YetiForceCompany / YetiForceCRM

vtlib/Vtiger/PackageImport.php

Doc Comments +19 added lines

@@ -53,6 +53,7 @@ 
 
 	/**
 	 * Get type of package (as specified in manifest)
+	 * @return string
 	 */
 	public function type()
 	{
@@ -393,6 +394,7 @@ 
 	/**
 	 * Cache the field instance for re-use
 	 * @access private
+	 * @param Field $fieldInstance
 	 */
 	public function __AddModuleFieldToCache($moduleInstance, $fieldname, $fieldInstance)
 	{
@@ -674,6 +676,8 @@ 
 	/**
 	 * Import Blocks of the module
 	 * @access private
+	 * @param \SimpleXMLElement $modulenode
+	 * @param Module $moduleInstance
 	 */
 	public function import_Blocks($modulenode, $moduleInstance)
 	{
@@ -717,6 +721,7 @@ 
 	/**
 	 * Import Fields of the module
 	 * @access private
+	 * @param Block $blockInstance
 	 */
 	public function import_Fields($blocknode, $blockInstance, $moduleInstance)
 	{
@@ -807,6 +812,8 @@ 
 	/**
 	 * Import Custom views of the module
 	 * @access private
+	 * @param \SimpleXMLElement $modulenode
+	 * @param Module $moduleInstance
 	 */
 	public function import_CustomViews($modulenode, $moduleInstance)
 	{
@@ -851,6 +858,8 @@ 
 	/**
 	 * Import Sharing Access of the module
 	 * @access private
+	 * @param \SimpleXMLElement $modulenode
+	 * @param Module $moduleInstance
 	 */
 	public function import_SharingAccess($modulenode, $moduleInstance)
 	{
@@ -867,6 +876,8 @@ 
 	/**
 	 * Import Events of the module
 	 * @access private
+	 * @param \SimpleXMLElement $modulenode
+	 * @param Module $moduleInstance
 	 */
 	public function import_Events($modulenode, $moduleInstance)
 	{
@@ -899,6 +910,8 @@ 
 	/**
 	 * Import actions of the module
 	 * @access private
+	 * @param \SimpleXMLElement $modulenode
+	 * @param Module $moduleInstance
 	 */
 	public function import_Actions($modulenode, $moduleInstance)
 	{
@@ -925,6 +938,8 @@ 
 	/**
 	 * Import related lists of the module
 	 * @access private
+	 * @param \SimpleXMLElement $modulenode
+	 * @param Module $moduleInstance
 	 */
 	public function import_RelatedLists($modulenode, $moduleInstance)
 	{
@@ -1004,6 +1019,7 @@ 
 	/**
 	 * Import cron jobs of the module.
 	 * @access private
+	 * @param \SimpleXMLElement $modulenode
 	 */
 	public function import_CronTasks($modulenode)
 	{
@@ -1022,6 +1038,9 @@ 
 		}
 	}
 
+	/**
+	 * @param \SimpleXMLElement $modulenode
+	 */
 	public function import_update($modulenode)
 	{
 		$dirName = 'cache/updates';

Braces +89 added lines, -60 removed lines

@@ -101,8 +101,9 @@ 
 	{
 		$xpathres = $this->xpath($path);
 		foreach ($xpathres as $pathkey => $pathvalue) {
-			if ($pathkey == $path)
-				return $pathvalue;
+			if ($pathkey == $path) {
+							return $pathvalue;
+			}
 		}
 		return false;
 	}
@@ -121,13 +122,15 @@ 
 
 		if ($packagetype) {
 			$lcasetype = strtolower($packagetype);
-			if ($lcasetype == 'language')
-				return true;
+			if ($lcasetype == 'language') {
+							return true;
+			}
 		}
 		if ($packagetype) {
 			$lcasetype = strtolower($packagetype);
-			if ($lcasetype == 'layout')
-				return true;
+			if ($lcasetype == 'layout') {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -146,8 +149,9 @@ 
 
 		if ($packagetype) {
 			$lcasetype = strtolower($packagetype);
-			if ($lcasetype == 'extension')
-				return true;
+			if ($lcasetype == 'extension') {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -163,8 +167,9 @@ 
 
 		if ($packagetype) {
 			$lcasetype = strtolower($packagetype);
-			if ($lcasetype == 'update')
-				return true;
+			if ($lcasetype == 'update') {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -183,8 +188,9 @@ 
 
 		if ($packagetype) {
 			$lcasetype = strtolower($packagetype);
-			if ($lcasetype == 'layout')
-				return true;
+			if ($lcasetype == 'layout') {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -227,8 +233,9 @@ 
 	public function getParameters()
 	{
 		$parameters = [];
-		if (empty($this->_modulexml->parameters))
-			return $parameters;
+		if (empty($this->_modulexml->parameters)) {
+					return $parameters;
+		}
 		foreach ($this->_modulexml->parameters->parameter as $parameter) {
 			$parameters[] = $parameter;
 		}
@@ -338,17 +345,21 @@ 
 		}
 
 		$validzip = false;
-		if ($manifestxml_found && $languagefile_found && $moduleVersionFound)
-			$validzip = true;
+		if ($manifestxml_found && $languagefile_found && $moduleVersionFound) {
+					$validzip = true;
+		}
 
-		if ($manifestxml_found && $layoutfile_found && $moduleVersionFound)
-			$validzip = true;
+		if ($manifestxml_found && $layoutfile_found && $moduleVersionFound) {
+					$validzip = true;
+		}
 
-		if ($manifestxml_found && $languagefile_found && $extensionfile_found && $moduleVersionFound)
-			$validzip = true;
+		if ($manifestxml_found && $languagefile_found && $extensionfile_found && $moduleVersionFound) {
+					$validzip = true;
+		}
 
-		if ($manifestxml_found && $updatefile_found && $moduleVersionFound)
-			$validzip = true;
+		if ($manifestxml_found && $updatefile_found && $moduleVersionFound) {
+					$validzip = true;
+		}
 
 		if ($validzip) {
 			if (!empty($this->_modulexml->license)) {
@@ -365,8 +376,9 @@ 
 				}
 			}
 		}
-		if ($unzip)
-			$unzip->close();
+		if ($unzip) {
+					$unzip->close();
+		}
 		return $validzip;
 	}
 
@@ -376,8 +388,9 @@ 
 	 */
 	public function getModuleNameFromZip($zipfile)
 	{
-		if (!$this->checkZip($zipfile))
-			return null;
+		if (!$this->checkZip($zipfile)) {
+					return null;
+		}
 		return (string) $this->_modulexml->name;
 	}
 
@@ -453,8 +466,9 @@ 
 				$unzip->unzip("$module.png", 'layouts/' . \Vtiger_Viewer::getDefaultLayoutName() . "/skins/images/$module.png");
 			}
 
-			if ($unzip)
-				$unzip->close();
+			if ($unzip) {
+							$unzip->close();
+			}
 		}
 		return $module;
 	}
@@ -642,8 +656,9 @@ 
 	 */
 	public function import_Tables($modulenode)
 	{
-		if (empty($modulenode->tables) || empty($modulenode->tables->table))
-			return;
+		if (empty($modulenode->tables) || empty($modulenode->tables->table)) {
+					return;
+		}
 		$adb = \PearDatabase::getInstance();
 		$adb->query('SET FOREIGN_KEY_CHECKS = 0;');
 
@@ -677,8 +692,9 @@ 
 	 */
 	public function import_Blocks($modulenode, $moduleInstance)
 	{
-		if (empty($modulenode->blocks) || empty($modulenode->blocks->block))
-			return;
+		if (empty($modulenode->blocks) || empty($modulenode->blocks->block)) {
+					return;
+		}
 		foreach ($modulenode->blocks->block as $blocknode) {
 			$blockInstance = $this->import_Block($modulenode, $moduleInstance, $blocknode);
 			$this->import_Fields($blocknode, $blockInstance, $moduleInstance);
@@ -697,8 +713,9 @@ 
 		$blockInstance->label = $blocklabel;
 		if (isset($blocknode->sequence) && isset($blocknode->display_status)) {
 			$blockInstance->sequence = strval($blocknode->sequence);
-			if ($blockInstance->sequence = "")
-				$blockInstance->sequence = NULL;
+			if ($blockInstance->sequence = "") {
+							$blockInstance->sequence = NULL;
+			}
 			$blockInstance->showtitle = strval($blocknode->show_title);
 			$blockInstance->visible = strval($blocknode->visible);
 			$blockInstance->increateview = strval($blocknode->create_view);
@@ -720,8 +737,9 @@ 
 	 */
 	public function import_Fields($blocknode, $blockInstance, $moduleInstance)
 	{
-		if (empty($blocknode->fields) || empty($blocknode->fields->field))
-			return;
+		if (empty($blocknode->fields) || empty($blocknode->fields->field)) {
+					return;
+		}
 
 		foreach ($blocknode->fields->field as $fieldnode) {
 			$fieldInstance = $this->import_Field($blocknode, $blockInstance, $moduleInstance, $fieldnode);
@@ -752,17 +770,21 @@ 
 		$fieldInstance->displaytype = $fieldnode->displaytype;
 		$fieldInstance->info_type = $fieldnode->info_type;
 
-		if (!empty($fieldnode->fieldparams))
-			$fieldInstance->fieldparams = $fieldnode->fieldparams;
+		if (!empty($fieldnode->fieldparams)) {
+					$fieldInstance->fieldparams = $fieldnode->fieldparams;
+		}
 
-		if (!empty($fieldnode->helpinfo))
-			$fieldInstance->helpinfo = $fieldnode->helpinfo;
+		if (!empty($fieldnode->helpinfo)) {
+					$fieldInstance->helpinfo = $fieldnode->helpinfo;
+		}
 
-		if (isset($fieldnode->masseditable))
-			$fieldInstance->masseditable = $fieldnode->masseditable;
+		if (isset($fieldnode->masseditable)) {
+					$fieldInstance->masseditable = $fieldnode->masseditable;
+		}
 
-		if (isset($fieldnode->columntype) && !empty($fieldnode->columntype))
-			$fieldInstance->columntype = strval($fieldnode->columntype);
+		if (isset($fieldnode->columntype) && !empty($fieldnode->columntype)) {
+					$fieldInstance->columntype = strval($fieldnode->columntype);
+		}
 
 		if (!empty($fieldnode->tree_template)) {
 			$templateid = $fieldInstance->setTreeTemplate($fieldnode->tree_template, $moduleInstance);
@@ -810,8 +832,9 @@ 
 	 */
 	public function import_CustomViews($modulenode, $moduleInstance)
 	{
-		if (empty($modulenode->customviews) || empty($modulenode->customviews->customview))
-			return;
+		if (empty($modulenode->customviews) || empty($modulenode->customviews->customview)) {
+					return;
+		}
 		foreach ($modulenode->customviews->customview as $customviewnode) {
 			$this->import_CustomView($modulenode, $moduleInstance, $customviewnode);
 		}
@@ -854,8 +877,9 @@ 
 	 */
 	public function import_SharingAccess($modulenode, $moduleInstance)
 	{
-		if (empty($modulenode->sharingaccess))
-			return;
+		if (empty($modulenode->sharingaccess)) {
+					return;
+		}
 
 		if (!empty($modulenode->sharingaccess->default)) {
 			foreach ($modulenode->sharingaccess->default as $defaultnode) {
@@ -885,8 +909,9 @@ 
 	 */
 	public function import_Actions($modulenode, $moduleInstance)
 	{
-		if (empty($modulenode->actions) || empty($modulenode->actions->action))
-			return;
+		if (empty($modulenode->actions) || empty($modulenode->actions->action)) {
+					return;
+		}
 		foreach ($modulenode->actions->action as $actionnode) {
 			$this->import_Action($modulenode, $moduleInstance, $actionnode);
 		}
@@ -899,10 +924,11 @@ 
 	public function import_Action($modulenode, $moduleInstance, $actionnode)
 	{
 		$actionstatus = $actionnode->status;
-		if ($actionstatus == 'enabled')
-			$moduleInstance->enableTools($actionnode->name);
-		else
-			$moduleInstance->disableTools($actionnode->name);
+		if ($actionstatus == 'enabled') {
+					$moduleInstance->enableTools($actionnode->name);
+		} else {
+					$moduleInstance->disableTools($actionnode->name);
+		}
 	}
 
 	/**
@@ -967,8 +993,9 @@ 
 	 */
 	public function import_CustomLinks($modulenode, $moduleInstance)
 	{
-		if (empty($modulenode->customlinks) || empty($modulenode->customlinks->customlink))
-			return;
+		if (empty($modulenode->customlinks) || empty($modulenode->customlinks->customlink)) {
+					return;
+		}
 
 		foreach ($modulenode->customlinks->customlink as $customlinknode) {
 			$handlerInfo = null;
@@ -990,8 +1017,9 @@ 
 	 */
 	public function import_CronTasks($modulenode)
 	{
-		if (empty($modulenode->crons) || empty($modulenode->crons->cron))
-			return;
+		if (empty($modulenode->crons) || empty($modulenode->crons->cron)) {
+					return;
+		}
 		foreach ($modulenode->crons->cron as $cronTask) {
 			if (empty($cronTask->status)) {
 				$cronTask->status = Cron::$STATUS_DISABLED;
@@ -1052,8 +1080,9 @@ 
 	 */
 	public function importInventory()
 	{
-		if (empty($this->_modulexml->inventory) || empty($this->_modulexml->inventory->fields->field))
-			return false;
+		if (empty($this->_modulexml->inventory) || empty($this->_modulexml->inventory->fields->field)) {
+					return false;
+		}
 		$module = (string) $this->moduleInstance->name;
 
 		$inventoryInstance = \Vtiger_Inventory_Model::getInstance($module);

vtlib/Vtiger/ThemeImport.php

Doc Comments +1 added lines

@@ -28,6 +28,7 @@
 	/**
 	 * Initialize Import
 	 * @access private
+	 * @param boolean $overwrite
 	 */
 	public function initImport($zipfile, $overwrite)
 	{

Braces +6 added lines, -4 removed lines

@@ -84,8 +84,9 @@ 
 		foreach ($filelist as $filename => $fileinfo) {
 			if (!$unzip->isdir($filename)) {
 
-				if (strpos($filename, '/') === false)
-					continue;
+				if (strpos($filename, '/') === false) {
+									continue;
+				}
 
 				$targetdir = substr($filename, 0, strripos($filename, '/'));
 				$targetfile = basename($filename);
@@ -146,8 +147,9 @@ 
 				}
 			}
 		}
-		if ($unzip)
-			$unzip->close();
+		if ($unzip) {
+					$unzip->close();
+		}
 
 		self::register($prefix, $label, $name);
 

vtlib/Vtiger/Utils/StringTemplate.php

Doc Comments +1 added lines

@@ -112,6 +112,7 @@
 	/**
 	 * Clean up the input to be used as a regex
 	 * @access private
+	 * @param string $value
 	 */
 	public function __formatAsRegex($value)
 	{

Braces +6 added lines, -4 removed lines

@@ -70,8 +70,9 @@ 
 		unset($this->tplvars);
 
 		$this->tplvars = [];
-		foreach ($restorevars as $key => $val)
-			$this->assign($key, $val);
+		foreach ($restorevars as $key => $val) {
+					$this->assign($key, $val);
+		}
 	}
 
 	/**
@@ -82,8 +83,9 @@ 
 	 */
 	public function merge($instring, $avoidLookup = false)
 	{
-		if (empty($instring))
-			return $instring;
+		if (empty($instring)) {
+					return $instring;
+		}
 
 		if (!$avoidLookup) {
 

vtlib/Vtiger/Webservice.php

Doc Comments +3 added lines

@@ -20,6 +20,7 @@ 
 	 * Helper function to log messages
 	 * @param String Message to log
 	 * @param Boolean true appends linebreak, false to avoid it
+	 * @param string $message
 	 * @access private
 	 */
 	static function log($message, $delim = true)
@@ -30,6 +31,7 @@ 
 	/**
 	 * Initialize webservice for the given module
 	 * @param Module Instance of the module.
+	 * @param Module $moduleInstance
 	 */
 	static function initialize($moduleInstance)
 	{
@@ -45,6 +47,7 @@ 
 	/**
 	 * Initialize webservice for the given module
 	 * @param Module Instance of the module.
+	 * @param Module $moduleInstance
 	 */
 	static function uninitialize($moduleInstance)
 	{

vtlib/Vtiger/Zip.php

Doc Comments +2 added lines

@@ -69,6 +69,7 @@ 
 
 	/**
 	 * Normalize the directory path separators.
+	 * @param string $path
 	 */
 	public function __normalizePath($path)
 	{
@@ -79,6 +80,7 @@ 
 
 	/**
 	 * Copy the directory on the disk into zip file.
+	 * @param string $zipdirname
 	 */
 	public function copyDirectoryFromDisk($dirname, $zipdirname = null, $excludeList = null, $basedirname = null)
 	{

Braces +18 added lines, -12 removed lines

@@ -50,8 +50,9 @@ 
 		if ($search_index === 0) {
 			$startindex = strlen($base_realpath) + 1;
 			// On windows $base_realpath ends with / and On Linux it will not have / at end!
-			if (strrpos($base_realpath, '/') == strlen($base_realpath) - 1)
-				$startindex -= 1;
+			if (strrpos($base_realpath, '/') == strlen($base_realpath) - 1) {
+							$startindex -= 1;
+			}
 			$relpath = substr($src_realpath, $startindex);
 		}
 		return $relpath;
@@ -62,8 +63,9 @@ 
 	 */
 	public function __fixDirSeparator($path)
 	{
-		if ($path != '' && (strripos($path, '/') != strlen($path) - 1))
-			$path .= '/';
+		if ($path != '' && (strripos($path, '/') != strlen($path) - 1)) {
+					$path .= '/';
+		}
 		return $path;
 	}
 
@@ -72,8 +74,9 @@ 
 	 */
 	public function __normalizePath($path)
 	{
-		if ($path && strpos($path, '\\') !== false)
-			$path = preg_replace("/\\\\/", "/", $path);
+		if ($path && strpos($path, '\\') !== false) {
+					$path = preg_replace("/\\\\/", "/", $path);
+		}
 		return $path;
 	}
 
@@ -83,18 +86,21 @@ 
 	public function copyDirectoryFromDisk($dirname, $zipdirname = null, $excludeList = null, $basedirname = null)
 	{
 		$dir = opendir($dirname);
-		if (strripos($dirname, '/') != strlen($dirname) - 1)
-			$dirname .= '/';
+		if (strripos($dirname, '/') != strlen($dirname) - 1) {
+					$dirname .= '/';
+		}
 
-		if ($basedirname === null)
-			$basedirname = realpath($dirname);
+		if ($basedirname === null) {
+					$basedirname = realpath($dirname);
+		}
 
 		while (false !== ($file = readdir($dir))) {
 			if ($file != '.' && $file != '..' &&
 				$file != '.svn' && $file != 'CVS') {
 				// Exclude the file/directory 
-				if (!empty($excludeList) && in_array("$dirname$file", $excludeList))
-					continue;
+				if (!empty($excludeList) && in_array("$dirname$file", $excludeList)) {
+									continue;
+				}
 
 				if (is_dir("$dirname$file")) {
 					$this->copyDirectoryFromDisk("$dirname$file", $zipdirname, $excludeList, $basedirname);

include/recaptcha/recaptchalib.php

Indentation -1 removed lines

@@ -98,7 +98,6 @@
  * @param string $pubkey A public key for reCAPTCHA
  * @param string $error The error given by reCAPTCHA (optional, default is null)
  * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false)
-
  * @return string - The HTML to be embedded in the user's form.
  */
 function recaptcha_get_html($pubkey, $error = null, $use_ssl = false)

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 	$http_request .= $req;
 
 	$response = '';
-	if (false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) )) {
+	if (false == ($fs = @fsockopen($host, $port, $errno, $errstr, 10))) {
 		die('Could not open socket');
 	}
 

Braces +7 added lines, -4 removed lines

@@ -47,8 +47,9 @@ 
 function _recaptcha_qsencode($data)
 {
 	$req = "";
-	foreach ($data as $key => $value)
-		$req .= $key . '=' . urlencode(stripslashes($value)) . '&';
+	foreach ($data as $key => $value) {
+			$req .= $key . '=' . urlencode(stripslashes($value)) . '&';
+	}
 
 	// Cut the last '&'
 	$req = substr($req, 0, strlen($req) - 1);
@@ -83,8 +84,10 @@ 
 
 	fwrite($fs, $http_request);
 
-	while (!feof($fs))
-		$response .= fgets($fs, 1160); // One TCP-IP packet
+	while (!feof($fs)) {
+			$response .= fgets($fs, 1160);
+	}
+	// One TCP-IP packet
 	fclose($fs);
 	$response = explode("\r\n\r\n", $response, 2);
 

Doc Comments +6 added lines

@@ -206,6 +206,9 @@ 
 }
 /* Mailhide related code */
 
+/**
+ * @param string $ky
+ */
 function _recaptcha_aes_encrypt($val, $ky)
 {
 	if (!function_exists("mcrypt_encrypt")) {
@@ -217,6 +220,9 @@ 
 	return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
 }
 
+/**
+ * @param string $x
+ */
 function _recaptcha_mailhide_urlbase64($x)
 {
 	return strtr(base64_encode($x), '+/', '-_');

include/Loader.php

Braces +3 added lines, -2 removed lines

@@ -124,8 +124,9 @@
 			$secondFallBackModuleDir = $secondFallBackModuleClassPath = $actualModule;
 			if ($actualModule != 'Users') {
 				$baseModule = $moduleHierarchyParts[0];
-				if ($baseModule == 'Settings')
-					$baseModule = 'Settings:Vtiger';
+				if ($baseModule == 'Settings') {
+									$baseModule = 'Settings:Vtiger';
+				}
 				$firstFallBackDir = str_replace(':', '.', $baseModule);
 				$firstFallBackClassPath = str_replace(':', '_', $baseModule);
 			}

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;
+		}
 	}
 }