YetiForceCompany / YetiForceCRM

vtlib/Vtiger/LayoutImport.php

Doc Comments +1 added lines

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

vtlib/Vtiger/LinkData.php

Doc Comments +3 added lines

@@ -23,6 +23,9 @@
 	protected $user;
 	protected $module;
 
+	/**
+	 * @param Link $link
+	 */
 	public function __construct($link, $user, $input = null)
 	{
 		$this->link = $link;

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 +78 added lines, -52 removed lines

@@ -98,8 +98,9 @@ 
 	{
 		$xpathres = $this->xpath($path);
 		foreach ($xpathres as $pathkey => $pathvalue) {
-			if ($pathkey == $path)
-				return $pathvalue;
+			if ($pathkey == $path) {
+							return $pathvalue;
+			}
 		}
 		return false;
 	}
@@ -118,13 +119,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;
 	}
@@ -143,8 +146,9 @@ 
 
 		if ($packagetype) {
 			$lcasetype = strtolower($packagetype);
-			if ($lcasetype === 'extension')
-				return true;
+			if ($lcasetype === 'extension') {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -160,8 +164,9 @@ 
 
 		if ($packagetype) {
 			$lcasetype = strtolower($packagetype);
-			if ($lcasetype === 'update')
-				return true;
+			if ($lcasetype === 'update') {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -180,8 +185,9 @@ 
 
 		if ($packagetype) {
 			$lcasetype = strtolower($packagetype);
-			if ($lcasetype === 'layout')
-				return true;
+			if ($lcasetype === 'layout') {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -224,8 +230,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;
 		}
@@ -333,17 +340,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)) {
@@ -371,8 +382,9 @@ 
 	 */
 	public function getModuleNameFromZip($zipfile)
 	{
-		if (!$this->checkZip($zipfile))
-			return null;
+		if (!$this->checkZip($zipfile)) {
+					return null;
+		}
 		return (string) $this->_modulexml->name;
 	}
 
@@ -619,8 +631,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;');
 
@@ -654,8 +667,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);
@@ -674,8 +688,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);
@@ -697,8 +712,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) {
 			$this->import_Field($blocknode, $blockInstance, $moduleInstance, $fieldnode);
@@ -729,17 +745,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);
@@ -787,8 +807,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);
 		}
@@ -831,8 +852,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) {
@@ -862,8 +884,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);
 		}
@@ -945,8 +968,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;
@@ -968,8 +992,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;
@@ -1043,8 +1068,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/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/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/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)

Braces +23 added lines, -17 removed lines

