adamjakab / SuiteCRM

include/database/MysqlManager.php

Spacing +140 added lines, -140 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.
@@ -170,25 +170,25 @@ 
 	 */
 	public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
 	{
-		if(is_array($sql)) {
+		if (is_array($sql)) {
 			return $this->queryArray($sql, $dieOnError, $msg, $suppress);
 		}
 
 		parent::countQuery($sql);
-		$GLOBALS['log']->info('Query:' . $sql);
+		$GLOBALS['log']->info('Query:'.$sql);
 		$this->checkConnection();
 		$this->query_time = microtime(true);
 		$this->lastsql = $sql;
-		$result = $suppress?@mysql_query($sql, $this->database):mysql_query($sql, $this->database);
+		$result = $suppress ? @mysql_query($sql, $this->database) : mysql_query($sql, $this->database);
 
 		$this->query_time = microtime(true) - $this->query_time;
 		$GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
 
 
-		if($keepResult)
+		if ($keepResult)
 			$this->lastResult = $result;
 
-		$this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
+		$this->checkError($msg.' Query Failed:'.$sql.'::', $dieOnError);
 		return $result;
 	}
 
@@ -224,7 +224,7 @@ 
 	public function disconnect()
 	{
 		$GLOBALS['log']->debug('Calling MySQL::disconnect()');
-		if(!empty($this->database)){
+		if (!empty($this->database)) {
 			$this->freeResult();
 			mysql_close($this->database);
 			$this->database = null;
@@ -236,7 +236,7 @@ 
 	 */
 	protected function freeDbResult($dbResult)
 	{
-		if(!empty($dbResult))
+		if (!empty($dbResult))
 			mysql_free_result($dbResult);
 	}
 
@@ -262,15 +262,15 @@ 
         $count = (int)$count;
 	    if ($start < 0)
 			$start = 0;
-		$GLOBALS['log']->debug('Limit Query:' . $sql. ' Start: ' .$start . ' count: ' . $count);
+		$GLOBALS['log']->debug('Limit Query:'.$sql.' Start: '.$start.' count: '.$count);
 
 	    $sql = "$sql LIMIT $start,$count";
 		$this->lastsql = $sql;
 
-		if(!empty($GLOBALS['sugar_config']['check_query'])){
+		if (!empty($GLOBALS['sugar_config']['check_query'])) {
 			$this->checkQuery($sql);
 		}
-		if(!$execute) {
+		if (!$execute) {
 			return $sql;
 		}
 
@@ -283,14 +283,14 @@ 
 	 */
 	protected function checkQuery($sql, $object_name = false)
 	{
-		$result   = $this->query('EXPLAIN ' . $sql);
+		$result   = $this->query('EXPLAIN '.$sql);
 		$badQuery = array();
 		while ($row = $this->fetchByAssoc($result)) {
 			if (empty($row['table']))
 				continue;
 			$badQuery[$row['table']] = '';
 			if (strtoupper($row['type']) == 'ALL')
-				$badQuery[$row['table']]  .=  ' Full Table Scan;';
+				$badQuery[$row['table']] .= ' Full Table Scan;';
 			if (empty($row['key']))
 				$badQuery[$row['table']] .= ' No Index Key Used;';
 			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using filesort') > 0)
@@ -299,18 +299,18 @@ 
 				$badQuery[$row['table']] .= ' Using Temporary Table;';
 		}
 
-		if ( empty($badQuery) )
+		if (empty($badQuery))
 			return true;
 
-		foreach($badQuery as $table=>$data ){
-			if(!empty($data)){
-				$warning = ' Table:' . $table . ' Data:' . $data;
-				if(!empty($GLOBALS['sugar_config']['check_query_log'])){
+		foreach ($badQuery as $table=>$data) {
+			if (!empty($data)) {
+				$warning = ' Table:'.$table.' Data:'.$data;
+				if (!empty($GLOBALS['sugar_config']['check_query_log'])) {
 					$GLOBALS['log']->fatal($sql);
-					$GLOBALS['log']->fatal('CHECK QUERY:' .$warning);
+					$GLOBALS['log']->fatal('CHECK QUERY:'.$warning);
 				}
-				else{
-					$GLOBALS['log']->warn('CHECK QUERY:' .$warning);
+				else {
+					$GLOBALS['log']->warn('CHECK QUERY:'.$warning);
 				}
 			}
 		}
@@ -327,19 +327,19 @@ 
 		$result = $this->query("DESCRIBE $tablename");
 
 		$columns = array();
-		while (($row=$this->fetchByAssoc($result)) !=null) {
+		while (($row = $this->fetchByAssoc($result)) != null) {
 			$name = strtolower($row['Field']);
-			$columns[$name]['name']=$name;
+			$columns[$name]['name'] = $name;
 			$matches = array();
 			preg_match_all('/(\w+)(?:\(([0-9]+,?[0-9]*)\)|)( unsigned)?/i', $row['Type'], $matches);
-			$columns[$name]['type']=strtolower($matches[1][0]);
-			if ( isset($matches[2][0]) && in_array(strtolower($matches[1][0]),array('varchar','char','varchar2','int','decimal','float')) )
-				$columns[$name]['len']=strtolower($matches[2][0]);
-			if ( stristr($row['Extra'],'auto_increment') )
+			$columns[$name]['type'] = strtolower($matches[1][0]);
+			if (isset($matches[2][0]) && in_array(strtolower($matches[1][0]), array('varchar', 'char', 'varchar2', 'int', 'decimal', 'float')))
+				$columns[$name]['len'] = strtolower($matches[2][0]);
+			if (stristr($row['Extra'], 'auto_increment'))
 				$columns[$name]['auto_increment'] = '1';
-			if ($row['Null'] == 'NO' && !stristr($row['Key'],'PRI'))
+			if ($row['Null'] == 'NO' && !stristr($row['Key'], 'PRI'))
 				$columns[$name]['required'] = 'true';
-			if (!empty($row['Default']) )
+			if (!empty($row['Default']))
 				$columns[$name]['default'] = $row['Default'];
 		}
 		return $columns;
@@ -348,20 +348,20 @@ 
 	/**
 	 * @see DBManager::getFieldsArray()
 	 */
-	public function getFieldsArray($result, $make_lower_case=false)
+	public function getFieldsArray($result, $make_lower_case = false)
 	{
 		$field_array = array();
 
-		if(empty($result))
+		if (empty($result))
 			return 0;
 
 		$fields = mysql_num_fields($result);
-		for ($i=0; $i < $fields; $i++) {
+		for ($i = 0; $i < $fields; $i++) {
 			$meta = mysql_fetch_field($result, $i);
 			if (!$meta)
 				return array();
 
-			if($make_lower_case == true)
+			if ($make_lower_case == true)
 				$meta->name = strtolower($meta->name);
 
 			$field_array[] = $meta->name;
@@ -393,7 +393,7 @@ 
 			if (!empty($r)) {
 				while ($a = $this->fetchByAssoc($r)) {
 					$row = array_values($a);
-					$tables[]=$row[0];
+					$tables[] = $row[0];
 				}
 				return $tables;
 			}
@@ -419,7 +419,7 @@ 
 
 		if ($this->getDatabase()) {
 			$result = $this->query("SHOW TABLES LIKE ".$this->quoted($tableName));
-			if(empty($result)) return false;
+			if (empty($result)) return false;
 			$row = $this->fetchByAssoc($result);
 			return !empty($row);
 		}
@@ -440,7 +440,7 @@ 
 			if (!empty($r)) {
 				while ($a = $this->fetchByAssoc($r)) {
 					$row = array_values($a);
-					$tables[]=$row[0];
+					$tables[] = $row[0];
 				}
 				return $tables;
 			}
@@ -453,7 +453,7 @@ 
 	 */
 	public function quote($string)
 	{
-		if(is_array($string)) {
+		if (is_array($string)) {
 			return $this->arrayQuote($string);
 		}
 		return mysql_real_escape_string($this->quoteInternal($string), $this->getDatabase());
@@ -474,7 +474,7 @@ 
 	{
 		global $sugar_config;
 
-		if(is_null($configOptions))
+		if (is_null($configOptions))
 			$configOptions = $sugar_config['dbconfig'];
 
 		if ($this->getOption('persistent')) {
@@ -491,10 +491,10 @@ 
 					$configOptions['db_user_name'],
 					$configOptions['db_password']
 					);
-			if(empty($this->database)) {
+			if (empty($this->database)) {
 				$GLOBALS['log']->fatal("Could not connect to server ".$configOptions['db_host_name']." as ".$configOptions['db_user_name'].":".mysql_error());
-				if($dieOnError) {
-					if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
+				if ($dieOnError) {
+					if (isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
 						sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
 					} else {
 						sugar_die("Could not connect to the database. Please refer to suitecrm.log for details.");
@@ -504,15 +504,15 @@ 
 				}
 			}
 			// Do not pass connection information because we have not connected yet
-			if($this->database  && $this->getOption('persistent')){
+			if ($this->database && $this->getOption('persistent')) {
 				$_SESSION['administrator_error'] = "<b>Severe Performance Degradation: Persistent Database Connections "
 					. "not working.  Please set \$sugar_config['dbconfigoption']['persistent'] to false "
 					. "in your config.php file</b>";
 			}
 		}
-		if(!empty($configOptions['db_name']) && !@mysql_select_db($configOptions['db_name'])) {
-			$GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}: " . mysql_error($this->database));
-			if($dieOnError) {
+		if (!empty($configOptions['db_name']) && !@mysql_select_db($configOptions['db_name'])) {
+			$GLOBALS['log']->fatal("Unable to select database {$configOptions['db_name']}: ".mysql_error($this->database));
+			if ($dieOnError) {
 				sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
 			} else {
 				return false;
@@ -523,12 +523,12 @@ 
 	    mysql_query("SET CHARACTER SET utf8", $this->database);
 	    $names = "SET NAMES 'utf8'";
 	    $collation = $this->getOption('collation');
-	    if(!empty($collation)) {
+	    if (!empty($collation)) {
 	        $names .= " COLLATE '$collation'";
 		}
 	    mysql_query($names, $this->database);
 
-		if(!$this->checkError('Could Not Connect:', $dieOnError))
+		if (!$this->checkError('Could Not Connect:', $dieOnError))
 			$GLOBALS['log']->info("connected to db");
 		$this->connectOptions = $configOptions;
 
@@ -544,16 +544,16 @@ 
 	 */
 	public function repairTableParams($tablename, $fielddefs, $indices, $execute = true, $engine = null)
 	{
-		$sql = parent::repairTableParams($tablename,$fielddefs,$indices,false,$engine);
+		$sql = parent::repairTableParams($tablename, $fielddefs, $indices, false, $engine);
 
-		if ( $sql == '' )
+		if ($sql == '')
 			return '';
 
-		if ( stristr($sql,'create table') )
+		if (stristr($sql, 'create table'))
 		{
 			if ($execute) {
-				$msg = "Error creating table: ".$tablename. ":";
-				$this->query($sql,true,$msg);
+				$msg = "Error creating table: ".$tablename.":";
+				$this->query($sql, true, $msg);
 			}
 			return $sql;
 		}
@@ -562,23 +562,23 @@ 
 		$match = array();
 		preg_match_all('!/\*.*?\*/!is', $sql, $match);
 		$commentBlocks = $match[0];
-		$sql = preg_replace('!/\*.*?\*/!is','', $sql);
+		$sql = preg_replace('!/\*.*?\*/!is', '', $sql);
 
 		// now, we should only have alter table statements
 		// let's replace the 'alter table name' part with a comma
-		$sql = preg_replace("!alter table $tablename!is",', ', $sql);
+		$sql = preg_replace("!alter table $tablename!is", ', ', $sql);
 
 		// re-add it at the beginning
-		$sql = substr_replace($sql,'',strpos($sql,','),1);
-		$sql = str_replace(";","",$sql);
-		$sql = str_replace("\n","",$sql);
+		$sql = substr_replace($sql, '', strpos($sql, ','), 1);
+		$sql = str_replace(";", "", $sql);
+		$sql = str_replace("\n", "", $sql);
 		$sql = "ALTER TABLE $tablename $sql";
 
-		if ( $execute )
-			$this->query($sql,'Error with MySQL repair table');
+		if ($execute)
+			$this->query($sql, 'Error with MySQL repair table');
 
 		// and re-add the comments at the beginning
-		$sql = implode("\n",$commentBlocks) . "\n". $sql . "\n";
+		$sql = implode("\n", $commentBlocks)."\n".$sql."\n";
 
 		return $sql;
 	}
@@ -589,7 +589,7 @@ 
 	public function convert($string, $type, array $additional_parameters = array())
 	{
 		$all_parameters = $additional_parameters;
-		if(is_array($string)) {
+		if (is_array($string)) {
 			$all_parameters = array_merge($string, $all_parameters);
 		} elseif (!is_null($string)) {
 			array_unshift($all_parameters, $string);
@@ -602,17 +602,17 @@ 
 			case 'left':
 				return "LEFT($all_strings)";
 			case 'date_format':
-				if(empty($additional_parameters)) {
+				if (empty($additional_parameters)) {
 					return "DATE_FORMAT($string,'%Y-%m-%d')";
 				} else {
 					$format = $additional_parameters[0];
-					if($format[0] != "'") {
+					if ($format[0] != "'") {
 						$format = $this->quoted($format);
 					}
 					return "DATE_FORMAT($string,$format)";
 				}
 			case 'ifnull':
-				if(empty($additional_parameters) && !strstr($all_strings, ",")) {
+				if (empty($additional_parameters) && !strstr($all_strings, ",")) {
 					$all_strings .= ",''";
 				}
 				return "IFNULL($all_strings)";
@@ -631,7 +631,7 @@ 
             case 'add_tz_offset' :
                 $getUserUTCOffset = $GLOBALS['timedate']->getUserUTCOffset();
                 $operation = $getUserUTCOffset < 0 ? '-' : '+';
-                return $string . ' ' . $operation . ' INTERVAL ' . abs($getUserUTCOffset) . ' MINUTE';
+                return $string.' '.$operation.' INTERVAL '.abs($getUserUTCOffset).' MINUTE';
             case 'avg':
                 return "avg($string)";
 		}
@@ -672,15 +672,15 @@ 
 	 */
 	protected function isEngineEnabled($engine)
 	{
-		if(!is_string($engine)) return false;
+		if (!is_string($engine)) return false;
 
 		$engine = strtoupper($engine);
 
 		$r = $this->query("SHOW ENGINES");
 
-		while ( $row = $this->fetchByAssoc($r) )
-			if ( strtoupper($row['Engine']) == $engine )
-				return ($row['Support']=='YES' || $row['Support']=='DEFAULT');
+		while ($row = $this->fetchByAssoc($r))
+			if (strtoupper($row['Engine']) == $engine)
+				return ($row['Support'] == 'YES' || $row['Support'] == 'DEFAULT');
 
 		return false;
 	}
@@ -708,9 +708,9 @@ 
 	*/
 	public function createTableSQLParams($tablename, $fieldDefs, $indices, $engine = null)
 	{
-		if ( empty($engine) && isset($fieldDefs['engine']))
+		if (empty($engine) && isset($fieldDefs['engine']))
 			$engine = $fieldDefs['engine'];
-		if ( !$this->isEngineEnabled($engine) )
+		if (!$this->isEngineEnabled($engine))
 			$engine = '';
 
 		$columns = $this->columnSQLRep($fieldDefs, false, $tablename);
@@ -723,13 +723,13 @@ 
 
 		// cn: bug 9873 - module tables do not get created in utf8 with assoc collation
 		$collation = $this->getOption('collation');
-		if(empty($collation)) {
+		if (empty($collation)) {
 		    $collation = 'utf8_general_ci';
 		}
 		$sql = "CREATE TABLE $tablename ($columns $keys) CHARACTER SET utf8 COLLATE $collation";
 
 		if (!empty($engine))
-			$sql.= " ENGINE=$engine";
+			$sql .= " ENGINE=$engine";
 
 		return $sql;
 	}
@@ -741,7 +741,7 @@ 
     public function isTextType($type)
     {
         $type = $this->getColumnType(strtolower($type));
-        return in_array($type, array('blob','text','longblob', 'longtext'));
+        return in_array($type, array('blob', 'text', 'longblob', 'longtext'));
     }
 
 	/**
@@ -752,16 +752,16 @@ 
 		// always return as array for post-processing
 		$ref = parent::oneColumnSQLRep($fieldDef, $ignoreRequired, $table, true);
 
-		if ( $ref['colType'] == 'int' && !empty($fieldDef['len']) ) {
+		if ($ref['colType'] == 'int' && !empty($fieldDef['len'])) {
 			$ref['colType'] .= "(".$fieldDef['len'].")";
 		}
 
 		// bug 22338 - don't set a default value on text or blob fields
-		if ( isset($ref['default']) &&
+		if (isset($ref['default']) &&
             in_array($ref['colBaseType'], array('text', 'blob', 'longtext', 'longblob')))
 			    $ref['default'] = '';
 
-		if ( $return_as_array )
+		if ($return_as_array)
 			return $ref;
 		else
 			return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
@@ -773,8 +773,8 @@ 
 	protected function changeColumnSQL($tablename, $fieldDefs, $action, $ignoreRequired = false)
 	{
 		$columns = array();
-		if ($this->isFieldArray($fieldDefs)){
-			foreach ($fieldDefs as $def){
+		if ($this->isFieldArray($fieldDefs)) {
+			foreach ($fieldDefs as $def) {
 				if ($action == 'drop')
 					$columns[] = $def['name'];
 				else
@@ -811,7 +811,7 @@ 
 
 	$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;
@@ -841,7 +841,7 @@ 
 				* that this can easily be fixed by referring to db dictionary
 				* to find the correct primary field name
 				*/
-			if ( $alter_table )
+			if ($alter_table)
 				$columns[] = " INDEX $name ($fields)";
 			else
 				$columns[] = " KEY $name ($fields)";
@@ -850,13 +850,13 @@ 
 			if ($this->full_text_indexing_installed())
 				$columns[] = " FULLTEXT ($fields)";
 			else
-				$GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:',$name);
+				$GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:', $name);
 			break;
 		}
 	}
 	$columns = implode(", $alter_action ", $columns);
-	if(!empty($alter_action)){
-		$columns = $alter_action . ' '. $columns;
+	if (!empty($alter_action)) {
+		$columns = $alter_action.' '.$columns;
 	}
 	return $columns;
 	}
@@ -878,7 +878,7 @@ 
 	public function setAutoIncrementStart($table, $field_name, $start_value)
 	{
 		$start_value = (int)$start_value;
-		return $this->query( "ALTER TABLE $table AUTO_INCREMENT = $start_value;");
+		return $this->query("ALTER TABLE $table AUTO_INCREMENT = $start_value;");
 	}
 
 	/**
@@ -907,18 +907,18 @@ 
 		$result = $this->query("SHOW INDEX FROM $tablename");
 
 		$indices = array();
-		while (($row=$this->fetchByAssoc($result)) !=null) {
-			$index_type='index';
-			if ($row['Key_name'] =='PRIMARY') {
-				$index_type='primary';
+		while (($row = $this->fetchByAssoc($result)) != null) {
+			$index_type = 'index';
+			if ($row['Key_name'] == 'PRIMARY') {
+				$index_type = 'primary';
 			}
-			elseif ( $row['Non_unique'] == '0' ) {
-				$index_type='unique';
+			elseif ($row['Non_unique'] == '0') {
+				$index_type = 'unique';
 			}
 			$name = strtolower($row['Key_name']);
-			$indices[$name]['name']=$name;
-			$indices[$name]['type']=$index_type;
-			$indices[$name]['fields'][]=strtolower($row['Column_name']);
+			$indices[$name]['name'] = $name;
+			$indices[$name]['type'] = $index_type;
+			$indices[$name]['fields'][] = strtolower($row['Column_name']);
 		}
 		return $indices;
 	}
@@ -929,11 +929,11 @@ 
 	public function add_drop_constraint($table, $definition, $drop = false)
 	{
 		$type         = $definition['type'];
-		$fields       = implode(',',$definition['fields']);
+		$fields       = implode(',', $definition['fields']);
 		$name         = $definition['name'];
 		$sql          = '';
 
-		switch ($type){
+		switch ($type) {
 		// generic indices
 		case 'index':
 		case 'alternate_key':
@@ -977,7 +977,7 @@ 
 	 */
 	public function fetchOne($sql, $dieOnError = false, $msg = '', $suppress = false)
 	{
-		if(stripos($sql, ' LIMIT ') === false) {
+		if (stripos($sql, ' LIMIT ') === false) {
 			// little optimization to just fetch one row
 			$sql .= " LIMIT 0,1";
 		}
@@ -997,13 +997,13 @@ 
 	 */
 	public function massageFieldDef(&$fieldDef, $tablename)
 	{
-		parent::massageFieldDef($fieldDef,$tablename);
+		parent::massageFieldDef($fieldDef, $tablename);
 
-		if ( isset($fieldDef['default']) &&
+		if (isset($fieldDef['default']) &&
 			($fieldDef['dbType'] == 'text'
 				|| $fieldDef['dbType'] == 'blob'
 				|| $fieldDef['dbType'] == 'longtext'
-				|| $fieldDef['dbType'] == 'longblob' ))
+				|| $fieldDef['dbType'] == 'longblob'))
 			unset($fieldDef['default']);
 		if ($fieldDef['dbType'] == 'uint')
 			$fieldDef['len'] = '10';
@@ -1011,22 +1011,22 @@ 
 			$fieldDef['len'] = '20';
 		if ($fieldDef['dbType'] == 'bool')
 			$fieldDef['type'] = 'tinyint';
-		if ($fieldDef['dbType'] == 'bool' && empty($fieldDef['default']) )
+		if ($fieldDef['dbType'] == 'bool' && empty($fieldDef['default']))
 			$fieldDef['default'] = '0';
-		if (($fieldDef['dbType'] == 'varchar' || $fieldDef['dbType'] == 'enum') && empty($fieldDef['len']) )
+		if (($fieldDef['dbType'] == 'varchar' || $fieldDef['dbType'] == 'enum') && empty($fieldDef['len']))
 			$fieldDef['len'] = '255';
 		if ($fieldDef['dbType'] == 'uint')
 			$fieldDef['len'] = '10';
-		if ($fieldDef['dbType'] == 'int' && empty($fieldDef['len']) )
+		if ($fieldDef['dbType'] == 'int' && empty($fieldDef['len']))
 			$fieldDef['len'] = '11';
 
-		if($fieldDef['dbType'] == 'decimal') {
-			if(isset($fieldDef['len'])) {
-				if(strstr($fieldDef['len'], ",") === false) {
+		if ($fieldDef['dbType'] == 'decimal') {
+			if (isset($fieldDef['len'])) {
+				if (strstr($fieldDef['len'], ",") === false) {
 					$fieldDef['len'] .= ",0";
 				}
 			} else {
-				$fieldDef['len']  = '10,0';
+				$fieldDef['len'] = '10,0';
 			}
 		}
 	}
@@ -1046,8 +1046,8 @@ 
 	{
 		$sql = array();
 		foreach ($indexes as $index) {
-			$name =$index['name'];
-			if($execute) {
+			$name = $index['name'];
+			if ($execute) {
 			unset(self::$index_descriptions[$tablename][$name]);
 			}
 			if ($index['type'] == 'primary') {
@@ -1057,8 +1057,8 @@ 
 			}
 		}
 		if (!empty($sql)) {
-            $sql = "ALTER TABLE $tablename " . join(",", $sql) . ";";
-			if($execute)
+            $sql = "ALTER TABLE $tablename ".join(",", $sql).";";
+			if ($execute)
 				$this->query($sql);
 		} else {
 			$sql = '';
@@ -1084,7 +1084,7 @@ 
 		$q = "SHOW COLLATION LIKE 'utf8%'";
 		$r = $this->query($q);
 		$res = array();
-		while($a = $this->fetchByAssoc($r)) {
+		while ($a = $this->fetchByAssoc($r)) {
 			$res[] = $a['Collation'];
 		}
 		return $res;
@@ -1104,13 +1104,13 @@ 
 	public function emptyValue($type)
 	{
 		$ctype = $this->getColumnType($type);
-		if($ctype == "datetime") {
+		if ($ctype == "datetime") {
 			return $this->convert($this->quoted("0000-00-00 00:00:00"), "datetime");
 		}
-		if($ctype == "date") {
+		if ($ctype == "date") {
 			return $this->convert($this->quoted("0000-00-00"), "date");
 		}
-		if($ctype == "time") {
+		if ($ctype == "time") {
 			return $this->convert($this->quoted("00:00:00"), "time");
 		}
 		return parent::emptyValue($type);
@@ -1122,13 +1122,13 @@ 
 	 */
 	public function lastDbError()
 	{
-		if($this->database) {
-		    if(mysql_errno($this->database)) {
+		if ($this->database) {
+		    if (mysql_errno($this->database)) {
 			    return "MySQL error ".mysql_errno($this->database).": ".mysql_error($this->database);
 		    }
 		} else {
-			$err =  mysql_error();
-			if($err) {
+			$err = mysql_error();
+			if ($err) {
 			    return $err;
 			}
 		}
@@ -1141,7 +1141,7 @@ 
 	 */
 	protected function quoteTerm($term)
 	{
-		if(strpos($term, ' ') !== false) {
+		if (strpos($term, ' ') !== false) {
 			return '"'.$term.'"';
 		}
 		return $term;
@@ -1157,16 +1157,16 @@ 
 	public function getFulltextQuery($field, $terms, $must_terms = array(), $exclude_terms = array())
 	{
 		$condition = array();
-		foreach($terms as $term) {
+		foreach ($terms as $term) {
 			$condition[] = $this->quoteTerm($term);
 		}
-		foreach($must_terms as $term) {
+		foreach ($must_terms as $term) {
 			$condition[] = "+".$this->quoteTerm($term);
 		}
-		foreach($exclude_terms as $term) {
+		foreach ($exclude_terms as $term) {
 			$condition[] = "-".$this->quoteTerm($term);
 		}
-		$condition = $this->quoted(join(" ",$condition));
+		$condition = $this->quoted(join(" ", $condition));
 		return "MATCH($field) AGAINST($condition IN BOOLEAN MODE)";
 	}
 
@@ -1178,7 +1178,7 @@ 
 	{
 		$charsets = array();
 		$res = $this->query("show variables like 'character\\_set\\_%'");
-		while($row = $this->fetchByAssoc($res)) {
+		while ($row = $this->fetchByAssoc($res)) {
 			$charsets[$row['Variable_name']] = $row['Value'];
 		}
 		return $charsets;
@@ -1188,7 +1188,7 @@ 
 	{
 		$charsets = $this->getCharsetInfo();
 		$charset_str = array();
-		foreach($charsets as $name => $value) {
+		foreach ($charsets as $name => $value) {
 			$charset_str[] = "$name = $value";
 		}
 		return array(
@@ -1210,18 +1210,18 @@ 
 	{
 		$this->log->debug("creating temp table for [$table]...");
 		$result = $this->query("SHOW CREATE TABLE {$table}");
-		if(empty($result)) {
+		if (empty($result)) {
 			return false;
 		}
 		$row = $this->fetchByAssoc($result);
-		if(empty($row) || empty($row['Create Table'])) {
+		if (empty($row) || empty($row['Create Table'])) {
 		    return false;
 		}
 		$create = $row['Create Table'];
 		// rewrite DDL with _temp name
 		$tempTableQuery = str_replace("CREATE TABLE `{$table}`", "CREATE TABLE `{$table}__uw_temp`", $create);
 		$r2 = $this->query($tempTableQuery);
-		if(empty($r2)) {
+		if (empty($r2)) {
 			return false;
 		}
 
@@ -1243,11 +1243,11 @@ 
 		$this->log->debug("verifying ALTER TABLE");
 		// Skipping ALTER TABLE [table] DROP PRIMARY KEY because primary keys are not being copied
 		// over to the temp tables
-		if(strpos(strtoupper($query), 'DROP PRIMARY KEY') !== false) {
+		if (strpos(strtoupper($query), 'DROP PRIMARY KEY') !== false) {
 			$this->log->debug("Skipping DROP PRIMARY KEY");
 			return '';
 		}
-		if(!$this->makeTempTableCopy($table)) {
+		if (!$this->makeTempTableCopy($table)) {
 			return 'Could not create temp table copy';
 		}
 
@@ -1255,7 +1255,7 @@ 
 		$this->log->debug('testing query: ['.$query.']');
 		$tempTableTestQuery = str_replace("ALTER TABLE `{$table}`", "ALTER TABLE `{$table}__uw_temp`", $query);
 		if (strpos($tempTableTestQuery, 'idx') === false) {
-			if(strpos($tempTableTestQuery, '__uw_temp') === false) {
+			if (strpos($tempTableTestQuery, '__uw_temp') === false) {
 				return 'Could not use a temp table to test query!';
 			}
 
@@ -1268,7 +1268,7 @@ 
 			$this->query($tempTableTestQuery_idx, false, "Preflight Failed for: {$query}");
 		}
 		$mysqlError = $this->getL();
-		if(!empty($mysqlError)) {
+		if (!empty($mysqlError)) {
 			return $mysqlError;
 		}
 		$this->dropTableName("{$table}__uw_temp");
@@ -1280,13 +1280,13 @@ 
 	{
 		$this->log->debug("verifying $querytype statement");
 
-		if(!$this->makeTempTableCopy($table)) {
+		if (!$this->makeTempTableCopy($table)) {
 			return 'Could not create temp table copy';
 		}
 		// test the query on the test table
 		$this->log->debug('testing query: ['.$query.']');
 		$tempTableTestQuery = str_replace("$querytype `{$table}`", "$querytype `{$table}__uw_temp`", $query);
-		if(strpos($tempTableTestQuery, '__uw_temp') === false) {
+		if (strpos($tempTableTestQuery, '__uw_temp') === false) {
 			return 'Could not use a temp table to test query!';
 		}
 
@@ -1366,11 +1366,11 @@ 
 	public function userExists($username)
 	{
 		$db = $this->getOne("SELECT DATABASE()");
-		if(!$this->selectDb("mysql")) {
+		if (!$this->selectDb("mysql")) {
 			return false;
 		}
 		$user = $this->getOne("select count(*) from user where user = ".$this->quoted($username));
-		if(!$this->selectDb($db)) {
+		if (!$this->selectDb($db)) {
 			$this->checkError("Cannot select database $db", true);
 		}
 		return !empty($user);
@@ -1392,7 +1392,7 @@ 
 							IDENTIFIED BY '{$qpassword}';", true);
 
 		$this->query("SET PASSWORD FOR \"{$user}\"@\"{$host_name}\" = password('{$qpassword}');", true);
-		if($host_name != 'localhost') {
+		if ($host_name != 'localhost') {
 			$this->createDbUser($database_name, "localhost", $user, $password);
 		}
 	}
@@ -1438,10 +1438,10 @@ 
 	public function canInstall()
 	{
 		$db_version = $this->version();
-		if(empty($db_version)) {
+		if (empty($db_version)) {
 			return array('ERR_DB_VERSION_FAILURE');
 		}
-		if(version_compare($db_version, '4.1.2') < 0) {
+		if (version_compare($db_version, '4.1.2') < 0) {
 			return array('ERR_DB_MYSQL_VERSION', $db_version);
 		}
 		return true;

include/database/MysqliManager.php

Spacing +36 added lines, -36 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.
@@ -121,18 +121,18 @@ 
 	 */
 	public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
 	{
-		if(is_array($sql)) {
+		if (is_array($sql)) {
 			return $this->queryArray($sql, $dieOnError, $msg, $suppress);
         }
 
 		static $queryMD5 = array();
 
 		parent::countQuery($sql);
-		$GLOBALS['log']->info('Query:' . $sql);
+		$GLOBALS['log']->info('Query:'.$sql);
 		$this->checkConnection();
 		$this->query_time = microtime(true);
 		$this->lastsql = $sql;
-		$result = $suppress?@mysqli_query($this->database,$sql):mysqli_query($this->database,$sql);
+		$result = $suppress ? @mysqli_query($this->database, $sql) : mysqli_query($this->database, $sql);
 		$md5 = md5($sql);
 
 		if (empty($queryMD5[$md5]))
@@ -154,9 +154,9 @@ 
 		*/
 
 
-		if($keepResult)
+		if ($keepResult)
 			$this->lastResult = $result;
-		$this->checkError($msg.' Query Failed: ' . $sql, $dieOnError);
+		$this->checkError($msg.' Query Failed: '.$sql, $dieOnError);
 
 		return $result;
 	}
@@ -193,10 +193,10 @@ 
 	 */
 	public function disconnect()
 	{
-		if(isset($GLOBALS['log']) && !is_null($GLOBALS['log'])) {
+		if (isset($GLOBALS['log']) && !is_null($GLOBALS['log'])) {
 			$GLOBALS['log']->debug('Calling MySQLi::disconnect()');
 		}
-		if(!empty($this->database)){
+		if (!empty($this->database)) {
 			$this->freeResult();
 			mysqli_close($this->database);
 			$this->database = null;
@@ -208,7 +208,7 @@ 
 	 */
 	protected function freeDbResult($dbResult)
 	{
-		if(!empty($dbResult))
+		if (!empty($dbResult))
 			mysqli_free_result($dbResult);
 	}
 
@@ -228,7 +228,7 @@ 
 			if (!$meta)
 				return 0;
 
-			if($make_lower_case == true)
+			if ($make_lower_case == true)
 				$meta->name = strtolower($meta->name);
 
 			$field_array[] = $meta->name;
@@ -247,7 +247,7 @@ 
 		if (empty($result))	return false;
 
 		$row = mysqli_fetch_assoc($result);
-		if($row == null) $row = false; //Make sure MySQLi driver results are consistent with other database drivers
+		if ($row == null) $row = false; //Make sure MySQLi driver results are consistent with other database drivers
 		return $row;
 	}
 
@@ -256,7 +256,7 @@ 
 	 */
 	public function quote($string)
 	{
-		return mysqli_real_escape_string($this->getDatabase(),$this->quoteInternal($string));
+		return mysqli_real_escape_string($this->getDatabase(), $this->quoteInternal($string));
 	}
 
 	/**
@@ -269,23 +269,23 @@ 
 		if (is_null($configOptions))
 			$configOptions = $sugar_config['dbconfig'];
 
-		if(!isset($this->database)) {
+		if (!isset($this->database)) {
 
 			//mysqli connector has a separate parameter for port.. We need to separate it out from the host name
-			$dbhost=$configOptions['db_host_name'];
-            $dbport=isset($configOptions['db_port']) ? ($configOptions['db_port'] == '' ? null : $configOptions['db_port']) : null;
+			$dbhost = $configOptions['db_host_name'];
+            $dbport = isset($configOptions['db_port']) ? ($configOptions['db_port'] == '' ? null : $configOptions['db_port']) : null;
 			
-			$pos=strpos($configOptions['db_host_name'],':');
+			$pos = strpos($configOptions['db_host_name'], ':');
 			if ($pos !== false) {
-				$dbhost=substr($configOptions['db_host_name'],0,$pos);
-				$dbport=substr($configOptions['db_host_name'],$pos+1);
+				$dbhost = substr($configOptions['db_host_name'], 0, $pos);
+				$dbport = substr($configOptions['db_host_name'], $pos + 1);
 			}
 
-			$this->database = @mysqli_connect($dbhost,$configOptions['db_user_name'],$configOptions['db_password'],isset($configOptions['db_name'])?$configOptions['db_name']:'',$dbport);
-			if(empty($this->database)) {
-				$GLOBALS['log']->fatal("Could not connect to DB server ".$dbhost." as ".$configOptions['db_user_name'].". port " .$dbport . ": " . mysqli_connect_error());
-				if($dieOnError) {
-					if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
+			$this->database = @mysqli_connect($dbhost, $configOptions['db_user_name'], $configOptions['db_password'], isset($configOptions['db_name']) ? $configOptions['db_name'] : '', $dbport);
+			if (empty($this->database)) {
+				$GLOBALS['log']->fatal("Could not connect to DB server ".$dbhost." as ".$configOptions['db_user_name'].". port ".$dbport.": ".mysqli_connect_error());
+				if ($dieOnError) {
+					if (isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
 						sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
 					} else {
 						sugar_die("Could not connect to the database. Please refer to suitecrm.log for details.");
@@ -296,10 +296,10 @@ 
 			}
 		}
 
-		if(!empty($configOptions['db_name']) && !@mysqli_select_db($this->database,$configOptions['db_name'])) {
-			$GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}: " . mysqli_connect_error());
-			if($dieOnError) {
-					if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
+		if (!empty($configOptions['db_name']) && !@mysqli_select_db($this->database, $configOptions['db_name'])) {
+			$GLOBALS['log']->fatal("Unable to select database {$configOptions['db_name']}: ".mysqli_connect_error());
+			if ($dieOnError) {
+					if (isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
 						sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
 					} else {
 						sugar_die("Could not connect to the database. Please refer to suitecrm.log for details.");
@@ -310,15 +310,15 @@ 
 	    }
 
 		// cn: using direct calls to prevent this from spamming the Logs
-	    mysqli_query($this->database,"SET CHARACTER SET utf8");
+	    mysqli_query($this->database, "SET CHARACTER SET utf8");
 	    $names = "SET NAMES 'utf8'";
 	    $collation = $this->getOption('collation');
-	    if(!empty($collation)) {
+	    if (!empty($collation)) {
 	        $names .= " COLLATE '$collation'";
 		}
-	    mysqli_query($this->database,$names);
+	    mysqli_query($this->database, $names);
 
-		if($this->checkError('Could Not Connect', $dieOnError))
+		if ($this->checkError('Could Not Connect', $dieOnError))
 			$GLOBALS['log']->info("connected to db");
 
 		$this->connectOptions = $configOptions;
@@ -331,13 +331,13 @@ 
 	 */
 	public function lastDbError()
 	{
-		if($this->database) {
-		    if(mysqli_errno($this->database)) {
+		if ($this->database) {
+		    if (mysqli_errno($this->database)) {
 			    return "MySQL error ".mysqli_errno($this->database).": ".mysqli_error($this->database);
 		    }
 		} else {
-			$err =  mysqli_connect_error();
-			if($err) {
+			$err = mysqli_connect_error();
+			if ($err) {
 			    return $err;
 			}
 		}
@@ -349,7 +349,7 @@ 
 	{
 		$charsets = $this->getCharsetInfo();
 		$charset_str = array();
-		foreach($charsets as $name => $value) {
+		foreach ($charsets as $name => $value) {
 			$charset_str[] = "$name = $value";
 		}
 		return array(

include/database/DBManagerFactory.php

Spacing +30 added lines, -30 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.
@@ -69,9 +69,9 @@ 
     {
         global $sugar_config;
 
-        if(empty($config['db_manager'])) {
+        if (empty($config['db_manager'])) {
             // standard types
-            switch($type) {
+            switch ($type) {
                 case "mysql":
                     if (empty($sugar_config['mysqli_disabled']) && function_exists('mysqli_connect')) {
                         $my_db_manager = 'MysqliManager';
@@ -80,11 +80,11 @@ 
                     }
                     break;
                 case "mssql":
-                  	if ( function_exists('sqlsrv_connect')
-                                && (empty($config['db_mssql_force_driver']) || $config['db_mssql_force_driver'] == 'sqlsrv' )) {
+                  	if (function_exists('sqlsrv_connect')
+                                && (empty($config['db_mssql_force_driver']) || $config['db_mssql_force_driver'] == 'sqlsrv')) {
                         $my_db_manager = 'SqlsrvManager';
                     } elseif (self::isFreeTDS()
-                                && (empty($config['db_mssql_force_driver']) || $config['db_mssql_force_driver'] == 'freetds' )) {
+                                && (empty($config['db_mssql_force_driver']) || $config['db_mssql_force_driver'] == 'freetds')) {
                         $my_db_manager = 'FreeTDSManager';
                     } else {
                         $my_db_manager = 'MssqlManager';
@@ -92,7 +92,7 @@ 
                     break;
                 default:
                     $my_db_manager = self::getManagerByType($type, false);
-                    if(empty($my_db_manager)) {
+                    if (empty($my_db_manager)) {
                         $GLOBALS['log']->fatal("unable to load DB manager for: $type");
                         sugar_die("Cannot load DB manager");
                     }
@@ -104,17 +104,17 @@ 
         // sanitize the name
         $my_db_manager = preg_replace("/[^A-Za-z0-9_-]/", "", $my_db_manager);
 
-        if(!empty($config['db_manager_class'])){
+        if (!empty($config['db_manager_class'])) {
             $my_db_manager = $config['db_manager_class'];
         } else {
-            if(file_exists("custom/include/database/{$my_db_manager}.php")) {
+            if (file_exists("custom/include/database/{$my_db_manager}.php")) {
                 require_once("custom/include/database/{$my_db_manager}.php");
             } else {
                 require_once("include/database/{$my_db_manager}.php");
             }
         }
 
-        if(class_exists($my_db_manager)) {
+        if (class_exists($my_db_manager)) {
             return new $my_db_manager();
         } else {
             return null;
@@ -134,14 +134,14 @@ 
         static $count = 0, $old_count = 0;
 
         //fall back to the default instance name
-        if(empty($sugar_config['db'][$instanceName])){
+        if (empty($sugar_config['db'][$instanceName])) {
         	$instanceName = '';
         }
-        if(!isset(self::$instances[$instanceName])){
+        if (!isset(self::$instances[$instanceName])) {
             $config = $sugar_config['dbconfig'];
             $count++;
                 self::$instances[$instanceName] = self::getTypeInstance($config['db_type'], $config);
-                if(!empty($sugar_config['dbconfigoption'])) {
+                if (!empty($sugar_config['dbconfigoption'])) {
                     self::$instances[$instanceName]->setOptions($sugar_config['dbconfigoption']);
                 }
                 self::$instances[$instanceName]->connect($config, true);
@@ -159,7 +159,7 @@ 
      */
     public static function disconnectAll()
     {
-        foreach(self::$instances as $instance) {
+        foreach (self::$instances as $instance) {
             $instance->disconnect();
         }
         self::$instances = array();
@@ -177,7 +177,7 @@ 
     public static function getManagerByType($type, $validate = true)
     {
         $drivers = self::getDbDrivers($validate);
-        if(!empty($drivers[$type])) {
+        if (!empty($drivers[$type])) {
             return get_class($drivers[$type]);
         }
         return false;
@@ -191,19 +191,19 @@ 
      */
     protected static function scanDriverDir($dir, &$drivers, $validate = true)
     {
-        if(!is_dir($dir)) return;
+        if (!is_dir($dir)) return;
         $scandir = opendir($dir);
-        if($scandir === false) return;
-        while(($name = readdir($scandir)) !== false) {
-            if(substr($name, -11) != "Manager.php") continue;
-            if($name == "DBManager.php") continue;
+        if ($scandir === false) return;
+        while (($name = readdir($scandir)) !== false) {
+            if (substr($name, -11) != "Manager.php") continue;
+            if ($name == "DBManager.php") continue;
             require_once("$dir/$name");
             $classname = substr($name, 0, -4);
-            if(!class_exists($classname)) continue;
+            if (!class_exists($classname)) continue;
             $driver = new $classname;
-            if(!$validate || $driver->valid()) {
-                if(empty($drivers[$driver->dbType])) {
-                    $drivers[$driver->dbType]  = array();
+            if (!$validate || $driver->valid()) {
+                if (empty($drivers[$driver->dbType])) {
+                    $drivers[$driver->dbType] = array();
                 }
                 $drivers[$driver->dbType][] = $driver;
             }
@@ -235,9 +235,9 @@ 
         self::scanDriverDir("custom/include/database", $drivers, $validate);
 
         $result = array();
-        foreach($drivers as $type => $tdrivers) {
-            if(empty($tdrivers)) continue;
-            if(count($tdrivers) > 1) {
+        foreach ($drivers as $type => $tdrivers) {
+            if (empty($tdrivers)) continue;
+            if (count($tdrivers) > 1) {
                 usort($tdrivers, array(__CLASS__, "_compareDrivers"));
             }
             $result[$type] = $tdrivers[0];
@@ -255,13 +255,13 @@ 
     {
         static $is_freetds = null;
 
-        if($is_freetds === null) {
+        if ($is_freetds === null) {
     		ob_start();
     		phpinfo(INFO_MODULES);
-    		$info=ob_get_contents();
+    		$info = ob_get_contents();
     		ob_end_clean();
 
-    		$is_freetds = (strpos($info,'FreeTDS') !== false);
+    		$is_freetds = (strpos($info, 'FreeTDS') !== false);
         }
 
         return $is_freetds;

include/ListView/ListView.php

Spacing +373 added lines, -373 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.
@@ -45,8 +45,8 @@ 
  */
 class ListView
 {
-    var $local_theme= null;
-    var $local_app_strings= null;
+    var $local_theme = null;
+    var $local_app_strings = null;
     var $local_image_path = null;
     var $local_current_module = null;
     var $local_mod_strings = null;
@@ -81,12 +81,12 @@ 
     var $child_focus = '';
     var $layout_manager = null;
     var $process_for_popups = false;
-    var $multi_select_popup=false;
+    var $multi_select_popup = false;
     var $_additionalDetails = false;
     var $additionalDetailsFunction = null;
     var $sort_order = '';
-    var $force_mass_update=false;
-    var $keep_mass_update_form_open=false;
+    var $force_mass_update = false;
+    var $keep_mass_update_form_open = false;
     var $ignorePopulateOnly = false;
 
 function setDataArray($value) {
@@ -100,7 +100,7 @@ 
     echo "<form name='MassUpdate' method='post' action='index.php'>";
     $this->processListViewTwo($seed, $xTemplateSection, $html_varName);
 
-    echo "<a href='javascript:" . ((!$this->multi_select_popup) ? 'sListView.' : ''). "check_all(document.MassUpdate, \"mass[]\", true)'>".translate('LBL_CHECKALL')."</a> - <a href='javascript:sListView.check_all(document.MassUpdate, \"mass[]\", false);'>".translate('LBL_CLEARALL')."</a>";
+    echo "<a href='javascript:".((!$this->multi_select_popup) ? 'sListView.' : '')."check_all(document.MassUpdate, \"mass[]\", true)'>".translate('LBL_CHECKALL')."</a> - <a href='javascript:sListView.check_all(document.MassUpdate, \"mass[]\", false);'>".translate('LBL_CLEARALL')."</a>";
     echo '<br><br>';
 }
 
@@ -110,109 +110,109 @@ 
     global $sugar_config;
 
     $populateOnly = $this->ignorePopulateOnly ? FALSE : (!empty($sugar_config['save_query']) && $sugar_config['save_query'] == 'populate_only');
-    if(isset($seed->module_dir) && $populateOnly) {
-        if(empty($GLOBALS['displayListView']) && strcmp(strtolower($_REQUEST['action']), 'popup') != 0 && (!empty($_REQUEST['clear_query']) || $_REQUEST['module'] == $seed->module_dir && ((empty($_REQUEST['query']) || $_REQUEST['query'] == 'MSI')&& (empty($_SESSION['last_search_mod']) || $_SESSION['last_search_mod'] != $seed->module_dir)))) {
-            $_SESSION['last_search_mod'] = $_REQUEST['module'] ;
+    if (isset($seed->module_dir) && $populateOnly) {
+        if (empty($GLOBALS['displayListView']) && strcmp(strtolower($_REQUEST['action']), 'popup') != 0 && (!empty($_REQUEST['clear_query']) || $_REQUEST['module'] == $seed->module_dir && ((empty($_REQUEST['query']) || $_REQUEST['query'] == 'MSI') && (empty($_SESSION['last_search_mod']) || $_SESSION['last_search_mod'] != $seed->module_dir)))) {
+            $_SESSION['last_search_mod'] = $_REQUEST['module'];
             return;
         }
     }
-    if(strcmp(strtolower($_REQUEST['action']), 'popup') != 0){
-        $_SESSION['last_search_mod'] = $_REQUEST['module'] ;
+    if (strcmp(strtolower($_REQUEST['action']), 'popup') != 0) {
+        $_SESSION['last_search_mod'] = $_REQUEST['module'];
     }
     //following session variable will track the detail view navigation history.
     //needs to the reset after each search.
-    $this->setLocalSessionVariable($html_varName,"DETAIL_NAV_HISTORY",false);
+    $this->setLocalSessionVariable($html_varName, "DETAIL_NAV_HISTORY", false);
 
     require_once('include/MassUpdate.php');
     $mass = new MassUpdate();
     $add_acl_javascript = false;
-    if(!isset($_REQUEST['action'])) {
-        $this->shouldProcess=false;
+    if (!isset($_REQUEST['action'])) {
+        $this->shouldProcess = false;
     } else {
     $this->shouldProcess = is_subclass_of($seed, "SugarBean")
-        && (($_REQUEST['action'] == 'index') || ('ListView' == substr($_REQUEST['action'],0,8)) /* cn: to include all ListViewXXX.php type views */)
+        && (($_REQUEST['action'] == 'index') || ('ListView' == substr($_REQUEST['action'], 0, 8)) /* cn: to include all ListViewXXX.php type views */)
         && ($_REQUEST['module'] == $seed->module_dir);
     }
 
     //when processing a multi-select popup.
-    if($this->process_for_popups && $this->multi_select_popup)  $this->shouldProcess =true;
+    if ($this->process_for_popups && $this->multi_select_popup)  $this->shouldProcess = true;
     //mass update turned off?
-    if(!$this->show_mass_update) $this->shouldProcess = false;
-    if(is_subclass_of($seed, "SugarBean")) {
-        if($seed->bean_implements('ACL')) {
-            if(!ACLController::checkAccess($seed->module_dir,'list',true)) {
-                if($_REQUEST['module'] != 'Home') {
+    if (!$this->show_mass_update) $this->shouldProcess = false;
+    if (is_subclass_of($seed, "SugarBean")) {
+        if ($seed->bean_implements('ACL')) {
+            if (!ACLController::checkAccess($seed->module_dir, 'list', true)) {
+                if ($_REQUEST['module'] != 'Home') {
                     ACLController::displayNoAccess();
                 }
                 return;
             }
-            if(!ACLController::checkAccess($seed->module_dir,'export',true)) {
-                $sugar_config['disable_export']= true;
+            if (!ACLController::checkAccess($seed->module_dir, 'export', true)) {
+                $sugar_config['disable_export'] = true;
             }
 
         }
     }
 
     //force mass update form if requested.
-    if($this->force_mass_update) {
+    if ($this->force_mass_update) {
         $this->shouldProcess = true;
     }
 
-    if($this->shouldProcess) {
+    if ($this->shouldProcess) {
         echo $mass->getDisplayMassUpdateForm(true, $this->multi_select_popup);
         echo $mass->getMassUpdateFormHeader($this->multi_select_popup);
         $mass->setSugarBean($seed);
 
         //C.L. Fix for 10048, do not process handleMassUpdate for multi select popups
-        if(!$this->multi_select_popup) {
+        if (!$this->multi_select_popup) {
             $mass->handleMassUpdate();
         }
     }
 
-    $this->processListViewTwo($seed,$xTemplateSection, $html_varName);
+    $this->processListViewTwo($seed, $xTemplateSection, $html_varName);
 
-    if($this->shouldProcess && empty($this->process_for_popups)) {
+    if ($this->shouldProcess && empty($this->process_for_popups)) {
         //echo "<a href='javascript:sListView.clear_all(document.MassUpdate, \"mass[]\");'>".translate('LBL_CLEARALL')."</a>";
         // cn: preserves current functionality, exception is InboundEmail
-        if($this->show_mass_update_form) {
+        if ($this->show_mass_update_form) {
             echo $mass->getMassUpdateForm();
         }
-        if(!$this->keep_mass_update_form_open) {
+        if (!$this->keep_mass_update_form_open) {
             echo $mass->endMassUpdateForm();
         }
     }
 }
 
 
-function process_dynamic_listview($source_module, $sugarbean,$subpanel_def)
+function process_dynamic_listview($source_module, $sugarbean, $subpanel_def)
 {
         $this->source_module = $source_module;
         $this->subpanel_module = $subpanel_def->name;
-        if(!isset($this->xTemplate))
+        if (!isset($this->xTemplate))
             $this->createXTemplate();
 
-        $html_var = $this->subpanel_module . "_CELL";
+        $html_var = $this->subpanel_module."_CELL";
 
-        $list_data = $this->processUnionBeans($sugarbean,$subpanel_def, $html_var);
+        $list_data = $this->processUnionBeans($sugarbean, $subpanel_def, $html_var);
 
         $list = $list_data['list'];
         $parent_data = $list_data['parent_data'];
 
-        if($subpanel_def->isCollection()) {
-            $thepanel=$subpanel_def->get_header_panel_def();
+        if ($subpanel_def->isCollection()) {
+            $thepanel = $subpanel_def->get_header_panel_def();
         } else {
-            $thepanel=$subpanel_def;
+            $thepanel = $subpanel_def;
         }
 
 
 
         $this->process_dynamic_listview_header($thepanel->get_module_name(), $thepanel, $html_var);
-        $this->process_dynamic_listview_rows($list,$parent_data, 'dyn_list_view', $html_var,$subpanel_def);
+        $this->process_dynamic_listview_rows($list, $parent_data, 'dyn_list_view', $html_var, $subpanel_def);
 
-        if($this->display_header_and_footer)
+        if ($this->display_header_and_footer)
         {
             $this->getAdditionalHeader();
-            if(!empty($this->header_title))
+            if (!empty($this->header_title))
             {
                 echo get_form_header($this->header_title, $this->header_text, false);
             }
@@ -220,11 +220,11 @@ 
 
         $this->xTemplate->out('dyn_list_view');
 
-        if(isset($_SESSION['validation']))
+        if (isset($_SESSION['validation']))
         {
             print base64_decode('PGEgaHJlZj0naHR0cDovL3d3dy5zdWdhcmNybS5jb20nPlBPV0VSRUQmbmJzcDtCWSZuYnNwO1NVR0FSQ1JNPC9hPg==');
         }
-        if(isset($list_data['query'])) {
+        if (isset($list_data['query'])) {
             return ($list_data['query']);
         }
     }
@@ -236,7 +236,7 @@ 
  * @param unknown $html_varName
  * @desc INTERNAL FUNCTION handles the rows
  */
- function process_dynamic_listview_rows($data,$parent_data, $xtemplateSection, $html_varName, $subpanel_def)
+ function process_dynamic_listview_rows($data, $parent_data, $xtemplateSection, $html_varName, $subpanel_def)
  {
     global $subpanel_item_count;
     global $odd_bg;
@@ -261,37 +261,37 @@ 
     //Either retrieve the is_fill_in_additional_fields property from the lone
     //subpanel or visit each subpanel's subpanels to retrieve the is_fill_in_addition_fields
     //property
-    $subpanel_list=array();
-    if($subpanel_def->isCollection()) {
-        $subpanel_list=$subpanel_def->sub_subpanels;
+    $subpanel_list = array();
+    if ($subpanel_def->isCollection()) {
+        $subpanel_list = $subpanel_def->sub_subpanels;
     } else {
-        $subpanel_list[]= $subpanel_def;
+        $subpanel_list[] = $subpanel_def;
     }
 
-    foreach($subpanel_list as $this_subpanel)
+    foreach ($subpanel_list as $this_subpanel)
     {
-        if($this_subpanel->is_fill_in_additional_fields())
+        if ($this_subpanel->is_fill_in_additional_fields())
         {
             $fill_additional_fields[] = $this_subpanel->bean_name;
             $fill_additional_fields[$this_subpanel->bean_name] = true;
         }
     }
 
-    if ( empty($data) ) {
+    if (empty($data)) {
         $this->xTemplate->assign("ROW_COLOR", 'oddListRow');
-        $thepanel=$subpanel_def;
-        if($subpanel_def->isCollection())
-            $thepanel=$subpanel_def->get_header_panel_def();
+        $thepanel = $subpanel_def;
+        if ($subpanel_def->isCollection())
+            $thepanel = $subpanel_def->get_header_panel_def();
         $this->xTemplate->assign("COL_COUNT", count($thepanel->get_list_fields()));
         $this->xTemplate->parse($xtemplateSection.".nodata");
     }
-    while(list($aVal, $aItem) = each($data))
+    while (list($aVal, $aItem) = each($data))
     {
         $subpanel_item_count++;
         $aItem->check_date_relationships_load();
         // TODO: expensive and needs to be removed and done better elsewhere
 
-        if(!empty($fill_additional_fields[$aItem->object_name])
+        if (!empty($fill_additional_fields[$aItem->object_name])
         || ($aItem->object_name == 'Case' && !empty($fill_additional_fields['aCase']))
         )
         {
@@ -301,15 +301,15 @@ 
         //rrs bug: 25343
         $aItem->call_custom_logic("process_record");
 
-        if(isset($parent_data[$aItem->id])) {
+        if (isset($parent_data[$aItem->id])) {
 
             $aItem->parent_name = $parent_data[$aItem->id]['parent_name'];
-            if(!empty($parent_data[$aItem->id]['parent_name_owner'])) {
-            $aItem->parent_name_owner =  $parent_data[$aItem->id]['parent_name_owner'];
-            $aItem->parent_name_mod =  $parent_data[$aItem->id]['parent_name_mod'];
+            if (!empty($parent_data[$aItem->id]['parent_name_owner'])) {
+            $aItem->parent_name_owner = $parent_data[$aItem->id]['parent_name_owner'];
+            $aItem->parent_name_mod = $parent_data[$aItem->id]['parent_name_mod'];
         }}
         $fields = $aItem->get_list_view_data();
-        if(isset($processed_ids[$aItem->id])) {
+        if (isset($processed_ids[$aItem->id])) {
             continue;
 
         } else {
@@ -320,50 +320,50 @@ 
         //ADD OFFSET TO ARRAY
         $fields['OFFSET'] = ($offset + $count + 1);
 
-        if($this->shouldProcess) {
-            if($aItem->ACLAccess('EditView')) {
-            $this->xTemplate->assign('PREROW', "<input type='checkbox' class='checkbox' name='mass[]' value='". $fields['ID']. "' />");
+        if ($this->shouldProcess) {
+            if ($aItem->ACLAccess('EditView')) {
+            $this->xTemplate->assign('PREROW', "<input type='checkbox' class='checkbox' name='mass[]' value='".$fields['ID']."' />");
             } else {
                 $this->xTemplate->assign('PREROW', '');
 
             }
-            if($aItem->ACLAccess('DetailView')) {
-                $this->xTemplate->assign('TAG_NAME','a');
+            if ($aItem->ACLAccess('DetailView')) {
+                $this->xTemplate->assign('TAG_NAME', 'a');
             } else {
-                $this->xTemplate->assign('TAG_NAME','span');
+                $this->xTemplate->assign('TAG_NAME', 'span');
             }
             $this->xTemplate->assign('CHECKALL', "<input type='checkbox'  title='".$GLOBALS['app_strings']['LBL_SELECT_ALL_TITLE']."' class='checkbox' name='massall' id='massall' value='' onclick='sListView.check_all(document.MassUpdate, \"mass[]\", this.checked);' />");
         }
 
-        if($oddRow)
+        if ($oddRow)
         {
             $ROW_COLOR = 'oddListRow';
-            $BG_COLOR =  $odd_bg;
+            $BG_COLOR = $odd_bg;
         }
         else
         {
             $ROW_COLOR = 'evenListRow';
-            $BG_COLOR =  $even_bg;
+            $BG_COLOR = $even_bg;
         }
         $oddRow = !$oddRow;
 		$button_contents = array();
         $this->xTemplate->assign("ROW_COLOR", $ROW_COLOR);
         $this->xTemplate->assign("BG_COLOR", $BG_COLOR);
         $layout_manager = $this->getLayoutManager();
-        $layout_manager->setAttribute('context','List');
-        $layout_manager->setAttribute('image_path',$this->local_image_path);
+        $layout_manager->setAttribute('context', 'List');
+        $layout_manager->setAttribute('image_path', $this->local_image_path);
         $layout_manager->setAttribute('module_name', $subpanel_def->_instance_properties['module']);
-        if(!empty($this->child_focus))
-            $layout_manager->setAttribute('related_module_name',$this->child_focus->module_dir);
+        if (!empty($this->child_focus))
+            $layout_manager->setAttribute('related_module_name', $this->child_focus->module_dir);
 
         //AG$subpanel_data = $this->list_field_defs;
         //$bla = array_pop($subpanel_data);
         //select which sub-panel to display here, the decision will be made based on the type of
         //the sub-panel and panel in the bean being processed.
-        if($subpanel_def->isCollection()) {
-            $thepanel=$subpanel_def->sub_subpanels[$aItem->panel_name];
+        if ($subpanel_def->isCollection()) {
+            $thepanel = $subpanel_def->sub_subpanels[$aItem->panel_name];
         } else {
-            $thepanel=$subpanel_def;
+            $thepanel = $subpanel_def;
         }
 
 		/* BEGIN - SECURITY GROUPS */ 
@@ -374,22 +374,22 @@ 
 		$aclaccess_in_group = false;
 
 		global $current_user;
-		if(is_admin($current_user)) {
+		if (is_admin($current_user)) {
 			$aclaccess_is_owner = true;
 		} else {
 			$aclaccess_is_owner = $aItem->isOwner($current_user->id);
 		}
 
 		require_once("modules/SecurityGroups/SecurityGroup.php");
-		$aclaccess_in_group = SecurityGroup::groupHasAccess($aItem->module_dir,$aItem->id);
+		$aclaccess_in_group = SecurityGroup::groupHasAccess($aItem->module_dir, $aItem->id);
         	
     	/* END - SECURITY GROUPS */ 
     	
         //get data source name
-        $linked_field=$thepanel->get_data_source_name();
-        $linked_field_set=$thepanel->get_data_source_name(true);
+        $linked_field = $thepanel->get_data_source_name();
+        $linked_field_set = $thepanel->get_data_source_name(true);
         static $count;
-        if(!isset($count))$count = 0;
+        if (!isset($count))$count = 0;
 		/* BEGIN - SECURITY GROUPS */ 
 		/**
         $field_acl['DetailView'] = $aItem->ACLAccess('DetailView');
@@ -398,19 +398,19 @@ 
         $field_acl['Delete'] = $aItem->ACLAccess('Delete');
 		*/
 		//pass is_owner, in_group...vars defined above
-        $field_acl['DetailView'] = $aItem->ACLAccess('DetailView',$aclaccess_is_owner,$aclaccess_in_group);
-        $field_acl['ListView'] = $aItem->ACLAccess('ListView',$aclaccess_is_owner,$aclaccess_in_group);
-        $field_acl['EditView'] = $aItem->ACLAccess('EditView',$aclaccess_is_owner,$aclaccess_in_group);
-        $field_acl['Delete'] = $aItem->ACLAccess('Delete',$aclaccess_is_owner,$aclaccess_in_group);
+        $field_acl['DetailView'] = $aItem->ACLAccess('DetailView', $aclaccess_is_owner, $aclaccess_in_group);
+        $field_acl['ListView'] = $aItem->ACLAccess('ListView', $aclaccess_is_owner, $aclaccess_in_group);
+        $field_acl['EditView'] = $aItem->ACLAccess('EditView', $aclaccess_is_owner, $aclaccess_in_group);
+        $field_acl['Delete'] = $aItem->ACLAccess('Delete', $aclaccess_is_owner, $aclaccess_in_group);
 		/* END - SECURITY GROUPS */ 
-        foreach($thepanel->get_list_fields() as $field_name=>$list_field)
+        foreach ($thepanel->get_list_fields() as $field_name=>$list_field)
         {
             //add linked field attribute to the array.
-            $list_field['linked_field']=$linked_field;
-            $list_field['linked_field_set']=$linked_field_set;
+            $list_field['linked_field'] = $linked_field;
+            $list_field['linked_field_set'] = $linked_field_set;
 
             $usage = empty($list_field['usage']) ? '' : $list_field['usage'];
-            if($usage == 'query_only' && !empty($list_field['force_query_only_display'])){
+            if ($usage == 'query_only' && !empty($list_field['force_query_only_display'])) {
                 //if you are here you have column that is query only but needs to be displayed as blank.  This is helpful
                 //for collections such as Activities where you have a field in only one object and wish to show it in the subpanel list
                 $count++;
@@ -420,13 +420,13 @@ 
                 $this->xTemplate->assign('CELL', $widget_contents);
                 $this->xTemplate->parse($xtemplateSection.".row.cell");
 
-            }else if($usage != 'query_only')
+            } else if ($usage != 'query_only')
             {
-                $list_field['name']=$field_name;
+                $list_field['name'] = $field_name;
 
                 $module_field = $field_name.'_mod';
                 $owner_field = $field_name.'_owner';
-                if(!empty($aItem->$module_field)) {
+                if (!empty($aItem->$module_field)) {
 
                     $list_field['owner_id'] = $aItem->$owner_field;
                     $list_field['owner_module'] = $aItem->$module_field;
@@ -435,71 +435,71 @@ 
                     $list_field['owner_id'] = false;
                     $list_field['owner_module'] = false;
                 }
-                if(isset($list_field['alias'])) $list_field['name'] = $list_field['alias'];
-                else $list_field['name']=$field_name;
+                if (isset($list_field['alias'])) $list_field['name'] = $list_field['alias'];
+                else $list_field['name'] = $field_name;
                 $list_field['fields'] = $fields;
                 $list_field['module'] = $aItem->module_dir;
                 $list_field['start_link_wrapper'] = $this->start_link_wrapper;
                 $list_field['end_link_wrapper'] = $this->end_link_wrapper;
                 $list_field['subpanel_id'] = $this->subpanel_id;
                 $list_field += $field_acl;
-                if ( isset($aItem->field_defs[strtolower($list_field['name'])])) {
+                if (isset($aItem->field_defs[strtolower($list_field['name'])])) {
                     require_once('include/SugarFields/SugarFieldHandler.php');
                     // We need to see if a sugar field exists for this field type first,
                     // if it doesn't, toss it at the old sugarWidgets. This is for
                     // backwards compatibility and will be removed in a future release
                     $vardef = $aItem->field_defs[strtolower($list_field['name'])];
-                    if ( isset($vardef['type']) ) {
-                        $fieldType = isset($vardef['custom_type'])?$vardef['custom_type']:$vardef['type'];
-                        $tmpField = SugarFieldHandler::getSugarField($fieldType,true);
+                    if (isset($vardef['type'])) {
+                        $fieldType = isset($vardef['custom_type']) ? $vardef['custom_type'] : $vardef['type'];
+                        $tmpField = SugarFieldHandler::getSugarField($fieldType, true);
                     } else {
                         $tmpField = NULL;
                     }
 
-                    if ( $tmpField != NULL ) {
-                        $widget_contents = SugarFieldHandler::displaySmarty($list_field['fields'],$vardef,'ListView',$list_field);
+                    if ($tmpField != NULL) {
+                        $widget_contents = SugarFieldHandler::displaySmarty($list_field['fields'], $vardef, 'ListView', $list_field);
                     } else {
                         // No SugarField for this particular type
                         // Use the old, icky, SugarWidget for now
                         $widget_contents = $layout_manager->widgetDisplay($list_field);
                     }
 
-                    if ( isset($list_field['widget_class']) && $list_field['widget_class'] == 'SubPanelDetailViewLink' ) {
+                    if (isset($list_field['widget_class']) && $list_field['widget_class'] == 'SubPanelDetailViewLink') {
                         // We need to call into the old SugarWidgets for the time being, so it can generate a proper link with all the various corner-cases handled
                         // So we'll populate the field data with the pre-rendered display for the field
                         $list_field['fields'][$field_name] = $widget_contents;
-                        if('full_name' == $field_name){//bug #32465
+                        if ('full_name' == $field_name) {//bug #32465
                            $list_field['fields'][strtoupper($field_name)] = $widget_contents;
                         }
 
                         //vardef source is non db, assign the field name to varname for processing of column.
-                        if(!empty($vardef['source']) && $vardef['source']=='non-db'){
+                        if (!empty($vardef['source']) && $vardef['source'] == 'non-db') {
                             $list_field['varname'] = $field_name;
 
                         }
                         $widget_contents = $layout_manager->widgetDisplay($list_field);
-                    } else if(isset($list_field['widget_class']) && $list_field['widget_class'] == 'SubPanelEmailLink' ) {
+                    } else if (isset($list_field['widget_class']) && $list_field['widget_class'] == 'SubPanelEmailLink') {
                         $widget_contents = $layout_manager->widgetDisplay($list_field);
                     }
 
                  $count++;
                 $this->xTemplate->assign('CELL_COUNT', $count);
                 $this->xTemplate->assign('CLASS', "");
-                if ( empty($widget_contents) ) $widget_contents = '&nbsp;';
+                if (empty($widget_contents)) $widget_contents = '&nbsp;';
                 $this->xTemplate->assign('CELL', $widget_contents);
                 $this->xTemplate->parse($xtemplateSection.".row.cell");
                 } else {
                     // This handles the edit and remove buttons and icon widget
-                	if( isset($list_field['widget_class']) && $list_field['widget_class'] == "SubPanelIcon") {
+                	if (isset($list_field['widget_class']) && $list_field['widget_class'] == "SubPanelIcon") {
 		                $count++;
 		                $widget_contents = $layout_manager->widgetDisplay($list_field);
 		                $this->xTemplate->assign('CELL_COUNT', $count);
 		                $this->xTemplate->assign('CLASS', "");
-		                if ( empty($widget_contents) ) $widget_contents = '&nbsp;';
+		                if (empty($widget_contents)) $widget_contents = '&nbsp;';
 		                $this->xTemplate->assign('CELL', $widget_contents);
 		                $this->xTemplate->parse($xtemplateSection.".row.cell");
                 	} elseif (preg_match("/button/i", $list_field['name'])) {
-                        if ((($list_field['name'] === 'edit_button' && $field_acl['EditView']) || ($list_field['name'] === 'close_button' && $field_acl['EditView']) || ($list_field['name'] === 'remove_button' && $field_acl['Delete'])) && '' != ($_content = $layout_manager->widgetDisplay($list_field)) )
+                        if ((($list_field['name'] === 'edit_button' && $field_acl['EditView']) || ($list_field['name'] === 'close_button' && $field_acl['EditView']) || ($list_field['name'] === 'remove_button' && $field_acl['Delete'])) && '' != ($_content = $layout_manager->widgetDisplay($list_field)))
                         {
                             $button_contents[] = $_content;
                             unset($_content);
@@ -513,7 +513,7 @@ 
                			$this->xTemplate->assign('CLASS', "");
                			$widget_contents = $layout_manager->widgetDisplay($list_field);
 		                $this->xTemplate->assign('CELL_COUNT', $count);
-		                if ( empty($widget_contents) ) $widget_contents = '&nbsp;';
+		                if (empty($widget_contents)) $widget_contents = '&nbsp;';
 		                $this->xTemplate->assign('CELL', $widget_contents);
 		                $this->xTemplate->parse($xtemplateSection.".row.cell");
                 	}
@@ -525,7 +525,7 @@ 
 
         // Make sure we have at least one button before rendering a column for
         // the action buttons in a list view. Relevant bugs: #51647 and #51640.
-        if(!empty($button_contents))
+        if (!empty($button_contents))
         {
             $button_contents = array_filter($button_contents);
             if (!empty($button_contents))
@@ -534,7 +534,7 @@ 
             // bug#51275: smarty widget to help provide the action menu functionality as it is currently sprinkled throughout the app with html
                 require_once('include/Smarty/plugins/function.sugar_action_menu.php');
                 $tempid = create_guid();
-                array_unshift($button_contents, "<div style='display: inline' id='$tempid'>" . array_shift($button_contents) . "</div>");
+                array_unshift($button_contents, "<div style='display: inline' id='$tempid'>".array_shift($button_contents)."</div>");
                 $action_button = smarty_function_sugar_action_menu(array(
                     'id' => $tempid,
                     'buttons' => $button_contents,
@@ -550,7 +550,7 @@ 
             $this->xTemplate->assign('CELL_COUNT', ++$count);
             //Bug#51275 for beta3 pre_script is not required any more
             $this->xTemplate->assign('CELL', $action_button);
-            $this->xTemplate->parse($xtemplateSection . ".row.cell");
+            $this->xTemplate->parse($xtemplateSection.".row.cell");
         }
 
 
@@ -582,13 +582,13 @@ 
  function ListView() {
 
 
-    if(!$this->initialized) {
+    if (!$this->initialized) {
         global $sugar_config;
         $this->records_per_page = $sugar_config['list_max_entries_per_page'] + 0;
         $this->initialized = true;
         global $app_strings, $currentModule;
         $this->local_theme = SugarThemeRegistry::current()->__toString();
-        $this->local_app_strings =$app_strings;
+        $this->local_app_strings = $app_strings;
         $this->local_image_path = SugarThemeRegistry::current()->getImagePath();
         $this->local_current_module = $currentModule;
     }
@@ -619,7 +619,7 @@ 
  * Contributor(s): ______________________________________.
 */
  function setXTemplatePath($value) {
-    $this->xTemplatePath= $value;
+    $this->xTemplatePath = $value;
 }
 
 /**this is a helper function for allowing ListView to create a new XTemplate it groups parameters that should be set into a single function
@@ -629,22 +629,22 @@ 
 */
  function initNewXTemplate($XTemplatePath, $modString, $imagePath = null) {
     $this->setXTemplatePath($XTemplatePath);
-    if(isset($modString))
+    if (isset($modString))
         $this->setModStrings($modString);
-    if(isset($imagePath))
+    if (isset($imagePath))
         $this->setImagePath($imagePath);
 }
 
 
-function getOrderBy($varName, $defaultOrderBy='', $force_sortorder='') {
-    $sortBy = $this->getSessionVariable($varName, "ORDER_BY") ;
+function getOrderBy($varName, $defaultOrderBy = '', $force_sortorder = '') {
+    $sortBy = $this->getSessionVariable($varName, "ORDER_BY");
 
     $orderByDirection = $this->getSessionVariableName($varName, "order_by_direction");
     $orderByColumn = $this->getSessionVariableName($varName, "ORDER_BY");
     $lastEqualsSortBy = false;
     $defaultOrder = false; //ascending
 
-    if(empty($sortBy)) {
+    if (empty($sortBy)) {
         $this->setUserVariable($varName, "ORDER_BY", $defaultOrderBy);
         $sortBy = $defaultOrderBy;
     } else {
@@ -682,7 +682,7 @@ 
         }
         $desc = $orderByValue == 'desc';
         $orderByDirectionValue = false;
-        $this->setSessionVariable($varName, $sortBy . "S", $desc);
+        $this->setSessionVariable($varName, $sortBy."S", $desc);
         if (!empty($sortBy))
         {
             if (empty($force_sortorder))
@@ -693,11 +693,11 @@ 
                     {
                         $orderByDirectionValue = $desc ? 'asc' : 'desc';
                     }
-                    $this->query_orderby = $sortBy . ' ' . $orderByValue;
+                    $this->query_orderby = $sortBy.' '.$orderByValue;
                 }
             } else
             {
-                $this->query_orderby = $sortBy . ' ' . $force_sortorder;
+                $this->query_orderby = $sortBy.' '.$force_sortorder;
             }
             if (!isset($this->appendToBaseUrl))
             {
@@ -714,7 +714,7 @@ 
             }
             //Just clear from url...
             $this->appendToBaseUrl[$orderByColumn] = false;
-    }else {
+    } else {
         $this->query_orderby = "";
     }
     $this->sortby = $sortBy;
@@ -728,15 +728,15 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setQuery($where, $limit, $orderBy, $varName, $allowOrderByOveride=true) {
+ function setQuery($where, $limit, $orderBy, $varName, $allowOrderByOveride = true) {
     $this->query_where = $where;
-    if($this->getSessionVariable("query", "where") != $where) {
+    if ($this->getSessionVariable("query", "where") != $where) {
         $this->query_where_has_changed = true;
         $this->setSessionVariable("query", "where", $where);
     }
 
     $this->query_limit = $limit;
-    if(!$allowOrderByOveride) {
+    if (!$allowOrderByOveride) {
         $this->query_orderby = $orderBy;
         return;
     }
@@ -759,7 +759,7 @@ 
 */
  function setTheme($theme) {
     $this->local_theme = $theme;
-    if(isset($this->xTemplate))$this->xTemplate->assign("THEME", $this->local_theme);
+    if (isset($this->xTemplate))$this->xTemplate->assign("THEME", $this->local_theme);
 }
 
 /**sets the AppStrings used only use if it is different from the global
@@ -770,7 +770,7 @@ 
  function setAppStrings($app_strings) {
     unset($this->local_app_strings);
     $this->local_app_strings = $app_strings;
-    if(isset($this->xTemplate))$this->xTemplate->assign("APP", $this->local_app_strings);
+    if (isset($this->xTemplate))$this->xTemplate->assign("APP", $this->local_app_strings);
 }
 
 /**sets the ModStrings used
@@ -781,7 +781,7 @@ 
  function setModStrings($mod_strings) {
     unset($this->local_module_strings);
     $this->local_mod_strings = $mod_strings;
-    if(isset($this->xTemplate))$this->xTemplate->assign("MOD", $this->local_mod_strings);
+    if (isset($this->xTemplate))$this->xTemplate->assign("MOD", $this->local_mod_strings);
 }
 
 /**sets the ImagePath used
@@ -791,10 +791,10 @@ 
 */
  function setImagePath($image_path) {
     $this->local_image_path = $image_path;
-    if(empty($this->local_image_path)) {
+    if (empty($this->local_image_path)) {
         $this->local_image_path = SugarThemeRegistry::get($this->local_theme)->getImagePath();
     }
-    if(isset($this->xTemplate))$this->xTemplate->assign("IMAGE_PATH", $this->local_image_path);
+    if (isset($this->xTemplate))$this->xTemplate->assign("IMAGE_PATH", $this->local_image_path);
 }
 
 /**sets the currentModule only use if this is different from the global
@@ -805,7 +805,7 @@ 
  function setCurrentModule($currentModule) {
     unset($this->local_current_module);
     $this->local_current_module = $currentModule;
-    if(isset($this->xTemplate))$this->xTemplate->assign("MODULE_NAME", $this->local_current_module);
+    if (isset($this->xTemplate))$this->xTemplate->assign("MODULE_NAME", $this->local_current_module);
 }
 
 /**INTERNAL FUNCTION creates an XTemplate DO NOT CALL THIS THIS IS AN INTERNAL FUNCTION
@@ -814,12 +814,12 @@ 
  * Contributor(s): ______________________________________.
 */
  function createXTemplate() {
-    if(!isset($this->xTemplate)) {
-        if(isset($this->xTemplatePath)) {
+    if (!isset($this->xTemplate)) {
+        if (isset($this->xTemplatePath)) {
 
             $this->xTemplate = new XTemplate($this->xTemplatePath);
             $this->xTemplate->assign("APP", $this->local_app_strings);
-            if(isset($this->local_mod_strings))$this->xTemplate->assign("MOD", $this->local_mod_strings);
+            if (isset($this->local_mod_strings))$this->xTemplate->assign("MOD", $this->local_mod_strings);
             $this->xTemplate->assign("THEME", $this->local_theme);
             $this->xTemplate->assign("IMAGE_PATH", $this->local_image_path);
             $this->xTemplate->assign("MODULE_NAME", $this->local_current_module);
@@ -854,7 +854,7 @@ 
 */
  function xTemplateAssign($name, $value) {
 
-        if(!isset($this->xTemplate)) {
+        if (!isset($this->xTemplate)) {
             $this->createXTemplate();
         }
         $this->xTemplate->assign($name, $value);
@@ -867,11 +867,11 @@ 
  * Contributor(s): ______________________________________.
 */
  function getOffset($localVarName) {
- 	if($this->query_where_has_changed || isset($GLOBALS['record_has_changed'])) {
- 		$this->setSessionVariable($localVarName,"offset", 0);
+ 	if ($this->query_where_has_changed || isset($GLOBALS['record_has_changed'])) {
+ 		$this->setSessionVariable($localVarName, "offset", 0);
  	}
-	$offset = $this->getSessionVariable($localVarName,"offset");
-	if(isset($offset)) {
+	$offset = $this->getSessionVariable($localVarName, "offset");
+	if (isset($offset)) {
 		return $offset;
 	}
 	return 0;
@@ -891,12 +891,12 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setSessionVariable($localVarName,$varName, $value) {
+ function setSessionVariable($localVarName, $varName, $value) {
     $_SESSION[$this->local_current_module."_".$localVarName."_".$varName] = $value;
 }
 
-function setUserVariable($localVarName,$varName, $value) {
-        if($this->is_dynamic ||  $localVarName == 'CELL')return;
+function setUserVariable($localVarName, $varName, $value) {
+        if ($this->is_dynamic || $localVarName == 'CELL')return;
         global $current_user;
         $current_user->setPreference($this->local_current_module."_".$localVarName."_".$varName, $value);
 }
@@ -906,13 +906,13 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function getSessionVariable($localVarName,$varName) {
+ function getSessionVariable($localVarName, $varName) {
     //Set any variables pass in through request first
-    if(isset($_REQUEST[$this->getSessionVariableName($localVarName, $varName)])) {
-        $this->setSessionVariable($localVarName,$varName,$_REQUEST[$this->getSessionVariableName($localVarName, $varName)]);
+    if (isset($_REQUEST[$this->getSessionVariableName($localVarName, $varName)])) {
+        $this->setSessionVariable($localVarName, $varName, $_REQUEST[$this->getSessionVariableName($localVarName, $varName)]);
     }
 
-    if(isset($_SESSION[$this->getSessionVariableName($localVarName, $varName)])) {
+    if (isset($_SESSION[$this->getSessionVariableName($localVarName, $varName)])) {
         return $_SESSION[$this->getSessionVariableName($localVarName, $varName)];
     }
     return "";
@@ -920,10 +920,10 @@ 
 
 function getUserVariable($localVarName, $varName) {
     global $current_user;
-    if($this->is_dynamic ||  $localVarName == 'CELL')return;
-    if(isset($_REQUEST[$this->getSessionVariableName($localVarName, $varName)])) {
+    if ($this->is_dynamic || $localVarName == 'CELL')return;
+    if (isset($_REQUEST[$this->getSessionVariableName($localVarName, $varName)])) {
 
-            $this->setUserVariable($localVarName,$varName,$_REQUEST[$this->getSessionVariableName($localVarName, $varName)]);
+            $this->setUserVariable($localVarName, $varName, $_REQUEST[$this->getSessionVariableName($localVarName, $varName)]);
     }
     return $current_user->getPreference($this->getSessionVariableName($localVarName, $varName));
 }
@@ -947,7 +947,7 @@ 
           'default',
         );
 
-        foreach($priority_map as $p) {
+        foreach ($priority_map as $p) {
             if (key_exists($p, $sortOrderList)) {
                 $order = strtolower($sortOrderList[$p]);
                 if (in_array($order, array('asc', 'desc'))) {
@@ -969,7 +969,7 @@ 
     * All Rights Reserved.
     * Contributor(s): ______________________________________..
     */
-    function getSessionVariableName($localVarName,$varName) {
+    function getSessionVariableName($localVarName, $varName) {
         return $this->local_current_module."_".$localVarName."_".$varName;
     }
 
@@ -997,22 +997,22 @@ 
         SugarVCR::erase($seed->module_dir);
         $params = array();
         //$filter = array('id', 'full_name');
-        $filter=array();
+        $filter = array();
         $ret_array = $seed->create_new_list_query($this->query_orderby, $this->query_where, $filter, $params, 0, '', true, $seed, true);
-        if(!is_array($params)) $params = array();
-        if(!isset($params['custom_select'])) $params['custom_select'] = '';
-        if(!isset($params['custom_from'])) $params['custom_from'] = '';
-        if(!isset($params['custom_where'])) $params['custom_where'] = '';
-        if(!isset($params['custom_order_by'])) $params['custom_order_by'] = '';
-        $main_query = $ret_array['select'] . $params['custom_select'] . $ret_array['from'] . $params['custom_from'] . $ret_array['where'] . $params['custom_where'] . $ret_array['order_by'] . $params['custom_order_by'];
-        SugarVCR::store($seed->module_dir,  $main_query);
+        if (!is_array($params)) $params = array();
+        if (!isset($params['custom_select'])) $params['custom_select'] = '';
+        if (!isset($params['custom_from'])) $params['custom_from'] = '';
+        if (!isset($params['custom_where'])) $params['custom_where'] = '';
+        if (!isset($params['custom_order_by'])) $params['custom_order_by'] = '';
+        $main_query = $ret_array['select'].$params['custom_select'].$ret_array['from'].$params['custom_from'].$ret_array['where'].$params['custom_where'].$ret_array['order_by'].$params['custom_order_by'];
+        SugarVCR::store($seed->module_dir, $main_query);
         //ADDING VCR CONTROL
 
-        if(empty($this->related_field_name)) {
+        if (empty($this->related_field_name)) {
             $response = $seed->get_list($this->query_orderby, $this->query_where, $current_offset, $this->query_limit);
         } else {
             $related_field_name = $this->related_field_name;
-            $response = $seed->get_related_list($this->child_focus,$related_field_name, $this->query_orderby,
+            $response = $seed->get_related_list($this->child_focus, $related_field_name, $this->query_orderby,
             $this->query_where, $current_offset, $this->query_limit);
         }
 
@@ -1021,12 +1021,12 @@ 
         $next_offset = $response['next_offset'];
         $previous_offset = $response['previous_offset'];
 
-        if(!empty($response['current_offset'])) {
+        if (!empty($response['current_offset'])) {
             $current_offset = $response['current_offset'];
         }
 
         $list_view_row_count = $row_count;
-        $this->processListNavigation($xtemplateSection,$html_varName, $current_offset, $next_offset, $previous_offset, $row_count, null, null, empty($seed->column_fields) ? null : count($seed->column_fields));
+        $this->processListNavigation($xtemplateSection, $html_varName, $current_offset, $next_offset, $previous_offset, $row_count, null, null, empty($seed->column_fields) ? null : count($seed->column_fields));
 
         return $list;
     }
@@ -1036,7 +1036,7 @@ 
     function processUnionBeans($sugarbean, $subpanel_def, $html_var = 'CELL') {
 
 		$last_detailview_record = $this->getSessionVariable("detailview", "record");
-		if(!empty($last_detailview_record) && $last_detailview_record != $sugarbean->id){
+		if (!empty($last_detailview_record) && $last_detailview_record != $sugarbean->id) {
 			$GLOBALS['record_has_changed'] = true;
 		}
 		$this->setSessionVariable("detailview", "record", $sugarbean->id);
@@ -1053,14 +1053,14 @@ 
         $sort_order['request'] = isset($_REQUEST['sort_order']) ? $_REQUEST['sort_order'] : null;
 
         // see if the session data has a sort order
-        if (isset($_SESSION['last_sub' . $this->subpanel_module . '_order']))
+        if (isset($_SESSION['last_sub'.$this->subpanel_module.'_order']))
         {
-            $sort_order['session'] = $_SESSION['last_sub' . $this->subpanel_module . '_order'];
+            $sort_order['session'] = $_SESSION['last_sub'.$this->subpanel_module.'_order'];
 
             // We swap the order when the request contains an offset (indicating a column sort issued);
             // otherwise we do not sort.  If we don't make this check, then the subpanel listview will
             // swap ordering each time a new record is entered via quick create forms
-            if (isset($_REQUEST[$module . '_' . $html_var . '_offset']))
+            if (isset($_REQUEST[$module.'_'.$html_var.'_offset']))
             {
                 $sort_order['session'] = $sort_order['session'] == 'asc' ? 'desc' : 'asc';
             }
@@ -1083,10 +1083,10 @@ 
             $this->query_orderby = 'id';
         }
 
-        $this->getOrderBy($html_var,$this->query_orderby, $this->sort_order);
+        $this->getOrderBy($html_var, $this->query_orderby, $this->sort_order);
 
-        $_SESSION['last_sub' .$this->subpanel_module. '_order'] = $this->sort_order;
-        $_SESSION['last_sub' .$this->subpanel_module. '_url'] = $this->getBaseURL($html_var);
+        $_SESSION['last_sub'.$this->subpanel_module.'_order'] = $this->sort_order;
+        $_SESSION['last_sub'.$this->subpanel_module.'_url'] = $this->getBaseURL($html_var);
 
 		// Bug 8139 - Correct Subpanel sorting on 'name', when subpanel sorting default is 'last_name, first_name'
 		if (($this->sortby == 'name' || $this->sortby == 'last_name') &&
@@ -1094,21 +1094,21 @@ 
 			$this->sortby = 'last_name '.$this->sort_order.', first_name ';
 		}
 
-        if(!empty($this->response)){
-            $response =& $this->response;
+        if (!empty($this->response)) {
+            $response = & $this->response;
             echo 'cached';
-        }else{
-            $response = SugarBean::get_union_related_list($sugarbean,$this->sortby, $this->sort_order, $this->query_where, $current_offset, -1, $this->records_per_page,$this->query_limit,$subpanel_def);
-            $this->response =& $response;
+        } else {
+            $response = SugarBean::get_union_related_list($sugarbean, $this->sortby, $this->sort_order, $this->query_where, $current_offset, -1, $this->records_per_page, $this->query_limit, $subpanel_def);
+            $this->response = & $response;
         }
         $list = $response['list'];
         $row_count = $response['row_count'];
         $next_offset = $response['next_offset'];
         $previous_offset = $response['previous_offset'];
-        if(!empty($response['current_offset']))$current_offset = $response['current_offset'];
+        if (!empty($response['current_offset']))$current_offset = $response['current_offset'];
         global $list_view_row_count;
         $list_view_row_count = $row_count;
-        $this->processListNavigation('dyn_list_view', $html_var, $current_offset, $next_offset, $previous_offset, $row_count, $sugarbean,$subpanel_def);
+        $this->processListNavigation('dyn_list_view', $html_var, $current_offset, $next_offset, $previous_offset, $row_count, $sugarbean, $subpanel_def);
 
         return array('list'=>$list, 'parent_data'=>$response['parent_data'], 'query'=>$response['query']);
     }
@@ -1116,34 +1116,34 @@ 
     function getBaseURL($html_varName) {
         static $cache = array();
 
-        if(!empty($cache[$html_varName]))return $cache[$html_varName];
-        $blockVariables = array('mass', 'uid', 'massupdate', 'delete', 'merge', 'selectCount','current_query_by_page');
-        if(!empty($this->base_URL)) {
+        if (!empty($cache[$html_varName]))return $cache[$html_varName];
+        $blockVariables = array('mass', 'uid', 'massupdate', 'delete', 'merge', 'selectCount', 'current_query_by_page');
+        if (!empty($this->base_URL)) {
             return $this->base_URL;
         }
 
             $baseurl = $_SERVER['PHP_SELF'];
-            if(empty($baseurl)) {
+            if (empty($baseurl)) {
                 $baseurl = 'index.php';
             }
 
             /*fixes an issue with deletes when doing a search*/
-            foreach(array_merge($_GET, $_POST) as $name=>$value) {
+            foreach (array_merge($_GET, $_POST) as $name=>$value) {
                 //echo ("$name = $value <br/>");
-                if(!empty($value) && $name != 'sort_order' //&& $name != ListView::getSessionVariableName($html_varName,"ORDER_BY")
-                        && $name != ListView::getSessionVariableName($html_varName,"offset")
+                if (!empty($value) && $name != 'sort_order' //&& $name != ListView::getSessionVariableName($html_varName,"ORDER_BY")
+                        && $name != ListView::getSessionVariableName($html_varName, "offset")
                         /*&& substr_count($name, "ORDER_BY")==0*/ && !in_array($name, $blockVariables))
                 {
-                    if(is_array($value)) {
-                        foreach($value as $valuename=>$valuevalue) {
-                            if(substr_count($baseurl, '?') > 0)
+                    if (is_array($value)) {
+                        foreach ($value as $valuename=>$valuevalue) {
+                            if (substr_count($baseurl, '?') > 0)
                                 $baseurl	.= "&{$name}[]=".$valuevalue;
                             else
                                 $baseurl	.= "?{$name}[]=".$valuevalue;
                         }
                     } else {
                         $value = urlencode($value);
-                        if(substr_count($baseurl, '?') > 0) {
+                        if (substr_count($baseurl, '?') > 0) {
                             $baseurl	.= "&$name=$value";
                         } else {
                             $baseurl	.= "?$name=$value";
@@ -1153,17 +1153,17 @@ 
             }
 
 
-            if($_SERVER['REQUEST_METHOD'] == 'POST') {
+            if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                 // at this point it is possible that the above foreach already executed resulting in double ?'s in the url
-                if(substr_count($baseurl, '?') == 0) {
+                if (substr_count($baseurl, '?') == 0) {
                     $baseurl .= '?';
                 }
-                if(isset($_REQUEST['action'])) $baseurl.= '&action='.$_REQUEST['action'];
-                if(isset($_REQUEST['record'])) $baseurl .= '&record='.$_REQUEST['record'];
-                if(isset($_REQUEST['module'])) $baseurl .= '&module='.$_REQUEST['module'];
+                if (isset($_REQUEST['action'])) $baseurl .= '&action='.$_REQUEST['action'];
+                if (isset($_REQUEST['record'])) $baseurl .= '&record='.$_REQUEST['record'];
+                if (isset($_REQUEST['module'])) $baseurl .= '&module='.$_REQUEST['module'];
             }
 
-            $baseurl .= "&".ListView::getSessionVariableName($html_varName,"offset")."=";
+            $baseurl .= "&".ListView::getSessionVariableName($html_varName, "offset")."=";
             $cache[$html_varName] = $baseurl;
             return $baseurl;
     }
@@ -1177,7 +1177,7 @@ 
     * All Rights Reserved.
     * Contributor(s): ______________________________________..
     */
-    function processListNavigation($xtemplateSection, $html_varName, $current_offset, $next_offset, $previous_offset, $row_count, $sugarbean=null, $subpanel_def=null, $col_count = 20) {
+    function processListNavigation($xtemplateSection, $html_varName, $current_offset, $next_offset, $previous_offset, $row_count, $sugarbean = null, $subpanel_def = null, $col_count = 20) {
 
         global $export_module;
         global $sugar_config;
@@ -1187,40 +1187,40 @@ 
 
         $start_record = $current_offset + 1;
 
-        if(!is_numeric($col_count))
+        if (!is_numeric($col_count))
             $col_count = 20;
 
-        if($row_count == 0)
+        if ($row_count == 0)
             $start_record = 0;
 
         $end_record = $start_record + $this->records_per_page;
         // back up the the last page.
-        if($end_record > $row_count+1) {
-            $end_record = $row_count+1;
+        if ($end_record > $row_count + 1) {
+            $end_record = $row_count + 1;
         }
         // Determine the start location of the last page
-        if($row_count == 0)
+        if ($row_count == 0)
             $number_pages = 0;
         else
             $number_pages = floor(($row_count - 1) / $this->records_per_page);
 
         $last_offset = $number_pages * $this->records_per_page;
 
-        if(empty($this->query_limit)  || $this->query_limit > $this->records_per_page) {
+        if (empty($this->query_limit) || $this->query_limit > $this->records_per_page) {
             $this->base_URL = $this->getBaseURL($html_varName);
             $dynamic_url = '';
 
-            if($this->is_dynamic) {
-                $dynamic_url .='&'. $this->getSessionVariableName($html_varName,'ORDER_BY') . '='. $this->getSessionVariable($html_varName,'ORDER_BY').'&sort_order='.$this->sort_order.'&to_pdf=true&action=SubPanelViewer&subpanel=' . $this->subpanel_module;
+            if ($this->is_dynamic) {
+                $dynamic_url .= '&'.$this->getSessionVariableName($html_varName, 'ORDER_BY').'='.$this->getSessionVariable($html_varName, 'ORDER_BY').'&sort_order='.$this->sort_order.'&to_pdf=true&action=SubPanelViewer&subpanel='.$this->subpanel_module;
             }
 
             $current_URL = htmlentities($this->base_URL.$current_offset.$dynamic_url);
             $start_URL = htmlentities($this->base_URL."0".$dynamic_url);
-            $previous_URL  = htmlentities($this->base_URL.$previous_offset.$dynamic_url);
+            $previous_URL = htmlentities($this->base_URL.$previous_offset.$dynamic_url);
             $next_URL  = htmlentities($this->base_URL.$next_offset.$dynamic_url);
-            $end_URL  = htmlentities($this->base_URL.'end'.$dynamic_url);
+            $end_URL = htmlentities($this->base_URL.'end'.$dynamic_url);
 
-            if(!empty($this->start_link_wrapper)) {
+            if (!empty($this->start_link_wrapper)) {
                 $current_URL = $this->start_link_wrapper.$current_URL.$this->end_link_wrapper;
                 $start_URL = $this->start_link_wrapper.$start_URL.$this->end_link_wrapper;
                 $previous_URL = $this->start_link_wrapper.$previous_URL.$this->end_link_wrapper;
@@ -1230,7 +1230,7 @@ 
 
             $moduleString = htmlspecialchars("{$currentModule}_{$html_varName}_offset");
             $moduleStringOrder = htmlspecialchars("{$currentModule}_{$html_varName}_ORDER_BY");
-            if($this->shouldProcess && !$this->multi_select_popup) {
+            if ($this->shouldProcess && !$this->multi_select_popup) {
                 // check the checkboxes onload
                 echo "<script>YAHOO.util.Event.addListener(window, \"load\", sListView.check_boxes);</script>\n";
 
@@ -1238,7 +1238,7 @@ 
                 $uids = empty($_REQUEST['uid']) || $massUpdateRun ? '' : $_REQUEST['uid'];
                 $select_entire_list = ($massUpdateRun) ? 0 : (isset($_POST['select_entire_list']) ? $_POST['select_entire_list'] : (isset($_REQUEST['select_entire_list']) ? htmlspecialchars($_REQUEST['select_entire_list']) : 0));
 
-                echo "<textarea style='display: none' name='uid'>{$uids}</textarea>\n" .
+                echo "<textarea style='display: none' name='uid'>{$uids}</textarea>\n".
                     "<input type='hidden' name='select_entire_list' value='{$select_entire_list}'>\n".
                     "<input type='hidden' name='{$moduleString}' value='0'>\n".
                     "<input type='hidden' name='{$moduleStringOrder}' value='0'>\n";
@@ -1248,64 +1248,64 @@ 
 
             $GLOBALS['log']->debug("Offsets: (start, previous, next, last)(0, $previous_offset, $next_offset, $last_offset)");
 
-            if(0 == $current_offset) {
-                $start_link = "<button type='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("start_off","aborder='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_START'])."</button>";
-                $previous_link = "<button type='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("previous_off","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
+            if (0 == $current_offset) {
+                $start_link = "<button type='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("start_off", "aborder='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START'])."</button>";
+                $previous_link = "<button type='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("previous_off", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
             } else {
-                if($this->multi_select_popup) {// nav links for multiselect popup, submit form to save checks.
-                    $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick='javascript:save_checks(0, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("start","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_START'])."</button>";
-                    $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick='javascript:save_checks($previous_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("previous","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
-                } elseif($this->shouldProcess) {
-                    $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick='location.href=\"$start_URL\"; sListView.save_checks(0, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("start","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_START'])."</button>";
-                    $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick='location.href=\"$previous_URL\"; sListView.save_checks($previous_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("previous","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
+                if ($this->multi_select_popup) {// nav links for multiselect popup, submit form to save checks.
+                    $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick='javascript:save_checks(0, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("start", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START'])."</button>";
+                    $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick='javascript:save_checks($previous_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("previous", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
+                } elseif ($this->shouldProcess) {
+                    $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick='location.href=\"$start_URL\"; sListView.save_checks(0, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("start", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START'])."</button>";
+                    $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick='location.href=\"$previous_URL\"; sListView.save_checks($previous_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("previous", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
                 } else {
                     $onClick = '';
-                    if(0 != preg_match('/javascript.*/', $start_URL)){
+                    if (0 != preg_match('/javascript.*/', $start_URL)) {
                         $onClick = "\"$start_URL;\"";
-                    }else{
-                        $onClick ="'location.href=\"$start_URL\";'";
+                    } else {
+                        $onClick = "'location.href=\"$start_URL\";'";
                     }
-                    $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("start","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_START'])."</button>";
+                    $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("start", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START'])."</button>";
 
                     $onClick = '';
-                    if(0 != preg_match('/javascript.*/', $previous_URL)){
+                    if (0 != preg_match('/javascript.*/', $previous_URL)) {
                         $onClick = "\"$previous_URL;\"";
-                    }else{
+                    } else {
                         $onClick = "'location.href=\"$previous_URL\";'";
                     }
-                    $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("previous","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
+                    $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("previous", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
                 }
             }
 
-            if($last_offset <= $current_offset) {
-                $end_link = "<button type='button' name='listViewEndButton' title='{$this->local_app_strings['LNK_LIST_END']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("end_off","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_END'])."</button>";
-                $next_link = "<button type='button' name='listViewNextButton' title='{$this->local_app_strings['LNK_LIST_NEXT']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("next_off","aborder='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_NEXT'])."</button>";
+            if ($last_offset <= $current_offset) {
+                $end_link = "<button type='button' name='listViewEndButton' title='{$this->local_app_strings['LNK_LIST_END']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("end_off", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END'])."</button>";
+                $next_link = "<button type='button' name='listViewNextButton' title='{$this->local_app_strings['LNK_LIST_NEXT']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("next_off", "aborder='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT'])."</button>";
             } else {
-                if($this->multi_select_popup) { // nav links for multiselect popup, submit form to save checks.
-                    $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick='javascript:save_checks($last_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("end","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_END'])."</button>";
-                    if(!empty($sugar_config['disable_count_query'])) {
+                if ($this->multi_select_popup) { // nav links for multiselect popup, submit form to save checks.
+                    $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick='javascript:save_checks($last_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("end", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END'])."</button>";
+                    if (!empty($sugar_config['disable_count_query'])) {
                         $end_link = '';
                     }
-                    $next_link = "<button type='button' name='listViewNextButton' title='{$this->local_app_strings['LNK_LIST_NEXT']}' class='button' onClick='javascript:save_checks($next_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("next","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_NEXT'])."</button>";
-                } elseif($this->shouldProcess) {
-                    $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick='location.href=\"$end_URL\"; sListView.save_checks(\"end\", \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("end","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_END'])."</button>";
-                    $next_link = "<button type='button' name='listViewNextButton' class='button' title='{$this->local_app_strings['LNK_LIST_NEXT']}' onClick='location.href=\"$next_URL\"; sListView.save_checks($next_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("next","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_NEXT'])."</button>";
+                    $next_link = "<button type='button' name='listViewNextButton' title='{$this->local_app_strings['LNK_LIST_NEXT']}' class='button' onClick='javascript:save_checks($next_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("next", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT'])."</button>";
+                } elseif ($this->shouldProcess) {
+                    $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick='location.href=\"$end_URL\"; sListView.save_checks(\"end\", \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("end", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END'])."</button>";
+                    $next_link = "<button type='button' name='listViewNextButton' class='button' title='{$this->local_app_strings['LNK_LIST_NEXT']}' onClick='location.href=\"$next_URL\"; sListView.save_checks($next_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("next", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT'])."</button>";
                 } else {
                     $onClick = '';
-                    if(0 != preg_match('/javascript.*/', $next_URL)){
+                    if (0 != preg_match('/javascript.*/', $next_URL)) {
                         $onClick = "\"$next_URL;\"";
-                    }else{
-                        $onClick ="'location.href=\"$next_URL\";'";
+                    } else {
+                        $onClick = "'location.href=\"$next_URL\";'";
                     }
-                    $next_link = "<button type='button' name='listViewNextButton' class='button' title='{$this->local_app_strings['LNK_LIST_NEXT']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("next","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_NEXT'])."</button>";
+                    $next_link = "<button type='button' name='listViewNextButton' class='button' title='{$this->local_app_strings['LNK_LIST_NEXT']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("next", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT'])."</button>";
 
                     $onClick = '';
-                    if(0 != preg_match('/javascript.*/', $end_URL)){
+                    if (0 != preg_match('/javascript.*/', $end_URL)) {
                         $onClick = "\"$end_URL;\"";
-                    }else{
+                    } else {
                         $onClick = "'location.href=\"$end_URL\";'";
                     }
-                    $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("end","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_END'])."</button>";
+                    $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("end", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END'])."</button>";
 
                 }
             }
@@ -1313,7 +1313,7 @@ 
             $GLOBALS['log']->info("Offset (next, current, prev)($next_offset, $current_offset, $previous_offset)");
             $GLOBALS['log']->info("Start/end records ($start_record, $end_record)");
 
-            $end_record = $end_record-1;
+            $end_record = $end_record - 1;
 
 $script_href = "<a style=\'width: 150px\' name=\"thispage\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'if (document.MassUpdate.select_entire_list.value==1){document.MassUpdate.select_entire_list.value=0;sListView.check_all(document.MassUpdate, \"mass[]\", true, $this->records_per_page)}else {sListView.check_all(document.MassUpdate, \"mass[]\", true)};\' href=\'#\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_CURRENT']}&nbsp;&#x28;{$this->records_per_page}&#x29;&#x200E;</a>"
  . "<a style=\'width: 150px\' name=\"selectall\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'sListView.check_entire_list(document.MassUpdate, \"mass[]\",true,{$row_count});\' href=\'#\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_ENTIRE']}&nbsp;&#x28;{$row_count}&#x29;&#x200E;</a>"
@@ -1336,14 +1336,14 @@ 
                 }
                 </script>";
 
-            if($this->show_select_menu)
+            if ($this->show_select_menu)
             {
                 $total_label = "";
                 $total = $row_count;
                 $pageTotal = ($row_count > 0) ? $end_record - $start_record + 1 : 0;
                 if (!empty($GLOBALS['sugar_config']['disable_count_query']) && $GLOBALS['sugar_config']['disable_count_query'] === true && $total > $pageTotal) {
                     $this->show_plus = true;
-                    $total =  $pageTotal;
+                    $total = $pageTotal;
                     $total_label = $total.'+';
                 } else {
                     $this->show_plus = false;
@@ -1365,16 +1365,16 @@ 
                     'id' => 'selectLink',
                     'buttons' => $menuItems,
                     'flat' => false,
-                ),$this->xTemplate);
+                ), $this->xTemplate);
 
             } else {
                 $select_link = "&nbsp;";
             }
 
-            $export_link = '<input class="button" type="button" value="'.$this->local_app_strings['LBL_EXPORT'].'" ' .
+            $export_link = '<input class="button" type="button" value="'.$this->local_app_strings['LBL_EXPORT'].'" '.
                     'onclick="return sListView.send_form(true, \''.$_REQUEST['module'].'\', \'index.php?entryPoint=export\',\''.$this->local_app_strings['LBL_LISTVIEW_NO_SELECTED'].'\')">';
 
-            if($this->show_delete_button) {
+            if ($this->show_delete_button) {
                 $delete_link = '<input class="button" type="button" id="delete_button" name="Delete" value="'.$this->local_app_strings['LBL_DELETE_BUTTON_LABEL'].'" onclick="return sListView.send_mass_update(\'selected\',\''.$this->local_app_strings['LBL_LISTVIEW_NO_SELECTED'].'\', 1)">';
             } else {
                 $delete_link = '&nbsp;';
@@ -1384,7 +1384,7 @@ 
             $admin->retrieveSettings('system');
 
             $user_merge = $current_user->getPreference('mailmerge_on');
-            if($user_merge == 'on' && isset($admin->settings['system_mailmerge_on']) && $admin->settings['system_mailmerge_on']) {
+            if ($user_merge == 'on' && isset($admin->settings['system_mailmerge_on']) && $admin->settings['system_mailmerge_on']) {
                 echo "<script>
                 function mailmerge_dialog(el) {
                    	var \$dialog = \$('<div></div>')
@@ -1393,7 +1393,7 @@ 
                         . "<a style=\'width: 150px\' class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' href=\'index.php?action=index&module=MailMerge&entire=true\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_ENTIRE']}</a>')
 					.dialog({
 						autoOpen: false,
-						title: '". $this->local_app_strings['LBL_MAILMERGE']."',
+						title: '".$this->local_app_strings['LBL_MAILMERGE']."',
 						width: 150,
 						position: {
 						    my: myPos,
@@ -1409,16 +1409,16 @@ 
                 $merge_link = "&nbsp;";
             }
 
-            $selected_objects_span = "&nbsp;|&nbsp;{$this->local_app_strings['LBL_LISTVIEW_SELECTED_OBJECTS']}<input  style='border: 0px; background: transparent; font-size: inherit; color: inherit' type='text' readonly name='selectCount[]' value='" . ((isset($_POST['mass'])) ? count($_POST['mass']): 0) . "' />";
+            $selected_objects_span = "&nbsp;|&nbsp;{$this->local_app_strings['LBL_LISTVIEW_SELECTED_OBJECTS']}<input  style='border: 0px; background: transparent; font-size: inherit; color: inherit' type='text' readonly name='selectCount[]' value='".((isset($_POST['mass'])) ? count($_POST['mass']) : 0)."' />";
 
-            if($_REQUEST['module'] == 'Home' || $this->local_current_module == 'Import'
+            if ($_REQUEST['module'] == 'Home' || $this->local_current_module == 'Import'
                 || $this->show_export_button == false
                 || (!empty($sugar_config['disable_export']))
                 || (!empty($sugar_config['admin_export_only'])
                 && !(
                         is_admin($current_user)
                         || (ACLController::moduleSupportsACL($_REQUEST['module'])
-                            && ACLAction::getUserAccessLevel($current_user->id,$_REQUEST['module'], 'access') == ACL_ALLOW_ENABLED
+                            && ACLAction::getUserAccessLevel($current_user->id, $_REQUEST['module'], 'access') == ACL_ALLOW_ENABLED
                             && (ACLAction::getUserAccessLevel($current_user->id, $_REQUEST['module'], 'admin') == ACL_ALLOW_ADMIN ||
                                 ACLAction::getUserAccessLevel($current_user->id, $_REQUEST['module'], 'admin') == ACL_ALLOW_ADMIN_DEV)))))
             {
@@ -1427,13 +1427,13 @@ 
                 }
                 $export_link = "&nbsp;";
                 $merge_link = "&nbsp;";
-            } elseif($_REQUEST['module'] != "Accounts" && $_REQUEST['module'] != "Cases" && $_REQUEST['module'] != "Contacts" && $_REQUEST['module'] != "Leads" && $_REQUEST['module'] != "Opportunities") {
+            } elseif ($_REQUEST['module'] != "Accounts" && $_REQUEST['module'] != "Cases" && $_REQUEST['module'] != "Contacts" && $_REQUEST['module'] != "Leads" && $_REQUEST['module'] != "Opportunities") {
                 $merge_link = "&nbsp;";
             }
 
-            if($this->show_paging == true) {
-                if(!empty($sugar_config['disable_count_query'])) {
-                    if($row_count > $end_record) {
+            if ($this->show_paging == true) {
+                if (!empty($sugar_config['disable_count_query'])) {
+                    if ($row_count > $end_record) {
                         $row_count .= '+';
                     }
                 }
@@ -1449,16 +1449,16 @@ 
                     $html_text .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\"><tr><td align=\"left\"  >";
 
                     //attempt to get the query to recreate this subpanel
-                    if(!empty($this->response)){
-                        $response =& $this->response;
-                    }else{
-                        $response = SugarBean::get_union_related_list($sugarbean,$this->sortby, $this->sort_order, $this->query_where, $current_offset, -1, $this->records_per_page,$this->query_limit,$subpanel_def);
+                    if (!empty($this->response)) {
+                        $response = & $this->response;
+                    } else {
+                        $response = SugarBean::get_union_related_list($sugarbean, $this->sortby, $this->sort_order, $this->query_where, $current_offset, -1, $this->records_per_page, $this->query_limit, $subpanel_def);
                         $this->response = $response;
                     }
                     //if query is present, then pass it in as parameter
-                    if (isset($response['query']) && !empty($response['query'])){
+                    if (isset($response['query']) && !empty($response['query'])) {
                         $html_text .= $subpanelTiles->get_buttons($subpanel_def, $response['query']);
-                    }else{
+                    } else {
                         $html_text .= $subpanelTiles->get_buttons($subpanel_def);
                     }
                 }
@@ -1468,11 +1468,11 @@ 
                 $html_text .= "</td>\n<td nowrap align=\"right\">".$start_link."&nbsp;&nbsp;".$previous_link."&nbsp;&nbsp;<span class='pageNumbers'>(".$start_record." - ".$end_record." ".$this->local_app_strings['LBL_LIST_OF']." ".$row_count.")</span>&nbsp;&nbsp;".$next_link."&nbsp;&nbsp;".$end_link."</td></tr></table>\n";
                 $html_text .= "</td>\n";
                 $html_text .= "</tr>\n";
-                $this->xTemplate->assign("PAGINATION",$html_text);
+                $this->xTemplate->assign("PAGINATION", $html_text);
             }
 
             //C.L. - Fix for 23461
-            if(empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
+            if (empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
                 $_SESSION['export_where'] = $this->query_where;
             }
             $this->xTemplate->parse($xtemplateSection.".list_nav_row");
@@ -1481,24 +1481,24 @@ 
 
     function processOrderBy($html_varName) {
 
-        if(!isset($this->base_URL)) {
+        if (!isset($this->base_URL)) {
             $this->base_URL = $_SERVER['PHP_SELF'];
 
-            if(isset($_SERVER['QUERY_STRING'])) {
-                $this->base_URL = preg_replace("/\&".$this->getSessionVariableName($html_varName,"ORDER_BY")."=[0-9a-zA-Z\_\.]*/","",$this->base_URL .'?'.$_SERVER['QUERY_STRING']);
-                $this->base_URL = preg_replace("/\&".$this->getSessionVariableName($html_varName,"offset")."=[0-9]*/","",$this->base_URL);
+            if (isset($_SERVER['QUERY_STRING'])) {
+                $this->base_URL = preg_replace("/\&".$this->getSessionVariableName($html_varName, "ORDER_BY")."=[0-9a-zA-Z\_\.]*/", "", $this->base_URL.'?'.$_SERVER['QUERY_STRING']);
+                $this->base_URL = preg_replace("/\&".$this->getSessionVariableName($html_varName, "offset")."=[0-9]*/", "", $this->base_URL);
             }
-            if($_SERVER['REQUEST_METHOD'] == 'POST') {
+            if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                 $this->base_URL .= '?';
-                if(isset($_REQUEST['action'])) $this->base_URL .= '&action='.$_REQUEST['action'];
-                if(isset($_REQUEST['record'])) $this->base_URL .= '&record='.$_REQUEST['record'];
-                if(isset($_REQUEST['module'])) $this->base_URL .= '&module='.$_REQUEST['module'];
+                if (isset($_REQUEST['action'])) $this->base_URL .= '&action='.$_REQUEST['action'];
+                if (isset($_REQUEST['record'])) $this->base_URL .= '&record='.$_REQUEST['record'];
+                if (isset($_REQUEST['module'])) $this->base_URL .= '&module='.$_REQUEST['module'];
             }
-            $this->base_URL .= "&".$this->getSessionVariableName($html_varName,"offset")."=";
+            $this->base_URL .= "&".$this->getSessionVariableName($html_varName, "offset")."=";
         }
 
-        if($this->is_dynamic) {
-            $this->base_URL.='&to_pdf=true&action=SubPanelViewer&subpanel=' . $this->source_module;
+        if ($this->is_dynamic) {
+            $this->base_URL .= '&to_pdf=true&action=SubPanelViewer&subpanel='.$this->source_module;
         }
 
         //bug43465 start
@@ -1506,19 +1506,19 @@ 
         {
             foreach ($this->appendToBaseUrl as $key => $value)
             {
-                $fullRequestString = $key . '=' . $value;
+                $fullRequestString = $key.'='.$value;
 
                 if ($this->base_URL == "/index.php")
                 {
                     $this->base_URL .= "?";
                 } else
                 {
-                    if ($fullRequestString == substr($this->baseURL, '-' . strlen($fullRequestString)))
+                    if ($fullRequestString == substr($this->baseURL, '-'.strlen($fullRequestString)))
                     {
-                        $this->base_URL = preg_replace("/&" . $key . "\=.*/", "", $this->base_URL);
+                        $this->base_URL = preg_replace("/&".$key."\=.*/", "", $this->base_URL);
                     } else
                     {
-                        $this->base_URL = preg_replace("/&" . $key . "\=.*?&/", "&", $this->base_URL);
+                        $this->base_URL = preg_replace("/&".$key."\=.*?&/", "&", $this->base_URL);
                     }
                     $this->base_URL .= "&";
                 }
@@ -1530,9 +1530,9 @@ 
         }
         //bug43465 end
 
-        $sort_URL_base = $this->base_URL. "&".$this->getSessionVariableName($html_varName,"ORDER_BY")."=";
+        $sort_URL_base = $this->base_URL."&".$this->getSessionVariableName($html_varName, "ORDER_BY")."=";
 
-        if($sort_URL_base !== "")
+        if ($sort_URL_base !== "")
         {
             $this->xTemplate->assign("ORDER_BY", $sort_URL_base);
             return $sort_URL_base;
@@ -1583,19 +1583,19 @@ 
         $mergeList = array();
         $module = '';
         //todo what is this?  It is using an array as a boolean
-        while(list($aVal, $aItem) = each($data))
+        while (list($aVal, $aItem) = each($data))
         {
-            if(isset($this->data_array)) {
+            if (isset($this->data_array)) {
                 $fields = $this->data_array;
             } else {
                 $aItem->check_date_relationships_load();
                 $fields = $aItem->get_list_view_data();
             }
 
-            if(is_object($aItem)) { // cn: bug 5349
+            if (is_object($aItem)) { // cn: bug 5349
                 //add item id to merge list, if the button is clicked
                 $mergeList[] = $aItem->id;
-                if(empty($module)) {
+                if (empty($module)) {
                     $module = $aItem->module_dir;
                 }
             }
@@ -1604,37 +1604,37 @@ 
                 $fields['OFFSET'] = ($offset + $count + 1);
 
             $fields['STAMP'] = $timeStamp;
-            if($this->shouldProcess) {
+            if ($this->shouldProcess) {
 
             $prerow = '';
-            if(!isset($this->data_array)) {
-                $prerow .= "<input onclick='sListView.check_item(this, document.MassUpdate)' type='checkbox' class='checkbox' name='mass[]' value='". $fields['ID']. "'>";
+            if (!isset($this->data_array)) {
+                $prerow .= "<input onclick='sListView.check_item(this, document.MassUpdate)' type='checkbox' class='checkbox' name='mass[]' value='".$fields['ID']."'>";
             }
             $this->xTemplate->assign('PREROW', $prerow);
 
             $this->xTemplate->assign('CHECKALL', "<input type='checkbox' class='checkbox'  title='".$GLOBALS['app_strings']['LBL_SELECT_ALL_TITLE']."'  name='massall' id='massall' value='' onclick='sListView.check_all(document.MassUpdate, \"mass[]\", this.checked)'>");
             }
-            if(!isset($this->data_array)) {
+            if (!isset($this->data_array)) {
                 $tag = $aItem->listviewACLHelper();
-                $this->xTemplate->assign('TAG',$tag) ;
+                $this->xTemplate->assign('TAG', $tag);
             }
 
-            if($oddRow)
+            if ($oddRow)
             {
                 $ROW_COLOR = 'oddListRow';
-                $BG_COLOR =  $odd_bg;
+                $BG_COLOR = $odd_bg;
             }
             else
             {
                 $ROW_COLOR = 'evenListRow';
-                $BG_COLOR =  $even_bg;
+                $BG_COLOR = $even_bg;
             }
             $oddRow = !$oddRow;
 
             $this->xTemplate->assign('ROW_COLOR', $ROW_COLOR);
             $this->xTemplate->assign('BG_COLOR', $BG_COLOR);
 
-            if(isset($this->data_array))
+            if (isset($this->data_array))
             {
                 $this->xTemplate->assign('KEY', $aVal);
                 $this->xTemplate->assign('VALUE', $aItem);
@@ -1645,23 +1645,23 @@ 
             {
     //AED -- some modules do not have their additionalDetails.php established. Add a check to ensure require_once does not fail
     // Bug #2786
-                if($this->_additionalDetails && $aItem->ACLAccess('DetailView') && (file_exists('modules/' . $aItem->module_dir . '/metadata/additionalDetails.php') || file_exists('custom/modules/' . $aItem->module_dir . '/metadata/additionalDetails.php'))) {
+                if ($this->_additionalDetails && $aItem->ACLAccess('DetailView') && (file_exists('modules/'.$aItem->module_dir.'/metadata/additionalDetails.php') || file_exists('custom/modules/'.$aItem->module_dir.'/metadata/additionalDetails.php'))) {
 
-                    $additionalDetailsFile = 'modules/' . $aItem->module_dir . '/metadata/additionalDetails.php';
-                    if(file_exists('custom/modules/' . $aItem->module_dir . '/metadata/additionalDetails.php')){
-                        $additionalDetailsFile = 'custom/modules/' . $aItem->module_dir . '/metadata/additionalDetails.php';
+                    $additionalDetailsFile = 'modules/'.$aItem->module_dir.'/metadata/additionalDetails.php';
+                    if (file_exists('custom/modules/'.$aItem->module_dir.'/metadata/additionalDetails.php')) {
+                        $additionalDetailsFile = 'custom/modules/'.$aItem->module_dir.'/metadata/additionalDetails.php';
                     }
 
                     require_once($additionalDetailsFile);
-                    $ad_function = (empty($this->additionalDetailsFunction) ? 'additionalDetails' : $this->additionalDetailsFunction) . $aItem->object_name;
+                    $ad_function = (empty($this->additionalDetailsFunction) ? 'additionalDetails' : $this->additionalDetailsFunction).$aItem->object_name;
                     $results = $ad_function($fields);
                     $results['string'] = str_replace(array("&#039", "'"), '\&#039', $results['string']); // no xss!
 
-                    if(trim($results['string']) == '') $results['string'] = $app_strings['LBL_NONE'];
+                    if (trim($results['string']) == '') $results['string'] = $app_strings['LBL_NONE'];
                     $fields[$results['fieldToAddTo']] = $fields[$results['fieldToAddTo']].'</a>';
                 }
 
-                if($aItem->ACLAccess('Delete')) {
+                if ($aItem->ACLAccess('Delete')) {
                     $delete = '<a class="listViewTdToolsS1" onclick="return confirm(\''.$this->local_app_strings['NTC_DELETE_CONFIRMATION'].'\')" href="'.'index.php?action=Delete&module='.$aItem->module_dir.'&record='.$fields['ID'].'&return_module='.$aItem->module_dir.'&return_action=index&return_id=">'.$this->local_app_strings['LBL_DELETE_INLINE'].'</a>';
                     require_once('include/Smarty/plugins/function.sugar_action_menu.php');
                     $fields['DELETE_BUTTON'] = smarty_function_sugar_action_menu(array(
@@ -1675,26 +1675,26 @@ 
                 $aItem->setupCustomFields($aItem->module_dir);
                 $aItem->custom_fields->populateAllXTPL($this->xTemplate, 'detail', $html_varName, $fields);
             }
-            if(!isset($this->data_array) && $aItem->ACLAccess('DetailView')) {
+            if (!isset($this->data_array) && $aItem->ACLAccess('DetailView')) {
                 $count++;
             }
-            if(isset($this->data_array)) {
+            if (isset($this->data_array)) {
                 $count++;
             }
-            if(!isset($this->data_array)) {
+            if (!isset($this->data_array)) {
                 $aItem->list_view_parse_additional_sections($this->xTemplate, $xtemplateSection);
 
-                if($this->xTemplate->exists($xtemplateSection.'.row.pro')) {
+                if ($this->xTemplate->exists($xtemplateSection.'.row.pro')) {
                     $this->xTemplate->parse($xtemplateSection.'.row.pro');
                 }
             }
-            $this->xTemplate->parse($xtemplateSection . '.row');
+            $this->xTemplate->parse($xtemplateSection.'.row');
 
-            if(isset($fields['ID'])) {
+            if (isset($fields['ID'])) {
                 $associated_row_data[$fields['ID']] = $fields;
                 // Bug 38908: cleanup data for JS to avoid having &nbsp; shuffled around
-                foreach($fields as $key => $value) {
-                    if($value == '&nbsp;') {
+                foreach ($fields as $key => $value) {
+                    if ($value == '&nbsp;') {
                         $associated_row_data[$fields['ID']][$key] = '';
                     }
                 }
@@ -1703,21 +1703,21 @@ 
 
         $_SESSION['MAILMERGE_RECORDS'] = $mergeList;
         $_SESSION['MAILMERGE_MODULE_FROM_LISTVIEW'] = $module;
-        if(empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
+        if (empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
             $_SESSION['MAILMERGE_MODULE'] = $module;
         }
 
-        if($this->process_for_popups)
+        if ($this->process_for_popups)
         {
             $json = getJSONobj();
             $is_show_fullname = showFullName() ? 1 : 0;
-            $associated_javascript_data = '<script type="text/javascript">' . "\n"
+            $associated_javascript_data = '<script type="text/javascript">'."\n"
                 //. '<!-- // associated javascript data generated by ListView' . "\n"
                 . 'var associated_javascript_data = '
-                . $json->encode($associated_row_data) . ";\n"
+                . $json->encode($associated_row_data).";\n"
                 //. '-->' . "\n"
                 . 'var is_show_fullname = '
-                . $is_show_fullname . ";\n"
+                . $is_show_fullname.";\n"
                 . '</script>';
             $this->xTemplate->assign('ASSOCIATED_JAVASCRIPT_DATA', $associated_javascript_data);
         }
@@ -1729,7 +1729,7 @@ 
     function getLayoutManager()
     {
         require_once('include/generic/LayoutManager.php');
-        if($this->layout_manager == null)
+        if ($this->layout_manager == null)
         {
             $this->layout_manager = new LayoutManager();
         }
@@ -1742,36 +1742,36 @@ 
 
 
         $layout_manager = $this->getLayoutManager();
-        $layout_manager->setAttribute('order_by_link',$this->processOrderBy($html_var));
-        $layout_manager->setAttribute('context','HeaderCell');
-        $layout_manager->setAttribute('image_path',$this->local_image_path);
-        $layout_manager->setAttribute('html_varName',$html_var);
+        $layout_manager->setAttribute('order_by_link', $this->processOrderBy($html_var));
+        $layout_manager->setAttribute('context', 'HeaderCell');
+        $layout_manager->setAttribute('image_path', $this->local_image_path);
+        $layout_manager->setAttribute('html_varName', $html_var);
         $layout_manager->setAttribute('module_name', $source_module);
-        list($orderBy,$desc) = $this->getOrderByInfo($html_var);
+        list($orderBy, $desc) = $this->getOrderByInfo($html_var);
 
-        if($orderBy == 'amount*1')
+        if ($orderBy == 'amount*1')
         {
-            $orderBy=  'amount';
+            $orderBy = 'amount';
         }
 		$buttons = false;
         $col_count = 0;
-        foreach($subpanel_def->get_list_fields() as $column_name=>$widget_args)
+        foreach ($subpanel_def->get_list_fields() as $column_name=>$widget_args)
         {
             $usage = empty($widget_args['usage']) ? '' : $widget_args['usage'];
-            if($usage != 'query_only' || !empty($widget_args['force_query_only_display']))
+            if ($usage != 'query_only' || !empty($widget_args['force_query_only_display']))
             {
                 $imgArrow = '';
 
-                if($orderBy == $column_name || (isset($widget_args['sort_by']) && str_replace('.','_',$widget_args['sort_by']) == $orderBy))
+                if ($orderBy == $column_name || (isset($widget_args['sort_by']) && str_replace('.', '_', $widget_args['sort_by']) == $orderBy))
                 {
                     $imgArrow = "_down";
-                    if($this->sort_order == 'asc') {
+                    if ($this->sort_order == 'asc') {
                         $imgArrow = "_up";
                     }
                 }
 
                 if (!preg_match("/_button/i", $column_name)) {
-	                $widget_args['name']=$column_name;
+	                $widget_args['name'] = $column_name;
 	                $widget_args['sort'] = $imgArrow;
 	                $widget_args['start_link_wrapper'] = $this->start_link_wrapper;
 	                $widget_args['end_link_wrapper'] = $this->end_link_wrapper;
@@ -1781,8 +1781,8 @@ 
 	                $cell_width = empty($widget_args['width']) ? '' : $widget_args['width'];
 	                $this->xTemplate->assign('HEADER_CELL', $widget_contents);
 	                static $count;
-	            if(!isset($count))$count = 0; else $count++;
-                    if($col_count == 0 || $column_name == 'name') $footable = 'data-toggle="true"';
+	            if (!isset($count))$count = 0; else $count++;
+                    if ($col_count == 0 || $column_name == 'name') $footable = 'data-toggle="true"';
                     else {
                         $footable = 'data-hide="phone"';
                         if ($col_count > 2) $footable = 'data-hide="phone,phonelandscape"';
@@ -1799,7 +1799,7 @@ 
             ++$col_count;
         }
 
-        if($buttons) {
+        if ($buttons) {
                     $this->xTemplate->assign('FOOTABLE', '');
         			$this->xTemplate->assign('HEADER_CELL', "&nbsp;");
         			$this->xTemplate->assign('CELL_COUNT', $count);
@@ -1827,37 +1827,37 @@ 
 
     function processListViewTwo($seed, $xTemplateSection, $html_varName) {
         global $current_user;
-        if(!isset($this->xTemplate)) {
+        if (!isset($this->xTemplate)) {
             $this->createXTemplate();
         }
 
         $isSugarBean = is_subclass_of($seed, "SugarBean");
         $list = null;
 
-        if($isSugarBean) {
+        if ($isSugarBean) {
             $list = $this->processSugarBean($xTemplateSection, $html_varName, $seed);
         } else {
             $list = $seed;
         }
 
         if (is_object($seed) && isset($seed->object_name) && $seed->object_name == 'WorkFlow') {
-            $tab=array();
+            $tab = array();
             $access = get_workflow_admin_modules_for_user($current_user);
             for ($i = 0; $i < count($list); $i++) {
-                if(!empty($access[$list[$i]->base_module])){
-                    $tab[]=$list[$i];
+                if (!empty($access[$list[$i]->base_module])) {
+                    $tab[] = $list[$i];
                 }
             }
             $list = $tab;
         }
 
-        if($this->is_dynamic) {
-            $this->processHeaderDynamic($xTemplateSection,$html_varName);
-            $this->processListRows($list,$xTemplateSection, $html_varName);
+        if ($this->is_dynamic) {
+            $this->processHeaderDynamic($xTemplateSection, $html_varName);
+            $this->processListRows($list, $xTemplateSection, $html_varName);
         } else {
             $this->processSortArrows($html_varName);
 
-            if($isSugarBean) {
+            if ($isSugarBean) {
                 $seed->parse_additional_headers($this->xTemplate, $xTemplateSection);
             }
             $this->xTemplateAssign('CHECKALL', SugarThemeRegistry::current()->getImage('blank', '', 1, 1, ".gif", ''));
@@ -1866,19 +1866,19 @@ 
             $this->processOrderBy($html_varName);
 
 
-            $this->processListRows($list,$xTemplateSection, $html_varName);
+            $this->processListRows($list, $xTemplateSection, $html_varName);
         }
 
-        if($this->display_header_and_footer) {
+        if ($this->display_header_and_footer) {
             $this->getAdditionalHeader();
-            if(!empty($this->header_title)) {
+            if (!empty($this->header_title)) {
                 echo get_form_header($this->header_title, $this->header_text, false);
             }
         }
 
         $this->xTemplate->out($xTemplateSection);
 
-        if(isset($_SESSION['validation'])) {
+        if (isset($_SESSION['validation'])) {
             print base64_decode('PGEgaHJlZj0naHR0cDovL3d3dy5zdWdhcmNybS5jb20nPlBPV0VSRUQmbmJzcDtCWSZuYnNwO1NVR0FSQ1JNPC9hPg==');
         }
     }
@@ -1890,7 +1890,7 @@ 
     }
 
     function getArrowUpDownStart($upDown) {
-        $ext = ( SugarThemeRegistry::current()->pngSupport ? "png" : "gif" );
+        $ext = (SugarThemeRegistry::current()->pngSupport ? "png" : "gif");
 
         if (!isset($upDown) || empty($upDown)) {
             $upDown = "";
@@ -1901,7 +1901,7 @@ 
 	function getArrowEnd() {
 		$imgFileParts = pathinfo(SugarThemeRegistry::current()->getImageURL("arrow.gif"));
 
-        list($width,$height) = ListView::getArrowImageSize();
+        list($width, $height) = ListView::getArrowImageSize();
 
 		return '.'.$imgFileParts['extension']."' width='$width' height='$height' align='absmiddle' alt=".translate('LBL_SORT').">";
     }
@@ -1912,13 +1912,13 @@ 
         }
         $imgFileParts = pathinfo(SugarThemeRegistry::current()->getImageURL("arrow{$upDown}.gif"));
 
-        list($width,$height) = ListView::getArrowUpDownImageSize($upDown);
+        list($width, $height) = ListView::getArrowUpDownImageSize($upDown);
 
         //get the right alt tag for the sort
         $sortStr = translate('LBL_ALT_SORT');
-        if($upDown == '_down'){
+        if ($upDown == '_down') {
             $sortStr = translate('LBL_ALT_SORT_DESC');
-        }elseif($upDown == '_up'){
+        }elseif ($upDown == '_up') {
             $sortStr = translate('LBL_ALT_SORT_ASC');
         }
         return " width='$width' height='$height' align='absmiddle' alt='$sortStr'>";
@@ -1926,13 +1926,13 @@ 
 
 	function getArrowImageSize() {
 	    // jbasicChartDashletsExpColust get the non-sort image's size.. the up and down have be the same.
-		$image = SugarThemeRegistry::current()->getImageURL("arrow.gif",false);
+		$image = SugarThemeRegistry::current()->getImageURL("arrow.gif", false);
 
         $cache_key = 'arrow_size.'.$image;
 
         // Check the cache
         $result = sugar_cache_retrieve($cache_key);
-        if(!empty($result))
+        if (!empty($result))
         return $result;
 
         // No cache hit.  Calculate the value and return.
@@ -1943,13 +1943,13 @@ 
 
     function getArrowUpDownImageSize($upDown) {
         // just get the non-sort image's size.. the up and down have be the same.
-        $image = SugarThemeRegistry::current()->getImageURL("arrow{$upDown}.gif",false);
+        $image = SugarThemeRegistry::current()->getImageURL("arrow{$upDown}.gif", false);
 
         $cache_key = 'arrowupdown_size.'.$image;
 
         // Check the cache
         $result = sugar_cache_retrieve($cache_key);
-        if(!empty($result))
+        if (!empty($result))
         return $result;
 
         // No cache hit.  Calculate the value and return.
@@ -1963,7 +1963,7 @@ 
 		$orderBy = $this->getSessionVariable($html_varName, "OBL");
 		$desc = $this->getSessionVariable($html_varName, $orderBy.'S');
 		$orderBy = str_replace('.', '_', $orderBy);
-		return array($orderBy,$desc);
+		return array($orderBy, $desc);
 	}
 
     function processSortArrows($html_varName)
@@ -1971,20 +1971,20 @@ 
 
         $this->xTemplateAssign("arrow_start", $this->getArrowStart());
 
-        list($orderBy,$desc) = $this->getOrderByInfo($html_varName);
+        list($orderBy, $desc) = $this->getOrderByInfo($html_varName);
 
 		$imgArrow = "_up";
-		if($desc) {
+		if ($desc) {
 			$imgArrow = "_down";
 		}
 		/**
 		 * @deprecated only used by legacy opportunites listview, nothing current. Leaving for BC
 		 */
-		if($orderBy == 'amount')
+		if ($orderBy == 'amount')
 		{
 			$this->xTemplateAssign('amount_arrow', $imgArrow);
 		}
-		else if($orderBy == 'amount_usdollar')
+		else if ($orderBy == 'amount_usdollar')
 		{
 			$this->xTemplateAssign('amount_usdollar_arrow', $imgArrow);
 		}
@@ -1997,31 +1997,31 @@ 
     }
 
     // this is where translation happens for dynamic list views
-    function loadListFieldDefs(&$subpanel_fields,&$child_focus)
+    function loadListFieldDefs(&$subpanel_fields, &$child_focus)
     {
         $this->list_field_defs = $subpanel_fields;
 
-        for($i=0;$i < count($this->list_field_defs);$i++)
+        for ($i = 0; $i < count($this->list_field_defs); $i++)
         {
             $list_field = $this->list_field_defs[$i];
             $field_def = null;
             $key = '';
-            if(!empty($list_field['vname']))
+            if (!empty($list_field['vname']))
             {
                 $key = $list_field['vname'];
-            } else if(isset($list_field['name']) &&  isset($child_focus->field_defs[$list_field['name']]))
+            } else if (isset($list_field['name']) && isset($child_focus->field_defs[$list_field['name']]))
             {
                     $field_def = $child_focus->field_defs[$list_field['name']];
                     $key = $field_def['vname'];
             }
-            if(!empty($key))
+            if (!empty($key))
             {
-                $list_field['label'] = translate($key,$child_focus->module_dir);
-                $this->list_field_defs[$i]['label'] = preg_replace('/:$/','',$list_field['label']);
+                $list_field['label'] = translate($key, $child_focus->module_dir);
+                $this->list_field_defs[$i]['label'] = preg_replace('/:$/', '', $list_field['label']);
             }
             else
             {
-                $this->list_field_defs[$i]['label'] ='&nbsp;';
+                $this->list_field_defs[$i]['label'] = '&nbsp;';
             }
         }
     }
@@ -2036,7 +2036,7 @@ 
      * All Rights Reserved.
      * Contributor(s): ______________________________________.
      */
-     function setLocalSessionVariable($localVarName,$varName, $value) {
+     function setLocalSessionVariable($localVarName, $varName, $value) {
         $_SESSION[$localVarName."_".$varName] = $value;
      }
 
@@ -2046,11 +2046,11 @@ 
      * All Rights Reserved.
      * Contributor(s): ______________________________________.
      */
- function getLocalSessionVariable($localVarName,$varName) {
-    if(isset($_SESSION[$localVarName."_".$varName])) {
+ function getLocalSessionVariable($localVarName, $varName) {
+    if (isset($_SESSION[$localVarName."_".$varName])) {
         return $_SESSION[$localVarName."_".$varName];
     }
-    else{
+    else {
         return "";
     }
  }
@@ -2058,7 +2058,7 @@ 
  /* Set to true if you want Additional Details to appear in the listview
   */
  function setAdditionalDetails($value = true, $function = '') {
-    if(!empty($function)) $this->additionalDetailsFunction = $function;
+    if (!empty($function)) $this->additionalDetailsFunction = $function;
     $this->_additionalDetails = $value;
  }
 

include/ListView/ListViewData.php

Spacing +104 added lines, -104 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.
@@ -75,10 +75,10 @@ 
 	 */
 	function getOrderBy($orderBy = '', $direction = '') {
 		if (!empty($orderBy) || !empty($_REQUEST[$this->var_order_by])) {
-            if(!empty($_REQUEST[$this->var_order_by])) {
+            if (!empty($_REQUEST[$this->var_order_by])) {
     			$direction = 'ASC';
     			$orderBy = $_REQUEST[$this->var_order_by];
-    			if(!empty($_REQUEST['lvso']) && (empty($_SESSION['lvd']['last_ob']) || strcmp($orderBy, $_SESSION['lvd']['last_ob']) == 0) ){
+    			if (!empty($_REQUEST['lvso']) && (empty($_SESSION['lvd']['last_ob']) || strcmp($orderBy, $_SESSION['lvd']['last_ob']) == 0)) {
     				$direction = $_REQUEST['lvso'];
     			}
             }
@@ -87,7 +87,7 @@ 
         }
 		else {
             $userPreferenceOrder = $GLOBALS['current_user']->getPreference('listviewOrder', $this->var_name);
-			if(!empty($_SESSION[$this->var_order_by])) {
+			if (!empty($_SESSION[$this->var_order_by])) {
 				$orderBy = $_SESSION[$this->var_order_by]['orderBy'];
 				$direction = $_SESSION[$this->var_order_by]['direction'];
             } elseif (!empty($userPreferenceOrder)) {
@@ -98,8 +98,8 @@ 
 				$direction = 'DESC';
 			}
 		}
-		if(!empty($direction)) {
-    		if(strtolower($direction) == "desc") {
+		if (!empty($direction)) {
+    		if (strtolower($direction) == "desc") {
     		    $direction = 'DESC';
     		} else {
     		    $direction = 'ASC';
@@ -114,8 +114,8 @@ 
 	 * @param STRING (ASC or DESC) $current_order
 	 * @return  STRING (ASC or DESC)
 	 */
-	function getReverseSortOrder($current_order){
-		return (strcmp(strtolower($current_order), 'asc') == 0)?'DESC':'ASC';
+	function getReverseSortOrder($current_order) {
+		return (strcmp(strtolower($current_order), 'asc') == 0) ? 'DESC' : 'ASC';
 	}
 	/**
 	 * gets the limit of how many rows to show per page
@@ -145,8 +145,8 @@ 
     {
         global $beanList;
 
-        $blockVariables = array('mass', 'uid', 'massupdate', 'delete', 'merge', 'selectCount',$this->var_order_by, $this->var_offset, 'lvso', 'sortOrder', 'orderBy', 'request_data', 'current_query_by_page');
-        foreach($beanList as $bean)
+        $blockVariables = array('mass', 'uid', 'massupdate', 'delete', 'merge', 'selectCount', $this->var_order_by, $this->var_offset, 'lvso', 'sortOrder', 'orderBy', 'request_data', 'current_query_by_page');
+        foreach ($beanList as $bean)
         {
             $blockVariables[] = 'Home2_'.strtoupper($bean).'_ORDER_BY';
         }
@@ -164,30 +164,30 @@ 
 	 *
 	 * @param unknown_type $baseName
 	 */
-	function setVariableName($baseName, $where, $listviewName = null){
+	function setVariableName($baseName, $where, $listviewName = null) {
         global $timedate;
-        $module = (!empty($listviewName)) ? $listviewName: $_REQUEST['module'];
-        $this->var_name = $module .'2_'. strtoupper($baseName);
+        $module = (!empty($listviewName)) ? $listviewName : $_REQUEST['module'];
+        $this->var_name = $module.'2_'.strtoupper($baseName);
 
-		$this->var_order_by = $this->var_name .'_ORDER_BY';
-		$this->var_offset = $this->var_name . '_offset';
+		$this->var_order_by = $this->var_name.'_ORDER_BY';
+		$this->var_offset = $this->var_name.'_offset';
         $timestamp = sugar_microtime();
         $this->stamp = $timestamp;
 
-        $_SESSION[$module .'2_QUERY_QUERY'] = $where;
+        $_SESSION[$module.'2_QUERY_QUERY'] = $where;
 
-        $_SESSION[strtoupper($baseName) . "_FROM_LIST_VIEW"] = $timestamp;
-        $_SESSION[strtoupper($baseName) . "_DETAIL_NAV_HISTORY"] = false;
+        $_SESSION[strtoupper($baseName)."_FROM_LIST_VIEW"] = $timestamp;
+        $_SESSION[strtoupper($baseName)."_DETAIL_NAV_HISTORY"] = false;
 	}
 
-	function getTotalCount($main_query){
-		if(!empty($this->count_query)){
+	function getTotalCount($main_query) {
+		if (!empty($this->count_query)) {
 		    $count_query = $this->count_query;
-		}else{
+		} else {
 	        $count_query = $this->seed->create_list_count_query($main_query);
 	    }
 		$result = $this->db->query($count_query);
-		if($row = $this->db->fetchByAssoc($result)){
+		if ($row = $this->db->fetchByAssoc($result)) {
 			return $row['c'];
 		}
 		return 0;
@@ -229,13 +229,13 @@ 
 	 * @param string:'id' $id_field
 	 * @return array('data'=> row data, 'pageData' => page data information, 'query' => original query string)
 	 */
-	function getListViewData($seed, $where, $offset=-1, $limit = -1, $filter_fields=array(),$params=array(),$id_field = 'id',$singleSelect=true) {
+	function getListViewData($seed, $where, $offset = -1, $limit = -1, $filter_fields = array(), $params = array(), $id_field = 'id', $singleSelect = true) {
         global $current_user;
         SugarVCR::erase($seed->module_dir);
-        $this->seed =& $seed;
+        $this->seed = & $seed;
         $totalCounted = empty($GLOBALS['sugar_config']['disable_count_query']);
         $_SESSION['MAILMERGE_MODULE_FROM_LISTVIEW'] = $seed->module_dir;
-        if(empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup'){
+        if (empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
             $_SESSION['MAILMERGE_MODULE'] = $seed->module_dir;
         }
 
@@ -244,7 +244,7 @@ 
 		$this->seed->id = '[SELECT_ID_LIST]';
 
         // if $params tell us to override all ordering
-        if(!empty($params['overrideOrder']) && !empty($params['orderBy'])) {
+        if (!empty($params['overrideOrder']) && !empty($params['orderBy'])) {
             $order = $this->getOrderBy(strtolower($params['orderBy']), (empty($params['sortOrder']) ? '' : $params['sortOrder'])); // retreive from $_REQUEST
         }
         else {
@@ -252,17 +252,17 @@ 
         }
 
         // still empty? try to use settings passed in $param
-        if(empty($order['orderBy']) && !empty($params['orderBy'])) {
+        if (empty($order['orderBy']) && !empty($params['orderBy'])) {
             $order['orderBy'] = $params['orderBy'];
-            $order['sortOrder'] =  (empty($params['sortOrder']) ? '' : $params['sortOrder']);
+            $order['sortOrder'] = (empty($params['sortOrder']) ? '' : $params['sortOrder']);
         }
 
         //rrs - bug: 21788. Do not use Order by stmts with fields that are not in the query.
         // Bug 22740 - Tweak this check to strip off the table name off the order by parameter.
         // Samir Gandhi : Do not remove the report_cache.date_modified condition as the report list view is broken
         $orderby = $order['orderBy'];
-        if (strpos($order['orderBy'],'.') && ($order['orderBy'] != "report_cache.date_modified")) {
-            $orderby = substr($order['orderBy'],strpos($order['orderBy'],'.')+1);
+        if (strpos($order['orderBy'], '.') && ($order['orderBy'] != "report_cache.date_modified")) {
+            $orderby = substr($order['orderBy'], strpos($order['orderBy'], '.') + 1);
         }
         if ($orderby != 'date_entered' && !in_array($orderby, array_keys($filter_fields))) {
         	$order['orderBy'] = '';
@@ -272,10 +272,10 @@ 
 		if (empty($order['orderBy'])) {
             $orderBy = '';
         } else {
-            $orderBy = $order['orderBy'] . ' ' . $order['sortOrder'];
+            $orderBy = $order['orderBy'].' '.$order['sortOrder'];
             //wdong, Bug 25476, fix the sorting problem of Oracle.
             if (isset($params['custom_order_by_override']['ori_code']) && $order['orderBy'] == $params['custom_order_by_override']['ori_code'])
-                $orderBy = $params['custom_order_by_override']['custom_code'] . ' ' . $order['sortOrder'];
+                $orderBy = $params['custom_order_by_override']['custom_code'].' '.$order['sortOrder'];
         }
 
         if (empty($params['skipOrderSave'])) { // don't save preferences if told so
@@ -290,34 +290,34 @@ 
 		$ret_array = $seed->create_new_list_query($orderBy, $where, $filter_fields, $params, 0, '', true, $seed, $singleSelect);
         $ret_array['inner_join'] = '';
         if (!empty($this->seed->listview_inner_join)) {
-            $ret_array['inner_join'] = ' ' . implode(' ', $this->seed->listview_inner_join) . ' ';
+            $ret_array['inner_join'] = ' '.implode(' ', $this->seed->listview_inner_join).' ';
         }
 
-		if(!is_array($params)) $params = array();
-        if(!isset($params['custom_select'])) $params['custom_select'] = '';
-        if(!isset($params['custom_from'])) $params['custom_from'] = '';
-        if(!isset($params['custom_where'])) $params['custom_where'] = '';
-        if(!isset($params['custom_order_by'])) $params['custom_order_by'] = '';
-		$main_query = $ret_array['select'] . $params['custom_select'] . $ret_array['from'] . $params['custom_from'] . $ret_array['inner_join']. $ret_array['where'] . $params['custom_where'] . $ret_array['order_by'] . $params['custom_order_by'];
+		if (!is_array($params)) $params = array();
+        if (!isset($params['custom_select'])) $params['custom_select'] = '';
+        if (!isset($params['custom_from'])) $params['custom_from'] = '';
+        if (!isset($params['custom_where'])) $params['custom_where'] = '';
+        if (!isset($params['custom_order_by'])) $params['custom_order_by'] = '';
+		$main_query = $ret_array['select'].$params['custom_select'].$ret_array['from'].$params['custom_from'].$ret_array['inner_join'].$ret_array['where'].$params['custom_where'].$ret_array['order_by'].$params['custom_order_by'];
 		//C.L. - Fix for 23461
-		if(empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
+		if (empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
           	   $_SESSION['export_where'] = $ret_array['where'];
 		}
-   		if($limit < -1) {
+   		if ($limit < -1) {
 			$result = $this->db->query($main_query);
 		}
 		else {
-			if($limit == -1) {
+			if ($limit == -1) {
 				$limit = $this->getLimit();
             }
 			$dyn_offset = $this->getOffset();
-			if($dyn_offset > 0 || !is_int($dyn_offset))$offset = $dyn_offset;
+			if ($dyn_offset > 0 || !is_int($dyn_offset))$offset = $dyn_offset;
 
-            if(strcmp($offset, 'end') == 0){
+            if (strcmp($offset, 'end') == 0) {
             	$totalCount = $this->getTotalCount($main_query);
-            	$offset = (floor(($totalCount -1) / $limit)) * $limit;
+            	$offset = (floor(($totalCount - 1) / $limit)) * $limit;
             }
-            if($this->seed->ACLAccess('ListView')) {
+            if ($this->seed->ACLAccess('ListView')) {
                 $result = $this->db->limitQuery($main_query, $offset, $limit + 1);
             }
             else {
@@ -335,9 +335,9 @@ 
         $idIndex = array();
         $id_list = '';
 
-   		while(($row = $this->db->fetchByAssoc($result)) != null)
+   		while (($row = $this->db->fetchByAssoc($result)) != null)
         {
-   			if($count < $limit)
+   			if ($count < $limit)
             {
    				$id_list .= ',\''.$row[$id_field].'\'';
    				$idIndex[$row[$id_field]][] = count($rows);
@@ -351,51 +351,51 @@ 
             $id_list = '('.substr($id_list, 1).')';
         }
 
-        SugarVCR::store($this->seed->module_dir,  $main_query);
-		if($count != 0) {
+        SugarVCR::store($this->seed->module_dir, $main_query);
+		if ($count != 0) {
 			//NOW HANDLE SECONDARY QUERIES
-			if(!empty($ret_array['secondary_select'])) {
-				$secondary_query = $ret_array['secondary_select'] . $ret_array['secondary_from'] . ' WHERE '.$this->seed->table_name.'.id IN ' .$id_list;
-                if(isset($ret_array['order_by']))
+			if (!empty($ret_array['secondary_select'])) {
+				$secondary_query = $ret_array['secondary_select'].$ret_array['secondary_from'].' WHERE '.$this->seed->table_name.'.id IN '.$id_list;
+                if (isset($ret_array['order_by']))
                 {
-                    $secondary_query .= ' ' . $ret_array['order_by'];
+                    $secondary_query .= ' '.$ret_array['order_by'];
                 }
 
                 $secondary_result = $this->db->query($secondary_query);
 
                 $ref_id_count = array();
-				while($row = $this->db->fetchByAssoc($secondary_result)) {
+				while ($row = $this->db->fetchByAssoc($secondary_result)) {
 
                     $ref_id_count[$row['ref_id']][] = true;
-					foreach($row as $name=>$value) {
+					foreach ($row as $name=>$value) {
 						//add it to every row with the given id
-						foreach($idIndex[$row['ref_id']] as $index){
-						    $rows[$index][$name]=$value;
+						foreach ($idIndex[$row['ref_id']] as $index) {
+						    $rows[$index][$name] = $value;
 						}
 					}
 				}
 
                 $rows_keys = array_keys($rows);
-                foreach($rows_keys as $key)
+                foreach ($rows_keys as $key)
                 {
                     $rows[$key]['secondary_select_count'] = count($ref_id_count[$rows[$key]['ref_id']]);
                 }
 			}
 
             // retrieve parent names
-            if(!empty($filter_fields['parent_name']) && !empty($filter_fields['parent_id']) && !empty($filter_fields['parent_type'])) {
-                foreach($idIndex as $id => $rowIndex) {
-                    if(!isset($post_retrieve[$rows[$rowIndex[0]]['parent_type']])) {
+            if (!empty($filter_fields['parent_name']) && !empty($filter_fields['parent_id']) && !empty($filter_fields['parent_type'])) {
+                foreach ($idIndex as $id => $rowIndex) {
+                    if (!isset($post_retrieve[$rows[$rowIndex[0]]['parent_type']])) {
                         $post_retrieve[$rows[$rowIndex[0]]['parent_type']] = array();
                     }
-                    if(!empty($rows[$rowIndex[0]]['parent_id'])) $post_retrieve[$rows[$rowIndex[0]]['parent_type']][] = array('child_id' => $id , 'parent_id'=> $rows[$rowIndex[0]]['parent_id'], 'parent_type' => $rows[$rowIndex[0]]['parent_type'], 'type' => 'parent');
+                    if (!empty($rows[$rowIndex[0]]['parent_id'])) $post_retrieve[$rows[$rowIndex[0]]['parent_type']][] = array('child_id' => $id, 'parent_id'=> $rows[$rowIndex[0]]['parent_id'], 'parent_type' => $rows[$rowIndex[0]]['parent_type'], 'type' => 'parent');
                 }
-                if(isset($post_retrieve)) {
+                if (isset($post_retrieve)) {
                     $parent_fields = $seed->retrieve_parent_fields($post_retrieve);
-                    foreach($parent_fields as $child_id => $parent_data) {
+                    foreach ($parent_fields as $child_id => $parent_data) {
                         //add it to every row with the given id
-						foreach($idIndex[$child_id] as $index){
-						    $rows[$index]['parent_name']= $parent_data['parent_name'];
+						foreach ($idIndex[$child_id] as $index) {
+						    $rows[$index]['parent_name'] = $parent_data['parent_name'];
 						}
                     }
                 }
@@ -404,7 +404,7 @@ 
 			$pageData = array();
 
 			reset($rows);
-			while($row = current($rows)){
+			while ($row = current($rows)) {
 
                 $temp = clone $seed;
 			    $dataIndex = count($data);
@@ -414,9 +414,9 @@ 
 				if (empty($this->seed->assigned_user_id) && !empty($temp->assigned_user_id)) {
 				    $this->seed->assigned_user_id = $temp->assigned_user_id;
 				}
-				if($idIndex[$row[$id_field]][0] == $dataIndex){
+				if ($idIndex[$row[$id_field]][0] == $dataIndex) {
 				    $pageData['tag'][$dataIndex] = $temp->listviewACLHelper();
-				}else{
+				} else {
 				    $pageData['tag'][$dataIndex] = $pageData['tag'][$idIndex[$row[$id_field]][0]];
 				}
 				$data[$dataIndex] = $temp->get_list_view_data($filter_fields);
@@ -424,21 +424,21 @@ 
                 $editViewAccess = $temp->ACLAccess('EditView');
                 $pageData['rowAccess'][$dataIndex] = array('view' => $detailViewAccess, 'edit' => $editViewAccess);
                 $additionalDetailsAllow = $this->additionalDetails && $detailViewAccess && (file_exists(
-                         'modules/' . $temp->module_dir . '/metadata/additionalDetails.php'
-                     ) || file_exists('custom/modules/' . $temp->module_dir . '/metadata/additionalDetails.php'));
+                         'modules/'.$temp->module_dir.'/metadata/additionalDetails.php'
+                     ) || file_exists('custom/modules/'.$temp->module_dir.'/metadata/additionalDetails.php'));
                 $additionalDetailsEdit = $editViewAccess;
-                if($additionalDetailsAllow) {
-                    if($this->additionalDetailsAjax) {
+                if ($additionalDetailsAllow) {
+                    if ($this->additionalDetailsAjax) {
 					   $ar = $this->getAdditionalDetailsAjax($data[$dataIndex]['ID']);
                     }
                     else {
-                        $additionalDetailsFile = 'modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php';
-                        if(file_exists('custom/modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php')){
-                        	$additionalDetailsFile = 'custom/modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php';
+                        $additionalDetailsFile = 'modules/'.$this->seed->module_dir.'/metadata/additionalDetails.php';
+                        if (file_exists('custom/modules/'.$this->seed->module_dir.'/metadata/additionalDetails.php')) {
+                        	$additionalDetailsFile = 'custom/modules/'.$this->seed->module_dir.'/metadata/additionalDetails.php';
                         }
                         require_once($additionalDetailsFile);
                         $ar = $this->getAdditionalDetails($data[$dataIndex],
-                                    (empty($this->additionalDetailsFunction) ? 'additionalDetails' : $this->additionalDetailsFunction) . $this->seed->object_name,
+                                    (empty($this->additionalDetailsFunction) ? 'additionalDetails' : $this->additionalDetailsFunction).$this->seed->object_name,
                                     $additionalDetailsEdit);
                     }
                     $pageData['additionalDetails'][$dataIndex] = $ar['string'];
@@ -450,18 +450,18 @@ 
 		$nextOffset = -1;
 		$prevOffset = -1;
 		$endOffset = -1;
-		if($count > $limit) {
+		if ($count > $limit) {
 			$nextOffset = $offset + $limit;
 		}
 
-		if($offset > 0) {
+		if ($offset > 0) {
 			$prevOffset = $offset - $limit;
-			if($prevOffset < 0)$prevOffset = 0;
+			if ($prevOffset < 0)$prevOffset = 0;
 		}
 		$totalCount = $count + $offset;
 
-		if( $count >= $limit && $totalCounted){
-			$totalCount  = $this->getTotalCount($main_query);
+		if ($count >= $limit && $totalCounted) {
+			$totalCount = $this->getTotalCount($main_query);
 		}
 		SugarVCR::recordIDs($this->seed->module_dir, array_keys($idIndex), $offset, $totalCount);
         $module_names = array(
@@ -471,21 +471,21 @@ 
 		$pageData['ordering'] = $order;
 		$pageData['ordering']['sortOrder'] = $this->getReverseSortOrder($pageData['ordering']['sortOrder']);
         //get url parameters as an array
-        $pageData['queries'] = $this->generateQueries($pageData['ordering']['sortOrder'], $offset, $prevOffset, $nextOffset,  $endOffset, $totalCounted);
+        $pageData['queries'] = $this->generateQueries($pageData['ordering']['sortOrder'], $offset, $prevOffset, $nextOffset, $endOffset, $totalCounted);
         //join url parameters from array to a string
         $pageData['urls'] = $this->generateURLS($pageData['queries']);
-		$pageData['offsets'] = array( 'current'=>$offset, 'next'=>$nextOffset, 'prev'=>$prevOffset, 'end'=>$endOffset, 'total'=>$totalCount, 'totalCounted'=>$totalCounted);
+		$pageData['offsets'] = array('current'=>$offset, 'next'=>$nextOffset, 'prev'=>$prevOffset, 'end'=>$endOffset, 'total'=>$totalCount, 'totalCounted'=>$totalCounted);
 		$pageData['bean'] = array('objectName' => $seed->object_name, 'moduleDir' => $seed->module_dir, 'moduleName' => strtr($seed->module_dir, $module_names));
         $pageData['stamp'] = $this->stamp;
         $pageData['access'] = array('view' => $this->seed->ACLAccess('DetailView'), 'edit' => $this->seed->ACLAccess('EditView'));
 		$pageData['idIndex'] = $idIndex;
-        if(!$this->seed->ACLAccess('ListView')) {
+        if (!$this->seed->ACLAccess('ListView')) {
             $pageData['error'] = 'ACL restricted access';
         }
 
         $queryString = '';
 
-        if( isset($_REQUEST["searchFormTab"]) && $_REQUEST["searchFormTab"] == "advanced_search" ||
+        if (isset($_REQUEST["searchFormTab"]) && $_REQUEST["searchFormTab"] == "advanced_search" ||
         	isset($_REQUEST["type_basic"]) && (count($_REQUEST["type_basic"] > 1) || $_REQUEST["type_basic"][0] != "") ||
         	isset($_REQUEST["module"]) && $_REQUEST["module"] == "MergeRecords")
         {
@@ -493,19 +493,19 @@ 
         }
         else if (isset($_REQUEST["searchFormTab"]) && $_REQUEST["searchFormTab"] == "basic_search")
         {
-            if($seed->module_dir == "Reports") $searchMetaData = SearchFormReports::retrieveReportsSearchDefs();
+            if ($seed->module_dir == "Reports") $searchMetaData = SearchFormReports::retrieveReportsSearchDefs();
             else $searchMetaData = SearchForm::retrieveSearchDefs($seed->module_dir);
 
             $basicSearchFields = array();
 
-            if( isset($searchMetaData['searchdefs']) && isset($searchMetaData['searchdefs'][$seed->module_dir]['layout']['basic_search']) )
+            if (isset($searchMetaData['searchdefs']) && isset($searchMetaData['searchdefs'][$seed->module_dir]['layout']['basic_search']))
                 $basicSearchFields = $searchMetaData['searchdefs'][$seed->module_dir]['layout']['basic_search'];
 
-            foreach( $basicSearchFields as $basicSearchField)
+            foreach ($basicSearchFields as $basicSearchField)
             {
                 $field_name = (is_array($basicSearchField) && isset($basicSearchField['name'])) ? $basicSearchField['name'] : $basicSearchField;
                 $field_name .= "_basic";
-                if( isset($_REQUEST[$field_name])  && ( !is_array($basicSearchField) || !isset($basicSearchField['type']) || $basicSearchField['type'] == 'text' || $basicSearchField['type'] == 'name') )
+                if (isset($_REQUEST[$field_name]) && (!is_array($basicSearchField) || !isset($basicSearchField['type']) || $basicSearchField['type'] == 'text' || $basicSearchField['type'] == 'name'))
                 {
                     // Ensure the encoding is UTF-8
                     $queryString = htmlentities($_REQUEST[$field_name], null, 'UTF-8');
@@ -514,7 +514,7 @@ 
             }
         }
 
-		return array('data'=>$data , 'pageData'=>$pageData, 'query' => $queryString);
+		return array('data'=>$data, 'pageData'=>$pageData, 'query' => $queryString);
 	}
 
 
@@ -528,7 +528,7 @@ 
     {
         foreach ($queries as $name => $value)
         {
-            $queries[$name] = 'index.php?' . http_build_query($value);
+            $queries[$name] = 'index.php?'.http_build_query($value);
         }
         $this->base_url = $queries['baseURL'];
         return $queries;
@@ -554,22 +554,22 @@ 
         $queries['orderBy'] = $queries['baseURL'];
         $queries['orderBy'][$this->var_order_by] = '';
 
-        if($nextOffset > -1)
+        if ($nextOffset > -1)
         {
             $queries['nextPage'] = $queries['baseURL'];
             $queries['nextPage'][$this->var_offset] = $nextOffset;
         }
-        if($offset > 0)
+        if ($offset > 0)
         {
             $queries['startPage'] = $queries['baseURL'];
             $queries['startPage'][$this->var_offset] = 0;
         }
-        if($prevOffset > -1)
+        if ($prevOffset > -1)
         {
             $queries['prevPage'] = $queries['baseURL'];
             $queries['prevPage'][$this->var_offset] = $prevOffset;
         }
-        if($totalCounted)
+        if ($totalCounted)
         {
             $queries['endPage'] = $queries['baseURL'];
             $queries['endPage'][$this->var_offset] = $endOffset;
@@ -594,7 +594,7 @@ 
 
         $jscalendarImage = SugarThemeRegistry::current()->getImageURL('info_inline.gif');
 
-        $extra = "<span id='adspan_" . $id . "' "
+        $extra = "<span id='adspan_".$id."' "
                 . "onclick=\"lvg_dtails('$id')\" "
 				. " style='position: relative;'><!--not_in_theme!--><img vertical-align='middle' class='info' border='0' alt='".$app_strings['LBL_ADDITIONAL_DETAILS']."' src='$jscalendarImage'></span>";
 
@@ -618,27 +618,27 @@ 
 
         $results['string'] = str_replace(array("&#039", "'"), '\&#039', $results['string']); // no xss!
 
-        if(trim($results['string']) == '')
+        if (trim($results['string']) == '')
         {
             $results['string'] = $app_strings['LBL_NONE'];
         }
          	$close = false;
             $extra = "<img alt='{$app_strings['LBL_INFOINLINE']}' style='padding: 0px 5px 0px 2px' border='0' onclick=\"SUGAR.util.getStaticAdditionalDetails(this,'";
 
-            $extra .= str_replace(array("\rn", "\r", "\n"), array('','','<br />'), $results['string']) ;
+            $extra .= str_replace(array("\rn", "\r", "\n"), array('', '', '<br />'), $results['string']);
             $extra .= "','<div style=\'float:left\'>{$app_strings['LBL_ADDITIONAL_DETAILS']}</div><div style=\'float: right\'>";
 
-	        if($editAccess && !empty($results['editLink']))
+	        if ($editAccess && !empty($results['editLink']))
 	        {
-	            $extra .=  "<a title=\'{$app_strings['LBL_EDIT_BUTTON']}\' href={$results['editLink']}><img style=\'margin-left: 2px;\' border=\'0\' src=\'".SugarThemeRegistry::current()->getImageURL('edit_inline.png')."\'></a>";
+	            $extra .= "<a title=\'{$app_strings['LBL_EDIT_BUTTON']}\' href={$results['editLink']}><img style=\'margin-left: 2px;\' border=\'0\' src=\'".SugarThemeRegistry::current()->getImageURL('edit_inline.png')."\'></a>";
 	            $close = true;
 	        }
 	        $close = (!empty($results['viewLink'])) ? true : $close;
 	        $extra .= (!empty($results['viewLink']) ? "<a title=\'{$app_strings['LBL_VIEW_BUTTON']}\' href={$results['viewLink']}><img style=\'margin-left: 2px;\' border=\'0\' src=".SugarThemeRegistry::current()->getImageURL('view_inline.png')."></a>" : '');
 
-            if($close == true) {
+            if ($close == true) {
             	$closeVal = "true";
-            	$extra .=  "<a title=\'{$app_strings['LBL_ADDITIONAL_DETAILS_CLOSE_TITLE']}\' href=\'javascript: SUGAR.util.closeStaticAdditionalDetails();\'><img style=\'margin-left: 2px;\' border=\'0\' src=\'".SugarThemeRegistry::current()->getImageURL('close.png')."\'></a>";
+            	$extra .= "<a title=\'{$app_strings['LBL_ADDITIONAL_DETAILS_CLOSE_TITLE']}\' href=\'javascript: SUGAR.util.closeStaticAdditionalDetails();\'><img style=\'margin-left: 2px;\' border=\'0\' src=\'".SugarThemeRegistry::current()->getImageURL('close.png')."\'></a>";
             } else {
             	$closeVal = "false";
             }

include/utils/sugar_file_utils.php

Spacing +66 added lines, -66 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.
@@ -53,39 +53,39 @@ 
  * @param $context
  * @return boolean - Returns true on success false on failure
  */
-function sugar_mkdir($pathname, $mode=null, $recursive=false, $context='') {
+function sugar_mkdir($pathname, $mode = null, $recursive = false, $context = '') {
 	$mode = get_mode('dir_mode', $mode);
 
-	if ( sugar_is_dir($pathname,$mode) )
+	if (sugar_is_dir($pathname, $mode))
 	    return true;
 
 	$result = false;
-	if(empty($mode))
+	if (empty($mode))
 		$mode = 0777;
-	if(empty($context)) {
+	if (empty($context)) {
 		$result = @mkdir($pathname, $mode, $recursive);
 	} else {
 		$result = @mkdir($pathname, $mode, $recursive, $context);
 	}
 
-	if($result){
-		if(!sugar_chmod($pathname, $mode)){
+	if ($result) {
+		if (!sugar_chmod($pathname, $mode)) {
 			return false;
 		}
-		if(!empty($GLOBALS['sugar_config']['default_permissions']['user'])){
-			if(!sugar_chown($pathname)){
+		if (!empty($GLOBALS['sugar_config']['default_permissions']['user'])) {
+			if (!sugar_chown($pathname)) {
 				return false;
 			}
 		}
-		if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
-   			if(!sugar_chgrp($pathname)) {
+		if (!empty($GLOBALS['sugar_config']['default_permissions']['group'])) {
+   			if (!sugar_chgrp($pathname)) {
    				return false;
    			}
 		}
 	}
 	else {
 		$errorMessage = "Cannot create directory $pathname cannot be touched";
-		if(is_null($GLOBALS['log'])) {
+		if (is_null($GLOBALS['log'])) {
 			throw new Exception("Error occurred but the system doesn't have logger. Error message: \"$errorMessage\"");
 		}
 		$GLOBALS['log']->error($errorMessage);
@@ -108,13 +108,13 @@ 
  * @param $context
  * @return boolean - Returns a file pointer on success, false otherwise
  */
-function sugar_fopen($filename, $mode, $use_include_path=false, $context=null){
+function sugar_fopen($filename, $mode, $use_include_path = false, $context = null) {
 	//check to see if the file exists, if not then use touch to create it.
-	if(!file_exists($filename)){
+	if (!file_exists($filename)) {
 		sugar_touch($filename);
 	}
 
-	if(empty($context)) {
+	if (empty($context)) {
 
 		return fopen($filename, $mode, $use_include_path);
 	} else {
@@ -136,22 +136,22 @@ 
  * @param $context
  * @return int - Returns the number of bytes written to the file, false otherwise.
  */
-function sugar_file_put_contents($filename, $data, $flags=null, $context=null){
+function sugar_file_put_contents($filename, $data, $flags = null, $context = null) {
 	//check to see if the file exists, if not then use touch to create it.
-	if(!file_exists($filename)){
+	if (!file_exists($filename)) {
 		sugar_touch($filename);
 	}
 
-	if ( !is_writable($filename) ) {
+	if (!is_writable($filename)) {
 	    $GLOBALS['log']->error("File $filename cannot be written to");
 	    return false;
 	}
 
-	if(empty($flags)) {
+	if (empty($flags)) {
 		return file_put_contents($filename, $data);
-	} elseif(empty($context)) {
+	} elseif (empty($context)) {
 		return file_put_contents($filename, $data, $flags);
-	} else{
+	} else {
 		return file_put_contents($filename, $data, $flags, $context);
 	}
 }
@@ -169,13 +169,13 @@ 
  * @param context $context Context to pass into fopen operation
  * @return boolean - Returns true if $filename was created, false otherwise.
  */
-function sugar_file_put_contents_atomic($filename, $data, $mode='wb', $use_include_path=false, $context=null){
+function sugar_file_put_contents_atomic($filename, $data, $mode = 'wb', $use_include_path = false, $context = null) {
 
     $dir = dirname($filename);
     $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);
             return false;
@@ -196,7 +196,7 @@ 
         }
     }
 
-    if(file_exists($filename))
+    if (file_exists($filename))
     {
        return sugar_chmod($filename, 0755);
     }
@@ -214,18 +214,18 @@ 
  * @param $context
  * @return string|boolean - Returns a file data on success, false otherwise
  */
-function sugar_file_get_contents($filename, $use_include_path=false, $context=null){
+function sugar_file_get_contents($filename, $use_include_path = false, $context = null) {
 	//check to see if the file exists, if not then use touch to create it.
-	if(!file_exists($filename)){
+	if (!file_exists($filename)) {
 		sugar_touch($filename);
 	}
 
-	if ( !is_readable($filename) ) {
+	if (!is_readable($filename)) {
 	    $GLOBALS['log']->error("File $filename cannot be read");
 	    return false;
 	}
 
-	if(empty($context)) {
+	if (empty($context)) {
 		return file_get_contents($filename, $use_include_path);
 	} else {
 		return file_get_contents($filename, $use_include_path, $context);
@@ -246,29 +246,29 @@ 
  * @return boolean - Returns TRUE on success or FALSE on failure.
  *
  */
-function sugar_touch($filename, $time=null, $atime=null) {
+function sugar_touch($filename, $time = null, $atime = null) {
 
    $result = false;
 
-   if(!empty($atime) && !empty($time)) {
+   if (!empty($atime) && !empty($time)) {
    	  $result = @touch($filename, $time, $atime);
-   } else if(!empty($time)) {
+   } else if (!empty($time)) {
    	  $result = @touch($filename, $time);
    } else {
    	  $result = @touch($filename);
    }
 
-   if(!$result) {
+   if (!$result) {
        $GLOBALS['log']->error("File $filename cannot be touched");
        return $result;
    }
-	if(!empty($GLOBALS['sugar_config']['default_permissions']['file_mode'])){
+	if (!empty($GLOBALS['sugar_config']['default_permissions']['file_mode'])) {
 		sugar_chmod($filename, $GLOBALS['sugar_config']['default_permissions']['file_mode']);
 	}
-	if(!empty($GLOBALS['sugar_config']['default_permissions']['user'])){
+	if (!empty($GLOBALS['sugar_config']['default_permissions']['user'])) {
 		sugar_chown($filename);
 	}
-	if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
+	if (!empty($GLOBALS['sugar_config']['default_permissions']['group'])) {
 		sugar_chgrp($filename);
 	}
 
@@ -284,16 +284,16 @@ 
  * @param  int $mode The integer value of the permissions mode to set the created directory to
  * @return boolean   Returns TRUE on success or FALSE on failure.
  */
-function sugar_chmod($filename, $mode=null) {
-    if ( !is_int($mode) )
-        $mode = (int) $mode;
-	if(!is_windows()){
-		if(!isset($mode)){
+function sugar_chmod($filename, $mode = null) {
+    if (!is_int($mode))
+        $mode = (int)$mode;
+	if (!is_windows()) {
+		if (!isset($mode)) {
 			$mode = get_mode('file_mode', $mode);
 		}
-        if(isset($mode) && $mode > 0){
+        if (isset($mode) && $mode > 0) {
 		   return @chmod($filename, $mode);
-		}else{
+		} else {
 	    	return false;
 		}
 	}
@@ -309,15 +309,15 @@ 
  * @param user - A user name or number
  * @return boolean - Returns TRUE on success or FALSE on failure.
  */
-function sugar_chown($filename, $user='') {
-	if(!is_windows()){
-		if(strlen($user)){
+function sugar_chown($filename, $user = '') {
+	if (!is_windows()) {
+		if (strlen($user)) {
 			return chown($filename, $user);
-		}else{
-			if(strlen($GLOBALS['sugar_config']['default_permissions']['user'])){
+		} else {
+			if (strlen($GLOBALS['sugar_config']['default_permissions']['user'])) {
 				$user = $GLOBALS['sugar_config']['default_permissions']['user'];
 				return chown($filename, $user);
-			}else{
+			} else {
 				return false;
 			}
 		}
@@ -334,15 +334,15 @@ 
  * @param group - A group name or number
  * @return boolean - Returns TRUE on success or FALSE on failure.
  */
-function sugar_chgrp($filename, $group='') {
-	if(!is_windows()){
-		if(!empty($group)){
+function sugar_chgrp($filename, $group = '') {
+	if (!is_windows()) {
+		if (!empty($group)) {
 			return chgrp($filename, $group);
-		}else{
-			if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
+		} else {
+			if (!empty($GLOBALS['sugar_config']['default_permissions']['group'])) {
 				$group = $GLOBALS['sugar_config']['default_permissions']['group'];
 				return chgrp($filename, $group);
-			}else{
+			} else {
 				return false;
 			}
 		}
@@ -360,26 +360,26 @@ 
  * defined in the config file.
  * @return int - the mode either found in the config file or passed in via the input parameter
  */
-function get_mode($key = 'dir_mode', $mode=null) {
-	if ( !is_int($mode) )
-        $mode = (int) $mode;
-    if(!class_exists('SugarConfig', true)) {
+function get_mode($key = 'dir_mode', $mode = null) {
+	if (!is_int($mode))
+        $mode = (int)$mode;
+    if (!class_exists('SugarConfig', true)) {
 		require 'include/SugarObjects/SugarConfig.php';
 	}
-	if(!is_windows()){
-		$conf_inst=SugarConfig::getInstance();
+	if (!is_windows()) {
+		$conf_inst = SugarConfig::getInstance();
 		$mode = $conf_inst->get('default_permissions.'.$key, $mode);
 	}
 	return $mode;
 }
 
-function sugar_is_dir($path, $mode='r'){
-		if(defined('TEMPLATE_URL'))return is_dir($path, $mode);
+function sugar_is_dir($path, $mode = 'r') {
+		if (defined('TEMPLATE_URL'))return is_dir($path, $mode);
 		return is_dir($path);
 }
 
-function sugar_is_file($path, $mode='r'){
-		if(defined('TEMPLATE_URL'))return is_file($path, $mode);
+function sugar_is_file($path, $mode = 'r') {
+		if (defined('TEMPLATE_URL'))return is_file($path, $mode);
 		return is_file($path);
 }
 
@@ -391,10 +391,10 @@ 
 function sugar_cached($file)
 {
     static $cdir = null;
-    if(empty($cdir) && !empty($GLOBALS['sugar_config']['cache_dir'])) {
+    if (empty($cdir) && !empty($GLOBALS['sugar_config']['cache_dir'])) {
         $cdir = rtrim($GLOBALS['sugar_config']['cache_dir'], '/\\');
     }
-    if(empty($cdir)) {
+    if (empty($cdir)) {
         $cdir = "cache";
     }
     return "$cdir/$file";

include/modules.php

Spacing +42 added lines, -42 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.
@@ -79,18 +79,18 @@ 
 $beanList['Cases']          = 'aCase';
 $beanList['Bugs']           = 'Bug';
 $beanList['ProspectLists']      = 'ProspectList';
-$beanList['Prospects']  = 'Prospect';
+$beanList['Prospects'] = 'Prospect';
 $beanList['Project']            = 'Project';
-$beanList['ProjectTask']            = 'ProjectTask';
+$beanList['ProjectTask'] = 'ProjectTask';
 $beanList['Campaigns']          = 'Campaign';
-$beanList['EmailMarketing']  = 'EmailMarketing';
+$beanList['EmailMarketing'] = 'EmailMarketing';
 $beanList['CampaignLog']        = 'CampaignLog';
 $beanList['CampaignTrackers']   = 'CampaignTracker';
-$beanList['Releases']       = 'Release';
+$beanList['Releases'] = 'Release';
 $beanList['Groups'] = 'Group';
 $beanList['EmailMan'] = 'EmailMan';
-$beanList['Schedulers']  = 'Scheduler';
-$beanList['SchedulersJobs']  = 'SchedulersJob';
+$beanList['Schedulers'] = 'Scheduler';
+$beanList['SchedulersJobs'] = 'SchedulersJob';
 $beanList['Contacts']       = 'Contact';
 $beanList['Accounts']       = 'Account';
 $beanList['DynamicFields']  = 'DynamicField';
@@ -106,19 +106,19 @@ 
 $beanList['Currencies']     = 'Currency';
 $beanList['Trackers']       = 'Tracker';
 $beanList['Connectors']     = 'Connectors';
-$beanList['Import_1']         = 'ImportMap';
+$beanList['Import_1'] = 'ImportMap';
 $beanList['Import_2']       = 'UsersLastImport';
 $beanList['Versions']       = 'Version';
 $beanList['Administration'] = 'Administration';
 $beanList['vCals']          = 'vCal';
 $beanList['CustomFields']   = 'CustomFields';
-$beanList['Alerts']  = 'Alert';
+$beanList['Alerts'] = 'Alert';
 
 
 
 
-$beanList['Documents']  = 'Document';
-$beanList['DocumentRevisions']  = 'DocumentRevision';
+$beanList['Documents'] = 'Document';
+$beanList['DocumentRevisions'] = 'DocumentRevision';
 $beanList['Roles']  = 'Role';
 
 $beanList['Audit']  = 'Audit';
@@ -152,24 +152,24 @@ 
 $beanFiles['aCase']         = 'modules/Cases/Case.php';
 $beanFiles['Bug']           = 'modules/Bugs/Bug.php';
 $beanFiles['Group'] = 'modules/Groups/Group.php';
-$beanFiles['CampaignLog']  = 'modules/CampaignLog/CampaignLog.php';
+$beanFiles['CampaignLog'] = 'modules/CampaignLog/CampaignLog.php';
 $beanFiles['Project']           = 'modules/Project/Project.php';
-$beanFiles['ProjectTask']           = 'modules/ProjectTask/ProjectTask.php';
+$beanFiles['ProjectTask'] = 'modules/ProjectTask/ProjectTask.php';
 $beanFiles['Campaign']          = 'modules/Campaigns/Campaign.php';
 $beanFiles['ProspectList']      = 'modules/ProspectLists/ProspectList.php';
-$beanFiles['Prospect']  = 'modules/Prospects/Prospect.php';
+$beanFiles['Prospect'] = 'modules/Prospects/Prospect.php';
 
-$beanFiles['EmailMarketing']          = 'modules/EmailMarketing/EmailMarketing.php';
-$beanFiles['CampaignTracker']  = 'modules/CampaignTrackers/CampaignTracker.php';
+$beanFiles['EmailMarketing'] = 'modules/EmailMarketing/EmailMarketing.php';
+$beanFiles['CampaignTracker'] = 'modules/CampaignTrackers/CampaignTracker.php';
 $beanFiles['Release']           = 'modules/Releases/Release.php';
 $beanFiles['EmailMan']          = 'modules/EmailMan/EmailMan.php';
 
-$beanFiles['Scheduler']  = 'modules/Schedulers/Scheduler.php';
-$beanFiles['SchedulersJob']  = 'modules/SchedulersJobs/SchedulersJob.php';
+$beanFiles['Scheduler'] = 'modules/Schedulers/Scheduler.php';
+$beanFiles['SchedulersJob'] = 'modules/SchedulersJobs/SchedulersJob.php';
 $beanFiles['Contact']       = 'modules/Contacts/Contact.php';
 $beanFiles['Account']       = 'modules/Accounts/Account.php';
 $beanFiles['Opportunity']   = 'modules/Opportunities/Opportunity.php';
-$beanFiles['EmailTemplate']         = 'modules/EmailTemplates/EmailTemplate.php';
+$beanFiles['EmailTemplate'] = 'modules/EmailTemplates/EmailTemplate.php';
 $beanFiles['Note']          = 'modules/Notes/Note.php';
 $beanFiles['Call']          = 'modules/Calls/Call.php';
 $beanFiles['Email']         = 'modules/Emails/Email.php';
@@ -177,21 +177,21 @@ 
 $beanFiles['Task']          = 'modules/Tasks/Task.php';
 $beanFiles['User']          = 'modules/Users/User.php';
 $beanFiles['Employee']      = 'modules/Employees/Employee.php';
-$beanFiles['Currency']          = 'modules/Currencies/Currency.php';
-$beanFiles['Tracker']          = 'modules/Trackers/Tracker.php';
+$beanFiles['Currency'] = 'modules/Currencies/Currency.php';
+$beanFiles['Tracker'] = 'modules/Trackers/Tracker.php';
 $beanFiles['ImportMap']     = 'modules/Import/maps/ImportMap.php';
-$beanFiles['UsersLastImport']= 'modules/Import/UsersLastImport.php';
-$beanFiles['Administration']= 'modules/Administration/Administration.php';
-$beanFiles['UpgradeHistory']= 'modules/Administration/UpgradeHistory.php';
+$beanFiles['UsersLastImport'] = 'modules/Import/UsersLastImport.php';
+$beanFiles['Administration'] = 'modules/Administration/Administration.php';
+$beanFiles['UpgradeHistory'] = 'modules/Administration/UpgradeHistory.php';
 $beanFiles['vCal']          = 'modules/vCals/vCal.php';
-$beanFiles['Alert']          = 'modules/Alerts/Alert.php';
-$beanFiles['Version']           = 'modules/Versions/Version.php';
+$beanFiles['Alert'] = 'modules/Alerts/Alert.php';
+$beanFiles['Version'] = 'modules/Versions/Version.php';
 
 
 
-$beanFiles['Role']          = 'modules/Roles/Role.php';
+$beanFiles['Role'] = 'modules/Roles/Role.php';
 
-$beanFiles['Document']  = 'modules/Documents/Document.php';
+$beanFiles['Document'] = 'modules/Documents/Document.php';
 $beanFiles['DocumentRevision']  = 'modules/DocumentRevisions/DocumentRevision.php';
 $beanFiles['FieldsMetaData']    = 'modules/DynamicFields/FieldsMetaData.php';
 //$beanFiles['Audit']           = 'modules/Audit/Audit.php';
@@ -204,7 +204,7 @@ 
 
 
 $beanFiles['SavedSearch']  = 'modules/SavedSearch/SavedSearch.php';
-$beanFiles['UserPreference']  = 'modules/UserPreferences/UserPreference.php';
+$beanFiles['UserPreference'] = 'modules/UserPreferences/UserPreference.php';
 $beanFiles['MergeRecord']  = 'modules/MergeRecords/MergeRecord.php';
 $beanFiles['EmailAddress'] = 'modules/EmailAddresses/EmailAddress.php';
 $beanFiles['EmailText'] = 'modules/EmailText/EmailText.php';
@@ -216,19 +216,19 @@ 
 //$beanList['Library']= 'Library';
 //$beanFiles['Library'] = 'modules/Library/Library.php';
 
-$beanFiles['Configurator']          = 'modules/Configurator/Configurator.php';
+$beanFiles['Configurator'] = 'modules/Configurator/Configurator.php';
 
 // added these lists for security settings for tabs
 $modInvisList = array('Administration', 'Currencies', 'CustomFields', 'Connectors',
     'Dropdown', 'Dynamic', 'DynamicFields', 'DynamicLayout', 'EditCustomFields',
-    'Help', 'Import',  'MySettings', 'EditCustomFields','FieldsMetaData',
+    'Help', 'Import', 'MySettings', 'EditCustomFields', 'FieldsMetaData',
     'UpgradeWizard', 'Trackers', 'Connectors', 'Employees', 'Calendar',
-    'Releases','Sync',
-    'Users',  'Versions', 'LabelEditor','Roles','EmailMarketing'
-    ,'OptimisticLock', 'TeamMemberships', 'TeamSets', 'TeamSetModule', 'Audit', 'MailMerge', 'MergeRecords', 'EmailAddresses','EmailText',
-    'Schedulers','Schedulers_jobs', /*'Queues',*/ 'EmailTemplates',
+    'Releases', 'Sync',
+    'Users', 'Versions', 'LabelEditor', 'Roles', 'EmailMarketing'
+    ,'OptimisticLock', 'TeamMemberships', 'TeamSets', 'TeamSetModule', 'Audit', 'MailMerge', 'MergeRecords', 'EmailAddresses', 'EmailText',
+    'Schedulers', 'Schedulers_jobs', /*'Queues',*/ 'EmailTemplates',
     'CampaignTrackers', 'CampaignLog', 'EmailMan', 'Prospects', 'ProspectLists',
-    'Groups','InboundEmail',
+    'Groups', 'InboundEmail',
     'ACLActions', 'ACLRoles',
     'DocumentRevisions',
     'ProjectTask',
@@ -265,15 +265,15 @@ 
 $modInvisList[] = 'Connectors';
 
 $report_include_modules = array();
-$report_include_modules['Currencies']='Currency';
+$report_include_modules['Currencies'] = 'Currency';
 //add prospects
-$report_include_modules['Prospects']='Prospect';
+$report_include_modules['Prospects'] = 'Prospect';
 $report_include_modules['DocumentRevisions'] = 'DocumentRevision';
 $report_include_modules['ProductCategories'] = 'ProductCategory';
 $report_include_modules['ProductTypes'] = 'ProductType';
 //add Tracker modules
 
-$report_include_modules['Trackers']         = 'Tracker';
+$report_include_modules['Trackers'] = 'Tracker';
 
 
 
@@ -323,9 +323,9 @@ 
 //the bean class name == dictionary entry/object name convention
 //No future module should need an entry here.
 $objectList = array();
-$objectList['Cases'] =  'Case';
-$objectList['Groups'] =  'User';
-$objectList['Users'] =  'User';
+$objectList['Cases'] = 'Case';
+$objectList['Groups'] = 'User';
+$objectList['Users'] = 'User';
 
 
 // knowledge base

include/TemplateHandler/TemplateHandler.php

Spacing +99 added lines, -99 removed lines

@@ -53,8 +53,8 @@ 
       $this->cacheDir = sugar_cached('');
     }
 
-    function loadSmarty(){
-        if(empty($this->ss)){
+    function loadSmarty() {
+        if (empty($this->ss)) {
             $this->ss = new Sugar_Smarty();
         }
     }
@@ -67,7 +67,7 @@ 
      */
     static function clearAll() {
     	global $beanList;
-		foreach($beanList as $module_dir =>$object_name){
+		foreach ($beanList as $module_dir =>$object_name) {
                 TemplateHandler::clearCache($module_dir);
 		}
     }
@@ -80,14 +80,14 @@ 
      * @param String $module The module directory to clear
      * @param String $view Optional view value (DetailView, EditView, etc.)
      */
-    static function clearCache($module, $view=''){
-        $cacheDir = create_cache_directory('modules/'. $module . '/');
+    static function clearCache($module, $view = '') {
+        $cacheDir = create_cache_directory('modules/'.$module.'/');
         $d = dir($cacheDir);
-        while($e = $d->read()){
-            if(!empty($view) && $e != $view )continue;
-            $end =strlen($e) - 4;
-            if(is_file($cacheDir . $e) && $end > 1 && substr($e, $end) == '.tpl'){
-                unlink($cacheDir . $e);
+        while ($e = $d->read()) {
+            if (!empty($view) && $e != $view)continue;
+            $end = strlen($e) - 4;
+            if (is_file($cacheDir.$e) && $end > 1 && substr($e, $end) == '.tpl') {
+                unlink($cacheDir.$e);
             }
         }
     }
@@ -105,21 +105,21 @@ 
     function buildTemplate($module, $view, $tpl, $ajaxSave, $metaDataDefs) {
         $this->loadSmarty();
 
-        $cacheDir = create_cache_directory($this->templateDir. $module . '/');
-        $file = $cacheDir . $view . '.tpl';
-        $string = '{* Create Date: ' . date('Y-m-d H:i:s') . "*}\n";
+        $cacheDir = create_cache_directory($this->templateDir.$module.'/');
+        $file = $cacheDir.$view.'.tpl';
+        $string = '{* Create Date: '.date('Y-m-d H:i:s')."*}\n";
         $this->ss->left_delimiter = '{{';
         $this->ss->right_delimiter = '}}';
         $this->ss->assign('module', $module);
         $this->ss->assign('built_in_buttons', array('CANCEL', 'DELETE', 'DUPLICATE', 'EDIT', 'FIND_DUPLICATES', 'SAVE', 'CONNECTOR'));
         $contents = $this->ss->fetch($tpl);
         //Insert validation and quicksearch stuff here
-        if($view == 'EditView' || strpos($view,'QuickCreate') || $ajaxSave || $view == "ConvertLead") {
+        if ($view == 'EditView' || strpos($view, 'QuickCreate') || $ajaxSave || $view == "ConvertLead") {
 
             global $dictionary, $beanList, $app_strings, $mod_strings;
             $mod = $beanList[$module];
 
-            if($mod == 'aCase') {
+            if ($mod == 'aCase') {
                 $mod = 'Case';
             }
 
@@ -128,14 +128,14 @@ 
             //Retrieve all panel field definitions with displayParams Array field set
             $panelFields = array();
 
-            foreach($metaDataDefs['panels'] as $panel) {
-                    foreach($panel as $row) {
-                            foreach($row as $entry) {
-                                    if(empty($entry)) {
+            foreach ($metaDataDefs['panels'] as $panel) {
+                    foreach ($panel as $row) {
+                            foreach ($row as $entry) {
+                                    if (empty($entry)) {
                                        continue;
                                     }
 
-                                    if(is_array($entry) &&
+                                    if (is_array($entry) &&
                                        isset($entry['name']) &&
                                        isset($entry['displayParams']) &&
                                        isset($entry['displayParams']['required']) &&
@@ -143,7 +143,7 @@ 
                                        $panelFields[$entry['name']] = $entry;
                                     }
 
-                                    if(is_array($entry)) {
+                                    if (is_array($entry)) {
                                       $defs2[$entry['name']] = $entry;
                                     } else {
                                       $defs2[$entry] = array('name' => $entry);
@@ -152,18 +152,18 @@ 
                     } //foreach
             } //foreach
 
-            foreach($panelFields as $field=>$value) {
+            foreach ($panelFields as $field=>$value) {
                       $nameList = array();
-                      if(!is_array($value['displayParams']['required'])) {
+                      if (!is_array($value['displayParams']['required'])) {
                          $nameList[] = $field;
                       } else {
-                         foreach($value['displayParams']['required'] as $groupedField) {
+                         foreach ($value['displayParams']['required'] as $groupedField) {
                                  $nameList[] = $groupedField;
                          }
                       }
 
-                      foreach($nameList as $x) {
-                         if(isset($defs[$x]) &&
+                      foreach ($nameList as $x) {
+                         if (isset($defs[$x]) &&
                             isset($defs[$x]['type']) &&
                             !isset($defs[$x]['required'])) {
                             $defs[$x]['required'] = true;
@@ -182,7 +182,7 @@ 
 
             $javascript->setSugarBean($sugarbean);
             if ($view != "ConvertLead")
-                $javascript->addAllFields('', null,true);
+                $javascript->addAllFields('', null, true);
 
             $validatedFields = array();
             $javascript->addToValidateBinaryDependency('assigned_user_name', 'alpha', $javascript->buildStringToTranslateInSmarty('ERR_SQS_NO_MATCH_FIELD').': '.$javascript->buildStringToTranslateInSmarty('LBL_ASSIGNED_TO'), 'false', '', 'assigned_user_id');
@@ -193,20 +193,20 @@ 
             //3) not have validateDepedency set to false in metadata
             //4) have id_name in vardef entry
             //5) not already been added to Array
-            foreach($sugarbean->field_name_map as $name=>$def) {
+            foreach ($sugarbean->field_name_map as $name=>$def) {
 
-               if($def['type']=='relate' &&
+               if ($def['type'] == 'relate' &&
                   isset($defs2[$name]) &&
                   (!isset($defs2[$name]['validateDependency']) || $defs2[$name]['validateDependency'] === true) &&
                   isset($def['id_name']) &&
                   !in_array($name, $validatedFields)) {
 
-                  if(isset($mod_strings[$def['vname']])
+                  if (isset($mod_strings[$def['vname']])
                         || isset($app_strings[$def['vname']])
-                        || translate($def['vname'],$sugarbean->module_dir) != $def['vname']) {
+                        || translate($def['vname'], $sugarbean->module_dir) != $def['vname']) {
                      $vname = $def['vname'];
                   }
-                  else{
+                  else {
                      $vname = "undefined";
                   }
                   $javascript->addToValidateBinaryDependency($name, 'alpha', $javascript->buildStringToTranslateInSmarty('ERR_SQS_NO_MATCH_FIELD').': '.$javascript->buildStringToTranslateInSmarty($vname), (!empty($def['required']) ? 'true' : 'false'), '', $def['id_name']);
@@ -218,11 +218,11 @@ 
             $contents .= $javascript->getScript();
             $contents .= $this->createQuickSearchCode($defs, $defs2, $view, $module);
             $contents .= "{/literal}\n";
-        }else if(preg_match('/^SearchForm_.+/', $view)){
+        } else if (preg_match('/^SearchForm_.+/', $view)) {
             global $dictionary, $beanList, $app_strings, $mod_strings;
             $mod = $beanList[$module];
 
-            if($mod == 'aCase') {
+            if ($mod == 'aCase') {
                 $mod = 'Case';
             }
 
@@ -235,7 +235,7 @@ 
         //Remove all the copyright comments
         $contents = preg_replace('/\{\*[^\}]*?\*\}/', '', $contents);
 
-        if($fh = @sugar_fopen($file, 'w')) {
+        if ($fh = @sugar_fopen($file, 'w')) {
             fputs($fh, $contents);
             fclose($fh);
         }
@@ -251,12 +251,12 @@ 
      * @param module string module name
      * @param view string view need (eg DetailView, EditView, etc)
      */
-    function checkTemplate($module, $view, $checkFormName = false, $formName='') {
-        if(inDeveloperMode() || !empty($_SESSION['developerMode'])){
+    function checkTemplate($module, $view, $checkFormName = false, $formName = '') {
+        if (inDeveloperMode() || !empty($_SESSION['developerMode'])) {
             return false;
         }
         $view = $checkFormName ? $formName : $view;
-        return file_exists($this->cacheDir . $this->templateDir . $module . '/' .$view . '.tpl');
+        return file_exists($this->cacheDir.$this->templateDir.$module.'/'.$view.'.tpl');
     }
 
     /**
@@ -270,16 +270,16 @@ 
      */
     function displayTemplate($module, $view, $tpl, $ajaxSave = false, $metaDataDefs = null) {
         $this->loadSmarty();
-        if(!$this->checkTemplate($module, $view)) {
+        if (!$this->checkTemplate($module, $view)) {
             $this->buildTemplate($module, $view, $tpl, $ajaxSave, $metaDataDefs);
         }
-        $file = $this->cacheDir . $this->templateDir . $module . '/' . $view . '.tpl';
-        if(file_exists($file)) {
+        $file = $this->cacheDir.$this->templateDir.$module.'/'.$view.'.tpl';
+        if (file_exists($file)) {
            return $this->ss->fetch($file);
         } else {
            global $app_strings;
-           $GLOBALS['log']->fatal($app_strings['ERR_NO_SUCH_FILE'] .": $file");
-           return $app_strings['ERR_NO_SUCH_FILE'] .": $file";
+           $GLOBALS['log']->fatal($app_strings['ERR_NO_SUCH_FILE'].": $file");
+           return $app_strings['ERR_NO_SUCH_FILE'].": $file";
         }
     }
 
@@ -290,16 +290,16 @@ 
      * @param view string view need (eg DetailView, EditView, etc)
      */
     function deleteTemplate($module, $view) {
-        if(is_file($this->cacheDir . $this->templateDir . $module . '/' .$view . '.tpl')) {
+        if (is_file($this->cacheDir.$this->templateDir.$module.'/'.$view.'.tpl')) {
             // Bug #54634 : RTC 18144 : Cannot add more than 1 user to role but popup is multi-selectable
-            if ( !isset($this->ss) )
+            if (!isset($this->ss))
             {
                 $this->loadSmarty();
             }
-            $cache_file_name = $this->ss->_get_compile_path($this->cacheDir . $this->templateDir . $module . '/' .$view . '.tpl');
+            $cache_file_name = $this->ss->_get_compile_path($this->cacheDir.$this->templateDir.$module.'/'.$view.'.tpl');
             SugarCache::cleanFile($cache_file_name);
 
-            return unlink($this->cacheDir . $this->templateDir . $module . '/' .$view . '.tpl');
+            return unlink($this->cacheDir.$this->templateDir.$module.'/'.$view.'.tpl');
         }
         return false;
     }
@@ -316,47 +316,47 @@ 
      * @param strign $module
      * @return string
      */
-    public function createQuickSearchCode($defs, $defs2, $view = '', $module='')
+    public function createQuickSearchCode($defs, $defs2, $view = '', $module = '')
     {
         $sqs_objects = array();
         require_once('include/QuickSearchDefaults.php');
-        if(isset($this) && $this instanceof TemplateHandler) //If someone calls createQuickSearchCode as a static method (@see ImportViewStep3) $this becomes anoter object, not TemplateHandler
+        if (isset($this) && $this instanceof TemplateHandler) //If someone calls createQuickSearchCode as a static method (@see ImportViewStep3) $this becomes anoter object, not TemplateHandler
         {
             $qsd = QuickSearchDefaults::getQuickSearchDefaults($this->getQSDLookup());
-        }else
+        } else
         {
             $qsd = QuickSearchDefaults::getQuickSearchDefaults(array());
         }
         $qsd->setFormName($view);
-        if(preg_match('/^SearchForm_.+/', $view)){
-        	if(strpos($view, 'popup_query_form')){
+        if (preg_match('/^SearchForm_.+/', $view)) {
+        	if (strpos($view, 'popup_query_form')) {
         		$qsd->setFormName('popup_query_form');
             	$parsedView = 'advanced';
-        	}else{
+        	} else {
         		$qsd->setFormName('search_form');
             	$parsedView = preg_replace("/^SearchForm_/", "", $view);
         	}
             //Loop through the Meta-Data fields to see which ones need quick search support
-            foreach($defs as $f) {
+            foreach ($defs as $f) {
                 $field = $f;
-                $name = $qsd->form_name . '_' . $field['name'];
+                $name = $qsd->form_name.'_'.$field['name'];
 
-                if($field['type'] == 'relate' && isset($field['module']) && preg_match('/_name$|_c$/si',$name)  || !empty($field['quicksearch']) ) {
-                    if(preg_match('/^(Campaigns|Teams|Users|Contacts|Accounts)$/si', $field['module'], $matches)) {
+                if ($field['type'] == 'relate' && isset($field['module']) && preg_match('/_name$|_c$/si', $name) || !empty($field['quicksearch'])) {
+                    if (preg_match('/^(Campaigns|Teams|Users|Contacts|Accounts)$/si', $field['module'], $matches)) {
 
-                        if($matches[0] == 'Campaigns') {
+                        if ($matches[0] == 'Campaigns') {
                             $sqs_objects[$name.'_'.$parsedView] = $qsd->loadQSObject('Campaigns', 'Campaign', $field['name'], $field['id_name'], $field['id_name']);
-                        } else if($matches[0] == 'Users'){
+                        } else if ($matches[0] == 'Users') {
 
-                            if(!empty($f['name']) && !empty($f['id_name'])) {
-                                $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSUser($f['name'],$f['id_name']);
+                            if (!empty($f['name']) && !empty($f['id_name'])) {
+                                $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSUser($f['name'], $f['id_name']);
                             }
                             else {
                                 $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSUser();
                             }
-                        } else if($matches[0] == 'Campaigns') {
+                        } else if ($matches[0] == 'Campaigns') {
                             $sqs_objects[$name.'_'.$parsedView] = $qsd->loadQSObject('Campaigns', 'Campaign', $field['name'], $field['id_name'], $field['id_name']);
-                        } else if($matches[0] == 'Accounts') {
+                        } else if ($matches[0] == 'Accounts') {
                             $nameKey = $name;
                             $idKey = isset($field['id_name']) ? $field['id_name'] : 'account_id';
 
@@ -369,12 +369,12 @@ 
                             $shippingKey = isset($f['displayParams']['shippingKey']) ? $f['displayParams']['shippingKey'] : null;
                             $additionalFields = isset($f['displayParams']['additionalFields']) ? $f['displayParams']['additionalFields'] : null;
                             $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSAccount($nameKey, $idKey, $billingKey, $shippingKey, $additionalFields);
-                        } else if($matches[0] == 'Contacts'){
+                        } else if ($matches[0] == 'Contacts') {
                             $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSContact($field['name'], $field['id_name']);
                         }
                     } else {
                          $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSParent($field['module']);
-                         if(!isset($field['field_list']) && !isset($field['populate_list'])) {
+                         if (!isset($field['field_list']) && !isset($field['populate_list'])) {
                              $sqs_objects[$name.'_'.$parsedView]['populate_list'] = array($field['name'], $field['id_name']);
                              $sqs_objects[$name.'_'.$parsedView]['field_list'] = array('name', 'id');
                          } else {
@@ -382,63 +382,63 @@ 
                              $sqs_objects[$name.'_'.$parsedView]['field_list'] = $field['populate_list'];
                          }
                     }
-                } else if($field['type'] == 'parent') {
+                } else if ($field['type'] == 'parent') {
                     $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSParent();
                 } //if-else
             } //foreach
 
-            foreach ( $sqs_objects as $name => $field )
-               foreach ( $field['populate_list'] as $key => $fieldname )
-                    $sqs_objects[$name]['populate_list'][$key] = $sqs_objects[$name]['populate_list'][$key] . '_'.$parsedView;
-        }else{
+            foreach ($sqs_objects as $name => $field)
+               foreach ($field['populate_list'] as $key => $fieldname)
+                    $sqs_objects[$name]['populate_list'][$key] = $sqs_objects[$name]['populate_list'][$key].'_'.$parsedView;
+        } else {
             //Loop through the Meta-Data fields to see which ones need quick search support
-            foreach($defs2 as $f) {
-                if(!isset($defs[$f['name']])) continue;
+            foreach ($defs2 as $f) {
+                if (!isset($defs[$f['name']])) continue;
 
                 $field = $defs[$f['name']];
                 if ($view == "ConvertLead")
                 {
-                    $field['name'] = $module . $field['name'];
+                    $field['name'] = $module.$field['name'];
                     if (isset($field['module']) && isset($field['id_name']) && substr($field['id_name'], -4) == "_ida") {
                         $lc_module = strtolower($field['module']);
                         $ida_suffix = "_".$lc_module.$lc_module."_ida";
                         if (preg_match('/'.$ida_suffix.'$/', $field['id_name']) > 0) {
-                            $field['id_name'] = $module . $field['id_name'];
+                            $field['id_name'] = $module.$field['id_name'];
                         }
                         else
-                            $field['id_name'] = $field['name'] . "_" . $field['id_name'];
+                            $field['id_name'] = $field['name']."_".$field['id_name'];
                     }
                     else {
                         if (!empty($field['id_name']))
                             $field['id_name'] = $module.$field['id_name'];
                     }
                 }
-				$name = $qsd->form_name . '_' . $field['name'];
+				$name = $qsd->form_name.'_'.$field['name'];
 
 
-                if($field['type'] == 'relate' && isset($field['module']) && (preg_match('/_name$|_c$/si',$name) || !empty($field['quicksearch']))) {
-                    if (!preg_match('/_c$/si',$name)
-                        && (!isset($field['id_name']) || !preg_match('/_c$/si',$field['id_name']))
+                if ($field['type'] == 'relate' && isset($field['module']) && (preg_match('/_name$|_c$/si', $name) || !empty($field['quicksearch']))) {
+                    if (!preg_match('/_c$/si', $name)
+                        && (!isset($field['id_name']) || !preg_match('/_c$/si', $field['id_name']))
                         && preg_match('/^(Campaigns|Teams|Users|Contacts|Accounts)$/si', $field['module'], $matches)
                     ) {
 
-                        if($matches[0] == 'Campaigns') {
+                        if ($matches[0] == 'Campaigns') {
                             $sqs_objects[$name] = $qsd->loadQSObject('Campaigns', 'Campaign', $field['name'], $field['id_name'], $field['id_name']);
-                        } else if($matches[0] == 'Users'){
-                            if($field['name'] == 'reports_to_name'){
-                                $sqs_objects[$name] = $qsd->getQSUser('reports_to_name','reports_to_id');
+                        } else if ($matches[0] == 'Users') {
+                            if ($field['name'] == 'reports_to_name') {
+                                $sqs_objects[$name] = $qsd->getQSUser('reports_to_name', 'reports_to_id');
                              // Bug #52994 : QuickSearch for a 1-M User relationship changes assigned to user
-                            }elseif($field['name'] == 'assigned_user_name'){
-                                 $sqs_objects[$name] = $qsd->getQSUser('assigned_user_name','assigned_user_id');
+                            }elseif ($field['name'] == 'assigned_user_name') {
+                                 $sqs_objects[$name] = $qsd->getQSUser('assigned_user_name', 'assigned_user_id');
                              }
                              else
                              {
                                  $sqs_objects[$name] = $qsd->getQSUser($field['name'], $field['id_name']);
 
 							}
-                        } else if($matches[0] == 'Campaigns') {
+                        } else if ($matches[0] == 'Campaigns') {
                             $sqs_objects[$name] = $qsd->loadQSObject('Campaigns', 'Campaign', $field['name'], $field['id_name'], $field['id_name']);
-                        } else if($matches[0] == 'Accounts') {
+                        } else if ($matches[0] == 'Accounts') {
                             $nameKey = $name;
                             $idKey = isset($field['id_name']) ? $field['id_name'] : 'account_id';
 
@@ -451,15 +451,15 @@ 
                             $shippingKey = SugarArray::staticGet($f, 'displayParams.shippingKey');
                             $additionalFields = SugarArray::staticGet($f, 'displayParams.additionalFields');
                             $sqs_objects[$name] = $qsd->getQSAccount($nameKey, $idKey, $billingKey, $shippingKey, $additionalFields);
-                        } else if($matches[0] == 'Contacts'){
+                        } else if ($matches[0] == 'Contacts') {
                             $sqs_objects[$name] = $qsd->getQSContact($field['name'], $field['id_name']);
-                            if(preg_match('/_c$/si',$name) || !empty($field['quicksearch'])){
+                            if (preg_match('/_c$/si', $name) || !empty($field['quicksearch'])) {
                                 $sqs_objects[$name]['field_list'] = array('salutation', 'first_name', 'last_name', 'id');
                             }
                         }
                     } else {
                         $sqs_objects[$name] = $qsd->getQSParent($field['module']);
-                        if(!isset($field['field_list']) && !isset($field['populate_list'])) {
+                        if (!isset($field['field_list']) && !isset($field['populate_list'])) {
                             $sqs_objects[$name]['populate_list'] = array($field['name'], $field['id_name']);
                             // now handle quicksearches where the column to match is not 'name' but rather specified in 'rname'
                             if (!isset($field['rname']))
@@ -468,14 +468,14 @@ 
                             {
                                 $sqs_objects[$name]['field_list'] = array($field['rname'], 'id');
                                 $sqs_objects[$name]['order'] = $field['rname'];
-                                $sqs_objects[$name]['conditions'] = array(array('name'=>$field['rname'],'op'=>'like_custom','end'=>'%','value'=>''));
+                                $sqs_objects[$name]['conditions'] = array(array('name'=>$field['rname'], 'op'=>'like_custom', 'end'=>'%', 'value'=>''));
                             }
                         } else {
                             $sqs_objects[$name]['populate_list'] = $field['field_list'];
                             $sqs_objects[$name]['field_list'] = $field['populate_list'];
                         }
                     }
-                } else if($field['type'] == 'parent') {
+                } else if ($field['type'] == 'parent') {
                     $sqs_objects[$name] = $qsd->getQSParent();
                 } //if-else
 
@@ -485,13 +485,13 @@ 
 
                 //merge populate_list && field_list with vardef
                 if (!empty($field['field_list']) && !empty($field['populate_list'])) {
-                    for ($j=0; $j<count($field['field_list']); $j++) {
+                    for ($j = 0; $j < count($field['field_list']); $j++) {
                 		//search for the same couple (field_list_item,populate_field_item)
                			$field_list_item = $field['field_list'][$j];
-               			$field_list_item_alternate = $qsd->form_name . '_' . $field['field_list'][$j];
+               			$field_list_item_alternate = $qsd->form_name.'_'.$field['field_list'][$j];
                			$populate_list_item = $field['populate_list'][$j];
                 		$found = false;
-                		for ($k=0; $k<count($sqs_objects[$name]['field_list']); $k++) {
+                		for ($k = 0; $k < count($sqs_objects[$name]['field_list']); $k++) {
                 			if (($field_list_item == $sqs_objects[$name]['populate_list'][$k] || $field_list_item_alternate == $sqs_objects[$name]['populate_list'][$k]) && //il faut inverser field_list et populate_list (cf lignes 465,466 ci-dessus)
                 				$populate_list_item == $sqs_objects[$name]['field_list'][$k]) {
                 				$found = true;
@@ -509,14 +509,14 @@ 
         }
 
        //Implement QuickSearch for the field
-       if(!empty($sqs_objects) && count($sqs_objects) > 0) {
+       if (!empty($sqs_objects) && count($sqs_objects) > 0) {
            $quicksearch_js = '<script language="javascript">';
-           $quicksearch_js.= 'if(typeof sqs_objects == \'undefined\'){var sqs_objects = new Array;}';
+           $quicksearch_js .= 'if(typeof sqs_objects == \'undefined\'){var sqs_objects = new Array;}';
            $json = getJSONobj();
-           foreach($sqs_objects as $sqsfield=>$sqsfieldArray){
+           foreach ($sqs_objects as $sqsfield=>$sqsfieldArray) {
                $quicksearch_js .= "sqs_objects['$sqsfield']={$json->encode($sqsfieldArray)};";
            }
-           return $quicksearch_js . '</script>';
+           return $quicksearch_js.'</script>';
        }
        return '';
     }

include/connectors/ConnectorFactory.php

Spacing +11 added lines, -11 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.
@@ -42,12 +42,12 @@ 
  * Connector factory
  * @api
  */
-class ConnectorFactory{
+class ConnectorFactory {
 
 	static $source_map = array();
 
-	public static function getInstance($source_name){
-		if(empty(self::$source_map[$source_name])) {
+	public static function getInstance($source_name) {
+		if (empty(self::$source_map[$source_name])) {
 			require_once('include/connectors/sources/SourceFactory.php');
 			require_once('include/connectors/component.php');
 			$source = SourceFactory::getSource($source_name);
@@ -64,7 +64,7 @@ 
 	 * which represents the inheritance structure to load up all required parents.
 	 * @param string $class the root class we want to load.
 	 */
-	public static function load($class, $type){
+	public static function load($class, $type) {
 		self::loadClass($class, $type);
 	}
 
@@ -72,15 +72,15 @@ 
 	 * include a source class file.
 	 * @param string $class a class file to include.
 	 */
-	public static function loadClass($class, $type){
-		$dir = str_replace('_','/',$class);
+	public static function loadClass($class, $type) {
+		$dir = str_replace('_', '/', $class);
 		$parts = explode("/", $dir);
-		$file = $parts[count($parts)-1] . '.php';
-		if(file_exists("custom/modules/Connectors/connectors/{$type}/{$dir}/$file")){
+		$file = $parts[count($parts) - 1].'.php';
+		if (file_exists("custom/modules/Connectors/connectors/{$type}/{$dir}/$file")) {
 			require_once("custom/modules/Connectors/connectors/{$type}/{$dir}/$file");
-		} else if(file_exists("modules/Connectors/connectors/{$type}/{$dir}/$file")) {
+		} else if (file_exists("modules/Connectors/connectors/{$type}/{$dir}/$file")) {
 			require_once("modules/Connectors/connectors/{$type}/{$dir}/$file");
-		} else if(file_exists("connectors/{$type}/{$dir}/$file")) {
+		} else if (file_exists("connectors/{$type}/{$dir}/$file")) {
 			require_once("connectors/{$type}/{$dir}/$file");
 		}
 	}