adamjakab / SuiteCRM

include/SugarObjects/SugarRegistry.php

Braces +3 added lines, -1 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.

include/database/SqlsrvManager.php

Braces +43 added lines, -31 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.
@@ -153,16 +155,18 @@ 
     {
         global $sugar_config;
 
-        if (is_null($configOptions))
-            $configOptions = $sugar_config['dbconfig'];
+        if (is_null($configOptions)) {
+                    $configOptions = $sugar_config['dbconfig'];
+        }
 
         //set the connections parameters
         $connect_param = '';
         $configOptions['db_host_instance'] = trim($configOptions['db_host_instance']);
-        if (empty($configOptions['db_host_instance']))
-            $connect_param = $configOptions['db_host_name'];
-        else
-            $connect_param = $configOptions['db_host_name']."\\".$configOptions['db_host_instance'];
+        if (empty($configOptions['db_host_instance'])) {
+                    $connect_param = $configOptions['db_host_name'];
+        } else {
+                    $connect_param = $configOptions['db_host_name']."\\".$configOptions['db_host_instance'];
+        }
 
         /*
          * Don't try to specifically use a persistent connection
@@ -192,8 +196,9 @@ 
             }
         }
 
-        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");
+        }
 
         sqlsrv_query($this->database, 'SET DATEFORMAT mdy');
 
@@ -245,8 +250,9 @@ 
 
         foreach ( sqlsrv_field_metadata($result) as $fieldMetadata ) {
             $key = $fieldMetadata['Name'];
-            if($make_lower_case==true)
-                $key = strtolower($key);
+            if($make_lower_case==true) {
+                            $key = strtolower($key);
+            }
 
             $field_array[] = $key;
         }
@@ -259,7 +265,9 @@ 
 	 */
 	public function fetchRow($result)
 	{
-		if (empty($result))	return false;
+		if (empty($result)) {
+		    return false;
+		}
 
 	    $row = sqlsrv_fetch_array($result,SQLSRV_FETCH_ASSOC);
         if (empty($row)) {
@@ -284,11 +292,12 @@ 
      */
     public function convert($string, $type, array $additional_parameters = array())
     {
-        if ( $type == 'datetime')
-        // see http://msdn.microsoft.com/en-us/library/ms187928.aspx for details
+        if ( $type == 'datetime') {
+                // see http://msdn.microsoft.com/en-us/library/ms187928.aspx for details
             return "CONVERT(datetime,$string,120)";
-        else
-            return parent::convert($string, $type, $additional_parameters);
+        } else {
+                    return parent::convert($string, $type, $additional_parameters);
+        }
     }
 
 	/**
@@ -330,8 +339,9 @@ 
      */
     protected function freeDbResult($dbResult)
     {
-        if(!empty($dbResult))
-            sqlsrv_free_stmt($dbResult);
+        if(!empty($dbResult)) {
+                    sqlsrv_free_stmt($dbResult);
+        }
     }
 
 
@@ -377,14 +387,12 @@ 
             if ( $row['TYPE_NAME'] == 'decimal' ) {
                 $columns[$column_name]['len']=strtolower($row['PRECISION']);
                 $columns[$column_name]['len'].=','.strtolower($row['SCALE']);
-            }
-			elseif ( in_array($row['TYPE_NAME'],array('nchar','nvarchar')) ) {
+            } elseif ( in_array($row['TYPE_NAME'],array('nchar','nvarchar')) ) {
 				$columns[$column_name]['len']=strtolower($row['PRECISION']);
 				if ( $row['TYPE_NAME'] == 'nvarchar' && $row['PRECISION'] == '0' ) {
 				    $columns[$column_name]['len']='max';
 				}
-			}
-            elseif ( !in_array($row['TYPE_NAME'],array('datetime','text')) ) {
+			} elseif ( !in_array($row['TYPE_NAME'],array('datetime','text')) ) {
                 $columns[$column_name]['len']=strtolower($row['LENGTH']);
             }
             if ( stristr($row['TYPE_NAME'],'identity') ) {
@@ -392,8 +400,9 @@ 
                 $columns[$column_name]['type']=str_replace(' identity','',strtolower($row['TYPE_NAME']));
             }
 
-            if (!empty($row['IS_NULLABLE']) && $row['IS_NULLABLE'] == 'NO' && (empty($row['KEY']) || !stristr($row['KEY'],'PRI')))
-                $columns[strtolower($row['COLUMN_NAME'])]['required'] = 'true';
+            if (!empty($row['IS_NULLABLE']) && $row['IS_NULLABLE'] == 'NO' && (empty($row['KEY']) || !stristr($row['KEY'],'PRI'))) {
+                            $columns[strtolower($row['COLUMN_NAME'])]['required'] = 'true';
+            }
 
             $column_def = 1;
             if ( strtolower($tablename) == 'relationships' ) {
@@ -402,12 +411,13 @@ 
             if ( $column_def != 0 && ($row['COLUMN_DEF'] != null)) {	// NOTE Not using !empty as an empty string may be a viable default value.
                 $matches = array();
                 $row['COLUMN_DEF'] = html_entity_decode($row['COLUMN_DEF'],ENT_QUOTES);
-                if ( preg_match('/\([\(|\'](.*)[\)|\']\)/i',$row['COLUMN_DEF'],$matches) )
-                    $columns[$column_name]['default'] = $matches[1];
-                elseif ( preg_match('/\(N\'(.*)\'\)/i',$row['COLUMN_DEF'],$matches) )
-                    $columns[$column_name]['default'] = $matches[1];
-                else
-                    $columns[$column_name]['default'] = $row['COLUMN_DEF'];
+                if ( preg_match('/\([\(|\'](.*)[\)|\']\)/i',$row['COLUMN_DEF'],$matches) ) {
+                                    $columns[$column_name]['default'] = $matches[1];
+                } elseif ( preg_match('/\(N\'(.*)\'\)/i',$row['COLUMN_DEF'],$matches) ) {
+                                    $columns[$column_name]['default'] = $matches[1];
+                } else {
+                                    $columns[$column_name]['default'] = $row['COLUMN_DEF'];
+                }
             }
         }
         return $columns;
@@ -495,7 +505,9 @@ 
     public function lastDbError()
     {
         $errors = sqlsrv_errors(SQLSRV_ERR_ERRORS);
-        if(empty($errors)) return false;
+        if(empty($errors)) {
+            return false;
+        }
         global $app_strings;
         if (empty($app_strings)
 		    or !isset($app_strings['ERR_MSSQL_DB_CONTEXT'])

include/database/MssqlManager.php

Braces +202 added lines, -159 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.
@@ -168,8 +170,9 @@ 
     {
         global $sugar_config;
 
-        if (is_null($configOptions))
-            $configOptions = $sugar_config['dbconfig'];
+        if (is_null($configOptions)) {
+                    $configOptions = $sugar_config['dbconfig'];
+        }
 
         //SET DATEFORMAT to 'YYYY-MM-DD''
         ini_set('mssql.datetimeconvert', '0');
@@ -258,8 +261,9 @@ 
 			}
          }
 
-        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;
 
@@ -284,8 +288,9 @@ 
             return $this->queryArray($sql, $dieOnError, $msg, $suppress);
         }
         // Flag if there are odd number of single quotes
-        if ((substr_count($sql, "'") & 1))
-            $GLOBALS['log']->error("SQL statement[" . $sql . "] has odd number of single quotes.");
+        if ((substr_count($sql, "'") & 1)) {
+                    $GLOBALS['log']->error("SQL statement[" . $sql . "] has odd number of single quotes.");
+        }
 
 		$sql = $this->_appendN($sql);
 
@@ -308,14 +313,16 @@ 
 			$sqlpos2 = strpos($sqlmsg, 'Warning:');
 			$sqlpos3 = strpos($sqlmsg, 'Checking identity information:');
 
-			if ($sqlpos !== false || $sqlpos2 !== false || $sqlpos3 !== false)		// if sqlmsg has 'Changed database context to', just log it
+			if ($sqlpos !== false || $sqlpos2 !== false || $sqlpos3 !== false) {
+			    // if sqlmsg has 'Changed database context to', just log it
 				$GLOBALS['log']->debug($sqlmsg . ": " . $sql );
-			else {
+			} else {
 				$GLOBALS['log']->fatal($sqlmsg . ": " . $sql );
-				if($dieOnError)
-					sugar_die('SQL Error : ' . $sqlmsg);
-				else
-					echo 'SQL Error : ' . $sqlmsg;
+				if($dieOnError) {
+									sugar_die('SQL Error : ' . $sqlmsg);
+				} else {
+									echo 'SQL Error : ' . $sqlmsg;
+				}
 			}
         }
 
@@ -340,8 +347,9 @@ 
     private function handleUnionLimitQuery($sql, $start, $count)
     {
         //set the start to 0, no negs
-        if ($start < 0)
-            $start=0;
+        if ($start < 0) {
+                    $start=0;
+        }
 
         $GLOBALS['log']->debug(print_r(func_get_args(),true));
 
@@ -390,8 +398,7 @@ 
                 $rowNumOrderBy = 'id';
                 $unionOrderBy = "";
             }
-        }
-        else {
+        } else {
             //there are no order by elements, so just pass back string
             $unionsql = $sql;
             //with no guidance on what to use for required order by in rownumber function,
@@ -413,8 +420,7 @@ 
         if ($count == 1 && $start == 0)
         {
             $limitUnionSQL = "SELECT TOP $count * FROM (" .$unionsql .") as top_count ".$unionOrderBy;
-        }
-        else
+        } else
         {
             $limitUnionSQL = "SELECT TOP $count * FROM( select ROW_NUMBER() OVER ( order by "
             .$rowNumOrderBy.") AS row_number, * FROM ("
@@ -436,11 +442,12 @@ 
         $count = (int)$count;
         $newSQL = $sql;
         $distinctSQLARRAY = array();
-        if (strpos($sql, "UNION") && !preg_match("/(')(UNION).?(')/i", $sql))
-            $newSQL = $this->handleUnionLimitQuery($sql,$start,$count);
-        else {
-            if ($start < 0)
-                $start = 0;
+        if (strpos($sql, "UNION") && !preg_match("/(')(UNION).?(')/i", $sql)) {
+                    $newSQL = $this->handleUnionLimitQuery($sql,$start,$count);
+        } else {
+            if ($start < 0) {
+                            $start = 0;
+            }
             $GLOBALS['log']->debug(print_r(func_get_args(),true));
             $this->lastsql = $sql;
             $matches = array();
@@ -461,20 +468,17 @@ 
                                     " . $selectPart[2] . $orderByMatch[1]. "
                                 ) AS a
                                 WHERE row_number > $start";
-                        }
-                        else {
+                        } else {
                             $newSQL = $matches[1] . " TOP $count " . $matches[2] . $matches[3];
                         }
-                    }
-                    else {
+                    } else {
                         $distinct_o = strpos($match_two, "distinct");
                         $up_to_distinct_str = substr($match_two, 0, $distinct_o);
                         //check to see if the distinct is within a function, if so, then proceed as normal
                         if (strpos($up_to_distinct_str,"(")) {
                             //proceed as normal
                             $newSQL = $matches[1] . " TOP $count " . $matches[2] . $matches[3];
-                        }
-                        else {
+                        } else {
                             //if distinct is not within a function, then parse
                             //string contains distinct clause, "TOP needs to come after Distinct"
                             //get position of distinct
@@ -556,8 +560,7 @@ 
                                                 group by " . $grpByStr . "
                                         ) AS a
                                         WHERE row_number > $start";
-                        }
-                        else {
+                        } else {
                         $newSQL = "SELECT TOP $count * FROM
                                     (
                                         " . $matches[1] . " ROW_NUMBER()
@@ -566,7 +569,7 @@ 
                                     ) AS a
                                     WHERE row_number > $start";
                         }
-                    }else{
+                    } else{
                         //if there is a distinct clause, form query with rownumber after distinct
                         if ($hasDistinct) {
                              $newSQL = "SELECT TOP $count * FROM
@@ -577,8 +580,7 @@ 
                                             )
                                             AS a
                                             WHERE row_number > $start";
-                        }
-                        else {
+                        } else {
                              $newSQL = "SELECT TOP $count * FROM
                                            (
                                   " . $matches[1] . " ROW_NUMBER() OVER (ORDER BY " . $sqlArray['FROM'][0]['alias'] . ".id) AS row_number, " . $matches[2] . $matches[3]. "
@@ -617,8 +619,9 @@ 
         //strip all single quotes out
         $count = substr_count ( $p_sql, $strip_beg);
         $increment = 1;
-        if ($strip_beg != $strip_end)
-            $increment = 2;
+        if ($strip_beg != $strip_end) {
+                    $increment = 2;
+        }
 
         $i=0;
         $offset = 0;
@@ -780,9 +783,10 @@ 
     {
         $sql = strtolower($sql);
         $orig_order_match = trim($orig_order_match);
-        if (strpos($orig_order_match, ".") != 0)
-            //this has a tablename defined, pass in the order match
+        if (strpos($orig_order_match, ".") != 0) {
+                    //this has a tablename defined, pass in the order match
             return $orig_order_match;
+        }
 
         // If there is no ordering direction (ASC/DESC), use ASC by default
         if (strpos($orig_order_match, " ") === false) {
@@ -824,15 +828,15 @@ 
             //break out of here, log this
             $GLOBALS['log']->debug("No match was found for order by, pass string back untouched as: $orig_order_match");
             return $orig_order_match;
-        }
-        else {
+        } else {
             //if found, then parse and return
             //grab string up to the aliased column
             $GLOBALS['log']->debug("order by found, process sql string");
 
             $psql = (trim($this->getAliasFromSQL($sql, $orderMatch )));
-            if (empty($psql))
-                $psql = trim(substr($sql, 0, $found_in_sql));
+            if (empty($psql)) {
+                            $psql = trim(substr($sql, 0, $found_in_sql));
+            }
 
             //grab the last comma before the alias
             preg_match('/\s+' . trim($orderMatch). '/', $psql, $match, PREG_OFFSET_CAPTURE);
@@ -845,8 +849,9 @@ 
             //this is especially true for unified search from home screen
 
             $alias_beg_pos = 0;
-            if(strpos($psql, " as "))
-                $alias_beg_pos = strpos($psql, " as ");
+            if(strpos($psql, " as ")) {
+                            $alias_beg_pos = strpos($psql, " as ");
+            }
 
             // Bug # 44923 - This breaks the query and does not properly filter isnull
             // as there are other functions such as ltrim and rtrim.
@@ -883,8 +888,9 @@ 
         //correct table name.
         if (($module_str != 'Reports' && $module_str != 'SavedReport') && isset($beanList[$module_str])  &&  isset($beanFiles[$beanList[$module_str]])){
             //if the class is not already loaded, then load files
-            if (!class_exists($beanList[$module_str]))
-                require_once($beanFiles[$beanList[$module_str]]);
+            if (!class_exists($beanList[$module_str])) {
+                            require_once($beanFiles[$beanList[$module_str]]);
+            }
 
             //instantiate new bean
             $module_bean = new $beanList[$module_str]();
@@ -897,8 +903,7 @@ 
                 $GLOBALS['log']->debug("Could not find table name for module $module_str. ");
                 $tbl_name = $module_str;
             }
-        }
-        else {
+        } else {
             //since the module does NOT exist in beanlist, then we have to parse the string
             //and grab the table name from the passed in sql
             $GLOBALS['log']->debug("Could not find table name from module in request, retrieve from passed in sql");
@@ -919,8 +924,9 @@ 
                 // MFH BUG #14009: Also check to see if there are any carriage returns before the next space so that we don't grab any arbitrary joins or other tables.
                 $carriage_ret = strpos($tableEnd,"\n");
                 $next_space = strpos($tableEnd," " );
-                if ($carriage_ret < $next_space)
-                    $next_space = $carriage_ret;
+                if ($carriage_ret < $next_space) {
+                                    $next_space = $carriage_ret;
+                }
                 if ($next_space > 0) {
                     $tbl_name= substr($tableEnd,0, $next_space);
                     if(empty($tbl_name)){
@@ -943,18 +949,17 @@ 
                         || $alias_tbl_name == "outer"
                         || $alias_tbl_name == "right") {
                         //not aliased, do nothing
-                    }
-                    elseif ($alias_tbl_name == "as") {
+                    } elseif ($alias_tbl_name == "as") {
                             //the next word is the table name
                             $aliasTableEnd = trim(substr($aliasTableEnd, $alias_space));
                             $alias_space = strpos ($aliasTableEnd, " " );
                             if ($alias_space > 0) {
                                 $alias_tbl_name= trim(substr($aliasTableEnd,0, $alias_space));
-                                if (!empty($alias_tbl_name))
-                                    $tbl_name = $alias_tbl_name;
+                                if (!empty($alias_tbl_name)) {
+                                                                    $tbl_name = $alias_tbl_name;
+                                }
                             }
-                    }
-                    else {
+                    } else {
                         //this is table alias
                         $tbl_name = $alias_tbl_name;
                     }
@@ -974,16 +979,19 @@ 
 	{
 		$field_array = array();
 
-		if(! isset($result) || empty($result))
-            return 0;
+		if(! isset($result) || empty($result)) {
+		            return 0;
+		}
 
         $i = 0;
         while ($i < mssql_num_fields($result)) {
             $meta = mssql_fetch_field($result, $i);
-            if (!$meta)
-                return 0;
-            if($make_lower_case==true)
-                $meta->name = strtolower($meta->name);
+            if (!$meta) {
+                            return 0;
+            }
+            if($make_lower_case==true) {
+                            $meta->name = strtolower($meta->name);
+            }
 
             $field_array[] = $meta->name;
 
@@ -1006,7 +1014,9 @@ 
 	 */
 	public function fetchRow($result)
 	{
-		if (empty($result))	return false;
+		if (empty($result)) {
+		    return false;
+		}
 
         $row = mssql_fetch_assoc($result);
         //MSSQL returns a space " " when a varchar column is empty ("") and not null.
@@ -1088,8 +1098,9 @@ 
             $tables = array();
             $r = $this->query('SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES');
             if (is_resource($r)) {
-                while ($a = $this->fetchByAssoc($r))
-                    $tables[] = $a['TABLE_NAME'];
+                while ($a = $this->fetchByAssoc($r)) {
+                                    $tables[] = $a['TABLE_NAME'];
+                }
 
                 return $tables;
             }
@@ -1246,12 +1257,14 @@ 
      */
 	public function createTableSQLParams($tablename, $fieldDefs, $indices)
     {
-        if (empty($tablename) || empty($fieldDefs))
-            return '';
+        if (empty($tablename) || empty($fieldDefs)) {
+                    return '';
+        }
 
         $columns = $this->columnSQLRep($fieldDefs, false, $tablename);
-        if (empty($columns))
-            return '';
+        if (empty($columns)) {
+                    return '';
+        }
 
         return "CREATE TABLE $tablename ($columns)";
     }
@@ -1263,7 +1276,9 @@ 
     public function isTextType($type)
     {
         $type = strtolower($type);
-        if(!isset($this->type_map[$type])) return false;
+        if(!isset($this->type_map[$type])) {
+            return false;
+        }
         return in_array($this->type_map[$type], array('ntext','text','image', 'nvarchar(max)'));
     }
 
@@ -1316,8 +1331,9 @@ 
             $f_def  = $this->oneColumnSQLRep($def, $ignoreRequired,$tablename, true);
             $f_stmt = "ALTER COLUMN ".$f_def['name'].' '.$f_def['colType'].' '.
                         $f_def['required'].' '.$f_def['auto_increment']."\n";
-            if (!empty( $f_def['default']))
-                $f_stmt .= " ALTER TABLE " . $tablename .  " ADD  ". $f_def['default'] . " FOR " . $def['name'];
+            if (!empty( $f_def['default'])) {
+                            $f_stmt .= " ALTER TABLE " . $tablename .  " ADD  ". $f_def['default'] . " FOR " . $def['name'];
+            }
             return $f_stmt;
             break;
         default:
@@ -1355,8 +1371,7 @@ 
 
           		$columns[] = $this->alterSQLRep($action, $def, $ignoreRequired,$tablename);
       		}
-        }
-        else {
+        } else {
             //if the column is being modified drop the default value
       		//constraint if it exists. alterSQLRep will add the constraint back
       		if (!empty($constraints[$fieldDefs['name']])) {
@@ -1391,8 +1406,9 @@ 
      */
     public function setAutoIncrementStart($table, $field_name, $start_value)
     {
-        if($start_value > 1)
-            $start_value -= 1;
+        if($start_value > 1) {
+                    $start_value -= 1;
+        }
 		$this->query("DBCC CHECKIDENT ('$table', RESEED, $start_value) WITH NO_INFOMSGS");
         return true;
     }
@@ -1428,10 +1444,11 @@ 
         $indices = array();
         while (($row=$this->fetchByAssoc($result)) != null) {
             $index_type = 'index';
-            if ($row['is_primary_key'] == '1')
-                $index_type = 'primary';
-            elseif ($row['is_unique'] == 1 )
-                $index_type = 'unique';
+            if ($row['is_primary_key'] == '1') {
+                            $index_type = 'primary';
+            } elseif ($row['is_unique'] == 1 ) {
+                            $index_type = 'unique';
+            }
             $name = strtolower($row['index_name']);
             $indices[$name]['name']     = $name;
             $indices[$name]['type']     = $index_type;
@@ -1456,18 +1473,19 @@ 
             if ( $row['TYPE_NAME'] == 'decimal' ) {
                 $columns[$column_name]['len']=strtolower($row['PRECISION']);
                 $columns[$column_name]['len'].=','.strtolower($row['SCALE']);
+            } elseif ( in_array($row['TYPE_NAME'],array('nchar','nvarchar')) ) {
+							$columns[$column_name]['len']=strtolower($row['PRECISION']);
+			} elseif ( !in_array($row['TYPE_NAME'],array('datetime','text')) ) {
+                            $columns[$column_name]['len']=strtolower($row['LENGTH']);
             }
-			elseif ( in_array($row['TYPE_NAME'],array('nchar','nvarchar')) )
-				$columns[$column_name]['len']=strtolower($row['PRECISION']);
-            elseif ( !in_array($row['TYPE_NAME'],array('datetime','text')) )
-                $columns[$column_name]['len']=strtolower($row['LENGTH']);
             if ( stristr($row['TYPE_NAME'],'identity') ) {
                 $columns[$column_name]['auto_increment'] = '1';
                 $columns[$column_name]['type']=str_replace(' identity','',strtolower($row['TYPE_NAME']));
             }
 
-            if (!empty($row['IS_NULLABLE']) && $row['IS_NULLABLE'] == 'NO' && (empty($row['KEY']) || !stristr($row['KEY'],'PRI')))
-                $columns[strtolower($row['COLUMN_NAME'])]['required'] = 'true';
+            if (!empty($row['IS_NULLABLE']) && $row['IS_NULLABLE'] == 'NO' && (empty($row['KEY']) || !stristr($row['KEY'],'PRI'))) {
+                            $columns[strtolower($row['COLUMN_NAME'])]['required'] = 'true';
+            }
 
             $column_def = 1;
             if ( strtolower($tablename) == 'relationships' ) {
@@ -1476,12 +1494,13 @@ 
             if ( $column_def != 0 && ($row['COLUMN_DEF'] != null)) {	// NOTE Not using !empty as an empty string may be a viable default value.
                 $matches = array();
                 $row['COLUMN_DEF'] = html_entity_decode($row['COLUMN_DEF'],ENT_QUOTES);
-                if ( preg_match('/\([\(|\'](.*)[\)|\']\)/i',$row['COLUMN_DEF'],$matches) )
-                    $columns[$column_name]['default'] = $matches[1];
-                elseif ( preg_match('/\(N\'(.*)\'\)/i',$row['COLUMN_DEF'],$matches) )
-                    $columns[$column_name]['default'] = $matches[1];
-                else
-                    $columns[$column_name]['default'] = $row['COLUMN_DEF'];
+                if ( preg_match('/\([\(|\'](.*)[\)|\']\)/i',$row['COLUMN_DEF'],$matches) ) {
+                                    $columns[$column_name]['default'] = $matches[1];
+                } elseif ( preg_match('/\(N\'(.*)\'\)/i',$row['COLUMN_DEF'],$matches) ) {
+                                    $columns[$column_name]['default'] = $matches[1];
+                } else {
+                                    $columns[$column_name]['default'] = $row['COLUMN_DEF'];
+                }
             }
         }
         return $columns;
@@ -1513,53 +1532,61 @@ 
         // generic indices
         case 'index':
         case 'alternate_key':
-            if ($drop)
-                $sql = "DROP INDEX {$name} ON {$table}";
-            else
-                $sql = "CREATE INDEX {$name} ON {$table} ({$fields})";
+            if ($drop) {
+                            $sql = "DROP INDEX {$name} ON {$table}";
+            } else {
+                            $sql = "CREATE INDEX {$name} ON {$table} ({$fields})";
+            }
             break;
         case 'clustered':
-            if ($drop)
-                $sql = "DROP INDEX {$name} ON {$table}";
-            else
-                $sql = "CREATE CLUSTERED INDEX $name ON $table ($fields)";
+            if ($drop) {
+                            $sql = "DROP INDEX {$name} ON {$table}";
+            } else {
+                            $sql = "CREATE CLUSTERED INDEX $name ON $table ($fields)";
+            }
             break;
             // constraints as indices
         case 'unique':
-            if ($drop)
-                $sql = "ALTER TABLE {$table} DROP CONSTRAINT $name";
-            else
-                $sql = "ALTER TABLE {$table} ADD CONSTRAINT {$name} UNIQUE ({$fields})";
+            if ($drop) {
+                            $sql = "ALTER TABLE {$table} DROP CONSTRAINT $name";
+            } else {
+                            $sql = "ALTER TABLE {$table} ADD CONSTRAINT {$name} UNIQUE ({$fields})";
+            }
             break;
         case 'primary':
-            if ($drop)
-                $sql = "ALTER TABLE {$table} DROP CONSTRAINT {$name}";
-            else
-                $sql = "ALTER TABLE {$table} ADD CONSTRAINT {$name} PRIMARY KEY ({$fields})";
+            if ($drop) {
+                            $sql = "ALTER TABLE {$table} DROP CONSTRAINT {$name}";
+            } else {
+                            $sql = "ALTER TABLE {$table} ADD CONSTRAINT {$name} PRIMARY KEY ({$fields})";
+            }
             break;
         case 'foreign':
-            if ($drop)
-                $sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
-            else
-                $sql = "ALTER TABLE {$table} ADD CONSTRAINT {$name}  FOREIGN KEY ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignFields']})";
+            if ($drop) {
+                            $sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
+            } else {
+                            $sql = "ALTER TABLE {$table} ADD CONSTRAINT {$name}  FOREIGN KEY ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignFields']})";
+            }
             break;
         case 'fulltext':
             if ($this->full_text_indexing_enabled() && $drop) {
                 $sql = "DROP FULLTEXT INDEX ON {$table}";
             } elseif ($this->full_text_indexing_enabled()) {
                 $catalog_name=$this->ftsCatalogName();
-                if ( isset($definition['catalog_name']) && $definition['catalog_name'] != 'default')
-                    $catalog_name = $definition['catalog_name'];
+                if ( isset($definition['catalog_name']) && $definition['catalog_name'] != 'default') {
+                                    $catalog_name = $definition['catalog_name'];
+                }
 
                 $language = "Language 1033";
-                if (isset($definition['language']) && !empty($definition['language']))
-                    $language = "Language " . $definition['language'];
+                if (isset($definition['language']) && !empty($definition['language'])) {
+                                    $language = "Language " . $definition['language'];
+                }
 
                 $key_index = $definition['key_index'];
 
                 $change_tracking = "auto";
-                if (isset($definition['change_tracking']) && !empty($definition['change_tracking']))
-                    $change_tracking = $definition['change_tracking'];
+                if (isset($definition['change_tracking']) && !empty($definition['change_tracking'])) {
+                                    $change_tracking = $definition['change_tracking'];
+                }
 
                 $sql = " CREATE FULLTEXT INDEX ON $table ($fields $language) KEY INDEX $key_index ON $catalog_name WITH CHANGE_TRACKING $change_tracking" ;
             }
@@ -1585,12 +1612,14 @@ 
     protected function full_text_indexing_enabled($dbname = null)
     {
         // check to see if we already have install setting in session
-    	if(!isset($_SESSION['IsFulltextInstalled']))
-            $_SESSION['IsFulltextInstalled'] = $this->full_text_indexing_installed();
+    	if(!isset($_SESSION['IsFulltextInstalled'])) {
+    	            $_SESSION['IsFulltextInstalled'] = $this->full_text_indexing_installed();
+    	}
 
         // check to see if FTS Indexing service is installed
-        if(empty($_SESSION['IsFulltextInstalled']))
-            return false;
+        if(empty($_SESSION['IsFulltextInstalled'])) {
+                    return false;
+        }
 
         // grab the dbname if it was not passed through
 		if (empty($dbname)) {
@@ -1639,8 +1668,9 @@ 
     {
         static $results = array();
 
-        if ( empty($column) && isset($results[$table]) )
-            return $results[$table];
+        if ( empty($column) && isset($results[$table]) ) {
+                    return $results[$table];
+        }
 
         $query = <<<EOQ
 select s.name, o.name, c.name dtrt, d.name ctrt
@@ -1653,18 +1683,20 @@ 
             on s.schema_id = o.schema_id
     where o.name = '$table'
 EOQ;
-        if ( !empty($column) )
-            $query .= " and c.name = '$column'";
+        if ( !empty($column) ) {
+                    $query .= " and c.name = '$column'";
+        }
         $res = $this->query($query);
         if ( !empty($column) ) {
             $row = $this->fetchByAssoc($res);
-            if (!empty($row))
-                return $row['ctrt'];
-        }
-        else {
+            if (!empty($row)) {
+                            return $row['ctrt'];
+            }
+        } else {
             $returnResult = array();
-            while ( $row = $this->fetchByAssoc($res) )
-                $returnResult[$row['dtrt']] = $row['ctrt'];
+            while ( $row = $this->fetchByAssoc($res) ) {
+                            $returnResult[$row['dtrt']] = $row['ctrt'];
+            }
             $results[$table] = $returnResult;
             return $returnResult;
         }
@@ -1679,8 +1711,9 @@ 
     {
         parent::massageFieldDef($fieldDef,$tablename);
 
-        if ($fieldDef['type'] == 'int')
-            $fieldDef['len'] = '4';
+        if ($fieldDef['type'] == 'int') {
+                    $fieldDef['len'] = '4';
+        }
 
         if(empty($fieldDef['len']))
         {
@@ -1709,9 +1742,10 @@ 
         {
             $fieldDef['default'] = '0';
         }
-		if (isset($fieldDef['required']) && $fieldDef['required'] && !isset($fieldDef['default']) )
-			$fieldDef['default'] = '';
-//        if ($fieldDef['type'] == 'bit' && empty($fieldDef['len']) )
+		if (isset($fieldDef['required']) && $fieldDef['required'] && !isset($fieldDef['default']) ) {
+					$fieldDef['default'] = '';
+		}
+		//        if ($fieldDef['type'] == 'bit' && empty($fieldDef['len']) )
 //            $fieldDef['len'] = '1';
 //		if ($fieldDef['type'] == 'bool' && empty($fieldDef['len']) )
 //            $fieldDef['len'] = '1';
@@ -1755,13 +1789,15 @@ 
 		$ref = parent::oneColumnSQLRep($fieldDef, $ignoreRequired, $table, true);
 
 		// Bug 24307 - Don't add precision for float fields.
-		if ( stristr($ref['colType'],'float') )
-			$ref['colType'] = preg_replace('/(,\d+)/','',$ref['colType']);
+		if ( stristr($ref['colType'],'float') ) {
+					$ref['colType'] = preg_replace('/(,\d+)/','',$ref['colType']);
+		}
 
-        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']}";
+        }
 	}
 
     /**
@@ -1799,8 +1835,9 @@ 
      */
     protected function freeDbResult($dbResult)
     {
-        if(!empty($dbResult))
-            mssql_free_result($dbResult);
+        if(!empty($dbResult)) {
+                    mssql_free_result($dbResult);
+        }
     }
 
 	/**
@@ -1810,7 +1847,9 @@ 
     public function lastDbError()
     {
         $sqlmsg = mssql_get_last_message();
-        if(empty($sqlmsg)) return false;
+        if(empty($sqlmsg)) {
+            return false;
+        }
         global $app_strings;
         if (empty($app_strings)
 		    or !isset($app_strings['ERR_MSSQL_DB_CONTEXT'])
@@ -1833,11 +1872,11 @@ 
                 //only if connection if made before languge is set.
                 $GLOBALS['log']->debug("Ignoring this database message: " . $sqlmsg);
                 return false;
-            }
-            else {
+            } else {
                 $sqlpos = strpos($sqlmsg, $app_strings['ERR_MSSQL_DB_CONTEXT']);
-                if ( $sqlpos !== false )
-                    return false;
+                if ( $sqlpos !== false ) {
+                                    return false;
+                }
             }
         }
 
@@ -1882,8 +1921,9 @@ 
     protected function _appendN($sql)
     {
         // If there are no single quotes, don't bother, will just assume there is no character data
-        if (strpos($sql, "'") === false)
-            return $sql;
+        if (strpos($sql, "'") === false) {
+                    return $sql;
+        }
 
         // Flag if there are odd number of single quotes, just continue without trying to append N
         if ((substr_count($sql, "'") & 1)) {
@@ -1922,14 +1962,17 @@ 
             }
         }
 
-        if (!empty($replace))
-            $sql = str_replace(array_keys($replace), $replace, $sql);
+        if (!empty($replace)) {
+                    $sql = str_replace(array_keys($replace), $replace, $sql);
+        }
 
-        if (!empty($pairs))
-            $sql = str_replace(array_keys($pairs), $pairs, $sql);
+        if (!empty($pairs)) {
+                    $sql = str_replace(array_keys($pairs), $pairs, $sql);
+        }
 
-        if(strpos($sql, "<@#@#@PAIR@#@#@>"))
-            $sql = str_replace(array('<@#@#@PAIR@#@#@>'), array("''"), $sql);
+        if(strpos($sql, "<@#@#@PAIR@#@#@>")) {
+                    $sql = str_replace(array('<@#@#@PAIR@#@#@>'), array("''"), $sql);
+        }
 
         return $sql;
     }

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