BUG: refs #301 Fixed style

Author: Charles Ma

core/controllers/components/UtilityComponent.php

@@ -15,56 +15,56 @@ class UtilityComponent extends AppComponent
 {
 
   /**
-	 * The main function for converting to an XML document.
-	 * Pass in a multi dimensional array and this recrusively loops through and builds up an XML document.
-	 *
-	 * @param array $data
-	 * @param string $rootNodeName - what you want the root node to be - defaultsto data.
-	 * @param SimpleXMLElement $xml - should only be used recursively
-	 * @return string XML
-	 */
-	public function toXml($data, $rootNodeName = 'data', $xml=null)
+   * The main function for converting to an XML document.
+   * Pass in a multi dimensional array and this recrusively loops through and builds up an XML document.
+   *
+   * @param array $data
+   * @param string $rootNodeName - what you want the root node to be - defaultsto data.
+   * @param SimpleXMLElement $xml - should only be used recursively
+   * @return string XML
+   */
+  public function toXml($data, $rootNodeName = 'data', $xml = null)
     {
-		// turn off compatibility mode as simple xml throws a wobbly if you don't.
-		if(ini_get('zend.ze1_compatibility_mode') == 1)
+    // turn off compatibility mode as simple xml throws a wobbly if you don't.
+    if(ini_get('zend.ze1_compatibility_mode') == 1)
       {
-			ini_set ('zend.ze1_compatibility_mode', 0);
+      ini_set('zend.ze1_compatibility_mode', 0);
       }
 
-		if ($xml == null)
+    if($xml == null)
       {
-			$xml = simplexml_load_string("<?xml version='1.0' encoding='utf-8'?><$rootNodeName />");
+      $xml = simplexml_load_string("<?xml version='1.0' encoding='utf-8'?><".$rootNodeName." />");
       }
 
-		// loop through the data passed in.
-		foreach($data as $key => $value)
+    // loop through the data passed in.
+    foreach($data as $key => $value)
       {
-			// no numeric keys in our xml please!
-			if(is_numeric($key))
+      // no numeric keys in our xml please!
+      if(is_numeric($key))
         {
-				// make string key...
-				$key = "unknownNode_". (string) $key;
+        // make string key...
+        $key = "unknownNode_". (string) $key;
         }
 
-			// replace anything not alpha numeric
-			$key = preg_replace('/[^a-z]/i', '', $key);
+      // replace anything not alpha numeric
+      $key = preg_replace('/[^a-z]/i', '', $key);
 
-			// if there is another array found recrusively call this function
-			if(is_array($value))
+      // if there is another array found recrusively call this function
+      if(is_array($value))
         {
-				$node = $xml->addChild($key);
-				// recrusive call.
-				$this->toXml($value, $rootNodeName, $node);
+        $node = $xml->addChild($key);
+        // recrusive call.
+        $this->toXml($value, $rootNodeName, $node);
         }
-			else
+      else
         {
-				// add single node.
+        // add single node.
         $value = htmlentities($value);
-				$xml->addChild($key,$value);
+        $xml->addChild($key, $value);
         }
       }
-		// pass back as string. or simple xml object if you want!
-		return $xml->asXML();
+    // pass back as string. or simple xml object if you want!
+    return $xml->asXML();
     }
   /** Get all the modules */
   public function getAllModules()

modules/remoteprocessing/controllers/components/JobComponent.php

@@ -105,7 +105,7 @@ public function computeLogs($job, $logs, $params)
     $xml .= "<![CDATA[".JsonComponent::encode($params)."]]>";
     $xml .= "</JobParameters>\n";
     $logs = explode("-COMMAND\r", $logs);
-    if(count($logs)<2)
+    if(count($logs) < 2)
       {
       return "";
       }
@@ -185,7 +185,7 @@ public function convertXmlREsults($xml)
       $tmp['command'] = trim((string) $process->Command);
       $tmp['stderr'] = trim((string) $process->Error);
       $tmp['stdout'] = trim((string) $process->Output);
-      $tmp['xmlStdout'] = simplexml_load_string($tmp['stdout'], 'SimpleXMLElement', LIBXML_NOCDATA);;
+      $tmp['xmlStdout'] = simplexml_load_string($tmp['stdout'], 'SimpleXMLElement', LIBXML_NOCDATA);
       $tmp['time'] = (float) trim(str_replace("s", "", (string) $process->ExecutionTime)); //convert in milliseconds
       $tmp['output'] = array();
       $tmp['parameters'] = array();