adamjakab / SuiteCRM

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;
     }

install/installConfig.php

Braces +40 added lines, -26 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.
@@ -89,7 +91,9 @@ 
         $out = "<select name=\"$name\">";
         foreach($options as $key => $value) {
             $selected = '';
-            if($key==$default) $selected = ' selected="selected"';
+            if($key==$default) {
+                $selected = ' selected="selected"';
+            }
             $out .= "<option label=\"$value\" value=\"$key\"$selected>$value</option>";
         }
         $out .= "</select>";
@@ -275,8 +279,7 @@ 
                 if(!empty($value)) {
                     if(!empty($value['required'])) {
                         $form .= "<span class=\"required\">*</span>";
-                    }
-                    else {
+                    } else {
                     }
                     if(!empty($_SESSION[$name])) {
                         $sessval = $_SESSION[$name];
@@ -295,7 +298,7 @@ 
                     //if the type is password, set a hidden field to capture the value.  This is so that we can properly encode special characters, which is a limitation with password fields
                     if($type=='password'){
                         $form .= "</div><div class=\"install_block\"><label>{$mod_strings['LBL_DBCONF_TITLE_PSWD_INFO_LABEL']}</label><span>&nbsp;</span><input type='$type' name='{$name}_entry' id='{$name}_entry' value='".urldecode($sessval)."'><input type='hidden' name='$name' id='$name' value='".urldecode($sessval)."'></div><div class=\"install_block\">";
-                    }else{
+                    } else{
                         $form .= "<input type='$type' name='$name' id='$name' value='$sessval'>";
                     }
 
@@ -559,7 +562,9 @@ 
         $notify_allow_default_outbound_checked = empty($_SESSION['notify_allow_default_outbound']) ? '' : ' checked="checked" ';
 
         // set default smtp toggle buttons selected value
-        if(empty($_SESSION['smtp_tab_selected'])) $_SESSION['smtp_tab_selected'] = 'smtp_tab_other';
+        if(empty($_SESSION['smtp_tab_selected'])) {
+            $_SESSION['smtp_tab_selected'] = 'smtp_tab_other';
+        }
 
         $out .= <<<EOQ
         <div class="floatbox full" id="fb2">
@@ -1705,28 +1710,37 @@ 
 
 
 if( is_file("config.php") ){
-    if(!empty($sugar_config['default_theme']))
-        $_SESSION['site_default_theme'] = $sugar_config['default_theme'];
+    if(!empty($sugar_config['default_theme'])) {
+            $_SESSION['site_default_theme'] = $sugar_config['default_theme'];
+    }
 
-    if(!empty($sugar_config['disable_persistent_connections']))
-        $_SESSION['disable_persistent_connections'] =
+    if(!empty($sugar_config['disable_persistent_connections'])) {
+            $_SESSION['disable_persistent_connections'] =
             $sugar_config['disable_persistent_connections'];
-    if(!empty($sugar_config['default_language']))
-        $_SESSION['default_language'] = $sugar_config['default_language'];
-    if(!empty($sugar_config['translation_string_prefix']))
-        $_SESSION['translation_string_prefix'] = $sugar_config['translation_string_prefix'];
-    if(!empty($sugar_config['default_charset']))
-        $_SESSION['default_charset'] = $sugar_config['default_charset'];
-
-    if(!empty($sugar_config['default_currency_name']))
-        $_SESSION['default_currency_name'] = $sugar_config['default_currency_name'];
-    if(!empty($sugar_config['default_currency_symbol']))
-        $_SESSION['default_currency_symbol'] = $sugar_config['default_currency_symbol'];
-    if(!empty($sugar_config['default_currency_iso4217']))
-        $_SESSION['default_currency_iso4217'] = $sugar_config['default_currency_iso4217'];
-
-    if(!empty($sugar_config['rss_cache_time']))
-        $_SESSION['rss_cache_time'] = $sugar_config['rss_cache_time'];
+    }
+    if(!empty($sugar_config['default_language'])) {
+            $_SESSION['default_language'] = $sugar_config['default_language'];
+    }
+    if(!empty($sugar_config['translation_string_prefix'])) {
+            $_SESSION['translation_string_prefix'] = $sugar_config['translation_string_prefix'];
+    }
+    if(!empty($sugar_config['default_charset'])) {
+            $_SESSION['default_charset'] = $sugar_config['default_charset'];
+    }
+
+    if(!empty($sugar_config['default_currency_name'])) {
+            $_SESSION['default_currency_name'] = $sugar_config['default_currency_name'];
+    }
+    if(!empty($sugar_config['default_currency_symbol'])) {
+            $_SESSION['default_currency_symbol'] = $sugar_config['default_currency_symbol'];
+    }
+    if(!empty($sugar_config['default_currency_iso4217'])) {
+            $_SESSION['default_currency_iso4217'] = $sugar_config['default_currency_iso4217'];
+    }
+
+    if(!empty($sugar_config['rss_cache_time'])) {
+            $_SESSION['rss_cache_time'] = $sugar_config['rss_cache_time'];
+    }
     if(!empty($sugar_config['languages']))
     {
         // We need to encode the languages in a way that can be retrieved later.

include/InlineEditing/InlineEditing.php

Braces +31 added lines, -21 removed lines

@@ -75,7 +75,9 @@ 
             $vardef['type'] = 'varchar';
         }
 
-        if (isset($vardef['precision'])) unset($vardef['precision']);
+        if (isset($vardef['precision'])) {
+            unset($vardef['precision']);
+        }
 
         //$vardef['precision'] = $locale->getPrecedentPreference('default_currency_significant_digits', $current_user);
 
@@ -115,8 +117,9 @@ 
         if (isset($vardef['function'])
             && ($vardef['function'] == 'getEmailAddressWidget'
                 || $vardef['function']['name'] == 'getEmailAddressWidget')
-        )
-            unset($vardef['function']);
+        ) {
+                    unset($vardef['function']);
+        }
 
         if (isset($vardef['name']) && ($vardef['name'] == 'date_modified')) {
             $vardef['name'] = 'aow_temp_date';
@@ -149,8 +152,9 @@ 
         }
 
         // hack to disable one of the js calls in this control
-        if (isset($vardef['function']) && ($vardef['function'] == 'getCurrencyDropDown' || $vardef['function']['name'] == 'getCurrencyDropDown'))
-            $contents .= "{literal}<script>function CurrencyConvertAll() { return; }</script>{/literal}";
+        if (isset($vardef['function']) && ($vardef['function'] == 'getCurrencyDropDown' || $vardef['function']['name'] == 'getCurrencyDropDown')) {
+                    $contents .= "{literal}<script>function CurrencyConvertAll() { return; }</script>{/literal}";
+        }
 
 
 
@@ -186,8 +190,9 @@ 
     $ss->assign('CALENDAR_FDOW', $current_user->get_first_day_of_week());
 
     $fieldlist = array();
-    if (!isset($focus) || !($focus instanceof SugarBean))
-        require_once($beanFiles[$beanList[$module]]);
+    if (!isset($focus) || !($focus instanceof SugarBean)) {
+            require_once($beanFiles[$beanList[$module]]);
+    }
     $focus = new $beanList[$module];
     // create the dropdowns for the parent type fields
     $vardefFields[$fieldname] = $focus->field_defs[$fieldname];
@@ -197,11 +202,13 @@ 
     foreach ($vardefFields as $name => $properties) {
         $fieldlist[$name] = $properties;
         // fill in enums
-        if (isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($app_list_strings[$fieldlist[$name]['options']]))
-            $fieldlist[$name]['options'] = $app_list_strings[$fieldlist[$name]['options']];
+        if (isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($app_list_strings[$fieldlist[$name]['options']])) {
+                    $fieldlist[$name]['options'] = $app_list_strings[$fieldlist[$name]['options']];
+        }
         // Bug 32626: fall back on checking the mod_strings if not in the app_list_strings
-        elseif (isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($mod_strings[$fieldlist[$name]['options']]))
-            $fieldlist[$name]['options'] = $mod_strings[$fieldlist[$name]['options']];
+        elseif (isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($mod_strings[$fieldlist[$name]['options']])) {
+                    $fieldlist[$name]['options'] = $mod_strings[$fieldlist[$name]['options']];
+        }
     }
 
     // fill in function return values
@@ -209,8 +216,9 @@ 
         if (!empty($fieldlist[$fieldname]['function']['returns']) && $fieldlist[$fieldname]['function']['returns'] == 'html') {
             $function = $fieldlist[$fieldname]['function']['name'];
             // include various functions required in the various vardefs
-            if (isset($fieldlist[$fieldname]['function']['include']) && is_file($fieldlist[$fieldname]['function']['include']))
-                require_once($fieldlist[$fieldname]['function']['include']);
+            if (isset($fieldlist[$fieldname]['function']['include']) && is_file($fieldlist[$fieldname]['function']['include'])) {
+                            require_once($fieldlist[$fieldname]['function']['include']);
+            }
             $_REQUEST[$fieldname] = $value;
             $value = $function($focus, $fieldname, $value, $view);
 
@@ -308,14 +316,14 @@ 
 
         if ($bean->field_defs[$field]['type'] == "multienum") {
             $bean->$field = encodeMultienumValue($value);
-        }else if ($bean->field_defs[$field]['type'] == "relate" || $bean->field_defs[$field]['type'] == 'parent'){
+        } else if ($bean->field_defs[$field]['type'] == "relate" || $bean->field_defs[$field]['type'] == 'parent'){
             $save_field = $bean->field_defs[$field]['id_name'];
             $bean->$save_field = $value;
             if ($bean->field_defs[$field]['type'] == 'parent') {
                 $bean->parent_type = $_REQUEST['parent_type'];
                 $bean->fill_in_additional_parent_fields(); // get up to date parent info as need it to display name
             }
-        }else{
+        } else{
             $bean->$field = $value;
         }
 
@@ -450,14 +458,15 @@ 
 
         //To fix github bug 880 (the rname was null and was causing a 500 error in the getFieldValueFromModule call to $fieldname
         $fieldName = 'name';//$vardef['name'];
-        if(!is_null($vardef['rname']))
-            $fieldName = $vardef['rname'];
+        if(!is_null($vardef['rname'])) {
+                    $fieldName = $vardef['rname'];
+        }
 
         if($vardef['ext2']){
 
             $value .= getFieldValueFromModule($fieldName,$vardef['ext2'],$record) . "</a>";
 
-        }else if(!empty($vardef['rname'])){
+        } else if(!empty($vardef['rname'])){
             $value .= getFieldValueFromModule($fieldName,$vardef['module'],$record) . "</a>";
 
         } else {
@@ -472,8 +481,9 @@ 
 function getFieldValueFromModule($fieldname, $module, $id)
 {
     //Github bug 880, if the fieldname is null, do no call from bean
-    if(is_null($fieldname))
-        return '';
+    if(is_null($fieldname)) {
+            return '';
+    }
 
     $bean = BeanFactory::getBean($module, $id);
     if (is_object($bean) && $bean->id != "") {
@@ -497,7 +507,7 @@ 
 
     if($bean->ACLAccess('EditView')) {
         return true;
-    }else {
+    } else {
         return false;
     }
 }

install/performSetup.php

Braces +28 added lines, -13 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.
@@ -243,8 +245,9 @@ 
 	    $focus = new $bean();
 	}
 
-	if ( $bean == 'Configurator' )
-	    continue;
+	if ( $bean == 'Configurator' ) {
+		    continue;
+	}
 
     $table_name = $focus->table_name;
     //installStatus(sprintf($mod_strings['STAT_CREATE_DB_TABLE'], $focus->table_name ));
@@ -278,8 +281,9 @@ 
             if( $bean == "User" ){
                 $new_tables = 1;
             }
-            if($bean == "Administration")
-                $new_config = 1;
+            if($bean == "Administration") {
+                            $new_config = 1;
+            }
 
 
         }
@@ -404,8 +408,9 @@ 
     }
     if ($fp && (!isset($_SESSION['oc_install']) || $_SESSION['oc_install'] == false)) {
         @fclose($fp);
-        if ($next_step == 9999)
-            $next_step = 8;
+        if ($next_step == 9999) {
+                    $next_step = 8;
+        }
         $fpResult = <<<FP
      <form action="install.php" method="post" name="form" id="form">
      <input type="hidden" name="current_step" value="{$next_step}">
@@ -423,7 +428,7 @@ 
 
     if( isset($_SESSION['setup_site_sugarbeet_automatic_checks']) && $_SESSION['setup_site_sugarbeet_automatic_checks'] == true){
         set_CheckUpdates_config_setting('automatic');
-    }else{
+    } else{
         set_CheckUpdates_config_setting('manual');
     }
     if(!empty($_SESSION['setup_system_name'])){
@@ -554,10 +559,18 @@ 
 
 installLog('handleOverride');
 // add local settings to config overrides
-if(!empty($_SESSION['default_date_format'])) $sugar_config['default_date_format'] = $_SESSION['default_date_format'];
-if(!empty($_SESSION['default_time_format'])) $sugar_config['default_time_format'] = $_SESSION['default_time_format'];
-if(!empty($_SESSION['default_language'])) $sugar_config['default_language'] = $_SESSION['default_language'];
-if(!empty($_SESSION['default_locale_name_format'])) $sugar_config['default_locale_name_format'] = $_SESSION['default_locale_name_format'];
+if(!empty($_SESSION['default_date_format'])) {
+    $sugar_config['default_date_format'] = $_SESSION['default_date_format'];
+}
+if(!empty($_SESSION['default_time_format'])) {
+    $sugar_config['default_time_format'] = $_SESSION['default_time_format'];
+}
+if(!empty($_SESSION['default_language'])) {
+    $sugar_config['default_language'] = $_SESSION['default_language'];
+}
+if(!empty($_SESSION['default_locale_name_format'])) {
+    $sugar_config['default_locale_name_format'] = $_SESSION['default_locale_name_format'];
+}
 //$configurator->handleOverride();
 
 
@@ -638,7 +651,9 @@ 
 
 // restore superglobals and vars
 $GLOBALS = $varStack['GLOBALS'];
-foreach($varStack['defined_vars'] as $__key => $__value) $$__key = $__value;
+foreach($varStack['defined_vars'] as $__key => $__value) {
+    $$__key = $__value;
+}
 
 
 

modules/ProspectLists/ProspectList.php

Braces +42 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.
@@ -103,8 +105,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -137,19 +138,21 @@ 
 			$where_auto = '1=1';
 				if($show_deleted == 0){
                 	$where_auto = "$this->table_name.deleted=0";
-				}else if($show_deleted == 1){
+				} else if($show_deleted == 1){
                 	$where_auto = "$this->table_name.deleted=1";
 				}
 
-		if($where != "")
-			$query .= "where $where AND ".$where_auto;
-		else
-			$query .= "where ".$where_auto;
+		if($where != "") {
+					$query .= "where $where AND ".$where_auto;
+		} else {
+					$query .= "where ".$where_auto;
+		}
 
-		if($order_by != "")
-			$query .= " ORDER BY $order_by";
-		else
-			$query .= " ORDER BY prospect_lists.name";
+		if($order_by != "") {
+					$query .= " ORDER BY $order_by";
+		} else {
+					$query .= " ORDER BY prospect_lists.name";
+		}
 
 		return $query;
 	}
@@ -167,15 +170,17 @@ 
 
 		$where_auto = " prospect_lists.deleted=0";
 
-        if($where != "")
-                $query .= " WHERE $where AND ".$where_auto;
-        else
-                $query .= " WHERE ".$where_auto;
+        if($where != "") {
+                        $query .= " WHERE $where AND ".$where_auto;
+        } else {
+                        $query .= " WHERE ".$where_auto;
+        }
 
-        if($order_by != "")
-                $query .= " ORDER BY $order_by";
-        else
-                $query .= " ORDER BY prospect_lists.name";
+        if($order_by != "") {
+                        $query .= " ORDER BY $order_by";
+        } else {
+                        $query .= " ORDER BY prospect_lists.name";
+        }
         return $query;
     }
 
@@ -302,12 +307,15 @@ 
 	function save_relationship_changes($is_update, $exclude = array())
     {
     	parent::save_relationship_changes($is_update, $exclude);
-		if($this->lead_id != "")
-	   		$this->set_prospect_relationship($this->id, $this->lead_id, "lead");
-    	if($this->contact_id != "")
-    		$this->set_prospect_relationship($this->id, $this->contact_id, "contact");
-    	if($this->prospect_id != "")
-    		$this->set_prospect_relationship($this->id, $this->contact_id, "prospect");
+		if($this->lead_id != "") {
+			   		$this->set_prospect_relationship($this->id, $this->lead_id, "lead");
+		}
+    	if($this->contact_id != "") {
+    	    		$this->set_prospect_relationship($this->id, $this->contact_id, "contact");
+    	}
+    	if($this->prospect_id != "") {
+    	    		$this->set_prospect_relationship($this->id, $this->contact_id, "prospect");
+    	}
     }
 
 	function set_prospect_relationship($prospect_list_id, &$link_ids, $link_name)
@@ -365,10 +373,11 @@ 
 
 		$row = $this->db->fetchByAssoc($result);
 
-		if($row)
-			return $row['num'];
-		else
-			return 0;
+		if($row) {
+					return $row['num'];
+		} else {
+					return 0;
+		}
 	}
 
 
@@ -390,7 +399,9 @@ 
 		$the_where = "";
 		foreach($where_clauses as $clause)
 		{
-			if($the_where != "") $the_where .= " or ";
+			if($the_where != "") {
+			    $the_where .= " or ";
+			}
 			$the_where .= $clause;
 		}