From 61fdefda62cf960a9823a433e056604d9a14283f Mon Sep 17 00:00:00 2001
From: Alan Hollis <alan.hollis@6dg.co.uk>
Date: Fri, 27 Sep 2013 10:13:14 +0100
Subject: [PATCH 1/5] Move functions out of global namespace

Having global functions in openSRS_loaders prevents this library being
used in other projects.

Any project using this library / fork would now need to create a wrapper
class around the processOpenSRSMethod and call the function through
that.

Functions that are required as part of the core library have been moved
into openSRS_base + openSRS_fastlookup. There is a duplicate function
now in both these classes which I didn't have time to resolve.
---
 opensrs/openSRS_base.php       | 64 ++++++++++++++++-------
 opensrs/openSRS_fastlookup.php | 33 +++++++-----
 opensrs/openSRS_loader.php     | 94 +---------------------------------
 3 files changed, 67 insertions(+), 124 deletions(-)

diff --git a/opensrs/openSRS_base.php b/opensrs/openSRS_base.php
index 08970886..9f140447 100644
--- a/opensrs/openSRS_base.php
+++ b/opensrs/openSRS_base.php
@@ -25,7 +25,7 @@ class openSRS_base {
 	 * openSRS_base object constructor
 	 *
 	 * Closes an existing socket connection, if we have one
-	 * 
+	 *
 	 * @since   3.1
 	 */
 	public function __construct () {
@@ -51,7 +51,7 @@ public function __destruct () {
 	 * Method to check the PHP version and OpenSSL PHP lib installation
 	 *
 	 * @since   3.1
-	 */	
+	 */
 	private function _verifySystemProperties () {
 		if (!function_exists('version_compare') || version_compare('4.3', phpversion(), '>=')) {
 			$error_message = "PHP version must be v4.3+ (current version is ". phpversion() .") to use \"SSL\" encryption";
@@ -70,9 +70,9 @@ private function _verifySystemProperties () {
 	 * @param 	string 	$request Raw XML request
 	 *
 	 * @return 	string 	$data 	Raw XML response
-	 *  
+	 *
 	 * @since   3.1
-	 */	
+	 */
 	public function send_cmd($request) {
 		// make or get the socket filehandle
 		if (!$this->init_socket() ) {
@@ -95,9 +95,9 @@ public function send_cmd($request) {
 	 * Method to initialize a socket connection to the OpenSRS server
 	 *
 	 * @return 	boolean  True if connected
-	 *  
+	 *
 	 * @since   3.1
-	 */	
+	 */
 	private function init_socket() {
 		if ($this->is_connected()) return true;
 		$this->_socket = fsockopen(CRYPT_TYPE . '://' . OSRS_HOST, OSRS_SSL_PORT, $this->_socketErrorNum, $this->_socketErrorMsg, $this->_socketTimeout);
@@ -107,23 +107,23 @@ private function init_socket() {
 			return true;
 		}
 	}
-	
+
 	/**
 	 * Method to check if a socket connection exists
 	 *
 	 * @return 	boolean  True if connected
-	 *  
+	 *
 	 * @since   3.4
-	 */	
+	 */
 	public function is_connected() {
 		return (is_resource($this->_socket)) ? true : false;
 	}
 
 	/**
 	 * Method to close the socket connection
-	 *  
+	 *
 	 * @since   3.4
-	 */	
+	 */
 	private function close_socket() {
 		if (is_resource($this->_socket))
 		{
@@ -134,10 +134,10 @@ private function close_socket() {
 
 	/**
 	 * Method to read data from the buffer stream
-	 *  
+	 *
 	 * @return 	string 	XML response
 	 * @since   3.1
-	 */	
+	 */
 	private function read_data() {
 		$buf = $this->readData($this->_socket, $this->_socketReadTimeout);
 		if (!$buf) {
@@ -147,19 +147,19 @@ private function read_data() {
 			$data = $buf;
 		}
 		if (!empty($this->osrs_debug)) print_r("<pre>" . htmlentities($data) . "</pre>");
-		
+
 		return $data;
 	}
 
 	/**
 	 * Method to send data
-	 *  
+	 *
 	 * @param 	string 	$message 	XML request
 	 * @return 	string  $message	XML response
 	 * @since   3.1
-	 */	
+	 */
 	private function send_data($message) {
-		if (!empty($this->osrs_debug)) print_r("<pre>" . htmlentities($message) . "</pre>");		
+		if (!empty($this->osrs_debug)) print_r("<pre>" . htmlentities($message) . "</pre>");
 		return $this->writeData( $this->_socket, $message );
 	}
 
@@ -179,7 +179,7 @@ private function writeData(&$fh,$msg) {
 		$header .= "X-Username: " . OSRS_USERNAME . CRLF;
 		$header .= "X-Signature: " . $signature . CRLF;
 		$header .= "Content-Length: " . $len . CRLF . CRLF;
-		
+
 		fputs($fh, $header);
 		fputs($fh, $msg, $len );
 	}
@@ -227,7 +227,7 @@ private function readHeader($fh, $timeout=5) {
 	* @param	int 	timeout for read
 	* @return	mixed	buffer with data, or an error for a short read
 	*/
-	private function readData(&$fh, $timeout=5) {
+	private function readData(&$fh, $timeout= 5) {
 		$len = 0;
 		/* PHP doesn't have timeout for fread ... we just set the timeout for the socket */
 		socket_set_timeout($fh, $timeout);
@@ -254,4 +254,30 @@ private function readData(&$fh, $timeout=5) {
 		$this->close_socket();
 		return $buf;
 	}
+
+    protected function convertArray2Formatted ($type="", $data="") {
+      $resultString = "";
+      if ($type == "json") $resultString = json_encode($data);
+      if ($type == "yaml") $resultString = Spyc::YAMLDump($data);
+      return $resultString;
+    }
+
+    protected function convertFormatted2array ($type="", $data="") {
+        $resultArray = "";
+        if ($type == "json") $resultArray = json_decode($data, true);
+        if ($type == "yaml") $resultArray = Spyc::YAMLLoad($data);;
+        return $resultArray;
+    }
+
+    protected function array_filter_recursive($input)
+    {
+      foreach ($input as &$value)
+      {
+        if (is_array($value))
+        {
+          $value = $this->array_filter_recursive($value);
+        }
+      }
+      return array_filter($input);
+    }
 }
\ No newline at end of file
diff --git a/opensrs/openSRS_fastlookup.php b/opensrs/openSRS_fastlookup.php
index ca29b8cc..612386d7 100644
--- a/opensrs/openSRS_fastlookup.php
+++ b/opensrs/openSRS_fastlookup.php
@@ -1,7 +1,7 @@
 <?php
 
 class openSRS_fastlookup {
-	
+
 	private $_socket = false;
 	private $_socketErrorNum = false;
 	private $_socketErrorMsg = false;
@@ -36,13 +36,13 @@ public function checkDomain($domain) {
 		// Read result hand for parsing
 		$result = fread($this->_socket, 1024);
 		$data = $this->parseResult ($result);
-		
+
 		// Close the socket
 		$this->close_socket ();
 
 		return $data;
 	}
-	
+
 	public function checkDomainBunch ($domain, $tlds){
 		if (!$this->init_socket() ) {
 			trigger_error ("oSRS Error - Unable to establish socket: (". $this->_socketErrorNum .") ". $this->_socketErrorMsg, E_USER_WARNING);
@@ -51,7 +51,7 @@ public function checkDomainBunch ($domain, $tlds){
 
 		// check to see if the domain has a "." in it, if it does then take everything before the dot as the domain
 		// This is if someone puts in a domain name instead of just a name
-		
+
 		if(preg_match("/(^.+)\.(.+)\.(.+)/",$domain,$matches) > 0)
 			$domain=$matches[1];
 		else if (preg_match("/(^.+)\.(.+)/",$domain,$matches) > 0)
@@ -73,28 +73,28 @@ public function checkDomainBunch ($domain, $tlds){
 			// Read result hand for parsing
 			$result = fread($this->_socket, 1024);
 			$checkRes = $this->parseResult ($result);
-			
+
 			// Sort out the results
 			$loopAray = array ();
 			$loopAray['domain'] = $domain;
 			$loopAray['tld'] = $tld;
 			$loopAray['result'] = $checkRes;
-			
+
 			// Final push
 			array_push ($resultArray, $loopAray);
 		}
-		
+
 		// Close the socket
 		$this->close_socket ();
-		
+
 		// And there you go!!  That's it
 		return $resultArray;
 	}
 
-	
+
 	private function parseResult ($resString) {
 		$resultReturn = "";
-		
+
 		if ($resString != "") {
 			$temArra = explode (" ", $resString);
 			if ($temArra[0] == 210) $resultReturn = "Available";
@@ -104,11 +104,18 @@ private function parseResult ($resString) {
 		} else {
 			$resultReturn = "Read error";
 		}
-	
+
 		return $resultReturn;
 	}
 
-	private function init_socket() {
+    protected function convertArray2Formatted ($type="", $data="") {
+      $resultString = "";
+      if ($type == "json") $resultString = json_encode($data);
+      if ($type == "yaml") $resultString = Spyc::YAMLDump($data);
+      return $resultString;
+    }
+
+    private function init_socket() {
 		$this->_socket = pfsockopen(OSRS_HOST, OSRS_FASTLOOKUP_PORT, $this->_socketErrorNum, $this->_socketErrorMsg, $this->_socketTimeout);
 		if (!$this->_socket) {
 			return false;
@@ -116,7 +123,7 @@ private function init_socket() {
 			return true;
 		}
 	}
-	
+
 	private function close_socket() {
 		fclose($this->_socket);
 		$this->_socket = false;
diff --git a/opensrs/openSRS_loader.php b/opensrs/openSRS_loader.php
index 2086864d..31569543 100644
--- a/opensrs/openSRS_loader.php
+++ b/opensrs/openSRS_loader.php
@@ -7,14 +7,14 @@ final class Autoloader
   static public function load( $classname )
   {
     $lib_paths = array(OPENSRSURI, OPENSRSMAIL, OPENSRSOMA, OPENSRSFASTLOOKUP, OPENSRSTRUST);
-    
+
     foreach ($lib_paths as &$path) {
     	$classfile = $path . DS . $classname . ".php";
     	if(file_exists( $classfile )) {
       	require_once $classfile;
     	}
   	}
-  } 
+  }
   static public function load_domains( $classname )
   {
     $iterator = new DirectoryIterator(OPENSRSDOMAINS);
@@ -30,93 +30,3 @@ static public function load_domains( $classname )
 
 spl_autoload_register( array( 'Autoloader', 'load') );
 spl_autoload_register( array( 'Autoloader', 'load_domains') );
-
-/**
-* Method to convert Array -> Object -> Array
-*
-* @param  hash  $data  Containing array object
-* 
-* @return   stdClass Object $object   Containing stdClass object
-* @since    3.4
-*/
-
-function array2object($data) {
-  if(!is_array($data)) return $data;
-  $object = new stdClass();
-  
-  foreach ($data as $name=>$value) {
-    if (isset($name)) {
-      $name = strtolower(trim($name));
-      $object->$name = array2object($value); 
-    }
-  }
-  return $object;
-}
-
-function object2array($data){
-   if(!is_object($data) && !is_array($data)) return $data;
-   if(is_object($data)) $data = get_object_vars($data);
-   return array_map('object2array', $data);
-}
-
-// Call parsers and functions of openSRS
-function processOpenSRS ($type="", $data="") {
-
-    if (empty($data)) {
-        trigger_error("OSRS Error - No data found.");
-        return null;
-    }
-    else {
-        $dataArray = array();
-        switch(strtolower($type)) {
-            case "array":
-                $dataArray = $data;
-                break;
-            case "json":
-                $json = str_replace("\\\"", "\"", $data);   //  Replace  \"  with " for JSON that comes from Javascript
-                $dataArray = json_decode($json, true);
-                break;
-            case "yaml":
-                $dataArray = Spyc::YAMLLoad($data);
-                break;
-            default:
-                $dataArray = $data;
-        }
-		    // Convert associative array to object
-        $dataObject = array2object($dataArray);
-        $classCall = null;
-        if (class_exists($dataObject->func)){
-            $classCall = new $dataObject->func($type, $dataObject);
-        } 
-        else {
-            trigger_error("OSRS Error - Unable to find the function $dataObject->func.  Either the function is misspelled or there are incorrect file paths set in openSRS_config.php.");
-        }
-        return $classCall;
-    }
-}
-
-function convertArray2Formatted ($type="", $data="") {
-  $resultString = "";
-  if ($type == "json") $resultString = json_encode($data);
-  if ($type == "yaml") $resultString = Spyc::YAMLDump($data);
-  return $resultString;
-}
-
-function convertFormatted2array ($type="", $data="") {
-	$resultArray = "";
-	if ($type == "json") $resultArray = json_decode($data, true);
-	if ($type == "yaml") $resultArray = Spyc::YAMLLoad($data);;
-	return $resultArray;
-}
-
-function array_filter_recursive($input)
-{
-  foreach ($input as &$value)
-  {
-    if (is_array($value))
-    {
-      $value = array_filter_recursive($value);
-    }
-  } 
-  return array_filter($input);
-}
\ No newline at end of file

From 3f461971dcaa65701280bfb8bf73b31ee51526ad Mon Sep 17 00:00:00 2001
From: Alan Hollis <alan.hollis@6dg.co.uk>
Date: Fri, 27 Sep 2013 10:16:01 +0100
Subject: [PATCH 2/5] Change demo to use wrapper around open srs loader

This should allow all the demos and tests to still function despite
moving some of the global functions outside of the autoload script.
---
 demo/demo1.php                                |  6 ++--
 demo/demo2.php                                |  4 +--
 demo/demo3.php                                |  4 +--
 demo/demo5p.php                               | 14 ++++----
 demo/demo6.php                                | 28 +++++++--------
 demo/demo6p.php                               |  6 ++--
 demo/testcase/test-allinoneDomain.php         | 10 +++---
 demo/testcase/test-authChangeOwnership.php    |  8 ++---
 demo/testcase/test-authChangePassword.php     |  8 ++---
 demo/testcase/test-authCheckVersion.php       |  8 ++---
 demo/testcase/test-authSendAuthcode.php       |  8 ++---
 demo/testcase/test-authSendPassword.php       |  8 ++---
 demo/testcase/test-bulkChange.php             | 10 +++---
 demo/testcase/test-bulkSubmit.php             | 10 +++---
 demo/testcase/test-bulkTransfer.php           | 10 +++---
 demo/testcase/test-cookieDelete.php           |  8 ++---
 demo/testcase/test-cookieQuit.php             |  8 ++---
 demo/testcase/test-cookieSet.php              |  8 ++---
 demo/testcase/test-cookieUpdate.php           |  8 ++---
 demo/testcase/test-demodomainqueries.php      | 36 +++++++++++--------
 demo/testcase/test-dnsCreate.php              | 16 ++++-----
 demo/testcase/test-dnsDelete.php              | 10 +++---
 demo/testcase/test-dnsForce.php               | 10 +++---
 demo/testcase/test-dnsGet.php                 | 10 +++---
 demo/testcase/test-dnsReset.php               | 10 +++---
 demo/testcase/test-dnsSet.php                 | 12 +++----
 demo/testcase/test-fwdCreate.php              | 10 +++---
 demo/testcase/test-fwdDelete.php              | 10 +++---
 demo/testcase/test-fwdGet.php                 | 10 +++---
 demo/testcase/test-fwdSet.php                 | 10 +++---
 demo/testcase/test-lookupBelongsToRsp.php     |  8 ++---
 demo/testcase/test-lookupDomain.php           | 10 +++---
 demo/testcase/test-lookupGetBalance.php       |  8 ++---
 demo/testcase/test-lookupGetCaBlockerList.php |  8 ++---
 .../testcase/test-lookupGetDeletedDomains.php | 10 +++---
 demo/testcase/test-lookupGetDomain.php        | 10 +++---
 .../test-lookupGetDomainsByExpiry.php         | 10 +++---
 .../test-lookupGetDomainsContacts.php         | 10 +++---
 demo/testcase/test-lookupGetNotes.php         | 10 +++---
 demo/testcase/test-lookupGetOrderInfo.php     | 10 +++---
 .../testcase/test-lookupGetOrdersByDomain.php | 10 +++---
 demo/testcase/test-lookupGetPrice.php         | 10 +++---
 demo/testcase/test-lookupLookupDomain.php     |  8 ++---
 demo/testcase/test-lookupNameSuggest.php      | 12 +++----
 demo/testcase/test-mailAuthentication.php     | 10 +++---
 demo/testcase/test-mailChangeDomain.php       | 10 +++---
 demo/testcase/test-mailCreateDomain.php       | 10 +++---
 demo/testcase/test-mailCreateDomainAlias.php  | 10 +++---
 .../test-mailCreateDomainWelcomeEmail.php     | 10 +++---
 demo/testcase/test-mailCreateMailbox.php      | 10 +++---
 .../test-mailCreateMailboxForwardOnly.php     | 10 +++---
 demo/testcase/test-mailDeleteDomain.php       | 10 +++---
 demo/testcase/test-mailDeleteDomainAlias.php  | 10 +++---
 .../test-mailDeleteDomainWelcomeEmail.php     | 10 +++---
 demo/testcase/test-mailDeleteMailbox.php      | 10 +++---
 demo/testcase/test-mailGetCompanyDomains.php  | 10 +++---
 demo/testcase/test-mailGetDomain.php          | 12 +++----
 demo/testcase/test-mailGetDomainAllowList.php | 10 +++---
 demo/testcase/test-mailGetDomainBlockList.php | 10 +++---
 .../test-mailGetDomainMailboxLimits.php       | 10 +++---
 demo/testcase/test-mailGetDomainMailboxes.php | 10 +++---
 .../test-mailGetNumDomainMailboxes.php        | 10 +++---
 demo/testcase/test-mailSetDomainAdmin.php     | 10 +++---
 demo/testcase/test-mailSetDomainAllowList.php | 10 +++---
 demo/testcase/test-mailSetDomainBlockList.php | 10 +++---
 .../test-mailSetDomainDisabledStatus.php      | 10 +++---
 .../test-mailSetDomainMailboxLimits.php       | 10 +++---
 demo/testcase/test-nsAdvancedUpdt.php         | 10 +++---
 demo/testcase/test-nsCreate.php               | 10 +++---
 demo/testcase/test-nsDelete.php               | 10 +++---
 demo/testcase/test-nsGet.php                  | 10 +++---
 demo/testcase/test-nsModify.php               | 10 +++---
 demo/testcase/test-nsRegistryAdd.php          | 10 +++---
 demo/testcase/test-nsRegistryCheck.php        | 10 +++---
 demo/testcase/test-omaAddRole.php             | 14 ++++----
 demo/testcase/test-omaAuthenticate.php        | 10 +++---
 demo/testcase/test-omaChangeCompany.php       | 10 +++---
 .../test-omaChangeCompanyBulletin.php         | 12 +++----
 demo/testcase/test-omaChangeDomain.php        | 12 +++----
 .../testcase/test-omaChangeDomainBulletin.php | 12 +++----
 demo/testcase/test-omaChangeUser.php          | 10 +++---
 demo/testcase/test-omaCreateWorkgroup.php     | 10 +++---
 demo/testcase/test-omaDeleteDomain.php        | 12 +++----
 demo/testcase/test-omaDeleteUser.php          |  8 ++---
 demo/testcase/test-omaDeleteWorkgroup.php     | 10 +++---
 demo/testcase/test-omaGenerateToken.php       | 12 +++----
 demo/testcase/test-omaGetCompany.php          |  8 ++---
 demo/testcase/test-omaGetCompanyBulletin.php  | 12 +++----
 demo/testcase/test-omaGetCompanyChanges.php   |  8 ++---
 demo/testcase/test-omaGetDeletedContacts.php  |  8 ++---
 demo/testcase/test-omaGetDeletedMessages.php  | 10 +++---
 demo/testcase/test-omaGetDomain.php           | 10 +++---
 demo/testcase/test-omaGetDomainBulletin.php   | 12 +++----
 demo/testcase/test-omaGetDomainChanges.php    |  8 ++---
 demo/testcase/test-omaGetUser.php             |  8 ++---
 .../test-omaGetUserAttributeHistory.php       |  8 ++---
 demo/testcase/test-omaGetUserChanges.php      |  8 ++---
 demo/testcase/test-omaGetUserFolders.php      |  8 ++---
 demo/testcase/test-omaGetUserMessages.php     |  8 ++---
 demo/testcase/test-omaLogoutUser.php          |  8 ++---
 demo/testcase/test-omaMigrationAdd.php        | 12 +++----
 demo/testcase/test-omaMigrationJobs.php       | 12 +++----
 demo/testcase/test-omaMigrationStatus.php     | 10 +++---
 demo/testcase/test-omaMigrationTrace.php      | 10 +++---
 demo/testcase/test-omaMoveUserMessages.php    |  8 ++---
 demo/testcase/test-omaPostCompanyBulletin.php | 12 +++----
 demo/testcase/test-omaPostDomainBulletin.php  | 12 +++----
 demo/testcase/test-omaReindex.php             |  8 ++---
 demo/testcase/test-omaRenameUser.php          |  8 ++---
 .../test-omaRestoreDeletedContacts.php        |  8 ++---
 .../test-omaRestoreDeletedMessages.php        |  8 ++---
 demo/testcase/test-omaRestoreDomain.php       |  8 ++---
 demo/testcase/test-omaRestoreUser.php         |  8 ++---
 demo/testcase/test-omaSearchAdmins.php        | 10 +++---
 demo/testcase/test-omaSearchBrands.php        | 10 +++---
 demo/testcase/test-omaSearchDomains.php       | 10 +++---
 demo/testcase/test-omaSearchUsers.php         | 10 +++---
 demo/testcase/test-omaSearchWorkgroups.php    | 10 +++---
 demo/testcase/test-omaSetRole.php             | 10 +++---
 demo/testcase/test-omaStatsList.php           |  8 ++---
 demo/testcase/test-omaStatsSnapshot.php       |  8 ++---
 demo/testcase/test-persDelete.php             | 10 +++---
 demo/testcase/test-persNameSuggest.php        | 10 +++---
 demo/testcase/test-persQuery.php              | 10 +++---
 demo/testcase/test-persSUregister.php         | 10 +++---
 demo/testcase/test-persUpdate.php             | 10 +++---
 demo/testcase/test-premiumDomain.php          | 10 +++---
 demo/testcase/test-provActivate.php           | 10 +++---
 demo/testcase/test-provCancelPending.php      | 10 +++---
 demo/testcase/test-provProcessPending.php     | 10 +++---
 demo/testcase/test-provQueryQueuedRequest.php | 10 +++---
 demo/testcase/test-provRenew.php              | 10 +++---
 demo/testcase/test-provRevoke.php             | 10 +++---
 demo/testcase/test-provSWregister.php         | 26 +++++++-------
 demo/testcase/test-provSendCIRAapproval.php   | 10 +++---
 demo/testcase/test-provUpdateContacts.php     | 10 +++---
 demo/testcase/test-pubCreate.php              | 10 +++---
 demo/testcase/test-pubDelete.php              | 12 +++----
 demo/testcase/test-pubDisable.php             | 10 +++---
 demo/testcase/test-pubEnable.php              | 10 +++---
 .../test-pubGenerateRedirectionCode.php       | 10 +++---
 demo/testcase/test-pubGetControlPanelUrl.php  | 10 +++---
 demo/testcase/test-pubGetServiceInfo.php      | 10 +++---
 demo/testcase/test-pubLetExpire.php           | 10 +++---
 demo/testcase/test-pubUpdate.php              | 10 +++---
 demo/testcase/test-quickLookUp.php            | 14 ++++----
 demo/testcase/test-sendCiraEmailPwd.php       |  8 ++---
 demo/testcase/test-subresActing.php           | 12 +++----
 demo/testcase/test-subresCreate.php           | 10 +++---
 demo/testcase/test-subresGet.php              | 10 +++---
 demo/testcase/test-subresModify.php           | 10 +++---
 demo/testcase/test-subresPay.php              | 10 +++---
 demo/testcase/test-subuserAdd.php             | 10 +++---
 demo/testcase/test-subuserDelete.php          | 10 +++---
 demo/testcase/test-subuserGet.php             | 10 +++---
 demo/testcase/test-subuserGetInfo.php         | 10 +++---
 demo/testcase/test-subuserModify.php          | 10 +++---
 demo/testcase/test-suggestDomain.php          | 10 +++---
 demo/testcase/test-transCancel.php            | 10 +++---
 demo/testcase/test-transCheck.php             | 10 +++---
 demo/testcase/test-transGetAway.php           | 10 +++---
 demo/testcase/test-transGetIn.php             | 10 +++---
 demo/testcase/test-transProcess.php           | 10 +++---
 demo/testcase/test-transRsp2Rsp.php           | 10 +++---
 demo/testcase/test-transSendPass.php          | 10 +++---
 demo/testcase/test-transTradeDomain.php       | 10 +++---
 demo/testcase/test-trustCancelOrder.php       | 10 +++---
 demo/testcase/test-trustCreateToken.php       | 10 +++---
 demo/testcase/test-trustGetOrderInfo.php      | 10 +++---
 demo/testcase/test-trustGetProductInfo.php    | 10 +++---
 demo/testcase/test-trustParseCSR.php          | 10 +++---
 demo/testcase/test-trustProcessPending.php    | 10 +++---
 demo/testcase/test-trustQueryApproverList.php | 10 +++---
 .../test-trustRequestOnDemandScan.php         | 10 +++---
 .../test-trustResendApproverEmail.php         | 10 +++---
 demo/testcase/test-trustResendCertEmail.php   | 10 +++---
 demo/testcase/test-trustSWregister.php        |  6 ++--
 demo/testcase/test-trustUpdateOrder.php       |  8 ++---
 demo/testcase/test-trustUpdateProduct.php     |  6 ++--
 179 files changed, 905 insertions(+), 897 deletions(-)

diff --git a/demo/demo1.php b/demo/demo1.php
index 9fe20024..70969006 100644
--- a/demo/demo1.php
+++ b/demo/demo1.php
@@ -1,4 +1,4 @@
-<?
+<?php
 $callArray = array (
 	"func" => "premiumDomain",
 	//"func" => "allinone",
@@ -8,11 +8,11 @@
                 "domain" => "hockey.com",
 		// These are optional
                 "selected" => ".com;.net;.org",
-                "alldomains" => ".com;.net;.org" 
+                "alldomains" => ".com;.net;.org"
         )
 );
 
-require_once ("../opensrs/openSRS_loader.php");
+require_once(__DIR__ . "/openSRS_LoaderWrapper.php");
 
 //JSON
 $callstring = json_encode($callArray);
diff --git a/demo/demo2.php b/demo/demo2.php
index b0c0a2cd..0f4b0a9f 100644
--- a/demo/demo2.php
+++ b/demo/demo2.php
@@ -1,4 +1,4 @@
-<?
+<?php
 $callArray = array (
         "func" => "subresGet",
         "data" => array (
@@ -6,7 +6,7 @@
         )
 );
 
-require_once("../opensrs/openSRS_loader.php");
+require_once(__DIR__ . "/openSRS_LoaderWrapper.php");
 
 $callstring = json_encode($callArray);
 
diff --git a/demo/demo3.php b/demo/demo3.php
index fb338bbe..2d4e8845 100644
--- a/demo/demo3.php
+++ b/demo/demo3.php
@@ -1,4 +1,4 @@
-<?
+<?php
 $callArray = array (
         "func" => "cookieSet",
         "data" => array (
@@ -8,7 +8,7 @@
         )
 );
 
-require_once("..//opensrs/openSRS_loader.php");
+require_once(__DIR__ . "/openSRS_LoaderWrapper.php");
 
 $callstring = json_encode($callArray);
 $osrsHandler = processOpenSRS ("json", $callstring);
diff --git a/demo/demo5p.php b/demo/demo5p.php
index 00f2dcd5..c475447b 100644
--- a/demo/demo5p.php
+++ b/demo/demo5p.php
@@ -1,11 +1,11 @@
-<?php 
+<?php
 
 if (isSet($_POST['func'])) {
 	// ONLY FOR TESTING PURPOSE!!!
 	require_once("../opensrs/spyc.php");
-	
+
 	// !!!!!!!! ---  Proper form values verification  --- !!!!!!!!!
-	
+
 	$format = $_POST["format"];
 	$function = $_POST["func"];
 	$domain = $_POST["domain"];
@@ -20,12 +20,12 @@
 			"selected" => $tlds,
 		)
 	);
-	
+
 	if ($format == "json") $callstring = json_encode($callArray);
 	if ($format == "yaml") $callstring = Spyc::YAMLDump($callArray);
-	
+
 	// Open SRS Call -> Result
-	require_once ("../opensrs/openSRS_loader.php");
+	require_once(__DIR__ . "/openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS($format, $callstring);
 
 	$jsonRet = $osrsHandler->resultRaw;
@@ -34,4 +34,4 @@
 } else {
 	echo ("<h2>Invalid call!</h2>");
 }
-?> 
+?>
diff --git a/demo/demo6.php b/demo/demo6.php
index 94d279d1..61a1fc7f 100644
--- a/demo/demo6.php
+++ b/demo/demo6.php
@@ -1,11 +1,11 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	$callstring = "";
 
 	$firstname = trim($_POST["firstname"]);
 	$lastname = trim($_POST["lastname"]);
-	
+
 
 	$searchstring = $firstname . " " . $lastname;
 
@@ -14,9 +14,9 @@
 		"data" => array ("searchstring" => $searchstring)
 	);
 
-	$callstring = json_encode($callArray);	
+	$callstring = json_encode($callArray);
 	// Open SRS Call -> Result
-	require_once ("../opensrs/openSRS_loader.php");
+	require_once(__DIR__ . "/openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ("json", $callstring);
 	$json_out = $osrsHandler->resultFormatted;
 
@@ -31,9 +31,9 @@
 
   <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script>
 	<script language="Javascript" type="text/javascript" src="js/runonload.js"></script>
-	<script language="Javascript" type="text/javascript" src="js/democode.js"></script>	
+	<script language="Javascript" type="text/javascript" src="js/democode.js"></script>
+
 
-	
 	<style media="screen" type="text/css">
 	.defaultText { width: 205px; height: 39px; font-size: 20px;}
 	.defaultTextActive { color: #a1a1a1; font-style: italic;}
@@ -91,7 +91,7 @@
 
 					<div id="content">
 						<table width="540px">
-						<?php 
+						<?php
 						if (isSet($json_out)){
 							$json_a = json_decode($json_out, true);
 
@@ -113,21 +113,21 @@
 							}
 						}
 						?>
-					</table>	
+					</table>
 				</div>
 
 				<!-- Page footer -->
 				<div id="footer">
 					<!-- Left links -->
 					<a href="http://www.facebook.com/home.php#/pages/OpenSRS/127798660660?ref=s">OpenSRS is part of </a><a href="http://www.tucowsinc.com/">Tucows</a>
-					<span class="separator">|</span> <a href="http://opensrs.com/privacy">Privacy Policy</a>	<span class="separator">|</span> 
+					<span class="separator">|</span> <a href="http://opensrs.com/privacy">Privacy Policy</a>	<span class="separator">|</span>
 					<a href="http://opensrs.com/sitemap.php">Sitemap</a> <span class="separator">|</span>  &copy; 2010
-				</div>	
+				</div>
 
 			</div></div>
 		</div>
-		
-		
+
+
 		<script type="text/javascript">
 				<!--
 				$(document).ready(function() {
@@ -145,11 +145,11 @@
 		        }
 		    	});
 
-		    	$(".defaultText").blur();        
+		    	$(".defaultText").blur();
 				});
 				//-->
 			</script>
-		
+
 	</body>
 
 	</html>
diff --git a/demo/demo6p.php b/demo/demo6p.php
index 331b328c..50121299 100644
--- a/demo/demo6p.php
+++ b/demo/demo6p.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once("../opensrs/spyc.php");
@@ -14,9 +14,9 @@
 		);
 
 
-	$callstring = json_encode($callArray);	
+	$callstring = json_encode($callArray);
 	// Open SRS Call -> Result
-	require_once ("../opensrs/openSRS_loader.php");
+	require_once(__DIR__ . "/openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ("json", $callstring);
 	$json_out = $osrsHandler->resultFormatted;
 
diff --git a/demo/testcase/test-allinoneDomain.php b/demo/testcase/test-allinoneDomain.php
index 46df5a2b..c39f84ce 100644
--- a/demo/testcase/test-allinoneDomain.php
+++ b/demo/testcase/test-allinoneDomain.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 
@@ -36,7 +36,7 @@
 
 
 // Open SRS Call -> Result
-require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 $osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 
@@ -106,12 +106,12 @@
 </form>
 
 
-	
+
 </body>
 </html>
 
 
 
-<?php 
+<?php
 }
-?> 
+?>
diff --git a/demo/testcase/test-authChangeOwnership.php b/demo/testcase/test-authChangeOwnership.php
index b57862bd..1ac607d6 100644
--- a/demo/testcase/test-authChangeOwnership.php
+++ b/demo/testcase/test-authChangeOwnership.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 
@@ -25,7 +25,7 @@
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -76,10 +76,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-authChangePassword.php b/demo/testcase/test-authChangePassword.php
index 91e97e1e..6f308e86 100644
--- a/demo/testcase/test-authChangePassword.php
+++ b/demo/testcase/test-authChangePassword.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 
@@ -23,7 +23,7 @@
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -68,10 +68,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-authCheckVersion.php b/demo/testcase/test-authCheckVersion.php
index 181209f8..9c7d2cef 100644
--- a/demo/testcase/test-authCheckVersion.php
+++ b/demo/testcase/test-authCheckVersion.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 
@@ -19,7 +19,7 @@
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -58,10 +58,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-authSendAuthcode.php b/demo/testcase/test-authSendAuthcode.php
index 37ba29e9..7c6463ed 100644
--- a/demo/testcase/test-authSendAuthcode.php
+++ b/demo/testcase/test-authSendAuthcode.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	// ONLY FOR TESTING PURPOSE!!!
@@ -21,7 +21,7 @@
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -60,10 +60,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-authSendPassword.php b/demo/testcase/test-authSendPassword.php
index 32d5b6d5..cad510a4 100644
--- a/demo/testcase/test-authSendPassword.php
+++ b/demo/testcase/test-authSendPassword.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	// ONLY FOR TESTING PURPOSE!!!
@@ -23,7 +23,7 @@
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -68,10 +68,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-bulkChange.php b/demo/testcase/test-bulkChange.php
index 9cfb4a34..aa183f42 100644
--- a/demo/testcase/test-bulkChange.php
+++ b/demo/testcase/test-bulkChange.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -38,13 +38,13 @@
 			"domain_list" => $_POST["domain_list"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -113,10 +113,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-bulkSubmit.php b/demo/testcase/test-bulkSubmit.php
index 99e69b65..27e76812 100644
--- a/demo/testcase/test-bulkSubmit.php
+++ b/demo/testcase/test-bulkSubmit.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -14,13 +14,13 @@
 			"xxx" => $_POST["xxx"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -59,10 +59,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-bulkTransfer.php b/demo/testcase/test-bulkTransfer.php
index b35a4157..57d4d44a 100644
--- a/demo/testcase/test-bulkTransfer.php
+++ b/demo/testcase/test-bulkTransfer.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -18,13 +18,13 @@
 			"change_items" => $_POST["change_items"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -75,10 +75,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-cookieDelete.php b/demo/testcase/test-cookieDelete.php
index 13c3c3b4..312d374d 100644
--- a/demo/testcase/test-cookieDelete.php
+++ b/demo/testcase/test-cookieDelete.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	// ONLY FOR TESTING PURPOSE!!!
@@ -21,7 +21,7 @@
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -62,10 +62,10 @@
 	</tr>
 </table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-cookieQuit.php b/demo/testcase/test-cookieQuit.php
index aa8c37ac..efaa1c7c 100644
--- a/demo/testcase/test-cookieQuit.php
+++ b/demo/testcase/test-cookieQuit.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	// ONLY FOR TESTING PURPOSE!!!
@@ -19,7 +19,7 @@
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -55,10 +55,10 @@
 	</tr>
 </table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-cookieSet.php b/demo/testcase/test-cookieSet.php
index 51c1cda2..4cc84bbc 100644
--- a/demo/testcase/test-cookieSet.php
+++ b/demo/testcase/test-cookieSet.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 
@@ -26,7 +26,7 @@
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -77,10 +77,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-cookieUpdate.php b/demo/testcase/test-cookieUpdate.php
index 012b85a6..17f92271 100644
--- a/demo/testcase/test-cookieUpdate.php
+++ b/demo/testcase/test-cookieUpdate.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 
@@ -24,7 +24,7 @@
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -85,10 +85,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-demodomainqueries.php b/demo/testcase/test-demodomainqueries.php
index aa2c1fd0..95068e58 100644
--- a/demo/testcase/test-demodomainqueries.php
+++ b/demo/testcase/test-demodomainqueries.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 
@@ -37,9 +37,17 @@
 
 
 // Open SRS Call -> Result
-require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
+
+function convertFormatted2array ($type="", $data="") {
+    $resultArray = "";
+    if ($type == "json") $resultArray = json_decode($data, true);
+    if ($type == "yaml") $resultArray = Spyc::YAMLLoad($data);;
+    return $resultArray;
+}
+
 $osrsHandler = processOpenSRS ($formFormat, $callstring);
-$capArray = convertFormatted2array ($formFormat, $osrsHandler->resultFormatted); 
+$capArray = convertFormatted2array ($formFormat, $osrsHandler->resultFormatted);
 
 $arraLookup  = $capArray['lookup'];
 $arraPrem = $capArray['premium'];
@@ -57,8 +65,8 @@
 	<meta name="generator" http-equiv="generator" content="Claire Lam" />
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
 	<meta http-equiv="Content-Language" content="en"/>
-	
-	
+
+
 	<!-- CSS Styles -->
 	<style type="text/css">
 		.allleft {
@@ -70,7 +78,7 @@
 			margin: 0 auto;
 			text-align: center;
 		}
-	</style>		
+	</style>
 </head>
 <body>
 
@@ -80,7 +88,7 @@
 	<input type="hidden" name="function" value="allinoneDomain">
 
 <center>
-	<div><span class="headLine">Lookup / Suggest / Premuim Doamins</span></div>	
+	<div><span class="headLine">Lookup / Suggest / Premuim Doamins</span></div>
 	<div><input type="text" name="domain" id="domain" value="<?php echo ($formSearchWord); ?>" class="frontBox" size="60"> <input value="Check" id="lookupSearch" type="submit"></div>
 </center>
 </form>
@@ -91,16 +99,16 @@
 
 	<div class="cent">
 		<div class="allleft">Current
-<?php 
+<?php
 if (count($arraLookup) != 0){
 	echo("	<div><h4>Lookup</h4></div>\n");
 	echo("	<div>". $arraLookup[0]['domain'] ." - <b>". $arraLookup[0]['status'] ."</b></div>\n");
 }
-?>			
+?>
 		</div>
 		<div class="allleft">With new implementation
-	
-<?php 
+
+<?php
 if (count($arraLookup) != 0){
 	echo("	<div><h4>Lookup</h4></div>\n");
 	for ($i=0; $i<count($arraLookup); $i++){
@@ -159,7 +167,7 @@
 	<input type="hidden" name="format" value="<?php echo($tf); ?>">
 	<input type="hidden" name="function" value="allinoneDomain">
 	<center>
-		<div><span class="headLine">Lookup / Suggest / Premuim Doamins</span></div>	
+		<div><span class="headLine">Lookup / Suggest / Premuim Doamins</span></div>
 		<div><input type="text" name="domain" id="domain" value="" class="frontBox" size="60"> <input value="Check" id="lookupSearch" type="submit"></div>
 	</center>
 </form>
@@ -181,6 +189,6 @@
 -->
 </body>
 </html>
-<?php 
+<?php
 }
-?> 
\ No newline at end of file
+?>
\ No newline at end of file
diff --git a/demo/testcase/test-dnsCreate.php b/demo/testcase/test-dnsCreate.php
index 074a8c7b..3887e857 100644
--- a/demo/testcase/test-dnsCreate.php
+++ b/demo/testcase/test-dnsCreate.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -20,7 +20,7 @@
 	 		"DNS_template" => $_POST["dns_template"],
  		)
 	);
-	
+
 	if (isSet($a)) {
 		$as = array();
 		for ($i = 0; $i < count($a); $i++) {
@@ -35,7 +35,7 @@
 		$aaaas = array();
 		for ($i = 0; $i < count($aaaa); $i++) {
 			if(!empty($aaaa["ipv6_address"][$i]) && !empty($aaaa["subdomain"][$i]) ) {
-				array_push($aaaas, array("ipv6_address" => $aaaa["ipv6_address"][$i], "subdomain" => $aaaa["subdomain"][$i]));	
+				array_push($aaaas, array("ipv6_address" => $aaaa["ipv6_address"][$i], "subdomain" => $aaaa["subdomain"][$i]));
 			}
 		}
 		if (count($aaaas)> 0) $callArray["data"]["aaaa"] = $aaaas;
@@ -75,17 +75,17 @@
 		$txts = array();
 		for ($i = 0; $i < count($txt); $i++) {
 			if(!empty($txt["text"][$i])) {
-				array_push($txts, array("subdomain" => $txt["subdomain"][$i], "text" => $txt["text"][$i]));	
+				array_push($txts, array("subdomain" => $txt["subdomain"][$i], "text" => $txt["text"][$i]));
 			}
 		}
 		if (count($txts)> 0) $callArray["data"]["txt"] = $txts;
 	}
-		
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -175,10 +175,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-dnsDelete.php b/demo/testcase/test-dnsDelete.php
index 7b4a8eed..2b4c2593 100644
--- a/demo/testcase/test-dnsDelete.php
+++ b/demo/testcase/test-dnsDelete.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -14,13 +14,13 @@
 			"domain" => $_POST["domain"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -59,10 +59,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-dnsForce.php b/demo/testcase/test-dnsForce.php
index a78a4d1a..1f8db301 100644
--- a/demo/testcase/test-dnsForce.php
+++ b/demo/testcase/test-dnsForce.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -14,13 +14,13 @@
 			"domain" => $_POST["domain"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -59,10 +59,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-dnsGet.php b/demo/testcase/test-dnsGet.php
index 574df628..295214ca 100644
--- a/demo/testcase/test-dnsGet.php
+++ b/demo/testcase/test-dnsGet.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -14,13 +14,13 @@
 			"domain" => $_POST["domain"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -59,10 +59,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-dnsReset.php b/demo/testcase/test-dnsReset.php
index 94d5fa86..d9bbd6e8 100644
--- a/demo/testcase/test-dnsReset.php
+++ b/demo/testcase/test-dnsReset.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -15,13 +15,13 @@
 			"dns_template" => $_POST["dns_template"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -63,10 +63,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-dnsSet.php b/demo/testcase/test-dnsSet.php
index b9257494..be54fbdd 100644
--- a/demo/testcase/test-dnsSet.php
+++ b/demo/testcase/test-dnsSet.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -36,7 +36,7 @@
 		$aaaas = array();
 		for ($i = 0; $i < count($aaaa); $i++) {
 			if(!empty($aaaa["ipv6_address"][$i]) && !empty($aaaa["subdomain"][$i]) ) {
-				array_push($aaaas, array("ipv6_address" => $aaaa["ipv6_address"][$i], "subdomain" => $aaaa["subdomain"][$i]));	
+				array_push($aaaas, array("ipv6_address" => $aaaa["ipv6_address"][$i], "subdomain" => $aaaa["subdomain"][$i]));
 			}
 		}
 		if (count($aaaas)> 0) $callArray["data"]["aaaa"] = $aaaas;
@@ -76,7 +76,7 @@
 		$txts = array();
 		for ($i = 0; $i < count($txt); $i++) {
 			if(!empty($txt["text"][$i])) {
-				array_push($txts, array("subdomain" => $txt["subdomain"][$i], "text" => $txt["text"][$i]));	
+				array_push($txts, array("subdomain" => $txt["subdomain"][$i], "text" => $txt["text"][$i]));
 			}
 		}
 		if (count($txts)> 0) $callArray["data"]["txt"] = $txts;
@@ -86,7 +86,7 @@
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -177,10 +177,10 @@
 	</table>
 
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-fwdCreate.php b/demo/testcase/test-fwdCreate.php
index f232dbb2..c1065289 100644
--- a/demo/testcase/test-fwdCreate.php
+++ b/demo/testcase/test-fwdCreate.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -14,13 +14,13 @@
 			"domain" => $_POST["domain"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -59,10 +59,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-fwdDelete.php b/demo/testcase/test-fwdDelete.php
index 32f1d3f7..731468d2 100644
--- a/demo/testcase/test-fwdDelete.php
+++ b/demo/testcase/test-fwdDelete.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -14,13 +14,13 @@
 			"domain" => $_POST["domain"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -59,10 +59,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-fwdGet.php b/demo/testcase/test-fwdGet.php
index 6028d5f2..3ef85669 100644
--- a/demo/testcase/test-fwdGet.php
+++ b/demo/testcase/test-fwdGet.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -22,13 +22,13 @@
 			"title" => $_POST["title"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -91,10 +91,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-fwdSet.php b/demo/testcase/test-fwdSet.php
index b7ceb333..5192c7a3 100644
--- a/demo/testcase/test-fwdSet.php
+++ b/demo/testcase/test-fwdSet.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -23,13 +23,13 @@
 			"title" => $_POST["title"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -95,10 +95,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-lookupBelongsToRsp.php b/demo/testcase/test-lookupBelongsToRsp.php
index f0f1f63f..15484aa7 100644
--- a/demo/testcase/test-lookupBelongsToRsp.php
+++ b/demo/testcase/test-lookupBelongsToRsp.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	// ONLY FOR TESTING PURPOSE!!!
@@ -21,7 +21,7 @@
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -60,10 +60,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-lookupDomain.php b/demo/testcase/test-lookupDomain.php
index d9b0c1f0..9cf0a2ee 100644
--- a/demo/testcase/test-lookupDomain.php
+++ b/demo/testcase/test-lookupDomain.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 
@@ -37,7 +37,7 @@
 
 
 // Open SRS Call -> Result
-require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 $osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 
@@ -109,12 +109,12 @@
 </form>
 
 
-	
+
 </body>
 </html>
 
 
 
-<?php 
+<?php
 }
-?> 
+?>
diff --git a/demo/testcase/test-lookupGetBalance.php b/demo/testcase/test-lookupGetBalance.php
index 89ef1c30..e62f6d5f 100644
--- a/demo/testcase/test-lookupGetBalance.php
+++ b/demo/testcase/test-lookupGetBalance.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	// ONLY FOR TESTING PURPOSE!!!
@@ -19,7 +19,7 @@
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -56,10 +56,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-lookupGetCaBlockerList.php b/demo/testcase/test-lookupGetCaBlockerList.php
index a2bc968f..1371b16e 100644
--- a/demo/testcase/test-lookupGetCaBlockerList.php
+++ b/demo/testcase/test-lookupGetCaBlockerList.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	// ONLY FOR TESTING PURPOSE!!!
@@ -21,7 +21,7 @@
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -60,10 +60,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-lookupGetDeletedDomains.php b/demo/testcase/test-lookupGetDeletedDomains.php
index 9c2713e0..426bd529 100644
--- a/demo/testcase/test-lookupGetDeletedDomains.php
+++ b/demo/testcase/test-lookupGetDeletedDomains.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	// ONLY FOR TESTING PURPOSE!!!
@@ -24,13 +24,13 @@
 			"limit" => $_POST["limit"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -96,10 +96,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-lookupGetDomain.php b/demo/testcase/test-lookupGetDomain.php
index e1e97052..23c9cc47 100644
--- a/demo/testcase/test-lookupGetDomain.php
+++ b/demo/testcase/test-lookupGetDomain.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -22,13 +22,13 @@
 			"domain" => $_POST["domain"],
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -91,10 +91,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-lookupGetDomainsByExpiry.php b/demo/testcase/test-lookupGetDomainsByExpiry.php
index 30144e83..51ba451d 100644
--- a/demo/testcase/test-lookupGetDomainsByExpiry.php
+++ b/demo/testcase/test-lookupGetDomainsByExpiry.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	// ONLY FOR TESTING PURPOSE!!!
@@ -18,13 +18,13 @@
 			"limit" => $_POST["limit"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -72,10 +72,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-lookupGetDomainsContacts.php b/demo/testcase/test-lookupGetDomainsContacts.php
index 18bc61b8..2de6a11c 100644
--- a/demo/testcase/test-lookupGetDomainsContacts.php
+++ b/demo/testcase/test-lookupGetDomainsContacts.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	// ONLY FOR TESTING PURPOSE!!!
@@ -15,13 +15,13 @@
 			"domain_list" => $_POST["domain_list"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -60,10 +60,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-lookupGetNotes.php b/demo/testcase/test-lookupGetNotes.php
index b44947de..f5409c08 100644
--- a/demo/testcase/test-lookupGetNotes.php
+++ b/demo/testcase/test-lookupGetNotes.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	// ONLY FOR TESTING PURPOSE!!!
@@ -20,13 +20,13 @@
 			"transfer_id" => $_POST["transfer_id"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -80,10 +80,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-lookupGetOrderInfo.php b/demo/testcase/test-lookupGetOrderInfo.php
index 1153a4e0..dd08c558 100644
--- a/demo/testcase/test-lookupGetOrderInfo.php
+++ b/demo/testcase/test-lookupGetOrderInfo.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	// ONLY FOR TESTING PURPOSE!!!
@@ -15,13 +15,13 @@
 			"order_id" => $_POST["order_id"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -60,10 +60,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-lookupGetOrdersByDomain.php b/demo/testcase/test-lookupGetOrdersByDomain.php
index 5222497c..a4754f0c 100644
--- a/demo/testcase/test-lookupGetOrdersByDomain.php
+++ b/demo/testcase/test-lookupGetOrdersByDomain.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	// ONLY FOR TESTING PURPOSE!!!
@@ -21,13 +21,13 @@
 			"order_to" => $_POST["order_to"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -84,10 +84,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-lookupGetPrice.php b/demo/testcase/test-lookupGetPrice.php
index f603a400..e5fdb99b 100644
--- a/demo/testcase/test-lookupGetPrice.php
+++ b/demo/testcase/test-lookupGetPrice.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	// ONLY FOR TESTING PURPOSE!!!
@@ -17,13 +17,13 @@
 			"reg_type" => $_POST["reg_type"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -69,10 +69,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-lookupLookupDomain.php b/demo/testcase/test-lookupLookupDomain.php
index 4ab5bad1..2064c7be 100644
--- a/demo/testcase/test-lookupLookupDomain.php
+++ b/demo/testcase/test-lookupLookupDomain.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	// ONLY FOR TESTING PURPOSE!!!
@@ -21,7 +21,7 @@
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -61,10 +61,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-lookupNameSuggest.php b/demo/testcase/test-lookupNameSuggest.php
index 7ce7f305..7e1adf38 100644
--- a/demo/testcase/test-lookupNameSuggest.php
+++ b/demo/testcase/test-lookupNameSuggest.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 
@@ -42,7 +42,7 @@
 
 
 // Open SRS Call -> Result
-require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 $osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 
@@ -84,7 +84,7 @@
                 </td>
         </tr>
         <tr><td><br><span class="headLine"><b>Name Suggestion Options</b></span></td></tr>
-        <tr><td> 
+        <tr><td>
                         <span class="headLine">Max Number of Suggestion Results </span>
                         <input type="text" name="max" id="max" value="" class="frontBox"><br>
 		</td>
@@ -128,12 +128,12 @@
 </form>
 
 
-	
+
 </body>
 </html>
 
 
 
-<?php 
+<?php
 }
-?> 
+?>
diff --git a/demo/testcase/test-mailAuthentication.php b/demo/testcase/test-mailAuthentication.php
index 119e40c4..da755309 100644
--- a/demo/testcase/test-mailAuthentication.php
+++ b/demo/testcase/test-mailAuthentication.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -16,13 +16,13 @@
 			"admin_domain" => $_POST["admin_domain"],
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -44,7 +44,7 @@
 	<input type="hidden" name="format" value="<?php echo($tf); ?>">
 	<input type="hidden" name="function" value="mailAuthentication">
 	<h4>Authentication</h4>
-	  
+
 	<div class="control-group">
 	    <label class="control-label">Admin Username </label>
 	    <div class="controls"><input type="text" name="admin_username" value=""></div>
@@ -65,6 +65,6 @@
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-mailChangeDomain.php b/demo/testcase/test-mailChangeDomain.php
index a45bab82..d59b41b3 100644
--- a/demo/testcase/test-mailChangeDomain.php
+++ b/demo/testcase/test-mailChangeDomain.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -23,13 +23,13 @@
 			"spam_level" => $_POST["spam_level"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -98,10 +98,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-mailCreateDomain.php b/demo/testcase/test-mailCreateDomain.php
index e8b00f52..98e90b1d 100644
--- a/demo/testcase/test-mailCreateDomain.php
+++ b/demo/testcase/test-mailCreateDomain.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -23,13 +23,13 @@
 			"spam_level" => $_POST["spam_level"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -98,10 +98,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-mailCreateDomainAlias.php b/demo/testcase/test-mailCreateDomainAlias.php
index 994412b1..780fba7a 100644
--- a/demo/testcase/test-mailCreateDomainAlias.php
+++ b/demo/testcase/test-mailCreateDomainAlias.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -18,13 +18,13 @@
 			"alias" => $_POST["alias"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -77,10 +77,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-mailCreateDomainWelcomeEmail.php b/demo/testcase/test-mailCreateDomainWelcomeEmail.php
index eb005d8c..612504a2 100644
--- a/demo/testcase/test-mailCreateDomainWelcomeEmail.php
+++ b/demo/testcase/test-mailCreateDomainWelcomeEmail.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -23,13 +23,13 @@
 			"mime_type" => $_POST["mime_type"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -97,10 +97,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-mailCreateMailbox.php b/demo/testcase/test-mailCreateMailbox.php
index fae324e0..33cb2489 100644
--- a/demo/testcase/test-mailCreateMailbox.php
+++ b/demo/testcase/test-mailCreateMailbox.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -31,13 +31,13 @@
 			"spam_level" => $_POST["spam_level"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -130,10 +130,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-mailCreateMailboxForwardOnly.php b/demo/testcase/test-mailCreateMailboxForwardOnly.php
index e92b7836..297d62b8 100644
--- a/demo/testcase/test-mailCreateMailboxForwardOnly.php
+++ b/demo/testcase/test-mailCreateMailboxForwardOnly.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -20,13 +20,13 @@
 			"forward_email" => $_POST["forward_email"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -89,10 +89,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-mailDeleteDomain.php b/demo/testcase/test-mailDeleteDomain.php
index 68abe02b..588d4df9 100644
--- a/demo/testcase/test-mailDeleteDomain.php
+++ b/demo/testcase/test-mailDeleteDomain.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -18,13 +18,13 @@
 			"cascade" => $_POST["cascade"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -78,10 +78,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-mailDeleteDomainAlias.php b/demo/testcase/test-mailDeleteDomainAlias.php
index 46686a24..b8b3e841 100644
--- a/demo/testcase/test-mailDeleteDomainAlias.php
+++ b/demo/testcase/test-mailDeleteDomainAlias.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -17,13 +17,13 @@
 			"alias" => $_POST["alias"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -73,10 +73,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-mailDeleteDomainWelcomeEmail.php b/demo/testcase/test-mailDeleteDomainWelcomeEmail.php
index a5e8053c..c757fc25 100644
--- a/demo/testcase/test-mailDeleteDomainWelcomeEmail.php
+++ b/demo/testcase/test-mailDeleteDomainWelcomeEmail.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -17,13 +17,13 @@
 			"domain" => $_POST["domain"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -73,10 +73,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-mailDeleteMailbox.php b/demo/testcase/test-mailDeleteMailbox.php
index e2a45501..7fccaed5 100644
--- a/demo/testcase/test-mailDeleteMailbox.php
+++ b/demo/testcase/test-mailDeleteMailbox.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -18,13 +18,13 @@
 			"domain" => $_POST["domain"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -77,10 +77,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-mailGetCompanyDomains.php b/demo/testcase/test-mailGetCompanyDomains.php
index e9262523..56ddf80f 100644
--- a/demo/testcase/test-mailGetCompanyDomains.php
+++ b/demo/testcase/test-mailGetCompanyDomains.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -16,13 +16,13 @@
 			"admin_domain" => $_POST["admin_domain"],
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -68,10 +68,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-mailGetDomain.php b/demo/testcase/test-mailGetDomain.php
index 52dd4fce..539059c6 100644
--- a/demo/testcase/test-mailGetDomain.php
+++ b/demo/testcase/test-mailGetDomain.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -17,13 +17,13 @@
 			"domain" => $_POST["domain"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -47,7 +47,7 @@
 	<input type="hidden" name="function" value="mailGetDomain">
 
 <h4>Authentication</h4>
-  
+
 <div class="control-group">
     <label class="control-label">Admin Username </label>
     <div class="controls"><input type="text" name="admin_username" value=""></div>
@@ -72,10 +72,10 @@
 	<input value="Get Domain" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-mailGetDomainAllowList.php b/demo/testcase/test-mailGetDomainAllowList.php
index 974348f8..df5f543d 100644
--- a/demo/testcase/test-mailGetDomainAllowList.php
+++ b/demo/testcase/test-mailGetDomainAllowList.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -17,13 +17,13 @@
 			"domain" => $_POST["domain"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -73,10 +73,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-mailGetDomainBlockList.php b/demo/testcase/test-mailGetDomainBlockList.php
index 32d224a6..c23da967 100644
--- a/demo/testcase/test-mailGetDomainBlockList.php
+++ b/demo/testcase/test-mailGetDomainBlockList.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -17,13 +17,13 @@
 			"domain" => $_POST["domain"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -73,10 +73,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-mailGetDomainMailboxLimits.php b/demo/testcase/test-mailGetDomainMailboxLimits.php
index 562210d4..97434f1a 100644
--- a/demo/testcase/test-mailGetDomainMailboxLimits.php
+++ b/demo/testcase/test-mailGetDomainMailboxLimits.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -17,13 +17,13 @@
 			"domain" => $_POST["domain"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -73,10 +73,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-mailGetDomainMailboxes.php b/demo/testcase/test-mailGetDomainMailboxes.php
index 2cd3e2d2..b2db3266 100644
--- a/demo/testcase/test-mailGetDomainMailboxes.php
+++ b/demo/testcase/test-mailGetDomainMailboxes.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -18,13 +18,13 @@
             "limit" => $_POST["limit"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -77,10 +77,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-mailGetNumDomainMailboxes.php b/demo/testcase/test-mailGetNumDomainMailboxes.php
index daa92896..d0e645ca 100644
--- a/demo/testcase/test-mailGetNumDomainMailboxes.php
+++ b/demo/testcase/test-mailGetNumDomainMailboxes.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -17,13 +17,13 @@
 			"domain" => $_POST["domain"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -73,10 +73,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-mailSetDomainAdmin.php b/demo/testcase/test-mailSetDomainAdmin.php
index cf8128bd..4816417f 100644
--- a/demo/testcase/test-mailSetDomainAdmin.php
+++ b/demo/testcase/test-mailSetDomainAdmin.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -19,13 +19,13 @@
 			"state" => $_POST["state"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -49,7 +49,7 @@
 	<input type="hidden" name="function" value="mailSetDomainAdmin">
 
 <h4>Authentication</h4>
-  
+
 <div class="control-group">
     <label class="control-label">Admin Username </label>
     <div class="controls"><input type="text" name="admin_username" value=""></div>
@@ -85,6 +85,6 @@
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-mailSetDomainAllowList.php b/demo/testcase/test-mailSetDomainAllowList.php
index 6fe42986..33a2c9df 100644
--- a/demo/testcase/test-mailSetDomainAllowList.php
+++ b/demo/testcase/test-mailSetDomainAllowList.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -18,13 +18,13 @@
 			"list" => $_POST["list"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -76,10 +76,10 @@
 	</table>
         <input value="Set Domain Allow List" type="submit" />
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-mailSetDomainBlockList.php b/demo/testcase/test-mailSetDomainBlockList.php
index 029b0d63..171d1e95 100644
--- a/demo/testcase/test-mailSetDomainBlockList.php
+++ b/demo/testcase/test-mailSetDomainBlockList.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -18,13 +18,13 @@
 			"list" => $_POST["list"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -77,10 +77,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-mailSetDomainDisabledStatus.php b/demo/testcase/test-mailSetDomainDisabledStatus.php
index 47c9a8ad..bc36f5bb 100644
--- a/demo/testcase/test-mailSetDomainDisabledStatus.php
+++ b/demo/testcase/test-mailSetDomainDisabledStatus.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -18,13 +18,13 @@
 			"disabled" => $_POST["disabled"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -77,10 +77,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-mailSetDomainMailboxLimits.php b/demo/testcase/test-mailSetDomainMailboxLimits.php
index e507ec75..8915b419 100644
--- a/demo/testcase/test-mailSetDomainMailboxLimits.php
+++ b/demo/testcase/test-mailSetDomainMailboxLimits.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -22,13 +22,13 @@
 			"mailing_list" => $_POST["mailing_list"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -94,10 +94,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-nsAdvancedUpdt.php b/demo/testcase/test-nsAdvancedUpdt.php
index c3c0d610..bab65a22 100644
--- a/demo/testcase/test-nsAdvancedUpdt.php
+++ b/demo/testcase/test-nsAdvancedUpdt.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -19,13 +19,13 @@
 			"remove_ns" => $_POST["remove_ns"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -79,10 +79,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-nsCreate.php b/demo/testcase/test-nsCreate.php
index 8e1db928..8a01b1e3 100644
--- a/demo/testcase/test-nsCreate.php
+++ b/demo/testcase/test-nsCreate.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -18,13 +18,13 @@
 			"add_to_all_registry" => $_POST["add_to_all_registry"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -75,10 +75,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-nsDelete.php b/demo/testcase/test-nsDelete.php
index b2d9d1f8..aa79fe53 100644
--- a/demo/testcase/test-nsDelete.php
+++ b/demo/testcase/test-nsDelete.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -17,13 +17,13 @@
 			"ipaddress" => $_POST["ipaddress"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -71,10 +71,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-nsGet.php b/demo/testcase/test-nsGet.php
index f53470d6..deec242e 100644
--- a/demo/testcase/test-nsGet.php
+++ b/demo/testcase/test-nsGet.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -16,13 +16,13 @@
 			"name" => $_POST["name"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -67,10 +67,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-nsModify.php b/demo/testcase/test-nsModify.php
index a86876fa..b67f868a 100644
--- a/demo/testcase/test-nsModify.php
+++ b/demo/testcase/test-nsModify.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -18,13 +18,13 @@
 			"new_name" => $_POST["new_name"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -75,10 +75,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-nsRegistryAdd.php b/demo/testcase/test-nsRegistryAdd.php
index a4b5326f..6717f592 100644
--- a/demo/testcase/test-nsRegistryAdd.php
+++ b/demo/testcase/test-nsRegistryAdd.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -16,13 +16,13 @@
 			"all" => $_POST["all"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -67,10 +67,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-nsRegistryCheck.php b/demo/testcase/test-nsRegistryCheck.php
index 24500f1f..1164b012 100644
--- a/demo/testcase/test-nsRegistryCheck.php
+++ b/demo/testcase/test-nsRegistryCheck.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -15,13 +15,13 @@
 			"tld" => $_POST["tld"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -63,10 +63,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaAddRole.php b/demo/testcase/test-omaAddRole.php
index 30f2bccd..ea8206bc 100644
--- a/demo/testcase/test-omaAddRole.php
+++ b/demo/testcase/test-omaAddRole.php
@@ -1,7 +1,7 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
-	
+
 	// Put the data to the Formatted array
 	$callArray = array(
 		"user" => $_POST["user"],
@@ -12,14 +12,14 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = AddRole::call($callArray);
 
 	// Print out the results
 	echo (" In: ". json_encode($callArray) ."<br>");
 	echo ("Out: ". $response);
 
-} 
+}
 ?>
 
 <?php include("header.inc") ?>
@@ -46,14 +46,14 @@
 	</div>
 
 
-	
+
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaAuthenticate.php b/demo/testcase/test-omaAuthenticate.php
index c8134f0a..8423badd 100644
--- a/demo/testcase/test-omaAuthenticate.php
+++ b/demo/testcase/test-omaAuthenticate.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 
@@ -12,7 +12,7 @@
 	$callArray = array_filter($callArray);
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = Authenticate::call($callArray);
 
 	// Print out the results
@@ -20,7 +20,7 @@
 	echo ("Out: ". $response);
 
 } else {
-	
+
 ?>
 
 <?php include("header.inc") ?>
@@ -48,10 +48,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaChangeCompany.php b/demo/testcase/test-omaChangeCompany.php
index cf63cc5a..db73d9de 100644
--- a/demo/testcase/test-omaChangeCompany.php
+++ b/demo/testcase/test-omaChangeCompany.php
@@ -1,7 +1,7 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
-	
+
 	// Put the data to the Formatted array
 	$callArray = array(
 		"company" => $_POST["user"],
@@ -16,7 +16,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = ChangeCompany::call(array_filter_recursive($callArray));
 
 	// Print out the results
@@ -67,10 +67,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaChangeCompanyBulletin.php b/demo/testcase/test-omaChangeCompanyBulletin.php
index 7d746a89..cc89cede 100644
--- a/demo/testcase/test-omaChangeCompanyBulletin.php
+++ b/demo/testcase/test-omaChangeCompanyBulletin.php
@@ -1,7 +1,7 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
-	
+
 	// Put the data to the Formatted array
 	$callArray = array(
 		"company" => $_POST["company"],
@@ -12,9 +12,9 @@
 	if(!empty($_POST["token"])){
 		$callArray["token"] = $_POST["token"];
 	}
-	
+
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = ChangeCompanyBulletin::call($callArray);
 
 	// Print out the results
@@ -58,10 +58,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaChangeDomain.php b/demo/testcase/test-omaChangeDomain.php
index c09fcf8a..f40c01fd 100644
--- a/demo/testcase/test-omaChangeDomain.php
+++ b/demo/testcase/test-omaChangeDomain.php
@@ -1,7 +1,7 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
-	
+
 	// Put the data to the Formatted array
 	$callArray = array(
 		"domain" => $_POST["domain"],
@@ -17,9 +17,9 @@
 	if(!empty($_POST["token"])){
 		$callArray["token"] = $_POST["token"];
 	}
-	
+
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = ChangeDomain::call(array_filter_recursive($callArray));
 
 	// Print out the results
@@ -77,10 +77,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaChangeDomainBulletin.php b/demo/testcase/test-omaChangeDomainBulletin.php
index 1aa36f25..e5d88c89 100644
--- a/demo/testcase/test-omaChangeDomainBulletin.php
+++ b/demo/testcase/test-omaChangeDomainBulletin.php
@@ -1,7 +1,7 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
-	
+
 	// Put the data to the Formatted array
 	$callArray = array(
 		"domain" => $_POST["domain"],
@@ -12,9 +12,9 @@
 	if(!empty($_POST["token"])){
 		$callArray["token"] = $_POST["token"];
 	}
-	
+
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = ChangeDomainBulletin::call($callArray);
 
 	// Print out the results
@@ -58,10 +58,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaChangeUser.php b/demo/testcase/test-omaChangeUser.php
index ce9363be..ec47a66e 100644
--- a/demo/testcase/test-omaChangeUser.php
+++ b/demo/testcase/test-omaChangeUser.php
@@ -1,7 +1,7 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
-	
+
 	// Put the data to the Formatted array
 	$callArray = array(
 		"user" => $_POST["user"],
@@ -22,7 +22,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = ChangeUser::call(array_filter_recursive($callArray));
 
 	// Print out the results
@@ -85,10 +85,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaCreateWorkgroup.php b/demo/testcase/test-omaCreateWorkgroup.php
index 2f60afb4..0c7a76b0 100644
--- a/demo/testcase/test-omaCreateWorkgroup.php
+++ b/demo/testcase/test-omaCreateWorkgroup.php
@@ -1,9 +1,9 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
 	$callArray = array(
-		"workgroup" => $_POST["workgroup"], 
+		"workgroup" => $_POST["workgroup"],
 		"domain" => $_POST["domain"]
 	);
 
@@ -11,7 +11,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = CreateWorkgroup::call($callArray);
 
 	// Print out the results
@@ -46,10 +46,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaDeleteDomain.php b/demo/testcase/test-omaDeleteDomain.php
index 9b0e0b8c..1e42cddc 100644
--- a/demo/testcase/test-omaDeleteDomain.php
+++ b/demo/testcase/test-omaDeleteDomain.php
@@ -1,7 +1,7 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
-	
+
 	// Put the data to the Formatted array
 	$callArray = array(
 		"domain" => $_POST["domain"],
@@ -9,9 +9,9 @@
 	if(!empty($_POST["token"])){
 		$callArray["token"] = $_POST["token"];
 	}
-	
+
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = DeleteDomain::call($callArray);
 
 	// Print out the results
@@ -45,10 +45,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaDeleteUser.php b/demo/testcase/test-omaDeleteUser.php
index c47d9ece..f3d8829c 100644
--- a/demo/testcase/test-omaDeleteUser.php
+++ b/demo/testcase/test-omaDeleteUser.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 
@@ -10,7 +10,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = DeleteUser::call($callArray);
 
 	// Print out the results
@@ -42,10 +42,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaDeleteWorkgroup.php b/demo/testcase/test-omaDeleteWorkgroup.php
index 6400d3dc..1d039f4e 100644
--- a/demo/testcase/test-omaDeleteWorkgroup.php
+++ b/demo/testcase/test-omaDeleteWorkgroup.php
@@ -1,9 +1,9 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
 	$callArray = array(
-		"workgroup" => $_POST["workgroup"], 
+		"workgroup" => $_POST["workgroup"],
 		"domain" => $_POST["domain"]
 	);
 
@@ -11,7 +11,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = DeleteWorkgroup::call($callArray);
 
 	// Print out the results
@@ -46,10 +46,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaGenerateToken.php b/demo/testcase/test-omaGenerateToken.php
index 88701ad2..7f8e07b9 100644
--- a/demo/testcase/test-omaGenerateToken.php
+++ b/demo/testcase/test-omaGenerateToken.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -8,13 +8,13 @@
 		"attributes" => array(
 			"token" => $_POST["token"],
 			"duration" => $_POST["duration"],
-			"type" => $_POST["type"], //sso or session or oma 
-    		"oma" => $_POST["oma"] ? true : false		
+			"type" => $_POST["type"], //sso or session or oma
+    		"oma" => $_POST["oma"] ? true : false
     	)
 	);
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = GenerateToken::call($callArray);
 
 	// Print out the results
@@ -65,10 +65,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaGetCompany.php b/demo/testcase/test-omaGetCompany.php
index f588b862..29babb18 100644
--- a/demo/testcase/test-omaGetCompany.php
+++ b/demo/testcase/test-omaGetCompany.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -10,7 +10,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = GetCompany::call($callArray);
 
 	// Print out the results
@@ -42,10 +42,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaGetCompanyBulletin.php b/demo/testcase/test-omaGetCompanyBulletin.php
index 0f614f49..52415ca0 100644
--- a/demo/testcase/test-omaGetCompanyBulletin.php
+++ b/demo/testcase/test-omaGetCompanyBulletin.php
@@ -1,7 +1,7 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
-	
+
 	// Put the data to the Formatted array
 	$callArray = array(
 		"company" => $_POST["company"],
@@ -11,9 +11,9 @@
 	if(!empty($_POST["token"])){
 		$callArray["token"] = $_POST["token"];
 	}
-	
+
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = GetCompanyBulletin::call($callArray);
 
 	// Print out the results
@@ -53,10 +53,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaGetCompanyChanges.php b/demo/testcase/test-omaGetCompanyChanges.php
index f725f344..c717d513 100644
--- a/demo/testcase/test-omaGetCompanyChanges.php
+++ b/demo/testcase/test-omaGetCompanyChanges.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -14,7 +14,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = GetCompanyChanges::call(array_filter_recursive($callArray));
 
 	// Print out the results
@@ -56,10 +56,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaGetDeletedContacts.php b/demo/testcase/test-omaGetDeletedContacts.php
index ed3561d8..2fe5b944 100644
--- a/demo/testcase/test-omaGetDeletedContacts.php
+++ b/demo/testcase/test-omaGetDeletedContacts.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -10,7 +10,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = GetDeletedContacts::call($callArray);
 
 	// Print out the results
@@ -42,10 +42,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaGetDeletedMessages.php b/demo/testcase/test-omaGetDeletedMessages.php
index 0c642865..1c0b269c 100644
--- a/demo/testcase/test-omaGetDeletedMessages.php
+++ b/demo/testcase/test-omaGetDeletedMessages.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 
@@ -15,12 +15,12 @@
 	if(!empty($_POST["poll"])){
 		$callArray["attributes"]["poll"] = $_POST["poll"];
 	}
-	
+
 	if(!empty($_POST["token"])){
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = GetDeletedMessages::call(array_filter_recursive($callArray));
 
 	// Print out the results
@@ -70,10 +70,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaGetDomain.php b/demo/testcase/test-omaGetDomain.php
index 5e5e8319..8235425b 100644
--- a/demo/testcase/test-omaGetDomain.php
+++ b/demo/testcase/test-omaGetDomain.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -8,9 +8,9 @@
 	if(!empty($_POST["token"])){
 		$callArray["token"] = $_POST["token"];
 	}
-	
+
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = GetDomain::call($callArray);
 
 	// Print out the results
@@ -42,10 +42,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaGetDomainBulletin.php b/demo/testcase/test-omaGetDomainBulletin.php
index 67045079..7b2a4da5 100644
--- a/demo/testcase/test-omaGetDomainBulletin.php
+++ b/demo/testcase/test-omaGetDomainBulletin.php
@@ -1,7 +1,7 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
-	
+
 	// Put the data to the Formatted array
 	$callArray = array(
 		"domain" => $_POST["domain"],
@@ -11,9 +11,9 @@
 	if(!empty($_POST["token"])){
 		$callArray["token"] = $_POST["token"];
 	}
-	
+
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = GetDomainBulletin::call($callArray);
 
 	// Print out the results
@@ -53,10 +53,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaGetDomainChanges.php b/demo/testcase/test-omaGetDomainChanges.php
index 23c2dac5..5c6b3bd4 100644
--- a/demo/testcase/test-omaGetDomainChanges.php
+++ b/demo/testcase/test-omaGetDomainChanges.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -14,7 +14,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = GetDomainChanges::call(array_filter_recursive($callArray));
 
 	// Print out the results
@@ -56,10 +56,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaGetUser.php b/demo/testcase/test-omaGetUser.php
index f86ee7d2..ad561359 100644
--- a/demo/testcase/test-omaGetUser.php
+++ b/demo/testcase/test-omaGetUser.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -10,7 +10,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = GetUser::call($callArray);
 
 	// Print out the results
@@ -42,10 +42,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaGetUserAttributeHistory.php b/demo/testcase/test-omaGetUserAttributeHistory.php
index 8c14d664..166aea6f 100644
--- a/demo/testcase/test-omaGetUserAttributeHistory.php
+++ b/demo/testcase/test-omaGetUserAttributeHistory.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -10,7 +10,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = GetUserAttributeHistory::call($callArray);
 
 	// Print out the results
@@ -47,10 +47,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaGetUserChanges.php b/demo/testcase/test-omaGetUserChanges.php
index 7a3cbc49..e99e69d8 100644
--- a/demo/testcase/test-omaGetUserChanges.php
+++ b/demo/testcase/test-omaGetUserChanges.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -14,7 +14,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = GetUserChanges::call(array_filter_recursive($callArray));
 
 	// Print out the results
@@ -56,10 +56,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaGetUserFolders.php b/demo/testcase/test-omaGetUserFolders.php
index cd6345b3..cbe2ff7a 100644
--- a/demo/testcase/test-omaGetUserFolders.php
+++ b/demo/testcase/test-omaGetUserFolders.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -10,7 +10,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = GetUserFolders::call($callArray);
 
 	// Print out the results
@@ -42,10 +42,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaGetUserMessages.php b/demo/testcase/test-omaGetUserMessages.php
index c19c1d23..67b163fa 100644
--- a/demo/testcase/test-omaGetUserMessages.php
+++ b/demo/testcase/test-omaGetUserMessages.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -10,7 +10,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = GetUserMessages::call($callArray);
 
 	// Print out the results
@@ -47,10 +47,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaLogoutUser.php b/demo/testcase/test-omaLogoutUser.php
index d67ddf49..488632cf 100644
--- a/demo/testcase/test-omaLogoutUser.php
+++ b/demo/testcase/test-omaLogoutUser.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -10,7 +10,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = LogoutUser::call($callArray);
 
 	// Print out the results
@@ -42,10 +42,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaMigrationAdd.php b/demo/testcase/test-omaMigrationAdd.php
index d364d5e4..2536d5d9 100644
--- a/demo/testcase/test-omaMigrationAdd.php
+++ b/demo/testcase/test-omaMigrationAdd.php
@@ -1,7 +1,7 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
-	
+
 
 	// Put the data to the Formatted array
 	$callArray = array(
@@ -33,9 +33,9 @@
 	}
 	$callArray["users"] = array_filter($callArray["users"]);
 	$callArray = array_filter($callArray);
-	
+
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = MigrationAdd::call($callArray);
 
 	// Print out the results
@@ -97,10 +97,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaMigrationJobs.php b/demo/testcase/test-omaMigrationJobs.php
index ccc9ca43..527ad735 100644
--- a/demo/testcase/test-omaMigrationJobs.php
+++ b/demo/testcase/test-omaMigrationJobs.php
@@ -1,7 +1,7 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
-	
+
 	// Put the data to the Formatted array
 	$callArray = array(
 		"user" => $_POST["user"]
@@ -12,13 +12,13 @@
 	}
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = MigrationJobs::call($callArray);
 
 	// Print out the results
 	echo (" In: ". json_encode($callArray) ."<br>");
 	echo ("Out: ". $response);
-        
+
 
 } else {
 	// Format
@@ -46,10 +46,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaMigrationStatus.php b/demo/testcase/test-omaMigrationStatus.php
index 8e2179d4..3aa22aa8 100644
--- a/demo/testcase/test-omaMigrationStatus.php
+++ b/demo/testcase/test-omaMigrationStatus.php
@@ -1,7 +1,7 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
-	
+
 	// Put the data to the Formatted array
 	$callArray = array(
 		"job" => $_POST["job"],
@@ -14,7 +14,7 @@
 	$callArray = array_filter($callArray);
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = MigrationStatus::call($callArray);
 
 	// Print out the results
@@ -52,10 +52,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaMigrationTrace.php b/demo/testcase/test-omaMigrationTrace.php
index 3fa270bb..f832985d 100644
--- a/demo/testcase/test-omaMigrationTrace.php
+++ b/demo/testcase/test-omaMigrationTrace.php
@@ -1,7 +1,7 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
-	
+
 	// Put the data to the Formatted array
 	$callArray = array(
 		"job" => $_POST["job"],
@@ -14,7 +14,7 @@
 	$callArray = array_filter($callArray);
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = MigrationTrace::call($callArray);
 
 	// Print out the results
@@ -46,10 +46,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaMoveUserMessages.php b/demo/testcase/test-omaMoveUserMessages.php
index 487f5b09..dfd26aa8 100644
--- a/demo/testcase/test-omaMoveUserMessages.php
+++ b/demo/testcase/test-omaMoveUserMessages.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -15,7 +15,7 @@
 	$callArray = array_filter($callArray);
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = MoveUserMessages::call($callArray);
 
 	// Print out the results
@@ -57,10 +57,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaPostCompanyBulletin.php b/demo/testcase/test-omaPostCompanyBulletin.php
index 680bd484..38cb5a90 100644
--- a/demo/testcase/test-omaPostCompanyBulletin.php
+++ b/demo/testcase/test-omaPostCompanyBulletin.php
@@ -1,7 +1,7 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
-	
+
 	// Put the data to the Formatted array
 	$callArray = array(
 		"company" => $_POST["company"],
@@ -12,9 +12,9 @@
 	if(!empty($_POST["token"])){
 		$callArray["token"] = $_POST["token"];
 	}
-	
+
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = PostCompanyBulletin::call(array_filter_recursive($callArray));
 
 	// Print out the results
@@ -60,10 +60,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaPostDomainBulletin.php b/demo/testcase/test-omaPostDomainBulletin.php
index 3cc0d226..c625f1dd 100644
--- a/demo/testcase/test-omaPostDomainBulletin.php
+++ b/demo/testcase/test-omaPostDomainBulletin.php
@@ -1,7 +1,7 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
-	
+
 	// Put the data to the Formatted array
 	$callArray = array(
 		"domain" => $_POST["domain"],
@@ -12,9 +12,9 @@
 	if(!empty($_POST["token"])){
 		$callArray["token"] = $_POST["token"];
 	}
-	
+
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = PostDomainBulletin::call(array_filter_recursive($callArray));
 
 	// Print out the results
@@ -59,10 +59,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaReindex.php b/demo/testcase/test-omaReindex.php
index 878349f1..0a64ac42 100644
--- a/demo/testcase/test-omaReindex.php
+++ b/demo/testcase/test-omaReindex.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -12,7 +12,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = Reindex::call($callArray);
 
 	// Print out the results
@@ -52,10 +52,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaRenameUser.php b/demo/testcase/test-omaRenameUser.php
index a1cb1078..07e1f630 100644
--- a/demo/testcase/test-omaRenameUser.php
+++ b/demo/testcase/test-omaRenameUser.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -11,7 +11,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = RenameUser::call($callArray);
 
 	// Print out the results
@@ -47,10 +47,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaRestoreDeletedContacts.php b/demo/testcase/test-omaRestoreDeletedContacts.php
index 4e0acfd9..c29c5783 100644
--- a/demo/testcase/test-omaRestoreDeletedContacts.php
+++ b/demo/testcase/test-omaRestoreDeletedContacts.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -11,7 +11,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = RestoreDeletedContacts::call($callArray);
 
 	// Print out the results
@@ -47,10 +47,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaRestoreDeletedMessages.php b/demo/testcase/test-omaRestoreDeletedMessages.php
index 732766a9..968a046f 100644
--- a/demo/testcase/test-omaRestoreDeletedMessages.php
+++ b/demo/testcase/test-omaRestoreDeletedMessages.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -11,7 +11,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = RestoreDeletedMessages::call($callArray);
 
 	// Print out the results
@@ -47,10 +47,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaRestoreDomain.php b/demo/testcase/test-omaRestoreDomain.php
index 2711fb2d..34c0699d 100644
--- a/demo/testcase/test-omaRestoreDomain.php
+++ b/demo/testcase/test-omaRestoreDomain.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -12,7 +12,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = RestoreDomain::call($callArray);
 
 	// Print out the results
@@ -52,10 +52,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
\ No newline at end of file
diff --git a/demo/testcase/test-omaRestoreUser.php b/demo/testcase/test-omaRestoreUser.php
index 0456c5c9..8d8b7df2 100644
--- a/demo/testcase/test-omaRestoreUser.php
+++ b/demo/testcase/test-omaRestoreUser.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -12,7 +12,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = RestoreUser::call($callArray);
 
 	// Print out the results
@@ -52,10 +52,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaSearchAdmins.php b/demo/testcase/test-omaSearchAdmins.php
index f2157486..86b9028c 100644
--- a/demo/testcase/test-omaSearchAdmins.php
+++ b/demo/testcase/test-omaSearchAdmins.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -7,7 +7,7 @@
 			"company" => $_POST["company"],
 			"type" => explode(",", $_POST["type"]),
 			"match" => $_POST["match"],
-		), 
+		),
 		"range" => array(
 			"first" => $_POST["first"],
 			"limit" => $_POST["limit"]
@@ -22,7 +22,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = SearchAdmins::call(array_filter_recursive($callArray));
 
 	// Print out the results
@@ -81,10 +81,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaSearchBrands.php b/demo/testcase/test-omaSearchBrands.php
index 33d23d11..32e04595 100644
--- a/demo/testcase/test-omaSearchBrands.php
+++ b/demo/testcase/test-omaSearchBrands.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -7,7 +7,7 @@
 			"company" => $_POST["company"],
 			"match" => $_POST["match"],
 			"deleted" => $_POST["deleted"] ? true : false,
-		), 
+		),
 		"range" => array(
 			"first" => $_POST["first"],
 			"limit" => $_POST["limit"]
@@ -22,7 +22,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = SearchBrands::call(array_filter_recursive($callArray));
 
 	// Print out the results
@@ -88,10 +88,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaSearchDomains.php b/demo/testcase/test-omaSearchDomains.php
index 046b7012..7c433892 100644
--- a/demo/testcase/test-omaSearchDomains.php
+++ b/demo/testcase/test-omaSearchDomains.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -6,7 +6,7 @@
 		"criteria" => array(
 			"company" => $_POST["company"],
 			"match" => $_POST["match"]
-		), 
+		),
 		"range" => array(
 			"first" => $_POST["first"],
 			"limit" => $_POST["limit"]
@@ -28,7 +28,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = SearchDomains::call(array_filter_recursive($callArray));
 
 	// Print out the results
@@ -94,10 +94,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaSearchUsers.php b/demo/testcase/test-omaSearchUsers.php
index 5db3ab09..b06bdc97 100644
--- a/demo/testcase/test-omaSearchUsers.php
+++ b/demo/testcase/test-omaSearchUsers.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -8,7 +8,7 @@
 			"workgroup" =>  $_POST["workgroup"],
 			"match" => $_POST["match"],
 			"deleted" => $_POST["deleted"] ? true : false,
-		), 
+		),
 		"range" => array(
 			"first" => $_POST["first"],
 			"limit" => $_POST["limit"]
@@ -27,7 +27,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = SearchUsers::call(array_filter_recursive($callArray));
 
 	// Print out the results
@@ -97,10 +97,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaSearchWorkgroups.php b/demo/testcase/test-omaSearchWorkgroups.php
index 15555b76..9db3b04c 100644
--- a/demo/testcase/test-omaSearchWorkgroups.php
+++ b/demo/testcase/test-omaSearchWorkgroups.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -6,7 +6,7 @@
 		"criteria" => array(
 			"domain" => $_POST["domain"],
 			"match" => $_POST["match"],
-		), 
+		),
 		"range" => array(
 			"first" => $_POST["first"],
 			"limit" => $_POST["limit"]
@@ -21,7 +21,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = SearchWorkgroups::call(array_filter_recursive($callArray));
 
 	// Print out the results
@@ -79,10 +79,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaSetRole.php b/demo/testcase/test-omaSetRole.php
index 6676e2ef..86274e87 100644
--- a/demo/testcase/test-omaSetRole.php
+++ b/demo/testcase/test-omaSetRole.php
@@ -1,9 +1,9 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
 	$callArray = array(
-		"user" => $_POST["user"], 
+		"user" => $_POST["user"],
 		"role" => $_POST["role"],
 		"object" => $_POST["object"]
 	);
@@ -12,7 +12,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = SetRole::call($callArray);
 
 	// Print out the results
@@ -51,10 +51,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaStatsList.php b/demo/testcase/test-omaStatsList.php
index 2bafca6c..1172f671 100644
--- a/demo/testcase/test-omaStatsList.php
+++ b/demo/testcase/test-omaStatsList.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -7,7 +7,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = StatsList::call($callArray);
 
 	// Print out the results
@@ -33,10 +33,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-omaStatsSnapshot.php b/demo/testcase/test-omaStatsSnapshot.php
index 0c9c1010..70fb730c 100644
--- a/demo/testcase/test-omaStatsSnapshot.php
+++ b/demo/testcase/test-omaStatsSnapshot.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST'){
 	// Put the data to the Formatted array
@@ -12,7 +12,7 @@
 		$callArray["token"] = $_POST["token"];
 	}
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../../opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$response = StatsSnapshot::call($callArray);
 
 	// Print out the results
@@ -51,10 +51,10 @@
 	<input class="btn" value="Submit" type="submit">
 </form>
 </div>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-persDelete.php b/demo/testcase/test-persDelete.php
index bda370a4..adbccea6 100644
--- a/demo/testcase/test-persDelete.php
+++ b/demo/testcase/test-persDelete.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -14,13 +14,13 @@
 			"domain" => $_POST["domain"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -59,10 +59,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-persNameSuggest.php b/demo/testcase/test-persNameSuggest.php
index 48882994..10dba1c6 100644
--- a/demo/testcase/test-persNameSuggest.php
+++ b/demo/testcase/test-persNameSuggest.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -14,13 +14,13 @@
 			"searchstring" => $_POST["searchstring"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -59,10 +59,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-persQuery.php b/demo/testcase/test-persQuery.php
index 28b5228a..95175f0c 100644
--- a/demo/testcase/test-persQuery.php
+++ b/demo/testcase/test-persQuery.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -16,13 +16,13 @@
 			"query_email" => $_POST["query_email"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -67,10 +67,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-persSUregister.php b/demo/testcase/test-persSUregister.php
index 29dae72d..4c4e3824 100644
--- a/demo/testcase/test-persSUregister.php
+++ b/demo/testcase/test-persSUregister.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -20,13 +20,13 @@
 			"type" => $_POST["type"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -81,10 +81,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-persUpdate.php b/demo/testcase/test-persUpdate.php
index f17424cb..7e1b2be6 100644
--- a/demo/testcase/test-persUpdate.php
+++ b/demo/testcase/test-persUpdate.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -21,13 +21,13 @@
 			"content" => $_POST["content"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -87,10 +87,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-premiumDomain.php b/demo/testcase/test-premiumDomain.php
index 5ac36004..b5423493 100644
--- a/demo/testcase/test-premiumDomain.php
+++ b/demo/testcase/test-premiumDomain.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 
@@ -38,7 +38,7 @@
 
 
 // Open SRS Call -> Result
-require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 $osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 
@@ -109,12 +109,12 @@
 </form>
 
 
-	
+
 </body>
 </html>
 
 
 
-<?php 
+<?php
 }
-?> 
\ No newline at end of file
+?>
\ No newline at end of file
diff --git a/demo/testcase/test-provActivate.php b/demo/testcase/test-provActivate.php
index 4f270653..8861a14c 100644
--- a/demo/testcase/test-provActivate.php
+++ b/demo/testcase/test-provActivate.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -16,13 +16,13 @@
 			"domainname" => $_POST["domainname"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -67,10 +67,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-provCancelPending.php b/demo/testcase/test-provCancelPending.php
index 59c6e3dc..65331f95 100644
--- a/demo/testcase/test-provCancelPending.php
+++ b/demo/testcase/test-provCancelPending.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -15,13 +15,13 @@
 			"status" => $_POST["status"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -63,10 +63,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-provProcessPending.php b/demo/testcase/test-provProcessPending.php
index cc6e4b49..ec28715b 100644
--- a/demo/testcase/test-provProcessPending.php
+++ b/demo/testcase/test-provProcessPending.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -17,13 +17,13 @@
 			"owner_address" => $_POST["owner_address"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -71,10 +71,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-provQueryQueuedRequest.php b/demo/testcase/test-provQueryQueuedRequest.php
index 9bdd8c0e..423c8210 100644
--- a/demo/testcase/test-provQueryQueuedRequest.php
+++ b/demo/testcase/test-provQueryQueuedRequest.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -14,13 +14,13 @@
 			"request_id" => $_POST["request_id"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -59,10 +59,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-provRenew.php b/demo/testcase/test-provRenew.php
index e291c28d..e87ae8d1 100644
--- a/demo/testcase/test-provRenew.php
+++ b/demo/testcase/test-provRenew.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -20,13 +20,13 @@
 			"affiliate_id" => $_POST["affiliate_id"],
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -83,10 +83,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-provRevoke.php b/demo/testcase/test-provRevoke.php
index 24077f8d..2fb6d3a7 100644
--- a/demo/testcase/test-provRevoke.php
+++ b/demo/testcase/test-provRevoke.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -16,13 +16,13 @@
 			"notes" => $_POST["notes"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -67,10 +67,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-provSWregister.php b/demo/testcase/test-provSWregister.php
index fe4f849b..45d0a50a 100644
--- a/demo/testcase/test-provSWregister.php
+++ b/demo/testcase/test-provSWregister.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 
@@ -55,16 +55,16 @@
         "eligibility_id" => $_POST['eligibility_id'],
         "eligibility_id_type" => $_POST['eligibility_id_type'],
         "eligibility_name" => $_POST['eligibility_name'],
-          
+
 	),
-	
+
 	"professional_data" => array (
         "authority" => $_POST['authority'],
         "authority_website" => $_POST['authority_website'],
         "license_number" => $_POST['license_number'],
         "profession" => $_POST['profession'],
 	),
-	
+
 	"br_registrant_info" => array(
 		"br_register_number" => $_POST['br_register_number']
 	),
@@ -123,7 +123,7 @@
 
 
 // Open SRS Call -> Result
-require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 $osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 
@@ -186,7 +186,7 @@
 	<tr>
 		<td>
 			<b>Required at all time</b><br>
-			
+
 			<?php echo("domain: <input type=\"text\" name=\"domain\" value=\"phptest" . time() . ".com\"><br>"); ?>
 			period: <input type="text" name="period" value="1">year(s)<br>
 			reg_username: <input type="text" name="reg_username" value="phptest"><br>
@@ -234,7 +234,7 @@
 			&nbsp; &nbsp;locality_city: <input type="text" name="locality_city" value=""> - Optional<br>
 			&nbsp; &nbsp;locality_country: <input type="text" name="locality_country" value=""><br>
 			&nbsp; &nbsp;locality_state_prov: <input type="text" name="locality_state_prov" value=""> - Optional<br>
-			
+
 		</td>
 	</tr>
 	<tr>
@@ -244,7 +244,7 @@
 			&nbsp; &nbsp; &nbsp; &nbsp;&nbsp;&nbsp;.BE | .EU | lang: <input type="text" name="lang" value="en"><br>
 			.DE | .BE | .EU | owner_confirm_address: <input type="text" name="owner_confirm_address" value=""><br>
 		</td>
-	</tr>	
+	</tr>
 	<tr>
 		<td>
 			<b>.CA</b><br />
@@ -275,8 +275,8 @@
 			registrant_id_type: <input type="text" name="registrant_id_type" value="ABN"><br>
 			registrant_id: <input type="text" name="registrant_id" value="99 999 999 999"> - Required if registrant_id_type = ACN or ABN<br>
 			eligibility_type: <input type="text" name="eligibility_type" value="Registered Business"><br>
-    		eligibility_id: <input type="text" name="eligibility_id" value="99999999"> - Required for .COM.AU and .NET.AU<br> 
-			eligibility_id_type: <input type="text" name="eligibility_id_type" value="ACN"> - Required for .COM.AU and .NET.AU<br> 
+    		eligibility_id: <input type="text" name="eligibility_id" value="99999999"> - Required for .COM.AU and .NET.AU<br>
+			eligibility_id_type: <input type="text" name="eligibility_id_type" value="ACN"> - Required for .COM.AU and .NET.AU<br>
 			eligibility_name: <input type="text" name="eligibility_name" value="Don Marshall CTO"> - Optional<br>
 		</td>
 	</tr>
@@ -322,12 +322,12 @@
 </form>
 
 
-	
+
 </body>
 </html>
 
 
 
-<?php 
+<?php
 }
-?> 
+?>
diff --git a/demo/testcase/test-provSendCIRAapproval.php b/demo/testcase/test-provSendCIRAapproval.php
index cc6e20ec..02faef15 100644
--- a/demo/testcase/test-provSendCIRAapproval.php
+++ b/demo/testcase/test-provSendCIRAapproval.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -14,13 +14,13 @@
 			"domain" => $_POST["domain"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -59,10 +59,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-provUpdateContacts.php b/demo/testcase/test-provUpdateContacts.php
index 3e7c3021..aac0c764 100644
--- a/demo/testcase/test-provUpdateContacts.php
+++ b/demo/testcase/test-provUpdateContacts.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 
@@ -45,7 +45,7 @@
 
 
 // Open SRS Call -> Result
-require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 $osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 
@@ -119,12 +119,12 @@
 </form>
 
 
-	
+
 </body>
 </html>
 
 
 
-<?php 
+<?php
 }
-?> 
\ No newline at end of file
+?>
\ No newline at end of file
diff --git a/demo/testcase/test-pubCreate.php b/demo/testcase/test-pubCreate.php
index 3f888612..d97e164e 100644
--- a/demo/testcase/test-pubCreate.php
+++ b/demo/testcase/test-pubCreate.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	// ONLY FOR TESTING PURPOSE!!!
@@ -18,13 +18,13 @@
 			"source_domain" => $_POST["source_domain"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -72,10 +72,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-pubDelete.php b/demo/testcase/test-pubDelete.php
index 187b33b1..008494e0 100644
--- a/demo/testcase/test-pubDelete.php
+++ b/demo/testcase/test-pubDelete.php
@@ -1,7 +1,7 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
-	
+
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
 
 	// Form data capture
@@ -16,13 +16,13 @@
 			"service_type" => $_POST["service_type"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -64,10 +64,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-pubDisable.php b/demo/testcase/test-pubDisable.php
index cb080e38..c20b9f89 100644
--- a/demo/testcase/test-pubDisable.php
+++ b/demo/testcase/test-pubDisable.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 
@@ -16,13 +16,13 @@
 			"service_type" => $_POST["service_type"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -64,10 +64,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-pubEnable.php b/demo/testcase/test-pubEnable.php
index 9b8d6ff2..1a636b05 100644
--- a/demo/testcase/test-pubEnable.php
+++ b/demo/testcase/test-pubEnable.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 
@@ -16,13 +16,13 @@
 			"service_type" => $_POST["service_type"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -64,10 +64,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-pubGenerateRedirectionCode.php b/demo/testcase/test-pubGenerateRedirectionCode.php
index 595dfc20..fe4f87d5 100644
--- a/demo/testcase/test-pubGenerateRedirectionCode.php
+++ b/demo/testcase/test-pubGenerateRedirectionCode.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -16,13 +16,13 @@
 			"programming_language" => $_POST["programming_language"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -67,10 +67,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-pubGetControlPanelUrl.php b/demo/testcase/test-pubGetControlPanelUrl.php
index 8fe8d323..90a246d3 100644
--- a/demo/testcase/test-pubGetControlPanelUrl.php
+++ b/demo/testcase/test-pubGetControlPanelUrl.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -15,13 +15,13 @@
 			"service_type" => $_POST["service_type"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -63,10 +63,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-pubGetServiceInfo.php b/demo/testcase/test-pubGetServiceInfo.php
index d39b48d3..5f8cce8c 100644
--- a/demo/testcase/test-pubGetServiceInfo.php
+++ b/demo/testcase/test-pubGetServiceInfo.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -15,13 +15,13 @@
 			"service_type" => $_POST["service_type"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -63,10 +63,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-pubLetExpire.php b/demo/testcase/test-pubLetExpire.php
index 04bcef6c..15226987 100644
--- a/demo/testcase/test-pubLetExpire.php
+++ b/demo/testcase/test-pubLetExpire.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -15,13 +15,13 @@
 			"service_type" => $_POST["service_type"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -63,10 +63,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-pubUpdate.php b/demo/testcase/test-pubUpdate.php
index e6c4a780..9df2a79b 100644
--- a/demo/testcase/test-pubUpdate.php
+++ b/demo/testcase/test-pubUpdate.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -17,13 +17,13 @@
 			"source_domain" => $_POST["source_domain"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -71,10 +71,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-quickLookUp.php b/demo/testcase/test-quickLookUp.php
index d7c62c3a..1adb700c 100644
--- a/demo/testcase/test-quickLookUp.php
+++ b/demo/testcase/test-quickLookUp.php
@@ -36,7 +36,7 @@
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 
@@ -60,9 +60,9 @@
 <form action="" method="post" class="form-horizontal">
 	<input type="hidden" name="format" value="<?php echo($tf); ?>">
 	<input type="hidden" name="function" value="fastDomainLookup">
-	
+
 	<div class="row">
-		<div class="span12">	
+		<div class="span12">
 			<div class="control-group">
 	    		<label class="control-label">Fast Lookup Domain </label>
 	    		<div class="controls"><input type="text" name="domain" value=""></div>
@@ -71,8 +71,8 @@
 	</div>
 
 	<div class="row">
-		<div class="span4">	
-			<div class="control-group">	
+		<div class="span4">
+			<div class="control-group">
 				<div class="controls"><label class="checkbox">.com<input type="checkbox" name="tld[]" value=".com"></label></div>
 				<div class="controls"><label class="checkbox">.net<input type="checkbox" name="tld[]" value=".net"></label></div>
 	    		<div class="controls"><label class="checkbox">.org<input type="checkbox" name="tld[]" value=".org"></label></div>
@@ -81,8 +81,8 @@
 	    		<div class="controls"><label class="checkbox">.me<input type="checkbox" name="tld[]" value=".me"></label></div>
 			</div>
 		</div>
-		<div class="span4">	
-			<div class="control-group">	
+		<div class="span4">
+			<div class="control-group">
 				<div class="controls"><label class="checkbox">.asia<input type="checkbox" name="tld[]" value=".asia"></label></div>
 	    		<div class="controls"><label class="checkbox">..org.uk<input type="checkbox" name="tld[]" value=".org.uk"></label></div>
 	    		<div class="controls"><label class="checkbox">.tel<input type="checkbox" name="tld[]" value=".tel"></label></div>
diff --git a/demo/testcase/test-sendCiraEmailPwd.php b/demo/testcase/test-sendCiraEmailPwd.php
index 3a7a8bfe..248166e0 100644
--- a/demo/testcase/test-sendCiraEmailPwd.php
+++ b/demo/testcase/test-sendCiraEmailPwd.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -20,7 +20,7 @@
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -59,10 +59,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-subresActing.php b/demo/testcase/test-subresActing.php
index 222499e6..327b6dcf 100644
--- a/demo/testcase/test-subresActing.php
+++ b/demo/testcase/test-subresActing.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 
@@ -67,7 +67,7 @@
 
 
 // Open SRS Call -> Result
-require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 $osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 
@@ -136,7 +136,7 @@
 			affiliate_id: <input type="text" name="affiliate_id" value="">Recorded on renewal order Leave blank for no affiliate<br>
 			auto_renew: <input type="text" name="auto_renew" value="0"><br>
 			domain: <input type="text" name="domain" value="tucowstest1000120xx.com"><br>
-			
+
 			f_parkp: <input type="text" name="f_parkp" value="Y"><br>
 			f_whois_privacy: <input type="text" name="f_whois_privacy" value="1"><br>
 			f_lock_domain: <input type="text" name="f_lock_domain" value="1"><br>
@@ -162,12 +162,12 @@
 </form>
 
 
-	
+
 </body>
 </html>
 
 
 
-<?php 
+<?php
 }
-?> 
\ No newline at end of file
+?>
\ No newline at end of file
diff --git a/demo/testcase/test-subresCreate.php b/demo/testcase/test-subresCreate.php
index 64d5999a..098f2dab 100644
--- a/demo/testcase/test-subresCreate.php
+++ b/demo/testcase/test-subresCreate.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -47,7 +47,7 @@
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -97,7 +97,7 @@
 				url: <input type="text" name="url" value="http://www.tucows.com"><br>
 				lang_pref: <input type="text" name="lang_pref" value="EN">
 			</td>
-		</tr>		
+		</tr>
 		<tr>
 			<td>
 				<b>Domain info</b><br>
@@ -118,10 +118,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-subresGet.php b/demo/testcase/test-subresGet.php
index ab43b438..08e1c528 100644
--- a/demo/testcase/test-subresGet.php
+++ b/demo/testcase/test-subresGet.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -14,13 +14,13 @@
 			"username" => $_POST["username"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -59,10 +59,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-subresModify.php b/demo/testcase/test-subresModify.php
index 4ea04999..45782b6f 100644
--- a/demo/testcase/test-subresModify.php
+++ b/demo/testcase/test-subresModify.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -48,7 +48,7 @@
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -98,7 +98,7 @@
 				url: <input type="text" name="url" value="http://www.tucows.com"><br>
 				lang_pref: <input type="text" name="lang_pref" value="EN">
 			</td>
-		</tr>		
+		</tr>
 		<tr>
 			<td>
 				<b>Domain info</b><br>
@@ -120,10 +120,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-subresPay.php b/demo/testcase/test-subresPay.php
index 7723e3e7..6b68e275 100644
--- a/demo/testcase/test-subresPay.php
+++ b/demo/testcase/test-subresPay.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -15,13 +15,13 @@
 			"username" => $_POST["username"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -63,10 +63,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-subuserAdd.php b/demo/testcase/test-subuserAdd.php
index 38e80c59..aefd7687 100644
--- a/demo/testcase/test-subuserAdd.php
+++ b/demo/testcase/test-subuserAdd.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -19,13 +19,13 @@
 			"sub_password" => $_POST["sub_password"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -79,10 +79,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-subuserDelete.php b/demo/testcase/test-subuserDelete.php
index c070de7e..d80c99c3 100644
--- a/demo/testcase/test-subuserDelete.php
+++ b/demo/testcase/test-subuserDelete.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -17,13 +17,13 @@
 			"sub_id" => $_POST["sub_id"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -71,10 +71,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-subuserGet.php b/demo/testcase/test-subuserGet.php
index 4273ce9f..65a30ea9 100644
--- a/demo/testcase/test-subuserGet.php
+++ b/demo/testcase/test-subuserGet.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -16,13 +16,13 @@
 			"username" => $_POST["username"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -67,10 +67,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-subuserGetInfo.php b/demo/testcase/test-subuserGetInfo.php
index 1fd840bc..f2222d2d 100644
--- a/demo/testcase/test-subuserGetInfo.php
+++ b/demo/testcase/test-subuserGetInfo.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -15,13 +15,13 @@
 			"bypass" => $_POST["bypass"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -63,10 +63,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-subuserModify.php b/demo/testcase/test-subuserModify.php
index 440434c9..17ec91f0 100644
--- a/demo/testcase/test-subuserModify.php
+++ b/demo/testcase/test-subuserModify.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -20,13 +20,13 @@
 			"sub_id" => $_POST["sub_id"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -83,10 +83,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-suggestDomain.php b/demo/testcase/test-suggestDomain.php
index 7a7807e1..73d83efe 100644
--- a/demo/testcase/test-suggestDomain.php
+++ b/demo/testcase/test-suggestDomain.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 
@@ -36,7 +36,7 @@
 
 
 // Open SRS Call -> Result
-require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 $osrsHandler = processOpenSRS($formFormat, $callstring);
 
 // Print out the results
@@ -106,12 +106,12 @@
 </form>
 
 
-	
+
 </body>
 </html>
 
 
 
-<?php 
+<?php
 }
-?> 
\ No newline at end of file
+?>
\ No newline at end of file
diff --git a/demo/testcase/test-transCancel.php b/demo/testcase/test-transCancel.php
index ac6f7a3d..9df50ae2 100644
--- a/demo/testcase/test-transCancel.php
+++ b/demo/testcase/test-transCancel.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -16,13 +16,13 @@
 			"order_id" => $_POST["order_id"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -67,10 +67,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-transCheck.php b/demo/testcase/test-transCheck.php
index ed59240a..c2c391b2 100644
--- a/demo/testcase/test-transCheck.php
+++ b/demo/testcase/test-transCheck.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -16,13 +16,13 @@
 			"get_request_address" => $_POST["get_request_address"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -67,10 +67,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-transGetAway.php b/demo/testcase/test-transGetAway.php
index c728c71a..469aa7b9 100644
--- a/demo/testcase/test-transGetAway.php
+++ b/demo/testcase/test-transGetAway.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -27,13 +27,13 @@
 			"request_address" => $_POST["request_address"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -111,10 +111,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-transGetIn.php b/demo/testcase/test-transGetIn.php
index dc96b5a7..eb6dcca9 100644
--- a/demo/testcase/test-transGetIn.php
+++ b/demo/testcase/test-transGetIn.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -33,13 +33,13 @@
 			"losing_registrar" => $_POST["losing_registrar"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -135,10 +135,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-transProcess.php b/demo/testcase/test-transProcess.php
index 422ba925..a850442d 100644
--- a/demo/testcase/test-transProcess.php
+++ b/demo/testcase/test-transProcess.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -15,13 +15,13 @@
 			"reseller" => $_POST["reseller"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -63,10 +63,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-transRsp2Rsp.php b/demo/testcase/test-transRsp2Rsp.php
index fed4ac71..587aeac3 100644
--- a/demo/testcase/test-transRsp2Rsp.php
+++ b/demo/testcase/test-transRsp2Rsp.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -17,13 +17,13 @@
 			"password" => $_POST["password"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -71,10 +71,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-transSendPass.php b/demo/testcase/test-transSendPass.php
index b6889891..6cfc02f9 100644
--- a/demo/testcase/test-transSendPass.php
+++ b/demo/testcase/test-transSendPass.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -14,13 +14,13 @@
 			"domain_name" => $_POST["domain_name"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -59,11 +59,11 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
 
diff --git a/demo/testcase/test-transTradeDomain.php b/demo/testcase/test-transTradeDomain.php
index b9813452..3e32d1ce 100644
--- a/demo/testcase/test-transTradeDomain.php
+++ b/demo/testcase/test-transTradeDomain.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -18,13 +18,13 @@
 			"org_name" => $_POST["org_name"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -75,10 +75,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
\ No newline at end of file
diff --git a/demo/testcase/test-trustCancelOrder.php b/demo/testcase/test-trustCancelOrder.php
index 9c6ed7cd..4952918d 100644
--- a/demo/testcase/test-trustCancelOrder.php
+++ b/demo/testcase/test-trustCancelOrder.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -14,13 +14,13 @@
 			"order_id" => $_POST["order_id"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -59,10 +59,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-trustCreateToken.php b/demo/testcase/test-trustCreateToken.php
index 72f33e93..965504c1 100644
--- a/demo/testcase/test-trustCreateToken.php
+++ b/demo/testcase/test-trustCreateToken.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -15,13 +15,13 @@
 			"product_id" => $_POST["product_id"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -63,10 +63,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-trustGetOrderInfo.php b/demo/testcase/test-trustGetOrderInfo.php
index 9f7341e5..72ad491a 100644
--- a/demo/testcase/test-trustGetOrderInfo.php
+++ b/demo/testcase/test-trustGetOrderInfo.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -14,13 +14,13 @@
 			"order_id" => $_POST["order_id"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -59,10 +59,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-trustGetProductInfo.php b/demo/testcase/test-trustGetProductInfo.php
index 5b8097ef..536e2ff3 100644
--- a/demo/testcase/test-trustGetProductInfo.php
+++ b/demo/testcase/test-trustGetProductInfo.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -14,13 +14,13 @@
 			"product_id" => $_POST["product_id"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -59,10 +59,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-trustParseCSR.php b/demo/testcase/test-trustParseCSR.php
index f2ec260a..f8dc1a24 100644
--- a/demo/testcase/test-trustParseCSR.php
+++ b/demo/testcase/test-trustParseCSR.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -15,13 +15,13 @@
 			"csr" => $_POST["csr"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -63,10 +63,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-trustProcessPending.php b/demo/testcase/test-trustProcessPending.php
index 7778d450..e7f0c98b 100644
--- a/demo/testcase/test-trustProcessPending.php
+++ b/demo/testcase/test-trustProcessPending.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -14,13 +14,13 @@
 			"order_id" => $_POST["order_id"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -59,10 +59,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-trustQueryApproverList.php b/demo/testcase/test-trustQueryApproverList.php
index 4ba2081c..f0fb5814 100644
--- a/demo/testcase/test-trustQueryApproverList.php
+++ b/demo/testcase/test-trustQueryApproverList.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -15,13 +15,13 @@
 			"domain" => $_POST["domain"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -63,10 +63,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-trustRequestOnDemandScan.php b/demo/testcase/test-trustRequestOnDemandScan.php
index a21ba104..e48a9967 100644
--- a/demo/testcase/test-trustRequestOnDemandScan.php
+++ b/demo/testcase/test-trustRequestOnDemandScan.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -15,13 +15,13 @@
 			"product_id" => $_POST["product_id"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -63,10 +63,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-trustResendApproverEmail.php b/demo/testcase/test-trustResendApproverEmail.php
index 6c9671da..c856a0c7 100644
--- a/demo/testcase/test-trustResendApproverEmail.php
+++ b/demo/testcase/test-trustResendApproverEmail.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -14,13 +14,13 @@
 			"order_id" => $_POST["order_id"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -59,10 +59,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-trustResendCertEmail.php b/demo/testcase/test-trustResendCertEmail.php
index fd22ee62..25c8587c 100644
--- a/demo/testcase/test-trustResendCertEmail.php
+++ b/demo/testcase/test-trustResendCertEmail.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -14,13 +14,13 @@
 			"order_id" => $_POST["order_id"]
 		)
 	);
-	
+
 	if ($formFormat == "json") $callstring = json_encode($callArray);
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS ($formFormat, $callstring);
 
 	// Print out the results
@@ -59,10 +59,10 @@
 		</tr>
 	</table>
 </form>
-	
+
 </body>
 </html>
 
-<?php 
+<?php
 }
 ?>
diff --git a/demo/testcase/test-trustSWregister.php b/demo/testcase/test-trustSWregister.php
index b1081238..b714b2a5 100644
--- a/demo/testcase/test-trustSWregister.php
+++ b/demo/testcase/test-trustSWregister.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -48,7 +48,7 @@
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS($formFormat, $callstring);
 
 	// Print out the results
@@ -145,6 +145,6 @@
 	</body>
 	</html>
 
-	<?php 
+	<?php
 }
 ?>
diff --git a/demo/testcase/test-trustUpdateOrder.php b/demo/testcase/test-trustUpdateOrder.php
index 3d12ceb9..69acf408 100644
--- a/demo/testcase/test-trustUpdateOrder.php
+++ b/demo/testcase/test-trustUpdateOrder.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -28,7 +28,7 @@
 
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS($formFormat, $callstring);
 
 	// Print out the results
@@ -82,7 +82,7 @@
 				<tr>
 					<td width="100%"><span class="headLine">csr </span><textarea rows="10" name="csr" id="csr" cols="60"></textarea></td>
 				</tr>
-				
+
 				<tr>
 					<td><input value="Submit" type="submit"></td>
 				</tr>
@@ -92,6 +92,6 @@
 	</body>
 	</html>
 
-	<?php 
+	<?php
 }
 ?>
diff --git a/demo/testcase/test-trustUpdateProduct.php b/demo/testcase/test-trustUpdateProduct.php
index 45b88a05..1d430146 100644
--- a/demo/testcase/test-trustUpdateProduct.php
+++ b/demo/testcase/test-trustUpdateProduct.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if (isSet($_POST['function'])) {
 	require_once dirname(__FILE__) . "/../../opensrs/spyc.php";
@@ -22,7 +22,7 @@
 	if ($formFormat == "yaml") $callstring = Spyc::YAMLDump($callArray);
 
 	// Open SRS Call -> Result
-	require_once dirname(__FILE__) . "/../..//opensrs/openSRS_loader.php";
+	require_once(__DIR__ . "/../openSRS_LoaderWrapper.php");
 	$osrsHandler = processOpenSRS($formFormat, $callstring);
 
 	// Print out the results
@@ -73,6 +73,6 @@
 	</body>
 	</html>
 
-	<?php 
+	<?php
 }
 ?>

From 3b4e364c30cfd2a4cd10b644dcfc0881cd144ca7 Mon Sep 17 00:00:00 2001
From: Alan Hollis <alan.hollis@6dg.co.uk>
Date: Fri, 27 Sep 2013 10:17:30 +0100
Subject: [PATCH 3/5] Fix classes to use method moved into openSRS_base

---
 .../authentication/authChangeOwnership.php    | 12 +--
 .../authentication/authChangePassword.php     | 12 +--
 .../authentication/authCheckVersion.php       | 10 +-
 .../authentication/authSendAuthcode.php       | 10 +-
 .../authentication/authSendPassword.php       | 10 +-
 opensrs/domains/bulkchange/bulkChange.php     | 94 +++++++++----------
 opensrs/domains/bulkchange/bulkSubmit.php     | 16 ++--
 opensrs/domains/bulkchange/bulkTransfer.php   | 28 +++---
 opensrs/domains/cookie/cookieDelete.php       | 10 +-
 opensrs/domains/cookie/cookieQuit.php         | 10 +-
 opensrs/domains/cookie/cookieSet.php          | 16 ++--
 opensrs/domains/cookie/cookieUpdate.php       | 16 ++--
 opensrs/domains/dnszone/dnsCreate.php         | 54 +++++------
 opensrs/domains/dnszone/dnsDelete.php         | 14 +--
 opensrs/domains/dnszone/dnsForce.php          | 14 +--
 opensrs/domains/dnszone/dnsGet.php            | 14 +--
 opensrs/domains/dnszone/dnsReset.php          | 16 ++--
 opensrs/domains/dnszone/dnsSet.php            | 48 +++++-----
 opensrs/domains/forwarding/fwdCreate.php      | 14 +--
 opensrs/domains/forwarding/fwdDelete.php      | 14 +--
 opensrs/domains/forwarding/fwdGet.php         | 16 ++--
 opensrs/domains/forwarding/fwdSet.php         | 24 ++---
 opensrs/domains/lookup/allinoneDomain.php     |  8 +-
 opensrs/domains/lookup/lookupBelongsToRsp.php |  6 +-
 opensrs/domains/lookup/lookupDomain.php       | 14 +--
 opensrs/domains/lookup/lookupGetBalance.php   |  8 +-
 .../domains/lookup/lookupGetCaBlockerList.php |  6 +-
 .../lookup/lookupGetDeletedDomains.php        |  6 +-
 opensrs/domains/lookup/lookupGetDomain.php    | 20 ++--
 .../lookup/lookupGetDomainsByExpiry.php       |  6 +-
 .../lookup/lookupGetDomainsContacts.php       |  8 +-
 opensrs/domains/lookup/lookupGetNotes.php     |  8 +-
 opensrs/domains/lookup/lookupGetOrderInfo.php |  8 +-
 .../lookup/lookupGetOrdersByDomain.php        |  8 +-
 opensrs/domains/lookup/lookupGetPrice.php     |  8 +-
 opensrs/domains/lookup/lookupLookupDomain.php |  8 +-
 opensrs/domains/lookup/lookupNameSuggest.php  |  8 +-
 opensrs/domains/lookup/premiumDomain.php      |  8 +-
 opensrs/domains/lookup/suggestDomain.php      | 10 +-
 opensrs/domains/nameserver/nsAdvancedUpdt.php | 18 ++--
 opensrs/domains/nameserver/nsCreate.php       | 20 ++--
 opensrs/domains/nameserver/nsDelete.php       | 16 ++--
 opensrs/domains/nameserver/nsGet.php          | 16 ++--
 opensrs/domains/nameserver/nsModify.php       | 18 ++--
 opensrs/domains/nameserver/nsRegistryAdd.php  | 14 +--
 .../domains/nameserver/nsRegistryCheck.php    | 14 +--
 opensrs/domains/personalnames/persDelete.php  | 14 +--
 .../domains/personalnames/persNameSuggest.php | 16 ++--
 opensrs/domains/personalnames/persQuery.php   | 16 ++--
 .../domains/personalnames/persSUregister.php  | 16 ++--
 opensrs/domains/personalnames/persUpdate.php  | 18 ++--
 opensrs/domains/provisioning/provActivate.php | 16 ++--
 .../provisioning/provCancelActivate.php       | 14 +--
 .../provisioning/provCancelPending.php        | 18 ++--
 opensrs/domains/provisioning/provModify.php   | 90 +++++++++---------
 .../provisioning/provProcessPending.php       | 18 ++--
 .../provisioning/provQueryQueuedRequest.php   | 14 +--
 opensrs/domains/provisioning/provRenew.php    | 18 ++--
 opensrs/domains/provisioning/provRevoke.php   | 16 ++--
 .../domains/provisioning/provSWregister.php   | 62 ++++++------
 .../provisioning/provSendCIRAapproval.php     | 14 +--
 .../provisioning/provUpdateAllInfo.php        | 42 ++++-----
 .../provisioning/provUpdateContacts.php       | 16 ++--
 opensrs/domains/subreseller/subresActing.php  | 12 +--
 opensrs/domains/subreseller/subresCreate.php  | 18 ++--
 opensrs/domains/subreseller/subresGet.php     | 14 +--
 opensrs/domains/subreseller/subresModify.php  | 18 ++--
 opensrs/domains/subreseller/subresPay.php     | 14 +--
 opensrs/domains/subuser/subuserAdd.php        | 16 ++--
 opensrs/domains/subuser/subuserDelete.php     | 16 ++--
 opensrs/domains/subuser/subuserGet.php        | 16 ++--
 opensrs/domains/subuser/subuserGetInfo.php    | 16 ++--
 opensrs/domains/subuser/subuserModify.php     | 14 +--
 opensrs/domains/transfer/transCancel.php      | 16 ++--
 opensrs/domains/transfer/transCheck.php       | 16 ++--
 opensrs/domains/transfer/transGetAway.php     | 14 +--
 opensrs/domains/transfer/transGetIn.php       | 14 +--
 opensrs/domains/transfer/transProcess.php     | 14 +--
 opensrs/domains/transfer/transRsp2Rsp.php     | 16 ++--
 opensrs/domains/transfer/transSendPass.php    | 14 +--
 opensrs/domains/transfer/transTradeDomain.php | 14 +--
 opensrs/fastlookup/fastDomainLookup.php       |  4 +-
 opensrs/mail/mailAuthentication.php           | 18 ++--
 opensrs/mail/mailChangeDomain.php             | 24 ++---
 opensrs/mail/mailCreateDomain.php             | 24 ++---
 opensrs/mail/mailCreateDomainAlias.php        | 24 ++---
 opensrs/mail/mailCreateDomainWelcomeEmail.php | 22 ++---
 opensrs/mail/mailCreateMailbox.php            | 32 +++----
 opensrs/mail/mailCreateMailboxForwardOnly.php | 32 +++----
 opensrs/mail/mailDeleteDomain.php             | 24 ++---
 opensrs/mail/mailDeleteDomainAlias.php        | 22 ++---
 opensrs/mail/mailDeleteDomainWelcomeEmail.php | 22 ++---
 opensrs/mail/mailDeleteMailbox.php            | 24 ++---
 opensrs/mail/mailGetCompanyDomains.php        | 24 ++---
 opensrs/mail/mailGetDomain.php                | 22 ++---
 opensrs/mail/mailGetDomainAllowList.php       | 22 ++---
 opensrs/mail/mailGetDomainBlockList.php       | 20 ++--
 opensrs/mail/mailGetDomainMailboxLimits.php   | 22 ++---
 opensrs/mail/mailGetDomainMailboxes.php       | 20 ++--
 opensrs/mail/mailGetNumDomainMailboxes.php    | 22 ++---
 opensrs/mail/mailSetDomainAdmin.php           | 24 ++---
 opensrs/mail/mailSetDomainAllowList.php       | 22 ++---
 opensrs/mail/mailSetDomainBlockList.php       | 22 ++---
 opensrs/mail/mailSetDomainDisabledStatus.php  | 20 ++--
 opensrs/mail/mailSetDomainMailboxLimits.php   | 24 ++---
 opensrs/publishing/pubCreate.php              | 10 +-
 opensrs/publishing/pubDelete.php              |  8 +-
 opensrs/publishing/pubDisable.php             |  8 +-
 opensrs/publishing/pubEnable.php              |  8 +-
 .../publishing/pubGenerateRedirectionCode.php | 12 +--
 opensrs/publishing/pubGetControlPanelUrl.php  |  8 +-
 opensrs/publishing/pubGetServiceInfo.php      |  8 +-
 opensrs/publishing/pubLetExpire.php           |  8 +-
 opensrs/publishing/pubUpdate.php              | 16 ++--
 opensrs/trust/trustCancelOrder.php            |  8 +-
 opensrs/trust/trustCreateToken.php            | 10 +-
 opensrs/trust/trustGetOrderInfo.php           |  8 +-
 opensrs/trust/trustGetProductInfo.php         |  8 +-
 opensrs/trust/trustParseCSR.php               |  8 +-
 opensrs/trust/trustProcessPending.php         |  8 +-
 opensrs/trust/trustQueryApproverList.php      | 10 +-
 opensrs/trust/trustRequestOnDemandScan.php    | 10 +-
 opensrs/trust/trustResendApproverEmail.php    |  8 +-
 opensrs/trust/trustResendCertEmail.php        |  8 +-
 opensrs/trust/trustSWregister.php             | 28 +++---
 opensrs/trust/trustUpdateOrder.php            | 22 ++---
 opensrs/trust/trustUpdateProduct.php          | 22 ++---
 templates/domainTemplate.php                  | 18 ++--
 templates/mailTemplate.php                    | 22 ++---
 129 files changed, 1123 insertions(+), 1123 deletions(-)

diff --git a/opensrs/domains/authentication/authChangeOwnership.php b/opensrs/domains/authentication/authChangeOwnership.php
index 57d7ac74..2e35682b 100644
--- a/opensrs/domains/authentication/authChangeOwnership.php
+++ b/opensrs/domains/authentication/authChangeOwnership.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class authChangeOwnership extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -41,7 +41,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - Password string not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -68,7 +68,7 @@ private function _processRequest (){
 		// Command optional values
 		if (isSet($this->_dataObject->data->move_all) && $this->_dataObject->data->move_all != "") $cmd['attributes']['move_all'] = $this->_dataObject->data->move_all;
 		if (isSet($this->_dataObject->data->reg_domain) && $this->_dataObject->data->reg_domain != "") $cmd['attributes']['reg_domain'] = $this->_dataObject->data->reg_domain;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -76,7 +76,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/authentication/authChangePassword.php b/opensrs/domains/authentication/authChangePassword.php
index 816afe59..94fd8c97 100644
--- a/opensrs/domains/authentication/authChangePassword.php
+++ b/opensrs/domains/authentication/authChangePassword.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class authChangePassword extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -57,11 +57,11 @@ private function _processRequest (){
 				"reg_password" => $this->_dataObject->data->reg_password
 			)
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->cookie) && $this->_dataObject->data->cookie != "") $cmd['cookie'] = $this->_dataObject->data->cookie;
 		if (isSet($this->_dataObject->data->domain) && $this->_dataObject->data->domain != "") $cmd['domain'] = $this->_dataObject->data->domain;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -69,7 +69,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/authentication/authCheckVersion.php b/opensrs/domains/authentication/authCheckVersion.php
index b06b6a90..68556029 100644
--- a/opensrs/domains/authentication/authCheckVersion.php
+++ b/opensrs/domains/authentication/authCheckVersion.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class authCheckVersion extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -48,7 +48,7 @@ private function _processRequest (){
 				"state" => "ready"
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -56,7 +56,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/authentication/authSendAuthcode.php b/opensrs/domains/authentication/authSendAuthcode.php
index 86b8a1e5..58dd6d85 100644
--- a/opensrs/domains/authentication/authSendAuthcode.php
+++ b/opensrs/domains/authentication/authSendAuthcode.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class authSendAuthcode extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -51,7 +51,7 @@ private function _processRequest (){
 				"domain_name" => $this->_dataObject->data->domain_name
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -59,7 +59,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/authentication/authSendPassword.php b/opensrs/domains/authentication/authSendPassword.php
index cbb31b13..7257fe06 100644
--- a/opensrs/domains/authentication/authSendPassword.php
+++ b/opensrs/domains/authentication/authSendPassword.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class authSendPassword extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -53,7 +53,7 @@ private function _processRequest (){
 				"sub_user" => $this->_dataObject->data->sub_user
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -61,7 +61,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/bulkchange/bulkChange.php b/opensrs/domains/bulkchange/bulkChange.php
index fd8e24f0..4279773a 100644
--- a/opensrs/domains/bulkchange/bulkChange.php
+++ b/opensrs/domains/bulkchange/bulkChange.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class bulkChange extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->change_items) || $this->_dataObject->data->change_items == "") {
 			trigger_error ("oSRS Error - change_items is not defined.", E_USER_WARNING);
@@ -99,8 +99,8 @@ private function _validateObject (){
 	private function _allDomainRenewCheck(){
 		$allDomainRenewPassed=true;
 
-		if(!isSet($this->_dataObject->data->period) && $this->_dataObject->data->period == "" && 
-		!isSet($this->_dataObject->data->let_expire) && $this->_dataObject->data->let_expire == "" && 
+		if(!isSet($this->_dataObject->data->period) && $this->_dataObject->data->period == "" &&
+		!isSet($this->_dataObject->data->let_expire) && $this->_dataObject->data->let_expire == "" &&
 		!isSet($this->_dataObject->data->auto_renew) && $this->_dataObject->data->auto_renew == "" ) {
 
 			trigger_error ("oSRS Error - change type is domain_renew but at least one of period, let_expire or auto_renew has to be defined.", E_USER_WARNING);
@@ -171,7 +171,7 @@ private function _allDomainForwardingCheck(){
 		}
 		return $allDomainForwardingPassed;
 	}
-	
+
 	private function _allDomainLockCheck(){
 		$allDomainLockPassed=true;
 		if (!isSet($this->_dataObject->data->op_type) || $this->_dataObject->data->op_type == "") {
@@ -187,8 +187,8 @@ private function _allDomainNameserversCheck(){
 			trigger_error ("oSRS Error - change type is domain_nameservers but op_type is not defined.", E_USER_WARNING);
 			$allDomainNameserversPassed = false;
 		}
-		if(!isSet($this->_dataObject->data->add_ns) && $this->_dataObject->data->add_ns == "" && 
-		!isSet($this->_dataObject->data->remove_ns) && $this->_dataObject->data->remove_ns == "" && 
+		if(!isSet($this->_dataObject->data->add_ns) && $this->_dataObject->data->add_ns == "" &&
+		!isSet($this->_dataObject->data->remove_ns) && $this->_dataObject->data->remove_ns == "" &&
 		!isSet($this->_dataObject->data->assign_ns) && $this->_dataObject->data->assign_ns == "" ) {
 
 			trigger_error ("oSRS Error - change type is domain_nameservers but at least one of add_ns, remove_ns or assign_ns has to be defined.", E_USER_WARNING);
@@ -218,7 +218,7 @@ private function _allWhoisPrivacyCheck(){
 	// Post validation functions
 	private function _processRequest (){
 		$this->_dataObject->data->change_items = explode (",", $this->_dataObject->data->change_items);
-	
+
 		$cmd = array(
 			'protocol' => 'XCP',
 			'action' => 'submit_bulk_change',
@@ -228,71 +228,71 @@ private function _processRequest (){
 				'change_items' => $this->_dataObject->data->change_items
 			)
 		);
-		
+
 		// Command optional values
-		if (isSet($this->_dataObject->data->apply_to_locked_domains) && $this->_dataObject->data->apply_to_locked_domains != "") 
+		if (isSet($this->_dataObject->data->apply_to_locked_domains) && $this->_dataObject->data->apply_to_locked_domains != "")
 			$cmd['attributes']['apply_to_locked_domains'] = $this->_dataObject->data->apply_to_locked_domains;
-		if (isSet($this->_dataObject->data->contact_email) && $this->_dataObject->data->contact_email != "") 
+		if (isSet($this->_dataObject->data->contact_email) && $this->_dataObject->data->contact_email != "")
 			$cmd['attributes']['contact_email'] = $this->_dataObject->data->contact_email;
-		if (isSet($this->_dataObject->data->apply_to_all_reseller_items) && $this->_dataObject->data->apply_to_all_reseller_items!= "") 
+		if (isSet($this->_dataObject->data->apply_to_all_reseller_items) && $this->_dataObject->data->apply_to_all_reseller_items!= "")
 			$cmd['attributes']['apply_to_all_reseller_items'] = $this->_dataObject->data->apply_to_all_reseller_items;
 
 		switch($this->_dataObject->data->change_type){
 			case "availability_check":
 				break;
 			case "domain_renew":
-				if (isSet($this->_dataObject->data->period) && $this->_dataObject->data->period!= "") 
+				if (isSet($this->_dataObject->data->period) && $this->_dataObject->data->period!= "")
 					$cmd['attributes']['period'] = $this->_dataObject->data->period;
-				if (isSet($this->_dataObject->data->let_expire) && $this->_dataObject->data->let_expire!= "") 
+				if (isSet($this->_dataObject->data->let_expire) && $this->_dataObject->data->let_expire!= "")
 					$cmd['attributes']['let_expire'] = $this->_dataObject->data->let_expire;
-				if (isSet($this->_dataObject->data->auto_renew) && $this->_dataObject->data->auto_renew!= "") 
+				if (isSet($this->_dataObject->data->auto_renew) && $this->_dataObject->data->auto_renew!= "")
 					$cmd['attributes']['auto_renew'] = $this->_dataObject->data->auto_renew;
-				if (isSet($this->_dataObject->data->affiliate_id) && $this->_dataObject->data->affiliate_id!= "") 
+				if (isSet($this->_dataObject->data->affiliate_id) && $this->_dataObject->data->affiliate_id!= "")
 					$cmd['attributes']['affiliate_id'] = $this->_dataObject->data->affiliate_id;
 				break;
 			case "push_domains":
-				if (isSet($this->_dataObject->data->gaining_reseller_username) && $this->_dataObject->data->gaining_reseller_username!= "") 
+				if (isSet($this->_dataObject->data->gaining_reseller_username) && $this->_dataObject->data->gaining_reseller_username!= "")
 					$cmd['attributes']['gaining_reseller_username'] = $this->_dataObject->data->gaining_reseller_username;
 				break;
 			case "dns_zone":
-				if (isSet($this->_dataObject->data->apply_to_domains) && $this->_dataObject->data->apply_to_domains!= "") 
+				if (isSet($this->_dataObject->data->apply_to_domains) && $this->_dataObject->data->apply_to_domains!= "")
 					$cmd['attributes']['apply_to_domains'] = $this->_dataObject->data->apply_to_domains;
-				if (isSet($this->_dataObject->data->dns_action) && $this->_dataObject->data->dns_action!= "") 
+				if (isSet($this->_dataObject->data->dns_action) && $this->_dataObject->data->dns_action!= "")
 					$cmd['attributes']['dns_action'] = $this->_dataObject->data->dns_action;
-				if (isSet($this->_dataObject->data->dns_template) && $this->_dataObject->data->dns_template!= "") 
+				if (isSet($this->_dataObject->data->dns_template) && $this->_dataObject->data->dns_template!= "")
 					$cmd['attributes']['dns_template'] = $this->_dataObject->data->dns_template;
-				if (isSet($this->_dataObject->data->only_if) && $this->_dataObject->data->only_if!= "") 
+				if (isSet($this->_dataObject->data->only_if) && $this->_dataObject->data->only_if!= "")
 					$cmd['attributes']['only_if'] = $this->_dataObject->data->only_if;
-				if (isSet($this->_dataObject->data->force_dns_nameservers) && $this->_dataObject->data->force_dns_nameservers!= "") 
+				if (isSet($this->_dataObject->data->force_dns_nameservers) && $this->_dataObject->data->force_dns_nameservers!= "")
 					$cmd['attributes']['force_dns_nameservers'] = $this->_dataObject->data->force_dns_nameservers;
 				break;
 			case "dns_zone_record":
-				if (isSet($this->_dataObject->data->dns_action) && $this->_dataObject->data->dns_action!= "") 
+				if (isSet($this->_dataObject->data->dns_action) && $this->_dataObject->data->dns_action!= "")
 					$cmd['attributes']['dns_action'] = $this->_dataObject->data->dns_action;
-				if (isSet($this->_dataObject->data->dns_record_type) && $this->_dataObject->data->dns_record_type!= "") 
+				if (isSet($this->_dataObject->data->dns_record_type) && $this->_dataObject->data->dns_record_type!= "")
 					$cmd['attributes']['dns_record_type'] = $this->_dataObject->data->dns_record_type;
-				if (isSet($this->_dataObject->data->dns_record_data->ip_address) && $this->_dataObject->data->dns_record_data->ip_address!= "") 
+				if (isSet($this->_dataObject->data->dns_record_data->ip_address) && $this->_dataObject->data->dns_record_data->ip_address!= "")
 					$cmd['attributes']['dns_record_data']['ip_address'] = $this->_dataObject->data->dns_record_data->ip_address;
-				if (isSet($this->_dataObject->data->dns_record_data->subdomain) && $this->_dataObject->data->dns_record_data->subdomain!= "") 
+				if (isSet($this->_dataObject->data->dns_record_data->subdomain) && $this->_dataObject->data->dns_record_data->subdomain!= "")
 					$cmd['attributes']['dns_record_data']['subdomain'] = $this->_dataObject->data->dns_record_data->subdomain;
-				if (isSet($this->_dataObject->data->dns_record_data->ipv6_address) && $this->_dataObject->data->dns_record_data->ipv6_address!= "") 
+				if (isSet($this->_dataObject->data->dns_record_data->ipv6_address) && $this->_dataObject->data->dns_record_data->ipv6_address!= "")
 					$cmd['attributes']['dns_record_data']['ipv6_address'] = $this->_dataObject->data->dns_record_data->ipv6_address;
 				if (isSet($this->_dataObject->data->dns_record_data->hostname) && $this->_dataObject->data->dns_record_data->hostname!= "") $
 					$cmd['attributes']['dns_record_data']['hostname'] = $this->_dataObject->data->dns_record_data->hostname;
-				if (isSet($this->_dataObject->data->dns_record_data->priority) && $this->_dataObject->data->dns_record_data->priority!= "") 
+				if (isSet($this->_dataObject->data->dns_record_data->priority) && $this->_dataObject->data->dns_record_data->priority!= "")
 					$cmd['attributes']['dns_record_data']['priority'] = $this->_dataObject->data->dns_record_data->priority;
-				if (isSet($this->_dataObject->data->dns_record_data->weight) && $this->_dataObject->data->dns_record_data->weight!= "") 
+				if (isSet($this->_dataObject->data->dns_record_data->weight) && $this->_dataObject->data->dns_record_data->weight!= "")
 					$cmd['attributes']['dns_record_data']['weight'] = $this->_dataObject->data->dns_record_data->weight;
-				if (isSet($this->_dataObject->data->dns_record_data->port) && $this->_dataObject->data->dns_record_data->port!= "") 
+				if (isSet($this->_dataObject->data->dns_record_data->port) && $this->_dataObject->data->dns_record_data->port!= "")
 					$cmd['attributes']['dns_record_data']['port'] = $this->_dataObject->data->dns_record_data->port;
-				if (isSet($this->_dataObject->data->dns_record_data->text) && $this->_dataObject->data->dns_record_data->text!= "") 
+				if (isSet($this->_dataObject->data->dns_record_data->text) && $this->_dataObject->data->dns_record_data->text!= "")
 					$cmd['attributes']['dns_record_data']['text'] = $this->_dataObject->data->dns_record_data->text;
-				if (isSet($this->_dataObject->data->only_if) && $this->_dataObject->data->only_if!= "") 
+				if (isSet($this->_dataObject->data->only_if) && $this->_dataObject->data->only_if!= "")
 					$cmd['attributes']['only_if'] = $this->_dataObject->data->only_if;
 				break;
 			case "domain_contacts":
 				// Allows for multiple contact changes with the same data
-				if (isSet($this->_dataObject->data->type) && $this->_dataObject->data->type!= "" && 
+				if (isSet($this->_dataObject->data->type) && $this->_dataObject->data->type!= "" &&
 				    isSet($this->_dataObject->personal) && $this->_dataObject->personal!= ""){
 
 					$contact_types=explode (",", $this->_dataObject->data->type);
@@ -306,39 +306,39 @@ private function _processRequest (){
 				}
 				break;
 			case "domain_forwarding":
-				if (isSet($this->_dataObject->data->op_type) && $this->_dataObject->data->op_type!= "") 
+				if (isSet($this->_dataObject->data->op_type) && $this->_dataObject->data->op_type!= "")
 					$cmd['attributes']['op_type'] = $this->_dataObject->data->op_type;
 				break;
 			case "domain_lock":
-				if (isSet($this->_dataObject->data->op_type) && $this->_dataObject->data->op_type!= "") 
+				if (isSet($this->_dataObject->data->op_type) && $this->_dataObject->data->op_type!= "")
 					$cmd['attributes']['op_type'] = $this->_dataObject->data->op_type;
 				break;
 			case "domain_parked_pages":
-				if (isSet($this->_dataObject->data->op_type) && $this->_dataObject->data->op_type!= "") 
+				if (isSet($this->_dataObject->data->op_type) && $this->_dataObject->data->op_type!= "")
 					$cmd['attributes']['op_type'] = $this->_dataObject->data->op_type;
 				break;
 			case "domain_nameservers":
-				if (isSet($this->_dataObject->data->op_type) && $this->_dataObject->data->op_type!= "") 
+				if (isSet($this->_dataObject->data->op_type) && $this->_dataObject->data->op_type!= "")
 					$cmd['attributes']['op_type'] = $this->_dataObject->data->op_type;
-				if (isSet($this->_dataObject->data->add_ns) && $this->_dataObject->data->add_ns!= "") 
+				if (isSet($this->_dataObject->data->add_ns) && $this->_dataObject->data->add_ns!= "")
 					$cmd['attributes']['add_ns'] = explode(",",$this->_dataObject->data->add_ns);
-				if (isSet($this->_dataObject->data->remove_ns) && $this->_dataObject->data->remove_ns!= "") 
+				if (isSet($this->_dataObject->data->remove_ns) && $this->_dataObject->data->remove_ns!= "")
 					$cmd['attributes']['remove_ns'] = explode(",",$this->_dataObject->data->remove_ns);
-				if (isSet($this->_dataObject->data->assign_ns) && $this->_dataObject->data->assign_ns!= "") 
+				if (isSet($this->_dataObject->data->assign_ns) && $this->_dataObject->data->assign_ns!= "")
 					$cmd['attributes']['assign_ns'] = explode(",",$this->_dataObject->data->assign_ns);
 				break;
 			case "whois_privacy":
-				if (isSet($this->_dataObject->data->op_type) && $this->_dataObject->data->op_type!= "") 
+				if (isSet($this->_dataObject->data->op_type) && $this->_dataObject->data->op_type!= "")
 					$cmd['attributes']['op_type'] = $this->_dataObject->data->op_type;
 				break;
 			default:
 				break;
 		}
 
-		
 
-		
-	
+
+
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -346,8 +346,8 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 
  private function _createUserData(){
diff --git a/opensrs/domains/bulkchange/bulkSubmit.php b/opensrs/domains/bulkchange/bulkSubmit.php
index f2b0b3ce..93119d03 100644
--- a/opensrs/domains/bulkchange/bulkSubmit.php
+++ b/opensrs/domains/bulkchange/bulkSubmit.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class bulkSubmit extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,13 +26,13 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->change_items) || $this->_dataObject->data->change_items == "") {
 			trigger_error ("oSRS Error - change_items is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		if (!isSet($this->_dataObject->data->change_type) || $this->_dataObject->data->change_type == "") {
 			trigger_error ("oSRS Error - change_type is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -63,11 +63,11 @@ private function _processRequest (){
 			'object' => 'bulk_change',
 			'attributes' => array (
 				'change_items' => $this->_dataObject->data->change_items,
-				'change_type' => $this->_dataObject->data->change_type, 
+				'change_type' => $this->_dataObject->data->change_type,
 				'op_type' => $this->_dataObject->data->op_type,
 			)
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->contact_email) && $this->_dataObject->data->contact_email != "") $cmd['attributes']['contact_email'] = $this->_dataObject->data->contact_email;
 		if (isSet($this->_dataObject->data->apply_to_locked_domains) && $this->_dataObject->data->apply_to_locked_domains != "") $cmd['attributes']['apply_to_locked_domains'] = $this->_dataObject->data->apply_to_locked_domains;
@@ -79,7 +79,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/bulkchange/bulkTransfer.php b/opensrs/domains/bulkchange/bulkTransfer.php
index 3a7e9ab3..fc222ede 100644
--- a/opensrs/domains/bulkchange/bulkTransfer.php
+++ b/opensrs/domains/bulkchange/bulkTransfer.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class bulkTransfer extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->custom_tech_contact) || $this->_dataObject->data->custom_tech_contact == "") {
 			trigger_error ("oSRS Error - custom_tech_contact is not defined.", E_USER_WARNING);
@@ -44,11 +44,11 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - reg_password is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed)
 	 		$allPassed=$this->_allTimeRequired();
-	
+
 		if ($allPassed){
 			// Execute the command
 			$this->_processRequest ();
@@ -73,7 +73,7 @@ private function _allTimeRequired(){
 	// Post validation functions
 	private function _processRequest (){
 		$this->_dataObject->data->domain_list = explode (",", $this->_dataObject->data->domain_list);
-	
+
 		$cmd = array(
 			'protocol' => 'XCP',
 			'action' => 'bulk_transfer',
@@ -92,15 +92,15 @@ private function _processRequest (){
 				'domain_list' => $this->_dataObject->data->domain_list
 			)
 		);
-		
+
 		// Command optional values
 
 		if (isSet($this->_dataObject->data->reg_domain) || $this->_dataObject->data->reg_domain != "") $cmd['attributes']['reg_domain'] = $this->_dataObject->data->reg_domain;
-		
+
 		if (isSet($this->_dataObject->data->affiliate_id) && $this->_dataObject->data->affiliate_id != "") $cmd['attributes']['affiliate_id'] = $this->_dataObject->data->affiliate_id;
 		if (isSet($this->_dataObject->data->handle) && $this->_dataObject->data->handle != "") $cmd['attributes']['handle'] = $this->_dataObject->data->handle;
 		if (isSet($this->_dataObject->data->registrant_ip) && $this->_dataObject->data->registrant_ip != "") $cmd['attributes']['registrant_ip'] = $this->_dataObject->data->registrant_ip;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -108,10 +108,10 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
-	
+
 	private function _createUserData(){
 		$userArray = array(
 			"first_name" => $this->_dataObject->personal->first_name,
@@ -131,6 +131,6 @@ private function _createUserData(){
 			"lang_pref" => $this->_dataObject->personal->lang_pref
 		);
 		return $userArray;
-	}	
-	
+	}
+
 }
diff --git a/opensrs/domains/cookie/cookieDelete.php b/opensrs/domains/cookie/cookieDelete.php
index 43ace6ed..f6b1b848 100644
--- a/opensrs/domains/cookie/cookieDelete.php
+++ b/opensrs/domains/cookie/cookieDelete.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class cookieDelete extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -18,7 +18,7 @@ public function __construct ($formatString, $dataObject) {
 		$this->_formatHolder = $formatString;
 		$this->_validateObject ();
 	}
-	
+
 	public function __destruct () {
 		parent::__destruct();
 	}
@@ -60,7 +60,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/cookie/cookieQuit.php b/opensrs/domains/cookie/cookieQuit.php
index 0a19260d..3ab56a42 100644
--- a/opensrs/domains/cookie/cookieQuit.php
+++ b/opensrs/domains/cookie/cookieQuit.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class cookieQuit extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -18,7 +18,7 @@ public function __construct ($formatString, $dataObject) {
 		$this->_formatHolder = $formatString;
 		$this->_validateObject ();
 	}
-	
+
 	public function __destruct () {
 		parent::__destruct();
 	}
@@ -51,7 +51,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/cookie/cookieSet.php b/opensrs/domains/cookie/cookieSet.php
index 28171e0e..f96a32d4 100644
--- a/opensrs/domains/cookie/cookieSet.php
+++ b/opensrs/domains/cookie/cookieSet.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class cookieSet extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -18,7 +18,7 @@ public function __construct ($formatString, $dataObject) {
 		$this->_formatHolder = $formatString;
 		$this->_validateObject ();
 	}
-	
+
 	public function __destruct () {
 		parent::__destruct();
 	}
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->reg_username)) {
 			trigger_error ("oSRS Error - Username string not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -36,7 +36,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - Password string not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-		
+
 		if (!isSet($this->_dataObject->data->domain)) {
 			trigger_error ("oSRS Error - Search domain strinng not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -76,10 +76,10 @@ private function _processRequest (){
 		} else {
 			$this->resultRaw = $arrayResult;
 		}
-		
+
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/cookie/cookieUpdate.php b/opensrs/domains/cookie/cookieUpdate.php
index 40f4e6e0..b1a03a75 100644
--- a/opensrs/domains/cookie/cookieUpdate.php
+++ b/opensrs/domains/cookie/cookieUpdate.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class cookieUpdate extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -18,7 +18,7 @@ public function __construct ($formatString, $dataObject) {
 		$this->_formatHolder = $formatString;
 		$this->_validateObject ();
 	}
-	
+
 	public function __destruct () {
 		parent::__destruct();
 	}
@@ -36,7 +36,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - Password string not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-		
+
 		if (!isSet($this->_dataObject->data->domain)) {
 			trigger_error ("oSRS Error - Existing domain strinng not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -79,7 +79,7 @@ private function _processRequest (){
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
-		
+
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		if (isSet($arrayResult['attributes'])){
@@ -87,10 +87,10 @@ private function _processRequest (){
 		} else {
 			$this->resultRaw = $arrayResult;
 		}
-		
+
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/dnszone/dnsCreate.php b/opensrs/domains/dnszone/dnsCreate.php
index ff1dbff2..65d99dfd 100644
--- a/opensrs/domains/dnszone/dnsCreate.php
+++ b/opensrs/domains/dnszone/dnsCreate.php
@@ -1,9 +1,9 @@
 <?php
 /**
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class DnsCreate extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,13 +26,13 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -61,8 +61,8 @@ private function _processRequest (){
 
 		// records - A
 		if (isset($this->_dataObject->data->a) && count($this->_dataObject->data->a) > 0) {
-			$as = array();			
-			foreach ($this->_dataObject->data->a as $key => $value) {	
+			$as = array();
+			foreach ($this->_dataObject->data->a as $key => $value) {
 				array_push($as, array('ip_address' => $value->ip_address, 'subdomain' => $value->subdomain));
 			}
 			$cmd['attributes']['records']['A'] = $as;
@@ -70,17 +70,17 @@ private function _processRequest (){
 
 		// records - AAAA
 		if (isset($this->_dataObject->data->aaaa) && count($this->_dataObject->data->aaaa) > 0) {
-			$aaaas = array();			
-			foreach ($this->_dataObject->data->aaaa as $key => $val) {	            
+			$aaaas = array();
+			foreach ($this->_dataObject->data->aaaa as $key => $val) {
 				array_push($aaaas, array('ipv6_address' => $val->ipv6_address, 'subdomain' => $val->subdomain));
 			}
 			$cmd['attributes']['records']['AAAA'] = $aaaas;
 		}
-		
+
 		// records - CNAME
 		if (isset($this->_dataObject->data->cname) && count($this->_dataObject->data->cname) > 0) {
-			$cnames = array();			
-			foreach ($this->_dataObject->data->cname as $key => $val) {	
+			$cnames = array();
+			foreach ($this->_dataObject->data->cname as $key => $val) {
 				array_push($cnames, array('hostname' => $val->hostname, 'subdomain' => $val->subdomain));
 			}
 			$cmd['attributes']['records']['CNAME'] = $cnames;
@@ -88,12 +88,12 @@ private function _processRequest (){
 
 		// records - MX
 		if (isset($this->_dataObject->data->mx) && count($this->_dataObject->data->mx) > 0) {
-			$mxs = array();			
-			foreach ($this->_dataObject->data->mx as $key => $val) {	
-				array_push($mxs, 
+			$mxs = array();
+			foreach ($this->_dataObject->data->mx as $key => $val) {
+				array_push($mxs,
 					array(
-						'priority' => $val->priority, 
-						'subdomain' => $val->subdomain, 
+						'priority' => $val->priority,
+						'subdomain' => $val->subdomain,
 						'hostname' => $val->hostname
 					)
 				);
@@ -103,13 +103,13 @@ private function _processRequest (){
 
 		// records - SRV
 		if (isset($this->_dataObject->data->srv) && count($this->_dataObject->data->srv) > 0) {
-			$srvs = array();			
-			foreach ($this->_dataObject->data->srv as $key => $val) {	
-				array_push($srvs, 
+			$srvs = array();
+			foreach ($this->_dataObject->data->srv as $key => $val) {
+				array_push($srvs,
 					array(
-						'priority' => $val->priority, 
-						'weight' => $val->weight, 
-						'subdomain' => $val->subdomain, 
+						'priority' => $val->priority,
+						'weight' => $val->weight,
+						'subdomain' => $val->subdomain,
 						'hostname' => $val->hostname,
 						'port' => $val->port
 					)
@@ -121,13 +121,13 @@ private function _processRequest (){
 		// records - TXT
 		if (isset($this->_dataObject->data->txt) && count($this->_dataObject->data->txt) > 0) {
 			$txts = array();
-			foreach ($this->_dataObject->data->txt as $key => $val) {	
+			foreach ($this->_dataObject->data->txt as $key => $val) {
 				array_push($txts, array('subdomain' => $val->subdomain, 'text' => $val->text));
 			}
 			$cmd['attributes']['records']['TXT'] = $txts;
 		}
-	    		
-		
+
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -135,7 +135,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/dnszone/dnsDelete.php b/opensrs/domains/dnszone/dnsDelete.php
index 2ea26dbd..c252a228 100644
--- a/opensrs/domains/dnszone/dnsDelete.php
+++ b/opensrs/domains/dnszone/dnsDelete.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class DnsDelete extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,13 +26,13 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -52,7 +52,7 @@ private function _processRequest (){
 				'domain' => $this->_dataObject->data->domain
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -60,7 +60,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/dnszone/dnsForce.php b/opensrs/domains/dnszone/dnsForce.php
index 83a089e8..5b2e398f 100644
--- a/opensrs/domains/dnszone/dnsForce.php
+++ b/opensrs/domains/dnszone/dnsForce.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class DnsForce extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,13 +26,13 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -52,7 +52,7 @@ private function _processRequest (){
 				'domain' => $this->_dataObject->data->domain
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -60,7 +60,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/dnszone/dnsGet.php b/opensrs/domains/dnszone/dnsGet.php
index 03c9154c..87fcb03b 100644
--- a/opensrs/domains/dnszone/dnsGet.php
+++ b/opensrs/domains/dnszone/dnsGet.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class DnsGet extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,13 +26,13 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -52,7 +52,7 @@ private function _processRequest (){
 				'domain' => $this->_dataObject->data->domain,
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -60,7 +60,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/dnszone/dnsReset.php b/opensrs/domains/dnszone/dnsReset.php
index 6360c996..a82cd68d 100644
--- a/opensrs/domains/dnszone/dnsReset.php
+++ b/opensrs/domains/dnszone/dnsReset.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class DnsReset extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,13 +26,13 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -52,10 +52,10 @@ private function _processRequest (){
 				'domain' => $this->_dataObject->data->domain
 			)
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->dns_template) && $this->_dataObject->data->dns_template != "") $cmd['attributes']['dns_template'] = $this->_dataObject->data->dns_template;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -63,7 +63,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/dnszone/dnsSet.php b/opensrs/domains/dnszone/dnsSet.php
index b25813b6..143c999a 100644
--- a/opensrs/domains/dnszone/dnsSet.php
+++ b/opensrs/domains/dnszone/dnsSet.php
@@ -9,7 +9,7 @@
 * @license  MIT License (http://www.opensource.org/licenses/mit-license.php)
 * @link
 */
- 
+
 class DnsSet extends openSRS_base
 {
     private $_dataObject;
@@ -45,7 +45,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		if ($allPassed) {
 			$this->_processRequest ();
 		} else {
@@ -72,8 +72,8 @@ private function _processRequest (){
 
 		// records - A
 		if (isset($this->_dataObject->data->a) && count($this->_dataObject->data->a) > 0) {
-			$as = array();			
-			foreach ($this->_dataObject->data->a as $key => $value) {	
+			$as = array();
+			foreach ($this->_dataObject->data->a as $key => $value) {
 				array_push($as, array('ip_address' => $value->ip_address, 'subdomain' => $value->subdomain));
 			}
 			$cmd['attributes']['records']['A'] = $as;
@@ -81,17 +81,17 @@ private function _processRequest (){
 
 		// records - AAAA
 		if (isset($this->_dataObject->data->aaaa) && count($this->_dataObject->data->aaaa) > 0) {
-			$aaaas = array();			
-			foreach ($this->_dataObject->data->aaaa as $key => $val) {	            
+			$aaaas = array();
+			foreach ($this->_dataObject->data->aaaa as $key => $val) {
 				array_push($aaaas, array('ipv6_address' => $val->ipv6_address, 'subdomain' => $val->subdomain));
 			}
 			$cmd['attributes']['records']['AAAA'] = $aaaas;
 		}
-		
+
 		// records - CNAME
 		if (isset($this->_dataObject->data->cname) && count($this->_dataObject->data->cname) > 0) {
-			$cnames = array();			
-			foreach ($this->_dataObject->data->cname as $key => $val) {	
+			$cnames = array();
+			foreach ($this->_dataObject->data->cname as $key => $val) {
 				array_push($cnames, array('hostname' => $val->hostname, 'subdomain' => $val->subdomain));
 			}
 			$cmd['attributes']['records']['CNAME'] = $cnames;
@@ -99,12 +99,12 @@ private function _processRequest (){
 
 		// records - MX
 		if (isset($this->_dataObject->data->mx) && count($this->_dataObject->data->mx) > 0) {
-			$mxs = array();			
-			foreach ($this->_dataObject->data->mx as $key => $val) {	
-				array_push($mxs, 
+			$mxs = array();
+			foreach ($this->_dataObject->data->mx as $key => $val) {
+				array_push($mxs,
 					array(
-						'priority' => $val->priority, 
-						'subdomain' => $val->subdomain, 
+						'priority' => $val->priority,
+						'subdomain' => $val->subdomain,
 						'hostname' => $val->hostname
 					)
 				);
@@ -114,13 +114,13 @@ private function _processRequest (){
 
 		// records - SRV
 		if (isset($this->_dataObject->data->srv) && count($this->_dataObject->data->srv) > 0) {
-			$srvs = array();			
-			foreach ($this->_dataObject->data->srv as $key => $val) {	
-				array_push($srvs, 
+			$srvs = array();
+			foreach ($this->_dataObject->data->srv as $key => $val) {
+				array_push($srvs,
 					array(
-						'priority' => $val->priority, 
-						'weight' => $val->weight, 
-						'subdomain' => $val->subdomain, 
+						'priority' => $val->priority,
+						'weight' => $val->weight,
+						'subdomain' => $val->subdomain,
 						'hostname' => $val->hostname,
 						'port' => $val->port
 					)
@@ -132,12 +132,12 @@ private function _processRequest (){
 		// records - TXT
 		if (isset($this->_dataObject->data->txt) && count($this->_dataObject->data->txt) > 0) {
 			$txts = array();
-			foreach ($this->_dataObject->data->txt as $key => $val) {	
+			foreach ($this->_dataObject->data->txt as $key => $val) {
 				array_push($txts, array('subdomain' => $val->subdomain, 'text' => $val->text));
 			}
 			$cmd['attributes']['records']['TXT'] = $txts;
 		}
-	    
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -145,7 +145,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/forwarding/fwdCreate.php b/opensrs/domains/forwarding/fwdCreate.php
index c7d911c0..9a032f0d 100644
--- a/opensrs/domains/forwarding/fwdCreate.php
+++ b/opensrs/domains/forwarding/fwdCreate.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class fwdCreate extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -44,10 +44,10 @@ private function _processRequest (){
 			'object' => 'domain',
 			'attributes' => array ()
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->domain) && $this->_dataObject->data->domain != "") $cmd['attributes']['domain'] = $this->_dataObject->data->domain;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -55,7 +55,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/forwarding/fwdDelete.php b/opensrs/domains/forwarding/fwdDelete.php
index 65f9629e..97de6f8d 100644
--- a/opensrs/domains/forwarding/fwdDelete.php
+++ b/opensrs/domains/forwarding/fwdDelete.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class fwdDelete extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -44,10 +44,10 @@ private function _processRequest (){
 			'object' => 'domain',
 			'attributes' => array()
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->domain) && $this->_dataObject->data->domain != "") $cmd['attributes']['domain'] = $this->_dataObject->data->domain;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -55,7 +55,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/forwarding/fwdGet.php b/opensrs/domains/forwarding/fwdGet.php
index bcbba1cf..0a1e5b02 100644
--- a/opensrs/domains/forwarding/fwdGet.php
+++ b/opensrs/domains/forwarding/fwdGet.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class fwdGet extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if ((!isSet($this->_dataObject->data->cookie) || $this->_dataObject->data->cookie == "") && (!isSet($this->_dataObject->data->bypass) || $this->_dataObject->data->bypass == "")) {
 			trigger_error ("oSRS Error - cookie / bypass is not defined.", E_USER_WARNING);
@@ -36,7 +36,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - Both cookie and bypass cannot be set in one call.", E_USER_WARNING);
 			$allPassed = false;
 		}
-						
+
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -61,11 +61,11 @@ private function _processRequest (){
 				'domain' => $this->_dataObject->data->domain
 			)
 		);
-		
+
 		// Cookie / bypass
 		if (isSet($this->_dataObject->data->cookie) && $this->_dataObject->data->cookie != "") $cmd['cookie'] = $this->_dataObject->data->cookie;
 		if (isSet($this->_dataObject->data->bypass) && $this->_dataObject->data->bypass != "") $cmd['domain'] = $this->_dataObject->data->bypass;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -73,7 +73,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult[attributes];
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/forwarding/fwdSet.php b/opensrs/domains/forwarding/fwdSet.php
index b87bdcab..8daa8f9a 100644
--- a/opensrs/domains/forwarding/fwdSet.php
+++ b/opensrs/domains/forwarding/fwdSet.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class fwdSet extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if ((!isSet($this->_dataObject->data->cookie) || $this->_dataObject->data->cookie == "") && (!isSet($this->_dataObject->data->bypass) || $this->_dataObject->data->bypass == "")) {
 			trigger_error ("oSRS Error - cookie / bypass is not defined.", E_USER_WARNING);
@@ -36,7 +36,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - Both cookie and bypass cannot be set in one call.", E_USER_WARNING);
 			$allPassed = false;
 		}
-		
+
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -45,7 +45,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - subdomain is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -63,20 +63,20 @@ private function _processRequest (){
 			'object' => 'domain',
 //			'cookie' => $this->_dataObject->data->cookie,
 			'attributes' => array (
-				'domain' => $this->_dataObject->data->domain, 
+				'domain' => $this->_dataObject->data->domain,
 				'forwarding' => array (
 					array (
 					'subdomain' => $this->_dataObject->data->subdomain
 					)
-					
+
 				)
 			)
 		);
-		
+
 		// Cookie / bypass
 		if (isSet($this->_dataObject->data->cookie) && $this->_dataObject->data->cookie != "") $cmd['cookie'] = $this->_dataObject->data->cookie;
 		if (isSet($this->_dataObject->data->bypass) && $this->_dataObject->data->bypass != "") $cmd['domain'] = $this->_dataObject->data->bypass;
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->description) && $this->_dataObject->data->description != "") $cmd['attributes']['forwarding'][0]['description'] = $this->_dataObject->data->description;
 		if (isSet($this->_dataObject->data->destination_url) && $this->_dataObject->data->destination_url != "") $cmd['attributes']['forwarding'][0]['destination_url'] = $this->_dataObject->data->destination_url;
@@ -84,7 +84,7 @@ private function _processRequest (){
 		if (isSet($this->_dataObject->data->keywords) && $this->_dataObject->data->keywords != "") $cmd['attributes']['forwarding'][0]['keywords'] = $this->_dataObject->data->keywords;
 		if (isSet($this->_dataObject->data->masked) && $this->_dataObject->data->masked != "") $cmd['attributes']['forwarding'][0]['masked'] = $this->_dataObject->data->masked;
 		if (isSet($this->_dataObject->data->title) && $this->_dataObject->data->title != "") $cmd['attributes']['forwarding'][0]['title'] = $this->_dataObject->data->title;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -92,7 +92,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/lookup/allinoneDomain.php b/opensrs/domains/lookup/allinoneDomain.php
index 6f3f8302..6d6e3715 100644
--- a/opensrs/domains/lookup/allinoneDomain.php
+++ b/opensrs/domains/lookup/allinoneDomain.php
@@ -40,7 +40,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - Search domain strinng not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-		
+
 		// Select non empty one
 		if (isSet($this->_dataObject->data->selected) && $this->_dataObject->data->selected != "") $arraSelected = explode (";", $this->_dataObject->data->selected);
 		if (isSet($this->_dataObject->data->defaulttld) && $this->_dataObject->data->defaulttld != "") $arraAll = explode (";", $this->_dataObject->data->defaulttld);
@@ -101,7 +101,7 @@ private function _domainTLD($domain, $request){
 
 		// Results
 		$this->resultFullRaw = $arrayResult;
-		
+
 		// empty premium
 		$this->resultFullRaw = $arrayResult;
 
@@ -123,7 +123,7 @@ private function _domainTLD($domain, $request){
 			$this->resultRaw = $arrayResult;
 		}
 
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/lookup/lookupBelongsToRsp.php b/opensrs/domains/lookup/lookupBelongsToRsp.php
index b0b0d9b9..45d21ff5 100644
--- a/opensrs/domains/lookup/lookupBelongsToRsp.php
+++ b/opensrs/domains/lookup/lookupBelongsToRsp.php
@@ -3,7 +3,7 @@
  *  Required object values:
  *  data - domain
  */
- 
+
 class lookupBelongsToRsp extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -64,7 +64,7 @@ private function _processRequest (){
                 } else {
 			$this->resultRaw = $arrayResult;
 		}
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/lookup/lookupDomain.php b/opensrs/domains/lookup/lookupDomain.php
index 1dd51d0f..baf9b16a 100644
--- a/opensrs/domains/lookup/lookupDomain.php
+++ b/opensrs/domains/lookup/lookupDomain.php
@@ -35,10 +35,10 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - Search domain strinng not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-		
+
 		if (isSet($this->_dataObject->data->selected) && $this->_dataObject->data->selected != "") $arraSelected = explode (";", $this->_dataObject->data->selected);
 		if (isSet($this->_dataObject->data->defaulttld) && $this->_dataObject->data->defaulttld != "") $arraAll = explode (";", $this->_dataObject->data->defaulttld);
-		
+
 		if (count($arraSelected) == 0) {
 			if (count($arraAll) == 0){
 				$arraCall = array (".com",".net",".org", ".ca");
@@ -48,7 +48,7 @@ private function _validateObject (){
 		} else {
 			$arraCall = $arraSelected;
 		}
-		
+
 		// Call function
 		if ($allPassed) {
 			$resObject = $this->_domainTLD ($domain, $arraCall);
@@ -92,7 +92,7 @@ private function _domainTLD($domain, $request){
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// FLip XML to Array
 //		print_r ($arrayResult);
 //		echo ("\n\n\n");
-		
+
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		if (isSet($arrayResult['attributes']['lookup']['items'])){
@@ -100,8 +100,8 @@ private function _domainTLD($domain, $request){
 		} else {
 			$this->resultRaw = $arrayResult;
 		}
-				
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/lookup/lookupGetBalance.php b/opensrs/domains/lookup/lookupGetBalance.php
index df3b9686..e526d0b9 100644
--- a/opensrs/domains/lookup/lookupGetBalance.php
+++ b/opensrs/domains/lookup/lookupGetBalance.php
@@ -3,7 +3,7 @@
  *  Required object values:
  *  - none -
  */
- 
+
 class lookupGetBalance extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -55,8 +55,8 @@ private function _processRequest (){
             $this->resultRaw = $arrayResult['attributes'];
         else
             $this->resultRaw = $arrayResult;
-                
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/lookup/lookupGetCaBlockerList.php b/opensrs/domains/lookup/lookupGetCaBlockerList.php
index 0c4a3c44..4f15592e 100644
--- a/opensrs/domains/lookup/lookupGetCaBlockerList.php
+++ b/opensrs/domains/lookup/lookupGetCaBlockerList.php
@@ -3,7 +3,7 @@
  *  Required object values:
  *  data - domain - .CA only
  */
- 
+
 class lookupGetCaBlockerList extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -59,7 +59,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/lookup/lookupGetDeletedDomains.php b/opensrs/domains/lookup/lookupGetDeletedDomains.php
index 95b93e4c..279e208d 100644
--- a/opensrs/domains/lookup/lookupGetDeletedDomains.php
+++ b/opensrs/domains/lookup/lookupGetDeletedDomains.php
@@ -79,7 +79,7 @@ private function _processRequest (){
 			"object" => "domain",
 			"attributes" => array ()
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->owner_email) && $this->_dataObject->data->owner_email != "") $cmd['attributes']['owner_email'] = $this->_dataObject->data->owner_email;
 		if (isSet($this->_dataObject->data->admin_email) && $this->_dataObject->data->admin_email != "") $cmd['attributes']['admin_email'] = $this->_dataObject->data->admin_email;
@@ -103,7 +103,7 @@ private function _processRequest (){
                 } else {
 			$this->resultRaw = $arrayResult;
 		}
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/lookup/lookupGetDomain.php b/opensrs/domains/lookup/lookupGetDomain.php
index 113a544f..811492a8 100644
--- a/opensrs/domains/lookup/lookupGetDomain.php
+++ b/opensrs/domains/lookup/lookupGetDomain.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class lookupGetDomain extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,17 +26,17 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (empty($this->_dataObject->data->cookie) && empty($this->_dataObject->data->domain) ) {
 			trigger_error ("oSRS Error - cookie and domain are not defined.", E_USER_WARNING);
 		 	$allPassed = false;
 		}
-						
+
 		if (empty($this->_dataObject->data->type)) {
 		 	trigger_error ("oSRS Error - type is not defined.", E_USER_WARNING);
 		 	$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -56,18 +56,18 @@ private function _processRequest (){
 				'type' => $this->_dataObject->data->type
 			)
 		);
-		
+
 		if (isSet($this->_dataObject->data->cookie) && $this->_dataObject->data->cookie != "") $cmd['cookie'] = $this->_dataObject->data->cookie;
 		if (isSet($this->_dataObject->data->domain) && $this->_dataObject->data->domain != "") $cmd['domain'] = $this->_dataObject->data->domain;
 		if (isSet($this->_dataObject->data->registrant_ip) && $this->_dataObject->data->registrant_ip != "") $cmd['registrant_ip'] = $this->_dataObject->data->registrant_ip;
-				
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->limit) && $this->_dataObject->data->limit != "") $cmd['attributes']['limit'] = $this->_dataObject->data->limit;
                 if (isSet($this->_dataObject->data->domain) && $this->_dataObject->data->domain != "") $cmd['attributes']['domain_name'] = $this->_dataObject->data->domain;
 		if (isSet($this->_dataObject->data->page) && $this->_dataObject->data->page != "") $cmd['attributes']['page'] = $this->_dataObject->data->page;
 		if (isSet($this->_dataObject->data->max_to_expiry) && $this->_dataObject->data->max_to_expiry != "") $cmd['attributes']['max_to_expiry'] = $this->_dataObject->data->max_to_expiry;
 		if (isSet($this->_dataObject->data->min_to_expiry) && $this->_dataObject->data->min_to_expiry != "") $cmd['attributes']['min_to_expiry'] = $this->_dataObject->data->min_to_expiry;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -75,7 +75,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/lookup/lookupGetDomainsByExpiry.php b/opensrs/domains/lookup/lookupGetDomainsByExpiry.php
index 173a464d..835643b3 100644
--- a/opensrs/domains/lookup/lookupGetDomainsByExpiry.php
+++ b/opensrs/domains/lookup/lookupGetDomainsByExpiry.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->exp_from)) {
 			trigger_error ("oSRS Error - exp_from is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -76,7 +76,7 @@ private function _processRequest (){
                 } else {
 			$this->resultRaw = $arrayResult;
 		}
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/lookup/lookupGetDomainsContacts.php b/opensrs/domains/lookup/lookupGetDomainsContacts.php
index a8edd009..e83cda15 100644
--- a/opensrs/domains/lookup/lookupGetDomainsContacts.php
+++ b/opensrs/domains/lookup/lookupGetDomainsContacts.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->domain_list)) {
 			trigger_error ("oSRS Error - Domain list is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -47,7 +47,7 @@ private function _validateObject (){
 	// Post validation functions
 	private function _processRequest (){
 		$domainListArray = explode (",", $this->_dataObject->data->domain_list);
-	
+
 		$cmd = array(
 			"protocol" => "XCP",
 			"action" => "GET_DOMAINS_CONTACTS",
@@ -68,7 +68,7 @@ private function _processRequest (){
                 } else {
 			$this->resultRaw = $arrayResult;
 		}
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/lookup/lookupGetNotes.php b/opensrs/domains/lookup/lookupGetNotes.php
index 1afed286..6085cac7 100644
--- a/opensrs/domains/lookup/lookupGetNotes.php
+++ b/opensrs/domains/lookup/lookupGetNotes.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->domain)) {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -60,7 +60,7 @@ private function _processRequest (){
 				'type' => $this->_dataObject->data->type
 			)
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->page) && $this->_dataObject->data->page != "") $cmd['attributes']['page'] = $this->_dataObject->data->page;
 		if (isSet($this->_dataObject->data->limit) && $this->_dataObject->data->limit != "") $cmd['attributes']['limit'] = $this->_dataObject->data->limit;
@@ -78,7 +78,7 @@ private function _processRequest (){
                 } else {
 			$this->resultRaw = $arrayResult;
 		}
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/lookup/lookupGetOrderInfo.php b/opensrs/domains/lookup/lookupGetOrderInfo.php
index ab977a2c..d77f4aaa 100644
--- a/opensrs/domains/lookup/lookupGetOrderInfo.php
+++ b/opensrs/domains/lookup/lookupGetOrderInfo.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->order_id)) {
 			trigger_error ("oSRS Error - order_id is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -54,7 +54,7 @@ private function _processRequest (){
 				"order_id" => $this->_dataObject->data->order_id
 			)
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->page) && $this->_dataObject->data->page != "") $cmd['attributes']['page'] = $this->_dataObject->data->page;
 		if (isSet($this->_dataObject->data->limit) && $this->_dataObject->data->limit != "") $cmd['attributes']['limit'] = $this->_dataObject->data->limit;
@@ -68,7 +68,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/lookup/lookupGetOrdersByDomain.php b/opensrs/domains/lookup/lookupGetOrdersByDomain.php
index fde4ade5..898058f8 100644
--- a/opensrs/domains/lookup/lookupGetOrdersByDomain.php
+++ b/opensrs/domains/lookup/lookupGetOrdersByDomain.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->domain)) {
 			trigger_error ("oSRS Error - Domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -54,7 +54,7 @@ private function _processRequest (){
 				'domain' => $this->_dataObject->data->domain
 			)
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->page) && $this->_dataObject->data->page != "") $cmd['attributes']['page'] = $this->_dataObject->data->page;
 		if (isSet($this->_dataObject->data->order_from) && $this->_dataObject->data->order_from != "") $cmd['attributes']['order_from'] = $this->_dataObject->data->order_from;
@@ -74,7 +74,7 @@ private function _processRequest (){
                 } else {
 			$this->resultRaw = $arrayResult;
 		}
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/lookup/lookupGetPrice.php b/opensrs/domains/lookup/lookupGetPrice.php
index 67f77d38..00b90963 100644
--- a/opensrs/domains/lookup/lookupGetPrice.php
+++ b/opensrs/domains/lookup/lookupGetPrice.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->domain)) {
 			trigger_error ("oSRS Error - Domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -54,7 +54,7 @@ private function _processRequest (){
 				'domain' => $this->_dataObject->data->domain
 			)
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->period) && $this->_dataObject->data->period != "") $cmd['attributes']['period'] = $this->_dataObject->data->period;
 		if (isSet($this->_dataObject->data->reg_type) && $this->_dataObject->data->reg_type != "") $cmd['attributes']['reg_type'] = $this->_dataObject->data->reg_type;
@@ -70,7 +70,7 @@ private function _processRequest (){
                 } else {
 			$this->resultRaw = $arrayResult;
 		}
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/lookup/lookupLookupDomain.php b/opensrs/domains/lookup/lookupLookupDomain.php
index 89f96117..dc3cd3d2 100644
--- a/opensrs/domains/lookup/lookupLookupDomain.php
+++ b/opensrs/domains/lookup/lookupLookupDomain.php
@@ -35,7 +35,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - Search domain strinng not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-		
+
 		// Call function
 		if ($allPassed) {
 			$this->_processRequest ();
@@ -54,7 +54,7 @@ private function _processRequest (){
 				'domain' => $this->_dataObject->data->domain,
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -66,7 +66,7 @@ private function _processRequest (){
                 } else {
 			$this->resultRaw = $arrayResult;
 		}
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/lookup/lookupNameSuggest.php b/opensrs/domains/lookup/lookupNameSuggest.php
index c6154abc..535a4ede 100644
--- a/opensrs/domains/lookup/lookupNameSuggest.php
+++ b/opensrs/domains/lookup/lookupNameSuggest.php
@@ -43,7 +43,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - Search domain strinng not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-		
+
 		// Select non empty one
 
                 // Name Suggestion Choice Check
@@ -125,7 +125,7 @@ private function _domainTLD($domain, $nstlds, $lktlds){
 
 		// Results
 		$this->resultFullRaw = $arrayResult;
-		
+
 		if (isSet($arrayResult['attributes'])){
 
                     $this->resultRaw = array (
@@ -137,7 +137,7 @@ private function _domainTLD($domain, $nstlds, $lktlds){
 			$this->resultRaw = $arrayResult;
 		}
 
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/lookup/premiumDomain.php b/opensrs/domains/lookup/premiumDomain.php
index e20e2d29..4d004e77 100644
--- a/opensrs/domains/lookup/premiumDomain.php
+++ b/opensrs/domains/lookup/premiumDomain.php
@@ -51,7 +51,7 @@ private function _validateObject (){
 		} else {
 			$arraCall = $arraSelected;
 		}
-		
+
 		// Call function
 		if ($allPassed) {
 			$resObject = $this->_domainTLD ($domain, $arraCall);
@@ -93,10 +93,10 @@ private function _domainTLD($domain, $request){
 		if (isSet($arrayResult['attributes']['premium']['items'])) {
 			$this->resultRaw = $arrayResult['attributes']['premium']['items'];
 		} else {
-			$this->resultRaw = $arrayResult;						// Null if there are no premium domains 
+			$this->resultRaw = $arrayResult;						// Null if there are no premium domains
 		}
 
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/lookup/suggestDomain.php b/opensrs/domains/lookup/suggestDomain.php
index 5cf28350..60867c6a 100644
--- a/opensrs/domains/lookup/suggestDomain.php
+++ b/opensrs/domains/lookup/suggestDomain.php
@@ -52,7 +52,7 @@ private function _validateObject (){
 		} else {
 			$arraCall = $arraSelected;
 		}
-		
+
 		// Call function
 		if ($allPassed) {
 			$resObject = $this->_domainTLD ($domain, $arraCall);
@@ -83,7 +83,7 @@ private function _domainTLD($domain, $request){
                 if(isSet($this->_dataObject->data->maximum) && $this->_dataObject->data->maximum != ""){
                     $cmd['attributes']['service_override']['suggestion']['maximum'] = $this->_dataObject->data->maximum;
                 }
-		
+
 //		print_r ($cmd);
 //		echo ("\n\n\n");
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
@@ -103,8 +103,8 @@ private function _domainTLD($domain, $request){
 		} else {
 			$this->resultRaw = $arrayResult;
 		}
-		
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/nameserver/nsAdvancedUpdt.php b/opensrs/domains/nameserver/nsAdvancedUpdt.php
index 28802373..408fd6f1 100644
--- a/opensrs/domains/nameserver/nsAdvancedUpdt.php
+++ b/opensrs/domains/nameserver/nsAdvancedUpdt.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class nsAdvancedUpdt extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if ((!isSet($this->_dataObject->data->cookie) || $this->_dataObject->data->cookie == "") && (!isSet($this->_dataObject->data->bypass) || $this->_dataObject->data->bypass == "")) {
 			trigger_error ("oSRS Error - cookie / bypass is not defined.", E_USER_WARNING);
@@ -42,7 +42,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - op_type is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -63,11 +63,11 @@ private function _processRequest (){
 				'op_type' => $this->_dataObject->data->op_type
 			)
 		);
-		
+
 		// Cookie / bypass
 		if (isSet($this->_dataObject->data->cookie) && $this->_dataObject->data->cookie != "") $cmd['cookie'] = $this->_dataObject->data->cookie;
 		if (isSet($this->_dataObject->data->bypass) && $this->_dataObject->data->bypass != "") $cmd['domain'] = $this->_dataObject->data->bypass;
-		
+
 				// Command optional values
 		if (isSet($this->_dataObject->data->add_ns) && $this->_dataObject->data->add_ns != "") {
 			$tempAdd = explode (",", $this->_dataObject->data->add_ns);
@@ -81,7 +81,7 @@ private function _processRequest (){
 			$tempAdd = explode (",", $this->_dataObject->data->remove_ns);
 			$cmd['attributes']['remove_ns'] = $tempAdd;
 		}
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -89,7 +89,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/nameserver/nsCreate.php b/opensrs/domains/nameserver/nsCreate.php
index 575be48a..df7ec410 100644
--- a/opensrs/domains/nameserver/nsCreate.php
+++ b/opensrs/domains/nameserver/nsCreate.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class nsCreate extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if ((!isSet($this->_dataObject->data->cookie) || $this->_dataObject->data->cookie == "") && (!isSet($this->_dataObject->data->bypass) || $this->_dataObject->data->bypass == "")) {
 			trigger_error ("oSRS Error - cookie / bypass is not defined.", E_USER_WARNING);
@@ -36,7 +36,7 @@ private function _validateObject (){
 	  	isSet($this->_dataObject->data->bypass) && $this->_dataObject->data->bypass != "" ) {
 			trigger_error ("oSRS Error - Both cookie and bypass cannot be set in one call.", E_USER_WARNING);
 			$allPassed = false;
-		}		
+		}
 		if (!isSet($this->_dataObject->data->name) || $this->_dataObject->data->name == "") {
 			trigger_error ("oSRS Error - name is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -45,7 +45,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - ipaddress is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -68,14 +68,14 @@ private function _processRequest (){
 				'ipaddress' => $this->_dataObject->data->ipaddress
 			)
 		);
-		
+
 		// Cookie / bypass
 		if (isSet($this->_dataObject->data->cookie) && $this->_dataObject->data->cookie != "") $cmd['cookie'] = $this->_dataObject->data->cookie;
 		if (isSet($this->_dataObject->data->bypass) && $this->_dataObject->data->bypass != "") $cmd['domain'] = $this->_dataObject->data->bypass;
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->add_to_all_registry) && $this->_dataObject->data->add_to_all_registry != "") $cmd['attributes']['add_to_all_registry'] = $this->_dataObject->data->add_to_all_registry;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -83,7 +83,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/nameserver/nsDelete.php b/opensrs/domains/nameserver/nsDelete.php
index 549251ec..691861b2 100644
--- a/opensrs/domains/nameserver/nsDelete.php
+++ b/opensrs/domains/nameserver/nsDelete.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class nsDelete extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if ((!isSet($this->_dataObject->data->cookie) || $this->_dataObject->data->cookie == "") && (!isSet($this->_dataObject->data->bypass) || $this->_dataObject->data->bypass == "")) {
 			trigger_error ("oSRS Error - cookie / bypass is not defined.", E_USER_WARNING);
@@ -41,7 +41,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - name is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -64,11 +64,11 @@ private function _processRequest (){
 				'ipaddress' => $this->_dataObject->data->ipaddress
 			)
 		);
-		
+
 		// Cookie / bypass
 		if (isSet($this->_dataObject->data->cookie) && $this->_dataObject->data->cookie != "") $cmd['cookie'] = $this->_dataObject->data->cookie;
 		if (isSet($this->_dataObject->data->bypass) && $this->_dataObject->data->bypass != "") $cmd['domain'] = $this->_dataObject->data->bypass;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -76,7 +76,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/nameserver/nsGet.php b/opensrs/domains/nameserver/nsGet.php
index 8bd18952..6017fabf 100644
--- a/opensrs/domains/nameserver/nsGet.php
+++ b/opensrs/domains/nameserver/nsGet.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class nsGet extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if ((!isSet($this->_dataObject->data->cookie) || $this->_dataObject->data->cookie == "") && (!isSet($this->_dataObject->data->bypass) || $this->_dataObject->data->bypass == "")) {
 			trigger_error ("oSRS Error - cookie / bypass is not defined.", E_USER_WARNING);
@@ -41,7 +41,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - name is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -63,11 +63,11 @@ private function _processRequest (){
 				'name' => $this->_dataObject->data->name
 			)
 		);
-		
+
 		// Cookie / bypass
 		if (isSet($this->_dataObject->data->cookie) && $this->_dataObject->data->cookie != "") $cmd['cookie'] = $this->_dataObject->data->cookie;
 		if (isSet($this->_dataObject->data->bypass) && $this->_dataObject->data->bypass != "") $cmd['domain'] = $this->_dataObject->data->bypass;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -79,7 +79,7 @@ private function _processRequest (){
 		} else {
 			$this->resultRaw = $arrayResult;
 		}
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/nameserver/nsModify.php b/opensrs/domains/nameserver/nsModify.php
index 9da67fd5..4046cc03 100644
--- a/opensrs/domains/nameserver/nsModify.php
+++ b/opensrs/domains/nameserver/nsModify.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class nsModify extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if ((!isSet($this->_dataObject->data->cookie) || $this->_dataObject->data->cookie == "") && (!isSet($this->_dataObject->data->bypass) || $this->_dataObject->data->bypass == "")) {
 			trigger_error ("oSRS Error - cookie / bypass is not defined.", E_USER_WARNING);
@@ -45,7 +45,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - name is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -68,14 +68,14 @@ private function _processRequest (){
 				'name' => $this->_dataObject->data->name
 			)
 		);
-		
+
 		// Cookie / bypass
 		if (isSet($this->_dataObject->data->cookie) && $this->_dataObject->data->cookie != "") $cmd['cookie'] = $this->_dataObject->data->cookie;
 		if (isSet($this->_dataObject->data->bypass) && $this->_dataObject->data->bypass != "") $cmd['domain'] = $this->_dataObject->data->bypass;
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->new_name) && $this->_dataObject->data->new_name != "") $cmd['attributes']['new_name'] = $this->_dataObject->data->new_name;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -83,7 +83,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/nameserver/nsRegistryAdd.php b/opensrs/domains/nameserver/nsRegistryAdd.php
index cc91e79d..800b4124 100644
--- a/opensrs/domains/nameserver/nsRegistryAdd.php
+++ b/opensrs/domains/nameserver/nsRegistryAdd.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class nsRegistryAdd extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->fqdn) || $this->_dataObject->data->fqdn == "") {
 			trigger_error ("oSRS Error - fqdn is not defined.", E_USER_WARNING);
@@ -40,7 +40,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - all is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -62,7 +62,7 @@ private function _processRequest (){
 				'all' => $this->_dataObject->data->all
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -74,7 +74,7 @@ private function _processRequest (){
                 } else {
 			$this->resultRaw = $arrayResult;
 		}
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/nameserver/nsRegistryCheck.php b/opensrs/domains/nameserver/nsRegistryCheck.php
index 0bb0a090..a5561483 100644
--- a/opensrs/domains/nameserver/nsRegistryCheck.php
+++ b/opensrs/domains/nameserver/nsRegistryCheck.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class nsRegistryCheck extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->fqdn) || $this->_dataObject->data->fqdn == "") {
 			trigger_error ("oSRS Error - fqdn is not defined.", E_USER_WARNING);
@@ -36,7 +36,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - tld is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -57,7 +57,7 @@ private function _processRequest (){
 				'tld' => $this->_dataObject->data->tld
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -65,7 +65,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/personalnames/persDelete.php b/opensrs/domains/personalnames/persDelete.php
index 7b8a866f..fcfdb256 100644
--- a/opensrs/domains/personalnames/persDelete.php
+++ b/opensrs/domains/personalnames/persDelete.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class persDelete extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,13 +26,13 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -52,7 +52,7 @@ private function _processRequest (){
 				'domain' => $this->_dataObject->data->domain
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -60,7 +60,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/personalnames/persNameSuggest.php b/opensrs/domains/personalnames/persNameSuggest.php
index 981f6e5c..a877eeb7 100644
--- a/opensrs/domains/personalnames/persNameSuggest.php
+++ b/opensrs/domains/personalnames/persNameSuggest.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class persNameSuggest extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,13 +26,13 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->searchstring) || $this->_dataObject->data->searchstring == "") {
 			trigger_error ("oSRS Error - searchstring is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -52,12 +52,12 @@ private function _processRequest (){
 				'searchstring' => $this->_dataObject->data->searchstring
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		trigger_error($xmlCMD);
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		trigger_error($XMLresult);
-		
+
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
 
 		// Results
@@ -67,7 +67,7 @@ private function _processRequest (){
                 } else {
 			$this->resultRaw = $arrayResult;
 		}
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/personalnames/persQuery.php b/opensrs/domains/personalnames/persQuery.php
index 07dc0425..9e84d85d 100644
--- a/opensrs/domains/personalnames/persQuery.php
+++ b/opensrs/domains/personalnames/persQuery.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class persQuery extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,13 +26,13 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -52,11 +52,11 @@ private function _processRequest (){
 				'domain' => $this->_dataObject->data->domain
 			)
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->query_dns) && $this->_dataObject->data->query_dns != "") $cmd['attributes']['query_dns'] = $this->_dataObject->data->query_dns;
 		if (isSet($this->_dataObject->data->query_email) && $this->_dataObject->data->query_email != "") $cmd['attributes']['query_email'] = $this->_dataObject->data->query_email;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -64,7 +64,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/personalnames/persSUregister.php b/opensrs/domains/personalnames/persSUregister.php
index 0f5ceeb1..5aee6c58 100644
--- a/opensrs/domains/personalnames/persSUregister.php
+++ b/opensrs/domains/personalnames/persSUregister.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class persSUregister extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
@@ -40,7 +40,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - password is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -64,7 +64,7 @@ private function _processRequest (){
 				)
 			)
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->forward_email) && $this->_dataObject->data->forward_email != "") $cmd['attributes']['mailbox']['forward_email'] = $this->_dataObject->data->forward_email;
 		$content = "";
@@ -78,7 +78,7 @@ private function _processRequest (){
 			$cmd['attributes']['dnsRecords']['name'] = $name;
 			$cmd['attributes']['dnsRecords']['type'] = $type;
 		}
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -86,7 +86,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/personalnames/persUpdate.php b/opensrs/domains/personalnames/persUpdate.php
index 2a1a30ed..ab9a2022 100644
--- a/opensrs/domains/personalnames/persUpdate.php
+++ b/opensrs/domains/personalnames/persUpdate.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class persUpdate extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,13 +26,13 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -49,10 +49,10 @@ private function _processRequest (){
 			'action' => 'UPDATE',
 			'object' => 'SURNAME',
 			'attributes' => array (
-				'domain' => $this->_dataObject->data->domain 
+				'domain' => $this->_dataObject->data->domain
 			)
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->mailbox_type) && $this->_dataObject->data->mailbox_type != "") $cmd['attributes']['mailbox']['mailbox_type'] = $this->_dataObject->data->mailbox_type;
 		if (isSet($this->_dataObject->data->password) && $this->_dataObject->data->password != "") $cmd['attributes']['mailbox']['password'] = $this->_dataObject->data->password;
@@ -61,7 +61,7 @@ private function _processRequest (){
 		if (isSet($this->_dataObject->data->type) && $this->_dataObject->data->type != "") $cmd['attributes']['dnsRecords'][0]['type'] = $this->_dataObject->data->type;
 		if (isSet($this->_dataObject->data->name) && $this->_dataObject->data->name != "") $cmd['attributes']['dnsRecords'][0]['name'] = $this->_dataObject->data->name;
 		if (isSet($this->_dataObject->data->content) && $this->_dataObject->data->content != "") $cmd['attributes']['dnsRecords'][0]['content'] = $this->_dataObject->data->content;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -69,7 +69,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/domains/provisioning/provActivate.php b/opensrs/domains/provisioning/provActivate.php
index 8993e516..27a9186d 100644
--- a/opensrs/domains/provisioning/provActivate.php
+++ b/opensrs/domains/provisioning/provActivate.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class provActivate extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if ((!isSet($this->_dataObject->data->cookie) || $this->_dataObject->data->cookie == "") && (!isSet($this->_dataObject->data->bypass) || $this->_dataObject->data->bypass == "")) {
 			trigger_error ("oSRS Error - cookie / bypass is not defined.", E_USER_WARNING);
@@ -36,7 +36,7 @@ private function _validateObject (){
 	  	isSet($this->_dataObject->data->bypass) && $this->_dataObject->data->bypass != "" ) {
 			trigger_error ("oSRS Error - Both cookie and bypass cannot be set in one call.", E_USER_WARNING);
 			$allPassed = false;
-		}		
+		}
 		if (!isSet($this->_dataObject->data->domainname)) {
 			trigger_error ("oSRS Error - domainname is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -62,11 +62,11 @@ private function _processRequest (){
 				'domainname' => $this->_dataObject->data->domainname
 			)
 		);
-		
+
 		// Cookie / bypass
 		if (isSet($this->_dataObject->data->cookie) && $this->_dataObject->data->cookie != "") $cmd['cookie'] = $this->_dataObject->data->cookie;
 		if (isSet($this->_dataObject->data->bypass) && $this->_dataObject->data->bypass != "") $cmd['domain'] = $this->_dataObject->data->bypass;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -74,7 +74,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/provisioning/provCancelActivate.php b/opensrs/domains/provisioning/provCancelActivate.php
index d915d699..b9b8a907 100644
--- a/opensrs/domains/provisioning/provCancelActivate.php
+++ b/opensrs/domains/provisioning/provCancelActivate.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class provCancelActivate extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,13 +26,13 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->order_id)) {
 			trigger_error ("oSRS Error - order_id is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -52,7 +52,7 @@ private function _processRequest (){
 				'order_id' => $this->_dataObject->data->order_id
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -60,7 +60,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/provisioning/provCancelPending.php b/opensrs/domains/provisioning/provCancelPending.php
index 2a2aa993..458e7b66 100644
--- a/opensrs/domains/provisioning/provCancelPending.php
+++ b/opensrs/domains/provisioning/provCancelPending.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class provCancelPending extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,13 +26,13 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->to_date) || $this->_dataObject->data->to_date == "") {
 			trigger_error ("oSRS Error - to_date is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -52,12 +52,12 @@ private function _processRequest (){
 				'to_date' => $this->_dataObject->data->to_date
 			)
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->status) && $this->_dataObject->data->status != "") {
-			$cmd['attributes']['status'] = explode (",", $this->_dataObject->data->status);	
+			$cmd['attributes']['status'] = explode (",", $this->_dataObject->data->status);
 		}
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -69,7 +69,7 @@ private function _processRequest (){
                 } else {
 			$this->resultRaw = $arrayResult;
 		}
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/provisioning/provModify.php b/opensrs/domains/provisioning/provModify.php
index 2669ad6b..ae9ed47c 100644
--- a/opensrs/domains/provisioning/provModify.php
+++ b/opensrs/domains/provisioning/provModify.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class provModify extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (empty($this->_dataObject->data->cookie) && empty($this->_dataObject->data->domain) ) {
 			trigger_error ("oSRS Error - cookie and/or domain is not defined.", E_USER_WARNING);
@@ -40,7 +40,7 @@ private function _validateObject (){
 		if (!isSet($this->_dataObject->data->data) || $this->_dataObject->data->data == "") {
 			trigger_error ("oSRS Error - data variable that defines the modify type is not defined.", E_USER_WARNING);
 			$allPassed = false;
-				
+
 		}else{
 
 			switch($this->_dataObject->data->data){
@@ -102,7 +102,7 @@ private function _validateObject (){
 					break;
 			}
 		}
-	
+
 
 		// Run the command
 		if ($allPassed) {
@@ -141,7 +141,7 @@ private function _allCedInfoCheck(){
 			trigger_error ("oSRS Error - change type is ced_info but locality_state_prov is not defined.", E_USER_WARNING);
 			$allCedInfo = false;
 		}
-	
+
 		return $allCedInfo;
 	}
 
@@ -157,7 +157,7 @@ private function _allRspWhoisInfoCheck(){
 			trigger_error ("oSRS Error - change type is rsp_whois_info but flag is not defined.", E_USER_WARNING);
 			$allRspWhoisInfo = false;
 		}
-	
+
 		return $allRspWhoisInfo;
 	}
 
@@ -237,7 +237,7 @@ private function _allForwardingEmailCheck(){
 	}
 
 	private function _allNexusInfoCheck(){
-		$allNexusInfo=true;	
+		$allNexusInfo=true;
 		if (!isSet($this->_dataObject->data->nexus) || $this->_dataObject->data->nexus == "") {
 			trigger_error ("oSRS Error - data type is nexus_info but nexus is not defined.", E_USER_WARNING);
 			$allNexusInfo = false;
@@ -314,60 +314,60 @@ private function _processRequest (){
 				'data' => $this->_dataObject->data->data
 			)
 		);
-		
+
 		if (isSet($this->_dataObject->data->cookie) && $this->_dataObject->data->cookie != "") $cmd['cookie'] = $this->_dataObject->data->cookie;
 		if (isSet($this->_dataObject->data->domain) && $this->_dataObject->data->domain != "") $cmd['attributes']['domain']  = $this->_dataObject->data->domain;
 
 		// Command optional values
-		
+
 		switch($this->_dataObject->data->data){
 			case "ced_info":
 				// ced_info data
-				if (isSet($this->_dataObject->data->ced_info->contact_type) && $this->_dataObject->data->ced_info->contact_type != "") 
+				if (isSet($this->_dataObject->data->ced_info->contact_type) && $this->_dataObject->data->ced_info->contact_type != "")
 					$cmd['attributes']['ced_info']['contact_type'] = $this->_dataObject->data->ced_info->contact_type;
-				if (isSet($this->_dataObject->data->ced_info->id_number) && $this->_dataObject->data->ced_info->id_number != "") 
+				if (isSet($this->_dataObject->data->ced_info->id_number) && $this->_dataObject->data->ced_info->id_number != "")
 					$cmd['attributes']['ced_info']['id_number'] = $this->_dataObject->data->ced_info->id_number;
-				if (isSet($this->_dataObject->data->ced_info->id_type) && $this->_dataObject->data->ced_info->id_type != "") 
+				if (isSet($this->_dataObject->data->ced_info->id_type) && $this->_dataObject->data->ced_info->id_type != "")
 					$cmd['attributes']['ced_info']['id_type'] = $this->_dataObject->data->ced_info->id_type;
-				if (isSet($this->_dataObject->data->ced_info->id_type_info) && $this->_dataObject->data->ced_info->id_type_info != "") 
+				if (isSet($this->_dataObject->data->ced_info->id_type_info) && $this->_dataObject->data->ced_info->id_type_info != "")
 					$cmd['attributes']['ced_info']['id_type_info'] = $this->_dataObject->data->ced_info->id_type_info;
-				if (isSet($this->_dataObject->data->ced_info->legal_entity_type) && $this->_dataObject->data->ced_info->legal_entity_type != "") 
+				if (isSet($this->_dataObject->data->ced_info->legal_entity_type) && $this->_dataObject->data->ced_info->legal_entity_type != "")
 					$cmd['attributes']['ced_info']['legal_entity_type'] = $this->_dataObject->data->ced_info->legal_entity_type;
-				if (isSet($this->_dataObject->data->ced_info->legal_entity_type_info) && $this->_dataObject->data->ced_info->legal_entity_type_info != "") 
+				if (isSet($this->_dataObject->data->ced_info->legal_entity_type_info) && $this->_dataObject->data->ced_info->legal_entity_type_info != "")
 					$cmd['attributes']['ced_info']['legal_entity_type_info'] = $this->_dataObject->data->ced_info->legal_entity_type_info;
-				if (isSet($this->_dataObject->data->ced_info->locality_city) && $this->_dataObject->data->ced_info->locality_city != "") 
+				if (isSet($this->_dataObject->data->ced_info->locality_city) && $this->_dataObject->data->ced_info->locality_city != "")
 					$cmd['attributes']['ced_info']['locality_city'] = $this->_dataObject->data->ced_info->locality_city;
-				if (isSet($this->_dataObject->data->ced_info->locality_country) && $this->_dataObject->data->ced_info->locality_country != "") 
+				if (isSet($this->_dataObject->data->ced_info->locality_country) && $this->_dataObject->data->ced_info->locality_country != "")
 					$cmd['attributes']['ced_info']['locality_country'] = $this->_dataObject->data->ced_info->locality_country;
-				if (isSet($this->_dataObject->data->ced_info->locality_state_prov) && $this->_dataObject->data->ced_info->locality_state_prov != "") 
+				if (isSet($this->_dataObject->data->ced_info->locality_state_prov) && $this->_dataObject->data->ced_info->locality_state_prov != "")
 					$cmd['attributes']['ced_info']['localicty_state_prov'] = $this->_dataObject->data->ced_info->locality_state_prov;
-					
+
 				break;
 			case "rsp_whois_info":
 				//rsp_whois_info data
-				if (isSet($this->_dataObject->data->all) && $this->_dataObject->data->all != "") 
+				if (isSet($this->_dataObject->data->all) && $this->_dataObject->data->all != "")
 					$cmd['attributes']['all'] = $this->_dataObject->data->all;
-				if (isSet($this->_dataObject->data->flag) && $this->_dataObject->data->flag != "") 
+				if (isSet($this->_dataObject->data->flag) && $this->_dataObject->data->flag != "")
 					$cmd['attributes']['flag'] = $this->_dataObject->data->flag;
 				break;
 			case "trademark":
 				//trademark data
-				if (isSet($this->_dataObject->data->trademark) && $this->_dataObject->data->trademark != "") 
+				if (isSet($this->_dataObject->data->trademark) && $this->_dataObject->data->trademark != "")
 					$cmd['attributes']['trademark'] = $this->_dataObject->data->trademark;
 				break;
 			case "change_ips_tag":
 				//change_ips_tag data
 
-				if (isSet($this->_dataObject->data->change_tag_all) && $this->_dataObject->data->change_tag_all != "") 
+				if (isSet($this->_dataObject->data->change_tag_all) && $this->_dataObject->data->change_tag_all != "")
 					$cmd['attributes']['change_tag_all'] = $this->_dataObject->data->change_tag_all;
-				if (isSet($this->_dataObject->data->gaining_registrar_tag) && $this->_dataObject->data->gaining_registrar_tag != "") 
+				if (isSet($this->_dataObject->data->gaining_registrar_tag) && $this->_dataObject->data->gaining_registrar_tag != "")
 					$cmd['attributes']['gaining_registrar_tag'] = $this->_dataObject->data->gaining_registrar_tag;
-				if (isSet($this->_dataObject->data->rsp_override) && $this->_dataObject->data->rsp_override != "") 
+				if (isSet($this->_dataObject->data->rsp_override) && $this->_dataObject->data->rsp_override != "")
 					$cmd['attributes']['rsp_override'] = $this->_dataObject->data->rsp_override;
 				break;
 			case "contact_info":
 				//contact_info data
-				if (isSet($this->_dataObject->data->report_email) && $this->_dataObject->data->report_email != "") 
+				if (isSet($this->_dataObject->data->report_email) && $this->_dataObject->data->report_email != "")
 					$cmd['attributes']['report_email'] = $this->_dataObject->data->report_email;
 				if (isSet($this->_dataObject->data->contact_type) && $this->_dataObject->data->contact_type != ""){
 					$contact_types=explode(",",$this->_dataObject->data->contact_type);
@@ -377,59 +377,59 @@ private function _processRequest (){
 				break;
 			case "domain_auth_info":
 				//domain_auth_info data
-				if (isSet($this->_dataObject->data->domain_auth_info) && $this->_dataObject->data->domain_auth_info != "") 
+				if (isSet($this->_dataObject->data->domain_auth_info) && $this->_dataObject->data->domain_auth_info != "")
 					$cmd['attributes']['domain_auth_info'] = $this->_dataObject->data->domain_auth_info;
 				break;
 			case "expire_action":
 				//expire_action data
-				if (isSet($this->_dataObject->data->auto_renew) && $this->_dataObject->data->auto_renew != "") 
+				if (isSet($this->_dataObject->data->auto_renew) && $this->_dataObject->data->auto_renew != "")
 					$cmd['attributes']['auto_renew'] = $this->_dataObject->data->auto_renew;
-				if (isSet($this->_dataObject->data->let_expire) && $this->_dataObject->data->let_expire != "") 
+				if (isSet($this->_dataObject->data->let_expire) && $this->_dataObject->data->let_expire != "")
 					$cmd['attributes']['let_expire'] = $this->_dataObject->data->let_expire;
 				break;
 			case "forwarding_email":
-				if (isSet($this->_dataObject->data->forwarding_email) && $this->_dataObject->data->forwarding_email != "") 
+				if (isSet($this->_dataObject->data->forwarding_email) && $this->_dataObject->data->forwarding_email != "")
 					$cmd['attributes']['forwarding_email'] = $this->_dataObject->data->forwarding_email;
 				break;
 			case "nexus_info":
 				//nexus_info data
-				if (isSet($this->_dataObject->data->nexus->app_purpose) && $this->_dataObject->data->nexus->app_purpose != "") 
+				if (isSet($this->_dataObject->data->nexus->app_purpose) && $this->_dataObject->data->nexus->app_purpose != "")
 					$cmd['attributes']['nexus']['app_purpose'] = $this->_dataObject->data->nexus->app_purpose;
-				if (isSet($this->_dataObject->data->nexus->category) && $this->_dataObject->data->nexus->category != "") 
+				if (isSet($this->_dataObject->data->nexus->category) && $this->_dataObject->data->nexus->category != "")
 					$cmd['attributes']['nexus']['category'] = $this->_dataObject->data->nexus->category;
-				if (isSet($this->_dataObject->data->nexus->validator) && $this->_dataObject->data->nexus->validator != "") 
+				if (isSet($this->_dataObject->data->nexus->validator) && $this->_dataObject->data->nexus->validator != "")
 					$cmd['attributes']['nexus']['validator'] = $this->_dataObject->data->nexus->validator;
 				break;
 			case "parkpage_state":
 				//parkpage_state
-				if (isSet($this->_dataObject->data->state) && $this->_dataObject->data->state != "") 
+				if (isSet($this->_dataObject->data->state) && $this->_dataObject->data->state != "")
 					$cmd['attributes']['state'] = $this->_dataObject->data->state;
 				break;
 			case "status":
 				//status data
-				if (isSet($this->_dataObject->data->lock_state) && $this->_dataObject->data->lock_state != "") 
+				if (isSet($this->_dataObject->data->lock_state) && $this->_dataObject->data->lock_state != "")
 					$cmd['attributes']['lock_state'] = $this->_dataObject->data->lock_state;
-				if (isSet($this->_dataObject->data->domain_name) && $this->_dataObject->data->domain_name != "") 
+				if (isSet($this->_dataObject->data->domain_name) && $this->_dataObject->data->domain_name != "")
 					$cmd['attributes']['domain_name'] = $this->_dataObject->data->domain_name;
 				break;
 			case "uk_whois_opt":
 				//uk_whois_opt
 				if (isSet($this->_dataObject->data->reg_type) && $this->_dataObject->data->reg_type != "")
 					$cmd['attributes']['reg_type'] = $this->_dataObject->data->reg_type;
-				if (isSet($this->_dataObject->data->uk_affect_domains) && $this->_dataObject->data->uk_affect_domains != "") 
+				if (isSet($this->_dataObject->data->uk_affect_domains) && $this->_dataObject->data->uk_affect_domains != "")
 					$cmd['attributes']['uk_affect_domains'] = $this->_dataObject->data->uk_affect_domains;
-				if (isSet($this->_dataObject->data->uk_whois_opt) && $this->_dataObject->data->uk_whois_opt != "") 
+				if (isSet($this->_dataObject->data->uk_whois_opt) && $this->_dataObject->data->uk_whois_opt != "")
 					$cmd['attributes']['uk_whois_opt'] = $this->_dataObject->data->uk_whois_opt;
 				break;
 			case "whois_privacy_state":
 				//whois_privacy_state
-				if (isSet($this->_dataObject->data->state) && $this->_dataObject->data->state != "") 
+				if (isSet($this->_dataObject->data->state) && $this->_dataObject->data->state != "")
 					$cmd['attributes']['state'] = $this->_dataObject->data->state;
 				break;
 			default:
 				break;
 		}
-		
+
 		// Run the command
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
@@ -438,10 +438,10 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
-	
-		
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+
+
 
 	}
 
diff --git a/opensrs/domains/provisioning/provProcessPending.php b/opensrs/domains/provisioning/provProcessPending.php
index 2da4188f..63ae5719 100644
--- a/opensrs/domains/provisioning/provProcessPending.php
+++ b/opensrs/domains/provisioning/provProcessPending.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class provProcessPending extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,13 +26,13 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->order_id) || $this->_dataObject->data->order_id == "") {
 			trigger_error ("oSRS Error - order_id is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -51,14 +51,14 @@ private function _processRequest (){
 			'attributes' => array (
 				'order_id' => $this->_dataObject->data->order_id
 			)
-		
+
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->owner_address) && $this->_dataObject->data->owner_address != "") $cmd['attributes']['owner_address'] = $this->_dataObject->data->owner_address;
 		if (isSet($this->_dataObject->data->command) && $this->_dataObject->data->command != "") $cmd['attributes']['command'] = $this->_dataObject->data->command;
 		if (isSet($this->_dataObject->data->fax_received) && $this->_dataObject->data->fax_received != "") $cmd['attributes']['fax_received'] = $this->_dataObject->data->fax_received;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -66,7 +66,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/provisioning/provQueryQueuedRequest.php b/opensrs/domains/provisioning/provQueryQueuedRequest.php
index b745dbeb..616c2f6f 100644
--- a/opensrs/domains/provisioning/provQueryQueuedRequest.php
+++ b/opensrs/domains/provisioning/provQueryQueuedRequest.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class provQueryQueuedRequest extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,13 +26,13 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->request_id) || $this->_dataObject->data->request_id == "") {
 			trigger_error ("oSRS Error - request_id is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -52,7 +52,7 @@ private function _processRequest (){
 				'request_id' => $this->_dataObject->data->request_id
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -60,7 +60,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/provisioning/provRenew.php b/opensrs/domains/provisioning/provRenew.php
index 3fda6849..98ecfd1f 100644
--- a/opensrs/domains/provisioning/provRenew.php
+++ b/opensrs/domains/provisioning/provRenew.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class provRenew extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->auto_renew) || $this->_dataObject->data->auto_renew == "") {
 			trigger_error ("oSRS Error - auto_renew is not defined.", E_USER_WARNING);
@@ -48,7 +48,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - period is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -64,7 +64,7 @@ private function _processRequest (){
 			'protocol' => 'XCP',
 			'action' => 'renew',
 			'object' => 'DOMAIN',
-			'attributes' => array ( 
+			'attributes' => array (
 			    'auto_renew' => $this->_dataObject->data->auto_renew,
 			    'currentexpirationyear' => $this->_dataObject->data->currentexpirationyear,
 			    'domain' => $this->_dataObject->data->domain,
@@ -72,11 +72,11 @@ private function _processRequest (){
 			    'period' => $this->_dataObject->data->period
 			)
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->f_parkp) && $this->_dataObject->data->f_parkp != "") $cmd['attributes']['f_parkp'] = $this->_dataObject->data->f_parkp;
 		if (isSet($this->_dataObject->data->affiliate_id) && $this->_dataObject->data->affiliate_id != "") $cmd['attributes']['affiliate_id'] = $this->_dataObject->data->affiliate_id;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -88,7 +88,7 @@ private function _processRequest (){
                 } else {
 			$this->resultRaw = $arrayResult;
 		}
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/provisioning/provRevoke.php b/opensrs/domains/provisioning/provRevoke.php
index 543cdfef..566a2aea 100644
--- a/opensrs/domains/provisioning/provRevoke.php
+++ b/opensrs/domains/provisioning/provRevoke.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class provRevoke extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->reseller) || $this->_dataObject->data->reseller == "") {
 			trigger_error ("oSRS Error - reseller is not defined.", E_USER_WARNING);
@@ -36,7 +36,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -57,10 +57,10 @@ private function _processRequest (){
 				'domain' => $this->_dataObject->data->domain,
 			)
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->notes) && $this->_dataObject->data->notes != "") $cmd['attributes']['notes'] = $this->_dataObject->data->notes;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -68,7 +68,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/provisioning/provSWregister.php b/opensrs/domains/provisioning/provSWregister.php
index ff3c2a5b..2eec790b 100644
--- a/opensrs/domains/provisioning/provSWregister.php
+++ b/opensrs/domains/provisioning/provSWregister.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class provSWregister extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -55,11 +55,11 @@ private function _validate () {
 			die();
 		}
 	}
-	
+
 	// Personal Information
 	private function _allTimeRequired(){
 		$subtest = true;
-		
+
 		$reqPers = array("first_name", "last_name", "org_name", "address1", "city", "state", "country", "postal_code", "phone", "email", "lang_pref");
 		foreach ($reqPers as $reqPer) {
 		  if ($this->_dataObject->personal->$reqPer == "") {
@@ -67,7 +67,7 @@ private function _allTimeRequired(){
 				$subtest = false;
 			}
 		}
-		
+
 		$reqDatas = array("reg_type", "reg_username", "reg_password", "domain", "custom_nameservers", "period", "custom_tech_contact", "custom_nameservers");
 		foreach ($reqDatas as $reqData) {
 			if ($this->_dataObject->data->$reqData == "") {
@@ -75,11 +75,11 @@ private function _allTimeRequired(){
 				$subtest = false;
 			}
 		}
-		
+
 		return $subtest;
 	}
-	
-	
+
+
 	// ccTLD specific validation
 	private function _ccTLD_ca () {
 		$subtest = true;
@@ -92,17 +92,17 @@ private function _ccTLD_ca () {
 		}
 		return $subtest;
 	}
-	
+
 	// ccTLD specific validation
 	private function _ccTLD_au () {
 		$subtest = true;
 		$reqDatas = array("registrant_name",  "eligibility_type");
-		
+
 		$tld = explode(".", strtolower($this->_dataObject->data->domain), 2);
-				
+
 		if ($tld == "au")
 			$reqDatas = array_merge($reqDatas, array("registrant_id", "registrant_id_type"));
-			
+
 		foreach($reqDatas as $reqData) {
 		  if ($this->_dataObject->au_registrant_info->$reqData == "") {
 				trigger_error ("oSRS Error - ". $reqData ." is not defined.", E_USER_WARNING);
@@ -120,7 +120,7 @@ private function _ccTLD_br () {
         }
         return $subtest;
     }
- 	
+
  	private function _ccTLD_pro () {
         $subtest = true;
         if ($this->_dataObject->professional_data->profession == "") {
@@ -141,7 +141,7 @@ private function _ccTLD_it () {
 		}
 		return $subtest;
 	}
-	
+
 	private function _ccTLD_asia () {
 		$subtest = true;
 		$reqDatas = array("contact_type", "id_number", "id_type", "legal_entity_type", "locality_country");
@@ -153,7 +153,7 @@ private function _ccTLD_asia () {
 		}
 		return $subtest;
 	}
-	
+
 	private function _ccTLD_be () {
 		$subtest = true;
 		$reqData = array("lang", "owner_confirm_address");
@@ -177,7 +177,7 @@ private function _ccTLD_de () {
 		}
 		return $subtest;
 	}
-	
+
 	private function _ccTLD_eu () {
 		$subtest = true;
 		$reqDatas = array("eu_country", "lang", "owner_confirm_address");
@@ -201,7 +201,7 @@ private function _ccTLD_us () {
 		}
 		return $subtest;
 	}
-	
+
 	private function _ccTLD_name () {
 		$subtest = true;
 		$reqData = array("forwarding_email");
@@ -213,10 +213,10 @@ private function _ccTLD_name () {
 		}
 		return $subtest;
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($ccTLD){
-		// Compile the command	
+		// Compile the command
 		$cmd = array(
 			'protocol' => 'XCP',
 			'action' => 'SW_REGISTER',
@@ -252,7 +252,7 @@ private function _processRequest ($ccTLD){
 				$cmd['attributes'][$reqData] = $this->_dataObject->data->$reqData;
 		}
 
-	
+
 		// NS records
 		if ($this->_dataObject->data->custom_nameservers == 1){
 			$passArray = array();
@@ -284,9 +284,9 @@ private function _processRequest ($ccTLD){
 			if (isSet($this->_dataObject->data->rant_agrees) && $this->_dataObject->data->rant_agrees != "") $cmd['attributes']['rant_agrees'] = $this->_dataObject->data->rant_agrees;
 			if (isSet($this->_dataObject->data->rant_no) && $this->_dataObject->data->rant_no != "") $cmd['attributes']['rant_no'] = $this->_dataObject->data->rant_no;
 		}
-		
+
 		if ($ccTLD == "asia") {
-			$reqDatas = array("contact_type", "id_number", "id_type", "legal_entity_type", "locality_country", "id_type_info", 
+			$reqDatas = array("contact_type", "id_number", "id_type", "legal_entity_type", "locality_country", "id_type_info",
 				"legal_entity_type_info","locality_city", "locality_state_prov"
 			);
 
@@ -295,9 +295,9 @@ private function _processRequest ($ccTLD){
 					$cmd['attributes']['tld_data']['ced_info'][$reqData] = $this->_dataObject->data->$reqData;
 			}
 		}
-		
+
 		if ($ccTLD == "au") {
-			$reqDatasAU = array("registrant_name", "eligibility_type", "registrant_id", "registrant_id_type", "eligibility_name", 
+			$reqDatasAU = array("registrant_name", "eligibility_type", "registrant_id", "registrant_id_type", "eligibility_name",
 				"eligibility_id", "eligibility_id_type", "eligibility_reason"
 			);
 
@@ -313,14 +313,14 @@ private function _processRequest ($ccTLD){
 			$cmd['attributes']['tld_data']['it_registrant_info']['reg_code'] = $this->_dataObject->it_registrant_info->reg_code;
 			$cmd['attributes']['tld_data']['it_registrant_info']['entity_type'] = $this->_dataObject->it_registrant_info->entity_type;
 		}
-		
+
 
 		if ($ccTLD == "eu"){
 			$cmd['attributes']['country'] = strtoupper($this->_dataObject->data->eu_country);
 			$cmd['attributes']['lang'] = $this->_dataObject->data->lang;
 			$cmd['attributes']['owner_confirm_address'] = $this->_dataObject->data->owner_confirm_address;
 		}
-		
+
 		if ($ccTLD == "be"){
 			$cmd['attributes']['lang'] = $this->_dataObject->data->lang;
 			$cmd['attributes']['owner_confirm_address'] = $this->_dataObject->data->owner_confirm_address;
@@ -351,8 +351,8 @@ private function _processRequest ($ccTLD){
 					$cmd['attributes']['tld_data']['professional_data'][$reqData] = $this->_dataObject->professional_data->$reqData;
 			}
 		}
-		
-		
+
+
 		// Process the call
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
@@ -365,10 +365,10 @@ private function _processRequest ($ccTLD){
                 } else {
 			$this->resultRaw = $arrayResult;
 		}
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
-	
+
 	private function _createUserData(){
 		$userArray = array(
 			"first_name" => $this->_dataObject->personal->first_name,
diff --git a/opensrs/domains/provisioning/provSendCIRAapproval.php b/opensrs/domains/provisioning/provSendCIRAapproval.php
index 1653e006..63178a92 100644
--- a/opensrs/domains/provisioning/provSendCIRAapproval.php
+++ b/opensrs/domains/provisioning/provSendCIRAapproval.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class provSendCIRAapproval extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,13 +26,13 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -52,7 +52,7 @@ private function _processRequest (){
 				'domain' => $this->_dataObject->data->domain
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -60,7 +60,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/provisioning/provUpdateAllInfo.php b/opensrs/domains/provisioning/provUpdateAllInfo.php
index 851f46e8..5f713db4 100644
--- a/opensrs/domains/provisioning/provUpdateAllInfo.php
+++ b/opensrs/domains/provisioning/provUpdateAllInfo.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class provUpdateAllInfo extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain  == "") {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
@@ -40,7 +40,7 @@ private function _validateObject (){
 		}else{
 			if(!$this->_allRequired("owner_contact"))
 				$allPassed=false;
-		
+
 		}
 		if (!isSet($this->_dataObject->data->admin_contact) || $this->_dataObject->data->admin_contact  == ""){
 			trigger_error ("oSRS Error - admin_contact is not defined.", E_USER_WARNING);
@@ -48,7 +48,7 @@ private function _validateObject (){
 		}else{
 			if(!$this->_allRequired("admin_contact"))
 				$allPassed=false;
-			
+
 		}
 		if (!isSet($this->_dataObject->data->tech_contact) || $this->_dataObject->data->tech_contact  == ""){
 			trigger_error ("oSRS Error - tech_contact in is not defined.", E_USER_WARNING);
@@ -56,7 +56,7 @@ private function _validateObject (){
 		}else{
 			if(!$this->_allRequired("tech_contact"))
 				$allPassed=false;
-		}	
+		}
 		if (!isSet($this->_dataObject->data->billing_contact) || $this->_dataObject->data->billing_contact  == ""){
 				trigger_error ("oSRS Error - billing_contact is not defined.", E_USER_WARNING);
 				$allPassed = false;
@@ -64,7 +64,7 @@ private function _validateObject (){
 			if(!$this->_allRequired("billing_contact"))
 				$allPassed=false;
 		}
-		
+
 		//Check Nameserver Values
 		if (!isSet($this->_dataObject->data->nameserver_names) || $this->_dataObject->data->nameserver_names  == "") {
 			trigger_error ("oSRS Error - The function requires at least one nameserver is provided.", E_USER_WARNING);
@@ -78,11 +78,11 @@ private function _validateObject (){
 				$allPassed = false;
 			}
 		}
-		
-				
+
+
 		// Run the command
 		if ($allPassed) {
-		
+
 			// Execute the command
 			$this->_processRequest ();
 		} else {
@@ -90,7 +90,7 @@ private function _validateObject (){
 		}
 	}
 
-			
+
 	private function _allRequired($contact){
 		$allInfo = true;
 		// Check Contact information
@@ -133,7 +133,7 @@ private function _processRequest (){
 							"email" => $this->_dataObject->data->owner_contact->email,
 							"lang_pref" => $this->_dataObject->data->owner_contact->lang_pref
 							),
-							
+
 						'admin' => array(
 							"first_name" => $this->_dataObject->data->admin_contact->first_name,
 							"last_name" => $this->_dataObject->data->admin_contact->last_name,
@@ -150,7 +150,7 @@ private function _processRequest (){
 							"email" => $this->_dataObject->data->admin_contact->email,
 							"lang_pref" => $this->_dataObject->data->admin_contact->lang_pref
 							),
-							
+
 						'tech' => array(
 							"first_name" => $this->_dataObject->data->tech_contact->first_name,
 							"last_name" => $this->_dataObject->data->tech_contact->last_name,
@@ -185,9 +185,9 @@ private function _processRequest (){
 							)
 						)
 				)
-			
+
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->nameserver_names) && $this->_dataObject->data->nameserver_names != ""){
 
@@ -200,16 +200,16 @@ private function _processRequest (){
 
 			foreach ($nameServers as $nameServer){
 				$cmd['attributes']['nameserver_list'][$i]['fqdn'] = $nameServer;
-				
+
 				if(isSet($ipAddresses[$i]))
 					$cmd['attributes']['nameserver_list'][$i]['ipaddress'] = $ipAddresses[$i];
-				
+
 				$i++;
 			}
-			
+
 
 		}
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -217,8 +217,8 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 
 
diff --git a/opensrs/domains/provisioning/provUpdateContacts.php b/opensrs/domains/provisioning/provUpdateContacts.php
index 230c9a79..11ab74d7 100644
--- a/opensrs/domains/provisioning/provUpdateContacts.php
+++ b/opensrs/domains/provisioning/provUpdateContacts.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 class provUpdateContacts extends openSRS_base {
 	private $_dataObject;
@@ -31,7 +31,7 @@ private function _validateObject (){
 				$allPassed = false;
 			}
 		}
-		
+
 		$reqData = array ("domain", "types");
 		for ($i = 0; $i < count($reqData); $i++){
 			if ($this->_dataObject->data->$reqData[$i] == "") {
@@ -46,7 +46,7 @@ private function _validateObject (){
 			$this->processRequest ();
 		} else {
 			trigger_error ("oSRS Error - Incorrect call.", E_USER_WARNING);
-		}		
+		}
 	}
 
 	private function _createUserData(){
@@ -68,12 +68,12 @@ private function _createUserData(){
 			"lang_pref" => $this->_dataObject->personal->lang_pref
 		);
 		return $userArray;
-	}	
-	
+	}
+
 	// Post validation functions
 	private function processRequest (){
 		$this->_dataObject->data->types = explode (",", $this->_dataObject->data->types);
-	
+
 		// Compile the command
 		$cmd = array(
 			'protocol' => 'XCP',
@@ -98,7 +98,7 @@ private function processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/subreseller/subresActing.php b/opensrs/domains/subreseller/subresActing.php
index 82b5bcb3..cec0b5bc 100644
--- a/opensrs/domains/subreseller/subresActing.php
+++ b/opensrs/domains/subreseller/subresActing.php
@@ -73,12 +73,12 @@ private function _validateObject (){
 					'bulk_order' => $this->_dataObject->data->bulk_order
 					),
 			);
-			
+
 			if ($this->_dataObject->data->custom_nameservers == 1){
 				for ($j=1; $j<=10; $j++){
 					$tns = "name". $j;
 					$tso = "sortorder". $j;
-				
+
 					$passArray = array ();
 					$temHolder = array ();
 					if (isSet($this->_dataObject->data->$tns)){
@@ -89,11 +89,11 @@ private function _validateObject (){
 						}
 					}
 				}
-				
+
 				$cmd['attributes']['nameserver_list'] = $passArray;
 			}
 
-			
+
 			$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 			$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 			$arrayResult = $this->_opsHandler->decode($XMLresult);		// FLip XML to Array
@@ -101,8 +101,8 @@ private function _validateObject (){
 			// Results
 			$this->resultFullRaw = $arrayResult;
 			$this->resultRaw = $arrayResult;
-			$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-			$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+			$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+			$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 		} else {
 			echo ("Incorrect call data.<br>\n");
 		}
diff --git a/opensrs/domains/subreseller/subresCreate.php b/opensrs/domains/subreseller/subresCreate.php
index 9bc1769c..e18e7602 100644
--- a/opensrs/domains/subreseller/subresCreate.php
+++ b/opensrs/domains/subreseller/subresCreate.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class subresCreate extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,14 +26,14 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		$reqPers = array ("first_name", "last_name", "org_name", "address1", "city", "state", "country", "postal_code", "phone", "email", "lang_pref");
 		for ($i = 0; $i < count($reqPers); $i++){
 			if ($this->_dataObject->personal->$reqPers[$i] == "") {
 				trigger_error ("oSRS Error - ". $reqPers[$i] ." is not defined.", E_USER_WARNING);
 				$allPassed = false;
 			}
-		}		
+		}
 
 		$reqData = array ("ccp_enabled", "low_balance_email", "password", "pricing_plan", "status", "system_status_email", "username");
 		for ($i = 0; $i < count($reqData); $i++){
@@ -74,7 +74,7 @@ private function _processRequest (){
 				'username' => $this->_dataObject->data->username
 			)
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->payment_email) && $this->_dataObject->data->payment_email != "") $cmd['attributes']['payment_email'] = $this->_dataObject->data->payment_email;
 		if (isSet($this->_dataObject->data->url) && $this->_dataObject->data->url != "") $cmd['attributes']['url'] = $this->_dataObject->data->url;
@@ -85,7 +85,7 @@ private function _processRequest (){
 				$cmd['attributes']['nameservers']['fqdn'. ($i+1)] = $tmpArray[$i];
 			}
 		}
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -97,8 +97,8 @@ private function _processRequest (){
                 } else {
 			$this->resultRaw = $arrayResult;
 		}
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 
 
@@ -121,5 +121,5 @@ private function _createUserData(){
 			"lang_pref" => $this->_dataObject->personal->lang_pref
 		);
 		return $userArray;
-	}	
+	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/subreseller/subresGet.php b/opensrs/domains/subreseller/subresGet.php
index 63025ef4..2d9e71f3 100644
--- a/opensrs/domains/subreseller/subresGet.php
+++ b/opensrs/domains/subreseller/subresGet.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class subresGet extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,13 +26,13 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->username) || $this->_dataObject->data->username == "") {
 			trigger_error ("oSRS Error - username is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -52,7 +52,7 @@ private function _processRequest (){
 				'username' => $this->_dataObject->data->username
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -64,7 +64,7 @@ private function _processRequest (){
                 } else {
 			$this->resultRaw = $arrayResult;
 		}
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/subreseller/subresModify.php b/opensrs/domains/subreseller/subresModify.php
index d0463ed2..759da347 100644
--- a/opensrs/domains/subreseller/subresModify.php
+++ b/opensrs/domains/subreseller/subresModify.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class subresModify extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,14 +26,14 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		$reqPers = array ("first_name", "last_name", "org_name", "address1", "city", "state", "country", "postal_code", "phone", "email", "lang_pref");
 		for ($i = 0; $i < count($reqPers); $i++){
 			if ($this->_dataObject->personal->$reqPers[$i] == "") {
 				trigger_error ("oSRS Error - ". $reqPers[$i] ." is not defined.", E_USER_WARNING);
 				$allPassed = false;
 			}
-		}		
+		}
 
 		$reqData = array ("ccp_enabled", "low_balance_email", "password", "pricing_plan", "status", "system_status_email", "username");
 		for ($i = 0; $i < count($reqData); $i++){
@@ -74,7 +74,7 @@ private function _processRequest (){
 				'username' => $this->_dataObject->data->username
 			)
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->payment_email) && $this->_dataObject->data->payment_email != "") $cmd['attributes']['payment_email'] = $this->_dataObject->data->payment_email;
 		if (isSet($this->_dataObject->data->url) && $this->_dataObject->data->url != "") $cmd['attributes']['url'] = $this->_dataObject->data->url;
@@ -86,7 +86,7 @@ private function _processRequest (){
 				$cmd['attributes']['nameservers']['fqdn'. ($i+1)] = $tmpArray[$i];
 			}
 		}
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -94,8 +94,8 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 
 
@@ -118,5 +118,5 @@ private function _createUserData(){
 			"lang_pref" => $this->_dataObject->personal->lang_pref
 		);
 		return $userArray;
-	}	
+	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/subreseller/subresPay.php b/opensrs/domains/subreseller/subresPay.php
index c57f0194..8b7225f9 100644
--- a/opensrs/domains/subreseller/subresPay.php
+++ b/opensrs/domains/subreseller/subresPay.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class subresPay extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->amount) || $this->_dataObject->data->amount == "") {
 			trigger_error ("oSRS Error - amount is not defined.", E_USER_WARNING);
@@ -36,7 +36,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - username is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -57,7 +57,7 @@ private function _processRequest (){
 				'username' => $this->_dataObject->data->username
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -69,7 +69,7 @@ private function _processRequest (){
                 } else {
 			$this->resultRaw = $arrayResult;
 		}
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/subuser/subuserAdd.php b/opensrs/domains/subuser/subuserAdd.php
index 37f02ff1..d75a6d5a 100644
--- a/opensrs/domains/subuser/subuserAdd.php
+++ b/opensrs/domains/subuser/subuserAdd.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class subuserAdd extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if ((!isSet($this->_dataObject->data->cookie) || $this->_dataObject->data->cookie == "") && (!isSet($this->_dataObject->data->bypass) || $this->_dataObject->data->bypass == "")) {
 			trigger_error ("oSRS Error - cookie / bypass is not defined.", E_USER_WARNING);
@@ -53,7 +53,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - sub_password is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -78,11 +78,11 @@ private function _processRequest (){
 				'sub_password' => $this->_dataObject->data->sub_password
 			)
 		);
-		
+
 		// Cookie / bypass
 		if (isSet($this->_dataObject->data->cookie) && $this->_dataObject->data->cookie != "") $cmd['cookie'] = $this->_dataObject->data->cookie;
 		if (isSet($this->_dataObject->data->bypass) && $this->_dataObject->data->bypass != "") $cmd['domain'] = $this->_dataObject->data->bypass;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -90,7 +90,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/subuser/subuserDelete.php b/opensrs/domains/subuser/subuserDelete.php
index 2800bdae..3ff183a2 100644
--- a/opensrs/domains/subuser/subuserDelete.php
+++ b/opensrs/domains/subuser/subuserDelete.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class subuserDelete extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if ((!isSet($this->_dataObject->data->cookie) || $this->_dataObject->data->cookie == "") && (!isSet($this->_dataObject->data->bypass) || $this->_dataObject->data->bypass == "")) {
 			trigger_error ("oSRS Error - cookie / bypass is not defined.", E_USER_WARNING);
@@ -45,7 +45,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - sub_id is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -67,11 +67,11 @@ private function _processRequest (){
 				'sub_id' => $this->_dataObject->data->sub_id
 			)
 		);
-		
+
 		// Cookie / bypass
 		if (isSet($this->_dataObject->data->cookie) && $this->_dataObject->data->cookie != "") $cmd['cookie'] = $this->_dataObject->data->cookie;
 		if (isSet($this->_dataObject->data->bypass) && $this->_dataObject->data->bypass != "") $cmd['domain'] = $this->_dataObject->data->bypass;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -79,7 +79,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/subuser/subuserGet.php b/opensrs/domains/subuser/subuserGet.php
index 2e03ccd7..37a26412 100644
--- a/opensrs/domains/subuser/subuserGet.php
+++ b/opensrs/domains/subuser/subuserGet.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class subuserGet extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if ((!isSet($this->_dataObject->data->cookie) || $this->_dataObject->data->cookie == "") && (!isSet($this->_dataObject->data->bypass) || $this->_dataObject->data->bypass == "")) {
 			trigger_error ("oSRS Error - cookie / bypass is not defined.", E_USER_WARNING);
@@ -41,7 +41,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - username is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -61,11 +61,11 @@ private function _processRequest (){
 //			'cookie' => $this->_dataObject->data->cookie,
 			'username' => $this->_dataObject->data->username
 		);
-		
+
 		// Cookie / bypass
 		if (isSet($this->_dataObject->data->cookie) && $this->_dataObject->data->cookie != "") $cmd['cookie'] = $this->_dataObject->data->cookie;
 		if (isSet($this->_dataObject->data->bypass) && $this->_dataObject->data->bypass != "") $cmd['domain'] = $this->_dataObject->data->bypass;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -73,7 +73,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/subuser/subuserGetInfo.php b/opensrs/domains/subuser/subuserGetInfo.php
index 5a88946c..72d7cb93 100644
--- a/opensrs/domains/subuser/subuserGetInfo.php
+++ b/opensrs/domains/subuser/subuserGetInfo.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class subuserGetInfo extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if ((!isSet($this->_dataObject->data->cookie) || $this->_dataObject->data->cookie == "") && (!isSet($this->_dataObject->data->bypass) || $this->_dataObject->data->bypass == "")) {
 			trigger_error ("oSRS Error - cookie / bypass is not defined.", E_USER_WARNING);
@@ -36,7 +36,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - Both cookie and bypass cannot be set in one call.", E_USER_WARNING);
 			$allPassed = false;
 		}
-						
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -55,11 +55,11 @@ private function _processRequest (){
 //			'registrant_ip' => '216.40.46.115',
 //			'cookie' => $this->_dataObject->data->cookie
 		);
-		
+
 		// Cookie / bypass
 		if (isSet($this->_dataObject->data->cookie) && $this->_dataObject->data->cookie != "") $cmd['cookie'] = $this->_dataObject->data->cookie;
 		if (isSet($this->_dataObject->data->bypass) && $this->_dataObject->data->bypass != "") $cmd['domain'] = $this->_dataObject->data->bypass;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -67,7 +67,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/subuser/subuserModify.php b/opensrs/domains/subuser/subuserModify.php
index 80c1f23f..85b7fdc4 100644
--- a/opensrs/domains/subuser/subuserModify.php
+++ b/opensrs/domains/subuser/subuserModify.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class subuserModify extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if ((!isSet($this->_dataObject->data->cookie) || $this->_dataObject->data->cookie == "") && (!isSet($this->_dataObject->data->bypass) || $this->_dataObject->data->bypass == "")) {
 			trigger_error ("oSRS Error - cookie / bypass is not defined.", E_USER_WARNING);
@@ -83,11 +83,11 @@ private function _processRequest (){
 				'sub_id' => $this->_dataObject->data->sub_id
 			)
 		);
-		
+
 		// Cookie / bypass
 		if (isSet($this->_dataObject->data->cookie) && $this->_dataObject->data->cookie != "") $cmd['cookie'] = $this->_dataObject->data->cookie;
 		if (isSet($this->_dataObject->data->bypass) && $this->_dataObject->data->bypass != "") $cmd['domain'] = $this->_dataObject->data->bypass;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -95,7 +95,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/transfer/transCancel.php b/opensrs/domains/transfer/transCancel.php
index 2afb3c2e..ca6b16bc 100644
--- a/opensrs/domains/transfer/transCancel.php
+++ b/opensrs/domains/transfer/transCancel.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class transCancel extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,13 +26,13 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->reseller) || $this->_dataObject->data->reseller == "") {
 			trigger_error ("oSRS Error - reseller is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -52,11 +52,11 @@ private function _processRequest (){
 				'reseller' => $this->_dataObject->data->reseller
 			)
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->domain) && $this->_dataObject->data->domain != "") $cmd['attributes']['domain'] = $this->_dataObject->data->domain;
 		if (isSet($this->_dataObject->data->order_id) && $this->_dataObject->data->order_id != "") $cmd['attributes']['order_id'] = $this->_dataObject->data->order_id;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -64,7 +64,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/transfer/transCheck.php b/opensrs/domains/transfer/transCheck.php
index 5127d58e..c95fa167 100644
--- a/opensrs/domains/transfer/transCheck.php
+++ b/opensrs/domains/transfer/transCheck.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class transCheck extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,13 +26,13 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -52,11 +52,11 @@ private function _processRequest (){
 				'domain' => $this->_dataObject->data->domain
 			)
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->check_status) && $this->_dataObject->data->check_status != "") $cmd['attributes']['check_status'] = $this->_dataObject->data->check_status;
 		if (isSet($this->_dataObject->data->get_request_address) && $this->_dataObject->data->get_request_address != "") $cmd['attributes']['get_request_address'] = $this->_dataObject->data->get_request_address;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -68,7 +68,7 @@ private function _processRequest (){
                 } else {
 			$this->resultRaw = $arrayResult;
 		}
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/transfer/transGetAway.php b/opensrs/domains/transfer/transGetAway.php
index 6624f970..01542a6d 100644
--- a/opensrs/domains/transfer/transGetAway.php
+++ b/opensrs/domains/transfer/transGetAway.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class transGetAway extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -44,7 +44,7 @@ private function _processRequest (){
 			'object' => 'domain',
 			'attributes' => array ()
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->domain) && $this->_dataObject->data->domain != "") $cmd['attributes']['domain'] = $this->_dataObject->data->domain;
 		if (isSet($this->_dataObject->data->gaining_registrar) && $this->_dataObject->data->gaining_registrar != "") $cmd['attributes']['gaining_registrar'] = $this->_dataObject->data->gaining_registrar;
@@ -60,7 +60,7 @@ private function _processRequest (){
 		if (isSet($this->_dataObject->data->status) && $this->_dataObject->data->status != "") $cmd['attributes']['status'] = $this->_dataObject->data->status;
 		if (isSet($this->_dataObject->data->registry_request_date) && $this->_dataObject->data->registry_request_date != "") $cmd['attributes']['registry_request_date'] = $this->_dataObject->data->registry_request_date;
 		if (isSet($this->_dataObject->data->request_address) && $this->_dataObject->data->request_address != "") $cmd['attributes']['request_address'] = $this->_dataObject->data->request_address;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -72,7 +72,7 @@ private function _processRequest (){
                 } else {
 			$this->resultRaw = $arrayResult;
 		}
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/transfer/transGetIn.php b/opensrs/domains/transfer/transGetIn.php
index 972555b7..0418e28b 100644
--- a/opensrs/domains/transfer/transGetIn.php
+++ b/opensrs/domains/transfer/transGetIn.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class transGetIn extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -45,7 +45,7 @@ private function _processRequest (){
 //			'registrant_ip' => '12.34.56.78',
 			'attributes' => array ()
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->completed_from) && $this->_dataObject->data->completed_from != "") $cmd['attributes']['completed_from'] = $this->_dataObject->data->completed_from;
 		if (isSet($this->_dataObject->data->completed_to) && $this->_dataObject->data->completed_to != "") $cmd['attributes']['completed_to'] = $this->_dataObject->data->completed_to;
@@ -67,7 +67,7 @@ private function _processRequest (){
 		if (isSet($this->_dataObject->data->status) && $this->_dataObject->data->status != "") $cmd['attributes']['status'] = $this->_dataObject->data->status;
 		if (isSet($this->_dataObject->data->transfer_id) && $this->_dataObject->data->transfer_id != "") $cmd['attributes']['transfer_id'] = $this->_dataObject->data->transfer_id;
 		if (isSet($this->_dataObject->data->losing_registrar) && $this->_dataObject->data->losing_registrar != "") $cmd['attributes']['losing_registrar'] = $this->_dataObject->data->losing_registrar;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -79,7 +79,7 @@ private function _processRequest (){
                 } else {
 			$this->resultRaw = $arrayResult;
 		}
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/transfer/transProcess.php b/opensrs/domains/transfer/transProcess.php
index f1874fbd..a6769aab 100644
--- a/opensrs/domains/transfer/transProcess.php
+++ b/opensrs/domains/transfer/transProcess.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class transProcess extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->order_id) || $this->_dataObject->data->order_id == "") {
 			trigger_error ("oSRS Error - order_id is not defined.", E_USER_WARNING);
@@ -36,7 +36,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - reseller is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -57,7 +57,7 @@ private function _processRequest (){
 				'reseller' => $this->_dataObject->data->reseller
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -65,7 +65,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/transfer/transRsp2Rsp.php b/opensrs/domains/transfer/transRsp2Rsp.php
index 7346b942..a600ac5c 100644
--- a/opensrs/domains/transfer/transRsp2Rsp.php
+++ b/opensrs/domains/transfer/transRsp2Rsp.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class transRsp2Rsp extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
@@ -36,7 +36,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - grsp is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -56,11 +56,11 @@ private function _processRequest (){
 				'grsp' => $this->_dataObject->data->grsp
 			)
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->username) && $this->_dataObject->data->username != "") $cmd['attributes']['username'] = $this->_dataObject->data->username;
 		if (isSet($this->_dataObject->data->password) && $this->_dataObject->data->password != "") $cmd['attributes']['password'] = $this->_dataObject->data->password;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -68,7 +68,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/transfer/transSendPass.php b/opensrs/domains/transfer/transSendPass.php
index e5499dc0..a7b5d700 100644
--- a/opensrs/domains/transfer/transSendPass.php
+++ b/opensrs/domains/transfer/transSendPass.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class transSendPass extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,13 +26,13 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain_name) || $this->_dataObject->data->domain_name == "") {
 			trigger_error ("oSRS Error - domain_name is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -52,7 +52,7 @@ private function _processRequest (){
 				'domain_name' => $this->_dataObject->data->domain_name
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -60,7 +60,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/domains/transfer/transTradeDomain.php b/opensrs/domains/transfer/transTradeDomain.php
index d9330f75..d66dae06 100644
--- a/opensrs/domains/transfer/transTradeDomain.php
+++ b/opensrs/domains/transfer/transTradeDomain.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class transTradeDomain extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,7 +26,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->first_name) || $this->_dataObject->data->first_name == "") {
 			trigger_error ("oSRS Error - first_name is not defined.", E_USER_WARNING);
@@ -48,7 +48,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - org_name is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -72,7 +72,7 @@ private function _processRequest (){
 				'org_name' => $this->_dataObject->data->org_name
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -80,7 +80,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/fastlookup/fastDomainLookup.php b/opensrs/fastlookup/fastDomainLookup.php
index 6a0c6a7f..1247293d 100644
--- a/opensrs/fastlookup/fastDomainLookup.php
+++ b/opensrs/fastlookup/fastDomainLookup.php
@@ -80,7 +80,7 @@ private function _domainTLD($domain, $request){
 		// Results
 		$this->resultFullRaw = $result;
 		$this->resultRaw = $result;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/mail/mailAuthentication.php b/opensrs/mail/mailAuthentication.php
index 67f0d5b8..617e6726 100644
--- a/opensrs/mail/mailAuthentication.php
+++ b/opensrs/mail/mailAuthentication.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class mailAuthentication extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -56,7 +56,7 @@ private function _validateObject (){
 				$this->_dataObject->data->admin_domain = APP_MAIL_DOMAIN;
 			}
 		}
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -65,21 +65,21 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
 			0 => "ver ver=\"3.4\"",
 			1 => "login user=\"". $this->_dataObject->data->admin_username ."\" domain=\"". $this->_dataObject->data->admin_domain ."\" password=\"". $this->_dataObject->data->admin_password ."\"",
 			2 => "quit"
-		);		
+		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/mail/mailChangeDomain.php b/opensrs/mail/mailChangeDomain.php
index e89a2760..b5444e33 100644
--- a/opensrs/mail/mailChangeDomain.php
+++ b/opensrs/mail/mailChangeDomain.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
 
 class mailChangeDomain extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -29,7 +29,7 @@ public function __destruct () {
 	private function _validateObject (){
 		$allPassed = true;
 		$compile = "";
-		
+
 		// Command required values - authentication
 		if (!isSet($this->_dataObject->data->admin_username) || $this->_dataObject->data->admin_username == "") {
 			if (APP_MAIL_USERNAME == ""){
@@ -55,7 +55,7 @@ private function _validateObject (){
 				$this->_dataObject->data->admin_domain = APP_MAIL_DOMAIN;
 			}
 		}
-						
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS-eMail Error - domain is not defined.", E_USER_WARNING);
@@ -63,7 +63,7 @@ private function _validateObject (){
 		} else {
 			$compile .= " domain=\"". $this->_dataObject->data->domain ."\"";
 		}
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->language) && $this->_dataObject->data->language != "")
                         $compile .= " language=\"". $this->_dataObject->data->language ."\"";
@@ -82,8 +82,8 @@ private function _validateObject (){
 
 		if (isSet($this->_dataObject->data->spam_level) && $this->_dataObject->data->spam_level != "")
                         $compile .= " spam_level=\"". $this->_dataObject->data->spam_level ."\"";
-                
-		
+
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -92,7 +92,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
@@ -100,14 +100,14 @@ private function _processRequest ($command = ""){
 			1 => "login user=\"". $this->_dataObject->data->admin_username ."\" domain=\"". $this->_dataObject->data->admin_domain ."\" password=\"". $this->_dataObject->data->admin_password ."\"",
 			2 => "change_domain". $command,
 			3 => "quit"
-		);		
+		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/mail/mailCreateDomain.php b/opensrs/mail/mailCreateDomain.php
index 20a2b4e6..dd850ea6 100644
--- a/opensrs/mail/mailCreateDomain.php
+++ b/opensrs/mail/mailCreateDomain.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class mailCreateDomain extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -29,7 +29,7 @@ public function __destruct () {
 	private function _validateObject (){
 		$allPassed = true;
 		$compile = "";
-		
+
 		if (!isSet($this->_dataObject->data->admin_username) || $this->_dataObject->data->admin_username == "") {
 			if (APP_MAIL_USERNAME == ""){
 				trigger_error ("oSRS-eMail Error - username is not defined.", E_USER_WARNING);
@@ -54,7 +54,7 @@ private function _validateObject (){
 				$this->_dataObject->data->admin_domain = APP_MAIL_DOMAIN;
 			}
 		}
-				
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS-eMail Error - newdomain is not defined.", E_USER_WARNING);
@@ -62,7 +62,7 @@ private function _validateObject (){
 		} else {
 			$compile .= " domain=\"". $this->_dataObject->data->domain ."\"";
 		}
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->timezone) && $this->_dataObject->data->timezone != "")
                         $compile .= " timezone=\"". $this->_dataObject->data->timezone ."\"";
@@ -81,7 +81,7 @@ private function _validateObject (){
 
 		if (isSet($this->_dataObject->data->spam_level) & $this->_dataObject->data->spam_level != "")
                         $compile .= " spam_level=\"". $this->_dataObject->data->spam_level ."\"";
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -90,7 +90,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
@@ -98,14 +98,14 @@ private function _processRequest ($command = ""){
 			1 => "login user=\"". $this->_dataObject->data->admin_username ."\" domain=\"". $this->_dataObject->data->admin_domain ."\" password=\"". $this->_dataObject->data->admin_password ."\"",
 			2 => "create_domain". $command,
 			3 => "quit"
-		);		
+		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/mail/mailCreateDomainAlias.php b/opensrs/mail/mailCreateDomainAlias.php
index 71be290f..df9473ef 100644
--- a/opensrs/mail/mailCreateDomainAlias.php
+++ b/opensrs/mail/mailCreateDomainAlias.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class mailCreateDomainAlias extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -29,7 +29,7 @@ public function __destruct () {
 	private function _validateObject (){
 		$allPassed = true;
 		$compile = "";
-		
+
 		// Command required values - authentication
 		if (!isSet($this->_dataObject->data->admin_username) || $this->_dataObject->data->admin_username == "") {
 			if (APP_MAIL_USERNAME == ""){
@@ -55,7 +55,7 @@ private function _validateObject (){
 				$this->_dataObject->data->admin_domain = APP_MAIL_DOMAIN;
 			}
 		}
-						
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS-eMail Error - domain is not defined.", E_USER_WARNING);
@@ -63,14 +63,14 @@ private function _validateObject (){
 		} else {
 			$compile .= " domain=\"". $this->_dataObject->data->domain ."\"";
 		}
-		
+
 		if (!isSet($this->_dataObject->data->alias) || $this->_dataObject->data->alias == "") {
 			trigger_error ("oSRS-eMail Error - alias is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		} else {
 			$compile .= " alias=\"". $this->_dataObject->data->alias ."\"";
 		}
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -79,7 +79,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
@@ -87,14 +87,14 @@ private function _processRequest ($command = ""){
 			1 => "login user=\"". $this->_dataObject->data->admin_username ."\" domain=\"". $this->_dataObject->data->admin_domain ."\" password=\"". $this->_dataObject->data->admin_password ."\"",
 			2 => "create_domain_alias". $command,
 			3 => "quit"
-		);		
+		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/mail/mailCreateDomainWelcomeEmail.php b/opensrs/mail/mailCreateDomainWelcomeEmail.php
index 4a29e5dd..d2342c6e 100644
--- a/opensrs/mail/mailCreateDomainWelcomeEmail.php
+++ b/opensrs/mail/mailCreateDomainWelcomeEmail.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class mailCreateDomainWelcomeEmail extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -29,7 +29,7 @@ public function __destruct () {
 	private function _validateObject (){
 		$allPassed = true;
 		$compile = "";
-		
+
 		// Command required values - authentication
 		if (!isSet($this->_dataObject->data->admin_username) || $this->_dataObject->data->admin_username == "") {
 			if (APP_MAIL_USERNAME == ""){
@@ -55,7 +55,7 @@ private function _validateObject (){
 				$this->_dataObject->data->admin_domain = APP_MAIL_DOMAIN;
 			}
 		}
-					
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS-eMail Error - domain is not defined.", E_USER_WARNING);
@@ -99,7 +99,7 @@ private function _validateObject (){
 		} else {
 			$compile .= " mime_type=\"". $this->_dataObject->data->mime_type ."\"";
 		}
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -108,7 +108,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
@@ -116,14 +116,14 @@ private function _processRequest ($command = ""){
 			1 => "login user=\"". $this->_dataObject->data->admin_username ."\" domain=\"". $this->_dataObject->data->admin_domain ."\" password=\"". $this->_dataObject->data->admin_password ."\"",
 			2 => "create_domain_welcome_email". $command,
 			3 => "quit"
-		);		
+		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/mail/mailCreateMailbox.php b/opensrs/mail/mailCreateMailbox.php
index 570ba1c7..c62f9db6 100644
--- a/opensrs/mail/mailCreateMailbox.php
+++ b/opensrs/mail/mailCreateMailbox.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class mailCreateMailbox extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -29,7 +29,7 @@ public function __destruct () {
 	private function _validateObject (){
 		$allPassed = true;
 		$compile = "";
-		
+
 
 		// Command required values - authentication
 		if (!isSet($this->_dataObject->data->admin_username) || $this->_dataObject->data->admin_username == "") {
@@ -56,7 +56,7 @@ private function _validateObject (){
 				$this->_dataObject->data->admin_domain = APP_MAIL_DOMAIN;
 			}
 		}
-						
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS-eMail Error - domain is not defined.", E_USER_WARNING);
@@ -64,28 +64,28 @@ private function _validateObject (){
 		} else {
 			$compile .= " domain=\"". $this->_dataObject->data->domain ."\"";
 		}
-		
+
 		if (!isSet($this->_dataObject->data->workgroup) || $this->_dataObject->data->workgroup == "") {
 			trigger_error ("oSRS-eMail Error - workgroup is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		} else {
 			$compile .= " workgroup=\"". $this->_dataObject->data->workgroup ."\"";
 		}
-		
+
 		if (!isSet($this->_dataObject->data->mailbox) || $this->_dataObject->data->mailbox == "") {
 			trigger_error ("oSRS-eMail Error - mailbox is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		} else {
 			$compile .= " mailbox=\"". $this->_dataObject->data->mailbox ."\"";
 		}
-		
+
 		if (!isSet($this->_dataObject->data->password) || $this->_dataObject->data->password == "") {
 			trigger_error ("oSRS-eMail Error - password is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		} else {
 			$compile .= " password=\"". $this->_dataObject->data->password ."\"";
 		}
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->first_name) && $this->_dataObject->data->first_name != "")
                         $compile .= " first_name=\"". $this->_dataObject->data->first_name ."\"";
@@ -98,7 +98,7 @@ private function _validateObject (){
 
 		if (isSet($this->_dataObject->data->phone) && $this->_dataObject->data->phone != "")
                         $compile .= " phone=\"". $this->_dataObject->data->phone ."\"";
-                
+
 		if (isSet($this->_dataObject->data->fax) && $this->_dataObject->data->fax != "")
                         $compile .= " fax=\"". $this->_dataObject->data->fax ."\"";
 
@@ -119,7 +119,7 @@ private function _validateObject (){
 
 		if (isSet($this->_dataObject->data->spam_level) && $this->_dataObject->data->spam_level != "")
                         $compile .= " spam_level=\"". $this->_dataObject->data->spam_level ."\"";
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -128,7 +128,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
@@ -136,14 +136,14 @@ private function _processRequest ($command = ""){
 			1 => "login user=\"". $this->_dataObject->data->admin_username ."\" domain=\"". $this->_dataObject->data->admin_domain ."\" password=\"". $this->_dataObject->data->admin_password ."\"",
 			2 => "create_mailbox". $command,
 			3 => "quit"
-		);		
+		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/mail/mailCreateMailboxForwardOnly.php b/opensrs/mail/mailCreateMailboxForwardOnly.php
index 72b2bd54..f75e8548 100644
--- a/opensrs/mail/mailCreateMailboxForwardOnly.php
+++ b/opensrs/mail/mailCreateMailboxForwardOnly.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class mailCreateMailboxForwardOnly extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -29,7 +29,7 @@ public function __destruct () {
 	private function _validateObject (){
 		$allPassed = true;
 		$compile = "";
-		
+
 		// Command required values - authentication
 		if (!isSet($this->_dataObject->data->admin_username) || $this->_dataObject->data->admin_username == "") {
 			if (APP_MAIL_USERNAME == ""){
@@ -55,7 +55,7 @@ private function _validateObject (){
 				$this->_dataObject->data->admin_domain = APP_MAIL_DOMAIN;
 			}
 		}
-						
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS-eMail Error - domain is not defined.", E_USER_WARNING);
@@ -63,33 +63,33 @@ private function _validateObject (){
 		} else {
 			$compile .= " domain=\"". $this->_dataObject->data->domain ."\"";
 		}
-		
+
 		if (!isSet($this->_dataObject->data->workgroup) || $this->_dataObject->data->workgroup == "") {
 			trigger_error ("oSRS-eMail Error - workgroup is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		} else {
 			$compile .= " workgroup=\"". $this->_dataObject->data->workgroup ."\"";
 		}
-		
+
 		if (!isSet($this->_dataObject->data->mailbox) || $this->_dataObject->data->mailbox == "") {
 			trigger_error ("oSRS-eMail Error - mailbox is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		} else {
 			$compile .= " mailbox=\"". $this->_dataObject->data->mailbox ."\"";
 		}
-		
+
 		if (!isSet($this->_dataObject->data->forward_email) || $this->_dataObject->data->forward_email == "") {
 			trigger_error ("oSRS-eMail Error - forwarding email is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		} else {
 			$compile .= " forward_email=\"". $this->_dataObject->data->forward_email ."\"";
 		}
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->spam_level) && $this->_dataObject->data->spam_level != "")
                         $compile .= " spam_level=\"". $this->_dataObject->data->spam_level ."\"";
-		
-		
+
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -98,7 +98,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
@@ -106,14 +106,14 @@ private function _processRequest ($command = ""){
 			1 => "login user=\"". $this->_dataObject->data->admin_username ."\" domain=\"". $this->_dataObject->data->admin_domain ."\" password=\"". $this->_dataObject->data->admin_password ."\"",
 			2 => "create_mailbox_forward_only". $command,
 			3 => "quit"
-		);		
+		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/mail/mailDeleteDomain.php b/opensrs/mail/mailDeleteDomain.php
index cee841ab..aaa66b18 100644
--- a/opensrs/mail/mailDeleteDomain.php
+++ b/opensrs/mail/mailDeleteDomain.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class mailDeleteDomain extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -29,7 +29,7 @@ public function __destruct () {
 	private function _validateObject (){
 		$allPassed = true;
 		$compile = "";
-		
+
 		// Command required values - authentication
 		if (!isSet($this->_dataObject->data->admin_username) || $this->_dataObject->data->admin_username == "") {
 			if (APP_MAIL_USERNAME == ""){
@@ -55,7 +55,7 @@ private function _validateObject (){
 				$this->_dataObject->data->admin_domain = APP_MAIL_DOMAIN;
 			}
 		}
-						
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS-eMail Error - domain is not defined.", E_USER_WARNING);
@@ -63,10 +63,10 @@ private function _validateObject (){
 		} else {
 			$compile .= " domain=\"". $this->_dataObject->data->domain ."\"";
 		}
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->cascade) || $this->_dataObject->data->cascade != "") $compile .= " cascade=\"". $this->_dataObject->data->cascade ."\"";
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -75,7 +75,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
@@ -83,14 +83,14 @@ private function _processRequest ($command = ""){
 			1 => "login user=\"". $this->_dataObject->data->admin_username ."\" domain=\"". $this->_dataObject->data->admin_domain ."\" password=\"". $this->_dataObject->data->admin_password ."\"",
 			2 => "delete_domain". $command,
 			3 => "quit"
-		);		
+		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/mail/mailDeleteDomainAlias.php b/opensrs/mail/mailDeleteDomainAlias.php
index b543eb68..ffa2a7e8 100644
--- a/opensrs/mail/mailDeleteDomainAlias.php
+++ b/opensrs/mail/mailDeleteDomainAlias.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class mailDeleteDomainAlias extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -29,7 +29,7 @@ public function __destruct () {
 	private function _validateObject (){
 		$allPassed = true;
 		$compile = "";
-		
+
 		// Command required values - authentication
 		if (!isSet($this->_dataObject->data->admin_username) || $this->_dataObject->data->admin_username == "") {
 			if (APP_MAIL_USERNAME == ""){
@@ -55,7 +55,7 @@ private function _validateObject (){
 				$this->_dataObject->data->admin_domain = APP_MAIL_DOMAIN;
 			}
 		}
-						
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->alias) || $this->_dataObject->data->alias == "") {
 			trigger_error ("oSRS-eMail Error - alias is not defined.", E_USER_WARNING);
@@ -63,7 +63,7 @@ private function _validateObject (){
 		} else {
 			$compile .= " alias=\"". $this->_dataObject->data->alias ."\"";
 		}
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -72,7 +72,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
@@ -80,14 +80,14 @@ private function _processRequest ($command = ""){
 			1 => "login user=\"". $this->_dataObject->data->admin_username ."\" domain=\"". $this->_dataObject->data->admin_domain ."\" password=\"". $this->_dataObject->data->admin_password ."\"",
 			2 => "delete_domain_alias". $command,
 			3 => "quit"
-		);		
+		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/mail/mailDeleteDomainWelcomeEmail.php b/opensrs/mail/mailDeleteDomainWelcomeEmail.php
index edb928f5..25617869 100644
--- a/opensrs/mail/mailDeleteDomainWelcomeEmail.php
+++ b/opensrs/mail/mailDeleteDomainWelcomeEmail.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class mailDeleteDomainWelcomeEmail extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -29,7 +29,7 @@ public function __destruct () {
 	private function _validateObject (){
 		$allPassed = true;
 		$compile = "";
-		
+
 		// Command required values - authentication
 		if (!isSet($this->_dataObject->data->admin_username) || $this->_dataObject->data->admin_username == "") {
 			if (APP_MAIL_USERNAME == ""){
@@ -55,7 +55,7 @@ private function _validateObject (){
 				$this->_dataObject->data->admin_domain = APP_MAIL_DOMAIN;
 			}
 		}
-						
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS-eMail Error - domain is not defined.", E_USER_WARNING);
@@ -63,7 +63,7 @@ private function _validateObject (){
 		} else {
 			$compile .= " domain=\"". $this->_dataObject->data->domain ."\"";
 		}
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -72,7 +72,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
@@ -80,14 +80,14 @@ private function _processRequest ($command = ""){
 			1 => "login user=\"". $this->_dataObject->data->admin_username ."\" domain=\"". $this->_dataObject->data->admin_domain ."\" password=\"". $this->_dataObject->data->admin_password ."\"",
 			2 => "delete_domain_welcome_email". $command,
 			3 => "quit"
-		);		
+		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/mail/mailDeleteMailbox.php b/opensrs/mail/mailDeleteMailbox.php
index 6fbcf774..d5d1946f 100644
--- a/opensrs/mail/mailDeleteMailbox.php
+++ b/opensrs/mail/mailDeleteMailbox.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class mailDeleteMailbox extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -29,7 +29,7 @@ public function __destruct () {
 	private function _validateObject (){
 		$allPassed = true;
 		$compile = "";
-		
+
 		// Command required values - authentication
 		if (!isSet($this->_dataObject->data->admin_username) || $this->_dataObject->data->admin_username == "") {
 			if (APP_MAIL_USERNAME == ""){
@@ -55,7 +55,7 @@ private function _validateObject (){
 				$this->_dataObject->data->admin_domain = APP_MAIL_DOMAIN;
 			}
 		}
-						
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->mailbox) || $this->_dataObject->data->mailbox == "") {
 			trigger_error ("oSRS-eMail Error - mailbox is not defined.", E_USER_WARNING);
@@ -63,14 +63,14 @@ private function _validateObject (){
 		} else {
 			$compile .= " mailbox=\"". $this->_dataObject->data->mailbox ."\"";
 		}
-		
+
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS-eMail Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		} else {
 			$compile .= " domain=\"". $this->_dataObject->data->domain ."\"";
 		}
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -79,7 +79,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
@@ -87,14 +87,14 @@ private function _processRequest ($command = ""){
 			1 => "login user=\"". $this->_dataObject->data->admin_username ."\" domain=\"". $this->_dataObject->data->admin_domain ."\" password=\"". $this->_dataObject->data->admin_password ."\"",
 			2 => "delete_mailbox". $command,
 			3 => "quit"
-		);		
+		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/mail/mailGetCompanyDomains.php b/opensrs/mail/mailGetCompanyDomains.php
index a7ca099b..c8275409 100644
--- a/opensrs/mail/mailGetCompanyDomains.php
+++ b/opensrs/mail/mailGetCompanyDomains.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class mailGetCompanyDomains extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -29,7 +29,7 @@ public function __destruct () {
 	private function _validateObject (){
 		$allPassed = true;
 		$compile = "";
-		
+
 		// Command required values - authentication
 		if (!isSet($this->_dataObject->data->admin_username) || $this->_dataObject->data->admin_username == "") {
 			if (APP_MAIL_USERNAME == ""){
@@ -55,12 +55,12 @@ private function _validateObject (){
 				$this->_dataObject->data->admin_domain = APP_MAIL_DOMAIN;
 			}
 		}
-						
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->limit)) {
-			if ($this->_dataObject->data->limit != "") $compile .= " limit=\"". $this->_dataObject->data->limit ."\""; 
+			if ($this->_dataObject->data->limit != "") $compile .= " limit=\"". $this->_dataObject->data->limit ."\"";
 		}
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -69,7 +69,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
@@ -77,14 +77,14 @@ private function _processRequest ($command = ""){
 			1 => "login user=\"". $this->_dataObject->data->admin_username ."\" domain=\"". $this->_dataObject->data->admin_domain ."\" password=\"". $this->_dataObject->data->admin_password ."\"",
 			2 => "get_company_domains". $command,
 			3 => "quit"
-		);		
+		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/mail/mailGetDomain.php b/opensrs/mail/mailGetDomain.php
index 4c45e142..7f7fe142 100644
--- a/opensrs/mail/mailGetDomain.php
+++ b/opensrs/mail/mailGetDomain.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class mailGetDomain extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -29,7 +29,7 @@ public function __destruct () {
 	private function _validateObject (){
 		$allPassed = true;
 		$compile = "";
-		
+
 		// Command required values - authentication
 		if (!isSet($this->_dataObject->data->admin_username) || $this->_dataObject->data->admin_username == "") {
 			if (APP_MAIL_USERNAME == ""){
@@ -55,7 +55,7 @@ private function _validateObject (){
 				$this->_dataObject->data->admin_domain = APP_MAIL_DOMAIN;
 			}
 		}
-						
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS-eMail Error - domain is not defined.", E_USER_WARNING);
@@ -63,7 +63,7 @@ private function _validateObject (){
 		} else {
 			$compile .= " domain=\"". $this->_dataObject->data->domain ."\"";
 		}
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -72,7 +72,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
@@ -80,14 +80,14 @@ private function _processRequest ($command = ""){
 			1 => "login user=\"". $this->_dataObject->data->admin_username ."\" domain=\"". $this->_dataObject->data->admin_domain ."\" password=\"". $this->_dataObject->data->admin_password ."\"",
 			2 => "get_domain". $command,
 			3 => "quit"
-		);		
+		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/mail/mailGetDomainAllowList.php b/opensrs/mail/mailGetDomainAllowList.php
index 97a60196..0bb09ba0 100644
--- a/opensrs/mail/mailGetDomainAllowList.php
+++ b/opensrs/mail/mailGetDomainAllowList.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class mailGetDomainAllowList extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -29,7 +29,7 @@ public function __destruct () {
 	private function _validateObject (){
 		$allPassed = true;
 		$compile = "";
-		
+
 		// Command required values - authentication
 		if (!isSet($this->_dataObject->data->admin_username) || $this->_dataObject->data->admin_username == "") {
 			if (APP_MAIL_USERNAME == ""){
@@ -55,7 +55,7 @@ private function _validateObject (){
 				$this->_dataObject->data->admin_domain = APP_MAIL_DOMAIN;
 			}
 		}
-						
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS-eMail Error - domain is not defined.", E_USER_WARNING);
@@ -63,7 +63,7 @@ private function _validateObject (){
 		} else {
 			$compile .= " domain=\"". $this->_dataObject->data->domain ."\"";
 		}
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -72,7 +72,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
@@ -80,14 +80,14 @@ private function _processRequest ($command = ""){
 			1 => "login user=\"". $this->_dataObject->data->admin_username ."\" domain=\"". $this->_dataObject->data->admin_domain ."\" password=\"". $this->_dataObject->data->admin_password ."\"",
 			2 => "get_domain_allow_list". $command,
 			3 => "quit"
-		);		
+		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/mail/mailGetDomainBlockList.php b/opensrs/mail/mailGetDomainBlockList.php
index d1a67d1d..48422749 100644
--- a/opensrs/mail/mailGetDomainBlockList.php
+++ b/opensrs/mail/mailGetDomainBlockList.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class mailGetDomainBlockList extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -29,7 +29,7 @@ public function __destruct () {
 	private function _validateObject (){
 		$allPassed = true;
 		$compile = "";
-		
+
 		// Command required values - authentication
 		if (!isSet($this->_dataObject->data->admin_username) || $this->_dataObject->data->admin_username == "") {
 			if (APP_MAIL_USERNAME == ""){
@@ -55,7 +55,7 @@ private function _validateObject (){
 				$this->_dataObject->data->admin_domain = APP_MAIL_DOMAIN;
 			}
 		}
-						
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS-eMail Error - domain is not defined.", E_USER_WARNING);
@@ -72,7 +72,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
@@ -80,14 +80,14 @@ private function _processRequest ($command = ""){
 			1 => "login user=\"". $this->_dataObject->data->admin_username ."\" domain=\"". $this->_dataObject->data->admin_domain ."\" password=\"". $this->_dataObject->data->admin_password ."\"",
 			2 => "get_domain_block_list". $command,
 			3 => "quit"
-		);		
+		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/mail/mailGetDomainMailboxLimits.php b/opensrs/mail/mailGetDomainMailboxLimits.php
index 3075e92b..d5c16844 100644
--- a/opensrs/mail/mailGetDomainMailboxLimits.php
+++ b/opensrs/mail/mailGetDomainMailboxLimits.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class mailGetDomainMailboxLimits extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -29,7 +29,7 @@ public function __destruct () {
 	private function _validateObject (){
 		$allPassed = true;
 		$compile = "";
-		
+
 		// Command required values - authentication
 		if (!isSet($this->_dataObject->data->admin_username) || $this->_dataObject->data->admin_username == "") {
 			if (APP_MAIL_USERNAME == ""){
@@ -55,7 +55,7 @@ private function _validateObject (){
 				$this->_dataObject->data->admin_domain = APP_MAIL_DOMAIN;
 			}
 		}
-						
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS-eMail Error - domain is not defined.", E_USER_WARNING);
@@ -63,7 +63,7 @@ private function _validateObject (){
 		} else {
 			$compile .= " domain=\"". $this->_dataObject->data->domain ."\"";
 		}
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -72,7 +72,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
@@ -80,14 +80,14 @@ private function _processRequest ($command = ""){
 			1 => "login user=\"". $this->_dataObject->data->admin_username ."\" domain=\"". $this->_dataObject->data->admin_domain ."\" password=\"". $this->_dataObject->data->admin_password ."\"",
 			2 => "get_domain_mailbox_limits". $command,
 			3 => "quit"
-		);		
+		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/mail/mailGetDomainMailboxes.php b/opensrs/mail/mailGetDomainMailboxes.php
index bb02c949..d6a03a61 100644
--- a/opensrs/mail/mailGetDomainMailboxes.php
+++ b/opensrs/mail/mailGetDomainMailboxes.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class mailGetDomainMailboxes extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -29,7 +29,7 @@ public function __destruct () {
 	private function _validateObject (){
 		$allPassed = true;
 		$compile = "";
-		
+
 		// Command required values - authentication
 		if (!isSet($this->_dataObject->data->admin_username) || $this->_dataObject->data->admin_username == "") {
 			if (APP_MAIL_USERNAME == ""){
@@ -55,7 +55,7 @@ private function _validateObject (){
 				$this->_dataObject->data->admin_domain = APP_MAIL_DOMAIN;
 			}
 		}
-						
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS-eMail Error - domain is not defined.", E_USER_WARNING);
@@ -63,7 +63,7 @@ private function _validateObject (){
 		} else {
 			$compile .= " domain=\"". $this->_dataObject->data->domain ."\"";
 		}
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->limit) && $this->_dataObject->data->limit != ""){
                         $compile .= " limit=\"". $this->_dataObject->data->limit ."\"";
@@ -76,7 +76,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
@@ -87,11 +87,11 @@ private function _processRequest ($command = ""){
 		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/mail/mailGetNumDomainMailboxes.php b/opensrs/mail/mailGetNumDomainMailboxes.php
index 3b260d8c..8dcb07f6 100644
--- a/opensrs/mail/mailGetNumDomainMailboxes.php
+++ b/opensrs/mail/mailGetNumDomainMailboxes.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class mailGetNumDomainMailboxes extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -29,7 +29,7 @@ public function __destruct () {
 	private function _validateObject (){
 		$allPassed = true;
 		$compile = "";
-		
+
 		// Command required values - authentication
 		if (!isSet($this->_dataObject->data->admin_username) || $this->_dataObject->data->admin_username == "") {
 			if (APP_MAIL_USERNAME == ""){
@@ -55,7 +55,7 @@ private function _validateObject (){
 				$this->_dataObject->data->admin_domain = APP_MAIL_DOMAIN;
 			}
 		}
-						
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS-eMail Error - domain is not defined.", E_USER_WARNING);
@@ -63,7 +63,7 @@ private function _validateObject (){
 		} else {
 			$compile .= " domain=\"". $this->_dataObject->data->domain ."\"";
 		}
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -72,7 +72,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
@@ -80,13 +80,13 @@ private function _processRequest ($command = ""){
 			1 => "login user=\"". $this->_dataObject->data->admin_username ."\" domain=\"". $this->_dataObject->data->admin_domain ."\" password=\"". $this->_dataObject->data->admin_password ."\"",
 			2 => "get_num_domain_mailboxes". $command,
 			3 => "quit"
-		);		
+		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/mail/mailSetDomainAdmin.php b/opensrs/mail/mailSetDomainAdmin.php
index 7b97e634..81bb057c 100644
--- a/opensrs/mail/mailSetDomainAdmin.php
+++ b/opensrs/mail/mailSetDomainAdmin.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class mailSetDomainAdmin extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -29,7 +29,7 @@ public function __destruct () {
 	private function _validateObject (){
 		$allPassed = true;
 		$compile = "";
-		
+
 		// Command required values - authentication
 		if (!isSet($this->_dataObject->data->admin_username) || $this->_dataObject->data->admin_username == "") {
 			if (APP_MAIL_USERNAME == ""){
@@ -55,7 +55,7 @@ private function _validateObject (){
 				$this->_dataObject->data->admin_domain = APP_MAIL_DOMAIN;
 			}
 		}
-						
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS-eMail Error - domain is not defined.", E_USER_WARNING);
@@ -69,11 +69,11 @@ private function _validateObject (){
 		} else {
 			$compile .= " mailbox=\"". $this->_dataObject->data->mailbox ."\"";
 		}
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->state) && $this->_dataObject->data->state != "")
                         $compile .= " state=\"". $this->_dataObject->data->state ."\"";
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -82,7 +82,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
@@ -90,14 +90,14 @@ private function _processRequest ($command = ""){
 			1 => "login user=\"". $this->_dataObject->data->admin_username ."\" domain=\"". $this->_dataObject->data->admin_domain ."\" password=\"". $this->_dataObject->data->admin_password ."\"",
 			2 => "set_domain_admin". $command,
 			3 => "quit"
-		);		
+		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/mail/mailSetDomainAllowList.php b/opensrs/mail/mailSetDomainAllowList.php
index 2315900e..07b036ef 100644
--- a/opensrs/mail/mailSetDomainAllowList.php
+++ b/opensrs/mail/mailSetDomainAllowList.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class mailSetDomainAllowList extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -29,7 +29,7 @@ public function __destruct () {
 	private function _validateObject (){
 		$allPassed = true;
 		$compile = "";
-		
+
 		// Command required values - authentication
 		if (!isSet($this->_dataObject->data->admin_username) || $this->_dataObject->data->admin_username == "") {
 			if (APP_MAIL_USERNAME == ""){
@@ -55,7 +55,7 @@ private function _validateObject (){
 				$this->_dataObject->data->admin_domain = APP_MAIL_DOMAIN;
 			}
 		}
-						
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS-eMail Error - domain is not defined.", E_USER_WARNING);
@@ -69,7 +69,7 @@ private function _validateObject (){
 		} else {
 			$compile .= " list=\"". $this->_dataObject->data->list ."\"";
 		}
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -78,7 +78,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
@@ -86,14 +86,14 @@ private function _processRequest ($command = ""){
 			1 => "login user=\"". $this->_dataObject->data->admin_username ."\" domain=\"". $this->_dataObject->data->admin_domain ."\" password=\"". $this->_dataObject->data->admin_password ."\"",
 			2 => "set_domain_allow_list". $command,
 			3 => "quit"
-		);		
+		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/mail/mailSetDomainBlockList.php b/opensrs/mail/mailSetDomainBlockList.php
index 3fab1db4..01532f52 100644
--- a/opensrs/mail/mailSetDomainBlockList.php
+++ b/opensrs/mail/mailSetDomainBlockList.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class mailSetDomainBlockList extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -29,7 +29,7 @@ public function __destruct () {
 	private function _validateObject (){
 		$allPassed = true;
 		$compile = "";
-		
+
 		// Command required values - authentication
 		if (!isSet($this->_dataObject->data->admin_username) || $this->_dataObject->data->admin_username == "") {
 			if (APP_MAIL_USERNAME == ""){
@@ -55,7 +55,7 @@ private function _validateObject (){
 				$this->_dataObject->data->admin_domain = APP_MAIL_DOMAIN;
 			}
 		}
-						
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS-eMail Error - domain is not defined.", E_USER_WARNING);
@@ -69,7 +69,7 @@ private function _validateObject (){
 		} else {
 			$compile .= " list=\"". $this->_dataObject->data->list ."\"";
 		}
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -78,7 +78,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
@@ -86,14 +86,14 @@ private function _processRequest ($command = ""){
 			1 => "login user=\"". $this->_dataObject->data->admin_username ."\" domain=\"". $this->_dataObject->data->admin_domain ."\" password=\"". $this->_dataObject->data->admin_password ."\"",
 			2 => "set_domain_block_list". $command,
 			3 => "quit"
-		);		
+		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/mail/mailSetDomainDisabledStatus.php b/opensrs/mail/mailSetDomainDisabledStatus.php
index b4038eff..8bfe20cb 100644
--- a/opensrs/mail/mailSetDomainDisabledStatus.php
+++ b/opensrs/mail/mailSetDomainDisabledStatus.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class mailSetDomainDisabledStatus extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -29,7 +29,7 @@ public function __destruct () {
 	private function _validateObject (){
 		$allPassed = true;
 		$compile = "";
-		
+
 		// Command required values - authentication
 		if (!isSet($this->_dataObject->data->admin_username) || $this->_dataObject->data->admin_username == "") {
 			if (APP_MAIL_USERNAME == ""){
@@ -55,7 +55,7 @@ private function _validateObject (){
 				$this->_dataObject->data->admin_domain = APP_MAIL_DOMAIN;
 			}
 		}
-						
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS-eMail Error - domain is not defined.", E_USER_WARNING);
@@ -69,7 +69,7 @@ private function _validateObject (){
 		} else {
 			$compile .= " disabled=\"". $this->_dataObject->data->disabled ."\"";
 		}
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -78,7 +78,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
@@ -86,12 +86,12 @@ private function _processRequest ($command = ""){
 			1 => "login user=\"". $this->_dataObject->data->admin_username ."\" domain=\"". $this->_dataObject->data->admin_domain ."\" password=\"". $this->_dataObject->data->admin_password ."\"",
 			2 => "set_domain_disabled_status". $command,
 			3 => "quit"
-		);		
+		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		// Results
 		$this->resultRaw = $arrayResult;
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/mail/mailSetDomainMailboxLimits.php b/opensrs/mail/mailSetDomainMailboxLimits.php
index 494f3b91..9f44c167 100644
--- a/opensrs/mail/mailSetDomainMailboxLimits.php
+++ b/opensrs/mail/mailSetDomainMailboxLimits.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class mailSetDomainMailboxLimits extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -29,7 +29,7 @@ public function __destruct () {
 	private function _validateObject (){
 		$allPassed = true;
 		$compile = "";
-		
+
 		// Command required values - authentication
 		if (!isSet($this->_dataObject->data->admin_username) || $this->_dataObject->data->admin_username == "") {
 			if (APP_MAIL_USERNAME == ""){
@@ -55,7 +55,7 @@ private function _validateObject (){
 				$this->_dataObject->data->admin_domain = ;
 			}
 		}
-						
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->domain) || $this->_dataObject->data->domain == "") {
 			trigger_error ("oSRS-eMail Error - domain is not defined.", E_USER_WARNING);
@@ -63,14 +63,14 @@ private function _validateObject (){
 		} else {
 			$compile .= " domain=\"". $this->_dataObject->data->domain ."\"";
 		}
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->mailbox) || $this->_dataObject->data->mailbox != "") $compile .= " mailbox=\"". $this->_dataObject->data->mailbox ."\"";
 		if (isSet($this->_dataObject->data->filter_only) || $this->_dataObject->data->filter_only != "") $compile .= " filter_only=\"". $this->_dataObject->data->filter_only ."\"";
 		if (isSet($this->_dataObject->data->alias) || $this->_dataObject->data->alias != "") $compile .= " alias=\"". $this->_dataObject->data->alias ."\"";
 		if (isSet($this->_dataObject->data->forward_only) || $this->_dataObject->data->forward_only != "") $compile .= " forward_only=\"". $this->_dataObject->data->forward_only ."\"";
 		if (isSet($this->_dataObject->data->mailing_list) || $this->_dataObject->data->mailing_list != "") $compile .= " mailing_list=\"". $this->_dataObject->data->mailing_list ."\"";
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -79,7 +79,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
@@ -87,14 +87,14 @@ private function _processRequest ($command = ""){
 			1 => "login user=\"". $this->_dataObject->data->admin_username ."\" domain=\"". $this->_dataObject->data->admin_domain ."\" password=\"". $this->_dataObject->data->admin_password ."\"",
 			2 => "set_domain_mailbox_limits". $command,
 			3 => "quit"
-		);		
+		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/opensrs/publishing/pubCreate.php b/opensrs/publishing/pubCreate.php
index 6b5b2bf7..e7416eac 100644
--- a/opensrs/publishing/pubCreate.php
+++ b/opensrs/publishing/pubCreate.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->domain)) {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -59,10 +59,10 @@ private function _processRequest (){
 				"service_type" => $this->_dataObject->data->service_type
 			)
 		);
-		
+
 		if (isSet($this->_dataObject->data->end_user_auth_info) && $this->_dataObject->data->end_user_auth_info != "") $cmd['attributes']['end_user_auth_info'] = $this->_dataObject->data->end_user_auth_info;
 		if (isSet($this->_dataObject->data->source_domain) && $this->_dataObject->data->source_domain != "") $cmd['attributes']['source_domain'] = $this->_dataObject->data->source_domain;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -70,7 +70,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/publishing/pubDelete.php b/opensrs/publishing/pubDelete.php
index 69e2f259..6c9a5e4a 100644
--- a/opensrs/publishing/pubDelete.php
+++ b/opensrs/publishing/pubDelete.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->domain)) {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -59,7 +59,7 @@ private function _processRequest (){
 				"service_type" => $this->_dataObject->data->service_type
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -67,7 +67,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/publishing/pubDisable.php b/opensrs/publishing/pubDisable.php
index 9d80035d..2e1403ad 100644
--- a/opensrs/publishing/pubDisable.php
+++ b/opensrs/publishing/pubDisable.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->domain)) {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -59,7 +59,7 @@ private function _processRequest (){
 				"service_type" => $this->_dataObject->data->service_type
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -67,7 +67,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/publishing/pubEnable.php b/opensrs/publishing/pubEnable.php
index abdb7d36..7c44edba 100644
--- a/opensrs/publishing/pubEnable.php
+++ b/opensrs/publishing/pubEnable.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->domain)) {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -59,7 +59,7 @@ private function _processRequest (){
 				"service_type" => $this->_dataObject->data->service_type
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -67,7 +67,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/publishing/pubGenerateRedirectionCode.php b/opensrs/publishing/pubGenerateRedirectionCode.php
index d5fc25b7..42bcadd9 100644
--- a/opensrs/publishing/pubGenerateRedirectionCode.php
+++ b/opensrs/publishing/pubGenerateRedirectionCode.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->domain)) {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -39,12 +39,12 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - service_type is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-		
+
 		if (!isSet($this->_dataObject->data->programming_language)) {
 			trigger_error ("oSRS Error - programming language is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -66,7 +66,7 @@ private function _processRequest (){
 				"programming_language" => $this->_dataObject->data->programming_language
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -74,7 +74,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/publishing/pubGetControlPanelUrl.php b/opensrs/publishing/pubGetControlPanelUrl.php
index 72c48076..cbe01485 100644
--- a/opensrs/publishing/pubGetControlPanelUrl.php
+++ b/opensrs/publishing/pubGetControlPanelUrl.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->domain)) {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -59,7 +59,7 @@ private function _processRequest (){
 				"service_type" => $this->_dataObject->data->service_type
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -67,7 +67,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/publishing/pubGetServiceInfo.php b/opensrs/publishing/pubGetServiceInfo.php
index a7fc079c..67896a5a 100644
--- a/opensrs/publishing/pubGetServiceInfo.php
+++ b/opensrs/publishing/pubGetServiceInfo.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->domain)) {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -59,7 +59,7 @@ private function _processRequest (){
 				"service_type" => $this->_dataObject->data->service_type
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -67,7 +67,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/publishing/pubLetExpire.php b/opensrs/publishing/pubLetExpire.php
index 23fafce8..77ad649e 100644
--- a/opensrs/publishing/pubLetExpire.php
+++ b/opensrs/publishing/pubLetExpire.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->domain)) {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -59,7 +59,7 @@ private function _processRequest (){
 				"service_type" => $this->_dataObject->data->service_type
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -67,7 +67,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/publishing/pubUpdate.php b/opensrs/publishing/pubUpdate.php
index 4f035087..71889326 100644
--- a/opensrs/publishing/pubUpdate.php
+++ b/opensrs/publishing/pubUpdate.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->domain)) {
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -39,12 +39,12 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - service_type is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-		
+
 		if (!isSet($this->_dataObject->data->source_domain)) {
 			trigger_error ("oSRS Error - source_domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -66,10 +66,10 @@ private function _processRequest (){
 				"source_domain" => $this->_dataObject->data->source_domain,
 			)
 		);
-		
+
 		if (isSet($this->_dataObject->data->new_domain) && $this->_dataObject->data->new_domain != "") $cmd['attributes']['new_domain'] = $this->_dataObject->data->new_domain;
-		
-		
+
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -77,7 +77,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/trust/trustCancelOrder.php b/opensrs/trust/trustCancelOrder.php
index 4dbff02a..dd36624b 100644
--- a/opensrs/trust/trustCancelOrder.php
+++ b/opensrs/trust/trustCancelOrder.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->order_id)) {
 			trigger_error ("oSRS Error - order_id is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -54,7 +54,7 @@ private function _processRequest (){
 				"order_id" => $this->_dataObject->data->order_id
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -62,7 +62,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/trust/trustCreateToken.php b/opensrs/trust/trustCreateToken.php
index 679bf76b..0cd28a61 100644
--- a/opensrs/trust/trustCreateToken.php
+++ b/opensrs/trust/trustCreateToken.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->order_id) and !isSet($this->_dataObject->data->product_id) ) {
 			trigger_error ("oSRS Error - order_id or product_id is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -51,10 +51,10 @@ private function _processRequest (){
 			"action" => "create_token",
 			"object" => "trust_service"
 		);
-		
+
 		if (isSet($this->_dataObject->data->product_id) && $this->_dataObject->data->product_id != "") $cmd['attributes']['product_id'] = $this->_dataObject->data->product_id;
 		if (isSet($this->_dataObject->data->order_id) && $this->_dataObject->data->order_id != "") $cmd['attributes']['order_id'] = $this->_dataObject->data->order_id;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -62,7 +62,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/trust/trustGetOrderInfo.php b/opensrs/trust/trustGetOrderInfo.php
index 2071e2cb..f6a1dfde 100644
--- a/opensrs/trust/trustGetOrderInfo.php
+++ b/opensrs/trust/trustGetOrderInfo.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->order_id)) {
 			trigger_error ("oSRS Error - order_id is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -54,7 +54,7 @@ private function _processRequest (){
 				"order_id" => $this->_dataObject->data->order_id
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -62,7 +62,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/trust/trustGetProductInfo.php b/opensrs/trust/trustGetProductInfo.php
index 5d6bdf10..3c7b62ec 100644
--- a/opensrs/trust/trustGetProductInfo.php
+++ b/opensrs/trust/trustGetProductInfo.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->product_id)) {
 			trigger_error ("oSRS Error - product_id is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -54,7 +54,7 @@ private function _processRequest (){
 				"product_id" => $this->_dataObject->data->product_id
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -62,7 +62,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/trust/trustParseCSR.php b/opensrs/trust/trustParseCSR.php
index 2419c183..e21b1275 100644
--- a/opensrs/trust/trustParseCSR.php
+++ b/opensrs/trust/trustParseCSR.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->csr)) {
 			trigger_error ("oSRS Error - csr is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -60,7 +60,7 @@ private function _processRequest (){
 				"csr" => $this->_dataObject->data->csr
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -68,7 +68,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/trust/trustProcessPending.php b/opensrs/trust/trustProcessPending.php
index e0176296..c4d8e8f4 100644
--- a/opensrs/trust/trustProcessPending.php
+++ b/opensrs/trust/trustProcessPending.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->order_id)) {
 			trigger_error ("oSRS Error - order_id is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -54,7 +54,7 @@ private function _processRequest (){
 				"order_id" => $this->_dataObject->data->order_id
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -62,7 +62,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/trust/trustQueryApproverList.php b/opensrs/trust/trustQueryApproverList.php
index d896207d..1fa9cf22 100644
--- a/opensrs/trust/trustQueryApproverList.php
+++ b/opensrs/trust/trustQueryApproverList.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->product_type)) {
 			trigger_error ("oSRS Error - product_type is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -38,7 +38,7 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -59,7 +59,7 @@ private function _processRequest (){
 				"product_type" => $this->_dataObject->data->product_type
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -67,7 +67,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/trust/trustRequestOnDemandScan.php b/opensrs/trust/trustRequestOnDemandScan.php
index 93ed27dd..f2fc5383 100644
--- a/opensrs/trust/trustRequestOnDemandScan.php
+++ b/opensrs/trust/trustRequestOnDemandScan.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->order_id) and !isSet($this->_dataObject->data->product_id) ) {
 			trigger_error ("oSRS Error - order_id or product_id is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -51,10 +51,10 @@ private function _processRequest (){
 			"action" => "request_on_demand_scan",
 			"object" => "trust_service"
 		);
-		
+
 		if (isSet($this->_dataObject->data->product_id) && $this->_dataObject->data->product_id != "") $cmd['attributes']['product_id'] = $this->_dataObject->data->product_id;
 		if (isSet($this->_dataObject->data->order_id) && $this->_dataObject->data->order_id != "") $cmd['attributes']['order_id'] = $this->_dataObject->data->order_id;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -62,7 +62,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/trust/trustResendApproverEmail.php b/opensrs/trust/trustResendApproverEmail.php
index dd18afc8..d0d3c363 100644
--- a/opensrs/trust/trustResendApproverEmail.php
+++ b/opensrs/trust/trustResendApproverEmail.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->order_id)) {
 			trigger_error ("oSRS Error - order_id is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -54,7 +54,7 @@ private function _processRequest (){
 				"order_id" => $this->_dataObject->data->order_id
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -62,7 +62,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/trust/trustResendCertEmail.php b/opensrs/trust/trustResendCertEmail.php
index 7a895d32..fb2bae53 100644
--- a/opensrs/trust/trustResendCertEmail.php
+++ b/opensrs/trust/trustResendCertEmail.php
@@ -29,7 +29,7 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->order_id)) {
 			trigger_error ("oSRS Error - order_id is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -54,7 +54,7 @@ private function _processRequest (){
 				"order_id" => $this->_dataObject->data->order_id
 			)
 		);
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -62,7 +62,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult;
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
diff --git a/opensrs/trust/trustSWregister.php b/opensrs/trust/trustSWregister.php
index 16f150b2..68f1fe64 100644
--- a/opensrs/trust/trustSWregister.php
+++ b/opensrs/trust/trustSWregister.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class trustSWregister extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -30,9 +30,9 @@ private function _validateObject (){
 		$allPassed = $this->_allTimeRequired ();
 		// Run the command
 		if ($allPassed) {
-			// Execute the command			
+			// Execute the command
 			$this->_processRequest ();
-		} else {			
+		} else {
 			trigger_error ("oSRS Error - Incorrect call.", E_USER_WARNING);
 		}
 	} // end of private function _validateObject()
@@ -40,7 +40,7 @@ private function _validateObject (){
 	// Personal Information
 	private function _allTimeRequired(){
 		$subtest = true;
-		
+
 		// $reqPers = array ("first_name", "last_name", "org_name", "address1", "city", "state", "country", "postal_code", "phone", "email");
 		// 	for ($i = 0; $i < count($reqPers); $i++){
 		// 		if ($this->_dataObject->personal->$reqPers[$i] == "") {
@@ -48,7 +48,7 @@ private function _allTimeRequired(){
 		// 			$subtest = false;
 		// 		}
 		// 	}
-		
+
 		$reqData = array ("reg_type", "product_type");
 		for ($i = 0; $i < count($reqData); $i++){
 			if ($this->_dataObject->data->$reqData[$i] == "") {
@@ -56,17 +56,17 @@ private function _allTimeRequired(){
 				$subtest = false;
 			}
 		}
-		
+
 		return $subtest;
 	}
-	
+
 	// Post validation functions
-	private function _processRequest (){		
+	private function _processRequest (){
 		$cmd = array(
 			'protocol' => 'XCP',
 			'action' => 'SW_REGISTER',
 			'object' => 'trust_service',
-			'attributes' => array( 
+			'attributes' => array(
 				'reg_type' => $this->_dataObject->data->reg_type,
 				'product_type' => $this->_dataObject->data->product_type,
 				'contact_set' => array(
@@ -90,7 +90,7 @@ private function _processRequest (){
 		if (isSet($this->_dataObject->data->server_count) && $this->_dataObject->data->server_count != "") $cmd['attributes']['server_count'] = $this->_dataObject->data->server_count;
 		if (isSet($this->_dataObject->data->handle) && $this->_dataObject->data->handle != "") $cmd['attributes']['handle'] = $this->_dataObject->data->handle;
 
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -102,11 +102,11 @@ private function _processRequest (){
 		} else {
 			$this->resultRaw = $arrayResult;
 		}
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 		$this->XMLresult = $XMLresult;
 	}
-	
+
 	private function _createUserData(){
 		$userArray = array(
 			"first_name" => $this->_dataObject->personal->first_name,
diff --git a/opensrs/trust/trustUpdateOrder.php b/opensrs/trust/trustUpdateOrder.php
index 8dd72018..1b5ecaab 100644
--- a/opensrs/trust/trustUpdateOrder.php
+++ b/opensrs/trust/trustUpdateOrder.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class trustUpdateOrder extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -25,7 +25,7 @@ public function __destruct () {
 
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->order_id)) {
 			trigger_error ("oSRS Error - order_id is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -39,18 +39,18 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - Incorrect call.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
-	private function _processRequest (){		
+	private function _processRequest (){
 		$cmd = array(
 			'protocol' => 'XCP',
 			'action' => 'update_order',
 			'object' => 'trust_service',
-			'attributes' => array( 
+			'attributes' => array(
 				'order_id' => $this->_dataObject->data->order_id
 			)
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->product_type) && $this->_dataObject->data->product_type != "") $cmd['attributes']['product_type'] = $this->_dataObject->data->product_type;
 		// reg_type => SiteLock ONLY
@@ -64,7 +64,7 @@ private function _processRequest (){
 		if (isSet($this->_dataObject->data->server_count) && $this->_dataObject->data->server_count != "") $cmd['attributes']['server_count'] = $this->_dataObject->data->server_count;
 
 
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -76,9 +76,9 @@ private function _processRequest (){
 		} else {
 			$this->resultRaw = $arrayResult;
 		}
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 		$this->XMLresult = $XMLresult;
 	}
-	
+
 }
diff --git a/opensrs/trust/trustUpdateProduct.php b/opensrs/trust/trustUpdateProduct.php
index a2b30a99..dbb65c0c 100644
--- a/opensrs/trust/trustUpdateProduct.php
+++ b/opensrs/trust/trustUpdateProduct.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class trustUpdateProduct extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -25,7 +25,7 @@ public function __destruct () {
 
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		if (!isSet($this->_dataObject->data->product_id)) {
 			trigger_error ("oSRS Error - product_id is not defined.", E_USER_WARNING);
 			$allPassed = false;
@@ -39,24 +39,24 @@ private function _validateObject (){
 			trigger_error ("oSRS Error - Incorrect call.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
-	private function _processRequest (){		
+	private function _processRequest (){
 		$cmd = array(
 			'protocol' => 'XCP',
 			'action' => 'update_product',
 			'object' => 'trust_service',
-			'attributes' => array( 
+			'attributes' => array(
 				'product_id' => $this->_dataObject->data->product_id
 			)
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->contact_email) && $this->_dataObject->data->contact_email != "") $cmd['attributes']['contact_email'] = $this->_dataObject->data->contact_email;
 		if (isSet($this->_dataObject->data->seal_in_search) && $this->_dataObject->data->seal_in_search != "") $cmd['attributes']['seal_in_search'] = $this->_dataObject->data->seal_in_search;
 		if (isSet($this->_dataObject->data->trust_seal) && $this->_dataObject->data->trust_seal != "") $cmd['attributes']['trust_seal'] = $this->_dataObject->data->trust_seal;
 
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -68,9 +68,9 @@ private function _processRequest (){
 		} else {
 			$this->resultRaw = $arrayResult;
 		}
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 		$this->XMLresult = $XMLresult;
 	}
-	
+
 }
diff --git a/templates/domainTemplate.php b/templates/domainTemplate.php
index c3aedfa2..e6574655 100644
--- a/templates/domainTemplate.php
+++ b/templates/domainTemplate.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class functionTemplate extends openSRS_base {
 	private $_dataObject;
 	private $_formatHolder = "";
@@ -26,13 +26,13 @@ public function __destruct () {
 	// Validate the object
 	private function _validateObject (){
 		$allPassed = true;
-		
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->xxx) || $this->_dataObject->data->xxx == "") {
 			trigger_error ("oSRS Error - xxx is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -45,12 +45,12 @@ private function _validateObject (){
 	// Post validation functions
 	private function _processRequest (){
 		$cmd = array(
-		
+
 		);
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->xxx) && $this->_dataObject->data->xxx != "") $cmd['attributes']['xxx'] = $this->_dataObject->data->xxx;
-		
+
 		$xmlCMD = $this->_opsHandler->encode($cmd);					// Flip Array to XML
 		$XMLresult = $this->send_cmd($xmlCMD);						// Send XML
 		$arrayResult = $this->_opsHandler->decode($XMLresult);		// Flip XML to Array
@@ -58,7 +58,7 @@ private function _processRequest (){
 		// Results
 		$this->resultFullRaw = $arrayResult;
 		$this->resultRaw = $arrayResult['attributes'];
-		$this->resultFullFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFullFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultFullRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 	}
 }
\ No newline at end of file
diff --git a/templates/mailTemplate.php b/templates/mailTemplate.php
index 4d8391b1..5b4f1729 100644
--- a/templates/mailTemplate.php
+++ b/templates/mailTemplate.php
@@ -1,14 +1,14 @@
 <?php
 /*
  *  Required object values:
- *  data - 
+ *  data -
  */
- 
+
 class xxx extends openSRS_mail {
 	private $_dataObject;
 	private $_formatHolder = "";
 	private $_osrsm;
-	
+
 	public $resultRaw;
 	public $resultFormatted;
 	public $resultSuccess;
@@ -29,7 +29,7 @@ public function __destruct () {
 	private function _validateObject (){
 		$allPassed = true;
 		$compile = "";
-		
+
 		// Command required values - authentication
 		if (!isSet($this->_dataObject->data->username) || $this->_dataObject->data->username == "") {
 			trigger_error ("oSRS-eMail Error - username is not defined.", E_USER_WARNING);
@@ -43,7 +43,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - authentication domain is not defined.", E_USER_WARNING);
 			$allPassed = false;
 		}
-				
+
 		// Command required values
 		if (!isSet($this->_dataObject->data->xxx) || $this->_dataObject->data->xxx == "") {
 			trigger_error ("oSRS-eMail Error - xxx is not defined.", E_USER_WARNING);
@@ -51,10 +51,10 @@ private function _validateObject (){
 		} else {
 			$compile .= " xxx=\"". $this->_dataObject->data->xxx ."\"";
 		}
-		
+
 		// Command optional values
 		if (isSet($this->_dataObject->data->xxx) || $this->_dataObject->data->xxx != "") $compile .= " xxx=\"". $this->_dataObject->data->xxx ."\"";
-		
+
 		// Run the command
 		if ($allPassed) {
 			// Execute the command
@@ -63,7 +63,7 @@ private function _validateObject (){
 			trigger_error ("oSRS-eMail Error - Missing data.", E_USER_WARNING);
 		}
 	}
-	
+
 	// Post validation functions
 	private function _processRequest ($command = ""){
 		$sequence = array (
@@ -71,13 +71,13 @@ private function _processRequest ($command = ""){
 			1 => "login user=\"". $this->_dataObject->data->username ."\" domain=\"". $this->_dataObject->data->authdomain ."\" password=\"". $this->_dataObject->data->password ."\"",
 			2 => "xxx". $command,
 			3 => "quit"
-		);		
+		);
 		$tucRes = $this->makeCall($sequence);
 		$arrayResult = $this->parseResults($tucRes);
-		
+
 		// Results
 		$this->resultRaw = $arrayResult;
-		$this->resultFormatted = convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
+		$this->resultFormatted = $this->convertArray2Formatted ($this->_formatHolder, $this->resultRaw);
 		$this->resultSuccess = $this->makeCheck ($arrayResult);
 	}
 }
\ No newline at end of file

From bfcf6149f62661f8e002bd66694d63251342cff2 Mon Sep 17 00:00:00 2001
From: Alan Hollis <alan.hollis@6dg.co.uk>
Date: Fri, 27 Sep 2013 10:23:07 +0100
Subject: [PATCH 4/5] Add wrapper file

Includes the functions that were in the global namespace previously and
calls the autoloader.
---
 demo/openSRS_LoaderWrapper.php | 83 ++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 demo/openSRS_LoaderWrapper.php

diff --git a/demo/openSRS_LoaderWrapper.php b/demo/openSRS_LoaderWrapper.php
new file mode 100644
index 00000000..009a162e
--- /dev/null
+++ b/demo/openSRS_LoaderWrapper.php
@@ -0,0 +1,83 @@
+<?php
+require_once __DIR__ . '/../opensrs/openSRS_loader.php';
+
+// Call parsers and functions of openSRS
+function processOpenSRS ($type="", $data="") {
+
+    if (empty($data)) {
+        trigger_error("OSRS Error - No data found.");
+        return null;
+    }
+    else {
+        $dataArray = array();
+        switch(strtolower($type)) {
+            case "array":
+                $dataArray = $data;
+                break;
+            case "json":
+                $json = str_replace("\\\"", "\"", $data);   //  Replace  \"  with " for JSON that comes from Javascript
+                $dataArray = json_decode($json, true);
+                break;
+            case "yaml":
+                $dataArray = Spyc::YAMLLoad($data);
+                break;
+            default:
+                $dataArray = $data;
+        }
+        // Convert associative array to object
+        $dataObject = array2object($dataArray);
+        $classCall = null;
+        if (class_exists($dataObject->func)){
+            $classCall = new $dataObject->func($type, $dataObject);
+        }
+        else {
+            trigger_error("OSRS Error - Unable to find the function $dataObject->func.  Either the function is misspelled or there are incorrect file paths set in openSRS_config.php.");
+        }
+        return $classCall;
+    }
+}
+
+function array2object($data) {
+    if(!is_array($data)) return $data;
+    $object = new stdClass();
+
+    foreach ($data as $name=>$value) {
+        if (isset($name)) {
+            $name = strtolower(trim($name));
+            $object->$name = array2object($value);
+        }
+    }
+    return $object;
+}
+
+function object2array($data){
+    if(!is_object($data) && !is_array($data)) return $data;
+    if(is_object($data)) $data = get_object_vars($data);
+    return array_map('object2array', $data);
+}
+
+function convertArray2Formatted ($type="", $data="") {
+    $resultString = "";
+    if ($type == "json") $resultString = json_encode($data);
+    if ($type == "yaml") $resultString = Spyc::YAMLDump($data);
+    return $resultString;
+}
+
+function convertFormatted2array ($type="", $data="") {
+    $resultArray = "";
+    if ($type == "json") $resultArray = json_decode($data, true);
+    if ($type == "yaml") $resultArray = Spyc::YAMLLoad($data);;
+    return $resultArray;
+}
+
+function array_filter_recursive($input)
+{
+    foreach ($input as &$value)
+    {
+        if (is_array($value))
+        {
+            $value = array_filter_recursive($value);
+        }
+    }
+    return array_filter($input);
+}
\ No newline at end of file

From fe157d90a7f036479cbc34befed0c0dc2a675576 Mon Sep 17 00:00:00 2001
From: Alan Hollis <alan.hollis@6dg.co.uk>
Date: Fri, 27 Sep 2013 10:23:38 +0100
Subject: [PATCH 5/5] Make tester include new wrapper

---
 test/api-tester.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/api-tester.php b/test/api-tester.php
index e8ce4bda..2203e4dd 100644
--- a/test/api-tester.php
+++ b/test/api-tester.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . "/../opensrs/openSRS_loader.php";
+require_once(__DIR__ . "/../demo/openSRS_LoaderWrapper.php");
 
 $callstring = json_encode(array("func" => "lookupGetBalance"));
 $osrsHandler = processOpenSRS ("json", $callstring);