adamjakab / SuiteCRM

include/database/MysqlManager.php

Braces +184 added lines, -128 removed lines

@@ -1,5 +1,7 @@ 
 <?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.
@@ -185,8 +187,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;
@@ -236,8 +239,9 @@ 
 	 */
 	protected function freeDbResult($dbResult)
 	{
-		if(!empty($dbResult))
-			mysql_free_result($dbResult);
+		if(!empty($dbResult)) {
+					mysql_free_result($dbResult);
+		}
 	}
 
 
@@ -260,8 +264,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";
@@ -286,21 +291,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)){
@@ -308,8 +319,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);
 				}
 			}
@@ -333,14 +343,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;
 	}
@@ -352,17 +366,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;
 		}
@@ -375,7 +392,9 @@ 
 	 */
 	public function fetchRow($result)
 	{
-		if (empty($result))	return false;
+		if (empty($result)) {
+		    return false;
+		}
 
 		return mysql_fetch_assoc($result);
 	}
@@ -419,7 +438,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);
 		}
@@ -474,8 +495,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(
@@ -528,8 +550,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);
@@ -546,8 +569,9 @@ 
 	{
 		$sql = parent::repairTableParams($tablename,$fielddefs,$indices,false,$engine);
 
-		if ( $sql == '' )
-			return '';
+		if ( $sql == '' ) {
+					return '';
+		}
 
 		if ( stristr($sql,'create table') )
 		{
@@ -574,8 +598,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";
@@ -672,15 +697,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;
 	}
@@ -708,18 +736,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');
@@ -728,8 +760,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;
 	}
@@ -758,13 +791,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']}";
+		}
 	}
 
 	/**
@@ -775,16 +810,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);
@@ -806,23 +843,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':
@@ -841,16 +882,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;
 		}
 	}
@@ -892,8 +935,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 "";
 	}
@@ -911,8 +955,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']);
@@ -938,29 +981,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;
@@ -1003,22 +1050,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'])) {
@@ -1058,8 +1113,9 @@ 
 		}
 		if (!empty($sql)) {
             $sql = "ALTER TABLE $tablename " . join(",", $sql) . ";";
-			if($execute)
-				$this->query($sql);
+			if($execute) {
+							$this->query($sql);
+			}
 		} else {
 			$sql = '';
 		}

include/database/MysqliManager.php

Braces +34 added lines, -19 removed lines

@@ -1,5 +1,7 @@ 
 <?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.
@@ -135,8 +137,9 @@ 
 		$result = $suppress?@mysqli_query($this->database,$sql):mysqli_query($this->database,$sql);
 		$md5 = md5($sql);
 
-		if (empty($queryMD5[$md5]))
-			$queryMD5[$md5] = true;
+		if (empty($queryMD5[$md5])) {
+					$queryMD5[$md5] = true;
+		}
 
 		$this->query_time = microtime(true) - $this->query_time;
 		$GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
@@ -154,8 +157,9 @@ 
 		*/
 
 
-		if($keepResult)
-			$this->lastResult = $result;
+		if($keepResult) {
+					$this->lastResult = $result;
+		}
 		$this->checkError($msg.' Query Failed: ' . $sql, $dieOnError);
 
 		return $result;
@@ -208,8 +212,9 @@ 
 	 */
 	protected function freeDbResult($dbResult)
 	{
-		if(!empty($dbResult))
-			mysqli_free_result($dbResult);
+		if(!empty($dbResult)) {
+					mysqli_free_result($dbResult);
+		}
 	}
 
 	/**
@@ -219,17 +224,20 @@ 
 	{
 		$field_array = array();
 
-		if (!isset($result) || empty($result))
-			return 0;
+		if (!isset($result) || empty($result)) {
+					return 0;
+		}
 
 		$i = 0;
 		while ($i < mysqli_num_fields($result)) {
 			$meta = mysqli_fetch_field_direct($result, $i);
-			if (!$meta)
-				return 0;
+			if (!$meta) {
+							return 0;
+			}
 
-			if($make_lower_case == true)
-				$meta->name = strtolower($meta->name);
+			if($make_lower_case == true) {
+							$meta->name = strtolower($meta->name);
+			}
 
 			$field_array[] = $meta->name;
 
@@ -244,10 +252,15 @@ 
 	 */
 	public function fetchRow($result)
 	{
-		if (empty($result))	return false;
+		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;
 	}
 
