adamjakab / SuiteCRM

include/database/MysqlManager.php

Braces +181 added lines, -127 removed lines

@@ -189,8 +189,9 @@ 
 		$GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
 
 
-		if($keepResult)
-			$this->lastResult = $result;
+		if($keepResult) {
+					$this->lastResult = $result;
+		}
 
 		$this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
 		return $result;
@@ -240,8 +241,9 @@ 
 	 */
 	protected function freeDbResult($dbResult)
 	{
-		if(!empty($dbResult))
-			mysql_free_result($dbResult);
+		if(!empty($dbResult)) {
+					mysql_free_result($dbResult);
+		}
 	}
 
 
@@ -264,8 +266,9 @@ 
 	{
         $start = (int)$start;
         $count = (int)$count;
-	    if ($start < 0)
-			$start = 0;
+	    if ($start < 0) {
+	    			$start = 0;
+	    }
 		$GLOBALS['log']->debug('Limit Query:' . $sql. ' Start: ' .$start . ' count: ' . $count);
 
 	    $sql = "$sql LIMIT $start,$count";
@@ -290,21 +293,27 @@ 
 		$result   = $this->query('EXPLAIN ' . $sql);
 		$badQuery = array();
 		while ($row = $this->fetchByAssoc($result)) {
-			if (empty($row['table']))
-				continue;
+			if (empty($row['table'])) {
+							continue;
+			}
 			$badQuery[$row['table']] = '';
-			if (strtoupper($row['type']) == 'ALL')
-				$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)
-				$badQuery[$row['table']] .= ' Using FileSort;';
-			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using temporary') > 0)
-				$badQuery[$row['table']] .= ' Using Temporary Table;';
+			if (strtoupper($row['type']) == 'ALL') {
+							$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) {
+							$badQuery[$row['table']] .= ' Using FileSort;';
+			}
+			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using temporary') > 0) {
+							$badQuery[$row['table']] .= ' Using Temporary Table;';
+			}
 		}
 
-		if ( empty($badQuery) )
-			return true;
+		if ( empty($badQuery) ) {
+					return true;
+		}
 
 		foreach($badQuery as $table=>$data ){
 			if(!empty($data)){
@@ -312,8 +321,7 @@ 
 				if(!empty($GLOBALS['sugar_config']['check_query_log'])){
 					$GLOBALS['log']->fatal($sql);
 					$GLOBALS['log']->fatal('CHECK QUERY:' .$warning);
-				}
-				else{
+				} else{
 					$GLOBALS['log']->warn('CHECK QUERY:' .$warning);
 				}
 			}
@@ -337,14 +345,18 @@ 
 			$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]['auto_increment'] = '1';
-			if ($row['Null'] == 'NO' && !stristr($row['Key'],'PRI'))
-				$columns[$name]['required'] = 'true';
-			if (!empty($row['Default']) )
-				$columns[$name]['default'] = $row['Default'];
+			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')) {
+							$columns[$name]['required'] = 'true';
+			}
+			if (!empty($row['Default']) ) {
+							$columns[$name]['default'] = $row['Default'];
+			}
 		}
 		return $columns;
 	}
@@ -356,17 +368,20 @@ 
 	{
 		$field_array = array();
 
-		if(empty($result))
-			return 0;
+		if(empty($result)) {
+					return 0;
+		}
 
 		$fields = mysql_num_fields($result);
 		for ($i=0; $i < $fields; $i++) {
 			$meta = mysql_fetch_field($result, $i);
-			if (!$meta)
-				return array();
+			if (!$meta) {
+							return array();
+			}
 
-			if($make_lower_case == true)
-				$meta->name = strtolower($meta->name);
+			if($make_lower_case == true) {
+							$meta->name = strtolower($meta->name);
+			}
 
 			$field_array[] = $meta->name;
 		}
@@ -379,7 +394,9 @@ 
 	 */
 	public function fetchRow($result)
 	{
-		if (empty($result))	return false;
+		if (empty($result)) {
+		    return false;
+		}
 
 		return mysql_fetch_assoc($result);
 	}
@@ -423,7 +440,9 @@ 
 
 		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);
 		}
