YetiForceCompany / YetiForceCRM

admin/include/Viewer.php

Braces +8 added lines, -6 removed lines

@@ -28,8 +28,9 @@ 
 	protected function log($message, $delimiter = "\n")
 	{
 		static $file = null;
-		if ($file === null)
-			$file = dirname(__FILE__) . '/../../cache/logs/viewer-debug.log';
+		if ($file === null) {
+					$file = dirname(__FILE__) . '/../../cache/logs/viewer-debug.log';
+		}
 		if (self::$debugViewer) {
 			file_put_contents($file, $message . $delimiter, FILE_APPEND);
 		}
@@ -173,10 +174,11 @@ 
 			foreach ($this->tpl_vars as $key => $smarty_variable) {
 				// Determine type of value being pased.
 				$valueType = 'literal';
-				if (is_object($smarty_variable->value))
-					$valueType = get_class($smarty_variable->value);
-				else if (is_array($smarty_variable->value))
-					$valueType = 'array';
+				if (is_object($smarty_variable->value)) {
+									$valueType = get_class($smarty_variable->value);
+				} else if (is_array($smarty_variable->value)) {
+									$valueType = 'array';
+				}
 				$this->log(sprintf("DATA: %s, TYPE: %s", $key, $valueType));
 			}
 		}

libraries/log4php.debug/LoggerHierarchy.php

Braces +12 added lines, -7 removed lines

@@ -19,7 +19,9 @@ 
 /**
  * @ignore 
  */
-if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); 
+if (!defined('LOG4PHP_DIR')) {
+	define('LOG4PHP_DIR', dirname(__FILE__));
+}
 
 /**
  */
@@ -102,8 +104,9 @@ 
     {
         static $instance;
         
-        if (!isset($instance))
-            $instance = new LoggerHierarchy(new LoggerRoot());
+        if (!isset($instance)) {
+                    $instance = new LoggerHierarchy(new LoggerRoot());
+        }
         return $instance;
     }
     
@@ -266,8 +269,9 @@ 
      */ 
     public function &getRootLogger()
     {
-        if (!isset($this->root) || $this->root === null)
-            $this->root = new LoggerRoot();
+        if (!isset($this->root) || $this->root === null) {
+                    $this->root = new LoggerRoot();
+        }
         return $this->root;
     }
      
@@ -355,8 +359,9 @@ 
      */
     public function setThreshold($l)
     {
-        if ($l !== null)
-            $this->threshold = $l;
+        if ($l !== null) {
+                    $this->threshold = $l;
+        }
     }
     
     /**

libraries/log4php.debug/LoggerRoot.php

Braces +6 added lines, -3 removed lines

@@ -19,7 +19,9 @@ 
 /**
  * @ignore 
  */
-if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__));
+if (!defined('LOG4PHP_DIR')) {
+	define('LOG4PHP_DIR', dirname(__FILE__));
+}
  
 /**
  */
@@ -55,8 +57,9 @@ 
     public function LoggerRoot($level = null)
     {
         $this->Logger($this->name);
-        if ($level === null)
-            $level = LoggerLevel::getLevelAll();
+        if ($level === null) {
+                    $level = LoggerLevel::getLevelAll();
+        }
         $this->setLevel($level);
     } 
     

libraries/SabreDAV/DAVACL/PrincipalBackend/PDO.php

Braces +31 added lines, -10 removed lines

@@ -106,7 +106,9 @@ 
 
             // Checking if the principal is in the prefix
             list($rowPrefix) = URLUtil::splitPath($row['uri']);
