YetiForceCompany / YetiForceCRM

include/simplehtmldom/simple_html_dom.php

Switch Indentation +21 added lines, -21 removed lines

@@ -399,9 +399,9 @@ 
 if (isset($this->_[HDOM_INFO_INNER]))
 	return $this->_[HDOM_INFO_INNER];
 switch ($this->nodetype) {
-	case HDOM_TYPE_TEXT: return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
-	case HDOM_TYPE_COMMENT: return '';
-	case HDOM_TYPE_UNKNOWN: return '';
+		case HDOM_TYPE_TEXT: return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		case HDOM_TYPE_COMMENT: return '';
+		case HDOM_TYPE_UNKNOWN: return '';
 }
 if (strcasecmp($this->tag, 'script') === 0)
 	return '';
@@ -640,19 +640,19 @@ 
 }
 
 switch ($exp) {
-	case '=':
-		return ($value === $pattern);
-	case '!=':
-		return ($value !== $pattern);
-	case '^=':
-		return preg_match("/^" . preg_quote($pattern, '/') . "/", $value);
-	case '$=':
-		return preg_match("/" . preg_quote($pattern, '/') . "$/", $value);
-	case '*=':
-		if ($pattern[0] == '/') {
-			return preg_match($pattern, $value);
-		}
-		return preg_match("/" . $pattern . "/i", $value);
+		case '=':
+			return ($value === $pattern);
+		case '!=':
+			return ($value !== $pattern);
+		case '^=':
+			return preg_match("/^" . preg_quote($pattern, '/') . "/", $value);
+		case '$=':
+			return preg_match("/" . preg_quote($pattern, '/') . "$/", $value);
+		case '*=':
+			if ($pattern[0] == '/') {
+				return preg_match($pattern, $value);
+			}
+			return preg_match("/" . $pattern . "/i", $value);
 }
 return false;
 }
@@ -736,11 +736,11 @@ 
 	return $this->convert_text($this->attr[$name]);
 }
 switch ($name) {
-	case 'outertext': return $this->outertext();
-	case 'innertext': return $this->innertext();
-	case 'plaintext': return $this->text();
-	case 'xmltext': return $this->xmltext();
-	default: return array_key_exists($name, $this->attr);
+		case 'outertext': return $this->outertext();
+		case 'innertext': return $this->innertext();
+		case 'plaintext': return $this->text();
+		case 'xmltext': return $this->xmltext();
+		default: return array_key_exists($name, $this->attr);
 }
 }
 

Spacing +3 added lines, -3 removed lines

@@ -224,7 +224,7 @@ 
 	{
 	// I am SURE that this doesn't work properly.
 	// It fails to unset the current node from it's current parents nodes or children list first.
-	if($parent !== null)
+	if ($parent !== null)
 	{
 	$this->parent = $parent;
 	$this->parent->nodes[] = $this;
@@ -1427,7 +1427,7 @@ 
 		$node->tag = 'unknown';
 	}
 	if ($this->char === '>')
-		$node->_[HDOM_INFO_TEXT].='>';
+		$node->_[HDOM_INFO_TEXT] .= '>';
 	$this->link_nodes($node, true);
 	$this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 	return true;
@@ -1450,7 +1450,7 @@ 
 	}
 
 	if ($this->char === '>')
-		$node->_[HDOM_INFO_TEXT].='>';
+		$node->_[HDOM_INFO_TEXT] .= '>';
 	$this->link_nodes($node, false);
 	$this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 	return true;

Braces +164 added lines, -107 removed lines

@@ -153,8 +153,9 @@ 
 		echo $lead . $this->tag;
 		if ($show_attr && count($this->attr) > 0) {
 			echo '(';
-			foreach ($this->attr as $k => $v)
-				echo "[$k]=>\"" . $this->$k . '", ';
+			foreach ($this->attr as $k => $v) {
+							echo "[$k]=>\"" . $this->$k . '", ';
+			}
 			echo ')';
 		}
 		echo "\n";
@@ -246,8 +247,9 @@ 
 if ($idx === -1) {
 	return $this->children;
 }
-if (isset($this->children[$idx]))
+if (isset($this->children[$idx])) {
 	return $this->children[$idx];
+}
 return null;
 }
 
@@ -290,14 +292,17 @@ 
 // returns the previous sibling of node
 function prev_sibling()
 {
-if ($this->parent === null)
+if ($this->parent === null) {
 	return null;
+}
 $idx = 0;
 $count = count($this->parent->children);
-while ($idx < $count && $this !== $this->parent->children[$idx])
+while ($idx < $count && $this !== $this->parent->children[$idx]) {
 	++$idx;
-if (--$idx < 0)
+}
+if (--$idx < 0) {
 	return null;
+}
 return $this->parent->children[$idx];
 }
 
@@ -328,14 +333,17 @@ 
 // get dom node's inner html
 function innertext()
 {
-if (isset($this->_[HDOM_INFO_INNER]))
+if (isset($this->_[HDOM_INFO_INNER])) {
 	return $this->_[HDOM_INFO_INNER];
-if (isset($this->_[HDOM_INFO_TEXT]))
+}
+if (isset($this->_[HDOM_INFO_TEXT])) {
 	return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+}
 
 $ret = '';
-foreach ($this->nodes as $n)
+foreach ($this->nodes as $n) {
 	$ret .= $n->outertext();
+}
 return $ret;
 }
 
@@ -353,18 +361,21 @@ 
 	$debugObject->debugLog(1, 'Innertext of tag: ' . $this->tag . $text);
 }
 