@@ -478,8 +497,9 @@ 
 	{
 		global $sugar_config;
 
-		if(is_null($configOptions))
-			$configOptions = $sugar_config['dbconfig'];
+		if(is_null($configOptions)) {
+					$configOptions = $sugar_config['dbconfig'];
+		}
 
 		if ($this->getOption('persistent')) {
 			$this->database = @mysql_pconnect(
@@ -532,8 +552,9 @@ 
 		}
 	    mysql_query($names, $this->database);
 
-		if(!$this->checkError('Could Not Connect:', $dieOnError))
-			$GLOBALS['log']->info("connected to db");
+		if(!$this->checkError('Could Not Connect:', $dieOnError)) {
+					$GLOBALS['log']->info("connected to db");
+		}
 		$this->connectOptions = $configOptions;
 
 		$GLOBALS['log']->info("Connect:".$this->database);
@@ -550,8 +571,9 @@ 
 	{
 		$sql = parent::repairTableParams($tablename,$fielddefs,$indices,false,$engine);
 
-		if ( $sql == '' )
-			return '';
+		if ( $sql == '' ) {
+					return '';
+		}
 
 		if ( stristr($sql,'create table') )
 		{
@@ -578,8 +600,9 @@ 
 		$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";
@@ -676,15 +699,18 @@ 
 	 */
 	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 )
+		while ( $row = $this->fetchByAssoc($r) ) {
+					if ( strtoupper($row['Engine']) == $engine )
 				return ($row['Support']=='YES' || $row['Support']=='DEFAULT');
+		}
 
 		return false;
 	}
@@ -712,18 +738,22 @@ 
 	*/
 	public function createTableSQLParams($tablename, $fieldDefs, $indices, $engine = null)
 	{
-		if ( empty($engine) && isset($fieldDefs['engine']))
-			$engine = $fieldDefs['engine'];
-		if ( !$this->isEngineEnabled($engine) )
-			$engine = '';
+		if ( empty($engine) && isset($fieldDefs['engine'])) {
+					$engine = $fieldDefs['engine'];
+		}
+		if ( !$this->isEngineEnabled($engine) ) {
+					$engine = '';
+		}
 
 		$columns = $this->columnSQLRep($fieldDefs, false, $tablename);
-		if (empty($columns))
-			return false;
+		if (empty($columns)) {
+					return false;
+		}
 
 		$keys = $this->keysSQL($indices);
-		if (!empty($keys))
-			$keys = ",$keys";
+		if (!empty($keys)) {
+					$keys = ",$keys";
+		}
 
 		// cn: bug 9873 - module tables do not get created in utf8 with assoc collation
 		$collation = $this->getOption('collation');
@@ -732,8 +762,9 @@ 
 		}
 		$sql = "CREATE TABLE $tablename ($columns $keys) CHARACTER SET utf8 COLLATE $collation";
 
-		if (!empty($engine))
-			$sql.= " ENGINE=$engine";
+		if (!empty($engine)) {
+					$sql.= " ENGINE=$engine";
+		}
 
 		return $sql;
 	}
@@ -762,13 +793,15 @@ 
 
 		// bug 22338 - don't set a default value on text or blob fields
 		if ( isset($ref['default']) &&
-            in_array($ref['colBaseType'], array('text', 'blob', 'longtext', 'longblob')))
-			    $ref['default'] = '';
+            in_array($ref['colBaseType'], array('text', 'blob', 'longtext', 'longblob'))) {
+					    $ref['default'] = '';
+		}
 
-		if ( $return_as_array )
-			return $ref;
-		else
-			return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
+		if ( $return_as_array ) {
+					return $ref;
+		} else {
+					return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
+		}
 	}
 
 	/**
@@ -779,16 +812,18 @@ 
 		$columns = array();
 		if ($this->isFieldArray($fieldDefs)){
 			foreach ($fieldDefs as $def){
-				if ($action == 'drop')
-					$columns[] = $def['name'];
-				else
-					$columns[] = $this->oneColumnSQLRep($def, $ignoreRequired);
+				if ($action == 'drop') {
+									$columns[] = $def['name'];
+				} else {
+									$columns[] = $this->oneColumnSQLRep($def, $ignoreRequired);
+				}
 			}
 		} else {
-			if ($action == 'drop')
-				$columns[] = $fieldDefs['name'];
-		else
-			$columns[] = $this->oneColumnSQLRep($fieldDefs);
+			if ($action == 'drop') {
+							$columns[] = $fieldDefs['name'];
+			} else {
+					$columns[] = $this->oneColumnSQLRep($fieldDefs);
+		}
 		}
 
 		return "ALTER TABLE $tablename $action COLUMN ".implode(",$action column ", $columns);
@@ -810,23 +845,27 @@ 
 	{
 	// check if the passed value is an array of fields.
 	// if not, convert it into an array
-	if (!$this->isFieldArray($indices))
-		$indices[] = $indices;
+	if (!$this->isFieldArray($indices)) {
+			$indices[] = $indices;
+	}
 
 	$columns = array();
 	foreach ($indices as $index) {
-		if(!empty($index['db']) && $index['db'] != $this->dbType)
-			continue;
-		if (isset($index['source']) && $index['source'] != 'db')
-			continue;
+		if(!empty($index['db']) && $index['db'] != $this->dbType) {
+					continue;
+		}
+		if (isset($index['source']) && $index['source'] != 'db') {
+					continue;
+		}
 
 		$type = $index['type'];
 		$name = $index['name'];
 
-		if (is_array($index['fields']))
-			$fields = implode(", ", $index['fields']);
-		else
-			$fields = $index['fields'];
+		if (is_array($index['fields'])) {
+					$fields = implode(", ", $index['fields']);
+		} else {
+					$fields = $index['fields'];
+		}
 
 		switch ($type) {
 		case 'unique':
@@ -845,16 +884,18 @@ 
 				* that this can easily be fixed by referring to db dictionary
 				* to find the correct primary field name
 				*/