-            if ($rowPrefix !== $prefixPath) continue;
+            if ($rowPrefix !== $prefixPath) {
+            	continue;
+            }
 
             $principal = [
                 'uri' => $row['uri'],
@@ -146,7 +148,9 @@ 
         $stmt->execute([$path]);
 
         $row = $stmt->fetch(\PDO::FETCH_ASSOC);
-        if (!$row) return;
+        if (!$row) {
+        	return;
+        }
 
         $principal = [
             'id'  => $row['id'],
@@ -240,7 +244,10 @@ 
      * @return array
      */
     public function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
-        if (count($searchProperties) == 0) return [];    //No criteria
+        if (count($searchProperties) == 0) {
+        	return [];
+        }
+        //No criteria
 
         $query = sprintf('SELECT uri FROM %s WHERE ', $this->tableName);
         $values = [];
@@ -256,7 +263,9 @@ 
                     // Unsupported property
                     return [];
             }
-            if (count($values) > 0) $query .= (strcmp($test, "anyof") == 0 ? " || " : " && ");
+            if (count($values) > 0) {
+            	$query .= (strcmp($test, "anyof") == 0 ? " || " : " && ");
+            }
             $query .= 'lower(' . $column . ') LIKE lower(?)';
             $values[] = '%' . $value . '%';
 
@@ -269,7 +278,9 @@ 
 
             // Checking if the principal is in the prefix
             list($rowPrefix) = URLUtil::splitPath($row['uri']);
-            if ($rowPrefix !== $prefixPath) continue;
+            if ($rowPrefix !== $prefixPath) {
+            	continue;
+            }
 
             $principals[] = $row['uri'];
 
@@ -300,7 +311,9 @@ 
         $value = null;
         $scheme = null;
         list($scheme, $value) = explode(":", $uri, 2);
-        if ($value === null) return null;
+        if ($value === null) {
+        	return null;
+        }
 
         $uri = null;
         switch ($scheme){
@@ -312,7 +325,9 @@ 
                 while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
                     // Checking if the principal is in the prefix
                     list($rowPrefix) = URLUtil::splitPath($row['uri']);
-                    if ($rowPrefix !== $principalPrefix) continue;
+                    if ($rowPrefix !== $principalPrefix) {
+                    	continue;
+                    }
                     
                     $uri = $row['uri'];
                     break; //Stop on first match
@@ -334,7 +349,9 @@ 
     public function getGroupMemberSet($principal) {
 
         $principal = $this->getPrincipalByPath($principal);
-        if (!$principal) throw new DAV\Exception('Principal not found');
+        if (!$principal) {
+        	throw new DAV\Exception('Principal not found');
+        }
 
 		$query = 'SELECT principals.uri as uri FROM %s AS groupmembers LEFT JOIN %s AS principals ON groupmembers.member_id = principals.id WHERE groupmembers.principal_id = ?';
         $query = sprintf($query, $this->groupMembersTableName, $this->tableName);
@@ -358,7 +375,9 @@ 
     public function getGroupMembership($principal) {
 
         $principal = $this->getPrincipalByPath($principal);
-        if (!$principal) throw new DAV\Exception('Principal not found');
+        if (!$principal) {
+        	throw new DAV\Exception('Principal not found');
+        }
 
         $stmt = $this->pdo->prepare(sprintf('SELECT principals.uri as uri FROM %s AS groupmembers LEFT JOIN %s AS principals ON groupmembers.principal_id = principals.id WHERE groupmembers.member_id = ?', $this->groupMembersTableName, $this->tableName));
         $stmt->execute([$principal['id']]);
@@ -396,7 +415,9 @@ 
                 $memberIds[] = $row['id'];
             }
         }
-        if (!$principalId) throw new DAV\Exception('Principal not found');
+        if (!$principalId) {
+        	throw new DAV\Exception('Principal not found');
+        }
 
         // Wiping out old members
         $stmt = $this->pdo->prepare(sprintf('DELETE FROM %s WHERE principal_id = ?;', $this->groupMembersTableName));

include/runtime/Viewer.php

Braces +8 added lines, -6 removed lines

@@ -29,8 +29,9 @@ 
 	protected function log($message, $delimiter = '\n')
 	{
 		static $file = null;
-		if ($file === null)
-			$file = dirname(__FILE__) . '/../../cache/logs/viewer-debug.log';
+		if ($file === null) {
+					$file = dirname(__FILE__) . '/../../cache/logs/viewer-debug.log';
+		}
 		if (self::$debugViewer) {
 			file_put_contents($file, $message . $delimiter, FILE_APPEND);
 		}
@@ -177,10 +178,11 @@ 
 			foreach ($this->tpl_vars as $key => $smarty_variable) {
 				// Determine type of value being pased.
 				$valueType = 'literal';
-				if (is_object($smarty_variable->value))
-					$valueType = get_class($smarty_variable->value);
-				else if (is_array($smarty_variable->value))
-					$valueType = 'array';
+				if (is_object($smarty_variable->value)) {
+									$valueType = get_class($smarty_variable->value);
+				} else if (is_array($smarty_variable->value)) {
+									$valueType = 'array';
+				}
 				$this->log(sprintf("DATA: %s, TYPE: %s", $key, $valueType));
 			}
 		}

include/CRMEntity.php

Braces +157 added lines, -114 removed lines

@@ -169,8 +169,9 @@ 
 
 		//to get the owner id
 		$ownerid = $this->column_fields['assigned_user_id'];
-		if (!isset($ownerid) || $ownerid == '')
-			$ownerid = $current_user->id;
+		if (!isset($ownerid) || $ownerid == '') {
+					$ownerid = $current_user->id;
+		}
 
 		if (isset($file_details['original_name']) && $file_details['original_name'] != null) {
 			$file_name = $file_details['original_name'];
@@ -337,16 +338,18 @@ 
 			} else {
 				$this->id = $this->newRecord;
 			}
-			if (empty($currentUser->id))
-				$currentUser->id = 0;
+			if (empty($currentUser->id)) {
+							$currentUser->id = 0;
+			}
 
 			// Customization
 			$created_date_var = $adb->formatDate($date_var, true);
 			$modified_date_var = $adb->formatDate($date_var, true);
 			// Preserve the timestamp
 			if (self::isBulkSaveMode()) {
-				if (!empty($this->column_fields['createdtime']))
-					$created_date_var = $adb->formatDate($this->column_fields['createdtime'], true);
+				if (!empty($this->column_fields['createdtime'])) {
+									$created_date_var = $adb->formatDate($this->column_fields['createdtime'], true);
+				}
 				//NOTE : modifiedtime ignored to support vtws_sync API track changes.
 			}
 			// END
@@ -376,10 +379,11 @@ 
 	private function resolve_query_result_value($result, $index, $columnname)
 	{
 		$adb = PearDatabase::getInstance();
-		if (is_array($result))
-			return $result[$index][$columnname];
-		else
-			return $adb->query_result($result, $index, $columnname);
+		if (is_array($result)) {
+					return $result[$index][$columnname];
+		} else {
+					return $adb->query_result($result, $index, $columnname);
+		}
 	}
 
 	/** Function to insert values in the specifed table for the specified module
@@ -595,10 +599,10 @@ 
 				} else {
 					$fldvalue = $this->column_fields[$fieldname];
 				}
-				if ($uitype != 33 && $uitype != 8)
-					$fldvalue = \vtlib\Functions::fromHTML($fldvalue, ($insertion_mode == 'edit') ? true : false);
-			}
-			else {
+				if ($uitype != 33 && $uitype != 8) {
+									$fldvalue = \vtlib\Functions::fromHTML($fldvalue, ($insertion_mode == 'edit') ? true : false);
+				}
+			} else {
 				$fldvalue = '';
 			}
 
@@ -656,8 +660,9 @@ 
 		$query1 = "select * from vtiger_seattachmentsrel where crmid=?";
 		$result = $adb->pquery($query1, array($notesid));
 		$noofrows = $adb->num_rows($result);
-		if ($noofrows != 0)
-			$attachmentid = $adb->query_result($result, 0, 'attachmentsid');
+		if ($noofrows != 0) {
+					$attachmentid = $adb->query_result($result, 0, 'attachmentsid');
+		}
 		if ($attachmentid != '') {
 			$query2 = "select * from vtiger_attachments where attachmentsid=?";
 			$filename = $adb->query_result($adb->pquery($query2, array($attachmentid)), 0, 'name');
@@ -708,10 +713,11 @@ 
 		// Lookup module field cache
 		if ($module == 'Calendar' || $module == 'Events') {
 			getColumnFields('Calendar');
-			if (VTCacheUtils::lookupFieldInfo_Module('Events'))
-				$cachedEventsFields = VTCacheUtils::lookupFieldInfo_Module('Events');
-			else
-				$cachedEventsFields = [];
+			if (VTCacheUtils::lookupFieldInfo_Module('Events')) {
+							$cachedEventsFields = VTCacheUtils::lookupFieldInfo_Module('Events');
+			} else {
+							$cachedEventsFields = [];
+			}
 			$cachedCalendarFields = VTCacheUtils::lookupFieldInfo_Module('Calendar');
 			$cachedModuleFields = array_merge($cachedEventsFields, $cachedCalendarFields);
 			$module = 'Calendar';
@@ -856,10 +862,11 @@ 
 			while ($row = $this->db->fetchByAssoc($result)) {
 				$rowid = $row[$this->table_index];
 
-				if (isset($rowid))
-					$this->retrieve_entity_info($rowid, $this->module_name);
-				else
-					$this->db->println("rowid not set unable to retrieve");
+				if (isset($rowid)) {
+									$this->retrieve_entity_info($rowid, $this->module_name);
+				} else {
+									$this->db->println("rowid not set unable to retrieve");
+				}
 
 
 
@@ -872,10 +879,11 @@ 
 			}
 		}
 
-		if (isset($list))
-			return $list;
-		else
-			return null;
+		if (isset($list)) {
+					return $list;
+		} else {
+					return null;
+		}
 	}
 
 	/** This function should be overridden in each module.  It marks an item as deleted.
@@ -1045,19 +1053,22 @@ 
 		require_once('include/utils/UserInfoUtil.php');
 		foreach ($this->column_fields as $fieldname => $fieldvalue) {
 			$reset_value = false;
-			if (getFieldVisibilityPermission($moduleName, $current_user->id, $fieldname) != '0')
-				$reset_value = true;
+			if (getFieldVisibilityPermission($moduleName, $current_user->id, $fieldname) != '0') {
+							$reset_value = true;
+			}
 
-			if ($fieldname == "record_id" || $fieldname == "record_module")
-				$reset_value = false;
+			if ($fieldname == "record_id" || $fieldname == "record_module") {
+							$reset_value = false;
+			}
 
 			/*
 			  if (isset($this->additional_column_fields) && in_array($fieldname, $this->additional_column_fields) === true)
 			  $reset_value = false;
 			 */
 
-			if ($reset_value === true)
-				$this->column_fields[$fieldname] = "";
+			if ($reset_value === true) {
+							$this->column_fields[$fieldname] = "";
+			}
 		}
 	}
 