@@ -266,8 +279,9 @@ 
 	{
 		global $sugar_config;
 
-		if (is_null($configOptions))
-			$configOptions = $sugar_config['dbconfig'];
+		if (is_null($configOptions)) {
+					$configOptions = $sugar_config['dbconfig'];
+		}
 
 		if(!isset($this->database)) {
 
@@ -318,8 +332,9 @@ 
 		}
 	    mysqli_query($this->database,$names);
 
-		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;
 		return true;

include/database/DBManagerFactory.php

Braces +21 added lines, -7 removed lines

@@ -1,5 +1,7 @@ 
 <?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.
@@ -191,15 +193,25 @@ 
      */
     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;
+        if($scandir === false) {
+            return;
+        }
         while(($name = readdir($scandir)) !== false) {
-            if(substr($name, -11) != "Manager.php") continue;
-            if($name == "DBManager.php") continue;
+            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])) {
@@ -236,7 +248,9 @@ 
 
         $result = array();
         foreach($drivers as $type => $tdrivers) {
-            if(empty($tdrivers)) continue;
+            if(empty($tdrivers)) {
+                continue;
+            }
             if(count($tdrivers) > 1) {
                 usort($tdrivers, array(__CLASS__, "_compareDrivers"));
             }

include/utils/sugar_file_utils.php

Braces +27 added lines, -18 removed lines

@@ -1,5 +1,7 @@ 
 <?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.
@@ -56,12 +58,14 @@ 
 function sugar_mkdir($pathname, $mode=null, $recursive=false, $context='') {
 	$mode = get_mode('dir_mode', $mode);
 
-	if ( sugar_is_dir($pathname,$mode) )
-	    return true;
+	if ( sugar_is_dir($pathname,$mode) ) {
+		    return true;
+	}
 
 	$result = false;
-	if(empty($mode))
-		$mode = 0777;
+	if(empty($mode)) {
+			$mode = 0777;
+	}
 	if(empty($context)) {
 		$result = @mkdir($pathname, $mode, $recursive);
 	} else {
@@ -82,8 +86,7 @@ 
    				return false;
    			}
 		}
-	}
-	else {
+	} else {
 		$errorMessage = "Cannot create directory $pathname cannot be touched";
 		if(is_null($GLOBALS['log'])) {
 			throw new Exception("Error occurred but the system doesn't have logger. Error message: \"$errorMessage\"");
@@ -285,15 +288,16 @@ 
  * @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_int($mode) ) {
+            $mode = (int) $mode;
+    }
 	if(!is_windows()){
 		if(!isset($mode)){
 			$mode = get_mode('file_mode', $mode);
 		}
         if(isset($mode) && $mode > 0){
 		   return @chmod($filename, $mode);
-		}else{
+		} else{
 	    	return false;
 		}
 	}
@@ -313,11 +317,11 @@ 
 	if(!is_windows()){
 		if(strlen($user)){
 			return chown($filename, $user);
-		}else{
+		} else{
 			if(strlen($GLOBALS['sugar_config']['default_permissions']['user'])){
 				$user = $GLOBALS['sugar_config']['default_permissions']['user'];
 				return chown($filename, $user);
-			}else{
+			} else{
 				return false;
 			}
 		}
@@ -338,11 +342,11 @@ 
 	if(!is_windows()){
 		if(!empty($group)){
 			return chgrp($filename, $group);
-		}else{
+		} else{
 			if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
 				$group = $GLOBALS['sugar_config']['default_permissions']['group'];
 				return chgrp($filename, $group);
-			}else{
+			} else{
 				return false;
 			}
 		}
@@ -361,8 +365,9 @@ 
  * @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 ( !is_int($mode) ) {
+	        $mode = (int) $mode;
+	}
     if(!class_exists('SugarConfig', true)) {
 		require 'include/SugarObjects/SugarConfig.php';
 	}
@@ -374,12 +379,16 @@ 
 }
 
 function sugar_is_dir($path, $mode='r'){
-		if(defined('TEMPLATE_URL'))return is_dir($path, $mode);
+		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);
+		if(defined('TEMPLATE_URL')) {
+		    return is_file($path, $mode);
+		}
 		return is_file($path);
 }
 

include/MVC/Controller/ControllerFactory.php

Braces +5 added lines, -5 removed lines

@@ -57,23 +57,23 @@
 			require_once('custom/modules/'.$module.'/controller.php');
 			if(class_exists($customClass)){
 				$controller = new $customClass();
-			}else if(class_exists($class)){
+			} else if(class_exists($class)){
 				$controller = new $class();
 			}
-		}elseif(file_exists('modules/'.$module.'/controller.php')){
+		} elseif(file_exists('modules/'.$module.'/controller.php')){
 			require_once('modules/'.$module.'/controller.php');
 			if(class_exists($customClass)){
 				$controller = new $customClass();
-			}else if(class_exists($class)){
+			} else if(class_exists($class)){
 				$controller = new $class();
 			}
-		}else{
+		} else{
 			if(file_exists('custom/include/MVC/Controller/SugarController.php')){
 				require_once('custom/include/MVC/Controller/SugarController.php');
 			}
 			if(class_exists('CustomSugarController')){
 				$controller = new CustomSugarController();
-			}else{
+			} else{
 			$controller = new SugarController();
 			}
 		}