-if ($this->tag === 'root')
+if ($this->tag === 'root') {
 	return $this->innertext();
+}
 
 // trigger callback
 if ($this->dom && $this->dom->callback !== null) {
 	call_user_func_array($this->dom->callback, array($this));
 }
 
-if (isset($this->_[HDOM_INFO_OUTER]))
+if (isset($this->_[HDOM_INFO_OUTER])) {
 	return $this->_[HDOM_INFO_OUTER];
-if (isset($this->_[HDOM_INFO_TEXT]))
+}
+if (isset($this->_[HDOM_INFO_TEXT])) {
 	return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+}
 
 // render begin tag
 if ($this->dom && $this->dom->nodes[$this->_[HDOM_INFO_BEGIN]]) {
@@ -388,25 +399,29 @@ 
 }
 
 // render end tag
-if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END] != 0)
+if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END] != 0) {
 	$ret .= '</' . $this->tag . '>';
+}
 return $ret;
 }
 
 // get dom node's plain text
 function text()
 {
-if (isset($this->_[HDOM_INFO_INNER]))
+if (isset($this->_[HDOM_INFO_INNER])) {
 	return $this->_[HDOM_INFO_INNER];
+}
 switch ($this->nodetype) {
 	case HDOM_TYPE_TEXT: return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
 	case HDOM_TYPE_COMMENT: return '';
 	case HDOM_TYPE_UNKNOWN: return '';
 }
-if (strcasecmp($this->tag, 'script') === 0)
+if (strcasecmp($this->tag, 'script') === 0) {
 	return '';
-if (strcasecmp($this->tag, 'style') === 0)
+}
+if (strcasecmp($this->tag, 'style') === 0) {
 	return '';
+}
 
 $ret = '';
 // In rare cases, (always node type 1 or HDOM_TYPE_ELEMENT - observed for some span tags, and some p tags) $this->nodes is set to NULL.
@@ -437,8 +452,9 @@ 
 function makeup()
 {
 // text, comment, unknown
-if (isset($this->_[HDOM_INFO_TEXT]))
+if (isset($this->_[HDOM_INFO_TEXT])) {
 	return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+}
 
 $ret = '<' . $this->tag;
 $i = -1;
@@ -447,14 +463,15 @@ 
 	++$i;
 
 	// skip removed attribute
-	if ($val === null || $val === false)
-		continue;
+	if ($val === null || $val === false) {
+			continue;
+	}
 
 	$ret .= $this->_[HDOM_INFO_SPACE][$i][0];
 	//no value attr: nowrap, checked selected...
-	if ($val === true)
-		$ret .= $key;
-	else {
+	if ($val === true) {
+			$ret .= $key;
+	} else {
 		switch ($this->_[HDOM_INFO_QUOTE][$i]) {
 			case HDOM_QUOTE_DOUBLE: $quote = '"';
 				break;
@@ -474,18 +491,21 @@ 
 function find($selector, $idx = null, $lowercase = false)
 {
 $selectors = $this->parse_selector($selector);
-if (($count = count($selectors)) === 0)
+if (($count = count($selectors)) === 0) {
 	return [];
+}
 $found_keys = [];
 
 // find each selector
 for ($c = 0; $c < $count; ++$c) {
 	// The change on the below line was documented on the sourceforge code tracker id 2788009
 	// used to be: if (($levle=count($selectors[0]))===0) return [];
-	if (($levle = count($selectors[$c])) === 0)
-		return [];
-	if (!isset($this->_[HDOM_INFO_BEGIN]))
-		return [];
+	if (($levle = count($selectors[$c])) === 0) {
+			return [];
+	}
+	if (!isset($this->_[HDOM_INFO_BEGIN])) {
+			return [];
+	}
 
 	$head = array($this->_[HDOM_INFO_BEGIN] => 1);
 
@@ -501,8 +521,9 @@ 
 	}
 
 	foreach ($head as $k => $v) {
-		if (!isset($found_keys[$k]))
-			$found_keys[$k] = 1;
+		if (!isset($found_keys[$k])) {
+					$found_keys[$k] = 1;
+		}
 	}
 }
 
@@ -510,14 +531,16 @@ 
 ksort($found_keys);
 
 $found = [];
-foreach ($found_keys as $k => $v)
+foreach ($found_keys as $k => $v) {
 	$found[] = $this->dom->nodes[$k];
+}
 
 // return nth-element or array
-if (is_null($idx))
+if (is_null($idx)) {
 	return $found;
-else if ($idx < 0)
+} else if ($idx < 0) {
 	$idx = count($found) + $idx;
+}
 return (isset($found[$idx])) ? $found[$idx] : null;
 }
 
@@ -562,8 +585,9 @@ 
 	$pass = true;
 
 	if ($tag === '*' && !$key) {
-		if (in_array($node, $this->children, true))
-			$ret[$i] = 1;
+		if (in_array($node, $this->children, true)) {
+					$ret[$i] = 1;
+		}
 		continue;
 	}
 
@@ -574,11 +598,13 @@ 
 	// compare key
 	if ($pass && $key) {
 		if ($no_key) {
-			if (isset($node->attr[$key]))
-				$pass = false;
+			if (isset($node->attr[$key])) {
+							$pass = false;
+			}
 		} else {
-			if (($key != "plaintext") && !isset($node->attr[$key]))
-				$pass = false;
+			if (($key != "plaintext") && !isset($node->attr[$key])) {
+							$pass = false;
+			}
 		}
 	}
 	// compare value
@@ -614,16 +640,19 @@ 
 					} else {
 						$check = $this->match($exp, $val, $k);
 					}
-					if ($check)
-						break;
+					if ($check) {
+											break;
+					}
 				}
 			}
 		}