@@ -1103,8 +1114,9 @@ 
 		}
 
 		foreach ($colf as $key => $value) {
-			if (getFieldVisibilityPermission($module, $current_user->id, $key, 'readwrite') == '0')
-				$this->importable_fields[$key] = $value;
+			if (getFieldVisibilityPermission($module, $current_user->id, $key, 'readwrite') == '0') {
+							$this->importable_fields[$key] = $value;
+			}
 		}
 	}
 
@@ -1354,13 +1366,15 @@ 
 		$num_rows = $adb->num_rows($result);
 		for ($i = 0; $i < $num_rows; $i++) {
 			$columnname = $adb->query_result($result, $i, 'columnname');
-			if (in_array($columnname, $this->sortby_fields))
-				continue;
-			else
-				$this->sortby_fields[] = $columnname;
+			if (in_array($columnname, $this->sortby_fields)) {
+							continue;
+			} else {
+							$this->sortby_fields[] = $columnname;
+			}
+		}
+		if ($tabid == 21 || $tabid == 22) {
+					$this->sortby_fields[] = 'crmid';
 		}
-		if ($tabid == 21 || $tabid == 22)
-			$this->sortby_fields[] = 'crmid';
 		$log->debug("Exiting initSortByField");
 	}
 	/* Function to check if the mod number already exits */
