YetiForceCompany / YetiForceCRM

include/Webservices/Utils.php

Doc Comments +23 added lines

@@ -162,6 +162,9 @@ 
 	return $param;
 }
 
+/**
+ * @param boolean $moduleName
+ */
 function vtws_getEntityNameFields($moduleName)
 {
 
@@ -285,6 +288,10 @@ 
 	return vtws_addModuleTypeWebserviceEntity($moduleName, $moduleHandler['file'], $moduleHandler['class'], $isModule);
 }
 
+/**
+ * @param string $filePath
+ * @param string $className
+ */
 function vtws_addModuleTypeWebserviceEntity($moduleName, $filePath, $className)
 {
 	$adb = PearDatabase::getInstance();
@@ -313,6 +320,10 @@ 
 	}
 }
 
+/**
+ * @param string $filePath
+ * @param string $className
+ */
 function vtws_addActorTypeWebserviceEntityWithName($moduleName, $filePath, $className, $actorNameDetails)
 {
 	$adb = PearDatabase::getInstance();
@@ -322,6 +333,10 @@ 
 	vtws_addActorTypeName($entityId, $actorNameDetails['fieldNames'], $actorNameDetails['indexField'], $actorNameDetails['tableName']);
 }
 
+/**
+ * @param string $filePath
+ * @param string $className
+ */
 function vtws_addActorTypeWebserviceEntityWithoutName($moduleName, $filePath, $className, $actorNameDetails)
 {
 	$adb = PearDatabase::getInstance();
@@ -352,6 +367,9 @@ 
 	return $meta->getName($id);
 }
 
+/**
+ * @param string $name
+ */
 function vtws_preserveGlobal($name, $value)
 {
 	return VTWS_PreserveGlobal::preserveGlobal($name, $value);
@@ -953,6 +971,11 @@ 
 	return null;
 }
 
+/**
+ * @param string $label
+ *
+ * @return integer|null
+ */
 function vtws_getWebserviceTranslatedString($label)
 {
 	$currentLanguage = vtws_getWebserviceCurrentLanguage();

include/Webservices/VTQL_Lexer.php

Doc Comments +9 added lines

@@ -5,6 +5,9 @@ 
 $in_started = false;
 $count = false;
 
+/**
+ * @param integer $count
+ */
 function incrementN($lexer, $count)
 {
 	$i = 0;
@@ -160,6 +163,9 @@ 
 	}
 }
 