-		if (!$check)
-			$pass = false;
+		if (!$check) {
+					$pass = false;
+		}
+	}
+	if ($pass) {
+			$ret[$i] = 1;
 	}
-	if ($pass)
-		$ret[$i] = 1;
 	unset($node);
 }
 // It's passed by reference so this is actually what this function returns.
@@ -683,11 +712,13 @@ 
 
 foreach ($matches as $m) {
 	$m[0] = trim($m[0]);
-	if ($m[0] === '' || $m[0] === '/' || $m[0] === '//')
-		continue;
+	if ($m[0] === '' || $m[0] === '/' || $m[0] === '//') {
+			continue;
+	}
 	// for browser generated xpath
-	if ($m[1] === 'tbody')
-		continue;
+	if ($m[1] === 'tbody') {
+			continue;
+	}
 
 	list($tag, $key, $val, $exp, $no_key) = array($m[1], null, null, '=', false);
 	if (!empty($m[2])) {
@@ -725,8 +756,9 @@ 
 		$result = [];
 	}
 }
-if (count($result) > 0)
+if (count($result) > 0) {
 	$selectors[] = $result;
+}
 return $selectors;
 }
 
@@ -749,8 +781,9 @@ 
 switch ($name) {
 	case 'outertext': return $this->_[HDOM_INFO_OUTER] = $value;
 	case 'innertext':
-		if (isset($this->_[HDOM_INFO_TEXT]))
-			return $this->_[HDOM_INFO_TEXT] = $value;
+		if (isset($this->_[HDOM_INFO_TEXT])) {
+					return $this->_[HDOM_INFO_TEXT] = $value;
+		}
 		return $this->_[HDOM_INFO_INNER] = $value;
 }
 if (!isset($this->attr[$name])) {
@@ -773,9 +806,10 @@ 
 
 function __unset($name)
 {
-if (isset($this->attr[$name]))
+if (isset($this->attr[$name])) {
 	unset($this->attr[$name]);
 }
+}
 
 // PaperG - Function to convert the text from one character set to another if the two sets are not the same.
 function convert_text($text)
@@ -835,27 +869,30 @@ 
 for ($i = 0; $i < $len; $i++) {
 	$c = ord($str[$i]);
 	if ($c > 128) {
-		if (($c >= 254))
-			return false;
-		elseif ($c >= 252)
-			$bits = 6;
-		elseif ($c >= 248)
-			$bits = 5;
-		elseif ($c >= 240)
-			$bits = 4;
-		elseif ($c >= 224)
-			$bits = 3;
-		elseif ($c >= 192)
-			$bits = 2;
-		else
-			return false;
-		if (($i + $bits) > $len)
-			return false;
+		if (($c >= 254)) {
+					return false;
+		} elseif ($c >= 252) {
+					$bits = 6;
+		} elseif ($c >= 248) {
+					$bits = 5;
+		} elseif ($c >= 240) {
+					$bits = 4;
+		} elseif ($c >= 224) {
+					$bits = 3;
+		} elseif ($c >= 192) {
+					$bits = 2;
+		} else {
+					return false;
+		}
+		if (($i + $bits) > $len) {
+					return false;
+		}
 		while ($bits > 1) {
 			$i++;
 			$b = ord($str[$i]);
-			if ($b < 128 || $b > 191)
-				return false;
+			if ($b < 128 || $b > 191) {
+							return false;
+			}
 			$bits--;
 		}
 	}
@@ -1175,8 +1212,9 @@ 
 function save($filepath = '')
 {
 $ret = $this->root->innertext();
-if ($filepath !== '')
+if ($filepath !== '') {
 	file_put_contents($filepath, $ret, LOCK_EX);
+}
 return $ret;
 }
 
@@ -1195,9 +1233,10 @@ 
 	$n = null;
 }
 // This add next line is documented in the sourceforge repository. 2977248 as a fix for ongoing memory leaks that occur even with the use of clear.
-if (isset($this->children))
+if (isset($this->children)) {
 	foreach ($this->children as $n) {
 		$n->clear();
+}
 		$n = null;
 	}
 if (isset($this->parent)) {
@@ -1249,9 +1288,10 @@ 
 $this->root->_[HDOM_INFO_BEGIN] = -1;
 $this->root->nodetype = HDOM_TYPE_ROOT;
 $this->parent = $this->root;
-if ($this->size > 0)
+if ($this->size > 0) {
 	$this->char = $this->doc[0];
 }
+}
 
 // parse html content
 protected function parse()
@@ -1360,8 +1400,9 @@ 
 	$tag = $this->copy_until_char('>');
 
 	// skip attributes in end tag
-	if (($pos = strpos($tag, ' ')) !== false)
-		$tag = substr($tag, 0, $pos);
+	if (($pos = strpos($tag, ' ')) !== false) {
+			$tag = substr($tag, 0, $pos);
+	}
 
 	$parent_lower = strtolower($this->parent->tag);
 	$tag_lower = strtolower($tag);
@@ -1371,23 +1412,25 @@ 
 			$this->parent->_[HDOM_INFO_END] = 0;
 			$org_parent = $this->parent;
 
-			while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower)
-				$this->parent = $this->parent->parent;
+			while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower) {
+							$this->parent = $this->parent->parent;
+			}
 
 			if (strtolower($this->parent->tag) !== $tag_lower) {
 				$this->parent = $org_parent; // restore origonal parent
-				if ($this->parent->parent)
-					$this->parent = $this->parent->parent;
+				if ($this->parent->parent) {
+									$this->parent = $this->parent->parent;
+				}
 				$this->parent->_[HDOM_INFO_END] = $this->cursor;
 				return $this->as_text_node($tag);
 			}