-			if ( $alter_table )
-				$columns[] = " INDEX $name ($fields)";
-			else
-				$columns[] = " KEY $name ($fields)";
+			if ( $alter_table ) {
+							$columns[] = " INDEX $name ($fields)";
+			} else {
+							$columns[] = " KEY $name ($fields)";
+			}
 			break;
 		case 'fulltext':
-			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);
+			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);
+			}
 			break;
 		}
 	}
@@ -896,8 +937,9 @@ 
 	{
 		$result = $this->query("SHOW TABLE STATUS LIKE '$table'");
 		$row = $this->fetchByAssoc($result);
-		if (!empty($row['Auto_increment']))
-			return $row['Auto_increment'];
+		if (!empty($row['Auto_increment'])) {
+					return $row['Auto_increment'];
+		}
 
 		return "";
 	}
@@ -915,8 +957,7 @@ 
 			$index_type='index';
 			if ($row['Key_name'] =='PRIMARY') {
 				$index_type='primary';
-			}
-			elseif ( $row['Non_unique'] == '0' ) {
+			} elseif ( $row['Non_unique'] == '0' ) {
 				$index_type='unique';
 			}
 			$name = strtolower($row['Key_name']);
@@ -942,29 +983,33 @@ 
 		case 'index':
 		case 'alternate_key':
 		case 'clustered':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP INDEX {$name} ";
-			else
-				$sql = "ALTER TABLE {$table} ADD INDEX {$name} ({$fields})";
+			if ($drop) {
+							$sql = "ALTER TABLE {$table} DROP INDEX {$name} ";
+			} else {
+							$sql = "ALTER TABLE {$table} ADD INDEX {$name} ({$fields})";
+			}
 			break;
 		// constraints as indices
 		case 'unique':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP INDEX $name";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT UNIQUE {$name} ({$fields})";
+			if ($drop) {
+							$sql = "ALTER TABLE {$table} DROP INDEX $name";
+			} else {
+							$sql = "ALTER TABLE {$table} ADD CONSTRAINT UNIQUE {$name} ({$fields})";
+			}
 			break;
 		case 'primary':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP PRIMARY KEY";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT PRIMARY KEY ({$fields})";
+			if ($drop) {
+							$sql = "ALTER TABLE {$table} DROP PRIMARY KEY";
+			} else {
+							$sql = "ALTER TABLE {$table} ADD CONSTRAINT PRIMARY KEY ({$fields})";
+			}
 			break;
 		case 'foreign':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT FOREIGN KEY {$name} ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignField']})";
+			if ($drop) {
+							$sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
+			} else {
+							$sql = "ALTER TABLE {$table} ADD CONSTRAINT FOREIGN KEY {$name} ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignField']})";
+			}
 			break;
 		}
 		return $sql;