@@ -1370,10 +1384,11 @@ 
 		$adb = PearDatabase::getInstance();
 		$result = $adb->pquery(sprintf("SELECT %s FROM *s WHERE %s = ?", $adb->sql_escape_string($column), $adb->sql_escape_string($table), $adb->sql_escape_string($column)), [$no]);
 		$num_rows = $adb->num_rows($result);
-		if ($num_rows > 0)
-			return true;
-		else
-			return false;
+		if ($num_rows > 0) {
+					return true;
+		} else {
+					return false;
+		}
 	}
 
 	// END
@@ -1386,8 +1401,9 @@ 
 
 		vtlib_setup_modulevars($module, $this);
 		$tabid = \includes\Modules::getModuleId($module);
-		if (!\includes\fields\RecordNumber::isModuleSequenceConfigured($tabid))
-			return;
+		if (!\includes\fields\RecordNumber::isModuleSequenceConfigured($tabid)) {
+					return;
+		}
 		$fieldinfo = $adb->pquery("SELECT * FROM vtiger_field WHERE tabid = ? && uitype = 4", Array($tabid));
 
 		$returninfo = [];
@@ -1441,8 +1457,9 @@ 
 		$singular_modname = vtlib_toSingular($related_module);
 		$button = '';
 		if ($actions) {
-			if (is_string($actions))
-				$actions = explode(',', strtoupper($actions));
+			if (is_string($actions)) {
+							$actions = explode(',', strtoupper($actions));
+			}
 			if (in_array('SELECT', $actions) && isPermitted($related_module, 4, '') == 'yes') {
 				$button .= "<input title='" . \includes\Language::translate('LBL_SELECT') . " " . \includes\Language::translate($related_module) . "' class='crmbutton small edit' type='button' onclick=\"return window.open('index.php?module=$related_module&return_module=$currentModule&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid=$id','test','width=640,height=602,resizable=0,scrollbars=0');\" value='" . \includes\Language::translate('LBL_SELECT') . " " . \includes\Language::translate($related_module) . "'>&nbsp;";
 			}
@@ -1455,10 +1472,11 @@ 
 		}
 
 		// To make the edit or del link actions to return back to same view.
-		if ($singlepane_view == 'true')
-			$returnset = "&return_module=$this_module&return_action=DetailView&return_id=$id";
-		else
-			$returnset = "&return_module=$this_module&return_action=CallRelatedList&return_id=$id";
+		if ($singlepane_view == 'true') {
+					$returnset = "&return_module=$this_module&return_action=DetailView&return_id=$id";
+		} else {
+					$returnset = "&return_module=$this_module&return_action=CallRelatedList&return_id=$id";
+		}
 
 		$userNameSql = \vtlib\Deprecated::getSqlForNameInDisplayFormat(array('first_name' => 'vtiger_users.first_name',
 				'last_name' => 'vtiger_users.last_name'), 'Users');
@@ -1480,8 +1498,9 @@ 
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value === null)
-			$return_value = [];
+		if ($return_value === null) {
+					$return_value = [];
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 		return $return_value;
 	}
@@ -1513,8 +1532,9 @@ 
 				return true;
 			} else if ($lastviewed && $modifiedon) {
 				/** Lastviewed and Modified time is available. */
-				if ($this->__timediff($modifiedon, $lastviewed) > 0)
-					return true;
+				if ($this->__timediff($modifiedon, $lastviewed) > 0) {
+									return true;
+				}
 			}
 		}
 		return false;
@@ -1534,8 +1554,9 @@ 
 
 		$t2 = mktime($t2_h, $t2_i, $t2_s, $t2_m, $t2_d, $t2_y);
 
-		if ($t1 == $t2)
-			return 0;
+		if ($t1 == $t2) {
+					return 0;
+		}
 		return $t2 - $t1;
 	}
 
