adamjakab / SuiteCRM

include/database/MssqlManager.php

Indentation +156 added lines, -156 removed lines

@@ -140,8 +140,8 @@ 
             'relate'   => 'varchar',
             'multienum'=> 'text',
             'html'     => 'text',
-			'longhtml' => 'text',
-    		'datetime' => 'datetime',
+            'longhtml' => 'text',
+            'datetime' => 'datetime',
             'datetimecombo' => 'datetime',
             'time'     => 'datetime',
             'bool'     => 'bit',
@@ -156,7 +156,7 @@ 
             'url'      => 'varchar',
             'encrypt'  => 'varchar',
             'file'     => 'varchar',
-	        'decimal_tpl' => 'decimal(%d, %d)',
+            'decimal_tpl' => 'decimal(%d, %d)',
             );
 
     protected $connectOptions = null;
@@ -236,16 +236,16 @@ 
         //it will throw an Unable to select database message.
 
         if(!empty($configOptions['db_name']) && !@mssql_select_db($configOptions['db_name'], $this->database)){
-			$connected = false;
-			for($i=0;$i<5;$i++){
-				usleep(200000);
-				if(@mssql_select_db($configOptions['db_name'], $this->database)){
-					$connected = true;
-					break;
-				}
-			}
-			if(!$connected){
-			    $GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}");
+            $connected = false;
+            for($i=0;$i<5;$i++){
+                usleep(200000);
+                if(@mssql_select_db($configOptions['db_name'], $this->database)){
+                    $connected = true;
+                    break;
+                }
+            }
+            if(!$connected){
+                $GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}");
                 if($dieOnError) {
                     if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
                         sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
@@ -255,8 +255,8 @@ 
                 } else {
                     return false;
                 }
-			}
-         }
+            }
+            }
 
         if(!$this->checkError('Could Not Connect', $dieOnError))
             $GLOBALS['log']->info("connected to db");
@@ -267,18 +267,18 @@ 
         return true;
     }
 
-	/**
+    /**
      * @see DBManager::version()
      */
     public function version()
     {
         return $this->getOne("SELECT @@VERSION as version");
-	}
+    }
 
-	/**
+    /**
      * @see DBManager::query()
-	 */
-	public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
+     */
+    public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
     {
         if(is_array($sql)) {
             return $this->queryArray($sql, $dieOnError, $msg, $suppress);
@@ -287,7 +287,7 @@ 
         if ((substr_count($sql, "'") & 1))
             $GLOBALS['log']->error("SQL statement[" . $sql . "] has odd number of single quotes.");
 
-		$sql = $this->_appendN($sql);
+        $sql = $this->_appendN($sql);
 
         $GLOBALS['log']->info('Query:' . $sql);
         $this->checkConnection();
@@ -295,7 +295,7 @@ 
         $this->query_time = microtime(true);
 
         // Bug 34892 - Clear out previous error message by checking the @@ERROR global variable
-		@mssql_query("SELECT @@ERROR", $this->database);
+        @mssql_query("SELECT @@ERROR", $this->database);
 
         $result = $suppress?@mssql_query($sql, $this->database):mssql_query($sql, $this->database);
 
@@ -305,18 +305,18 @@ 
             //				  not affect the functionality of the query
             $sqlmsg = mssql_get_last_message();
             $sqlpos = strpos($sqlmsg, 'Changed database context to');
-			$sqlpos2 = strpos($sqlmsg, 'Warning:');
-			$sqlpos3 = strpos($sqlmsg, 'Checking identity information:');
+            $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
-				$GLOBALS['log']->debug($sqlmsg . ": " . $sql );
-			else {
-				$GLOBALS['log']->fatal($sqlmsg . ": " . $sql );
-				if($dieOnError)
-					sugar_die('SQL Error : ' . $sqlmsg);
-				else
-					echo 'SQL Error : ' . $sqlmsg;
-			}
+            if ($sqlpos !== false || $sqlpos2 !== false || $sqlpos3 !== false)		// if sqlmsg has 'Changed database context to', just log it
+                $GLOBALS['log']->debug($sqlmsg . ": " . $sql );
+            else {
+                $GLOBALS['log']->fatal($sqlmsg . ": " . $sql );
+                if($dieOnError)
+                    sugar_die('SQL Error : ' . $sqlmsg);
+                else
+                    echo 'SQL Error : ' . $sqlmsg;
+            }
         }
 
         $this->query_time = microtime(true) - $this->query_time;
@@ -426,8 +426,8 @@ 
         return $limitUnionSQL;
     }
 
-	/**
-	 * FIXME: verify and thoroughly test this code, these regexps look fishy
+    /**
+     * FIXME: verify and thoroughly test this code, these regexps look fishy
      * @see DBManager::limitQuery()
      */
     public function limitQuery($sql, $start, $count, $dieOnError = false, $msg = '', $execute = true)
@@ -569,7 +569,7 @@ 
                     }else{
                         //if there is a distinct clause, form query with rownumber after distinct
                         if ($hasDistinct) {
-                             $newSQL = "SELECT TOP $count * FROM
+                                $newSQL = "SELECT TOP $count * FROM
                                             (
                             SELECT ROW_NUMBER() OVER (ORDER BY ".$grpByStr.") AS row_number, count(*) counter, " . $distinctSQLARRAY[0] . "
                                                         " . $distinctSQLARRAY[1] . "
@@ -579,7 +579,7 @@ 
                                             WHERE row_number > $start";
                         }
                         else {
-                             $newSQL = "SELECT TOP $count * FROM
+                                $newSQL = "SELECT TOP $count * FROM
                                            (
                                   " . $matches[1] . " ROW_NUMBER() OVER (ORDER BY " . $sqlArray['FROM'][0]['alias'] . ".id) AS row_number, " . $matches[2] . $matches[3]. "
                                            )
@@ -626,7 +626,7 @@ 
         while ($i<$count && $offset<strlen($p_sql)) {
             if ($offset > strlen($p_sql))
             {
-				break;
+                break;
             }
 
             $beg_sin = strpos($p_sql, $strip_beg, $offset);
@@ -665,7 +665,7 @@ 
      * @param  array  $pattern_array
      * @return string
      */
-	private function addPatternToSQL($token, array $pattern_array)
+    private function addPatternToSQL($token, array $pattern_array)
     {
         //strip all single quotes out
         $pattern_array = array_reverse($pattern_array);
@@ -684,7 +684,7 @@ 
      * @param  string $alias
      * @return string
      */
-	private function getAliasFromSQL($sql, $alias)
+    private function getAliasFromSQL($sql, $alias)
     {
         $matches = array();
         preg_match('/^(.*SELECT)(.*?FROM.*WHERE)(.*)$/isU',$sql, $matches);
@@ -786,7 +786,7 @@ 
 
         // If there is no ordering direction (ASC/DESC), use ASC by default
         if (strpos($orig_order_match, " ") === false) {
-        	$orig_order_match .= " ASC";
+            $orig_order_match .= " ASC";
         }
 
         //grab first space in order by
@@ -810,11 +810,11 @@ 
                 $lastSpacePos = strrpos($containsColStr, " ");
                 //use positions of column name, space before name, and length of column to find the correct column name
                 $col_name = substr($sql, $lastSpacePos, $colMatchPos-$lastSpacePos+strlen($orderMatch));
-				//bug 25485. When sorting by a custom field in Account List and then pressing NEXT >, system gives an error
-				$containsCommaPos = strpos($col_name, ",");
-				if($containsCommaPos !== false) {
-					$col_name = substr($col_name, $containsCommaPos+1);
-				}
+                //bug 25485. When sorting by a custom field in Account List and then pressing NEXT >, system gives an error
+                $containsCommaPos = strpos($col_name, ",");
+                if($containsCommaPos !== false) {
+                    $col_name = substr($col_name, $containsCommaPos+1);
+                }
                 //add the "asc/desc" order back
                 $col_name = $col_name. " ". $asc_desc;
 
@@ -967,14 +967,14 @@ 
     }
 
 
-	/**
+    /**
      * @see DBManager::getFieldsArray()
      */
-	public function getFieldsArray($result, $make_lower_case = false)
-	{
-		$field_array = array();
+    public function getFieldsArray($result, $make_lower_case = false)
+    {
+        $field_array = array();
 
-		if(! isset($result) || empty($result))
+        if(! isset($result) || empty($result))
             return 0;
 
         $i = 0;
@@ -991,37 +991,37 @@ 
         }
 
         return $field_array;
-	}
+    }
 
     /**
      * @see DBManager::getAffectedRowCount()
      */
-	public function getAffectedRowCount($result)
+    public function getAffectedRowCount($result)
     {
         return $this->getOne("SELECT @@ROWCOUNT");
     }
 
-	/**
-	 * @see DBManager::fetchRow()
-	 */
-	public function fetchRow($result)
-	{
-		if (empty($result))	return false;
+    /**
+     * @see DBManager::fetchRow()
+     */
+    public function fetchRow($result)
+    {
+        if (empty($result))	return false;
 
         $row = mssql_fetch_assoc($result);
         //MSSQL returns a space " " when a varchar column is empty ("") and not null.
         //We need to iterate through the returned row array and strip empty spaces
         if(!empty($row)){
             foreach($row as $key => $column) {
-               //notice we only strip if one space is returned.  we do not want to strip
-               //strings with intentional spaces (" foo ")
-               if (!empty($column) && $column ==" ") {
-                   $row[$key] = '';
-               }
+                //notice we only strip if one space is returned.  we do not want to strip
+                //strings with intentional spaces (" foo ")
+                if (!empty($column) && $column ==" ") {
+                    $row[$key] = '';
+                }
             }
         }
         return $row;
-	}
+    }
 
     /**
      * @see DBManager::quote()
@@ -1069,7 +1069,7 @@ 
             if (!empty($r)) {
                 while ($a = $this->fetchByAssoc($r)) {
                     $row = array_values($a);
-					$tables[]=$row[0];
+                    $tables[]=$row[0];
                 }
                 return $tables;
             }
@@ -1126,7 +1126,7 @@ 
                 )
                 ";
                 //create full text index
-                 $FTSqry[] = "CREATE FULLTEXT INDEX ON fts_wakeup
+                    $FTSqry[] = "CREATE FULLTEXT INDEX ON fts_wakeup
                 (
                     body
                     Language 0X0
@@ -1195,7 +1195,7 @@ 
                     $len = $this->date_formats[$additional_parameters[0]];
                     return "LEFT(CONVERT(varchar($len),". $string . ",120),$len)";
                 } else {
-                   return "LEFT(CONVERT(varchar(10),". $string . ",120),10)";
+                    return "LEFT(CONVERT(varchar(10),". $string . ",120),10)";
                 }
             case 'ifnull':
                 if(empty($additional_parameters_string)) {
@@ -1237,14 +1237,14 @@ 
             case 'datetime': return substr($string, 0,19);
             case 'date': return substr($string, 0, 10);
             case 'time': return substr($string, 11);
-		}
-		return $string;
+        }
+        return $string;
     }
 
     /**
      * @see DBManager::createTableSQLParams()
      */
-	public function createTableSQLParams($tablename, $fieldDefs, $indices)
+    public function createTableSQLParams($tablename, $fieldDefs, $indices)
     {
         if (empty($tablename) || empty($fieldDefs))
             return '';
@@ -1322,7 +1322,7 @@ 
             break;
         default:
             return '';
-    	}
+        }
     }
 
     /**
@@ -1338,14 +1338,14 @@ 
         $columns = array();
         if ($this->isFieldArray($fieldDefs)) {
             foreach ($fieldDefs as $def)
-      		{
-          		//if the column is being modified drop the default value
-          		//constraint if it exists. alterSQLRep will add the constraint back
-          		if (!empty($constraints[$def['name']])) {
-          			$sql.=" ALTER TABLE " . $tablename . " DROP CONSTRAINT " . $constraints[$def['name']];
-          		}
-          		//check to see if we need to drop related indexes before the alter
-          		$indices = $this->get_indices($tablename);
+                {
+                    //if the column is being modified drop the default value
+                    //constraint if it exists. alterSQLRep will add the constraint back
+                    if (!empty($constraints[$def['name']])) {
+                        $sql.=" ALTER TABLE " . $tablename . " DROP CONSTRAINT " . $constraints[$def['name']];
+                    }
+                    //check to see if we need to drop related indexes before the alter
+                    $indices = $this->get_indices($tablename);
                 foreach ( $indices as $index ) {
                     if ( in_array($def['name'],$index['fields']) ) {
                         $sql  .= ' ' . $this->add_drop_constraint($tablename,$index,true).' ';
@@ -1353,16 +1353,16 @@ 
                     }
                 }
 
-          		$columns[] = $this->alterSQLRep($action, $def, $ignoreRequired,$tablename);
-      		}
+                    $columns[] = $this->alterSQLRep($action, $def, $ignoreRequired,$tablename);
+                }
         }
         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']])) {
-      			$sql.=" ALTER TABLE " . $tablename . " DROP CONSTRAINT " . $constraints[$fieldDefs['name']];
-      		}
-      		//check to see if we need to drop related indexes before the alter
+                //constraint if it exists. alterSQLRep will add the constraint back
+                if (!empty($constraints[$fieldDefs['name']])) {
+                    $sql.=" ALTER TABLE " . $tablename . " DROP CONSTRAINT " . $constraints[$fieldDefs['name']];
+                }
+                //check to see if we need to drop related indexes before the alter
             $indices = $this->get_indices($tablename);
             foreach ( $indices as $index ) {
                 if ( in_array($fieldDefs['name'],$index['fields']) ) {
@@ -1372,7 +1372,7 @@ 
             }
 
 
-          	$columns[] = $this->alterSQLRep($action, $fieldDefs, $ignoreRequired,$tablename);
+                $columns[] = $this->alterSQLRep($action, $fieldDefs, $ignoreRequired,$tablename);
         }
 
         $columns = implode(", ", $columns);
@@ -1383,8 +1383,8 @@ 
 
     protected function setAutoIncrement($table, $field_name)
     {
-		return "identity(1,1)";
-	}
+        return "identity(1,1)";
+    }
 
     /**
      * @see DBManager::setAutoIncrementStart()
@@ -1393,16 +1393,16 @@ 
     {
         if($start_value > 1)
             $start_value -= 1;
-		$this->query("DBCC CHECKIDENT ('$table', RESEED, $start_value) WITH NO_INFOMSGS");
+        $this->query("DBCC CHECKIDENT ('$table', RESEED, $start_value) WITH NO_INFOMSGS");
         return true;
     }
 
-	/**
+    /**
      * @see DBManager::getAutoIncrement()
      */
     public function getAutoIncrement($table, $field_name)
     {
-		$result = $this->getOne("select IDENT_CURRENT('$table') + IDENT_INCR ( '$table' ) as 'Auto_increment'");
+        $result = $this->getOne("select IDENT_CURRENT('$table') + IDENT_INCR ( '$table' ) as 'Auto_increment'");
         return $result;
     }
 
@@ -1457,8 +1457,8 @@ 
                 $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('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') ) {
@@ -1585,7 +1585,7 @@ 
     protected function full_text_indexing_enabled($dbname = null)
     {
         // check to see if we already have install setting in session
-    	if(!isset($_SESSION['IsFulltextInstalled']))
+        if(!isset($_SESSION['IsFulltextInstalled']))
             $_SESSION['IsFulltextInstalled'] = $this->full_text_indexing_installed();
 
         // check to see if FTS Indexing service is installed
@@ -1593,27 +1593,27 @@ 
             return false;
 
         // grab the dbname if it was not passed through
-		if (empty($dbname)) {
-			global $sugar_config;
-			$dbname = $sugar_config['dbconfig']['db_name'];
-		}
+        if (empty($dbname)) {
+            global $sugar_config;
+            $dbname = $sugar_config['dbconfig']['db_name'];
+        }
         //we already know that Indexing service is installed, now check
         //to see if it is enabled
-		$res = $this->getOne("SELECT DATABASEPROPERTY('$dbname', 'IsFulltextEnabled') ftext");
+        $res = $this->getOne("SELECT DATABASEPROPERTY('$dbname', 'IsFulltextEnabled') ftext");
         return !empty($res);
-	}
+    }
 
     /**
      * Creates default full text catalog
      */
-	protected function create_default_full_text_catalog()
+    protected function create_default_full_text_catalog()
     {
-		if ($this->full_text_indexing_enabled()) {
-		    $catalog = $this->ftsCatalogName();
+        if ($this->full_text_indexing_enabled()) {
+            $catalog = $this->ftsCatalogName();
             $GLOBALS['log']->debug("Creating the default catalog for full-text indexing, $catalog");
 
             //drop catalog if exists.
-			$ret = $this->query("
+            $ret = $this->query("
                 if not exists(
                     select *
                         from sys.fulltext_catalogs
@@ -1621,11 +1621,11 @@ 
                         )
                 CREATE FULLTEXT CATALOG $catalog");
 
-			if (empty($ret)) {
-				$GLOBALS['log']->error("Error creating default full-text catalog, $catalog");
-			}
-		}
-	}
+            if (empty($ret)) {
+                $GLOBALS['log']->error("Error creating default full-text catalog, $catalog");
+            }
+        }
+    }
 
     /**
      * Function returns name of the constraint automatically generated by sql-server.
@@ -1635,7 +1635,7 @@ 
      * @param  string $column
      * @return string
      */
-	private function get_field_default_constraint_name($table, $column = null)
+    private function get_field_default_constraint_name($table, $column = null)
     {
         static $results = array();
 
@@ -1670,7 +1670,7 @@ 
         }
 
         return null;
-	}
+    }
 
     /**
      * @see DBManager::massageFieldDef()
@@ -1692,7 +1692,7 @@ 
                 case 'varchar'  :
                 case 'nvarchar' :
                                   $fieldDef['len'] = $this->isTextType($fieldDef['dbType']) ? 'max' : '255';
-                                  break;
+                                    break;
                 case 'image'    : $fieldDef['len'] = '2147483647'; break;
                 case 'ntext'    : $fieldDef['len'] = '2147483646'; break;   // Note: this is from legacy code, don't know if this is correct
             }
@@ -1701,7 +1701,7 @@ 
            && empty($fieldDef['precision'])
            && !strpos($fieldDef['len'], ','))
         {
-             $fieldDef['len'] .= ',0'; // Adding 0 precision if it is not specified
+                $fieldDef['len'] .= ',0'; // Adding 0 precision if it is not specified
         }
 
         if(empty($fieldDef['default'])
@@ -1709,8 +1709,8 @@ 
         {
             $fieldDef['default'] = '0';
         }
-		if (isset($fieldDef['required']) && $fieldDef['required'] && !isset($fieldDef['default']) )
-			$fieldDef['default'] = '';
+        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']) )
@@ -1739,30 +1739,30 @@ 
      */
     protected function oneColumnSQLRep($fieldDef, $ignoreRequired = false, $table = '', $return_as_array = false)
     {
-    	//Bug 25814
-		if(isset($fieldDef['name'])){
-		    $colType = $this->getFieldType($fieldDef);
-        	if(stristr($this->getFieldType($fieldDef), 'decimal') && isset($fieldDef['len'])){
-				$fieldDef['len'] = min($fieldDef['len'],38);
-			}
-		    //bug: 39690 float(8) is interpreted as real and this generates a diff when doing repair
-			if(stristr($colType, 'float') && isset($fieldDef['len']) && $fieldDef['len'] == 8){
-				unset($fieldDef['len']);
-			}
-		}
-
-		// always return as array for post-processing
-		$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']);
+        //Bug 25814
+        if(isset($fieldDef['name'])){
+            $colType = $this->getFieldType($fieldDef);
+            if(stristr($this->getFieldType($fieldDef), 'decimal') && isset($fieldDef['len'])){
+                $fieldDef['len'] = min($fieldDef['len'],38);
+            }
+            //bug: 39690 float(8) is interpreted as real and this generates a diff when doing repair
+            if(stristr($colType, 'float') && isset($fieldDef['len']) && $fieldDef['len'] == 8){
+                unset($fieldDef['len']);
+            }
+        }
+
+        // always return as array for post-processing
+        $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 ( $return_as_array )
             return $ref;
         else
             return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
-	}
+    }
 
     /**
      * Saves changes to module's audit table
@@ -1771,13 +1771,13 @@ 
      * @param array  $changes changes
      */
     public function save_audit_records(SugarBean $bean, $changes)