-		}
-		else if (($this->parent->parent) && isset($this->block_tags[$tag_lower])) {
+		} else if (($this->parent->parent) && isset($this->block_tags[$tag_lower])) {
 			$this->parent->_[HDOM_INFO_END] = 0;
 			$org_parent = $this->parent;
 
-			while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower)
-				$this->parent = $this->parent->parent;
+			while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower) {
+							$this->parent = $this->parent->parent;
+			}
 
 			if (strtolower($this->parent->tag) !== $tag_lower) {
 				$this->parent = $org_parent; // restore origonal parent
@@ -1397,13 +1440,15 @@ 
 		} else if (($this->parent->parent) && strtolower($this->parent->parent->tag) === $tag_lower) {
 			$this->parent->_[HDOM_INFO_END] = 0;
 			$this->parent = $this->parent->parent;
-		} else
-			return $this->as_text_node($tag);
+		} else {
+					return $this->as_text_node($tag);
+		}
 	}
 
 	$this->parent->_[HDOM_INFO_END] = $this->cursor;
-	if ($this->parent->parent)
-		$this->parent = $this->parent->parent;
+	if ($this->parent->parent) {
+			$this->parent = $this->parent->parent;
+	}
 
 	$this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 	return true;
@@ -1426,8 +1471,9 @@ 
 		$node->nodetype = HDOM_TYPE_UNKNOWN;
 		$node->tag = 'unknown';
 	}
-	if ($this->char === '>')
-		$node->_[HDOM_INFO_TEXT].='>';
+	if ($this->char === '>') {
+			$node->_[HDOM_INFO_TEXT].='>';
+	}
 	$this->link_nodes($node, true);
 	$this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 	return true;
@@ -1449,8 +1495,9 @@ 
 		return true;
 	}
 
-	if ($this->char === '>')
-		$node->_[HDOM_INFO_TEXT].='>';
+	if ($this->char === '>') {
+			$node->_[HDOM_INFO_TEXT].='>';
+	}
 	$this->link_nodes($node, false);
 	$this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 	return true;
@@ -1511,8 +1558,9 @@ 
 	if ($name !== '/' && $name !== '') {
 		$space[1] = $this->copy_skip($this->token_blank);
 		$name = $this->restore_noise($name);
-		if ($this->lowercase)
-			$name = strtolower($name);
+		if ($this->lowercase) {
+					$name = strtolower($name);
+		}
 		if ($this->char === '=') {
 			$this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 			$this->parse_attr($node, $name, $space);
@@ -1520,14 +1568,17 @@ 
 			//no value attr: nowrap, checked selected...
 			$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
 			$node->attr[$name] = true;
-			if ($this->char != '>')
-				$this->char = $this->doc[--$this->pos]; // prev
+			if ($this->char != '>') {
+							$this->char = $this->doc[--$this->pos];
+			}
+			// prev
 		}
 		$node->_[HDOM_INFO_SPACE][] = $space;
 		$space = array($this->copy_skip($this->token_blank), '', '');
-	} else
-		break;
-} while ($this->char !== '>' && $this->char !== '/');
+	} else {
+			break;
+	}
+	} while ($this->char !== '>' && $this->char !== '/');
 
 $this->link_nodes($node, true);
 $node->_[HDOM_INFO_ENDSPACE] = $space[0];
@@ -1538,9 +1589,10 @@ 
 	$node->_[HDOM_INFO_END] = 0;
 } else {
 	// reset parent
-	if (!isset($this->self_closing_tags[strtolower($node->tag)]))
-		$this->parent = $node;
-}
+	if (!isset($this->self_closing_tags[strtolower($node->tag)])) {
+			$this->parent = $node;
+	}
+	}
 $this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 // If it's a BR tag, we need to set it's text to the default text.
 // This way when we see it in plaintext, we can generate formatting that the user wants.
@@ -1621,8 +1673,9 @@ 
 $len = strspn($this->doc, $chars, $pos);
 $this->pos += $len;
 $this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
-if ($len === 0)
+if ($len === 0) {
 	return '';
+}
 return substr($this->doc, $pos, $len);
 }
 