@@ -232,10 +232,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) {
@@ -267,8 +268,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;
@@ -360,8 +362,9 @@ 
 function relateEntities(CRMEntity $focus, $sourceModule, $sourceRecordId, $destinationModule, $destinationRecordIds, $relatedName = false)
 {
 	\App\Log::trace("Entering relateEntities method ($sourceModule, $sourceRecordId, $destinationModule, $destinationRecordIds)");
-	if (!is_array($destinationRecordIds))
-		$destinationRecordIds = [$destinationRecordIds];
+	if (!is_array($destinationRecordIds)) {
+			$destinationRecordIds = [$destinationRecordIds];
+	}
 
 	$data = [
 		'CRMEntity' => $focus,
@@ -404,20 +407,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) {

Doc Comments +5 added lines

@@ -197,6 +197,7 @@ 
 
 /**
  * Function to find the UI type of a field based on the uitype id
+ * @param string $reqtype
  */
 function is_uitype($uitype, $reqtype)
 {
@@ -322,6 +323,8 @@ 
 /**
  * This function returns no value but handles the delete functionality of each entity.
  * Input Parameter are $module - module name, $return_module - return module name, $focus - module object, $record - entity id, $return_id - return entity id.
+ * @param integer $destinationRecordId
+ * @param integer $sourceRecordId
  */
 function DeleteEntity($destinationModule, $sourceModule, CRMEntity $focus, $destinationRecordId, $sourceRecordId, $relatedName = false)
 {
@@ -481,6 +484,8 @@ 
 
 /**
  * Function to get the approximate difference between two date time values as string
+ * @param integer $d1
+ * @param integer $d2
  */
 function dateDiffAsString($d1, $d2)
 {

vtlib/Vtiger/PackageExport.php

Spacing +1 added lines, -1 removed lines

@@ -214,7 +214,7 @@
 		if ($dir = @opendir($languageFolder)) {  // open languages folder
 			while (($langName = readdir($dir)) !== false) {
 				if ($langName != '..' && $langName != '.' && is_dir($languageFolder . "/" . $langName)) {
-					$langDir = @opendir($languageFolder . '/' . $langName);  //open languages/en_us folder
+					$langDir = @opendir($languageFolder . '/' . $langName); //open languages/en_us folder
 					while (($moduleLangFile = readdir($langDir)) !== false) {
 						$langFilePath = $languageFolder . '/' . $langName . '/' . $moduleLangFile;
 						if (is_file($langFilePath) && $moduleLangFile === $module . '.php') { //check if languages/en_us/module.php file exists

Doc Comments +12 added lines, -1 removed lines

@@ -78,6 +78,7 @@ 
 	/**
 	 * Initialize Export
 	 * @access private
+	 * @param boolean $module
 	 */
 	public function __initExport($module)
 	{
@@ -204,7 +205,7 @@ 
 
 	/**
 	 * Function copies language files to zip
-	 * @param <vtlib\Zip> $zip
+	 * @param Zip $zip
 	 * @param string $module
 	 */
 	public function __copyLanguageFiles($zip, $module)
@@ -239,6 +240,7 @@ 
 	/**
 	 * Export vtiger dependencies
 	 * @access private
+	 * @param boolean $moduleInstance
 	 */
 	public function export_Dependencies($moduleInstance)
 	{
@@ -367,6 +369,7 @@ 
 	/**
 	 * Export module blocks with its related fields
 	 * @access private
+	 * @param boolean $moduleInstance
 	 */
 	public function export_Blocks($moduleInstance)
 	{
@@ -531,6 +534,7 @@ 
 	/**
 	 * Export Custom views of the module
 	 * @access private
+	 * @param boolean $moduleInstance
 	 */
 	public function export_CustomViews($moduleInstance)
 	{
@@ -590,6 +594,7 @@ 
 	/**
 	 * Export Sharing Access of the module
 	 * @access private
+	 * @param boolean $moduleInstance
 	 */
 	public function export_SharingAccess($moduleInstance)
 	{
@@ -621,6 +626,9 @@ 
 		$this->closeNode('sharingaccess');
 	}
 
+	/**
+	 * @param boolean $moduleInstance
+	 */
 	public function export_Actions($moduleInstance)
 	{
 
@@ -646,6 +654,7 @@ 
 	/**
 	 * Export related lists associated with module.
 	 * @access private
+	 * @param boolean $moduleInstance
 	 */
 	public function export_RelatedLists($moduleInstance)
 	{
@@ -720,6 +729,7 @@ 
 	/**
 	 * Export custom links of the module.
 	 * @access private
+	 * @param boolean $moduleInstance
 	 */
 	public function export_CustomLinks($moduleInstance)
 	{
@@ -745,6 +755,7 @@ 
 	/**
 	 * Export cron tasks for the module.
 	 * @access private
+	 * @param boolean $moduleInstance
 	 */
 	public function export_CronTasks($moduleInstance)
 	{

Braces +54 added lines, -36 removed lines

@@ -48,11 +48,13 @@ 
 	/** @access private */
 	public function outputNode($value, $node = '')
 	{
-		if ($node != '')
-			$this->openNode($node, '');
+		if ($node != '') {
+					$this->openNode($node, '');
+		}
 		$this->__write($value);
-		if ($node != '')
-			$this->closeNode($node);
+		if ($node != '') {
+					$this->closeNode($node);
+		}
 	}
 
 	/** @access private */
@@ -144,20 +146,24 @@ 
 		$zip->copyDirectoryFromDisk("modules/$module");
 
 		// Copy Settings/module directory
-		if (is_dir("modules/Settings/$module"))
-			$zip->copyDirectoryFromDisk("modules/Settings/$module", 'settings/');
+		if (is_dir("modules/Settings/$module")) {
+					$zip->copyDirectoryFromDisk("modules/Settings/$module", 'settings/');
+		}
 
 		// Copy cron files of the module (if any)
-		if (is_dir("cron/modules/$module"))
-			$zip->copyDirectoryFromDisk("cron/modules/$module", "cron");
+		if (is_dir("cron/modules/$module")) {
+					$zip->copyDirectoryFromDisk("cron/modules/$module", "cron");
+		}
 
 		//Copy module templates files
-		if (is_dir('layouts/' . \Vtiger_Viewer::getDefaultLayoutName() . '/modules/' . $module))
-			$zip->copyDirectoryFromDisk('layouts/' . \Vtiger_Viewer::getDefaultLayoutName() . '/modules/' . $module, 'templates');
+		if (is_dir('layouts/' . \Vtiger_Viewer::getDefaultLayoutName() . '/modules/' . $module)) {
+					$zip->copyDirectoryFromDisk('layouts/' . \Vtiger_Viewer::getDefaultLayoutName() . '/modules/' . $module, 'templates');
+		}
 
 		//Copy Settings module templates files, if any
-		if (is_dir('layouts/' . \Vtiger_Viewer::getDefaultLayoutName() . "/modules/Settings/$module"))
-			$zip->copyDirectoryFromDisk('layouts/' . \Vtiger_Viewer::getDefaultLayoutName() . "/modules/Settings/$module", "settings/templates");
+		if (is_dir('layouts/' . \Vtiger_Viewer::getDefaultLayoutName() . "/modules/Settings/$module")) {
+					$zip->copyDirectoryFromDisk('layouts/' . \Vtiger_Viewer::getDefaultLayoutName() . "/modules/Settings/$module", "settings/templates");
+		}
 
 		//Support to multiple layouts of module
 		$layoutDirectories = glob('layouts' . '/*', GLOB_ONLYDIR);
@@ -261,8 +267,9 @@ 
 		}
 		$this->openNode('dependencies');
 		$this->outputNode($minVersion, 'vtiger_version');
-		if ($maxVersion !== false)
-			$this->outputNode($maxVersion, 'vtiger_max_version');
+		if ($maxVersion !== false) {
+					$this->outputNode($maxVersion, 'vtiger_max_version');
+		}
 		$this->closeNode('dependencies');
 	}
 
@@ -374,8 +381,9 @@ 
 		$sqlresult = $adb->pquery("SELECT * FROM vtiger_blocks WHERE tabid = ?", Array($moduleInstance->id));
 		$resultrows = $adb->num_rows($sqlresult);
 
-		if (empty($resultrows))
-			return;
+		if (empty($resultrows)) {
+					return;
+		}
 
 		$this->openNode('blocks');
 		for ($index = 0; $index < $resultrows; ++$index) {
@@ -421,8 +429,9 @@ 
 		$fieldresult = $adb->pquery("SELECT * FROM vtiger_field WHERE tabid=? && block=?", Array($moduleInstance->id, $blockid));
 		$fieldcount = $adb->num_rows($fieldresult);
 
-		if (empty($fieldcount))
-			return;
+		if (empty($fieldcount)) {
+					return;
+		}
 
 		$entityresult = $adb->pquery("SELECT * FROM vtiger_entityname WHERE tabid=?", Array($moduleInstance->id));
 		$entity_fieldname = $adb->query_result($entityresult, 0, 'fieldname');
@@ -537,8 +546,9 @@ 
 		$db = \PearDatabase::getInstance();
 
 		$customviewres = $db->pquery("SELECT * FROM vtiger_customview WHERE entitytype = ?", [$moduleInstance->name]);
-		if (!$customviewres->rowCount())
-			return;
+		if (!$customviewres->rowCount()) {
+					return;
+		}
 
 		$this->openNode('customviews');
 		while ($row = $db->getRow($customviewres)) {
@@ -598,22 +608,27 @@ 
 		$deforgshare = $adb->pquery("SELECT * FROM vtiger_def_org_share WHERE tabid=?", Array($moduleInstance->id));
 		$deforgshareCount = $adb->num_rows($deforgshare);
 
-		if (empty($deforgshareCount))
-			return;
+		if (empty($deforgshareCount)) {
+					return;
+		}
 
 		$this->openNode('sharingaccess');
 		if ($deforgshareCount) {
 			for ($index = 0; $index < $deforgshareCount; ++$index) {
 				$permission = $adb->query_result($deforgshare, $index, 'permission');
 				$permissiontext = '';
-				if ($permission == '0')
-					$permissiontext = 'public_readonly';
-				if ($permission == '1')
-					$permissiontext = 'public_readwrite';
-				if ($permission == '2')
-					$permissiontext = 'public_readwritedelete';
-				if ($permission == '3')
-					$permissiontext = 'private';
+				if ($permission == '0') {
+									$permissiontext = 'public_readonly';
+				}
+				if ($permission == '1') {
+									$permissiontext = 'public_readwrite';
+				}
+				if ($permission == '2') {
+									$permissiontext = 'public_readwritedelete';
+				}
+				if ($permission == '3') {
+									$permissiontext = 'private';
+				}
 
 				$this->outputNode($permissiontext, 'default');
 			}
@@ -624,8 +639,9 @@ 
 	public function export_Actions($moduleInstance)
 	{
 
-		if (!$moduleInstance->isentitytype)
-			return;
+		if (!$moduleInstance->isentitytype) {
+					return;
+		}
 
 		$adb = \PearDatabase::getInstance();
 		$result = $adb->pquery('SELECT distinct(actionname) FROM vtiger_profile2utility, vtiger_actionmapping
@@ -650,8 +666,9 @@ 
 	public function export_RelatedLists($moduleInstance)
 	{
 
-		if (!$moduleInstance->isentitytype)
-			return;
+		if (!$moduleInstance->isentitytype) {
+					return;
+		}
 
 		$adb = \PearDatabase::getInstance();
 		$result = $adb->pquery("SELECT * FROM vtiger_relatedlists WHERE tabid = ?", Array($moduleInstance->id));
@@ -785,8 +802,9 @@ 
 		$tableName = $inventoryFieldModel->getTableName('fields');
 
 		$result = $db->query(sprintf('SELECT * FROM %s', $tableName));
-		if ($db->getRowCount($result) == 0)
-			return false;
+		if ($db->getRowCount($result) == 0) {
+					return false;
+		}
 
 		$this->openNode('inventory');
 		$this->openNode('fields');