@@ -1555,8 +1576,9 @@ 
 	 */
 	public function save_related_module($module, $crmid, $withModule, $withCrmid, $relatedName = false)
 	{
-		if (!is_array($withCrmid))
-			$withCrmid = [$withCrmid];
+		if (!is_array($withCrmid)) {
+					$withCrmid = [$withCrmid];
+		}
 		switch ($relatedName) {
 			case 'get_many_to_many':
 				$this->saveRelatedM2M($module, $crmid, $withModule, $withCrmid);
@@ -1577,8 +1599,9 @@ 
 		foreach ($withCrmid as $relcrmid) {
 			$check = $db->pquery(sprintf('SELECT 1 FROM `%s` WHERE %s = ? && %s = ?', $referenceInfo['table'], $referenceInfo['base'], $referenceInfo['rel']), [$relcrmid, $crmid]);
 			// Relation already exists? No need to add again
-			if ($check && $db->getRowCount($check))
-				continue;
+			if ($check && $db->getRowCount($check)) {
+							continue;
+			}
 			$db->insert($referenceInfo['table'], [
 				$referenceInfo['base'] => $relcrmid,
 				$referenceInfo['rel'] => $crmid
@@ -1594,8 +1617,9 @@ 
 			if ($withModule == 'Documents') {
 				$checkpresence = $db->pquery('SELECT crmid FROM vtiger_senotesrel WHERE crmid = ? && notesid = ?', [$crmid, $relcrmid]);
 				// Relation already exists? No need to add again
-				if ($checkpresence && $db->getRowCount($checkpresence))
-					continue;
+				if ($checkpresence && $db->getRowCount($checkpresence)) {
+									continue;
+				}
 
 				$db->insert('vtiger_senotesrel', [
 					'crmid' => $crmid,
@@ -1605,8 +1629,9 @@ 
 				$checkpresence = $db->pquery('SELECT crmid FROM vtiger_crmentityrel WHERE crmid = ? && module = ? && relcrmid = ? && relmodule = ?', [$crmid, $module, $relcrmid, $withModule]
 				);
 				// Relation already exists? No need to add again
-				if ($checkpresence && $db->getRowCount($checkpresence))
-					continue;
+				if ($checkpresence && $db->getRowCount($checkpresence)) {
+									continue;
+				}
 
 				$db->insert('vtiger_crmentityrel', [
 					'crmid' => $crmid,
@@ -1630,8 +1655,9 @@ 
 	public function delete_related_module($module, $crmid, $withModule, $withCrmid)
 	{
 		$db = PearDatabase::getInstance();
-		if (!is_array($withCrmid))
-			$withCrmid = Array($withCrmid);
+		if (!is_array($withCrmid)) {
+					$withCrmid = Array($withCrmid);
+		}
 		foreach ($withCrmid as $relcrmid) {
 
 			if ($withModule == 'Documents') {
@@ -1665,8 +1691,9 @@ 
 
 		$button = '';
 		if ($actions) {
-			if (is_string($actions))
-				$actions = explode(',', strtoupper($actions));
+			if (is_string($actions)) {
+							$actions = explode(',', strtoupper($actions));
+			}
 			if (in_array('SELECT', $actions) && isPermitted($related_module, 4, '') == 'yes') {
 				$button .= "<input title='" . \includes\Language::translate('LBL_SELECT') . " " . \includes\Language::translate($related_module) . "' class='crmbutton small edit' " .
 					" type='button' onclick=\"return window.open('index.php?module=$related_module&return_module=$current_module&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid=$id','test','width=640,height=602,resizable=0,scrollbars=0');\"" .
@@ -1681,10 +1708,11 @@ 
 		}
 
 		// To make the edit or del link actions to return back to same view.
-		if ($singlepane_view == 'true')
-			$returnset = "&return_module=$current_module&return_action=DetailView&return_id=$id";
-		else
-			$returnset = "&return_module=$current_module&return_action=CallRelatedList&return_id=$id";
+		if ($singlepane_view == 'true') {
+					$returnset = "&return_module=$current_module&return_action=DetailView&return_id=$id";
+		} else {
+					$returnset = "&return_module=$current_module&return_action=CallRelatedList&return_id=$id";
+		}
 
 		$query = "SELECT vtiger_crmentity.*, $other->table_name.*";
 
@@ -1698,10 +1726,12 @@ 
 				$query .= ", $tname.*";
 
 				// Setup the default JOIN conditions if not specified
-				if (empty($relmap[1]))
-					$relmap[1] = $other->table_name;
-				if (empty($relmap[2]))
-					$relmap[2] = $relmap[0];
+				if (empty($relmap[1])) {
+									$relmap[1] = $other->table_name;
+				}
+				if (empty($relmap[2])) {
+									$relmap[2] = $relmap[0];
+				}
 				$more_relation .= " LEFT JOIN $tname ON $tname.$relmap[0] = $relmap[1].$relmap[2]";
 			}
 		}
@@ -1715,8 +1745,9 @@ 
 		$query .= " WHERE vtiger_crmentity.deleted = 0 && (vtiger_crmentityrel.crmid = $id || vtiger_crmentityrel.relcrmid = $id)";
 		$return_value = GetRelatedList($current_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value === null)
-			$return_value = [];
+		if ($return_value === null) {
+					$return_value = [];
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		return $return_value;
@@ -1749,10 +1780,11 @@ 
 		$row = [];
 
 		// To make the edit or del link actions to return back to same view.
-		if ($singlepane_view == 'true')
-			$returnset = "&return_module=$currentModule&return_action=DetailView&return_id=$id";
-		else
-			$returnset = "&return_module=$currentModule&return_action=CallRelatedList&return_id=$id";
+		if ($singlepane_view == 'true') {
+					$returnset = "&return_module=$currentModule&return_action=DetailView&return_id=$id";
+		} else {
+					$returnset = "&return_module=$currentModule&return_action=CallRelatedList&return_id=$id";
+		}
 
 		$return_value = null;
 
@@ -1783,8 +1815,9 @@ 
 			$button .= '<input type="hidden" name="' . $dependentColumn . '" id="' . $dependentColumn . '" value="' . $id . '">';
 			$button .= '<input type="hidden" name="' . $dependentColumn . '_type" id="' . $dependentColumn . '_type" value="' . $currentModule . '">';
 			if ($actions) {
-				if (is_string($actions))
-					$actions = explode(',', strtoupper($actions));
+				if (is_string($actions)) {
+									$actions = explode(',', strtoupper($actions));
+				}
 				if (in_array('ADD', $actions) && isPermitted($relatedModule, 1, '') == 'yes' && getFieldVisibilityPermission($relatedModule, $current_user->id, $dependentField, 'readwrite') == '0') {
 					$button .= "<input title='" . \includes\Language::translate('LBL_ADD_NEW') . " " . \includes\Language::translate($singular_modname, $relatedModule) . "' class='crmbutton small create'" .
 						" onclick='this.form.action.value=\"EditView\";this.form.module.value=\"$relatedModule\"' type='submit' name='button'" .
@@ -1794,8 +1827,9 @@ 
 			$query = $this->createDependentQuery($other, $row, $id);
 			$return_value = GetRelatedList($currentModule, $relatedModule, $other, $query, $button, $returnset);
 		}
-		if ($return_value === null)
-			$return_value = [];
+		if ($return_value === null) {
+					$return_value = [];
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		return $return_value;
@@ -1823,10 +1857,12 @@ 
 					continue;
 				}
 				// Setup the default JOIN conditions if not specified
-				if (empty($relmap[1]))
-					$relmap[1] = $other->table_name;
-				if (empty($relmap[2]))
-					$relmap[2] = $relmap[0];
+				if (empty($relmap[1])) {
+									$relmap[1] = $other->table_name;
+				}
+				if (empty($relmap[2])) {
+									$relmap[2] = $relmap[0];
+				}
 				$join .= " LEFT JOIN $tname ON $tname.$relmap[0] = $relmap[1].$relmap[2]";
 			}
 		}
@@ -2355,8 +2391,9 @@ 
 	{
 		$adb = PearDatabase::getInstance();
 
-		if (!is_array($uitypes))
-			$uitypes = array($uitypes);
+		if (!is_array($uitypes)) {
+					$uitypes = array($uitypes);
+		}
 		$module = get_class($this);
 
 		$cachedModuleFields = VTCacheUtils::lookupFieldInfo_Module($module);
@@ -2400,10 +2437,11 @@ 
 			$columnCount = count($lookupcolumns);
 			foreach ($lookupcolumns as $columnname) {
 				if (!empty($columnname)) {
-					if ($i == 0 || $i == ($columnCount))
-						$query .= sprintf("%s = '%s'", $columnname, $value);
-					else
-						$query .= sprintf(" || %s = '%s'", $columnname, $value);
+					if ($i == 0 || $i == ($columnCount)) {
+											$query .= sprintf("%s = '%s'", $columnname, $value);
+					} else {
+											$query .= sprintf(" || %s = '%s'", $columnname, $value);
+					}
 					$i++;
 				}
 			}
@@ -2460,8 +2498,9 @@ 
 
 	public function getUserAccessConditionsQuerySR($module, $currentUser = false, $relatedRecord = false)
 	{
-		if ($currentUser === false)
-			$currentUser = vglobal('current_user');
+		if ($currentUser === false) {
+					$currentUser = vglobal('current_user');
+		}
 
 		$userid = $currentUser->id;
 		$userPrivileges = \Vtiger_Util_Helper::getUserPrivilegesFile($userid);
@@ -2687,10 +2726,11 @@ 
 		$log = LoggerManager::getInstance();
 		$currentModule = vglobal('currentModule');
 		$log->debug("Entering getSortOrder() method ...");
-		if (AppRequest::has('sorder'))
-			$sorder = $this->db->sql_escape_string(AppRequest::getForSql('sorder'));
-		else
-			$sorder = (($_SESSION[$currentModule . '_Sort_Order'] != '') ? ($_SESSION[$currentModule . '_Sort_Order']) : ($this->default_sort_order));
+		if (AppRequest::has('sorder')) {
+					$sorder = $this->db->sql_escape_string(AppRequest::getForSql('sorder'));
+		} else {
+					$sorder = (($_SESSION[$currentModule . '_Sort_Order'] != '') ? ($_SESSION[$currentModule . '_Sort_Order']) : ($this->default_sort_order));
+		}
 		$log->debug("Exiting getSortOrder() method ...");
 		return $sorder;
 	}
@@ -2710,10 +2750,11 @@ 
 			$use_default_order_by = $this->default_order_by;
 		}
 
-		if (AppRequest::has('order_by'))
-			$order_by = $this->db->sql_escape_string(AppRequest::getForSql('order_by'));
-		else
-			$order_by = (($_SESSION[$currentModule . '_Order_By'] != '') ? ($_SESSION[$currentModule . '_Order_By']) : ($use_default_order_by));
+		if (AppRequest::has('order_by')) {
+					$order_by = $this->db->sql_escape_string(AppRequest::getForSql('order_by'));
+		} else {
+					$order_by = (($_SESSION[$currentModule . '_Order_By'] != '') ? ($_SESSION[$currentModule . '_Order_By']) : ($use_default_order_by));
+		}
 		$log->debug("Exiting getOrderBy method ...");
 		return $order_by;
 	}
@@ -2753,8 +2794,9 @@ 
 		$selectClause = sprintf('SELECT %s.%s AS recordid,%s%s', $this->table_name, $this->table_index, $tableColumnsString, $additionalColumns);
 
 		// Select Custom Field Table Columns if present
-		if (isset($this->customFieldTable))
-			$query .= ", " . $this->customFieldTable[0] . ".* ";
+		if (isset($this->customFieldTable)) {
+					$query .= ", " . $this->customFieldTable[0] . ".* ";
+		}
 
 		$fromClause = " FROM $this->table_name";
 
@@ -2798,8 +2840,9 @@ 
 		foreach ($tableColumns as $tableColumn) {
 			$tableInfo = explode('.', $tableColumn);
 			$duplicateCheckClause .= " ifnull($tableColumn,'null') = ifnull(temp.$tableInfo[1],'null')";
-			if (count($tableColumns) != $i++)
-				$duplicateCheckClause .= ' && ';
+			if (count($tableColumns) != $i++) {
+							$duplicateCheckClause .= ' && ';
+			}
 		}
 
 		$query = $selectClause . $fromClause .

include/http/Response.php

Braces +31 added lines, -22 removed lines

@@ -69,8 +69,9 @@ 
 	 */
 	public function setError($code, $message = null)
 	{
-		if ($message === null)
-			$message = $code;
+		if ($message === null) {
+					$message = $code;
+		}
 		$error = array('code' => $code, 'message' => $message);
 		$this->error = $error;
 	}
@@ -172,24 +173,29 @@ 
 
 		/* Set right charset (UTF-8) to avoid IE complaining about c00ce56e error */
 		if ($this->emitType == self::$EMIT_JSON) {
-			if (!$contentTypeSent)
-				header('Content-type: text/json; charset=UTF-8');
+			if (!$contentTypeSent) {
+							header('Content-type: text/json; charset=UTF-8');
+			}
 			$this->emitJSON();
 		} else if ($this->emitType == self::$EMIT_JSONTEXT) {
-			if (!$contentTypeSent)
-				header('Content-type: text/json; charset=UTF-8');
+			if (!$contentTypeSent) {
+							header('Content-type: text/json; charset=UTF-8');
+			}
 			$this->emitText();
 		} else if ($this->emitType == self::$EMIT_HTML) {
-			if (!$contentTypeSent)
-				header('Content-type: text/html; charset=UTF-8');
+			if (!$contentTypeSent) {
+							header('Content-type: text/html; charset=UTF-8');
+			}
 			$this->emitRaw();
 		} else if ($this->emitType == self::$EMIT_RAW) {
-			if (!$contentTypeSent)
-				header('Content-type: text/plain; charset=UTF-8');
+			if (!$contentTypeSent) {
+							header('Content-type: text/plain; charset=UTF-8');
+			}
 			$this->emitRaw();
 		} else if ($this->emitType == self::$EMIT_JSONP) {
-			if (!$contentTypeSent)
-				header('Content-type: application/javascript; charset=UTF-8');
+			if (!$contentTypeSent) {
+							header('Content-type: application/javascript; charset=UTF-8');
+			}
 			echo $this->emitJSONPFn . "(";
 			$this->emitJSON();
 			echo ")";
@@ -210,15 +216,17 @@ 
 	protected function emitText()
 	{
 		if ($this->result === NULL) {
-			if (is_string($this->error))
-				echo $this->error;
-			else
-				echo \includes\utils\Json::encode($this->prepareResponse());
+			if (is_string($this->error)) {
+							echo $this->error;
+			} else {
+							echo \includes\utils\Json::encode($this->prepareResponse());
+			}
 		} else {
-			if (is_string($this->result))
-				echo $this->result;
-			else
-				echo \includes\utils\Json::encode($this->prepareResponse());
+			if (is_string($this->result)) {
+							echo $this->result;
+			} else {
+							echo \includes\utils\Json::encode($this->prepareResponse());
+			}
 		}
 	}
 
@@ -227,8 +235,9 @@ 
 	 */
 	protected function emitRaw()
 	{
-		if ($this->result === NULL)
-			echo (is_string($this->error)) ? $this->error : var_export($this->error, true);
+		if ($this->result === NULL) {
+					echo (is_string($this->error)) ? $this->error : var_export($this->error, true);
+		}
 		echo $this->result;
 	}
 }

include/database/PearDatabase.php

Braces +33 added lines, -22 removed lines

@@ -441,8 +441,9 @@ 
 			$this->checkError('Missing table name');
 			return false;
 		}
-		if ($where != '')
-			$where = sprintf('WHERE %s', $where);
+		if ($where != '') {
+					$where = sprintf('WHERE %s', $where);
+		}
 		if (count($params) === 0) {
 			$this->query(sprintf('DELETE FROM %s %s', $table, $where));
 		} else {
@@ -530,10 +531,12 @@ 
 	 */
 	public function flatten_array($input, $output = null)
 	{
-		if ($input === null)
-			return null;
-		if ($output === null)
-			$output = [];
+		if ($input === null) {
+					return null;
+		}
+		if ($output === null) {
+					$output = [];
+		}
 		foreach ($input as $value) {
 			if (is_array($value)) {
 				$output = $this->flatten_array($value, $output);
@@ -606,15 +609,17 @@ 
 	{
 		if (isset($result) && $rowNum < 0) {
 			$row = $this->getRow($result);
-			if ($encode && is_array($row))
-				return array_map('to_html', $row);
+			if ($encode && is_array($row)) {
+							return array_map('to_html', $row);
+			}
 			return $row;
 		}
 		if ($this->getRowCount($result) > $rowNum) {
 			$row = $this->raw_query_result_rowdata($result, $rowNum);
 		}
-		if ($encode && is_array($row))
-			return array_map('to_html', $row);
+		if ($encode && is_array($row)) {
+					return array_map('to_html', $row);
+		}
 		return $row;
 	}
 
@@ -759,8 +764,9 @@ 
 			$this->log('sqlExprDatalist: empty arrays not allowed', 'error');
 			$this->checkError('sqlExprDatalist: empty arrays not allowed');
 		}
-		foreach ($array as $key => $val)
-			$l .= ($l ? ',' : '') . $this->quote($val);
+		foreach ($array as $key => $val) {
+					$l .= ($l ? ',' : '') . $this->quote($val);
+		}
 		return ' ( ' . $l . ' ) ';
 	}
 
@@ -775,8 +781,9 @@ 
 	{
 		$result = $this->query($sql, $dieOnError, $msg);
 
-		if ($this->getRowCount($result) == 1)
-			return $result;
+		if ($this->getRowCount($result) == 1) {
+					return $result;
+		}
 		$this->log('Rows Returned:' . $this->getRowCount($result) . ' More than 1 row returned for ' . $sql, 'error');
 		$this->checkError('Rows Returned:' . $this->getRowCount($result) . ' More than 1 row returned for ' . $sql, $dieOnError);
 		return '';
@@ -788,8 +795,9 @@ 
 	{
 		$result = $this->pquery($sql, $params, $dieOnError, $msg);
 
-		if ($this->getRowCount($result) == 1)
-			return $result;
+		if ($this->getRowCount($result) == 1) {
+					return $result;
+		}
 		$this->log('Rows Returned:' . $this->getRowCount($result) . ' More than 1 row returned for ' . $sql, 'error');
 		$this->checkError('Rows Returned:' . $this->getRowCount($result) . ' More than 1 row returned for ' . $sql, $dieOnError);
 		return '';
@@ -853,8 +861,9 @@ 
 			if (isset($_SERVER['REQUEST_METHOD'])) {
 				$uri = $_SERVER['REQUEST_URI'];
 				$qmarkIndex = strpos($_SERVER['REQUEST_URI'], '?');
-				if ($qmarkIndex !== false)
-					$uri = substr($uri, 0, $qmarkIndex);
+				if ($qmarkIndex !== false) {
+									$uri = substr($uri, 0, $qmarkIndex);
+				}
 				$data = $uri . '?' . http_build_query($_SERVER['REQUEST_METHOD'] == 'GET' ? $_GET : $_POST);
 			}
 			$stmt = $db->database->prepare($logQuery);
@@ -889,10 +898,12 @@ 
 					}
 					$args = rtrim($args, ',');
 				}
-				if (!empty($callerfunc))
-					$callerfunc = " ($callerfunc)";
-				if (!empty($args))
-					$callerfunc .= "[$args] ";
+				if (!empty($callerfunc)) {
+									$callerfunc = " ($callerfunc)";
+				}
+				if (!empty($args)) {
+									$callerfunc .= "[$args] ";
+				}
 			}
 			$data[] = 'CALLER: (' . $callers[$calleridx]['line'] . ') ' . $callers[$calleridx]['file'] . $callerfunc;
 		}

vtlib/Vtiger/Zip.php

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);