@@ -1637,8 +1690,9 @@ 
 
 protected function copy_until_char($char)
 {
-if ($this->char === null)
+if ($this->char === null) {
 	return '';
+}
 
 if (($pos = strpos($this->doc, $char, $this->pos)) === false) {
 	$ret = substr($this->doc, $this->pos, $this->size - $this->pos);
@@ -1647,8 +1701,9 @@ 
 	return $ret;
 }
 
-if ($pos === $this->pos)
+if ($pos === $this->pos) {
 	return '';
+}
 $pos_old = $this->pos;
 $this->char = $this->doc[$pos];
 $this->pos = $pos;
@@ -1657,8 +1712,9 @@ 
 
 protected function copy_until_char_escape($char)
 {
-if ($this->char === null)
+if ($this->char === null) {
 	return '';
+}
 
 $start = $this->pos;
 while (1) {
@@ -1669,8 +1725,9 @@ 
 		return $ret;
 	}
 
-	if ($pos === $this->pos)
-		return '';
+	if ($pos === $this->pos) {
+			return '';
+	}
 
 	if ($this->doc[$pos - 1] === '\\') {
 		$start = $pos + 1;

Doc Comments +38 added lines

@@ -66,6 +66,9 @@ 
 // helper functions
 // -----------------------------------------------------------------------------
 // get html dom from file
+/**
+ * @param string $url
+ */
 function file_get_html($url, $use_include_path = false, $context = null, $offset = -1, $maxLen = -1, $lowercase = true, $forceTagsClosed = true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
 {
 	// We DO force the tags to be terminated.
@@ -120,6 +123,9 @@ 
 	public $tag_start = 0;
 	private $dom = null;
 
+	/**
+	 * @param simple_html_dom $dom
+	 */
 	public function __construct($dom)
 	{
 		$this->dom = $dom;
@@ -1552,6 +1558,10 @@ 
 }
 
 // parse attributes
+/**
+ * @param simple_html_dom_node $node
+ * @param string[] $space
+ */
 protected function parse_attr($node, $name, &$space)
 {
 // Per sourceforge: http://sourceforge.net/tracker/?func=detail&aid=3061408&group_id=218559&atid=1044037
@@ -1588,6 +1598,10 @@ 
 }
 
 // link node's parent
+/**
+ * @param simple_html_dom_node $node
+ * @param boolean $is_child
+ */
 protected function link_nodes(&$node, $is_child)
 {
 $node->parent = $this->parent;
@@ -1598,6 +1612,9 @@ 
 }
 
 // as a text node
+/**
+ * @param string $tag
+ */
 protected function as_text_node($tag)
 {
 $node = new simple_html_dom_node($this);
@@ -1608,12 +1625,18 @@ 
 return true;
 }
 
+/**
+ * @param string $chars
+ */
 protected function skip($chars)
 {
 $this->pos += strspn($this->doc, $chars, $this->pos);
 $this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 }
 
+/**
+ * @param string $chars
+ */
 protected function copy_skip($chars)
 {
 $pos = $this->pos;
@@ -1625,6 +1648,9 @@ 
 return substr($this->doc, $pos, $len);
 }
 
+/**
+ * @param string $chars
+ */
 protected function copy_until($chars)
 {
 $pos = $this->pos;
@@ -1634,6 +1660,9 @@ 
 return substr($this->doc, $pos, $len);
 }
 
+/**
+ * @param string $char
+ */
 protected function copy_until_char($char)
 {
 if ($this->char === null)
@@ -1654,6 +1683,9 @@ 
 return substr($this->doc, $pos_old, $pos - $pos_old);
 }
 
+/**
+ * @param string $char
+ */
 protected function copy_until_char_escape($char)
 {
 if ($this->char === null)
@@ -1685,6 +1717,9 @@ 
 
 // remove noise from html content
 // save the noise in the $this->noise array.
+/**
+ * @param string $pattern
+ */
 protected function remove_noise($pattern, $remove_tag = false)
 {
 global $debugObject;
@@ -1712,6 +1747,9 @@ 
 }
 
 // restore noise to html content
+/**
+ * @param string|null $text
+ */
 function restore_noise($text)
 {
 global $debugObject;

include/utils/EmailTemplate.php

Spacing +2 added lines, -2 removed lines

@@ -120,7 +120,7 @@ 
 				$moduleTableIndexList = $meta->getEntityTableIndexList();
 				foreach ($tableList as $index => $tableName) {
 					if ($tableName != $tableList[0]) {
-						$sql .=' INNER JOIN ' . $tableName . ' ON ' . $tableList[0] . '.' .
+						$sql .= ' INNER JOIN ' . $tableName . ' ON ' . $tableList[0] . '.' .
 							$moduleTableIndexList[$tableList[0]] . '=' . $tableName . '.' .
 							$moduleTableIndexList[$tableName];
 					}
@@ -128,7 +128,7 @@ 
 				//If module is Leads and if you are not selected any leads fields then query failure is happening.
 				//By default we are checking where condition on base table.
 				if ($module == 'Leads' && !in_array('vtiger_leaddetails', $tableList)) {
-					$sql .=' INNER JOIN vtiger_leaddetails ON vtiger_leaddetails.leadid = vtiger_crmentity.crmid';
+					$sql .= ' INNER JOIN vtiger_leaddetails ON vtiger_leaddetails.leadid = vtiger_crmentity.crmid';
 				}
 
 				$sql .= ' WHERE';

Braces +6 added lines, -4 removed lines

@@ -209,8 +209,9 @@ 
 						$needle = '$' . strtolower($this->module) . '-' . $parentFieldColumnMapping[$params['field']] . ':' . $column . '$';
 						$this->processedDescription = str_replace($needle, $values[array_search($column, $fieldColumnMapping)], $this->processedDescription);
 					}
-					if (!$params['owner'])
-						$this->processedmodules[$module] = true;
+					if (!$params['owner']) {
+											$this->processedmodules[$module] = true;
+					}
 				}
 			}
 		}
@@ -253,7 +254,8 @@ 
 		$rows = $adb->num_rows($res);
 		if ($rows > 0) {
 			return true;
-		} else
-			return false;
+		} else {
+					return false;
+		}
 	}
 }

include/utils/ConfigReader.php

Braces +6 added lines, -4 removed lines

@@ -37,8 +37,9 @@ 
 
 	public function setConfig($key, $value)
 	{
-		if (empty($key))
-			return;
+		if (empty($key)) {
+					return;
+		}
 		$this->properties[$key] = $value;
 		//not neccessary for php5.x versions
 		self::$propertiesCache[$this->name] = $this->properties;
@@ -46,8 +47,9 @@ 
 
 	public function getConfig($key)
 	{
-		if (empty($key))
-			return '';
+		if (empty($key)) {
+					return '';
+		}
 		return $this->properties[$key];
 	}
 }

Doc Comments +7 added lines

@@ -15,6 +15,10 @@ 
 	protected $name;
 	static $propertiesCache = [];
 
+	/**
+	 * @param string $path
+	 * @param string $name
+	 */
 	public function __construct($path, $name, $force = false)
 	{
 		$this->load($path, $name, $force);
@@ -41,6 +45,9 @@ 
 		self::$propertiesCache[$this->name] = $this->properties;
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public function getConfig($key)
 	{
 		if (empty($key))

include/utils/ExportUtils.php

Braces +3 added lines, -2 removed lines

@@ -28,8 +28,9 @@
 	$blockid_list = '(';
 	for ($i = 0; $i < $noofrows; $i++) {
 		$blockid = $adb->query_result($result, $i, "blockid");
-		if ($i != 0)
-			$blockid_list .= ', ';
+		if ($i != 0) {
+					$blockid_list .= ', ';
+		}
 		$blockid_list .= $blockid;
 		$block_label[$blockid] = $adb->query_result($result, $i, "blocklabel");
 	}

include/utils/RecurringType.php

Braces +30 added lines, -26 removed lines

@@ -69,8 +69,9 @@ 
 		}
 		$this->dayofweek_to_rpt = $repeat_arr['dayofweek_to_repeat'];
 		$this->repeat_monthby = $repeat_arr['repeatmonth_type'];
-		if (isset($repeat_arr['repeatmonth_date']))
-			$this->rptmonth_datevalue = $repeat_arr['repeatmonth_date'];
+		if (isset($repeat_arr['repeatmonth_date'])) {
+					$this->rptmonth_datevalue = $repeat_arr['repeatmonth_date'];
+		}
 		$this->rptmonth_daytype = $repeat_arr['repeatmonth_daytype'];
 
 		$this->recurringdates = $this->_getRecurringDates();
@@ -409,13 +410,13 @@ 
 					if ($this->rptmonth_datevalue <= $date) {
 						$index = $this->rptmonth_datevalue - 1;
 						$day = $this->rptmonth_datevalue;
-						if (isset($this->recur_freq))
-							$month = $month + $this->recur_freq;
-						else
-							$month = $month + 1;
+						if (isset($this->recur_freq)) {
+													$month = $month + $this->recur_freq;
+						} else {
+													$month = $month + 1;
+						}
 						$tempdateObj = $tempdateObj->getThismonthDaysbyIndex($index, $day, $month, $year);
-					}
-					else {
+					} else {
 						$index = $this->rptmonth_datevalue - 1;
 						$day = $this->rptmonth_datevalue;
 						$tempdateObj = $tempdateObj->getThismonthDaysbyIndex($index, $day, $month, $year);
@@ -430,10 +431,11 @@ 
 						$tempdateObj = new vt_DateTime($date_arr, true);
 						$firstdayofmonthObj = $this->getFistdayofmonth($this->dayofweek_to_rpt[0], $tempdateObj);
 						if ($firstdayofmonthObj->get_DB_formatted_date() <= $tempdate) {
-							if (isset($this->recur_freq))
-								$month = $firstdayofmonthObj->getMonth() + $this->recur_freq;
-							else
-								$month = $firstdayofmonthObj->getMonth() + 1;
+							if (isset($this->recur_freq)) {
+															$month = $firstdayofmonthObj->getMonth() + $this->recur_freq;
+							} else {
+															$month = $firstdayofmonthObj->getMonth() + 1;
+							}
 							$dateObj = $firstdayofmonthObj->getThismonthDaysbyIndex(0, 1, $month, $firstdayofmonthObj->getYear());
 							$nextmonthObj = $this->getFistdayofmonth($this->dayofweek_to_rpt[0], $dateObj);
 							$tempdateObj = $nextmonthObj;
@@ -449,16 +451,16 @@ 
 						$tempdateObj = new vt_DateTime($date_arr, true);
 						$lastdayofmonthObj = $this->getLastdayofmonth($this->dayofweek_to_rpt[0], $tempdateObj);
 						if ($lastdayofmonthObj->get_DB_formatted_date() <= $tempdate) {
-							if (isset($this->recur_freq))
-								$month = $lastdayofmonthObj->getMonth() + $this->recur_freq;
-							else
-								$month = $lastdayofmonthObj->getMonth() + 1;
+							if (isset($this->recur_freq)) {
+															$month = $lastdayofmonthObj->getMonth() + $this->recur_freq;
+							} else {
+															$month = $lastdayofmonthObj->getMonth() + 1;
+							}
 							$dateObj = $lastdayofmonthObj->getThismonthDaysbyIndex(0, 1, $month, $lastdayofmonthObj->getYear());
 							$dateObj = $dateObj->getThismonthDaysbyIndex($dateObj->getDaysInMonth() - 1, $dateObj->getDaysInMonth(), $month, $lastdayofmonthObj->getYear());
 							$nextmonthObj = $this->getLastdayofmonth($this->dayofweek_to_rpt[0], $dateObj);
 							$tempdateObj = $nextmonthObj;
-						}
-						else {
+						} else {
 							$tempdateObj = $lastdayofmonthObj;
 						}
 					}
@@ -476,10 +478,11 @@ 
 				}
 			} elseif ($this->recur_type == 'Yearly') {
 
-				if (isset($this->recur_freq))
-					$index = $year + $this->recur_freq;
-				else
-					$index = $year + 1;
+				if (isset($this->recur_freq)) {
+									$index = $year + $this->recur_freq;
+				} else {
+									$index = $year + 1;
+				}
 				if ($index > 2037 || $index < 1970) {
 					print("<font color='red'>" . \includes\Language::translate('LBL_CAL_LIMIT_MSG') . "</font>");
 					exit;
@@ -534,10 +537,11 @@ 
 		if ($dayofweek == $dateObj->dayofweek) {
 			return $dateObj;
 		} else {
-			if ($dayofweek > $dateObj->dayofweek)
-				$day = $dateObj->day - 7 + ($dayofweek - $dateObj->dayofweek);
-			else
-				$day = $dateObj->day - ($dateObj->dayofweek - $dayofweek);
+			if ($dayofweek > $dateObj->dayofweek) {
+							$day = $dateObj->day - 7 + ($dayofweek - $dateObj->dayofweek);
+			} else {
+							$day = $dateObj->day - ($dateObj->dayofweek - $dayofweek);
+			}
 			$index = $day - 1;
 			$month = $dateObj->month;
 			$year = $dateObj->year;

include/utils/utils.php

Spacing +1 added lines, -1 removed lines

@@ -1401,7 +1401,7 @@
 function isRecordExists($recordId, $cache = true)
 {
 	$recordMetaData = vtlib\Functions::getCRMRecordMetadata($recordId);
-	return (isset($recordMetaData) && $recordMetaData['deleted'] == 0 ) ? true : false;
+	return (isset($recordMetaData) && $recordMetaData['deleted'] == 0) ? true : false;
 }
 
 /** Function to set date values compatible to database (YY_MM_DD)

Doc Comments +3 added lines

@@ -367,6 +367,7 @@ 
 
 /**
  * Function to find the UI type of a field based on the uitype id
+ * @param string $reqtype
  */
 function is_uitype($uitype, $reqtype)
 {
@@ -752,6 +753,8 @@ 
 
 /**
  * Function to get the approximate difference between two date time values as string
+ * @param integer $d1
+ * @param integer $d2
  */
 function dateDiffAsString($d1, $d2)
 {

Braces +35 added lines, -25 removed lines

@@ -289,13 +289,15 @@ 
 		while (($i--) > 0) {
 			if ($data != ($a = $data % ($p = pow(64, $i)))) {
 				$ret = chr(base_convert(str_pad(str_repeat(1, $i + 1), 8, "0"), 2, 10) + (($data - $a) / $p));
-				for ($i; $i > 0; $i--)
-					$ret .= chr(128 + ((($data % pow(64, $i)) - ($data % ($p = pow(64, $i - 1)))) / $p));
+				for ($i; $i > 0; $i--) {
+									$ret .= chr(128 + ((($data % pow(64, $i)) - ($data % ($p = pow(64, $i - 1)))) / $p));
+				}
 				break;
 			}
 		}
-	} else
-		$ret = "&#$data;";
+	} else {
+			$ret = "&#$data;";
+	}
 	return $ret;
 }
 
@@ -344,8 +346,9 @@ 
  */
 function escape_single_quotes($value)
 {
-	if (isset($value))
-		$value = str_replace("'", "\'", $value);
+	if (isset($value)) {
+			$value = str_replace("'", "\'", $value);
+	}
 	return $value;
 }
 
@@ -366,10 +369,11 @@ 
 			$str = str_replace('_', '\_', $str);
 			if ($flag == 0) {
 				// If value what to search is null then we should not add % which will fail
-				if (empty($str))
-					$str = '' . $str . '';
-				else
-					$str = '%' . $str . '%';
+				if (empty($str)) {
+									$str = '' . $str . '';
+				} else {
+									$str = '%' . $str . '%';
+				}
 			} elseif ($flag == 1) {
 				$str = '%' . $str;
 			} elseif ($flag == 2) {
@@ -402,8 +406,9 @@ 
 
 		$ret_str .= " ifnull($tbl_name.$col_name,'null') = ifnull(temp.$col_name,'null')";
 
-		if (count($field_array) != $i)
-			$ret_str .= " and ";
+		if (count($field_array) != $i) {
+					$ret_str .= " and ";
+		}
 		$i++;
 	}
 	return $ret_str;
@@ -430,8 +435,9 @@ 
 	foreach ($name as $module) {
 		$focus = CRMEntity::getInstance($module);
 		$query = $focus->buildSearchQueryForFieldTypes(11, $number);
-		if (empty($query))
-			return;
+		if (empty($query)) {
+					return;
+		}
 
 		$result = $adb->pquery($query, []);
 		if ($adb->num_rows($result) > 0) {
@@ -569,8 +575,9 @@ 
 	//require_once('modules/com_vtiger_workflow/VTEntityCache.php');
 	$em = new VTEventsManager($adb);
 	$em->initTriggerCache();
-	if (!is_array($destinationRecordIds))
-		$destinationRecordIds = [$destinationRecordIds];
+	if (!is_array($destinationRecordIds)) {
+			$destinationRecordIds = [$destinationRecordIds];
+	}
 
 	$data = [];
 	$data['CRMEntity'] = $focus;
@@ -626,20 +633,23 @@ 
 	$delim = array('/', '.');
 	foreach ($delim as $delimiter) {
 		$x = strpos($value, $delimiter);
-		if ($x === false)
-			continue;
-		else {
+		if ($x === false) {
+					continue;
+		} else {
 			$value = str_replace($delimiter, '-', $value);
 			break;
 		}
 	}
 	list($y, $m, $d) = explode('-', $value);
-	if (strlen($y) == 1)
-		$y = '0' . $y;
-	if (strlen($m) == 1)
-		$m = '0' . $m;
-	if (strlen($d) == 1)
-		$d = '0' . $d;
+	if (strlen($y) == 1) {
+			$y = '0' . $y;
+	}
+	if (strlen($m) == 1) {
+			$m = '0' . $m;
+	}
+	if (strlen($d) == 1) {
+			$d = '0' . $d;
+	}
 	$value = implode('-', array($y, $m, $d));
 
 	if (strlen($y) < 4) {

include/ConfigUtils.php

Braces +3 added lines, -2 removed lines

@@ -61,8 +61,9 @@
 		self::$modules[$module] = $CONFIG;
 		switch ($argsLength) {
 			case 2:
-				if (!isset($CONFIG[$key]))
-					return false;
+				if (!isset($CONFIG[$key])) {
+									return false;
+				}
 				return $CONFIG[$key];
 				break;
 			default:

Doc Comments +36 added lines

@@ -16,11 +16,17 @@ 
 	protected static $sounds = [];
 	protected static $search = [];
 
+	/**
+	 * @param string $key
+	 */
 	public static function load($key, $config)
 	{
 		self::$$key = $config;
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function main($key, $value = false)
 	{
 		if (isset(self::$main[$key])) {
@@ -75,11 +81,17 @@ 
 		}
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function api($key, $defvalue = false)
 	{
 		return self::$api[$key];
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function debug($key, $defvalue = false)
 	{
 		if (empty(self::$debug)) {
@@ -89,6 +101,9 @@ 
 		return self::$debug[$key];
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function developer($key, $defvalue = false)
 	{
 		if (empty(self::$developer)) {
@@ -98,6 +113,9 @@ 
 		return self::$developer[$key];
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function security($key, $defvalue = false)
 	{
 		if (empty(self::$security)) {
@@ -107,6 +125,9 @@ 
 		return self::$security[$key];
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function securityKeys($key, $defvalue = false)
 	{
 		if (empty(self::$securityKeys)) {
@@ -116,6 +137,11 @@ 
 		return self::$securityKeys[$key];
 	}
 
+	/**
+	 * @param string $key
+	 *
+	 * @return integer
+	 */
 	public static function performance($key, $defvalue = false)
 	{
 		if (empty(self::$performance)) {
@@ -125,6 +151,9 @@ 
 		return self::$performance[$key];
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function relation($key, $defvalue = false)
 	{
 		if (empty(self::$relation)) {
@@ -147,6 +176,9 @@ 
 		return self::$sounds[$key];
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function search($key, $defvalue = false)
 	{
 		if (empty(self::$search)) {
@@ -156,6 +188,10 @@ 
 		return self::$search[$key];
 	}
 
+	/**
+	 * @param string $key
+	 * @param integer $value
+	 */
 	public static function iniSet($key, $value)
 	{
 		@ini_set($key, $value);

include/Webservices/VtigerCRMObjectMeta.php

Braces +6 added lines, -4 removed lines

@@ -212,8 +212,9 @@ 
 		$adb = PearDatabase::getInstance();
 
 		// administrator's have assign privilege
-		if (\vtlib\Functions::userIsAdministrator($this->user))
-			return true;
+		if (\vtlib\Functions::userIsAdministrator($this->user)) {
+					return true;
+		}
 
 		$idComponents = vtws_getIdComponents($webserviceId);
 		$userId = $idComponents[1];
@@ -353,8 +354,9 @@ 
 		$theme = vtws_preserveGlobal('theme', $this->user->theme);
 		$default_language = AppConfig::main('default_language');
 		$current_language = vglobal('current_language');
-		if (empty($current_language))
-			$current_language = $default_language;
+		if (empty($current_language)) {
+					$current_language = $default_language;
+		}
 		$current_language = vtws_preserveGlobal('current_language', $current_language);
 
 		$this->computeAccess();

include/Webservices/History.php

Braces +7 added lines, -4 removed lines

@@ -31,8 +31,9 @@ 
 	$page = empty($element['page']) ? 0 : intval($element['page']); // Page to start
 
 	$acrossAllModule = false;
-	if ($moduleName == 'Home')
-		$acrossAllModule = true;
+	if ($moduleName == 'Home') {
+			$acrossAllModule = true;
+	}
 
 	// Pre-condition check
 	if (empty($moduleName)) {
@@ -71,8 +72,10 @@ 
 
 	// Get most recently tracked changes with limit
 	$start = $page * $MAXLIMIT;
-	if ($start > 0)
-		$start = $start + 1; // Adjust the start range
+	if ($start > 0) {
+			$start = $start + 1;
+	}
+	// Adjust the start range
 	$sql .= sprintf(' ORDER BY vtiger_modtracker_basic.id DESC LIMIT %s,%s', $start, $MAXLIMIT);
 
 	$result = $adb->pquery($sql, $params);