adamjakab / SuiteCRM

include/database/DBManager.php

Spacing +314 added lines, -314 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -314,7 +314,7 @@ 
 		}
 
 		$dberror = $this->lastDbError();
-		if($dberror === false) {
+		if ($dberror === false) {
     		$this->last_error = false;
 	    	return false;
 		}
@@ -332,16 +332,16 @@ 
 	 */
 	protected function registerError($userMessage, $message, $dieOnError = false)
 	{
-		if(!empty($message)) {
-			if(!empty($userMessage)) {
+		if (!empty($message)) {
+			if (!empty($userMessage)) {
 				$message = "$userMessage: $message";
 			}
-			if(empty($message)) {
+			if (empty($message)) {
 			    $message = "Database error";
 			}
 			$this->log->fatal($message);
 			if ($dieOnError || $this->dieOnError) {
-				if(isset($GLOBALS['app_strings']['ERR_DB_FAIL'])) {
+				if (isset($GLOBALS['app_strings']['ERR_DB_FAIL'])) {
 					sugar_die($GLOBALS['app_strings']['ERR_DB_FAIL']);
 				} else {
 					sugar_die("Database error. Please check suitecrm.log for details.");
@@ -379,8 +379,8 @@ 
 		$slow_query_time_msec = isset($sugar_config['slow_query_time_msec'])
 			? $sugar_config['slow_query_time_msec'] : 5000;
 
-		if($do_the_dump) {
-			if($slow_query_time_msec < ($this->query_time * 1000)) {
+		if ($do_the_dump) {
+			if ($slow_query_time_msec < ($this->query_time * 1000)) {
 				// Then log both the query and the query time
 				$this->log->fatal('Slow Query (time:'.$this->query_time."\n".$query);
 				return true;
@@ -412,20 +412,20 @@ 
 		$indices = $GLOBALS['dictionary'][$object_name]['indices'];
 
 	if (empty($indices)) {
-		foreach ( $GLOBALS['dictionary'] as $current ) {
-			if ($current['table'] == $table){
+		foreach ($GLOBALS['dictionary'] as $current) {
+			if ($current['table'] == $table) {
 				$indices = $current['indices'];
 				break;
 			}
 		}
 	}
 	if (empty($indices)) {
-		$this->log->warn('CHECK QUERY: Could not find index definitions for table ' . $table);
+		$this->log->warn('CHECK QUERY: Could not find index definitions for table '.$table);
 		return false;
 	}
 	if (!empty($match[2][0])) {
 		$orderBys = explode(' ', $match[2][0]);
-		foreach ($orderBys as $orderBy){
+		foreach ($orderBys as $orderBy) {
 			$orderBy = trim($orderBy);
 			if (empty($orderBy))
 				continue;
@@ -433,7 +433,7 @@ 
 			if ($orderBy == 'asc' || $orderBy == 'desc')
 				continue;
 
-			$orderBy = str_replace(array($table . '.', ','), '', $orderBy);
+			$orderBy = str_replace(array($table.'.', ','), '', $orderBy);
 
 			foreach ($indices as $index)
 				if (empty($index['db']) || $index['db'] == $this->dbType)
@@ -441,11 +441,11 @@ 
 						if ($field == $orderBy)
 							return true;
 
-			$warning = 'Missing Index For Order By Table: ' . $table . ' Order By:' . $orderBy ;
+			$warning = 'Missing Index For Order By Table: '.$table.' Order By:'.$orderBy;
 			if (!empty($GLOBALS['sugar_config']['dump_slow_queries']))
-				$this->log->fatal('CHECK QUERY:' .$warning);
+				$this->log->fatal('CHECK QUERY:'.$warning);
 			else
-				$this->log->warn('CHECK QUERY:' .$warning);
+				$this->log->warn('CHECK QUERY:'.$warning);
 		}
 	}
 	return false;
@@ -491,9 +491,9 @@ 
 	public function insert(SugarBean $bean)
 	{
 		$sql = $this->insertSQL($bean);
-		$tablename =  $bean->getTableName();
+		$tablename = $bean->getTableName();
 		$msg = "Error inserting into table: $tablename:";
-		return $this->query($sql,true,$msg);
+		return $this->query($sql, true, $msg);
 	}
 
 	/**
@@ -512,13 +512,13 @@ 
 		{
 			if (isset($fieldDef['source']) && $fieldDef['source'] != 'db')  continue;
 			//custom fields handle there save seperatley
-			if(!empty($field_map) && !empty($field_map[$field]['custom_type'])) continue;
+			if (!empty($field_map) && !empty($field_map[$field]['custom_type'])) continue;
 
-			if(isset($data[$field])) {
+			if (isset($data[$field])) {
 				// clean the incoming value..
 				$val = from_html($data[$field]);
 			} else {
-				if(isset($fieldDef['default']) && strlen($fieldDef['default']) > 0) {
+				if (isset($fieldDef['default']) && strlen($fieldDef['default']) > 0) {
 					$val = $fieldDef['default'];
 				} else {
 					$val = null;
@@ -528,26 +528,26 @@ 
 			//handle auto increment values here - we may have to do something like nextval for oracle
 			if (!empty($fieldDef['auto_increment'])) {
 				$auto = $this->getAutoIncrementSQL($table, $fieldDef['name']);
-				if(!empty($auto)) {
+				if (!empty($auto)) {
 					$values[$field] = $auto;
 				}
 			} elseif ($fieldDef['name'] == 'deleted') {
 				$values['deleted'] = (int)$val;
 			} else {
 				// need to do some thing about types of values
-				if(!is_null($val) || !empty($fieldDef['required'])) {
+				if (!is_null($val) || !empty($fieldDef['required'])) {
 					$values[$field] = $this->massageValue($val, $fieldDef);
 				}
 			}
 		}
 
 		if (empty($values))
-			return $execute?true:''; // no columns set
+			return $execute ? true : ''; // no columns set
 
 		// get the entire sql
 		$query = "INSERT INTO $table (".implode(",", array_keys($values)).")
 					VALUES (".implode(",", $values).")";
-		return $execute?$this->query($query):$query;
+		return $execute ? $this->query($query) : $query;
 	}
 
     /**
@@ -565,7 +565,7 @@ 
 		$sql = $this->updateSQL($bean, $where);
 		$tablename = $bean->getTableName();
 		$msg = "Error updating table: $tablename:";
-		return $this->query($sql,true,$msg);
+		return $this->query($sql, true, $msg);
 	}
 
     /**
@@ -581,8 +581,8 @@ 
 	{
 		$sql = $this->deleteSQL($bean, $where);
 		$tableName = $bean->getTableName();
-		$msg = "Error deleting from table: ".$tableName. ":";
-		return $this->query($sql,true,$msg);
+		$msg = "Error deleting from table: ".$tableName.":";
+		return $this->query($sql, true, $msg);
 	}
 
 	/**
@@ -599,8 +599,8 @@ 
 	{
 		$sql = $this->retrieveSQL($bean, $where);
 		$tableName = $bean->getTableName();
-		$msg = "Error retriving values from table:".$tableName. ":";
-		return $this->query($sql,true,$msg);
+		$msg = "Error retriving values from table:".$tableName.":";
+		return $this->query($sql, true, $msg);
 	}
 
 	/**
@@ -623,7 +623,7 @@ 
 	{
 		$sql = $this->retrieveViewSQL($beans, $cols, $where);
 		$msg = "Error retriving values from View Collection:";
-		return $this->query($sql,true,$msg);
+		return $this->query($sql, true, $msg);
 	}
 
 
@@ -638,8 +638,8 @@ 
 		$sql = $this->createTableSQL($bean);
 		$tablename = $bean->getTableName();
 		$msg = "Error creating table: $tablename:";
-		$this->query($sql,true,$msg);
-		if(!$this->supports("inline_keys")) {
+		$this->query($sql, true, $msg);
+		if (!$this->supports("inline_keys")) {
 		// handle constraints and indices
 			$indicesArr = $this->createConstraintSql($bean);
 			if (count($indicesArr) > 0)
@@ -676,9 +676,9 @@ 
 			$res = true;
 			if ($sql) {
 				$msg = "Error creating table: $tablename";
-				$res = ($res and $this->query($sql,true,$msg));
+				$res = ($res and $this->query($sql, true, $msg));
 			}
-			if(!$this->supports("inline_keys")) {
+			if (!$this->supports("inline_keys")) {
 				// handle constraints and indices
 				$indicesArr = $this->getConstraintSql($indices, $tablename);
 				if (count($indicesArr) > 0)
@@ -705,20 +705,20 @@ 
 
 		//Clean the indexes to prevent duplicate definitions
 		$new_index = array();
-		foreach($indices as $ind_def){
+		foreach ($indices as $ind_def) {
 			$new_index[$ind_def['name']] = $ind_def;
 		}
 		//jc: added this for beans that do not actually have a table, namely
 		//ForecastOpportunities
-		if($tablename == 'does_not_exist' || $tablename == '')
+		if ($tablename == 'does_not_exist' || $tablename == '')
 			return '';
 
 		global $dictionary;
-		$engine=null;
-		if (isset($dictionary[$bean->getObjectName()]['engine']) && !empty($dictionary[$bean->getObjectName()]['engine']) )
+		$engine = null;
+		if (isset($dictionary[$bean->getObjectName()]['engine']) && !empty($dictionary[$bean->getObjectName()]['engine']))
 			$engine = $dictionary[$bean->getObjectName()]['engine'];
 
-		return $this->repairTableParams($tablename, $fielddefs,$new_index,$execute,$engine);
+		return $this->repairTableParams($tablename, $fielddefs, $new_index, $execute, $engine);
 	}
 
 	/**
@@ -730,12 +730,12 @@ 
 	protected function isNullable($vardef)
 	{
 
-		if(isset($vardef['isnull']) && (strtolower($vardef['isnull']) == 'false' || $vardef['isnull'] === false)
+		if (isset($vardef['isnull']) && (strtolower($vardef['isnull']) == 'false' || $vardef['isnull'] === false)
 			&& !empty($vardef['required'])) {
 				/* required + is_null=false => not null */
 			return false;
 		}
-		if(empty($vardef['auto_increment']) && (empty($vardef['type']) || $vardef['type'] != 'id')
+		if (empty($vardef['auto_increment']) && (empty($vardef['type']) || $vardef['type'] != 'id')
 					&& (empty($vardef['dbType']) || $vardef['dbType'] != 'id')
 					&& (empty($vardef['name']) || ($vardef['name'] != 'id' && $vardef['name'] != 'deleted'))
 		) {
@@ -756,7 +756,7 @@ 
      * @todo: refactor engine param to be more generic
      * @return string
      */
-	public function repairTableParams($tablename, $fielddefs,  $indices, $execute = true, $engine = null)
+	public function repairTableParams($tablename, $fielddefs, $indices, $execute = true, $engine = null)
 	{
 		//jc: had a bug when running the repair if the tablename is blank the repair will
 		//fail when it tries to create a repair table
@@ -766,13 +766,13 @@ 
 		//if the table does not exist create it and we are done
 		$sql = "/* Table : $tablename */\n";
 		if (!$this->tableExists($tablename)) {
-			$createtablesql = $this->createTableSQLParams($tablename,$fielddefs,$indices,$engine);
-			if($execute && $createtablesql){
-				$this->createTableParams($tablename,$fielddefs,$indices,$engine);
+			$createtablesql = $this->createTableSQLParams($tablename, $fielddefs, $indices, $engine);
+			if ($execute && $createtablesql) {
+				$this->createTableParams($tablename, $fielddefs, $indices, $engine);
 			}
 
 			$sql .= "/* MISSING TABLE: {$tablename} */\n";
-			$sql .= $createtablesql . "\n";
+			$sql .= $createtablesql."\n";
 			return $sql;
 		}
 
@@ -782,7 +782,7 @@ 
 		$take_action = false;
 
 		// do column comparisons
-		$sql .=	"/*COLUMNS*/\n";
+		$sql .= "/*COLUMNS*/\n";
 		foreach ($fielddefs as $name => $value) {
 			if (isset($value['source']) && $value['source'] != 'db')
 				continue;
@@ -801,9 +801,9 @@ 
 
 			$name = strtolower($value['name']);
 			// add or fix the field defs per what the DB is expected to give us back
-			$this->massageFieldDef($value,$tablename);
+			$this->massageFieldDef($value, $tablename);
 
-			$ignorerequired=false;
+			$ignorerequired = false;
 
 			//Do not track requiredness in the DB, auto_increment, ID,
 			// and deleted fields are always required in the DB, so don't force those
@@ -819,32 +819,32 @@ 
 				$value['required'] = $compareFieldDefs[$name]['required'];
 			}
 
-			if ( !isset($compareFieldDefs[$name]) ) {
+			if (!isset($compareFieldDefs[$name])) {
 				// ok we need this field lets create it
-				$sql .=	"/*MISSING IN DATABASE - $name -  ROW*/\n";
-				$sql .= $this->addColumnSQL($tablename, $value) .  "\n";
+				$sql .= "/*MISSING IN DATABASE - $name -  ROW*/\n";
+				$sql .= $this->addColumnSQL($tablename, $value)."\n";
 				if ($execute)
 					$this->addColumn($tablename, $value);
 				$take_action = true;
-			} elseif ( !$this->compareVarDefs($compareFieldDefs[$name],$value)) {
+			} elseif (!$this->compareVarDefs($compareFieldDefs[$name], $value)) {
 				//fields are different lets alter it
-				$sql .=	"/*MISMATCH WITH DATABASE - $name -  ROW ";
-				foreach($compareFieldDefs[$name] as $rKey => $rValue) {
-					$sql .=	"[$rKey] => '$rValue'  ";
+				$sql .= "/*MISMATCH WITH DATABASE - $name -  ROW ";
+				foreach ($compareFieldDefs[$name] as $rKey => $rValue) {
+					$sql .= "[$rKey] => '$rValue'  ";
 				}
-				$sql .=	"*/\n";
-				$sql .=	"/* VARDEF - $name -  ROW";
-				foreach($value as $rKey => $rValue) {
-					$sql .=	"[$rKey] => '$rValue'  ";
+				$sql .= "*/\n";
+				$sql .= "/* VARDEF - $name -  ROW";
+				foreach ($value as $rKey => $rValue) {
+					$sql .= "[$rKey] => '$rValue'  ";
 				}
-				$sql .=	"*/\n";
+				$sql .= "*/\n";
 
 				//jc: oracle will complain if you try to execute a statement that sets a column to (not) null
 				//when it is already (not) null
-				if ( isset($value['isnull']) && isset($compareFieldDefs[$name]['isnull']) &&
+				if (isset($value['isnull']) && isset($compareFieldDefs[$name]['isnull']) &&
 					$value['isnull'] === $compareFieldDefs[$name]['isnull']) {
 					unset($value['required']);
-					$ignorerequired=true;
+					$ignorerequired = true;
 				}
 
 				//dwheeler: Once a column has been defined as null, we cannot try to force it back to !null
@@ -853,12 +853,12 @@ 
 				{
 					$ignorerequired = true;
 				}
-				$altersql = $this->alterColumnSQL($tablename, $value,$ignorerequired);
-				if(is_array($altersql)) {
+				$altersql = $this->alterColumnSQL($tablename, $value, $ignorerequired);
+				if (is_array($altersql)) {
 					$altersql = join("\n", $altersql);
 				}
-				$sql .= $altersql .  "\n";
-				if($execute){
+				$sql .= $altersql."\n";
+				if ($execute) {
 					$this->alterColumn($tablename, $value, $ignorerequired);
 				}
 				$take_action = true;
@@ -866,13 +866,13 @@ 
 		}
 
 		// do index comparisons
-		$sql .=	"/* INDEXES */\n";
+		$sql .= "/* INDEXES */\n";
 		$correctedIndexs = array();
 
         $compareIndices_case_insensitive = array();
 
 		// do indices comparisons case-insensitive
-		foreach($compareIndices as $k => $value){
+		foreach ($compareIndices as $k => $value) {
 			$value['name'] = strtolower($value['name']);
 			$compareIndices_case_insensitive[strtolower($k)] = $value;
 		}
@@ -899,59 +899,59 @@ 
 				continue;
 
 			//database helpers do not know how to handle full text indices
-			if ($value['type']=='fulltext')
+			if ($value['type'] == 'fulltext')
 				continue;
 
-			if ( in_array($value['type'],array('alternate_key','foreign')) )
+			if (in_array($value['type'], array('alternate_key', 'foreign')))
 				$value['type'] = 'index';
 
-			if ( !isset($compareIndices[$name]) ) {
+			if (!isset($compareIndices[$name])) {
 				//First check if an index exists that doesn't match our name, if so, try to rename it
 				$found = false;
 				foreach ($compareIndices as $ex_name => $ex_value) {
-					if($this->compareVarDefs($ex_value, $value, true)) {
+					if ($this->compareVarDefs($ex_value, $value, true)) {
 						$found = $ex_name;
 						break;
 					}
 				}
 				if ($found) {
-					$sql .=	 "/*MISSNAMED INDEX IN DATABASE - $name - $ex_name */\n";
+					$sql .= "/*MISSNAMED INDEX IN DATABASE - $name - $ex_name */\n";
 					$rename = $this->renameIndexDefs($ex_value, $value, $tablename);
-					if($execute) {
+					if ($execute) {
 						$this->query($rename, true, "Cannot rename index");
 					}
-					$sql .= is_array($rename)?join("\n", $rename). "\n":$rename."\n";
+					$sql .= is_array($rename) ? join("\n", $rename)."\n" : $rename."\n";
 
 				} else {
 					// ok we need this field lets create it
-					$sql .=	 "/*MISSING INDEX IN DATABASE - $name -{$value['type']}  ROW */\n";
-					$sql .= $this->addIndexes($tablename,array($value), $execute) .  "\n";
+					$sql .= "/*MISSING INDEX IN DATABASE - $name -{$value['type']}  ROW */\n";
+					$sql .= $this->addIndexes($tablename, array($value), $execute)."\n";
 				}
 				$take_action = true;
 				$correctedIndexs[$name] = true;
-			} elseif ( !$this->compareVarDefs($compareIndices[$name],$value) ) {
+			} elseif (!$this->compareVarDefs($compareIndices[$name], $value)) {
 				// fields are different lets alter it
-				$sql .=	"/*INDEX MISMATCH WITH DATABASE - $name -  ROW ";
+				$sql .= "/*INDEX MISMATCH WITH DATABASE - $name -  ROW ";
 				foreach ($compareIndices[$name] as $n1 => $t1) {
-					$sql .=	 "<$n1>";
-					if ( $n1 == 'fields' )
-						foreach($t1 as $rKey => $rValue)
+					$sql .= "<$n1>";
+					if ($n1 == 'fields')
+						foreach ($t1 as $rKey => $rValue)
 							$sql .= "[$rKey] => '$rValue'  ";
 					else
 						$sql .= " $t1 ";
 				}
-				$sql .=	"*/\n";
-				$sql .=	"/* VARDEF - $name -  ROW";
+				$sql .= "*/\n";
+				$sql .= "/* VARDEF - $name -  ROW";
 				foreach ($value as $n1 => $t1) {
-					$sql .=	"<$n1>";
-					if ( $n1 == 'fields' )
+					$sql .= "<$n1>";
+					if ($n1 == 'fields')
 						foreach ($t1 as $rKey => $rValue)
-							$sql .=	"[$rKey] => '$rValue'  ";
+							$sql .= "[$rKey] => '$rValue'  ";
 					else
 						$sql .= " $t1 ";
 				}
-				$sql .=	"*/\n";
-				$sql .= $this->modifyIndexes($tablename,array($value), $execute) .  "\n";
+				$sql .= "*/\n";
+				$sql .= $this->modifyIndexes($tablename, array($value), $execute)."\n";
 				$take_action = true;
 				$correctedIndexs[$name] = true;
 			}
@@ -970,7 +970,7 @@ 
      */
 	public function compareVarDefs($fielddef1, $fielddef2, $ignoreName = false)
 	{
-		foreach ( $fielddef1 as $key => $value ) {
+		foreach ($fielddef1 as $key => $value) {
 			if ($key == 'name' && $ignoreName)
 				continue;
             if (isset($fielddef2[$key]))
@@ -984,7 +984,7 @@ 
                 }
                 else
                 {
-                    if (array_map('strtolower', $fielddef1[$key]) == array_map('strtolower',$fielddef2[$key]))
+                    if (array_map('strtolower', $fielddef1[$key]) == array_map('strtolower', $fielddef2[$key]))
                     {
                         continue;
                     }
@@ -1033,9 +1033,9 @@ 
 				}
 				else {
 					$returnArray['msg'] = 'match';
-					foreach($row1 as $key => $value){
+					foreach ($row1 as $key => $value) {
 						//ignore keys when checking we will check them when we do the index check
-						if( !isset($ignore_filter[$key]) && (!isset($row2[$key]) || $row1[$key] !== $row2[$key])){
+						if (!isset($ignore_filter[$key]) && (!isset($row2[$key]) || $row1[$key] !== $row2[$key])) {
 							$returnArray['msg'] = 'no_match';
 						}
 					}
@@ -1111,7 +1111,7 @@ 
 		$sql = $this->createIndexSQL($bean, $fieldDefs, $name, $unique);
 		$tablename = $bean->getTableName();
 		$msg = "Error creating index $name on table: $tablename:";
-		return $this->query($sql,true,$msg);
+		return $this->query($sql, true, $msg);
 	}
 
 	/**
@@ -1128,14 +1128,14 @@ 
 		$columns = array();
 
 		foreach ($indices as $index) {
-			if(!empty($index['db']) && $index['db'] != $this->dbType)
+			if (!empty($index['db']) && $index['db'] != $this->dbType)
 				continue;
 			if (isset($index['source']) && $index['source'] != 'db')
 			continue;
 
 			$sql = $this->add_drop_constraint($table, $index);
 
-			if(!empty($sql)) {
+			if (!empty($sql)) {
 				$columns[] = $sql;
 			}
 		}
@@ -1155,11 +1155,11 @@ 
 	{
 		$alters = $this->getConstraintSql($indexes, $tablename);
 		if ($execute) {
-			foreach($alters as $sql) {
+			foreach ($alters as $sql) {
 				$this->query($sql, true, "Error adding index: ");
 			}
 		}
-		if(!empty($alters)) {
+		if (!empty($alters)) {
 			$sql = join(";\n", $alters).";\n";
 		} else {
 			$sql = '';
@@ -1179,17 +1179,17 @@ 
 	{
 		$sqls = array();
 		foreach ($indexes as $index) {
-			$name =$index['name'];
-			$sqls[$name] = $this->add_drop_constraint($tablename,$index,true);
+			$name = $index['name'];
+			$sqls[$name] = $this->add_drop_constraint($tablename, $index, true);
 		}
 		if (!empty($sqls) && $execute) {
-			foreach($sqls as $name => $sql) {
+			foreach ($sqls as $name => $sql) {
 				unset(self::$index_descriptions[$tablename][$name]);
 				$this->query($sql);
 			}
 		}
-		if(!empty($sqls)) {
-			return join(";\n",$sqls).";";
+		if (!empty($sqls)) {
+			return join(";\n", $sqls).";";
 		} else {
 			return '';
 		}
@@ -1219,7 +1219,7 @@ 
 	public function addColumn($tablename, $fieldDefs)
 	{
 		$sql = $this->addColumnSQL($tablename, $fieldDefs);
-		if ($this->isFieldArray($fieldDefs)){
+		if ($this->isFieldArray($fieldDefs)) {
 			$columns = array();
 			foreach ($fieldDefs as $fieldDef)
 				$columns[] = $fieldDef['name'];
@@ -1229,7 +1229,7 @@ 
 			$columns = $fieldDefs['name'];
 		}
 		$msg = "Error adding column(s) $columns on table: $tablename:";
-		return $this->query($sql,true,$msg);
+		return $this->query($sql, true, $msg);
 	}
 
 	/**
@@ -1242,8 +1242,8 @@ 
      */
 	public function alterColumn($tablename, $newFieldDef, $ignoreRequired = false)
 	{
-		$sql = $this->alterColumnSQL($tablename, $newFieldDef,$ignoreRequired);
-		if ($this->isFieldArray($newFieldDef)){
+		$sql = $this->alterColumnSQL($tablename, $newFieldDef, $ignoreRequired);
+		if ($this->isFieldArray($newFieldDef)) {
 			$columns = array();
 			foreach ($newFieldDef as $fieldDef) {
 				$columns[] = $fieldDef['name'];
@@ -1255,8 +1255,8 @@ 
 		}
 
 		$msg = "Error altering column(s) $columns on table: $tablename:";
-		$res = $this->query($sql,true,$msg);
-		if($res) {
+		$res = $this->query($sql, true, $msg);
+		if ($res) {
 			$this->getTableDescription($tablename, true); // reload table description after altering
 		}
 		return $res;
@@ -1282,7 +1282,7 @@ 
 	public function dropTableName($name)
 	{
 		$sql = $this->dropTableNameSQL($name);
-		return $this->query($sql,true,"Error dropping table $name:");
+		return $this->query($sql, true, "Error dropping table $name:");
 	}
 
     /**
@@ -1297,7 +1297,7 @@ 
 		$tablename = $bean->getTableName();
 		$sql = $this->dropColumnSQL($tablename, $fieldDefs);
 		$msg = "Error deleting column(s) on table: $tablename:";
-		return $this->query($sql,true,$msg);
+		return $this->query($sql, true, $msg);
 	}
 
     /**
@@ -1320,18 +1320,18 @@ 
 
 		$rows_found = 0;
 		$count_query = $bean->create_list_count_query($select_query);
-		if(!empty($count_query))
+		if (!empty($count_query))
 		{
 			// We have a count query.  Run it and get the results.
 			$result = $this->query($count_query, true, "Error running count query for $this->object_name List: ");
 			$assoc = $this->fetchByAssoc($result);
-			if(!empty($assoc['c']))
+			if (!empty($assoc['c']))
 			{
 				$rows_found = $assoc['c'];
 			}
 		}
-		if($count == -1){
-			$count 	= $sugar_config['list_max_entries_per_page'];
+		if ($count == -1) {
+			$count = $sugar_config['list_max_entries_per_page'];
 		}
 		$next_offset = $start + $count;
 
@@ -1344,13 +1344,13 @@ 
 		$fields = $bean->getFieldDefinitions();
 		$custom_fields = array();
 
-		if($bean->hasCustomFields()){
-			foreach ($fields as $fieldDef){
-				if($fieldDef['source'] == 'custom_fields'){
+		if ($bean->hasCustomFields()) {
+			foreach ($fields as $fieldDef) {
+				if ($fieldDef['source'] == 'custom_fields') {
 					$custom_fields[$fieldDef['name']] = $fieldDef['name'];
 				}
 			}
-			if(!empty($custom_fields)){
+			if (!empty($custom_fields)) {
 				$custom_fields['id_c'] = 'id_c';
 				$id_field = array('name' => 'id_c', 'custom_type' => 'id',);
 				$fields[] = $id_field;
@@ -1363,50 +1363,50 @@ 
 		$cstm_row_array = array();
 		$cstm_columns = array();
 		$built_columns = false;
-		while(($row = $this->fetchByAssoc($result)) != null)
+		while (($row = $this->fetchByAssoc($result)) != null)
 		{
 			$values = array();
 			$cstm_values = array();
-			if(!$is_related_query){
+			if (!$is_related_query) {
 				foreach ($fields as $fieldDef)
 				{
-					if(isset($fieldDef['source']) && $fieldDef['source'] != 'db' && $fieldDef['source'] != 'custom_fields') continue;
+					if (isset($fieldDef['source']) && $fieldDef['source'] != 'db' && $fieldDef['source'] != 'custom_fields') continue;
 					$val = $row[$fieldDef['name']];
 
 					//handle auto increment values here only need to do this on insert not create
-					if ($fieldDef['name'] == 'deleted'){
+					if ($fieldDef['name'] == 'deleted') {
 							$values['deleted'] = $val;
-							if(!$built_columns){
+							if (!$built_columns) {
 							$columns[] = 'deleted';
 						}
 					}
 					else
 					{
 						$type = $fieldDef['type'];
-						if(!empty($fieldDef['custom_type'])){
+						if (!empty($fieldDef['custom_type'])) {
 							$type = $fieldDef['custom_type'];
 						}
 						// need to do some thing about types of values
-						if($this->dbType == 'mysql' && $val == '' && ($type == 'datetime' ||  $type == 'date' || $type == 'int' || $type == 'currency' || $type == 'decimal')){
-							if(!empty($custom_fields[$fieldDef['name']]))
+						if ($this->dbType == 'mysql' && $val == '' && ($type == 'datetime' || $type == 'date' || $type == 'int' || $type == 'currency' || $type == 'decimal')) {
+							if (!empty($custom_fields[$fieldDef['name']]))
 								$cstm_values[$fieldDef['name']] = 'null';
 							else
 								$values[$fieldDef['name']] = 'null';
-						}else{
-							if(isset($type) && $type=='int') {
-								if(!empty($custom_fields[$fieldDef['name']]))
+						} else {
+							if (isset($type) && $type == 'int') {
+								if (!empty($custom_fields[$fieldDef['name']]))
 									$cstm_values[$fieldDef['name']] = $GLOBALS['db']->quote(from_html($val));
 								else
 									$values[$fieldDef['name']] = $GLOBALS['db']->quote(from_html($val));
 							} else {
-								if(!empty($custom_fields[$fieldDef['name']]))
+								if (!empty($custom_fields[$fieldDef['name']]))
 									$cstm_values[$fieldDef['name']] = "'".$GLOBALS['db']->quote(from_html($val))."'";
 								else
 									$values[$fieldDef['name']] = "'".$GLOBALS['db']->quote(from_html($val))."'";
 							}
 						}
-						if(!$built_columns){
-							if(!empty($custom_fields[$fieldDef['name']]))
+						if (!$built_columns) {
+							if (!empty($custom_fields[$fieldDef['name']]))
 								$cstm_columns[] = $fieldDef['name'];
 							else
 								$columns[] = $fieldDef['name'];
@@ -1417,19 +1417,19 @@ 
 			} else {
 			foreach ($row as $key=>$val)
 			{
-					if($key != 'orc_row'){
+					if ($key != 'orc_row') {
 						$values[$key] = "'$val'";
-						if(!$built_columns){
+						if (!$built_columns) {
 							$columns[] = $key;
 						}
 					}
 			}
 			}
 			$built_columns = true;
-			if(!empty($values)){
+			if (!empty($values)) {
 				$row_array[] = $values;
 			}
-			if(!empty($cstm_values) && !empty($cstm_values['id_c']) && (strlen($cstm_values['id_c']) > 7)){
+			if (!empty($cstm_values) && !empty($cstm_values['id_c']) && (strlen($cstm_values['id_c']) > 7)) {
 				$cstm_row_array[] = $cstm_values;
 			}
 		}
@@ -1439,9 +1439,9 @@ 
 		// get the entire sql
 		$sql .= "(".implode(",", $columns).") ";
 		$sql .= "VALUES";
-		for($i = 0; $i < count($row_array); $i++){
+		for ($i = 0; $i < count($row_array); $i++) {
 			$sql .= " (".implode(",", $row_array[$i]).")";
-			if($i < (count($row_array) - 1)){
+			if ($i < (count($row_array) - 1)) {
 				$sql .= ", ";
 			}
 		}
@@ -1450,9 +1450,9 @@ 
 		$custom_sql .= "(".implode(",", $cstm_columns).") ";
 		$custom_sql .= "VALUES";
 
-		for($i = 0; $i < count($cstm_row_array); $i++){
+		for ($i = 0; $i < count($cstm_row_array); $i++) {
 			$custom_sql .= " (".implode(",", $cstm_row_array[$i]).")";
-			if($i < (count($cstm_row_array) - 1)){
+			if ($i < (count($cstm_row_array) - 1)) {
 				$custom_sql .= ", ";
 			}
 		}
@@ -1545,17 +1545,17 @@ 
      */
     public function quoteType($type, $value)
 	{
-	    if($type == 'date') {
+	    if ($type == 'date') {
 	        return $this->convert($this->quoted($value), "date");
 	    }
-	    if($type == 'time') {
+	    if ($type == 'time') {
 	        return $this->convert($this->quoted($value), "time");
 	    }
-        if(isset($this->type_class[$type]) &&  $this->type_class[$type] == "date") {
+        if (isset($this->type_class[$type]) && $this->type_class[$type] == "date") {
             return $this->convert($this->quoted($value), "datetime");
         }
-        if($this->isNumericType($type)) {
-            return 0+$value; // ensure it's numeric
+        if ($this->isNumericType($type)) {
+            return 0 + $value; // ensure it's numeric
         }
 
         return $this->quoted($value);
@@ -1571,7 +1571,7 @@ 
      */
 	public function arrayQuote(array &$array)
 	{
-		foreach($array as &$val) {
+		foreach ($array as &$val) {
 			$val = $this->quote($val);
 		}
 		return $array;
@@ -1584,10 +1584,10 @@ 
      */
 	protected function freeResult($result = false)
 	{
-		if($result) {
+		if ($result) {
 			$this->freeDbResult($result);
 		}
-		if($this->lastResult) {
+		if ($this->lastResult) {
 			$this->freeDbResult($this->lastResult);
 			$this->lastResult = null;
 		}
@@ -1616,17 +1616,17 @@ 
 	public function getOne($sql, $dieOnError = false, $msg = '')
 	{
 		$this->log->info("Get One: |$sql|");
-		if(!$this->hasLimit($sql)) {
+		if (!$this->hasLimit($sql)) {
 		    $queryresult = $this->limitQuery($sql, 0, 1, $dieOnError, $msg);
 		} else {
 		    // support old code that passes LIMIT to sql
 		    // works only for mysql, so do not rely on this
 		    $queryresult = $this->query($sql, $dieOnError, $msg);
 		}
-		$this->checkError($msg.' Get One Failed:' . $sql, $dieOnError);
+		$this->checkError($msg.' Get One Failed:'.$sql, $dieOnError);
 		if (!$queryresult) return false;
 		$row = $this->fetchByAssoc($queryresult);
-		if(!empty($row)) {
+		if (!empty($row)) {
 			return array_shift($row);
 		}
 		return false;
@@ -1646,12 +1646,12 @@ 
 		$this->log->info("Fetch One: |$sql|");
 		$this->checkConnection();
 		$queryresult = $this->query($sql, $dieOnError, $msg);
-		$this->checkError($msg.' Fetch One Failed:' . $sql, $dieOnError);
+		$this->checkError($msg.' Fetch One Failed:'.$sql, $dieOnError);
 
 		if (!$queryresult) return false;
 
 		$row = $this->fetchByAssoc($queryresult);
-		if ( !$row ) return false;
+		if (!$row) return false;
 
 		$this->freeResult($queryresult);
 		return $row;
@@ -1692,7 +1692,7 @@ 
      */
 	public function getTableDescription($tablename, $reload = false)
 	{
-		if($reload || empty(self::$table_descriptions[$tablename])) {
+		if ($reload || empty(self::$table_descriptions[$tablename])) {
 			self::$table_descriptions[$tablename] = $this->get_columns($tablename);
 		}
 		return self::$table_descriptions[$tablename];
@@ -1708,12 +1708,12 @@ 
 	protected function describeField($name, $tablename)
 	{
 		$table = $this->getTableDescription($tablename);
-		if(!empty($table) && isset($table[$name]))
+		if (!empty($table) && isset($table[$name]))
 			return 	$table[$name];
 
 		$table = $this->getTableDescription($tablename, true);
 
-		if(isset($table[$name]))
+		if (isset($table[$name]))
 		return $table[$name];
 
 		return array();
@@ -1728,13 +1728,13 @@ 
 	 */
 	protected function describeIndex($name, $tablename)
 	{
-		if(isset(self::$index_descriptions[$tablename]) && isset(self::$index_descriptions[$tablename]) && isset(self::$index_descriptions[$tablename][$name])){
+		if (isset(self::$index_descriptions[$tablename]) && isset(self::$index_descriptions[$tablename]) && isset(self::$index_descriptions[$tablename][$name])) {
 			return 	self::$index_descriptions[$tablename][$name];
 		}
 
 		self::$index_descriptions[$tablename] = $this->get_indices($tablename);
 
-		if(isset(self::$index_descriptions[$tablename][$name])){
+		if (isset(self::$index_descriptions[$tablename][$name])) {
 			return 	self::$index_descriptions[$tablename][$name];
 		}
 
@@ -1751,9 +1751,9 @@ 
      */
 	public function truncate($string, $len)
 	{
-		if ( is_numeric($len) && $len > 0)
+		if (is_numeric($len) && $len > 0)
 		{
-			$string = mb_substr($string,0,(int) $len, "UTF-8");
+			$string = mb_substr($string, 0, (int)$len, "UTF-8");
 		}
 		return $string;
 	}
@@ -1768,11 +1768,11 @@ 
      */
 	public function concat($table, array $fields, $space = ' ')
 	{
-		if(empty($fields)) return '';
+		if (empty($fields)) return '';
 		$elems = array();
 		$space = $this->quoted($space);
-		foreach ( $fields as $field ) {
-			if(!empty($elems)) $elems[] = $space;
+		foreach ($fields as $field) {
+			if (!empty($elems)) $elems[] = $space;
 			$elems[] = $this->convert("$table.$field", 'IFNULL', array("''"));
 		}
 		$first = array_shift($elems);
@@ -1829,8 +1829,8 @@ 
 	 */
 	public function executePreparedQuery($stmt, $data = array())
 	{
-		if(!empty($this->preparedTokens[$stmt])){
-			if(!is_array($data)){
+		if (!empty($this->preparedTokens[$stmt])) {
+			if (!is_array($data)) {
 				$data = array($data);
 			}
 
@@ -1838,7 +1838,7 @@ 
 
 			//ensure that the number of data elements matches the number of replacement tokens
 			//we found in prepare().
-			if(count($data) != $pTokens['tokenCount']){
+			if (count($data) != $pTokens['tokenCount']) {
 				//error the data count did not match the token count
 				return false;
 			}
@@ -1864,7 +1864,7 @@ 
 				}//switch
 			}//foreach
 			return $this->query($query);
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -1908,7 +1908,7 @@ 
 	{
 		// get column names and values
 		$sql = $this->insertParams($bean->getTableName(), $bean->getFieldDefinitions(), get_object_vars($bean),
-		        isset($bean->field_name_map)?$bean->field_name_map:null, false);
+		        isset($bean->field_name_map) ? $bean->field_name_map : null, false);
 		return $sql;
 	}
 
@@ -1936,48 +1936,48 @@ 
     		if (!empty($bean->field_name_map[$field]['auto_increment'])) continue;
 
     		//custom fields handle their save separately
-    		if(isset($bean->field_name_map) && !empty($bean->field_name_map[$field]['custom_type']))  continue;
+    		if (isset($bean->field_name_map) && !empty($bean->field_name_map[$field]['custom_type']))  continue;
 
     		// no need to clear deleted since we only update not deleted records anyway
-    		if($fieldDef['name'] == 'deleted' && empty($bean->deleted)) continue;
+    		if ($fieldDef['name'] == 'deleted' && empty($bean->deleted)) continue;
 
-    		if(isset($bean->$field)) {
+    		if (isset($bean->$field)) {
     			$val = from_html($bean->$field);
     		} else {
     			continue;
     		}
 
-    		if(!empty($fieldDef['type']) && $fieldDef['type'] == 'bool'){
+    		if (!empty($fieldDef['type']) && $fieldDef['type'] == 'bool') {
     			$val = $bean->getFieldValue($field);
     		}
 
-    		if(strlen($val) == 0) {
-    			if(isset($fieldDef['default']) && strlen($fieldDef['default']) > 0) {
+    		if (strlen($val) == 0) {
+    			if (isset($fieldDef['default']) && strlen($fieldDef['default']) > 0) {
     				$val = $fieldDef['default'];
     			} else {
     				$val = null;
     			}
     		}
 
-    		if(!empty($val) && !empty($fieldDef['len']) && strlen($val) > $fieldDef['len']) {
+    		if (!empty($val) && !empty($fieldDef['len']) && strlen($val) > $fieldDef['len']) {
 			    $val = $this->truncate($val, $fieldDef['len']);
 			}
 		$columnName = $this->quoteIdentifier($fieldDef['name']);
-    		if(!is_null($val) || !empty($fieldDef['required'])) {
+    		if (!is_null($val) || !empty($fieldDef['required'])) {
     			$columns[] = "{$columnName}=".$this->massageValue($val, $fieldDef);
-    		} elseif($this->isNullable($fieldDef)) {
+    		} elseif ($this->isNullable($fieldDef)) {
     			$columns[] = "{$columnName}=NULL";
     		} else {
     		    $columns[] = "{$columnName}=".$this->emptyValue($fieldDef['type']);
     		}
 		}
 
-		if ( sizeof($columns) == 0 )
+		if (sizeof($columns) == 0)
 			return ""; // no columns set
 
 		// build where clause
 		$where = $this->getWhereClause($bean, $this->updateWhereArray($bean, $where));
-		if(isset($fields['deleted'])) {
+		if (isset($fields['deleted'])) {
 		    $where .= " AND deleted=0";
 		}
 
@@ -2001,7 +2001,7 @@ 
 			$primaryColumn = $fieldDef['name'];
 
 			$val = $bean->getFieldValue($fieldDef['name']);
-			if ($val != FALSE){
+			if ($val != FALSE) {
 				$where[$primaryColumn] = $val;
 			}
 		}
@@ -2027,7 +2027,7 @@ 
 			if (is_array($val)) {
 				$op = "IN";
 				$temp = array();
-				foreach ($val as $tval){
+				foreach ($val as $tval) {
 					$temp[] = $this->quoted($tval);
 				}
 				$val = implode(",", $temp);
@@ -2053,9 +2053,9 @@ 
 	 * @param  array  $whereArray Optional, where conditions in an array
 	 * @return string
 	 */
-	protected function getWhereClause(SugarBean $bean, array $whereArray=array())
+	protected function getWhereClause(SugarBean $bean, array $whereArray = array())
 	{
-	    return " WHERE " . $this->getColumnWhereClause($bean->getTableName(), $whereArray);
+	    return " WHERE ".$this->getColumnWhereClause($bean->getTableName(), $whereArray);
 	}
 
 	/**
@@ -2069,13 +2069,13 @@ 
 	{
 		$type = $this->getFieldType($fieldDef);
 
-		if(isset($this->type_class[$type])) {
+		if (isset($this->type_class[$type])) {
 			// handle some known types
-			switch($this->type_class[$type]) {
+			switch ($this->type_class[$type]) {
 				case 'bool':
 				case 'int':
-					if (!empty($fieldDef['required']) && $val == ''){
-						if (isset($fieldDef['default'])){
+					if (!empty($fieldDef['required']) && $val == '') {
+						if (isset($fieldDef['default'])) {
 							return $fieldDef['default'];
 						}
 						return 0;
@@ -2083,16 +2083,16 @@ 
 					return intval($val);
                 case 'bigint' :
                     $val = (float)$val;
-					if (!empty($fieldDef['required']) && $val == false){
-						if (isset($fieldDef['default'])){
+					if (!empty($fieldDef['required']) && $val == false) {
+						if (isset($fieldDef['default'])) {
 							return $fieldDef['default'];
 						}
 						return 0;
 					}
                     return $val;
 				case 'float':
-					if (!empty($fieldDef['required'])  && $val == ''){
-						if (isset($fieldDef['default'])){
+					if (!empty($fieldDef['required']) && $val == '') {
+						if (isset($fieldDef['default'])) {
 							return $fieldDef['default'];
 						}
 						return 0;
@@ -2101,7 +2101,7 @@ 
 				case 'time':
 				case 'date':
 					// empty date can't be '', so convert it to either NULL or empty date value
-					if($val == '') {
+					if ($val == '') {
 						if (!empty($fieldDef['required'])) {
 							if (isset($fieldDef['default'])) {
 								return $fieldDef['default'];
@@ -2113,14 +2113,14 @@ 
 					break;
 			}
 		} else {
-		    if(!empty($val) && !empty($fieldDef['len']) && strlen($val) > $fieldDef['len']) {
+		    if (!empty($val) && !empty($fieldDef['len']) && strlen($val) > $fieldDef['len']) {
 			    $val = $this->truncate($val, $fieldDef['len']);
 			}
 		}
 
-		if ( is_null($val) ) {
-			if(!empty($fieldDef['required'])) {
-				if (isset($fieldDef['default'])  && $fieldDef['default'] != ''){
+		if (is_null($val)) {
+			if (!empty($fieldDef['required'])) {
+				if (isset($fieldDef['default']) && $fieldDef['default'] != '') {
 					return $fieldDef['default'];
 				}
 				return $this->emptyValue($type);
@@ -2128,7 +2128,7 @@ 
 				return "NULL";
 			}
 		}
-        if($type == "datetimecombo") {
+        if ($type == "datetimecombo") {
             $type = "datetime";
         }
 		return $this->convert($this->quoted($val), $type);
@@ -2143,23 +2143,23 @@ 
 	 */
 	public function massageFieldDef(&$fieldDef, $tablename)
 	{
-		if ( !isset($fieldDef['dbType']) ) {
-			if ( isset($fieldDef['dbtype']) )
+		if (!isset($fieldDef['dbType'])) {
+			if (isset($fieldDef['dbtype']))
 				$fieldDef['dbType'] = $fieldDef['dbtype'];
 			else
 				$fieldDef['dbType'] = $fieldDef['type'];
 		}
-		$type = $this->getColumnType($fieldDef['dbType'],$fieldDef['name'],$tablename);
+		$type = $this->getColumnType($fieldDef['dbType'], $fieldDef['name'], $tablename);
 		$matches = array();
         // len can be a number or a string like 'max', for example, nvarchar(max)
         preg_match_all('/(\w+)(?:\(([0-9]+,?[0-9]*|\w+)\)|)/i', $type, $matches);
-		if ( isset($matches[1][0]) )
+		if (isset($matches[1][0]))
 			$fieldDef['type'] = $matches[1][0];
-		if ( isset($matches[2][0]) && empty($fieldDef['len']) )
+		if (isset($matches[2][0]) && empty($fieldDef['len']))
 			$fieldDef['len'] = $matches[2][0];
-		if ( !empty($fieldDef['precision']) && is_numeric($fieldDef['precision']) && !strstr($fieldDef['len'],',') )
+		if (!empty($fieldDef['precision']) && is_numeric($fieldDef['precision']) && !strstr($fieldDef['len'], ','))
 			$fieldDef['len'] .= ",{$fieldDef['precision']}";
-		if (!empty($fieldDef['required']) || ($fieldDef['name'] == 'id' && !isset($fieldDef['required'])) ) {
+		if (!empty($fieldDef['required']) || ($fieldDef['name'] == 'id' && !isset($fieldDef['required']))) {
 			$fieldDef['required'] = 'true';
 		}
 	}
@@ -2180,7 +2180,7 @@ 
 		$level = 0;
 		$selectField = "";
 		$strLen = strlen($selectStatement);
-		for($i = 0; $i < $strLen; $i++)
+		for ($i = 0; $i < $strLen; $i++)
 		{
 			$char = $selectStatement[$i];
 
@@ -2190,16 +2190,16 @@ 
 				$fields[$field] = $selectField;
 				$selectField = "";
 			}
-			else if ($char == "("){
+			else if ($char == "(") {
 				$level++;
 				$selectField .= $char;
 			}
-			else if($char == ")"){
+			else if ($char == ")") {
 				$level--;
 				$selectField .= $char;
 
 
-			}else{
+			} else {
 				$selectField .= $char;
 			}
 
@@ -2215,7 +2215,7 @@ 
      */
 	protected function getFieldNameFromSelect($string)
 	{
-		if(strncasecmp($string, "DISTINCT ", 9) == 0) {
+		if (strncasecmp($string, "DISTINCT ", 9) == 0) {
 			$string = substr($string, 9);
 		}
 		if (stripos($string, " as ") !== false)
@@ -2293,14 +2293,14 @@ 
 				foreach ($cols[$beanID] as $def) $select[] = $table.".".$def['name'];
 
 			// build part of where clause
-			if (is_array($whereClause[$beanID])){
+			if (is_array($whereClause[$beanID])) {
 				$where[] = $this->getColumnWhereClause($table, $whereClause[$beanID]);
 			}
 			// initialize so that it can be used properly in form clause generation
 			$table_used_in_from[$table] = false;
 
 			$indices = $bean->getIndices();
-			foreach ($indices as $index){
+			foreach ($indices as $index) {
 				if ($index['type'] == 'foreign') {
 					$relationship[$table][] = array('foreignTable'=> $index['foreignTable']
 												,'foreignColumn'=>$index['foreignField']
@@ -2321,12 +2321,12 @@ 
 		// table2 is assumed to joining through primary key called id
 		$separator = "";
 		$from = ''; $table_used_in_from = array();
-		foreach ($relations as $table1 => $rightsidearray){
+		foreach ($relations as $table1 => $rightsidearray) {
 			if ($table_used_in_from[$table1]) continue; // table has been joined
 
 			$from .= $separator." ".$table1;
 			$table_used_in_from[$table1] = true;
-			foreach ($rightsidearray as $tablearray){
+			foreach ($rightsidearray as $tablearray) {
 				$table2 = $tablearray['foreignTable']; // get foreign table
 				$tableAlias = $aliases[$table2]; // get a list of aliases for this table
 				foreach ($tableAlias as $table2) {
@@ -2386,9 +2386,9 @@ 
 		// we do not have change a lot of existing code
 		// and add dbtype where type is being used for some special
 		// purposes like referring to foreign table etc.
-		if(!empty($fieldDef['dbType']))
+		if (!empty($fieldDef['dbType']))
 			return  $fieldDef['dbType'];
-		if(!empty($fieldDef['dbtype']))
+		if (!empty($fieldDef['dbtype']))
 			return  $fieldDef['dbtype'];
 		if (!empty($fieldDef['type']))
 			return  $fieldDef['type'];
@@ -2408,17 +2408,17 @@ 
      */
     public function getTypeParts($type)
     {
-        if(preg_match("#(?P<type>\w+)\s*(?P<arg>\((?P<len>\w+)\s*(,\s*(?P<scale>\d+))*\))*#", $type, $matches))
+        if (preg_match("#(?P<type>\w+)\s*(?P<arg>\((?P<len>\w+)\s*(,\s*(?P<scale>\d+))*\))*#", $type, $matches))
         {
-            $return = array();  // Not returning matches array as such as we don't want to expose the regex make up on the interface
+            $return = array(); // Not returning matches array as such as we don't want to expose the regex make up on the interface
             $return['baseType'] = $matches['type'];
-            if( isset($matches['arg'])) {
+            if (isset($matches['arg'])) {
                 $return['arg'] = $matches['arg'];
             }
-            if( isset($matches['len'])) {
+            if (isset($matches['len'])) {
                 $return['len'] = $matches['len'];
             }
-            if( isset($matches['scale'])) {
+            if (isset($matches['scale'])) {
                 $return['scale'] = $matches['scale'];
             }
             return $return;
@@ -2442,28 +2442,28 @@ 
 		$type = $this->getFieldType($fieldDef);
         $colType = $this->getColumnType($type);
 
-        if($parts = $this->getTypeParts($colType))
+        if ($parts = $this->getTypeParts($colType))
         {
             $colBaseType = $parts['baseType'];
-            $defLen =  isset($parts['len']) ? $parts['len'] : '255'; // Use the mappings length (precision) as default if it exists
+            $defLen = isset($parts['len']) ? $parts['len'] : '255'; // Use the mappings length (precision) as default if it exists
         }
 
-        if(!empty($fieldDef['len'])) {
-            if (in_array($colBaseType, array( 'nvarchar', 'nchar', 'varchar', 'varchar2', 'char',
+        if (!empty($fieldDef['len'])) {
+            if (in_array($colBaseType, array('nvarchar', 'nchar', 'varchar', 'varchar2', 'char',
                                           'clob', 'blob', 'text'))) {
           	    $colType = "$colBaseType(${fieldDef['len']})";
-            } elseif(($colBaseType == 'decimal' || $colBaseType == 'float')){
-                  if(!empty($fieldDef['precision']) && is_numeric($fieldDef['precision']))
-                      if(strpos($fieldDef['len'],',') === false){
-                          $colType = $colBaseType . "(".$fieldDef['len'].",".$fieldDef['precision'].")";
-                      }else{
-                          $colType = $colBaseType . "(".$fieldDef['len'].")";
+            } elseif (($colBaseType == 'decimal' || $colBaseType == 'float')) {
+                  if (!empty($fieldDef['precision']) && is_numeric($fieldDef['precision']))
+                      if (strpos($fieldDef['len'], ',') === false) {
+                          $colType = $colBaseType."(".$fieldDef['len'].",".$fieldDef['precision'].")";
+                      } else {
+                          $colType = $colBaseType."(".$fieldDef['len'].")";
                       }
                   else
-                          $colType = $colBaseType . "(".$fieldDef['len'].")";
+                          $colType = $colBaseType."(".$fieldDef['len'].")";
               }
         } else {
-            if (in_array($colBaseType, array( 'nvarchar', 'nchar', 'varchar', 'varchar2', 'char'))) {
+            if (in_array($colBaseType, array('nvarchar', 'nchar', 'varchar', 'varchar2', 'char'))) {
                 $colType = "$colBaseType($defLen)";
             }
         }
@@ -2485,29 +2485,29 @@ 
         }
 
 		$auto_increment = '';
-		if(!empty($fieldDef['auto_increment']) && $fieldDef['auto_increment'])
-			$auto_increment = $this->setAutoIncrement($table , $fieldDef['name']);
+		if (!empty($fieldDef['auto_increment']) && $fieldDef['auto_increment'])
+			$auto_increment = $this->setAutoIncrement($table, $fieldDef['name']);
 
-		$required = 'NULL';  // MySQL defaults to NULL, SQL Server defaults to NOT NULL -- must specify
+		$required = 'NULL'; // MySQL defaults to NULL, SQL Server defaults to NOT NULL -- must specify
 		//Starting in 6.0, only ID and auto_increment fields will be NOT NULL in the DB.
 		if ((empty($fieldDef['isnull']) || strtolower($fieldDef['isnull']) == 'false') &&
 			(!empty($auto_increment) || $name == 'id' || ($fieldDef['type'] == 'id' && !empty($fieldDef['required'])))) {
-			$required =  "NOT NULL";
+			$required = "NOT NULL";
 		}
 		// If the field is marked both required & isnull=>false - alwqys make it not null
 		// Use this to ensure primary key fields never defined as null
-		if(isset($fieldDef['isnull']) && (strtolower($fieldDef['isnull']) == 'false' || $fieldDef['isnull'] === false)
+		if (isset($fieldDef['isnull']) && (strtolower($fieldDef['isnull']) == 'false' || $fieldDef['isnull'] === false)
 			&& !empty($fieldDef['required'])) {
-			$required =  "NOT NULL";
+			$required = "NOT NULL";
 		}
 		if ($ignoreRequired)
 			$required = "";
 
-		if ( $return_as_array ) {
+		if ($return_as_array) {
 			return array(
 				'name' => $name,
 				'colType' => $colType,
-                'colBaseType' => $colBaseType,  // Adding base type for easier processing in derived classes
+                'colBaseType' => $colBaseType, // Adding base type for easier processing in derived classes
 				'default' => $default,
 				'required' => $required,
 				'auto_increment' => $auto_increment,
@@ -2532,14 +2532,14 @@ 
 
 		if ($this->isFieldArray($fieldDefs)) {
 			foreach ($fieldDefs as $fieldDef) {
-				if(!isset($fieldDef['source']) || $fieldDef['source'] == 'db') {
-					$columns[] = $this->oneColumnSQLRep($fieldDef,false, $tablename);
+				if (!isset($fieldDef['source']) || $fieldDef['source'] == 'db') {
+					$columns[] = $this->oneColumnSQLRep($fieldDef, false, $tablename);
 				}
 			}
 			$columns = implode(",", $columns);
 		}
 		else {
-			$columns = $this->oneColumnSQLRep($fieldDefs,$ignoreRequired, $tablename);
+			$columns = $this->oneColumnSQLRep($fieldDefs, $ignoreRequired, $tablename);
 		}
 
 		return $columns;
@@ -2701,40 +2701,40 @@ 
      */
 	public function getValidDBName($name, $ensureUnique = false, $type = 'column', $force = false)
 	{
-		if(is_array($name)) {
+		if (is_array($name)) {
 			$result = array();
-			foreach($name as $field) {
+			foreach ($name as $field) {
 				$result[] = $this->getValidDBName($field, $ensureUnique, $type);
 			}
 			return $result;
 		} else {
-		    if(strchr($name, ".")) {
+		    if (strchr($name, ".")) {
 		        // this is a compound name with dots, handle separately
 		        $parts = explode(".", $name);
-		        if(count($parts) > 2) {
+		        if (count($parts) > 2) {
 		            // some weird name, cut to table.name
-		            array_splice($parts, 0, count($parts)-2);
+		            array_splice($parts, 0, count($parts) - 2);
 		        }
 		        $parts = $this->getValidDBName($parts, $ensureUnique, $type, $force);
                 return join(".", $parts);
 		    }
 			// first strip any invalid characters - all but word chars (which is alphanumeric and _)
-			$name = preg_replace( '/[^\w]+/i', '', $name ) ;
-			$len = strlen( $name ) ;
+			$name = preg_replace('/[^\w]+/i', '', $name);
+			$len = strlen($name);
 			$maxLen = empty($this->maxNameLengths[$type]) ? $this->maxNameLengths[$type]['column'] : $this->maxNameLengths[$type];
 			if ($len <= $maxLen && !$force) {
 				return strtolower($name);
 			}
 			if ($ensureUnique) {
 				$md5str = md5($name);
-				$tail = substr ( $name, -11) ;
-				$temp = substr($md5str , strlen($md5str)-4 );
-				$result = substr( $name, 0, 10) . $temp . $tail ;
+				$tail = substr($name, -11);
+				$temp = substr($md5str, strlen($md5str) - 4);
+				$result = substr($name, 0, 10).$temp.$tail;
 			} else {
-				$result = substr( $name, 0, 11) . substr( $name, 11 - $maxLen);
+				$result = substr($name, 0, 11).substr($name, 11 - $maxLen);
 			}
 
-			return strtolower( $result ) ;
+			return strtolower($result);
 		}
 	}
 
@@ -2746,7 +2746,7 @@ 
 	 */
 	public function getColumnType($type)
 	{
-		return isset($this->type_map[$type])?$this->type_map[$type]:$type;
+		return isset($this->type_map[$type]) ? $this->type_map[$type] : $type;
 	}
 
 	/**
@@ -2760,10 +2760,10 @@ 
 	 */
 	public function isFieldArray($defArray)
 	{
-		if ( !is_array($defArray) )
+		if (!is_array($defArray))
 			return false;
 
-		if ( isset($defArray['type']) ){
+		if (isset($defArray['type'])) {
 			// type key exists. May be an array of defs or a simple definition
 			return is_array($defArray['type']); // type is not an array => definition else array
 		}
@@ -2798,19 +2798,19 @@ 
 		require('metadata/audit_templateMetaData.php');
 		$fieldDefs = $dictionary['audit']['fields'];
 
-		$values=array();
+		$values = array();
 		$values['id'] = $this->massageValue(create_guid(), $fieldDefs['id']);
-		$values['parent_id']= $this->massageValue($bean->id, $fieldDefs['parent_id']);
-		$values['field_name']= $this->massageValue($changes['field_name'], $fieldDefs['field_name']);
+		$values['parent_id'] = $this->massageValue($bean->id, $fieldDefs['parent_id']);
+		$values['field_name'] = $this->massageValue($changes['field_name'], $fieldDefs['field_name']);
 		$values['data_type'] = $this->massageValue($changes['data_type'], $fieldDefs['data_type']);
-		if ($changes['data_type']=='text') {
+		if ($changes['data_type'] == 'text') {
 			$values['before_value_text'] = $this->massageValue($changes['before'], $fieldDefs['before_value_text']);
 			$values['after_value_text'] = $this->massageValue($changes['after'], $fieldDefs['after_value_text']);
 		} else {
 			$values['before_value_string'] = $this->massageValue($changes['before'], $fieldDefs['before_value_string']);
 			$values['after_value_string'] = $this->massageValue($changes['after'], $fieldDefs['after_value_string']);
 		}
-		$values['date_created'] = $this->massageValue(TimeDate::getInstance()->nowDb(), $fieldDefs['date_created'] );
+		$values['date_created'] = $this->massageValue(TimeDate::getInstance()->nowDb(), $fieldDefs['date_created']);
 		$values['created_by'] = $this->massageValue($current_user->id, $fieldDefs['created_by']);
 
 		$sql .= "(".implode(",", array_keys($values)).") ";
@@ -2840,9 +2840,9 @@ 
      * @param array|null $field_filter Array of filter names to be inspected (NULL means all fields)
      * @return array
      */
-    public function getDataChanges(SugarBean &$bean, array $field_filter = null)
+    public function getDataChanges(SugarBean & $bean, array $field_filter = null)
 	{
-        $changed_values=array();
+        $changed_values = array();
 
         $fetched_row = array();
         if (is_array($bean->fetched_row))
@@ -2862,40 +2862,40 @@ 
             $field_defs = array_intersect_key($field_defs, $fetched_row);
 
             // remove fields which do not exist as bean property
-            $field_defs = array_intersect_key($field_defs, (array) $bean);
+            $field_defs = array_intersect_key($field_defs, (array)$bean);
 
             foreach ($field_defs as $field => $properties) {
                 $before_value = $fetched_row[$field];
-                $after_value=$bean->$field;
+                $after_value = $bean->$field;
                 if (isset($properties['type'])) {
-                    $field_type=$properties['type'];
+                    $field_type = $properties['type'];
                 } else {
                     if (isset($properties['dbType'])) {
-                        $field_type=$properties['dbType'];
+                        $field_type = $properties['dbType'];
                     }
-                    else if(isset($properties['data_type'])) {
-                        $field_type=$properties['data_type'];
+                    else if (isset($properties['data_type'])) {
+                        $field_type = $properties['data_type'];
                     }
                     else {
-                        $field_type=$properties['dbtype'];
+                        $field_type = $properties['dbtype'];
                     }
                 }
 
                 //Because of bug #25078(sqlserver haven't 'date' type, trim extra "00:00:00" when insert into *_cstm table).
                 // so when we read the audit datetime field from sqlserver, we have to replace the extra "00:00:00" again.
-                if(!empty($field_type) && $field_type == 'date'){
-                    $before_value = $this->fromConvert($before_value , $field_type);
+                if (!empty($field_type) && $field_type == 'date') {
+                    $before_value = $this->fromConvert($before_value, $field_type);
                 }
                 //if the type and values match, do nothing.
-                if (!($this->_emptyValue($before_value,$field_type) && $this->_emptyValue($after_value,$field_type))) {
+                if (!($this->_emptyValue($before_value, $field_type) && $this->_emptyValue($after_value, $field_type))) {
                     $change = false;
                     if (trim($before_value) !== trim($after_value)) {
                         // Bug #42475: Don't directly compare numeric values, instead do the subtract and see if the comparison comes out to be "close enough", it is necessary for floating point numbers.
                         // Manual merge of fix 95727f2eed44852f1b6bce9a9eccbe065fe6249f from DBHelper
                         // This fix also fixes Bug #44624 in a more generic way and therefore eliminates the need for fix 0a55125b281c4bee87eb347709af462715f33d2d in DBHelper
                         if ($this->isNumericType($field_type)) {
-                            $numerator = abs(2*((trim($before_value)+0)-(trim($after_value)+0)));
-                            $denominator = abs(((trim($before_value)+0)+(trim($after_value)+0)));
+                            $numerator = abs(2 * ((trim($before_value) + 0) - (trim($after_value) + 0)));
+                            $denominator = abs(((trim($before_value) + 0) + (trim($after_value) + 0)));
                             // detect whether to use absolute or relative error. use absolute if denominator is zero to avoid division by zero
                             $error = ($denominator == 0) ? $numerator : $numerator / $denominator;
                             if ($error >= 0.0000000001) {    // Smaller than 10E-10
@@ -2911,7 +2911,7 @@ 
                             $change = true;
                         }
                         if ($change) {
-                            $changed_values[$field]=array('field_name'=>$field,
+                            $changed_values[$field] = array('field_name'=>$field,
                                 'data_type'=>$field_type,
                                 'before'=>$before_value,
                                 'after'=>$after_value);
@@ -2982,8 +2982,8 @@ 
      */
 	public function renameIndexDefs($old_definition, $new_definition, $table_name)
 	{
-		return array($this->add_drop_constraint($table_name,$old_definition,true),
-				$this->add_drop_constraint($table_name,$new_definition), false);
+		return array($this->add_drop_constraint($table_name, $old_definition, true),
+				$this->add_drop_constraint($table_name, $new_definition), false);
 	}
 
 	/**
@@ -3005,7 +3005,7 @@ 
 	protected function _getBooleanValue($val)
 	{
 		//need to put the === sign here otherwise true == 'non empty string'
-		if (empty($val) or $val==='off')
+		if (empty($val) or $val === 'off')
 			return false;
 
 		return true;
@@ -3018,7 +3018,7 @@ 
 	 */
 	public function isNumericType($type)
 	{
-	    if(isset($this->type_class[$type]) && ($this->type_class[$type] == 'int' || $this->type_class[$type] == 'float')) {
+	    if (isset($this->type_class[$type]) && ($this->type_class[$type] == 'int' || $this->type_class[$type] == 'float')) {
 	        return true;
 	    }
 		return false;
@@ -3035,7 +3035,7 @@ 
 		if (empty($val))
 			return true;
 
-		if($this->emptyValue($type) == $val) {
+		if ($this->emptyValue($type) == $val) {
 			return true;
 		}
 		switch ($type) {
@@ -3094,7 +3094,7 @@ 
 		$i = 0;
 		$order_by_arr = array();
 		foreach ($values as $key => $value) {
-			if($key == '') {
+			if ($key == '') {
 				$order_by_arr[] = "WHEN ($order_by='' OR $order_by IS NULL) THEN $i";
 			} else {
 				$order_by_arr[] = "WHEN $order_by=".$this->quoted($key)." THEN $i";
@@ -3112,7 +3112,7 @@ 
      */
 	public function emptyValue($type)
 	{
-		if(isset($this->type_class[$type]) && ($this->type_class[$type] == 'bool' || $this->type_class[$type] == 'int' || $this->type_class[$type] == 'float')) {
+		if (isset($this->type_class[$type]) && ($this->type_class[$type] == 'bool' || $this->type_class[$type] == 'int' || $this->type_class[$type] == 'float')) {
 			return 0;
 		}
 
@@ -3161,9 +3161,9 @@ 
      * @return resource|bool query result
      * @see DBManager::limitQuery()
 	 */
-	public function limitQuerySql($sql, $start, $count, $dieOnError=false, $msg='')
+	public function limitQuerySql($sql, $start, $count, $dieOnError = false, $msg = '')
 	{
-		return $this->limitQuery($sql,$start,$count,$dieOnError,$msg,false);
+		return $this->limitQuery($sql, $start, $count, $dieOnError, $msg, false);
 	}
 
 	/**
@@ -3182,7 +3182,7 @@ 
      */
 	public function checkPrivilege($privilege)
 	{
-		switch($privilege) {
+		switch ($privilege) {
 			case "CREATE TABLE":
 				$this->query("CREATE TABLE temp (id varchar(36))");
 				break;
@@ -3203,23 +3203,23 @@ 
 				break;
 			case "ADD COLUMN":
 				$test = array("test" => array("name" => "test", "type" => "varchar", "len" => 50));
-				$sql = 	$this->changeColumnSQL("temp", $test, "add");
+				$sql = $this->changeColumnSQL("temp", $test, "add");
 				$this->query($sql);
 				break;
 			case "CHANGE COLUMN":
 				$test = array("test" => array("name" => "test", "type" => "varchar", "len" => 100));
-				$sql = 	$this->changeColumnSQL("temp", $test, "modify");
+				$sql = $this->changeColumnSQL("temp", $test, "modify");
 				$this->query($sql);
 				break;
 			case "DROP COLUMN":
 				$test = array("test" => array("name" => "test", "type" => "varchar", "len" => 100));
-				$sql = 	$this->changeColumnSQL("temp", $test, "drop");
+				$sql = $this->changeColumnSQL("temp", $test, "drop");
 				$this->query($sql);
 				break;
 			default:
 				return false;
 		}
-		if($this->checkError("Checking privileges")) {
+		if ($this->checkError("Checking privileges")) {
 			return false;
 		}
 		return true;
@@ -3236,7 +3236,7 @@ 
 		$select_check = strpos(strtolower($query), strtolower("SELECT"));
 		//Checks to see if there is union select which is valid
 		$select_check2 = strpos(strtolower($query), strtolower("(SELECT"));
-		if($select_check==0 || $select_check2==0){
+		if ($select_check == 0 || $select_check2 == 0) {
 			//Returning false means query is ok!
 			return true;
 		}
@@ -3255,10 +3255,10 @@ 
 	public function parseFulltextQuery($query)
 	{
 		/* split on space or comma, double quotes with \ for escape */
-		if(strpbrk($query, " ,")) {
+		if (strpbrk($query, " ,")) {
 			// ("([^"]*?)"|[^" ,]+)((, )+)?
 			// '/([^" ,]+|".*?[^\\\\]")(,|\s)\s*/'
-			if(!preg_match_all('/("([^"]*?)"|[^"\s,]+)((,\s)+)?/', $query, $m)) {
+			if (!preg_match_all('/("([^"]*?)"|[^"\s,]+)((,\s)+)?/', $query, $m)) {
 				return false;
 			}
 			$qterms = $m[1];
@@ -3266,17 +3266,17 @@ 
 			$qterms = array($query);
 		}
 		$terms = $must_terms = $not_terms = array();
-		foreach($qterms as $item) {
-			if($item[0] == '"') {
+		foreach ($qterms as $item) {
+			if ($item[0] == '"') {
 				$item = trim($item, '"');
 			}
-			if($item[0] == '+') {
+			if ($item[0] == '+') {
                 if (strlen($item) > 1) {
                     $must_terms[] = substr($item, 1);
                 }
                 continue;
 			}
-			if($item[0] == '-') {
+			if ($item[0] == '-') {
                 if (strlen($item) > 1) {
 				    $not_terms[] = substr($item, 1);
                 }
@@ -3325,11 +3325,11 @@ 
 	public function verifySQLStatement($query, $skipTables)
 	{
 		$query = trim($query);
-		foreach($this->standardQueries as $qstart => $check) {
-			if(strncasecmp($qstart, $query, strlen($qstart)) == 0) {
-				if(is_callable(array($this, $check))) {
+		foreach ($this->standardQueries as $qstart => $check) {
+			if (strncasecmp($qstart, $query, strlen($qstart)) == 0) {
+				if (is_callable(array($this, $check))) {
 					$table = $this->extractTableName($query);
-					if(!in_array($table, $skipTables)) {
+					if (!in_array($table, $skipTables)) {
 						return call_user_func(array($this, $check), $table, $query);
 					} else {
 						$this->log->debug("Skipping table $table as blacklisted");
@@ -3358,20 +3358,20 @@ 
 		$tempname = $table."__uw_temp";
 		$tempTableQuery = str_replace("CREATE TABLE {$table}", "CREATE TABLE $tempname", $query);
 
-		if(strpos($tempTableQuery, '__uw_temp') === false) {
+		if (strpos($tempTableQuery, '__uw_temp') === false) {
 			return 'Could not use a temp table to test query!';
 		}
 
 		$this->query($tempTableQuery, false, "Preflight Failed for: {$query}");
 
 		$error = $this->lastError(); // empty on no-errors
-		if(!empty($error)) {
+		if (!empty($error)) {
 			return $error;
 		}
 
 		// check if table exists
 		$this->log->debug('testing for table: '.$table);
-		if(!$this->tableExists($tempname)) {
+		if (!$this->tableExists($tempname)) {
 			return "Failed to create temp table!";
 		}
 
@@ -3390,8 +3390,8 @@ 
 	public function queryArray(array $sqls, $dieOnError = false, $msg = '', $suppress = false)
 	{
 		$last = true;
-		foreach($sqls as $sql) {
-			if(!($last = $this->query($sql, $dieOnError, $msg, $suppress))) {
+		foreach ($sqls as $sql) {
+			if (!($last = $this->query($sql, $dieOnError, $msg, $suppress))) {
 				break;
 			}
 		}
@@ -3409,7 +3409,7 @@ 
 	{
 	    if (empty($result))	return false;
 
-	    if(is_int($encode) && func_num_args() == 3) {
+	    if (is_int($encode) && func_num_args() == 3) {
 	        // old API: $result, $rowNum, $encode
 	        $GLOBALS['log']->deprecated("Using row number in fetchByAssoc is not portable and no longer supported. Please fix your code.");
 	        $encode = func_get_arg(2);
@@ -3460,7 +3460,7 @@ 
 	 */
 	public function getOption($option)
 	{
-	    if(isset($this->options[$option])) {
+	    if (isset($this->options[$option])) {
 	        return $this->options[$option];
 	    }
 	    return null;
@@ -3500,7 +3500,7 @@ 
 	public function isDatabaseNameValid($name)
 	{
 		// Generic case - no slashes, no dots
-		return preg_match('#[/.\\\\]#', $name)==0;
+		return preg_match('#[/.\\\\]#', $name) == 0;
 	}
 
 	/**

install.php

Spacing +112 added lines, -112 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- if(!defined('sugarEntry'))define('sugarEntry', true);
+ if (!defined('sugarEntry'))define('sugarEntry', true);
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -39,7 +39,7 @@ 
  ********************************************************************************/
  
 @session_start();
-if(isset($_REQUEST['clear_session']) || !empty($_SESSION['loginAttempts'])) {
+if (isset($_REQUEST['clear_session']) || !empty($_SESSION['loginAttempts'])) {
 	session_destroy();
 	header('Location: install.php');
 	echo 'session clean, page refresh...';
@@ -47,17 +47,17 @@ 
 }
  
 //  recover smtp settings
-if(isset($_POST['smtp_tab_selected'])) {
+if (isset($_POST['smtp_tab_selected'])) {
     $_POST = array_merge($_POST, $_POST[$_POST['smtp_tab_selected']]);
 }
 
 //session_destroy();
-if (version_compare(phpversion(),'5.2.0') < 0) {
-	$msg = 'Minimum PHP version required is 5.2.0.  You are using PHP version  '. phpversion();
+if (version_compare(phpversion(), '5.2.0') < 0) {
+	$msg = 'Minimum PHP version required is 5.2.0.  You are using PHP version  '.phpversion();
     die($msg);
 }
 $session_id = session_id();
-if(empty($session_id)){
+if (empty($session_id)) {
 	@session_start();
 }
 $GLOBALS['installing'] = true;
@@ -78,7 +78,7 @@ 
 //check to see if the script files need to be rebuilt, add needed variables to request array
 $_REQUEST['root_directory'] = getcwd();
 $_REQUEST['js_rebuild_concat'] = 'rebuild';
-if(isset($_REQUEST['goto']) && $_REQUEST['goto'] != 'SilentInstall') {
+if (isset($_REQUEST['goto']) && $_REQUEST['goto'] != 'SilentInstall') {
     require_once('jssource/minify.php');
 }
 
@@ -87,7 +87,7 @@ 
 setPhpIniSettings();
 $locale = new Localization();
 
-if(get_magic_quotes_gpc() == 1) {
+if (get_magic_quotes_gpc() == 1) {
    $_REQUEST = array_map("stripslashes_checkstrings", $_REQUEST);
    $_POST = array_map("stripslashes_checkstrings", $_POST);
    $_GET = array_map("stripslashes_checkstrings", $_GET);
@@ -108,16 +108,16 @@ 
 
 ///////////////////////////////////////////////////////////////////////////////
 ////	INSTALLER LANGUAGE
-function getSupportedInstallLanguages(){
+function getSupportedInstallLanguages() {
 	$supportedLanguages = array(
 	'en_us'	=> 'English (US)',
 	);
-	if(file_exists('install/lang.config.php')){
+	if (file_exists('install/lang.config.php')) {
 		include('install/lang.config.php');
-		if(!empty($config['languages'])){
+		if (!empty($config['languages'])) {
 
-			foreach($config['languages'] as $k=>$v){
-				if(file_exists('install/language/' . $k . '.lang.php')){
+			foreach ($config['languages'] as $k=>$v) {
+				if (file_exists('install/language/'.$k.'.lang.php')) {
 					$supportedLanguages[$k] = $v;
 				}
 			}
@@ -129,10 +129,10 @@ 
 
 // after install language is selected, use that pack
 $default_lang = 'en_us';
-if(!isset($_POST['language']) && (!isset($_SESSION['language']) && empty($_SESSION['language']))) {
-	if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) && !empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+if (!isset($_POST['language']) && (!isset($_SESSION['language']) && empty($_SESSION['language']))) {
+	if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) && !empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
 		$lang = parseAcceptLanguage();
-		if(isset($supportedLanguages[$lang])) {
+		if (isset($supportedLanguages[$lang])) {
 			$_POST['language'] = $lang;
 		} else {
 			$_POST['language'] = $default_lang;
@@ -140,19 +140,19 @@ 
 	}
 }
 
-if(isset($_POST['language'])) {
-	$_SESSION['language'] = str_replace('-','_',$_POST['language']);
+if (isset($_POST['language'])) {
+	$_SESSION['language'] = str_replace('-', '_', $_POST['language']);
 }
 
 $current_language = isset($_SESSION['language']) ? $_SESSION['language'] : $default_lang;
 
-if(file_exists("install/language/{$current_language}.lang.php")) {
+if (file_exists("install/language/{$current_language}.lang.php")) {
 	require_once("install/language/{$current_language}.lang.php");
 } else {
 	require_once("install/language/{$default_lang}.lang.php");
 }
 
-if($current_language != 'en_us') {
+if ($current_language != 'en_us') {
 	$my_mod_strings = $mod_strings;
 	include('install/language/en_us.lang.php');
 	$mod_strings = sugarLangArrayMerge($mod_strings, $my_mod_strings);
@@ -166,40 +166,40 @@ 
 $help_url = get_help_button_url();
 
 //if this license print, then redirect and exit,
-if(isset($_REQUEST['page']) && $_REQUEST['page'] == 'licensePrint')
+if (isset($_REQUEST['page']) && $_REQUEST['page'] == 'licensePrint')
 {
     include('install/licensePrint.php');
     exit ();
 }
 
-if(isset($_REQUEST['sugar_body_only']) && $_REQUEST['sugar_body_only'] == "1") {
+if (isset($_REQUEST['sugar_body_only']) && $_REQUEST['sugar_body_only'] == "1") {
     //if this is a system check, then just run the check and return,
     //this is an ajax call and there is no need for further processing
 
-    if(isset($_REQUEST['uploadLogoFrame']) && ($_REQUEST['uploadLogoFrame'])){
+    if (isset($_REQUEST['uploadLogoFrame']) && ($_REQUEST['uploadLogoFrame'])) {
         echo 'I\'m an uploader iframe!';
         return;
     }
 
         // upload company logo
-    if(isset($_REQUEST['uploadLogo']) && ($_REQUEST['uploadLogo'])){
+    if (isset($_REQUEST['uploadLogo']) && ($_REQUEST['uploadLogo'])) {
         $filepath = '';
         $errors = array();
 
-        switch($_FILES['company_logo']['error']) {
+        switch ($_FILES['company_logo']['error']) {
 
             case UPLOAD_ERR_OK:
                 $allowedTypes = array(IMAGETYPE_PNG, IMAGETYPE_JPEG/*, IMAGETYPE_GIF */);
                 $detectedType = exif_imagetype($_FILES['company_logo']['tmp_name']);
-                if(!in_array($detectedType, $allowedTypes)) {
+                if (!in_array($detectedType, $allowedTypes)) {
                     $errors[] = $mod_strings['ERR_UPLOAD_FILETYPE'];
                 }
                 else {
                     // uploaded image stored in the /custom path instead of put into the original theme directory..
 
-                    mkdir_recursive('custom/' . SugarThemeRegistry::current()->getDefaultImagePath(), true);
+                    mkdir_recursive('custom/'.SugarThemeRegistry::current()->getDefaultImagePath(), true);
                     $tmpvar = explode('?', SugarThemeRegistry::current()->getImageURL('company_logo.png'));
-                    $destFile = 'custom/' . $tmpvar[0];
+                    $destFile = 'custom/'.$tmpvar[0];
                     if (!move_uploaded_file($_FILES['company_logo']['tmp_name'], $destFile)) {
                         $errors[] = $mod_strings['ERR_LANG_UPLOAD_1'];
                     }
@@ -247,13 +247,13 @@ 
 
         // TODO--low: validate file size & image width/height and save, show status result to client js
 
-        echo "<script>window.top.window.{$_REQUEST['callback']}(" . json_encode($result) . ");</script>";
+        echo "<script>window.top.window.{$_REQUEST['callback']}(".json_encode($result).");</script>";
         return;
     }
 
-    if(isset($_REQUEST['storeConfig']) && ($_REQUEST['storeConfig'])){
+    if (isset($_REQUEST['storeConfig']) && ($_REQUEST['storeConfig'])) {
         // store configuration by form to session
-        if(!isset($_SESSION)) session_start();
+        if (!isset($_SESSION)) session_start();
         $_SESSION = array_merge($_SESSION, $_POST);
 
         // TODO--low: don't forget the custom type install settings! validate here..
@@ -267,22 +267,22 @@ 
 //            $si_errors = true;
 //        }
 
-        if(!empty($sugar_config['dbconfig'])) {
+        if (!empty($sugar_config['dbconfig'])) {
             try {
                 $db = DBManagerFactory::getInstance();
                 $db->disconnect();
-            } catch (\Exception $e) {
-                $validation_errors[] = $mod_strings['LBL_DB_CONN_ERR'] . ': ' . $e->getMessage();
+            }catch (\Exception $e) {
+                $validation_errors[] = $mod_strings['LBL_DB_CONN_ERR'].': '.$e->getMessage();
             }
         }
 
         $errors = '';
-        if( isset($validation_errors) && is_array($validation_errors)){
-            if( count($validation_errors) > 0 ){
+        if (isset($validation_errors) && is_array($validation_errors)) {
+            if (count($validation_errors) > 0) {
                // $errors  = '<div id="errorMsgs">';
                 $errors .= '<p>'.$mod_strings['LBL_SITECFG_FIX_ERRORS'].'</p><ul>';
-                foreach( $validation_errors as $error ){
-                    $errors .= '<li class="error">' . $error . '</li>';
+                foreach ($validation_errors as $error) {
+                    $errors .= '<li class="error">'.$error.'</li>';
                 }
                 $errors .= '</ul>'; //</div>';
             }
@@ -292,7 +292,7 @@ 
         return;
     }
 
-    if(isset($_REQUEST['checkInstallSystem']) && ($_REQUEST['checkInstallSystem'])){
+    if (isset($_REQUEST['checkInstallSystem']) && ($_REQUEST['checkInstallSystem'])) {
         require_once('install/installSystemCheck.php');
         echo runCheck($install_script, $mod_strings);
         return;
@@ -300,7 +300,7 @@ 
 
     //if this is a DB Settings check, then just run the check and return,
     //this is an ajax call and there is no need for further processing
-    if(isset($_REQUEST['checkDBSettings']) && ($_REQUEST['checkDBSettings'])){
+    if (isset($_REQUEST['checkDBSettings']) && ($_REQUEST['checkDBSettings'])) {
         require_once('install/checkDBSettings.php');
         echo checkDBSettings();
         return;
@@ -308,13 +308,13 @@ 
 }
 
 //maintaining the install_type if earlier set to custom
-if(isset($_REQUEST['install_type']) && $_REQUEST['install_type'] == 'custom'){
+if (isset($_REQUEST['install_type']) && $_REQUEST['install_type'] == 'custom') {
 	$_SESSION['install_type'] = $_REQUEST['install_type'];
 }
 
 //set the default settings into session
-foreach($installer_defaults as $key =>$val){
-    if(!isset($_SESSION[$key])){
+foreach ($installer_defaults as $key =>$val) {
+    if (!isset($_SESSION[$key])) {
         $_SESSION[$key] = $val;
     }
 }
@@ -326,7 +326,7 @@ 
 $next_step = 0;
 
 // use a simple array to map out the steps of the installer page flow
-$workflow = array(  'welcome.php',
+$workflow = array('welcome.php',
                     'ready.php',
 
                     // TODO-g: remove these files..
@@ -339,9 +339,9 @@ 
 //$workflow[] = 'dbConfig_b.php';
 
 //define web root, which will be used as default for site_url
-if($_SERVER['SERVER_PORT']=='80'){
+if ($_SERVER['SERVER_PORT'] == '80') {
     $web_root = $_SERVER['SERVER_NAME'].$_SERVER['PHP_SELF'];
-}else{
+} else {
     $web_root = $_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].$_SERVER['PHP_SELF'];
 }
 $web_root = str_replace("/install.php", "", $web_root);
@@ -359,16 +359,16 @@ 
     }
 }
 
-if(empty($sugar_config['cache_dir']) && !empty($_SESSION['cache_dir'])) {
+if (empty($sugar_config['cache_dir']) && !empty($_SESSION['cache_dir'])) {
     $sugar_config['cache_dir'] = $_SESSION['cache_dir'];
 }
 
 // set the form's php var to the loaded config's var else default to sane settings
-if(!isset($_SESSION['setup_site_url'])  || empty($_SESSION['setup_site_url'])) {
-    if(isset($sugar_config['site_url']) && !empty($sugar_config['site_url'])) {
-        $_SESSION['setup_site_url']= $sugar_config['site_url'];
+if (!isset($_SESSION['setup_site_url']) || empty($_SESSION['setup_site_url'])) {
+    if (isset($sugar_config['site_url']) && !empty($sugar_config['site_url'])) {
+        $_SESSION['setup_site_url'] = $sugar_config['site_url'];
     } else {
-        $_SESSION['setup_site_url']= $web_root;
+        $_SESSION['setup_site_url'] = $web_root;
     }
 }
 
@@ -391,8 +391,8 @@ 
   //$workflow[] = 'confirmSettings.php';
 $workflow[] = 'performSetup.php';
 
-  if(!isset($_SESSION['oc_install']) ||  $_SESSION['oc_install'] == false){
-    if(isset($_SESSION['install_type'])  && !empty($_SESSION['install_type'])  && $_SESSION['install_type']=='custom'){
+  if (!isset($_SESSION['oc_install']) || $_SESSION['oc_install'] == false) {
+    if (isset($_SESSION['install_type']) && !empty($_SESSION['install_type']) && $_SESSION['install_type'] == 'custom') {
         //$workflow[] = 'download_patches.php';
         $workflow[] = 'download_modules.php';
     }
@@ -403,8 +403,8 @@ 
 
 
 // increment/decrement the workflow pointer
-if(!empty($_REQUEST['goto'])) {
-    switch($_REQUEST['goto']) {
+if (!empty($_REQUEST['goto'])) {
+    switch ($_REQUEST['goto']) {
         case $mod_strings['LBL_CHECKSYS_RECHECK']:
             $next_step = $_REQUEST['current_step'];
             break;
@@ -426,7 +426,7 @@ 
     }
 }
 // Add check here to see if a silent install config file exists; if so then launch silent installer
-elseif ( is_file('config_si.php') && empty($sugar_config['installer_locked'])) {
+elseif (is_file('config_si.php') && empty($sugar_config['installer_locked'])) {
 
 $langHeader = get_language_header();
 
@@ -471,13 +471,13 @@ 
 
 
 
-    $exclude_files = array('complete_install.php','register.php','download_modules.php');
+    $exclude_files = array('complete_install.php', 'register.php', 'download_modules.php');
 
-if(isset($next_step) && isset($workflow[$next_step]) && !in_array($workflow[$next_step],$exclude_files) && isset($sugar_config['installer_locked']) && $sugar_config['installer_locked'] == true) {
+if (isset($next_step) && isset($workflow[$next_step]) && !in_array($workflow[$next_step], $exclude_files) && isset($sugar_config['installer_locked']) && $sugar_config['installer_locked'] == true) {
     $the_file = 'installDisabled.php';
 	$disabled_title = $mod_strings['LBL_DISABLED_DESCRIPTION'];
 	$disabled_title_2 = $mod_strings['LBL_DISABLED_TITLE_2'];
-	$disabled_text =<<<EOQ
+	$disabled_text = <<<EOQ
 		<p>{$mod_strings['LBL_DISABLED_DESCRIPTION']}</p>
 		<pre>
 			'installer_locked' => false,
@@ -487,12 +487,12 @@ 
 		<p>{$mod_strings['LBL_DISABLED_HELP_1']} <a href="{$mod_strings['LBL_DISABLED_HELP_LNK']}" target="_blank">{$mod_strings['LBL_DISABLED_HELP_2']}</a>.</p>
 EOQ;
 }
-else{
+else {
 $validation_errors = array();
 // process the data posted
-if($next_clicked) {
+if ($next_clicked) {
 	// store the submitted data because the 'Next' button was clicked
-    switch($workflow[trim($_REQUEST['current_step'])]) {
+    switch ($workflow[trim($_REQUEST['current_step'])]) {
         case 'welcome.php':
         	$_SESSION['language'] = $_REQUEST['language'];
    			$_SESSION['setup_site_admin_user_name'] = 'admin';
@@ -503,25 +503,25 @@ 
 
 
            // eventually default all vars here, with overrides from config.php
-            if(is_readable('config.php')) {
+            if (is_readable('config.php')) {
             	global $sugar_config;
                 include_once('config.php');
             }
 
             $default_db_type = 'mysql';
 
-            if(!isset($_SESSION['setup_db_type'])) {
+            if (!isset($_SESSION['setup_db_type'])) {
                 $_SESSION['setup_db_type'] = empty($sugar_config['dbconfig']['db_type']) ? $default_db_type : $sugar_config['dbconfig']['db_type'];
             }
 
             break;
         //TODO--low: add this functionality to installConfig.php
         case 'installType.php':
-            $_SESSION['install_type']   = $_REQUEST['install_type'];
-            if(isset($_REQUEST['setup_license_key']) && !empty($_REQUEST['setup_license_key'])){
-                $_SESSION['setup_license_key']  = $_REQUEST['setup_license_key'];
+            $_SESSION['install_type'] = $_REQUEST['install_type'];
+            if (isset($_REQUEST['setup_license_key']) && !empty($_REQUEST['setup_license_key'])) {
+                $_SESSION['setup_license_key'] = $_REQUEST['setup_license_key'];
             }
-            $_SESSION['licenseKey_submitted']      = true;
+            $_SESSION['licenseKey_submitted'] = true;
 
 
 
@@ -530,39 +530,39 @@ 
         case 'installConfig.php':
 
         //case 'systemOptions.php':
-            if(isset($_REQUEST['setup_db_type'])) {
+            if (isset($_REQUEST['setup_db_type'])) {
               $_SESSION['setup_db_type'] = $_REQUEST['setup_db_type'];
             }
             $validation_errors = validate_systemOptions();
-            if(count($validation_errors) > 0) {
+            if (count($validation_errors) > 0) {
                 $next_step--;
             }
             //break;
 
         //case 'dbConfig_a.php':
             //validation is now done through ajax call to checkDBSettings.php
-            if(isset($_REQUEST['setup_db_drop_tables'])){
+            if (isset($_REQUEST['setup_db_drop_tables'])) {
                 $_SESSION['setup_db_drop_tables'] = $_REQUEST['setup_db_drop_tables'];
-                if($_SESSION['setup_db_drop_tables']=== true || $_SESSION['setup_db_drop_tables'] == 'true'){
+                if ($_SESSION['setup_db_drop_tables'] === true || $_SESSION['setup_db_drop_tables'] == 'true') {
                     $_SESSION['setup_db_create_database'] = false;
                 }
             }
             //break;
 
         //case 'siteConfig_a.php':
-            if(isset($_REQUEST['setup_site_url'])){$_SESSION['setup_site_url']          = $_REQUEST['setup_site_url'];}
-            if(isset($_REQUEST['setup_system_name'])){$_SESSION['setup_system_name']    = $_REQUEST['setup_system_name'];}
-            if(isset($_REQUEST['setup_db_collation'])) {
+            if (isset($_REQUEST['setup_site_url'])) {$_SESSION['setup_site_url']          = $_REQUEST['setup_site_url']; }
+            if (isset($_REQUEST['setup_system_name'])) {$_SESSION['setup_system_name']    = $_REQUEST['setup_system_name']; }
+            if (isset($_REQUEST['setup_db_collation'])) {
                 $_SESSION['setup_db_options']['collation'] = $_REQUEST['setup_db_collation'];
             }
             $_SESSION['setup_site_admin_user_name']             = $_REQUEST['setup_site_admin_user_name'];
             $_SESSION['setup_site_admin_password']              = $_REQUEST['setup_site_admin_password'];
             $_SESSION['setup_site_admin_password_retype']       = $_REQUEST['setup_site_admin_password_retype'];
-            $_SESSION['siteConfig_submitted']               = true;
+            $_SESSION['siteConfig_submitted'] = true;
 
             $validation_errors = array();
             $validation_errors = validate_siteConfig('a');
-            if(count($validation_errors) > 0 || $_REQUEST['goto'] == 'resend') {
+            if (count($validation_errors) > 0 || $_REQUEST['goto'] == 'resend') {
                 $next_step--;
             }
             //break;
@@ -570,56 +570,56 @@ 
         //case 'siteConfig_b.php':
             $_SESSION['setup_site_sugarbeet_automatic_checks'] = get_boolean_from_request('setup_site_sugarbeet_automatic_checks');
 
-            $_SESSION['setup_site_custom_session_path']     = get_boolean_from_request('setup_site_custom_session_path');
-            if($_SESSION['setup_site_custom_session_path']){
-                $_SESSION['setup_site_session_path']            = $_REQUEST['setup_site_session_path'];
-            }else{
+            $_SESSION['setup_site_custom_session_path'] = get_boolean_from_request('setup_site_custom_session_path');
+            if ($_SESSION['setup_site_custom_session_path']) {
+                $_SESSION['setup_site_session_path'] = $_REQUEST['setup_site_session_path'];
+            } else {
                 $_SESSION['setup_site_session_path'] = '';
             }
 
-            $_SESSION['setup_site_custom_log_dir']          = get_boolean_from_request('setup_site_custom_log_dir');
-            if($_SESSION['setup_site_custom_log_dir']){
-                $_SESSION['setup_site_log_dir']                 = $_REQUEST['setup_site_log_dir'];
-            }else{
+            $_SESSION['setup_site_custom_log_dir'] = get_boolean_from_request('setup_site_custom_log_dir');
+            if ($_SESSION['setup_site_custom_log_dir']) {
+                $_SESSION['setup_site_log_dir'] = $_REQUEST['setup_site_log_dir'];
+            } else {
                 $_SESSION['setup_site_log_dir'] = '.';
             }
 
-            $_SESSION['setup_site_specify_guid']            = get_boolean_from_request('setup_site_specify_guid');
-            if($_SESSION['setup_site_specify_guid']){
-                $_SESSION['setup_site_guid']                    = $_REQUEST['setup_site_guid'];
-            }else{
+            $_SESSION['setup_site_specify_guid'] = get_boolean_from_request('setup_site_specify_guid');
+            if ($_SESSION['setup_site_specify_guid']) {
+                $_SESSION['setup_site_guid'] = $_REQUEST['setup_site_guid'];
+            } else {
                 $_SESSION['setup_site_guid'] = '';
             }
-            $_SESSION['siteConfig_submitted']               = true;
-            if(isset($_REQUEST['setup_site_sugarbeet_anonymous_stats'])){
+            $_SESSION['siteConfig_submitted'] = true;
+            if (isset($_REQUEST['setup_site_sugarbeet_anonymous_stats'])) {
                 $_SESSION['setup_site_sugarbeet_anonymous_stats'] = get_boolean_from_request('setup_site_sugarbeet_anonymous_stats');
-            }else{
+            } else {
                 $_SESSION['setup_site_sugarbeet_anonymous_stats'] = 0;
             }
 
             $validation_errors = array();
             $validation_errors = validate_siteConfig('b');
-            if(count($validation_errors) > 0) {
+            if (count($validation_errors) > 0) {
                 $next_step--;
             }
             break;
 }
     }
 
-if($next_step == 9999) {
+if ($next_step == 9999) {
     $the_file = 'SilentInstall';
-}else if($next_step == 9191) {
-	$_SESSION['oc_server_url']	= $_REQUEST['oc_server_url'];
+} else if ($next_step == 9191) {
+	$_SESSION['oc_server_url'] = $_REQUEST['oc_server_url'];
     $_SESSION['oc_username']    = $_REQUEST['oc_username'];
     $_SESSION['oc_password']   	= $_REQUEST['oc_password'];
     $the_file = 'oc_convert.php';
 }
-else{
+else {
         $the_file = $workflow[$next_step];
 
 }
 
-switch($the_file) {
+switch ($the_file) {
     case 'welcome.php':
     case 'license.php':
 			//
@@ -630,7 +630,7 @@ 
 			unset($_SESSION['test_session']);
         @session_start();
 
-			if(!isset($_SESSION['test_session']))
+			if (!isset($_SESSION['test_session']))
 			{
                 $the_file = 'installDisabled.php';
 				// PHP.ini location -
@@ -641,14 +641,14 @@ 
             break;
 			}
         // check to see if installer has been disabled
-        if(is_readable('config.php') && (filesize('config.php') > 0)) {
+        if (is_readable('config.php') && (filesize('config.php') > 0)) {
             include_once('config.php');
 
-            if(!isset($sugar_config['installer_locked']) || $sugar_config['installer_locked'] == true) {
+            if (!isset($sugar_config['installer_locked']) || $sugar_config['installer_locked'] == true) {
                 $the_file = 'installDisabled.php';
 				$disabled_title = $mod_strings['LBL_DISABLED_DESCRIPTION'];
 				$disabled_title_2 = $mod_strings['LBL_DISABLED_TITLE_2'];
-				$disabled_text =<<<EOQ
+				$disabled_text = <<<EOQ
 					<p>{$mod_strings['LBL_DISABLED_DESCRIPTION']}</p>
 					<pre>
 						'installer_locked' => false,
@@ -659,7 +659,7 @@ 
 EOQ;
 		             //if this is an offline client installation but the conversion did not succeed,
 		            //then try to convert again
-					if(isset($sugar_config['disc_client']) && $sugar_config['disc_client'] == true && isset($sugar_config['oc_converted']) && $sugar_config['oc_converted'] == false) {
+					if (isset($sugar_config['disc_client']) && $sugar_config['disc_client'] == true && isset($sugar_config['oc_converted']) && $sugar_config['oc_converted'] == false) {
 			          header('Location: index.php?entryPoint=oc_convert&first_time=true');
 						exit ();
 		            }
@@ -689,22 +689,22 @@ 
         }
 
         $validation_errors = validate_dbConfig('a');
-        if(count($validation_errors) > 0) {
+        if (count($validation_errors) > 0) {
             $the_file = 'dbConfig_a.php';
             $si_errors = true;
         }
         $validation_errors = validate_siteConfig('a');
-        if(count($validation_errors) > 0) {
+        if (count($validation_errors) > 0) {
             $the_file = 'siteConfig_a.php';
             $si_errors = true;
         }
         $validation_errors = validate_siteConfig('b');
-        if(count($validation_errors) > 0) {
+        if (count($validation_errors) > 0) {
             $the_file = 'siteConfig_b.php';
             $si_errors = true;
         }
 
-        if(!$si_errors){
+        if (!$si_errors) {
             $the_file = 'performSetup.php';
         }
         require_once('jssource/minify.php');
@@ -734,13 +734,13 @@ 
         // check whether we're getting this request from a command line tool
         // we want to output brief messages if we're outputting to a command line tool
         $cli_mode = false;
-        if(isset($_REQUEST['cli']) && ($_REQUEST['cli'] == 'true')) {
+        if (isset($_REQUEST['cli']) && ($_REQUEST['cli'] == 'true')) {
             $_SESSION['cli'] = true;
             // if we have errors, just shoot them back now
-            if(count($validation_errors) > 0) {
-                foreach($validation_errors as $error) {
+            if (count($validation_errors) > 0) {
+                foreach ($validation_errors as $error) {
                     print($mod_strings['ERR_ERROR_GENERAL']."\n");
-                    print("    " . $error . "\n");
+                    print("    ".$error."\n");
                     print("Exit 1\n");
                     exit(1);
                 }
@@ -757,7 +757,7 @@ 
 
 // change to require to get a good file load error message if the file is not available.
 
-require('install/' . $the_file);
+require('install/'.$the_file);
 
 installerHook('post_installFileRequire', array('the_file' => $the_file));
 

modules/AOR_Reports/aor_utils.php

Spacing +7 added lines, -7 removed lines

@@ -62,7 +62,7 @@ 
     $fieldDisplay = $currentBean->field_name_map[$field]['vname'];
     $fieldDisplay = translate($fieldDisplay, $currentBean->module_dir);
     $fieldDisplay = trim($fieldDisplay, ':');
-    foreach($modulePathDisplay as &$module) {
+    foreach ($modulePathDisplay as &$module) {
         $module = isset($app_list_strings['aor_moduleList'][$module]) ? $app_list_strings['aor_moduleList'][$module] : (
             isset($app_list_strings['moduleList'][$module]) ? $app_list_strings['moduleList'][$module] : $module
         );
@@ -73,7 +73,7 @@ 
 function requestToUserParameters()
 {
     $params = array();
-    if(isset($_REQUEST['parameter_id']) && $_REQUEST['parameter_id']) {
+    if (isset($_REQUEST['parameter_id']) && $_REQUEST['parameter_id']) {
         foreach ($_REQUEST['parameter_id'] as $key => $parameterId) {
             if ($_REQUEST['parameter_type'][$key] === 'Multi') {
                 $_REQUEST['parameter_value'][$key] = encodeMultienumValue(explode(',', $_REQUEST['parameter_value'][$key]));
@@ -88,9 +88,9 @@ 
             if ($_REQUEST['parameter_type'][$key] === 'Date') {
                 $values = array();
                 $values[] = $_REQUEST['parameter_value'][0];
-                $values[] = $_REQUEST['parameter_value'][1];;
-                $values[] = $_REQUEST['parameter_value'][2];;
-                $values[] = $_REQUEST['parameter_value'][3];;
+                $values[] = $_REQUEST['parameter_value'][1]; ;
+                $values[] = $_REQUEST['parameter_value'][2]; ;
+                $values[] = $_REQUEST['parameter_value'][3]; ;
 
                 $params[$parameterId] = array(
                     'id' => $parameterId,
@@ -227,7 +227,7 @@ 
  */
 function getPeriodEndDate($dateTimePeriodListSelected)
 {
-    switch($dateTimePeriodListSelected) {
+    switch ($dateTimePeriodListSelected) {
         case 'today':
         case 'yesterday':
             $datetimePeriod = new DateTime();
@@ -327,7 +327,7 @@ 
     $offsetMonths -= 1;
     // Offset months
     if ($offsetMonths > 0) {
-        $q1start->add(new DateInterval('P' . $offsetMonths . 'M'));
+        $q1start->add(new DateInterval('P'.$offsetMonths.'M'));
     }
     $q1end = DateTime::createFromFormat(DATE_ISO8601, $q1start->format(DATE_ISO8601));
     $q1end->add(new DateInterval('P2M'));

modules/AM_ProjectTemplates/controller.php

Spacing +9 added lines, -9 removed lines

@@ -19,11 +19,11 @@ 
  * @author Andrew Mclaughlan <andrew@mclaughlan.info>
  */
 
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 class AM_ProjectTemplatesController extends SugarController {
 
-    function action_create_project(){
+    function action_create_project() {
 
         global $current_user, $db;
 
@@ -31,7 +31,7 @@ 
         $template_id = $_POST['template_id'];
         $project_start = $_POST['start_date'];
         //Get project start date
-		if($project_start!='')
+		if ($project_start != '')
 		{
 			$dateformat = $current_user->getPreference('datef');
 			$startdate = DateTime::createFromFormat($dateformat, $project_start);
@@ -73,8 +73,8 @@ 
                         ORDER BY am_tasktemplates.order_number ASC";
         $tasks = $db->query($get_tasks);
         //Create new project tasks from the template tasks
-        $count=1;
-        while($row = $db->fetchByAssoc($tasks))
+        $count = 1;
+        while ($row = $db->fetchByAssoc($tasks))
         {
             $project_task = new ProjectTask();
             $project_task->name = $row['name'];
@@ -95,18 +95,18 @@ 
             //Flag to prevent after save logichook running when project_tasks are created (see custom/modules/ProjectTask/updateProject.php)
             $project_task->set_project_end_date = 0;
 
-            if($count == '1'){
+            if ($count == '1') {
                 $project_task->date_start = $start;
                 $enddate = $startdate->modify('+'.$row['duration'].' '.$duration_unit);
                 $end = $enddate->format('Y-m-d');
                 $project_task->date_finish = $end;
                 $enddate_array[$count] = $end;
-                $GLOBALS['log']->fatal("DATE:". $end);
+                $GLOBALS['log']->fatal("DATE:".$end);
             }
             else {
                 $start_date = $count - 1;
                 $startdate = DateTime::createFromFormat('Y-m-d', $enddate_array[$start_date]);
-                $GLOBALS['log']->fatal("DATE:". $enddate_array[$start_date]);
+                $GLOBALS['log']->fatal("DATE:".$enddate_array[$start_date]);
                 $start = $startdate->format('Y-m-d');
                 $project_task->date_start = $start;
                 $enddate = $startdate->modify('+'.$row['duration'].' '.$duration_unit);
@@ -136,7 +136,7 @@ 
             'action'=>'DetailView',
             'record' => $project->id,
         );
-        SugarApplication::redirect('index.php?' . http_build_query($params));
+        SugarApplication::redirect('index.php?'.http_build_query($params));
     }
 
 }

modules/EmailTemplates/PopupDocumentsCampaignTemplate.php

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -55,7 +55,7 @@ 
 
 	public function _get_where_clause() {
 		$where = '';
-		if(isset($_REQUEST['query']))
+		if (isset($_REQUEST['query']))
 		{
 			$where_clauses = array();
 			append_where_clause($where_clauses, "document_name", "documents.document_name");
@@ -98,8 +98,8 @@ 
 
 
 $hide_clear_button = empty($_REQUEST['hide_clear_button']) ? false : true;
-$button  = "<form action='index.php' method='post' name='form' id='form'>\n";
-if(!$hide_clear_button)
+$button = "<form action='index.php' method='post' name='form' id='form'>\n";
+if (!$hide_clear_button)
 {
 	$button .= "<input type='button' name='button' class='button' onclick=\"send_back('','');\" title='"
 		.$app_strings['LBL_CLEAR_BUTTON_TITLE']."' value='  "
@@ -119,7 +119,7 @@ 
 $form->assign('MODULE_NAME', $currentModule);
 $form->assign('NAME', $name);
 $form->assign('DOCUMENT_NAME', $document_name);
-if(isset($_REQUEST['target'])) $form->assign('DOCUMENT_TARGET', $_REQUEST['target']);
+if (isset($_REQUEST['target'])) $form->assign('DOCUMENT_TARGET', $_REQUEST['target']);
 else $form->assign('DOCUMENT_TARGET', '');
 
 $form->assign('DOCUMENT_REVISION_ID', $document_revision_id);

data/SugarBean.php

Spacing +207 added lines, -207 removed lines

@@ -311,17 +311,17 @@ 
                     $this->optimistic_lock = true;
                 }
             }
-            $loaded_defs[$this->object_name]['column_fields'] =& $this->column_fields;
-            $loaded_defs[$this->object_name]['list_fields'] =& $this->list_fields;
-            $loaded_defs[$this->object_name]['required_fields'] =& $this->required_fields;
-            $loaded_defs[$this->object_name]['field_name_map'] =& $this->field_name_map;
-            $loaded_defs[$this->object_name]['field_defs'] =& $this->field_defs;
+            $loaded_defs[$this->object_name]['column_fields'] = & $this->column_fields;
+            $loaded_defs[$this->object_name]['list_fields'] = & $this->list_fields;
+            $loaded_defs[$this->object_name]['required_fields'] = & $this->required_fields;
+            $loaded_defs[$this->object_name]['field_name_map'] = & $this->field_name_map;
+            $loaded_defs[$this->object_name]['field_defs'] = & $this->field_defs;
         } else {
-            $this->column_fields =& $loaded_defs[$this->object_name]['column_fields'];
-            $this->list_fields =& $loaded_defs[$this->object_name]['list_fields'];
-            $this->required_fields =& $loaded_defs[$this->object_name]['required_fields'];
-            $this->field_name_map =& $loaded_defs[$this->object_name]['field_name_map'];
-            $this->field_defs =& $loaded_defs[$this->object_name]['field_defs'];
+            $this->column_fields = & $loaded_defs[$this->object_name]['column_fields'];
+            $this->list_fields = & $loaded_defs[$this->object_name]['list_fields'];
+            $this->required_fields = & $loaded_defs[$this->object_name]['required_fields'];
+            $this->field_name_map = & $loaded_defs[$this->object_name]['field_name_map'];
+            $this->field_defs = & $loaded_defs[$this->object_name]['field_defs'];
             $this->added_custom_field_defs = true;
 
             if (!isset($this->custom_fields) &&
@@ -343,9 +343,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function SugarBean(){
+    public function SugarBean() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -457,14 +457,14 @@ 
     {
         //load the module dictionary if not supplied.
         if ((!isset($dictionary) or empty($dictionary)) && !empty($module_dir)) {
-            $filename = 'modules/' . $module_dir . '/vardefs.php';
+            $filename = 'modules/'.$module_dir.'/vardefs.php';
             if (file_exists($filename)) {
                 include($filename);
             }
         }
         if (!is_array($dictionary) or !array_key_exists($key, $dictionary)) {
-            $GLOBALS['log']->fatal("removeRelationshipMeta: Metadata for table " . $tablename . " does not exist");
-            display_notice("meta data absent for table " . $tablename . " keyed to $key ");
+            $GLOBALS['log']->fatal("removeRelationshipMeta: Metadata for table ".$tablename." does not exist");
+            display_notice("meta data absent for table ".$tablename." keyed to $key ");
         } else {
             if (isset($dictionary[$key]['relationships'])) {
                 $RelationshipDefs = $dictionary[$key]['relationships'];
@@ -495,7 +495,7 @@ 
         //load the module dictionary if not supplied.
         if (empty($dictionary) && !empty($module_dir)) {
             if ($is_custom) {
-                $filename = 'custom/modules/' . $module_dir . '/Ext/Vardefs/vardefs.ext.php';
+                $filename = 'custom/modules/'.$module_dir.'/Ext/Vardefs/vardefs.ext.php';
             } else {
                 if ($key == 'User') {
                     // a very special case for the Employees module
@@ -503,7 +503,7 @@ 
                     // Users/vardefs.php
                     $filename = 'modules/Users/vardefs.php';
                 } else {
-                    $filename = 'modules/' . $module_dir . '/vardefs.php';
+                    $filename = 'modules/'.$module_dir.'/vardefs.php';
                 }
             }
 
@@ -514,14 +514,14 @@ 
                     $dictionary = $GLOBALS['dictionary'];
                 }
             } else {
-                $GLOBALS['log']->debug("createRelationshipMeta: no metadata file found" . $filename);
+                $GLOBALS['log']->debug("createRelationshipMeta: no metadata file found".$filename);
                 return;
             }
         }
 
         if (!is_array($dictionary) or !array_key_exists($key, $dictionary)) {
-            $GLOBALS['log']->fatal("createRelationshipMeta: Metadata for table " . $tablename . " does not exist");
-            display_notice("meta data absent for table " . $tablename . " keyed to $key ");
+            $GLOBALS['log']->fatal("createRelationshipMeta: Metadata for table ".$tablename." does not exist");
+            display_notice("meta data absent for table ".$tablename." keyed to $key ");
         } else {
             if (isset($dictionary[$key]['relationships'])) {
                 $RelationshipDefs = $dictionary[$key]['relationships'];
@@ -530,18 +530,18 @@ 
                 $beanList_ucase = array_change_key_case($beanList, CASE_UPPER);
                 foreach ($RelationshipDefs as $rel_name => $rel_def) {
                     if (isset($rel_def['lhs_module']) and !isset($beanList_ucase[strtoupper($rel_def['lhs_module'])])) {
-                        $GLOBALS['log']->debug('skipping orphaned relationship record ' . $rel_name . ' lhs module is missing ' . $rel_def['lhs_module']);
+                        $GLOBALS['log']->debug('skipping orphaned relationship record '.$rel_name.' lhs module is missing '.$rel_def['lhs_module']);
                         continue;
                     }
                     if (isset($rel_def['rhs_module']) and !isset($beanList_ucase[strtoupper($rel_def['rhs_module'])])) {
-                        $GLOBALS['log']->debug('skipping orphaned relationship record ' . $rel_name . ' rhs module is missing ' . $rel_def['rhs_module']);
+                        $GLOBALS['log']->debug('skipping orphaned relationship record '.$rel_name.' rhs module is missing '.$rel_def['rhs_module']);
                         continue;
                     }
 
 
                     //check whether relationship exists or not first.
                     if (Relationship::exists($rel_name, $db)) {
-                        $GLOBALS['log']->debug('Skipping, relationship already exists ' . $rel_name);
+                        $GLOBALS['log']->debug('Skipping, relationship already exists '.$rel_name);
                     } else {
                         $seed = BeanFactory::getBean("Relationships");
                         $keys = array_keys($seed->field_defs);
@@ -559,10 +559,10 @@ 
 
 
                         $column_list = implode(",", array_keys($toInsert));
-                        $value_list = "'" . implode("','", array_values($toInsert)) . "'";
+                        $value_list = "'".implode("','", array_values($toInsert))."'";
 
                         //create the record. todo add error check.
-                        $insert_string = "INSERT into relationships (" . $column_list . ") values (" . $value_list . ")";
+                        $insert_string = "INSERT into relationships (".$column_list.") values (".$value_list.")";
                         $db->query($insert_string, true);
                     }
                 }
@@ -638,11 +638,11 @@ 
                     $tmp_final_query = $parentbean->$shortcut_function_name();
                 }
                 if (!$first) {
-                    $final_query_rows .= ' UNION ALL ( ' . $parentbean->create_list_count_query($tmp_final_query, $parameters) . ' )';
-                    $final_query .= ' UNION ALL ( ' . $tmp_final_query . ' )';
+                    $final_query_rows .= ' UNION ALL ( '.$parentbean->create_list_count_query($tmp_final_query, $parameters).' )';
+                    $final_query .= ' UNION ALL ( '.$tmp_final_query.' )';
                 } else {
-                    $final_query_rows = '(' . $parentbean->create_list_count_query($tmp_final_query, $parameters) . ')';
-                    $final_query = '(' . $tmp_final_query . ')';
+                    $final_query_rows = '('.$parentbean->create_list_count_query($tmp_final_query, $parameters).')';
+                    $final_query = '('.$tmp_final_query.')';
                     $first = false;
                 }
             }
@@ -673,32 +673,32 @@ 
                 }
                 $subquery['select'] = substr($subquery['select'], 0, strlen($subquery['select']) - 1);
                 //Put the query into the final_query
-                $query = $subquery['select'] . " " . $subquery['from'] . " " . $subquery['where'];
+                $query = $subquery['select']." ".$subquery['from']." ".$subquery['where'];
                 if (!$first) {
-                    $query = ' UNION ALL ( ' . $query . ' )';
+                    $query = ' UNION ALL ( '.$query.' )';
                     $final_query_rows .= " UNION ALL ";
                 } else {
-                    $query = '(' . $query . ')';
+                    $query = '('.$query.')';
                     $first = false;
                 }
                 $query_array = $subquery['query_array'];
                 $select_position = strpos($query_array['select'], "SELECT");
                 $distinct_position = strpos($query_array['select'], "DISTINCT");
                 if (!empty($subquery['params']['distinct']) && !empty($subpanel_def->table_name)) {
-                    $query_rows = "( SELECT count(DISTINCT " . $subpanel_def->table_name . ".id)" . $subquery['from_min'] . $query_array['join'] . $subquery['where'] . ' )';
+                    $query_rows = "( SELECT count(DISTINCT ".$subpanel_def->table_name.".id)".$subquery['from_min'].$query_array['join'].$subquery['where'].' )';
                 } elseif ($select_position !== false && $distinct_position != false) {
-                    $query_rows = "( " . substr_replace($query_array['select'], "SELECT count(", $select_position, 6) . ")" . $subquery['from_min'] . $query_array['join'] . $subquery['where'] . ' )';
+                    $query_rows = "( ".substr_replace($query_array['select'], "SELECT count(", $select_position, 6).")".$subquery['from_min'].$query_array['join'].$subquery['where'].' )';
                 } else {
                     //resort to default behavior.
-                    $query_rows = "( SELECT count(*)" . $subquery['from_min'] . $query_array['join'] . $subquery['where'] . ' )';
+                    $query_rows = "( SELECT count(*)".$subquery['from_min'].$query_array['join'].$subquery['where'].' )';
                 }
                 if (!empty($subquery['secondary_select'])) {
-                    $subquerystring = $subquery['secondary_select'] . $subquery['secondary_from'] . $query_array['join'] . $subquery['where'];
+                    $subquerystring = $subquery['secondary_select'].$subquery['secondary_from'].$query_array['join'].$subquery['where'];
                     if (!empty($subquery['secondary_where'])) {
                         if (empty($subquery['where'])) {
-                            $subquerystring .= " WHERE " . $subquery['secondary_where'];
+                            $subquerystring .= " WHERE ".$subquery['secondary_where'];
                         } else {
-                            $subquerystring .= " AND " . $subquery['secondary_where'];
+                            $subquerystring .= " AND ".$subquery['secondary_where'];
                         }
                     }
                     $secondary_queries[] = $subquerystring;
@@ -721,12 +721,12 @@ 
             }
 
             if (!empty($sort_order)) {
-                $order_by .= ' ' . $sort_order;
+                $order_by .= ' '.$sort_order;
             }
 
             $order_by = $parentbean->process_order_by($order_by, $submodule, $suppress_table_name);
             if (!empty($order_by)) {
-                $final_query .= ' ORDER BY ' . $order_by;
+                $final_query .= ' ORDER BY '.$order_by;
             }
         }
 
@@ -794,7 +794,7 @@ 
                     if (empty($where_definition)) {
                         $where_definition = $table_where;
                     } else {
-                        $where_definition .= ' AND ' . $table_where;
+                        $where_definition .= ' AND '.$table_where;
                     }
                 }
 
@@ -815,7 +815,7 @@ 
 
 
                 if (!$subpanel_def->isCollection() && isset($list_fields[$order_by]) && isset($submodule->field_defs[$order_by]) && (!isset($submodule->field_defs[$order_by]['source']) || $submodule->field_defs[$order_by]['source'] == 'db')) {
-                    $order_by = $submodule->table_name . '.' . $order_by;
+                    $order_by = $submodule->table_name.'.'.$order_by;
                 }
                 $table_name = $this_subpanel->table_name;
                 $panel_name = $this_subpanel->name;
@@ -831,8 +831,8 @@ 
 
                 $subquery = $submodule->create_new_list_query('', $subwhere, $list_fields, $params, 0, '', true, $parentbean, $singleSelect);
 
-                $subquery['select'] = $subquery['select'] . " , '$panel_name' panel_name ";
-                $subquery['from'] = $subquery['from'] . $query_array['join'];
+                $subquery['select'] = $subquery['select']." , '$panel_name' panel_name ";
+                $subquery['from'] = $subquery['from'].$query_array['join'];
                 $subquery['query_array'] = $query_array;
                 $subquery['params'] = $params;
 
@@ -870,7 +870,7 @@ 
         $use_count_query = false;
         $processing_collection = $subpanel_def->isCollection();
 
-        $GLOBALS['log']->debug("process_union_list_query: " . $query);
+        $GLOBALS['log']->debug("process_union_list_query: ".$query);
         if ($max_per_page == -1) {
             $max_per_page = $sugar_config['list_max_entries_per_subpanel'];
         }
@@ -947,9 +947,9 @@ 
                         if (isset($row[$field])) {
                             $current_bean->$field = $this->convertField($row[$field], $value);
                             unset($row[$field]);
-                        } elseif (isset($row[$this->table_name . '.' . $field])) {
-                            $current_bean->$field = $this->convertField($row[$this->table_name . '.' . $field], $value);
-                            unset($row[$this->table_name . '.' . $field]);
+                        } elseif (isset($row[$this->table_name.'.'.$field])) {
+                            $current_bean->$field = $this->convertField($row[$this->table_name.'.'.$field], $value);
+                            unset($row[$this->table_name.'.'.$field]);
                         } else {
                             $current_bean->$field = "";
                             unset($row[$field]);
@@ -1116,7 +1116,7 @@ 
                         $class = $beanList[$child_info['parent_type']];
                         // Added to avoid error below; just silently fail and write message to log
                         if (empty($beanFiles[$class])) {
-                            $GLOBALS['log']->error($this->object_name . '::retrieve_parent_fields() - cannot load class "' . $class . '", skip loading.');
+                            $GLOBALS['log']->error($this->object_name.'::retrieve_parent_fields() - cannot load class "'.$class.'", skip loading.');
                             continue;
                         }
                         require_once($beanFiles[$class]);
@@ -1127,7 +1127,7 @@ 
                         $queries[$child_info['parent_type']] = "SELECT id ";
                         $field_def = $templates[$child_info['parent_type']]->field_defs['name'];
                         if (isset($field_def['db_concat_fields'])) {
-                            $queries[$child_info['parent_type']] .= ' , ' . $this->db->concat($templates[$child_info['parent_type']]->table_name, $field_def['db_concat_fields']) . ' parent_name';
+                            $queries[$child_info['parent_type']] .= ' , '.$this->db->concat($templates[$child_info['parent_type']]->table_name, $field_def['db_concat_fields']).' parent_name';
                         } else {
                             $queries[$child_info['parent_type']] .= ' , name parent_name';
                         }
@@ -1137,7 +1137,7 @@ 
                         } elseif (isset($templates[$child_info['parent_type']]->field_defs['created_by'])) {
                             $queries[$child_info['parent_type']] .= ", created_by parent_name_owner, '{$child_info['parent_type']}' parent_name_mod";
                         }
-                        $queries[$child_info['parent_type']] .= " FROM " . $templates[$child_info['parent_type']]->table_name . " WHERE id IN ('{$child_info['parent_id']}'";
+                        $queries[$child_info['parent_type']] .= " FROM ".$templates[$child_info['parent_type']]->table_name." WHERE id IN ('{$child_info['parent_id']}'";
                     } else {
                         if (empty($parent_child_map[$child_info['parent_id']])) {
                             $queries[$child_info['parent_type']] .= " ,'{$child_info['parent_id']}'";
@@ -1149,7 +1149,7 @@ 
         }
         $results = array();
         foreach ($queries as $query) {
-            $result = $this->db->query($query . ')');
+            $result = $this->db->query($query.')');
             while ($row = $this->db->fetchByAssoc($result)) {
                 $results[$row['id']] = $row;
             }
@@ -1234,7 +1234,7 @@ 
      */
     public function get_custom_table_name()
     {
-        return $this->getTableName() . '_cstm';
+        return $this->getTableName().'_cstm';
     }
 
     /**
@@ -1474,7 +1474,7 @@ 
      */
     public function load_relationship($rel_name)
     {
-        $GLOBALS['log']->debug("SugarBean[{$this->object_name}].load_relationships, Loading relationship (" . $rel_name . ").");
+        $GLOBALS['log']->debug("SugarBean[{$this->object_name}].load_relationships, Loading relationship (".$rel_name.").");
 
         if (empty($rel_name)) {
             $GLOBALS['log']->error("SugarBean.load_relationships, Null relationship name passed.");
@@ -1509,7 +1509,7 @@ 
                 return true;
             }
         }
-        $GLOBALS['log']->debug("SugarBean.load_relationships, Error Loading relationship (" . $rel_name . ")");
+        $GLOBALS['log']->debug("SugarBean.load_relationships, Error Loading relationship (".$rel_name.")");
         return false;
     }
 
@@ -1616,7 +1616,7 @@ 
                         $idField = $value_array['id_name'];
                         if (isset($fieldDefs[$idField]) && isset($fieldDefs[$idField]['type']) && $fieldDefs[$idField]['type'] == 'link') {
                             $tmpFieldDefs = $fieldDefs[$idField];
-                            $tmpFieldDefs['vname'] = translate($value_array['vname'], $this->module_dir) . " " . $GLOBALS['app_strings']['LBL_ID'];
+                            $tmpFieldDefs['vname'] = translate($value_array['vname'], $this->module_dir)." ".$GLOBALS['app_strings']['LBL_ID'];
                             $importableFields[$idField] = $tmpFieldDefs;
                         }
                     }
@@ -1640,8 +1640,8 @@ 
 
         $key = $this->getObjectName();
         if (!array_key_exists($key, $dictionary)) {
-            $GLOBALS['log']->fatal("create_tables: Metadata for table " . $this->table_name . " does not exist");
-            display_notice("meta data absent for table " . $this->table_name . " keyed to $key ");
+            $GLOBALS['log']->fatal("create_tables: Metadata for table ".$this->table_name." does not exist");
+            display_notice("meta data absent for table ".$this->table_name." keyed to $key ");
         } else {
             if (!$this->db->tableExists($this->table_name)) {
                 $this->db->createTable($this);
@@ -1702,7 +1702,7 @@ 
      */
     public function get_audit_table_name()
     {
-        return $this->getTableName() . '_audit';
+        return $this->getTableName().'_audit';
     }
 
     /**
@@ -1720,7 +1720,7 @@ 
         require('metadata/audit_templateMetaData.php');
 
         // Bug: 52583 Need ability to customize template for audit tables
-        $custom = 'custom/metadata/audit_templateMetaData_' . $this->getTableName() . '.php';
+        $custom = 'custom/metadata/audit_templateMetaData_'.$this->getTableName().'.php';
         if (file_exists($custom)) {
             require($custom);
         }
@@ -1730,7 +1730,7 @@ 
 
         // Renaming template indexes to fit the particular audit table (removed the brittle hard coding)
         foreach ($indices as $nr => $properties) {
-            $indices[$nr]['name'] = 'idx_' . strtolower($this->getTableName()) . '_' . $properties['name'];
+            $indices[$nr]['name'] = 'idx_'.strtolower($this->getTableName()).'_'.$properties['name'];
         }
 
         $engine = null;
@@ -1754,8 +1754,8 @@ 
         global $dictionary;
         $key = $this->getObjectName();
         if (!array_key_exists($key, $dictionary)) {
-            $GLOBALS['log']->fatal("drop_tables: Metadata for table " . $this->table_name . " does not exist");
-            echo "meta data absent for table " . $this->table_name . "<br>\n";
+            $GLOBALS['log']->fatal("drop_tables: Metadata for table ".$this->table_name." does not exist");
+            echo "meta data absent for table ".$this->table_name."<br>\n";
         } else {
             if (empty($this->table_name)) {
                 return;
@@ -1763,8 +1763,8 @@ 
             if ($this->db->tableExists($this->table_name)) {
                 $this->db->dropTable($this);
             }
-            if ($this->db->tableExists($this->table_name . '_cstm')) {
-                $this->db->dropTableName($this->table_name . '_cstm');
+            if ($this->db->tableExists($this->table_name.'_cstm')) {
+                $this->db->dropTableName($this->table_name.'_cstm');
                 DynamicField::deleteCache();
             }
             if ($this->db->tableExists($this->get_audit_table_name())) {
@@ -2059,7 +2059,7 @@ 
                     break;
             }
             if ($reformatted) {
-                $GLOBALS['log']->deprecated('Formatting correction: ' . $this->module_dir . '->' . $field . ' had formatting automatically corrected. This will be removed in the future, please upgrade your external code');
+                $GLOBALS['log']->deprecated('Formatting correction: '.$this->module_dir.'->'.$field.' had formatting automatically corrected. This will be removed in the future, please upgrade your external code');
             }
         }
     }
@@ -2101,7 +2101,7 @@ 
                     $_SESSION['o_lock_object'] = $this->toArray();
                     $saveform = "<form name='save' id='save' method='POST'>";
                     foreach ($_POST as $key => $arg) {
-                        $saveform .= "<input type='hidden' name='" . addslashes($key) . "' value='" . addslashes($arg) . "'>";
+                        $saveform .= "<input type='hidden' name='".addslashes($key)."' value='".addslashes($arg)."'>";
                     }
                     $saveform .= "</form><script>document.getElementById('save').submit();</script>";
                     $_SESSION['o_lock_save'] = $saveform;
@@ -2281,7 +2281,7 @@ 
                     if ($rel_name == $new_rel_link && $this->$id != $new_rel_id) {
                         $new_rel_id = '';
                     }
-                    $GLOBALS['log']->debug('save_relationship_changes(): From relationship_field array - adding a relationship record: ' . $rel_name . ' = ' . $this->$id);
+                    $GLOBALS['log']->debug('save_relationship_changes(): From relationship_field array - adding a relationship record: '.$rel_name.' = '.$this->$id);
                     //already related the new relationship id so let's set it to false so we don't add it again using the _REQUEST['relate_i'] mechanism in a later block
                     $this->load_relationship($rel_name);
                     $rel_add = $this->$rel_name->add($this->$id);
@@ -2292,7 +2292,7 @@ 
                 } else {
                     //if before value is not empty then attempt to delete relationship
                     if (!empty($this->rel_fields_before_value[$id])) {
-                        $GLOBALS['log']->debug('save_relationship_changes(): From relationship_field array - attempting to remove the relationship record, using relationship attribute' . $rel_name);
+                        $GLOBALS['log']->debug('save_relationship_changes(): From relationship_field array - attempting to remove the relationship record, using relationship attribute'.$rel_name);
                         $this->load_relationship($rel_name);
                         $this->$rel_name->delete($this->id, $this->rel_fields_before_value[$id]);
                     }
@@ -2342,7 +2342,7 @@ 
                             } else {
                                 $modified_relationships['remove']['failure'][] = $linkField;
                             }
-                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - attempting to remove the relationship record returned " . var_export($success, true));
+                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - attempting to remove the relationship record returned ".var_export($success, true));
                         }
 
                         if (!empty($this->$idName) && is_string($this->$idName)) {
@@ -2357,7 +2357,7 @@ 
                                 $modified_relationships['add']['failure'][] = $linkField;
                             }
 
-                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - add a relationship record returned " . var_export($success, true));
+                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - add a relationship record returned ".var_export($success, true));
                         }
                     } else {
                         $GLOBALS['log']->fatal("Failed to load relationship {$linkField} while saving {$this->module_dir}");
@@ -2741,10 +2741,10 @@ 
             $template_name = "Default";
         }
         if (!empty($_SESSION["special_notification"]) && $_SESSION["special_notification"]) {
-            $template_name = $beanList[$this->module_dir] . 'Special';
+            $template_name = $beanList[$this->module_dir].'Special';
         }
         if ($this->special_notification) {
-            $template_name = $beanList[$this->module_dir] . 'Special';
+            $template_name = $beanList[$this->module_dir].'Special';
         }
         $xtpl->assign("ASSIGNED_USER", $this->new_assigned_user_name);
         $xtpl->assign("ASSIGNER", $current_user->name);
@@ -2755,17 +2755,17 @@ 
             $parsedSiteUrl['port'] = 80;
         }
 
-        $port = ($parsedSiteUrl['port'] != 80) ? ":" . $parsedSiteUrl['port'] : '';
+        $port = ($parsedSiteUrl['port'] != 80) ? ":".$parsedSiteUrl['port'] : '';
         $path = !empty($parsedSiteUrl['path']) ? $parsedSiteUrl['path'] : "";
         $cleanUrl = "{$parsedSiteUrl['scheme']}://{$host}{$port}{$path}";
 
-        $xtpl->assign("URL", $cleanUrl . "/index.php?module={$this->module_dir}&action=DetailView&record={$this->id}");
+        $xtpl->assign("URL", $cleanUrl."/index.php?module={$this->module_dir}&action=DetailView&record={$this->id}");
         $xtpl->assign("SUGAR", "Sugar v{$sugar_version}");
         $xtpl->parse($template_name);
-        $xtpl->parse($template_name . "_Subject");
+        $xtpl->parse($template_name."_Subject");
 
         $notify_mail->Body = from_html(trim($xtpl->text($template_name)));
-        $notify_mail->Subject = from_html($xtpl->text($template_name . "_Subject"));
+        $notify_mail->Subject = from_html($xtpl->text($template_name."_Subject"));
 
         // cn: bug 8568 encode notify email in User's outbound email encoding
         $notify_mail->prepForOutbound();
@@ -2857,7 +2857,7 @@ 
                 if (empty($where)) {
                     $where = $owner_where;
                 } else {
-                    $where .= ' AND ' . $owner_where;
+                    $where .= ' AND '.$owner_where;
                 }
             }
         }
@@ -2911,7 +2911,7 @@ 
             if (empty($where)) {
                 $where = $owner_where;
             } else {
-                $where .= ' AND ' . $owner_where;
+                $where .= ' AND '.$owner_where;
             }
         }
         /* BEGIN - SECURITY GROUPS */
@@ -2925,9 +2925,9 @@ 
             $group_where = SecurityGroup::getGroupUsersWhere($current_user->id);
             //$group_where = "user_name = 'admin'";
             if (empty($where)) {
-                $where = " (" . $group_where . ") ";
+                $where = " (".$group_where.") ";
             } else {
-                $where .= " AND (" . $group_where . ") ";
+                $where .= " AND (".$group_where.") ";
             }
         } elseif ($this->bean_implements('ACL') && ACLController::requireSecurityGroup($this->module_dir, 'list')) {
             require_once('modules/SecurityGroups/SecurityGroup.php');
@@ -2936,12 +2936,12 @@ 
             $group_where = SecurityGroup::getGroupWhere($this->table_name, $this->module_dir, $current_user->id);
             if (!empty($owner_where)) {
                 if (empty($where)) {
-                    $where = " (" . $owner_where . " or " . $group_where . ") ";
+                    $where = " (".$owner_where." or ".$group_where.") ";
                 } else {
-                    $where .= " AND (" . $owner_where . " or " . $group_where . ") ";
+                    $where .= " AND (".$owner_where." or ".$group_where.") ";
                 }
             } else {
-                $where .= ' AND ' . $group_where;
+                $where .= ' AND '.$group_where;
             }
         }
         /* END - SECURITY GROUPS */
@@ -2960,7 +2960,7 @@ 
         $ret_array['order_by'] = '';
         //secondary selects are selects that need to be run after the primary query to retrieve additional info on main
         if ($singleSelect) {
-            $ret_array['secondary_select'] =& $ret_array['select'];
+            $ret_array['secondary_select'] = & $ret_array['select'];
             $ret_array['secondary_from'] = &$ret_array['from'];
         } else {
             $ret_array['secondary_select'] = '';
@@ -3034,7 +3034,7 @@ 
             //alias is used to alias field names
             $alias = '';
             if (isset($value['alias'])) {
-                $alias = ' as ' . $value['alias'] . ' ';
+                $alias = ' as '.$value['alias'].' ';
             }
 
             if (empty($this->field_defs[$field]) || !empty($value['force_blank'])) {
@@ -3073,29 +3073,29 @@ 
                 $selectedFields["$this->table_name.$field"] = true;
             } elseif ((!isset($data['source']) || $data['source'] == 'custom_fields') && (!empty($alias) || !empty($filter))) {
                 //add this column only if it has NOT already been added to select statement string
-                $colPos = strpos($ret_array['select'], "$this->table_name" . "_cstm" . ".$field");
+                $colPos = strpos($ret_array['select'], "$this->table_name"."_cstm".".$field");
                 if (!$colPos || $colPos < 0) {
-                    $ret_array['select'] .= ", $this->table_name" . "_cstm" . ".$field $alias";
+                    $ret_array['select'] .= ", $this->table_name"."_cstm".".$field $alias";
                 }
 
                 $selectedFields["$this->table_name.$field"] = true;
             }
 
             if ($data['type'] != 'relate' && isset($data['db_concat_fields'])) {
-                $ret_array['select'] .= ", " . $this->db->concat($this->table_name, $data['db_concat_fields']) . " as $field";
+                $ret_array['select'] .= ", ".$this->db->concat($this->table_name, $data['db_concat_fields'])." as $field";
                 $selectedFields[$this->db->concat($this->table_name, $data['db_concat_fields'])] = true;
             }
             //Custom relate field or relate fields built in module builder which have no link field associated.
             if ($data['type'] == 'relate' && (isset($data['custom_module']) || isset($data['ext2']))) {
-                $joinTableAlias = 'jt' . $jtcount;
+                $joinTableAlias = 'jt'.$jtcount;
                 $relateJoinInfo = $this->custom_fields->getRelateJoin($data, $joinTableAlias, false);
                 $ret_array['select'] .= $relateJoinInfo['select'];
                 $ret_array['from'] .= $relateJoinInfo['from'];
                 //Replace any references to the relationship in the where clause with the new alias
                 //If the link isn't set, assume that search used the local table for the field
                 $searchTable = isset($data['link']) ? $relateJoinInfo['rel_table'] : $this->table_name;
-                $field_name = $relateJoinInfo['rel_table'] . '.' . !empty($data['name']) ? $data['name'] : 'name';
-                $where = preg_replace('/(^|[\s(])' . $field_name . '/', '${1}' . $relateJoinInfo['name_field'], $where);
+                $field_name = $relateJoinInfo['rel_table'].'.'.!empty($data['name']) ? $data['name'] : 'name';
+                $where = preg_replace('/(^|[\s(])'.$field_name.'/', '${1}'.$relateJoinInfo['name_field'], $where);
                 $jtcount++;
             }
             //Parent Field
@@ -3103,7 +3103,7 @@ 
                 //See if we need to join anything by inspecting the where clause
                 $match = preg_match('/(^|[\s(])parent_([a-zA-Z]+_?[a-zA-Z]+)_([a-zA-Z]+_?[a-zA-Z]+)\.name/', $where, $matches);
                 if ($match) {
-                    $joinTableAlias = 'jt' . $jtcount;
+                    $joinTableAlias = 'jt'.$jtcount;
                     $joinModule = $matches[2];
                     $joinTable = $matches[3];
                     $localTable = $this->table_name;
@@ -3124,7 +3124,7 @@ 
                     $ret_array['from'] .= " LEFT JOIN $joinTable $joinTableAlias
                         ON $localTable.{$data['id_name']} = $joinTableAlias.id";
                     //Replace any references to the relationship in the where clause with the new alias
-                    $where = preg_replace('/(^|[\s(])parent_' . $joinModule . '_' . $joinTable . '\.name/', '${1}' . $nameField, $where);
+                    $where = preg_replace('/(^|[\s(])parent_'.$joinModule.'_'.$joinTable.'\.name/', '${1}'.$nameField, $where);
                     $jtcount++;
                 }
             }
@@ -3133,7 +3133,7 @@ 
             {
                 $linkField = $data['link'];
                 $this->load_relationship($linkField);
-                if(!empty($this->$linkField))
+                if (!empty($this->$linkField))
                 {
                     $params = array();
                     if (empty($join_type)) {
@@ -3144,12 +3144,12 @@ 
                     if (isset($data['join_name'])) {
                         $params['join_table_alias'] = $data['join_name'];
                     } else {
-                        $params['join_table_alias'] = 'jt' . $jtcount;
+                        $params['join_table_alias'] = 'jt'.$jtcount;
                     }
                     if (isset($data['join_link_name'])) {
                         $params['join_table_link_alias'] = $data['join_link_name'];
                     } else {
-                        $params['join_table_link_alias'] = 'jtl' . $jtcount;
+                        $params['join_table_link_alias'] = 'jtl'.$jtcount;
                     }
                     $join_primary = !isset($data['join_primary']) || $data['join_primary'];
 
@@ -3182,20 +3182,20 @@ 
                                 require_once($beanFiles[$beanList[$rel_module]]);
                                 $rel_mod = new $beanList[$rel_module]();
                                 if (isset($rel_mod->field_defs['assigned_user_id'])) {
-                                    $ret_array['secondary_select'] .= " , " . $params['join_table_alias'] . ".assigned_user_id {$field}_owner, '$rel_module' {$field}_mod";
+                                    $ret_array['secondary_select'] .= " , ".$params['join_table_alias'].".assigned_user_id {$field}_owner, '$rel_module' {$field}_mod";
                                 } else {
                                     if (isset($rel_mod->field_defs['created_by'])) {
-                                        $ret_array['secondary_select'] .= " , " . $params['join_table_alias'] . ".created_by {$field}_owner , '$rel_module' {$field}_mod";
+                                        $ret_array['secondary_select'] .= " , ".$params['join_table_alias'].".created_by {$field}_owner , '$rel_module' {$field}_mod";
                                     }
                                 }
                             }
                         }
 
                         if (isset($data['db_concat_fields'])) {
-                            $ret_array['secondary_select'] .= ' , ' . $this->db->concat($params['join_table_alias'], $data['db_concat_fields']) . ' ' . $field;
+                            $ret_array['secondary_select'] .= ' , '.$this->db->concat($params['join_table_alias'], $data['db_concat_fields']).' '.$field;
                         } else {
                             if (!isset($data['relationship_fields'])) {
-                                $ret_array['secondary_select'] .= ' , ' . $params['join_table_alias'] . '.' . $data['rname'] . ' ' . $field;
+                                $ret_array['secondary_select'] .= ' , '.$params['join_table_alias'].'.'.$data['rname'].' '.$field;
                             }
                         }
                         if (!$singleSelect) {
@@ -3211,54 +3211,54 @@ 
                             //27416, the $ret_array['secondary_select'] should always generate, regardless the dbtype
                             // add rel_key only if it was not already added
                             if (!$singleSelect) {
-                                $ret_array['select'] .= ", '                                    '  " . $join['rel_key'] . ' ';
+                                $ret_array['select'] .= ", '                                    '  ".$join['rel_key'].' ';
                             }
-                            $ret_array['secondary_select'] .= ', ' . $params['join_table_link_alias'] . '.' . $join['rel_key'] . ' ' . $join['rel_key'];
+                            $ret_array['secondary_select'] .= ', '.$params['join_table_link_alias'].'.'.$join['rel_key'].' '.$join['rel_key'];
                         }
                         if (isset($data['relationship_fields'])) {
                             foreach ($data['relationship_fields'] as $r_name => $alias_name) {
                                 if (!empty($secondarySelectedFields[$alias_name])) {
                                     continue;
                                 }
-                                $ret_array['secondary_select'] .= ', ' . $params['join_table_link_alias'] . '.' . $r_name . ' ' . $alias_name;
+                                $ret_array['secondary_select'] .= ', '.$params['join_table_link_alias'].'.'.$r_name.' '.$alias_name;
                                 $secondarySelectedFields[$alias_name] = true;
                             }
                         }
                         if (!$table_joined) {
-                            $ret_array['secondary_from'] .= ' ' . $join['join'] . ' AND ' . $params['join_table_alias'] . '.deleted=0';
+                            $ret_array['secondary_from'] .= ' '.$join['join'].' AND '.$params['join_table_alias'].'.deleted=0';
                             if (isset($data['link_type']) && $data['link_type'] == 'relationship_info' && ($parentbean instanceof SugarBean)) {
-                                $ret_array['secondary_where'] = $params['join_table_link_alias'] . '.' . $join['rel_key'] . "='" . $parentbean->id . "'";
+                                $ret_array['secondary_where'] = $params['join_table_link_alias'].'.'.$join['rel_key']."='".$parentbean->id."'";
                             }
                         }
                     } else {
                         if (isset($data['db_concat_fields'])) {
-                            $ret_array['select'] .= ' , ' . $this->db->concat($params['join_table_alias'], $data['db_concat_fields']) . ' ' . $field;
+                            $ret_array['select'] .= ' , '.$this->db->concat($params['join_table_alias'], $data['db_concat_fields']).' '.$field;
                         } else {
-                            $ret_array['select'] .= ' , ' . $params['join_table_alias'] . '.' . $data['rname'] . ' ' . $field;
+                            $ret_array['select'] .= ' , '.$params['join_table_alias'].'.'.$data['rname'].' '.$field;
                         }
                         if (isset($data['additionalFields'])) {
                             foreach ($data['additionalFields'] as $k => $v) {
                                 if (!empty($data['id_name']) && $data['id_name'] == $v && !empty($fields[$data['id_name']])) {
                                     continue;
                                 }
-                                $ret_array['select'] .= ' , ' . $params['join_table_alias'] . '.' . $k . ' ' . $v;
+                                $ret_array['select'] .= ' , '.$params['join_table_alias'].'.'.$k.' '.$v;
                             }
                         }
                         if (!$table_joined) {
-                            $ret_array['from'] .= ' ' . $join['join'] . ' AND ' . $params['join_table_alias'] . '.deleted=0';
+                            $ret_array['from'] .= ' '.$join['join'].' AND '.$params['join_table_alias'].'.deleted=0';
                             if (!empty($beanList[$rel_module]) && !empty($beanFiles[$beanList[$rel_module]])) {
                                 require_once($beanFiles[$beanList[$rel_module]]);
                                 $rel_mod = new $beanList[$rel_module]();
                                 if (isset($value['target_record_key']) && !empty($filter)) {
-                                    $selectedFields[$this->table_name . '.' . $value['target_record_key']] = true;
+                                    $selectedFields[$this->table_name.'.'.$value['target_record_key']] = true;
                                     $ret_array['select'] .= " , $this->table_name.{$value['target_record_key']} ";
                                 }
                                 if (isset($rel_mod->field_defs['assigned_user_id'])) {
-                                    $ret_array['select'] .= ' , ' . $params['join_table_alias'] . '.assigned_user_id ' . $field . '_owner';
+                                    $ret_array['select'] .= ' , '.$params['join_table_alias'].'.assigned_user_id '.$field.'_owner';
                                 } else {
-                                    $ret_array['select'] .= ' , ' . $params['join_table_alias'] . '.created_by ' . $field . '_owner';
+                                    $ret_array['select'] .= ' , '.$params['join_table_alias'].'.created_by '.$field.'_owner';
                                 }
-                                $ret_array['select'] .= "  , '" . $rel_module . "' " . $field . '_mod';
+                                $ret_array['select'] .= "  , '".$rel_module."' ".$field.'_mod';
                             }
                         }
                     }
@@ -3268,37 +3268,37 @@ 
                     if (isset($data['db_concat_fields'])) {
                         $buildWhere = false;
                         if (in_array('first_name', $data['db_concat_fields']) && in_array('last_name', $data['db_concat_fields'])) {
-                            $exp = '/\(\s*?' . $data['name'] . '.*?\%\'\s*?\)/';
+                            $exp = '/\(\s*?'.$data['name'].'.*?\%\'\s*?\)/';
                             if (preg_match($exp, $where, $matches)) {
                                 $search_expression = $matches[0];
                                 //Create three search conditions - first + last, first, last
-                                $first_name_search = str_replace($data['name'], $params['join_table_alias'] . '.first_name', $search_expression);
-                                $last_name_search = str_replace($data['name'], $params['join_table_alias'] . '.last_name', $search_expression);
+                                $first_name_search = str_replace($data['name'], $params['join_table_alias'].'.first_name', $search_expression);
+                                $last_name_search = str_replace($data['name'], $params['join_table_alias'].'.last_name', $search_expression);
                                 $full_name_search = str_replace($data['name'], $this->db->concat($params['join_table_alias'], $data['db_concat_fields']), $search_expression);
                                 $buildWhere = true;
-                                $where = str_replace($search_expression, '(' . $full_name_search . ' OR ' . $first_name_search . ' OR ' . $last_name_search . ')', $where);
+                                $where = str_replace($search_expression, '('.$full_name_search.' OR '.$first_name_search.' OR '.$last_name_search.')', $where);
                             }
                         }
 
                         if (!$buildWhere) {
                             $db_field = $this->db->concat($params['join_table_alias'], $data['db_concat_fields']);
-                            $where = preg_replace('/' . $data['name'] . '/', $db_field, $where);
+                            $where = preg_replace('/'.$data['name'].'/', $db_field, $where);
 
                             // For relationship fields replace their alias by the corresponding link table and r_name
                             if (isset($data['relationship_fields'])) {
                                 foreach ($data['relationship_fields'] as $r_name => $alias_name) {
                                     $db_field = $this->db->concat($params['join_table_link_alias'], $r_name);
-                                    $where = preg_replace('/' . $alias_name . '/', $db_field, $where);
+                                    $where = preg_replace('/'.$alias_name.'/', $db_field, $where);
                                 }
                             }
                         }
                     } else {
-                        $where = preg_replace('/(^|[\s(])' . $data['name'] . '/', '${1}' . $params['join_table_alias'] . '.' . $data['rname'], $where);
+                        $where = preg_replace('/(^|[\s(])'.$data['name'].'/', '${1}'.$params['join_table_alias'].'.'.$data['rname'], $where);
 
                         // For relationship fields replace their alias by the corresponding link table and r_name
                         if (isset($data['relationship_fields'])) {
                             foreach ($data['relationship_fields'] as $r_name => $alias_name) {
-                                $where = preg_replace('/(^|[\s(])' . $alias_name . '/', '${1}' . $params['join_table_link_alias'] . '.' . $r_name, $where);
+                                $where = preg_replace('/(^|[\s(])'.$alias_name.'/', '${1}'.$params['join_table_link_alias'].'.'.$r_name, $where);
                             }
                         }
                     }
@@ -3312,12 +3312,12 @@ 
             }
         }
         if (!empty($filter)) {
-            if (isset($this->field_defs['assigned_user_id']) && empty($selectedFields[$this->table_name . '.assigned_user_id'])) {
+            if (isset($this->field_defs['assigned_user_id']) && empty($selectedFields[$this->table_name.'.assigned_user_id'])) {
                 $ret_array['select'] .= ", $this->table_name.assigned_user_id ";
-            } elseif (isset($this->field_defs['created_by']) && empty($selectedFields[$this->table_name . '.created_by'])) {
+            } elseif (isset($this->field_defs['created_by']) && empty($selectedFields[$this->table_name.'.created_by'])) {
                 $ret_array['select'] .= ", $this->table_name.created_by ";
             }
-            if (isset($this->field_defs['system_id']) && empty($selectedFields[$this->table_name . '.system_id'])) {
+            if (isset($this->field_defs['system_id']) && empty($selectedFields[$this->table_name.'.system_id'])) {
                 $ret_array['select'] .= ", $this->table_name.system_id ";
             }
         }
@@ -3344,7 +3344,7 @@ 
         //make call to process the order by clause
         $order_by = $this->process_order_by($order_by);
         if (!empty($order_by)) {
-            $ret_array['order_by'] = " ORDER BY " . $order_by;
+            $ret_array['order_by'] = " ORDER BY ".$order_by;
         }
         if ($singleSelect) {
             unset($ret_array['secondary_where']);
@@ -3356,7 +3356,7 @@ 
             return $ret_array;
         }
 
-        return $ret_array['select'] . $ret_array['from'] . $ret_array['where'] . $ret_array['order_by'];
+        return $ret_array['select'].$ret_array['from'].$ret_array['where'].$ret_array['order_by'];
     }
 
 	public function get_relationship_field($field)
@@ -3431,9 +3431,9 @@ 
 
                 if (empty($field_defs['table']) && !$suppress_table_name) {
                     if ($source == 'db') {
-                        $list_column[0] = $bean_queried->table_name . '.' . $list_column[0];
+                        $list_column[0] = $bean_queried->table_name.'.'.$list_column[0];
                     } elseif ($source == 'custom_fields') {
-                        $list_column[0] = $bean_queried->table_name . '_cstm.' . $list_column[0];
+                        $list_column[0] = $bean_queried->table_name.'_cstm.'.$list_column[0];
                     }
                 }
 
@@ -3489,7 +3489,7 @@ 
          * if the row_offset is set to 'end' go to the end of the list
          */
         $toEnd = strval($row_offset) == 'end';
-        $GLOBALS['log']->debug("process_list_query: " . $query);
+        $GLOBALS['log']->debug("process_list_query: ".$query);
         if ($max_per_page == -1) {
             $max_per_page = $sugar_config['list_max_entries_per_page'];
         }
@@ -3548,14 +3548,14 @@ 
             foreach ($this->field_defs as $field => $value) {
                 if (isset($row[$field])) {
                     $temp->$field = $row[$field];
-                    $owner_field = $field . '_owner';
+                    $owner_field = $field.'_owner';
                     if (isset($row[$owner_field])) {
                         $temp->$owner_field = $row[$owner_field];
                     }
 
-                    $GLOBALS['log']->debug("$temp->object_name({$row['id']}): " . $field . " = " . $temp->$field);
-                } elseif (isset($row[$this->table_name . '.' . $field])) {
-                    $temp->$field = $row[$this->table_name . '.' . $field];
+                    $GLOBALS['log']->debug("$temp->object_name({$row['id']}): ".$field." = ".$temp->$field);
+                } elseif (isset($row[$this->table_name.'.'.$field])) {
+                    $temp->$field = $row[$this->table_name.'.'.$field];
                 } else {
                     $temp->$field = "";
                 }
@@ -3608,22 +3608,22 @@ 
     public function create_list_count_query($query)
     {
         // remove the 'order by' clause which is expected to be at the end of the query
-        $pattern = '/\sORDER BY.*/is';  // ignores the case
+        $pattern = '/\sORDER BY.*/is'; // ignores the case
         $replacement = '';
         $query = preg_replace($pattern, $replacement, $query);
         //handle distinct clause
         $star = '*';
         if (substr_count(strtolower($query), 'distinct')) {
             if (!empty($this->seed) && !empty($this->seed->table_name)) {
-                $star = 'DISTINCT ' . $this->seed->table_name . '.id';
+                $star = 'DISTINCT '.$this->seed->table_name.'.id';
             } else {
-                $star = 'DISTINCT ' . $this->table_name . '.id';
+                $star = 'DISTINCT '.$this->table_name.'.id';
             }
         }
 
         // change the select expression to 'count(*)'
-        $pattern = '/SELECT(.*?)(\s){1}FROM(\s){1}/is';  // ignores the case
-        $replacement = 'SELECT count(' . $star . ') c FROM ';
+        $pattern = '/SELECT(.*?)(\s){1}FROM(\s){1}/is'; // ignores the case
+        $replacement = 'SELECT count('.$star.') c FROM ';
 
         //if the passed query has union clause then replace all instances of the pattern.
         //this is very rare. I have seen this happening only from projects module.
@@ -3639,13 +3639,13 @@ 
                 if (!empty($matches)) {
                     if (stristr($matches[0], "distinct")) {
                         if (!empty($this->seed) && !empty($this->seed->table_name)) {
-                            $star = 'DISTINCT ' . $this->seed->table_name . '.id';
+                            $star = 'DISTINCT '.$this->seed->table_name.'.id';
                         } else {
-                            $star = 'DISTINCT ' . $this->table_name . '.id';
+                            $star = 'DISTINCT '.$this->table_name.'.id';
                         }
                     }
                 } // if
-                $replacement = 'SELECT count(' . $star . ') c FROM ';
+                $replacement = 'SELECT count('.$star.') c FROM ';
                 $union_qs[$key] = preg_replace($pattern, $replacement, $union_query, 1);
             }
             $modified_select_query = implode(" UNION ALL ", $union_qs);
@@ -3711,7 +3711,7 @@ 
             if (empty($where)) {
                 $where = $owner_where;
             } else {
-                $where .= ' AND ' . $owner_where;
+                $where .= ' AND '.$owner_where;
             }
         }
 
@@ -3723,12 +3723,12 @@ 
             $group_where = SecurityGroup::getGroupWhere($this->table_name, $this->module_dir, $current_user->id);
             if (!empty($owner_where)) {
                 if (empty($where)) {
-                    $where = " (" . $owner_where . " or " . $group_where . ") ";
+                    $where = " (".$owner_where." or ".$group_where.") ";
                 } else {
-                    $where .= " AND (" . $owner_where . " or " . $group_where . ") ";
+                    $where .= " AND (".$owner_where." or ".$group_where.") ";
                 }
             } else {
-                $where .= ' AND ' . $group_where;
+                $where .= ' AND '.$group_where;
             }
         }
         /* END - SECURITY GROUPS */
@@ -3757,7 +3757,7 @@ 
     public function process_detail_query($query, $row_offset, $limit = -1, $max_per_page = -1, $where = '', $offset = 0)
     {
         global $sugar_config;
-        $GLOBALS['log']->debug("process_detail_query: " . $query);
+        $GLOBALS['log']->debug("process_detail_query: ".$query);
         if ($max_per_page == -1) {
             $max_per_page = $sugar_config['list_max_entries_per_page'];
         }
@@ -3823,14 +3823,14 @@ 
         }
         $custom_join = $this->getCustomJoin();
 
-        $query = "SELECT $this->table_name.*" . $custom_join['select'] . " FROM $this->table_name ";
+        $query = "SELECT $this->table_name.*".$custom_join['select']." FROM $this->table_name ";
 
         $query .= $custom_join['join'];
-        $query .= " WHERE $this->table_name.id = " . $this->db->quoted($id);
+        $query .= " WHERE $this->table_name.id = ".$this->db->quoted($id);
         if ($deleted) {
             $query .= " AND $this->table_name.deleted=0";
         }
-        $GLOBALS['log']->debug("Retrieve $this->object_name : " . $query);
+        $GLOBALS['log']->debug("Retrieve $this->object_name : ".$query);
         $result = $this->db->limitQuery($query, 0, 1, true, "Retrieving record by id $this->table_name:$id found ");
         if (empty($result)) {
             return null;
@@ -3981,7 +3981,7 @@ 
             }
             if (isset($row[$field])) {
                 $this->$field = $row[$field];
-                $owner = $field . '_owner';
+                $owner = $field.'_owner';
                 if (!empty($row[$owner])) {
                     $this->$owner = $row[$owner];
                 }
@@ -4178,12 +4178,12 @@ 
         $query = 'SELECT id';
         foreach ($fields as $field => $alias) {
             if (!empty($GLOBALS['dictionary'][$object]['fields'][$field]['db_concat_fields'])) {
-                $query .= ' ,' . $this->db->concat($table, $GLOBALS['dictionary'][$object]['fields'][$field]['db_concat_fields']) . ' as ' . $alias;
+                $query .= ' ,'.$this->db->concat($table, $GLOBALS['dictionary'][$object]['fields'][$field]['db_concat_fields']).' as '.$alias;
             } elseif (!empty($GLOBALS['dictionary'][$object]['fields'][$field]) &&
                 (empty($GLOBALS['dictionary'][$object]['fields'][$field]['source']) ||
                     $GLOBALS['dictionary'][$object]['fields'][$field]['source'] != "non-db")
             ) {
-                $query .= ' ,' . $table . '.' . $field . ' as ' . $alias;
+                $query .= ' ,'.$table.'.'.$field.' as '.$alias;
             }
             if (!$return_array) {
                 $this->$alias = '';
@@ -4195,12 +4195,12 @@ 
 
 
         if (isset($GLOBALS['dictionary'][$object]['fields']['assigned_user_id'])) {
-            $query .= " , " . $table . ".assigned_user_id owner";
+            $query .= " , ".$table.".assigned_user_id owner";
         } elseif (isset($GLOBALS['dictionary'][$object]['fields']['created_by'])) {
-            $query .= " , " . $table . ".created_by owner";
+            $query .= " , ".$table.".created_by owner";
         }
-        $query .= ' FROM ' . $table . ' WHERE deleted=0 AND id=';
-        $result = $GLOBALS['db']->query($query . "'$id'");
+        $query .= ' FROM '.$table.' WHERE deleted=0 AND id=';
+        $result = $GLOBALS['db']->query($query."'$id'");
         $row = $GLOBALS['db']->fetchByAssoc($result);
         if ($return_array) {
             return $row;
@@ -4208,9 +4208,9 @@ 
         $owner = (empty($row['owner'])) ? '' : $row['owner'];
         foreach ($fields as $alias) {
             $this->$alias = (!empty($row[$alias])) ? $row[$alias] : '';
-            $alias = $alias . '_owner';
+            $alias = $alias.'_owner';
             $this->$alias = $owner;
-            $a_mod = $alias . '_mod';
+            $a_mod = $alias.'_mod';
             $this->$a_mod = $module;
         }
     }
@@ -4370,15 +4370,15 @@ 
         $entire_where = $query_array['where'];
         if (!empty($where)) {
             if (empty($entire_where)) {
-                $entire_where = ' WHERE ' . $where;
+                $entire_where = ' WHERE '.$where;
             } else {
-                $entire_where .= ' AND ' . $where;
+                $entire_where .= ' AND '.$where;
             }
         }
 
-        $query = 'SELECT ' . $child_seed->table_name . '.* ' . $query_array['from'] . ' ' . $entire_where;
+        $query = 'SELECT '.$child_seed->table_name.'.* '.$query_array['from'].' '.$entire_where;
         if (!empty($order_by)) {
-            $query .= " ORDER BY " . $order_by;
+            $query .= " ORDER BY ".$order_by;
         }
 
         return $child_seed->process_list_query($query, $row_offset, $limit, $max, $where);
@@ -4414,9 +4414,9 @@ 
      */
     public function process_full_list_query($query, $check_date = false)
     {
-        $GLOBALS['log']->debug("process_full_list_query: query is " . $query);
+        $GLOBALS['log']->debug("process_full_list_query: query is ".$query);
         $result = $this->db->query($query, false);
-        $GLOBALS['log']->debug("process_full_list_query: result is " . print_r($result, true));
+        $GLOBALS['log']->debug("process_full_list_query: result is ".print_r($result, true));
         $class = get_class($this);
         $isFirstTime = true;
         $bean = new $class();
@@ -4432,7 +4432,7 @@ 
             foreach ($bean->field_defs as $field => $value) {
                 if (isset($row[$field])) {
                     $bean->$field = $row[$field];
-                    $GLOBALS['log']->debug("process_full_list: $bean->object_name({$row['id']}): " . $field . " = " . $bean->$field);
+                    $GLOBALS['log']->debug("process_full_list: $bean->object_name({$row['id']}): ".$field." = ".$bean->$field);
                 } else {
                     $bean->$field = '';
                 }
@@ -4524,7 +4524,7 @@ 
         $this->call_custom_logic("before_restore", $custom_logic_arguments);
 
         $date_modified = $GLOBALS['timedate']->nowDb();
-        $query = "UPDATE $this->table_name set deleted=0 , date_modified = '$date_modified' where id='" . $this->db->quote($id) . "'";
+        $query = "UPDATE $this->table_name set deleted=0 , date_modified = '$date_modified' where id='".$this->db->quote($id)."'";
         $this->db->query($query, true, "Error marking record undeleted: ");
 
         $this->restoreFiles();
@@ -4554,9 +4554,9 @@ 
         $directory = $this->deleteFileDirectory();
 
         foreach ($files as $file) {
-            if (sugar_is_file('upload://deleted/' . $directory . '/' . $file)) {
-                if (!sugar_rename('upload://deleted/' . $directory . '/' . $file, 'upload://' . $file)) {
-                    $GLOBALS['log']->error('Could not move file ' . $directory . '/' . $file . ' from deleted directory');
+            if (sugar_is_file('upload://deleted/'.$directory.'/'.$file)) {
+                if (!sugar_rename('upload://deleted/'.$directory.'/'.$file, 'upload://'.$file)) {
+                    $GLOBALS['log']->error('Could not move file '.$directory.'/'.$file.' from deleted directory');
                 }
             }
         }
@@ -4565,7 +4565,7 @@ 
          * @var DBManager $db
          */
         global $db;
-        $db->query('DELETE FROM cron_remove_documents WHERE bean_id=' . $db->quoted($this->id));
+        $db->query('DELETE FROM cron_remove_documents WHERE bean_id='.$db->quoted($this->id));
 
         return true;
     }
@@ -4713,19 +4713,19 @@ 
 
         $directory = $this->deleteFileDirectory();
 
-        $isCreated = sugar_is_dir('upload://deleted/' . $directory);
+        $isCreated = sugar_is_dir('upload://deleted/'.$directory);
         if (!$isCreated) {
-            sugar_mkdir('upload://deleted/' . $directory, 0777, true);
-            $isCreated = sugar_is_dir('upload://deleted/' . $directory);
+            sugar_mkdir('upload://deleted/'.$directory, 0777, true);
+            $isCreated = sugar_is_dir('upload://deleted/'.$directory);
         }
         if (!$isCreated) {
             return false;
         }
 
         foreach ($files as $file) {
-            if (file_exists('upload://' . $file)) {
-                if (!sugar_rename('upload://' . $file, 'upload://deleted/' . $directory . '/' . $file)) {
-                    $GLOBALS['log']->error('Could not move file ' . $file . ' to deleted directory');
+            if (file_exists('upload://'.$file)) {
+                if (!sugar_rename('upload://'.$file, 'upload://deleted/'.$directory.'/'.$file)) {
+                    $GLOBALS['log']->error('Could not move file '.$file.' to deleted directory');
                 }
             }
         }
@@ -4745,7 +4745,7 @@ 
         }
         if (empty($record['id'])) {
             $record['id'] = $db->quoted(create_guid());
-            $db->query('INSERT INTO cron_remove_documents (' . implode(', ', array_keys($record)) . ') VALUES(' . implode(', ', $record) . ')');
+            $db->query('INSERT INTO cron_remove_documents ('.implode(', ', array_keys($record)).') VALUES('.implode(', ', $record).')');
         } else {
             $db->query("UPDATE cron_remove_documents SET date_modified={$record['date_modified']} WHERE id={$record['id']}");
         }
@@ -4766,7 +4766,7 @@ 
      */
     public function build_related_list($query, &$template, $row_offset = 0, $limit = -1)
     {
-        $GLOBALS['log']->debug("Finding linked records $this->object_name: " . $query);
+        $GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
         $db = DBManagerFactory::getInstance('listviews');
 
         if (!empty($row_offset) && $row_offset != 0 && !empty($limit) && $limit != -1) {
@@ -4813,7 +4813,7 @@ 
     {
         $db = DBManagerFactory::getInstance('listviews');
         // No need to do an additional query
-        $GLOBALS['log']->debug("Finding linked records $this->object_name: " . $query);
+        $GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
         if (empty($in) && !empty($query)) {
             $idList = $this->build_related_in($query);
             $in = $idList['in'];
@@ -4879,9 +4879,9 @@ 
         while ($row = $this->db->fetchByAssoc($result)) {
             $idList[] = $row['id'];
             if (empty($ids)) {
-                $ids = "('" . $row['id'] . "'";
+                $ids = "('".$row['id']."'";
             } else {
-                $ids .= ",'" . $row['id'] . "'";
+                $ids .= ",'".$row['id']."'";
             }
         }
         if (empty($ids)) {
@@ -4905,7 +4905,7 @@ 
      */
     public function build_related_list2($query, &$template, &$field_list)
     {
-        $GLOBALS['log']->debug("Finding linked values $this->object_name: " . $query);
+        $GLOBALS['log']->debug("Finding linked values $this->object_name: ".$query);
 
         $result = $this->db->query($query, true);
 
@@ -5019,9 +5019,9 @@ 
     {
         $where_clause = $this->get_where($fields_array, $deleted);
         $custom_join = $this->getCustomJoin();
-        $query = "SELECT $this->table_name.*" . $custom_join['select'] . " FROM $this->table_name " . $custom_join['join'];
+        $query = "SELECT $this->table_name.*".$custom_join['select']." FROM $this->table_name ".$custom_join['join'];
         $query .= " $where_clause";
-        $GLOBALS['log']->debug("Retrieve $this->object_name: " . $query);
+        $GLOBALS['log']->debug("Retrieve $this->object_name: ".$query);
         //requireSingleResult has been deprecated.
         //$result = $this->db->requireSingleResult($query, true, "Retrieving record $where_clause:");
         $result = $this->db->limitQuery($query, 0, 1, true, "Retrieving record $where_clause:");
@@ -5060,7 +5060,7 @@ 
             }
             $name = $this->db->getValidDBName($name);
 
-            $where_clause .= "$name = " . $this->db->quoted($value);
+            $where_clause .= "$name = ".$this->db->quoted($value);
         }
         if (!empty($where_clause)) {
             if ($deleted) {
@@ -5158,7 +5158,7 @@ 
         $where = '';
 
         // make sure there is a date modified
-        $date_modified = $this->db->convert("'" . $GLOBALS['timedate']->nowDb() . "'", 'datetime');
+        $date_modified = $this->db->convert("'".$GLOBALS['timedate']->nowDb()."'", 'datetime');
 
         $row = null;
         if ($check_duplicates) {
@@ -5168,7 +5168,7 @@ 
                 $where .= " AND $name = '$value' ";
             }
             $query .= $where;
-            $result = $this->db->query($query, false, "Looking For Duplicate Relationship:" . $query);
+            $result = $this->db->query($query, false, "Looking For Duplicate Relationship:".$query);
             $row = $this->db->fetchByAssoc($result);
         }
 
@@ -5177,16 +5177,16 @@ 
             if (isset($data_values)) {
                 $relate_values = array_merge($relate_values, $data_values);
             }
-            $query = "INSERT INTO $table (id, " . implode(',', array_keys($relate_values)) . ", date_modified) VALUES ('" . create_guid() . "', " . "'" . implode("', '", $relate_values) . "', " . $date_modified . ")";
+            $query = "INSERT INTO $table (id, ".implode(',', array_keys($relate_values)).", date_modified) VALUES ('".create_guid()."', "."'".implode("', '", $relate_values)."', ".$date_modified.")";
 
-            $this->db->query($query, false, "Creating Relationship:" . $query);
+            $this->db->query($query, false, "Creating Relationship:".$query);
         } elseif ($do_update) {
             $conds = array();
             foreach ($data_values as $key => $value) {
-                array_push($conds, $key . "='" . $this->db->quote($value) . "'");
+                array_push($conds, $key."='".$this->db->quote($value)."'");
             }
-            $query = "UPDATE $table SET " . implode(',', $conds) . ",date_modified=" . $date_modified . " " . $where;
-            $this->db->query($query, false, "Updating Relationship:" . $query);
+            $query = "UPDATE $table SET ".implode(',', $conds).",date_modified=".$date_modified." ".$where;
+            $this->db->query($query, false, "Updating Relationship:".$query);
         }
     }
 
@@ -5197,7 +5197,7 @@ 
             $query .= " AND $name = '$value' ";
         }
         $query .= " ORDER BY $select_id ";
-        $result = $this->db->query($query, false, "Retrieving Relationship:" . $query);
+        $result = $this->db->query($query, false, "Retrieving Relationship:".$query);
         $ids = array();
         while ($row = $this->db->fetchByAssoc($result)) {
             $ids[] = $row;
@@ -5208,13 +5208,13 @@ 
     public function loadLayoutDefs()
     {
         global $layout_defs;
-        if (empty($this->layout_def) && file_exists('modules/' . $this->module_dir . '/layout_defs.php')) {
-            include_once('modules/' . $this->module_dir . '/layout_defs.php');
-            if (file_exists('custom/modules/' . $this->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php')) {
-                include_once('custom/modules/' . $this->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php');
+        if (empty($this->layout_def) && file_exists('modules/'.$this->module_dir.'/layout_defs.php')) {
+            include_once('modules/'.$this->module_dir.'/layout_defs.php');
+            if (file_exists('custom/modules/'.$this->module_dir.'/Ext/Layoutdefs/layoutdefs.ext.php')) {
+                include_once('custom/modules/'.$this->module_dir.'/Ext/Layoutdefs/layoutdefs.ext.php');
             }
             if (empty($layout_defs[get_class($this)])) {
-                echo "\$layout_defs[" . get_class($this) . "]; does not exist";
+                echo "\$layout_defs[".get_class($this)."]; does not exist";
             }
 
             $this->layout_def = $layout_defs[get_class($this)];
@@ -5440,8 +5440,8 @@ 
         $tmp = explode(",", $order_by);
         $comma = ' ';
         foreach ($tmp as $stmp) {
-            $stmp = (substr_count($stmp, ".") > 0 ? trim($stmp) : "$qualify." . trim($stmp));
-            $order_by_clause .= $comma . $stmp;
+            $stmp = (substr_count($stmp, ".") > 0 ? trim($stmp) : "$qualify.".trim($stmp));
+            $order_by_clause .= $comma.$stmp;
             $comma = ", ";
         }
         return $order_by_clause;
@@ -5457,19 +5457,19 @@ 
         $street_field
     ) {
         if (isset($this->$street_field)) {
-            $street_field_2 = $street_field . '_2';
-            $street_field_3 = $street_field . '_3';
-            $street_field_4 = $street_field . '_4';
+            $street_field_2 = $street_field.'_2';
+            $street_field_3 = $street_field.'_3';
+            $street_field_4 = $street_field.'_4';
             if (isset($this->$street_field_2)) {
-                $this->$street_field .= "\n" . $this->$street_field_2;
+                $this->$street_field .= "\n".$this->$street_field_2;
                 unset($this->$street_field_2);
             }
             if (isset($this->$street_field_3)) {
-                $this->$street_field .= "\n" . $this->$street_field_3;
+                $this->$street_field .= "\n".$this->$street_field_3;
                 unset($this->$street_field_3);
             }
             if (isset($this->$street_field_4)) {
-                $this->$street_field .= "\n" . $this->$street_field_4;
+                $this->$street_field .= "\n".$this->$street_field_4;
                 unset($this->$street_field_4);
             }
             $this->$street_field = trim($this->$street_field, "\n");

include/InlineEditing/InlineEditing.php

Spacing +37 added lines, -37 removed lines

@@ -42,9 +42,9 @@ 
 
     global $current_language, $app_strings, $app_list_strings, $current_user, $beanFiles, $beanList;
 
-    $bean = BeanFactory::getBean($module,$id);
+    $bean = BeanFactory::getBean($module, $id);
 
-    if(!checkAccess($bean)){
+    if (!checkAccess($bean)) {
         return false;
     }
 
@@ -54,7 +54,7 @@ 
     $mod_strings = return_module_language($current_language, $module);
 
     // set the filename for this control
-    $file = create_cache_directory('include/InlineEditing/') . $module . $view . $alt_type . $fieldname . '.tpl';
+    $file = create_cache_directory('include/InlineEditing/').$module.$view.$alt_type.$fieldname.'.tpl';
 
     if (!is_file($file)
         || inDeveloperMode()
@@ -99,7 +99,7 @@ 
         if ($vardef['type'] == 'link') {
             $vardef['type'] = 'relate';
             $vardef['rname'] = 'name';
-            $vardef['id_name'] = $vardef['name'] . '_id';
+            $vardef['id_name'] = $vardef['name'].'_id';
             if ((!isset($vardef['module']) || $vardef['module'] == '') && $focus->load_relationship($vardef['name'])) {
                 $vardef['module'] = $focus->{$vardef['name']}->getRelatedModuleName();
             }
@@ -135,15 +135,15 @@ 
         // Remove all the copyright comments
         $contents = preg_replace('/\{\*[^\}]*?\*\}/', '', $contents);
         // remove extra wrong javascript which breaks auto complete on flexi relationship parent fields
-        $contents = preg_replace("/<script language=\"javascript\">if\(typeof sqs_objects == \'undefined\'\){var sqs_objects = new Array;}sqs_objects\[\'EditView_parent_name\'\].*?<\/script>/","",$contents);
+        $contents = preg_replace("/<script language=\"javascript\">if\(typeof sqs_objects == \'undefined\'\){var sqs_objects = new Array;}sqs_objects\[\'EditView_parent_name\'\].*?<\/script>/", "", $contents);
 
 
         if ($view == 'EditView' && ($vardef['type'] == 'relate' || $vardef['type'] == 'parent')) {
 
-            $contents = str_replace('"' . $vardef['id_name'] . '"', '{/literal}"{$fields.' . $vardef['name'] . '.id_name}"{literal}', $contents);
-            $contents = str_replace('"' . $vardef['name'] . '"', '{/literal}"{$fields.' . $vardef['name'] . '.name}"{literal}', $contents);
+            $contents = str_replace('"'.$vardef['id_name'].'"', '{/literal}"{$fields.'.$vardef['name'].'.id_name}"{literal}', $contents);
+            $contents = str_replace('"'.$vardef['name'].'"', '{/literal}"{$fields.'.$vardef['name'].'.name}"{literal}', $contents);
             // regex below fixes button javascript for flexi relationship
-            if($vardef['type'] == 'parent') {
+            if ($vardef['type'] == 'parent') {
                 $contents = str_replace("onclick='open_popup(document.{\$form_name}.parent_type.value, 600, 400, \"\", true, false, {literal}{\"call_back_function\":\"set_return\",\"form_name\":\"EditView\",\"field_to_name_array\":{\"id\":{/literal}\"{\$fields.parent_name.id_name}", "onclick='open_popup(document.{\$form_name}.parent_type.value, 600, 400, \"\", true, false, {literal}{\"call_back_function\":\"set_return\",\"form_name\":\"EditView\",\"field_to_name_array\":{\"id\":{/literal}\"parent_id", $contents);
             }
         }
@@ -177,10 +177,10 @@ 
     }
     $t23 = strpos($time_format, '23') !== false ? '%H' : '%I';
     if (!isset($match[2]) || $match[2] == '') {
-        $ss->assign('CALENDAR_FORMAT', $date_format . ' ' . $t23 . $time_separator . "%M");
+        $ss->assign('CALENDAR_FORMAT', $date_format.' '.$t23.$time_separator."%M");
     } else {
         $pm = $match[2] == "pm" ? "%P" : "%p";
-        $ss->assign('CALENDAR_FORMAT', $date_format . ' ' . $t23 . $time_separator . "%M" . $pm);
+        $ss->assign('CALENDAR_FORMAT', $date_format.' '.$t23.$time_separator."%M".$pm);
     }
 
     $ss->assign('CALENDAR_FDOW', $current_user->get_first_day_of_week());
@@ -219,7 +219,7 @@ 
     }
 
     if ($fieldlist[$fieldname]['type'] == 'link') {
-        $fieldlist[$fieldname]['id_name'] = $fieldlist[$fieldname]['name'] . '_id';
+        $fieldlist[$fieldname]['id_name'] = $fieldlist[$fieldname]['name'].'_id';
 
         if ((!isset($fieldlist[$fieldname]['module']) || $fieldlist[$fieldname]['module'] == '') && $focus->load_relationship($fieldlist[$fieldname]['name'])) {
             $relateField = $fieldlist[$fieldname]['name'];
@@ -227,7 +227,7 @@ 
         }
     }
 
-    if($fieldlist[$fieldname]['type'] == 'parent'){
+    if ($fieldlist[$fieldname]['type'] == 'parent') {
         $fieldlist['parent_id']['name'] = 'parent_id';
     }
 
@@ -238,15 +238,15 @@ 
     }
 
     if (isset($fieldlist[$fieldname]['id_name']) && $fieldlist[$fieldname]['id_name'] != '' && $fieldlist[$fieldname]['id_name'] != $fieldlist[$fieldname]['name']) {
-        if($value){
+        if ($value) {
             $relateIdField = $fieldlist[$fieldname]['id_name'];
-            $rel_value =  $bean->$relateIdField;
+            $rel_value = $bean->$relateIdField;
 
         }
         $fieldlist[$fieldlist[$fieldname]['id_name']]['value'] = $rel_value;
         $fieldlist[$fieldname]['value'] = $value;
         $fieldlist[$fieldname]['id_name'] = $aow_field;
-        $fieldlist[$fieldname]['name'] = $aow_field . '_display';
+        $fieldlist[$fieldname]['name'] = $aow_field.'_display';
     } else if (isset($fieldlist[$fieldname]['type']) && ($fieldlist[$fieldname]['type'] == 'datetimecombo' || $fieldlist[$fieldname]['type'] == 'datetime')) {
         $value = $focus->convertField($value, $fieldlist[$fieldname]);
         if (!$value) {
@@ -310,14 +310,14 @@ 
 
         if ($bean->field_defs[$field]['type'] == "multienum") {
             $bean->$field = encodeMultienumValue($value);
-        }else if ($bean->field_defs[$field]['type'] == "relate" || $bean->field_defs[$field]['type'] == 'parent'){
+        } else if ($bean->field_defs[$field]['type'] == "relate" || $bean->field_defs[$field]['type'] == 'parent') {
             $save_field = $bean->field_defs[$field]['id_name'];
             $bean->$save_field = $value;
             if ($bean->field_defs[$field]['type'] == 'parent') {
                 $bean->parent_type = $_REQUEST['parent_type'];
                 $bean->fill_in_additional_parent_fields(); // get up to date parent info as need it to display name
             }
-        }else{
+        } else {
             $bean->$field = $value;
         }
 
@@ -342,7 +342,7 @@ 
 
     $fieldlist[$field] = $bean->getFieldDefinition($field);
 
-    if(is_array($listViewDefs)){
+    if (is_array($listViewDefs)) {
         $fieldlist[$field] = array_merge($fieldlist[$field], $listViewDefs);
     }
 
@@ -380,7 +380,7 @@ 
         $vardef['module'] = $bean->module_dir;
 
         $SugarWidgetSubPanelDetailViewLink = new SugarWidgetSubPanelDetailViewLink($vardef);
-        $value = "<b>" . $SugarWidgetSubPanelDetailViewLink->displayList($vardef) . "</b>";
+        $value = "<b>".$SugarWidgetSubPanelDetailViewLink->displayList($vardef)."</b>";
 
     }
 
@@ -393,7 +393,7 @@ 
         }
         $datetime_format = $timedate->get_date_time_format();
         // create utc date (as it's utc in db)
-        $datetime = DateTime::createFromFormat("Y-m-d H:i:s", $value,new DateTimeZone('UTC'));
+        $datetime = DateTime::createFromFormat("Y-m-d H:i:s", $value, new DateTimeZone('UTC'));
         // convert it to timezone the user uses
         $datetime = $timedate->tzUser($datetime);
 
@@ -432,24 +432,24 @@ 
     }
 
     //if field is of type relate.
-    if ($vardef['type'] == "relate" || $vardef['type'] == "parent")  {
+    if ($vardef['type'] == "relate" || $vardef['type'] == "parent") {
 
-        if($vardef['source'] == "non-db"){
+        if ($vardef['source'] == "non-db") {
 
-            if($vardef['module'] == "Employees"){
+            if ($vardef['module'] == "Employees") {
                 $vardef['ext2'] = "Users";
                 $vardef['rname'] = "full_name";
             }
 
         }
-        if($vardef['type'] == "parent") {
+        if ($vardef['type'] == "parent") {
             $vardef['module'] = $bean->parent_type;
             $name = $bean->parent_name;
         }
         $idName = $vardef['id_name'];
         $record = $bean->$idName;
 
-        if($vardef['name'] != "assigned_user_name") {
+        if ($vardef['name'] != "assigned_user_name") {
             $value = "<a class=\"listViewTdLinkS1\" href=\"index.php?action=DetailView&module=".$vardef['module']."&record=$record\">";
         } else {
             $value = "";
@@ -457,26 +457,26 @@ 
 
 
         //To fix github bug 880 (the rname was null and was causing a 500 error in the getFieldValueFromModule call to $fieldname
-        $fieldName = 'name';//$vardef['name'];
-        if(!is_null($vardef['rname']))
+        $fieldName = 'name'; //$vardef['name'];
+        if (!is_null($vardef['rname']))
             $fieldName = $vardef['rname'];
 
-        if($vardef['ext2']){
+        if ($vardef['ext2']) {
 
-            $value .= getFieldValueFromModule($fieldName,$vardef['ext2'],$record);
+            $value .= getFieldValueFromModule($fieldName, $vardef['ext2'], $record);
 
-        }else if(!empty($vardef['rname'])){
-            $value .= getFieldValueFromModule($fieldName,$vardef['module'],$record);
+        } else if (!empty($vardef['rname'])) {
+            $value .= getFieldValueFromModule($fieldName, $vardef['module'], $record);
 
         } else {
             $value .= $name;
         }
 
-        if($vardef['name'] != "assigned_user_name") {
+        if ($vardef['name'] != "assigned_user_name") {
             $value .= "</a>";
         }
     }
-	if($vardef['type'] == "url")
+	if ($vardef['type'] == "url")
 	{
 		$value = '<a href='.$value.' target="_blank">'.$value.'</a>';
 	}
@@ -487,7 +487,7 @@ 
 function getFieldValueFromModule($fieldname, $module, $id)
 {
     //Github bug 880, if the fieldname is null, do no call from bean
-    if(is_null($fieldname))
+    if (is_null($fieldname))
         return '';
 
     $bean = BeanFactory::getBean($module, $id);
@@ -508,11 +508,11 @@ 
     return $value;
 }
 
-function checkAccess($bean){
+function checkAccess($bean) {
 
-    if($bean->ACLAccess('EditView')) {
+    if ($bean->ACLAccess('EditView')) {
         return true;
-    }else {
+    } else {
         return false;
     }
 }

include/SugarEmailAddress/SugarEmailAddress.php

Spacing +173 added lines, -173 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -81,9 +81,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function SugarEmailAddress(){
+    public function SugarEmailAddress() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -99,16 +99,16 @@ 
      * @param string $module
      */
     function handleLegacySave($bean, $prefix = "") {
-        if(!isset($_REQUEST) || !isset($_REQUEST['useEmailWidget'])) {
+        if (!isset($_REQUEST) || !isset($_REQUEST['useEmailWidget'])) {
             if (empty($this->addresses) || !isset($_REQUEST['massupdate'])) {
                 $this->addresses = array();
                 $optOut = (isset($bean->email_opt_out) && $bean->email_opt_out == "1") ? true : false;
                 $invalid = (isset($bean->invalid_email) && $bean->invalid_email == "1") ? true : false;
 
                 $isPrimary = true;
-                for($i = 1; $i <= 10; $i++){
+                for ($i = 1; $i <= 10; $i++) {
                     $email = 'email'.$i;
-                    if(isset($bean->$email) && !empty($bean->$email)){
+                    if (isset($bean->$email) && !empty($bean->$email)) {
                         $opt_out_field = $email.'_opt_out';
                         $invalid_field = $email.'_invalid';
                         $field_optOut = (isset($bean->$opt_out_field)) ? $bean->$opt_out_field : $optOut;
@@ -119,8 +119,8 @@ 
                 }
             }
         }
-        $this->populateAddresses($bean->id, $bean->module_dir, array(),'');
-        if(isset($_REQUEST) && isset($_REQUEST['useEmailWidget'])) {
+        $this->populateAddresses($bean->id, $bean->module_dir, array(), '');
+        if (isset($_REQUEST) && isset($_REQUEST['useEmailWidget'])) {
             $this->populateLegacyFields($bean);
         }
     }
@@ -142,11 +142,11 @@ 
         return;
     }
 
-    function populateLegacyFields(&$bean){
+    function populateLegacyFields(&$bean) {
         $primary_found = false;
         $alternate_found = false;
         $alternate2_found = false;
-        foreach($this->addresses as $k=>$address) {
+        foreach ($this->addresses as $k=>$address) {
             if ($primary_found && $alternate_found)
                 break;
             if ($address['primary_address'] == 1 && !$primary_found) {
@@ -155,7 +155,7 @@ 
             } elseif (!$alternate_found) {
                 $alternate_index = $k;
                 $alternate_found = true;
-            } elseif (!$alternate2_found){
+            } elseif (!$alternate2_found) {
                 $alternate2_index = $k;
                 $alternate2_found = true;
             }
@@ -192,27 +192,27 @@ 
         $args = func_get_args();
         return call_user_func_array(array($this, '_save'), $args);
     }
-    private function _save($id, $module, $new_addrs=array(), $primary='', $replyTo='', $invalid='', $optOut='', $in_workflow=false) {
-        if(empty($this->addresses) || $in_workflow){
-            $this->populateAddresses($id, $module, $new_addrs,$primary);
+    private function _save($id, $module, $new_addrs = array(), $primary = '', $replyTo = '', $invalid = '', $optOut = '', $in_workflow = false) {
+        if (empty($this->addresses) || $in_workflow) {
+            $this->populateAddresses($id, $module, $new_addrs, $primary);
         }
 
         //find all email addresses..
-        $current_links=array();
+        $current_links = array();
         // Need to correct this to handle the Employee/User split
         $module = $this->getCorrectedModule($module);
-        $q2="select *  from email_addr_bean_rel eabr WHERE eabr.bean_id = '".$this->db->quote($id)."' AND eabr.bean_module = '".$this->db->quote($module)."' and eabr.deleted=0";
+        $q2 = "select *  from email_addr_bean_rel eabr WHERE eabr.bean_id = '".$this->db->quote($id)."' AND eabr.bean_module = '".$this->db->quote($module)."' and eabr.deleted=0";
         $r2 = $this->db->query($q2);
-        while(($row2=$this->db->fetchByAssoc($r2)) != null ) {
-            $current_links[$row2['email_address_id']]=$row2;
+        while (($row2 = $this->db->fetchByAssoc($r2)) != null) {
+            $current_links[$row2['email_address_id']] = $row2;
         }
 
         $isConversion = (isset($_REQUEST) && isset($_REQUEST['action']) && $_REQUEST['action'] == 'ConvertLead') ? true : false;
 
         if (!empty($this->addresses)) {
             // insert new relationships and create email address record, if they don't exist
-            foreach($this->addresses as $address) {
-                if(!empty($address['email_address'])) {
+            foreach ($this->addresses as $address) {
+                if (!empty($address['email_address'])) {
                     $guid = create_guid();
                     $emailId = isset($address['email_address_id'])
                         && isset($current_links[$address['email_address_id']])
@@ -220,14 +220,14 @@ 
                     $emailId = $this->AddUpdateEmailAddress($address['email_address'],
                                                             $address['invalid_email'],
                                                             $address['opt_out'],
-                                                            $emailId);// this will save the email address if not found
+                                                            $emailId); // this will save the email address if not found
 
                     //verify linkage and flags.
-                    $upd_eabr="";
+                    $upd_eabr = "";
                     if (isset($current_links[$emailId])) {
                         if (!$isConversion) { // do not update anything if this is for lead conversion
-                        if ($address['primary_address'] != $current_links[$emailId]['primary_address'] or $address['reply_to_address'] != $current_links[$emailId]['reply_to_address'] ) {
-                            $upd_eabr="UPDATE email_addr_bean_rel SET primary_address='".$this->db->quote($address['primary_address'])."', reply_to_address='".$this->db->quote($address['reply_to_address'])."' WHERE id='".$this->db->quote($current_links[$emailId]['id'])."'";
+                        if ($address['primary_address'] != $current_links[$emailId]['primary_address'] or $address['reply_to_address'] != $current_links[$emailId]['reply_to_address']) {
+                            $upd_eabr = "UPDATE email_addr_bean_rel SET primary_address='".$this->db->quote($address['primary_address'])."', reply_to_address='".$this->db->quote($address['reply_to_address'])."' WHERE id='".$this->db->quote($current_links[$emailId]['id'])."'";
                         }
 
                         unset($current_links[$emailId]);
@@ -258,13 +258,13 @@ 
         // for lead conversion, do not delete email addresses
         if (!empty($current_links) && !$isConversion) {
 
-            $delete="";
+            $delete = "";
             foreach ($current_links as $eabr) {
 
-                $delete.=empty($delete) ? "'".$this->db->quote($eabr['id']) . "' " : ",'" . $this->db->quote($eabr['id']) . "'";
+                $delete .= empty($delete) ? "'".$this->db->quote($eabr['id'])."' " : ",'".$this->db->quote($eabr['id'])."'";
             }
 
-            $eabr_unlink="update email_addr_bean_rel set deleted=1 where id in ({$delete})";
+            $eabr_unlink = "update email_addr_bean_rel set deleted=1 where id in ({$delete})";
             $this->db->query($eabr_unlink);
         }
         $this->stateBeforeWorkflow = null;
@@ -286,7 +286,7 @@ 
         )
     {
         $emailCaps = strtoupper(trim($email));
-        if(empty($emailCaps))
+        if (empty($emailCaps))
             return 0;
 
         $q = "SELECT *
@@ -324,10 +324,10 @@ 
         $r = $this->db->query($q, true);
 
         $retArr = array();
-        while($a = $this->db->fetchByAssoc($r)) {
+        while ($a = $this->db->fetchByAssoc($r)) {
             $retArr[] = $a['bean_id'];
         }
-        if(count($retArr) > 0) {
+        if (count($retArr) > 0) {
             return $retArr;
         } else {
             return false;
@@ -347,7 +347,7 @@ 
 
         $email = trim($email);
 
-        if(empty($email)) {
+        if (empty($email)) {
             return array();
         }
 
@@ -356,12 +356,12 @@ 
                 WHERE ea.email_address_caps = $emailCaps and eabl.deleted=0 ";
         $r = $this->db->query($q);
 
-        while($a = $this->db->fetchByAssoc($r)) {
-            if(isset($beanList[$a['bean_module']]) && !empty($beanList[$a['bean_module']])) {
+        while ($a = $this->db->fetchByAssoc($r)) {
+            if (isset($beanList[$a['bean_module']]) && !empty($beanList[$a['bean_module']])) {
                 $className = $beanList[$a['bean_module']];
 
-                if(isset($beanFiles[$className]) && !empty($beanFiles[$className])) {
-                    if(!class_exists($className)) {
+                if (isset($beanFiles[$className]) && !empty($beanFiles[$className])) {
+                    if (!class_exists($className)) {
                         require_once($beanFiles[$className]);
                     }
 
@@ -389,7 +389,7 @@ 
      * @param string $replyTo GUID of reply-to address
      * @param string $invalid GUID of invalid address
      */
-    function populateAddresses($id, $module, $new_addrs=array(), $primary='', $replyTo='', $invalid='', $optOut='') {
+    function populateAddresses($id, $module, $new_addrs = array(), $primary = '', $replyTo = '', $invalid = '', $optOut = '') {
         $module = $this->getCorrectedModule($module);
         //One last check for the ConvertLead action in which case we need to change $module to 'Leads'
         $module = (isset($_REQUEST) && isset($_REQUEST['action']) && $_REQUEST['action'] == 'ConvertLead') ? 'Leads' : $module;
@@ -400,54 +400,54 @@ 
         $hasEmailValue = false;
         $email_ids = array();
 
-        if (isset($_REQUEST) && isset($_REQUEST[$module .'_email_widget_id'])) {
+        if (isset($_REQUEST) && isset($_REQUEST[$module.'_email_widget_id'])) {
 
             $fromRequest = false;
             // determine which array to process
-            foreach($_REQUEST as $k => $v) {
-                if(strpos($k, 'emailAddress') !== false) {
+            foreach ($_REQUEST as $k => $v) {
+                if (strpos($k, 'emailAddress') !== false) {
                    $fromRequest = true;
                    break;
                 }
-            $widget_id = $_REQUEST[$module .'_email_widget_id'];
+            $widget_id = $_REQUEST[$module.'_email_widget_id'];
     }
 
             //Iterate over the widgets for this module, in case there are multiple email widgets for this module
-            while(isset($_REQUEST[$module . $widget_id . "emailAddress" . $widgetCount]))
+            while (isset($_REQUEST[$module.$widget_id."emailAddress".$widgetCount]))
             {
-                if (empty($_REQUEST[$module . $widget_id . "emailAddress" . $widgetCount])) {
+                if (empty($_REQUEST[$module.$widget_id."emailAddress".$widgetCount])) {
                     $widgetCount++;
                     continue;
                 }
 
                 $hasEmailValue = true;
 
-                $eId = $module . $widget_id;
-                if(isset($_REQUEST[$eId . 'emailAddressPrimaryFlag'])) {
-                   $primaryValue = $_REQUEST[$eId . 'emailAddressPrimaryFlag'];
-                } else if(isset($_REQUEST[$module . 'emailAddressPrimaryFlag'])) {
-                   $primaryValue = $_REQUEST[$module . 'emailAddressPrimaryFlag'];
+                $eId = $module.$widget_id;
+                if (isset($_REQUEST[$eId.'emailAddressPrimaryFlag'])) {
+                   $primaryValue = $_REQUEST[$eId.'emailAddressPrimaryFlag'];
+                } else if (isset($_REQUEST[$module.'emailAddressPrimaryFlag'])) {
+                   $primaryValue = $_REQUEST[$module.'emailAddressPrimaryFlag'];
                 }
 
                 $optOutValues = array();
-                if(isset($_REQUEST[$eId .'emailAddressOptOutFlag'])) {
-                   $optOutValues = $_REQUEST[$eId .'emailAddressOptOutFlag'];
-                } else if(isset($_REQUEST[$module . 'emailAddressOptOutFlag'])) {
-                   $optOutValues = $_REQUEST[$module . 'emailAddressOptOutFlag'];
+                if (isset($_REQUEST[$eId.'emailAddressOptOutFlag'])) {
+                   $optOutValues = $_REQUEST[$eId.'emailAddressOptOutFlag'];
+                } else if (isset($_REQUEST[$module.'emailAddressOptOutFlag'])) {
+                   $optOutValues = $_REQUEST[$module.'emailAddressOptOutFlag'];
                 }
 
                 $invalidValues = array();
-                if(isset($_REQUEST[$eId .'emailAddressInvalidFlag'])) {
-                   $invalidValues = $_REQUEST[$eId .'emailAddressInvalidFlag'];
-                } else if(isset($_REQUEST[$module . 'emailAddressInvalidFlag'])) {
-                   $invalidValues = $_REQUEST[$module . 'emailAddressInvalidFlag'];
+                if (isset($_REQUEST[$eId.'emailAddressInvalidFlag'])) {
+                   $invalidValues = $_REQUEST[$eId.'emailAddressInvalidFlag'];
+                } else if (isset($_REQUEST[$module.'emailAddressInvalidFlag'])) {
+                   $invalidValues = $_REQUEST[$module.'emailAddressInvalidFlag'];
                 }
 
                 $deleteValues = array();
-                if(isset($_REQUEST[$eId .'emailAddressDeleteFlag'])) {
-                   $deleteValues = $_REQUEST[$eId .'emailAddressDeleteFlag'];
-                } else if(isset($_REQUEST[$module . 'emailAddressDeleteFlag'])) {
-                   $deleteValues = $_REQUEST[$module . 'emailAddressDeleteFlag'];
+                if (isset($_REQUEST[$eId.'emailAddressDeleteFlag'])) {
+                   $deleteValues = $_REQUEST[$eId.'emailAddressDeleteFlag'];
+                } else if (isset($_REQUEST[$module.'emailAddressDeleteFlag'])) {
+                   $deleteValues = $_REQUEST[$module.'emailAddressDeleteFlag'];
                 }
 
                 // prep from form save
@@ -455,36 +455,36 @@ 
                 $replyToField = '';
                 $invalidField = '';
                 $optOutField = '';
-                if($fromRequest && empty($primary) && isset($primaryValue)) {
+                if ($fromRequest && empty($primary) && isset($primaryValue)) {
                     $primaryField = $primaryValue;
                 }
 
-                if($fromRequest && empty($replyTo)) {
-                    if(isset($_REQUEST[$eId .'emailAddressReplyToFlag'])) {
-                       $replyToField = $_REQUEST[$eId .'emailAddressReplyToFlag'];
-                    } else if(isset($_REQUEST[$module . 'emailAddressReplyToFlag'])) {
-                       $replyToField = $_REQUEST[$module . 'emailAddressReplyToFlag'];
+                if ($fromRequest && empty($replyTo)) {
+                    if (isset($_REQUEST[$eId.'emailAddressReplyToFlag'])) {
+                       $replyToField = $_REQUEST[$eId.'emailAddressReplyToFlag'];
+                    } else if (isset($_REQUEST[$module.'emailAddressReplyToFlag'])) {
+                       $replyToField = $_REQUEST[$module.'emailAddressReplyToFlag'];
                     }
                 }
-                if($fromRequest && empty($new_addrs)) {
-                    foreach($_REQUEST as $k => $v) {
-                        if(preg_match('/'.$eId.'emailAddress[0-9]+$/i', $k) && !empty($v)) {
+                if ($fromRequest && empty($new_addrs)) {
+                    foreach ($_REQUEST as $k => $v) {
+                        if (preg_match('/'.$eId.'emailAddress[0-9]+$/i', $k) && !empty($v)) {
                             $new_addrs[$k] = $v;
                         }
                     }
                 }
-                if($fromRequest && empty($email_ids)) {
-                    foreach($_REQUEST as $k => $v) {
-                        if(preg_match('/'.$eId.'emailAddressId[0-9]+$/i', $k) && !empty($v)) {
+                if ($fromRequest && empty($email_ids)) {
+                    foreach ($_REQUEST as $k => $v) {
+                        if (preg_match('/'.$eId.'emailAddressId[0-9]+$/i', $k) && !empty($v)) {
                             $key = str_replace('emailAddressId', 'emailAddress', $k);
                             $email_ids[$key] = $v;
                         }
                     }
                 }
 
-                if($fromRequest && empty($new_addrs)) {
-                    foreach($_REQUEST as $k => $v) {
-                        if(preg_match('/'.$eId.'emailAddressVerifiedValue[0-9]+$/i', $k) && !empty($v)) {
+                if ($fromRequest && empty($new_addrs)) {
+                    foreach ($_REQUEST as $k => $v) {
+                        if (preg_match('/'.$eId.'emailAddressVerifiedValue[0-9]+$/i', $k) && !empty($v)) {
                             $validateFlag = str_replace("Value", "Flag", $k);
                             if (isset($_REQUEST[$validateFlag]) && $_REQUEST[$validateFlag] == "true")
                               $new_addrs[$k] = $v;
@@ -493,21 +493,21 @@ 
                 }
 
                 //empty the addresses array if the post happened from email address widget.
-                if($post_from_email_address_widget) {
-                    $this->addresses=array();  //this gets populated during retrieve of the contact bean.
+                if ($post_from_email_address_widget) {
+                    $this->addresses = array(); //this gets populated during retrieve of the contact bean.
                 } else {
                     $optOutValues = array();
                     $invalidValues = array();
-                    foreach($new_addrs as $k=>$email) {
+                    foreach ($new_addrs as $k=>$email) {
                        preg_match('/emailAddress([0-9])+$/', $k, $matches);
                        $count = $matches[1];
-                       $result = $this->db->query("SELECT opt_out, invalid_email from email_addresses where email_address_caps = '" . $this->db->quote(strtoupper($email)) . "'");
-                       if(!empty($result)) {
-                          $row=$this->db->fetchByAssoc($result);
-                          if(!empty($row['opt_out'])) {
+                       $result = $this->db->query("SELECT opt_out, invalid_email from email_addresses where email_address_caps = '".$this->db->quote(strtoupper($email))."'");
+                       if (!empty($result)) {
+                          $row = $this->db->fetchByAssoc($result);
+                          if (!empty($row['opt_out'])) {
                              $optOutValues[$k] = "emailAddress$count";
                           }
-                          if(!empty($row['invalid_email'])) {
+                          if (!empty($row['invalid_email'])) {
                              $invalidValues[$k] = "emailAddress$count";
                           }
                        }
@@ -515,11 +515,11 @@ 
                 }
                 // Re-populate the addresses class variable if we have new address(es).
                 if (!empty($new_addrs)) {
-                    foreach($new_addrs as $k => $reqVar) {
+                    foreach ($new_addrs as $k => $reqVar) {
                         //$key = preg_match("/^$eId/s", $k) ? substr($k, strlen($eId)) : $k;
                         $reqVar = trim($reqVar);
-                        if(strpos($k, 'emailAddress') !== false) {
-                            if(!empty($reqVar) && !in_array($k, $deleteValues)) {
+                        if (strpos($k, 'emailAddress') !== false) {
+                            if (!empty($reqVar) && !in_array($k, $deleteValues)) {
                                 $email_id   = (array_key_exists($k, $email_ids)) ? $email_ids[$k] : null;
                                 $primary    = ($k == $primaryValue) ? true : false;
                                 $replyTo    = ($k == $replyToField) ? true : false;
@@ -536,7 +536,7 @@ 
         }
 
         //If no widgets, set addresses array to empty
-        if($post_from_email_address_widget && !$hasEmailValue) {
+        if ($post_from_email_address_widget && !$hasEmailValue) {
            $this->addresses = array();
         }
     }
@@ -547,9 +547,9 @@ 
      * @param bool $primary Default false
      * @param bool $replyTo Default false
      */
-    function addAddress($addr, $primary=false, $replyTo=false, $invalid=false, $optOut=false, $email_id = null) {
+    function addAddress($addr, $primary = false, $replyTo = false, $invalid = false, $optOut = false, $email_id = null) {
         $addr = html_entity_decode($addr, ENT_QUOTES);
-        if(preg_match($this->regex, $addr)) {
+        if (preg_match($this->regex, $addr)) {
             $primaryFlag = ($primary) ? '1' : '0';
             $replyToFlag = ($replyTo) ? '1' : '0';
             $invalidFlag = ($invalid) ? '1' : '0';
@@ -585,17 +585,17 @@ 
      * Updates invalid_email and opt_out flags for each address
      */
     function updateFlags() {
-        if(!empty($this->addresses)) {
-            foreach($this->addresses as $addressMeta) {
-                if(isset($addressMeta['email_address']) && !empty($addressMeta['email_address'])) {
+        if (!empty($this->addresses)) {
+            foreach ($this->addresses as $addressMeta) {
+                if (isset($addressMeta['email_address']) && !empty($addressMeta['email_address'])) {
                     $address = $this->db->quote($this->_cleanAddress($addressMeta['email_address']));
 
                     $q = "SELECT * FROM email_addresses WHERE email_address = '{$address}'";
                     $r = $this->db->query($q);
                     $a = $this->db->fetchByAssoc($r);
 
-                    if(!empty($a)) {
-                        if(isset($a['invalid_email']) && isset($addressMeta['invalid_email']) && isset($addressMeta['opt_out']) && $a['invalid_email'] != $addressMeta['invalid_email'] || $a['opt_out'] != $addressMeta['opt_out']) {
+                    if (!empty($a)) {
+                        if (isset($a['invalid_email']) && isset($addressMeta['invalid_email']) && isset($addressMeta['opt_out']) && $a['invalid_email'] != $addressMeta['invalid_email'] || $a['opt_out'] != $addressMeta['opt_out']) {
                             $qUpdate = "UPDATE email_addresses SET invalid_email = ".intval($addressMeta['invalid_email']).", opt_out = ".intval($addressMeta['opt_out']).", date_modified = '".TimeDate::getInstance()->nowDb()."' WHERE id = '".$this->db->quote($a['id'])."'";
                             $rUpdate = $this->db->query($qUpdate);
                         }
@@ -608,7 +608,7 @@ 
     public function splitEmailAddress($addr)
     {
         $email = $this->_cleanAddress($addr);
-        if(!preg_match($this->regex, $email)) {
+        if (!preg_match($this->regex, $email)) {
             $email = ''; // remove bad email addr
         }
         $name = trim(str_replace(array($email, '<', '>', '"', "'"), '', $addr));
@@ -624,8 +624,8 @@ 
     function _cleanAddress($addr) {
         $addr = trim(from_html($addr));
 
-        if(strpos($addr, "<") !== false && strpos($addr, ">") !== false) {
-            $address = trim(substr($addr, strrpos($addr, "<") +1, strrpos($addr, ">") - strrpos($addr, "<") -1));
+        if (strpos($addr, "<") !== false && strpos($addr, ">") !== false) {
+            $address = trim(substr($addr, strrpos($addr, "<") + 1, strrpos($addr, ">") - strrpos($addr, "<") - 1));
         } else {
             $address = trim($addr);
         }
@@ -646,11 +646,11 @@ 
         $r = $this->db->query($q);
         $a = $this->db->fetchByAssoc($r);
 
-        if(!empty($a) && !empty($a['id'])) {
+        if (!empty($a) && !empty($a['id'])) {
             return $a['id'];
         } else {
             $guid = '';
-            if(!empty($address)){
+            if (!empty($address)) {
                 $guid = create_guid();
                 $now = TimeDate::getInstance()->nowDb();
                 $qa = "INSERT INTO email_addresses (id, email_address, email_address_caps, date_created, date_modified, deleted)
@@ -672,7 +672,7 @@ 
      *        to propagate to the new SugarEmailAddress - see bug 39188
      * @return String GUID of Email Address or '' if cleaned address was empty.
      */
-    public function AddUpdateEmailAddress($addr,$invalid=0,$opt_out=0,$id=null)
+    public function AddUpdateEmailAddress($addr, $invalid = 0, $opt_out = 0, $id = null)
     {
         // sanity checks to avoid SQL injection.
         $invalid = intval($invalid);
@@ -722,12 +722,12 @@ 
             if ($duplicate_email['invalid_email'] != $new_invalid ||
                 $duplicate_email['opt_out'] != $new_opt_out ||
                 (trim($duplicate_email['email_address']) != $address)) {
-                $upd_q = 'UPDATE ' . $this->table_name . ' ' .
-                    'SET email_address=\'' . $address . '\', ' .
-                    'invalid_email=' . $new_invalid . ', ' .
-                    'opt_out=' . $new_opt_out . ', ' .
-                    'date_modified=' . $this->db->now() . ' ' .
-                    'WHERE id=\'' . $this->db->quote($duplicate_email['id']) . '\'';
+                $upd_q = 'UPDATE '.$this->table_name.' '.
+                    'SET email_address=\''.$address.'\', '.
+                    'invalid_email='.$new_invalid.', '.
+                    'opt_out='.$new_opt_out.', '.
+                    'date_modified='.$this->db->now().' '.
+                    'WHERE id=\''.$this->db->quote($duplicate_email['id']).'\'';
                 $upd_r = $this->db->query($upd_q);
             }
             return $duplicate_email['id'];
@@ -735,7 +735,7 @@ 
         else {
             // no case-insensitive address match - it's new, or undeleted.
             $guid = '';
-            if(!empty($address)){
+            if (!empty($address)) {
                 $guid = create_guid();
                 $now = TimeDate::getInstance()->nowDb();
                 $qa = "INSERT INTO email_addresses (id, email_address, email_address_caps, date_created, date_modified, deleted, invalid_email, opt_out)
@@ -751,12 +751,12 @@ 
      * @param object $focus Object in focus
      * @return string email
      */
-    function getPrimaryAddress($focus,$parent_id=null,$parent_type=null) {
+    function getPrimaryAddress($focus, $parent_id = null, $parent_type = null) {
 
-        $parent_type=empty($parent_type) ? $focus->module_dir : $parent_type;
+        $parent_type = empty($parent_type) ? $focus->module_dir : $parent_type;
         // Bug63174: Email address is not shown in the list view for employees
         $parent_type = $this->getCorrectedModule($parent_type);
-        $parent_id=empty($parent_id) ? $focus->id : $parent_id;
+        $parent_id = empty($parent_id) ? $focus->id : $parent_id;
 
         $q = "SELECT ea.email_address FROM email_addresses ea
                 LEFT JOIN email_addr_bean_rel ear ON ea.id = ear.email_address_id
@@ -768,7 +768,7 @@ 
         $r = $this->db->limitQuery($q, 0, 1);
         $a = $this->db->fetchByAssoc($r);
 
-        if(isset($a['email_address'])) {
+        if (isset($a['email_address'])) {
             return $a['email_address'];
         }
         return '';
@@ -809,7 +809,7 @@ 
         $r = $this->db->query($q);
         $a = $this->db->fetchByAssoc($r);
 
-        if(isset($a['email_address'])) {
+        if (isset($a['email_address'])) {
             return $a['email_address'];
         }
         return '';
@@ -834,7 +834,7 @@ 
                 ORDER BY ear.reply_to_address, ear.primary_address DESC";
         $r = $this->db->query($q);
 
-        while($a = $this->db->fetchByAssoc($r, FALSE)) {
+        while ($a = $this->db->fetchByAssoc($r, FALSE)) {
             $return[] = $a;
         }
 
@@ -848,9 +848,9 @@ 
      * @param bool asMetadata Default false
      * @return string HTML/JS for widget
      */
-    function getEmailAddressWidgetEditView($id, $module, $asMetadata=false, $tpl='',$tabindex='0')
+    function getEmailAddressWidgetEditView($id, $module, $asMetadata = false, $tpl = '', $tabindex = '0')
     {
-        if ( !($this->smarty instanceOf Sugar_Smarty ) )
+        if (!($this->smarty instanceOf Sugar_Smarty))
             $this->smarty = new Sugar_Smarty();
 
         global $app_strings, $dictionary, $beanList;
@@ -861,33 +861,33 @@ 
         $passedModule = $module;
         $module = $this->getCorrectedModule($module);
         $saveModule = $module;
-        if(isset($_POST['is_converted']) && $_POST['is_converted']==true){
-            $id=$_POST['return_id'];
-            $module=$_POST['return_module'];
+        if (isset($_POST['is_converted']) && $_POST['is_converted'] == true) {
+            $id = $_POST['return_id'];
+            $module = $_POST['return_module'];
         }
         $prefillDataArr = array();
-        if(!empty($id)) {
+        if (!empty($id)) {
             $prefillDataArr = $this->getAddressesByGUID($id, $module);
             //When coming from convert leads, sometimes module is Contacts while the id is for a lead.
             if (empty($prefillDataArr) && $module == "Contacts")
                 $prefillDataArr = $this->getAddressesByGUID($id, "Leads");
-        } else if(isset($_REQUEST['full_form']) && !empty($_REQUEST['emailAddressWidget'])){
-            $widget_id = isset($_REQUEST[$module . '_email_widget_id']) ? $_REQUEST[$module . '_email_widget_id'] : '0';
+        } else if (isset($_REQUEST['full_form']) && !empty($_REQUEST['emailAddressWidget'])) {
+            $widget_id = isset($_REQUEST[$module.'_email_widget_id']) ? $_REQUEST[$module.'_email_widget_id'] : '0';
             $count = 0;
-            $key = $module . $widget_id . 'emailAddress'.$count;
-            while(isset($_REQUEST[$key])) {
+            $key = $module.$widget_id.'emailAddress'.$count;
+            while (isset($_REQUEST[$key])) {
                    $email = $_REQUEST[$key];
-                   $prefillDataArr[] =  array('email_address'=>$email,
+                   $prefillDataArr[] = array('email_address'=>$email,
                                              'primary_address'=>isset($_REQUEST['emailAddressPrimaryFlag']) && $_REQUEST['emailAddressPrimaryFlag'] == $key,
                                              'invalid_email'=>isset($_REQUEST['emailAddressInvalidFlag']) && in_array($key, $_REQUEST['emailAddressInvalidFlag']),
                                              'opt_out'=>isset($_REQUEST['emailAddressOptOutFlag']) && in_array($key, $_REQUEST['emailAddressOptOutFlag']),
                                              'reply_to_address'=>false
                                         );
-                   $key = $module . $widget_id . 'emailAddress' . ++$count;
+                   $key = $module.$widget_id.'emailAddress'.++$count;
             } //while
         }
 
-        if(!empty($prefillDataArr)) {
+        if (!empty($prefillDataArr)) {
             $json = new JSON(JSON_LOOSE_TYPE);
             $prefillData = $json->encode($prefillDataArr);
             $prefill = !empty($prefillDataArr) ? 'true' : 'false';
@@ -910,23 +910,23 @@ 
         $form = $this->view;
 
         //determine if this should be a quickcreate form, or a quick create form under subpanels
-        if ($this->view == "QuickCreate"){
+        if ($this->view == "QuickCreate") {
             // Fixed #1120 - fixed email validation for: Accounts -> Contacts subpanel -> Select -> Create Contact -> Save.
             // If email is required it should highlight this field and show an error message.
             // It didnt because the the form was named form_DCSubpanelQuickCreate_Contacts instead of expected form_SubpanelQuickCreate_Contacts
-            if($this->object_name = 'EmailAddress' && $saveModule == 'Contacts') {
-                $form = 'form_'.$this->view .'_'.$module;
+            if ($this->object_name = 'EmailAddress' && $saveModule == 'Contacts') {
+                $form = 'form_'.$this->view.'_'.$module;
             } else {
-                $form = 'form_DC'.$this->view .'_'.$module;
+                $form = 'form_DC'.$this->view.'_'.$module;
             }
-            if(isset($_REQUEST['action']) && $_REQUEST['action']=='SubpanelCreates' ||  $_REQUEST['action']=='SubpanelEdits'){
-                $form = 'form_Subpanel'.$this->view .'_'.$module;
+            if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'SubpanelCreates' || $_REQUEST['action'] == 'SubpanelEdits') {
+                $form = 'form_Subpanel'.$this->view.'_'.$module;
             }
         }
 
         $this->smarty->assign('emailView', $form);
 
-        if($module == 'Users') {
+        if ($module == 'Users') {
             $this->smarty->assign('useReplyTo', true);
         } else {
             $this->smarty->assign('useOptOut', true);
@@ -937,7 +937,7 @@ 
         $newEmail = $this->smarty->fetch($template);
 
 
-        if($asMetadata) {
+        if ($asMetadata) {
             // used by Email 2.0
             $ret = array();
             $ret['prefillData'] = $prefillDataArr;
@@ -955,18 +955,18 @@ 
      * @param object $focus Bean in focus
      * @return string HTML/JS for widget
      */
-    function getEmailAddressWidgetDetailView($focus, $tpl='')
+    function getEmailAddressWidgetDetailView($focus, $tpl = '')
     {
-        if ( !($this->smarty instanceOf Sugar_Smarty ) )
+        if (!($this->smarty instanceOf Sugar_Smarty))
             $this->smarty = new Sugar_Smarty();
 
         global $app_strings;
         global $current_user;
         $assign = array();
-        if(empty($focus->id))return '';
+        if (empty($focus->id))return '';
         $prefillData = $this->getAddressesByGUID($focus->id, $focus->module_dir);
 
-        foreach($prefillData as $addressItem) {
+        foreach ($prefillData as $addressItem) {
             $key = ($addressItem['primary_address'] == 1) ? 'primary' : "";
             $key = ($addressItem['reply_to_address'] == 1) ? 'reply_to' : $key;
             $key = ($addressItem['opt_out'] == 1) ? 'opt_out' : $key;
@@ -992,7 +992,7 @@ 
      */
     function getEmailAddressWidgetDuplicatesView($focus)
     {
-        if ( !($this->smarty instanceOf Sugar_Smarty ) )
+        if (!($this->smarty instanceOf Sugar_Smarty))
             $this->smarty = new Sugar_Smarty();
 
         $count = 0;
@@ -1002,49 +1002,49 @@ 
         $invalid = array();
         $mod = isset($focus) ? $focus->module_dir : "";
 
-        $widget_id = $_POST[$mod .'_email_widget_id'];
-        $this->smarty->assign('email_widget_id',$widget_id);
-        $this->smarty->assign('emailAddressWidget',$_POST['emailAddressWidget']);
+        $widget_id = $_POST[$mod.'_email_widget_id'];
+        $this->smarty->assign('email_widget_id', $widget_id);
+        $this->smarty->assign('emailAddressWidget', $_POST['emailAddressWidget']);
 
-        if(isset($_POST[$mod . $widget_id . 'emailAddressPrimaryFlag'])) {
-           $primary = $_POST[$mod . $widget_id . 'emailAddressPrimaryFlag'];
+        if (isset($_POST[$mod.$widget_id.'emailAddressPrimaryFlag'])) {
+           $primary = $_POST[$mod.$widget_id.'emailAddressPrimaryFlag'];
         }
 
-        while(isset($_POST[$mod . $widget_id . "emailAddress" . $count])) {
-            $emails[] = $_POST[$mod . $widget_id . 'emailAddress' . $count];
+        while (isset($_POST[$mod.$widget_id."emailAddress".$count])) {
+            $emails[] = $_POST[$mod.$widget_id.'emailAddress'.$count];
             $count++;
         }
 
-        if($count == 0) {
+        if ($count == 0) {
            return "";
         }
 
-        if(isset($_POST[$mod . $widget_id . 'emailAddressOptOutFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressOptOutFlag'] as $v) {
+        if (isset($_POST[$mod.$widget_id.'emailAddressOptOutFlag'])) {
+           foreach ($_POST[$mod.$widget_id.'emailAddressOptOutFlag'] as $v) {
               $optOut[] = $v;
            }
         }
 
-        if(isset($_POST[$mod . $widget_id . 'emailAddressInvalidFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressInvalidFlag'] as $v) {
+        if (isset($_POST[$mod.$widget_id.'emailAddressInvalidFlag'])) {
+           foreach ($_POST[$mod.$widget_id.'emailAddressInvalidFlag'] as $v) {
               $invalid[] = $v;
            }
         }
 
-        if(isset($_POST[$mod . $widget_id . 'emailAddressReplyToFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressReplyToFlag'] as $v) {
+        if (isset($_POST[$mod.$widget_id.'emailAddressReplyToFlag'])) {
+           foreach ($_POST[$mod.$widget_id.'emailAddressReplyToFlag'] as $v) {
               $replyTo[] = $v;
            }
         }
 
-        if(isset($_POST[$mod . $widget_id . 'emailAddressDeleteFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressDeleteFlag'] as $v) {
+        if (isset($_POST[$mod.$widget_id.'emailAddressDeleteFlag'])) {
+           foreach ($_POST[$mod.$widget_id.'emailAddressDeleteFlag'] as $v) {
               $delete[] = $v;
            }
         }
 
-        while(isset($_POST[$mod . $widget_id . "emailAddressVerifiedValue" . $count])) {
-            $verified[] = $_POST[$mod . $widget_id . 'emailAddressVerifiedValue' . $count];
+        while (isset($_POST[$mod.$widget_id."emailAddressVerifiedValue".$count])) {
+            $verified[] = $_POST[$mod.$widget_id.'emailAddressVerifiedValue'.$count];
             $count++;
         }
 
@@ -1069,33 +1069,33 @@ 
         $count = 0;
         $mod = isset($focus) ? $focus->module_dir : "";
 
-        $widget_id = $_POST[$mod .'_email_widget_id'];
-        $get .= '&' . $mod . '_email_widget_id='. $widget_id;
+        $widget_id = $_POST[$mod.'_email_widget_id'];
+        $get .= '&'.$mod.'_email_widget_id='.$widget_id;
         $get .= '&emailAddressWidget='.$_POST['emailAddressWidget'];
 
-        while(isset($_REQUEST[$mod . $widget_id . 'emailAddress' . $count])) {
-              $get .= "&" . $mod . $widget_id . "emailAddress" . $count . "=" . urlencode($_REQUEST[$mod . $widget_id . 'emailAddress' . $count]);
+        while (isset($_REQUEST[$mod.$widget_id.'emailAddress'.$count])) {
+              $get .= "&".$mod.$widget_id."emailAddress".$count."=".urlencode($_REQUEST[$mod.$widget_id.'emailAddress'.$count]);
               $count++;
         } //while
 
-        while(isset($_REQUEST[$mod . $widget_id . 'emailAddressVerifiedValue' . $count])) {
-              $get .= "&" . $mod . $widget_id . "emailAddressVerifiedValue" . $count . "=" . urlencode($_REQUEST[$mod . $widget_id . 'emailAddressVerifiedValue' . $count]);
+        while (isset($_REQUEST[$mod.$widget_id.'emailAddressVerifiedValue'.$count])) {
+              $get .= "&".$mod.$widget_id."emailAddressVerifiedValue".$count."=".urlencode($_REQUEST[$mod.$widget_id.'emailAddressVerifiedValue'.$count]);
               $count++;
         } //while
 
         $options = array('emailAddressPrimaryFlag', 'emailAddressOptOutFlag', 'emailAddressInvalidFlag', 'emailAddressDeleteFlag', 'emailAddressReplyToFlag');
 
-        foreach($options as $option) {
+        foreach ($options as $option) {
             $count = 0;
             $optionIdentifier = $mod.$widget_id.$option;
-            if(isset($_REQUEST[$optionIdentifier])) {
-               if(is_array($_REQUEST[$optionIdentifier])) {
-                   foreach($_REQUEST[$optionIdentifier] as $optOut) {
-                      $get .= "&" . $optionIdentifier . "[" . $count . "]=" . $optOut;
+            if (isset($_REQUEST[$optionIdentifier])) {
+               if (is_array($_REQUEST[$optionIdentifier])) {
+                   foreach ($_REQUEST[$optionIdentifier] as $optOut) {
+                      $get .= "&".$optionIdentifier."[".$count."]=".$optOut;
                       $count++;
                    } //foreach
                } else {
-                   $get .= "&" . $optionIdentifier . "=" . $_REQUEST[$optionIdentifier];
+                   $get .= "&".$optionIdentifier."=".$_REQUEST[$optionIdentifier];
                }
             } //if
         } //foreach
@@ -1113,7 +1113,7 @@ 
  * @return string The value for the bean_module column in the email_addr_bean_rel table
  */
     function getCorrectedModule(&$module) {
-        return ($module == "Employees")? "Users" : $module;
+        return ($module == "Employees") ? "Users" : $module;
     }
 
     public function stash($parentBeanId, $moduleName)
@@ -1123,7 +1123,7 @@ 
         $ids = array();
         while ($row = $this->db->fetchByAssoc($result, false))
         {
-            $ids[] =$this->db->quote($row['email_address_id']); // avoid 2nd order SQL Injection
+            $ids[] = $this->db->quote($row['email_address_id']); // avoid 2nd order SQL Injection
         }
         if (!empty($ids))
         {
@@ -1147,15 +1147,15 @@ 
  * @param string $view DetailView or EditView
  * @return string
  */
-function getEmailAddressWidget($focus, $field, $value, $view, $tabindex='0') {
+function getEmailAddressWidget($focus, $field, $value, $view, $tabindex = '0') {
     $sea = new SugarEmailAddress();
     $sea->setView($view);
 
-        if($view == 'EditView' || $view == 'QuickCreate' || $view == 'ConvertLead') {
+        if ($view == 'EditView' || $view == 'QuickCreate' || $view == 'ConvertLead') {
             $module = $focus->module_dir;
             if ($view == 'ConvertLead' && $module == "Contacts")  $module = "Leads";
 
-            return $sea->getEmailAddressWidgetEditView($focus->id, $module, false,'',$tabindex);
+            return $sea->getEmailAddressWidgetEditView($focus->id, $module, false, '', $tabindex);
         }
 
     return $sea->getEmailAddressWidgetDetailView($focus);

include/utils/sugar_file_utils.php

Spacing +2 added lines, -2 removed lines

@@ -186,7 +186,7 @@ 
     $temp = tempnam($dir, 'temp');
 
     if (!($f = @fopen($temp, $mode))) {
-        $temp = $dir . DIRECTORY_SEPARATOR . uniqid('temp');
+        $temp = $dir.DIRECTORY_SEPARATOR.uniqid('temp');
         if (!($f = @fopen($temp, $mode))) {
             trigger_error("sugar_file_put_contents_atomic() : error writing temporary file '$temp'", E_USER_WARNING);
 
@@ -393,7 +393,7 @@ 
     }
     if (!is_windows()) {
         $conf_inst = SugarConfig::getInstance();
-        $mode = $conf_inst->get('default_permissions.' . $key, $mode);
+        $mode = $conf_inst->get('default_permissions.'.$key, $mode);
     }
 
     return $mode;