+/**
+ * @param VTQL_Lexer $lexer
+ */
 function handleend($lexer, $val)
 {
 	return VTQL_Parser::SEMICOLON;
@@ -179,6 +185,9 @@ 
 	public $mandatory;
 	public $current_state;
 
+	/**
+	 * @param string $data
+	 */
 	public function __construct($data)
 	{
 		$this->index = 0;

include/Webservices/VTQL_Parser.php

Doc Comments +3 added lines

@@ -159,6 +159,9 @@
 	private $syntax_error;
 	private $user;
 
+	/**
+	 * @param VTQL_Lexer $lex
+	 */
 	public function __construct($user, $lex, $out)
 	{
 		if (!is_array($out)) {

Spacing +6 added lines, -6 removed lines

@@ -89,7 +89,7 @@ 
 {
 
 	public $stateno; /* The state-number */
-	public $major;   /* The major token value.  This is the code
+	public $major; /* The major token value.  This is the code
 	 * * number for the token at this stack level */
 	public $minor; /* The user-supplied minor token value.  This
 	 * * is the value of the token  */
@@ -663,17 +663,17 @@ 
 	/**
 	 * @var int
 	 */
-	public $yyidx;  /* Index of top element in stack */
+	public $yyidx; /* Index of top element in stack */
 
 	/**
 	 * @var int
 	 */
-	public $yyerrcnt;  /* Shifts left before out of the error */
+	public $yyerrcnt; /* Shifts left before out of the error */
 
 	/**
 	 * @var array
 	 */
-	public $yystack = [];  /* The parser's stack */
+	public $yystack = []; /* The parser's stack */
 
 	/**
 	 * For tracing shifts, the names of all terminals and nonterminals
@@ -782,7 +782,7 @@ 
 			 * * which appear on the RHS of the rule, but which are not used
 			 * * inside the C code.
 			 */
-			default: break;   /* If no destructor action specified: do nothing */
+			default: break; /* If no destructor action specified: do nothing */
 		}
 	}
 
@@ -1608,7 +1608,7 @@ 
 	{
 //        $yyact;            /* The parser action. */
 //        $yyendofinput;     /* True if we are at the end of input */
-		$yyerrorhit = 0;   /* True if yymajor has invoked an error */
+		$yyerrorhit = 0; /* True if yymajor has invoked an error */
 
 		/* (re)initialize the parser, if necessary */
 		if ($this->yyidx === null || $this->yyidx < 0) {

include/Webservices/WebserviceField.php

Doc Comments +9 added lines

@@ -84,6 +84,9 @@ 
 		}
 	}
 
+	/**
+	 * @param integer $rowNumber
+	 */
 	public static function fromQueryResult($adb, $result, $rowNumber)
 	{
 		return new WebserviceField($adb, $adb->query_result_rowdata($result, $rowNumber));
@@ -147,6 +150,9 @@ 
 		return $this->default;
 	}
 
+	/**
+	 * @return string
+	 */
 	public function getColumnName()
 	{
 		return $this->columnName;
@@ -203,6 +209,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param boolean $nullable
+	 */
 	private function setNullable($nullable)
 	{
 		$this->nullable = $nullable;

Braces +13 added lines, -9 removed lines

@@ -198,8 +198,9 @@ 
 
 	public function isReadOnly()
 	{
-		if ($this->readOnly == 1)
-			return true;
+		if ($this->readOnly == 1) {
+					return true;
+		}
 		return false;
 	}
 
@@ -307,8 +308,9 @@ 
 				$numRows = $this->pearDB->num_rows($result);
 				for ($i = 0; $i < $numRows; ++$i) {
 					$referenceType = $this->pearDB->query_result($result, $i, "type");
-					if (in_array($referenceType, $accessibleTypes))
-						array_push($referenceTypes, $referenceType);
+					if (in_array($referenceType, $accessibleTypes)) {
+											array_push($referenceTypes, $referenceType);
+					}
 				}
 			} else {
 				$fieldModel = Vtiger_Field_Model::getInstanceFromFieldId($this->getFieldId());
@@ -425,21 +427,23 @@ 
 				$picklistValue = $this->pearDB->query_result($result, $i, $fieldName);
 				$picklistValue = decode_html($picklistValue);
 				$moduleName = getTabModuleName($this->getTabId());
-				if ($moduleName == 'Events')
-					$moduleName = 'Calendar';
+				if ($moduleName == 'Events') {
+									$moduleName = 'Calendar';
+				}
 				$elem["label"] = \includes\Language::translate($picklistValue, $moduleName);
 				$elem["value"] = $picklistValue;
 				array_push($options, $elem);
 			}
-		}else {
+		} else {
 			$user = VTWS_PreserveGlobal::getGlobal('current_user');
 			$details = \includes\fields\Picklist::getRoleBasedPicklistValues($fieldName, $user->roleid);
 			for ($i = 0; $i < sizeof($details); ++$i) {
 				$elem = [];
 				$picklistValue = decode_html($details[$i]);
 				$moduleName = getTabModuleName($this->getTabId());
-				if ($moduleName == 'Events')
-					$moduleName = 'Calendar';
+				if ($moduleName == 'Events') {
+									$moduleName = 'Calendar';
+				}
 				$elem["label"] = \includes\Language::translate($picklistValue, $moduleName);
 				$elem["value"] = $picklistValue;
 				array_push($options, $elem);

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 								module_name=?, summary=?, test=?, execution_condition=?, defaultworkflow=?, filtersavedinnew=?,
 								schtypeid=?, schtime=?, schdayofmonth=?, schdayofweek=?, schannualdates=?, nexttrigger_time=? where workflow_id=?", array($wf->moduleName, $wf->description, $wf->test, $wf->executionCondition, $wf->defaultworkflow, $wf->filtersavedinnew,
 				$wf->schtypeid, $wf->schtime, $wf->schdayofmonth, $wf->schdayofweek, $wf->schannualdates, $wf->nexttrigger_time, $wf->id));
-		}else {
+		} else {
 			$workflowId = $adb->getUniqueID("com_vtiger_workflows");
 			$workflow->id = $workflowId;
 			$wf = $workflow;

install/views/Index.php

Doc Comments +5 added lines

@@ -19,6 +19,11 @@
 		return false;
 	}
 
+	/**
+	 * @param Vtiger_Request $request
+	 *
+	 * @return Vtiger_Request
+	 */
 	public function setLanguage($request)
 	{
 		if (!$request->get('lang')) {

Braces +3 added lines, -2 removed lines

@@ -87,8 +87,9 @@
 	public function process(Vtiger_Request $request)
 	{
 		$default_charset = AppConfig::main('default_charset');
-		if (empty($default_charset))
-			$default_charset = 'UTF-8';
+		if (empty($default_charset)) {
+					$default_charset = 'UTF-8';
+		}
 		$mode = $request->getMode();
 		if (!empty($mode) && $this->isMethodExposed($mode)) {
 			return $this->$mode($request);

libraries/csrf-magic/csrf-magic.php

Doc Comments +4 added lines, -1 removed lines

@@ -211,7 +211,7 @@ 
 /**
  * Checks if this is a post request, and if it is, checks if the nonce is valid.
  * @param bool $fatal Whether or not to fatally error out if there is a problem.
- * @return True if check passes or is not necessary, false if failure.
+ * @return boolean|null if check passes or is not necessary, false if failure.
  */
 function csrf_check($fatal = true) {
     if ($_SERVER['REQUEST_METHOD'] !== 'POST') return true;
@@ -281,6 +281,9 @@ 
     }
     return $ret;
 }
+/**
+ * @param integer $level
+ */
 function csrf_flattenpost2($level, $key, $data) {
     if(!is_array($data)) return array($key => $data);
     $ret = array();

Spacing +19 added lines, -19 removed lines

@@ -166,35 +166,35 @@ 
 			if (!$is_html) return $buffer;
         }
     }
-    $count=1;
+    $count = 1;
     $tokens = csrf_get_tokens();
     $name = $GLOBALS['csrf']['input-name'];
     $endslash = $GLOBALS['csrf']['xhtml'] ? ' /' : '';
     $input = "<input type='hidden' name='$name' value=\"$tokens\"$endslash>";
     $buffer = preg_replace('#(<form[^>]*method\s*=\s*["\']post["\'][^>]*>)#i', '$1' . $input, $buffer);
     if ($GLOBALS['csrf']['frame-breaker'] && !$is_partial) {
-        $buffer = preg_replace('/<\/head>/', '<script type="text/javascript">if (top != self) {top.location.href = self.location.href;}</script></head>', $buffer,$count);
+        $buffer = preg_replace('/<\/head>/', '<script type="text/javascript">if (top != self) {top.location.href = self.location.href;}</script></head>', $buffer, $count);
     }
     if (($js = $GLOBALS['csrf']['rewrite-js']) && !$is_partial) {
 		global $dbconfig;
         if (empty($dbconfig) || empty($dbconfig['db_name']) || $dbconfig['db_name'] == '_DBC_TYPE_') {
 		$buffer = preg_replace(
             '/<\/head>/',
-             '<script type="text/javascript">'.
-                'var csrfMagicToken = "'.$tokens.'";'.
-                'var csrfMagicName = "'.$name.'";</script>'.
-            '<script src="../'.$js.'" type="text/javascript"></script></head>',
-            $buffer,$count
+             '<script type="text/javascript">' .
+                'var csrfMagicToken = "' . $tokens . '";' .
+                'var csrfMagicName = "' . $name . '";</script>' .
+            '<script src="../' . $js . '" type="text/javascript"></script></head>',
+            $buffer, $count
 		);
 			
 		} else {
 		$buffer = preg_replace(
             '/<\/head>/',
-            '<script type="text/javascript">'.
-                'var csrfMagicToken = "'.$tokens.'";'.
-                'var csrfMagicName = "'.$name.'";</script>'.
-            '<script src="'.$js.'" type="text/javascript"></script></head>',
-            $buffer,$count
+            '<script type="text/javascript">' .
+                'var csrfMagicToken = "' . $tokens . '";' .
+                'var csrfMagicName = "' . $name . '";</script>' .
+            '<script src="' . $js . '" type="text/javascript"></script></head>',
+            $buffer, $count
 		);
 		}
 		
@@ -276,17 +276,17 @@ 
 
 function csrf_flattenpost($data) {
     $ret = array();
-    foreach($data as $n => $v) {
+    foreach ($data as $n => $v) {
         $ret = array_merge($ret, csrf_flattenpost2(1, $n, $v));
     }
     return $ret;
 }
 function csrf_flattenpost2($level, $key, $data) {
-    if(!is_array($data)) return array($key => $data);
+    if (!is_array($data)) return array($key => $data);
     $ret = array();
-    foreach($data as $n => $v) {
-        $nk = $level >= 1 ? $key."[$n]" : "[$n]";
-        $ret = array_merge($ret, csrf_flattenpost2($level+1, $nk, $v));
+    foreach ($data as $n => $v) {
+        $nk = $level >= 1 ? $key . "[$n]" : "[$n]";
+        $ret = array_merge($ret, csrf_flattenpost2($level + 1, $nk, $v));
     }
     return $ret;
 }
@@ -300,7 +300,7 @@ 
     $data = '';
     foreach (csrf_flattenpost($_POST) as $key => $value) {
         if ($key == $GLOBALS['csrf']['input-name']) continue;
-        $data .= '<input type="hidden" name="'.htmlspecialchars($key).'" value="'.htmlspecialchars($value).'" />';
+        $data .= '<input type="hidden" name="' . htmlspecialchars($key) . '" value="' . htmlspecialchars($value) . '" />';
     }
     echo "<html><head><title>CSRF check failed</title></head>
         <body>
@@ -408,7 +408,7 @@ 
     if (is_writable($dir)) {
         $secret = csrf_generate_secret();
         $fh = fopen($file, 'w');
-        fwrite($fh, '<?php $secret = "'.$secret.'";' . PHP_EOL);
+        fwrite($fh, '<?php $secret = "' . $secret . '";' . PHP_EOL);
         fclose($fh);
         return $secret;
     }

Braces +90 added lines, -31 removed lines

@@ -157,13 +157,16 @@ 
 			// Determine based on content type.
 			$headers = headers_list();
 			foreach ($headers as $header) {
-				if ($is_html) break;
-				else if (stripos('Content-type', $header) !== false && stripos('/html', $header) === false) {
+				if ($is_html) {
+					break;
+				} else if (stripos('Content-type', $header) !== false && stripos('/html', $header) === false) {
 					$is_html = false;
 				}
 			}
         
-			if (!$is_html) return $buffer;
+			if (!$is_html) {
+				return $buffer;
+			}
         }
     }
     $count=1;
@@ -214,22 +217,30 @@ 
  * @return True if check passes or is not necessary, false if failure.
  */
 function csrf_check($fatal = true) {
-    if ($_SERVER['REQUEST_METHOD'] !== 'POST') return true;
+    if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
+    	return true;
+    }
     csrf_start();
     $name = $GLOBALS['csrf']['input-name'];
     $ok = false;
     $tokens = '';
     do {
-        if (!isset($_POST[$name])) break;
+        if (!isset($_POST[$name])) {
+        	break;
+        }
         // we don't regenerate a token and check it because some token creation
         // schemes are volatile.
         $tokens = $_POST[$name];
-        if (!csrf_check_tokens($tokens)) break;
+        if (!csrf_check_tokens($tokens)) {
+        	break;
+        }
         $ok = true;
     } while (false);
     if ($fatal && !$ok) {
         $callback = $GLOBALS['csrf']['callback'];
-        if (trim($tokens, 'A..Za..z0..9:;,') !== '') $tokens = 'hidden';
+        if (trim($tokens, 'A..Za..z0..9:;,') !== '') {
+        	$tokens = 'hidden';
+        }
         $callback($tokens);
         exit;
     }
@@ -256,15 +267,21 @@ 
     csrf_start();
 
     // These are "strong" algorithms that don't require per se a secret
-    if (session_id()) return 'sid:' . csrf_hash(session_id()) . $ip;
+    if (session_id()) {
+    	return 'sid:' . csrf_hash(session_id()) . $ip;
+    }
     if ($GLOBALS['csrf']['cookie']) {
         $val = csrf_generate_secret();
         setcookie($GLOBALS['csrf']['cookie'], $val);
         return 'cookie:' . csrf_hash($val) . $ip;
     }
-    if ($GLOBALS['csrf']['key']) return 'key:' . csrf_hash($GLOBALS['csrf']['key']) . $ip;
+    if ($GLOBALS['csrf']['key']) {
+    	return 'key:' . csrf_hash($GLOBALS['csrf']['key']) . $ip;
+    }
     // These further algorithms require a server-side secret
-    if (!$secret) return 'invalid';
+    if (!$secret) {
+    	return 'invalid';
+    }
     if ($GLOBALS['csrf']['user'] !== false) {
         return 'user:' . csrf_hash($GLOBALS['csrf']['user']);
     }
@@ -282,7 +299,9 @@ 
     return $ret;
 }
 function csrf_flattenpost2($level, $key, $data) {
-    if(!is_array($data)) return array($key => $data);
+    if(!is_array($data)) {
+    	return array($key => $data);
+    }
     $ret = array();
     foreach($data as $n => $v) {
         $nk = $level >= 1 ? $key."[$n]" : "[$n]";
@@ -299,7 +318,9 @@ 
     header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden');
     $data = '';
     foreach (csrf_flattenpost($_POST) as $key => $value) {
-        if ($key == $GLOBALS['csrf']['input-name']) continue;
+        if ($key == $GLOBALS['csrf']['input-name']) {
+        	continue;
+        }
         $data .= '<input type="hidden" name="'.htmlspecialchars($key).'" value="'.htmlspecialchars($value).'" />';
     }
     echo "<html><head><title>CSRF check failed</title></head>
@@ -325,9 +346,13 @@ 
  * instead of csrf_check_token()
  */
 function csrf_check_tokens($tokens) {
-    if (is_string($tokens)) $tokens = explode(';', $tokens);
+    if (is_string($tokens)) {
+    	$tokens = explode(';', $tokens);
+    }
     foreach ($tokens as $token) {
-        if (csrf_check_token($token)) return true;
+        if (csrf_check_token($token)) {
+        	return true;
+        }
     }
     return false;
 }
@@ -336,38 +361,62 @@ 
  * Checks if a token is valid.
  */
 function csrf_check_token($token) {
-    if (strpos($token, ':') === false) return false;
+    if (strpos($token, ':') === false) {
+    	return false;
+    }
     list($type, $value) = explode(':', $token, 2);
-    if (strpos($value, ',') === false) return false;
+    if (strpos($value, ',') === false) {
+    	return false;
+    }
     list($x, $time) = explode(',', $token, 2);
     if ($GLOBALS['csrf']['expires']) {
-        if (time() > $time + $GLOBALS['csrf']['expires']) return false;
+        if (time() > $time + $GLOBALS['csrf']['expires']) {
+        	return false;
+        }
     }
     switch ($type) {
         case 'sid':
             return $value === csrf_hash(session_id(), $time);
         case 'cookie':
             $n = $GLOBALS['csrf']['cookie'];
-            if (!$n) return false;
-            if (!isset($_COOKIE[$n])) return false;
+            if (!$n) {
+            	return false;
+            }
+            if (!isset($_COOKIE[$n])) {
+            	return false;
+            }
             return $value === csrf_hash($_COOKIE[$n], $time);
         case 'key':
-            if (!$GLOBALS['csrf']['key']) return false;
+            if (!$GLOBALS['csrf']['key']) {
+            	return false;
+            }
             return $value === csrf_hash($GLOBALS['csrf']['key'], $time);
         // We could disable these 'weaker' checks if 'key' was set, but
         // that doesn't make me feel good then about the cookie-based
         // implementation.
         case 'user':
-            if (!csrf_get_secret()) return false;
-            if ($GLOBALS['csrf']['user'] === false) return false;
+            if (!csrf_get_secret()) {
+            	return false;
+            }
+            if ($GLOBALS['csrf']['user'] === false) {
+            	return false;
+            }
             return $value === csrf_hash($GLOBALS['csrf']['user'], $time);
         case 'ip':
-            if (!csrf_get_secret()) return false;
+            if (!csrf_get_secret()) {
+            	return false;
+            }
             // do not allow IP-based checks if the username is set, or if
             // the browser sent cookies
-            if ($GLOBALS['csrf']['user'] !== false) return false;
-            if (!empty($_COOKIE)) return false;
-            if (!$GLOBALS['csrf']['allow-ip']) return false;
+            if ($GLOBALS['csrf']['user'] !== false) {
+            	return false;
+            }
+            if (!empty($_COOKIE)) {
+            	return false;
+            }
+            if (!$GLOBALS['csrf']['allow-ip']) {
+            	return false;
+            }
             return $value === csrf_hash($_SERVER['IP_ADDRESS'], $time);
     }
     return false;
@@ -397,7 +446,9 @@ 
  * Retrieves the secret, and generates one if necessary.
  */
 function csrf_get_secret() {
-    if ($GLOBALS['csrf']['secret']) return $GLOBALS['csrf']['secret'];
+    if ($GLOBALS['csrf']['secret']) {
+    	return $GLOBALS['csrf']['secret'];
+    }
     $dir = dirname(__FILE__);
     $file = $dir . '/../../config/csrf_secret.php';
     $secret = '';
@@ -432,13 +483,21 @@ 
  * from the current time.
  */
 function csrf_hash($value, $time = null) {
-    if (!$time) $time = time();
+    if (!$time) {
+    	$time = time();
+    }
     return sha1(csrf_get_secret() . $value . $time) . ',' . $time;
 }
 
 // Load user configuration
-if (function_exists('csrf_startup')) csrf_startup();
+if (function_exists('csrf_startup')) {
+	csrf_startup();
+}
 // Initialize our handler
-if ($GLOBALS['csrf']['rewrite'])     ob_start('csrf_ob_handler');
+if ($GLOBALS['csrf']['rewrite']) {
+	ob_start('csrf_ob_handler');
+}
 // Perform check
-if (!$GLOBALS['csrf']['defer'])      csrf_check();
+if (!$GLOBALS['csrf']['defer']) {
+	csrf_check();
+}

Indentation +185 added lines, -185 removed lines

@@ -138,17 +138,17 @@ 
  * inject our JavaScript library.
  */
 function csrf_ob_handler($buffer, $flags) {
-    // Even though the user told us to rewrite, we should do a quick heuristic
-    // to check if the page is *actually* HTML. We don't begin rewriting until
-    // we hit the first <html tag.
-    static $is_html = false;
-    static $is_partial = false;
+	// Even though the user told us to rewrite, we should do a quick heuristic
+	// to check if the page is *actually* HTML. We don't begin rewriting until
+	// we hit the first <html tag.
+	static $is_html = false;
+	static $is_partial = false;
     
-    if (!$is_html) {
-        // not HTML until proven otherwise
-        if (stripos($buffer, '<html') !== false) {
-            $is_html = true;
-        } else {
+	if (!$is_html) {
+		// not HTML until proven otherwise
+		if (stripos($buffer, '<html') !== false) {
+			$is_html = true;
+		} else {
 
 			// Customized to take the partial HTML with form
 			$is_html = true;
@@ -164,48 +164,48 @@ 
 			}
         
 			if (!$is_html) return $buffer;
-        }
-    }
-    $count=1;
-    $tokens = csrf_get_tokens();
-    $name = $GLOBALS['csrf']['input-name'];
-    $endslash = $GLOBALS['csrf']['xhtml'] ? ' /' : '';
-    $input = "<input type='hidden' name='$name' value=\"$tokens\"$endslash>";
-    $buffer = preg_replace('#(<form[^>]*method\s*=\s*["\']post["\'][^>]*>)#i', '$1' . $input, $buffer);
-    if ($GLOBALS['csrf']['frame-breaker'] && !$is_partial) {
-        $buffer = preg_replace('/<\/head>/', '<script type="text/javascript">if (top != self) {top.location.href = self.location.href;}</script></head>', $buffer,$count);
-    }
-    if (($js = $GLOBALS['csrf']['rewrite-js']) && !$is_partial) {
+		}
+	}
+	$count=1;
+	$tokens = csrf_get_tokens();
+	$name = $GLOBALS['csrf']['input-name'];
+	$endslash = $GLOBALS['csrf']['xhtml'] ? ' /' : '';
+	$input = "<input type='hidden' name='$name' value=\"$tokens\"$endslash>";
+	$buffer = preg_replace('#(<form[^>]*method\s*=\s*["\']post["\'][^>]*>)#i', '$1' . $input, $buffer);
+	if ($GLOBALS['csrf']['frame-breaker'] && !$is_partial) {
+		$buffer = preg_replace('/<\/head>/', '<script type="text/javascript">if (top != self) {top.location.href = self.location.href;}</script></head>', $buffer,$count);
+	}
+	if (($js = $GLOBALS['csrf']['rewrite-js']) && !$is_partial) {
 		global $dbconfig;
-        if (empty($dbconfig) || empty($dbconfig['db_name']) || $dbconfig['db_name'] == '_DBC_TYPE_') {
+		if (empty($dbconfig) || empty($dbconfig['db_name']) || $dbconfig['db_name'] == '_DBC_TYPE_') {
 		$buffer = preg_replace(
-            '/<\/head>/',
-             '<script type="text/javascript">'.
-                'var csrfMagicToken = "'.$tokens.'";'.
-                'var csrfMagicName = "'.$name.'";</script>'.
-            '<script src="../'.$js.'" type="text/javascript"></script></head>',
-            $buffer,$count
+			'/<\/head>/',
+			 '<script type="text/javascript">'.
+				'var csrfMagicToken = "'.$tokens.'";'.
+				'var csrfMagicName = "'.$name.'";</script>'.
+			'<script src="../'.$js.'" type="text/javascript"></script></head>',
+			$buffer,$count
 		);
 			
 		} else {
 		$buffer = preg_replace(
-            '/<\/head>/',
-            '<script type="text/javascript">'.
-                'var csrfMagicToken = "'.$tokens.'";'.
-                'var csrfMagicName = "'.$name.'";</script>'.
-            '<script src="'.$js.'" type="text/javascript"></script></head>',
-            $buffer,$count
+			'/<\/head>/',
+			'<script type="text/javascript">'.
+				'var csrfMagicToken = "'.$tokens.'";'.
+				'var csrfMagicName = "'.$name.'";</script>'.
+			'<script src="'.$js.'" type="text/javascript"></script></head>',
+			$buffer,$count
 		);
 		}
 		
-        $script = '<script type="text/javascript">CsrfMagic.end();</script>';
+		$script = '<script type="text/javascript">CsrfMagic.end();</script>';
         
-        $buffer = preg_replace('/<\/body>/', $script . '</body>', $buffer, $count);
-        if (!$count) {
-            $buffer .= $script;
-        }
-    }
-    return $buffer;
+		$buffer = preg_replace('/<\/body>/', $script . '</body>', $buffer, $count);
+		if (!$count) {
+			$buffer .= $script;
+		}
+	}
+	return $buffer;
 }
 
 /**
@@ -214,26 +214,26 @@ 
  * @return True if check passes or is not necessary, false if failure.
  */
 function csrf_check($fatal = true) {
-    if ($_SERVER['REQUEST_METHOD'] !== 'POST') return true;
-    csrf_start();
-    $name = $GLOBALS['csrf']['input-name'];
-    $ok = false;
-    $tokens = '';
-    do {
-        if (!isset($_POST[$name])) break;
-        // we don't regenerate a token and check it because some token creation
-        // schemes are volatile.
-        $tokens = $_POST[$name];
-        if (!csrf_check_tokens($tokens)) break;
-        $ok = true;
-    } while (false);
-    if ($fatal && !$ok) {
-        $callback = $GLOBALS['csrf']['callback'];
-        if (trim($tokens, 'A..Za..z0..9:;,') !== '') $tokens = 'hidden';
-        $callback($tokens);
-        exit;
-    }
-    return $ok;
+	if ($_SERVER['REQUEST_METHOD'] !== 'POST') return true;
+	csrf_start();
+	$name = $GLOBALS['csrf']['input-name'];
+	$ok = false;
+	$tokens = '';
+	do {
+		if (!isset($_POST[$name])) break;
+		// we don't regenerate a token and check it because some token creation
+		// schemes are volatile.
+		$tokens = $_POST[$name];
+		if (!csrf_check_tokens($tokens)) break;
+		$ok = true;
+	} while (false);
+	if ($fatal && !$ok) {
+		$callback = $GLOBALS['csrf']['callback'];
+		if (trim($tokens, 'A..Za..z0..9:;,') !== '') $tokens = 'hidden';
+		$callback($tokens);
+		exit;
+	}
+	return $ok;
 }
 
 /**
@@ -241,67 +241,67 @@ 
  * by semicolons.
  */
 function csrf_get_tokens() {
-    $has_cookies = !empty($_COOKIE);
-
-    // $ip implements a composite key, which is sent if the user hasn't sent
-    // any cookies. It may or may not be used, depending on whether or not
-    // the cookies "stick"
-    $secret = csrf_get_secret();
-    if (!$has_cookies && $secret) {
-        $ip = ';ip:' . csrf_hash($_SERVER['IP_ADDRESS']);
-    } else {
-        $ip = '';
-    }
-    csrf_start();
-
-    // These are "strong" algorithms that don't require per se a secret
-    if (session_id()) return 'sid:' . csrf_hash(session_id()) . $ip;
-    if ($GLOBALS['csrf']['cookie']) {
-        $val = csrf_generate_secret();
-        setcookie($GLOBALS['csrf']['cookie'], $val);
-        return 'cookie:' . csrf_hash($val) . $ip;
-    }
-    if ($GLOBALS['csrf']['key']) return 'key:' . csrf_hash($GLOBALS['csrf']['key']) . $ip;
-    // These further algorithms require a server-side secret
-    if (!$secret) return 'invalid';
-    if ($GLOBALS['csrf']['user'] !== false) {
-        return 'user:' . csrf_hash($GLOBALS['csrf']['user']);
-    }
-    if ($GLOBALS['csrf']['allow-ip']) {
-        return ltrim($ip, ';');
-    }
-    return 'invalid';
+	$has_cookies = !empty($_COOKIE);
+
+	// $ip implements a composite key, which is sent if the user hasn't sent
+	// any cookies. It may or may not be used, depending on whether or not
+	// the cookies "stick"
+	$secret = csrf_get_secret();
+	if (!$has_cookies && $secret) {
+		$ip = ';ip:' . csrf_hash($_SERVER['IP_ADDRESS']);
+	} else {
+		$ip = '';
+	}
+	csrf_start();
+
+	// These are "strong" algorithms that don't require per se a secret
+	if (session_id()) return 'sid:' . csrf_hash(session_id()) . $ip;
+	if ($GLOBALS['csrf']['cookie']) {
+		$val = csrf_generate_secret();
+		setcookie($GLOBALS['csrf']['cookie'], $val);
+		return 'cookie:' . csrf_hash($val) . $ip;
+	}
+	if ($GLOBALS['csrf']['key']) return 'key:' . csrf_hash($GLOBALS['csrf']['key']) . $ip;
+	// These further algorithms require a server-side secret
+	if (!$secret) return 'invalid';
+	if ($GLOBALS['csrf']['user'] !== false) {
+		return 'user:' . csrf_hash($GLOBALS['csrf']['user']);
+	}
+	if ($GLOBALS['csrf']['allow-ip']) {
+		return ltrim($ip, ';');
+	}
+	return 'invalid';
 }
 
 function csrf_flattenpost($data) {
-    $ret = array();
-    foreach($data as $n => $v) {
-        $ret = array_merge($ret, csrf_flattenpost2(1, $n, $v));
-    }
-    return $ret;
+	$ret = array();
+	foreach($data as $n => $v) {
+		$ret = array_merge($ret, csrf_flattenpost2(1, $n, $v));
+	}
+	return $ret;
 }
 function csrf_flattenpost2($level, $key, $data) {
-    if(!is_array($data)) return array($key => $data);
-    $ret = array();
-    foreach($data as $n => $v) {
-        $nk = $level >= 1 ? $key."[$n]" : "[$n]";
-        $ret = array_merge($ret, csrf_flattenpost2($level+1, $nk, $v));
-    }
-    return $ret;
+	if(!is_array($data)) return array($key => $data);
+	$ret = array();
+	foreach($data as $n => $v) {
+		$nk = $level >= 1 ? $key."[$n]" : "[$n]";
+		$ret = array_merge($ret, csrf_flattenpost2($level+1, $nk, $v));
+	}
+	return $ret;
 }
 
 /**
  * @param $tokens is safe for HTML consumption
  */
 function csrf_callback($tokens) {
-    // (yes, $tokens is safe to echo without escaping)
-    header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden');
-    $data = '';
-    foreach (csrf_flattenpost($_POST) as $key => $value) {
-        if ($key == $GLOBALS['csrf']['input-name']) continue;
-        $data .= '<input type="hidden" name="'.htmlspecialchars($key).'" value="'.htmlspecialchars($value).'" />';
-    }
-    echo "<html><head><title>CSRF check failed</title></head>
+	// (yes, $tokens is safe to echo without escaping)
+	header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden');
+	$data = '';
+	foreach (csrf_flattenpost($_POST) as $key => $value) {
+		if ($key == $GLOBALS['csrf']['input-name']) continue;
+		$data .= '<input type="hidden" name="'.htmlspecialchars($key).'" value="'.htmlspecialchars($value).'" />';
+	}
+	echo "<html><head><title>CSRF check failed</title></head>
         <body>
         <p>CSRF check failed. Your form session may have expired, or you may not have
         cookies enabled.</p>
@@ -316,7 +316,7 @@ 
  * It is configurable by setting $GLOBALS['csrf']['callback'] in this file
  */
 function vtResponseForIllegalAccess() {
-    echo 'Invalid request - Response For Illegal Access';
+	echo 'Invalid request - Response For Illegal Access';
 }
 
 /**
@@ -324,106 +324,106 @@ 
  * instead of csrf_check_token()
  */
 function csrf_check_tokens($tokens) {
-    if (is_string($tokens)) $tokens = explode(';', $tokens);
-    foreach ($tokens as $token) {
-        if (csrf_check_token($token)) return true;
-    }
-    return false;
+	if (is_string($tokens)) $tokens = explode(';', $tokens);
+	foreach ($tokens as $token) {
+		if (csrf_check_token($token)) return true;
+	}
+	return false;
 }
 
 /**
  * Checks if a token is valid.
  */
 function csrf_check_token($token) {
-    if (strpos($token, ':') === false) return false;
-    list($type, $value) = explode(':', $token, 2);
-    if (strpos($value, ',') === false) return false;
-    list($x, $time) = explode(',', $token, 2);
-    if ($GLOBALS['csrf']['expires']) {
-        if (time() > $time + $GLOBALS['csrf']['expires']) return false;
-    }
-    switch ($type) {
-        case 'sid':
-            return $value === csrf_hash(session_id(), $time);
-        case 'cookie':
-            $n = $GLOBALS['csrf']['cookie'];
-            if (!$n) return false;
-            if (!isset($_COOKIE[$n])) return false;
-            return $value === csrf_hash($_COOKIE[$n], $time);
-        case 'key':
-            if (!$GLOBALS['csrf']['key']) return false;
-            return $value === csrf_hash($GLOBALS['csrf']['key'], $time);
-        // We could disable these 'weaker' checks if 'key' was set, but
-        // that doesn't make me feel good then about the cookie-based
-        // implementation.
-        case 'user':
-            if (!csrf_get_secret()) return false;
-            if ($GLOBALS['csrf']['user'] === false) return false;
-            return $value === csrf_hash($GLOBALS['csrf']['user'], $time);
-        case 'ip':
-            if (!csrf_get_secret()) return false;
-            // do not allow IP-based checks if the username is set, or if
-            // the browser sent cookies
-            if ($GLOBALS['csrf']['user'] !== false) return false;
-            if (!empty($_COOKIE)) return false;
-            if (!$GLOBALS['csrf']['allow-ip']) return false;
-            return $value === csrf_hash($_SERVER['IP_ADDRESS'], $time);
-    }
-    return false;
+	if (strpos($token, ':') === false) return false;
+	list($type, $value) = explode(':', $token, 2);
+	if (strpos($value, ',') === false) return false;
+	list($x, $time) = explode(',', $token, 2);
+	if ($GLOBALS['csrf']['expires']) {
+		if (time() > $time + $GLOBALS['csrf']['expires']) return false;
+	}
+	switch ($type) {
+		case 'sid':
+			return $value === csrf_hash(session_id(), $time);
+		case 'cookie':
+			$n = $GLOBALS['csrf']['cookie'];
+			if (!$n) return false;
+			if (!isset($_COOKIE[$n])) return false;
+			return $value === csrf_hash($_COOKIE[$n], $time);
+		case 'key':
+			if (!$GLOBALS['csrf']['key']) return false;
+			return $value === csrf_hash($GLOBALS['csrf']['key'], $time);
+		// We could disable these 'weaker' checks if 'key' was set, but
+		// that doesn't make me feel good then about the cookie-based
+		// implementation.
+		case 'user':
+			if (!csrf_get_secret()) return false;
+			if ($GLOBALS['csrf']['user'] === false) return false;
+			return $value === csrf_hash($GLOBALS['csrf']['user'], $time);
+		case 'ip':
+			if (!csrf_get_secret()) return false;
+			// do not allow IP-based checks if the username is set, or if
+			// the browser sent cookies
+			if ($GLOBALS['csrf']['user'] !== false) return false;
+			if (!empty($_COOKIE)) return false;
+			if (!$GLOBALS['csrf']['allow-ip']) return false;
+			return $value === csrf_hash($_SERVER['IP_ADDRESS'], $time);
+	}
+	return false;
 }
 
 /**
  * Sets a configuration value.
  */
 function csrf_conf($key, $val) {
-    if (!isset($GLOBALS['csrf'][$key])) {
-        trigger_error('No such configuration ' . $key, E_USER_WARNING);
-        return;
-    }
-    $GLOBALS['csrf'][$key] = $val;
+	if (!isset($GLOBALS['csrf'][$key])) {
+		trigger_error('No such configuration ' . $key, E_USER_WARNING);
+		return;
+	}
+	$GLOBALS['csrf'][$key] = $val;
 }
 
 /**
  * Starts a session if we're allowed to.
  */
 function csrf_start() {
-    if ($GLOBALS['csrf']['auto-session'] && !session_id()) {
-        session_start();
-    }
+	if ($GLOBALS['csrf']['auto-session'] && !session_id()) {
+		session_start();
+	}
 }
 
 /**
  * Retrieves the secret, and generates one if necessary.
  */
 function csrf_get_secret() {
-    if ($GLOBALS['csrf']['secret']) return $GLOBALS['csrf']['secret'];
-    $dir = dirname(__FILE__);
-    $file = $dir . '/../../config/csrf_secret.php';
-    $secret = '';
-    if (file_exists($file)) {
-        include $file;
-        return $secret;
-    }
-    if (is_writable($dir)) {
-        $secret = csrf_generate_secret();
-        $fh = fopen($file, 'w');
-        fwrite($fh, '<?php $secret = "'.$secret.'";' . PHP_EOL);
-        fclose($fh);
-        return $secret;
-    }
-    return '';
+	if ($GLOBALS['csrf']['secret']) return $GLOBALS['csrf']['secret'];
+	$dir = dirname(__FILE__);
+	$file = $dir . '/../../config/csrf_secret.php';
+	$secret = '';
+	if (file_exists($file)) {
+		include $file;
+		return $secret;
+	}
+	if (is_writable($dir)) {
+		$secret = csrf_generate_secret();
+		$fh = fopen($file, 'w');
+		fwrite($fh, '<?php $secret = "'.$secret.'";' . PHP_EOL);
+		fclose($fh);
+		return $secret;
+	}
+	return '';
 }
 
 /**
  * Generates a random string as the hash of time, microtime, and mt_rand.
  */
 function csrf_generate_secret($len = 32) {
-    $r = '';
-    for ($i = 0; $i < 32; $i++) {
-        $r .= chr(mt_rand(0, 255));
-    }
-    $r .= time() . microtime();
-    return sha1($r);
+	$r = '';
+	for ($i = 0; $i < 32; $i++) {
+		$r .= chr(mt_rand(0, 255));
+	}
+	$r .= time() . microtime();
+	return sha1($r);
 }
 
 /**
@@ -431,8 +431,8 @@ 
  * from the current time.
  */
 function csrf_hash($value, $time = null) {
-    if (!$time) $time = time();
-    return sha1(csrf_get_secret() . $value . $time) . ',' . $time;
+	if (!$time) $time = time();
+	return sha1(csrf_get_secret() . $value . $time) . ',' . $time;
 }
 
 // Load user configuration

libraries/freetag/freetag.class.php

Doc Comments +6 added lines, -1 removed lines

@@ -405,6 +405,7 @@ 
 	 * @param int The unique ID of the person who tagged the object with this tag.
 	 * @param int The unique ID of the object in question.
 	 * @param string A raw string from a web form containing tags.
+	 * @param string $tag
 	 *
 	 * @return boolean Returns true if successful, false otherwise. Does not operate as a transaction.
 	 */ 
@@ -662,7 +663,7 @@ 
 	 * @param string The raw string form of the tag to delete. See above for vtiger_notes.
 	 * @param int Whether to skip the update portion for objects that haven't been tagged. (Default: 1)
 	 *
-	 * @return string Returns the tag in normalized form.
+	 * @return boolean Returns the tag in normalized form.
 	 */
 	public function tag_object($tagger_id, $object_id, $tag_string, $module, $skip_updates = 1) {
 		if($tag_string == '') {
@@ -1127,6 +1128,10 @@ 
 	 * @param string The text to output
 	 * @return boolean Always returns true
 	 */
+
+	/**
+	 * @param string $text
+	 */
 	public function debug_text($text) {
 		if ($this->_debug) {
 			echo "$text<br>\n";

Indentation +3 added lines, -3 removed lines

@@ -175,7 +175,7 @@ 
 			WHERE $where
 			ORDER BY object_id ASC
 			LIMIT $offset, $limit";
-        echo $sql;
+		echo $sql;
 		$rs = $adb->pquery($sql, $params);
 		$retarr = array();
 		while ($row = $adb->fetch_array($rs)) {
@@ -220,7 +220,7 @@ 
 			WHERE $where
 			ORDER BY object_id ASC
 			";
-        	//echo $sql;
+			//echo $sql;
 		$rs = $adb->pquery($sql, $params);
 		$retarr = array();
 		while ($row = $adb->fetch_array($rs)) {
@@ -970,7 +970,7 @@ 
 			$tagger_sql
 			GROUP BY tag
 			ORDER BY quantity DESC LIMIT 0, $max";
-        //echo $sql;
+		//echo $sql;
 		$rs = $adb->pquery($sql, $params);
 		$retarr = array();
 		while ($row = $adb->fetch_array($rs)) {

Spacing +52 added lines, -52 removed lines

@@ -65,7 +65,7 @@ 
 	 * @access private
 	 * @param string Whether to prevent multiple vtiger_users from tagging the same object. By default, set to block (ala Upcoming.org)
 	 */
-	var $_block_multiuser_tag_on_object =0;
+	var $_block_multiuser_tag_on_object = 0;
 	/**
 	 * @access private
 	 * @param bool Whether to use persistent ADODB connections. False by default.
@@ -155,7 +155,7 @@ 
 	 * @return An array of Object ID numbers that reference your original objects.
 	 */ 
 	public function get_objects_with_tag($tag, $offset = 0, $limit = 100, $tagger_id = NULL) {
-		if(!isset($tag)) {
+		if (!isset($tag)) {
 			return false;
 		}		
 		$adb = PearDatabase::getInstance();
@@ -163,7 +163,7 @@ 
 		$where = "tag = ? ";
 		$params = array($tag);
 
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$where .= "AND tagger_id = ? ";
 			array_push($params, $tagger_id);
 		} 
@@ -201,7 +201,7 @@ 
 	 * @return An array of Object ID numbers that reference your original objects.
 	 */ 
 	public function get_objects_with_tag_all($tag, $tagger_id = NULL) {
-		if(!isset($tag)) {
+		if (!isset($tag)) {
 			return false;
 		}		
 		$adb = PearDatabase::getInstance();
@@ -209,7 +209,7 @@ 
 		$where = "tag = ? ";
 		$params = array($tag);
 
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$where .= "AND tagger_id = ? ";
 			array_push($params, $tagger_id);
 		} 
@@ -253,7 +253,7 @@ 
 			return $retarr;
 		}
 		$params = array($tagArray);
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$tagger_sql = "AND tagger_id = ?";
 			array_push($params, $tagger_id);
 		} else {
@@ -274,7 +274,7 @@ 
 		$sql = "SELECT ${prefix}freetagged_objects.object_id, tag, COUNT(DISTINCT tag) AS uniques
 			FROM ${prefix}freetagged_objects 
 			INNER JOIN ${prefix}freetags ON (${prefix}freetagged_objects.tag_id = ${prefix}freetags.id)
-			WHERE ${prefix}freetags.tag IN (". generateQuestionMarks($tagArray) .")
+			WHERE ${prefix}freetags.tag IN (" . generateQuestionMarks($tagArray) . ")
 			$tagger_sql
 			GROUP BY ${prefix}freetagged_objects.object_id
 			HAVING uniques = $numTags
@@ -304,7 +304,7 @@ 
 	 * @return An array of Object ID numbers that reference your original objects.
 	 */ 
 	public function get_objects_with_tag_id($tag_id, $offset = 0, $limit = 100, $tagger_id = NULL) {
-		if(!isset($tag_id)) {
+		if (!isset($tag_id)) {
 			return false;
 		}		
 		$adb = PearDatabase::getInstance();
@@ -312,7 +312,7 @@ 
 		$where = "id = ? ";
 		$params = array($tag_id);
 		
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$where .= "AND tagger_id = ?";
 			array_push($params, $tagger_id);
 		} 
@@ -353,19 +353,19 @@ 
 	 *	 - 'tagger_id' => The unique ID of the person who tagged the object with this tag.
 	 */ 
 	public function get_tags_on_object($object_id, $offset = 0, $limit = 10, $tagger_id = NULL) {
-		if(!isset($object_id)) {
+		if (!isset($object_id)) {
 			return false;
 		}	
 		
 		$where = "object_id = ? ";
 		$params = array($object_id);
 			
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$where .= "AND tagger_id = ? ";
 			array_push($params, $tagger_id);
 		} 
 
-		if($limit <= 0) {
+		if ($limit <= 0) {
 			$limit_sql = "";
 		} else {
 			$limit_sql = "LIMIT $offset, $limit";
@@ -410,7 +410,7 @@ 
 	 */ 
 
 	public function safe_tag($tagger_id, $object_id, $tag, $module) {
-		if(!isset($tagger_id)||!isset($object_id)||!isset($tag)) {
+		if (!isset($tagger_id) || !isset($object_id) || !isset($tag)) {
 			die("safe_tag argument missing");
 			return false;
 		}
@@ -437,7 +437,7 @@ 
 			
 		array_push($params, $object_id, $normalized_tag);
 		$rs = $adb->pquery($sql, $params);
-		if($rs->fields['count'] > 0) {
+		if ($rs->fields['count'] > 0) {
 			return true;
 		}
 		// Then see if a raw tag in this form exists.
@@ -446,7 +446,7 @@ 
 			WHERE raw_tag = ? ";
 		$rs = $adb->pquery($sql, array($tag));
 		$row = $adb->fetch_array($rs);
-		if($row) {
+		if ($row) {
 			$tag_id = $row['id'];
 		} else {
 			// Add new tag! 
@@ -456,7 +456,7 @@ 
 			$rs = $adb->pquery($sql, $params);
 			
 		}
-		if(!($tag_id > 0)) {
+		if (!($tag_id > 0)) {
 			return false;
 		}
 		$sql = "INSERT INTO ${prefix}freetagged_objects
@@ -513,14 +513,14 @@ 
 	 * @return string Returns the tag in normalized form.
 	 */ 
 	public function delete_object_tag($tagger_id, $object_id, $tag) {
-		if(!isset($tagger_id)||!isset($object_id)||!isset($tag)) {
+		if (!isset($tagger_id) || !isset($object_id) || !isset($tag)) {
 			die("delete_object_tag argument missing");
 			return false;
 		}
 		$adb = PearDatabase::getInstance();
 		$tag_id = $this->get_raw_tag_id($tag);
 		$prefix = $this->_table_prefix;
-		if($tag_id > 0) {
+		if ($tag_id > 0) {
 
 			$sql = "DELETE FROM ${prefix}freetagged_objects
 				WHERE tagger_id = ? && object_id = ? && tag_id = ? LIMIT 1";
@@ -547,7 +547,7 @@ 
 	public function delete_all_object_tags($object_id) {
 		$adb = PearDatabase::getInstance();
 		$prefix = $this->_table_prefix;
-		if($object_id > 0) {
+		if ($object_id > 0) {
 			$sql = "DELETE FROM ${prefix}freetagged_objects
 				WHERE object_id = ? ";	
 				$rs = $adb->pquery($sql, array($object_id));	
@@ -574,13 +574,13 @@ 
 	 */ 
 
 	public function delete_all_object_tags_for_user($tagger_id, $object_id) {
-		if(!isset($tagger_id)||!isset($object_id)) {
+		if (!isset($tagger_id) || !isset($object_id)) {
 			die("delete_all_object_tags_for_user argument missing");
 			return false;
 		}
 		$adb = PearDatabase::getInstance();
 		$prefix = $this->_table_prefix;
-		if($object_id > 0) {
+		if ($object_id > 0) {
 
 			$sql = "DELETE FROM ${prefix}freetagged_objects
 				WHERE tagger_id = ? && object_id = ?";	
@@ -604,7 +604,7 @@ 
 	 * @return string Returns the tag in normalized form.
 	 */ 
 	public function get_tag_id($tag) {
-		if(!isset($tag)) {
+		if (!isset($tag)) {
 			die("get_tag_id argument missing");
 			return false;
 		}
@@ -632,7 +632,7 @@ 
 	 */ 
 
 	public function get_raw_tag_id($tag) {
-		if(!isset($tag)) {
+		if (!isset($tag)) {
 			die("get_tag_id argument missing");
 			return false;
 		}
@@ -665,7 +665,7 @@ 
 	 * @return string Returns the tag in normalized form.
 	 */
 	public function tag_object($tagger_id, $object_id, $tag_string, $module, $skip_updates = 1) {
-		if($tag_string == '') {
+		if ($tag_string == '') {
 			// If an empty string was passed, just return true, don't die.
 			// die("Empty tag string passed");
 			return true;
@@ -706,10 +706,10 @@ 
 	 * @return boolean True if successful, false otherwise.
 	 */
 	public function _tag_object_array($tagger_id, $object_id, $tagArray, $module) {
-		foreach($tagArray as $tag) {
+		foreach ($tagArray as $tag) {
 			$tag = trim($tag);
-			if(($tag != '') && (strlen($tag) <= $this->_MAX_TAG_LENGTH)) {
-				if(get_magic_quotes_gpc()) {
+			if (($tag != '') && (strlen($tag) <= $this->_MAX_TAG_LENGTH)) {
+				if (get_magic_quotes_gpc()) {
 					$tag = addslashes($tag);
 				}
 				$this->safe_tag($tagger_id, $object_id, $tag, $module);
@@ -735,12 +735,12 @@ 
 			return $newwords;
 		}
 		# Perform tag parsing
-		if(get_magic_quotes_gpc()) {
+		if (get_magic_quotes_gpc()) {
 			$query = stripslashes(trim($tag_string));
 		} else {
 			$query = trim($tag_string);
 		}
-		$words = preg_split('/(")/', $query,-1,PREG_SPLIT_NO_EMPTY|PREG_SPLIT_DELIM_CAPTURE);
+		$words = preg_split('/(")/', $query, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
 		$delim = 0;
 		foreach ($words as $key => $word)
 		{
@@ -786,7 +786,7 @@ 
 	public function get_most_popular_tags($tagger_id = NULL, $offset = 0, $limit = 25) {
 		$adb = PearDatabase::getInstance();
 		$params = array();
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$tagger_sql = "AND tagger_id = ?";
 			array_push($params, $tagger_id);
 		} else {
@@ -830,7 +830,7 @@ 
 	public function count_tags($tagger_id = NULL) {
 		$adb = PearDatabase::getInstance();
 		$params = array();
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$tagger_sql = "AND tagger_id = ?";
 			array_push($params, $tagger_id);
 		} else {
@@ -874,11 +874,11 @@ 
 	 * @return string Returns an HTML snippet that can be used directly as a tag cloud.
 	 */
 
-	public function get_tag_cloud_html($module="",$tagger_id = NULL,$obj_id= NULL,$num_tags = 100, $min_font_size = 10, $max_font_size = 20, $font_units = 'px', $span_class = '', $tag_page_url = '/tag/') {
+	public function get_tag_cloud_html($module = "", $tagger_id = NULL, $obj_id = NULL, $num_tags = 100, $min_font_size = 10, $max_font_size = 20, $font_units = 'px', $span_class = '', $tag_page_url = '/tag/') {
 		global $theme;
-		$theme_path="themes/".$theme."/";
-		$image_path=$theme_path."images/";	
-		$tag_list = $this->get_tag_cloud_tags($num_tags, $tagger_id,$module,$obj_id);
+		$theme_path = "themes/" . $theme . "/";
+		$image_path = $theme_path . "images/";	
+		$tag_list = $this->get_tag_cloud_tags($num_tags, $tagger_id, $module, $obj_id);
 		if (count($tag_list[0])) {
 			// Get the maximum qty of tagged objects in the set
 			$max_qty = max(array_values($tag_list[0]));
@@ -894,7 +894,7 @@ 
 		if (0 == $spread) { // Divide by zero
 			$spread = 1;
 		}
-		$step = ($max_font_size - $min_font_size)/($spread);
+		$step = ($max_font_size - $min_font_size) / ($spread);
 
 		// Since the original tag_list is alphabetically ordered,
 		// we can now create the tag cloud by just putting a span
@@ -902,18 +902,18 @@ 
 		// by $step.
 		$cloud_html = '';
 		$cloud_spans = array();
-		if($module =='')
+		if ($module == '')
 			$module = 'All';
-		if($module != 'All') {
+		if ($module != 'All') {
 			foreach ($tag_list[0] as $tag => $qty) {
 				$size = $min_font_size + ($qty - $min_qty) * $step;
-				$cloud_span[] = '<span id="tag_'.$tag_list[1][$tag].'" class="' . $span_class . '" onMouseOver=$("tagspan_'.$tag_list[1][$tag].'").style.display="inline"; onMouseOut=$("tagspan_'.$tag_list[1][$tag].'").style.display="none";><a class="tagit" href="index.php?module=Home&action=UnifiedSearch&search_module='.$module.'&search_tag=tag_search&query_string='. urlencode($tag) . '" style="font-size: '. $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a><span class="'. $span_class .'" id="tagspan_'.$tag_list[1][$tag].'" style="display:none;cursor:pointer;" onClick="DeleteTag('.$tag_list[1][$tag].','.$obj_id.');"><img src="' . vtiger_imageurl('del_tag.gif', $theme) . '"></span></span>';
+				$cloud_span[] = '<span id="tag_' . $tag_list[1][$tag] . '" class="' . $span_class . '" onMouseOver=$("tagspan_' . $tag_list[1][$tag] . '").style.display="inline"; onMouseOut=$("tagspan_' . $tag_list[1][$tag] . '").style.display="none";><a class="tagit" href="index.php?module=Home&action=UnifiedSearch&search_module=' . $module . '&search_tag=tag_search&query_string=' . urlencode($tag) . '" style="font-size: ' . $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a><span class="' . $span_class . '" id="tagspan_' . $tag_list[1][$tag] . '" style="display:none;cursor:pointer;" onClick="DeleteTag(' . $tag_list[1][$tag] . ',' . $obj_id . ');"><img src="' . vtiger_imageurl('del_tag.gif', $theme) . '"></span></span>';
 
 			}
 		} else {
-			foreach($tag_list[0] as $tag => $qty) {
+			foreach ($tag_list[0] as $tag => $qty) {
 				$size = $min_font_size + ($qty - $min_qty) * $step;
-				$cloud_span[] = '<span class="' . $span_class . '"><a class="tagit" href="index.php?module=Home&action=UnifiedSearch&search_module='.$module.'&search_tag=tag_search&query_string='. urlencode($tag) . '" style="font-size: '. $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a></span>';
+				$cloud_span[] = '<span class="' . $span_class . '"><a class="tagit" href="index.php?module=Home&action=UnifiedSearch&search_module=' . $module . '&search_tag=tag_search&query_string=' . urlencode($tag) . '" style="font-size: ' . $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a></span>';
 			}
 		}
 		$cloud_html = join("\n ", $cloud_span);
@@ -938,24 +938,24 @@ 
 	 * values are numeric quantity of objects tagged with that tag.
 	 */
 
-	public function get_tag_cloud_tags($max = 100, $tagger_id = NULL,$module = "",$obj_id = NULL) {
+	public function get_tag_cloud_tags($max = 100, $tagger_id = NULL, $module = "", $obj_id = NULL) {
 		$adb = PearDatabase::getInstance();
 		$params = array();
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$tagger_sql = " && tagger_id = ?";
 			array_push($params, $tagger_id);
 		} else {
 			$tagger_sql = "";
 		}
 
-		if($module != "") {
+		if ($module != "") {
 			$tagger_sql .= " && module = ?";
 			array_push($params, $module);
 		} else {
 			$tagger_sql .= "";
 		}
 
-		if(isset($obj_id) && $obj_id > 0) {
+		if (isset($obj_id) && $obj_id > 0) {
   			$tagger_sql .= " && object_id = ?";
 			array_push($params, $obj_id);
 		} else {
@@ -978,10 +978,10 @@ 
 			$retarr[$row['tag']] = $row['quantity'];
 			$retarr1[$row['tag']] = $row['tag_id'];
 		}
-		if($retarr) ksort($retarr);
-		if($retarr1) ksort($retarr1);
-		$return_value[]=$retarr;
-		$return_value[]=$retarr1;
+		if ($retarr) ksort($retarr);
+		if ($retarr1) ksort($retarr1);
+		$return_value[] = $retarr;
+		$return_value[] = $retarr1;
 		return $return_value;
 
 	}
@@ -1014,7 +1014,7 @@ 
 
 	public function similar_tags($tag, $max = 100) {
 		$retarr = array();
-		if(!isset($tag)) {
+		if (!isset($tag)) {
 			return $retarr;
 		}
 		$adb = PearDatabase::getInstance();
@@ -1103,7 +1103,7 @@ 
 		$sql = "SELECT matches.object_id, COUNT( matches.object_id ) AS num_common_tags
 			FROM ${prefix}freetagged_objects as matches
 			INNER JOIN ${prefix}freetags as tags ON ( tags.id = matches.tag_id )
-			WHERE tags.tag IN (". generateQuestionMarks($tagArray) .")
+			WHERE tags.tag IN (" . generateQuestionMarks($tagArray) . ")
 			GROUP BY matches.object_id
 			HAVING num_common_tags >= ?
 			ORDER BY num_common_tags DESC
@@ -1111,7 +1111,7 @@ 
 
 		$rs = $adb->pquery($sql, array($tagArray, $threshold, $max_objects));
 		while ($row = $adb->fetch_array($rs)) {
-			$retarr[] = array (
+			$retarr[] = array(
 				'object_id' => $row['object_id'],
 				'strength' => ($row['num_common_tags'] / $numTags)
 				);

Braces +12 added lines, -5 removed lines

@@ -427,7 +427,9 @@ 
 		if ($this->_block_multiuser_tag_on_object == 0) {
 			$tagger_sql = " && tagger_id = ? ";
 			array_push($params, $tagger_id);
-		} else $tagger_sql = "";
+		} else {
+			$tagger_sql = "";
+		}
 		$sql = "SELECT COUNT(*) as count 
 			FROM ${prefix}freetagged_objects INNER JOIN ${prefix}freetags ON (tag_id = id)
 			WHERE 1=1 
@@ -902,8 +904,9 @@ 
 		// by $step.
 		$cloud_html = '';
 		$cloud_spans = array();
-		if($module =='')
-			$module = 'All';
+		if($module =='') {
+					$module = 'All';
+		}
 		if($module != 'All') {
 			foreach ($tag_list[0] as $tag => $qty) {
 				$size = $min_font_size + ($qty - $min_qty) * $step;
@@ -978,8 +981,12 @@ 
 			$retarr[$row['tag']] = $row['quantity'];
 			$retarr1[$row['tag']] = $row['tag_id'];
 		}
-		if($retarr) ksort($retarr);
-		if($retarr1) ksort($retarr1);
+		if($retarr) {
+			ksort($retarr);
+		}
+		if($retarr1) {
+			ksort($retarr1);
+		}
 		$return_value[]=$retarr;
 		$return_value[]=$retarr1;
 		return $return_value;

libraries/nusoap/class.nusoap_base.php

Doc Comments +7 added lines, -7 removed lines

@@ -306,7 +306,7 @@ 
 	/**
 	* gets the current debug data for this instance
 	*
-	* @return   debug data
+	* @return   string data
 	* @access   public
 	*/
 	public function &getDebug() {
@@ -319,7 +319,7 @@ 
 	* gets the current debug data for this instance as an XML comment
 	* this may change the contents of the debug data
 	*
-	* @return   debug data as an XML comment
+	* @return   string data as an XML comment
 	* @access   public
 	*/
 	public function &getDebugAsXMLComment() {
@@ -352,7 +352,7 @@ 
 	/**
 	* returns error string if present
 	*
-	* @return   mixed error string or false
+	* @return   string|false error string or false
 	* @access   public
 	*/
 	public function getError(){
@@ -365,7 +365,7 @@ 
 	/**
 	* sets error string
 	*
-	* @return   boolean $string error string
+	* @return   boolean|null $string error string
 	* @access   private
 	*/
 	public function setError($str){
@@ -800,7 +800,7 @@ 
     * returns false, if not prefixed
     *
     * @param string $str The prefixed string
-    * @return mixed The prefix or false if there is no prefix
+    * @return string|false The prefix or false if there is no prefix
     * @access public
     */
 	public function getPrefix($str){
@@ -830,7 +830,7 @@ 
     * or false if no prefixes registered for the given namespace
     *
     * @param string $ns The namespace
-    * @return mixed The prefix, false if the namespace has no prefixes
+    * @return string The prefix, false if the namespace has no prefixes
     * @access public
     */
 	public function getPrefixFromNamespace($ns) {
@@ -896,7 +896,7 @@ 
 *
 * @param    int $timestamp Unix time stamp
 * @param	boolean $utc Whether the time stamp is UTC or local
-* @return	mixed ISO 8601 date string or false
+* @return	string|false ISO 8601 date string or false
 * @access   public
 */
 function timestamp_to_iso8601($timestamp,$utc=true){

Indentation +244 added lines, -244 removed lines

@@ -104,21 +104,21 @@ 
 	 * @access private
 	 */
 	var $revision = '$Revision: 1.57 $';
-    /**
-     * Current error string (manipulated by getError/setError)
+	/**
+	 * Current error string (manipulated by getError/setError)
 	 *
 	 * @var string
 	 * @access private
 	 */
 	var $error_str = '';
-    /**
-     * Current debug string (manipulated by debug/appendDebug/clearDebug/getDebug/getDebugAsXMLComment)
+	/**
+	 * Current debug string (manipulated by debug/appendDebug/clearDebug/getDebug/getDebugAsXMLComment)
 	 *
 	 * @var string
 	 * @access private
 	 */
-    var $debug_str = '';
-    /**
+	var $debug_str = '';
+	/**
 	 * toggles automatic encoding of special characters as entities
 	 * (should always be true, I think)
 	 *
@@ -134,31 +134,31 @@ 
 	 */
 	var $debugLevel;
 
-    /**
-	* set schema version
-	*
-	* @var      string
-	* @access   public
-	*/
+	/**
+	 * set schema version
+	 *
+	 * @var      string
+	 * @access   public
+	 */
 	var $XMLSchemaVersion = 'http://www.w3.org/2001/XMLSchema';
 	
-    /**
-	* charset encoding for outgoing messages
-	*
-	* @var      string
-	* @access   public
-	*/
-    var $soap_defencoding = 'UTF-8';
+	/**
+	 * charset encoding for outgoing messages
+	 *
+	 * @var      string
+	 * @access   public
+	 */
+	var $soap_defencoding = 'UTF-8';
 	//var $soap_defencoding = 'UTF-8';
 
 	/**
-	* namespaces in an array of prefix => uri
-	*
-	* this is "seeded" by a set of constants, but it may be altered by code
-	*
-	* @var      array
-	* @access   public
-	*/
+	 * namespaces in an array of prefix => uri
+	 *
+	 * this is "seeded" by a set of constants, but it may be altered by code
+	 *
+	 * @var      array
+	 * @access   public
+	 */
 	var $namespaces = array(
 		'SOAP-ENV' => 'http://schemas.xmlsoap.org/soap/envelope/',
 		'xsd' => 'http://www.w3.org/2001/XMLSchema',
@@ -167,20 +167,20 @@ 
 		);
 
 	/**
-	* namespaces used in the current context, e.g. during serialization
-	*
-	* @var      array
-	* @access   private
-	*/
+	 * namespaces used in the current context, e.g. during serialization
+	 *
+	 * @var      array
+	 * @access   private
+	 */
 	var $usedNamespaces = array();
 
 	/**
-	* XML Schema types in an array of uri => (array of xml type => php type)
-	* is this legacy yet?
-	* no, this is used by the nusoap_xmlschema class to verify type => namespace mappings.
-	* @var      array
-	* @access   public
-	*/
+	 * XML Schema types in an array of uri => (array of xml type => php type)
+	 * is this legacy yet?
+	 * no, this is used by the nusoap_xmlschema class to verify type => namespace mappings.
+	 * @var      array
+	 * @access   public
+	 */
 	var $typemap = array(
 	'http://www.w3.org/2001/XMLSchema' => array(
 		'string'=>'string','boolean'=>'boolean','float'=>'double','double'=>'double','decimal'=>'double',
@@ -203,75 +203,75 @@ 
 		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),
 	'http://soapinterop.org/xsd' => array('SOAPStruct'=>'struct'),
 	'http://schemas.xmlsoap.org/soap/encoding/' => array('base64'=>'string','array'=>'array','Array'=>'array'),
-    'http://xml.apache.org/xml-soap' => array('Map')
+	'http://xml.apache.org/xml-soap' => array('Map')
 	);
 
 	/**
-	* XML entities to convert
-	*
-	* @var      array
-	* @access   public
-	* @deprecated
-	* @see	expandEntities
-	*/
+	 * XML entities to convert
+	 *
+	 * @var      array
+	 * @access   public
+	 * @deprecated
+	 * @see	expandEntities
+	 */
 	var $xmlEntities = array('quot' => '"','amp' => '&',
 		'lt' => '<','gt' => '>','apos' => "'");
 
 	/**
-	* constructor
-	*
-	* @access	public
-	*/
+	 * constructor
+	 *
+	 * @access	public
+	 */
 	public function nusoap_base() {
 		$this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];
 	}
 
 	/**
-	* gets the global debug level, which applies to future instances
-	*
-	* @return	integer	Debug level 0-9, where 0 turns off
-	* @access	public
-	*/
+	 * gets the global debug level, which applies to future instances
+	 *
+	 * @return	integer	Debug level 0-9, where 0 turns off
+	 * @access	public
+	 */
 	public function getGlobalDebugLevel() {
 		return $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];
 	}
 
 	/**
-	* sets the global debug level, which applies to future instances
-	*
-	* @param	int	$level	Debug level 0-9, where 0 turns off
-	* @access	public
-	*/
+	 * sets the global debug level, which applies to future instances
+	 *
+	 * @param	int	$level	Debug level 0-9, where 0 turns off
+	 * @access	public
+	 */
 	public function setGlobalDebugLevel($level) {
 		$GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'] = $level;
 	}
 
 	/**
-	* gets the debug level for this instance
-	*
-	* @return	int	Debug level 0-9, where 0 turns off
-	* @access	public
-	*/
+	 * gets the debug level for this instance
+	 *
+	 * @return	int	Debug level 0-9, where 0 turns off
+	 * @access	public
+	 */
 	public function getDebugLevel() {
 		return $this->debugLevel;
 	}
 
 	/**
-	* sets the debug level for this instance
-	*
-	* @param	int	$level	Debug level 0-9, where 0 turns off
-	* @access	public
-	*/
+	 * sets the debug level for this instance
+	 *
+	 * @param	int	$level	Debug level 0-9, where 0 turns off
+	 * @access	public
+	 */
 	public function setDebugLevel($level) {
 		$this->debugLevel = $level;
 	}
 
 	/**
-	* adds debug data to the instance debug string with formatting
-	*
-	* @param    string $string debug data
-	* @access   private
-	*/
+	 * adds debug data to the instance debug string with formatting
+	 *
+	 * @param    string $string debug data
+	 * @access   private
+	 */
 	public function debug($string){
 		if ($this->debugLevel > 0) {
 			$this->appendDebug($this->getmicrotime().' '.get_class($this).": $string\n");
@@ -279,11 +279,11 @@ 
 	}
 
 	/**
-	* adds debug data to the instance debug string without formatting
-	*
-	* @param    string $string debug data
-	* @access   public
-	*/
+	 * adds debug data to the instance debug string without formatting
+	 *
+	 * @param    string $string debug data
+	 * @access   public
+	 */
 	public function appendDebug($string){
 		if ($this->debugLevel > 0) {
 			// it would be nice to use a memory stream here to use
@@ -293,10 +293,10 @@ 
 	}
 
 	/**
-	* clears the current debug data for this instance
-	*
-	* @access   public
-	*/
+	 * clears the current debug data for this instance
+	 *
+	 * @access   public
+	 */
 	public function clearDebug() {
 		// it would be nice to use a memory stream here to use
 		// memory more efficiently
@@ -304,11 +304,11 @@ 
 	}
 
 	/**
-	* gets the current debug data for this instance
-	*
-	* @return   debug data
-	* @access   public
-	*/
+	 * gets the current debug data for this instance
+	 *
+	 * @return   debug data
+	 * @access   public
+	 */
 	public function &getDebug() {
 		// it would be nice to use a memory stream here to use
 		// memory more efficiently
@@ -316,12 +316,12 @@ 
 	}
 
 	/**
-	* gets the current debug data for this instance as an XML comment
-	* this may change the contents of the debug data
-	*
-	* @return   debug data as an XML comment
-	* @access   public
-	*/
+	 * gets the current debug data for this instance as an XML comment
+	 * this may change the contents of the debug data
+	 *
+	 * @return   debug data as an XML comment
+	 * @access   public
+	 */
 	public function &getDebugAsXMLComment() {
 		// it would be nice to use a memory stream here to use
 		// memory more efficiently
@@ -329,32 +329,32 @@ 
 			$this->debug_str = str_replace('--', '- -', $this->debug_str);
 		}
 		$ret = "<!--\n" . $this->debug_str . "\n-->";
-    	return $ret;
+		return $ret;
 	}
 
 	/**
-	* expands entities, e.g. changes '<' to '&lt;'.
-	*
-	* @param	string	$val	The string in which to expand entities.
-	* @access	private
-	*/
+	 * expands entities, e.g. changes '<' to '&lt;'.
+	 *
+	 * @param	string	$val	The string in which to expand entities.
+	 * @access	private
+	 */
 	public function expandEntities($val) {
 		if ($this->charencoding) {
-	    	$val = str_replace('&', '&amp;', $val);
-	    	$val = str_replace("'", '&apos;', $val);
-	    	$val = str_replace('"', '&quot;', $val);
-	    	$val = str_replace('<', '&lt;', $val);
-	    	$val = str_replace('>', '&gt;', $val);
-	    }
-	    return $val;
+			$val = str_replace('&', '&amp;', $val);
+			$val = str_replace("'", '&apos;', $val);
+			$val = str_replace('"', '&quot;', $val);
+			$val = str_replace('<', '&lt;', $val);
+			$val = str_replace('>', '&gt;', $val);
+		}
+		return $val;
 	}
 
 	/**
-	* returns error string if present
-	*
-	* @return   mixed error string or false
-	* @access   public
-	*/
+	 * returns error string if present
+	 *
+	 * @return   mixed error string or false
+	 * @access   public
+	 */
 	public function getError(){
 		if($this->error_str != ''){
 			return $this->error_str;
@@ -363,24 +363,24 @@ 
 	}
 
 	/**
-	* sets error string
-	*
-	* @return   boolean $string error string
-	* @access   private
-	*/
+	 * sets error string
+	 *
+	 * @return   boolean $string error string
+	 * @access   private
+	 */
 	public function setError($str){
 		$this->error_str = $str;
 	}
 
 	/**
-	* detect if array is a simple array or a struct (associative array)
-	*
-	* @param	mixed	$val	The PHP array
-	* @return	string	(arraySimple|arrayStruct)
-	* @access	private
-	*/
+	 * detect if array is a simple array or a struct (associative array)
+	 *
+	 * @param	mixed	$val	The PHP array
+	 * @return	string	(arraySimple|arrayStruct)
+	 * @access	private
+	 */
 	public function isArraySimpleOrStruct($val) {
-        $keyList = array_keys($val);
+		$keyList = array_keys($val);
 		foreach ($keyList as $keyListValue) {
 			if (!is_int($keyListValue)) {
 				return 'arrayStruct';
@@ -390,33 +390,33 @@ 
 	}
 
 	/**
-	* serializes PHP values in accordance w/ section 5. Type information is
-	* not serialized if $use == 'literal'.
-	*
-	* @param	mixed	$val	The value to serialize
-	* @param	string	$name	The name (local part) of the XML element
-	* @param	string	$type	The XML schema type (local part) for the element
-	* @param	string	$name_ns	The namespace for the name of the XML element
-	* @param	string	$type_ns	The namespace for the type of the element
-	* @param	array	$attributes	The attributes to serialize as name=>value pairs
-	* @param	string	$use	The WSDL "use" (encoded|literal)
-	* @param	boolean	$soapval	Whether this is called from soapval.
-	* @return	string	The serialized element, possibly with child elements
-    * @access	public
-	*/
+	 * serializes PHP values in accordance w/ section 5. Type information is
+	 * not serialized if $use == 'literal'.
+	 *
+	 * @param	mixed	$val	The value to serialize
+	 * @param	string	$name	The name (local part) of the XML element
+	 * @param	string	$type	The XML schema type (local part) for the element
+	 * @param	string	$name_ns	The namespace for the name of the XML element
+	 * @param	string	$type_ns	The namespace for the type of the element
+	 * @param	array	$attributes	The attributes to serialize as name=>value pairs
+	 * @param	string	$use	The WSDL "use" (encoded|literal)
+	 * @param	boolean	$soapval	Whether this is called from soapval.
+	 * @return	string	The serialized element, possibly with child elements
+	 * @access	public
+	 */
 	public function serialize_val($val,$name=false,$type=false,$name_ns=false,$type_ns=false,$attributes=false,$use='encoded',$soapval=false) {
 		$this->debug("in serialize_val: name=$name, type=$type, name_ns=$name_ns, type_ns=$type_ns, use=$use, soapval=$soapval");
 		$this->appendDebug('value=' . $this->varDump($val));
 		$this->appendDebug('attributes=' . $this->varDump($attributes));
 		
-    	if (is_object($val) && get_class($val) == 'soapval' && (! $soapval)) {
-    		$this->debug("serialize_val: serialize soapval");
-        	$xml = $val->serialize($use);
+		if (is_object($val) && get_class($val) == 'soapval' && (! $soapval)) {
+			$this->debug("serialize_val: serialize soapval");
+			$xml = $val->serialize($use);
 			$this->appendDebug($val->getDebug());
 			$val->clearDebug();
 			$this->debug("serialize_val of soapval returning $xml");
 			return $xml;
-        }
+		}
 		// force valid name if necessary
 		if (is_numeric($name)) {
 			$name = '__numeric_' . $name;
@@ -425,7 +425,7 @@ 
 		}
 		// if name has ns, add ns prefix to name
 		$xmlns = '';
-        if($name_ns){
+		if($name_ns){
 			$prefix = 'nu'.rand(1000,9999);
 			$name = $prefix.':'.$name;
 			$xmlns .= " xmlns:$prefix=\"$name_ns\"";
@@ -433,7 +433,7 @@ 
 		// if type is prefixed, create type prefix
 		if($type_ns != '' && $type_ns == $this->namespaces['xsd']){
 			// need to fix this. shouldn't default to xsd if no ns specified
-		    // w/o checking against typemap
+			// w/o checking against typemap
 			$type_prefix = 'xsd';
 		} elseif($type_ns){
 			$type_prefix = 'ns'.rand(1000,9999);
@@ -448,12 +448,12 @@ 
 		}
 		// serialize null value
 		if (is_null($val)) {
-    		$this->debug("serialize_val: serialize null");
+			$this->debug("serialize_val: serialize null");
 			if ($use == 'literal') {
 				$xml = "<$name$xmlns$atts/>";
 				$this->debug("serialize_val returning $xml");
-	        	return $xml;
-        	} else {
+				return $xml;
+			} else {
 				if (isset($type) && isset($type_prefix)) {
 					$type_str = " xsi:type=\"$type_prefix:$type\"";
 				} else {
@@ -461,41 +461,41 @@ 
 				}
 				$xml = "<$name$xmlns$type_str$atts xsi:nil=\"true\"/>";
 				$this->debug("serialize_val returning $xml");
-	        	return $xml;
-        	}
+				return $xml;
+			}
 		}
-        // serialize if an xsd built-in primitive type
-        if($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])){
-    		$this->debug("serialize_val: serialize xsd built-in primitive type");
-        	if (is_bool($val)) {
-        		if ($type == 'boolean') {
-	        		$val = $val ? 'true' : 'false';
-	        	} elseif (! $val) {
-	        		$val = 0;
-	        	}
+		// serialize if an xsd built-in primitive type
+		if($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])){
+			$this->debug("serialize_val: serialize xsd built-in primitive type");
+			if (is_bool($val)) {
+				if ($type == 'boolean') {
+					$val = $val ? 'true' : 'false';
+				} elseif (! $val) {
+					$val = 0;
+				}
 			} else if (is_string($val)) {
 				$val = $this->expandEntities($val);
 			}
 			if ($use == 'literal') {
 				$xml = "<$name$xmlns$atts>$val</$name>";
 				$this->debug("serialize_val returning $xml");
-	        	return $xml;
-        	} else {
+				return $xml;
+			} else {
 				$xml = "<$name$xmlns xsi:type=\"xsd:$type\"$atts>$val</$name>";
 				$this->debug("serialize_val returning $xml");
-	        	return $xml;
-        	}
-        }
+				return $xml;
+			}
+		}
 		// detect type and serialize
 		$xml = '';
 		switch(true) {
 			case (is_bool($val) || $type == 'boolean'):
 		   		$this->debug("serialize_val: serialize boolean");
-        		if ($type == 'boolean') {
-	        		$val = $val ? 'true' : 'false';
-	        	} elseif (! $val) {
-	        		$val = 0;
-	        	}
+				if ($type == 'boolean') {
+					$val = $val ? 'true' : 'false';
+				} elseif (! $val) {
+					$val = 0;
+				}
 				if ($use == 'literal') {
 					$xml .= "<$name$xmlns$atts>$val</$name>";
 				} else {
@@ -529,12 +529,12 @@ 
 				break;
 			case is_object($val):
 		   		$this->debug("serialize_val: serialize object");
-		    	if (get_class($val) == 'soapval') {
-		    		$this->debug("serialize_val: serialize soapval object");
-		        	$pXml = $val->serialize($use);
+				if (get_class($val) == 'soapval') {
+					$this->debug("serialize_val: serialize soapval object");
+					$pXml = $val->serialize($use);
 					$this->appendDebug($val->getDebug());
 					$val->clearDebug();
-		        } else {
+				} else {
 					if (! $name) {
 						$name = get_class($val);
 						$this->debug("In serialize_val, used class name $name as element name");
@@ -560,19 +560,19 @@ 
 			case (is_array($val) || $type):
 				// detect if struct or array
 				$valueType = $this->isArraySimpleOrStruct($val);
-                if($valueType=='arraySimple' || preg_match('/^ArrayOf/',$type)){
+				if($valueType=='arraySimple' || preg_match('/^ArrayOf/',$type)){
 			   		$this->debug("serialize_val: serialize array");
 					$i = 0;
 					if(is_array($val) && count($val)> 0){
 						foreach($val as $v){
-	                    	if(is_object($v) && get_class($v) ==  'soapval'){
+							if(is_object($v) && get_class($v) ==  'soapval'){
 								$tt_ns = $v->type_ns;
 								$tt = $v->type;
 							} elseif (is_array($v)) {
 								$tt = $this->isArraySimpleOrStruct($v);
 							} else {
 								$tt = gettype($v);
-	                        }
+							}
 							$array_types[$tt] = 1;
 							$xml .= $this->serialize_val($v,'item',false,false,false,false,$use);
 							++$i;
@@ -655,19 +655,19 @@ 
 		return $xml;
 	}
 
-    /**
-    * serializes a message
-    *
-    * @param string $body the XML of the SOAP body
-    * @param mixed $headers optional string of XML with SOAP header content, or array of soapval objects for SOAP headers, or associative array
-    * @param array $namespaces optional the namespaces used in generating the body and headers
-    * @param string $style optional (rpc|document)
-    * @param string $use optional (encoded|literal)
-    * @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)
-    * @return string the message
-    * @access public
-    */
-    public function serializeEnvelope($body,$headers=false,$namespaces=array(),$style='rpc',$use='encoded',$encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'){
+	/**
+	 * serializes a message
+	 *
+	 * @param string $body the XML of the SOAP body
+	 * @param mixed $headers optional string of XML with SOAP header content, or array of soapval objects for SOAP headers, or associative array
+	 * @param array $namespaces optional the namespaces used in generating the body and headers
+	 * @param string $style optional (rpc|document)
+	 * @param string $use optional (encoded|literal)
+	 * @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)
+	 * @return string the message
+	 * @access public
+	 */
+	public function serializeEnvelope($body,$headers=false,$namespaces=array(),$style='rpc',$use='encoded',$encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'){
 
 	$this->debug("In serializeEnvelope length=" . strlen($body) . " body (max 1000 characters)=" . substr($body, 0, 1000) . " style=$style use=$use encodingStyle=$encodingStyle");
 	$this->debug("headers:");
@@ -676,7 +676,7 @@ 
 	$this->appendDebug($this->varDump($namespaces));
 
 	// serialize namespaces
-    $ns_string = '';
+	$ns_string = '';
 	foreach(array_merge($this->namespaces,$namespaces) as $k => $v){
 		$ns_string .= " xmlns:$k=\"$v\"";
 	}
@@ -709,7 +709,7 @@ 
 		$body.
 	"</SOAP-ENV:Body>".
 	"</SOAP-ENV:Envelope>";
-    }
+	}
 
 	/**
 	 * formats a string to be inserted into an HTML stream
@@ -719,18 +719,18 @@ 
 	 * @access public
 	 * @deprecated
 	 */
-    public function formatDump($str){
+	public function formatDump($str){
 		$str = htmlspecialchars($str);
 		return nl2br($str);
-    }
+	}
 
 	/**
-	* contracts (changes namespace to prefix) a qualified name
-	*
-	* @param    string $qname qname
-	* @return	string contracted qname
-	* @access   private
-	*/
+	 * contracts (changes namespace to prefix) a qualified name
+	 *
+	 * @param    string $qname qname
+	 * @return	string contracted qname
+	 * @access   private
+	 */
 	public function contractQname($qname){
 		// get element namespace
 		if (strrpos($qname, ':')) {
@@ -749,12 +749,12 @@ 
 	}
 
 	/**
-	* expands (changes prefix to namespace) a qualified name
-	*
-	* @param    string $qname qname
-	* @return	string expanded qname
-	* @access   private
-	*/
+	 * expands (changes prefix to namespace) a qualified name
+	 *
+	 * @param    string $qname qname
+	 * @return	string expanded qname
+	 * @access   private
+	 */
 	public function expandQname($qname){
 		// get element prefix
 		if(strpos($qname,':') && !preg_match('/^http:\/\//',$qname)){
@@ -772,14 +772,14 @@ 
 		}
 	}
 
-    /**
-    * returns the local part of a prefixed string
-    * returns the original string, if not prefixed
-    *
-    * @param string $str The prefixed string
-    * @return string The local part
-    * @access public
-    */
+	/**
+	 * returns the local part of a prefixed string
+	 * returns the original string, if not prefixed
+	 *
+	 * @param string $str The prefixed string
+	 * @return string The local part
+	 * @access public
+	 */
 	public function getLocalPart($str){
 		if($sstr = strrchr($str,':')){
 			// get unqualified name
@@ -790,13 +790,13 @@ 
 	}
 
 	/**
-    * returns the prefix part of a prefixed string
-    * returns false, if not prefixed
-    *
-    * @param string $str The prefixed string
-    * @return mixed The prefix or false if there is no prefix
-    * @access public
-    */
+	 * returns the prefix part of a prefixed string
+	 * returns false, if not prefixed
+	 *
+	 * @param string $str The prefixed string
+	 * @return mixed The prefix or false if there is no prefix
+	 * @access public
+	 */
 	public function getPrefix($str){
 		if($pos = strrpos($str,':')){
 			// get prefix
@@ -806,12 +806,12 @@ 
 	}
 
 	/**
-    * pass it a prefix, it returns a namespace
-    *
-    * @param string $prefix The prefix
-    * @return mixed The namespace, false if no namespace has the specified prefix
-    * @access public
-    */
+	 * pass it a prefix, it returns a namespace
+	 *
+	 * @param string $prefix The prefix
+	 * @return mixed The namespace, false if no namespace has the specified prefix
+	 * @access public
+	 */
 	public function getNamespaceFromPrefix($prefix){
 		if (isset($this->namespaces[$prefix])) {
 			return $this->namespaces[$prefix];
@@ -820,17 +820,17 @@ 
 	}
 
 	/**
-    * returns the prefix for a given namespace (or prefix)
-    * or false if no prefixes registered for the given namespace
-    *
-    * @param string $ns The namespace
-    * @return mixed The prefix, false if the namespace has no prefixes
-    * @access public
-    */
+	 * returns the prefix for a given namespace (or prefix)
+	 * or false if no prefixes registered for the given namespace
+	 *
+	 * @param string $ns The namespace
+	 * @return mixed The prefix, false if the namespace has no prefixes
+	 * @access public
+	 */
 	public function getPrefixFromNamespace($ns) {
 		foreach ($this->namespaces as $p => $n) {
 			if ($ns == $n || $ns == $p) {
-			    $this->usedNamespaces[$p] = $n;
+				$this->usedNamespaces[$p] = $n;
 				return $p;
 			}
 		}
@@ -838,11 +838,11 @@ 
 	}
 
 	/**
-    * returns the time in ODBC canonical form with microseconds
-    *
-    * @return string The time in ODBC canonical form with microseconds
-    * @access public
-    */
+	 * returns the time in ODBC canonical form with microseconds
+	 *
+	 * @return string The time in ODBC canonical form with microseconds
+	 * @access public
+	 */
 	public function getmicrotime() {
 		if (function_exists('gettimeofday')) {
 			$tod = gettimeofday();
@@ -862,7 +862,7 @@ 
 	 * @return string The output of var_dump
 	 * @access public
 	 */
-    public function varDump($data) {
+	public function varDump($data) {
 		// <--------   YetiForce Sp. z o.o.   -------->
 		// original code:  	ob_start(); var_dump($data); $ret_val = ob_get_contents(); ob_end_clean();
 		$ret_val = var_export($data, true); 
@@ -871,11 +871,11 @@ 
 	}
 
 	/**
-	* represents the object as a string
-	*
-	* @return	string
-	* @access   public
-	*/
+	 * represents the object as a string
+	 *
+	 * @return	string
+	 * @access   public
+	 */
 	public function __toString() {
 		return $this->varDump($this);
 	}

Spacing +120 added lines, -120 removed lines

@@ -183,26 +183,26 @@ 
 	*/
 	var $typemap = array(
 	'http://www.w3.org/2001/XMLSchema' => array(
-		'string'=>'string','boolean'=>'boolean','float'=>'double','double'=>'double','decimal'=>'double',
-		'duration'=>'','dateTime'=>'string','time'=>'string','date'=>'string','gYearMonth'=>'',
-		'gYear'=>'','gMonthDay'=>'','gDay'=>'','gMonth'=>'','hexBinary'=>'string','base64Binary'=>'string',
+		'string'=>'string', 'boolean'=>'boolean', 'float'=>'double', 'double'=>'double', 'decimal'=>'double',
+		'duration'=>'', 'dateTime'=>'string', 'time'=>'string', 'date'=>'string', 'gYearMonth'=>'',
+		'gYear'=>'', 'gMonthDay'=>'', 'gDay'=>'', 'gMonth'=>'', 'hexBinary'=>'string', 'base64Binary'=>'string',
 		// abstract "any" types
-		'anyType'=>'string','anySimpleType'=>'string',
+		'anyType'=>'string', 'anySimpleType'=>'string',
 		// derived datatypes
-		'normalizedString'=>'string','token'=>'string','language'=>'','NMTOKEN'=>'','NMTOKENS'=>'','Name'=>'','NCName'=>'','ID'=>'',
-		'IDREF'=>'','IDREFS'=>'','ENTITY'=>'','ENTITIES'=>'','integer'=>'integer','nonPositiveInteger'=>'integer',
-		'negativeInteger'=>'integer','long'=>'integer','int'=>'integer','short'=>'integer','byte'=>'integer','nonNegativeInteger'=>'integer',
-		'unsignedLong'=>'','unsignedInt'=>'','unsignedShort'=>'','unsignedByte'=>'','positiveInteger'=>''),
+		'normalizedString'=>'string', 'token'=>'string', 'language'=>'', 'NMTOKEN'=>'', 'NMTOKENS'=>'', 'Name'=>'', 'NCName'=>'', 'ID'=>'',
+		'IDREF'=>'', 'IDREFS'=>'', 'ENTITY'=>'', 'ENTITIES'=>'', 'integer'=>'integer', 'nonPositiveInteger'=>'integer',
+		'negativeInteger'=>'integer', 'long'=>'integer', 'int'=>'integer', 'short'=>'integer', 'byte'=>'integer', 'nonNegativeInteger'=>'integer',
+		'unsignedLong'=>'', 'unsignedInt'=>'', 'unsignedShort'=>'', 'unsignedByte'=>'', 'positiveInteger'=>''),
 	'http://www.w3.org/2000/10/XMLSchema' => array(
-		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',
-		'float'=>'double','dateTime'=>'string',
-		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),
+		'i4'=>'', 'int'=>'integer', 'boolean'=>'boolean', 'string'=>'string', 'double'=>'double',
+		'float'=>'double', 'dateTime'=>'string',
+		'timeInstant'=>'string', 'base64Binary'=>'string', 'base64'=>'string', 'ur-type'=>'array'),
 	'http://www.w3.org/1999/XMLSchema' => array(
-		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',
-		'float'=>'double','dateTime'=>'string',
-		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),
+		'i4'=>'', 'int'=>'integer', 'boolean'=>'boolean', 'string'=>'string', 'double'=>'double',
+		'float'=>'double', 'dateTime'=>'string',
+		'timeInstant'=>'string', 'base64Binary'=>'string', 'base64'=>'string', 'ur-type'=>'array'),
 	'http://soapinterop.org/xsd' => array('SOAPStruct'=>'struct'),
-	'http://schemas.xmlsoap.org/soap/encoding/' => array('base64'=>'string','array'=>'array','Array'=>'array'),
+	'http://schemas.xmlsoap.org/soap/encoding/' => array('base64'=>'string', 'array'=>'array', 'Array'=>'array'),
     'http://xml.apache.org/xml-soap' => array('Map')
 	);
 
@@ -214,8 +214,8 @@ 
 	* @deprecated
 	* @see	expandEntities
 	*/
-	var $xmlEntities = array('quot' => '"','amp' => '&',
-		'lt' => '<','gt' => '>','apos' => "'");
+	var $xmlEntities = array('quot' => '"', 'amp' => '&',
+		'lt' => '<', 'gt' => '>', 'apos' => "'");
 
 	/**
 	* constructor
@@ -272,9 +272,9 @@ 
 	* @param    string $string debug data
 	* @access   private
 	*/
-	public function debug($string){
+	public function debug($string) {
 		if ($this->debugLevel > 0) {
-			$this->appendDebug($this->getmicrotime().' '.get_class($this).": $string\n");
+			$this->appendDebug($this->getmicrotime() . ' ' . get_class($this) . ": $string\n");
 		}
 	}
 
@@ -284,7 +284,7 @@ 
 	* @param    string $string debug data
 	* @access   public
 	*/
-	public function appendDebug($string){
+	public function appendDebug($string) {
 		if ($this->debugLevel > 0) {
 			// it would be nice to use a memory stream here to use
 			// memory more efficiently
@@ -355,8 +355,8 @@ 
 	* @return   mixed error string or false
 	* @access   public
 	*/
-	public function getError(){
-		if($this->error_str != ''){
+	public function getError() {
+		if ($this->error_str != '') {
 			return $this->error_str;
 		}
 		return false;
@@ -368,7 +368,7 @@ 
 	* @return   boolean $string error string
 	* @access   private
 	*/
-	public function setError($str){
+	public function setError($str) {
 		$this->error_str = $str;
 	}
 
@@ -404,12 +404,12 @@ 
 	* @return	string	The serialized element, possibly with child elements
     * @access	public
 	*/
-	public function serialize_val($val,$name=false,$type=false,$name_ns=false,$type_ns=false,$attributes=false,$use='encoded',$soapval=false) {
+	public function serialize_val($val, $name = false, $type = false, $name_ns = false, $type_ns = false, $attributes = false, $use = 'encoded', $soapval = false) {
 		$this->debug("in serialize_val: name=$name, type=$type, name_ns=$name_ns, type_ns=$type_ns, use=$use, soapval=$soapval");
 		$this->appendDebug('value=' . $this->varDump($val));
 		$this->appendDebug('attributes=' . $this->varDump($attributes));
 		
-    	if (is_object($val) && get_class($val) == 'soapval' && (! $soapval)) {
+    	if (is_object($val) && get_class($val) == 'soapval' && (!$soapval)) {
     		$this->debug("serialize_val: serialize soapval");
         	$xml = $val->serialize($use);
 			$this->appendDebug($val->getDebug());
@@ -420,30 +420,30 @@ 
 		// force valid name if necessary
 		if (is_numeric($name)) {
 			$name = '__numeric_' . $name;
-		} elseif (! $name) {
+		} elseif (!$name) {
 			$name = 'noname';
 		}
 		// if name has ns, add ns prefix to name
 		$xmlns = '';
-        if($name_ns){
-			$prefix = 'nu'.rand(1000,9999);
-			$name = $prefix.':'.$name;
+        if ($name_ns) {
+			$prefix = 'nu' . rand(1000, 9999);
+			$name = $prefix . ':' . $name;
 			$xmlns .= " xmlns:$prefix=\"$name_ns\"";
 		}
 		// if type is prefixed, create type prefix
-		if($type_ns != '' && $type_ns == $this->namespaces['xsd']){
+		if ($type_ns != '' && $type_ns == $this->namespaces['xsd']) {
 			// need to fix this. shouldn't default to xsd if no ns specified
 		    // w/o checking against typemap
 			$type_prefix = 'xsd';
-		} elseif($type_ns){
-			$type_prefix = 'ns'.rand(1000,9999);
+		} elseif ($type_ns) {
+			$type_prefix = 'ns' . rand(1000, 9999);
 			$xmlns .= " xmlns:$type_prefix=\"$type_ns\"";
 		}
 		// serialize attributes if present
 		$atts = '';
-		if($attributes){
-			foreach($attributes as $k => $v){
-				$atts .= " $k=\"".$this->expandEntities($v).'"';
+		if ($attributes) {
+			foreach ($attributes as $k => $v) {
+				$atts .= " $k=\"" . $this->expandEntities($v) . '"';
 			}
 		}
 		// serialize null value
@@ -465,12 +465,12 @@ 
         	}
 		}
         // serialize if an xsd built-in primitive type
-        if($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])){
+        if ($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])) {
     		$this->debug("serialize_val: serialize xsd built-in primitive type");
         	if (is_bool($val)) {
         		if ($type == 'boolean') {
 	        		$val = $val ? 'true' : 'false';
-	        	} elseif (! $val) {
+	        	} elseif (!$val) {
 	        		$val = 0;
 	        	}
 			} else if (is_string($val)) {
@@ -488,12 +488,12 @@ 
         }
 		// detect type and serialize
 		$xml = '';
-		switch(true) {
+		switch (true) {
 			case (is_bool($val) || $type == 'boolean'):
 		   		$this->debug("serialize_val: serialize boolean");
         		if ($type == 'boolean') {
 	        		$val = $val ? 'true' : 'false';
-	        	} elseif (! $val) {
+	        	} elseif (!$val) {
 	        		$val = 0;
 	        	}
 				if ($use == 'literal') {
@@ -510,7 +510,7 @@ 
 					$xml .= "<$name$xmlns xsi:type=\"xsd:int\"$atts>$val</$name>";
 				}
 				break;
-			case (is_float($val)|| is_double($val) || $type == 'float'):
+			case (is_float($val) || is_double($val) || $type == 'float'):
 		   		$this->debug("serialize_val: serialize float");
 				if ($use == 'literal') {
 					$xml .= "<$name$xmlns$atts>$val</$name>";
@@ -535,17 +535,17 @@ 
 					$this->appendDebug($val->getDebug());
 					$val->clearDebug();
 		        } else {
-					if (! $name) {
+					if (!$name) {
 						$name = get_class($val);
 						$this->debug("In serialize_val, used class name $name as element name");
 					} else {
 						$this->debug("In serialize_val, do not override name $name for element name for class " . get_class($val));
 					}
-					foreach(get_object_vars($val) as $k => $v){
-						$pXml = isset($pXml) ? $pXml.$this->serialize_val($v,$k,false,false,false,false,$use) : $this->serialize_val($v,$k,false,false,false,false,$use);
+					foreach (get_object_vars($val) as $k => $v) {
+						$pXml = isset($pXml) ? $pXml . $this->serialize_val($v, $k, false, false, false, false, $use) : $this->serialize_val($v, $k, false, false, false, false, $use);
 					}
 				}
-				if(isset($type) && isset($type_prefix)){
+				if (isset($type) && isset($type_prefix)) {
 					$type_str = " xsi:type=\"$type_prefix:$type\"";
 				} else {
 					$type_str = '';
@@ -560,12 +560,12 @@ 
 			case (is_array($val) || $type):
 				// detect if struct or array
 				$valueType = $this->isArraySimpleOrStruct($val);
-                if($valueType=='arraySimple' || preg_match('/^ArrayOf/',$type)){
+                if ($valueType == 'arraySimple' || preg_match('/^ArrayOf/', $type)) {
 			   		$this->debug("serialize_val: serialize array");
 					$i = 0;
-					if(is_array($val) && count($val)> 0){
-						foreach($val as $v){
-	                    	if(is_object($v) && get_class($v) ==  'soapval'){
+					if (is_array($val) && count($val) > 0) {
+						foreach ($val as $v) {
+	                    	if (is_object($v) && get_class($v) == 'soapval') {
 								$tt_ns = $v->type_ns;
 								$tt = $v->type;
 							} elseif (is_array($v)) {
@@ -574,23 +574,23 @@ 
 								$tt = gettype($v);
 	                        }
 							$array_types[$tt] = 1;
-							$xml .= $this->serialize_val($v,'item',false,false,false,false,$use);
+							$xml .= $this->serialize_val($v, 'item', false, false, false, false, $use);
 							++$i;
 						}
-						if(count($array_types) > 1){
+						if (count($array_types) > 1) {
 							$array_typename = 'xsd:anyType';
-						} elseif(isset($tt) && isset($this->typemap[$this->XMLSchemaVersion][$tt])) {
+						} elseif (isset($tt) && isset($this->typemap[$this->XMLSchemaVersion][$tt])) {
 							if ($tt == 'integer') {
 								$tt = 'int';
 							}
-							$array_typename = 'xsd:'.$tt;
-						} elseif(isset($tt) && $tt == 'arraySimple'){
+							$array_typename = 'xsd:' . $tt;
+						} elseif (isset($tt) && $tt == 'arraySimple') {
 							$array_typename = 'SOAP-ENC:Array';
-						} elseif(isset($tt) && $tt == 'arrayStruct'){
+						} elseif (isset($tt) && $tt == 'arrayStruct') {
 							$array_typename = 'unnamed_struct_use_soapval';
 						} else {
 							// if type is prefixed, create type prefix
-							if ($tt_ns != '' && $tt_ns == $this->namespaces['xsd']){
+							if ($tt_ns != '' && $tt_ns == $this->namespaces['xsd']) {
 								 $array_typename = 'xsd:' . $tt;
 							} elseif ($tt_ns) {
 								$tt_prefix = 'ns' . rand(1000, 9999);
@@ -606,7 +606,7 @@ 
 						} else if (isset($type) && isset($type_prefix)) {
 							$type_str = " xsi:type=\"$type_prefix:$type\"";
 						} else {
-							$type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"".$array_typename."[$array_type]\"";
+							$type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"" . $array_typename . "[$array_type]\"";
 						}
 					// empty array
 					} else {
@@ -618,11 +618,11 @@ 
 							$type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"xsd:anyType[0]\"";
 						}
 					}
-					$xml = "<$name$xmlns$type_str$atts>".$xml."</$name>";
+					$xml = "<$name$xmlns$type_str$atts>" . $xml . "</$name>";
 				} else {
 					// got a struct
 			   		$this->debug("serialize_val: serialize struct");
-					if(isset($type) && isset($type_prefix)){
+					if (isset($type) && isset($type_prefix)) {
 						$type_str = " xsi:type=\"$type_prefix:$type\"";
 					} else {
 						$type_str = '';
@@ -632,15 +632,15 @@ 
 					} else {
 						$xml .= "<$name$xmlns$type_str$atts>";
 					}
-					foreach($val as $k => $v){
+					foreach ($val as $k => $v) {
 						// Apache Map
 						if ($type == 'Map' && $type_ns == 'http://xml.apache.org/xml-soap') {
 							$xml .= '<item>';
-							$xml .= $this->serialize_val($k,'key',false,false,false,false,$use);
-							$xml .= $this->serialize_val($v,'value',false,false,false,false,$use);
+							$xml .= $this->serialize_val($k, 'key', false, false, false, false, $use);
+							$xml .= $this->serialize_val($v, 'value', false, false, false, false, $use);
 							$xml .= '</item>';
 						} else {
-							$xml .= $this->serialize_val($v,$k,false,false,false,false,$use);
+							$xml .= $this->serialize_val($v, $k, false, false, false, false, $use);
 						}
 					}
 					$xml .= "</$name>";
@@ -648,7 +648,7 @@ 
 				break;
 			default:
 		   		$this->debug("serialize_val: serialize unknown");
-				$xml .= 'not detected, got '.gettype($val).' for '.$val;
+				$xml .= 'not detected, got ' . gettype($val) . ' for ' . $val;
 				break;
 		}
 		$this->debug("serialize_val returning $xml");
@@ -667,7 +667,7 @@ 
     * @return string the message
     * @access public
     */
-    public function serializeEnvelope($body,$headers=false,$namespaces=array(),$style='rpc',$use='encoded',$encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'){
+    public function serializeEnvelope($body, $headers = false, $namespaces = array(), $style = 'rpc', $use = 'encoded', $encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/') {
 
 	$this->debug("In serializeEnvelope length=" . strlen($body) . " body (max 1000 characters)=" . substr($body, 0, 1000) . " style=$style use=$use encodingStyle=$encodingStyle");
 	$this->debug("headers:");
@@ -677,15 +677,15 @@ 
 
 	// serialize namespaces
     $ns_string = '';
-	foreach(array_merge($this->namespaces,$namespaces) as $k => $v){
+	foreach (array_merge($this->namespaces, $namespaces) as $k => $v) {
 		$ns_string .= " xmlns:$k=\"$v\"";
 	}
-	if($encodingStyle) {
+	if ($encodingStyle) {
 		$ns_string = " SOAP-ENV:encodingStyle=\"$encodingStyle\"$ns_string";
 	}
 
 	// serialize headers
-	if($headers){
+	if ($headers) {
 		if (is_array($headers)) {
 			$xml = '';
 			foreach ($headers as $k => $v) {
@@ -698,16 +698,16 @@ 
 			$headers = $xml;
 			$this->debug("In serializeEnvelope, serialized array of headers to $headers");
 		}
-		$headers = "<SOAP-ENV:Header>".$headers."</SOAP-ENV:Header>";
+		$headers = "<SOAP-ENV:Header>" . $headers . "</SOAP-ENV:Header>";
 	}
 	// serialize envelope
 	return
-	'<?xml version="1.0" encoding="'.$this->soap_defencoding .'"?'.">".
-	'<SOAP-ENV:Envelope'.$ns_string.">".
-	$headers.
-	"<SOAP-ENV:Body>".
-		$body.
-	"</SOAP-ENV:Body>".
+	'<?xml version="1.0" encoding="' . $this->soap_defencoding . '"?' . ">" .
+	'<SOAP-ENV:Envelope' . $ns_string . ">" .
+	$headers .
+	"<SOAP-ENV:Body>" .
+		$body .
+	"</SOAP-ENV:Body>" .
 	"</SOAP-ENV:Envelope>";
     }
 
@@ -719,7 +719,7 @@ 
 	 * @access public
 	 * @deprecated
 	 */
-    public function formatDump($str){
+    public function formatDump($str) {
 		$str = htmlspecialchars($str);
 		return nl2br($str);
     }
@@ -731,7 +731,7 @@ 
 	* @return	string contracted qname
 	* @access   private
 	*/
-	public function contractQname($qname){
+	public function contractQname($qname) {
 		// get element namespace
 		if (strrpos($qname, ':')) {
 			// get unqualified name
@@ -755,15 +755,15 @@ 
 	* @return	string expanded qname
 	* @access   private
 	*/
-	public function expandQname($qname){
+	public function expandQname($qname) {
 		// get element prefix
-		if(strpos($qname,':') && !preg_match('/^http:\/\//',$qname)){
+		if (strpos($qname, ':') && !preg_match('/^http:\/\//', $qname)) {
 			// get unqualified name
-			$name = substr(strstr($qname,':'),1);
+			$name = substr(strstr($qname, ':'), 1);
 			// get ns prefix
-			$prefix = substr($qname,0,strpos($qname,':'));
-			if(isset($this->namespaces[$prefix])){
-				return $this->namespaces[$prefix].':'.$name;
+			$prefix = substr($qname, 0, strpos($qname, ':'));
+			if (isset($this->namespaces[$prefix])) {
+				return $this->namespaces[$prefix] . ':' . $name;
 			} else {
 				return $qname;
 			}
@@ -780,10 +780,10 @@ 
     * @return string The local part
     * @access public
     */
-	public function getLocalPart($str){
-		if($sstr = strrchr($str,':')){
+	public function getLocalPart($str) {
+		if ($sstr = strrchr($str, ':')) {
 			// get unqualified name
-			return substr( $sstr, 1 );
+			return substr($sstr, 1);
 		} else {
 			return $str;
 		}
@@ -797,10 +797,10 @@ 
     * @return mixed The prefix or false if there is no prefix
     * @access public
     */
-	public function getPrefix($str){
-		if($pos = strrpos($str,':')){
+	public function getPrefix($str) {
+		if ($pos = strrpos($str, ':')) {
 			// get prefix
-			return substr($str,0,$pos);
+			return substr($str, 0, $pos);
 		}
 		return false;
 	}
@@ -812,7 +812,7 @@ 
     * @return mixed The namespace, false if no namespace has the specified prefix
     * @access public
     */
-	public function getNamespaceFromPrefix($prefix){
+	public function getNamespaceFromPrefix($prefix) {
 		if (isset($this->namespaces[$prefix])) {
 			return $this->namespaces[$prefix];
 		}
@@ -893,8 +893,8 @@ 
 * @return	mixed ISO 8601 date string or false
 * @access   public
 */
-function timestamp_to_iso8601($timestamp,$utc=true){
-	$datestr = date('Y-m-d\TH:i:sO',$timestamp);
+function timestamp_to_iso8601($timestamp, $utc = true) {
+	$datestr = date('Y-m-d\TH:i:sO', $timestamp);
 	$pos = strrpos($datestr, "+");
 	if ($pos === false) {
 		$pos = strrpos($datestr, "-");
@@ -904,20 +904,20 @@ 
 			$datestr = substr($datestr, 0, $pos + 3) . ':' . substr($datestr, -2);
 		}
 	}
-	if($utc){
-		$pattern = '/'.
-		'([0-9]{4})-'.	// centuries & years CCYY-
-		'([0-9]{2})-'.	// months MM-
-		'([0-9]{2})'.	// days DD
-		'T'.			// separator T
-		'([0-9]{2}):'.	// hours hh:
-		'([0-9]{2}):'.	// minutes mm:
-		'([0-9]{2})(\.[0-9]*)?'. // seconds ss.ss...
-		'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
+	if ($utc) {
+		$pattern = '/' .
+		'([0-9]{4})-' . // centuries & years CCYY-
+		'([0-9]{2})-' . // months MM-
+		'([0-9]{2})' . // days DD
+		'T' . // separator T
+		'([0-9]{2}):' . // hours hh:
+		'([0-9]{2}):' . // minutes mm:
+		'([0-9]{2})(\.[0-9]*)?' . // seconds ss.ss...
+		'(Z|[+\-][0-9]{2}:?[0-9]{2})?' . // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
 		'/';
 
-		if(preg_match($pattern,$datestr,$regs)){
-			return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ',$regs[1],$regs[2],$regs[3],$regs[4],$regs[5],$regs[6]);
+		if (preg_match($pattern, $datestr, $regs)) {
+			return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ', $regs[1], $regs[2], $regs[3], $regs[4], $regs[5], $regs[6]);
 		}
 		return false;
 	} else {
@@ -932,27 +932,27 @@ 
 * @return	mixed Unix timestamp (int) or false
 * @access   public
 */
-function iso8601_to_timestamp($datestr){
-	$pattern = '/'.
-	'([0-9]{4})-'.	// centuries & years CCYY-
-	'([0-9]{2})-'.	// months MM-
-	'([0-9]{2})'.	// days DD
-	'T'.			// separator T
-	'([0-9]{2}):'.	// hours hh:
-	'([0-9]{2}):'.	// minutes mm:
-	'([0-9]{2})(\.[0-9]+)?'. // seconds ss.ss...
-	'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
+function iso8601_to_timestamp($datestr) {
+	$pattern = '/' .
+	'([0-9]{4})-' . // centuries & years CCYY-
+	'([0-9]{2})-' . // months MM-
+	'([0-9]{2})' . // days DD
+	'T' . // separator T
+	'([0-9]{2}):' . // hours hh:
+	'([0-9]{2}):' . // minutes mm:
+	'([0-9]{2})(\.[0-9]+)?' . // seconds ss.ss...
+	'(Z|[+\-][0-9]{2}:?[0-9]{2})?' . // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
 	'/';
-	if(preg_match($pattern,$datestr,$regs)){
+	if (preg_match($pattern, $datestr, $regs)) {
 		// not utc
-		if($regs[8] != 'Z'){
-			$op = substr($regs[8],0,1);
-			$h = substr($regs[8],1,2);
-			$m = substr($regs[8],strlen($regs[8])-2,2);
-			if($op == '-'){
+		if ($regs[8] != 'Z') {
+			$op = substr($regs[8], 0, 1);
+			$h = substr($regs[8], 1, 2);
+			$m = substr($regs[8], strlen($regs[8]) - 2, 2);
+			if ($op == '-') {
 				$regs[4] = $regs[4] + $h;
 				$regs[5] = $regs[5] + $m;
-			} elseif($op == '+'){
+			} elseif ($op == '+') {
 				$regs[4] = $regs[4] - $h;
 				$regs[5] = $regs[5] - $m;
 			}

libraries/nusoap/class.soap_fault.php

Doc Comments +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
     * @param string $faultcode (SOAP-ENV:Client | SOAP-ENV:Server)
     * @param string $faultactor only used when msg routed between multiple actors
     * @param string $faultstring human readable error message
-    * @param mixed $faultdetail detail, typically a string or array of string
+    * @param string $faultdetail detail, typically a string or array of string
 	*/
 	public function nusoap_fault($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
 		parent::nusoap_base();

Indentation +12 added lines, -12 removed lines

@@ -38,13 +38,13 @@ 
 	var $faultdetail;
 
 	/**
-	* constructor
-    *
-    * @param string $faultcode (SOAP-ENV:Client | SOAP-ENV:Server)
-    * @param string $faultactor only used when msg routed between multiple actors
-    * @param string $faultstring human readable error message
-    * @param mixed $faultdetail detail, typically a string or array of string
-	*/
+	 * constructor
+	 *
+	 * @param string $faultcode (SOAP-ENV:Client | SOAP-ENV:Server)
+	 * @param string $faultactor only used when msg routed between multiple actors
+	 * @param string $faultstring human readable error message
+	 * @param mixed $faultdetail detail, typically a string or array of string
+	 */
 	public function nusoap_fault($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
 		parent::nusoap_base();
 		$this->faultcode = $faultcode;
@@ -54,11 +54,11 @@ 
 	}
 
 	/**
-	* serialize a fault
-	*
-	* @return	string	The serialization of the fault instance.
-	* @access   public
-	*/
+	 * serialize a fault
+	 *
+	 * @return	string	The serialization of the fault instance.
+	 * @access   public
+	 */
 	public function serialize(){
 		$ns_string = '';
 		foreach($this->namespaces as $k => $v){

Spacing +13 added lines, -13 removed lines

@@ -45,7 +45,7 @@ 
     * @param string $faultstring human readable error message
     * @param mixed $faultdetail detail, typically a string or array of string
 	*/
-	public function nusoap_fault($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
+	public function nusoap_fault($faultcode, $faultactor = '', $faultstring = '', $faultdetail = '') {
 		parent::nusoap_base();
 		$this->faultcode = $faultcode;
 		$this->faultactor = $faultactor;
@@ -59,22 +59,22 @@ 
 	* @return	string	The serialization of the fault instance.
 	* @access   public
 	*/
-	public function serialize(){
+	public function serialize() {
 		$ns_string = '';
-		foreach($this->namespaces as $k => $v){
+		foreach ($this->namespaces as $k => $v) {
 			$ns_string .= "\n  xmlns:$k=\"$v\"";
 		}
 		$return_msg =
-			'<?xml version="1.0" encoding="'.$this->soap_defencoding.'"?>'.
-			'<SOAP-ENV:Envelope SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"'.$ns_string.">\n".
-				'<SOAP-ENV:Body>'.
-				'<SOAP-ENV:Fault>'.
-					$this->serialize_val($this->faultcode, 'faultcode').
-					$this->serialize_val($this->faultactor, 'faultactor').
-					$this->serialize_val($this->faultstring, 'faultstring').
-					$this->serialize_val($this->faultdetail, 'detail').
-				'</SOAP-ENV:Fault>'.
-				'</SOAP-ENV:Body>'.
+			'<?xml version="1.0" encoding="' . $this->soap_defencoding . '"?>' .
+			'<SOAP-ENV:Envelope SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"' . $ns_string . ">\n" .
+				'<SOAP-ENV:Body>' .
+				'<SOAP-ENV:Fault>' .
+					$this->serialize_val($this->faultcode, 'faultcode') .
+					$this->serialize_val($this->faultactor, 'faultactor') .
+					$this->serialize_val($this->faultstring, 'faultstring') .
+					$this->serialize_val($this->faultdetail, 'detail') .
+				'</SOAP-ENV:Fault>' .
+				'</SOAP-ENV:Body>' .
 			'</SOAP-ENV:Envelope>';
 		return $return_msg;
 	}