-	{
-		//Bug 25078 fixed by Martin Hu: sqlserver haven't 'date' type, trim extra "00:00:00"
-		if($changes['data_type'] == 'date'){
-			$changes['before'] = str_replace(' 00:00:00','',$changes['before']);
-		}
-		parent::save_audit_records($bean,$changes);
-	}
+    {
+        //Bug 25078 fixed by Martin Hu: sqlserver haven't 'date' type, trim extra "00:00:00"
+        if($changes['data_type'] == 'date'){
+            $changes['before'] = str_replace(' 00:00:00','',$changes['before']);
+        }
+        parent::save_audit_records($bean,$changes);
+    }
 
     /**
      * Disconnects from the database
@@ -1786,7 +1786,7 @@ 
      */
     public function disconnect()
     {
-    	$GLOBALS['log']->debug('Calling Mssql::disconnect()');
+        $GLOBALS['log']->debug('Calling Mssql::disconnect()');
         if(!empty($this->database)){
             $this->freeResult();
             mssql_close($this->database);
@@ -1803,21 +1803,21 @@ 
             mssql_free_result($dbResult);
     }
 
-	/**
-	 * (non-PHPdoc)
-	 * @see DBManager::lastDbError()
-	 */
+    /**
+     * (non-PHPdoc)
+     * @see DBManager::lastDbError()
+     */
     public function lastDbError()
     {
         $sqlmsg = mssql_get_last_message();
         if(empty($sqlmsg)) return false;
         global $app_strings;
         if (empty($app_strings)
-		    or !isset($app_strings['ERR_MSSQL_DB_CONTEXT'])
-			or !isset($app_strings['ERR_MSSQL_WARNING']) ) {
+            or !isset($app_strings['ERR_MSSQL_DB_CONTEXT'])
+            or !isset($app_strings['ERR_MSSQL_WARNING']) ) {
         //ignore the message from sql-server if $app_strings array is empty. This will happen
         //only if connection if made before language is set.
-		    return false;
+            return false;
         }
 
         $sqlpos = strpos($sqlmsg, 'Changed database context to');
@@ -1826,7 +1826,7 @@ 
         if ( $sqlpos !== false || $sqlpos2 !== false || $sqlpos3 !== false ) {
             return false;
         } else {
-        	global $app_strings;
+            global $app_strings;
             //ERR_MSSQL_DB_CONTEXT: localized version of 'Changed database context to' message
             if (empty($app_strings) or !isset($app_strings['ERR_MSSQL_DB_CONTEXT'])) {
                 //ignore the message from sql-server if $app_strings array is empty. This will happen
@@ -1842,7 +1842,7 @@ 
         }
 
         if ( strlen($sqlmsg) > 2 ) {
-        	return "SQL Server error: " . $sqlmsg;
+            return "SQL Server error: " . $sqlmsg;
         }
 
         return false;
@@ -2065,7 +2065,7 @@ 
     public function installConfig()
     {
         return array(
-        	'LBL_DBCONFIG_MSG3' =>  array(
+            'LBL_DBCONFIG_MSG3' =>  array(
                 "setup_db_database_name" => array("label" => 'LBL_DBCONF_DB_NAME', "required" => true),
             ),
             'LBL_DBCONFIG_MSG2' =>  array(
@@ -2097,8 +2097,8 @@ 
      * @return string
      */
 
-	public function getGuidSQL()
+    public function getGuidSQL()
     {
-      	return 'NEWID()';
+            return 'NEWID()';
     }
 }

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

Spacing +254 added lines, -254 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -175,11 +175,11 @@ 
         ini_set('mssql.datetimeconvert', '0');
 
         //set the text size and textlimit to max number so that blob columns are not truncated
-        ini_set('mssql.textlimit','2147483647');
-        ini_set('mssql.textsize','2147483647');
-        ini_set('mssql.charset','UTF-8');
+        ini_set('mssql.textlimit', '2147483647');
+        ini_set('mssql.textsize', '2147483647');
+        ini_set('mssql.charset', 'UTF-8');
 
-        if(!empty($configOptions['db_host_instance'])) {
+        if (!empty($configOptions['db_host_instance'])) {
             $configOptions['db_host_instance'] = trim($configOptions['db_host_instance']);
         }
         //set the connections parameters
@@ -191,37 +191,37 @@ 
 
         //create persistent connection
         if ($this->getOption('persistent')) {
-            $this->database =@mssql_pconnect(
-                $connect_param ,
+            $this->database = @mssql_pconnect(
+                $connect_param,
                 $configOptions['db_user_name'],
                 $configOptions['db_password']
                 );
         }
         //if no persistent connection created, then create regular connection
-        if(!$this->database){
+        if (!$this->database) {
             $this->database = mssql_connect(
-                    $connect_param ,
+                    $connect_param,
                     $configOptions['db_user_name'],
                     $configOptions['db_password']
                     );
-            if(!$this->database){
+            if (!$this->database) {
                 $GLOBALS['log']->fatal("Could not connect to server ".$configOptions['db_host_name'].
                     " as ".$configOptions['db_user_name'].".");
-                if($dieOnError) {
+                if ($dieOnError) {
                     sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
                 } else {
                     return false;
                 }
             }
-            if($this->database && $this->getOption('persistent')){
+            if ($this->database && $this->getOption('persistent')) {
                 $_SESSION['administrator_error'] = "<B>Severe Performance Degradation: Persistent Database Connections "
                     . "not working.  Please set \$sugar_config['dbconfigoption']['persistent'] to false in your "
                     . "config.php file</B>";
             }
         }
         //make sure connection exists
-        if(!$this->database) {
-                if($dieOnError) {
+        if (!$this->database) {
+                if ($dieOnError) {
                     sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
                 } else {
                     return false;
@@ -235,19 +235,19 @@ 
         //mssql db maximum number of 5 times at the interval of .2 second. If can not connect
         //it will throw an Unable to select database message.
 
-        if(!empty($configOptions['db_name']) && !@mssql_select_db($configOptions['db_name'], $this->database)){
+        if (!empty($configOptions['db_name']) && !@mssql_select_db($configOptions['db_name'], $this->database)) {
 			$connected = false;
-			for($i=0;$i<5;$i++){
+			for ($i = 0; $i < 5; $i++) {
 				usleep(200000);
-				if(@mssql_select_db($configOptions['db_name'], $this->database)){
+				if (@mssql_select_db($configOptions['db_name'], $this->database)) {
 					$connected = true;
 					break;
 				}
 			}
-			if(!$connected){
-			    $GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}");
-                if($dieOnError) {
-                    if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
+			if (!$connected) {
+			    $GLOBALS['log']->fatal("Unable to select database {$configOptions['db_name']}");
+                if ($dieOnError) {
+                    if (isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
                         sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
                     } else {
                         sugar_die("Could not connect to the database. Please refer to suitecrm.log for details.");
@@ -258,7 +258,7 @@ 
 			}
          }
 
-        if(!$this->checkError('Could Not Connect', $dieOnError))
+        if (!$this->checkError('Could Not Connect', $dieOnError))
             $GLOBALS['log']->info("connected to db");
 
         $this->connectOptions = $configOptions;
@@ -280,16 +280,16 @@ 
 	 */
 	public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
     {
-        if(is_array($sql)) {
+        if (is_array($sql)) {
             return $this->queryArray($sql, $dieOnError, $msg, $suppress);
         }
         // 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.");
+            $GLOBALS['log']->error("SQL statement[".$sql."] has odd number of single quotes.");
 
 		$sql = $this->_appendN($sql);
 
-        $GLOBALS['log']->debug('Query:' . $sql);
+        $GLOBALS['log']->debug('Query:'.$sql);
         $this->checkConnection();
         $this->countQuery($sql);
         $this->query_time = microtime(true);
@@ -297,7 +297,7 @@ 
         // Bug 34892 - Clear out previous error message by checking the @@ERROR global variable
 		@mssql_query("SELECT @@ERROR", $this->database);
 
-        $result = $suppress?@mssql_query($sql, $this->database):mssql_query($sql, $this->database);
+        $result = $suppress ? @mssql_query($sql, $this->database) : mssql_query($sql, $this->database);
 
         if (!$result) {
             // awu Bug 10657: ignoring mssql error message 'Changed database context to' - an intermittent
@@ -309,13 +309,13 @@ 
 			$sqlpos3 = strpos($sqlmsg, 'Checking identity information:');
 
 			if ($sqlpos !== false || $sqlpos2 !== false || $sqlpos3 !== false)		// if sqlmsg has 'Changed database context to', just log it
-				$GLOBALS['log']->debug($sqlmsg . ": " . $sql );
+				$GLOBALS['log']->debug($sqlmsg.": ".$sql);
 			else {
-				$GLOBALS['log']->fatal($sqlmsg . ": " . $sql );
-				if($dieOnError)
-					sugar_die('SQL Error : ' . $sqlmsg);
+				$GLOBALS['log']->fatal($sqlmsg.": ".$sql);
+				if ($dieOnError)
+					sugar_die('SQL Error : '.$sqlmsg);
 				else
-					echo 'SQL Error : ' . $sqlmsg;
+					echo 'SQL Error : '.$sqlmsg;
 			}
         }
 
@@ -323,7 +323,7 @@ 
         $GLOBALS['log']->debug('Query Execution Time:'.$this->query_time);
 
 
-        $this->checkError($msg.' Query Failed: ' . $sql, $dieOnError);
+        $this->checkError($msg.' Query Failed: '.$sql, $dieOnError);
 
         return $result;
     }
@@ -341,14 +341,14 @@ 
     {
         //set the start to 0, no negs
         if ($start < 0)
-            $start=0;
+            $start = 0;
 
-        $GLOBALS['log']->debug(print_r(func_get_args(),true));
+        $GLOBALS['log']->debug(print_r(func_get_args(), true));
 
         $this->lastsql = $sql;
 
         //change the casing to lower for easier string comparison, and trim whitespaces
-        $sql = strtolower(trim($sql)) ;
+        $sql = strtolower(trim($sql));
 
         //set default sql
         $limitUnionSQL = $sql;
@@ -364,16 +364,16 @@ 
         $arr_count = 0;
 
         //process if there are elements
-        if ($unionOrderByCount){
+        if ($unionOrderByCount) {
             //we really want the last order by, so reconstruct string
             //adding a 1 to count, as we dont wish to process the last element
             $unionsql = '';
-            while ($unionOrderByCount>$arr_count+1) {
+            while ($unionOrderByCount > $arr_count + 1) {
                 $unionsql .= $orderByArray[$arr_count];
-                $arr_count = $arr_count+1;
+                $arr_count = $arr_count + 1;
                 //add an "order by" string back if we are coming into loop again
                 //remember they were taken out when array was created
-                if ($unionOrderByCount>$arr_count+1) {
+                if ($unionOrderByCount > $arr_count + 1) {
                     $unionsql .= "order by";
                 }
             }
@@ -403,7 +403,7 @@ 
         //so we do not want to strip the alias like in other queries.  Just add the "order by" string and
         //pass column name as is
         if ($unionOrderBy != '') {
-            $unionOrderBy = ' order by ' . $unionOrderBy;
+            $unionOrderBy = ' order by '.$unionOrderBy;
         }
 
         //Bug 56560, use top query in conjunction with rownumber() function
@@ -412,13 +412,13 @@ 
         //If not for paging, no need to use rownumber() function
         if ($count == 1 && $start == 0)
         {
-            $limitUnionSQL = "SELECT TOP $count * FROM (" .$unionsql .") as top_count ".$unionOrderBy;
+            $limitUnionSQL = "SELECT TOP $count * FROM (".$unionsql.") as top_count ".$unionOrderBy;
         }
         else
         {
             $limitUnionSQL = "SELECT TOP $count * FROM( select ROW_NUMBER() OVER ( order by "
             .$rowNumOrderBy.") AS row_number, * FROM ("
-            .$unionsql .") As numbered) "
+            .$unionsql.") As numbered) "
             . "As top_count_limit WHERE row_number > $start "
             .$unionOrderBy;
         }
@@ -437,64 +437,64 @@ 
         $newSQL = $sql;
         $distinctSQLARRAY = array();
         if (strpos($sql, "UNION") && !preg_match("/(')(UNION).?(')/i", $sql))
-            $newSQL = $this->handleUnionLimitQuery($sql,$start,$count);
+            $newSQL = $this->handleUnionLimitQuery($sql, $start, $count);
         else {
             if ($start < 0)
                 $start = 0;
-            $GLOBALS['log']->debug(print_r(func_get_args(),true));
+            $GLOBALS['log']->debug(print_r(func_get_args(), true));
             $this->lastsql = $sql;
             $matches = array();
-            preg_match('/^(.*SELECT\b)(.*?\bFROM\b.*\bWHERE\b)(.*)$/isU',$sql, $matches);
+            preg_match('/^(.*SELECT\b)(.*?\bFROM\b.*\bWHERE\b)(.*)$/isU', $sql, $matches);
             if (!empty($matches[3])) {
                 if ($start == 0) {
                     $match_two = strtolower($matches[2]);
-                    if (!strpos($match_two, "distinct")> 0 && strpos($match_two, "distinct") !==0) {
+                    if (!strpos($match_two, "distinct") > 0 && strpos($match_two, "distinct") !== 0) {
                         $orderByMatch = array();
-                        preg_match('/^(.*)(\bORDER BY\b)(.*)$/is',$matches[3], $orderByMatch);
+                        preg_match('/^(.*)(\bORDER BY\b)(.*)$/is', $matches[3], $orderByMatch);
                         if (!empty($orderByMatch[3])) {
                             $selectPart = array();
                             preg_match('/^(.*)(\bFROM\b.*)$/isU', $matches[2], $selectPart);
                             $newSQL = "SELECT TOP $count * FROM
                                 (
-                                    " . $matches[1] . $selectPart[1] . ", ROW_NUMBER()
-                                    OVER (ORDER BY " . $this->returnOrderBy($sql, $orderByMatch[3]) . ") AS row_number
-                                    " . $selectPart[2] . $orderByMatch[1]. "
+                                    ".$matches[1].$selectPart[1].", ROW_NUMBER()
+                                    OVER (ORDER BY " . $this->returnOrderBy($sql, $orderByMatch[3]).") AS row_number
+                                    " . $selectPart[2].$orderByMatch[1]."
                                 ) AS a
                                 WHERE row_number > $start";
                         }
                         else {
-                            $newSQL = $matches[1] . " TOP $count " . $matches[2] . $matches[3];
+                            $newSQL = $matches[1]." TOP $count ".$matches[2].$matches[3];
                         }
                     }
                     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,"(")) {
+                        if (strpos($up_to_distinct_str, "(")) {
                             //proceed as normal
-                            $newSQL = $matches[1] . " TOP $count " . $matches[2] . $matches[3];
+                            $newSQL = $matches[1]." TOP $count ".$matches[2].$matches[3];
                         }
                         else {
                             //if distinct is not within a function, then parse
                             //string contains distinct clause, "TOP needs to come after Distinct"
                             //get position of distinct
                             $match_zero = strtolower($matches[0]);
-                            $distinct_pos = strpos($match_zero , "distinct");
+                            $distinct_pos = strpos($match_zero, "distinct");
                             //get position of where
                             $where_pos = strpos($match_zero, "where");
                             //parse through string
-                            $beg = substr($matches[0], 0, $distinct_pos+9 );
-                            $mid = substr($matches[0], strlen($beg), ($where_pos+5) - (strlen($beg)));
-                            $end = substr($matches[0], strlen($beg) + strlen($mid) );
+                            $beg = substr($matches[0], 0, $distinct_pos + 9);
+                            $mid = substr($matches[0], strlen($beg), ($where_pos + 5) - (strlen($beg)));
+                            $end = substr($matches[0], strlen($beg) + strlen($mid));
                             //repopulate matches array
                             $matches[1] = $beg; $matches[2] = $mid; $matches[3] = $end;
 
-                            $newSQL = $matches[1] . " TOP $count " . $matches[2] . $matches[3];
+                            $newSQL = $matches[1]." TOP $count ".$matches[2].$matches[3];
                         }
                     }
                 } else {
                     $orderByMatch = array();
-                    preg_match('/^(.*)(\bORDER BY\b)(.*)$/is',$matches[3], $orderByMatch);
+                    preg_match('/^(.*)(\bORDER BY\b)(.*)$/is', $matches[3], $orderByMatch);
 
                     //if there is a distinct clause, parse sql string as we will have to insert the rownumber
                     //for paging, AFTER the distinct clause
@@ -512,8 +512,8 @@ 
 
                         //take out the select and distinct from string so we can reuse in group by
                         $dist_str = 'distinct';
-                        preg_match('/\b' . $dist_str . '\b/simU', $matches_sql, $matchesPartSQL, PREG_OFFSET_CAPTURE);
-                        $matches_sql = trim(substr($matches_sql,$matchesPartSQL[0][1] + strlen($dist_str)));
+                        preg_match('/\b'.$dist_str.'\b/simU', $matches_sql, $matchesPartSQL, PREG_OFFSET_CAPTURE);
+                        $matches_sql = trim(substr($matches_sql, $matchesPartSQL[0][1] + strlen($dist_str)));
                         //get the position of where and from for further processing
                         preg_match('/\bfrom\b/simU', $matches_sql, $matchesPartSQL, PREG_OFFSET_CAPTURE);
                         $from_pos = $matchesPartSQL[0][1];
@@ -521,17 +521,17 @@ 
                         $where_pos = $matchesPartSQL[0][1];
                         //split the sql into a string before and after the from clause
                         //we will use the columns being selected to construct the group by clause
-                        if ($from_pos>0 ) {
+                        if ($from_pos > 0) {
                             $distinctSQLARRAY[0] = substr($matches_sql, 0, $from_pos);
                             $distinctSQLARRAY[1] = substr($matches_sql, $from_pos);
                             //get position of order by (if it exists) so we can strip it from the string
                             $ob_pos = strpos($distinctSQLARRAY[1], "order by");
                             if ($ob_pos) {
-                                $distinctSQLARRAY[1] = substr($distinctSQLARRAY[1],0,$ob_pos);
+                                $distinctSQLARRAY[1] = substr($distinctSQLARRAY[1], 0, $ob_pos);
                             }
 
                             // strip off last closing parentheses from the where clause
-                            $distinctSQLARRAY[1] = preg_replace('/\)\s$/',' ',$distinctSQLARRAY[1]);
+                            $distinctSQLARRAY[1] = preg_replace('/\)\s$/', ' ', $distinctSQLARRAY[1]);
                         }
 
                         $grpByStr = array();
@@ -550,30 +550,30 @@ 
                             $newSQL = "SELECT TOP $count * FROM
                                         (
                                             SELECT ROW_NUMBER()
-                                                OVER (ORDER BY " . preg_replace('/^' . $dist_str . '\s+/', '', $this->returnOrderBy($sql, $orderByMatch[3])) . ") AS row_number,
-                                                count(*) counter, " . $distinctSQLARRAY[0] . "
-                                                " . $distinctSQLARRAY[1] . "
-                                                group by " . $grpByStr . "
+                                                OVER (ORDER BY ".preg_replace('/^'.$dist_str.'\s+/', '', $this->returnOrderBy($sql, $orderByMatch[3])).") AS row_number,
+                                                count(*) counter, " . $distinctSQLARRAY[0]."
+                                                " . $distinctSQLARRAY[1]."
+                                                group by " . $grpByStr."
                                         ) AS a
                                         WHERE row_number > $start";
                         }
                         else {
                         $newSQL = "SELECT TOP $count * FROM
                                     (
-                                        " . $matches[1] . " ROW_NUMBER()
-                                        OVER (ORDER BY " . $this->returnOrderBy($sql, $orderByMatch[3]) . ") AS row_number,
-                                        " . $matches[2] . $orderByMatch[1]. "
+                                        ".$matches[1]." ROW_NUMBER()
+                                        OVER (ORDER BY " . $this->returnOrderBy($sql, $orderByMatch[3]).") AS row_number,
+                                        " . $matches[2].$orderByMatch[1]."
                                     ) 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
                                             (
-                            SELECT ROW_NUMBER() OVER (ORDER BY ".$grpByStr.") AS row_number, count(*) counter, " . $distinctSQLARRAY[0] . "
-                                                        " . $distinctSQLARRAY[1] . "
-                                                    group by " . $grpByStr . "
+                            SELECT ROW_NUMBER() OVER (ORDER BY ".$grpByStr.") AS row_number, count(*) counter, ".$distinctSQLARRAY[0]."
+                                                        " . $distinctSQLARRAY[1]."
+                                                    group by " . $grpByStr."
                                             )
                                             AS a
                                             WHERE row_number > $start";
@@ -581,7 +581,7 @@ 
                         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]. "
+                                  ".$matches[1]." ROW_NUMBER() OVER (ORDER BY ".$sqlArray['FROM'][0]['alias'].".id) AS row_number, ".$matches[2].$matches[3]."
                                            )
                                            AS a
                                            WHERE row_number > $start";
@@ -591,9 +591,9 @@ 
             }
         }
 
-        $GLOBALS['log']->debug('Limit Query: ' . $newSQL);
-        if($execute) {
-            $result =  $this->query($newSQL, $dieOnError, $msg);
+        $GLOBALS['log']->debug('Limit Query: '.$newSQL);
+        if ($execute) {
+            $result = $this->query($newSQL, $dieOnError, $msg);
             $this->dump_slow_queries($newSQL);
             return $result;
         } else {
@@ -615,15 +615,15 @@ 
     private function removePatternFromSQL($p_sql, $strip_beg, $strip_end, $patt = 'patt')
     {
         //strip all single quotes out
-        $count = substr_count ( $p_sql, $strip_beg);
+        $count = substr_count($p_sql, $strip_beg);
         $increment = 1;
         if ($strip_beg != $strip_end)
             $increment = 2;
 
-        $i=0;
+        $i = 0;
         $offset = 0;
         $strip_array = array();
-        while ($i<$count && $offset<strlen($p_sql)) {
+        while ($i < $count && $offset < strlen($p_sql)) {
             if ($offset > strlen($p_sql))
             {
 				break;
@@ -634,23 +634,23 @@ 
             {
                 break;
             }
-            $sec_sin = strpos($p_sql, $strip_end, $beg_sin+1);
-            $strip_array[$patt.$i] = substr($p_sql, $beg_sin, $sec_sin - $beg_sin +1);
+            $sec_sin = strpos($p_sql, $strip_end, $beg_sin + 1);
+            $strip_array[$patt.$i] = substr($p_sql, $beg_sin, $sec_sin - $beg_sin + 1);
             if ($increment > 1) {
                 //we are in here because beginning and end patterns are not identical, so search for nesting
-                $exists = strpos($strip_array[$patt.$i], $strip_beg );
-                if ($exists>=0) {
-                    $nested_pos = (strrpos($strip_array[$patt.$i], $strip_beg ));
-                    $strip_array[$patt.$i] = substr($p_sql,$nested_pos+$beg_sin,$sec_sin - ($nested_pos+$beg_sin)+1);
-                    $p_sql = substr($p_sql, 0, $nested_pos+$beg_sin) . " ##". $patt.$i."## " . substr($p_sql, $sec_sin+1);
+                $exists = strpos($strip_array[$patt.$i], $strip_beg);
+                if ($exists >= 0) {
+                    $nested_pos = (strrpos($strip_array[$patt.$i], $strip_beg));
+                    $strip_array[$patt.$i] = substr($p_sql, $nested_pos + $beg_sin, $sec_sin - ($nested_pos + $beg_sin) + 1);
+                    $p_sql = substr($p_sql, 0, $nested_pos + $beg_sin)." ##".$patt.$i."## ".substr($p_sql, $sec_sin + 1);
                     $i = $i + 1;
                     continue;
                 }
             }
-            $p_len = strlen("##". $patt.$i."##");
-            $p_sql = substr($p_sql, 0, $beg_sin) . " ##". $patt.$i."## " . substr($p_sql, $sec_sin+1);
+            $p_len = strlen("##".$patt.$i."##");
+            $p_sql = substr($p_sql, 0, $beg_sin)." ##".$patt.$i."## ".substr($p_sql, $sec_sin + 1);
             //move the marker up
-            $offset = ($sec_sin-($sec_sin-$beg_sin))+$p_len+1; // Adjusting the starting point of the marker
+            $offset = ($sec_sin - ($sec_sin - $beg_sin)) + $p_len + 1; // Adjusting the starting point of the marker
 
             $i = $i + 1;
         }
@@ -672,7 +672,7 @@ 
         $pattern_array = array_reverse($pattern_array);
 
         foreach ($pattern_array as $key => $replace) {
-            $token = str_replace( " ##".$key."## ", $replace,$token);
+            $token = str_replace(" ##".$key."## ", $replace, $token);
         }
 
         return $token;
@@ -688,11 +688,11 @@ 
 	private function getAliasFromSQL($sql, $alias)
     {
         $matches = array();
-        preg_match('/^(.*SELECT)(.*?FROM.*WHERE)(.*)$/isU',$sql, $matches);
+        preg_match('/^(.*SELECT)(.*?FROM.*WHERE)(.*)$/isU', $sql, $matches);
         //parse all single and double  quotes out of array
-        $sin_array = $this->removePatternFromSQL($matches[2], "'", "'","sin_");
+        $sin_array = $this->removePatternFromSQL($matches[2], "'", "'", "sin_");
         $new_sql = array_pop($sin_array);
-        $dub_array = $this->removePatternFromSQL($new_sql, "\"", "\"","dub_");
+        $dub_array = $this->removePatternFromSQL($new_sql, "\"", "\"", "dub_");
         $new_sql = array_pop($dub_array);
 
         //search for parenthesis
@@ -701,7 +701,7 @@ 
 
         //all functions should be removed now, so split the array on commas
         $mstr_sql_array = explode(",", $new_sql);
-        foreach($mstr_sql_array as $token ) {
+        foreach ($mstr_sql_array as $token) {
             if (strpos($token, $alias)) {
                 //found token, add back comments
                 $token = $this->addPatternToSQL($token, $paren_array);
@@ -739,7 +739,7 @@ 
         $found = $found_in_sql;
 
         //if still no match found, then we need to parse through the string
-        if (!$found_in_sql){
+        if (!$found_in_sql) {
             //get count of how many times the match exists in string
             $found_count = substr_count($sql, $orderMatch);
             $i = 0;
@@ -748,21 +748,21 @@ 
             //loop through string as many times as there is a match
             while ($found_count > $i) {
                 //get the first match
-                $found_in_sql = strpos($sql, $orderMatch,$first_);
+                $found_in_sql = strpos($sql, $orderMatch, $first_);
                 //make sure there was a match
-                if($found_in_sql){
+                if ($found_in_sql) {
                     //grab the next 2 individual characters
-                    $str_plusone = substr($sql,$found_in_sql + $len,1);
-                    $str_plustwo = substr($sql,$found_in_sql + $len+1,1);
+                    $str_plusone = substr($sql, $found_in_sql + $len, 1);
+                    $str_plustwo = substr($sql, $found_in_sql + $len + 1, 1);
                     //if one of those characters is a comma, then we have our alias
-                    if ($str_plusone === "," || $str_plustwo === ","){
+                    if ($str_plusone === "," || $str_plustwo === ",") {
                         //keep track of this position
                         $found = $found_in_sql;
                     }
                 }
                 //set the offset and increase the iteration counter
-                $first_ = $found_in_sql+$len;
-                $i = $i+1;
+                $first_ = $found_in_sql + $len;
+                $i = $i + 1;
             }
         }
         //return $found, defaults have been set, so if no match was found it will be a negative number
@@ -794,8 +794,8 @@ 
         $firstSpace = strpos($orig_order_match, " ");
 
         //split order by into column name and ascending/descending
-        $orderMatch = " " . strtolower(substr($orig_order_match, 0, $firstSpace));
-        $asc_desc = trim(substr($orig_order_match,$firstSpace));
+        $orderMatch = " ".strtolower(substr($orig_order_match, 0, $firstSpace));
+        $asc_desc = trim(substr($orig_order_match, $firstSpace));
 
         //look for column name as an alias in sql string
         $found_in_sql = $this->findColumnByAlias($sql, $orderMatch);
@@ -806,18 +806,18 @@ 
             $colMatchPos = strpos($sql, $orderMatch);
             if ($colMatchPos !== false) {
                 //grab sub string up to column name
-                $containsColStr = substr($sql,0, $colMatchPos);
+                $containsColStr = substr($sql, 0, $colMatchPos);
                 //get position of first space, so we can grab table name
                 $lastSpacePos = strrpos($containsColStr, " ");
                 //use positions of column name, space before name, and length of column to find the correct column name
-                $col_name = substr($sql, $lastSpacePos, $colMatchPos-$lastSpacePos+strlen($orderMatch));
+                $col_name = substr($sql, $lastSpacePos, $colMatchPos - $lastSpacePos + strlen($orderMatch));
 				//bug 25485. When sorting by a custom field in Account List and then pressing NEXT >, system gives an error
 				$containsCommaPos = strpos($col_name, ",");
-				if($containsCommaPos !== false) {
-					$col_name = substr($col_name, $containsCommaPos+1);
+				if ($containsCommaPos !== false) {
+					$col_name = substr($col_name, $containsCommaPos + 1);
 				}
                 //add the "asc/desc" order back
-                $col_name = $col_name. " ". $asc_desc;
+                $col_name = $col_name." ".$asc_desc;
 
                 //return column name
                 return $col_name;
@@ -831,22 +831,22 @@ 
             //grab string up to the aliased column
             $GLOBALS['log']->debug("order by found, process sql string");
 
-            $psql = (trim($this->getAliasFromSQL($sql, $orderMatch )));
+            $psql = (trim($this->getAliasFromSQL($sql, $orderMatch)));
             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);
+            preg_match('/\s+'.trim($orderMatch).'/', $psql, $match, PREG_OFFSET_CAPTURE);
             $comma_pos = $match[0][1];
             //substring between the comma and the alias to find the joined_table alias and column name
-            $col_name = substr($psql,0, $comma_pos);
+            $col_name = substr($psql, 0, $comma_pos);
 
             //make sure the string does not have an end parenthesis
             //and is not part of a function (i.e. "ISNULL(leads.last_name,'') as name"  )
             //this is especially true for unified search from home screen
 
             $alias_beg_pos = 0;
-            if(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
@@ -855,13 +855,13 @@ 
                 $alias_beg_pos = strpos($psql, " "); */
 
             if ($alias_beg_pos > 0) {
-                $col_name = substr($psql,0, $alias_beg_pos );
+                $col_name = substr($psql, 0, $alias_beg_pos);
             }
             //add the "asc/desc" order back
-            $col_name = $col_name. " ". $asc_desc;
+            $col_name = $col_name." ".$asc_desc;
 
             //pass in new order by
-            $GLOBALS['log']->debug("order by being returned is " . $col_name);
+            $GLOBALS['log']->debug("order by being returned is ".$col_name);
             return $col_name;
         }
     }
@@ -877,12 +877,12 @@ 
     {
 
         global $beanList, $beanFiles;
-        $GLOBALS['log']->debug("Module being processed is " . $module_str);
+        $GLOBALS['log']->debug("Module being processed is ".$module_str);
         //get the right module files
         //the module string exists in bean list, then process bean for correct table name
         //note that we exempt the reports module from this, as queries from reporting module should be parsed for
         //correct table name.
-        if (($module_str != 'Reports' && $module_str != 'SavedReport') && isset($beanList[$module_str])  &&  isset($beanFiles[$beanList[$module_str]])){
+        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]]);
@@ -894,7 +894,7 @@ 
             //make sure table name is not just a blank space, or empty
             $tbl_name = trim($tbl_name);
 
-            if(empty($tbl_name)){
+            if (empty($tbl_name)) {
                 $GLOBALS['log']->debug("Could not find table name for module $module_str. ");
                 $tbl_name = $module_str;
             }
@@ -911,20 +911,20 @@ 
             $sql = str_replace(array("\n", "\r"), " ", $sql);
 
             //look for the location of the "from" in sql string
-            $fromLoc = strpos($sql," from " );
-            if ($fromLoc>0){
+            $fromLoc = strpos($sql, " from ");
+            if ($fromLoc > 0) {
                 //found from, substring from the " FROM " string in sql to end
-                $tableEnd = substr($sql, $fromLoc+6);
+                $tableEnd = substr($sql, $fromLoc + 6);
                 //We know that tablename will be next parameter after from, so
                 //grab the next space after table name.
                 // 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," " );
+                $carriage_ret = strpos($tableEnd, "\n");
+                $next_space = strpos($tableEnd, " ");
                 if ($carriage_ret < $next_space)
                     $next_space = $carriage_ret;
                 if ($next_space > 0) {
-                    $tbl_name= substr($tableEnd,0, $next_space);
-                    if(empty($tbl_name)){
+                    $tbl_name = substr($tableEnd, 0, $next_space);
+                    if (empty($tbl_name)) {
                         $GLOBALS['log']->debug("Could not find table name sql either, return $module_str. ");
                         $tbl_name = $module_str;
                     }
@@ -932,11 +932,11 @@ 
 
                 //grab the table, to see if it is aliased
                 $aliasTableEnd = trim(substr($tableEnd, $next_space));
-                $alias_space = strpos ($aliasTableEnd, " " );
-                if ($alias_space > 0){
-                    $alias_tbl_name= substr($aliasTableEnd,0, $alias_space);
+                $alias_space = strpos($aliasTableEnd, " ");
+                if ($alias_space > 0) {
+                    $alias_tbl_name = substr($aliasTableEnd, 0, $alias_space);
                     strtolower($alias_tbl_name);
-                    if(empty($alias_tbl_name)
+                    if (empty($alias_tbl_name)
                         || $alias_tbl_name == "where"
                         || $alias_tbl_name == "inner"
                         || $alias_tbl_name == "left"
@@ -948,9 +948,9 @@ 
                     elseif ($alias_tbl_name == "as") {
                             //the next word is the table name
                             $aliasTableEnd = trim(substr($aliasTableEnd, $alias_space));
-                            $alias_space = strpos ($aliasTableEnd, " " );
+                            $alias_space = strpos($aliasTableEnd, " ");
                             if ($alias_space > 0) {
-                                $alias_tbl_name= trim(substr($aliasTableEnd,0, $alias_space));
+                                $alias_tbl_name = trim(substr($aliasTableEnd, 0, $alias_space));
                                 if (!empty($alias_tbl_name))
                                     $tbl_name = $alias_tbl_name;
                             }
@@ -975,7 +975,7 @@ 
 	{
 		$field_array = array();
 
-		if(! isset($result) || empty($result))
+		if (!isset($result) || empty($result))
             return 0;
 
         $i = 0;
@@ -983,7 +983,7 @@ 
             $meta = mssql_fetch_field($result, $i);
             if (!$meta)
                 return 0;
-            if($make_lower_case==true)
+            if ($make_lower_case == true)
                 $meta->name = strtolower($meta->name);
 
             $field_array[] = $meta->name;
@@ -1012,11 +1012,11 @@ 
         $row = mssql_fetch_assoc($result);
         //MSSQL returns a space " " when a varchar column is empty ("") and not null.
         //We need to iterate through the returned row array and strip empty spaces
-        if(!empty($row)){
-            foreach($row as $key => $column) {
+        if (!empty($row)) {
+            foreach ($row as $key => $column) {
                //notice we only strip if one space is returned.  we do not want to strip
                //strings with intentional spaces (" foo ")
-               if (!empty($column) && $column ==" ") {
+               if (!empty($column) && $column == " ") {
                    $row[$key] = '';
                }
             }
@@ -1029,10 +1029,10 @@ 
      */
     public function quote($string)
     {
-        if(is_array($string)) {
+        if (is_array($string)) {
             return $this->arrayQuote($string);
         }
-        return str_replace("'","''", $this->quoteInternal($string));
+        return str_replace("'", "''", $this->quoteInternal($string));
     }
 
     /**
@@ -1070,7 +1070,7 @@ 
             if (!empty($r)) {
                 while ($a = $this->fetchByAssoc($r)) {
                     $row = array_values($a);
-					$tables[]=$row[0];
+					$tables[] = $row[0];
                 }
                 return $tables;
             }
@@ -1085,7 +1085,7 @@ 
     {
         $GLOBALS['log']->debug('MSSQL fetching table list');
 
-        if($this->getDatabase()) {
+        if ($this->getDatabase()) {
             $tables = array();
             $r = $this->query('SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES');
             if (is_resource($r)) {
@@ -1109,7 +1109,7 @@ 
     {
         $GLOBALS['log']->debug('MSSQL about to wakeup FTS');
 
-        if($this->getDatabase()) {
+        if ($this->getDatabase()) {
                 //create wakeup catalog
                 $FTSqry[] = "if not exists(  select * from sys.fulltext_catalogs where name ='wakeup_catalog' )
                 CREATE FULLTEXT CATALOG wakeup_catalog
@@ -1149,7 +1149,7 @@ 
                 $FTSqry[] = 'ALTER FULLTEXT INDEX ON fts_wakeup START FULL POPULATION';
                 $FTSqry[] = 'ALTER FULLTEXT INDEX ON fts_wakeup SET CHANGE_TRACKING AUTO';
 
-                foreach($FTSqry as $q){
+                foreach ($FTSqry as $q) {
                     sleep(3);
                     $this->query($q);
                 }
@@ -1172,12 +1172,12 @@ 
     {
         // convert the parameters array into a comma delimited string
         if (!empty($additional_parameters)) {
-            $additional_parameters_string = ','.implode(',',$additional_parameters);
+            $additional_parameters_string = ','.implode(',', $additional_parameters);
         } else {
             $additional_parameters_string = '';
         }
         $all_parameters = $additional_parameters;
-        if(is_array($string)) {
+        if (is_array($string)) {
             $all_parameters = array_merge($string, $all_parameters);
         } elseif (!is_null($string)) {
             array_unshift($all_parameters, $string);
@@ -1189,22 +1189,22 @@ 
             case 'left':
                 return "LEFT($string$additional_parameters_string)";
             case 'date_format':
-                if(!empty($additional_parameters[0]) && $additional_parameters[0][0] == "'") {
+                if (!empty($additional_parameters[0]) && $additional_parameters[0][0] == "'") {
                     $additional_parameters[0] = trim($additional_parameters[0], "'");
                 }
-                if(!empty($additional_parameters) && isset($this->date_formats[$additional_parameters[0]])) {
+                if (!empty($additional_parameters) && isset($this->date_formats[$additional_parameters[0]])) {
                     $len = $this->date_formats[$additional_parameters[0]];
-                    return "LEFT(CONVERT(varchar($len),". $string . ",120),$len)";
+                    return "LEFT(CONVERT(varchar($len),".$string.",120),$len)";
                 } else {
-                   return "LEFT(CONVERT(varchar(10),". $string . ",120),10)";
+                   return "LEFT(CONVERT(varchar(10),".$string.",120),10)";
                 }
             case 'ifnull':
-                if(empty($additional_parameters_string)) {
+                if (empty($additional_parameters_string)) {
                     $additional_parameters_string = ",''";
                 }
                 return "ISNULL($string$additional_parameters_string)";
             case 'concat':
-                return implode("+",$all_parameters);
+                return implode("+", $all_parameters);
             case 'text2char':
                 return "CAST($string AS varchar(8000))";
             case 'quarter':
@@ -1220,7 +1220,7 @@ 
             case 'add_tz_offset' :
                 $getUserUTCOffset = $GLOBALS['timedate']->getUserUTCOffset();
                 $operation = $getUserUTCOffset < 0 ? '-' : '+';
-                return 'DATEADD(minute, ' . $operation . abs($getUserUTCOffset) . ', ' . $string. ')';
+                return 'DATEADD(minute, '.$operation.abs($getUserUTCOffset).', '.$string.')';
             case 'avg':
                 return "avg($string)";
         }
@@ -1233,9 +1233,9 @@ 
      */
     public function fromConvert($string, $type)
     {
-        switch($type) {
+        switch ($type) {
             case 'datetimecombo':
-            case 'datetime': return substr($string, 0,19);
+            case 'datetime': return substr($string, 0, 19);
             case 'date': return substr($string, 0, 10);
             case 'time': return substr($string, 11);
 		}
@@ -1264,8 +1264,8 @@ 
     public function isTextType($type)
     {
         $type = strtolower($type);
-        if(!isset($this->type_map[$type])) return false;
-        return in_array($this->type_map[$type], array('ntext','text','image', 'nvarchar(max)'));
+        if (!isset($this->type_map[$type])) return false;
+        return in_array($this->type_map[$type], array('ntext', 'text', 'image', 'nvarchar(max)'));
     }
 
     /**
@@ -1275,13 +1275,13 @@ 
     public function emptyValue($type)
     {
         $ctype = $this->getColumnType($type);
-        if($ctype == "datetime") {
+        if ($ctype == "datetime") {
             return $this->convert($this->quoted("1970-01-01 00:00:00"), "datetime");
         }
-        if($ctype == "date") {
+        if ($ctype == "date") {
             return $this->convert($this->quoted("1970-01-01"), "datetime");
         }
-        if($ctype == "time") {
+        if ($ctype == "time") {
             return $this->convert($this->quoted("00:00:00"), "time");
         }
         return parent::emptyValue($type);
@@ -1304,21 +1304,21 @@ 
      */
     protected function alterSQLRep($action, array $def, $ignoreRequired, $tablename)
     {
-        switch($action){
+        switch ($action) {
         case 'add':
-             $f_def=$this->oneColumnSQLRep($def, $ignoreRequired,$tablename,false);
-            return "ADD " . $f_def;
+             $f_def = $this->oneColumnSQLRep($def, $ignoreRequired, $tablename, false);
+            return "ADD ".$f_def;
             break;
         case 'drop':
-            return "DROP COLUMN " . $def['name'];
+            return "DROP COLUMN ".$def['name'];
             break;
         case 'modify':
             //You cannot specify a default value for a column for MSSQL
-            $f_def  = $this->oneColumnSQLRep($def, $ignoreRequired,$tablename, true);
+            $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:
@@ -1334,7 +1334,7 @@ 
      */
     protected function changeColumnSQL($tablename, $fieldDefs, $action, $ignoreRequired = false)
     {
-        $sql=$sql2='';
+        $sql = $sql2 = '';
         $constraints = $this->get_field_default_constraint_name($tablename);
         $columns = array();
         if ($this->isFieldArray($fieldDefs)) {
@@ -1343,41 +1343,41 @@ 
           		//if the column is being modified drop the default value
           		//constraint if it exists. alterSQLRep will add the constraint back
           		if (!empty($constraints[$def['name']])) {
-          			$sql.=" ALTER TABLE " . $tablename . " DROP CONSTRAINT " . $constraints[$def['name']];
+          			$sql .= " ALTER TABLE ".$tablename." DROP CONSTRAINT ".$constraints[$def['name']];
           		}
           		//check to see if we need to drop related indexes before the alter
           		$indices = $this->get_indices($tablename);
-                foreach ( $indices as $index ) {
-                    if ( in_array($def['name'],$index['fields']) ) {
-                        $sql  .= ' ' . $this->add_drop_constraint($tablename,$index,true).' ';
-                        $sql2 .= ' ' . $this->add_drop_constraint($tablename,$index,false).' ';
+                foreach ($indices as $index) {
+                    if (in_array($def['name'], $index['fields'])) {
+                        $sql  .= ' '.$this->add_drop_constraint($tablename, $index, true).' ';
+                        $sql2 .= ' '.$this->add_drop_constraint($tablename, $index, false).' ';
                     }
                 }
 
-          		$columns[] = $this->alterSQLRep($action, $def, $ignoreRequired,$tablename);
+          		$columns[] = $this->alterSQLRep($action, $def, $ignoreRequired, $tablename);
       		}
         }
         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']])) {
-      			$sql.=" ALTER TABLE " . $tablename . " DROP CONSTRAINT " . $constraints[$fieldDefs['name']];
+      			$sql .= " ALTER TABLE ".$tablename." DROP CONSTRAINT ".$constraints[$fieldDefs['name']];
       		}
       		//check to see if we need to drop related indexes before the alter
             $indices = $this->get_indices($tablename);
-            foreach ( $indices as $index ) {
-                if ( in_array($fieldDefs['name'],$index['fields']) ) {
-                    $sql  .= ' ' . $this->add_drop_constraint($tablename,$index,true).' ';
-                    $sql2 .= ' ' . $this->add_drop_constraint($tablename,$index,false).' ';
+            foreach ($indices as $index) {
+                if (in_array($fieldDefs['name'], $index['fields'])) {
+                    $sql  .= ' '.$this->add_drop_constraint($tablename, $index, true).' ';
+                    $sql2 .= ' '.$this->add_drop_constraint($tablename, $index, false).' ';
                 }
             }
 
 
-          	$columns[] = $this->alterSQLRep($action, $fieldDefs, $ignoreRequired,$tablename);
+          	$columns[] = $this->alterSQLRep($action, $fieldDefs, $ignoreRequired, $tablename);
         }
 
         $columns = implode(", ", $columns);
-        $sql .= " ALTER TABLE $tablename $columns " . $sql2;
+        $sql .= " ALTER TABLE $tablename $columns ".$sql2;
 
         return $sql;
     }
@@ -1392,7 +1392,7 @@ 
      */
     public function setAutoIncrementStart($table, $field_name, $start_value)
     {
-        if($start_value > 1)
+        if ($start_value > 1)
             $start_value -= 1;
 		$this->query("DBCC CHECKIDENT ('$table', RESEED, $start_value) WITH NO_INFOMSGS");
         return true;
@@ -1427,11 +1427,11 @@ 
         $result = $this->query($query);
 
         $indices = array();
-        while (($row=$this->fetchByAssoc($result)) != null) {
+        while (($row = $this->fetchByAssoc($result)) != null) {
             $index_type = 'index';
             if ($row['is_primary_key'] == '1')
                 $index_type = 'primary';
-            elseif ($row['is_unique'] == 1 )
+            elseif ($row['is_unique'] == 1)
                 $index_type = 'unique';
             $name = strtolower($row['index_name']);
             $indices[$name]['name']     = $name;
@@ -1450,36 +1450,36 @@ 
         $result = $this->query("sp_columns $tablename");
 
         $columns = array();
-        while (($row=$this->fetchByAssoc($result)) !=null) {
+        while (($row = $this->fetchByAssoc($result)) != null) {
             $column_name = strtolower($row['COLUMN_NAME']);
-            $columns[$column_name]['name']=$column_name;
-            $columns[$column_name]['type']=strtolower($row['TYPE_NAME']);
-            if ( $row['TYPE_NAME'] == 'decimal' ) {
-                $columns[$column_name]['len']=strtolower($row['PRECISION']);
-                $columns[$column_name]['len'].=','.strtolower($row['SCALE']);
+            $columns[$column_name]['name'] = $column_name;
+            $columns[$column_name]['type'] = strtolower($row['TYPE_NAME']);
+            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']);
-            if ( stristr($row['TYPE_NAME'],'identity') ) {
+			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']));
+                $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')))
+            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' ) {
+            if (strtolower($tablename) == 'relationships') {
                 $column_def = $this->getOne("select cdefault from syscolumns where id = object_id('relationships') and name = '$column_name'");
             }
-            if ( $column_def != 0 && ($row['COLUMN_DEF'] != null)) {	// NOTE Not using !empty as an empty string may be a viable default value.
+            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) )
+                $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) )
+                elseif (preg_match('/\(N\'(.*)\'\)/i', $row['COLUMN_DEF'], $matches))
                     $columns[$column_name]['default'] = $matches[1];
                 else
                     $columns[$column_name]['default'] = $row['COLUMN_DEF'];
@@ -1494,7 +1494,7 @@ 
      */
     protected function ftsCatalogName()
     {
-        if(isset($this->connectOptions['db_name'])) {
+        if (isset($this->connectOptions['db_name'])) {
             return $this->connectOptions['db_name']."_fts_catalog";
         }
         return 'sugar_fts_catalog';
@@ -1506,11 +1506,11 @@ 
     public function add_drop_constraint($table, $definition, $drop = false)
     {
         $type         = $definition['type'];
-        $fields       = is_array($definition['fields'])?implode(',',$definition['fields']):$definition['fields'];
+        $fields       = is_array($definition['fields']) ? implode(',', $definition['fields']) : $definition['fields'];
         $name         = $definition['name'];
         $sql          = '';
 
-        switch ($type){
+        switch ($type) {
         // generic indices
         case 'index':
         case 'alternate_key':
@@ -1548,13 +1548,13 @@ 
             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 = $this->ftsCatalogName();
+                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'];
+                    $language = "Language ".$definition['language'];
 
                 $key_index = $definition['key_index'];
 
@@ -1562,7 +1562,7 @@ 
                 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" ;
+                $sql = " CREATE FULLTEXT INDEX ON $table ($fields $language) KEY INDEX $key_index ON $catalog_name WITH CHANGE_TRACKING $change_tracking";
             }
             break;
         }
@@ -1586,11 +1586,11 @@ 
     protected function full_text_indexing_enabled($dbname = null)
     {
         // check to see if we already have install setting in session
-    	if(!isset($_SESSION['IsFulltextInstalled']))
+    	if (!isset($_SESSION['IsFulltextInstalled']))
             $_SESSION['IsFulltextInstalled'] = $this->full_text_indexing_installed();
 
         // check to see if FTS Indexing service is installed
-        if(empty($_SESSION['IsFulltextInstalled']))
+        if (empty($_SESSION['IsFulltextInstalled']))
             return false;
 
         // grab the dbname if it was not passed through
@@ -1640,7 +1640,7 @@ 
     {
         static $results = array();
 
-        if ( empty($column) && isset($results[$table]) )
+        if (empty($column) && isset($results[$table]))
             return $results[$table];
 
         $query = <<<EOQ
@@ -1654,17 +1654,17 @@ 
             on s.schema_id = o.schema_id
     where o.name = '$table'
 EOQ;
-        if ( !empty($column) )
+        if (!empty($column))
             $query .= " and c.name = '$column'";
         $res = $this->query($query);
-        if ( !empty($column) ) {
+        if (!empty($column)) {
             $row = $this->fetchByAssoc($res);
             if (!empty($row))
                 return $row['ctrt'];
         }
         else {
             $returnResult = array();
-            while ( $row = $this->fetchByAssoc($res) )
+            while ($row = $this->fetchByAssoc($res))
                 $returnResult[$row['dtrt']] = $row['ctrt'];
             $results[$table] = $returnResult;
             return $returnResult;
@@ -1678,14 +1678,14 @@ 
      */
     public function massageFieldDef(&$fieldDef, $tablename)
     {
-        parent::massageFieldDef($fieldDef,$tablename);
+        parent::massageFieldDef($fieldDef, $tablename);
 
         if ($fieldDef['type'] == 'int')
             $fieldDef['len'] = '4';
 
-        if(empty($fieldDef['len']))
+        if (empty($fieldDef['len']))
         {
-            switch($fieldDef['type']) {
+            switch ($fieldDef['type']) {
                 case 'bit'      :
                 case 'bool'     : $fieldDef['len'] = '1'; break;
                 case 'smallint' : $fieldDef['len'] = '2'; break;
@@ -1695,22 +1695,22 @@ 
                                   $fieldDef['len'] = $this->isTextType($fieldDef['dbType']) ? 'max' : '255';
                                   break;
                 case 'image'    : $fieldDef['len'] = '2147483647'; break;
-                case 'ntext'    : $fieldDef['len'] = '2147483646'; break;   // Note: this is from legacy code, don't know if this is correct
+                case 'ntext'    : $fieldDef['len'] = '2147483646'; break; // Note: this is from legacy code, don't know if this is correct
             }
         }
-        if($fieldDef['type'] == 'decimal'
+        if ($fieldDef['type'] == 'decimal'
            && empty($fieldDef['precision'])
            && !strpos($fieldDef['len'], ','))
         {
              $fieldDef['len'] .= ',0'; // Adding 0 precision if it is not specified
         }
 
-        if(empty($fieldDef['default'])
-            && in_array($fieldDef['type'],array('bit','bool')))
+        if (empty($fieldDef['default'])
+            && in_array($fieldDef['type'], array('bit', 'bool')))
         {
             $fieldDef['default'] = '0';
         }
-		if (isset($fieldDef['required']) && $fieldDef['required'] && !isset($fieldDef['default']) )
+		if (isset($fieldDef['required']) && $fieldDef['required'] && !isset($fieldDef['default']))
 			$fieldDef['default'] = '';
 //        if ($fieldDef['type'] == 'bit' && empty($fieldDef['len']) )
 //            $fieldDef['len'] = '1';
@@ -1741,13 +1741,13 @@ 
     protected function oneColumnSQLRep($fieldDef, $ignoreRequired = false, $table = '', $return_as_array = false)
     {
     	//Bug 25814
-		if(isset($fieldDef['name'])){
+		if (isset($fieldDef['name'])) {
 		    $colType = $this->getFieldType($fieldDef);
-        	if(stristr($this->getFieldType($fieldDef), 'decimal') && isset($fieldDef['len'])){
-				$fieldDef['len'] = min($fieldDef['len'],38);
+        	if (stristr($this->getFieldType($fieldDef), 'decimal') && isset($fieldDef['len'])) {
+				$fieldDef['len'] = min($fieldDef['len'], 38);
 			}
 		    //bug: 39690 float(8) is interpreted as real and this generates a diff when doing repair
-			if(stristr($colType, 'float') && isset($fieldDef['len']) && $fieldDef['len'] == 8){
+			if (stristr($colType, 'float') && isset($fieldDef['len']) && $fieldDef['len'] == 8) {
 				unset($fieldDef['len']);
 			}
 		}
@@ -1756,10 +1756,10 @@ 
 		$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 )
+        if ($return_as_array)
             return $ref;
         else
             return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
@@ -1774,10 +1774,10 @@ 
     public function save_audit_records(SugarBean $bean, $changes)
 	{
 		//Bug 25078 fixed by Martin Hu: sqlserver haven't 'date' type, trim extra "00:00:00"
-		if($changes['data_type'] == 'date'){
-			$changes['before'] = str_replace(' 00:00:00','',$changes['before']);
+		if ($changes['data_type'] == 'date') {
+			$changes['before'] = str_replace(' 00:00:00', '', $changes['before']);
 		}
-		parent::save_audit_records($bean,$changes);
+		parent::save_audit_records($bean, $changes);
 	}
 
     /**
@@ -1788,7 +1788,7 @@ 
     public function disconnect()
     {
     	$GLOBALS['log']->debug('Calling Mssql::disconnect()');
-        if(!empty($this->database)){
+        if (!empty($this->database)) {
             $this->freeResult();
             mssql_close($this->database);
             $this->database = null;
@@ -1800,7 +1800,7 @@ 
      */
     protected function freeDbResult($dbResult)
     {
-        if(!empty($dbResult))
+        if (!empty($dbResult))
             mssql_free_result($dbResult);
     }
 
@@ -1811,11 +1811,11 @@ 
     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'])
-			or !isset($app_strings['ERR_MSSQL_WARNING']) ) {
+			or !isset($app_strings['ERR_MSSQL_WARNING'])) {
         //ignore the message from sql-server if $app_strings array is empty. This will happen
         //only if connection if made before language is set.
 		    return false;
@@ -1824,7 +1824,7 @@ 
         $sqlpos = strpos($sqlmsg, 'Changed database context to');
         $sqlpos2 = strpos($sqlmsg, 'Warning:');
         $sqlpos3 = strpos($sqlmsg, 'Checking identity information:');
-        if ( $sqlpos !== false || $sqlpos2 !== false || $sqlpos3 !== false ) {
+        if ($sqlpos !== false || $sqlpos2 !== false || $sqlpos3 !== false) {
             return false;
         } else {
         	global $app_strings;
@@ -1832,18 +1832,18 @@ 
             if (empty($app_strings) or !isset($app_strings['ERR_MSSQL_DB_CONTEXT'])) {
                 //ignore the message from sql-server if $app_strings array is empty. This will happen
                 //only if connection if made before languge is set.
-                $GLOBALS['log']->debug("Ignoring this database message: " . $sqlmsg);
+                $GLOBALS['log']->debug("Ignoring this database message: ".$sqlmsg);
                 return false;
             }
             else {
                 $sqlpos = strpos($sqlmsg, $app_strings['ERR_MSSQL_DB_CONTEXT']);
-                if ( $sqlpos !== false )
+                if ($sqlpos !== false)
                     return false;
             }
         }
 
-        if ( strlen($sqlmsg) > 2 ) {
-        	return "SQL Server error: " . $sqlmsg;
+        if (strlen($sqlmsg) > 2) {
+        	return "SQL Server error: ".$sqlmsg;
         }
 
         return false;
@@ -1864,7 +1864,7 @@ 
      */
     public function validateQuery($query)
     {
-        if(!$this->isSelect($query)) {
+        if (!$this->isSelect($query)) {
             return false;
         }
         $this->query("SET SHOWPLAN_TEXT ON");
@@ -1888,7 +1888,7 @@ 
 
         // Flag if there are odd number of single quotes, just continue without trying to append N
         if ((substr_count($sql, "'") & 1)) {
-            $GLOBALS['log']->error("SQL statement[" . $sql . "] has odd number of single quotes.");
+            $GLOBALS['log']->error("SQL statement[".$sql."] has odd number of single quotes.");
             return $sql;
         }
 
@@ -1918,7 +1918,7 @@ 
                 // We are assuming that all nvarchar columns are no more than 200 characters in length
                 // One problem we face is the image column type in reports which cannot accept nvarchar data
                 if (!empty($value) && !is_numeric(trim(str_replace(array("'", ","), "", $value))) && !preg_match('/^\'[\,]\'$/', $value)) {
-                    $replace[$value] = 'N' . trim($value, "N");
+                    $replace[$value] = 'N'.trim($value, "N");
                 }
             }
         }
@@ -1929,7 +1929,7 @@ 
         if (!empty($pairs))
             $sql = str_replace(array_keys($pairs), $pairs, $sql);
 
-        if(strpos($sql, "<@#@#@PAIR@#@#@>"))
+        if (strpos($sql, "<@#@#@PAIR@#@#@>"))
             $sql = str_replace(array('<@#@#@PAIR@#@#@>'), array("''"), $sql);
 
         return $sql;
@@ -1956,22 +1956,22 @@ 
     public function getFulltextQuery($field, $terms, $must_terms = array(), $exclude_terms = array())
     {
         $condition = $or_condition = array();
-        foreach($must_terms as $term) {
+        foreach ($must_terms as $term) {
             $condition[] = $this->quoteTerm($term);
         }
 
-        foreach($terms as $term) {
+        foreach ($terms as $term) {
             $or_condition[] = $this->quoteTerm($term);
         }
 
-        if(!empty($or_condition)) {
+        if (!empty($or_condition)) {
             $condition[] = "(".join(" | ", $or_condition).")";
         }
 
-        foreach($exclude_terms as $term) {
+        foreach ($exclude_terms as $term) {
             $condition[] = " NOT ".$this->quoteTerm($term);
         }
-        $condition = $this->quoted(join(" AND ",$condition));
+        $condition = $this->quoted(join(" AND ", $condition));
         return "CONTAINS($field, $condition)";
     }
 
@@ -2060,7 +2060,7 @@ 
     public function isDatabaseNameValid($name)
     {
         // No funny chars, does not begin with number
-        return preg_match('/^[0-9#@]+|[\"\'\*\/\\?\:\\<\>\-\ \&\!\(\)\[\]\{\}\;\,\.\`\~\|\\\\]+/', $name)==0;
+        return preg_match('/^[0-9#@]+|[\"\'\*\/\\?\:\\<\>\-\ \&\!\(\)\[\]\{\}\;\,\.\`\~\|\\\\]+/', $name) == 0;
     }
 
     public function installConfig()

modules/Users/authentication/AuthenticationController.php

Indentation +133 added lines, -133 removed lines

@@ -42,27 +42,27 @@ 
 
 class AuthenticationController
 {
-	public $loggedIn = false; //if a user has attempted to login
-	public $authenticated = false;
-	public $loginSuccess = false;// if a user has successfully logged in
+    public $loggedIn = false; //if a user has attempted to login
+    public $authenticated = false;
+    public $loginSuccess = false;// if a user has successfully logged in
 
-	protected static $authcontrollerinstance = null;
+    protected static $authcontrollerinstance = null;
 
     /**
      * @var SugarAuthenticate
      */
     public $authController;
 
-	/**
-	 * Creates an instance of the authentication controller and loads it
-	 *
-	 * @param STRING $type - the authentication Controller
-	 * @return AuthenticationController -
-	 */
-	public function __construct($type = null)
-	{
+    /**
+     * Creates an instance of the authentication controller and loads it
+     *
+     * @param STRING $type - the authentication Controller
+     * @return AuthenticationController -
+     */
+    public function __construct($type = null)
+    {
         $this->authController = $this->getAuthController($type);
-	}
+    }
 
     /**
      * Get auth controller object
@@ -81,7 +81,7 @@ 
         }
 
         // check in custom dir first, in case someone want's to override an auth controller
-		if (file_exists('custom/modules/Users/authentication/'.$type.'/' . $type . '.php')) {
+        if (file_exists('custom/modules/Users/authentication/'.$type.'/' . $type . '.php')) {
             require_once('custom/modules/Users/authentication/'.$type.'/' . $type . '.php');
         } elseif (file_exists('modules/Users/authentication/'.$type.'/' . $type . '.php')) {
             require_once('modules/Users/authentication/'.$type.'/' . $type . '.php');
@@ -98,123 +98,123 @@ 
         return new $type();
     }
 
-	/**
-	 * Returns an instance of the authentication controller
-	 *
-	 * @param string $type this is the type of authetnication you want to use default is SugarAuthenticate
-	 * @return an instance of the authetnciation controller
-	 */
-	public static function getInstance($type = null)
-	{
-		if (empty(self::$authcontrollerinstance)) {
-			self::$authcontrollerinstance = new AuthenticationController($type);
-		}
-
-		return self::$authcontrollerinstance;
-	}
-
-	/**
-	 * This function is called when a user initially tries to login.
-	 *
-	 * @param string $username
-	 * @param string $password
-	 * @param array $PARAMS
-	 * @return boolean true if the user successfully logs in or false otherwise.
-	 */
-	public function login($username, $password, $PARAMS = array())
-	{
-		//kbrill bug #13225
-		$_SESSION['loginAttempts'] = (isset($_SESSION['loginAttempts']))? $_SESSION['loginAttempts'] + 1: 1;
-		unset($GLOBALS['login_error']);
-
-		if($this->loggedIn)return $this->loginSuccess;
-		LogicHook::initialize()->call_custom_logic('Users', 'before_login');
-
-		$this->loginSuccess = $this->authController->loginAuthenticate($username, $password, false, $PARAMS);
-		$this->loggedIn = true;
-
-		if($this->loginSuccess){
-			//Ensure the user is authorized
-			checkAuthUserStatus();
-
-			//loginLicense();
-			if(!empty($GLOBALS['login_error'])){
-				unset($_SESSION['authenticated_user_id']);
-				$GLOBALS['log']->fatal('FAILED LOGIN: potential hack attempt:'.$GLOBALS['login_error']);
-				$this->loginSuccess = false;
-				return false;
-			}
-
-			//call business logic hook
-			if(isset($GLOBALS['current_user']))
-				$GLOBALS['current_user']->call_custom_logic('after_login');
-
-			// Check for running Admin Wizard
-			$config = new Administration();
-			$config->retrieveSettings();
-		    if ( is_admin($GLOBALS['current_user']) && empty($config->settings['system_adminwizard']) && $_REQUEST['action'] != 'AdminWizard' ) {
-				$GLOBALS['module'] = 'Configurator';
-				$GLOBALS['action'] = 'AdminWizard';
-				ob_clean();
-				header("Location: index.php?module=Configurator&action=AdminWizard");
-				sugar_cleanup(true);
-			}
-
-			$ut = $GLOBALS['current_user']->getPreference('ut');
-			$checkTimeZone = true;
-			if (is_array($PARAMS) && !empty($PARAMS) && isset($PARAMS['passwordEncrypted'])) {
-				$checkTimeZone = false;
-			} // if
-			if(empty($ut) && $checkTimeZone && $_REQUEST['action'] != 'SetTimezone' && $_REQUEST['action'] != 'SaveTimezone' ) {
-				$GLOBALS['module'] = 'Users';
-				$GLOBALS['action'] = 'Wizard';
-				ob_clean();
-				header("Location: index.php?module=Users&action=Wizard");
-				sugar_cleanup(true);
-			}
-		}else{
-			//kbrill bug #13225
-			LogicHook::initialize();
-			$GLOBALS['logic_hook']->call_custom_logic('Users', 'login_failed');
-			$GLOBALS['log']->fatal('FAILED LOGIN:attempts[' .$_SESSION['loginAttempts'] .'] - '. $username);
-		}
-		// if password has expired, set a session variable
-
-		return $this->loginSuccess;
-	}
-
-	/**
-	 * This is called on every page hit.
-	 * It returns true if the current session is authenticated or false otherwise
-	 *
-	 * @return booelan
-	 */
-	public function sessionAuthenticate()
-	{
-		if(!$this->authenticated){
-			$this->authenticated = $this->authController->sessionAuthenticate();
-		}
-		if($this->authenticated){
-			if(!isset($_SESSION['userStats']['pages'])){
-			    $_SESSION['userStats']['loginTime'] = time();
-			    $_SESSION['userStats']['pages'] = 0;
-			}
-			$_SESSION['userStats']['lastTime'] = time();
-			$_SESSION['userStats']['pages']++;
-
-		}
-		return $this->authenticated;
-	}
-
-	/**
-	 * Called when a user requests to logout. Should invalidate the session and redirect
-	 * to the login page.
-	 */
-	public function logout()
-	{
-		$GLOBALS['current_user']->call_custom_logic('before_logout');
-		$this->authController->logout();
-		LogicHook::initialize();
-		$GLOBALS['logic_hook']->call_custom_logic('Users', 'after_logout');
-	}
+    /**
+     * Returns an instance of the authentication controller
+     *
+     * @param string $type this is the type of authetnication you want to use default is SugarAuthenticate
+     * @return an instance of the authetnciation controller
+     */
+    public static function getInstance($type = null)
+    {
+        if (empty(self::$authcontrollerinstance)) {
+            self::$authcontrollerinstance = new AuthenticationController($type);
+        }
+
+        return self::$authcontrollerinstance;
+    }
+
+    /**
+     * This function is called when a user initially tries to login.
+     *
+     * @param string $username
+     * @param string $password
+     * @param array $PARAMS
+     * @return boolean true if the user successfully logs in or false otherwise.
+     */
+    public function login($username, $password, $PARAMS = array())
+    {
+        //kbrill bug #13225
+        $_SESSION['loginAttempts'] = (isset($_SESSION['loginAttempts']))? $_SESSION['loginAttempts'] + 1: 1;
+        unset($GLOBALS['login_error']);
+
+        if($this->loggedIn)return $this->loginSuccess;
+        LogicHook::initialize()->call_custom_logic('Users', 'before_login');
+
+        $this->loginSuccess = $this->authController->loginAuthenticate($username, $password, false, $PARAMS);
+        $this->loggedIn = true;
+
+        if($this->loginSuccess){
+            //Ensure the user is authorized
+            checkAuthUserStatus();
+
+            //loginLicense();
+            if(!empty($GLOBALS['login_error'])){
+                unset($_SESSION['authenticated_user_id']);
+                $GLOBALS['log']->fatal('FAILED LOGIN: potential hack attempt:'.$GLOBALS['login_error']);
+                $this->loginSuccess = false;
+                return false;
+            }
+
+            //call business logic hook
+            if(isset($GLOBALS['current_user']))
+                $GLOBALS['current_user']->call_custom_logic('after_login');
+
+            // Check for running Admin Wizard
+            $config = new Administration();
+            $config->retrieveSettings();
+            if ( is_admin($GLOBALS['current_user']) && empty($config->settings['system_adminwizard']) && $_REQUEST['action'] != 'AdminWizard' ) {
+                $GLOBALS['module'] = 'Configurator';
+                $GLOBALS['action'] = 'AdminWizard';
+                ob_clean();
+                header("Location: index.php?module=Configurator&action=AdminWizard");
+                sugar_cleanup(true);
+            }
+
+            $ut = $GLOBALS['current_user']->getPreference('ut');
+            $checkTimeZone = true;
+            if (is_array($PARAMS) && !empty($PARAMS) && isset($PARAMS['passwordEncrypted'])) {
+                $checkTimeZone = false;
+            } // if
+            if(empty($ut) && $checkTimeZone && $_REQUEST['action'] != 'SetTimezone' && $_REQUEST['action'] != 'SaveTimezone' ) {
+                $GLOBALS['module'] = 'Users';
+                $GLOBALS['action'] = 'Wizard';
+                ob_clean();
+                header("Location: index.php?module=Users&action=Wizard");
+                sugar_cleanup(true);
+            }
+        }else{
+            //kbrill bug #13225
+            LogicHook::initialize();
+            $GLOBALS['logic_hook']->call_custom_logic('Users', 'login_failed');
+            $GLOBALS['log']->fatal('FAILED LOGIN:attempts[' .$_SESSION['loginAttempts'] .'] - '. $username);
+        }
+        // if password has expired, set a session variable
+
+        return $this->loginSuccess;
+    }
+
+    /**
+     * This is called on every page hit.
+     * It returns true if the current session is authenticated or false otherwise
+     *
+     * @return booelan
+     */
+    public function sessionAuthenticate()
+    {
+        if(!$this->authenticated){
+            $this->authenticated = $this->authController->sessionAuthenticate();
+        }
+        if($this->authenticated){
+            if(!isset($_SESSION['userStats']['pages'])){
+                $_SESSION['userStats']['loginTime'] = time();
+                $_SESSION['userStats']['pages'] = 0;
+            }
+            $_SESSION['userStats']['lastTime'] = time();
+            $_SESSION['userStats']['pages']++;
+
+        }
+        return $this->authenticated;
+    }
+
+    /**
+     * Called when a user requests to logout. Should invalidate the session and redirect
+     * to the login page.
+     */
+    public function logout()
+    {
+        $GLOBALS['current_user']->call_custom_logic('before_logout');
+        $this->authController->logout();
+        LogicHook::initialize();
+        $GLOBALS['logic_hook']->call_custom_logic('Users', 'after_logout');
+    }
 }

Spacing +18 added lines, -18 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -44,7 +44,7 @@ 
 {
 	public $loggedIn = false; //if a user has attempted to login
 	public $authenticated = false;
-	public $loginSuccess = false;// if a user has successfully logged in
+	public $loginSuccess = false; // if a user has successfully logged in
 
 	protected static $authcontrollerinstance = null;
 
@@ -81,10 +81,10 @@ 
         }
 
         // check in custom dir first, in case someone want's to override an auth controller
-		if (file_exists('custom/modules/Users/authentication/'.$type.'/' . $type . '.php')) {
-            require_once('custom/modules/Users/authentication/'.$type.'/' . $type . '.php');
-        } elseif (file_exists('modules/Users/authentication/'.$type.'/' . $type . '.php')) {
-            require_once('modules/Users/authentication/'.$type.'/' . $type . '.php');
+		if (file_exists('custom/modules/Users/authentication/'.$type.'/'.$type.'.php')) {
+            require_once('custom/modules/Users/authentication/'.$type.'/'.$type.'.php');
+        } elseif (file_exists('modules/Users/authentication/'.$type.'/'.$type.'.php')) {
+            require_once('modules/Users/authentication/'.$type.'/'.$type.'.php');
         } else {
             require_once('modules/Users/authentication/SugarAuthenticate/SugarAuthenticate.php');
             $type = 'SugarAuthenticate';
@@ -124,21 +124,21 @@ 
 	public function login($username, $password, $PARAMS = array())
 	{
 		//kbrill bug #13225
-		$_SESSION['loginAttempts'] = (isset($_SESSION['loginAttempts']))? $_SESSION['loginAttempts'] + 1: 1;
+		$_SESSION['loginAttempts'] = (isset($_SESSION['loginAttempts'])) ? $_SESSION['loginAttempts'] + 1 : 1;
 		unset($GLOBALS['login_error']);
 
-		if($this->loggedIn)return $this->loginSuccess;
+		if ($this->loggedIn)return $this->loginSuccess;
 		LogicHook::initialize()->call_custom_logic('Users', 'before_login');
 
 		$this->loginSuccess = $this->authController->loginAuthenticate($username, $password, false, $PARAMS);
 		$this->loggedIn = true;
 
-		if($this->loginSuccess){
+		if ($this->loginSuccess) {
 			//Ensure the user is authorized
 			checkAuthUserStatus();
 
 			//loginLicense();
-			if(!empty($GLOBALS['login_error'])){
+			if (!empty($GLOBALS['login_error'])) {
 				unset($_SESSION['authenticated_user_id']);
 				$GLOBALS['log']->fatal('FAILED LOGIN: potential hack attempt:'.$GLOBALS['login_error']);
 				$this->loginSuccess = false;
@@ -146,13 +146,13 @@ 
 			}
 
 			//call business logic hook
-			if(isset($GLOBALS['current_user']))
+			if (isset($GLOBALS['current_user']))
 				$GLOBALS['current_user']->call_custom_logic('after_login');
 
 			// Check for running Admin Wizard
 			$config = new Administration();
 			$config->retrieveSettings();
-		    if ( is_admin($GLOBALS['current_user']) && empty($config->settings['system_adminwizard']) && $_REQUEST['action'] != 'AdminWizard' ) {
+		    if (is_admin($GLOBALS['current_user']) && empty($config->settings['system_adminwizard']) && $_REQUEST['action'] != 'AdminWizard') {
 				$GLOBALS['module'] = 'Configurator';
 				$GLOBALS['action'] = 'AdminWizard';
 				ob_clean();
@@ -165,18 +165,18 @@ 
 			if (is_array($PARAMS) && !empty($PARAMS) && isset($PARAMS['passwordEncrypted'])) {
 				$checkTimeZone = false;
 			} // if
-			if(empty($ut) && $checkTimeZone && $_REQUEST['action'] != 'SetTimezone' && $_REQUEST['action'] != 'SaveTimezone' ) {
+			if (empty($ut) && $checkTimeZone && $_REQUEST['action'] != 'SetTimezone' && $_REQUEST['action'] != 'SaveTimezone') {
 				$GLOBALS['module'] = 'Users';
 				$GLOBALS['action'] = 'Wizard';
 				ob_clean();
 				header("Location: index.php?module=Users&action=Wizard");
 				sugar_cleanup(true);
 			}
-		}else{
+		} else {
 			//kbrill bug #13225
 			LogicHook::initialize();
 			$GLOBALS['logic_hook']->call_custom_logic('Users', 'login_failed');
-			$GLOBALS['log']->fatal('FAILED LOGIN:attempts[' .$_SESSION['loginAttempts'] .'] - '. $username);
+			$GLOBALS['log']->fatal('FAILED LOGIN:attempts['.$_SESSION['loginAttempts'].'] - '.$username);
 		}
 		// if password has expired, set a session variable
 
@@ -191,11 +191,11 @@ 
 	 */
 	public function sessionAuthenticate()
 	{
-		if(!$this->authenticated){
+		if (!$this->authenticated) {
 			$this->authenticated = $this->authController->sessionAuthenticate();
 		}
-		if($this->authenticated){
-			if(!isset($_SESSION['userStats']['pages'])){
+		if ($this->authenticated) {
+			if (!isset($_SESSION['userStats']['pages'])) {
 			    $_SESSION['userStats']['loginTime'] = time();
 			    $_SESSION['userStats']['pages'] = 0;
 			}

install/performSetup.php

Indentation +18 added lines, -18 removed lines

@@ -156,9 +156,9 @@ 
 if(strpos($server_software,'Microsoft-IIS') !== false)
 {
     installLog("calling handleWebConfig()");
-	handleWebConfig();
+    handleWebConfig();
 } else {
-	installLog("calling handleHtaccess()");
+    installLog("calling handleHtaccess()");
     handleHtaccess();
 }
 
@@ -228,27 +228,27 @@ 
  * loop through all the Beans and create their tables
  */
 installStatus($mod_strings['STAT_CREATE_DB']);
- installLog("looping through all the Beans and create their tables");
- //start by clearing out the vardefs
- VardefManager::clearVardef();
+    installLog("looping through all the Beans and create their tables");
+    //start by clearing out the vardefs
+    VardefManager::clearVardef();
 installerHook('pre_createAllModuleTables');
 
 
 foreach( $beanFiles as $bean => $file ) {
-	$doNotInit = array('Scheduler', 'SchedulersJob', 'ProjectTask','jjwg_Maps','jjwg_Address_Cache','jjwg_Areas','jjwg_Markers');
+    $doNotInit = array('Scheduler', 'SchedulersJob', 'ProjectTask','jjwg_Maps','jjwg_Address_Cache','jjwg_Areas','jjwg_Markers');
 
-	if(in_array($bean, $doNotInit)) {
-		$focus = new $bean(false);
-	} else {
-	    $focus = new $bean();
-	}
+    if(in_array($bean, $doNotInit)) {
+        $focus = new $bean(false);
+    } else {
+        $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 ));
-     installLog("processing table ".$focus->table_name);
+        installLog("processing table ".$focus->table_name);
     // check to see if we have already setup this table
     if(!in_array($table_name, $processed_tables)) {
         if(!file_exists("modules/".$focus->module_dir."/vardefs.php")){
@@ -260,7 +260,7 @@ 
                 continue; // support new vardef definitions
             }
         } else {
-        	continue; //no further processing needed for ignored beans.
+            continue; //no further processing needed for ignored beans.
         }
 
         // table has not been setup...we will do it now and remember that
@@ -288,7 +288,7 @@ 
         installerHook('pre_createModuleTable', array('module' => $focus->getObjectName()));
         SugarBean::createRelationshipMeta($focus->getObjectName(), $db, $table_name, $empty, $focus->module_dir);
         installerHook('post_createModuleTable', array('module' => $focus->getObjectName()));
-		echo ".";
+        echo ".";
 
     } // end if()
 }
@@ -420,8 +420,8 @@ 
 
     //require_once('modules/Connectors/InstallDefaultConnectors.php');
 
-	///////////////////////////////////////////////////////////////////////////////
-	////    INSTALL PASSWORD TEMPLATES
+    ///////////////////////////////////////////////////////////////////////////////
+    ////    INSTALL PASSWORD TEMPLATES
     include('install/seed_data/Advanced_Password_SeedData.php');
 
 ///////////////////////////////////////////////////////////////////////////////

Spacing +58 added lines, -58 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -40,10 +40,10 @@ 
 
 function installStatus($msg, $cmd = null, $overwrite = false, $before = '[ok]<br>') {
     $fname = 'install/status.json';
-    if(!$overwrite && file_exists($fname)) {
+    if (!$overwrite && file_exists($fname)) {
         $stat = json_decode(file_get_contents($fname));
         //$msg = json_encode($stat);
-        $msg = $stat->message . $before . $msg;
+        $msg = $stat->message.$before.$msg;
     }
     file_put_contents($fname, json_encode(array(
         'message' => $msg,
@@ -55,10 +55,10 @@ 
 // This file will load the configuration settings from session data,
 // write to the config file, and execute any necessary database steps.
 $GLOBALS['installing'] = true;
-if( !isset( $install_script ) || !$install_script ){
+if (!isset($install_script) || !$install_script) {
     die($mod_strings['ERR_NO_DIRECT_SCRIPT']);
 }
-ini_set("output_buffering","0");
+ini_set("output_buffering", "0");
 set_time_limit(3600);
 // flush after each output so the user can see the progress in real-time
 ob_implicit_flush();
@@ -98,9 +98,9 @@ 
 $parsed_url                         = parse_url($setup_site_url);
 $setup_site_host_name               = $parsed_url['host'];
 $setup_site_log_dir                 = isset($_SESSION['setup_site_custom_log_dir']) ? $_SESSION['setup_site_log_dir'] : '.';
-$setup_site_log_file                = 'suitecrm.log';  // may be an option later
+$setup_site_log_file                = 'suitecrm.log'; // may be an option later
 $setup_site_session_path            = isset($_SESSION['setup_site_custom_session_path']) ? $_SESSION['setup_site_session_path'] : '';
-$setup_site_log_level				='fatal';
+$setup_site_log_level = 'fatal';
 
 /*sugar_cache_clear('TeamSetsCache');
 if ( file_exists($cache_dir .'modules/Teams/TeamSetCache.php') ) {
@@ -112,7 +112,7 @@ 
 	unlink($cache_dir.'modules/Teams/TeamSetMD5Cache.php');
 }*/
 $langHeader = get_language_header();
-$out =<<<EOQ
+$out = <<<EOQ
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <!DOCTYPE HTML>
 <html {$langHeader}>
@@ -153,7 +153,7 @@ 
 //handleLog4Php();
 
 $server_software = $_SERVER["SERVER_SOFTWARE"];
-if(strpos($server_software,'Microsoft-IIS') !== false)
+if (strpos($server_software, 'Microsoft-IIS') !== false)
 {
     installLog("calling handleWebConfig()");
 	handleWebConfig();
@@ -169,7 +169,7 @@ 
 echo "<br>";
 
 // create the SugarCRM database
-if($setup_db_create_database) {
+if ($setup_db_create_database) {
     installLog("calling handleDbCreateDatabase()");
     installerHook('pre_handleDbCreateDatabase');
     handleDbCreateDatabase();
@@ -193,19 +193,19 @@ 
 $ModuleInstaller->rebuild_tabledictionary();*/
 
 // create the SugarCRM database user
-if($setup_db_create_sugarsales_user){
+if ($setup_db_create_sugarsales_user) {
     installerHook('pre_handleDbCreateSugarUser');
     handleDbCreateSugarUser();
     installerHook('post_handleDbCreateSugarUser');
 }
 
-foreach( $beanFiles as $bean => $file ){
-    require_once( $file );
+foreach ($beanFiles as $bean => $file) {
+    require_once($file);
 }
 echo "<br>";
 // load up the config_override.php file.
 // This is used to provide default user settings
-if( is_file("config_override.php") ){
+if (is_file("config_override.php")) {
     require_once("config_override.php");
 }
 
@@ -219,7 +219,7 @@ 
 $new_report     = 1;
 
 // add non-module Beans to this array to keep the installer from erroring.
-$nonStandardModules = array (
+$nonStandardModules = array(
     //'Tracker',
 );
 
@@ -234,29 +234,29 @@ 
 installerHook('pre_createAllModuleTables');
 
 
-foreach( $beanFiles as $bean => $file ) {
-	$doNotInit = array('Scheduler', 'SchedulersJob', 'ProjectTask','jjwg_Maps','jjwg_Address_Cache','jjwg_Areas','jjwg_Markers');
+foreach ($beanFiles as $bean => $file) {
+	$doNotInit = array('Scheduler', 'SchedulersJob', 'ProjectTask', 'jjwg_Maps', 'jjwg_Address_Cache', 'jjwg_Areas', 'jjwg_Markers');
 
-	if(in_array($bean, $doNotInit)) {
+	if (in_array($bean, $doNotInit)) {
 		$focus = new $bean(false);
 	} else {
 	    $focus = new $bean();
 	}
 
-	if ( $bean == 'Configurator' )
+	if ($bean == 'Configurator')
 	    continue;
 
     $table_name = $focus->table_name;
     //installStatus(sprintf($mod_strings['STAT_CREATE_DB_TABLE'], $focus->table_name ));
      installLog("processing table ".$focus->table_name);
     // check to see if we have already setup this table
-    if(!in_array($table_name, $processed_tables)) {
-        if(!file_exists("modules/".$focus->module_dir."/vardefs.php")){
+    if (!in_array($table_name, $processed_tables)) {
+        if (!file_exists("modules/".$focus->module_dir."/vardefs.php")) {
             continue;
         }
-        if(!in_array($bean, $nonStandardModules)) {
+        if (!in_array($bean, $nonStandardModules)) {
             require_once("modules/".$focus->module_dir."/vardefs.php"); // load up $dictionary
-            if($dictionary[$focus->object_name]['table'] == 'does_not_exist') {
+            if ($dictionary[$focus->object_name]['table'] == 'does_not_exist') {
                 continue; // support new vardef definitions
             }
         } else {
@@ -268,17 +268,17 @@ 
 
         $focus->db->database = $db->database; // set db connection so we do not need to reconnect
 
-        if($setup_db_drop_tables) {
+        if ($setup_db_drop_tables) {
             drop_table_install($focus);
             installLog("dropping table ".$focus->table_name);
         }
 
-        if(create_table_if_not_exist($focus)) {
+        if (create_table_if_not_exist($focus)) {
             installLog("creating table ".$focus->table_name);
-            if( $bean == "User" ){
+            if ($bean == "User") {
                 $new_tables = 1;
             }
-            if($bean == "Administration")
+            if ($bean == "Administration")
                 $new_config = 1;
 
 
@@ -303,20 +303,20 @@ 
 ////    START RELATIONSHIP CREATION
 
     ksort($rel_dictionary);
-    foreach( $rel_dictionary as $rel_name => $rel_data ){
+    foreach ($rel_dictionary as $rel_name => $rel_data) {
         $table = $rel_data['table'];
 
-        if( $setup_db_drop_tables ){
-            if( $db->tableExists($table) ){
+        if ($setup_db_drop_tables) {
+            if ($db->tableExists($table)) {
                 $db->dropTableName($table);
             }
         }
 
-        if( !$db->tableExists($table) ){
+        if (!$db->tableExists($table)) {
             $db->createTableParams($table, $rel_data['fields'], $rel_data['indices']);
         }
 
-        SugarBean::createRelationshipMeta($rel_name,$db,$table,$rel_dictionary,'');
+        SugarBean::createRelationshipMeta($rel_name, $db, $table, $rel_dictionary, '');
     }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -376,7 +376,7 @@ 
 
 ///////////////////////////////////////////////////////////////////////////
 ////    FINALIZE LANG PACK INSTALL
-    if(isset($_SESSION['INSTALLED_LANG_PACKS']) && is_array($_SESSION['INSTALLED_LANG_PACKS']) && !empty($_SESSION['INSTALLED_LANG_PACKS'])) {
+    if (isset($_SESSION['INSTALLED_LANG_PACKS']) && is_array($_SESSION['INSTALLED_LANG_PACKS']) && !empty($_SESSION['INSTALLED_LANG_PACKS'])) {
         updateUpgradeHistory();
     }
 
@@ -393,7 +393,7 @@ 
 
     $memoryUsed = '';
     if (function_exists('memory_get_usage')) {
-        $memoryUsed = $mod_strings['LBL_PERFORM_OUTRO_5'] . memory_get_usage() . $mod_strings['LBL_PERFORM_OUTRO_6'];
+        $memoryUsed = $mod_strings['LBL_PERFORM_OUTRO_5'].memory_get_usage().$mod_strings['LBL_PERFORM_OUTRO_6'];
     }
 
 
@@ -421,14 +421,14 @@ 
 FP;
     }
 
-    if( isset($_SESSION['setup_site_sugarbeet_automatic_checks']) && $_SESSION['setup_site_sugarbeet_automatic_checks'] == true){
+    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'])){
-        $admin=new Administration();
-        $admin->saveSetting('system','name',$_SESSION['setup_system_name']);
+    if (!empty($_SESSION['setup_system_name'])) {
+        $admin = new Administration();
+        $admin->saveSetting('system', 'name', $_SESSION['setup_system_name']);
     }
 
     // Bug 28601 - Set the default list of tabs to show
@@ -490,16 +490,16 @@ 
 
 // populating the db with seed data
 installLog("populating the db with seed data");
-if( $_SESSION['demoData'] != 'no' ){
+if ($_SESSION['demoData'] != 'no') {
     installerHook('pre_installDemoData');
-    set_time_limit( 301 );
+    set_time_limit(301);
 
     echo "<br>";
     echo "<b>{$mod_strings['LBL_PERFORM_DEMO_DATA']}</b>";
     echo "<br><br>";
 
-    print( $render_table_close );
-    print( $render_table_open );
+    print($render_table_close);
+    print($render_table_open);
 
     global $current_user;
     $current_user = new User();
@@ -539,7 +539,7 @@ 
 //$focus->retrieveSettings();
 // switch off the adminwizard (mark that we have got past this point)
 installLog('AdminWizard OFF');
-$focus->saveSetting('system','adminwizard',1);
+$focus->saveSetting('system', 'adminwizard', 1);
 
 installLog('saveConfig');
 $focus->saveConfig();
@@ -554,10 +554,10 @@ 
 
 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();
 
 
@@ -576,9 +576,9 @@ 
 $currency = new Currency;
 installLog('retrieve');
 $currency->retrieve($currency->retrieve_id_by_name($_REQUEST['default_currency_name']));
-if ( !empty($currency->id)
+if (!empty($currency->id)
     && $currency->symbol == $_REQUEST['default_currency_symbol']
-    && $currency->iso4217 == $_REQUEST['default_currency_iso4217'] ) {
+    && $currency->iso4217 == $_REQUEST['default_currency_iso4217']) {
     $currency->deleted = 1;
     installLog('DBG: save currency');
     $currency->save();
@@ -601,7 +601,7 @@ 
 $sugar_config = get_sugar_config_defaults();
 
 // set local settings -  if neccessary you can set here more fields as named in User module / EditView form...
-if(isset($_REQUEST['timezone']) && $_REQUEST['timezone']) {
+if (isset($_REQUEST['timezone']) && $_REQUEST['timezone']) {
     $current_user->setPreference('timezone', $_REQUEST['timezone']);
 }
 
@@ -620,7 +620,7 @@ 
 //$_POST[''] = $_REQUEST['export_delimiter'];
 
 $_POST['record'] = $current_user->id;
-$_POST['is_admin'] = ( $current_user->is_admin ? 'on' : '' );
+$_POST['is_admin'] = ($current_user->is_admin ? 'on' : '');
 $_POST['use_real_names'] = true;
 $_POST['reminder_checked'] = '1';
 $_POST['reminder_time'] = 1800;
@@ -628,7 +628,7 @@ 
 $_POST['mailmerge_on'] = 'on';
 $_POST['receive_notifications'] = $current_user->receive_notifications;
 installLog('DBG: SugarThemeRegistry::getDefault');
-$_POST['user_theme'] = (string) SugarThemeRegistry::getDefault();
+$_POST['user_theme'] = (string)SugarThemeRegistry::getDefault();
 
 // save and redirect to new view
 $_REQUEST['return_module'] = 'Home';
@@ -638,15 +638,15 @@ 
 
 // 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;
 
 
 
 $endTime = microtime(true);
 $deltaTime = $endTime - $startTime;
 
-if( count( $bottle ) > 0 ){
-    foreach( $bottle as $bottle_message ){
+if (count($bottle) > 0) {
+    foreach ($bottle as $bottle_message) {
         $bottleMsg .= "{$bottle_message}\n";
     }
 } else {
@@ -654,7 +654,7 @@ 
 }
 installerHook('post_installModules');
 
-$out =<<<EOQ
+$out = <<<EOQ
 <br><p><b>{$mod_strings['LBL_PERFORM_OUTRO_1']} {$setup_sugar_version} {$mod_strings['LBL_PERFORM_OUTRO_2']}</b></p>
 
 {$mod_strings['LBL_PERFORM_OUTRO_3']} {$deltaTime} {$mod_strings['LBL_PERFORM_OUTRO_4']}<br />
@@ -676,6 +676,6 @@ 
 echo $out;
 
 $loginURL = str_replace('install.php', 'index.php', "//$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
-installStatus(sprintf($mod_strings['STAT_INSTALL_FINISH_LOGIN'], $loginURL ) , array('function' => 'redirect', 'arguments' => $loginURL) );
+installStatus(sprintf($mod_strings['STAT_INSTALL_FINISH_LOGIN'], $loginURL), array('function' => 'redirect', 'arguments' => $loginURL));
 
 ?>

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

install/installConfig.php

Indentation +4 added lines, -4 removed lines

@@ -221,7 +221,7 @@ 
     }
 
     private function getFormItems($mod_strings, $app_list_strings, $sugarConfigDefaults, $drivers, $checked, $db, $errors, $supportedLanguages,
-                                  $current_language, $customSession, $customLog, $customId, $customSessionHidden, $customLogHidden, $customIdHidden) {
+                                    $current_language, $customSession, $customLog, $customId, $customSessionHidden, $customLogHidden, $customIdHidden) {
 
 
 
@@ -445,9 +445,9 @@ 
             $_SESSION['email1'] = null;
         }
 
-		if(!isset($_SESSION['setup_site_admin_user_name'])) {
-			$_SESSION['setup_site_admin_user_name'] = null;
-		}
+        if(!isset($_SESSION['setup_site_admin_user_name'])) {
+            $_SESSION['setup_site_admin_user_name'] = null;
+        }
 		
         $out .=<<<EOQ
 <div class='install_block'>

Spacing +78 added lines, -78 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -39,7 +39,7 @@ 
  ********************************************************************************/
 
 
-if( !isset( $install_script ) || !$install_script ){
+if (!isset($install_script) || !$install_script) {
     die($mod_strings['ERR_NO_DIRECT_SCRIPT']);
 }
 
@@ -87,9 +87,9 @@ 
 
     public static function getSelect($name, $options, $default) {
         $out = "<select name=\"$name\">";
-        foreach($options as $key => $value) {
+        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>";
@@ -238,13 +238,13 @@ 
         <div class=\"form_section\">
           <h3>{$mod_strings['LBL_SYSOPTS_DB']}</h3>";
 
-        foreach($drivers as $type => $driver) {
-            $oci = ($type == "oci8")?"":'none'; // hack for special oracle message
-            $out_dbtypesel.=<<<EOQ
+        foreach ($drivers as $type => $driver) {
+            $oci = ($type == "oci8") ? "" : 'none'; // hack for special oracle message
+            $out_dbtypesel .= <<<EOQ
                 <input type="radio" class="checkbox" name="setup_db_type" id="setup_db_type" value="$type" {$checked[$type]} onclick="onDBTypeClick(this);//document.getElementById('ociMsg').style.display='$oci'"/>{$mod_strings[$driver->label]}<br>
 EOQ;
         }
-        $out_dbtypesel.=<<<EOQ
+        $out_dbtypesel .= <<<EOQ
         </div>
             <div name="ociMsg" id="ociMsg" style="display:none"></div>
     <!-- </div> -->
@@ -254,7 +254,7 @@ 
         $out2 = $out_dbtypesel;
 
 
-        $out2.=<<<EOQ2
+        $out2 .= <<<EOQ2
 
         <!-- <div class="floatbox"> -->
 
@@ -265,25 +265,25 @@ 
 
         $config_params = $db->installConfig();
         $form = '';
-        foreach($config_params as $group => $gdata) {
-            $form.= "<div class='install_block'>";
-            if($mod_strings[$group . '_LABEL']) {
-                $form .= "<label>{$mod_strings[$group . '_LABEL']}" . "<i> i <div class=\"tooltip\">{$mod_strings[$group]}</div></i></label>\n";
+        foreach ($config_params as $group => $gdata) {
+            $form .= "<div class='install_block'>";
+            if ($mod_strings[$group.'_LABEL']) {
+                $form .= "<label>{$mod_strings[$group.'_LABEL']}"."<i> i <div class=\"tooltip\">{$mod_strings[$group]}</div></i></label>\n";
             }
-            foreach($gdata as $name => $value) {
+            foreach ($gdata as $name => $value) {
 
-                if(!empty($value)) {
-                    if(!empty($value['required'])) {
+                if (!empty($value)) {
+                    if (!empty($value['required'])) {
                         $form .= "<span class=\"required\">*</span>";
                     }
                     else {
                     }
-                    if(!empty($_SESSION[$name])) {
+                    if (!empty($_SESSION[$name])) {
                         $sessval = $_SESSION[$name];
                     } else {
                         $sessval = '';
                     }
-                    if(!empty($value["type"])) {
+                    if (!empty($value["type"])) {
                         $type = $value["type"];
                     } else {
                         $type = '';
@@ -293,9 +293,9 @@ 
 
 FORM;
                     //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'){
+                    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'>";
                     }
 
@@ -319,7 +319,7 @@ 
 
 
 //if we are installing in custom mode, include the following html
-        if($db->supports("create_user")) {
+        if ($db->supports("create_user")) {
 // create / set db user dropdown
             $auto_select = '';
             $provide_select = '';
@@ -342,9 +342,9 @@ 
                 $same_select = 'selected';
             }
             $dbUSRDD = "<select name='dbUSRData' id='dbUSRData' onchange='toggleDBUser();'>";
-            $dbUSRDD .= "<option value='provide' $provide_select>" . $mod_strings['LBL_DBCONFIG_PROVIDE_DD'] . "</option>";
-            $dbUSRDD .= "<option value='create' $create_select>" . $mod_strings['LBL_DBCONFIG_CREATE_DD'] . "</option>";
-            $dbUSRDD .= "<option value='same' $same_select>" . $mod_strings['LBL_DBCONFIG_SAME_DD'] . "</option>";
+            $dbUSRDD .= "<option value='provide' $provide_select>".$mod_strings['LBL_DBCONFIG_PROVIDE_DD']."</option>";
+            $dbUSRDD .= "<option value='create' $create_select>".$mod_strings['LBL_DBCONFIG_CREATE_DD']."</option>";
+            $dbUSRDD .= "<option value='same' $same_select>".$mod_strings['LBL_DBCONFIG_SAME_DD']."</option>";
             $dbUSRDD .= "</select><br>&nbsp;";
 
 
@@ -388,12 +388,12 @@ 
 
 EOQ2;
         }
-        $out =$out2;
+        $out = $out2;
 
 
 
         // ------ siteConfig_a.php
-        $out .=<<<EOQ
+        $out .= <<<EOQ
         </div>
     </div>
     <div class="floatbox" id="fb6">
@@ -405,8 +405,8 @@ 
                     <h3>{$mod_strings['LBL_SITECFG_TITLE2']}<div class="tooltip-toggle"><em> i </em><div class="tooltip">{$mod_strings['LBL_SITECFG_PASSWORD_MSG']}</div></div></h3>
 EOQ;
         //hide this in typical mode
-        if(!empty($_SESSION['install_type']) && strtolower($_SESSION['install_type'])=='custom'){
-            $out .=<<<EOQ
+        if (!empty($_SESSION['install_type']) && strtolower($_SESSION['install_type']) == 'custom') {
+            $out .= <<<EOQ
 <div class='install_block'>
     {$mod_strings['LBL_SITECFG_URL_MSG']}
     <span class="required">*</span>
@@ -419,17 +419,17 @@ 
 </div>
 EOQ;
             $db = getDbConnection();
-            if($db->supports("collation")) {
+            if ($db->supports("collation")) {
                 $collationOptions = $db->getCollationList();
             }
-            if(!empty($collationOptions)) {
-                if(isset($_SESSION['setup_db_options']['collation'])) {
+            if (!empty($collationOptions)) {
+                if (isset($_SESSION['setup_db_options']['collation'])) {
                     $default = $_SESSION['setup_db_options']['collation'];
                 } else {
                     $default = $db->getDefaultCollation();
                 }
                 $options = get_select_options_with_id(array_combine($collationOptions, $collationOptions), $default);
-                $out .=<<<EOQ
+                $out .= <<<EOQ
      <div class='install_block'>
         <br>{$mod_strings['LBL_SITECFG_COLLATION_MSG']}
         <span class="required">*</span>
@@ -441,15 +441,15 @@ 
         }
 
         $help_url = get_help_button_url();
-        if(!isset($_SESSION['email1'])) {
+        if (!isset($_SESSION['email1'])) {
             $_SESSION['email1'] = null;
         }
 
-		if(!isset($_SESSION['setup_site_admin_user_name'])) {
+		if (!isset($_SESSION['setup_site_admin_user_name'])) {
 			$_SESSION['setup_site_admin_user_name'] = null;
 		}
 		
-        $out .=<<<EOQ
+        $out .= <<<EOQ
 <div class='install_block'>
     <!--
     <p class="ibmsg">{$mod_strings['LBL_SITECFG_PASSWORD_MSG']}</p>
@@ -498,7 +498,7 @@ 
 EOQ;
 
 
-        $out.=<<<EOQ
+        $out .= <<<EOQ
 </div><!-- dbg2 -->
 EOQ;
 
@@ -517,7 +517,7 @@ 
         $demoDD = "<select name='demoData' id='demoData' class='select'><option value='no' >".$mod_strings['LBL_NO']."</option><option value='yes'>".$mod_strings['LBL_YES']."</option>";
         $demoDD .= "</select>";
 
-        $out .=<<<EOQ3
+        $out .= <<<EOQ3
         </div>
         </div>
 
@@ -559,7 +559,7 @@ 
         $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">
@@ -817,7 +817,7 @@ 
 
 
         // db setup (dbConfig_a.php)
-        $out2 =<<<EOQ2
+        $out2 = <<<EOQ2
             <input type='hidden' name='setup_db_drop_tables' id='setup_db_drop_tables' value=''>
         </div>
 EOQ2;
@@ -836,7 +836,7 @@ 
         $currentLogoLink = SugarThemeRegistry::current()->getImageURL('company_logo.png');
         // show logo if we have
         $hiddenLogo = '';
-        if(!file_exists($currentLogoLink)) {
+        if (!file_exists($currentLogoLink)) {
             $hiddenLogo = 'display:none;';
         }
 
@@ -989,10 +989,10 @@ 
 EOQ;
 
 
-$out.= "<div class=\"floatbox full\">";
-$out.= "    <h3 onclick=\"$(this).next().toggle();\" class=\"toggler\">&raquo; {$mod_strings['LBL_SITECFG_SECURITY_TITLE']}</h3>";
+$out .= "<div class=\"floatbox full\">";
+$out .= "    <h3 onclick=\"$(this).next().toggle();\" class=\"toggler\">&raquo; {$mod_strings['LBL_SITECFG_SECURITY_TITLE']}</h3>";
 
-        $out.=<<<EOQ
+        $out .= <<<EOQ
 
 <div class="security-block" style="display:none;">
 <table cellspacing="0" cellpadding="0" border="0" align="center" class="shell">
@@ -1081,7 +1081,7 @@ 
 </div><!-- dbg1 -->
 EOQ;
 
-$out.= "</div>";
+$out .= "</div>";
 
 
 
@@ -1089,7 +1089,7 @@ 
     }
 
     private function getFormControlls($mod_strings, $formId) {
-        $out =<<<EOQ
+        $out = <<<EOQ
         <div id="checkingDiv" style="display:none">
                     <p><img alt="{$mod_strings['LBL_LICENSE_CHKDB_HEADER']}" src='install/processing.gif'> <br>{$mod_strings['LBL_LICENSE_CHKDB_HEADER']}</p>
            </div>
@@ -1375,7 +1375,7 @@ 
     }
 
     private function getFormScripts($mod_strings, $next_step) {
-        $out =<<<EOQ
+        $out = <<<EOQ
             /**
              * Submit form without step.
              */
@@ -1575,7 +1575,7 @@ 
      * @return string   output
      */
     public function show($data = null) {
-        foreach($data as $__key => $__val) {
+        foreach ($data as $__key => $__val) {
             $$__key = $__val;
         }
         $formId = 'installForm';
@@ -1633,7 +1633,7 @@ 
 
 
 
-if( !isset( $install_script ) || !$install_script ){
+if (!isset($install_script) || !$install_script) {
     die($mod_strings['ERR_NO_DIRECT_SCRIPT']);
 }
 
@@ -1641,20 +1641,20 @@ 
 
 //---------------- systemOption: db driver select
 
-if(!isset($_SESSION['setup_db_type']) || $_SESSION['setup_db_type'] ==''){
+if (!isset($_SESSION['setup_db_type']) || $_SESSION['setup_db_type'] == '') {
     $_SESSION['setup_db_type'] = 'mysql';
 }
 $setup_db_type = $_SESSION['setup_db_type'];
 
 $errs = '';
-if(isset($validation_errors)) {
-    if(count($validation_errors) > 0) {
+if (isset($validation_errors)) {
+    if (count($validation_errors) > 0) {
         $errs  = '<div id="errorMsgs">';
         $errs .= "<p>{$mod_strings['LBL_SYSOPTS_ERRS_TITLE']}</p>";
         $errs .= '<ul>';
 
-        foreach($validation_errors as $error) {
-            $errs .= '<li>' . $error . '</li>';
+        foreach ($validation_errors as $error) {
+            $errs .= '<li>'.$error.'</li>';
         }
 
         $errs .= '</ul>';
@@ -1663,7 +1663,7 @@ 
 }
 
 $drivers = DBManagerFactory::getDbDrivers();
-foreach(array_keys($drivers) as $dname) {
+foreach (array_keys($drivers) as $dname) {
     $checked[$dname] = '';
 }
 $checked[$setup_db_type] = 'checked="checked"';
@@ -1672,8 +1672,8 @@ 
 
 //----------------- dbConfig_a: db name user pass...
 
-if(empty($_SESSION['setup_db_host_name'])){
-    $_SESSION['setup_db_host_name'] = (isset($sugar_config['db_host_name']))  ? $sugar_config['db_host_name'] :  $_SERVER['SERVER_NAME'];
+if (empty($_SESSION['setup_db_host_name'])) {
+    $_SESSION['setup_db_host_name'] = (isset($sugar_config['db_host_name'])) ? $sugar_config['db_host_name'] : $_SERVER['SERVER_NAME'];
 }
 
 
@@ -1682,16 +1682,16 @@ 
 $createDb = (!empty($_SESSION['setup_db_create_database'])) ? 'checked="checked"' : '';
 $dropCreate = (!empty($_SESSION['setup_db_drop_tables'])) ? 'checked="checked"' : '';
 $instanceName = '';
-if (isset($_SESSION['setup_db_host_instance']) && !empty($_SESSION['setup_db_host_instance'])){
+if (isset($_SESSION['setup_db_host_instance']) && !empty($_SESSION['setup_db_host_instance'])) {
     $instanceName = $_SESSION['setup_db_host_instance'];
 }
 
-$setupDbPortNum ='';
-if (isset($_SESSION['setup_db_port_num']) && !empty($_SESSION['setup_db_port_num'])){
+$setupDbPortNum = '';
+if (isset($_SESSION['setup_db_port_num']) && !empty($_SESSION['setup_db_port_num'])) {
     $setupDbPortNum = $_SESSION['setup_db_port_num'];
 }
 
-if(!isset($_SESSION['setup_db_manager'])) {
+if (!isset($_SESSION['setup_db_manager'])) {
     $_SESSION['setup_db_manager'] = null;
 }
 
@@ -1704,54 +1704,54 @@ 
 //----------------- siteConfig_a.php Site Config & admin user
 
 
-if( is_file("config.php") ){
-    if(!empty($sugar_config['default_theme']))
+if (is_file("config.php")) {
+    if (!empty($sugar_config['default_theme']))
         $_SESSION['site_default_theme'] = $sugar_config['default_theme'];
 
-    if(!empty($sugar_config['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']))
+    if (!empty($sugar_config['default_language']))
         $_SESSION['default_language'] = $sugar_config['default_language'];
-    if(!empty($sugar_config['translation_string_prefix']))
+    if (!empty($sugar_config['translation_string_prefix']))
         $_SESSION['translation_string_prefix'] = $sugar_config['translation_string_prefix'];
-    if(!empty($sugar_config['default_charset']))
+    if (!empty($sugar_config['default_charset']))
         $_SESSION['default_charset'] = $sugar_config['default_charset'];
 
-    if(!empty($sugar_config['default_currency_name']))
+    if (!empty($sugar_config['default_currency_name']))
         $_SESSION['default_currency_name'] = $sugar_config['default_currency_name'];
-    if(!empty($sugar_config['default_currency_symbol']))
+    if (!empty($sugar_config['default_currency_symbol']))
         $_SESSION['default_currency_symbol'] = $sugar_config['default_currency_symbol'];
-    if(!empty($sugar_config['default_currency_iso4217']))
+    if (!empty($sugar_config['default_currency_iso4217']))
         $_SESSION['default_currency_iso4217'] = $sugar_config['default_currency_iso4217'];
 
-    if(!empty($sugar_config['rss_cache_time']))
+    if (!empty($sugar_config['rss_cache_time']))
         $_SESSION['rss_cache_time'] = $sugar_config['rss_cache_time'];
-    if(!empty($sugar_config['languages']))
+    if (!empty($sugar_config['languages']))
     {
         // We need to encode the languages in a way that can be retrieved later.
         $language_keys = Array();
         $language_values = Array();
 
-        foreach($sugar_config['languages'] as $key=>$value)
+        foreach ($sugar_config['languages'] as $key=>$value)
         {
             $language_keys[] = $key;
             $language_values[] = $value;
         }
 
-        $_SESSION['language_keys'] = urlencode(implode(",",$language_keys));
-        $_SESSION['language_values'] = urlencode(implode(",",$language_values));
+        $_SESSION['language_keys'] = urlencode(implode(",", $language_keys));
+        $_SESSION['language_values'] = urlencode(implode(",", $language_values));
     }
 }
 
 ////	errors
 $errors = '';
-if( isset($validation_errors) && is_array($validation_errors)){
-    if( count($validation_errors) > 0 ){
+if (isset($validation_errors) && is_array($validation_errors)) {
+    if (count($validation_errors) > 0) {
         $errors  = '<div id="errorMsgs">';
         $errors .= '<p>'.$mod_strings['LBL_SITECFG_FIX_ERRORS'].'</p><ul>';
-        foreach( $validation_errors as $error ){
-            $errors .= '<li>' . $error . '</li>';
+        foreach ($validation_errors as $error) {
+            $errors .= '<li>'.$error.'</li>';
         }
         $errors .= '</ul></div>';
     }

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

include/utils.php

Spacing +13 added lines, -13 removed lines

@@ -120,8 +120,8 @@ 
             'd.m.Y' => '23.12.2010',
             'm.d.Y' => '12.23.2010',
         ) : $dateFormats,
-        'dbconfig' => $dbconfig,  // this must be set!!
-        'dbconfigoption' => $dbconfigoption,  // this must be set!!
+        'dbconfig' => $dbconfig, // this must be set!!
+        'dbconfigoption' => $dbconfigoption, // this must be set!!
         'default_action' => empty($default_action) ? 'index' : $default_action,
         'default_charset' => empty($default_charset) ? 'UTF-8' : $default_charset,
         'default_currency_name' => empty($default_currency_name) ? 'US Dollar' : $default_currency_name,
@@ -149,7 +149,7 @@ 
         'display_inbound_email_buttons' => empty($display_inbound_email_buttons) ? false : $display_inbound_email_buttons,
         'history_max_viewed' => empty($history_max_viewed) ? 50 : $history_max_viewed,
         'host_name' => empty($host_name) ? 'localhost' : $host_name,
-        'import_dir' => $import_dir,  // this must be set!!
+        'import_dir' => $import_dir, // this must be set!!
         'import_max_records_per_file' => 100,
         'import_max_records_total_limit' => '',
         'languages' => empty($languages) ? array('en_us' => 'English (US)') : $languages,
@@ -169,21 +169,21 @@ 
         ),
         'require_accounts' => empty($requireAccounts) ? true : $requireAccounts,
         'rss_cache_time' => empty($RSS_CACHE_TIME) ? '10800' : $RSS_CACHE_TIME,
-        'session_dir' => $session_dir,  // this must be set!!
-        'site_url' => empty($site_URL) ? $site_url : $site_URL,  // this must be set!!
+        'session_dir' => $session_dir, // this must be set!!
+        'site_url' => empty($site_URL) ? $site_url : $site_URL, // this must be set!!
         'showDetailData' => true, // if true, read-only ACL fields will still appear on EditViews as non-editable
         'showThemePicker' => true,
         'sugar_version' => empty($sugar_version) ? 'unknown' : $sugar_version,
         'time_formats' => empty($timeFormats) ? array(
             'H:i' => '23:00', 'h:ia' => '11:00 pm', 'h:iA' => '11:00PM',
-            'H.i' => '23.00', 'h.ia' => '11.00 pm', 'h.iA' => '11.00PM', ) : $timeFormats,
-        'tmp_dir' => $tmp_dir,  // this must be set!!
+            'H.i' => '23.00', 'h.ia' => '11.00 pm', 'h.iA' => '11.00PM',) : $timeFormats,
+        'tmp_dir' => $tmp_dir, // this must be set!!
         'translation_string_prefix' => empty($translation_string_prefix) ? false : $translation_string_prefix,
         'unique_key' => empty($unique_key) ? md5(create_guid()) : $unique_key,
         'upload_badext' => empty($upload_badext) ? array(
             'php', 'php3', 'php4', 'php5', 'pl', 'cgi', 'py',
-            'asp', 'cfm', 'js', 'vbs', 'html', 'htm', ) : $upload_badext,
-        'upload_dir' => $upload_dir,  // this must be set!!
+            'asp', 'cfm', 'js', 'vbs', 'html', 'htm',) : $upload_badext,
+        'upload_dir' => $upload_dir, // this must be set!!
         'upload_maxsize' => empty($upload_maxsize) ? 30000000 : $upload_maxsize,
         'import_max_execution_time' => empty($import_max_execution_time) ? 3600 : $import_max_execution_time,
         'lock_homepage' => false,
@@ -249,7 +249,7 @@ 
         'date_formats' => array(
             'Y-m-d' => '2010-12-23', 'm-d-Y' => '12-23-2010', 'd-m-Y' => '23-12-2010',
             'Y/m/d' => '2010/12/23', 'm/d/Y' => '12/23/2010', 'd/m/Y' => '23/12/2010',
-            'Y.m.d' => '2010.12.23', 'd.m.Y' => '23.12.2010', 'm.d.Y' => '12.23.2010', ),
+            'Y.m.d' => '2010.12.23', 'd.m.Y' => '23.12.2010', 'm.d.Y' => '12.23.2010',),
         'name_formats' => array(
             's f l' => 's f l', 'f l' => 'f l', 's l' => 's l', 'l, s f' => 'l, s f',
             'l, f' => 'l, f', 's l, f' => 's l, f', 'l s f' => 'l s f', 'l f s' => 'l f s',
@@ -258,7 +258,7 @@ 
             'persistent' => true,
             'autofree' => false,
             'debug' => 0,
-            'ssl' => false, ),
+            'ssl' => false,),
         'default_action' => 'index',
         'default_charset' => return_session_value_or_default('default_charset',
             'UTF-8'),
@@ -321,12 +321,12 @@ 
         'sugarbeet' => true,
         'time_formats' => array(
             'H:i' => '23:00', 'h:ia' => '11:00pm', 'h:iA' => '11:00PM', 'h:i a' => '11:00 pm', 'h:i A' => '11:00 PM',
-            'H.i' => '23.00', 'h.ia' => '11.00pm', 'h.iA' => '11.00PM', 'h.i a' => '11.00 pm', 'h.i A' => '11.00 PM', ),
+            'H.i' => '23.00', 'h.ia' => '11.00pm', 'h.iA' => '11.00PM', 'h.i a' => '11.00 pm', 'h.i A' => '11.00 PM',),
         'tracker_max_display_length' => 15,
         'translation_string_prefix' => return_session_value_or_default('translation_string_prefix', false),
         'upload_badext' => array(
             'php', 'php3', 'php4', 'php5', 'pl', 'cgi', 'py',
-            'asp', 'cfm', 'js', 'vbs', 'html', 'htm', 'phtml', ),
+            'asp', 'cfm', 'js', 'vbs', 'html', 'htm', 'phtml',),
         'upload_maxsize' => 30000000,
         'import_max_execution_time' => 3600,
 //	'use_php_code_json' => returnPhpJsonStatus(),

tests/tests/modules/Meetings/MeetingTest.php

Indentation +17 added lines, -17 removed lines

@@ -164,23 +164,23 @@
         $meeting->parent_name = 'Account';
 
         $expected = array(
-                      'DELETED' => 0,
-                      'PARENT_TYPE' => 'Accounts',
-                      'STATUS' => 'Planned',
-                      'TYPE' => 'Sugar',
-                      'REMINDER_TIME' => '-1',
-                      'EMAIL_REMINDER_TIME' => '-1',
-                      'EMAIL_REMINDER_SENT' => '0',
-                      'SEQUENCE' => '0',
-                      'CONTACT_NAME' => 'test',
-                      'PARENT_NAME' => '',
-                      'CONTACT_ID' => 1,
-                      'REPEAT_INTERVAL' => '1',
-                      'PARENT_MODULE' => 'Accounts',
-                      'SET_COMPLETE' => '<a id=\'\' onclick=\'SUGAR.util.closeActivityPanel.show("Meetings","","Held","listview","1");\'><img src="themes/SuiteR/images/close_inline.png?v=fqXdFZ_r6FC1K7P_Fy3mVw"     border=\'0\' alt="Close" /></a>',
-                      'DATE_START' => '<font class=\'overdueTask\'></font>',
-                      'REMINDER_CHECKED' => false,
-                      'EMAIL_REMINDER_CHECKED' => false,
+                        'DELETED' => 0,
+                        'PARENT_TYPE' => 'Accounts',
+                        'STATUS' => 'Planned',
+                        'TYPE' => 'Sugar',
+                        'REMINDER_TIME' => '-1',
+                        'EMAIL_REMINDER_TIME' => '-1',
+                        'EMAIL_REMINDER_SENT' => '0',
+                        'SEQUENCE' => '0',
+                        'CONTACT_NAME' => 'test',
+                        'PARENT_NAME' => '',
+                        'CONTACT_ID' => 1,
+                        'REPEAT_INTERVAL' => '1',
+                        'PARENT_MODULE' => 'Accounts',
+                        'SET_COMPLETE' => '<a id=\'\' onclick=\'SUGAR.util.closeActivityPanel.show("Meetings","","Held","listview","1");\'><img src="themes/SuiteR/images/close_inline.png?v=fqXdFZ_r6FC1K7P_Fy3mVw"     border=\'0\' alt="Close" /></a>',
+                        'DATE_START' => '<font class=\'overdueTask\'></font>',
+                        'REMINDER_CHECKED' => false,
+                        'EMAIL_REMINDER_CHECKED' => false,
                     );
 
         $actual = $meeting->get_list_view_data();

tests/tests/modules/Calls/CallTest.php

Indentation +3 added lines, -3 removed lines

@@ -145,9 +145,9 @@
                 'EMAIL_REMINDER_SENT' => '0',
                 'REPEAT_INTERVAL' => '1',
                 'SET_COMPLETE' => '~'
-                                  .preg_quote('<a id=\'\' onclick=\'SUGAR.util.closeActivityPanel.show("Calls","","Held","listview","1");\'><img src="themes/SuiteR/images/close_inline.png?v=')
-                                  .'[\w-]+'
-                                  .preg_quote('"     border=\'0\' alt="Close" /></a>').'~',
+                                    .preg_quote('<a id=\'\' onclick=\'SUGAR.util.closeActivityPanel.show("Calls","","Held","listview","1");\'><img src="themes/SuiteR/images/close_inline.png?v=')
+                                    .'[\w-]+'
+                                    .preg_quote('"     border=\'0\' alt="Close" /></a>').'~',
                 'DATE_START' => '<font class=\'overdueTask\'></font>',
                 'CONTACT_ID' => null,
                 'CONTACT_NAME' => null,

modules/Meetings/Meeting.php

Indentation +652 added lines, -652 removed lines

@@ -40,150 +40,150 @@ 
 
 
 class Meeting extends SugarBean {
-	// Stored fields
-	var $id;
-	var $date_entered;
-	var $date_modified;
-	var $assigned_user_id;
-	var $modified_user_id;
-	var $created_by;
-	var $created_by_name;
-	var $modified_by_name;
-	var $description;
-	var $name;
-	var $location;
-	var $status;
-	var $type;
-	var $date_start;
-	var $time_start;
-	var $date_end;
-	var $duration_hours;
-	var $duration_minutes;
-	var $time_meridiem;
-	var $parent_type;
-	var $parent_type_options;
-	var $parent_id;
-	var $field_name_map;
-	var $contact_id;
-	var $user_id;
-	var $meeting_id;
-	var $reminder_time;
-	var $reminder_checked;
-	var $email_reminder_time;
-	var $email_reminder_checked;
-	var $email_reminder_sent;
-	var $required;
-	var $accept_status;
-	var $parent_name;
-	var $contact_name;
-	var $contact_phone;
-	var $contact_email;
-	var $account_id;
-	var $opportunity_id;
-	var $case_id;
-	var $assigned_user_name;
-	var $outlook_id;
-	var $sequence;
-	var $syncing = false;
-	var $recurring_source;
-
-	var $update_vcal = true;
-	var $contacts_arr;
-	var $users_arr;
-	var $meetings_arr;
-	// when assoc w/ a user/contact:
-	var $minutes_value_default = 15;
-	var $minutes_values = array('0'=>'00','15'=>'15','30'=>'30','45'=>'45');
-	var $table_name = "meetings";
-	var $rel_users_table = "meetings_users";
-	var $rel_contacts_table = "meetings_contacts";
-	var $rel_leads_table = "meetings_leads";
-	var $module_dir = "Meetings";
-	var $object_name = "Meeting";
-
-	var $importable = true;
-	// This is used to retrieve related fields from form posts.
-	var $additional_column_fields = array('assigned_user_name', 'assigned_user_id', 'contact_id', 'user_id', 'contact_name', 'accept_status');
-	var $relationship_fields = array('account_id'=>'accounts','opportunity_id'=>'opportunity','case_id'=>'case',
-									 'assigned_user_id'=>'users','contact_id'=>'contacts', 'user_id'=>'users', 'meeting_id'=>'meetings');
-	// so you can run get_users() twice and run query only once
-	var $cached_get_users = null;
-	var $new_schema = true;
+    // Stored fields
+    var $id;
+    var $date_entered;
+    var $date_modified;
+    var $assigned_user_id;
+    var $modified_user_id;
+    var $created_by;
+    var $created_by_name;
+    var $modified_by_name;
+    var $description;
+    var $name;
+    var $location;
+    var $status;
+    var $type;
+    var $date_start;
+    var $time_start;
+    var $date_end;
+    var $duration_hours;
+    var $duration_minutes;
+    var $time_meridiem;
+    var $parent_type;
+    var $parent_type_options;
+    var $parent_id;
+    var $field_name_map;
+    var $contact_id;
+    var $user_id;
+    var $meeting_id;
+    var $reminder_time;
+    var $reminder_checked;
+    var $email_reminder_time;
+    var $email_reminder_checked;
+    var $email_reminder_sent;
+    var $required;
+    var $accept_status;
+    var $parent_name;
+    var $contact_name;
+    var $contact_phone;
+    var $contact_email;
+    var $account_id;
+    var $opportunity_id;
+    var $case_id;
+    var $assigned_user_name;
+    var $outlook_id;
+    var $sequence;
+    var $syncing = false;
+    var $recurring_source;
+
+    var $update_vcal = true;
+    var $contacts_arr;
+    var $users_arr;
+    var $meetings_arr;
+    // when assoc w/ a user/contact:
+    var $minutes_value_default = 15;
+    var $minutes_values = array('0'=>'00','15'=>'15','30'=>'30','45'=>'45');
+    var $table_name = "meetings";
+    var $rel_users_table = "meetings_users";
+    var $rel_contacts_table = "meetings_contacts";
+    var $rel_leads_table = "meetings_leads";
+    var $module_dir = "Meetings";
+    var $object_name = "Meeting";
+
+    var $importable = true;
+    // This is used to retrieve related fields from form posts.
+    var $additional_column_fields = array('assigned_user_name', 'assigned_user_id', 'contact_id', 'user_id', 'contact_name', 'accept_status');
+    var $relationship_fields = array('account_id'=>'accounts','opportunity_id'=>'opportunity','case_id'=>'case',
+                                        'assigned_user_id'=>'users','contact_id'=>'contacts', 'user_id'=>'users', 'meeting_id'=>'meetings');
+    // so you can run get_users() twice and run query only once
+    var $cached_get_users = null;
+    var $new_schema = true;
     var $date_changed = false;
 
-	/**
-	 * sole constructor
-	 */
-	public function __construct() {
-		parent::__construct();
-		$this->setupCustomFields('Meetings');
-		foreach($this->field_defs as $field) {
-			$this->field_name_map[$field['name']] = $field;
-		}
+    /**
+     * sole constructor
+     */
+    public function __construct() {
+        parent::__construct();
+        $this->setupCustomFields('Meetings');
+        foreach($this->field_defs as $field) {
+            $this->field_name_map[$field['name']] = $field;
+        }
 //		$this->fill_in_additional_detail_fields();
         if(!empty($GLOBALS['app_list_strings']['duration_intervals'])) {
             $this->minutes_values = $GLOBALS['app_list_strings']['duration_intervals'];
         }
-	}
-
-	/**
-	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
-	 */
-	public function Meeting(){
-		$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 {
-			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
-		}
-		self::__construct();
-	}
-
-	/**
-	 * Disable edit if meeting is recurring and source is not Sugar. It should be edited only from Outlook.
-	 * @param $view string
-	 * @param $is_owner bool
-	 */
-	function ACLAccess($view,$is_owner='not_set',$in_group='not_set'){
-		// don't check if meeting is being synced from Outlook
-		if($this->syncing == false){
-			$view = strtolower($view);
-			switch($view){
-				case 'edit':
-				case 'save':
-				case 'editview':
-				case 'delete':
-					if(!empty($this->recurring_source) && $this->recurring_source != "Sugar"){
-						return false;
-					}
-			}
-		}
-		return parent::ACLAccess($view,$is_owner,$in_group);
-	}
-
-	/**
-	 * Stub for integration
-	 * @return bool
-	 */
-	function hasIntegratedMeeting() {
-		return false;
-	}
-
-	// save date_end by calculating user input
-	// this is for calendar
-	function save($check_notify = FALSE) {
-		global $timedate;
-		global $current_user;
-
-		global $disable_date_format;
+    }
+
+    /**
+     * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
+     */
+    public function Meeting(){
+        $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 {
+            trigger_error($deprecatedMessage, E_USER_DEPRECATED);
+        }
+        self::__construct();
+    }
+
+    /**
+     * Disable edit if meeting is recurring and source is not Sugar. It should be edited only from Outlook.
+     * @param $view string
+     * @param $is_owner bool
+     */
+    function ACLAccess($view,$is_owner='not_set',$in_group='not_set'){
+        // don't check if meeting is being synced from Outlook
+        if($this->syncing == false){
+            $view = strtolower($view);
+            switch($view){
+                case 'edit':
+                case 'save':
+                case 'editview':
+                case 'delete':
+                    if(!empty($this->recurring_source) && $this->recurring_source != "Sugar"){
+                        return false;
+                    }
+            }
+        }
+        return parent::ACLAccess($view,$is_owner,$in_group);
+    }
+
+    /**
+     * Stub for integration
+     * @return bool
+     */
+    function hasIntegratedMeeting() {
+        return false;
+    }
+
+    // save date_end by calculating user input
+    // this is for calendar
+    function save($check_notify = FALSE) {
+        global $timedate;
+        global $current_user;
+
+        global $disable_date_format;
 
         if(isset($this->date_start))
         {
             $td = $timedate->fromDb($this->date_start);
             if(!$td){
-            		$this->date_start = $timedate->to_db($this->date_start);
-            		$td = $timedate->fromDb($this->date_start);
+                    $this->date_start = $timedate->to_db($this->date_start);
+                    $td = $timedate->fromDb($this->date_start);
             }
             if($td)
             {
@@ -199,30 +199,30 @@ 
             }
         }
 
-		$check_notify =(!empty($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == '1') ? true : false;
-		if(empty($_REQUEST['send_invites'])) {
-			if(!empty($this->id)) {
-				$old_record = new Meeting();
-				$old_record->retrieve($this->id);
-				$old_assigned_user_id = $old_record->assigned_user_id;
-			}
-			if((empty($this->id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $GLOBALS['current_user']->id != $_REQUEST['assigned_user_id']) || (isset($old_assigned_user_id) && !empty($old_assigned_user_id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $old_assigned_user_id != $_REQUEST['assigned_user_id']) ){
-				$this->special_notification = true;
-				$check_notify = true;
+        $check_notify =(!empty($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == '1') ? true : false;
+        if(empty($_REQUEST['send_invites'])) {
+            if(!empty($this->id)) {
+                $old_record = new Meeting();
+                $old_record->retrieve($this->id);
+                $old_assigned_user_id = $old_record->assigned_user_id;
+            }
+            if((empty($this->id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $GLOBALS['current_user']->id != $_REQUEST['assigned_user_id']) || (isset($old_assigned_user_id) && !empty($old_assigned_user_id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $old_assigned_user_id != $_REQUEST['assigned_user_id']) ){
+                $this->special_notification = true;
+                $check_notify = true;
                 if(isset($_REQUEST['assigned_user_name'])) {
                     $this->new_assigned_user_name = $_REQUEST['assigned_user_name'];
                 }
-			}
-		}
-		/*nsingh 7/3/08  commenting out as bug #20814 is invalid
+            }
+        }
+        /*nsingh 7/3/08  commenting out as bug #20814 is invalid
 		if($current_user->getPreference('reminder_time')!= -1 &&  isset($_POST['reminder_checked']) && isset($_POST['reminder_time']) && $_POST['reminder_checked']==0  && $_POST['reminder_time']==-1){
 			$this->reminder_checked = '1';
 			$this->reminder_time = $current_user->getPreference('reminder_time');
 		}*/
 
-		// prevent a mass mailing for recurring meetings created in Calendar module
-		if(empty($this->id) && !empty($_REQUEST['module']) && $_REQUEST['module'] == "Calendar" && !empty($_REQUEST['repeat_type']) && !empty($this->repeat_parent_id))
-			$check_notify = false;
+        // prevent a mass mailing for recurring meetings created in Calendar module
+        if(empty($this->id) && !empty($_REQUEST['module']) && $_REQUEST['module'] == "Calendar" && !empty($_REQUEST['repeat_type']) && !empty($this->repeat_parent_id))
+            $check_notify = false;
 
         if (empty($this->status) ) {
             $this->status = $this->getDefaultStatus();
@@ -243,8 +243,8 @@ 
         }
 
         if (empty($this->type)) {
-			$this->type = 'Sugar';
-		}
+            $this->type = 'Sugar';
+        }
 
         if ( isset($api) && is_a($api,'WebMeeting') && empty($this->in_relationship_update) ) {
             // Make sure the API initialized and it supports Web Meetings
@@ -272,175 +272,175 @@ 
             $api->logoff();
         }
 
-		$return_id = parent::save($check_notify);
+        $return_id = parent::save($check_notify);
 
-		if($this->update_vcal) {
-			vCal::cache_sugar_vcal($current_user);
-		}
+        if($this->update_vcal) {
+            vCal::cache_sugar_vcal($current_user);
+        }
 
-		if(isset($_REQUEST['reminders_data'])) {
-			Reminder::saveRemindersDataJson('Meetings', $return_id, html_entity_decode($_REQUEST['reminders_data']));
-		}
+        if(isset($_REQUEST['reminders_data'])) {
+            Reminder::saveRemindersDataJson('Meetings', $return_id, html_entity_decode($_REQUEST['reminders_data']));
+        }
 
 
-		return $return_id;
-	}
+        return $return_id;
+    }
 
-	// this is for calendar
-	function mark_deleted($id) {
+    // this is for calendar
+    function mark_deleted($id) {
 
-		require_once("modules/Calendar/CalendarUtils.php");
-		CalendarUtils::correctRecurrences($this, $id);
+        require_once("modules/Calendar/CalendarUtils.php");
+        CalendarUtils::correctRecurrences($this, $id);
 
-		global $current_user;
+        global $current_user;
 
-		parent::mark_deleted($id);
+        parent::mark_deleted($id);
 
-		if($this->update_vcal) {
-			vCal::cache_sugar_vcal($current_user);
-		}
-	}
+        if($this->update_vcal) {
+            vCal::cache_sugar_vcal($current_user);
+        }
+    }
 
-	function get_summary_text() {
-		return "$this->name";
-	}
+    function get_summary_text() {
+        return "$this->name";
+    }
 
     function create_export_query($order_by, $where, $relate_link_join='')
     {
         $custom_join = $this->getCustomJoin(true, true, $where);
         $custom_join['join'] .= $relate_link_join;
-		$contact_required = stristr($where, "contacts");
+        $contact_required = stristr($where, "contacts");
 
-		if($contact_required) {
-			$query = "SELECT meetings.*, contacts.first_name, contacts.last_name, contacts.assigned_user_id contact_name_owner, users.user_name as assigned_user_name   ";
+        if($contact_required) {
+            $query = "SELECT meetings.*, contacts.first_name, contacts.last_name, contacts.assigned_user_id contact_name_owner, users.user_name as assigned_user_name   ";
             $query .= $custom_join['select'];
-			$query .= " FROM contacts, meetings, meetings_contacts ";
-			$where_auto = " meetings_contacts.contact_id = contacts.id AND meetings_contacts.meeting_id = meetings.id AND meetings.deleted=0 AND contacts.deleted=0";
-		} else {
-			$query = 'SELECT meetings.*, users.user_name as assigned_user_name  ';
+            $query .= " FROM contacts, meetings, meetings_contacts ";
+            $where_auto = " meetings_contacts.contact_id = contacts.id AND meetings_contacts.meeting_id = meetings.id AND meetings.deleted=0 AND contacts.deleted=0";
+        } else {
+            $query = 'SELECT meetings.*, users.user_name as assigned_user_name  ';
             $query .= $custom_join['select'];
-			$query .= ' FROM meetings ';
-			$where_auto = "meetings.deleted=0";
-		}
-		$query .= "  LEFT JOIN users ON meetings.assigned_user_id=users.id ";
+            $query .= ' FROM meetings ';
+            $where_auto = "meetings.deleted=0";
+        }
+        $query .= "  LEFT JOIN users ON meetings.assigned_user_id=users.id ";
 
         $query .= $custom_join['join'];
 
-		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;
 
         $order_by = $this->process_order_by($order_by);
         if (!empty($order_by)) {
             $query .= ' ORDER BY ' . $order_by;
         }
 
-		return $query;
-	}
-
-
-
-	function fill_in_additional_detail_fields() {
-		global $locale;
-		// Fill in the assigned_user_name
-		$this->assigned_user_name = get_assigned_user_name($this->assigned_user_id);
-
-		if (!empty($this->contact_id)) {
-			$query  = "SELECT first_name, last_name FROM contacts ";
-			$query .= "WHERE id='$this->contact_id' AND deleted=0";
-			$result = $this->db->limitQuery($query,0,1,true," Error filling in additional detail fields: ");
+        return $query;
+    }
 
-			// Get the contact name.
-			$row = $this->db->fetchByAssoc($result);
-			$GLOBALS['log']->info("additional call fields $query");
-			if($row != null)
-			{
-				$this->contact_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name'], '', '');
-				$GLOBALS['log']->debug("Call($this->id): contact_name = $this->contact_name");
-				$GLOBALS['log']->debug("Call($this->id): contact_id = $this->contact_id");
-			}
-		}
 
 
+    function fill_in_additional_detail_fields() {
+        global $locale;
+        // Fill in the assigned_user_name
+        $this->assigned_user_name = get_assigned_user_name($this->assigned_user_id);
 
-		$this->created_by_name = get_assigned_user_name($this->created_by);
-		$this->modified_by_name = get_assigned_user_name($this->modified_user_id);
-		$this->fill_in_additional_parent_fields();
+        if (!empty($this->contact_id)) {
+            $query  = "SELECT first_name, last_name FROM contacts ";
+            $query .= "WHERE id='$this->contact_id' AND deleted=0";
+            $result = $this->db->limitQuery($query,0,1,true," Error filling in additional detail fields: ");
 
-		if (!isset($this->time_hour_start)) {
-			$this->time_start_hour = intval(substr($this->time_start, 0, 2));
-		} //if-else
+            // Get the contact name.
+            $row = $this->db->fetchByAssoc($result);
+            $GLOBALS['log']->info("additional call fields $query");
+            if($row != null)
+            {
+                $this->contact_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name'], '', '');
+                $GLOBALS['log']->debug("Call($this->id): contact_name = $this->contact_name");
+                $GLOBALS['log']->debug("Call($this->id): contact_id = $this->contact_id");
+            }
+        }
 
-		if (isset($this->time_minute_start)) {
-			$time_start_minutes = $this->time_minute_start;
-		} else {
-			$time_start_minutes = substr($this->time_start, 3, 5);
-			if ($time_start_minutes > 0 && $time_start_minutes < 15) {
-				$time_start_minutes = "15";
-			} else if ($time_start_minutes > 15 && $time_start_minutes < 30) {
-				$time_start_minutes = "30";
-			} else if ($time_start_minutes > 30 && $time_start_minutes < 45) {
-				$time_start_minutes = "45";
-			} else if ($time_start_minutes > 45) {
-				$this->time_start_hour += 1;
-				$time_start_minutes = "00";
-		    } //if-else
-		} //if-else
 
 
-		if (isset($this->time_hour_start)) {
-			$time_start_hour = $this->time_hour_start;
-		} else {
-			$time_start_hour = intval(substr($this->time_start, 0, 2));
-		}
+        $this->created_by_name = get_assigned_user_name($this->created_by);
+        $this->modified_by_name = get_assigned_user_name($this->modified_user_id);
+        $this->fill_in_additional_parent_fields();
+
+        if (!isset($this->time_hour_start)) {
+            $this->time_start_hour = intval(substr($this->time_start, 0, 2));
+        } //if-else
+
+        if (isset($this->time_minute_start)) {
+            $time_start_minutes = $this->time_minute_start;
+        } else {
+            $time_start_minutes = substr($this->time_start, 3, 5);
+            if ($time_start_minutes > 0 && $time_start_minutes < 15) {
+                $time_start_minutes = "15";
+            } else if ($time_start_minutes > 15 && $time_start_minutes < 30) {
+                $time_start_minutes = "30";
+            } else if ($time_start_minutes > 30 && $time_start_minutes < 45) {
+                $time_start_minutes = "45";
+            } else if ($time_start_minutes > 45) {
+                $this->time_start_hour += 1;
+                $time_start_minutes = "00";
+            } //if-else
+        } //if-else
+
+
+        if (isset($this->time_hour_start)) {
+            $time_start_hour = $this->time_hour_start;
+        } else {
+            $time_start_hour = intval(substr($this->time_start, 0, 2));
+        }
 
-		global $timedate;
+        global $timedate;
         $this->time_meridiem = $timedate->AMPMMenu('', $this->time_start, 'onchange="SugarWidgetScheduler.update_time();"');
-		$hours_arr = array ();
-		$num_of_hours = 13;
-		$start_at = 1;
-
-		if (empty ($time_meridiem)) {
-			$num_of_hours = 24;
-			$start_at = 0;
-		} //if
-
-		for ($i = $start_at; $i < $num_of_hours; $i ++) {
-			$i = $i."";
-			if (strlen($i) == 1) {
-				$i = "0".$i;
-			}
-			$hours_arr[$i] = $i;
-		} //for
+        $hours_arr = array ();
+        $num_of_hours = 13;
+        $start_at = 1;
+
+        if (empty ($time_meridiem)) {
+            $num_of_hours = 24;
+            $start_at = 0;
+        } //if
+
+        for ($i = $start_at; $i < $num_of_hours; $i ++) {
+            $i = $i."";
+            if (strlen($i) == 1) {
+                $i = "0".$i;
+            }
+            $hours_arr[$i] = $i;
+        } //for
 
         if (!isset($this->duration_minutes)) {
-			$this->duration_minutes = $this->minutes_value_default;
-		}
+            $this->duration_minutes = $this->minutes_value_default;
+        }
 
         //setting default date and time
-		if (is_null($this->date_start))
-			$this->date_start = $timedate->now();
-		if (is_null($this->time_start))
-			$this->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
-		if (is_null($this->duration_hours)) {
-			$this->duration_hours = "0";
-		}
-		if (is_null($this->duration_minutes))
-			$this->duration_minutes = "1";
-
-		if(empty($this->id) && !empty($_REQUEST['date_start'])){
-			$this->date_start = $_REQUEST['date_start'];
-		}
+        if (is_null($this->date_start))
+            $this->date_start = $timedate->now();
+        if (is_null($this->time_start))
+            $this->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
+        if (is_null($this->duration_hours)) {
+            $this->duration_hours = "0";
+        }
+        if (is_null($this->duration_minutes))
+            $this->duration_minutes = "1";
+
+        if(empty($this->id) && !empty($_REQUEST['date_start'])){
+            $this->date_start = $_REQUEST['date_start'];
+        }
         if(!empty($this->date_start))
         {
             $td = SugarDateTime::createFromFormat($GLOBALS['timedate']->get_date_time_format(),$this->date_start);
             if (!empty($td))
             {
-    	        if (!empty($this->duration_hours) && $this->duration_hours != '')
+                if (!empty($this->duration_hours) && $this->duration_hours != '')
                 {
-		            $td = $td->modify("+{$this->duration_hours} hours");
-		        }
+                    $td = $td->modify("+{$this->duration_hours} hours");
+                }
                 if (!empty($this->duration_minutes) && $this->duration_minutes != '')
                 {
                     $td = $td->modify("+{$this->duration_minutes} mins");
@@ -451,77 +451,77 @@ 
             {
                 $GLOBALS['log']->fatal("Meeting::save: Bad date {$this->date_start} for format ".$GLOBALS['timedate']->get_date_time_format());
             }
-		}
-
-		global $app_list_strings;
-		$parent_types = $app_list_strings['record_type_display'];
-		$disabled_parent_types = ACLController::disabledModuleList($parent_types,false, 'list');
-		foreach($disabled_parent_types as $disabled_parent_type){
-			if($disabled_parent_type != $this->parent_type){
-				unset($parent_types[$disabled_parent_type]);
-			}
-		}
-
-		$this->parent_type_options = get_select_options_with_id($parent_types, $this->parent_type);
-		if (empty($this->reminder_time)) {
-			$this->reminder_time = -1;
-		}
-
-		if ( empty($this->id) ) {
-		    $reminder_t = $GLOBALS['current_user']->getPreference('reminder_time');
-		    if ( isset($reminder_t) )
-		        $this->reminder_time = $reminder_t;
-		}
-		$this->reminder_checked = $this->reminder_time == -1 ? false : true;
-
-		if (empty($this->email_reminder_time)) {
-			$this->email_reminder_time = -1;
-		}
-		if(empty($this->id)){
-			$reminder_t = $GLOBALS['current_user']->getPreference('email_reminder_time');
-			if(isset($reminder_t))
-		    		$this->email_reminder_time = $reminder_t;
-		}
-		$this->email_reminder_checked = $this->email_reminder_time == -1 ? false : true;
-
-		if (isset ($_REQUEST['parent_type']) && empty($this->parent_type)) {
-			$this->parent_type = $_REQUEST['parent_type'];
-		} elseif (is_null($this->parent_type)) {
-			$this->parent_type = $app_list_strings['record_type_default_key'];
-		}
-
-	}
-
-	function get_list_view_data() {
-		$meeting_fields = $this->get_list_view_array();
-
-		global $app_list_strings, $focus, $action, $currentModule;
-		if(isset($this->parent_type))
-			$meeting_fields['PARENT_MODULE'] = $this->parent_type;
-		if($this->status == "Planned") {
-			//cn: added this if() to deal with sequential Closes in Meetings.	this is a hack to a hack(formbase.php->handleRedirect)
-			if(empty($action))
-			     $action = "index";
+        }
+
+        global $app_list_strings;
+        $parent_types = $app_list_strings['record_type_display'];
+        $disabled_parent_types = ACLController::disabledModuleList($parent_types,false, 'list');
+        foreach($disabled_parent_types as $disabled_parent_type){
+            if($disabled_parent_type != $this->parent_type){
+                unset($parent_types[$disabled_parent_type]);
+            }
+        }
+
+        $this->parent_type_options = get_select_options_with_id($parent_types, $this->parent_type);
+        if (empty($this->reminder_time)) {
+            $this->reminder_time = -1;
+        }
+
+        if ( empty($this->id) ) {
+            $reminder_t = $GLOBALS['current_user']->getPreference('reminder_time');
+            if ( isset($reminder_t) )
+                $this->reminder_time = $reminder_t;
+        }
+        $this->reminder_checked = $this->reminder_time == -1 ? false : true;
+
+        if (empty($this->email_reminder_time)) {
+            $this->email_reminder_time = -1;
+        }
+        if(empty($this->id)){
+            $reminder_t = $GLOBALS['current_user']->getPreference('email_reminder_time');
+            if(isset($reminder_t))
+                    $this->email_reminder_time = $reminder_t;
+        }
+        $this->email_reminder_checked = $this->email_reminder_time == -1 ? false : true;
+
+        if (isset ($_REQUEST['parent_type']) && empty($this->parent_type)) {
+            $this->parent_type = $_REQUEST['parent_type'];
+        } elseif (is_null($this->parent_type)) {
+            $this->parent_type = $app_list_strings['record_type_default_key'];
+        }
+
+    }
+
+    function get_list_view_data() {
+        $meeting_fields = $this->get_list_view_array();
+
+        global $app_list_strings, $focus, $action, $currentModule;
+        if(isset($this->parent_type))
+            $meeting_fields['PARENT_MODULE'] = $this->parent_type;
+        if($this->status == "Planned") {
+            //cn: added this if() to deal with sequential Closes in Meetings.	this is a hack to a hack(formbase.php->handleRedirect)
+            if(empty($action))
+                    $action = "index";
             $setCompleteUrl = "<a id='{$this->id}' onclick='SUGAR.util.closeActivityPanel.show(\"{$this->module_dir}\",\"{$this->id}\",\"Held\",\"listview\",\"1\");'>";
-			if ($this->ACLAccess('edit')) {
+            if ($this->ACLAccess('edit')) {
                 $meeting_fields['SET_COMPLETE'] = $setCompleteUrl . SugarThemeRegistry::current()->getImage("close_inline"," border='0'",null,null,'.gif',translate('LBL_CLOSEINLINE'))."</a>";
             } else {
                 $meeting_fields['SET_COMPLETE'] = '';
             }
-		}
-		global $timedate;
-		$today = $timedate->nowDb();
-		$nextday = $timedate->asDbDate($timedate->getNow()->get("+1 day"));
-		$mergeTime = $meeting_fields['DATE_START']; //$timedate->merge_date_time($meeting_fields['DATE_START'], $meeting_fields['TIME_START']);
-		$date_db = $timedate->to_db($mergeTime);
-		if($date_db	< $today	) {
-			$meeting_fields['DATE_START']= "<font class='overdueTask'>".$meeting_fields['DATE_START']."</font>";
-		}else if($date_db	< $nextday) {
-			$meeting_fields['DATE_START'] = "<font class='todaysTask'>".$meeting_fields['DATE_START']."</font>";
-		} else {
-			$meeting_fields['DATE_START'] = "<font class='futureTask'>".$meeting_fields['DATE_START']."</font>";
-		}
-		$this->fill_in_additional_detail_fields();
+        }
+        global $timedate;
+        $today = $timedate->nowDb();
+        $nextday = $timedate->asDbDate($timedate->getNow()->get("+1 day"));
+        $mergeTime = $meeting_fields['DATE_START']; //$timedate->merge_date_time($meeting_fields['DATE_START'], $meeting_fields['TIME_START']);
+        $date_db = $timedate->to_db($mergeTime);
+        if($date_db	< $today	) {
+            $meeting_fields['DATE_START']= "<font class='overdueTask'>".$meeting_fields['DATE_START']."</font>";
+        }else if($date_db	< $nextday) {
+            $meeting_fields['DATE_START'] = "<font class='todaysTask'>".$meeting_fields['DATE_START']."</font>";
+        } else {
+            $meeting_fields['DATE_START'] = "<font class='futureTask'>".$meeting_fields['DATE_START']."</font>";
+        }
+        $this->fill_in_additional_detail_fields();
 
         // make sure we grab the localized version of the contact name, if a contact is provided
         if (!empty($this->contact_id))
@@ -537,342 +537,342 @@ 
 
         $meeting_fields['CONTACT_ID'] = $this->contact_id;
         $meeting_fields['CONTACT_NAME'] = $this->contact_name;
-		$meeting_fields['PARENT_NAME'] = $this->parent_name;
+        $meeting_fields['PARENT_NAME'] = $this->parent_name;
         $meeting_fields['REMINDER_CHECKED'] = $this->reminder_time==-1 ? false : true;
         $meeting_fields['EMAIL_REMINDER_CHECKED'] = $this->email_reminder_time==-1 ? false : true;
 
 
-		return $meeting_fields;
-	}
-
-	function set_notification_body($xtpl, &$meeting) {
-		global $sugar_config;
-		global $app_list_strings;
-		global $current_user;
-		global $timedate;
-
-
-		// cn: bug 9494 - passing a contact breaks this call
-		$notifyUser =($meeting->current_notify_user->object_name == 'User') ? $meeting->current_notify_user : $current_user;
-		// cn: bug 8078 - fixed call to $timedate
-		if(strtolower(get_class($meeting->current_notify_user)) == 'contact') {
-			$xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
-							'/index.php?entryPoint=acceptDecline&module=Meetings&contact_id='.$meeting->current_notify_user->id.'&record='.$meeting->id);
-		} elseif(strtolower(get_class($meeting->current_notify_user)) == 'lead') {
-			$xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
-							'/index.php?entryPoint=acceptDecline&module=Meetings&lead_id='.$meeting->current_notify_user->id.'&record='.$meeting->id);
-		} else {
-			$xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
-							'/index.php?entryPoint=acceptDecline&module=Meetings&user_id='.$meeting->current_notify_user->id.'&record='.$meeting->id);
-		}
-		$xtpl->assign("MEETING_TO", $meeting->current_notify_user->new_assigned_user_name);
-		$xtpl->assign("MEETING_SUBJECT", trim($meeting->name));
-		$xtpl->assign("MEETING_STATUS",(isset($meeting->status)? $app_list_strings['meeting_status_dom'][$meeting->status]:""));
-		$typekey = strtolower($meeting->type);
-		if(isset($meeting->type)) {
-		    if(!empty($app_list_strings['eapm_list'][$typekey])) {
-    		    $typestring = $app_list_strings['eapm_list'][$typekey];
-	    	} else {
-		        $typestring = $app_list_strings['meeting_type_dom'][$meeting->type];
-		    }
-		}
-		$xtpl->assign("MEETING_TYPE", isset($meeting->type)? $typestring:"");
-		$startdate = $timedate->fromDb($meeting->date_start);
-		$xtpl->assign("MEETING_STARTDATE", $timedate->asUser($startdate, $notifyUser)." ".TimeDate::userTimezoneSuffix($startdate, $notifyUser));
-		$enddate = $timedate->fromDb($meeting->date_end);
-		$xtpl->assign("MEETING_ENDDATE", $timedate->asUser($enddate, $notifyUser)." ".TimeDate::userTimezoneSuffix($enddate, $notifyUser));
-		$xtpl->assign("MEETING_HOURS", $meeting->duration_hours);
-		$xtpl->assign("MEETING_MINUTES", $meeting->duration_minutes);
-		$xtpl->assign("MEETING_DESCRIPTION", $meeting->description);
+        return $meeting_fields;
+    }
+
+    function set_notification_body($xtpl, &$meeting) {
+        global $sugar_config;
+        global $app_list_strings;
+        global $current_user;
+        global $timedate;
+
+
+        // cn: bug 9494 - passing a contact breaks this call
+        $notifyUser =($meeting->current_notify_user->object_name == 'User') ? $meeting->current_notify_user : $current_user;
+        // cn: bug 8078 - fixed call to $timedate
+        if(strtolower(get_class($meeting->current_notify_user)) == 'contact') {
+            $xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
+                            '/index.php?entryPoint=acceptDecline&module=Meetings&contact_id='.$meeting->current_notify_user->id.'&record='.$meeting->id);
+        } elseif(strtolower(get_class($meeting->current_notify_user)) == 'lead') {
+            $xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
+                            '/index.php?entryPoint=acceptDecline&module=Meetings&lead_id='.$meeting->current_notify_user->id.'&record='.$meeting->id);
+        } else {
+            $xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
+                            '/index.php?entryPoint=acceptDecline&module=Meetings&user_id='.$meeting->current_notify_user->id.'&record='.$meeting->id);
+        }
+        $xtpl->assign("MEETING_TO", $meeting->current_notify_user->new_assigned_user_name);
+        $xtpl->assign("MEETING_SUBJECT", trim($meeting->name));
+        $xtpl->assign("MEETING_STATUS",(isset($meeting->status)? $app_list_strings['meeting_status_dom'][$meeting->status]:""));
+        $typekey = strtolower($meeting->type);
+        if(isset($meeting->type)) {
+            if(!empty($app_list_strings['eapm_list'][$typekey])) {
+                $typestring = $app_list_strings['eapm_list'][$typekey];
+            } else {
+                $typestring = $app_list_strings['meeting_type_dom'][$meeting->type];
+            }
+        }
+        $xtpl->assign("MEETING_TYPE", isset($meeting->type)? $typestring:"");
+        $startdate = $timedate->fromDb($meeting->date_start);
+        $xtpl->assign("MEETING_STARTDATE", $timedate->asUser($startdate, $notifyUser)." ".TimeDate::userTimezoneSuffix($startdate, $notifyUser));
+        $enddate = $timedate->fromDb($meeting->date_end);
+        $xtpl->assign("MEETING_ENDDATE", $timedate->asUser($enddate, $notifyUser)." ".TimeDate::userTimezoneSuffix($enddate, $notifyUser));
+        $xtpl->assign("MEETING_HOURS", $meeting->duration_hours);
+        $xtpl->assign("MEETING_MINUTES", $meeting->duration_minutes);
+        $xtpl->assign("MEETING_DESCRIPTION", $meeting->description);
         if ( !empty($meeting->join_url) ) {
             $xtpl->assign('MEETING_URL', $meeting->join_url);
             $xtpl->parse('Meeting.Meeting_External_API');
         }
 
-		return $xtpl;
-	}
+        return $xtpl;
+    }
 
-	/**
-	 * Redefine method to attach ics file to notification email
-	 */
-	public function create_notification_email($notify_user){
+    /**
+     * Redefine method to attach ics file to notification email
+     */
+    public function create_notification_email($notify_user){
         // reset acceptance status for non organizer if date is changed
         if (($notify_user->id != $GLOBALS['current_user']->id) && $this->date_changed) {
             $this->set_accept_status($notify_user, 'none');
         }
 
-		$notify_mail = parent::create_notification_email($notify_user);
-
-		$path = SugarConfig::getInstance()->get('upload_dir','upload/') . $this->id;
-
-		require_once("modules/vCals/vCal.php");
-		$content = vCal::get_ical_event($this, $GLOBALS['current_user']);
-
-		if(file_put_contents($path,$content)){
-			$notify_mail->AddAttachment($path, 'meeting.ics', 'base64', 'text/calendar');
-		}
-		return $notify_mail;
-	}
-
-	/**
-	 * Redefine method to remove ics after email is sent
-	 */
-	public function send_assignment_notifications($notify_user, $admin){
-		parent::send_assignment_notifications($notify_user, $admin);
-
-		$path = SugarConfig::getInstance()->get('upload_dir','upload/') . $this->id;
-		unlink($path);
-	}
-
-	function get_meeting_users() {
-		$template = new User();
-		// First, get the list of IDs.
-		$query = "SELECT meetings_users.required, meetings_users.accept_status, meetings_users.user_id from meetings_users where meetings_users.meeting_id='$this->id' AND meetings_users.deleted=0";
-		$GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
-		$result = $this->db->query($query, true);
-		$list = Array();
-
-		while($row = $this->db->fetchByAssoc($result)) {
-			$template = new User(); // PHP 5 will retrieve by reference, always over-writing the "old" one
-			$record = $template->retrieve($row['user_id']);
-			$template->required = $row['required'];
-			$template->accept_status = $row['accept_status'];
-
-			if($record != null) {
-				// this copies the object into the array
-				$list[] = $template;
-			}
-		}
-		return $list;
-	}
-
-	function get_invite_meetings(&$user) {
-		$template = $this;
-		// First, get the list of IDs.
-		$GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
-		$query = "SELECT meetings_users.required, meetings_users.accept_status, meetings_users.meeting_id from meetings_users where meetings_users.user_id='$user->id' AND( meetings_users.accept_status IS NULL OR	meetings_users.accept_status='none') AND meetings_users.deleted=0";
-		$result = $this->db->query($query, true);
-		$list = Array();
-
-		while($row = $this->db->fetchByAssoc($result)) {
-			$record = $template->retrieve($row['meeting_id']);
-			$template->required = $row['required'];
-			$template->accept_status = $row['accept_status'];
-
-
-			if($record != null)
-			{
-			// this copies the object into the array
-			$list[] = $template;
-			}
-		}
-		return $list;
-	}
-
-
-	function set_accept_status(&$user,$status)
-	{
-		if($user->object_name == 'User')
-		{
-			$relate_values = array('user_id'=>$user->id,'meeting_id'=>$this->id);
-			$data_values = array('accept_status'=>$status);
-			$this->set_relationship($this->rel_users_table, $relate_values, true, true,$data_values);
-			global $current_user;
-
-			if($this->update_vcal)
-			{
-				vCal::cache_sugar_vcal($user);
-			}
-		}
-		else if($user->object_name == 'Contact')
-		{
-			$relate_values = array('contact_id'=>$user->id,'meeting_id'=>$this->id);
-			$data_values = array('accept_status'=>$status);
-			$this->set_relationship($this->rel_contacts_table, $relate_values, true, true,$data_values);
-		}
+        $notify_mail = parent::create_notification_email($notify_user);
+
+        $path = SugarConfig::getInstance()->get('upload_dir','upload/') . $this->id;
+
+        require_once("modules/vCals/vCal.php");
+        $content = vCal::get_ical_event($this, $GLOBALS['current_user']);
+
+        if(file_put_contents($path,$content)){
+            $notify_mail->AddAttachment($path, 'meeting.ics', 'base64', 'text/calendar');
+        }
+        return $notify_mail;
+    }
+
+    /**
+     * Redefine method to remove ics after email is sent
+     */
+    public function send_assignment_notifications($notify_user, $admin){
+        parent::send_assignment_notifications($notify_user, $admin);
+
+        $path = SugarConfig::getInstance()->get('upload_dir','upload/') . $this->id;
+        unlink($path);
+    }
+
+    function get_meeting_users() {
+        $template = new User();
+        // First, get the list of IDs.
+        $query = "SELECT meetings_users.required, meetings_users.accept_status, meetings_users.user_id from meetings_users where meetings_users.meeting_id='$this->id' AND meetings_users.deleted=0";
+        $GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
+        $result = $this->db->query($query, true);
+        $list = Array();
+
+        while($row = $this->db->fetchByAssoc($result)) {
+            $template = new User(); // PHP 5 will retrieve by reference, always over-writing the "old" one
+            $record = $template->retrieve($row['user_id']);
+            $template->required = $row['required'];
+            $template->accept_status = $row['accept_status'];
+
+            if($record != null) {
+                // this copies the object into the array
+                $list[] = $template;
+            }
+        }
+        return $list;
+    }
+
+    function get_invite_meetings(&$user) {
+        $template = $this;
+        // First, get the list of IDs.
+        $GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
+        $query = "SELECT meetings_users.required, meetings_users.accept_status, meetings_users.meeting_id from meetings_users where meetings_users.user_id='$user->id' AND( meetings_users.accept_status IS NULL OR	meetings_users.accept_status='none') AND meetings_users.deleted=0";
+        $result = $this->db->query($query, true);
+        $list = Array();
+
+        while($row = $this->db->fetchByAssoc($result)) {
+            $record = $template->retrieve($row['meeting_id']);
+            $template->required = $row['required'];
+            $template->accept_status = $row['accept_status'];
+
+
+            if($record != null)
+            {
+            // this copies the object into the array
+            $list[] = $template;
+            }
+        }
+        return $list;
+    }
+
+
+    function set_accept_status(&$user,$status)
+    {
+        if($user->object_name == 'User')
+        {
+            $relate_values = array('user_id'=>$user->id,'meeting_id'=>$this->id);
+            $data_values = array('accept_status'=>$status);
+            $this->set_relationship($this->rel_users_table, $relate_values, true, true,$data_values);
+            global $current_user;
+
+            if($this->update_vcal)
+            {
+                vCal::cache_sugar_vcal($user);
+            }
+        }
+        else if($user->object_name == 'Contact')
+        {
+            $relate_values = array('contact_id'=>$user->id,'meeting_id'=>$this->id);
+            $data_values = array('accept_status'=>$status);
+            $this->set_relationship($this->rel_contacts_table, $relate_values, true, true,$data_values);
+        }
         else if($user->object_name == 'Lead')
-		{
-			$relate_values = array('lead_id'=>$user->id,'meeting_id'=>$this->id);
-			$data_values = array('accept_status'=>$status);
-			$this->set_relationship($this->rel_leads_table, $relate_values, true, true,$data_values);
-		}
-	}
+        {
+            $relate_values = array('lead_id'=>$user->id,'meeting_id'=>$this->id);
+            $data_values = array('accept_status'=>$status);
+            $this->set_relationship($this->rel_leads_table, $relate_values, true, true,$data_values);
+        }
+    }
 
 
-	function get_notification_recipients() {
-		if($this->special_notification) {
-			return parent::get_notification_recipients();
-		}
+    function get_notification_recipients() {
+        if($this->special_notification) {
+            return parent::get_notification_recipients();
+        }
 
-		$list = array();
-		if(!is_array($this->contacts_arr)) {
-			$this->contacts_arr =	array();
-		}
+        $list = array();
+        if(!is_array($this->contacts_arr)) {
+            $this->contacts_arr =	array();
+        }
 
-		if(!is_array($this->users_arr)) {
-			$this->users_arr =	array();
-		}
+        if(!is_array($this->users_arr)) {
+            $this->users_arr =	array();
+        }
 
         if(!is_array($this->leads_arr)) {
-			$this->leads_arr =	array();
-		}
-
-		foreach($this->users_arr as $user_id) {
-			$notify_user = new User();
-			$notify_user->retrieve($user_id);
-			$notify_user->new_assigned_user_name = $notify_user->full_name;
-			$GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
-			$list[$notify_user->id] = $notify_user;
-		}
-
-		foreach($this->contacts_arr as $contact_id) {
-			$notify_user = new Contact();
-			$notify_user->retrieve($contact_id);
-			$notify_user->new_assigned_user_name = $notify_user->full_name;
-			$GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
-			$list[$notify_user->id] = $notify_user;
-		}
+            $this->leads_arr =	array();
+        }
+
+        foreach($this->users_arr as $user_id) {
+            $notify_user = new User();
+            $notify_user->retrieve($user_id);
+            $notify_user->new_assigned_user_name = $notify_user->full_name;
+            $GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
+            $list[$notify_user->id] = $notify_user;
+        }
+
+        foreach($this->contacts_arr as $contact_id) {
+            $notify_user = new Contact();
+            $notify_user->retrieve($contact_id);
+            $notify_user->new_assigned_user_name = $notify_user->full_name;
+            $GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
+            $list[$notify_user->id] = $notify_user;
+        }
 
         foreach($this->leads_arr as $lead_id) {
-			$notify_user = new Lead();
-			$notify_user->retrieve($lead_id);
-			$notify_user->new_assigned_user_name = $notify_user->full_name;
-			$GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
-			$list[$notify_user->id] = $notify_user;
-		}
-
-		global $sugar_config;
-		if(isset($sugar_config['disable_notify_current_user']) && $sugar_config['disable_notify_current_user']) {
-			global $current_user;
-			if(isset($list[$current_user->id]))
-				unset($list[$current_user->id]);
-		}
-		return $list;
-	}
-
-
-	function bean_implements($interface) {
-		switch($interface) {
-			case 'ACL':return true;
-		}
-		return false;
-	}
-
-	function listviewACLHelper() {
-		$array_assign = parent::listviewACLHelper();
-		$is_owner = false;
-		$in_group = false; //SECURITY GROUPS
-		if(!empty($this->parent_name)) {
-
-			if(!empty($this->parent_name_owner)) {
-				global $current_user;
-				$is_owner = $current_user->id == $this->parent_name_owner;
-			}
-			/* BEGIN - SECURITY GROUPS */
-			//parent_name_owner not being set for whatever reason so we need to figure this out
-			else if(!empty($this->parent_type) && !empty($this->parent_id)) {
-				global $current_user;
+            $notify_user = new Lead();
+            $notify_user->retrieve($lead_id);
+            $notify_user->new_assigned_user_name = $notify_user->full_name;
+            $GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
+            $list[$notify_user->id] = $notify_user;
+        }
+
+        global $sugar_config;
+        if(isset($sugar_config['disable_notify_current_user']) && $sugar_config['disable_notify_current_user']) {
+            global $current_user;
+            if(isset($list[$current_user->id]))
+                unset($list[$current_user->id]);
+        }
+        return $list;
+    }
+
+
+    function bean_implements($interface) {
+        switch($interface) {
+            case 'ACL':return true;
+        }
+        return false;
+    }
+
+    function listviewACLHelper() {
+        $array_assign = parent::listviewACLHelper();
+        $is_owner = false;
+        $in_group = false; //SECURITY GROUPS
+        if(!empty($this->parent_name)) {
+
+            if(!empty($this->parent_name_owner)) {
+                global $current_user;
+                $is_owner = $current_user->id == $this->parent_name_owner;
+            }
+            /* BEGIN - SECURITY GROUPS */
+            //parent_name_owner not being set for whatever reason so we need to figure this out
+            else if(!empty($this->parent_type) && !empty($this->parent_id)) {
+                global $current_user;
                 $parent_bean = BeanFactory::getBean($this->parent_type,$this->parent_id);
                 if($parent_bean !== false) {
-                	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
+                    $is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
-			}
-			require_once("modules/SecurityGroups/SecurityGroup.php");
-			$in_group = SecurityGroup::groupHasAccess($this->parent_type, $this->parent_id, 'view');
-        	/* END - SECURITY GROUPS */
-		}
-
-		/* BEGIN - SECURITY GROUPS */
-		/**
+            }
+            require_once("modules/SecurityGroups/SecurityGroup.php");
+            $in_group = SecurityGroup::groupHasAccess($this->parent_type, $this->parent_id, 'view');
+            /* END - SECURITY GROUPS */
+        }
+
+        /* BEGIN - SECURITY GROUPS */
+        /**
 		if(!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner)) {
-		*/
-		if(!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner, 'module', $in_group)){
+         */
+        if(!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner, 'module', $in_group)){
         /* END - SECURITY GROUPS */
-			$array_assign['PARENT'] = 'a';
-		} else {
-			$array_assign['PARENT'] = 'span';
-		}
-
-		$is_owner = false;
-		$in_group = false; //SECURITY GROUPS
-
-		if(!empty($this->contact_name)) {
-			if(!empty($this->contact_name_owner)) {
-				global $current_user;
-				$is_owner = $current_user->id == $this->contact_name_owner;
-			}
-			/* BEGIN - SECURITY GROUPS */
-			//contact_name_owner not being set for whatever reason so we need to figure this out
-			else {
-				global $current_user;
+            $array_assign['PARENT'] = 'a';
+        } else {
+            $array_assign['PARENT'] = 'span';
+        }
+
+        $is_owner = false;
+        $in_group = false; //SECURITY GROUPS
+
+        if(!empty($this->contact_name)) {
+            if(!empty($this->contact_name_owner)) {
+                global $current_user;
+                $is_owner = $current_user->id == $this->contact_name_owner;
+            }
+            /* BEGIN - SECURITY GROUPS */
+            //contact_name_owner not being set for whatever reason so we need to figure this out
+            else {
+                global $current_user;
                 $parent_bean = BeanFactory::getBean('Contacts',$this->contact_id);
                 if($parent_bean !== false) {
-                	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
+                    $is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
-			}
-			require_once("modules/SecurityGroups/SecurityGroup.php");
-			$in_group = SecurityGroup::groupHasAccess('Contacts', $this->contact_id, 'view');
-        	/* END - SECURITY GROUPS */
-		}
-
-		/* BEGIN - SECURITY GROUPS */
-		/**
+            }
+            require_once("modules/SecurityGroups/SecurityGroup.php");
+            $in_group = SecurityGroup::groupHasAccess('Contacts', $this->contact_id, 'view');
+            /* END - SECURITY GROUPS */
+        }
+
+        /* BEGIN - SECURITY GROUPS */
+        /**
 		if(ACLController::checkAccess('Contacts', 'view', $is_owner)) {
-		*/
-		if(ACLController::checkAccess('Contacts', 'view', $is_owner, 'module', $in_group)) {
+         */
+        if(ACLController::checkAccess('Contacts', 'view', $is_owner, 'module', $in_group)) {
         /* END - SECURITY GROUPS */
-			$array_assign['CONTACT'] = 'a';
-		} else {
-			$array_assign['CONTACT'] = 'span';
-		}
-		return $array_assign;
-	}
-
-
-	function save_relationship_changes($is_update, $exclude = array()) {
-	    if(empty($this->in_workflow)) {
-           if(empty($this->in_import)){//if a meeting is being imported then contact_id  should not be excluded
-           //if the global soap_server_object variable is not empty (as in from a soap/OPI call), then process the assigned_user_id relationship, otherwise
-           //add assigned_user_id to exclude list and let the logic from MeetingFormBase determine whether assigned user id gets added to the relationship
-           	if(!empty($GLOBALS['soap_server_object'])){
-           		$exclude = array('contact_id', 'user_id');
-           	}else{
-	    		$exclude = array('contact_id', 'user_id','assigned_user_id');
-           	}
-           }
-           else{
-           	$exclude = array('user_id');
-           }
-        }
-       parent::save_relationship_changes($is_update, $exclude);
-	}
-
-
-	/**
-	 * @see SugarBean::afterImportSave()
-	 */
-	public function afterImportSave()
-	{
-	    if ( $this->parent_type == 'Contacts' ) {
-	        $this->load_relationship('contacts');
-	        if ( !$this->contacts->relationship_exists('contacts',array('id'=>$this->parent_id)) )
-	            $this->contacts->add($this->parent_id);
-	    }
-	    elseif ( $this->parent_type == 'Leads' ) {
-	        $this->load_relationship('leads');
-	        if ( !$this->leads->relationship_exists('leads',array('id'=>$this->parent_id)) )
-	            $this->leads->add($this->parent_id);
-	    }
-
-	    parent::afterImportSave();
-	}
+            $array_assign['CONTACT'] = 'a';
+        } else {
+            $array_assign['CONTACT'] = 'span';
+        }
+        return $array_assign;
+    }
+
+
+    function save_relationship_changes($is_update, $exclude = array()) {
+        if(empty($this->in_workflow)) {
+            if(empty($this->in_import)){//if a meeting is being imported then contact_id  should not be excluded
+            //if the global soap_server_object variable is not empty (as in from a soap/OPI call), then process the assigned_user_id relationship, otherwise
+            //add assigned_user_id to exclude list and let the logic from MeetingFormBase determine whether assigned user id gets added to the relationship
+                if(!empty($GLOBALS['soap_server_object'])){
+                    $exclude = array('contact_id', 'user_id');
+                }else{
+                $exclude = array('contact_id', 'user_id','assigned_user_id');
+                }
+            }
+            else{
+                $exclude = array('user_id');
+            }
+        }
+        parent::save_relationship_changes($is_update, $exclude);
+    }
+
+
+    /**
+     * @see SugarBean::afterImportSave()
+     */
+    public function afterImportSave()
+    {
+        if ( $this->parent_type == 'Contacts' ) {
+            $this->load_relationship('contacts');
+            if ( !$this->contacts->relationship_exists('contacts',array('id'=>$this->parent_id)) )
+                $this->contacts->add($this->parent_id);
+        }
+        elseif ( $this->parent_type == 'Leads' ) {
+            $this->load_relationship('leads');
+            if ( !$this->leads->relationship_exists('leads',array('id'=>$this->parent_id)) )
+                $this->leads->add($this->parent_id);
+        }
+
+        parent::afterImportSave();
+    }
 
     public function getDefaultStatus()
     {
-         $def = $this->field_defs['status'];
-         if (isset($def['default'])) {
-             return $def['default'];
-         } else {
+            $def = $this->field_defs['status'];
+            if (isset($def['default'])) {
+                return $def['default'];
+            } else {
             $app = return_app_list_strings_language($GLOBALS['current_language']);
             if (isset($def['options']) && isset($app[$def['options']])) {
                 $keys = array_keys($app[$def['options']]);
@@ -888,9 +888,9 @@ 
 //TODO: do we really need focus, name and view params for this function
 function getMeetingsExternalApiDropDown($focus = null, $name = null, $value = null, $view = null)
 {
-	global $dictionary, $app_list_strings;
+    global $dictionary, $app_list_strings;
 
-	$cacheKeyName = 'meetings_type_drop_down';
+    $cacheKeyName = 'meetings_type_drop_down';
 
     $apiList = sugar_cache_retrieve($cacheKeyName);
     if ($apiList === null)
@@ -902,17 +902,17 @@ 
         sugar_cache_put($cacheKeyName, $apiList);
     }
 
-	if(!empty($value) && empty($apiList[$value]))
-	{
-		$apiList[$value] = $value;
+    if(!empty($value) && empty($apiList[$value]))
+    {
+        $apiList[$value] = $value;
     }
-	//bug 46294: adding list of options to dropdown list (if it is not the default list)
+    //bug 46294: adding list of options to dropdown list (if it is not the default list)
     if ($dictionary['Meeting']['fields']['type']['options'] != "eapm_list")
     {
         $apiList = array_merge(getMeetingTypeOptions($dictionary, $app_list_strings), $apiList);
     }
 
-	return $apiList;
+    return $apiList;
 }
 
 /**
@@ -923,20 +923,20 @@ 
  */
 function getMeetingTypeOptions($dictionary, $app_list_strings)
 {
-	$result = array();
+    $result = array();
 
     // getting name of meeting type to fill dropdown list by its values
     if (isset($dictionary['Meeting']['fields']['type']['options']))
-	{
-    	$typeName = $dictionary['Meeting']['fields']['type']['options'];
+    {
+        $typeName = $dictionary['Meeting']['fields']['type']['options'];
 
         if (!empty($app_list_strings[$typeName]))
-		{
-        	$typeList = $app_list_strings[$typeName];
+        {
+            $typeList = $app_list_strings[$typeName];
 
             foreach ($typeList as $key => $value)
-			{
-				$result[$value] = $value;
+            {
+                $result[$value] = $value;
             }
         }
     }