include/javascript/getYUIComboFile.php

Braces +15 added lines, -7 removed lines

@@ -1,5 +1,7 @@ 
 <?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.
@@ -38,7 +40,9 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-if (empty($_REQUEST)) die();
+if (empty($_REQUEST)) {
+    die();
+}
 
 $yui_path = array(
     "2.9.0" => "include/javascript/yui",
@@ -58,20 +62,24 @@ 
 foreach ($_REQUEST as $param => $val)
 {
 	//No backtracking in the path
-	if (strpos($param, "..") !== false)
-        continue;
+	if (strpos($param, "..") !== false) {
+	        continue;
+	}
 
 	$version = explode("/", $param);
 	$version = $version[0];
-    if (empty($yui_path[$version])) continue;
+    if (empty($yui_path[$version])) {
+        continue;
+    }
 
     $path = $yui_path[$version] . substr($param, strlen($version));
 
 	$extension = substr($path, strrpos($path, "_") + 1);
 
 	//Only allowed file extensions
-	if (empty($types[$extension]))
-	   continue;
+	if (empty($types[$extension])) {
+		   continue;
+	}
 
 	if (empty($contentType))
     {

include/Dashlets/DashletGenericChart.php

Braces +59 added lines, -36 removed lines

@@ -1,5 +1,7 @@ 
 <?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,10 +123,12 @@ 
         // load language files
         $this->loadLanguage($classname, 'modules/Charts/Dashlets/');
 
-        if ( empty($options['title']) )
-            $this->title = $this->dashletStrings['LBL_TITLE'];
-        if ( isset($options['autoRefresh']) )
-            $this->autoRefresh = $options['autoRefresh'];
+        if ( empty($options['title']) ) {
+                    $this->title = $this->dashletStrings['LBL_TITLE'];
+        }
+        if ( isset($options['autoRefresh']) ) {
+                    $this->autoRefresh = $options['autoRefresh'];
+        }
 
         $this->layoutManager = new LayoutManager();
         $this->layoutManager->setAttribute('context', 'Report');
@@ -140,8 +144,8 @@ 
     public function setRefreshIcon()
     {
     	$additionalTitle = '';
-        if($this->isRefreshable)
-
+        if($this->isRefreshable) {
+        
             $additionalTitle .= '<a href="#" onclick="SUGAR.mySugar.retrieveDashlet(\''
                 . $this->id
                 . '\',\'predefined_chart\'); return false;"><!--not_in_theme!-->'
@@ -154,6 +158,7 @@ 
                     translate('LBL_DASHLET_REFRESH', 'Home')
                 )
                 . '</a>';
+        }
         return $additionalTitle;
     }
 
@@ -200,25 +205,32 @@ 
 
         $options = array();
 
-        foreach($req as $name => $value)
-            if(!is_array($value)) $req[$name] = trim($value);
+        foreach($req as $name => $value) {
+                    if(!is_array($value)) $req[$name] = trim($value);
+        }
 
         foreach($this->_searchFields as $name => $params) {
             $widgetDef = $params;
-            if ( isset($this->getSeedBean()->field_defs[$name]) )
-                $widgetDef = $this->getSeedBean()->field_defs[$name];
-            if ( $widgetDef['type'] == 'date')           // special case date types
+            if ( isset($this->getSeedBean()->field_defs[$name]) ) {
+                            $widgetDef = $this->getSeedBean()->field_defs[$name];
+            }
+            if ( $widgetDef['type'] == 'date') {
+                // special case date types
                 $options[$widgetDef['name']] = $timedate->swap_formats($req['type_'.$widgetDef['name']], $timedate->get_date_format(), $timedate->dbDayFormat);
-            elseif ( $widgetDef['type'] == 'time')       // special case time types
+            } elseif ( $widgetDef['type'] == 'time') {
+                // special case time types
                 $options[$widgetDef['name']] = $timedate->swap_formats($req['type_'.$widgetDef['name']], $timedate->get_time_format(), $timedate->dbTimeFormat);
-            elseif ( $widgetDef['type'] == 'datepicker') // special case datepicker types
+            } elseif ( $widgetDef['type'] == 'datepicker') {
+                // special case datepicker types
                 $options[$widgetDef['name']] = $timedate->swap_formats($req[$widgetDef['name']], $timedate->get_date_format(), $timedate->dbDayFormat);
-            elseif (!empty($req[$widgetDef['name']]))
-                $options[$widgetDef['name']] = $req[$widgetDef['name']];
+            } elseif (!empty($req[$widgetDef['name']])) {
+                            $options[$widgetDef['name']] = $req[$widgetDef['name']];
+            }
         }
 
-        if (!empty($req['dashletTitle']))
-            $options['title'] = $req['dashletTitle'];
+        if (!empty($req['dashletTitle'])) {
+                    $options['title'] = $req['dashletTitle'];
+        }
 
         $options['autoRefresh'] = empty($req['autoRefresh']) ? '0' : $req['autoRefresh'];
 
@@ -241,19 +253,24 @@ 
                     $currentSearchFields[$name] = array();
 
                     $widgetDef = $params;
-                    if ( isset($this->getSeedBean()->field_defs[$name]) )
-                        $widgetDef = $this->getSeedBean()->field_defs[$name];
+                    if ( isset($this->getSeedBean()->field_defs[$name]) ) {
+                                            $widgetDef = $this->getSeedBean()->field_defs[$name];
+                    }
 
-                    if($widgetDef['type'] == 'enum' || $widgetDef['type'] == 'singleenum') $widgetDef['remove_blank'] = true; // remove the blank option for the dropdown
+                    if($widgetDef['type'] == 'enum' || $widgetDef['type'] == 'singleenum') {
+                        $widgetDef['remove_blank'] = true;
+                    }
+                    // remove the blank option for the dropdown
 
-                    if ( empty($widgetDef['input_name0']) )
-                        $widgetDef['input_name0'] = empty($this->$name) ? '' : $this->$name;
+                    if ( empty($widgetDef['input_name0']) ) {
+                                            $widgetDef['input_name0'] = empty($this->$name) ? '' : $this->$name;
+                    }
                     $currentSearchFields[$name]['label'] = translate($widgetDef['vname'], $this->getSeedBean()->module_dir);
-                    if ( $currentSearchFields[$name]['label'] == $widgetDef['vname'] )
-                        $currentSearchFields[$name]['label'] = translate($widgetDef['vname'], 'Charts');
+                    if ( $currentSearchFields[$name]['label'] == $widgetDef['vname'] ) {
+                                            $currentSearchFields[$name]['label'] = translate($widgetDef['vname'], 'Charts');
+                    }
                     $currentSearchFields[$name]['input'] = $this->layoutManager->widgetDisplayInput($widgetDef, true, (empty($this->$name) ? '' : $this->$name));
-                }
-                else { // ability to create spacers in input fields
+                } else { // ability to create spacers in input fields
                     $currentSearchFields['blank' + $count]['label'] = '';
                     $currentSearchFields['blank' + $count]['input'] = '';
                     $count++;
@@ -289,8 +306,9 @@ 
      */
     protected function getSeedBean()
     {
-        if ( !($this->_seedBean instanceof SugarBean) )
-            $this->_seedBean = SugarModule::get($this->_seedName)->loadBean();
+        if ( !($this->_seedBean instanceof SugarBean) ) {
+                    $this->_seedBean = SugarModule::get($this->_seedName)->loadBean();
+        }
 
         return $this->_seedBean;
     }
@@ -412,9 +430,14 @@ 
         }
 
         //if(isset($sortby1[0]) && $sortby1[0]=='') unset($sortby1[0]);//the beginning of lead_source_dom is blank.
-        if(isset($sortby1[0]) && $sortby1[0]==array()) unset($sortby1[0]);//the beginning of month after search is blank.
+        if(isset($sortby1[0]) && $sortby1[0]==array()) {
+            unset($sortby1[0]);
+        }
+        //the beginning of month after search is blank.
 
-        if($ifsort2==false) $sortby2=array(0);
+        if($ifsort2==false) {
+            $sortby2=array(0);
+        }
 
         if($keycolname2!=null) {
             $sortby2 = array();
@@ -438,7 +461,9 @@ 
 
         foreach($sortby1 as $sort1) {
             foreach($sortby2 as $sort2) {
-                if($ifsort2) $a=0;
+                if($ifsort2) {
+                    $a=0;
+                }
                 foreach($data_set as $key => $value){
                     if($value[$keycolname1] == $sort1 && (!$ifsort2 || $value[$keycolname2]== $sort2)) {
                         if($translate1) {
@@ -461,15 +486,13 @@ 
                     if($translate1) {
                         $val[$keycolname1] = $app_list_strings[$keycolname1.'_dom'][$sort1];
                         $val[$keycolname1.'_dom_option'] = $sort1;
-                    }
-                    else {
+                    } else {
                         $val[$keycolname1] = $sort1;
                     }
                     if($translate2) {
                         $val[$keycolname2] = $app_list_strings[$keycolname2.'_dom'][$sort2];
                         $val[$keycolname2.'_dom_option'] = $sort2;
-                    }
-                    elseif($keycolname2!=null) {
+                    } elseif($keycolname2!=null) {
                         $val[$keycolname2] = $sort2;
                     }
                     array_push($data, $val);

include/Dashlets/DashletCacheBuilder.php

Braces +6 added lines, -3 removed lines

@@ -1,5 +1,7 @@ 
 <?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.
@@ -73,8 +75,9 @@ 
                 if(is_file(preg_replace('/(.*\/.*)(\.php)/Uis', '$1.meta$2', $file))) { // is there an associated meta data file?
                     $dashletFiles[$class]['meta'] = preg_replace('/(.*\/.*)(\.php)/Uis', '$1.meta$2', $file);
                     require($dashletFiles[$class]['meta']);
-                    if ( isset($dashletMeta[$class]['module']) )
-                        $dashletFiles[$class]['module'] = $dashletMeta[$class]['module'];
+                    if ( isset($dashletMeta[$class]['module']) ) {
+                                            $dashletFiles[$class]['module'] = $dashletMeta[$class]['module'];
+                    }
                 }
                 
                 $filesInDirectory = array();

include/MySugar/retrieve_dash_page.php

Braces +20 added lines, -11 removed lines

@@ -1,5 +1,7 @@ 
 <?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.
@@ -94,8 +96,7 @@ 
         $old_dashlets = array();
         $current_user->setPreference('columns', $old_columns, 0, 'home');
         $current_user->setPreference('dashlets', $old_dashlets, 0, 'home');
-    }
-    else{
+    } else{
         // This is here to get Sugar dashlets added above the rest
         $dashlets[create_guid()] = array('className' => 'iFrameDashlet',
             'module' => 'Home',
@@ -150,8 +151,11 @@ 
         $columns[1]['dashlets'] = array();
 
         foreach($dashlets as $guid=>$dashlet) {
-            if( $dashlet['forceColumn'] == 0 ) array_push($columns[0]['dashlets'], $guid);
-            else array_push($columns[1]['dashlets'], $guid);
+            if( $dashlet['forceColumn'] == 0 ) {
+                array_push($columns[0]['dashlets'], $guid);
+            } else {
+                array_push($columns[1]['dashlets'], $guid);
+            }
             $count++;
         }
     }
@@ -179,8 +183,9 @@ 
     $dashlets = array_merge($dashlets,$dashletsDashboard);
     $current_user->setPreference('dashlets', $dashlets, 0, 'Home');
 }
-if ( !empty($pagesDashboard) || !empty($dashletsDashboard) )
+if ( !empty($pagesDashboard) || !empty($dashletsDashboard) ) {
     $current_user->resetPreferences('Dashboard');
+}
 
 if (empty($pages)){
     $pages = array();
@@ -217,12 +222,14 @@ 
         // only display dashlets that are from visibile modules and that the user has permission to list
         if(!empty($id) && isset($dashlets[$id]) && is_file($dashlets[$id]['fileLocation'])) {
             $module = 'Home';
-            if ( !empty($dashletsFiles[$dashlets[$id]['className']]['module']) )
-                $module = $dashletsFiles[$dashlets[$id]['className']]['module'];
+            if ( !empty($dashletsFiles[$dashlets[$id]['className']]['module']) ) {
+                            $module = $dashletsFiles[$dashlets[$id]['className']]['module'];
+            }
             // Bug 24772 - Look into the user preference for the module the dashlet is a part of in case
             //             of the Report Chart dashlets.
-            elseif ( !empty($dashlets[$id]['module']) )
-                $module = $dashlets[$id]['module'];
+            elseif ( !empty($dashlets[$id]['module']) ) {
+                            $module = $dashlets[$id]['module'];
+            }
 
             $myDashlet = new MySugar($module);
 
@@ -267,7 +274,9 @@ 
 $_SESSION['current_tab'] = $activePage;
 
 
-if(!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) $sugar_smarty->assign('lock_homepage', true);
+if(!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) {
+    $sugar_smarty->assign('lock_homepage', true);
+}
 
 
 $sugar_smarty->assign('sugarVersion', $sugar_version);