@@ -1007,22 +1052,30 @@ 
 			($fieldDef['dbType'] == 'text'
 				|| $fieldDef['dbType'] == 'blob'
 				|| $fieldDef['dbType'] == 'longtext'
-				|| $fieldDef['dbType'] == 'longblob' ))
-			unset($fieldDef['default']);
-		if ($fieldDef['dbType'] == 'uint')
-			$fieldDef['len'] = '10';
-		if ($fieldDef['dbType'] == 'ulong')
-			$fieldDef['len'] = '20';
-		if ($fieldDef['dbType'] == 'bool')
-			$fieldDef['type'] = 'tinyint';
-		if ($fieldDef['dbType'] == 'bool' && empty($fieldDef['default']) )
-			$fieldDef['default'] = '0';
-		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']) )
-			$fieldDef['len'] = '11';
+				|| $fieldDef['dbType'] == 'longblob' )) {
+					unset($fieldDef['default']);
+		}
+		if ($fieldDef['dbType'] == 'uint') {
+					$fieldDef['len'] = '10';
+		}
+		if ($fieldDef['dbType'] == 'ulong') {
+					$fieldDef['len'] = '20';
+		}
+		if ($fieldDef['dbType'] == 'bool') {
+					$fieldDef['type'] = 'tinyint';
+		}
+		if ($fieldDef['dbType'] == 'bool' && empty($fieldDef['default']) ) {
+					$fieldDef['default'] = '0';
+		}
+		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']) ) {
+					$fieldDef['len'] = '11';
+		}
 
 		if($fieldDef['dbType'] == 'decimal') {
 			if(isset($fieldDef['len'])) {
@@ -1062,8 +1115,9 @@ 
 		}
 		if (!empty($sql)) {
             $sql = "ALTER TABLE $tablename " . join(",", $sql) . ";";
-			if($execute)
-				$this->query($sql);
+			if($execute) {
+							$this->query($sql);
+			}
 		} else {
 			$sql = '';
 		}

include/generic/DeleteRelationship.php

Braces +1 added lines, -2 removed lines

@@ -88,8 +88,7 @@
 if ($bean_name === 'Team'){
  	$focus->retrieve($record);
  	$focus->remove_user_from_team($linked_id);
- }
- else{
+ } else{
 
  	// cut it off:
  	$focus->load_relationship($linked_field);

include/generic/SugarWidgets/SugarWidgetSubPanelRemoveButton.php

Braces +2 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
 			if ($layout_def['fields']['ID']===$layout_def['fields']['LATEST_REVISION_ID']) {
 				$hideremove=true;
 			}
-		}elseif ($_REQUEST['module'] === 'Teams' && $current_module === 'Users') {
+		} elseif ($_REQUEST['module'] === 'Teams' && $current_module === 'Users') {
 		// Implicit Team-memberships are not "removeable"
 
 			if($layout_def['fields']['UPLINE'] !== translate('LBL_TEAM_UPLINE_EXPLICIT', 'Users')) {
@@ -86,7 +86,7 @@ 
 			    $hideremove = true;
 			}} elseif ($current_module === 'ACLRoles' && (!ACLController::checkAccess($current_module, 'edit', true))) {
             $hideremove = true;
-		}elseif ($current_module === 'ACLRoles' && (!ACLController::checkAccess($current_module, 'edit', true))) {
+		} elseif ($current_module === 'ACLRoles' && (!ACLController::checkAccess($current_module, 'edit', true))) {
             $hideremove = true;
 		}
 		

modules/AOW_WorkFlow/aow_utils.php

Braces +66 added lines, -42 removed lines

@@ -179,7 +179,7 @@ 
                 if(isset($arr['vname']) && $arr['vname'] != '') {
                     $label = $rel_module_label . ' : ' . translate($arr['vname'], $mod->module_dir);
                     $module_label = trim(translate($arr['vname'],$mod->module_dir),':');
-                }else {
+                } else {
                     $label = $rel_module_label . ' : '. $name;
                     $module_label = $name;
                 }
@@ -230,7 +230,9 @@ 
                         $sort_fields[$name] = $relModuleName.' : '. $name;
                     }
                     if($arr['type'] == 'relate' && isset($arr['id_name']) && $arr['id_name'] != ''){
-                        if(isset($fields[$arr['id_name']])) unset( $fields[$arr['id_name']]);
+                        if(isset($fields[$arr['id_name']])) {
+                            unset( $fields[$arr['id_name']]);
+                        }
                     }
                 }
             } //End loop.
@@ -324,7 +326,9 @@ 
             $vardef['type'] = 'varchar';
         }
 
-        if(isset($vardef['precision'])) unset($vardef['precision']);
+        if(isset($vardef['precision'])) {
+            unset($vardef['precision']);
+        }
 
         //$vardef['precision'] = $locale->getPrecedentPreference('default_currency_significant_digits', $current_user);
 
@@ -364,8 +368,9 @@ 
         // remove the special text entry field function 'getEmailAddressWidget'
         if ( isset($vardef['function'])
             && ( $vardef['function'] == 'getEmailAddressWidget'
-                || $vardef['function']['name'] == 'getEmailAddressWidget' ) )
-            unset($vardef['function']);
+                || $vardef['function']['name'] == 'getEmailAddressWidget' ) ) {
+                    unset($vardef['function']);
+        }
 
         if(isset($vardef['name']) && ($vardef['name'] == 'date_entered' || $vardef['name'] == 'date_modified')){
             $vardef['name'] = 'aow_temp_date';
@@ -390,8 +395,9 @@ 
         }
 
         // hack to disable one of the js calls in this control
-        if ( isset($vardef['function']) && ( $vardef['function'] == 'getCurrencyDropDown' || $vardef['function']['name'] == 'getCurrencyDropDown' ) )
-            $contents .= "{literal}<script>function CurrencyConvertAll() { return; }</script>{/literal}";
+        if ( isset($vardef['function']) && ( $vardef['function'] == 'getCurrencyDropDown' || $vardef['function']['name'] == 'getCurrencyDropDown' ) ) {
+                    $contents .= "{literal}<script>function CurrencyConvertAll() { return; }</script>{/literal}";
+        }
 
         // Save it to the cache file
         if($fh = @sugar_fopen($file, 'w')) {
@@ -417,8 +423,7 @@ 
     $t23 = strpos($time_format, '23') !== false ? '%H' : '%I';
     if(!isset($match[2]) || $match[2] == '') {
         $ss->assign('CALENDAR_FORMAT', $date_format . ' ' . $t23 . $time_separator . "%M");
-    }
-    else {
+    } else {
         $pm = $match[2] == "pm" ? "%P" : "%p";
         $ss->assign('CALENDAR_FORMAT', $date_format . ' ' . $t23 . $time_separator . "%M" . $pm);
     }
@@ -427,8 +432,9 @@ 
 
     // populate the fieldlist from the vardefs
     $fieldlist = array();
-    if ( !isset($focus) || !($focus instanceof SugarBean) )
-        require_once($beanFiles[$beanList[$module]]);
+    if ( !isset($focus) || !($focus instanceof SugarBean) ) {
+            require_once($beanFiles[$beanList[$module]]);
+    }
     $focus = new $beanList[$module];
     // create the dropdowns for the parent type fields
     $vardefFields = $focus->getFieldDefinitions();
@@ -438,14 +444,17 @@ 
     foreach ( $vardefFields as $name => $properties ) {
         $fieldlist[$name] = $properties;
         // fill in enums
-        if(isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($app_list_strings[$fieldlist[$name]['options']]))
-            $fieldlist[$name]['options'] = $app_list_strings[$fieldlist[$name]['options']];
+        if(isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($app_list_strings[$fieldlist[$name]['options']])) {
+                    $fieldlist[$name]['options'] = $app_list_strings[$fieldlist[$name]['options']];
+        }
         // Bug 32626: fall back on checking the mod_strings if not in the app_list_strings
-        elseif(isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($mod_strings[$fieldlist[$name]['options']]))
-            $fieldlist[$name]['options'] = $mod_strings[$fieldlist[$name]['options']];
+        elseif(isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($mod_strings[$fieldlist[$name]['options']])) {
+                    $fieldlist[$name]['options'] = $mod_strings[$fieldlist[$name]['options']];
+        }
         // Bug 22730: make sure all enums have the ability to select blank as the default value.
-        if(!isset($fieldlist[$name]['options']['']))
-            $fieldlist[$name]['options'][''] = '';
+        if(!isset($fieldlist[$name]['options'][''])) {
+                    $fieldlist[$name]['options'][''] = '';
+        }
     }
 
     // fill in function return values
@@ -455,8 +464,9 @@ 
         {
             $function = $fieldlist[$fieldname]['function']['name'];
             // include various functions required in the various vardefs
-            if ( isset($fieldlist[$fieldname]['function']['include']) && is_file($fieldlist[$fieldname]['function']['include']))
-                require_once($fieldlist[$fieldname]['function']['include']);
+            if ( isset($fieldlist[$fieldname]['function']['include']) && is_file($fieldlist[$fieldname]['function']['include'])) {
+                            require_once($fieldlist[$fieldname]['function']['include']);
+            }
             $_REQUEST[$fieldname] = $value;
             $value = $function($focus, $fieldname, $value, $view);
 
@@ -514,9 +524,11 @@ 
         $value = $focus->convertField($value, $fieldlist[$fieldname]);
         if(!empty($params['date_format']) && isset($params['date_format'])){
             $convert_format = "Y-m-d H:i:s";
-            if($fieldlist[$fieldname]['type'] == 'date') $convert_format = "Y-m-d";
+            if($fieldlist[$fieldname]['type'] == 'date') {
+                $convert_format = "Y-m-d";
+            }
             $fieldlist[$fieldname]['value'] = $timedate->to_display($value, $convert_format, $params['date_format']);
-        }else{
+        } else{
             $fieldlist[$fieldname]['value'] = $timedate->to_display_date_time($value, true, true);
         }
         $fieldlist[$fieldname]['name'] = $aow_field;
@@ -582,7 +594,9 @@ 
 
     $value = json_decode(html_entity_decode_utf8($value), true);
 
-    if(!file_exists('modules/AOBH_BusinessHours/AOBH_BusinessHours.php')) unset($app_list_strings['aow_date_type_list']['business_hours']);
+    if(!file_exists('modules/AOBH_BusinessHours/AOBH_BusinessHours.php')) {
+        unset($app_list_strings['aow_date_type_list']['business_hours']);
+    }
 
     $field = '';
 
@@ -590,11 +604,12 @@ 
         $field .= "<select type='text' name='$aow_field".'[0]'."' id='$aow_field".'[0]'."' title='' tabindex='116'>". getDateFields($module, $view, $value[0], $field_option) ."</select>&nbsp;&nbsp;";
         $field .= "<select type='text' name='$aow_field".'[1]'."' id='$aow_field".'[1]'."' onchange='date_field_change(\"$aow_field\")'  title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aow_date_operator'], $value[1]) ."</select>&nbsp;";
         $display = 'none';
-        if($value[1] == 'plus' || $value[1] == 'minus') $display = '';
+        if($value[1] == 'plus' || $value[1] == 'minus') {
+            $display = '';
+        }
         $field .= "<input  type='text' style='display:$display' name='$aow_field".'[2]'."' id='$aow_field".'[2]'."' title='' value='$value[2]' tabindex='116'>&nbsp;";
         $field .= "<select type='text' style='display:$display' name='$aow_field".'[3]'."' id='$aow_field".'[3]'."' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aow_date_type_list'], $value[3]) ."</select>";
-    }
-    else {
+    } else {
         $field = getDateFields($module, $view, $value[0], $field_option).' '.$app_list_strings['aow_date_operator'][$value[1]];
         if($value[1] == 'plus' || $value[1] == 'minus'){
             $field .= ' '.$value[2].' '.$app_list_strings['aow_date_type_list'][$value[3]];
@@ -610,7 +625,9 @@ 
 
     $fields = $app_list_strings['aow_date_options'];
 
-    if(!$field_option) unset($fields['field']);
+    if(!$field_option) {
+        unset($fields['field']);
+    }
 
     if ($module != '') {
         if(isset($beanList[$module]) && $beanList[$module]){
@@ -643,8 +660,7 @@ 
 
     if(!file_exists('modules/SecurityGroups/SecurityGroup.php')){
         unset($app_list_strings['aow_assign_options']['security_group']);
-    }
-    else{
+    } else{
         $securityGroups = get_bean_select_array(true, 'SecurityGroup','name', '','name',true);
     }
 
@@ -654,17 +670,19 @@ 
         $field .= "<select type='text' name='$aow_field".'[0]'."' id='$aow_field".'[0]'."' onchange='assign_field_change(\"$aow_field\")' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aow_assign_options'], $value[0]) ."</select>&nbsp;&nbsp;";
         if(!file_exists('modules/SecurityGroups/SecurityGroup.php')){
             $field .= "<input type='hidden' name='$aow_field".'[1]'."' id='$aow_field".'[1]'."' value=''  />";
-        }
-        else {
+        } else {
             $display = 'none';
-            if($value[0] == 'security_group') $display = '';
+            if($value[0] == 'security_group') {
+                $display = '';
+            }
             $field .= "<select type='text' style='display:$display' name='$aow_field".'[1]'."' id='$aow_field".'[1]'."' title='' tabindex='116'>". get_select_options_with_id($securityGroups, $value[1]) ."</select>&nbsp;&nbsp;";
         }
         $display = 'none';
-        if($value[0] == 'role' || $value[0] == 'security_group') $display = '';
+        if($value[0] == 'role' || $value[0] == 'security_group') {
+            $display = '';
+        }
         $field .= "<select type='text' style='display:$display' name='$aow_field".'[2]'."' id='$aow_field".'[2]'."' title='' tabindex='116'>". get_select_options_with_id($roles, $value[2]) ."</select>&nbsp;&nbsp;";
-    }
-    else {
+    } else {
         $field = $app_list_strings['aow_assign_options'][$value[1]];
     }
     return $field;
@@ -679,8 +697,7 @@ 
             $option .= '<option value="'.$key.'" selected>'.$value.'</option>';
         } else if($selected_value == $key) {
             $option .= '<option value="'.$key.'" selected>'.$value.'</option>';
-        }
-        else {
+        } else {
             $option .= '<option value="'.$key.'">'.$value.'</option>';
         }
     }
@@ -707,8 +724,7 @@ 
         if(!empty($users[$key])) {
             return $users[$key];
         }
-    }
-    else if (is_file($file)){
+    } else if (is_file($file)){
         require_once($file);
         if(isset($lastUser['User']) && $lastUser['User'] != '') {
             $users_by_key = array_flip($users); // now keys are values
@@ -769,7 +785,9 @@ 
             $mod = new $beanList[$module]();
 
             foreach($mod->get_related_fields() as $field){
-                if(isset($field['link'])) $checked_link[] = $field['link'];
+                if(isset($field['link'])) {
+                    $checked_link[] = $field['link'];
+                }
                 if(!isset($field['module']) || !in_array($field['module'],$emailableModules) || (isset($field['dbType']) && $field['dbType'] == "id")){
                     continue;
                 }
@@ -813,7 +831,9 @@ 
     switch($bean->field_defs[$field]['type']) {
         case 'datetime':
         case 'datetimecombo':
-            if(empty($value)) break;
+            if(empty($value)) {
+                break;
+            }
             if ($value == 'NULL') {
                 $value = '';
                 break;
@@ -824,7 +844,9 @@ 
             }
             break;
         case 'date':
-            if(empty($value)) break;
+            if(empty($value)) {
+                break;
+            }
             if ($value == 'NULL') {
                 $value = '';
                 break;
@@ -835,7 +857,9 @@ 
             }
             break;
         case 'time':
-            if(empty($value)) break;
+            if(empty($value)) {
+                break;
+            }
             if ($value == 'NULL') {
                 $value = '';
                 break;

modules/EmailTemplates/EditView.php

Braces +42 added lines, -12 removed lines

@@ -68,7 +68,9 @@ 
 
 
 //setting default flag value so due date and time not required
-if (!isset($focus->id)) $focus->date_due_flag = 1;
+if (!isset($focus->id)) {
+    $focus->date_due_flag = 1;
+}
 
 //needed when creating a new case with default values passed in
 if (isset($_REQUEST['contact_name']) && is_null($focus->contact_name)) {
@@ -130,12 +132,16 @@ 
 $xtpl->parse("main.variable_option");
 
 $returnAction = 'index';
-if (isset($_REQUEST['return_module'])) $xtpl->assign("RETURN_MODULE", $_REQUEST['return_module']);
+if (isset($_REQUEST['return_module'])) {
+    $xtpl->assign("RETURN_MODULE", $_REQUEST['return_module']);
+}
 if (isset($_REQUEST['return_action'])) {
     $xtpl->assign("RETURN_ACTION", $_REQUEST['return_action']);
     $returnAction = $_REQUEST['return_action'];
 }
-if (isset($_REQUEST['return_id'])) $xtpl->assign("RETURN_ID", $_REQUEST['return_id']);
+if (isset($_REQUEST['return_id'])) {
+    $xtpl->assign("RETURN_ID", $_REQUEST['return_id']);
+}
 // handle Create $module then Cancel
 if (empty($_REQUEST['return_id'])) {
     $xtpl->assign("RETURN_ACTION", 'index');
@@ -164,8 +170,9 @@ 
 );
 $json = getJSONobj();
 $xtpl->assign('encoded_assigned_users_popup_request_data', $json->encode($popup_request_data));
-if (!empty($focus->assigned_user_name))
+if (!empty($focus->assigned_user_name)) {
     $xtpl->assign("ASSIGNED_USER_NAME", $focus->assigned_user_name);
+}
 
 $xtpl->assign("assign_user_select", SugarThemeRegistry::current()->getImage('id-ff-select', '', null, null, '.png', $mod_strings['LBL_SELECT']));
 $xtpl->assign("assign_user_clear", SugarThemeRegistry::current()->getImage('id-ff-clear', '', null, null, '.gif', $mod_strings['LBL_ID_FF_CLEAR']));
@@ -187,23 +194,38 @@ 
 $xtpl->assign("JSLANG", $jsLang);
 
 $xtpl->assign("ID", $focus->id);
-if (isset($focus->name)) $xtpl->assign("NAME", $focus->name); else $xtpl->assign("NAME", "");
+if (isset($focus->name)) {
+    $xtpl->assign("NAME", $focus->name);
+} else {
+    $xtpl->assign("NAME", "");
+}
 
 //Bug45632
 /* BEGIN - SECURITY GROUPS */
 /**
  * if(isset($focus->assigned_user_id)) $xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id); else $xtpl->assign("ASSIGNED_USER_ID", "");
  */
-if (isset($focus->assigned_user_id)) $xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id);
-else if (empty($focus->id) && empty($focus->assigned_user_id)) {
+if (isset($focus->assigned_user_id)) {
+    $xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id);
+} else if (empty($focus->id) && empty($focus->assigned_user_id)) {
     $xtpl->assign("ASSIGNED_USER_ID", $current_user->id);
     $xtpl->assign("ASSIGNED_USER_NAME", get_assigned_user_name($current_user->id));
-} else $xtpl->assign("ASSIGNED_USER_ID", "");
+} else {
+    $xtpl->assign("ASSIGNED_USER_ID", "");
+}
 /* END - SECURITY GROUPS */
 //Bug45632
 
-if (isset($focus->description)) $xtpl->assign("DESCRIPTION", $focus->description); else $xtpl->assign("DESCRIPTION", "");
-if (isset($focus->subject)) $xtpl->assign("SUBJECT", $focus->subject); else $xtpl->assign("SUBJECT", "");
+if (isset($focus->description)) {
+    $xtpl->assign("DESCRIPTION", $focus->description);
+} else {
+    $xtpl->assign("DESCRIPTION", "");
+}
+if (isset($focus->subject)) {
+    $xtpl->assign("SUBJECT", $focus->subject);
+} else {
+    $xtpl->assign("SUBJECT", "");
+}
 if ($focus->published == 'on') {
     $xtpl->assign("PUBLISHED", "CHECKED");
 }
@@ -244,8 +266,16 @@ 
 $xtpl->assign("TYPE_OPTIONS", get_select_options_with_id($app_list_strings['record_type_display'], $focus->parent_type));
 //$xtpl->assign("DEFAULT_MODULE","Accounts");
 
-if (isset($focus->body)) $xtpl->assign("BODY", $focus->body); else $xtpl->assign("BODY", "");
-if (isset($focus->body_html)) $xtpl->assign("BODY_HTML", $focus->body_html); else $xtpl->assign("BODY_HTML", "");
+if (isset($focus->body)) {
+    $xtpl->assign("BODY", $focus->body);
+} else {
+    $xtpl->assign("BODY", "");
+}
+if (isset($focus->body_html)) {
+    $xtpl->assign("BODY_HTML", $focus->body_html);
+} else {
+    $xtpl->assign("BODY_HTML", "");
+}
 
 
 // ---------------------------------

install.php

Braces +13 added lines, -15 removed lines

@@ -215,8 +215,7 @@ 
                 $detectedType = exif_imagetype($_FILES['company_logo']['tmp_name']);
                 if(!in_array($detectedType, $allowedTypes)) {
                     $errors[] = $mod_strings['ERR_UPLOAD_FILETYPE'];
-                }
-                else {
+                } else {
                     // uploaded image stored in the /custom path instead of put into the original theme directory..
 
                     mkdir_recursive('custom/' . SugarThemeRegistry::current()->getDefaultImagePath(), true);
@@ -224,8 +223,7 @@ 
                     $destFile = 'custom/' . $tmpvar[0];
                     if (!move_uploaded_file($_FILES['company_logo']['tmp_name'], $destFile)) {
                         $errors[] = $mod_strings['ERR_LANG_UPLOAD_1'];
-                    }
-                    else {
+                    } else {
                         $filepath = $destFile;
                     }
                 }
@@ -275,7 +273,9 @@ 
 
     if(isset($_REQUEST['storeConfig']) && ($_REQUEST['storeConfig'])){
         // store configuration by form to session
-        if(!isset($_SESSION)) session_start();
+        if(!isset($_SESSION)) {
+            session_start();
+        }
         $_SESSION = array_merge($_SESSION, $_POST);
 
         // TODO--low: don't forget the custom type install settings! validate here..
@@ -368,7 +368,7 @@ 
 //define web root, which will be used as default for site_url
 if($_SERVER['SERVER_PORT']=='80'){
     $web_root = $_SERVER['SERVER_NAME'].$_SERVER['PHP_SELF'];
-}else{
+} else{
     $web_root = $_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].$_SERVER['PHP_SELF'];
 }
 $web_root = str_replace("/install.php", "", $web_root);
@@ -513,8 +513,7 @@ 
 
 		<p>{$mod_strings['LBL_DISABLED_HELP_1']} <a href="{$mod_strings['LBL_DISABLED_HELP_LNK']}" target="_blank">{$mod_strings['LBL_DISABLED_HELP_2']}</a>.</p>
 EOQ;
-}
-else{
+} else{
     $validation_errors = array();
 // process the data posted
 if($next_clicked) {
@@ -605,27 +604,27 @@ 
                 $_SESSION['setup_site_custom_session_path']     = get_boolean_from_request('setup_site_custom_session_path');
                 if($_SESSION['setup_site_custom_session_path']){
                     $_SESSION['setup_site_session_path']            = $_REQUEST['setup_site_session_path'];
-                }else{
+                } else{
                     $_SESSION['setup_site_session_path'] = '';
                 }
 
                 $_SESSION['setup_site_custom_log_dir']          = get_boolean_from_request('setup_site_custom_log_dir');
                 if($_SESSION['setup_site_custom_log_dir']){
                     $_SESSION['setup_site_log_dir']                 = $_REQUEST['setup_site_log_dir'];
-                }else{
+                } else{
                     $_SESSION['setup_site_log_dir'] = '.';
                 }
 
                 $_SESSION['setup_site_specify_guid']            = get_boolean_from_request('setup_site_specify_guid');
                 if($_SESSION['setup_site_specify_guid']){
                     $_SESSION['setup_site_guid']                    = $_REQUEST['setup_site_guid'];
-                }else{
+                } else{
                     $_SESSION['setup_site_guid'] = '';
                 }
                 $_SESSION['siteConfig_submitted']               = true;
                 if(isset($_REQUEST['setup_site_sugarbeet_anonymous_stats'])){
                     $_SESSION['setup_site_sugarbeet_anonymous_stats'] = get_boolean_from_request('setup_site_sugarbeet_anonymous_stats');
-                }else{
+                } else{
                     $_SESSION['setup_site_sugarbeet_anonymous_stats'] = 0;
                 }
 
@@ -640,13 +639,12 @@ 
 
     if($next_step == 9999) {
         $the_file = 'SilentInstall';
-    }else if($next_step == 9191) {
+    } else if($next_step == 9191) {
         $_SESSION['oc_server_url']	= $_REQUEST['oc_server_url'];
         $_SESSION['oc_username']    = $_REQUEST['oc_username'];
         $_SESSION['oc_password']   	= $_REQUEST['oc_password'];
         $the_file = 'oc_convert.php';
-    }
-    else{
+    } else{
         $the_file = $workflow[$next_step];
 
     }