adamjakab / SuiteCRM

include/database/SqlsrvManager.php

Indentation +38 added lines, -38 removed lines

@@ -143,10 +143,10 @@ 
             'url'      => 'nvarchar',
             'encrypt'  => 'nvarchar',
             'file'     => 'nvarchar',
-	        'decimal_tpl' => 'decimal(%d, %d)',
+            'decimal_tpl' => 'decimal(%d, %d)',
     );
 
-	/**
+    /**
      * @see DBManager::connect()
      */
     public function connect(array $configOptions = null, $dieOnError = false)
@@ -203,10 +203,10 @@ 
         return true;
     }
 
-	/**
+    /**
      * @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);
@@ -232,15 +232,15 @@ 
         return $result;
     }
 
-	/**
+    /**
      * @see DBManager::getFieldsArray()
      */
-	public function getFieldsArray($result, $make_lower_case = false)
-	{
+    public function getFieldsArray($result, $make_lower_case = false)
+    {
         $field_array = array();
 
         if ( !$result ) {
-        	return false;
+            return false;
         }
 
         foreach ( sqlsrv_field_metadata($result) as $fieldMetadata ) {
@@ -252,16 +252,16 @@ 
         }
 
         return $field_array;
-	}
+    }
 
-	/**
-	 * @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 = sqlsrv_fetch_array($result,SQLSRV_FETCH_ASSOC);
+        $row = sqlsrv_fetch_array($result,SQLSRV_FETCH_ASSOC);
         if (empty($row)) {
             return false;
         }
@@ -277,7 +277,7 @@ 
         }
 
         return $row;
-	}
+    }
 
     /**
      * @see DBManager::convert()
@@ -291,7 +291,7 @@ 
             return parent::convert($string, $type, $additional_parameters);
     }
 
-	/**
+    /**
      * Compares two vardefs. Overriding 39098  due to bug: 39098 . IN 6.0 we changed the id columns to dbType = 'id'
      * for example emails_beans.  In 554 the field email_id was nvarchar but in 6.0 since it id dbType = 'id' we would want to alter
      * it to varchar. This code will prevent it.
@@ -317,7 +317,7 @@ 
      */
     public function disconnect()
     {
-    	$GLOBALS['log']->debug('Calling Mssql::disconnect()');
+        $GLOBALS['log']->debug('Calling Mssql::disconnect()');
         if(!empty($this->database)){
             $this->freeResult();
             sqlsrv_close($this->database);
@@ -335,10 +335,10 @@ 
     }
 
 
-	/**
-	 * Detect if no clustered index has been created for a table; if none created then just pick the first index and make it that
-	 *
-	 * @see MssqlHelper::indexSQL()
+    /**
+     * Detect if no clustered index has been created for a table; if none created then just pick the first index and make it that
+     *
+     * @see MssqlHelper::indexSQL()
      */
     public function getConstraintSql($indices, $table)
     {
@@ -378,12 +378,12 @@ 
                 $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']);
-				if ( $row['TYPE_NAME'] == 'nvarchar' && $row['PRECISION'] == '0' ) {
-				    $columns[$column_name]['len']='max';
-				}
-			}
+            elseif ( in_array($row['TYPE_NAME'],array('nchar','nvarchar')) ) {
+                $columns[$column_name]['len']=strtolower($row['PRECISION']);
+                if ( $row['TYPE_NAME'] == 'nvarchar' && $row['PRECISION'] == '0' ) {
+                    $columns[$column_name]['len']='max';
+                }
+            }
             elseif ( !in_array($row['TYPE_NAME'],array('datetime','text')) ) {
                 $columns[$column_name]['len']=strtolower($row['LENGTH']);
             }
@@ -488,21 +488,21 @@ 
         return "TRUNCATE TABLE $name";
     }
 
-	/**
-	 * (non-PHPdoc)
-	 * @see DBManager::lastDbError()
-	 */
+    /**
+     * (non-PHPdoc)
+     * @see DBManager::lastDbError()
+     */
     public function lastDbError()
     {
         $errors = sqlsrv_errors(SQLSRV_ERR_ERRORS);
         if(empty($errors)) 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 languge is set.
-		    return false;
+            return false;
         }
         $messages = array();
         foreach($errors as $error) {
@@ -515,7 +515,7 @@ 
             }
             $sqlpos = strpos($sqlmsg, $app_strings['ERR_MSSQL_DB_CONTEXT']);
             $sqlpos2 = strpos($sqlmsg, $app_strings['ERR_MSSQL_WARNING']);
-    		if ( $sqlpos !== false || $sqlpos2 !== false) {
+            if ( $sqlpos !== false || $sqlpos2 !== false) {
                     continue;
             }
             $messages[] = $sqlmsg;

Spacing +57 added lines, -57 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,14 +175,14 @@ 
                     "ReturnDatesAsStrings" => true,
                     "MultipleActiveResultSets" => true,
                     );
-        if(!empty($configOptions['db_name'])) {
+        if (!empty($configOptions['db_name'])) {
             $options["Database"] = $configOptions['db_name'];
         }
         $this->database = sqlsrv_connect($connect_param, $options);
-        if(empty($this->database)) {
+        if (empty($this->database)) {
             $GLOBALS['log']->fatal("Could not connect to server ".$configOptions['db_host_name']." as ".$configOptions['db_user_name'].".");
-            if($dieOnError) {
-                    if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
+            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.");
@@ -192,7 +192,7 @@ 
             }
         }
 
-        if($this->checkError('Could Not Connect:', $dieOnError))
+        if ($this->checkError('Could Not Connect:', $dieOnError))
             $GLOBALS['log']->info("connected to db");
 
         sqlsrv_query($this->database, 'SET DATEFORMAT mdy');
@@ -208,26 +208,26 @@ 
 	 */
 	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);
         }
         $sql = $this->_appendN($sql);
 
         $this->countQuery($sql);
-        $GLOBALS['log']->info('Query:' . $sql);
+        $GLOBALS['log']->info('Query:'.$sql);
         $this->checkConnection();
         $this->query_time = microtime(true);
 
-        $result = $suppress?@sqlsrv_query($this->database, $sql):sqlsrv_query($this->database, $sql);
+        $result = $suppress ? @sqlsrv_query($this->database, $sql) : sqlsrv_query($this->database, $sql);
 
         $this->query_time = microtime(true) - $this->query_time;
         $GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
 
 
-        $this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
+        $this->checkError($msg.' Query Failed:'.$sql.'::', $dieOnError);
 
         //suppress non error messages
-        sqlsrv_configure('WarningsReturnAsErrors',false);
+        sqlsrv_configure('WarningsReturnAsErrors', false);
 
         return $result;
     }
@@ -239,13 +239,13 @@ 
 	{
         $field_array = array();
 
-        if ( !$result ) {
+        if (!$result) {
         	return false;
         }
 
-        foreach ( sqlsrv_field_metadata($result) as $fieldMetadata ) {
+        foreach (sqlsrv_field_metadata($result) as $fieldMetadata) {
             $key = $fieldMetadata['Name'];
-            if($make_lower_case==true)
+            if ($make_lower_case == true)
                 $key = strtolower($key);
 
             $field_array[] = $key;
@@ -261,12 +261,12 @@ 
 	{
 		if (empty($result))	return false;
 
-	    $row = sqlsrv_fetch_array($result,SQLSRV_FETCH_ASSOC);
+	    $row = sqlsrv_fetch_array($result, SQLSRV_FETCH_ASSOC);
         if (empty($row)) {
             return false;
         }
 
-        foreach($row as $key => $column) {
+        foreach ($row as $key => $column) {
             // MSSQL returns a space " " when a varchar column is empty ("") and not null.
             // We need to strip empty spaces
             // notice we only strip if one space is returned.  we do not want to strip
@@ -284,7 +284,7 @@ 
      */
     public function convert($string, $type, array $additional_parameters = array())
     {
-        if ( $type == 'datetime')
+        if ($type == 'datetime')
         // see http://msdn.microsoft.com/en-us/library/ms187928.aspx for details
             return "CONVERT(datetime,$string,120)";
         else
@@ -300,10 +300,10 @@ 
      * @param  array  $fielddef2
      * @return bool   true if they match, false if they don't
      */
-    public function compareVarDefs($fielddef1,$fielddef2, $ignoreName = false)
+    public function compareVarDefs($fielddef1, $fielddef2, $ignoreName = false)
     {
-        if((isset($fielddef2['dbType']) && $fielddef2['dbType'] == 'id') || preg_match('/(_id$|^id$)/', $fielddef2['name'])){
-            if(isset($fielddef1['type']) && isset($fielddef2['type'])){
+        if ((isset($fielddef2['dbType']) && $fielddef2['dbType'] == 'id') || preg_match('/(_id$|^id$)/', $fielddef2['name'])) {
+            if (isset($fielddef1['type']) && isset($fielddef2['type'])) {
                 $fielddef2['type'] = $fielddef1['type'];
             }
         }
@@ -318,7 +318,7 @@ 
     public function disconnect()
     {
     	$GLOBALS['log']->debug('Calling Mssql::disconnect()');
-        if(!empty($this->database)){
+        if (!empty($this->database)) {
             $this->freeResult();
             sqlsrv_close($this->database);
             $this->database = null;
@@ -330,7 +330,7 @@ 
      */
     protected function freeDbResult($dbResult)
     {
-        if(!empty($dbResult))
+        if (!empty($dbResult))
             sqlsrv_free_stmt($dbResult);
     }
 
@@ -342,19 +342,19 @@ 
      */
     public function getConstraintSql($indices, $table)
     {
-        if ( $this->doesTableHaveAClusteredIndexDefined($table) ) {
+        if ($this->doesTableHaveAClusteredIndexDefined($table)) {
             return parent::getConstraintSql($indices, $table);
         }
 
         // check to see if one of the passed in indices is a primary one; if so we can bail as well
-        foreach ( $indices as $index ) {
-            if ( $index['type'] == 'primary' ) {
+        foreach ($indices as $index) {
+            if ($index['type'] == 'primary') {
                 return parent::getConstraintSql($indices, $table);
             }
         }
 
         // Change the first index listed to be a clustered one instead ( so we have at least one for the table )
-        if ( isset($indices[0]) ) {
+        if (isset($indices[0])) {
             $indices[0]['type'] = 'clustered';
         }
 
@@ -370,41 +370,41 @@ 
         $result = $this->query("sp_columns_90 $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']);
-				if ( $row['TYPE_NAME'] == 'nvarchar' && $row['PRECISION'] == '0' ) {
-				    $columns[$column_name]['len']='max';
+			elseif (in_array($row['TYPE_NAME'], array('nchar', 'nvarchar'))) {
+				$columns[$column_name]['len'] = strtolower($row['PRECISION']);
+				if ($row['TYPE_NAME'] == 'nvarchar' && $row['PRECISION'] == '0') {
+				    $columns[$column_name]['len'] = 'max';
 				}
 			}
-            elseif ( !in_array($row['TYPE_NAME'],array('datetime','text')) ) {
-                $columns[$column_name]['len']=strtolower($row['LENGTH']);
+            elseif (!in_array($row['TYPE_NAME'], array('datetime', 'text'))) {
+                $columns[$column_name]['len'] = strtolower($row['LENGTH']);
             }
-            if ( stristr($row['TYPE_NAME'],'identity') ) {
+            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'];
@@ -430,7 +430,7 @@ 
 EOSQL;
 
         $result = $this->getOne($query);
-        if ( !$result ) {
+        if (!$result) {
             return false;
         }
 
@@ -453,7 +453,7 @@ 
 EOSQL;
 
         $result = $this->getOne($query);
-        if ( !$result ) {
+        if (!$result) {
             return false;
         }
 
@@ -466,10 +466,10 @@ 
      * @see DBManager::changeColumnSQL()
      * @see MssqlHelper::changeColumnSQL()
      */
-    protected function changeColumnSQL($tablename,$fieldDefs, $action, $ignoreRequired = false)
+    protected function changeColumnSQL($tablename, $fieldDefs, $action, $ignoreRequired = false)
     {
         $sql = '';
-        if ( $action == 'drop' && $this->doesTableHaveAFulltextIndexDefined($tablename) ) {
+        if ($action == 'drop' && $this->doesTableHaveAFulltextIndexDefined($tablename)) {
             $sql .= "DROP FULLTEXT INDEX ON {$tablename}";
         }
 
@@ -495,33 +495,33 @@ 
     public function lastDbError()
     {
         $errors = sqlsrv_errors(SQLSRV_ERR_ERRORS);
-        if(empty($errors)) return false;
+        if (empty($errors)) return false;
         global $app_strings;
         if (empty($app_strings)
 		    or !isset($app_strings['ERR_MSSQL_DB_CONTEXT'])
-			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 languge is set.
 		    return false;
         }
         $messages = array();
-        foreach($errors as $error) {
+        foreach ($errors as $error) {
             $sqlmsg = $error['message'];
             $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) {
                 continue;
             }
             $sqlpos = strpos($sqlmsg, $app_strings['ERR_MSSQL_DB_CONTEXT']);
             $sqlpos2 = strpos($sqlmsg, $app_strings['ERR_MSSQL_WARNING']);
-    		if ( $sqlpos !== false || $sqlpos2 !== false) {
+    		if ($sqlpos !== false || $sqlpos2 !== false) {
                     continue;
             }
             $messages[] = $sqlmsg;
         }
 
-        if(!empty($messages)) {
+        if (!empty($messages)) {
             return join("\n", $messages);
         }
         return false;
@@ -548,7 +548,7 @@ 
     protected function verifyGenericQueryRollback($type, $table, $query)
     {
         $this->log->debug("verifying $type statement");
-        if(!sqlsrv_begin_transaction($this->database)) {
+        if (!sqlsrv_begin_transaction($this->database)) {
             return "Failed to create transaction";
         }
         $this->query($query, false);

Braces +43 added lines, -31 removed lines

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

include/database/MssqlManager.php

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()';
     }
 }

Switch Indentation +71 added lines, -71 removed lines

@@ -1304,24 +1304,24 @@ 
     protected function alterSQLRep($action, array $def, $ignoreRequired, $tablename)
     {
         switch($action){
-        case 'add':
-             $f_def=$this->oneColumnSQLRep($def, $ignoreRequired,$tablename,false);
-            return "ADD " . $f_def;
-            break;
-        case 'drop':
-            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_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'];
-            return $f_stmt;
-            break;
-        default:
-            return '';
+            case 'add':
+                 $f_def=$this->oneColumnSQLRep($def, $ignoreRequired,$tablename,false);
+                return "ADD " . $f_def;
+                break;
+            case 'drop':
+                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_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'];
+                return $f_stmt;
+                break;
+            default:
+                return '';
     	}
     }
 
@@ -1511,59 +1511,59 @@ 
 
         switch ($type){
         // generic indices
-        case 'index':
-        case 'alternate_key':
-            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)";
-            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})";
-            break;
-        case 'primary':
-            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']})";
-            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'];
-
-                $language = "Language 1033";
-                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'];
-
-                $sql = " CREATE FULLTEXT INDEX ON $table ($fields $language) KEY INDEX $key_index ON $catalog_name WITH CHANGE_TRACKING $change_tracking" ;
-            }
-            break;
+            case 'index':
+            case 'alternate_key':
+                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)";
+                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})";
+                break;
+            case 'primary':
+                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']})";
+                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'];
+
+                    $language = "Language 1033";
+                    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'];
+
+                    $sql = " CREATE FULLTEXT INDEX ON $table ($fields $language) KEY INDEX $key_index ON $catalog_name WITH CHANGE_TRACKING $change_tracking" ;
+                }
+                break;
         }
         return $sql;
     }

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']->info('Query:' . $sql);
+        $GLOBALS['log']->info('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']->info('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()

include/database/MysqlManager.php

Indentation +1344 added lines, -1344 removed lines

@@ -96,368 +96,368 @@ 
  */
 class MysqlManager extends DBManager
 {
-	/**
-	 * @see DBManager::$dbType
-	 */
-	public $dbType = 'mysql';
-	public $variant = 'mysql';
-	public $dbName = 'MySQL';
-	public $label = 'LBL_MYSQL';
-
-	protected $maxNameLengths = array(
-		'table' => 64,
-		'column' => 64,
-		'index' => 64,
-		'alias' => 256
-	);
-
-	protected $type_map = array(
-			'int'      => 'int',
-			'double'   => 'double',
-			'float'    => 'float',
-			'uint'     => 'int unsigned',
-			'ulong'    => 'bigint unsigned',
-			'long'     => 'bigint',
-			'short'    => 'smallint',
-			'varchar'  => 'varchar',
-			'text'     => 'text',
-			'longtext' => 'longtext',
-			'date'     => 'date',
-			'enum'     => 'varchar',
-			'relate'   => 'varchar',
-			'multienum'=> 'text',
-			'html'     => 'text',
-			'longhtml' => 'longtext',
-			'datetime' => 'datetime',
-			'datetimecombo' => 'datetime',
-			'time'     => 'time',
-			'bool'     => 'bool',
-			'tinyint'  => 'tinyint',
-			'char'     => 'char',
-			'blob'     => 'blob',
-			'longblob' => 'longblob',
-			'currency' => 'decimal(26,6)',
-			'decimal'  => 'decimal',
-			'decimal2' => 'decimal',
-			'id'       => 'char(36)',
-			'url'      => 'varchar',
-			'encrypt'  => 'varchar',
-			'file'     => 'varchar',
-			'decimal_tpl' => 'decimal(%d, %d)',
-
-	);
-
-	protected $capabilities = array(
-		"affected_rows" => true,
-		"select_rows" => true,
-		"inline_keys" => true,
-		"create_user" => true,
-		"fulltext" => true,
-	    "collation" => true,
-	    "create_db" => true,
-	    "disable_keys" => true,
-	);
-
-	/**
-	 * Parses and runs queries
-	 *
-	 * @param  string   $sql        SQL Statement to execute
-	 * @param  bool     $dieOnError True if we want to call die if the query returns errors
-	 * @param  string   $msg        Message to log if error occurs
-	 * @param  bool     $suppress   Flag to suppress all error output unless in debug logging mode.
-	 * @param  bool     $keepResult True if we want to push this result into the $lastResult array.
-	 * @return resource result set
-	 */
-	public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
-	{
-		if(is_array($sql)) {
-			return $this->queryArray($sql, $dieOnError, $msg, $suppress);
-		}
-
-		parent::countQuery($sql);
-		$GLOBALS['log']->info('Query:' . $sql);
-		$this->checkConnection();
-		$this->query_time = microtime(true);
-		$this->lastsql = $sql;
-		$result = $suppress?@mysql_query($sql, $this->database):mysql_query($sql, $this->database);
-
-		$this->query_time = microtime(true) - $this->query_time;
-		$GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
-
-
-		if($keepResult)
-			$this->lastResult = $result;
-
-		$this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
-		return $result;
-	}
+    /**
+     * @see DBManager::$dbType
+     */
+    public $dbType = 'mysql';
+    public $variant = 'mysql';
+    public $dbName = 'MySQL';
+    public $label = 'LBL_MYSQL';
+
+    protected $maxNameLengths = array(
+        'table' => 64,
+        'column' => 64,
+        'index' => 64,
+        'alias' => 256
+    );
+
+    protected $type_map = array(
+            'int'      => 'int',
+            'double'   => 'double',
+            'float'    => 'float',
+            'uint'     => 'int unsigned',
+            'ulong'    => 'bigint unsigned',
+            'long'     => 'bigint',
+            'short'    => 'smallint',
+            'varchar'  => 'varchar',
+            'text'     => 'text',
+            'longtext' => 'longtext',
+            'date'     => 'date',
+            'enum'     => 'varchar',
+            'relate'   => 'varchar',
+            'multienum'=> 'text',
+            'html'     => 'text',
+            'longhtml' => 'longtext',
+            'datetime' => 'datetime',
+            'datetimecombo' => 'datetime',
+            'time'     => 'time',
+            'bool'     => 'bool',
+            'tinyint'  => 'tinyint',
+            'char'     => 'char',
+            'blob'     => 'blob',
+            'longblob' => 'longblob',
+            'currency' => 'decimal(26,6)',
+            'decimal'  => 'decimal',
+            'decimal2' => 'decimal',
+            'id'       => 'char(36)',
+            'url'      => 'varchar',
+            'encrypt'  => 'varchar',
+            'file'     => 'varchar',
+            'decimal_tpl' => 'decimal(%d, %d)',
+
+    );
+
+    protected $capabilities = array(
+        "affected_rows" => true,
+        "select_rows" => true,
+        "inline_keys" => true,
+        "create_user" => true,
+        "fulltext" => true,
+        "collation" => true,
+        "create_db" => true,
+        "disable_keys" => true,
+    );
+
+    /**
+     * Parses and runs queries
+     *
+     * @param  string   $sql        SQL Statement to execute
+     * @param  bool     $dieOnError True if we want to call die if the query returns errors
+     * @param  string   $msg        Message to log if error occurs
+     * @param  bool     $suppress   Flag to suppress all error output unless in debug logging mode.
+     * @param  bool     $keepResult True if we want to push this result into the $lastResult array.
+     * @return resource result set
+     */
+    public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
+    {
+        if(is_array($sql)) {
+            return $this->queryArray($sql, $dieOnError, $msg, $suppress);
+        }
+
+        parent::countQuery($sql);
+        $GLOBALS['log']->info('Query:' . $sql);
+        $this->checkConnection();
+        $this->query_time = microtime(true);
+        $this->lastsql = $sql;
+        $result = $suppress?@mysql_query($sql, $this->database):mysql_query($sql, $this->database);
+
+        $this->query_time = microtime(true) - $this->query_time;
+        $GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
+
+
+        if($keepResult)
+            $this->lastResult = $result;
+
+        $this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
+        return $result;
+    }
 
     /**
      * Returns the number of rows affected by the last query
      * @param $result
      * @return int
      */
-	public function getAffectedRowCount($result)
-	{
-		return mysql_affected_rows($this->getDatabase());
-	}
-
-	/**
-	 * Returns the number of rows returned by the result
-	 *
-	 * This function can't be reliably implemented on most DB, do not use it.
-	 * @abstract
-	 * @deprecated
-	 * @param  resource $result
-	 * @return int
-	 */
-	public function getRowCount($result)
-	{
-	    return mysql_num_rows($result);
-	}
-
-	/**
-	 * Disconnects from the database
-	 *
-	 * Also handles any cleanup needed
-	 */
-	public function disconnect()
-	{
-		$GLOBALS['log']->debug('Calling MySQL::disconnect()');
-		if(!empty($this->database)){
-			$this->freeResult();
-			mysql_close($this->database);
-			$this->database = null;
-		}
-	}
-
-	/**
-	 * @see DBManager::freeDbResult()
-	 */
-	protected function freeDbResult($dbResult)
-	{
-		if(!empty($dbResult))
-			mysql_free_result($dbResult);
-	}
-
-
-	/**
-	 * @abstract
-	 * Check if query has LIMIT clause
-	 * Relevant for now only for Mysql
-	 * @param string $sql
-	 * @return bool
-	 */
-	protected function hasLimit($sql)
-	{
-	    return stripos($sql, " limit ") !== false;
-	}
-
-	/**
-	 * @see DBManager::limitQuery()
-	 */
-	public function limitQuery($sql, $start, $count, $dieOnError = false, $msg = '', $execute = true)
-	{
+    public function getAffectedRowCount($result)
+    {
+        return mysql_affected_rows($this->getDatabase());
+    }
+
+    /**
+     * Returns the number of rows returned by the result
+     *
+     * This function can't be reliably implemented on most DB, do not use it.
+     * @abstract
+     * @deprecated
+     * @param  resource $result
+     * @return int
+     */
+    public function getRowCount($result)
+    {
+        return mysql_num_rows($result);
+    }
+
+    /**
+     * Disconnects from the database
+     *
+     * Also handles any cleanup needed
+     */
+    public function disconnect()
+    {
+        $GLOBALS['log']->debug('Calling MySQL::disconnect()');
+        if(!empty($this->database)){
+            $this->freeResult();
+            mysql_close($this->database);
+            $this->database = null;
+        }
+    }
+
+    /**
+     * @see DBManager::freeDbResult()
+     */
+    protected function freeDbResult($dbResult)
+    {
+        if(!empty($dbResult))
+            mysql_free_result($dbResult);
+    }
+
+
+    /**
+     * @abstract
+     * Check if query has LIMIT clause
+     * Relevant for now only for Mysql
+     * @param string $sql
+     * @return bool
+     */
+    protected function hasLimit($sql)
+    {
+        return stripos($sql, " limit ") !== false;
+    }
+
+    /**
+     * @see DBManager::limitQuery()
+     */
+    public function limitQuery($sql, $start, $count, $dieOnError = false, $msg = '', $execute = true)
+    {
         $start = (int)$start;
         $count = (int)$count;
-	    if ($start < 0)
-			$start = 0;
-		$GLOBALS['log']->debug('Limit Query:' . $sql. ' Start: ' .$start . ' count: ' . $count);
-
-	    $sql = "$sql LIMIT $start,$count";
-		$this->lastsql = $sql;
-
-		if(!empty($GLOBALS['sugar_config']['check_query'])){
-			$this->checkQuery($sql);
-		}
-		if(!$execute) {
-			return $sql;
-		}
-
-		return $this->query($sql, $dieOnError, $msg);
-	}
-
-
-	/**
-	 * @see DBManager::checkQuery()
-	 */
-	protected function checkQuery($sql, $object_name = false)
-	{
-		$result   = $this->query('EXPLAIN ' . $sql);
-		$badQuery = array();
-		while ($row = $this->fetchByAssoc($result)) {
-			if (empty($row['table']))
-				continue;
-			$badQuery[$row['table']] = '';
-			if (strtoupper($row['type']) == 'ALL')
-				$badQuery[$row['table']]  .=  ' Full Table Scan;';
-			if (empty($row['key']))
-				$badQuery[$row['table']] .= ' No Index Key Used;';
-			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using filesort') > 0)
-				$badQuery[$row['table']] .= ' Using FileSort;';
-			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using temporary') > 0)
-				$badQuery[$row['table']] .= ' Using Temporary Table;';
-		}
-
-		if ( empty($badQuery) )
-			return true;
-
-		foreach($badQuery as $table=>$data ){
-			if(!empty($data)){
-				$warning = ' Table:' . $table . ' Data:' . $data;
-				if(!empty($GLOBALS['sugar_config']['check_query_log'])){
-					$GLOBALS['log']->fatal($sql);
-					$GLOBALS['log']->fatal('CHECK QUERY:' .$warning);
-				}
-				else{
-					$GLOBALS['log']->warn('CHECK QUERY:' .$warning);
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * @see DBManager::get_columns()
-	 */
-	public function get_columns($tablename)
-	{
-		//find all unique indexes and primary keys.
-		$result = $this->query("DESCRIBE $tablename");
-
-		$columns = array();
-		while (($row=$this->fetchByAssoc($result)) !=null) {
-			$name = strtolower($row['Field']);
-			$columns[$name]['name']=$name;
-			$matches = array();
-			preg_match_all('/(\w+)(?:\(([0-9]+,?[0-9]*)\)|)( unsigned)?/i', $row['Type'], $matches);
-			$columns[$name]['type']=strtolower($matches[1][0]);
-			if ( isset($matches[2][0]) && in_array(strtolower($matches[1][0]),array('varchar','char','varchar2','int','decimal','float')) )
-				$columns[$name]['len']=strtolower($matches[2][0]);
-			if ( stristr($row['Extra'],'auto_increment') )
-				$columns[$name]['auto_increment'] = '1';
-			if ($row['Null'] == 'NO' && !stristr($row['Key'],'PRI'))
-				$columns[$name]['required'] = 'true';
-			if (!empty($row['Default']) )
-				$columns[$name]['default'] = $row['Default'];
-		}
-		return $columns;
-	}
-
-	/**
-	 * @see DBManager::getFieldsArray()
-	 */
-	public function getFieldsArray($result, $make_lower_case=false)
-	{
-		$field_array = array();
-
-		if(empty($result))
-			return 0;
-
-		$fields = mysql_num_fields($result);
-		for ($i=0; $i < $fields; $i++) {
-			$meta = mysql_fetch_field($result, $i);
-			if (!$meta)
-				return array();
-
-			if($make_lower_case == true)
-				$meta->name = strtolower($meta->name);
-
-			$field_array[] = $meta->name;
-		}
-
-		return $field_array;
-	}
-
-	/**
-	 * @see DBManager::fetchRow()
-	 */
-	public function fetchRow($result)
-	{
-		if (empty($result))	return false;
-
-		return mysql_fetch_assoc($result);
-	}
-
-	/**
-	 * @see DBManager::getTablesArray()
-	 */
-	public function getTablesArray()
-	{
-		$this->log->debug('Fetching table list');
-
-		if ($this->getDatabase()) {
-			$tables = array();
-			$r = $this->query('SHOW TABLES');
-			if (!empty($r)) {
-				while ($a = $this->fetchByAssoc($r)) {
-					$row = array_values($a);
-					$tables[]=$row[0];
-				}
-				return $tables;
-			}
-		}
-
-		return false; // no database available
-	}
-
-	/**
-	 * @see DBManager::version()
-	 */
-	public function version()
-	{
-		return $this->getOne("SELECT version() version");
-	}
-
-	/**
-	 * @see DBManager::tableExists()
-	 */
-	public function tableExists($tableName)
-	{
-		$this->log->info("tableExists: $tableName");
-
-		if ($this->getDatabase()) {
-			$result = $this->query("SHOW TABLES LIKE ".$this->quoted($tableName));
-			if(empty($result)) return false;
-			$row = $this->fetchByAssoc($result);
-			return !empty($row);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get tables like expression
-	 * @param $like string
-	 * @return array
-	 */
-	public function tablesLike($like)
-	{
-		if ($this->getDatabase()) {
-			$tables = array();
-			$r = $this->query('SHOW TABLES LIKE '.$this->quoted($like));
-			if (!empty($r)) {
-				while ($a = $this->fetchByAssoc($r)) {
-					$row = array_values($a);
-					$tables[]=$row[0];
-				}
-				return $tables;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @see DBManager::quote()
-	 */
-	public function quote($string)
-	{
-		if(is_array($string)) {
-			return $this->arrayQuote($string);
-		}
-		return mysql_real_escape_string($this->quoteInternal($string), $this->getDatabase());
-	}
+        if ($start < 0)
+            $start = 0;
+        $GLOBALS['log']->debug('Limit Query:' . $sql. ' Start: ' .$start . ' count: ' . $count);
+
+        $sql = "$sql LIMIT $start,$count";
+        $this->lastsql = $sql;
+
+        if(!empty($GLOBALS['sugar_config']['check_query'])){
+            $this->checkQuery($sql);
+        }
+        if(!$execute) {
+            return $sql;
+        }
+
+        return $this->query($sql, $dieOnError, $msg);
+    }
+
+
+    /**
+     * @see DBManager::checkQuery()
+     */
+    protected function checkQuery($sql, $object_name = false)
+    {
+        $result   = $this->query('EXPLAIN ' . $sql);
+        $badQuery = array();
+        while ($row = $this->fetchByAssoc($result)) {
+            if (empty($row['table']))
+                continue;
+            $badQuery[$row['table']] = '';
+            if (strtoupper($row['type']) == 'ALL')
+                $badQuery[$row['table']]  .=  ' Full Table Scan;';
+            if (empty($row['key']))
+                $badQuery[$row['table']] .= ' No Index Key Used;';
+            if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using filesort') > 0)
+                $badQuery[$row['table']] .= ' Using FileSort;';
+            if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using temporary') > 0)
+                $badQuery[$row['table']] .= ' Using Temporary Table;';
+        }
+
+        if ( empty($badQuery) )
+            return true;
+
+        foreach($badQuery as $table=>$data ){
+            if(!empty($data)){
+                $warning = ' Table:' . $table . ' Data:' . $data;
+                if(!empty($GLOBALS['sugar_config']['check_query_log'])){
+                    $GLOBALS['log']->fatal($sql);
+                    $GLOBALS['log']->fatal('CHECK QUERY:' .$warning);
+                }
+                else{
+                    $GLOBALS['log']->warn('CHECK QUERY:' .$warning);
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @see DBManager::get_columns()
+     */
+    public function get_columns($tablename)
+    {
+        //find all unique indexes and primary keys.
+        $result = $this->query("DESCRIBE $tablename");
+
+        $columns = array();
+        while (($row=$this->fetchByAssoc($result)) !=null) {
+            $name = strtolower($row['Field']);
+            $columns[$name]['name']=$name;
+            $matches = array();
+            preg_match_all('/(\w+)(?:\(([0-9]+,?[0-9]*)\)|)( unsigned)?/i', $row['Type'], $matches);
+            $columns[$name]['type']=strtolower($matches[1][0]);
+            if ( isset($matches[2][0]) && in_array(strtolower($matches[1][0]),array('varchar','char','varchar2','int','decimal','float')) )
+                $columns[$name]['len']=strtolower($matches[2][0]);
+            if ( stristr($row['Extra'],'auto_increment') )
+                $columns[$name]['auto_increment'] = '1';
+            if ($row['Null'] == 'NO' && !stristr($row['Key'],'PRI'))
+                $columns[$name]['required'] = 'true';
+            if (!empty($row['Default']) )
+                $columns[$name]['default'] = $row['Default'];
+        }
+        return $columns;
+    }
+
+    /**
+     * @see DBManager::getFieldsArray()
+     */
+    public function getFieldsArray($result, $make_lower_case=false)
+    {
+        $field_array = array();
+
+        if(empty($result))
+            return 0;
+
+        $fields = mysql_num_fields($result);
+        for ($i=0; $i < $fields; $i++) {
+            $meta = mysql_fetch_field($result, $i);
+            if (!$meta)
+                return array();
+
+            if($make_lower_case == true)
+                $meta->name = strtolower($meta->name);
+
+            $field_array[] = $meta->name;
+        }
+
+        return $field_array;
+    }
+
+    /**
+     * @see DBManager::fetchRow()
+     */
+    public function fetchRow($result)
+    {
+        if (empty($result))	return false;
+
+        return mysql_fetch_assoc($result);
+    }
+
+    /**
+     * @see DBManager::getTablesArray()
+     */
+    public function getTablesArray()
+    {
+        $this->log->debug('Fetching table list');
+
+        if ($this->getDatabase()) {
+            $tables = array();
+            $r = $this->query('SHOW TABLES');
+            if (!empty($r)) {
+                while ($a = $this->fetchByAssoc($r)) {
+                    $row = array_values($a);
+                    $tables[]=$row[0];
+                }
+                return $tables;
+            }
+        }
+
+        return false; // no database available
+    }
+
+    /**
+     * @see DBManager::version()
+     */
+    public function version()
+    {
+        return $this->getOne("SELECT version() version");
+    }
+
+    /**
+     * @see DBManager::tableExists()
+     */
+    public function tableExists($tableName)
+    {
+        $this->log->info("tableExists: $tableName");
+
+        if ($this->getDatabase()) {
+            $result = $this->query("SHOW TABLES LIKE ".$this->quoted($tableName));
+            if(empty($result)) return false;
+            $row = $this->fetchByAssoc($result);
+            return !empty($row);
+        }
+
+        return false;
+    }
+
+    /**
+     * Get tables like expression
+     * @param $like string
+     * @return array
+     */
+    public function tablesLike($like)
+    {
+        if ($this->getDatabase()) {
+            $tables = array();
+            $r = $this->query('SHOW TABLES LIKE '.$this->quoted($like));
+            if (!empty($r)) {
+                while ($a = $this->fetchByAssoc($r)) {
+                    $row = array_values($a);
+                    $tables[]=$row[0];
+                }
+                return $tables;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @see DBManager::quote()
+     */
+    public function quote($string)
+    {
+        if(is_array($string)) {
+            return $this->arrayQuote($string);
+        }
+        return mysql_real_escape_string($this->quoteInternal($string), $this->getDatabase());
+    }
 
     /**
      * @see DBManager::quoteIdentifier()
@@ -467,272 +467,272 @@ 
         return '`'.$string.'`';
     }
 
-	/**
-	 * @see DBManager::connect()
-	 */
-	public function connect(array $configOptions = null, $dieOnError = false)
-	{
-		global $sugar_config;
-
-		if(is_null($configOptions))
-			$configOptions = $sugar_config['dbconfig'];
-
-		if ($this->getOption('persistent')) {
-			$this->database = @mysql_pconnect(
-				$configOptions['db_host_name'],
-				$configOptions['db_user_name'],
-				$configOptions['db_password']
-				);
-		}
-
-		if (!$this->database) {
-			$this->database = mysql_connect(
-					$configOptions['db_host_name'],
-					$configOptions['db_user_name'],
-					$configOptions['db_password']
-					);
-			if(empty($this->database)) {
-				$GLOBALS['log']->fatal("Could not connect to server ".$configOptions['db_host_name']." as ".$configOptions['db_user_name'].":".mysql_error());
-				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.");
-					}
-				} else {
-					return false;
-				}
-			}
-			// Do not pass connection information because we have not connected yet
-			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>";
-			}
-		}
-		if(!empty($configOptions['db_name']) && !@mysql_select_db($configOptions['db_name'])) {
-			$GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}: " . mysql_error($this->database));
-			if($dieOnError) {
-				sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
-			} else {
-				return false;
-			}
-		}
-
-		// cn: using direct calls to prevent this from spamming the Logs
-	    mysql_query("SET CHARACTER SET utf8", $this->database);
-	    $names = "SET NAMES 'utf8'";
-	    $collation = $this->getOption('collation');
-	    if(!empty($collation)) {
-	        $names .= " COLLATE '$collation'";
-		}
-	    mysql_query($names, $this->database);
-
-		if(!$this->checkError('Could Not Connect:', $dieOnError))
-			$GLOBALS['log']->info("connected to db");
-		$this->connectOptions = $configOptions;
-
-		$GLOBALS['log']->info("Connect:".$this->database);
-		return true;
-	}
-
-	/**
-	 * @see DBManager::repairTableParams()
-	 *
-	 * For MySQL, we can write the ALTER TABLE statement all in one line, which speeds things
-	 * up quite a bit. So here, we'll parse the returned SQL into a single ALTER TABLE command.
-	 */
-	public function repairTableParams($tablename, $fielddefs, $indices, $execute = true, $engine = null)
-	{
-		$sql = parent::repairTableParams($tablename,$fielddefs,$indices,false,$engine);
-
-		if ( $sql == '' )
-			return '';
-
-		if ( stristr($sql,'create table') )
-		{
-			if ($execute) {
-				$msg = "Error creating table: ".$tablename. ":";
-				$this->query($sql,true,$msg);
-			}
-			return $sql;
-		}
-
-		// first, parse out all the comments
-		$match = array();
-		preg_match_all('!/\*.*?\*/!is', $sql, $match);
-		$commentBlocks = $match[0];
-		$sql = preg_replace('!/\*.*?\*/!is','', $sql);
-
-		// now, we should only have alter table statements
-		// let's replace the 'alter table name' part with a comma
-		$sql = preg_replace("!alter table $tablename!is",', ', $sql);
-
-		// re-add it at the beginning
-		$sql = substr_replace($sql,'',strpos($sql,','),1);
-		$sql = str_replace(";","",$sql);
-		$sql = str_replace("\n","",$sql);
-		$sql = "ALTER TABLE $tablename $sql";
-
-		if ( $execute )
-			$this->query($sql,'Error with MySQL repair table');
-
-		// and re-add the comments at the beginning
-		$sql = implode("\n",$commentBlocks) . "\n". $sql . "\n";
-
-		return $sql;
-	}
-
-	/**
-	 * @see DBManager::convert()
-	 */
-	public function convert($string, $type, array $additional_parameters = array())
-	{
-		$all_parameters = $additional_parameters;
-		if(is_array($string)) {
-			$all_parameters = array_merge($string, $all_parameters);
-		} elseif (!is_null($string)) {
-			array_unshift($all_parameters, $string);
-		}
-		$all_strings = implode(',', $all_parameters);
-
-		switch (strtolower($type)) {
-			case 'today':
-				return "CURDATE()";
-			case 'left':
-				return "LEFT($all_strings)";
-			case 'date_format':
-				if(empty($additional_parameters)) {
-					return "DATE_FORMAT($string,'%Y-%m-%d')";
-				} else {
-					$format = $additional_parameters[0];
-					if($format[0] != "'") {
-						$format = $this->quoted($format);
-					}
-					return "DATE_FORMAT($string,$format)";
-				}
-			case 'ifnull':
-				if(empty($additional_parameters) && !strstr($all_strings, ",")) {
-					$all_strings .= ",''";
-				}
-				return "IFNULL($all_strings)";
-			case 'concat':
-				return "CONCAT($all_strings)";
-			case 'quarter':
-					return "QUARTER($string)";
-			case "length":
-					return "LENGTH($string)";
-			case 'month':
-					return "MONTH($string)";
-			case 'add_date':
-					return "DATE_ADD($string, INTERVAL {$additional_parameters[0]} {$additional_parameters[1]})";
-			case 'add_time':
-					return "DATE_ADD($string, INTERVAL + CONCAT({$additional_parameters[0]}, ':', {$additional_parameters[1]}) HOUR_MINUTE)";
+    /**
+     * @see DBManager::connect()
+     */
+    public function connect(array $configOptions = null, $dieOnError = false)
+    {
+        global $sugar_config;
+
+        if(is_null($configOptions))
+            $configOptions = $sugar_config['dbconfig'];
+
+        if ($this->getOption('persistent')) {
+            $this->database = @mysql_pconnect(
+                $configOptions['db_host_name'],
+                $configOptions['db_user_name'],
+                $configOptions['db_password']
+                );
+        }
+
+        if (!$this->database) {
+            $this->database = mysql_connect(
+                    $configOptions['db_host_name'],
+                    $configOptions['db_user_name'],
+                    $configOptions['db_password']
+                    );
+            if(empty($this->database)) {
+                $GLOBALS['log']->fatal("Could not connect to server ".$configOptions['db_host_name']." as ".$configOptions['db_user_name'].":".mysql_error());
+                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.");
+                    }
+                } else {
+                    return false;
+                }
+            }
+            // Do not pass connection information because we have not connected yet
+            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>";
+            }
+        }
+        if(!empty($configOptions['db_name']) && !@mysql_select_db($configOptions['db_name'])) {
+            $GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}: " . mysql_error($this->database));
+            if($dieOnError) {
+                sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
+            } else {
+                return false;
+            }
+        }
+
+        // cn: using direct calls to prevent this from spamming the Logs
+        mysql_query("SET CHARACTER SET utf8", $this->database);
+        $names = "SET NAMES 'utf8'";
+        $collation = $this->getOption('collation');
+        if(!empty($collation)) {
+            $names .= " COLLATE '$collation'";
+        }
+        mysql_query($names, $this->database);
+
+        if(!$this->checkError('Could Not Connect:', $dieOnError))
+            $GLOBALS['log']->info("connected to db");
+        $this->connectOptions = $configOptions;
+
+        $GLOBALS['log']->info("Connect:".$this->database);
+        return true;
+    }
+
+    /**
+     * @see DBManager::repairTableParams()
+     *
+     * For MySQL, we can write the ALTER TABLE statement all in one line, which speeds things
+     * up quite a bit. So here, we'll parse the returned SQL into a single ALTER TABLE command.
+     */
+    public function repairTableParams($tablename, $fielddefs, $indices, $execute = true, $engine = null)
+    {
+        $sql = parent::repairTableParams($tablename,$fielddefs,$indices,false,$engine);
+
+        if ( $sql == '' )
+            return '';
+
+        if ( stristr($sql,'create table') )
+        {
+            if ($execute) {
+                $msg = "Error creating table: ".$tablename. ":";
+                $this->query($sql,true,$msg);
+            }
+            return $sql;
+        }
+
+        // first, parse out all the comments
+        $match = array();
+        preg_match_all('!/\*.*?\*/!is', $sql, $match);
+        $commentBlocks = $match[0];
+        $sql = preg_replace('!/\*.*?\*/!is','', $sql);
+
+        // now, we should only have alter table statements
+        // let's replace the 'alter table name' part with a comma
+        $sql = preg_replace("!alter table $tablename!is",', ', $sql);
+
+        // re-add it at the beginning
+        $sql = substr_replace($sql,'',strpos($sql,','),1);
+        $sql = str_replace(";","",$sql);
+        $sql = str_replace("\n","",$sql);
+        $sql = "ALTER TABLE $tablename $sql";
+
+        if ( $execute )
+            $this->query($sql,'Error with MySQL repair table');
+
+        // and re-add the comments at the beginning
+        $sql = implode("\n",$commentBlocks) . "\n". $sql . "\n";
+
+        return $sql;
+    }
+
+    /**
+     * @see DBManager::convert()
+     */
+    public function convert($string, $type, array $additional_parameters = array())
+    {
+        $all_parameters = $additional_parameters;
+        if(is_array($string)) {
+            $all_parameters = array_merge($string, $all_parameters);
+        } elseif (!is_null($string)) {
+            array_unshift($all_parameters, $string);
+        }
+        $all_strings = implode(',', $all_parameters);
+
+        switch (strtolower($type)) {
+            case 'today':
+                return "CURDATE()";
+            case 'left':
+                return "LEFT($all_strings)";
+            case 'date_format':
+                if(empty($additional_parameters)) {
+                    return "DATE_FORMAT($string,'%Y-%m-%d')";
+                } else {
+                    $format = $additional_parameters[0];
+                    if($format[0] != "'") {
+                        $format = $this->quoted($format);
+                    }
+                    return "DATE_FORMAT($string,$format)";
+                }
+            case 'ifnull':
+                if(empty($additional_parameters) && !strstr($all_strings, ",")) {
+                    $all_strings .= ",''";
+                }
+                return "IFNULL($all_strings)";
+            case 'concat':
+                return "CONCAT($all_strings)";
+            case 'quarter':
+                    return "QUARTER($string)";
+            case "length":
+                    return "LENGTH($string)";
+            case 'month':
+                    return "MONTH($string)";
+            case 'add_date':
+                    return "DATE_ADD($string, INTERVAL {$additional_parameters[0]} {$additional_parameters[1]})";
+            case 'add_time':
+                    return "DATE_ADD($string, INTERVAL + CONCAT({$additional_parameters[0]}, ':', {$additional_parameters[1]}) HOUR_MINUTE)";
             case 'add_tz_offset' :
                 $getUserUTCOffset = $GLOBALS['timedate']->getUserUTCOffset();
                 $operation = $getUserUTCOffset < 0 ? '-' : '+';
                 return $string . ' ' . $operation . ' INTERVAL ' . abs($getUserUTCOffset) . ' MINUTE';
             case 'avg':
                 return "avg($string)";
-		}
-
-		return $string;
-	}
-
-	/**
-	 * (non-PHPdoc)
-	 * @see DBManager::fromConvert()
-	 */
-	public function fromConvert($string, $type)
-	{
-		return $string;
-	}
-
-	/**
-	 * Returns the name of the engine to use or null if we are to use the default
-	 *
-	 * @param  object $bean SugarBean instance
-	 * @return string
-	 */
-	protected function getEngine($bean)
-	{
-		global $dictionary;
-		$engine = null;
-		if (isset($dictionary[$bean->getObjectName()]['engine'])) {
-			$engine = $dictionary[$bean->getObjectName()]['engine'];
-		}
-		return $engine;
-	}
-
-	/**
-	 * Returns true if the engine given is enabled in the backend
-	 *
-	 * @param  string $engine
-	 * @return bool
-	 */
-	protected function isEngineEnabled($engine)
-	{
-		if(!is_string($engine)) return false;
-
-		$engine = strtoupper($engine);
-
-		$r = $this->query("SHOW ENGINES");
-
-		while ( $row = $this->fetchByAssoc($r) )
-			if ( strtoupper($row['Engine']) == $engine )
-				return ($row['Support']=='YES' || $row['Support']=='DEFAULT');
-
-		return false;
-	}
-
-	/**
-	 * @see DBManager::createTableSQL()
-	 */
-	public function createTableSQL(SugarBean $bean)
-	{
-		$tablename = $bean->getTableName();
-		$fieldDefs = $bean->getFieldDefinitions();
-		$indices   = $bean->getIndices();
-		$engine    = $this->getEngine($bean);
-		return $this->createTableSQLParams($tablename, $fieldDefs, $indices, $engine);
-	}
-
-	/**
-	 * Generates sql for create table statement for a bean.
-	 *
-	 * @param  string $tablename
-	 * @param  array  $fieldDefs
-	 * @param  array  $indices
-	 * @param  string $engine optional, MySQL engine to use
-	 * @return string SQL Create Table statement
-	*/
-	public function createTableSQLParams($tablename, $fieldDefs, $indices, $engine = null)
-	{
-		if ( empty($engine) && isset($fieldDefs['engine']))
-			$engine = $fieldDefs['engine'];
-		if ( !$this->isEngineEnabled($engine) )
-			$engine = '';
-
-		$columns = $this->columnSQLRep($fieldDefs, false, $tablename);
-		if (empty($columns))
-			return false;
-
-		$keys = $this->keysSQL($indices);
-		if (!empty($keys))
-			$keys = ",$keys";
-
-		// cn: bug 9873 - module tables do not get created in utf8 with assoc collation
-		$collation = $this->getOption('collation');
-		if(empty($collation)) {
-		    $collation = 'utf8_general_ci';
-		}
-		$sql = "CREATE TABLE $tablename ($columns $keys) CHARACTER SET utf8 COLLATE $collation";
-
-		if (!empty($engine))
-			$sql.= " ENGINE=$engine";
-
-		return $sql;
-	}
+        }
+
+        return $string;
+    }
+
+    /**
+     * (non-PHPdoc)
+     * @see DBManager::fromConvert()
+     */
+    public function fromConvert($string, $type)
+    {
+        return $string;
+    }
+
+    /**
+     * Returns the name of the engine to use or null if we are to use the default
+     *
+     * @param  object $bean SugarBean instance
+     * @return string
+     */
+    protected function getEngine($bean)
+    {
+        global $dictionary;
+        $engine = null;
+        if (isset($dictionary[$bean->getObjectName()]['engine'])) {
+            $engine = $dictionary[$bean->getObjectName()]['engine'];
+        }
+        return $engine;
+    }
+
+    /**
+     * Returns true if the engine given is enabled in the backend
+     *
+     * @param  string $engine
+     * @return bool
+     */
+    protected function isEngineEnabled($engine)
+    {
+        if(!is_string($engine)) return false;
+
+        $engine = strtoupper($engine);
+
+        $r = $this->query("SHOW ENGINES");
+
+        while ( $row = $this->fetchByAssoc($r) )
+            if ( strtoupper($row['Engine']) == $engine )
+                return ($row['Support']=='YES' || $row['Support']=='DEFAULT');
+
+        return false;
+    }
+
+    /**
+     * @see DBManager::createTableSQL()
+     */
+    public function createTableSQL(SugarBean $bean)
+    {
+        $tablename = $bean->getTableName();
+        $fieldDefs = $bean->getFieldDefinitions();
+        $indices   = $bean->getIndices();
+        $engine    = $this->getEngine($bean);
+        return $this->createTableSQLParams($tablename, $fieldDefs, $indices, $engine);
+    }
+
+    /**
+     * Generates sql for create table statement for a bean.
+     *
+     * @param  string $tablename
+     * @param  array  $fieldDefs
+     * @param  array  $indices
+     * @param  string $engine optional, MySQL engine to use
+     * @return string SQL Create Table statement
+     */
+    public function createTableSQLParams($tablename, $fieldDefs, $indices, $engine = null)
+    {
+        if ( empty($engine) && isset($fieldDefs['engine']))
+            $engine = $fieldDefs['engine'];
+        if ( !$this->isEngineEnabled($engine) )
+            $engine = '';
+
+        $columns = $this->columnSQLRep($fieldDefs, false, $tablename);
+        if (empty($columns))
+            return false;
+
+        $keys = $this->keysSQL($indices);
+        if (!empty($keys))
+            $keys = ",$keys";
+
+        // cn: bug 9873 - module tables do not get created in utf8 with assoc collation
+        $collation = $this->getOption('collation');
+        if(empty($collation)) {
+            $collation = 'utf8_general_ci';
+        }
+        $sql = "CREATE TABLE $tablename ($columns $keys) CHARACTER SET utf8 COLLATE $collation";
+
+        if (!empty($engine))
+            $sql.= " ENGINE=$engine";
+
+        return $sql;
+    }
 
     /**
      * Does this type represent text (i.e., non-varchar) value?
@@ -744,745 +744,745 @@ 
         return in_array($type, array('blob','text','longblob', 'longtext'));
     }
 
-	/**
-	 * @see DBManager::oneColumnSQLRep()
-	 */
-	protected function oneColumnSQLRep($fieldDef, $ignoreRequired = false, $table = '', $return_as_array = false)
-	{
-		// always return as array for post-processing
-		$ref = parent::oneColumnSQLRep($fieldDef, $ignoreRequired, $table, true);
+    /**
+     * @see DBManager::oneColumnSQLRep()
+     */
+    protected function oneColumnSQLRep($fieldDef, $ignoreRequired = false, $table = '', $return_as_array = false)
+    {
+        // always return as array for post-processing
+        $ref = parent::oneColumnSQLRep($fieldDef, $ignoreRequired, $table, true);
 
-		if ( $ref['colType'] == 'int' && !empty($fieldDef['len']) ) {
-			$ref['colType'] .= "(".$fieldDef['len'].")";
-		}
+        if ( $ref['colType'] == 'int' && !empty($fieldDef['len']) ) {
+            $ref['colType'] .= "(".$fieldDef['len'].")";
+        }
 
-		// bug 22338 - don't set a default value on text or blob fields
-		if ( isset($ref['default']) &&
+        // bug 22338 - don't set a default value on text or blob fields
+        if ( isset($ref['default']) &&
             in_array($ref['colBaseType'], array('text', 'blob', 'longtext', 'longblob')))
-			    $ref['default'] = '';
-
-		if ( $return_as_array )
-			return $ref;
-		else
-			return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
-	}
-
-	/**
-	 * @see DBManager::changeColumnSQL()
-	 */
-	protected function changeColumnSQL($tablename, $fieldDefs, $action, $ignoreRequired = false)
-	{
-		$columns = array();
-		if ($this->isFieldArray($fieldDefs)){
-			foreach ($fieldDefs as $def){
-				if ($action == 'drop')
-					$columns[] = $def['name'];
-				else
-					$columns[] = $this->oneColumnSQLRep($def, $ignoreRequired);
-			}
-		} else {
-			if ($action == 'drop')
-				$columns[] = $fieldDefs['name'];
-		else
-			$columns[] = $this->oneColumnSQLRep($fieldDefs);
-		}
-
-		return "ALTER TABLE $tablename $action COLUMN ".implode(",$action column ", $columns);
-	}
-
-	/**
-	 * Generates SQL for key specification inside CREATE TABLE statement
-	 *
-	 * The passes array is an array of field definitions or a field definition
-	 * itself. The keys generated will be either primary, foreign, unique, index
-	 * or none at all depending on the setting of the "key" parameter of a field definition
-	 *
-	 * @param  array  $indices
-	 * @param  bool   $alter_table
-	 * @param  string $alter_action
-	 * @return string SQL Statement
-	 */
-	protected function keysSQL($indices, $alter_table = false, $alter_action = '')
-	{
-	// check if the passed value is an array of fields.
-	// if not, convert it into an array
-	if (!$this->isFieldArray($indices))
-		$indices[] = $indices;
-
-	$columns = array();
-	foreach ($indices as $index) {
-		if(!empty($index['db']) && $index['db'] != $this->dbType)
-			continue;
-		if (isset($index['source']) && $index['source'] != 'db')
-			continue;
-
-		$type = $index['type'];
-		$name = $index['name'];
-
-		if (is_array($index['fields']))
-			$fields = implode(", ", $index['fields']);
-		else
-			$fields = $index['fields'];
-
-		switch ($type) {
-		case 'unique':
-			$columns[] = " UNIQUE $name ($fields)";
-			break;
-		case 'primary':
-			$columns[] = " PRIMARY KEY ($fields)";
-			break;
-		case 'index':
-		case 'foreign':
-		case 'clustered':
-		case 'alternate_key':
-			/**
-				* @todo here it is assumed that the primary key of the foreign
-				* table will always be named 'id'. It must be noted though
-				* that this can easily be fixed by referring to db dictionary
-				* to find the correct primary field name
-				*/
-			if ( $alter_table )
-				$columns[] = " INDEX $name ($fields)";
-			else
-				$columns[] = " KEY $name ($fields)";
-			break;
-		case 'fulltext':
-			if ($this->full_text_indexing_installed())
-				$columns[] = " FULLTEXT ($fields)";
-			else
-				$GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:',$name);
-			break;
-		}
-	}
-	$columns = implode(", $alter_action ", $columns);
-	if(!empty($alter_action)){
-		$columns = $alter_action . ' '. $columns;
-	}
-	return $columns;
-	}
-
-	/**
-	 * @see DBManager::setAutoIncrement()
-	 */
-	protected function setAutoIncrement($table, $field_name)
-	{
-		return "auto_increment";
-	}
-
-	/**
-	 * Sets the next auto-increment value of a column to a specific value.
-	 *
-	 * @param  string $table tablename
-	 * @param  string $field_name
-	 */
-	public function setAutoIncrementStart($table, $field_name, $start_value)
-	{
-		$start_value = (int)$start_value;
-		return $this->query( "ALTER TABLE $table AUTO_INCREMENT = $start_value;");
-	}
-
-	/**
-	 * Returns the next value for an auto increment
-	 *
-	 * @param  string $table tablename
-	 * @param  string $field_name
-	 * @return string
-	 */
-	public function getAutoIncrement($table, $field_name)
-	{
-		$result = $this->query("SHOW TABLE STATUS LIKE '$table'");
-		$row = $this->fetchByAssoc($result);
-		if (!empty($row['Auto_increment']))
-			return $row['Auto_increment'];
-
-		return "";
-	}
-
-	/**
-	 * @see DBManager::get_indices()
-	 */
-	public function get_indices($tablename)
-	{
-		//find all unique indexes and primary keys.
-		$result = $this->query("SHOW INDEX FROM $tablename");
-
-		$indices = array();
-		while (($row=$this->fetchByAssoc($result)) !=null) {
-			$index_type='index';
-			if ($row['Key_name'] =='PRIMARY') {
-				$index_type='primary';
-			}
-			elseif ( $row['Non_unique'] == '0' ) {
-				$index_type='unique';
-			}
-			$name = strtolower($row['Key_name']);
-			$indices[$name]['name']=$name;
-			$indices[$name]['type']=$index_type;
-			$indices[$name]['fields'][]=strtolower($row['Column_name']);
-		}
-		return $indices;
-	}
-
-	/**
-	 * @see DBManager::add_drop_constraint()
-	 */
-	public function add_drop_constraint($table, $definition, $drop = false)
-	{
-		$type         = $definition['type'];
-		$fields       = implode(',',$definition['fields']);
-		$name         = $definition['name'];
-		$sql          = '';
-
-		switch ($type){
-		// generic indices
-		case 'index':
-		case 'alternate_key':
-		case 'clustered':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP INDEX {$name} ";
-			else
-				$sql = "ALTER TABLE {$table} ADD INDEX {$name} ({$fields})";
-			break;
-		// constraints as indices
-		case 'unique':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP INDEX $name";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT UNIQUE {$name} ({$fields})";
-			break;
-		case 'primary':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP PRIMARY KEY";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT PRIMARY KEY ({$fields})";
-			break;
-		case 'foreign':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT FOREIGN KEY {$name} ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignField']})";
-			break;
-		}
-		return $sql;
-	}
-
-	/**
-	 * Runs a query and returns a single row
-	 *
-	 * @param  string   $sql        SQL Statement to execute
-	 * @param  bool     $dieOnError True if we want to call die if the query returns errors
-	 * @param  string   $msg        Message to log if error occurs
-	 * @param  bool     $suppress   Message to log if error occurs
-	 * @return array    single row from the query
-	 */
-	public function fetchOne($sql, $dieOnError = false, $msg = '', $suppress = false)
-	{
-		if(stripos($sql, ' LIMIT ') === false) {
-			// little optimization to just fetch one row
-			$sql .= " LIMIT 0,1";
-		}
-		return parent::fetchOne($sql, $dieOnError, $msg, $suppress);
-	}
-
-	/**
-	 * @see DBManager::full_text_indexing_installed()
-	 */
-	public function full_text_indexing_installed($dbname = null)
-	{
-		return $this->isEngineEnabled('MyISAM');
-	}
-
-	/**
-	 * @see DBManager::massageFieldDef()
-	 */
-	public function massageFieldDef(&$fieldDef, $tablename)
-	{
-		parent::massageFieldDef($fieldDef,$tablename);
-
-		if ( isset($fieldDef['default']) &&
-			($fieldDef['dbType'] == 'text'
-				|| $fieldDef['dbType'] == 'blob'
-				|| $fieldDef['dbType'] == 'longtext'
-				|| $fieldDef['dbType'] == 'longblob' ))
-			unset($fieldDef['default']);
-		if ($fieldDef['dbType'] == 'uint')
-			$fieldDef['len'] = '10';
-		if ($fieldDef['dbType'] == 'ulong')
-			$fieldDef['len'] = '20';
-		if ($fieldDef['dbType'] == 'bool')
-			$fieldDef['type'] = 'tinyint';
-		if ($fieldDef['dbType'] == 'bool' && empty($fieldDef['default']) )
-			$fieldDef['default'] = '0';
-		if (($fieldDef['dbType'] == 'varchar' || $fieldDef['dbType'] == 'enum') && empty($fieldDef['len']) )
-			$fieldDef['len'] = '255';
-		if ($fieldDef['dbType'] == 'uint')
-			$fieldDef['len'] = '10';
-		if ($fieldDef['dbType'] == 'int' && empty($fieldDef['len']) )
-			$fieldDef['len'] = '11';
-
-		if($fieldDef['dbType'] == 'decimal') {
-			if(isset($fieldDef['len'])) {
-				if(strstr($fieldDef['len'], ",") === false) {
-					$fieldDef['len'] .= ",0";
-				}
-			} else {
-				$fieldDef['len']  = '10,0';
-			}
-		}
-	}
-
-	/**
-	 * Generates SQL for dropping a table.
-	 *
-	 * @param  string $name table name
-	 * @return string SQL statement
-	 */
-	public function dropTableNameSQL($name)
-	{
-		return "DROP TABLE IF EXISTS ".$name;
-	}
-
-	public function dropIndexes($tablename, $indexes, $execute = true)
-	{
-		$sql = array();
-		foreach ($indexes as $index) {
-			$name =$index['name'];
-			if($execute) {
-			unset(self::$index_descriptions[$tablename][$name]);
-			}
-			if ($index['type'] == 'primary') {
-				$sql[] = 'DROP PRIMARY KEY';
-			} else {
-				$sql[] = "DROP INDEX $name";
-			}
-		}
-		if (!empty($sql)) {
+                $ref['default'] = '';
+
+        if ( $return_as_array )
+            return $ref;
+        else
+            return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
+    }
+
+    /**
+     * @see DBManager::changeColumnSQL()
+     */
+    protected function changeColumnSQL($tablename, $fieldDefs, $action, $ignoreRequired = false)
+    {
+        $columns = array();
+        if ($this->isFieldArray($fieldDefs)){
+            foreach ($fieldDefs as $def){
+                if ($action == 'drop')
+                    $columns[] = $def['name'];
+                else
+                    $columns[] = $this->oneColumnSQLRep($def, $ignoreRequired);
+            }
+        } else {
+            if ($action == 'drop')
+                $columns[] = $fieldDefs['name'];
+        else
+            $columns[] = $this->oneColumnSQLRep($fieldDefs);
+        }
+
+        return "ALTER TABLE $tablename $action COLUMN ".implode(",$action column ", $columns);
+    }
+
+    /**
+     * Generates SQL for key specification inside CREATE TABLE statement
+     *
+     * The passes array is an array of field definitions or a field definition
+     * itself. The keys generated will be either primary, foreign, unique, index
+     * or none at all depending on the setting of the "key" parameter of a field definition
+     *
+     * @param  array  $indices
+     * @param  bool   $alter_table
+     * @param  string $alter_action
+     * @return string SQL Statement
+     */
+    protected function keysSQL($indices, $alter_table = false, $alter_action = '')
+    {
+    // check if the passed value is an array of fields.
+    // if not, convert it into an array
+    if (!$this->isFieldArray($indices))
+        $indices[] = $indices;
+
+    $columns = array();
+    foreach ($indices as $index) {
+        if(!empty($index['db']) && $index['db'] != $this->dbType)
+            continue;
+        if (isset($index['source']) && $index['source'] != 'db')
+            continue;
+
+        $type = $index['type'];
+        $name = $index['name'];
+
+        if (is_array($index['fields']))
+            $fields = implode(", ", $index['fields']);
+        else
+            $fields = $index['fields'];
+
+        switch ($type) {
+        case 'unique':
+            $columns[] = " UNIQUE $name ($fields)";
+            break;
+        case 'primary':
+            $columns[] = " PRIMARY KEY ($fields)";
+            break;
+        case 'index':
+        case 'foreign':
+        case 'clustered':
+        case 'alternate_key':
+            /**
+             * @todo here it is assumed that the primary key of the foreign
+             * table will always be named 'id'. It must be noted though
+             * that this can easily be fixed by referring to db dictionary
+             * to find the correct primary field name
+             */
+            if ( $alter_table )
+                $columns[] = " INDEX $name ($fields)";
+            else
+                $columns[] = " KEY $name ($fields)";
+            break;
+        case 'fulltext':
+            if ($this->full_text_indexing_installed())
+                $columns[] = " FULLTEXT ($fields)";
+            else
+                $GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:',$name);
+            break;
+        }
+    }
+    $columns = implode(", $alter_action ", $columns);
+    if(!empty($alter_action)){
+        $columns = $alter_action . ' '. $columns;
+    }
+    return $columns;
+    }
+
+    /**
+     * @see DBManager::setAutoIncrement()
+     */
+    protected function setAutoIncrement($table, $field_name)
+    {
+        return "auto_increment";
+    }
+
+    /**
+     * Sets the next auto-increment value of a column to a specific value.
+     *
+     * @param  string $table tablename
+     * @param  string $field_name
+     */
+    public function setAutoIncrementStart($table, $field_name, $start_value)
+    {
+        $start_value = (int)$start_value;
+        return $this->query( "ALTER TABLE $table AUTO_INCREMENT = $start_value;");
+    }
+
+    /**
+     * Returns the next value for an auto increment
+     *
+     * @param  string $table tablename
+     * @param  string $field_name
+     * @return string
+     */
+    public function getAutoIncrement($table, $field_name)
+    {
+        $result = $this->query("SHOW TABLE STATUS LIKE '$table'");
+        $row = $this->fetchByAssoc($result);
+        if (!empty($row['Auto_increment']))
+            return $row['Auto_increment'];
+
+        return "";
+    }
+
+    /**
+     * @see DBManager::get_indices()
+     */
+    public function get_indices($tablename)
+    {
+        //find all unique indexes and primary keys.
+        $result = $this->query("SHOW INDEX FROM $tablename");
+
+        $indices = array();
+        while (($row=$this->fetchByAssoc($result)) !=null) {
+            $index_type='index';
+            if ($row['Key_name'] =='PRIMARY') {
+                $index_type='primary';
+            }
+            elseif ( $row['Non_unique'] == '0' ) {
+                $index_type='unique';
+            }
+            $name = strtolower($row['Key_name']);
+            $indices[$name]['name']=$name;
+            $indices[$name]['type']=$index_type;
+            $indices[$name]['fields'][]=strtolower($row['Column_name']);
+        }
+        return $indices;
+    }
+
+    /**
+     * @see DBManager::add_drop_constraint()
+     */
+    public function add_drop_constraint($table, $definition, $drop = false)
+    {
+        $type         = $definition['type'];
+        $fields       = implode(',',$definition['fields']);
+        $name         = $definition['name'];
+        $sql          = '';
+
+        switch ($type){
+        // generic indices
+        case 'index':
+        case 'alternate_key':
+        case 'clustered':
+            if ($drop)
+                $sql = "ALTER TABLE {$table} DROP INDEX {$name} ";
+            else
+                $sql = "ALTER TABLE {$table} ADD INDEX {$name} ({$fields})";
+            break;
+        // constraints as indices
+        case 'unique':
+            if ($drop)
+                $sql = "ALTER TABLE {$table} DROP INDEX $name";
+            else
+                $sql = "ALTER TABLE {$table} ADD CONSTRAINT UNIQUE {$name} ({$fields})";
+            break;
+        case 'primary':
+            if ($drop)
+                $sql = "ALTER TABLE {$table} DROP PRIMARY KEY";
+            else
+                $sql = "ALTER TABLE {$table} ADD CONSTRAINT PRIMARY KEY ({$fields})";
+            break;
+        case 'foreign':
+            if ($drop)
+                $sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
+            else
+                $sql = "ALTER TABLE {$table} ADD CONSTRAINT FOREIGN KEY {$name} ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignField']})";
+            break;
+        }
+        return $sql;
+    }
+
+    /**
+     * Runs a query and returns a single row
+     *
+     * @param  string   $sql        SQL Statement to execute
+     * @param  bool     $dieOnError True if we want to call die if the query returns errors
+     * @param  string   $msg        Message to log if error occurs
+     * @param  bool     $suppress   Message to log if error occurs
+     * @return array    single row from the query
+     */
+    public function fetchOne($sql, $dieOnError = false, $msg = '', $suppress = false)
+    {
+        if(stripos($sql, ' LIMIT ') === false) {
+            // little optimization to just fetch one row
+            $sql .= " LIMIT 0,1";
+        }
+        return parent::fetchOne($sql, $dieOnError, $msg, $suppress);
+    }
+
+    /**
+     * @see DBManager::full_text_indexing_installed()
+     */
+    public function full_text_indexing_installed($dbname = null)
+    {
+        return $this->isEngineEnabled('MyISAM');
+    }
+
+    /**
+     * @see DBManager::massageFieldDef()
+     */
+    public function massageFieldDef(&$fieldDef, $tablename)
+    {
+        parent::massageFieldDef($fieldDef,$tablename);
+
+        if ( isset($fieldDef['default']) &&
+            ($fieldDef['dbType'] == 'text'
+                || $fieldDef['dbType'] == 'blob'
+                || $fieldDef['dbType'] == 'longtext'
+                || $fieldDef['dbType'] == 'longblob' ))
+            unset($fieldDef['default']);
+        if ($fieldDef['dbType'] == 'uint')
+            $fieldDef['len'] = '10';
+        if ($fieldDef['dbType'] == 'ulong')
+            $fieldDef['len'] = '20';
+        if ($fieldDef['dbType'] == 'bool')
+            $fieldDef['type'] = 'tinyint';
+        if ($fieldDef['dbType'] == 'bool' && empty($fieldDef['default']) )
+            $fieldDef['default'] = '0';
+        if (($fieldDef['dbType'] == 'varchar' || $fieldDef['dbType'] == 'enum') && empty($fieldDef['len']) )
+            $fieldDef['len'] = '255';
+        if ($fieldDef['dbType'] == 'uint')
+            $fieldDef['len'] = '10';
+        if ($fieldDef['dbType'] == 'int' && empty($fieldDef['len']) )
+            $fieldDef['len'] = '11';
+
+        if($fieldDef['dbType'] == 'decimal') {
+            if(isset($fieldDef['len'])) {
+                if(strstr($fieldDef['len'], ",") === false) {
+                    $fieldDef['len'] .= ",0";
+                }
+            } else {
+                $fieldDef['len']  = '10,0';
+            }
+        }
+    }
+
+    /**
+     * Generates SQL for dropping a table.
+     *
+     * @param  string $name table name
+     * @return string SQL statement
+     */
+    public function dropTableNameSQL($name)
+    {
+        return "DROP TABLE IF EXISTS ".$name;
+    }
+
+    public function dropIndexes($tablename, $indexes, $execute = true)
+    {
+        $sql = array();
+        foreach ($indexes as $index) {
+            $name =$index['name'];
+            if($execute) {
+            unset(self::$index_descriptions[$tablename][$name]);
+            }
+            if ($index['type'] == 'primary') {
+                $sql[] = 'DROP PRIMARY KEY';
+            } else {
+                $sql[] = "DROP INDEX $name";
+            }
+        }
+        if (!empty($sql)) {
             $sql = "ALTER TABLE $tablename " . join(",", $sql) . ";";
-			if($execute)
-				$this->query($sql);
-		} else {
-			$sql = '';
-		}
-		return $sql;
-	}
-
-	/**
-	 * List of available collation settings
-	 * @return string
-	 */
-	public function getDefaultCollation()
-	{
-		return "utf8_general_ci";
-	}
-
-	/**
-	 * List of available collation settings
-	 * @return array
-	 */
-	public function getCollationList()
-	{
-		$q = "SHOW COLLATION LIKE 'utf8%'";
-		$r = $this->query($q);
-		$res = array();
-		while($a = $this->fetchByAssoc($r)) {
-			$res[] = $a['Collation'];
-		}
-		return $res;
-	}
-
-	/**
-	 * (non-PHPdoc)
-	 * @see DBManager::renameColumnSQL()
-	 */
-	public function renameColumnSQL($tablename, $column, $newname)
-	{
-		$field = $this->describeField($column, $tablename);
-		$field['name'] = $newname;
-		return "ALTER TABLE $tablename CHANGE COLUMN $column ".$this->oneColumnSQLRep($field);
-	}
-
-	public function emptyValue($type)
-	{
-		$ctype = $this->getColumnType($type);
-		if($ctype == "datetime") {
-			return $this->convert($this->quoted("0000-00-00 00:00:00"), "datetime");
-		}
-		if($ctype == "date") {
-			return $this->convert($this->quoted("0000-00-00"), "date");
-		}
-		if($ctype == "time") {
-			return $this->convert($this->quoted("00:00:00"), "time");
-		}
-		return parent::emptyValue($type);
-	}
-
-	/**
-	 * (non-PHPdoc)
-	 * @see DBManager::lastDbError()
-	 */
-	public function lastDbError()
-	{
-		if($this->database) {
-		    if(mysql_errno($this->database)) {
-			    return "MySQL error ".mysql_errno($this->database).": ".mysql_error($this->database);
-		    }
-		} else {
-			$err =  mysql_error();
-			if($err) {
-			    return $err;
-			}
-		}
+            if($execute)
+                $this->query($sql);
+        } else {
+            $sql = '';
+        }
+        return $sql;
+    }
+
+    /**
+     * List of available collation settings
+     * @return string
+     */
+    public function getDefaultCollation()
+    {
+        return "utf8_general_ci";
+    }
+
+    /**
+     * List of available collation settings
+     * @return array
+     */
+    public function getCollationList()
+    {
+        $q = "SHOW COLLATION LIKE 'utf8%'";
+        $r = $this->query($q);
+        $res = array();
+        while($a = $this->fetchByAssoc($r)) {
+            $res[] = $a['Collation'];
+        }
+        return $res;
+    }
+
+    /**
+     * (non-PHPdoc)
+     * @see DBManager::renameColumnSQL()
+     */
+    public function renameColumnSQL($tablename, $column, $newname)
+    {
+        $field = $this->describeField($column, $tablename);
+        $field['name'] = $newname;
+        return "ALTER TABLE $tablename CHANGE COLUMN $column ".$this->oneColumnSQLRep($field);
+    }
+
+    public function emptyValue($type)
+    {
+        $ctype = $this->getColumnType($type);
+        if($ctype == "datetime") {
+            return $this->convert($this->quoted("0000-00-00 00:00:00"), "datetime");
+        }
+        if($ctype == "date") {
+            return $this->convert($this->quoted("0000-00-00"), "date");
+        }
+        if($ctype == "time") {
+            return $this->convert($this->quoted("00:00:00"), "time");
+        }
+        return parent::emptyValue($type);
+    }
+
+    /**
+     * (non-PHPdoc)
+     * @see DBManager::lastDbError()
+     */
+    public function lastDbError()
+    {
+        if($this->database) {
+            if(mysql_errno($this->database)) {
+                return "MySQL error ".mysql_errno($this->database).": ".mysql_error($this->database);
+            }
+        } else {
+            $err =  mysql_error();
+            if($err) {
+                return $err;
+            }
+        }
         return false;
     }
 
-	/**
-	 * Quote MySQL search term
-	 * @param unknown_type $term
-	 */
-	protected function quoteTerm($term)
-	{
-		if(strpos($term, ' ') !== false) {
-			return '"'.$term.'"';
-		}
-		return $term;
-	}
-
-	/**
-	 * Generate fulltext query from set of terms
-	 * @param string $fields Field to search against
-	 * @param array $terms Search terms that may be or not be in the result
-	 * @param array $must_terms Search terms that have to be in the result
-	 * @param array $exclude_terms Search terms that have to be not in the result
-	 */
-	public function getFulltextQuery($field, $terms, $must_terms = array(), $exclude_terms = array())
-	{
-		$condition = array();
-		foreach($terms as $term) {
-			$condition[] = $this->quoteTerm($term);
-		}
-		foreach($must_terms as $term) {
-			$condition[] = "+".$this->quoteTerm($term);
-		}
-		foreach($exclude_terms as $term) {
-			$condition[] = "-".$this->quoteTerm($term);
-		}
-		$condition = $this->quoted(join(" ",$condition));
-		return "MATCH($field) AGAINST($condition IN BOOLEAN MODE)";
-	}
-
-	/**
-	 * Get list of all defined charsets
-	 * @return array
-	 */
-	protected function getCharsetInfo()
-	{
-		$charsets = array();
-		$res = $this->query("show variables like 'character\\_set\\_%'");
-		while($row = $this->fetchByAssoc($res)) {
-			$charsets[$row['Variable_name']] = $row['Value'];
-		}
-		return $charsets;
-	}
-
-	public function getDbInfo()
-	{
-		$charsets = $this->getCharsetInfo();
-		$charset_str = array();
-		foreach($charsets as $name => $value) {
-			$charset_str[] = "$name = $value";
-		}
-		return array(
-			"MySQL Version" => @mysql_get_client_info(),
-			"MySQL Host Info" => @mysql_get_host_info($this->database),
-			"MySQL Server Info" => @mysql_get_server_info($this->database),
-			"MySQL Client Encoding" =>  @mysql_client_encoding($this->database),
-			"MySQL Character Set Settings" => join(", ", $charset_str),
-		);
-	}
-
-	public function validateQuery($query)
-	{
-		$res = $this->query("EXPLAIN $query");
-		return !empty($res);
-	}
-
-	protected function makeTempTableCopy($table)
-	{
-		$this->log->debug("creating temp table for [$table]...");
-		$result = $this->query("SHOW CREATE TABLE {$table}");
-		if(empty($result)) {
-			return false;
-		}
-		$row = $this->fetchByAssoc($result);
-		if(empty($row) || empty($row['Create Table'])) {
-		    return false;
-		}
-		$create = $row['Create Table'];
-		// rewrite DDL with _temp name
-		$tempTableQuery = str_replace("CREATE TABLE `{$table}`", "CREATE TABLE `{$table}__uw_temp`", $create);
-		$r2 = $this->query($tempTableQuery);
-		if(empty($r2)) {
-			return false;
-		}
-
-		// get sample data into the temp table to test for data/constraint conflicts
-		$this->log->debug('inserting temp dataset...');
-		$q3 = "INSERT INTO `{$table}__uw_temp` SELECT * FROM `{$table}` LIMIT 10";
-		$this->query($q3, false, "Preflight Failed for: {$q3}");
-		return true;
-	}
-
-	/**
-	 * Tests an ALTER TABLE query
-	 * @param string table The table name to get DDL
-	 * @param string query The query to test.
-	 * @return string Non-empty if error found
-	 */
-	protected function verifyAlterTable($table, $query)
-	{
-		$this->log->debug("verifying ALTER TABLE");
-		// Skipping ALTER TABLE [table] DROP PRIMARY KEY because primary keys are not being copied
-		// over to the temp tables
-		if(strpos(strtoupper($query), 'DROP PRIMARY KEY') !== false) {
-			$this->log->debug("Skipping DROP PRIMARY KEY");
-			return '';
-		}
-		if(!$this->makeTempTableCopy($table)) {
-			return 'Could not create temp table copy';
-		}
-
-		// test the query on the test table
-		$this->log->debug('testing query: ['.$query.']');
-		$tempTableTestQuery = str_replace("ALTER TABLE `{$table}`", "ALTER TABLE `{$table}__uw_temp`", $query);
-		if (strpos($tempTableTestQuery, 'idx') === false) {
-			if(strpos($tempTableTestQuery, '__uw_temp') === false) {
-				return 'Could not use a temp table to test query!';
-			}
-
-			$this->log->debug('testing query on temp table: ['.$tempTableTestQuery.']');
-			$this->query($tempTableTestQuery, false, "Preflight Failed for: {$query}");
-		} else {
-			// test insertion of an index on a table
-			$tempTableTestQuery_idx = str_replace("ADD INDEX `idx_", "ADD INDEX `temp_idx_", $tempTableTestQuery);
-			$this->log->debug('testing query on temp table: ['.$tempTableTestQuery_idx.']');
-			$this->query($tempTableTestQuery_idx, false, "Preflight Failed for: {$query}");
-		}
-		$mysqlError = $this->getL();
-		if(!empty($mysqlError)) {
-			return $mysqlError;
-		}
-		$this->dropTableName("{$table}__uw_temp");
-
-		return '';
-	}
-
-	protected function verifyGenericReplaceQuery($querytype, $table, $query)
-	{
-		$this->log->debug("verifying $querytype statement");
-
-		if(!$this->makeTempTableCopy($table)) {
-			return 'Could not create temp table copy';
-		}
-		// test the query on the test table
-		$this->log->debug('testing query: ['.$query.']');
-		$tempTableTestQuery = str_replace("$querytype `{$table}`", "$querytype `{$table}__uw_temp`", $query);
-		if(strpos($tempTableTestQuery, '__uw_temp') === false) {
-			return 'Could not use a temp table to test query!';
-		}
-
-		$this->query($tempTableTestQuery, false, "Preflight Failed for: {$query}");
-		$error = $this->lastError(); // empty on no-errors
-		$this->dropTableName("{$table}__uw_temp"); // just in case
-		return $error;
-	}
-
-	/**
-	 * Tests a DROP TABLE query
-	 * @param string table The table name to get DDL
-	 * @param string query The query to test.
-	 * @return string Non-empty if error found
-	 */
-	public function verifyDropTable($table, $query)
-	{
-		return $this->verifyGenericReplaceQuery("DROP TABLE", $table, $query);
-	}
-
-	/**
-	 * Tests an INSERT INTO query
-	 * @param string table The table name to get DDL
-	 * @param string query The query to test.
-	 * @return string Non-empty if error found
-	 */
-	public function verifyInsertInto($table, $query)
-	{
-		return $this->verifyGenericReplaceQuery("INSERT INTO", $table, $query);
-	}
-
-	/**
-	 * Tests an UPDATE query
-	 * @param string table The table name to get DDL
-	 * @param string query The query to test.
-	 * @return string Non-empty if error found
-	 */
-	public function verifyUpdate($table, $query)
-	{
-		return $this->verifyGenericReplaceQuery("UPDATE", $table, $query);
-	}
-
-	/**
-	 * Tests an DELETE FROM query
-	 * @param string table The table name to get DDL
-	 * @param string query The query to test.
-	 * @return string Non-empty if error found
-	 */
-	public function verifyDeleteFrom($table, $query)
-	{
-		return $this->verifyGenericReplaceQuery("DELETE FROM", $table, $query);
-	}
-
-	/**
-	 * Check if certain database exists
-	 * @param string $dbname
-	 */
-	public function dbExists($dbname)
-	{
-		$db = $this->getOne("SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = ".$this->quoted($dbname));
-		return !empty($db);
-	}
-
-	/**
-	 * Select database
-	 * @param string $dbname
-	 */
-	protected function selectDb($dbname)
-	{
-		return mysql_select_db($dbname);
-	}
-
-	/**
-	 * Check if certain DB user exists
-	 * @param string $username
-	 */
-	public function userExists($username)
-	{
-		$db = $this->getOne("SELECT DATABASE()");
-		if(!$this->selectDb("mysql")) {
-			return false;
-		}
-		$user = $this->getOne("select count(*) from user where user = ".$this->quoted($username));
-		if(!$this->selectDb($db)) {
-			$this->checkError("Cannot select database $db", true);
-		}
-		return !empty($user);
-	}
-
-	/**
-	 * Create DB user
-	 * @param string $database_name
-	 * @param string $host_name
-	 * @param string $user
-	 * @param string $password
-	 */
-	public function createDbUser($database_name, $host_name, $user, $password)
-	{
-		$qpassword = $this->quote($password);
-		$this->query("GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, ALTER, DROP, INDEX
+    /**
+     * Quote MySQL search term
+     * @param unknown_type $term
+     */
+    protected function quoteTerm($term)
+    {
+        if(strpos($term, ' ') !== false) {
+            return '"'.$term.'"';
+        }
+        return $term;
+    }
+
+    /**
+     * Generate fulltext query from set of terms
+     * @param string $fields Field to search against
+     * @param array $terms Search terms that may be or not be in the result
+     * @param array $must_terms Search terms that have to be in the result
+     * @param array $exclude_terms Search terms that have to be not in the result
+     */
+    public function getFulltextQuery($field, $terms, $must_terms = array(), $exclude_terms = array())
+    {
+        $condition = array();
+        foreach($terms as $term) {
+            $condition[] = $this->quoteTerm($term);
+        }
+        foreach($must_terms as $term) {
+            $condition[] = "+".$this->quoteTerm($term);
+        }
+        foreach($exclude_terms as $term) {
+            $condition[] = "-".$this->quoteTerm($term);
+        }
+        $condition = $this->quoted(join(" ",$condition));
+        return "MATCH($field) AGAINST($condition IN BOOLEAN MODE)";
+    }
+
+    /**
+     * Get list of all defined charsets
+     * @return array
+     */
+    protected function getCharsetInfo()
+    {
+        $charsets = array();
+        $res = $this->query("show variables like 'character\\_set\\_%'");
+        while($row = $this->fetchByAssoc($res)) {
+            $charsets[$row['Variable_name']] = $row['Value'];
+        }
+        return $charsets;
+    }
+
+    public function getDbInfo()
+    {
+        $charsets = $this->getCharsetInfo();
+        $charset_str = array();
+        foreach($charsets as $name => $value) {
+            $charset_str[] = "$name = $value";
+        }
+        return array(
+            "MySQL Version" => @mysql_get_client_info(),
+            "MySQL Host Info" => @mysql_get_host_info($this->database),
+            "MySQL Server Info" => @mysql_get_server_info($this->database),
+            "MySQL Client Encoding" =>  @mysql_client_encoding($this->database),
+            "MySQL Character Set Settings" => join(", ", $charset_str),
+        );
+    }
+
+    public function validateQuery($query)
+    {
+        $res = $this->query("EXPLAIN $query");
+        return !empty($res);
+    }
+
+    protected function makeTempTableCopy($table)
+    {
+        $this->log->debug("creating temp table for [$table]...");
+        $result = $this->query("SHOW CREATE TABLE {$table}");
+        if(empty($result)) {
+            return false;
+        }
+        $row = $this->fetchByAssoc($result);
+        if(empty($row) || empty($row['Create Table'])) {
+            return false;
+        }
+        $create = $row['Create Table'];
+        // rewrite DDL with _temp name
+        $tempTableQuery = str_replace("CREATE TABLE `{$table}`", "CREATE TABLE `{$table}__uw_temp`", $create);
+        $r2 = $this->query($tempTableQuery);
+        if(empty($r2)) {
+            return false;
+        }
+
+        // get sample data into the temp table to test for data/constraint conflicts
+        $this->log->debug('inserting temp dataset...');
+        $q3 = "INSERT INTO `{$table}__uw_temp` SELECT * FROM `{$table}` LIMIT 10";
+        $this->query($q3, false, "Preflight Failed for: {$q3}");
+        return true;
+    }
+
+    /**
+     * Tests an ALTER TABLE query
+     * @param string table The table name to get DDL
+     * @param string query The query to test.
+     * @return string Non-empty if error found
+     */
+    protected function verifyAlterTable($table, $query)
+    {
+        $this->log->debug("verifying ALTER TABLE");
+        // Skipping ALTER TABLE [table] DROP PRIMARY KEY because primary keys are not being copied
+        // over to the temp tables
+        if(strpos(strtoupper($query), 'DROP PRIMARY KEY') !== false) {
+            $this->log->debug("Skipping DROP PRIMARY KEY");
+            return '';
+        }
+        if(!$this->makeTempTableCopy($table)) {
+            return 'Could not create temp table copy';
+        }
+
+        // test the query on the test table
+        $this->log->debug('testing query: ['.$query.']');
+        $tempTableTestQuery = str_replace("ALTER TABLE `{$table}`", "ALTER TABLE `{$table}__uw_temp`", $query);
+        if (strpos($tempTableTestQuery, 'idx') === false) {
+            if(strpos($tempTableTestQuery, '__uw_temp') === false) {
+                return 'Could not use a temp table to test query!';
+            }
+
+            $this->log->debug('testing query on temp table: ['.$tempTableTestQuery.']');
+            $this->query($tempTableTestQuery, false, "Preflight Failed for: {$query}");
+        } else {
+            // test insertion of an index on a table
+            $tempTableTestQuery_idx = str_replace("ADD INDEX `idx_", "ADD INDEX `temp_idx_", $tempTableTestQuery);
+            $this->log->debug('testing query on temp table: ['.$tempTableTestQuery_idx.']');
+            $this->query($tempTableTestQuery_idx, false, "Preflight Failed for: {$query}");
+        }
+        $mysqlError = $this->getL();
+        if(!empty($mysqlError)) {
+            return $mysqlError;
+        }
+        $this->dropTableName("{$table}__uw_temp");
+
+        return '';
+    }
+
+    protected function verifyGenericReplaceQuery($querytype, $table, $query)
+    {
+        $this->log->debug("verifying $querytype statement");
+
+        if(!$this->makeTempTableCopy($table)) {
+            return 'Could not create temp table copy';
+        }
+        // test the query on the test table
+        $this->log->debug('testing query: ['.$query.']');
+        $tempTableTestQuery = str_replace("$querytype `{$table}`", "$querytype `{$table}__uw_temp`", $query);
+        if(strpos($tempTableTestQuery, '__uw_temp') === false) {
+            return 'Could not use a temp table to test query!';
+        }
+
+        $this->query($tempTableTestQuery, false, "Preflight Failed for: {$query}");
+        $error = $this->lastError(); // empty on no-errors
+        $this->dropTableName("{$table}__uw_temp"); // just in case
+        return $error;
+    }
+
+    /**
+     * Tests a DROP TABLE query
+     * @param string table The table name to get DDL
+     * @param string query The query to test.
+     * @return string Non-empty if error found
+     */
+    public function verifyDropTable($table, $query)
+    {
+        return $this->verifyGenericReplaceQuery("DROP TABLE", $table, $query);
+    }
+
+    /**
+     * Tests an INSERT INTO query
+     * @param string table The table name to get DDL
+     * @param string query The query to test.
+     * @return string Non-empty if error found
+     */
+    public function verifyInsertInto($table, $query)
+    {
+        return $this->verifyGenericReplaceQuery("INSERT INTO", $table, $query);
+    }
+
+    /**
+     * Tests an UPDATE query
+     * @param string table The table name to get DDL
+     * @param string query The query to test.
+     * @return string Non-empty if error found
+     */
+    public function verifyUpdate($table, $query)
+    {
+        return $this->verifyGenericReplaceQuery("UPDATE", $table, $query);
+    }
+
+    /**
+     * Tests an DELETE FROM query
+     * @param string table The table name to get DDL
+     * @param string query The query to test.
+     * @return string Non-empty if error found
+     */
+    public function verifyDeleteFrom($table, $query)
+    {
+        return $this->verifyGenericReplaceQuery("DELETE FROM", $table, $query);
+    }
+
+    /**
+     * Check if certain database exists
+     * @param string $dbname
+     */
+    public function dbExists($dbname)
+    {
+        $db = $this->getOne("SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = ".$this->quoted($dbname));
+        return !empty($db);
+    }
+
+    /**
+     * Select database
+     * @param string $dbname
+     */
+    protected function selectDb($dbname)
+    {
+        return mysql_select_db($dbname);
+    }
+
+    /**
+     * Check if certain DB user exists
+     * @param string $username
+     */
+    public function userExists($username)
+    {
+        $db = $this->getOne("SELECT DATABASE()");
+        if(!$this->selectDb("mysql")) {
+            return false;
+        }
+        $user = $this->getOne("select count(*) from user where user = ".$this->quoted($username));
+        if(!$this->selectDb($db)) {
+            $this->checkError("Cannot select database $db", true);
+        }
+        return !empty($user);
+    }
+
+    /**
+     * Create DB user
+     * @param string $database_name
+     * @param string $host_name
+     * @param string $user
+     * @param string $password
+     */
+    public function createDbUser($database_name, $host_name, $user, $password)
+    {
+        $qpassword = $this->quote($password);
+        $this->query("GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, ALTER, DROP, INDEX
 							ON `$database_name`.*
 							TO \"$user\"@\"$host_name\"
 							IDENTIFIED BY '{$qpassword}';", true);
 
-		$this->query("SET PASSWORD FOR \"{$user}\"@\"{$host_name}\" = password('{$qpassword}');", true);
-		if($host_name != 'localhost') {
-			$this->createDbUser($database_name, "localhost", $user, $password);
-		}
-	}
-
-	/**
-	 * Create a database
-	 * @param string $dbname
-	 */
-	public function createDatabase($dbname)
-	{
-		$this->query("CREATE DATABASE `$dbname` CHARACTER SET utf8 COLLATE utf8_general_ci", true);
-	}
-
-	public function preInstall()
-	{
-		$db->query("ALTER DATABASE `{$setup_db_database_name}` DEFAULT CHARACTER SET utf8", true);
-		$db->query("ALTER DATABASE `{$setup_db_database_name}` DEFAULT COLLATE utf8_general_ci", true);
-
-	}
-
-	/**
-	 * Drop a database
-	 * @param string $dbname
-	 */
-	public function dropDatabase($dbname)
-	{
-		return $this->query("DROP DATABASE IF EXISTS `$dbname`", true);
-	}
-
-	/**
-	 * Check if this driver can be used
-	 * @return bool
-	 */
-	public function valid()
-	{
-		return function_exists("mysql_connect");
-	}
-
-	/**
-	 * Check DB version
-	 * @see DBManager::canInstall()
-	 */
-	public function canInstall()
-	{
-		$db_version = $this->version();
-		if(empty($db_version)) {
-			return array('ERR_DB_VERSION_FAILURE');
-		}
-		if(version_compare($db_version, '4.1.2') < 0) {
-			return array('ERR_DB_MYSQL_VERSION', $db_version);
-		}
-		return true;
-	}
-
-	public function installConfig()
-	{
-		return array(
-			'LBL_DBCONFIG_MSG3' =>  array(
-				"setup_db_database_name" => array("label" => 'LBL_DBCONF_DB_NAME', "required" => true),
-			),
-			'LBL_DBCONFIG_MSG2' =>  array(
-				"setup_db_host_name" => array("label" => 'LBL_DBCONF_HOST_NAME', "required" => true),
-			),
-			'LBL_DBCONF_TITLE_USER_INFO' => array(),
-			'LBL_DBCONFIG_B_MSG1' => array(
-				"setup_db_admin_user_name" => array("label" => 'LBL_DBCONF_DB_ADMIN_USER', "required" => true),
-				"setup_db_admin_password" => array("label" => 'LBL_DBCONF_DB_ADMIN_PASSWORD', "type" => "password"),
-			)
-		);
-	}
-
-	/**
-	 * Disable keys on the table
-	 * @abstract
-	 * @param string $tableName
-	 */
-	public function disableKeys($tableName)
-	{
-	    return $this->query('ALTER TABLE '.$tableName.' DISABLE KEYS');
-	}
-
-	/**
-	 * Re-enable keys on the table
-	 * @abstract
-	 * @param string $tableName
-	 */
-	public function enableKeys($tableName)
-	{
-	    return $this->query('ALTER TABLE '.$tableName.' ENABLE KEYS');
-	}
+        $this->query("SET PASSWORD FOR \"{$user}\"@\"{$host_name}\" = password('{$qpassword}');", true);
+        if($host_name != 'localhost') {
+            $this->createDbUser($database_name, "localhost", $user, $password);
+        }
+    }
+
+    /**
+     * Create a database
+     * @param string $dbname
+     */
+    public function createDatabase($dbname)
+    {
+        $this->query("CREATE DATABASE `$dbname` CHARACTER SET utf8 COLLATE utf8_general_ci", true);
+    }
+
+    public function preInstall()
+    {
+        $db->query("ALTER DATABASE `{$setup_db_database_name}` DEFAULT CHARACTER SET utf8", true);
+        $db->query("ALTER DATABASE `{$setup_db_database_name}` DEFAULT COLLATE utf8_general_ci", true);
+
+    }
+
+    /**
+     * Drop a database
+     * @param string $dbname
+     */
+    public function dropDatabase($dbname)
+    {
+        return $this->query("DROP DATABASE IF EXISTS `$dbname`", true);
+    }
+
+    /**
+     * Check if this driver can be used
+     * @return bool
+     */
+    public function valid()
+    {
+        return function_exists("mysql_connect");
+    }
+
+    /**
+     * Check DB version
+     * @see DBManager::canInstall()
+     */
+    public function canInstall()
+    {
+        $db_version = $this->version();
+        if(empty($db_version)) {
+            return array('ERR_DB_VERSION_FAILURE');
+        }
+        if(version_compare($db_version, '4.1.2') < 0) {
+            return array('ERR_DB_MYSQL_VERSION', $db_version);
+        }
+        return true;
+    }
+
+    public function installConfig()
+    {
+        return array(
+            'LBL_DBCONFIG_MSG3' =>  array(
+                "setup_db_database_name" => array("label" => 'LBL_DBCONF_DB_NAME', "required" => true),
+            ),
+            'LBL_DBCONFIG_MSG2' =>  array(
+                "setup_db_host_name" => array("label" => 'LBL_DBCONF_HOST_NAME', "required" => true),
+            ),
+            'LBL_DBCONF_TITLE_USER_INFO' => array(),
+            'LBL_DBCONFIG_B_MSG1' => array(
+                "setup_db_admin_user_name" => array("label" => 'LBL_DBCONF_DB_ADMIN_USER', "required" => true),
+                "setup_db_admin_password" => array("label" => 'LBL_DBCONF_DB_ADMIN_PASSWORD', "type" => "password"),
+            )
+        );
+    }
+
+    /**
+     * Disable keys on the table
+     * @abstract
+     * @param string $tableName
+     */
+    public function disableKeys($tableName)
+    {
+        return $this->query('ALTER TABLE '.$tableName.' DISABLE KEYS');
+    }
+
+    /**
+     * Re-enable keys on the table
+     * @abstract
+     * @param string $tableName
+     */
+    public function enableKeys($tableName)
+    {
+        return $this->query('ALTER TABLE '.$tableName.' ENABLE KEYS');
+    }
 
     /**
      * Returns a DB specific FROM clause which can be used to select against functions.
@@ -1501,8 +1501,8 @@ 
      * @return string
      */
 
-	public function getGuidSQL()
+    public function getGuidSQL()
     {
-      	return 'UUID()';
+            return 'UUID()';
     }
 }

Switch Indentation +49 added lines, -49 removed lines

@@ -825,33 +825,33 @@ 
 			$fields = $index['fields'];
 
 		switch ($type) {
-		case 'unique':
-			$columns[] = " UNIQUE $name ($fields)";
-			break;
-		case 'primary':
-			$columns[] = " PRIMARY KEY ($fields)";
-			break;
-		case 'index':
-		case 'foreign':
-		case 'clustered':
-		case 'alternate_key':
-			/**
+		    case 'unique':
+			    $columns[] = " UNIQUE $name ($fields)";
+			    break;
+		    case 'primary':
+			    $columns[] = " PRIMARY KEY ($fields)";
+			    break;
+		    case 'index':
+		    case 'foreign':
+		    case 'clustered':
+		    case 'alternate_key':
+			    /**
 				* @todo here it is assumed that the primary key of the foreign
 				* table will always be named 'id'. It must be noted though
 				* that this can easily be fixed by referring to db dictionary
 				* to find the correct primary field name
 				*/
-			if ( $alter_table )
-				$columns[] = " INDEX $name ($fields)";
-			else
-				$columns[] = " KEY $name ($fields)";
-			break;
-		case 'fulltext':
-			if ($this->full_text_indexing_installed())
-				$columns[] = " FULLTEXT ($fields)";
-			else
-				$GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:',$name);
-			break;
+			    if ( $alter_table )
+				    $columns[] = " INDEX $name ($fields)";
+			    else
+				    $columns[] = " KEY $name ($fields)";
+			    break;
+		    case 'fulltext':
+			    if ($this->full_text_indexing_installed())
+				    $columns[] = " FULLTEXT ($fields)";
+			    else
+				    $GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:',$name);
+			    break;
 		}
 	}
 	$columns = implode(", $alter_action ", $columns);
@@ -935,33 +935,33 @@ 
 
 		switch ($type){
 		// generic indices
-		case 'index':
-		case 'alternate_key':
-		case 'clustered':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP INDEX {$name} ";
-			else
-				$sql = "ALTER TABLE {$table} ADD INDEX {$name} ({$fields})";
-			break;
-		// constraints as indices
-		case 'unique':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP INDEX $name";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT UNIQUE {$name} ({$fields})";
-			break;
-		case 'primary':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP PRIMARY KEY";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT PRIMARY KEY ({$fields})";
-			break;
-		case 'foreign':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT FOREIGN KEY {$name} ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignField']})";
-			break;
+		    case 'index':
+		    case 'alternate_key':
+		    case 'clustered':
+			    if ($drop)
+				    $sql = "ALTER TABLE {$table} DROP INDEX {$name} ";
+			    else
+				    $sql = "ALTER TABLE {$table} ADD INDEX {$name} ({$fields})";
+			    break;
+		    // constraints as indices
+		    case 'unique':
+			    if ($drop)
+				    $sql = "ALTER TABLE {$table} DROP INDEX $name";
+			    else
+				    $sql = "ALTER TABLE {$table} ADD CONSTRAINT UNIQUE {$name} ({$fields})";
+			    break;
+		    case 'primary':
+			    if ($drop)
+				    $sql = "ALTER TABLE {$table} DROP PRIMARY KEY";
+			    else
+				    $sql = "ALTER TABLE {$table} ADD CONSTRAINT PRIMARY KEY ({$fields})";
+			    break;
+		    case 'foreign':
+			    if ($drop)
+				    $sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
+			    else
+				    $sql = "ALTER TABLE {$table} ADD CONSTRAINT FOREIGN KEY {$name} ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignField']})";
+			    break;
 		}
 		return $sql;
 	}

Spacing +140 added lines, -140 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.
@@ -170,25 +170,25 @@ 
 	 */
 	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);
 		}
 
 		parent::countQuery($sql);
-		$GLOBALS['log']->info('Query:' . $sql);
+		$GLOBALS['log']->info('Query:'.$sql);
 		$this->checkConnection();
 		$this->query_time = microtime(true);
 		$this->lastsql = $sql;
-		$result = $suppress?@mysql_query($sql, $this->database):mysql_query($sql, $this->database);
+		$result = $suppress ? @mysql_query($sql, $this->database) : mysql_query($sql, $this->database);
 
 		$this->query_time = microtime(true) - $this->query_time;
 		$GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
 
 
-		if($keepResult)
+		if ($keepResult)
 			$this->lastResult = $result;
 
-		$this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
+		$this->checkError($msg.' Query Failed:'.$sql.'::', $dieOnError);
 		return $result;
 	}
 
@@ -224,7 +224,7 @@ 
 	public function disconnect()
 	{
 		$GLOBALS['log']->debug('Calling MySQL::disconnect()');
-		if(!empty($this->database)){
+		if (!empty($this->database)) {
 			$this->freeResult();
 			mysql_close($this->database);
 			$this->database = null;
@@ -236,7 +236,7 @@ 
 	 */
 	protected function freeDbResult($dbResult)
 	{
-		if(!empty($dbResult))
+		if (!empty($dbResult))
 			mysql_free_result($dbResult);
 	}
 
@@ -262,15 +262,15 @@ 
         $count = (int)$count;
 	    if ($start < 0)
 			$start = 0;
-		$GLOBALS['log']->debug('Limit Query:' . $sql. ' Start: ' .$start . ' count: ' . $count);
+		$GLOBALS['log']->debug('Limit Query:'.$sql.' Start: '.$start.' count: '.$count);
 
 	    $sql = "$sql LIMIT $start,$count";
 		$this->lastsql = $sql;
 
-		if(!empty($GLOBALS['sugar_config']['check_query'])){
+		if (!empty($GLOBALS['sugar_config']['check_query'])) {
 			$this->checkQuery($sql);
 		}
-		if(!$execute) {
+		if (!$execute) {
 			return $sql;
 		}
 
@@ -283,14 +283,14 @@ 
 	 */
 	protected function checkQuery($sql, $object_name = false)
 	{
-		$result   = $this->query('EXPLAIN ' . $sql);
+		$result   = $this->query('EXPLAIN '.$sql);
 		$badQuery = array();
 		while ($row = $this->fetchByAssoc($result)) {
 			if (empty($row['table']))
 				continue;
 			$badQuery[$row['table']] = '';
 			if (strtoupper($row['type']) == 'ALL')
-				$badQuery[$row['table']]  .=  ' Full Table Scan;';
+				$badQuery[$row['table']] .= ' Full Table Scan;';
 			if (empty($row['key']))
 				$badQuery[$row['table']] .= ' No Index Key Used;';
 			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using filesort') > 0)
@@ -299,18 +299,18 @@ 
 				$badQuery[$row['table']] .= ' Using Temporary Table;';
 		}
 
-		if ( empty($badQuery) )
+		if (empty($badQuery))
 			return true;
 
-		foreach($badQuery as $table=>$data ){
-			if(!empty($data)){
-				$warning = ' Table:' . $table . ' Data:' . $data;
-				if(!empty($GLOBALS['sugar_config']['check_query_log'])){
+		foreach ($badQuery as $table=>$data) {
+			if (!empty($data)) {
+				$warning = ' Table:'.$table.' Data:'.$data;
+				if (!empty($GLOBALS['sugar_config']['check_query_log'])) {
 					$GLOBALS['log']->fatal($sql);
-					$GLOBALS['log']->fatal('CHECK QUERY:' .$warning);
+					$GLOBALS['log']->fatal('CHECK QUERY:'.$warning);
 				}
-				else{
-					$GLOBALS['log']->warn('CHECK QUERY:' .$warning);
+				else {
+					$GLOBALS['log']->warn('CHECK QUERY:'.$warning);
 				}
 			}
 		}
@@ -327,19 +327,19 @@ 
 		$result = $this->query("DESCRIBE $tablename");
 
 		$columns = array();
-		while (($row=$this->fetchByAssoc($result)) !=null) {
+		while (($row = $this->fetchByAssoc($result)) != null) {
 			$name = strtolower($row['Field']);
-			$columns[$name]['name']=$name;
+			$columns[$name]['name'] = $name;
 			$matches = array();
 			preg_match_all('/(\w+)(?:\(([0-9]+,?[0-9]*)\)|)( unsigned)?/i', $row['Type'], $matches);
-			$columns[$name]['type']=strtolower($matches[1][0]);
-			if ( isset($matches[2][0]) && in_array(strtolower($matches[1][0]),array('varchar','char','varchar2','int','decimal','float')) )
-				$columns[$name]['len']=strtolower($matches[2][0]);
-			if ( stristr($row['Extra'],'auto_increment') )
+			$columns[$name]['type'] = strtolower($matches[1][0]);
+			if (isset($matches[2][0]) && in_array(strtolower($matches[1][0]), array('varchar', 'char', 'varchar2', 'int', 'decimal', 'float')))
+				$columns[$name]['len'] = strtolower($matches[2][0]);
+			if (stristr($row['Extra'], 'auto_increment'))
 				$columns[$name]['auto_increment'] = '1';
-			if ($row['Null'] == 'NO' && !stristr($row['Key'],'PRI'))
+			if ($row['Null'] == 'NO' && !stristr($row['Key'], 'PRI'))
 				$columns[$name]['required'] = 'true';
-			if (!empty($row['Default']) )
+			if (!empty($row['Default']))
 				$columns[$name]['default'] = $row['Default'];
 		}
 		return $columns;
@@ -348,20 +348,20 @@ 
 	/**
 	 * @see DBManager::getFieldsArray()
 	 */
-	public function getFieldsArray($result, $make_lower_case=false)
+	public function getFieldsArray($result, $make_lower_case = false)
 	{
 		$field_array = array();
 
-		if(empty($result))
+		if (empty($result))
 			return 0;
 
 		$fields = mysql_num_fields($result);
-		for ($i=0; $i < $fields; $i++) {
+		for ($i = 0; $i < $fields; $i++) {
 			$meta = mysql_fetch_field($result, $i);
 			if (!$meta)
 				return array();
 
-			if($make_lower_case == true)
+			if ($make_lower_case == true)
 				$meta->name = strtolower($meta->name);
 
 			$field_array[] = $meta->name;
@@ -393,7 +393,7 @@ 
 			if (!empty($r)) {
 				while ($a = $this->fetchByAssoc($r)) {
 					$row = array_values($a);
-					$tables[]=$row[0];
+					$tables[] = $row[0];
 				}
 				return $tables;
 			}
@@ -419,7 +419,7 @@ 
 
 		if ($this->getDatabase()) {
 			$result = $this->query("SHOW TABLES LIKE ".$this->quoted($tableName));
-			if(empty($result)) return false;
+			if (empty($result)) return false;
 			$row = $this->fetchByAssoc($result);
 			return !empty($row);
 		}
@@ -440,7 +440,7 @@ 
 			if (!empty($r)) {
 				while ($a = $this->fetchByAssoc($r)) {
 					$row = array_values($a);
-					$tables[]=$row[0];
+					$tables[] = $row[0];
 				}
 				return $tables;
 			}
@@ -453,7 +453,7 @@ 
 	 */
 	public function quote($string)
 	{
-		if(is_array($string)) {
+		if (is_array($string)) {
 			return $this->arrayQuote($string);
 		}
 		return mysql_real_escape_string($this->quoteInternal($string), $this->getDatabase());
@@ -474,7 +474,7 @@ 
 	{
 		global $sugar_config;
 
-		if(is_null($configOptions))
+		if (is_null($configOptions))
 			$configOptions = $sugar_config['dbconfig'];
 
 		if ($this->getOption('persistent')) {
@@ -491,10 +491,10 @@ 
 					$configOptions['db_user_name'],
 					$configOptions['db_password']
 					);
-			if(empty($this->database)) {
+			if (empty($this->database)) {
 				$GLOBALS['log']->fatal("Could not connect to server ".$configOptions['db_host_name']." as ".$configOptions['db_user_name'].":".mysql_error());
-				if($dieOnError) {
-					if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
+				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.");
@@ -504,15 +504,15 @@ 
 				}
 			}
 			// Do not pass connection information because we have not connected yet
-			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>";
 			}
 		}
-		if(!empty($configOptions['db_name']) && !@mysql_select_db($configOptions['db_name'])) {
-			$GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}: " . mysql_error($this->database));
-			if($dieOnError) {
+		if (!empty($configOptions['db_name']) && !@mysql_select_db($configOptions['db_name'])) {
+			$GLOBALS['log']->fatal("Unable to select database {$configOptions['db_name']}: ".mysql_error($this->database));
+			if ($dieOnError) {
 				sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
 			} else {
 				return false;
@@ -523,12 +523,12 @@ 
 	    mysql_query("SET CHARACTER SET utf8", $this->database);
 	    $names = "SET NAMES 'utf8'";
 	    $collation = $this->getOption('collation');
-	    if(!empty($collation)) {
+	    if (!empty($collation)) {
 	        $names .= " COLLATE '$collation'";
 		}
 	    mysql_query($names, $this->database);
 
-		if(!$this->checkError('Could Not Connect:', $dieOnError))
+		if (!$this->checkError('Could Not Connect:', $dieOnError))
 			$GLOBALS['log']->info("connected to db");
 		$this->connectOptions = $configOptions;
 
@@ -544,16 +544,16 @@ 
 	 */
 	public function repairTableParams($tablename, $fielddefs, $indices, $execute = true, $engine = null)
 	{
-		$sql = parent::repairTableParams($tablename,$fielddefs,$indices,false,$engine);
+		$sql = parent::repairTableParams($tablename, $fielddefs, $indices, false, $engine);
 
-		if ( $sql == '' )
+		if ($sql == '')
 			return '';
 
-		if ( stristr($sql,'create table') )
+		if (stristr($sql, 'create table'))
 		{
 			if ($execute) {
-				$msg = "Error creating table: ".$tablename. ":";
-				$this->query($sql,true,$msg);
+				$msg = "Error creating table: ".$tablename.":";
+				$this->query($sql, true, $msg);
 			}
 			return $sql;
 		}
@@ -562,23 +562,23 @@ 
 		$match = array();
 		preg_match_all('!/\*.*?\*/!is', $sql, $match);
 		$commentBlocks = $match[0];
-		$sql = preg_replace('!/\*.*?\*/!is','', $sql);
+		$sql = preg_replace('!/\*.*?\*/!is', '', $sql);
 
 		// now, we should only have alter table statements
 		// let's replace the 'alter table name' part with a comma
-		$sql = preg_replace("!alter table $tablename!is",', ', $sql);
+		$sql = preg_replace("!alter table $tablename!is", ', ', $sql);
 
 		// re-add it at the beginning
-		$sql = substr_replace($sql,'',strpos($sql,','),1);
-		$sql = str_replace(";","",$sql);
-		$sql = str_replace("\n","",$sql);
+		$sql = substr_replace($sql, '', strpos($sql, ','), 1);
+		$sql = str_replace(";", "", $sql);
+		$sql = str_replace("\n", "", $sql);
 		$sql = "ALTER TABLE $tablename $sql";
 
-		if ( $execute )
-			$this->query($sql,'Error with MySQL repair table');
+		if ($execute)
+			$this->query($sql, 'Error with MySQL repair table');
 
 		// and re-add the comments at the beginning
-		$sql = implode("\n",$commentBlocks) . "\n". $sql . "\n";
+		$sql = implode("\n", $commentBlocks)."\n".$sql."\n";
 
 		return $sql;
 	}
@@ -589,7 +589,7 @@ 
 	public function convert($string, $type, array $additional_parameters = array())
 	{
 		$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);
@@ -602,17 +602,17 @@ 
 			case 'left':
 				return "LEFT($all_strings)";
 			case 'date_format':
-				if(empty($additional_parameters)) {
+				if (empty($additional_parameters)) {
 					return "DATE_FORMAT($string,'%Y-%m-%d')";
 				} else {
 					$format = $additional_parameters[0];
-					if($format[0] != "'") {
+					if ($format[0] != "'") {
 						$format = $this->quoted($format);
 					}
 					return "DATE_FORMAT($string,$format)";
 				}
 			case 'ifnull':
-				if(empty($additional_parameters) && !strstr($all_strings, ",")) {
+				if (empty($additional_parameters) && !strstr($all_strings, ",")) {
 					$all_strings .= ",''";
 				}
 				return "IFNULL($all_strings)";
@@ -631,7 +631,7 @@ 
             case 'add_tz_offset' :
                 $getUserUTCOffset = $GLOBALS['timedate']->getUserUTCOffset();
                 $operation = $getUserUTCOffset < 0 ? '-' : '+';
-                return $string . ' ' . $operation . ' INTERVAL ' . abs($getUserUTCOffset) . ' MINUTE';
+                return $string.' '.$operation.' INTERVAL '.abs($getUserUTCOffset).' MINUTE';
             case 'avg':
                 return "avg($string)";
 		}
@@ -672,15 +672,15 @@ 
 	 */
 	protected function isEngineEnabled($engine)
 	{
-		if(!is_string($engine)) return false;
+		if (!is_string($engine)) return false;
 
 		$engine = strtoupper($engine);
 
 		$r = $this->query("SHOW ENGINES");
 
-		while ( $row = $this->fetchByAssoc($r) )
-			if ( strtoupper($row['Engine']) == $engine )
-				return ($row['Support']=='YES' || $row['Support']=='DEFAULT');
+		while ($row = $this->fetchByAssoc($r))
+			if (strtoupper($row['Engine']) == $engine)
+				return ($row['Support'] == 'YES' || $row['Support'] == 'DEFAULT');
 
 		return false;
 	}
@@ -708,9 +708,9 @@ 
 	*/
 	public function createTableSQLParams($tablename, $fieldDefs, $indices, $engine = null)
 	{
-		if ( empty($engine) && isset($fieldDefs['engine']))
+		if (empty($engine) && isset($fieldDefs['engine']))
 			$engine = $fieldDefs['engine'];
-		if ( !$this->isEngineEnabled($engine) )
+		if (!$this->isEngineEnabled($engine))
 			$engine = '';
 
 		$columns = $this->columnSQLRep($fieldDefs, false, $tablename);
@@ -723,13 +723,13 @@ 
 
 		// cn: bug 9873 - module tables do not get created in utf8 with assoc collation
 		$collation = $this->getOption('collation');
-		if(empty($collation)) {
+		if (empty($collation)) {
 		    $collation = 'utf8_general_ci';
 		}
 		$sql = "CREATE TABLE $tablename ($columns $keys) CHARACTER SET utf8 COLLATE $collation";
 
 		if (!empty($engine))
-			$sql.= " ENGINE=$engine";
+			$sql .= " ENGINE=$engine";
 
 		return $sql;
 	}
@@ -741,7 +741,7 @@ 
     public function isTextType($type)
     {
         $type = $this->getColumnType(strtolower($type));
-        return in_array($type, array('blob','text','longblob', 'longtext'));
+        return in_array($type, array('blob', 'text', 'longblob', 'longtext'));
     }
 
 	/**
@@ -752,16 +752,16 @@ 
 		// always return as array for post-processing
 		$ref = parent::oneColumnSQLRep($fieldDef, $ignoreRequired, $table, true);
 
-		if ( $ref['colType'] == 'int' && !empty($fieldDef['len']) ) {
+		if ($ref['colType'] == 'int' && !empty($fieldDef['len'])) {
 			$ref['colType'] .= "(".$fieldDef['len'].")";
 		}
 
 		// bug 22338 - don't set a default value on text or blob fields
-		if ( isset($ref['default']) &&
+		if (isset($ref['default']) &&
             in_array($ref['colBaseType'], array('text', 'blob', 'longtext', 'longblob')))
 			    $ref['default'] = '';
 
-		if ( $return_as_array )
+		if ($return_as_array)
 			return $ref;
 		else
 			return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
@@ -773,8 +773,8 @@ 
 	protected function changeColumnSQL($tablename, $fieldDefs, $action, $ignoreRequired = false)
 	{
 		$columns = array();
-		if ($this->isFieldArray($fieldDefs)){
-			foreach ($fieldDefs as $def){
+		if ($this->isFieldArray($fieldDefs)) {
+			foreach ($fieldDefs as $def) {
 				if ($action == 'drop')
 					$columns[] = $def['name'];
 				else
@@ -811,7 +811,7 @@ 
 
 	$columns = array();
 	foreach ($indices as $index) {
-		if(!empty($index['db']) && $index['db'] != $this->dbType)
+		if (!empty($index['db']) && $index['db'] != $this->dbType)
 			continue;
 		if (isset($index['source']) && $index['source'] != 'db')
 			continue;
@@ -841,7 +841,7 @@ 
 				* that this can easily be fixed by referring to db dictionary
 				* to find the correct primary field name
 				*/
-			if ( $alter_table )
+			if ($alter_table)
 				$columns[] = " INDEX $name ($fields)";
 			else
 				$columns[] = " KEY $name ($fields)";
@@ -850,13 +850,13 @@ 
 			if ($this->full_text_indexing_installed())
 				$columns[] = " FULLTEXT ($fields)";
 			else
-				$GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:',$name);
+				$GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:', $name);
 			break;
 		}
 	}
 	$columns = implode(", $alter_action ", $columns);
-	if(!empty($alter_action)){
-		$columns = $alter_action . ' '. $columns;
+	if (!empty($alter_action)) {
+		$columns = $alter_action.' '.$columns;
 	}
 	return $columns;
 	}
@@ -878,7 +878,7 @@ 
 	public function setAutoIncrementStart($table, $field_name, $start_value)
 	{
 		$start_value = (int)$start_value;
-		return $this->query( "ALTER TABLE $table AUTO_INCREMENT = $start_value;");
+		return $this->query("ALTER TABLE $table AUTO_INCREMENT = $start_value;");
 	}
 
 	/**
@@ -907,18 +907,18 @@ 
 		$result = $this->query("SHOW INDEX FROM $tablename");
 
 		$indices = array();
-		while (($row=$this->fetchByAssoc($result)) !=null) {
-			$index_type='index';
-			if ($row['Key_name'] =='PRIMARY') {
-				$index_type='primary';
+		while (($row = $this->fetchByAssoc($result)) != null) {
+			$index_type = 'index';
+			if ($row['Key_name'] == 'PRIMARY') {
+				$index_type = 'primary';
 			}
-			elseif ( $row['Non_unique'] == '0' ) {
-				$index_type='unique';
+			elseif ($row['Non_unique'] == '0') {
+				$index_type = 'unique';
 			}
 			$name = strtolower($row['Key_name']);
-			$indices[$name]['name']=$name;
-			$indices[$name]['type']=$index_type;
-			$indices[$name]['fields'][]=strtolower($row['Column_name']);
+			$indices[$name]['name'] = $name;
+			$indices[$name]['type'] = $index_type;
+			$indices[$name]['fields'][] = strtolower($row['Column_name']);
 		}
 		return $indices;
 	}
@@ -929,11 +929,11 @@ 
 	public function add_drop_constraint($table, $definition, $drop = false)
 	{
 		$type         = $definition['type'];
-		$fields       = implode(',',$definition['fields']);
+		$fields       = implode(',', $definition['fields']);
 		$name         = $definition['name'];
 		$sql          = '';
 
-		switch ($type){
+		switch ($type) {
 		// generic indices
 		case 'index':
 		case 'alternate_key':
@@ -977,7 +977,7 @@ 
 	 */
 	public function fetchOne($sql, $dieOnError = false, $msg = '', $suppress = false)
 	{
-		if(stripos($sql, ' LIMIT ') === false) {
+		if (stripos($sql, ' LIMIT ') === false) {
 			// little optimization to just fetch one row
 			$sql .= " LIMIT 0,1";
 		}
@@ -997,13 +997,13 @@ 
 	 */
 	public function massageFieldDef(&$fieldDef, $tablename)
 	{
-		parent::massageFieldDef($fieldDef,$tablename);
+		parent::massageFieldDef($fieldDef, $tablename);
 
-		if ( isset($fieldDef['default']) &&
+		if (isset($fieldDef['default']) &&
 			($fieldDef['dbType'] == 'text'
 				|| $fieldDef['dbType'] == 'blob'
 				|| $fieldDef['dbType'] == 'longtext'
-				|| $fieldDef['dbType'] == 'longblob' ))
+				|| $fieldDef['dbType'] == 'longblob'))
 			unset($fieldDef['default']);
 		if ($fieldDef['dbType'] == 'uint')
 			$fieldDef['len'] = '10';
@@ -1011,22 +1011,22 @@ 
 			$fieldDef['len'] = '20';
 		if ($fieldDef['dbType'] == 'bool')
 			$fieldDef['type'] = 'tinyint';
-		if ($fieldDef['dbType'] == 'bool' && empty($fieldDef['default']) )
+		if ($fieldDef['dbType'] == 'bool' && empty($fieldDef['default']))
 			$fieldDef['default'] = '0';
-		if (($fieldDef['dbType'] == 'varchar' || $fieldDef['dbType'] == 'enum') && empty($fieldDef['len']) )
+		if (($fieldDef['dbType'] == 'varchar' || $fieldDef['dbType'] == 'enum') && empty($fieldDef['len']))
 			$fieldDef['len'] = '255';
 		if ($fieldDef['dbType'] == 'uint')
 			$fieldDef['len'] = '10';
-		if ($fieldDef['dbType'] == 'int' && empty($fieldDef['len']) )
+		if ($fieldDef['dbType'] == 'int' && empty($fieldDef['len']))
 			$fieldDef['len'] = '11';
 
-		if($fieldDef['dbType'] == 'decimal') {
-			if(isset($fieldDef['len'])) {
-				if(strstr($fieldDef['len'], ",") === false) {
+		if ($fieldDef['dbType'] == 'decimal') {
+			if (isset($fieldDef['len'])) {
+				if (strstr($fieldDef['len'], ",") === false) {
 					$fieldDef['len'] .= ",0";
 				}
 			} else {
-				$fieldDef['len']  = '10,0';
+				$fieldDef['len'] = '10,0';
 			}
 		}
 	}
@@ -1046,8 +1046,8 @@ 
 	{
 		$sql = array();
 		foreach ($indexes as $index) {
-			$name =$index['name'];
-			if($execute) {
+			$name = $index['name'];
+			if ($execute) {
 			unset(self::$index_descriptions[$tablename][$name]);
 			}
 			if ($index['type'] == 'primary') {
@@ -1057,8 +1057,8 @@ 
 			}
 		}
 		if (!empty($sql)) {
-            $sql = "ALTER TABLE $tablename " . join(",", $sql) . ";";
-			if($execute)
+            $sql = "ALTER TABLE $tablename ".join(",", $sql).";";
+			if ($execute)
 				$this->query($sql);
 		} else {
 			$sql = '';
@@ -1084,7 +1084,7 @@ 
 		$q = "SHOW COLLATION LIKE 'utf8%'";
 		$r = $this->query($q);
 		$res = array();
-		while($a = $this->fetchByAssoc($r)) {
+		while ($a = $this->fetchByAssoc($r)) {
 			$res[] = $a['Collation'];
 		}
 		return $res;
@@ -1104,13 +1104,13 @@ 
 	public function emptyValue($type)
 	{
 		$ctype = $this->getColumnType($type);
-		if($ctype == "datetime") {
+		if ($ctype == "datetime") {
 			return $this->convert($this->quoted("0000-00-00 00:00:00"), "datetime");
 		}
-		if($ctype == "date") {
+		if ($ctype == "date") {
 			return $this->convert($this->quoted("0000-00-00"), "date");
 		}
-		if($ctype == "time") {
+		if ($ctype == "time") {
 			return $this->convert($this->quoted("00:00:00"), "time");
 		}
 		return parent::emptyValue($type);
@@ -1122,13 +1122,13 @@ 
 	 */
 	public function lastDbError()
 	{
-		if($this->database) {
-		    if(mysql_errno($this->database)) {
+		if ($this->database) {
+		    if (mysql_errno($this->database)) {
 			    return "MySQL error ".mysql_errno($this->database).": ".mysql_error($this->database);
 		    }
 		} else {
-			$err =  mysql_error();
-			if($err) {
+			$err = mysql_error();
+			if ($err) {
 			    return $err;
 			}
 		}
@@ -1141,7 +1141,7 @@ 
 	 */
 	protected function quoteTerm($term)
 	{
-		if(strpos($term, ' ') !== false) {
+		if (strpos($term, ' ') !== false) {
 			return '"'.$term.'"';
 		}
 		return $term;
@@ -1157,16 +1157,16 @@ 
 	public function getFulltextQuery($field, $terms, $must_terms = array(), $exclude_terms = array())
 	{
 		$condition = array();
-		foreach($terms as $term) {
+		foreach ($terms as $term) {
 			$condition[] = $this->quoteTerm($term);
 		}
-		foreach($must_terms as $term) {
+		foreach ($must_terms as $term) {
 			$condition[] = "+".$this->quoteTerm($term);
 		}
-		foreach($exclude_terms as $term) {
+		foreach ($exclude_terms as $term) {
 			$condition[] = "-".$this->quoteTerm($term);
 		}
-		$condition = $this->quoted(join(" ",$condition));
+		$condition = $this->quoted(join(" ", $condition));
 		return "MATCH($field) AGAINST($condition IN BOOLEAN MODE)";
 	}
 
@@ -1178,7 +1178,7 @@ 
 	{
 		$charsets = array();
 		$res = $this->query("show variables like 'character\\_set\\_%'");
-		while($row = $this->fetchByAssoc($res)) {
+		while ($row = $this->fetchByAssoc($res)) {
 			$charsets[$row['Variable_name']] = $row['Value'];
 		}
 		return $charsets;
@@ -1188,7 +1188,7 @@ 
 	{
 		$charsets = $this->getCharsetInfo();
 		$charset_str = array();
-		foreach($charsets as $name => $value) {
+		foreach ($charsets as $name => $value) {
 			$charset_str[] = "$name = $value";
 		}
 		return array(
@@ -1210,18 +1210,18 @@ 
 	{
 		$this->log->debug("creating temp table for [$table]...");
 		$result = $this->query("SHOW CREATE TABLE {$table}");
-		if(empty($result)) {
+		if (empty($result)) {
 			return false;
 		}
 		$row = $this->fetchByAssoc($result);
-		if(empty($row) || empty($row['Create Table'])) {
+		if (empty($row) || empty($row['Create Table'])) {
 		    return false;
 		}
 		$create = $row['Create Table'];
 		// rewrite DDL with _temp name
 		$tempTableQuery = str_replace("CREATE TABLE `{$table}`", "CREATE TABLE `{$table}__uw_temp`", $create);
 		$r2 = $this->query($tempTableQuery);
-		if(empty($r2)) {
+		if (empty($r2)) {
 			return false;
 		}
 
@@ -1243,11 +1243,11 @@ 
 		$this->log->debug("verifying ALTER TABLE");
 		// Skipping ALTER TABLE [table] DROP PRIMARY KEY because primary keys are not being copied
 		// over to the temp tables
-		if(strpos(strtoupper($query), 'DROP PRIMARY KEY') !== false) {
+		if (strpos(strtoupper($query), 'DROP PRIMARY KEY') !== false) {
 			$this->log->debug("Skipping DROP PRIMARY KEY");
 			return '';
 		}
-		if(!$this->makeTempTableCopy($table)) {
+		if (!$this->makeTempTableCopy($table)) {
 			return 'Could not create temp table copy';
 		}
 
@@ -1255,7 +1255,7 @@ 
 		$this->log->debug('testing query: ['.$query.']');
 		$tempTableTestQuery = str_replace("ALTER TABLE `{$table}`", "ALTER TABLE `{$table}__uw_temp`", $query);
 		if (strpos($tempTableTestQuery, 'idx') === false) {
-			if(strpos($tempTableTestQuery, '__uw_temp') === false) {
+			if (strpos($tempTableTestQuery, '__uw_temp') === false) {
 				return 'Could not use a temp table to test query!';
 			}
 
@@ -1268,7 +1268,7 @@ 
 			$this->query($tempTableTestQuery_idx, false, "Preflight Failed for: {$query}");
 		}
 		$mysqlError = $this->getL();
-		if(!empty($mysqlError)) {
+		if (!empty($mysqlError)) {
 			return $mysqlError;
 		}
 		$this->dropTableName("{$table}__uw_temp");
@@ -1280,13 +1280,13 @@ 
 	{
 		$this->log->debug("verifying $querytype statement");
 
-		if(!$this->makeTempTableCopy($table)) {
+		if (!$this->makeTempTableCopy($table)) {
 			return 'Could not create temp table copy';
 		}
 		// test the query on the test table
 		$this->log->debug('testing query: ['.$query.']');
 		$tempTableTestQuery = str_replace("$querytype `{$table}`", "$querytype `{$table}__uw_temp`", $query);
-		if(strpos($tempTableTestQuery, '__uw_temp') === false) {
+		if (strpos($tempTableTestQuery, '__uw_temp') === false) {
 			return 'Could not use a temp table to test query!';
 		}
 
@@ -1366,11 +1366,11 @@ 
 	public function userExists($username)
 	{
 		$db = $this->getOne("SELECT DATABASE()");
-		if(!$this->selectDb("mysql")) {
+		if (!$this->selectDb("mysql")) {
 			return false;
 		}
 		$user = $this->getOne("select count(*) from user where user = ".$this->quoted($username));
-		if(!$this->selectDb($db)) {
+		if (!$this->selectDb($db)) {
 			$this->checkError("Cannot select database $db", true);
 		}
 		return !empty($user);
@@ -1392,7 +1392,7 @@ 
 							IDENTIFIED BY '{$qpassword}';", true);
 
 		$this->query("SET PASSWORD FOR \"{$user}\"@\"{$host_name}\" = password('{$qpassword}');", true);
-		if($host_name != 'localhost') {
+		if ($host_name != 'localhost') {
 			$this->createDbUser($database_name, "localhost", $user, $password);
 		}
 	}
@@ -1438,10 +1438,10 @@ 
 	public function canInstall()
 	{
 		$db_version = $this->version();
-		if(empty($db_version)) {
+		if (empty($db_version)) {
 			return array('ERR_DB_VERSION_FAILURE');
 		}
-		if(version_compare($db_version, '4.1.2') < 0) {
+		if (version_compare($db_version, '4.1.2') < 0) {
 			return array('ERR_DB_MYSQL_VERSION', $db_version);
 		}
 		return true;

Braces +184 added lines, -128 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -185,8 +187,9 @@ 
 		$GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
 
 
-		if($keepResult)
-			$this->lastResult = $result;
+		if($keepResult) {
+					$this->lastResult = $result;
+		}
 
 		$this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
 		return $result;
@@ -236,8 +239,9 @@ 
 	 */
 	protected function freeDbResult($dbResult)
 	{
-		if(!empty($dbResult))
-			mysql_free_result($dbResult);
+		if(!empty($dbResult)) {
+					mysql_free_result($dbResult);
+		}
 	}
 
 
@@ -260,8 +264,9 @@ 
 	{
         $start = (int)$start;
         $count = (int)$count;
-	    if ($start < 0)
-			$start = 0;
+	    if ($start < 0) {
+	    			$start = 0;
+	    }
 		$GLOBALS['log']->debug('Limit Query:' . $sql. ' Start: ' .$start . ' count: ' . $count);
 
 	    $sql = "$sql LIMIT $start,$count";
@@ -286,21 +291,27 @@ 
 		$result   = $this->query('EXPLAIN ' . $sql);
 		$badQuery = array();
 		while ($row = $this->fetchByAssoc($result)) {
-			if (empty($row['table']))
-				continue;
+			if (empty($row['table'])) {
+							continue;
+			}
 			$badQuery[$row['table']] = '';
-			if (strtoupper($row['type']) == 'ALL')
-				$badQuery[$row['table']]  .=  ' Full Table Scan;';
-			if (empty($row['key']))
-				$badQuery[$row['table']] .= ' No Index Key Used;';
-			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using filesort') > 0)
-				$badQuery[$row['table']] .= ' Using FileSort;';
-			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using temporary') > 0)
-				$badQuery[$row['table']] .= ' Using Temporary Table;';
+			if (strtoupper($row['type']) == 'ALL') {
+							$badQuery[$row['table']]  .=  ' Full Table Scan;';
+			}
+			if (empty($row['key'])) {
+							$badQuery[$row['table']] .= ' No Index Key Used;';
+			}
+			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using filesort') > 0) {
+							$badQuery[$row['table']] .= ' Using FileSort;';
+			}
+			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using temporary') > 0) {
+							$badQuery[$row['table']] .= ' Using Temporary Table;';
+			}
 		}
 
-		if ( empty($badQuery) )
-			return true;
+		if ( empty($badQuery) ) {
+					return true;
+		}
 
 		foreach($badQuery as $table=>$data ){
 			if(!empty($data)){
@@ -308,8 +319,7 @@ 
 				if(!empty($GLOBALS['sugar_config']['check_query_log'])){
 					$GLOBALS['log']->fatal($sql);
 					$GLOBALS['log']->fatal('CHECK QUERY:' .$warning);
-				}
-				else{
+				} else{
 					$GLOBALS['log']->warn('CHECK QUERY:' .$warning);
 				}
 			}
@@ -333,14 +343,18 @@ 
 			$matches = array();
 			preg_match_all('/(\w+)(?:\(([0-9]+,?[0-9]*)\)|)( unsigned)?/i', $row['Type'], $matches);
 			$columns[$name]['type']=strtolower($matches[1][0]);
-			if ( isset($matches[2][0]) && in_array(strtolower($matches[1][0]),array('varchar','char','varchar2','int','decimal','float')) )
-				$columns[$name]['len']=strtolower($matches[2][0]);
-			if ( stristr($row['Extra'],'auto_increment') )
-				$columns[$name]['auto_increment'] = '1';
-			if ($row['Null'] == 'NO' && !stristr($row['Key'],'PRI'))
-				$columns[$name]['required'] = 'true';
-			if (!empty($row['Default']) )
-				$columns[$name]['default'] = $row['Default'];
+			if ( isset($matches[2][0]) && in_array(strtolower($matches[1][0]),array('varchar','char','varchar2','int','decimal','float')) ) {
+							$columns[$name]['len']=strtolower($matches[2][0]);
+			}
+			if ( stristr($row['Extra'],'auto_increment') ) {
+							$columns[$name]['auto_increment'] = '1';
+			}
+			if ($row['Null'] == 'NO' && !stristr($row['Key'],'PRI')) {
+							$columns[$name]['required'] = 'true';
+			}
+			if (!empty($row['Default']) ) {
+							$columns[$name]['default'] = $row['Default'];
+			}
 		}
 		return $columns;
 	}
@@ -352,17 +366,20 @@ 
 	{
 		$field_array = array();
 
-		if(empty($result))
-			return 0;
+		if(empty($result)) {
+					return 0;
+		}
 
 		$fields = mysql_num_fields($result);
 		for ($i=0; $i < $fields; $i++) {
 			$meta = mysql_fetch_field($result, $i);
-			if (!$meta)
-				return array();
+			if (!$meta) {
+							return array();
+			}
 
-			if($make_lower_case == true)
-				$meta->name = strtolower($meta->name);
+			if($make_lower_case == true) {
+							$meta->name = strtolower($meta->name);
+			}
 
 			$field_array[] = $meta->name;
 		}
@@ -375,7 +392,9 @@ 
 	 */
 	public function fetchRow($result)
 	{
-		if (empty($result))	return false;
+		if (empty($result)) {
+		    return false;
+		}
 
 		return mysql_fetch_assoc($result);
 	}
@@ -419,7 +438,9 @@ 
 
 		if ($this->getDatabase()) {
 			$result = $this->query("SHOW TABLES LIKE ".$this->quoted($tableName));
-			if(empty($result)) return false;
+			if(empty($result)) {
+			    return false;
+			}
 			$row = $this->fetchByAssoc($result);
 			return !empty($row);
 		}
@@ -474,8 +495,9 @@ 
 	{
 		global $sugar_config;
 
-		if(is_null($configOptions))
-			$configOptions = $sugar_config['dbconfig'];
+		if(is_null($configOptions)) {
+					$configOptions = $sugar_config['dbconfig'];
+		}
 
 		if ($this->getOption('persistent')) {
 			$this->database = @mysql_pconnect(
@@ -528,8 +550,9 @@ 
 		}
 	    mysql_query($names, $this->database);
 
-		if(!$this->checkError('Could Not Connect:', $dieOnError))
-			$GLOBALS['log']->info("connected to db");
+		if(!$this->checkError('Could Not Connect:', $dieOnError)) {
+					$GLOBALS['log']->info("connected to db");
+		}
 		$this->connectOptions = $configOptions;
 
 		$GLOBALS['log']->info("Connect:".$this->database);
@@ -546,8 +569,9 @@ 
 	{
 		$sql = parent::repairTableParams($tablename,$fielddefs,$indices,false,$engine);
 
-		if ( $sql == '' )
-			return '';
+		if ( $sql == '' ) {
+					return '';
+		}
 
 		if ( stristr($sql,'create table') )
 		{
@@ -574,8 +598,9 @@ 
 		$sql = str_replace("\n","",$sql);
 		$sql = "ALTER TABLE $tablename $sql";
 
-		if ( $execute )
-			$this->query($sql,'Error with MySQL repair table');
+		if ( $execute ) {
+					$this->query($sql,'Error with MySQL repair table');
+		}
 
 		// and re-add the comments at the beginning
 		$sql = implode("\n",$commentBlocks) . "\n". $sql . "\n";
@@ -672,15 +697,18 @@ 
 	 */
 	protected function isEngineEnabled($engine)
 	{
-		if(!is_string($engine)) return false;
+		if(!is_string($engine)) {
+		    return false;
+		}
 
 		$engine = strtoupper($engine);
 
 		$r = $this->query("SHOW ENGINES");
 
-		while ( $row = $this->fetchByAssoc($r) )
-			if ( strtoupper($row['Engine']) == $engine )
+		while ( $row = $this->fetchByAssoc($r) ) {
+					if ( strtoupper($row['Engine']) == $engine )
 				return ($row['Support']=='YES' || $row['Support']=='DEFAULT');
+		}
 
 		return false;
 	}
@@ -708,18 +736,22 @@ 
 	*/
 	public function createTableSQLParams($tablename, $fieldDefs, $indices, $engine = null)
 	{
-		if ( empty($engine) && isset($fieldDefs['engine']))
-			$engine = $fieldDefs['engine'];
-		if ( !$this->isEngineEnabled($engine) )
-			$engine = '';
+		if ( empty($engine) && isset($fieldDefs['engine'])) {
+					$engine = $fieldDefs['engine'];
+		}
+		if ( !$this->isEngineEnabled($engine) ) {
+					$engine = '';
+		}
 
 		$columns = $this->columnSQLRep($fieldDefs, false, $tablename);
-		if (empty($columns))
-			return false;
+		if (empty($columns)) {
+					return false;
+		}
 
 		$keys = $this->keysSQL($indices);
-		if (!empty($keys))
-			$keys = ",$keys";
+		if (!empty($keys)) {
+					$keys = ",$keys";
+		}
 
 		// cn: bug 9873 - module tables do not get created in utf8 with assoc collation
 		$collation = $this->getOption('collation');
@@ -728,8 +760,9 @@ 
 		}
 		$sql = "CREATE TABLE $tablename ($columns $keys) CHARACTER SET utf8 COLLATE $collation";
 
-		if (!empty($engine))
-			$sql.= " ENGINE=$engine";
+		if (!empty($engine)) {
+					$sql.= " ENGINE=$engine";
+		}
 
 		return $sql;
 	}
@@ -758,13 +791,15 @@ 
 
 		// bug 22338 - don't set a default value on text or blob fields
 		if ( isset($ref['default']) &&
-            in_array($ref['colBaseType'], array('text', 'blob', 'longtext', 'longblob')))
-			    $ref['default'] = '';
+            in_array($ref['colBaseType'], array('text', 'blob', 'longtext', 'longblob'))) {
+					    $ref['default'] = '';
+		}
 
-		if ( $return_as_array )
-			return $ref;
-		else
-			return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
+		if ( $return_as_array ) {
+					return $ref;
+		} else {
+					return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
+		}
 	}
 
 	/**
@@ -775,16 +810,18 @@ 
 		$columns = array();
 		if ($this->isFieldArray($fieldDefs)){
 			foreach ($fieldDefs as $def){
-				if ($action == 'drop')
-					$columns[] = $def['name'];
-				else
-					$columns[] = $this->oneColumnSQLRep($def, $ignoreRequired);
+				if ($action == 'drop') {
+									$columns[] = $def['name'];
+				} else {
+									$columns[] = $this->oneColumnSQLRep($def, $ignoreRequired);
+				}
 			}
 		} else {
-			if ($action == 'drop')
-				$columns[] = $fieldDefs['name'];
-		else
-			$columns[] = $this->oneColumnSQLRep($fieldDefs);
+			if ($action == 'drop') {
+							$columns[] = $fieldDefs['name'];
+			} else {
+					$columns[] = $this->oneColumnSQLRep($fieldDefs);
+		}
 		}
 
 		return "ALTER TABLE $tablename $action COLUMN ".implode(",$action column ", $columns);
@@ -806,23 +843,27 @@ 
 	{
 	// check if the passed value is an array of fields.
 	// if not, convert it into an array
-	if (!$this->isFieldArray($indices))
-		$indices[] = $indices;
+	if (!$this->isFieldArray($indices)) {
+			$indices[] = $indices;
+	}
 
 	$columns = array();
 	foreach ($indices as $index) {
-		if(!empty($index['db']) && $index['db'] != $this->dbType)
-			continue;
-		if (isset($index['source']) && $index['source'] != 'db')
-			continue;
+		if(!empty($index['db']) && $index['db'] != $this->dbType) {
+					continue;
+		}
+		if (isset($index['source']) && $index['source'] != 'db') {
+					continue;
+		}
 
 		$type = $index['type'];
 		$name = $index['name'];
 
-		if (is_array($index['fields']))
-			$fields = implode(", ", $index['fields']);
-		else
-			$fields = $index['fields'];
+		if (is_array($index['fields'])) {
+					$fields = implode(", ", $index['fields']);
+		} else {
+					$fields = $index['fields'];
+		}
 
 		switch ($type) {
 		case 'unique':
@@ -841,16 +882,18 @@ 
 				* that this can easily be fixed by referring to db dictionary
 				* to find the correct primary field name
 				*/
-			if ( $alter_table )
-				$columns[] = " INDEX $name ($fields)";
-			else
-				$columns[] = " KEY $name ($fields)";
+			if ( $alter_table ) {
+							$columns[] = " INDEX $name ($fields)";
+			} else {
+							$columns[] = " KEY $name ($fields)";
+			}
 			break;
 		case 'fulltext':
-			if ($this->full_text_indexing_installed())
-				$columns[] = " FULLTEXT ($fields)";
-			else
-				$GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:',$name);
+			if ($this->full_text_indexing_installed()) {
+							$columns[] = " FULLTEXT ($fields)";
+			} else {
+							$GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:',$name);
+			}
 			break;
 		}
 	}
@@ -892,8 +935,9 @@ 
 	{
 		$result = $this->query("SHOW TABLE STATUS LIKE '$table'");
 		$row = $this->fetchByAssoc($result);
-		if (!empty($row['Auto_increment']))
-			return $row['Auto_increment'];
+		if (!empty($row['Auto_increment'])) {
+					return $row['Auto_increment'];
+		}
 
 		return "";
 	}
@@ -911,8 +955,7 @@ 
 			$index_type='index';
 			if ($row['Key_name'] =='PRIMARY') {
 				$index_type='primary';
-			}
-			elseif ( $row['Non_unique'] == '0' ) {
+			} elseif ( $row['Non_unique'] == '0' ) {
 				$index_type='unique';
 			}
 			$name = strtolower($row['Key_name']);
@@ -938,29 +981,33 @@ 
 		case 'index':
 		case 'alternate_key':
 		case 'clustered':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP INDEX {$name} ";
-			else
-				$sql = "ALTER TABLE {$table} ADD INDEX {$name} ({$fields})";
+			if ($drop) {
+							$sql = "ALTER TABLE {$table} DROP INDEX {$name} ";
+			} else {
+							$sql = "ALTER TABLE {$table} ADD INDEX {$name} ({$fields})";
+			}
 			break;
 		// constraints as indices
 		case 'unique':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP INDEX $name";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT UNIQUE {$name} ({$fields})";
+			if ($drop) {
+							$sql = "ALTER TABLE {$table} DROP INDEX $name";
+			} else {
+							$sql = "ALTER TABLE {$table} ADD CONSTRAINT UNIQUE {$name} ({$fields})";
+			}
 			break;
 		case 'primary':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP PRIMARY KEY";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT PRIMARY KEY ({$fields})";
+			if ($drop) {
+							$sql = "ALTER TABLE {$table} DROP PRIMARY KEY";
+			} else {
+							$sql = "ALTER TABLE {$table} ADD CONSTRAINT PRIMARY KEY ({$fields})";
+			}
 			break;
 		case 'foreign':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT FOREIGN KEY {$name} ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignField']})";
+			if ($drop) {
+							$sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
+			} else {
+							$sql = "ALTER TABLE {$table} ADD CONSTRAINT FOREIGN KEY {$name} ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignField']})";
+			}
 			break;
 		}
 		return $sql;
@@ -1003,22 +1050,30 @@ 
 			($fieldDef['dbType'] == 'text'
 				|| $fieldDef['dbType'] == 'blob'
 				|| $fieldDef['dbType'] == 'longtext'
-				|| $fieldDef['dbType'] == 'longblob' ))
-			unset($fieldDef['default']);
-		if ($fieldDef['dbType'] == 'uint')
-			$fieldDef['len'] = '10';
-		if ($fieldDef['dbType'] == 'ulong')
-			$fieldDef['len'] = '20';
-		if ($fieldDef['dbType'] == 'bool')
-			$fieldDef['type'] = 'tinyint';
-		if ($fieldDef['dbType'] == 'bool' && empty($fieldDef['default']) )
-			$fieldDef['default'] = '0';
-		if (($fieldDef['dbType'] == 'varchar' || $fieldDef['dbType'] == 'enum') && empty($fieldDef['len']) )
-			$fieldDef['len'] = '255';
-		if ($fieldDef['dbType'] == 'uint')
-			$fieldDef['len'] = '10';
-		if ($fieldDef['dbType'] == 'int' && empty($fieldDef['len']) )
-			$fieldDef['len'] = '11';
+				|| $fieldDef['dbType'] == 'longblob' )) {
+					unset($fieldDef['default']);
+		}
+		if ($fieldDef['dbType'] == 'uint') {
+					$fieldDef['len'] = '10';
+		}
+		if ($fieldDef['dbType'] == 'ulong') {
+					$fieldDef['len'] = '20';
+		}
+		if ($fieldDef['dbType'] == 'bool') {
+					$fieldDef['type'] = 'tinyint';
+		}
+		if ($fieldDef['dbType'] == 'bool' && empty($fieldDef['default']) ) {
+					$fieldDef['default'] = '0';
+		}
+		if (($fieldDef['dbType'] == 'varchar' || $fieldDef['dbType'] == 'enum') && empty($fieldDef['len']) ) {
+					$fieldDef['len'] = '255';
+		}
+		if ($fieldDef['dbType'] == 'uint') {
+					$fieldDef['len'] = '10';
+		}
+		if ($fieldDef['dbType'] == 'int' && empty($fieldDef['len']) ) {
+					$fieldDef['len'] = '11';
+		}
 
 		if($fieldDef['dbType'] == 'decimal') {
 			if(isset($fieldDef['len'])) {
@@ -1058,8 +1113,9 @@ 
 		}
 		if (!empty($sql)) {
             $sql = "ALTER TABLE $tablename " . join(",", $sql) . ";";
-			if($execute)
-				$this->query($sql);
+			if($execute) {
+							$this->query($sql);
+			}
 		} else {
 			$sql = '';
 		}

include/database/MysqliManager.php

Braces +34 added lines, -19 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -135,8 +137,9 @@ 
 		$result = $suppress?@mysqli_query($this->database,$sql):mysqli_query($this->database,$sql);
 		$md5 = md5($sql);
 
-		if (empty($queryMD5[$md5]))
-			$queryMD5[$md5] = true;
+		if (empty($queryMD5[$md5])) {
+					$queryMD5[$md5] = true;
+		}
 
 		$this->query_time = microtime(true) - $this->query_time;
 		$GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
@@ -154,8 +157,9 @@ 
 		*/
 
 
-		if($keepResult)
-			$this->lastResult = $result;
+		if($keepResult) {
+					$this->lastResult = $result;
+		}
 		$this->checkError($msg.' Query Failed: ' . $sql, $dieOnError);
 
 		return $result;
@@ -208,8 +212,9 @@ 
 	 */
 	protected function freeDbResult($dbResult)
 	{
-		if(!empty($dbResult))
-			mysqli_free_result($dbResult);
+		if(!empty($dbResult)) {
+					mysqli_free_result($dbResult);
+		}
 	}
 
 	/**
@@ -219,17 +224,20 @@ 
 	{
 		$field_array = array();
 
-		if (!isset($result) || empty($result))
-			return 0;
+		if (!isset($result) || empty($result)) {
+					return 0;
+		}
 
 		$i = 0;
 		while ($i < mysqli_num_fields($result)) {
 			$meta = mysqli_fetch_field_direct($result, $i);
-			if (!$meta)
-				return 0;
+			if (!$meta) {
+							return 0;
+			}
 
-			if($make_lower_case == true)
-				$meta->name = strtolower($meta->name);
+			if($make_lower_case == true) {
+							$meta->name = strtolower($meta->name);
+			}
 
 			$field_array[] = $meta->name;
 
@@ -244,10 +252,15 @@ 
 	 */
 	public function fetchRow($result)
 	{
-		if (empty($result))	return false;
+		if (empty($result)) {
+		    return false;
+		}
 
 		$row = mysqli_fetch_assoc($result);
-		if($row == null) $row = false; //Make sure MySQLi driver results are consistent with other database drivers
+		if($row == null) {
+		    $row = false;
+		}
+		//Make sure MySQLi driver results are consistent with other database drivers
 		return $row;
 	}
 
@@ -266,8 +279,9 @@ 
 	{
 		global $sugar_config;
 
-		if (is_null($configOptions))
-			$configOptions = $sugar_config['dbconfig'];
+		if (is_null($configOptions)) {
+					$configOptions = $sugar_config['dbconfig'];
+		}
 
 		if(!isset($this->database)) {
 
@@ -318,8 +332,9 @@ 
 		}
 	    mysqli_query($this->database,$names);
 
-		if($this->checkError('Could Not Connect', $dieOnError))
-			$GLOBALS['log']->info("connected to db");
+		if($this->checkError('Could Not Connect', $dieOnError)) {
+					$GLOBALS['log']->info("connected to db");
+		}
 
 		$this->connectOptions = $configOptions;
 		return true;

Indentation +252 added lines, -252 removed lines

@@ -98,51 +98,51 @@ 
  */
 class MysqliManager extends MysqlManager
 {
-	/**
-	 * @see DBManager::$dbType
-	 */
-	public $dbType = 'mysql';
-	public $variant = 'mysqli';
-	public $priority = 10;
-	public $label = 'LBL_MYSQLI';
-
-	/**
-	 * @see DBManager::$backendFunctions
-	 */
-	protected $backendFunctions = array(
-		'free_result'        => 'mysqli_free_result',
-		'close'              => 'mysqli_close',
-		'row_count'          => 'mysqli_num_rows',
-		'affected_row_count' => 'mysqli_affected_rows',
-		);
-
-	/**
-	 * @see MysqlManager::query()
-	 */
-	public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
-	{
-		if(is_array($sql)) {
-			return $this->queryArray($sql, $dieOnError, $msg, $suppress);
+    /**
+     * @see DBManager::$dbType
+     */
+    public $dbType = 'mysql';
+    public $variant = 'mysqli';
+    public $priority = 10;
+    public $label = 'LBL_MYSQLI';
+
+    /**
+     * @see DBManager::$backendFunctions
+     */
+    protected $backendFunctions = array(
+        'free_result'        => 'mysqli_free_result',
+        'close'              => 'mysqli_close',
+        'row_count'          => 'mysqli_num_rows',
+        'affected_row_count' => 'mysqli_affected_rows',
+        );
+
+    /**
+     * @see MysqlManager::query()
+     */
+    public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
+    {
+        if(is_array($sql)) {
+            return $this->queryArray($sql, $dieOnError, $msg, $suppress);
         }
 
-		static $queryMD5 = array();
+        static $queryMD5 = array();
 
-		parent::countQuery($sql);
-		$GLOBALS['log']->info('Query:' . $sql);
-		$this->checkConnection();
-		$this->query_time = microtime(true);
-		$this->lastsql = $sql;
-		$result = $suppress?@mysqli_query($this->database,$sql):mysqli_query($this->database,$sql);
-		$md5 = md5($sql);
+        parent::countQuery($sql);
+        $GLOBALS['log']->info('Query:' . $sql);
+        $this->checkConnection();
+        $this->query_time = microtime(true);
+        $this->lastsql = $sql;
+        $result = $suppress?@mysqli_query($this->database,$sql):mysqli_query($this->database,$sql);
+        $md5 = md5($sql);
 
-		if (empty($queryMD5[$md5]))
-			$queryMD5[$md5] = true;
+        if (empty($queryMD5[$md5]))
+            $queryMD5[$md5] = true;
 
-		$this->query_time = microtime(true) - $this->query_time;
-		$GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
+        $this->query_time = microtime(true) - $this->query_time;
+        $GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
 
-		// This is some heavy duty debugging, leave commented out unless you need this:
-		/*
+        // This is some heavy duty debugging, leave commented out unless you need this:
+        /*
 		$bt = debug_backtrace();
 		for ( $i = count($bt) ; $i-- ; $i > 0 ) {
 			if ( strpos('MysqliManager.php',$bt[$i]['file']) === false ) {
@@ -154,228 +154,228 @@ 
 		*/
 
 
-		if($keepResult)
-			$this->lastResult = $result;
-		$this->checkError($msg.' Query Failed: ' . $sql, $dieOnError);
-
-		return $result;
-	}
-
-	/**
-	 * Returns the number of rows affected by the last query
-	 *
-	 * @return int
-	 */
-	public function getAffectedRowCount($result)
-	{
-		return mysqli_affected_rows($this->getDatabase());
-	}
-
-	/**
-	 * Returns the number of rows returned by the result
-	 *
-	 * This function can't be reliably implemented on most DB, do not use it.
-	 * @abstract
-	 * @deprecated
-	 * @param  resource $result
-	 * @return int
-	 */
-	public function getRowCount($result)
-	{
-	    return mysqli_num_rows($result);
-	}
+        if($keepResult)
+            $this->lastResult = $result;
+        $this->checkError($msg.' Query Failed: ' . $sql, $dieOnError);
 
+        return $result;
+    }
 
     /**
-	 * Disconnects from the database
-	 *
-	 * Also handles any cleanup needed
-	 */
-	public function disconnect()
-	{
-		if(isset($GLOBALS['log']) && !is_null($GLOBALS['log'])) {
-			$GLOBALS['log']->debug('Calling MySQLi::disconnect()');
-		}
-		if(!empty($this->database)){
-			$this->freeResult();
-			mysqli_close($this->database);
-			$this->database = null;
-		}
-	}
-
-	/**
-	 * @see DBManager::freeDbResult()
-	 */
-	protected function freeDbResult($dbResult)
-	{
-		if(!empty($dbResult))
-			mysqli_free_result($dbResult);
-	}
-
-	/**
-	 * @see DBManager::getFieldsArray()
-	 */
-	public function getFieldsArray($result, $make_lower_case = false)
-	{
-		$field_array = array();
-
-		if (!isset($result) || empty($result))
-			return 0;
-
-		$i = 0;
-		while ($i < mysqli_num_fields($result)) {
-			$meta = mysqli_fetch_field_direct($result, $i);
-			if (!$meta)
-				return 0;
-
-			if($make_lower_case == true)
-				$meta->name = strtolower($meta->name);
-
-			$field_array[] = $meta->name;
-
-			$i++;
-		}
+     * Returns the number of rows affected by the last query
+     *
+     * @return int
+     */
+    public function getAffectedRowCount($result)
+    {
+        return mysqli_affected_rows($this->getDatabase());
+    }
+
+    /**
+     * Returns the number of rows returned by the result
+     *
+     * This function can't be reliably implemented on most DB, do not use it.
+     * @abstract
+     * @deprecated
+     * @param  resource $result
+     * @return int
+     */
+    public function getRowCount($result)
+    {
+        return mysqli_num_rows($result);
+    }
+
+
+    /**
+     * Disconnects from the database
+     *
+     * Also handles any cleanup needed
+     */
+    public function disconnect()
+    {
+        if(isset($GLOBALS['log']) && !is_null($GLOBALS['log'])) {
+            $GLOBALS['log']->debug('Calling MySQLi::disconnect()');
+        }
+        if(!empty($this->database)){
+            $this->freeResult();
+            mysqli_close($this->database);
+            $this->database = null;
+        }
+    }
+
+    /**
+     * @see DBManager::freeDbResult()
+     */
+    protected function freeDbResult($dbResult)
+    {
+        if(!empty($dbResult))
+            mysqli_free_result($dbResult);
+    }
+
+    /**
+     * @see DBManager::getFieldsArray()
+     */
+    public function getFieldsArray($result, $make_lower_case = false)
+    {
+        $field_array = array();
+
+        if (!isset($result) || empty($result))
+            return 0;
+
+        $i = 0;
+        while ($i < mysqli_num_fields($result)) {
+            $meta = mysqli_fetch_field_direct($result, $i);
+            if (!$meta)
+                return 0;
+
+            if($make_lower_case == true)
+                $meta->name = strtolower($meta->name);
+
+            $field_array[] = $meta->name;
+
+            $i++;
+        }
+
+        return $field_array;
+    }
+
+    /**
+     * @see DBManager::fetchRow()
+     */
+    public function fetchRow($result)
+    {
+        if (empty($result))	return false;
+
+        $row = mysqli_fetch_assoc($result);
+        if($row == null) $row = false; //Make sure MySQLi driver results are consistent with other database drivers
+        return $row;
+    }
 
-		return $field_array;
-	}
-
-	/**
-	 * @see DBManager::fetchRow()
-	 */
-	public function fetchRow($result)
-	{
-		if (empty($result))	return false;
-
-		$row = mysqli_fetch_assoc($result);
-		if($row == null) $row = false; //Make sure MySQLi driver results are consistent with other database drivers
-		return $row;
-	}
-
-	/**
-	 * @see DBManager::quote()
-	 */
-	public function quote($string)
-	{
-		return mysqli_real_escape_string($this->getDatabase(),$this->quoteInternal($string));
-	}
-
-	/**
-	 * @see DBManager::connect()
-	 */
-	public function connect(array $configOptions = null, $dieOnError = false)
-	{
-		global $sugar_config;
-
-		if (is_null($configOptions))
-			$configOptions = $sugar_config['dbconfig'];
-
-		if(!isset($this->database)) {
-
-			//mysqli connector has a separate parameter for port.. We need to separate it out from the host name
-			$dbhost=$configOptions['db_host_name'];
+    /**
+     * @see DBManager::quote()
+     */
+    public function quote($string)
+    {
+        return mysqli_real_escape_string($this->getDatabase(),$this->quoteInternal($string));
+    }
+
+    /**
+     * @see DBManager::connect()
+     */
+    public function connect(array $configOptions = null, $dieOnError = false)
+    {
+        global $sugar_config;
+
+        if (is_null($configOptions))
+            $configOptions = $sugar_config['dbconfig'];
+
+        if(!isset($this->database)) {
+
+            //mysqli connector has a separate parameter for port.. We need to separate it out from the host name
+            $dbhost=$configOptions['db_host_name'];
             $dbport=isset($configOptions['db_port']) ? ($configOptions['db_port'] == '' ? null : $configOptions['db_port']) : null;
 			
-			$pos=strpos($configOptions['db_host_name'],':');
-			if ($pos !== false) {
-				$dbhost=substr($configOptions['db_host_name'],0,$pos);
-				$dbport=substr($configOptions['db_host_name'],$pos+1);
-			}
-
-			$this->database = @mysqli_connect($dbhost,$configOptions['db_user_name'],$configOptions['db_password'],isset($configOptions['db_name'])?$configOptions['db_name']:'',$dbport);
-			if(empty($this->database)) {
-				$GLOBALS['log']->fatal("Could not connect to DB server ".$dbhost." as ".$configOptions['db_user_name'].". port " .$dbport . ": " . mysqli_connect_error());
-				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.");
-					}
-				} else {
-					return false;
-				}
-			}
-		}
+            $pos=strpos($configOptions['db_host_name'],':');
+            if ($pos !== false) {
+                $dbhost=substr($configOptions['db_host_name'],0,$pos);
+                $dbport=substr($configOptions['db_host_name'],$pos+1);
+            }
+
+            $this->database = @mysqli_connect($dbhost,$configOptions['db_user_name'],$configOptions['db_password'],isset($configOptions['db_name'])?$configOptions['db_name']:'',$dbport);
+            if(empty($this->database)) {
+                $GLOBALS['log']->fatal("Could not connect to DB server ".$dbhost." as ".$configOptions['db_user_name'].". port " .$dbport . ": " . mysqli_connect_error());
+                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.");
+                    }
+                } else {
+                    return false;
+                }
+            }
+        }
 
-		if(!empty($configOptions['db_name']) && !@mysqli_select_db($this->database,$configOptions['db_name'])) {
-			$GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}: " . mysqli_connect_error());
-			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.");
-					}
-			} else {
-				return false;
-			}
-	    }
+        if(!empty($configOptions['db_name']) && !@mysqli_select_db($this->database,$configOptions['db_name'])) {
+            $GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}: " . mysqli_connect_error());
+            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.");
+                    }
+            } else {
+                return false;
+            }
+        }
 
-		// cn: using direct calls to prevent this from spamming the Logs
+        // cn: using direct calls to prevent this from spamming the Logs
 	    
-	    $collation = $this->getOption('collation');
-	    if(!empty($collation)) {
-	    	$names = "SET NAMES 'utf8' COLLATE '$collation'";
-	    	mysqli_query($this->database,$names);
-		}
-	    mysqli_set_charset ($this->database , "utf8" );
-
-		if($this->checkError('Could Not Connect', $dieOnError))
-			$GLOBALS['log']->info("connected to db");
-
-		$this->connectOptions = $configOptions;
-		return true;
-	}
-
-	/**
-	 * (non-PHPdoc)
-	 * @see MysqlManager::lastDbError()
-	 */
-	public function lastDbError()
-	{
-		if($this->database) {
-		    if(mysqli_errno($this->database)) {
-			    return "MySQL error ".mysqli_errno($this->database).": ".mysqli_error($this->database);
-		    }
-		} else {
-			$err =  mysqli_connect_error();
-			if($err) {
-			    return $err;
-			}
-		}
+        $collation = $this->getOption('collation');
+        if(!empty($collation)) {
+            $names = "SET NAMES 'utf8' COLLATE '$collation'";
+            mysqli_query($this->database,$names);
+        }
+        mysqli_set_charset ($this->database , "utf8" );
 
-		return false;
-	}
+        if($this->checkError('Could Not Connect', $dieOnError))
+            $GLOBALS['log']->info("connected to db");
 
-	public function getDbInfo()
-	{
-		$charsets = $this->getCharsetInfo();
-		$charset_str = array();
-		foreach($charsets as $name => $value) {
-			$charset_str[] = "$name = $value";
-		}
-		return array(
-			"MySQLi Version" => @mysqli_get_client_info(),
-			"MySQLi Host Info" => @mysqli_get_host_info($this->database),
-			"MySQLi Server Info" => @mysqli_get_server_info($this->database),
-			"MySQLi Client Encoding" =>  @mysqli_client_encoding($this->database),
-			"MySQL Character Set Settings" => join(", ", $charset_str),
-		);
-	}
-
-	/**
-	 * Select database
-	 * @param string $dbname
-	 */
-	protected function selectDb($dbname)
-	{
-		return mysqli_select_db($this->getDatabase(), $dbname);
-	}
-
-	/**
-	 * Check if this driver can be used
-	 * @return bool
-	 */
-	public function valid()
-	{
-		return function_exists("mysqli_connect") && empty($GLOBALS['sugar_config']['mysqli_disabled']);
-	}
+        $this->connectOptions = $configOptions;
+        return true;
+    }
+
+    /**
+     * (non-PHPdoc)
+     * @see MysqlManager::lastDbError()
+     */
+    public function lastDbError()
+    {
+        if($this->database) {
+            if(mysqli_errno($this->database)) {
+                return "MySQL error ".mysqli_errno($this->database).": ".mysqli_error($this->database);
+            }
+        } else {
+            $err =  mysqli_connect_error();
+            if($err) {
+                return $err;
+            }
+        }
+
+        return false;
+    }
+
+    public function getDbInfo()
+    {
+        $charsets = $this->getCharsetInfo();
+        $charset_str = array();
+        foreach($charsets as $name => $value) {
+            $charset_str[] = "$name = $value";
+        }
+        return array(
+            "MySQLi Version" => @mysqli_get_client_info(),
+            "MySQLi Host Info" => @mysqli_get_host_info($this->database),
+            "MySQLi Server Info" => @mysqli_get_server_info($this->database),
+            "MySQLi Client Encoding" =>  @mysqli_client_encoding($this->database),
+            "MySQL Character Set Settings" => join(", ", $charset_str),
+        );
+    }
+
+    /**
+     * Select database
+     * @param string $dbname
+     */
+    protected function selectDb($dbname)
+    {
+        return mysqli_select_db($this->getDatabase(), $dbname);
+    }
+
+    /**
+     * Check if this driver can be used
+     * @return bool
+     */
+    public function valid()
+    {
+        return function_exists("mysqli_connect") && empty($GLOBALS['sugar_config']['mysqli_disabled']);
+    }
 }

Spacing +36 added lines, -36 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.
@@ -121,18 +121,18 @@ 
 	 */
 	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);
         }
 
 		static $queryMD5 = array();
 
 		parent::countQuery($sql);
-		$GLOBALS['log']->info('Query:' . $sql);
+		$GLOBALS['log']->info('Query:'.$sql);
 		$this->checkConnection();
 		$this->query_time = microtime(true);
 		$this->lastsql = $sql;
-		$result = $suppress?@mysqli_query($this->database,$sql):mysqli_query($this->database,$sql);
+		$result = $suppress ? @mysqli_query($this->database, $sql) : mysqli_query($this->database, $sql);
 		$md5 = md5($sql);
 
 		if (empty($queryMD5[$md5]))
@@ -154,9 +154,9 @@ 
 		*/
 
 
-		if($keepResult)
+		if ($keepResult)
 			$this->lastResult = $result;
-		$this->checkError($msg.' Query Failed: ' . $sql, $dieOnError);
+		$this->checkError($msg.' Query Failed: '.$sql, $dieOnError);
 
 		return $result;
 	}
@@ -193,10 +193,10 @@ 
 	 */
 	public function disconnect()
 	{
-		if(isset($GLOBALS['log']) && !is_null($GLOBALS['log'])) {
+		if (isset($GLOBALS['log']) && !is_null($GLOBALS['log'])) {
 			$GLOBALS['log']->debug('Calling MySQLi::disconnect()');
 		}
-		if(!empty($this->database)){
+		if (!empty($this->database)) {
 			$this->freeResult();
 			mysqli_close($this->database);
 			$this->database = null;
@@ -208,7 +208,7 @@ 
 	 */
 	protected function freeDbResult($dbResult)
 	{
-		if(!empty($dbResult))
+		if (!empty($dbResult))
 			mysqli_free_result($dbResult);
 	}
 
@@ -228,7 +228,7 @@ 
 			if (!$meta)
 				return 0;
 
-			if($make_lower_case == true)
+			if ($make_lower_case == true)
 				$meta->name = strtolower($meta->name);
 
 			$field_array[] = $meta->name;
@@ -247,7 +247,7 @@ 
 		if (empty($result))	return false;
 
 		$row = mysqli_fetch_assoc($result);
-		if($row == null) $row = false; //Make sure MySQLi driver results are consistent with other database drivers
+		if ($row == null) $row = false; //Make sure MySQLi driver results are consistent with other database drivers
 		return $row;
 	}
 
@@ -256,7 +256,7 @@ 
 	 */
 	public function quote($string)
 	{
-		return mysqli_real_escape_string($this->getDatabase(),$this->quoteInternal($string));
+		return mysqli_real_escape_string($this->getDatabase(), $this->quoteInternal($string));
 	}
 
 	/**
@@ -269,23 +269,23 @@ 
 		if (is_null($configOptions))
 			$configOptions = $sugar_config['dbconfig'];
 
-		if(!isset($this->database)) {
+		if (!isset($this->database)) {
 
 			//mysqli connector has a separate parameter for port.. We need to separate it out from the host name
-			$dbhost=$configOptions['db_host_name'];
-            $dbport=isset($configOptions['db_port']) ? ($configOptions['db_port'] == '' ? null : $configOptions['db_port']) : null;
+			$dbhost = $configOptions['db_host_name'];
+            $dbport = isset($configOptions['db_port']) ? ($configOptions['db_port'] == '' ? null : $configOptions['db_port']) : null;
 			
-			$pos=strpos($configOptions['db_host_name'],':');
+			$pos = strpos($configOptions['db_host_name'], ':');
 			if ($pos !== false) {
-				$dbhost=substr($configOptions['db_host_name'],0,$pos);
-				$dbport=substr($configOptions['db_host_name'],$pos+1);
+				$dbhost = substr($configOptions['db_host_name'], 0, $pos);
+				$dbport = substr($configOptions['db_host_name'], $pos + 1);
 			}
 
-			$this->database = @mysqli_connect($dbhost,$configOptions['db_user_name'],$configOptions['db_password'],isset($configOptions['db_name'])?$configOptions['db_name']:'',$dbport);
-			if(empty($this->database)) {
-				$GLOBALS['log']->fatal("Could not connect to DB server ".$dbhost." as ".$configOptions['db_user_name'].". port " .$dbport . ": " . mysqli_connect_error());
-				if($dieOnError) {
-					if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
+			$this->database = @mysqli_connect($dbhost, $configOptions['db_user_name'], $configOptions['db_password'], isset($configOptions['db_name']) ? $configOptions['db_name'] : '', $dbport);
+			if (empty($this->database)) {
+				$GLOBALS['log']->fatal("Could not connect to DB server ".$dbhost." as ".$configOptions['db_user_name'].". port ".$dbport.": ".mysqli_connect_error());
+				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.");
@@ -296,10 +296,10 @@ 
 			}
 		}
 
-		if(!empty($configOptions['db_name']) && !@mysqli_select_db($this->database,$configOptions['db_name'])) {
-			$GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}: " . mysqli_connect_error());
-			if($dieOnError) {
-					if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
+		if (!empty($configOptions['db_name']) && !@mysqli_select_db($this->database, $configOptions['db_name'])) {
+			$GLOBALS['log']->fatal("Unable to select database {$configOptions['db_name']}: ".mysqli_connect_error());
+			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.");
@@ -312,13 +312,13 @@ 
 		// cn: using direct calls to prevent this from spamming the Logs
 	    
 	    $collation = $this->getOption('collation');
-	    if(!empty($collation)) {
+	    if (!empty($collation)) {
 	    	$names = "SET NAMES 'utf8' COLLATE '$collation'";
-	    	mysqli_query($this->database,$names);
+	    	mysqli_query($this->database, $names);
 		}
-	    mysqli_set_charset ($this->database , "utf8" );
+	    mysqli_set_charset($this->database, "utf8");
 
-		if($this->checkError('Could Not Connect', $dieOnError))
+		if ($this->checkError('Could Not Connect', $dieOnError))
 			$GLOBALS['log']->info("connected to db");
 
 		$this->connectOptions = $configOptions;
@@ -331,13 +331,13 @@ 
 	 */
 	public function lastDbError()
 	{
-		if($this->database) {
-		    if(mysqli_errno($this->database)) {
+		if ($this->database) {
+		    if (mysqli_errno($this->database)) {
 			    return "MySQL error ".mysqli_errno($this->database).": ".mysqli_error($this->database);
 		    }
 		} else {
-			$err =  mysqli_connect_error();
-			if($err) {
+			$err = mysqli_connect_error();
+			if ($err) {
 			    return $err;
 			}
 		}
@@ -349,7 +349,7 @@ 
 	{
 		$charsets = $this->getCharsetInfo();
 		$charset_str = array();
-		foreach($charsets as $name => $value) {
+		foreach ($charsets as $name => $value) {
 			$charset_str[] = "$name = $value";
 		}
 		return array(

include/database/DBManagerFactory.php

Indentation +11 added lines, -11 removed lines

@@ -80,7 +80,7 @@ 
                     }
                     break;
                 case "mssql":
-                  	if ( function_exists('sqlsrv_connect')
+                      if ( function_exists('sqlsrv_connect')
                                 && (empty($config['db_mssql_force_driver']) || $config['db_mssql_force_driver'] == 'sqlsrv' )) {
                         $my_db_manager = 'SqlsrvManager';
                     } elseif (self::isFreeTDS()
@@ -122,20 +122,20 @@ 
     }
 
     /**
-	 * Returns a reference to the DB object for instance $instanceName, or the default
+     * Returns a reference to the DB object for instance $instanceName, or the default
      * instance if one is not specified
      *
      * @param  string $instanceName optional, name of the instance
      * @return object DBManager instance
      */
-	public static function getInstance($instanceName = '')
+    public static function getInstance($instanceName = '')
     {
         global $sugar_config;
         static $count = 0, $old_count = 0;
 
         //fall back to the default instance name
         if(empty($sugar_config['db'][$instanceName])){
-        	$instanceName = '';
+            $instanceName = '';
         }
         if(!isset(self::$instances[$instanceName])){
             $config = $sugar_config['dbconfig'];
@@ -248,7 +248,7 @@ 
     /**
      * Check if we have freeTDS driver installed
      * Invoked when connected to mssql. checks if we have freetds version of mssql library.
-	 * the response is put into a global variable.
+     * the response is put into a global variable.
      * @return bool
      */
     public static function isFreeTDS()
@@ -256,14 +256,14 @@ 
         static $is_freetds = null;
 
         if($is_freetds === null) {
-    		ob_start();
-    		phpinfo(INFO_MODULES);
-    		$info=ob_get_contents();
-    		ob_end_clean();
+            ob_start();
+            phpinfo(INFO_MODULES);
+            $info=ob_get_contents();
+            ob_end_clean();
 
-    		$is_freetds = (strpos($info,'FreeTDS') !== false);
+            $is_freetds = (strpos($info,'FreeTDS') !== false);
         }
 
         return $is_freetds;
-     }
+        }
 }
\ No newline at end of file

Spacing +30 added lines, -30 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.
@@ -69,9 +69,9 @@ 
     {
         global $sugar_config;
 
-        if(empty($config['db_manager'])) {
+        if (empty($config['db_manager'])) {
             // standard types
-            switch($type) {
+            switch ($type) {
                 case "mysql":
                     if (empty($sugar_config['mysqli_disabled']) && function_exists('mysqli_connect')) {
                         $my_db_manager = 'MysqliManager';
@@ -80,11 +80,11 @@ 
                     }
                     break;
                 case "mssql":
-                  	if ( function_exists('sqlsrv_connect')
-                                && (empty($config['db_mssql_force_driver']) || $config['db_mssql_force_driver'] == 'sqlsrv' )) {
+                  	if (function_exists('sqlsrv_connect')
+                                && (empty($config['db_mssql_force_driver']) || $config['db_mssql_force_driver'] == 'sqlsrv')) {
                         $my_db_manager = 'SqlsrvManager';
                     } elseif (self::isFreeTDS()
-                                && (empty($config['db_mssql_force_driver']) || $config['db_mssql_force_driver'] == 'freetds' )) {
+                                && (empty($config['db_mssql_force_driver']) || $config['db_mssql_force_driver'] == 'freetds')) {
                         $my_db_manager = 'FreeTDSManager';
                     } else {
                         $my_db_manager = 'MssqlManager';
@@ -92,7 +92,7 @@ 
                     break;
                 default:
                     $my_db_manager = self::getManagerByType($type, false);
-                    if(empty($my_db_manager)) {
+                    if (empty($my_db_manager)) {
                         $GLOBALS['log']->fatal("unable to load DB manager for: $type");
                         sugar_die("Cannot load DB manager");
                     }
@@ -104,17 +104,17 @@ 
         // sanitize the name
         $my_db_manager = preg_replace("/[^A-Za-z0-9_-]/", "", $my_db_manager);
 
-        if(!empty($config['db_manager_class'])){
+        if (!empty($config['db_manager_class'])) {
             $my_db_manager = $config['db_manager_class'];
         } else {
-            if(file_exists("custom/include/database/{$my_db_manager}.php")) {
+            if (file_exists("custom/include/database/{$my_db_manager}.php")) {
                 require_once("custom/include/database/{$my_db_manager}.php");
             } else {
                 require_once("include/database/{$my_db_manager}.php");
             }
         }
 
-        if(class_exists($my_db_manager)) {
+        if (class_exists($my_db_manager)) {
             return new $my_db_manager();
         } else {
             return null;
@@ -134,14 +134,14 @@ 
         static $count = 0, $old_count = 0;
 
         //fall back to the default instance name
-        if(empty($sugar_config['db'][$instanceName])){
+        if (empty($sugar_config['db'][$instanceName])) {
         	$instanceName = '';
         }
-        if(!isset(self::$instances[$instanceName])){
+        if (!isset(self::$instances[$instanceName])) {
             $config = $sugar_config['dbconfig'];
             $count++;
                 self::$instances[$instanceName] = self::getTypeInstance($config['db_type'], $config);
-                if(!empty($sugar_config['dbconfigoption'])) {
+                if (!empty($sugar_config['dbconfigoption'])) {
                     self::$instances[$instanceName]->setOptions($sugar_config['dbconfigoption']);
                 }
                 self::$instances[$instanceName]->connect($config, true);
@@ -159,7 +159,7 @@ 
      */
     public static function disconnectAll()
     {
-        foreach(self::$instances as $instance) {
+        foreach (self::$instances as $instance) {
             $instance->disconnect();
         }
         self::$instances = array();
@@ -177,7 +177,7 @@ 
     public static function getManagerByType($type, $validate = true)
     {
         $drivers = self::getDbDrivers($validate);
-        if(!empty($drivers[$type])) {
+        if (!empty($drivers[$type])) {
             return get_class($drivers[$type]);
         }
         return false;
@@ -191,19 +191,19 @@ 
      */
     protected static function scanDriverDir($dir, &$drivers, $validate = true)
     {
-        if(!is_dir($dir)) return;
+        if (!is_dir($dir)) return;
         $scandir = opendir($dir);
-        if($scandir === false) return;
-        while(($name = readdir($scandir)) !== false) {
-            if(substr($name, -11) != "Manager.php") continue;
-            if($name == "DBManager.php") continue;
+        if ($scandir === false) return;
+        while (($name = readdir($scandir)) !== false) {
+            if (substr($name, -11) != "Manager.php") continue;
+            if ($name == "DBManager.php") continue;
             require_once("$dir/$name");
             $classname = substr($name, 0, -4);
-            if(!class_exists($classname)) continue;
+            if (!class_exists($classname)) continue;
             $driver = new $classname;
-            if(!$validate || $driver->valid()) {
-                if(empty($drivers[$driver->dbType])) {
-                    $drivers[$driver->dbType]  = array();
+            if (!$validate || $driver->valid()) {
+                if (empty($drivers[$driver->dbType])) {
+                    $drivers[$driver->dbType] = array();
                 }
                 $drivers[$driver->dbType][] = $driver;
             }
@@ -235,9 +235,9 @@ 
         self::scanDriverDir("custom/include/database", $drivers, $validate);
 
         $result = array();
-        foreach($drivers as $type => $tdrivers) {
-            if(empty($tdrivers)) continue;
-            if(count($tdrivers) > 1) {
+        foreach ($drivers as $type => $tdrivers) {
+            if (empty($tdrivers)) continue;
+            if (count($tdrivers) > 1) {
                 usort($tdrivers, array(__CLASS__, "_compareDrivers"));
             }
             $result[$type] = $tdrivers[0];
@@ -255,13 +255,13 @@ 
     {
         static $is_freetds = null;
 
-        if($is_freetds === null) {
+        if ($is_freetds === null) {
     		ob_start();
     		phpinfo(INFO_MODULES);
-    		$info=ob_get_contents();
+    		$info = ob_get_contents();
     		ob_end_clean();
 
-    		$is_freetds = (strpos($info,'FreeTDS') !== false);
+    		$is_freetds = (strpos($info, 'FreeTDS') !== false);
         }
 
         return $is_freetds;

Braces +21 added lines, -7 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -191,15 +193,25 @@ 
      */
     protected static function scanDriverDir($dir, &$drivers, $validate = true)
     {
-        if(!is_dir($dir)) return;
+        if(!is_dir($dir)) {
+            return;
+        }
         $scandir = opendir($dir);
-        if($scandir === false) return;
+        if($scandir === false) {
+            return;
+        }
         while(($name = readdir($scandir)) !== false) {
-            if(substr($name, -11) != "Manager.php") continue;
-            if($name == "DBManager.php") continue;
+            if(substr($name, -11) != "Manager.php") {
+                continue;
+            }
+            if($name == "DBManager.php") {
+                continue;
+            }
             require_once("$dir/$name");
             $classname = substr($name, 0, -4);
-            if(!class_exists($classname)) continue;
+            if(!class_exists($classname)) {
+                continue;
+            }
             $driver = new $classname;
             if(!$validate || $driver->valid()) {
                 if(empty($drivers[$driver->dbType])) {
@@ -236,7 +248,9 @@ 
 
         $result = array();
         foreach($drivers as $type => $tdrivers) {
-            if(empty($tdrivers)) continue;
+            if(empty($tdrivers)) {
+                continue;
+            }
             if(count($tdrivers) > 1) {
                 usort($tdrivers, array(__CLASS__, "_compareDrivers"));
             }

include/ListView/ListView.php

Indentation +194 added lines, -196 removed lines

@@ -236,8 +236,8 @@ 
  * @param unknown $html_varName
  * @desc INTERNAL FUNCTION handles the rows
  */
- function process_dynamic_listview_rows($data,$parent_data, $xtemplateSection, $html_varName, $subpanel_def)
- {
+    function process_dynamic_listview_rows($data,$parent_data, $xtemplateSection, $html_varName, $subpanel_def)
+    {
     global $subpanel_item_count;
     global $odd_bg;
     global $even_bg;
@@ -346,7 +346,7 @@ 
             $BG_COLOR =  $even_bg;
         }
         $oddRow = !$oddRow;
-		$button_contents = array();
+        $button_contents = array();
         $this->xTemplate->assign("ROW_COLOR", $ROW_COLOR);
         $this->xTemplate->assign("BG_COLOR", $BG_COLOR);
         $layout_manager = $this->getLayoutManager();
@@ -366,43 +366,43 @@ 
             $thepanel=$subpanel_def;
         }
 
-		/* BEGIN - SECURITY GROUPS */ 
+        /* BEGIN - SECURITY GROUPS */ 
 
-		//This check is costly doing it field by field in the below foreach
-		//instead pull up here and do once per record....
-		$aclaccess_is_owner = false;
-		$aclaccess_in_group = false;
+        //This check is costly doing it field by field in the below foreach
+        //instead pull up here and do once per record....
+        $aclaccess_is_owner = false;
+        $aclaccess_in_group = false;
 
-		global $current_user;
-		if(is_admin($current_user)) {
-			$aclaccess_is_owner = true;
-		} else {
-			$aclaccess_is_owner = $aItem->isOwner($current_user->id);
-		}
+        global $current_user;
+        if(is_admin($current_user)) {
+            $aclaccess_is_owner = true;
+        } else {
+            $aclaccess_is_owner = $aItem->isOwner($current_user->id);
+        }
 
-		require_once("modules/SecurityGroups/SecurityGroup.php");
-		$aclaccess_in_group = SecurityGroup::groupHasAccess($aItem->module_dir,$aItem->id);
+        require_once("modules/SecurityGroups/SecurityGroup.php");
+        $aclaccess_in_group = SecurityGroup::groupHasAccess($aItem->module_dir,$aItem->id);
         	
-    	/* END - SECURITY GROUPS */ 
+        /* END - SECURITY GROUPS */ 
     	
         //get data source name
         $linked_field=$thepanel->get_data_source_name();
         $linked_field_set=$thepanel->get_data_source_name(true);
         static $count;
         if(!isset($count))$count = 0;
-		/* BEGIN - SECURITY GROUPS */ 
-		/**
+        /* BEGIN - SECURITY GROUPS */ 
+        /**
         $field_acl['DetailView'] = $aItem->ACLAccess('DetailView');
         $field_acl['ListView'] = $aItem->ACLAccess('ListView');
         $field_acl['EditView'] = $aItem->ACLAccess('EditView');
         $field_acl['Delete'] = $aItem->ACLAccess('Delete');
-		*/
-		//pass is_owner, in_group...vars defined above
+         */
+        //pass is_owner, in_group...vars defined above
         $field_acl['DetailView'] = $aItem->ACLAccess('DetailView',$aclaccess_is_owner,$aclaccess_in_group);
         $field_acl['ListView'] = $aItem->ACLAccess('ListView',$aclaccess_is_owner,$aclaccess_in_group);
         $field_acl['EditView'] = $aItem->ACLAccess('EditView',$aclaccess_is_owner,$aclaccess_in_group);
         $field_acl['Delete'] = $aItem->ACLAccess('Delete',$aclaccess_is_owner,$aclaccess_in_group);
-		/* END - SECURITY GROUPS */ 
+        /* END - SECURITY GROUPS */ 
         foreach($thepanel->get_list_fields() as $field_name=>$list_field)
         {
             //add linked field attribute to the array.
@@ -469,7 +469,7 @@ 
                         // So we'll populate the field data with the pre-rendered display for the field
                         $list_field['fields'][$field_name] = $widget_contents;
                         if('full_name' == $field_name){//bug #32465
-                           $list_field['fields'][strtoupper($field_name)] = $widget_contents;
+                            $list_field['fields'][strtoupper($field_name)] = $widget_contents;
                         }
 
                         //vardef source is non db, assign the field name to varname for processing of column.
@@ -482,7 +482,7 @@ 
                         $widget_contents = $layout_manager->widgetDisplay($list_field);
                     }
 
-                 $count++;
+                    $count++;
                 $this->xTemplate->assign('CELL_COUNT', $count);
                 $this->xTemplate->assign('CLASS', "");
                 if ( empty($widget_contents) ) $widget_contents = ' ';
@@ -490,15 +490,15 @@ 
                 $this->xTemplate->parse($xtemplateSection.".row.cell");
                 } else {
                     // This handles the edit and remove buttons and icon widget
-                	if( isset($list_field['widget_class']) && $list_field['widget_class'] == "SubPanelIcon") {
-		                $count++;
-		                $widget_contents = $layout_manager->widgetDisplay($list_field);
-		                $this->xTemplate->assign('CELL_COUNT', $count);
-		                $this->xTemplate->assign('CLASS', "");
-		                if ( empty($widget_contents) ) $widget_contents = ' ';
-		                $this->xTemplate->assign('CELL', $widget_contents);
-		                $this->xTemplate->parse($xtemplateSection.".row.cell");
-                	} elseif (preg_match("/button/i", $list_field['name'])) {
+                    if( isset($list_field['widget_class']) && $list_field['widget_class'] == "SubPanelIcon") {
+                        $count++;
+                        $widget_contents = $layout_manager->widgetDisplay($list_field);
+                        $this->xTemplate->assign('CELL_COUNT', $count);
+                        $this->xTemplate->assign('CLASS', "");
+                        if ( empty($widget_contents) ) $widget_contents = ' ';
+                        $this->xTemplate->assign('CELL', $widget_contents);
+                        $this->xTemplate->parse($xtemplateSection.".row.cell");
+                    } elseif (preg_match("/button/i", $list_field['name'])) {
                         if ((($list_field['name'] === 'edit_button' && $field_acl['EditView']) || ($list_field['name'] === 'close_button' && $field_acl['EditView']) || ($list_field['name'] === 'remove_button' && $field_acl['Delete'])) && '' != ($_content = $layout_manager->widgetDisplay($list_field)) )
                         {
                             $button_contents[] = $_content;
@@ -508,15 +508,15 @@ 
                         {
                             $button_contents[] = '';
                         }
-                	} else {
-               			$count++;
-               			$this->xTemplate->assign('CLASS', "");
-               			$widget_contents = $layout_manager->widgetDisplay($list_field);
-		                $this->xTemplate->assign('CELL_COUNT', $count);
-		                if ( empty($widget_contents) ) $widget_contents = ' ';
-		                $this->xTemplate->assign('CELL', $widget_contents);
-		                $this->xTemplate->parse($xtemplateSection.".row.cell");
-                	}
+                    } else {
+                            $count++;
+                            $this->xTemplate->assign('CLASS', "");
+                            $widget_contents = $layout_manager->widgetDisplay($list_field);
+                        $this->xTemplate->assign('CELL_COUNT', $count);
+                        if ( empty($widget_contents) ) $widget_contents = ' ';
+                        $this->xTemplate->assign('CELL', $widget_contents);
+                        $this->xTemplate->parse($xtemplateSection.".row.cell");
+                    }
                 }
 
             }
@@ -579,7 +579,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function ListView() {
+    function ListView() {
 
 
     if(!$this->initialized) {
@@ -598,11 +598,11 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setRecordsPerPage($count) {
+    function setRecordsPerPage($count) {
     $this->records_per_page = $count;
 }
 /**sets the header title */
- function setHeaderTitle($value) {
+    function setHeaderTitle($value) {
     $this->header_title = $value;
 }
 /**sets the header text this is text that's appended to the header table and is usually used for the creation of buttons
@@ -610,7 +610,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setHeaderText($value) {
+    function setHeaderText($value) {
     $this->header_text = $value;
 }
 /**sets the path for the XTemplate HTML file to be used this is only needed to be set if you are allowing ListView to create the XTemplate
@@ -618,7 +618,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setXTemplatePath($value) {
+    function setXTemplatePath($value) {
     $this->xTemplatePath= $value;
 }
 
@@ -627,7 +627,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function initNewXTemplate($XTemplatePath, $modString, $imagePath = null) {
+    function initNewXTemplate($XTemplatePath, $modString, $imagePath = null) {
     $this->setXTemplatePath($XTemplatePath);
     if(isset($modString))
         $this->setModStrings($modString);
@@ -728,7 +728,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setQuery($where, $limit, $orderBy, $varName, $allowOrderByOveride=true) {
+    function setQuery($where, $limit, $orderBy, $varName, $allowOrderByOveride=true) {
     $this->query_where = $where;
     if($this->getSessionVariable("query", "where") != $where) {
         $this->query_where_has_changed = true;
@@ -757,7 +757,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setTheme($theme) {
+    function setTheme($theme) {
     $this->local_theme = $theme;
     if(isset($this->xTemplate))$this->xTemplate->assign("THEME", $this->local_theme);
 }
@@ -767,7 +767,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setAppStrings($app_strings) {
+    function setAppStrings($app_strings) {
     unset($this->local_app_strings);
     $this->local_app_strings = $app_strings;
     if(isset($this->xTemplate))$this->xTemplate->assign("APP", $this->local_app_strings);
@@ -778,7 +778,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setModStrings($mod_strings) {
+    function setModStrings($mod_strings) {
     unset($this->local_module_strings);
     $this->local_mod_strings = $mod_strings;
     if(isset($this->xTemplate))$this->xTemplate->assign("MOD", $this->local_mod_strings);
@@ -789,7 +789,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setImagePath($image_path) {
+    function setImagePath($image_path) {
     $this->local_image_path = $image_path;
     if(empty($this->local_image_path)) {
         $this->local_image_path = SugarThemeRegistry::get($this->local_theme)->getImagePath();
@@ -802,7 +802,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setCurrentModule($currentModule) {
+    function setCurrentModule($currentModule) {
     unset($this->local_current_module);
     $this->local_current_module = $currentModule;
     if(isset($this->xTemplate))$this->xTemplate->assign("MODULE_NAME", $this->local_current_module);
@@ -813,7 +813,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function createXTemplate() {
+    function createXTemplate() {
     if(!isset($this->xTemplate)) {
         if(isset($this->xTemplatePath)) {
 
@@ -834,7 +834,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setXTemplate($newXTemplate) {
+    function setXTemplate($newXTemplate) {
     $this->xTemplate = $newXTemplate;
 }
 
@@ -843,7 +843,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function getXTemplate() {
+    function getXTemplate() {
     return $this->xTemplate;
 }
 
@@ -852,7 +852,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function xTemplateAssign($name, $value) {
+    function xTemplateAssign($name, $value) {
 
         if(!isset($this->xTemplate)) {
             $this->createXTemplate();
@@ -866,15 +866,15 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function getOffset($localVarName) {
- 	if($this->query_where_has_changed || isset($GLOBALS['record_has_changed'])) {
- 		$this->setSessionVariable($localVarName,"offset", 0);
- 	}
-	$offset = $this->getSessionVariable($localVarName,"offset");
-	if(isset($offset)) {
-		return $offset;
-	}
-	return 0;
+    function getOffset($localVarName) {
+        if($this->query_where_has_changed || isset($GLOBALS['record_has_changed'])) {
+            $this->setSessionVariable($localVarName,"offset", 0);
+        }
+    $offset = $this->getSessionVariable($localVarName,"offset");
+    if(isset($offset)) {
+        return $offset;
+    }
+    return 0;
 }
 
 /**INTERNAL FUNCTION sets the offset in the session
@@ -882,7 +882,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setOffset($localVarName, $value) {
+    function setOffset($localVarName, $value) {
         $this->setSessionVariable($localVarName, "offset", $value);
 }
 
@@ -891,7 +891,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setSessionVariable($localVarName,$varName, $value) {
+    function setSessionVariable($localVarName,$varName, $value) {
     $_SESSION[$this->local_current_module."_".$localVarName."_".$varName] = $value;
 }
 
@@ -906,7 +906,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function getSessionVariable($localVarName,$varName) {
+    function getSessionVariable($localVarName,$varName) {
     //Set any variables pass in through request first
     if(isset($_REQUEST[$this->getSessionVariableName($localVarName, $varName)])) {
         $this->setSessionVariable($localVarName,$varName,$_REQUEST[$this->getSessionVariableName($localVarName, $varName)]);
@@ -941,10 +941,10 @@ 
     function calculateSortOrder($sortOrderList)
     {
         $priority_map = array(
-          'request',
-          'session',
-          'subpaneldefs',
-          'default',
+            'request',
+            'session',
+            'subpaneldefs',
+            'default',
         );
 
         foreach($priority_map as $p) {
@@ -960,33 +960,31 @@ 
 
 
     /**
-
-    * @return void
-    * @param unknown $localVarName
-    * @param unknown $varName
-    * @desc INTERNAL FUNCTION returns the session/query variable name
-    * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
-    * All Rights Reserved.
-    * Contributor(s): ______________________________________..
-    */
+     * @return void
+     * @param unknown $localVarName
+     * @param unknown $varName
+     * @desc INTERNAL FUNCTION returns the session/query variable name
+     * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
+     * All Rights Reserved.
+     * Contributor(s): ______________________________________..
+     */
     function getSessionVariableName($localVarName,$varName) {
         return $this->local_current_module."_".$localVarName."_".$varName;
     }
 
     /**
-
-    * @return void
-    * @param unknown $seed
-    * @param unknown $xTemplateSection
-    * @param unknown $html_varName
-    * @desc INTERNAL FUNCTION Handles List Views using seeds that extend SugarBean
+     * @return void
+     * @param unknown $seed
+     * @param unknown $xTemplateSection
+     * @param unknown $html_varName
+     * @desc INTERNAL FUNCTION Handles List Views using seeds that extend SugarBean
         $XTemplateSection is the section in the XTemplate file that should be parsed usually main
         $html_VarName is the variable name used in the XTemplateFile e.g. TASK
         $seed is a seed that extends SugarBean
-        * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
-        * All Rights Reserved..
-        * Contributor(s): ______________________________________..
-    */
+     * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
+     * All Rights Reserved..
+     * Contributor(s): ______________________________________..
+     */
     function processSugarBean($xtemplateSection, $html_varName, $seed) {
         global $list_view_row_count;
 
@@ -1035,15 +1033,15 @@ 
 
     function processUnionBeans($sugarbean, $subpanel_def, $html_var = 'CELL') {
 
-		$last_detailview_record = $this->getSessionVariable("detailview", "record");
-		if(!empty($last_detailview_record) && $last_detailview_record != $sugarbean->id){
-			$GLOBALS['record_has_changed'] = true;
-		}
-		$this->setSessionVariable("detailview", "record", $sugarbean->id);
+        $last_detailview_record = $this->getSessionVariable("detailview", "record");
+        if(!empty($last_detailview_record) && $last_detailview_record != $sugarbean->id){
+            $GLOBALS['record_has_changed'] = true;
+        }
+        $this->setSessionVariable("detailview", "record", $sugarbean->id);
 
-		$current_offset = $this->getOffset($html_var);
-		$module = isset($_REQUEST['module']) ? $_REQUEST['module'] : '';
-		$response = array();
+        $current_offset = $this->getOffset($html_var);
+        $module = isset($_REQUEST['module']) ? $_REQUEST['module'] : '';
+        $response = array();
 
         // choose sort order
         $sort_order = array();
@@ -1088,11 +1086,11 @@ 
         $_SESSION['last_sub' .$this->subpanel_module. '_order'] = $this->sort_order;
         $_SESSION['last_sub' .$this->subpanel_module. '_url'] = $this->getBaseURL($html_var);
 
-		// Bug 8139 - Correct Subpanel sorting on 'name', when subpanel sorting default is 'last_name, first_name'
-		if (($this->sortby == 'name' || $this->sortby == 'last_name') &&
-			str_replace(' ', '', trim($subpanel_def->_instance_properties['sort_by'])) == 'last_name,first_name') {
-			$this->sortby = 'last_name '.$this->sort_order.', first_name ';
-		}
+        // Bug 8139 - Correct Subpanel sorting on 'name', when subpanel sorting default is 'last_name, first_name'
+        if (($this->sortby == 'name' || $this->sortby == 'last_name') &&
+            str_replace(' ', '', trim($subpanel_def->_instance_properties['sort_by'])) == 'last_name,first_name') {
+            $this->sortby = 'last_name '.$this->sort_order.', first_name ';
+        }
 
         if(!empty($this->response)){
             $response =& $this->response;
@@ -1168,15 +1166,15 @@ 
             return $baseurl;
     }
     /**
-    * @return void
-    * @param unknown $data
-    * @param unknown $xTemplateSection
-    * @param unknown $html_varName
-    * @desc INTERNAL FUNCTION process the List Navigation
-    * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
-    * All Rights Reserved.
-    * Contributor(s): ______________________________________..
-    */
+     * @return void
+     * @param unknown $data
+     * @param unknown $xTemplateSection
+     * @param unknown $html_varName
+     * @desc INTERNAL FUNCTION process the List Navigation
+     * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
+     * All Rights Reserved.
+     * Contributor(s): ______________________________________..
+     */
     function processListNavigation($xtemplateSection, $html_varName, $current_offset, $next_offset, $previous_offset, $row_count, $sugarbean=null, $subpanel_def=null, $col_count = 20) {
 
         global $export_module;
@@ -1316,8 +1314,8 @@ 
             $end_record = $end_record-1;
 
 $script_href = "<a style=\'width: 150px\' name=\"thispage\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'if (document.MassUpdate.select_entire_list.value==1){document.MassUpdate.select_entire_list.value=0;sListView.check_all(document.MassUpdate, \"mass[]\", true, $this->records_per_page)}else {sListView.check_all(document.MassUpdate, \"mass[]\", true)};\' href=\'#\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_CURRENT']}&nbsp;&#x28;{$this->records_per_page}&#x29;&#x200E;</a>"
- . "<a style=\'width: 150px\' name=\"selectall\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'sListView.check_entire_list(document.MassUpdate, \"mass[]\",true,{$row_count});\' href=\'#\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_ENTIRE']}&nbsp;&#x28;{$row_count}&#x29;&#x200E;</a>"
- . "<a style=\'width: 150px\' name=\"deselect\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'sListView.clear_all(document.MassUpdate, \"mass[]\", false);\' href=\'#\'>{$this->local_app_strings['LBL_LISTVIEW_NONE']}</a>";
+    . "<a style=\'width: 150px\' name=\"selectall\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'sListView.check_entire_list(document.MassUpdate, \"mass[]\",true,{$row_count});\' href=\'#\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_ENTIRE']}&nbsp;&#x28;{$row_count}&#x29;&#x200E;</a>"
+    . "<a style=\'width: 150px\' name=\"deselect\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'sListView.clear_all(document.MassUpdate, \"mass[]\", false);\' href=\'#\'>{$this->local_app_strings['LBL_LISTVIEW_NONE']}</a>";
 
 $close_inline_img = SugarThemeRegistry::current()->getImage('close_inline', 'border=0', null, null, ".gif", $app_strings['LBL_CLOSEINLINE']);
 
@@ -1548,15 +1546,15 @@ 
 
 
     /**
-    * @return void
-    * @param unknown $data
-    * @param unknown $xTemplateSection
-    * @param unknown $html_varName
-    * @desc INTERNAL FUNCTION handles the rows
-    * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
-    * All Rights Reserved.
-    * Contributor(s): ______________________________________..
-    */
+     * @return void
+     * @param unknown $data
+     * @param unknown $xTemplateSection
+     * @param unknown $html_varName
+     * @desc INTERNAL FUNCTION handles the rows
+     * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
+     * All Rights Reserved.
+     * Contributor(s): ______________________________________..
+     */
     function processListRows($data, $xtemplateSection, $html_varName)
     {
         global $odd_bg;
@@ -1753,7 +1751,7 @@ 
         {
             $orderBy=  'amount';
         }
-		$buttons = false;
+        $buttons = false;
         $col_count = 0;
         foreach($subpanel_def->get_list_fields() as $column_name=>$widget_args)
         {
@@ -1771,17 +1769,17 @@ 
                 }
 
                 if (!preg_match("/_button/i", $column_name)) {
-	                $widget_args['name']=$column_name;
-	                $widget_args['sort'] = $imgArrow;
-	                $widget_args['start_link_wrapper'] = $this->start_link_wrapper;
-	                $widget_args['end_link_wrapper'] = $this->end_link_wrapper;
-	                $widget_args['subpanel_module'] = $this->subpanel_module;
-
-	                $widget_contents = $layout_manager->widgetDisplay($widget_args);
-	                $cell_width = empty($widget_args['width']) ? '' : $widget_args['width'];
-	                $this->xTemplate->assign('HEADER_CELL', $widget_contents);
-	                static $count;
-	            if(!isset($count))$count = 0; else $count++;
+                    $widget_args['name']=$column_name;
+                    $widget_args['sort'] = $imgArrow;
+                    $widget_args['start_link_wrapper'] = $this->start_link_wrapper;
+                    $widget_args['end_link_wrapper'] = $this->end_link_wrapper;
+                    $widget_args['subpanel_module'] = $this->subpanel_module;
+
+                    $widget_contents = $layout_manager->widgetDisplay($widget_args);
+                    $cell_width = empty($widget_args['width']) ? '' : $widget_args['width'];
+                    $this->xTemplate->assign('HEADER_CELL', $widget_contents);
+                    static $count;
+                if(!isset($count))$count = 0; else $count++;
                     if($col_count == 0 || $column_name == 'name') $footable = 'data-toggle="true"';
                     else {
                         $footable = 'data-hide="phone"';
@@ -1789,11 +1787,11 @@ 
                         if ($col_count > 4) $footable = 'data-hide="phone,phonelandscape,tablet"';
                     }
                     $this->xTemplate->assign('FOOTABLE', $footable);
-	                $this->xTemplate->assign('CELL_COUNT', $count);
-	                $this->xTemplate->assign('CELL_WIDTH', $cell_width);
-	                $this->xTemplate->parse('dyn_list_view.header_cell');
+                    $this->xTemplate->assign('CELL_COUNT', $count);
+                    $this->xTemplate->assign('CELL_WIDTH', $cell_width);
+                    $this->xTemplate->parse('dyn_list_view.header_cell');
                 } else {
-                	$buttons = true;
+                    $buttons = true;
                 }
             }
             ++$col_count;
@@ -1801,29 +1799,29 @@ 
 
         if($buttons) {
                     $this->xTemplate->assign('FOOTABLE', '');
-        			$this->xTemplate->assign('HEADER_CELL', "&nbsp;");
-        			$this->xTemplate->assign('CELL_COUNT', $count);
-	                $this->xTemplate->assign('CELL_WIDTH', $cell_width);
-	                $this->xTemplate->parse('dyn_list_view.header_cell');
+                    $this->xTemplate->assign('HEADER_CELL', "&nbsp;");
+                    $this->xTemplate->assign('CELL_COUNT', $count);
+                    $this->xTemplate->assign('CELL_WIDTH', $cell_width);
+                    $this->xTemplate->parse('dyn_list_view.header_cell');
         }
 
     }
 
 
     /**
-    * @return void
-    * @param unknown $seed
-    * @param unknown $xTemplateSection
-    * @param unknown $html_varName
-    * @desc PUBLIC FUNCTION Handles List Views using seeds that extend SugarBean
+     * @return void
+     * @param unknown $seed
+     * @param unknown $xTemplateSection
+     * @param unknown $html_varName
+     * @desc PUBLIC FUNCTION Handles List Views using seeds that extend SugarBean
         $XTemplateSection is the section in the XTemplate file that should be parsed usually main
         $html_VarName is the variable name used in the XTemplateFile e.g. TASK
         $seed is a seed there are two types of seeds one is a subclass of SugarBean, the other is a list usually created from a sugar bean using get_list
         if no XTemplate is set it will create  a new XTemplate
-        * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
-        * All Rights Reserved..
-        * Contributor(s): ______________________________________..
-    */
+     * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
+     * All Rights Reserved..
+     * Contributor(s): ______________________________________..
+     */
 
     function processListViewTwo($seed, $xTemplateSection, $html_varName) {
         global $current_user;
@@ -1898,12 +1896,12 @@ 
         return "&nbsp;<img border='0' src='".SugarThemeRegistry::current()->getImageURL("arrow{$upDown}.{$ext}")."' ";
     }
 
-	function getArrowEnd() {
-		$imgFileParts = pathinfo(SugarThemeRegistry::current()->getImageURL("arrow.gif"));
+    function getArrowEnd() {
+        $imgFileParts = pathinfo(SugarThemeRegistry::current()->getImageURL("arrow.gif"));
 
         list($width,$height) = ListView::getArrowImageSize();
 
-		return '.'.$imgFileParts['extension']."' width='$width' height='$height' align='absmiddle' alt=".translate('LBL_SORT').">";
+        return '.'.$imgFileParts['extension']."' width='$width' height='$height' align='absmiddle' alt=".translate('LBL_SORT').">";
     }
 
     function getArrowUpDownEnd($upDown) {
@@ -1924,9 +1922,9 @@ 
         return " width='$width' height='$height' align='absmiddle' alt='$sortStr'>";
     }
 
-	function getArrowImageSize() {
-	    // jbasicChartDashletsExpColust get the non-sort image's size.. the up and down have be the same.
-		$image = SugarThemeRegistry::current()->getImageURL("arrow.gif",false);
+    function getArrowImageSize() {
+        // jbasicChartDashletsExpColust get the non-sort image's size.. the up and down have be the same.
+        $image = SugarThemeRegistry::current()->getImageURL("arrow.gif",false);
 
         $cache_key = 'arrow_size.'.$image;
 
@@ -1958,13 +1956,13 @@ 
         return $result;
     }
 
-	function getOrderByInfo($html_varName)
-	{
-		$orderBy = $this->getSessionVariable($html_varName, "OBL");
-		$desc = $this->getSessionVariable($html_varName, $orderBy.'S');
-		$orderBy = str_replace('.', '_', $orderBy);
-		return array($orderBy,$desc);
-	}
+    function getOrderByInfo($html_varName)
+    {
+        $orderBy = $this->getSessionVariable($html_varName, "OBL");
+        $desc = $this->getSessionVariable($html_varName, $orderBy.'S');
+        $orderBy = str_replace('.', '_', $orderBy);
+        return array($orderBy,$desc);
+    }
 
     function processSortArrows($html_varName)
     {
@@ -1973,25 +1971,25 @@ 
 
         list($orderBy,$desc) = $this->getOrderByInfo($html_varName);
 
-		$imgArrow = "_up";
-		if($desc) {
-			$imgArrow = "_down";
-		}
-		/**
-		 * @deprecated only used by legacy opportunites listview, nothing current. Leaving for BC
-		 */
-		if($orderBy == 'amount')
-		{
-			$this->xTemplateAssign('amount_arrow', $imgArrow);
-		}
-		else if($orderBy == 'amount_usdollar')
-		{
-			$this->xTemplateAssign('amount_usdollar_arrow', $imgArrow);
-		}
-		else
-		{
-			$this->xTemplateAssign($orderBy.'_arrow', $imgArrow);
-		}
+        $imgArrow = "_up";
+        if($desc) {
+            $imgArrow = "_down";
+        }
+        /**
+         * @deprecated only used by legacy opportunites listview, nothing current. Leaving for BC
+         */
+        if($orderBy == 'amount')
+        {
+            $this->xTemplateAssign('amount_arrow', $imgArrow);
+        }
+        else if($orderBy == 'amount_usdollar')
+        {
+            $this->xTemplateAssign('amount_usdollar_arrow', $imgArrow);
+        }
+        else
+        {
+            $this->xTemplateAssign($orderBy.'_arrow', $imgArrow);
+        }
 
         $this->xTemplateAssign('arrow_end', $this->getArrowEnd());
     }
@@ -2030,37 +2028,37 @@ 
         return sugar_microtime();
     }
 
-     /**INTERNAL FUNCTION sets a session variable keeping it local to the listview
+        /**INTERNAL FUNCTION sets a session variable keeping it local to the listview
      not the current_module
      * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
      * All Rights Reserved.
      * Contributor(s): ______________________________________.
      */
-     function setLocalSessionVariable($localVarName,$varName, $value) {
+        function setLocalSessionVariable($localVarName,$varName, $value) {
         $_SESSION[$localVarName."_".$varName] = $value;
-     }
+        }
 
-     /**INTERNAL FUNCTION returns a session variable that is local to the listview,
+        /**INTERNAL FUNCTION returns a session variable that is local to the listview,
      not the current_module
      * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
      * All Rights Reserved.
      * Contributor(s): ______________________________________.
      */
- function getLocalSessionVariable($localVarName,$varName) {
+    function getLocalSessionVariable($localVarName,$varName) {
     if(isset($_SESSION[$localVarName."_".$varName])) {
         return $_SESSION[$localVarName."_".$varName];
     }
     else{
         return "";
     }
- }
+    }
 
- /* Set to true if you want Additional Details to appear in the listview
+    /* Set to true if you want Additional Details to appear in the listview
   */
- function setAdditionalDetails($value = true, $function = '') {
+    function setAdditionalDetails($value = true, $function = '') {
     if(!empty($function)) $this->additionalDetailsFunction = $function;
     $this->_additionalDetails = $value;
- }
+    }
 
 }
 ?>

Spacing +373 added lines, -373 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.
@@ -45,8 +45,8 @@ 
  */
 class ListView
 {
-    var $local_theme= null;
-    var $local_app_strings= null;
+    var $local_theme = null;
+    var $local_app_strings = null;
     var $local_image_path = null;
     var $local_current_module = null;
     var $local_mod_strings = null;
@@ -81,12 +81,12 @@ 
     var $child_focus = '';
     var $layout_manager = null;
     var $process_for_popups = false;
-    var $multi_select_popup=false;
+    var $multi_select_popup = false;
     var $_additionalDetails = false;
     var $additionalDetailsFunction = null;
     var $sort_order = '';
-    var $force_mass_update=false;
-    var $keep_mass_update_form_open=false;
+    var $force_mass_update = false;
+    var $keep_mass_update_form_open = false;
     var $ignorePopulateOnly = false;
 
 function setDataArray($value) {
@@ -100,7 +100,7 @@ 
     echo "<form name='MassUpdate' method='post' action='index.php'>";
     $this->processListViewTwo($seed, $xTemplateSection, $html_varName);
 
-    echo "<a href='javascript:" . ((!$this->multi_select_popup) ? 'sListView.' : ''). "check_all(document.MassUpdate, \"mass[]\", true)'>".translate('LBL_CHECKALL')."</a> - <a href='javascript:sListView.check_all(document.MassUpdate, \"mass[]\", false);'>".translate('LBL_CLEARALL')."</a>";
+    echo "<a href='javascript:".((!$this->multi_select_popup) ? 'sListView.' : '')."check_all(document.MassUpdate, \"mass[]\", true)'>".translate('LBL_CHECKALL')."</a> - <a href='javascript:sListView.check_all(document.MassUpdate, \"mass[]\", false);'>".translate('LBL_CLEARALL')."</a>";
     echo '<br><br>';
 }
 
@@ -110,109 +110,109 @@ 
     global $sugar_config;
 
     $populateOnly = $this->ignorePopulateOnly ? FALSE : (!empty($sugar_config['save_query']) && $sugar_config['save_query'] == 'populate_only');
-    if(isset($seed->module_dir) && $populateOnly) {
-        if(empty($GLOBALS['displayListView']) && strcmp(strtolower($_REQUEST['action']), 'popup') != 0 && (!empty($_REQUEST['clear_query']) || $_REQUEST['module'] == $seed->module_dir && ((empty($_REQUEST['query']) || $_REQUEST['query'] == 'MSI')&& (empty($_SESSION['last_search_mod']) || $_SESSION['last_search_mod'] != $seed->module_dir)))) {
-            $_SESSION['last_search_mod'] = $_REQUEST['module'] ;
+    if (isset($seed->module_dir) && $populateOnly) {
+        if (empty($GLOBALS['displayListView']) && strcmp(strtolower($_REQUEST['action']), 'popup') != 0 && (!empty($_REQUEST['clear_query']) || $_REQUEST['module'] == $seed->module_dir && ((empty($_REQUEST['query']) || $_REQUEST['query'] == 'MSI') && (empty($_SESSION['last_search_mod']) || $_SESSION['last_search_mod'] != $seed->module_dir)))) {
+            $_SESSION['last_search_mod'] = $_REQUEST['module'];
             return;
         }
     }
-    if(strcmp(strtolower($_REQUEST['action']), 'popup') != 0){
-        $_SESSION['last_search_mod'] = $_REQUEST['module'] ;
+    if (strcmp(strtolower($_REQUEST['action']), 'popup') != 0) {
+        $_SESSION['last_search_mod'] = $_REQUEST['module'];
     }
     //following session variable will track the detail view navigation history.
     //needs to the reset after each search.
-    $this->setLocalSessionVariable($html_varName,"DETAIL_NAV_HISTORY",false);
+    $this->setLocalSessionVariable($html_varName, "DETAIL_NAV_HISTORY", false);
 
     require_once('include/MassUpdate.php');
     $mass = new MassUpdate();
     $add_acl_javascript = false;
-    if(!isset($_REQUEST['action'])) {
-        $this->shouldProcess=false;
+    if (!isset($_REQUEST['action'])) {
+        $this->shouldProcess = false;
     } else {
     $this->shouldProcess = is_subclass_of($seed, "SugarBean")
-        && (($_REQUEST['action'] == 'index') || ('ListView' == substr($_REQUEST['action'],0,8)) /* cn: to include all ListViewXXX.php type views */)
+        && (($_REQUEST['action'] == 'index') || ('ListView' == substr($_REQUEST['action'], 0, 8)) /* cn: to include all ListViewXXX.php type views */)
         && ($_REQUEST['module'] == $seed->module_dir);
     }
 
     //when processing a multi-select popup.
-    if($this->process_for_popups && $this->multi_select_popup)  $this->shouldProcess =true;
+    if ($this->process_for_popups && $this->multi_select_popup)  $this->shouldProcess = true;
     //mass update turned off?
-    if(!$this->show_mass_update) $this->shouldProcess = false;
-    if(is_subclass_of($seed, "SugarBean")) {
-        if($seed->bean_implements('ACL')) {
-            if(!ACLController::checkAccess($seed->module_dir,'list',true)) {
-                if($_REQUEST['module'] != 'Home') {
+    if (!$this->show_mass_update) $this->shouldProcess = false;
+    if (is_subclass_of($seed, "SugarBean")) {
+        if ($seed->bean_implements('ACL')) {
+            if (!ACLController::checkAccess($seed->module_dir, 'list', true)) {
+                if ($_REQUEST['module'] != 'Home') {
                     ACLController::displayNoAccess();
                 }
                 return;
             }
-            if(!ACLController::checkAccess($seed->module_dir,'export',true)) {
-                $sugar_config['disable_export']= true;
+            if (!ACLController::checkAccess($seed->module_dir, 'export', true)) {
+                $sugar_config['disable_export'] = true;
             }
 
         }
     }
 
     //force mass update form if requested.
-    if($this->force_mass_update) {
+    if ($this->force_mass_update) {
         $this->shouldProcess = true;
     }
 
-    if($this->shouldProcess) {
+    if ($this->shouldProcess) {
         echo $mass->getDisplayMassUpdateForm(true, $this->multi_select_popup);
         echo $mass->getMassUpdateFormHeader($this->multi_select_popup);
         $mass->setSugarBean($seed);
 
         //C.L. Fix for 10048, do not process handleMassUpdate for multi select popups
-        if(!$this->multi_select_popup) {
+        if (!$this->multi_select_popup) {
             $mass->handleMassUpdate();
         }
     }
 
-    $this->processListViewTwo($seed,$xTemplateSection, $html_varName);
+    $this->processListViewTwo($seed, $xTemplateSection, $html_varName);
 
-    if($this->shouldProcess && empty($this->process_for_popups)) {
+    if ($this->shouldProcess && empty($this->process_for_popups)) {
         //echo "<a href='javascript:sListView.clear_all(document.MassUpdate, \"mass[]\");'>".translate('LBL_CLEARALL')."</a>";
         // cn: preserves current functionality, exception is InboundEmail
-        if($this->show_mass_update_form) {
+        if ($this->show_mass_update_form) {
             echo $mass->getMassUpdateForm();
         }
-        if(!$this->keep_mass_update_form_open) {
+        if (!$this->keep_mass_update_form_open) {
             echo $mass->endMassUpdateForm();
         }
     }
 }
 
 
-function process_dynamic_listview($source_module, $sugarbean,$subpanel_def)
+function process_dynamic_listview($source_module, $sugarbean, $subpanel_def)
 {
         $this->source_module = $source_module;
         $this->subpanel_module = $subpanel_def->name;
-        if(!isset($this->xTemplate))
+        if (!isset($this->xTemplate))
             $this->createXTemplate();
 
-        $html_var = $this->subpanel_module . "_CELL";
+        $html_var = $this->subpanel_module."_CELL";
 
-        $list_data = $this->processUnionBeans($sugarbean,$subpanel_def, $html_var);
+        $list_data = $this->processUnionBeans($sugarbean, $subpanel_def, $html_var);
 
         $list = $list_data['list'];
         $parent_data = $list_data['parent_data'];
 
-        if($subpanel_def->isCollection()) {
-            $thepanel=$subpanel_def->get_header_panel_def();
+        if ($subpanel_def->isCollection()) {
+            $thepanel = $subpanel_def->get_header_panel_def();
         } else {
-            $thepanel=$subpanel_def;
+            $thepanel = $subpanel_def;
         }
 
 
 
         $this->process_dynamic_listview_header($thepanel->get_module_name(), $thepanel, $html_var);
-        $this->process_dynamic_listview_rows($list,$parent_data, 'dyn_list_view', $html_var,$subpanel_def);
+        $this->process_dynamic_listview_rows($list, $parent_data, 'dyn_list_view', $html_var, $subpanel_def);
 
-        if($this->display_header_and_footer)
+        if ($this->display_header_and_footer)
         {
             $this->getAdditionalHeader();
-            if(!empty($this->header_title))
+            if (!empty($this->header_title))
             {
                 echo get_form_header($this->header_title, $this->header_text, false);
             }
@@ -220,11 +220,11 @@ 
 
         $this->xTemplate->out('dyn_list_view');
 
-        if(isset($_SESSION['validation']))
+        if (isset($_SESSION['validation']))
         {
             print base64_decode('PGEgaHJlZj0naHR0cDovL3d3dy5zdWdhcmNybS5jb20nPlBPV0VSRUQmbmJzcDtCWSZuYnNwO1NVR0FSQ1JNPC9hPg==');
         }
-        if(isset($list_data['query'])) {
+        if (isset($list_data['query'])) {
             return ($list_data['query']);
         }
     }
@@ -236,7 +236,7 @@ 
  * @param unknown $html_varName
  * @desc INTERNAL FUNCTION handles the rows
  */
- function process_dynamic_listview_rows($data,$parent_data, $xtemplateSection, $html_varName, $subpanel_def)
+ function process_dynamic_listview_rows($data, $parent_data, $xtemplateSection, $html_varName, $subpanel_def)
  {
     global $subpanel_item_count;
     global $odd_bg;
@@ -261,37 +261,37 @@ 
     //Either retrieve the is_fill_in_additional_fields property from the lone
     //subpanel or visit each subpanel's subpanels to retrieve the is_fill_in_addition_fields
     //property
-    $subpanel_list=array();
-    if($subpanel_def->isCollection()) {
-        $subpanel_list=$subpanel_def->sub_subpanels;
+    $subpanel_list = array();
+    if ($subpanel_def->isCollection()) {
+        $subpanel_list = $subpanel_def->sub_subpanels;
     } else {
-        $subpanel_list[]= $subpanel_def;
+        $subpanel_list[] = $subpanel_def;
     }
 
-    foreach($subpanel_list as $this_subpanel)
+    foreach ($subpanel_list as $this_subpanel)
     {
-        if($this_subpanel->is_fill_in_additional_fields())
+        if ($this_subpanel->is_fill_in_additional_fields())
         {
             $fill_additional_fields[] = $this_subpanel->bean_name;
             $fill_additional_fields[$this_subpanel->bean_name] = true;
         }
     }
 
-    if ( empty($data) ) {
+    if (empty($data)) {
         $this->xTemplate->assign("ROW_COLOR", 'oddListRow');
-        $thepanel=$subpanel_def;
-        if($subpanel_def->isCollection())
-            $thepanel=$subpanel_def->get_header_panel_def();
+        $thepanel = $subpanel_def;
+        if ($subpanel_def->isCollection())
+            $thepanel = $subpanel_def->get_header_panel_def();
         $this->xTemplate->assign("COL_COUNT", count($thepanel->get_list_fields()));
         $this->xTemplate->parse($xtemplateSection.".nodata");
     }
-    while(list($aVal, $aItem) = each($data))
+    while (list($aVal, $aItem) = each($data))
     {
         $subpanel_item_count++;
         $aItem->check_date_relationships_load();
         // TODO: expensive and needs to be removed and done better elsewhere
 
-        if(!empty($fill_additional_fields[$aItem->object_name])
+        if (!empty($fill_additional_fields[$aItem->object_name])
         || ($aItem->object_name == 'Case' && !empty($fill_additional_fields['aCase']))
         )
         {
@@ -301,15 +301,15 @@ 
         //rrs bug: 25343
         $aItem->call_custom_logic("process_record");
 
-        if(isset($parent_data[$aItem->id])) {
+        if (isset($parent_data[$aItem->id])) {
 
             $aItem->parent_name = $parent_data[$aItem->id]['parent_name'];
-            if(!empty($parent_data[$aItem->id]['parent_name_owner'])) {
-            $aItem->parent_name_owner =  $parent_data[$aItem->id]['parent_name_owner'];
-            $aItem->parent_name_mod =  $parent_data[$aItem->id]['parent_name_mod'];
+            if (!empty($parent_data[$aItem->id]['parent_name_owner'])) {
+            $aItem->parent_name_owner = $parent_data[$aItem->id]['parent_name_owner'];
+            $aItem->parent_name_mod = $parent_data[$aItem->id]['parent_name_mod'];
         }}
         $fields = $aItem->get_list_view_data();
-        if(isset($processed_ids[$aItem->id])) {
+        if (isset($processed_ids[$aItem->id])) {
             continue;
 
         } else {
@@ -320,50 +320,50 @@ 
         //ADD OFFSET TO ARRAY
         $fields['OFFSET'] = ($offset + $count + 1);
 
-        if($this->shouldProcess) {
-            if($aItem->ACLAccess('EditView')) {
-            $this->xTemplate->assign('PREROW', "<input type='checkbox' class='checkbox' name='mass[]' value='". $fields['ID']. "' />");
+        if ($this->shouldProcess) {
+            if ($aItem->ACLAccess('EditView')) {
+            $this->xTemplate->assign('PREROW', "<input type='checkbox' class='checkbox' name='mass[]' value='".$fields['ID']."' />");
             } else {
                 $this->xTemplate->assign('PREROW', '');
 
             }
-            if($aItem->ACLAccess('DetailView')) {
-                $this->xTemplate->assign('TAG_NAME','a');
+            if ($aItem->ACLAccess('DetailView')) {
+                $this->xTemplate->assign('TAG_NAME', 'a');
             } else {
-                $this->xTemplate->assign('TAG_NAME','span');
+                $this->xTemplate->assign('TAG_NAME', 'span');
             }
             $this->xTemplate->assign('CHECKALL', "<input type='checkbox'  title='".$GLOBALS['app_strings']['LBL_SELECT_ALL_TITLE']."' class='checkbox' name='massall' id='massall' value='' onclick='sListView.check_all(document.MassUpdate, \"mass[]\", this.checked);' />");
         }
 
-        if($oddRow)
+        if ($oddRow)
         {
             $ROW_COLOR = 'oddListRow';
-            $BG_COLOR =  $odd_bg;
+            $BG_COLOR = $odd_bg;
         }
         else
         {
             $ROW_COLOR = 'evenListRow';
-            $BG_COLOR =  $even_bg;
+            $BG_COLOR = $even_bg;
         }
         $oddRow = !$oddRow;
 		$button_contents = array();
         $this->xTemplate->assign("ROW_COLOR", $ROW_COLOR);
         $this->xTemplate->assign("BG_COLOR", $BG_COLOR);
         $layout_manager = $this->getLayoutManager();
-        $layout_manager->setAttribute('context','List');
-        $layout_manager->setAttribute('image_path',$this->local_image_path);
+        $layout_manager->setAttribute('context', 'List');
+        $layout_manager->setAttribute('image_path', $this->local_image_path);
         $layout_manager->setAttribute('module_name', $subpanel_def->_instance_properties['module']);
-        if(!empty($this->child_focus))
-            $layout_manager->setAttribute('related_module_name',$this->child_focus->module_dir);
+        if (!empty($this->child_focus))
+            $layout_manager->setAttribute('related_module_name', $this->child_focus->module_dir);
 
         //AG$subpanel_data = $this->list_field_defs;
         //$bla = array_pop($subpanel_data);
         //select which sub-panel to display here, the decision will be made based on the type of
         //the sub-panel and panel in the bean being processed.
-        if($subpanel_def->isCollection()) {
-            $thepanel=$subpanel_def->sub_subpanels[$aItem->panel_name];
+        if ($subpanel_def->isCollection()) {
+            $thepanel = $subpanel_def->sub_subpanels[$aItem->panel_name];
         } else {
-            $thepanel=$subpanel_def;
+            $thepanel = $subpanel_def;
         }
 
 		/* BEGIN - SECURITY GROUPS */ 
@@ -374,22 +374,22 @@ 
 		$aclaccess_in_group = false;
 
 		global $current_user;
-		if(is_admin($current_user)) {
+		if (is_admin($current_user)) {
 			$aclaccess_is_owner = true;
 		} else {
 			$aclaccess_is_owner = $aItem->isOwner($current_user->id);
 		}
 
 		require_once("modules/SecurityGroups/SecurityGroup.php");
-		$aclaccess_in_group = SecurityGroup::groupHasAccess($aItem->module_dir,$aItem->id);
+		$aclaccess_in_group = SecurityGroup::groupHasAccess($aItem->module_dir, $aItem->id);
         	
     	/* END - SECURITY GROUPS */ 
     	
         //get data source name
-        $linked_field=$thepanel->get_data_source_name();
-        $linked_field_set=$thepanel->get_data_source_name(true);
+        $linked_field = $thepanel->get_data_source_name();
+        $linked_field_set = $thepanel->get_data_source_name(true);
         static $count;
-        if(!isset($count))$count = 0;
+        if (!isset($count))$count = 0;
 		/* BEGIN - SECURITY GROUPS */ 
 		/**
         $field_acl['DetailView'] = $aItem->ACLAccess('DetailView');
@@ -398,19 +398,19 @@ 
         $field_acl['Delete'] = $aItem->ACLAccess('Delete');
 		*/
 		//pass is_owner, in_group...vars defined above
-        $field_acl['DetailView'] = $aItem->ACLAccess('DetailView',$aclaccess_is_owner,$aclaccess_in_group);
-        $field_acl['ListView'] = $aItem->ACLAccess('ListView',$aclaccess_is_owner,$aclaccess_in_group);
-        $field_acl['EditView'] = $aItem->ACLAccess('EditView',$aclaccess_is_owner,$aclaccess_in_group);
-        $field_acl['Delete'] = $aItem->ACLAccess('Delete',$aclaccess_is_owner,$aclaccess_in_group);
+        $field_acl['DetailView'] = $aItem->ACLAccess('DetailView', $aclaccess_is_owner, $aclaccess_in_group);
+        $field_acl['ListView'] = $aItem->ACLAccess('ListView', $aclaccess_is_owner, $aclaccess_in_group);
+        $field_acl['EditView'] = $aItem->ACLAccess('EditView', $aclaccess_is_owner, $aclaccess_in_group);
+        $field_acl['Delete'] = $aItem->ACLAccess('Delete', $aclaccess_is_owner, $aclaccess_in_group);
 		/* END - SECURITY GROUPS */ 
-        foreach($thepanel->get_list_fields() as $field_name=>$list_field)
+        foreach ($thepanel->get_list_fields() as $field_name=>$list_field)
         {
             //add linked field attribute to the array.
-            $list_field['linked_field']=$linked_field;
-            $list_field['linked_field_set']=$linked_field_set;
+            $list_field['linked_field'] = $linked_field;
+            $list_field['linked_field_set'] = $linked_field_set;
 
             $usage = empty($list_field['usage']) ? '' : $list_field['usage'];
-            if($usage == 'query_only' && !empty($list_field['force_query_only_display'])){
+            if ($usage == 'query_only' && !empty($list_field['force_query_only_display'])) {
                 //if you are here you have column that is query only but needs to be displayed as blank.  This is helpful
                 //for collections such as Activities where you have a field in only one object and wish to show it in the subpanel list
                 $count++;
@@ -420,13 +420,13 @@ 
                 $this->xTemplate->assign('CELL', $widget_contents);
                 $this->xTemplate->parse($xtemplateSection.".row.cell");
 
-            }else if($usage != 'query_only')
+            } else if ($usage != 'query_only')
             {
-                $list_field['name']=$field_name;
+                $list_field['name'] = $field_name;
 
                 $module_field = $field_name.'_mod';
                 $owner_field = $field_name.'_owner';
-                if(!empty($aItem->$module_field)) {
+                if (!empty($aItem->$module_field)) {
 
                     $list_field['owner_id'] = $aItem->$owner_field;
                     $list_field['owner_module'] = $aItem->$module_field;
@@ -435,71 +435,71 @@ 
                     $list_field['owner_id'] = false;
                     $list_field['owner_module'] = false;
                 }
-                if(isset($list_field['alias'])) $list_field['name'] = $list_field['alias'];
-                else $list_field['name']=$field_name;
+                if (isset($list_field['alias'])) $list_field['name'] = $list_field['alias'];
+                else $list_field['name'] = $field_name;
                 $list_field['fields'] = $fields;
                 $list_field['module'] = $aItem->module_dir;
                 $list_field['start_link_wrapper'] = $this->start_link_wrapper;
                 $list_field['end_link_wrapper'] = $this->end_link_wrapper;
                 $list_field['subpanel_id'] = $this->subpanel_id;
                 $list_field += $field_acl;
-                if ( isset($aItem->field_defs[strtolower($list_field['name'])])) {
+                if (isset($aItem->field_defs[strtolower($list_field['name'])])) {
                     require_once('include/SugarFields/SugarFieldHandler.php');
                     // We need to see if a sugar field exists for this field type first,
                     // if it doesn't, toss it at the old sugarWidgets. This is for
                     // backwards compatibility and will be removed in a future release
                     $vardef = $aItem->field_defs[strtolower($list_field['name'])];
-                    if ( isset($vardef['type']) ) {
-                        $fieldType = isset($vardef['custom_type'])?$vardef['custom_type']:$vardef['type'];
-                        $tmpField = SugarFieldHandler::getSugarField($fieldType,true);
+                    if (isset($vardef['type'])) {
+                        $fieldType = isset($vardef['custom_type']) ? $vardef['custom_type'] : $vardef['type'];
+                        $tmpField = SugarFieldHandler::getSugarField($fieldType, true);
                     } else {
                         $tmpField = NULL;
                     }
 
-                    if ( $tmpField != NULL ) {
-                        $widget_contents = SugarFieldHandler::displaySmarty($list_field['fields'],$vardef,'ListView',$list_field);
+                    if ($tmpField != NULL) {
+                        $widget_contents = SugarFieldHandler::displaySmarty($list_field['fields'], $vardef, 'ListView', $list_field);
                     } else {
                         // No SugarField for this particular type
                         // Use the old, icky, SugarWidget for now
                         $widget_contents = $layout_manager->widgetDisplay($list_field);
                     }
 
-                    if ( isset($list_field['widget_class']) && $list_field['widget_class'] == 'SubPanelDetailViewLink' ) {
+                    if (isset($list_field['widget_class']) && $list_field['widget_class'] == 'SubPanelDetailViewLink') {
                         // We need to call into the old SugarWidgets for the time being, so it can generate a proper link with all the various corner-cases handled
                         // So we'll populate the field data with the pre-rendered display for the field
                         $list_field['fields'][$field_name] = $widget_contents;
-                        if('full_name' == $field_name){//bug #32465
+                        if ('full_name' == $field_name) {//bug #32465
                            $list_field['fields'][strtoupper($field_name)] = $widget_contents;
                         }
 
                         //vardef source is non db, assign the field name to varname for processing of column.
-                        if(!empty($vardef['source']) && $vardef['source']=='non-db'){
+                        if (!empty($vardef['source']) && $vardef['source'] == 'non-db') {
                             $list_field['varname'] = $field_name;
 
                         }
                         $widget_contents = $layout_manager->widgetDisplay($list_field);
-                    } else if(isset($list_field['widget_class']) && $list_field['widget_class'] == 'SubPanelEmailLink' ) {
+                    } else if (isset($list_field['widget_class']) && $list_field['widget_class'] == 'SubPanelEmailLink') {
                         $widget_contents = $layout_manager->widgetDisplay($list_field);
                     }
 
                  $count++;
                 $this->xTemplate->assign('CELL_COUNT', $count);
                 $this->xTemplate->assign('CLASS', "");
-                if ( empty($widget_contents) ) $widget_contents = '&nbsp;';
+                if (empty($widget_contents)) $widget_contents = '&nbsp;';
                 $this->xTemplate->assign('CELL', $widget_contents);
                 $this->xTemplate->parse($xtemplateSection.".row.cell");
                 } else {
                     // This handles the edit and remove buttons and icon widget
-                	if( isset($list_field['widget_class']) && $list_field['widget_class'] == "SubPanelIcon") {
+                	if (isset($list_field['widget_class']) && $list_field['widget_class'] == "SubPanelIcon") {
 		                $count++;
 		                $widget_contents = $layout_manager->widgetDisplay($list_field);
 		                $this->xTemplate->assign('CELL_COUNT', $count);
 		                $this->xTemplate->assign('CLASS', "");
-		                if ( empty($widget_contents) ) $widget_contents = '&nbsp;';
+		                if (empty($widget_contents)) $widget_contents = '&nbsp;';
 		                $this->xTemplate->assign('CELL', $widget_contents);
 		                $this->xTemplate->parse($xtemplateSection.".row.cell");
                 	} elseif (preg_match("/button/i", $list_field['name'])) {
-                        if ((($list_field['name'] === 'edit_button' && $field_acl['EditView']) || ($list_field['name'] === 'close_button' && $field_acl['EditView']) || ($list_field['name'] === 'remove_button' && $field_acl['Delete'])) && '' != ($_content = $layout_manager->widgetDisplay($list_field)) )
+                        if ((($list_field['name'] === 'edit_button' && $field_acl['EditView']) || ($list_field['name'] === 'close_button' && $field_acl['EditView']) || ($list_field['name'] === 'remove_button' && $field_acl['Delete'])) && '' != ($_content = $layout_manager->widgetDisplay($list_field)))
                         {
                             $button_contents[] = $_content;
                             unset($_content);
@@ -513,7 +513,7 @@ 
                			$this->xTemplate->assign('CLASS', "");
                			$widget_contents = $layout_manager->widgetDisplay($list_field);
 		                $this->xTemplate->assign('CELL_COUNT', $count);
-		                if ( empty($widget_contents) ) $widget_contents = '&nbsp;';
+		                if (empty($widget_contents)) $widget_contents = '&nbsp;';
 		                $this->xTemplate->assign('CELL', $widget_contents);
 		                $this->xTemplate->parse($xtemplateSection.".row.cell");
                 	}
@@ -525,7 +525,7 @@ 
 
         // Make sure we have at least one button before rendering a column for
         // the action buttons in a list view. Relevant bugs: #51647 and #51640.
-        if(!empty($button_contents))
+        if (!empty($button_contents))
         {
             $button_contents = array_filter($button_contents);
             if (!empty($button_contents))
@@ -534,7 +534,7 @@ 
             // bug#51275: smarty widget to help provide the action menu functionality as it is currently sprinkled throughout the app with html
                 require_once('include/Smarty/plugins/function.sugar_action_menu.php');
                 $tempid = create_guid();
-                array_unshift($button_contents, "<div style='display: inline' id='$tempid'>" . array_shift($button_contents) . "</div>");
+                array_unshift($button_contents, "<div style='display: inline' id='$tempid'>".array_shift($button_contents)."</div>");
                 $action_button = smarty_function_sugar_action_menu(array(
                     'id' => $tempid,
                     'buttons' => $button_contents,
@@ -550,7 +550,7 @@ 
             $this->xTemplate->assign('CELL_COUNT', ++$count);
             //Bug#51275 for beta3 pre_script is not required any more
             $this->xTemplate->assign('CELL', $action_button);
-            $this->xTemplate->parse($xtemplateSection . ".row.cell");
+            $this->xTemplate->parse($xtemplateSection.".row.cell");
         }
 
 
@@ -582,13 +582,13 @@ 
  function ListView() {
 
 
-    if(!$this->initialized) {
+    if (!$this->initialized) {
         global $sugar_config;
         $this->records_per_page = $sugar_config['list_max_entries_per_page'] + 0;
         $this->initialized = true;
         global $app_strings, $currentModule;
         $this->local_theme = SugarThemeRegistry::current()->__toString();
-        $this->local_app_strings =$app_strings;
+        $this->local_app_strings = $app_strings;
         $this->local_image_path = SugarThemeRegistry::current()->getImagePath();
         $this->local_current_module = $currentModule;
     }
@@ -619,7 +619,7 @@ 
  * Contributor(s): ______________________________________.
 */
  function setXTemplatePath($value) {
-    $this->xTemplatePath= $value;
+    $this->xTemplatePath = $value;
 }
 
 /**this is a helper function for allowing ListView to create a new XTemplate it groups parameters that should be set into a single function
@@ -629,22 +629,22 @@ 
 */
  function initNewXTemplate($XTemplatePath, $modString, $imagePath = null) {
     $this->setXTemplatePath($XTemplatePath);
-    if(isset($modString))
+    if (isset($modString))
         $this->setModStrings($modString);
-    if(isset($imagePath))
+    if (isset($imagePath))
         $this->setImagePath($imagePath);
 }
 
 
-function getOrderBy($varName, $defaultOrderBy='', $force_sortorder='') {
-    $sortBy = $this->getSessionVariable($varName, "ORDER_BY") ;
+function getOrderBy($varName, $defaultOrderBy = '', $force_sortorder = '') {
+    $sortBy = $this->getSessionVariable($varName, "ORDER_BY");
 
     $orderByDirection = $this->getSessionVariableName($varName, "order_by_direction");
     $orderByColumn = $this->getSessionVariableName($varName, "ORDER_BY");
     $lastEqualsSortBy = false;
     $defaultOrder = false; //ascending
 
-    if(empty($sortBy)) {
+    if (empty($sortBy)) {
         $this->setUserVariable($varName, "ORDER_BY", $defaultOrderBy);
         $sortBy = $defaultOrderBy;
     } else {
@@ -682,7 +682,7 @@ 
         }
         $desc = $orderByValue == 'desc';
         $orderByDirectionValue = false;
-        $this->setSessionVariable($varName, $sortBy . "S", $desc);
+        $this->setSessionVariable($varName, $sortBy."S", $desc);
         if (!empty($sortBy))
         {
             if (empty($force_sortorder))
@@ -693,11 +693,11 @@ 
                     {
                         $orderByDirectionValue = $desc ? 'asc' : 'desc';
                     }
-                    $this->query_orderby = $sortBy . ' ' . $orderByValue;
+                    $this->query_orderby = $sortBy.' '.$orderByValue;
                 }
             } else
             {
-                $this->query_orderby = $sortBy . ' ' . $force_sortorder;
+                $this->query_orderby = $sortBy.' '.$force_sortorder;
             }
             if (!isset($this->appendToBaseUrl))
             {
@@ -714,7 +714,7 @@ 
             }
             //Just clear from url...
             $this->appendToBaseUrl[$orderByColumn] = false;
-    }else {
+    } else {
         $this->query_orderby = "";
     }
     $this->sortby = $sortBy;
@@ -728,15 +728,15 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setQuery($where, $limit, $orderBy, $varName, $allowOrderByOveride=true) {
+ function setQuery($where, $limit, $orderBy, $varName, $allowOrderByOveride = true) {
     $this->query_where = $where;
-    if($this->getSessionVariable("query", "where") != $where) {
+    if ($this->getSessionVariable("query", "where") != $where) {
         $this->query_where_has_changed = true;
         $this->setSessionVariable("query", "where", $where);
     }
 
     $this->query_limit = $limit;
-    if(!$allowOrderByOveride) {
+    if (!$allowOrderByOveride) {
         $this->query_orderby = $orderBy;
         return;
     }
@@ -759,7 +759,7 @@ 
 */
  function setTheme($theme) {
     $this->local_theme = $theme;
-    if(isset($this->xTemplate))$this->xTemplate->assign("THEME", $this->local_theme);
+    if (isset($this->xTemplate))$this->xTemplate->assign("THEME", $this->local_theme);
 }
 
 /**sets the AppStrings used only use if it is different from the global
@@ -770,7 +770,7 @@ 
  function setAppStrings($app_strings) {
     unset($this->local_app_strings);
     $this->local_app_strings = $app_strings;
-    if(isset($this->xTemplate))$this->xTemplate->assign("APP", $this->local_app_strings);
+    if (isset($this->xTemplate))$this->xTemplate->assign("APP", $this->local_app_strings);
 }
 
 /**sets the ModStrings used
@@ -781,7 +781,7 @@ 
  function setModStrings($mod_strings) {
     unset($this->local_module_strings);
     $this->local_mod_strings = $mod_strings;
-    if(isset($this->xTemplate))$this->xTemplate->assign("MOD", $this->local_mod_strings);
+    if (isset($this->xTemplate))$this->xTemplate->assign("MOD", $this->local_mod_strings);
 }
 
 /**sets the ImagePath used
@@ -791,10 +791,10 @@ 
 */
  function setImagePath($image_path) {
     $this->local_image_path = $image_path;
-    if(empty($this->local_image_path)) {
+    if (empty($this->local_image_path)) {
         $this->local_image_path = SugarThemeRegistry::get($this->local_theme)->getImagePath();
     }
-    if(isset($this->xTemplate))$this->xTemplate->assign("IMAGE_PATH", $this->local_image_path);
+    if (isset($this->xTemplate))$this->xTemplate->assign("IMAGE_PATH", $this->local_image_path);
 }
 
 /**sets the currentModule only use if this is different from the global
@@ -805,7 +805,7 @@ 
  function setCurrentModule($currentModule) {
     unset($this->local_current_module);
     $this->local_current_module = $currentModule;
-    if(isset($this->xTemplate))$this->xTemplate->assign("MODULE_NAME", $this->local_current_module);
+    if (isset($this->xTemplate))$this->xTemplate->assign("MODULE_NAME", $this->local_current_module);
 }
 
 /**INTERNAL FUNCTION creates an XTemplate DO NOT CALL THIS THIS IS AN INTERNAL FUNCTION
@@ -814,12 +814,12 @@ 
  * Contributor(s): ______________________________________.
 */
  function createXTemplate() {
-    if(!isset($this->xTemplate)) {
-        if(isset($this->xTemplatePath)) {
+    if (!isset($this->xTemplate)) {
+        if (isset($this->xTemplatePath)) {
 
             $this->xTemplate = new XTemplate($this->xTemplatePath);
             $this->xTemplate->assign("APP", $this->local_app_strings);
-            if(isset($this->local_mod_strings))$this->xTemplate->assign("MOD", $this->local_mod_strings);
+            if (isset($this->local_mod_strings))$this->xTemplate->assign("MOD", $this->local_mod_strings);
             $this->xTemplate->assign("THEME", $this->local_theme);
             $this->xTemplate->assign("IMAGE_PATH", $this->local_image_path);
             $this->xTemplate->assign("MODULE_NAME", $this->local_current_module);
@@ -854,7 +854,7 @@ 
 */
  function xTemplateAssign($name, $value) {
 
-        if(!isset($this->xTemplate)) {
+        if (!isset($this->xTemplate)) {
             $this->createXTemplate();
         }
         $this->xTemplate->assign($name, $value);
@@ -867,11 +867,11 @@ 
  * Contributor(s): ______________________________________.
 */
  function getOffset($localVarName) {
- 	if($this->query_where_has_changed || isset($GLOBALS['record_has_changed'])) {
- 		$this->setSessionVariable($localVarName,"offset", 0);
+ 	if ($this->query_where_has_changed || isset($GLOBALS['record_has_changed'])) {
+ 		$this->setSessionVariable($localVarName, "offset", 0);
  	}
-	$offset = $this->getSessionVariable($localVarName,"offset");
-	if(isset($offset)) {
+	$offset = $this->getSessionVariable($localVarName, "offset");
+	if (isset($offset)) {
 		return $offset;
 	}
 	return 0;
@@ -891,12 +891,12 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setSessionVariable($localVarName,$varName, $value) {
+ function setSessionVariable($localVarName, $varName, $value) {
     $_SESSION[$this->local_current_module."_".$localVarName."_".$varName] = $value;
 }
 
-function setUserVariable($localVarName,$varName, $value) {
-        if($this->is_dynamic ||  $localVarName == 'CELL')return;
+function setUserVariable($localVarName, $varName, $value) {
+        if ($this->is_dynamic || $localVarName == 'CELL')return;
         global $current_user;
         $current_user->setPreference($this->local_current_module."_".$localVarName."_".$varName, $value);
 }
@@ -906,13 +906,13 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function getSessionVariable($localVarName,$varName) {
+ function getSessionVariable($localVarName, $varName) {
     //Set any variables pass in through request first
-    if(isset($_REQUEST[$this->getSessionVariableName($localVarName, $varName)])) {
-        $this->setSessionVariable($localVarName,$varName,$_REQUEST[$this->getSessionVariableName($localVarName, $varName)]);
+    if (isset($_REQUEST[$this->getSessionVariableName($localVarName, $varName)])) {
+        $this->setSessionVariable($localVarName, $varName, $_REQUEST[$this->getSessionVariableName($localVarName, $varName)]);
     }
 
-    if(isset($_SESSION[$this->getSessionVariableName($localVarName, $varName)])) {
+    if (isset($_SESSION[$this->getSessionVariableName($localVarName, $varName)])) {
         return $_SESSION[$this->getSessionVariableName($localVarName, $varName)];
     }
     return "";
@@ -920,10 +920,10 @@ 
 
 function getUserVariable($localVarName, $varName) {
     global $current_user;
-    if($this->is_dynamic ||  $localVarName == 'CELL')return;
-    if(isset($_REQUEST[$this->getSessionVariableName($localVarName, $varName)])) {
+    if ($this->is_dynamic || $localVarName == 'CELL')return;
+    if (isset($_REQUEST[$this->getSessionVariableName($localVarName, $varName)])) {
 
-            $this->setUserVariable($localVarName,$varName,$_REQUEST[$this->getSessionVariableName($localVarName, $varName)]);
+            $this->setUserVariable($localVarName, $varName, $_REQUEST[$this->getSessionVariableName($localVarName, $varName)]);
     }
     return $current_user->getPreference($this->getSessionVariableName($localVarName, $varName));
 }
@@ -947,7 +947,7 @@ 
           'default',
         );
 
-        foreach($priority_map as $p) {
+        foreach ($priority_map as $p) {
             if (key_exists($p, $sortOrderList)) {
                 $order = strtolower($sortOrderList[$p]);
                 if (in_array($order, array('asc', 'desc'))) {
@@ -969,7 +969,7 @@ 
     * All Rights Reserved.
     * Contributor(s): ______________________________________..
     */
-    function getSessionVariableName($localVarName,$varName) {
+    function getSessionVariableName($localVarName, $varName) {
         return $this->local_current_module."_".$localVarName."_".$varName;
     }
 
@@ -997,22 +997,22 @@ 
         SugarVCR::erase($seed->module_dir);
         $params = array();
         //$filter = array('id', 'full_name');
-        $filter=array();
+        $filter = array();
         $ret_array = $seed->create_new_list_query($this->query_orderby, $this->query_where, $filter, $params, 0, '', true, $seed, true);
-        if(!is_array($params)) $params = array();
-        if(!isset($params['custom_select'])) $params['custom_select'] = '';
-        if(!isset($params['custom_from'])) $params['custom_from'] = '';
-        if(!isset($params['custom_where'])) $params['custom_where'] = '';
-        if(!isset($params['custom_order_by'])) $params['custom_order_by'] = '';
-        $main_query = $ret_array['select'] . $params['custom_select'] . $ret_array['from'] . $params['custom_from'] . $ret_array['where'] . $params['custom_where'] . $ret_array['order_by'] . $params['custom_order_by'];
-        SugarVCR::store($seed->module_dir,  $main_query);
+        if (!is_array($params)) $params = array();
+        if (!isset($params['custom_select'])) $params['custom_select'] = '';
+        if (!isset($params['custom_from'])) $params['custom_from'] = '';
+        if (!isset($params['custom_where'])) $params['custom_where'] = '';
+        if (!isset($params['custom_order_by'])) $params['custom_order_by'] = '';
+        $main_query = $ret_array['select'].$params['custom_select'].$ret_array['from'].$params['custom_from'].$ret_array['where'].$params['custom_where'].$ret_array['order_by'].$params['custom_order_by'];
+        SugarVCR::store($seed->module_dir, $main_query);
         //ADDING VCR CONTROL
 
-        if(empty($this->related_field_name)) {
+        if (empty($this->related_field_name)) {
             $response = $seed->get_list($this->query_orderby, $this->query_where, $current_offset, $this->query_limit);
         } else {
             $related_field_name = $this->related_field_name;
-            $response = $seed->get_related_list($this->child_focus,$related_field_name, $this->query_orderby,
+            $response = $seed->get_related_list($this->child_focus, $related_field_name, $this->query_orderby,
             $this->query_where, $current_offset, $this->query_limit);
         }
 
@@ -1021,12 +1021,12 @@ 
         $next_offset = $response['next_offset'];
         $previous_offset = $response['previous_offset'];
 
-        if(!empty($response['current_offset'])) {
+        if (!empty($response['current_offset'])) {
             $current_offset = $response['current_offset'];
         }
 
         $list_view_row_count = $row_count;
-        $this->processListNavigation($xtemplateSection,$html_varName, $current_offset, $next_offset, $previous_offset, $row_count, null, null, empty($seed->column_fields) ? null : count($seed->column_fields));
+        $this->processListNavigation($xtemplateSection, $html_varName, $current_offset, $next_offset, $previous_offset, $row_count, null, null, empty($seed->column_fields) ? null : count($seed->column_fields));
 
         return $list;
     }
@@ -1036,7 +1036,7 @@ 
     function processUnionBeans($sugarbean, $subpanel_def, $html_var = 'CELL') {
 
 		$last_detailview_record = $this->getSessionVariable("detailview", "record");
-		if(!empty($last_detailview_record) && $last_detailview_record != $sugarbean->id){
+		if (!empty($last_detailview_record) && $last_detailview_record != $sugarbean->id) {
 			$GLOBALS['record_has_changed'] = true;
 		}
 		$this->setSessionVariable("detailview", "record", $sugarbean->id);
@@ -1053,14 +1053,14 @@ 
         $sort_order['request'] = isset($_REQUEST['sort_order']) ? $_REQUEST['sort_order'] : null;
 
         // see if the session data has a sort order
-        if (isset($_SESSION['last_sub' . $this->subpanel_module . '_order']))
+        if (isset($_SESSION['last_sub'.$this->subpanel_module.'_order']))
         {
-            $sort_order['session'] = $_SESSION['last_sub' . $this->subpanel_module . '_order'];
+            $sort_order['session'] = $_SESSION['last_sub'.$this->subpanel_module.'_order'];
 
             // We swap the order when the request contains an offset (indicating a column sort issued);
             // otherwise we do not sort.  If we don't make this check, then the subpanel listview will
             // swap ordering each time a new record is entered via quick create forms
-            if (isset($_REQUEST[$module . '_' . $html_var . '_offset']))
+            if (isset($_REQUEST[$module.'_'.$html_var.'_offset']))
             {
                 $sort_order['session'] = $sort_order['session'] == 'asc' ? 'desc' : 'asc';
             }
@@ -1083,10 +1083,10 @@ 
             $this->query_orderby = 'id';
         }
 
-        $this->getOrderBy($html_var,$this->query_orderby, $this->sort_order);
+        $this->getOrderBy($html_var, $this->query_orderby, $this->sort_order);
 
-        $_SESSION['last_sub' .$this->subpanel_module. '_order'] = $this->sort_order;
-        $_SESSION['last_sub' .$this->subpanel_module. '_url'] = $this->getBaseURL($html_var);
+        $_SESSION['last_sub'.$this->subpanel_module.'_order'] = $this->sort_order;
+        $_SESSION['last_sub'.$this->subpanel_module.'_url'] = $this->getBaseURL($html_var);
 
 		// Bug 8139 - Correct Subpanel sorting on 'name', when subpanel sorting default is 'last_name, first_name'
 		if (($this->sortby == 'name' || $this->sortby == 'last_name') &&
@@ -1094,21 +1094,21 @@ 
 			$this->sortby = 'last_name '.$this->sort_order.', first_name ';
 		}
 
-        if(!empty($this->response)){
-            $response =& $this->response;
+        if (!empty($this->response)) {
+            $response = & $this->response;
             echo 'cached';
-        }else{
-            $response = SugarBean::get_union_related_list($sugarbean,$this->sortby, $this->sort_order, $this->query_where, $current_offset, -1, $this->records_per_page,$this->query_limit,$subpanel_def);
-            $this->response =& $response;
+        } else {
+            $response = SugarBean::get_union_related_list($sugarbean, $this->sortby, $this->sort_order, $this->query_where, $current_offset, -1, $this->records_per_page, $this->query_limit, $subpanel_def);
+            $this->response = & $response;
         }
         $list = $response['list'];
         $row_count = $response['row_count'];
         $next_offset = $response['next_offset'];
         $previous_offset = $response['previous_offset'];
-        if(!empty($response['current_offset']))$current_offset = $response['current_offset'];
+        if (!empty($response['current_offset']))$current_offset = $response['current_offset'];
         global $list_view_row_count;
         $list_view_row_count = $row_count;
-        $this->processListNavigation('dyn_list_view', $html_var, $current_offset, $next_offset, $previous_offset, $row_count, $sugarbean,$subpanel_def);
+        $this->processListNavigation('dyn_list_view', $html_var, $current_offset, $next_offset, $previous_offset, $row_count, $sugarbean, $subpanel_def);
 
         return array('list'=>$list, 'parent_data'=>$response['parent_data'], 'query'=>$response['query']);
     }
@@ -1116,34 +1116,34 @@ 
     function getBaseURL($html_varName) {
         static $cache = array();
 
-        if(!empty($cache[$html_varName]))return $cache[$html_varName];
-        $blockVariables = array('mass', 'uid', 'massupdate', 'delete', 'merge', 'selectCount','current_query_by_page');
-        if(!empty($this->base_URL)) {
+        if (!empty($cache[$html_varName]))return $cache[$html_varName];
+        $blockVariables = array('mass', 'uid', 'massupdate', 'delete', 'merge', 'selectCount', 'current_query_by_page');
+        if (!empty($this->base_URL)) {
             return $this->base_URL;
         }
 
             $baseurl = $_SERVER['PHP_SELF'];
-            if(empty($baseurl)) {
+            if (empty($baseurl)) {
                 $baseurl = 'index.php';
             }
 
             /*fixes an issue with deletes when doing a search*/
-            foreach(array_merge($_GET, $_POST) as $name=>$value) {
+            foreach (array_merge($_GET, $_POST) as $name=>$value) {
                 //echo ("$name = $value <br/>");
-                if(!empty($value) && $name != 'sort_order' //&& $name != ListView::getSessionVariableName($html_varName,"ORDER_BY")
-                        && $name != ListView::getSessionVariableName($html_varName,"offset")
+                if (!empty($value) && $name != 'sort_order' //&& $name != ListView::getSessionVariableName($html_varName,"ORDER_BY")
+                        && $name != ListView::getSessionVariableName($html_varName, "offset")
                         /*&& substr_count($name, "ORDER_BY")==0*/ && !in_array($name, $blockVariables))
                 {
-                    if(is_array($value)) {
-                        foreach($value as $valuename=>$valuevalue) {
-                            if(substr_count($baseurl, '?') > 0)
+                    if (is_array($value)) {
+                        foreach ($value as $valuename=>$valuevalue) {
+                            if (substr_count($baseurl, '?') > 0)
                                 $baseurl	.= "&{$name}[]=".$valuevalue;
                             else
                                 $baseurl	.= "?{$name}[]=".$valuevalue;
                         }
                     } else {
                         $value = urlencode($value);
-                        if(substr_count($baseurl, '?') > 0) {
+                        if (substr_count($baseurl, '?') > 0) {
                             $baseurl	.= "&$name=$value";
                         } else {
                             $baseurl	.= "?$name=$value";
@@ -1153,17 +1153,17 @@ 
             }
 
 
-            if($_SERVER['REQUEST_METHOD'] == 'POST') {
+            if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                 // at this point it is possible that the above foreach already executed resulting in double ?'s in the url
-                if(substr_count($baseurl, '?') == 0) {
+                if (substr_count($baseurl, '?') == 0) {
                     $baseurl .= '?';
                 }
-                if(isset($_REQUEST['action'])) $baseurl.= '&action='.$_REQUEST['action'];
-                if(isset($_REQUEST['record'])) $baseurl .= '&record='.$_REQUEST['record'];
-                if(isset($_REQUEST['module'])) $baseurl .= '&module='.$_REQUEST['module'];
+                if (isset($_REQUEST['action'])) $baseurl .= '&action='.$_REQUEST['action'];
+                if (isset($_REQUEST['record'])) $baseurl .= '&record='.$_REQUEST['record'];
+                if (isset($_REQUEST['module'])) $baseurl .= '&module='.$_REQUEST['module'];
             }
 
-            $baseurl .= "&".ListView::getSessionVariableName($html_varName,"offset")."=";
+            $baseurl .= "&".ListView::getSessionVariableName($html_varName, "offset")."=";
             $cache[$html_varName] = $baseurl;
             return $baseurl;
     }
@@ -1177,7 +1177,7 @@ 
     * All Rights Reserved.
     * Contributor(s): ______________________________________..
     */
-    function processListNavigation($xtemplateSection, $html_varName, $current_offset, $next_offset, $previous_offset, $row_count, $sugarbean=null, $subpanel_def=null, $col_count = 20) {
+    function processListNavigation($xtemplateSection, $html_varName, $current_offset, $next_offset, $previous_offset, $row_count, $sugarbean = null, $subpanel_def = null, $col_count = 20) {
 
         global $export_module;
         global $sugar_config;
@@ -1187,40 +1187,40 @@ 
 
         $start_record = $current_offset + 1;
 
-        if(!is_numeric($col_count))
+        if (!is_numeric($col_count))
             $col_count = 20;
 
-        if($row_count == 0)
+        if ($row_count == 0)
             $start_record = 0;
 
         $end_record = $start_record + $this->records_per_page;
         // back up the the last page.
-        if($end_record > $row_count+1) {
-            $end_record = $row_count+1;
+        if ($end_record > $row_count + 1) {
+            $end_record = $row_count + 1;
         }
         // Determine the start location of the last page
-        if($row_count == 0)
+        if ($row_count == 0)
             $number_pages = 0;
         else
             $number_pages = floor(($row_count - 1) / $this->records_per_page);
 
         $last_offset = $number_pages * $this->records_per_page;
 
-        if(empty($this->query_limit)  || $this->query_limit > $this->records_per_page) {
+        if (empty($this->query_limit) || $this->query_limit > $this->records_per_page) {
             $this->base_URL = $this->getBaseURL($html_varName);
             $dynamic_url = '';
 
-            if($this->is_dynamic) {
-                $dynamic_url .='&'. $this->getSessionVariableName($html_varName,'ORDER_BY') . '='. $this->getSessionVariable($html_varName,'ORDER_BY').'&sort_order='.$this->sort_order.'&to_pdf=true&action=SubPanelViewer&subpanel=' . $this->subpanel_module;
+            if ($this->is_dynamic) {
+                $dynamic_url .= '&'.$this->getSessionVariableName($html_varName, 'ORDER_BY').'='.$this->getSessionVariable($html_varName, 'ORDER_BY').'&sort_order='.$this->sort_order.'&to_pdf=true&action=SubPanelViewer&subpanel='.$this->subpanel_module;
             }
 
             $current_URL = htmlentities($this->base_URL.$current_offset.$dynamic_url);
             $start_URL = htmlentities($this->base_URL."0".$dynamic_url);
-            $previous_URL  = htmlentities($this->base_URL.$previous_offset.$dynamic_url);
+            $previous_URL = htmlentities($this->base_URL.$previous_offset.$dynamic_url);
             $next_URL  = htmlentities($this->base_URL.$next_offset.$dynamic_url);
-            $end_URL  = htmlentities($this->base_URL.'end'.$dynamic_url);
+            $end_URL = htmlentities($this->base_URL.'end'.$dynamic_url);
 
-            if(!empty($this->start_link_wrapper)) {
+            if (!empty($this->start_link_wrapper)) {
                 $current_URL = $this->start_link_wrapper.$current_URL.$this->end_link_wrapper;
                 $start_URL = $this->start_link_wrapper.$start_URL.$this->end_link_wrapper;
                 $previous_URL = $this->start_link_wrapper.$previous_URL.$this->end_link_wrapper;
@@ -1230,7 +1230,7 @@ 
 
             $moduleString = htmlspecialchars("{$currentModule}_{$html_varName}_offset");
             $moduleStringOrder = htmlspecialchars("{$currentModule}_{$html_varName}_ORDER_BY");
-            if($this->shouldProcess && !$this->multi_select_popup) {
+            if ($this->shouldProcess && !$this->multi_select_popup) {
                 // check the checkboxes onload
                 echo "<script>YAHOO.util.Event.addListener(window, \"load\", sListView.check_boxes);</script>\n";
 
@@ -1238,7 +1238,7 @@ 
                 $uids = empty($_REQUEST['uid']) || $massUpdateRun ? '' : $_REQUEST['uid'];
                 $select_entire_list = ($massUpdateRun) ? 0 : (isset($_POST['select_entire_list']) ? $_POST['select_entire_list'] : (isset($_REQUEST['select_entire_list']) ? htmlspecialchars($_REQUEST['select_entire_list']) : 0));
 
-                echo "<textarea style='display: none' name='uid'>{$uids}</textarea>\n" .
+                echo "<textarea style='display: none' name='uid'>{$uids}</textarea>\n".
                     "<input type='hidden' name='select_entire_list' value='{$select_entire_list}'>\n".
                     "<input type='hidden' name='{$moduleString}' value='0'>\n".
                     "<input type='hidden' name='{$moduleStringOrder}' value='0'>\n";
@@ -1248,64 +1248,64 @@ 
 
             $GLOBALS['log']->debug("Offsets: (start, previous, next, last)(0, $previous_offset, $next_offset, $last_offset)");
 
-            if(0 == $current_offset) {
-                $start_link = "<button type='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("start_off","aborder='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_START'])."</button>";
-                $previous_link = "<button type='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("previous_off","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
+            if (0 == $current_offset) {
+                $start_link = "<button type='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("start_off", "aborder='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START'])."</button>";
+                $previous_link = "<button type='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("previous_off", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
             } else {
-                if($this->multi_select_popup) {// nav links for multiselect popup, submit form to save checks.
-                    $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick='javascript:save_checks(0, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("start","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_START'])."</button>";
-                    $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick='javascript:save_checks($previous_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("previous","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
-                } elseif($this->shouldProcess) {
-                    $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick='location.href=\"$start_URL\"; sListView.save_checks(0, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("start","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_START'])."</button>";
-                    $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick='location.href=\"$previous_URL\"; sListView.save_checks($previous_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("previous","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
+                if ($this->multi_select_popup) {// nav links for multiselect popup, submit form to save checks.
+                    $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick='javascript:save_checks(0, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("start", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START'])."</button>";
+                    $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick='javascript:save_checks($previous_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("previous", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
+                } elseif ($this->shouldProcess) {
+                    $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick='location.href=\"$start_URL\"; sListView.save_checks(0, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("start", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START'])."</button>";
+                    $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick='location.href=\"$previous_URL\"; sListView.save_checks($previous_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("previous", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
                 } else {
                     $onClick = '';
-                    if(0 != preg_match('/javascript.*/', $start_URL)){
+                    if (0 != preg_match('/javascript.*/', $start_URL)) {
                         $onClick = "\"$start_URL;\"";
-                    }else{
-                        $onClick ="'location.href=\"$start_URL\";'";
+                    } else {
+                        $onClick = "'location.href=\"$start_URL\";'";
                     }
-                    $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("start","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_START'])."</button>";
+                    $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("start", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START'])."</button>";
 
                     $onClick = '';
-                    if(0 != preg_match('/javascript.*/', $previous_URL)){
+                    if (0 != preg_match('/javascript.*/', $previous_URL)) {
                         $onClick = "\"$previous_URL;\"";
-                    }else{
+                    } else {
                         $onClick = "'location.href=\"$previous_URL\";'";
                     }
-                    $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("previous","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
+                    $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("previous", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
                 }
             }
 
-            if($last_offset <= $current_offset) {
-                $end_link = "<button type='button' name='listViewEndButton' title='{$this->local_app_strings['LNK_LIST_END']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("end_off","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_END'])."</button>";
-                $next_link = "<button type='button' name='listViewNextButton' title='{$this->local_app_strings['LNK_LIST_NEXT']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("next_off","aborder='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_NEXT'])."</button>";
+            if ($last_offset <= $current_offset) {
+                $end_link = "<button type='button' name='listViewEndButton' title='{$this->local_app_strings['LNK_LIST_END']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("end_off", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END'])."</button>";
+                $next_link = "<button type='button' name='listViewNextButton' title='{$this->local_app_strings['LNK_LIST_NEXT']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("next_off", "aborder='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT'])."</button>";
             } else {
-                if($this->multi_select_popup) { // nav links for multiselect popup, submit form to save checks.
-                    $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick='javascript:save_checks($last_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("end","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_END'])."</button>";
-                    if(!empty($sugar_config['disable_count_query'])) {
+                if ($this->multi_select_popup) { // nav links for multiselect popup, submit form to save checks.
+                    $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick='javascript:save_checks($last_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("end", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END'])."</button>";
+                    if (!empty($sugar_config['disable_count_query'])) {
                         $end_link = '';
                     }
-                    $next_link = "<button type='button' name='listViewNextButton' title='{$this->local_app_strings['LNK_LIST_NEXT']}' class='button' onClick='javascript:save_checks($next_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("next","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_NEXT'])."</button>";
-                } elseif($this->shouldProcess) {
-                    $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick='location.href=\"$end_URL\"; sListView.save_checks(\"end\", \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("end","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_END'])."</button>";
-                    $next_link = "<button type='button' name='listViewNextButton' class='button' title='{$this->local_app_strings['LNK_LIST_NEXT']}' onClick='location.href=\"$next_URL\"; sListView.save_checks($next_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("next","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_NEXT'])."</button>";
+                    $next_link = "<button type='button' name='listViewNextButton' title='{$this->local_app_strings['LNK_LIST_NEXT']}' class='button' onClick='javascript:save_checks($next_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("next", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT'])."</button>";
+                } elseif ($this->shouldProcess) {
+                    $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick='location.href=\"$end_URL\"; sListView.save_checks(\"end\", \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("end", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END'])."</button>";
+                    $next_link = "<button type='button' name='listViewNextButton' class='button' title='{$this->local_app_strings['LNK_LIST_NEXT']}' onClick='location.href=\"$next_URL\"; sListView.save_checks($next_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("next", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT'])."</button>";
                 } else {
                     $onClick = '';
-                    if(0 != preg_match('/javascript.*/', $next_URL)){
+                    if (0 != preg_match('/javascript.*/', $next_URL)) {
                         $onClick = "\"$next_URL;\"";
-                    }else{
-                        $onClick ="'location.href=\"$next_URL\";'";
+                    } else {
+                        $onClick = "'location.href=\"$next_URL\";'";
                     }
-                    $next_link = "<button type='button' name='listViewNextButton' class='button' title='{$this->local_app_strings['LNK_LIST_NEXT']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("next","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_NEXT'])."</button>";
+                    $next_link = "<button type='button' name='listViewNextButton' class='button' title='{$this->local_app_strings['LNK_LIST_NEXT']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("next", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT'])."</button>";
 
                     $onClick = '';
-                    if(0 != preg_match('/javascript.*/', $end_URL)){
+                    if (0 != preg_match('/javascript.*/', $end_URL)) {
                         $onClick = "\"$end_URL;\"";
-                    }else{
+                    } else {
                         $onClick = "'location.href=\"$end_URL\";'";
                     }
-                    $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("end","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_END'])."</button>";
+                    $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("end", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END'])."</button>";
 
                 }
             }
@@ -1313,7 +1313,7 @@ 
             $GLOBALS['log']->info("Offset (next, current, prev)($next_offset, $current_offset, $previous_offset)");
             $GLOBALS['log']->info("Start/end records ($start_record, $end_record)");
 
-            $end_record = $end_record-1;
+            $end_record = $end_record - 1;
 
 $script_href = "<a style=\'width: 150px\' name=\"thispage\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'if (document.MassUpdate.select_entire_list.value==1){document.MassUpdate.select_entire_list.value=0;sListView.check_all(document.MassUpdate, \"mass[]\", true, $this->records_per_page)}else {sListView.check_all(document.MassUpdate, \"mass[]\", true)};\' href=\'#\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_CURRENT']}&nbsp;&#x28;{$this->records_per_page}&#x29;&#x200E;</a>"
  . "<a style=\'width: 150px\' name=\"selectall\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'sListView.check_entire_list(document.MassUpdate, \"mass[]\",true,{$row_count});\' href=\'#\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_ENTIRE']}&nbsp;&#x28;{$row_count}&#x29;&#x200E;</a>"
@@ -1336,14 +1336,14 @@ 
                 }
                 </script>";
 
-            if($this->show_select_menu)
+            if ($this->show_select_menu)
             {
                 $total_label = "";
                 $total = $row_count;
                 $pageTotal = ($row_count > 0) ? $end_record - $start_record + 1 : 0;
                 if (!empty($GLOBALS['sugar_config']['disable_count_query']) && $GLOBALS['sugar_config']['disable_count_query'] === true && $total > $pageTotal) {
                     $this->show_plus = true;
-                    $total =  $pageTotal;
+                    $total = $pageTotal;
                     $total_label = $total.'+';
                 } else {
                     $this->show_plus = false;
@@ -1365,16 +1365,16 @@ 
                     'id' => 'selectLink',
                     'buttons' => $menuItems,
                     'flat' => false,
-                ),$this->xTemplate);
+                ), $this->xTemplate);
 
             } else {
                 $select_link = "&nbsp;";
             }
 
-            $export_link = '<input class="button" type="button" value="'.$this->local_app_strings['LBL_EXPORT'].'" ' .
+            $export_link = '<input class="button" type="button" value="'.$this->local_app_strings['LBL_EXPORT'].'" '.
                     'onclick="return sListView.send_form(true, \''.$_REQUEST['module'].'\', \'index.php?entryPoint=export\',\''.$this->local_app_strings['LBL_LISTVIEW_NO_SELECTED'].'\')">';
 
-            if($this->show_delete_button) {
+            if ($this->show_delete_button) {
                 $delete_link = '<input class="button" type="button" id="delete_button" name="Delete" value="'.$this->local_app_strings['LBL_DELETE_BUTTON_LABEL'].'" onclick="return sListView.send_mass_update(\'selected\',\''.$this->local_app_strings['LBL_LISTVIEW_NO_SELECTED'].'\', 1)">';
             } else {
                 $delete_link = '&nbsp;';
@@ -1384,7 +1384,7 @@ 
             $admin->retrieveSettings('system');
 
             $user_merge = $current_user->getPreference('mailmerge_on');
-            if($user_merge == 'on' && isset($admin->settings['system_mailmerge_on']) && $admin->settings['system_mailmerge_on']) {
+            if ($user_merge == 'on' && isset($admin->settings['system_mailmerge_on']) && $admin->settings['system_mailmerge_on']) {
                 echo "<script>
                 function mailmerge_dialog(el) {
                    	var \$dialog = \$('<div></div>')
@@ -1393,7 +1393,7 @@ 
                         . "<a style=\'width: 150px\' class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' href=\'index.php?action=index&module=MailMerge&entire=true\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_ENTIRE']}</a>')
 					.dialog({
 						autoOpen: false,
-						title: '". $this->local_app_strings['LBL_MAILMERGE']."',
+						title: '".$this->local_app_strings['LBL_MAILMERGE']."',
 						width: 150,
 						position: {
 						    my: myPos,
@@ -1409,16 +1409,16 @@ 
                 $merge_link = "&nbsp;";
             }
 
-            $selected_objects_span = "&nbsp;|&nbsp;{$this->local_app_strings['LBL_LISTVIEW_SELECTED_OBJECTS']}<input  style='border: 0px; background: transparent; font-size: inherit; color: inherit' type='text' readonly name='selectCount[]' value='" . ((isset($_POST['mass'])) ? count($_POST['mass']): 0) . "' />";
+            $selected_objects_span = "&nbsp;|&nbsp;{$this->local_app_strings['LBL_LISTVIEW_SELECTED_OBJECTS']}<input  style='border: 0px; background: transparent; font-size: inherit; color: inherit' type='text' readonly name='selectCount[]' value='".((isset($_POST['mass'])) ? count($_POST['mass']) : 0)."' />";
 
-            if($_REQUEST['module'] == 'Home' || $this->local_current_module == 'Import'
+            if ($_REQUEST['module'] == 'Home' || $this->local_current_module == 'Import'
                 || $this->show_export_button == false
                 || (!empty($sugar_config['disable_export']))
                 || (!empty($sugar_config['admin_export_only'])
                 && !(
                         is_admin($current_user)
                         || (ACLController::moduleSupportsACL($_REQUEST['module'])
-                            && ACLAction::getUserAccessLevel($current_user->id,$_REQUEST['module'], 'access') == ACL_ALLOW_ENABLED
+                            && ACLAction::getUserAccessLevel($current_user->id, $_REQUEST['module'], 'access') == ACL_ALLOW_ENABLED
                             && (ACLAction::getUserAccessLevel($current_user->id, $_REQUEST['module'], 'admin') == ACL_ALLOW_ADMIN ||
                                 ACLAction::getUserAccessLevel($current_user->id, $_REQUEST['module'], 'admin') == ACL_ALLOW_ADMIN_DEV)))))
             {
@@ -1427,13 +1427,13 @@ 
                 }
                 $export_link = "&nbsp;";
                 $merge_link = "&nbsp;";
-            } elseif($_REQUEST['module'] != "Accounts" && $_REQUEST['module'] != "Cases" && $_REQUEST['module'] != "Contacts" && $_REQUEST['module'] != "Leads" && $_REQUEST['module'] != "Opportunities") {
+            } elseif ($_REQUEST['module'] != "Accounts" && $_REQUEST['module'] != "Cases" && $_REQUEST['module'] != "Contacts" && $_REQUEST['module'] != "Leads" && $_REQUEST['module'] != "Opportunities") {
                 $merge_link = "&nbsp;";
             }
 
-            if($this->show_paging == true) {
-                if(!empty($sugar_config['disable_count_query'])) {
-                    if($row_count > $end_record) {
+            if ($this->show_paging == true) {
+                if (!empty($sugar_config['disable_count_query'])) {
+                    if ($row_count > $end_record) {
                         $row_count .= '+';
                     }
                 }
@@ -1449,16 +1449,16 @@ 
                     $html_text .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\"><tr><td align=\"left\"  >";
 
                     //attempt to get the query to recreate this subpanel
-                    if(!empty($this->response)){
-                        $response =& $this->response;
-                    }else{
-                        $response = SugarBean::get_union_related_list($sugarbean,$this->sortby, $this->sort_order, $this->query_where, $current_offset, -1, $this->records_per_page,$this->query_limit,$subpanel_def);
+                    if (!empty($this->response)) {
+                        $response = & $this->response;
+                    } else {
+                        $response = SugarBean::get_union_related_list($sugarbean, $this->sortby, $this->sort_order, $this->query_where, $current_offset, -1, $this->records_per_page, $this->query_limit, $subpanel_def);
                         $this->response = $response;
                     }
                     //if query is present, then pass it in as parameter
-                    if (isset($response['query']) && !empty($response['query'])){
+                    if (isset($response['query']) && !empty($response['query'])) {
                         $html_text .= $subpanelTiles->get_buttons($subpanel_def, $response['query']);
-                    }else{
+                    } else {
                         $html_text .= $subpanelTiles->get_buttons($subpanel_def);
                     }
                 }
@@ -1468,11 +1468,11 @@ 
                 $html_text .= "</td>\n<td nowrap align=\"right\">".$start_link."&nbsp;&nbsp;".$previous_link."&nbsp;&nbsp;<span class='pageNumbers'>(".$start_record." - ".$end_record." ".$this->local_app_strings['LBL_LIST_OF']." ".$row_count.")</span>&nbsp;&nbsp;".$next_link."&nbsp;&nbsp;".$end_link."</td></tr></table>\n";
                 $html_text .= "</td>\n";
                 $html_text .= "</tr>\n";
-                $this->xTemplate->assign("PAGINATION",$html_text);
+                $this->xTemplate->assign("PAGINATION", $html_text);
             }
 
             //C.L. - Fix for 23461
-            if(empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
+            if (empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
                 $_SESSION['export_where'] = $this->query_where;
             }
             $this->xTemplate->parse($xtemplateSection.".list_nav_row");
@@ -1481,24 +1481,24 @@ 
 
     function processOrderBy($html_varName) {
 
-        if(!isset($this->base_URL)) {
+        if (!isset($this->base_URL)) {
             $this->base_URL = $_SERVER['PHP_SELF'];
 
-            if(isset($_SERVER['QUERY_STRING'])) {
-                $this->base_URL = preg_replace("/\&".$this->getSessionVariableName($html_varName,"ORDER_BY")."=[0-9a-zA-Z\_\.]*/","",$this->base_URL .'?'.$_SERVER['QUERY_STRING']);
-                $this->base_URL = preg_replace("/\&".$this->getSessionVariableName($html_varName,"offset")."=[0-9]*/","",$this->base_URL);
+            if (isset($_SERVER['QUERY_STRING'])) {
+                $this->base_URL = preg_replace("/\&".$this->getSessionVariableName($html_varName, "ORDER_BY")."=[0-9a-zA-Z\_\.]*/", "", $this->base_URL.'?'.$_SERVER['QUERY_STRING']);
+                $this->base_URL = preg_replace("/\&".$this->getSessionVariableName($html_varName, "offset")."=[0-9]*/", "", $this->base_URL);
             }
-            if($_SERVER['REQUEST_METHOD'] == 'POST') {
+            if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                 $this->base_URL .= '?';
-                if(isset($_REQUEST['action'])) $this->base_URL .= '&action='.$_REQUEST['action'];
-                if(isset($_REQUEST['record'])) $this->base_URL .= '&record='.$_REQUEST['record'];
-                if(isset($_REQUEST['module'])) $this->base_URL .= '&module='.$_REQUEST['module'];
+                if (isset($_REQUEST['action'])) $this->base_URL .= '&action='.$_REQUEST['action'];
+                if (isset($_REQUEST['record'])) $this->base_URL .= '&record='.$_REQUEST['record'];
+                if (isset($_REQUEST['module'])) $this->base_URL .= '&module='.$_REQUEST['module'];
             }
-            $this->base_URL .= "&".$this->getSessionVariableName($html_varName,"offset")."=";
+            $this->base_URL .= "&".$this->getSessionVariableName($html_varName, "offset")."=";
         }
 
-        if($this->is_dynamic) {
-            $this->base_URL.='&to_pdf=true&action=SubPanelViewer&subpanel=' . $this->source_module;
+        if ($this->is_dynamic) {
+            $this->base_URL .= '&to_pdf=true&action=SubPanelViewer&subpanel='.$this->source_module;
         }
 
         //bug43465 start
@@ -1506,19 +1506,19 @@ 
         {
             foreach ($this->appendToBaseUrl as $key => $value)
             {
-                $fullRequestString = $key . '=' . $value;
+                $fullRequestString = $key.'='.$value;
 
                 if ($this->base_URL == "/index.php")
                 {
                     $this->base_URL .= "?";
                 } else
                 {
-                    if ($fullRequestString == substr($this->baseURL, '-' . strlen($fullRequestString)))
+                    if ($fullRequestString == substr($this->baseURL, '-'.strlen($fullRequestString)))
                     {
-                        $this->base_URL = preg_replace("/&" . $key . "\=.*/", "", $this->base_URL);
+                        $this->base_URL = preg_replace("/&".$key."\=.*/", "", $this->base_URL);
                     } else
                     {
-                        $this->base_URL = preg_replace("/&" . $key . "\=.*?&/", "&", $this->base_URL);
+                        $this->base_URL = preg_replace("/&".$key."\=.*?&/", "&", $this->base_URL);
                     }
                     $this->base_URL .= "&";
                 }
@@ -1530,9 +1530,9 @@ 
         }
         //bug43465 end
 
-        $sort_URL_base = $this->base_URL. "&".$this->getSessionVariableName($html_varName,"ORDER_BY")."=";
+        $sort_URL_base = $this->base_URL."&".$this->getSessionVariableName($html_varName, "ORDER_BY")."=";
 
-        if($sort_URL_base !== "")
+        if ($sort_URL_base !== "")
         {
             $this->xTemplate->assign("ORDER_BY", $sort_URL_base);
             return $sort_URL_base;
@@ -1583,19 +1583,19 @@ 
         $mergeList = array();
         $module = '';
         //todo what is this?  It is using an array as a boolean
-        while(list($aVal, $aItem) = each($data))
+        while (list($aVal, $aItem) = each($data))
         {
-            if(isset($this->data_array)) {
+            if (isset($this->data_array)) {
                 $fields = $this->data_array;
             } else {
                 $aItem->check_date_relationships_load();
                 $fields = $aItem->get_list_view_data();
             }
 
-            if(is_object($aItem)) { // cn: bug 5349
+            if (is_object($aItem)) { // cn: bug 5349
                 //add item id to merge list, if the button is clicked
                 $mergeList[] = $aItem->id;
-                if(empty($module)) {
+                if (empty($module)) {
                     $module = $aItem->module_dir;
                 }
             }
@@ -1604,37 +1604,37 @@ 
                 $fields['OFFSET'] = ($offset + $count + 1);
 
             $fields['STAMP'] = $timeStamp;
-            if($this->shouldProcess) {
+            if ($this->shouldProcess) {
 
             $prerow = '';
-            if(!isset($this->data_array)) {
-                $prerow .= "<input onclick='sListView.check_item(this, document.MassUpdate)' type='checkbox' class='checkbox' name='mass[]' value='". $fields['ID']. "'>";
+            if (!isset($this->data_array)) {
+                $prerow .= "<input onclick='sListView.check_item(this, document.MassUpdate)' type='checkbox' class='checkbox' name='mass[]' value='".$fields['ID']."'>";
             }
             $this->xTemplate->assign('PREROW', $prerow);
 
             $this->xTemplate->assign('CHECKALL', "<input type='checkbox' class='checkbox'  title='".$GLOBALS['app_strings']['LBL_SELECT_ALL_TITLE']."'  name='massall' id='massall' value='' onclick='sListView.check_all(document.MassUpdate, \"mass[]\", this.checked)'>");
             }
-            if(!isset($this->data_array)) {
+            if (!isset($this->data_array)) {
                 $tag = $aItem->listviewACLHelper();
-                $this->xTemplate->assign('TAG',$tag) ;
+                $this->xTemplate->assign('TAG', $tag);
             }
 
-            if($oddRow)
+            if ($oddRow)
             {
                 $ROW_COLOR = 'oddListRow';
-                $BG_COLOR =  $odd_bg;
+                $BG_COLOR = $odd_bg;
             }
             else
             {
                 $ROW_COLOR = 'evenListRow';
-                $BG_COLOR =  $even_bg;
+                $BG_COLOR = $even_bg;
             }
             $oddRow = !$oddRow;
 
             $this->xTemplate->assign('ROW_COLOR', $ROW_COLOR);
             $this->xTemplate->assign('BG_COLOR', $BG_COLOR);
 
-            if(isset($this->data_array))
+            if (isset($this->data_array))
             {
                 $this->xTemplate->assign('KEY', $aVal);
                 $this->xTemplate->assign('VALUE', $aItem);
@@ -1645,23 +1645,23 @@ 
             {
     //AED -- some modules do not have their additionalDetails.php established. Add a check to ensure require_once does not fail
     // Bug #2786
-                if($this->_additionalDetails && $aItem->ACLAccess('DetailView') && (file_exists('modules/' . $aItem->module_dir . '/metadata/additionalDetails.php') || file_exists('custom/modules/' . $aItem->module_dir . '/metadata/additionalDetails.php'))) {
+                if ($this->_additionalDetails && $aItem->ACLAccess('DetailView') && (file_exists('modules/'.$aItem->module_dir.'/metadata/additionalDetails.php') || file_exists('custom/modules/'.$aItem->module_dir.'/metadata/additionalDetails.php'))) {
 
-                    $additionalDetailsFile = 'modules/' . $aItem->module_dir . '/metadata/additionalDetails.php';
-                    if(file_exists('custom/modules/' . $aItem->module_dir . '/metadata/additionalDetails.php')){
-                        $additionalDetailsFile = 'custom/modules/' . $aItem->module_dir . '/metadata/additionalDetails.php';
+                    $additionalDetailsFile = 'modules/'.$aItem->module_dir.'/metadata/additionalDetails.php';
+                    if (file_exists('custom/modules/'.$aItem->module_dir.'/metadata/additionalDetails.php')) {
+                        $additionalDetailsFile = 'custom/modules/'.$aItem->module_dir.'/metadata/additionalDetails.php';
                     }
 
                     require_once($additionalDetailsFile);
-                    $ad_function = (empty($this->additionalDetailsFunction) ? 'additionalDetails' : $this->additionalDetailsFunction) . $aItem->object_name;
+                    $ad_function = (empty($this->additionalDetailsFunction) ? 'additionalDetails' : $this->additionalDetailsFunction).$aItem->object_name;
                     $results = $ad_function($fields);
                     $results['string'] = str_replace(array("&#039", "'"), '\&#039', $results['string']); // no xss!
 
-                    if(trim($results['string']) == '') $results['string'] = $app_strings['LBL_NONE'];
+                    if (trim($results['string']) == '') $results['string'] = $app_strings['LBL_NONE'];
                     $fields[$results['fieldToAddTo']] = $fields[$results['fieldToAddTo']].'</a>';
                 }
 
-                if($aItem->ACLAccess('Delete')) {
+                if ($aItem->ACLAccess('Delete')) {
                     $delete = '<a class="listViewTdToolsS1" onclick="return confirm(\''.$this->local_app_strings['NTC_DELETE_CONFIRMATION'].'\')" href="'.'index.php?action=Delete&module='.$aItem->module_dir.'&record='.$fields['ID'].'&return_module='.$aItem->module_dir.'&return_action=index&return_id=">'.$this->local_app_strings['LBL_DELETE_INLINE'].'</a>';
                     require_once('include/Smarty/plugins/function.sugar_action_menu.php');
                     $fields['DELETE_BUTTON'] = smarty_function_sugar_action_menu(array(
@@ -1675,26 +1675,26 @@ 
                 $aItem->setupCustomFields($aItem->module_dir);
                 $aItem->custom_fields->populateAllXTPL($this->xTemplate, 'detail', $html_varName, $fields);
             }
-            if(!isset($this->data_array) && $aItem->ACLAccess('DetailView')) {
+            if (!isset($this->data_array) && $aItem->ACLAccess('DetailView')) {
                 $count++;
             }
-            if(isset($this->data_array)) {
+            if (isset($this->data_array)) {
                 $count++;
             }
-            if(!isset($this->data_array)) {
+            if (!isset($this->data_array)) {
                 $aItem->list_view_parse_additional_sections($this->xTemplate, $xtemplateSection);
 
-                if($this->xTemplate->exists($xtemplateSection.'.row.pro')) {
+                if ($this->xTemplate->exists($xtemplateSection.'.row.pro')) {
                     $this->xTemplate->parse($xtemplateSection.'.row.pro');
                 }
             }
-            $this->xTemplate->parse($xtemplateSection . '.row');
+            $this->xTemplate->parse($xtemplateSection.'.row');
 
-            if(isset($fields['ID'])) {
+            if (isset($fields['ID'])) {
                 $associated_row_data[$fields['ID']] = $fields;
                 // Bug 38908: cleanup data for JS to avoid having &nbsp; shuffled around
-                foreach($fields as $key => $value) {
-                    if($value == '&nbsp;') {
+                foreach ($fields as $key => $value) {
+                    if ($value == '&nbsp;') {
                         $associated_row_data[$fields['ID']][$key] = '';
                     }
                 }
@@ -1703,21 +1703,21 @@ 
 
         $_SESSION['MAILMERGE_RECORDS'] = $mergeList;
         $_SESSION['MAILMERGE_MODULE_FROM_LISTVIEW'] = $module;
-        if(empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
+        if (empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
             $_SESSION['MAILMERGE_MODULE'] = $module;
         }
 
-        if($this->process_for_popups)
+        if ($this->process_for_popups)
         {
             $json = getJSONobj();
             $is_show_fullname = showFullName() ? 1 : 0;
-            $associated_javascript_data = '<script type="text/javascript">' . "\n"
+            $associated_javascript_data = '<script type="text/javascript">'."\n"
                 //. '<!-- // associated javascript data generated by ListView' . "\n"
                 . 'var associated_javascript_data = '
-                . $json->encode($associated_row_data) . ";\n"
+                . $json->encode($associated_row_data).";\n"
                 //. '-->' . "\n"
                 . 'var is_show_fullname = '
-                . $is_show_fullname . ";\n"
+                . $is_show_fullname.";\n"
                 . '</script>';
             $this->xTemplate->assign('ASSOCIATED_JAVASCRIPT_DATA', $associated_javascript_data);
         }
@@ -1729,7 +1729,7 @@ 
     function getLayoutManager()
     {
         require_once('include/generic/LayoutManager.php');
-        if($this->layout_manager == null)
+        if ($this->layout_manager == null)
         {
             $this->layout_manager = new LayoutManager();
         }
@@ -1742,36 +1742,36 @@ 
 
 
         $layout_manager = $this->getLayoutManager();
-        $layout_manager->setAttribute('order_by_link',$this->processOrderBy($html_var));
-        $layout_manager->setAttribute('context','HeaderCell');
-        $layout_manager->setAttribute('image_path',$this->local_image_path);
-        $layout_manager->setAttribute('html_varName',$html_var);
+        $layout_manager->setAttribute('order_by_link', $this->processOrderBy($html_var));
+        $layout_manager->setAttribute('context', 'HeaderCell');
+        $layout_manager->setAttribute('image_path', $this->local_image_path);
+        $layout_manager->setAttribute('html_varName', $html_var);
         $layout_manager->setAttribute('module_name', $source_module);
-        list($orderBy,$desc) = $this->getOrderByInfo($html_var);
+        list($orderBy, $desc) = $this->getOrderByInfo($html_var);
 
-        if($orderBy == 'amount*1')
+        if ($orderBy == 'amount*1')
         {
-            $orderBy=  'amount';
+            $orderBy = 'amount';
         }
 		$buttons = false;
         $col_count = 0;
-        foreach($subpanel_def->get_list_fields() as $column_name=>$widget_args)
+        foreach ($subpanel_def->get_list_fields() as $column_name=>$widget_args)
         {
             $usage = empty($widget_args['usage']) ? '' : $widget_args['usage'];
-            if($usage != 'query_only' || !empty($widget_args['force_query_only_display']))
+            if ($usage != 'query_only' || !empty($widget_args['force_query_only_display']))
             {
                 $imgArrow = '';
 
-                if($orderBy == $column_name || (isset($widget_args['sort_by']) && str_replace('.','_',$widget_args['sort_by']) == $orderBy))
+                if ($orderBy == $column_name || (isset($widget_args['sort_by']) && str_replace('.', '_', $widget_args['sort_by']) == $orderBy))
                 {
                     $imgArrow = "_down";
-                    if($this->sort_order == 'asc') {
+                    if ($this->sort_order == 'asc') {
                         $imgArrow = "_up";
                     }
                 }
 
                 if (!preg_match("/_button/i", $column_name)) {
-	                $widget_args['name']=$column_name;
+	                $widget_args['name'] = $column_name;
 	                $widget_args['sort'] = $imgArrow;
 	                $widget_args['start_link_wrapper'] = $this->start_link_wrapper;
 	                $widget_args['end_link_wrapper'] = $this->end_link_wrapper;
@@ -1781,8 +1781,8 @@ 
 	                $cell_width = empty($widget_args['width']) ? '' : $widget_args['width'];
 	                $this->xTemplate->assign('HEADER_CELL', $widget_contents);
 	                static $count;
-	            if(!isset($count))$count = 0; else $count++;
-                    if($col_count == 0 || $column_name == 'name') $footable = 'data-toggle="true"';
+	            if (!isset($count))$count = 0; else $count++;
+                    if ($col_count == 0 || $column_name == 'name') $footable = 'data-toggle="true"';
                     else {
                         $footable = 'data-hide="phone"';
                         if ($col_count > 2) $footable = 'data-hide="phone,phonelandscape"';
@@ -1799,7 +1799,7 @@ 
             ++$col_count;
         }
 
-        if($buttons) {
+        if ($buttons) {
                     $this->xTemplate->assign('FOOTABLE', '');
         			$this->xTemplate->assign('HEADER_CELL', "&nbsp;");
         			$this->xTemplate->assign('CELL_COUNT', $count);
@@ -1827,37 +1827,37 @@ 
 
     function processListViewTwo($seed, $xTemplateSection, $html_varName) {
         global $current_user;
-        if(!isset($this->xTemplate)) {
+        if (!isset($this->xTemplate)) {
             $this->createXTemplate();
         }
 
         $isSugarBean = is_subclass_of($seed, "SugarBean");
         $list = null;
 
-        if($isSugarBean) {
+        if ($isSugarBean) {
             $list = $this->processSugarBean($xTemplateSection, $html_varName, $seed);
         } else {
             $list = $seed;
         }
 
         if (is_object($seed) && isset($seed->object_name) && $seed->object_name == 'WorkFlow') {
-            $tab=array();
+            $tab = array();
             $access = get_workflow_admin_modules_for_user($current_user);
             for ($i = 0; $i < count($list); $i++) {
-                if(!empty($access[$list[$i]->base_module])){
-                    $tab[]=$list[$i];
+                if (!empty($access[$list[$i]->base_module])) {
+                    $tab[] = $list[$i];
                 }
             }
             $list = $tab;
         }
 
-        if($this->is_dynamic) {
-            $this->processHeaderDynamic($xTemplateSection,$html_varName);
-            $this->processListRows($list,$xTemplateSection, $html_varName);
+        if ($this->is_dynamic) {
+            $this->processHeaderDynamic($xTemplateSection, $html_varName);
+            $this->processListRows($list, $xTemplateSection, $html_varName);
         } else {
             $this->processSortArrows($html_varName);
 
-            if($isSugarBean) {
+            if ($isSugarBean) {
                 $seed->parse_additional_headers($this->xTemplate, $xTemplateSection);
             }
             $this->xTemplateAssign('CHECKALL', SugarThemeRegistry::current()->getImage('blank', '', 1, 1, ".gif", ''));
@@ -1866,19 +1866,19 @@ 
             $this->processOrderBy($html_varName);
 
 
-            $this->processListRows($list,$xTemplateSection, $html_varName);
+            $this->processListRows($list, $xTemplateSection, $html_varName);
         }
 
-        if($this->display_header_and_footer) {
+        if ($this->display_header_and_footer) {
             $this->getAdditionalHeader();
-            if(!empty($this->header_title)) {
+            if (!empty($this->header_title)) {
                 echo get_form_header($this->header_title, $this->header_text, false);
             }
         }
 
         $this->xTemplate->out($xTemplateSection);
 
-        if(isset($_SESSION['validation'])) {
+        if (isset($_SESSION['validation'])) {
             print base64_decode('PGEgaHJlZj0naHR0cDovL3d3dy5zdWdhcmNybS5jb20nPlBPV0VSRUQmbmJzcDtCWSZuYnNwO1NVR0FSQ1JNPC9hPg==');
         }
     }
@@ -1890,7 +1890,7 @@ 
     }
 
     function getArrowUpDownStart($upDown) {
-        $ext = ( SugarThemeRegistry::current()->pngSupport ? "png" : "gif" );
+        $ext = (SugarThemeRegistry::current()->pngSupport ? "png" : "gif");
 
         if (!isset($upDown) || empty($upDown)) {
             $upDown = "";
@@ -1901,7 +1901,7 @@ 
 	function getArrowEnd() {
 		$imgFileParts = pathinfo(SugarThemeRegistry::current()->getImageURL("arrow.gif"));
 
-        list($width,$height) = ListView::getArrowImageSize();
+        list($width, $height) = ListView::getArrowImageSize();
 
 		return '.'.$imgFileParts['extension']."' width='$width' height='$height' align='absmiddle' alt=".translate('LBL_SORT').">";
     }
@@ -1912,13 +1912,13 @@ 
         }
         $imgFileParts = pathinfo(SugarThemeRegistry::current()->getImageURL("arrow{$upDown}.gif"));
 
-        list($width,$height) = ListView::getArrowUpDownImageSize($upDown);
+        list($width, $height) = ListView::getArrowUpDownImageSize($upDown);
 
         //get the right alt tag for the sort
         $sortStr = translate('LBL_ALT_SORT');
-        if($upDown == '_down'){
+        if ($upDown == '_down') {
             $sortStr = translate('LBL_ALT_SORT_DESC');
-        }elseif($upDown == '_up'){
+        }elseif ($upDown == '_up') {
             $sortStr = translate('LBL_ALT_SORT_ASC');
         }
         return " width='$width' height='$height' align='absmiddle' alt='$sortStr'>";
@@ -1926,13 +1926,13 @@ 
 
 	function getArrowImageSize() {
 	    // jbasicChartDashletsExpColust get the non-sort image's size.. the up and down have be the same.
-		$image = SugarThemeRegistry::current()->getImageURL("arrow.gif",false);
+		$image = SugarThemeRegistry::current()->getImageURL("arrow.gif", false);
 
         $cache_key = 'arrow_size.'.$image;
 
         // Check the cache
         $result = sugar_cache_retrieve($cache_key);
-        if(!empty($result))
+        if (!empty($result))
         return $result;
 
         // No cache hit.  Calculate the value and return.
@@ -1943,13 +1943,13 @@ 
 
     function getArrowUpDownImageSize($upDown) {
         // just get the non-sort image's size.. the up and down have be the same.
-        $image = SugarThemeRegistry::current()->getImageURL("arrow{$upDown}.gif",false);
+        $image = SugarThemeRegistry::current()->getImageURL("arrow{$upDown}.gif", false);
 
         $cache_key = 'arrowupdown_size.'.$image;
 
         // Check the cache
         $result = sugar_cache_retrieve($cache_key);
-        if(!empty($result))
+        if (!empty($result))
         return $result;
 
         // No cache hit.  Calculate the value and return.
@@ -1963,7 +1963,7 @@ 
 		$orderBy = $this->getSessionVariable($html_varName, "OBL");
 		$desc = $this->getSessionVariable($html_varName, $orderBy.'S');
 		$orderBy = str_replace('.', '_', $orderBy);
-		return array($orderBy,$desc);
+		return array($orderBy, $desc);
 	}
 
     function processSortArrows($html_varName)
@@ -1971,20 +1971,20 @@ 
 
         $this->xTemplateAssign("arrow_start", $this->getArrowStart());
 
-        list($orderBy,$desc) = $this->getOrderByInfo($html_varName);
+        list($orderBy, $desc) = $this->getOrderByInfo($html_varName);
 
 		$imgArrow = "_up";
-		if($desc) {
+		if ($desc) {
 			$imgArrow = "_down";
 		}
 		/**
 		 * @deprecated only used by legacy opportunites listview, nothing current. Leaving for BC
 		 */
-		if($orderBy == 'amount')
+		if ($orderBy == 'amount')
 		{
 			$this->xTemplateAssign('amount_arrow', $imgArrow);
 		}
-		else if($orderBy == 'amount_usdollar')
+		else if ($orderBy == 'amount_usdollar')
 		{
 			$this->xTemplateAssign('amount_usdollar_arrow', $imgArrow);
 		}
@@ -1997,31 +1997,31 @@ 
     }
 
     // this is where translation happens for dynamic list views
-    function loadListFieldDefs(&$subpanel_fields,&$child_focus)
+    function loadListFieldDefs(&$subpanel_fields, &$child_focus)
     {
         $this->list_field_defs = $subpanel_fields;
 
-        for($i=0;$i < count($this->list_field_defs);$i++)
+        for ($i = 0; $i < count($this->list_field_defs); $i++)
         {
             $list_field = $this->list_field_defs[$i];
             $field_def = null;
             $key = '';
-            if(!empty($list_field['vname']))
+            if (!empty($list_field['vname']))
             {
                 $key = $list_field['vname'];
-            } else if(isset($list_field['name']) &&  isset($child_focus->field_defs[$list_field['name']]))
+            } else if (isset($list_field['name']) && isset($child_focus->field_defs[$list_field['name']]))
             {
                     $field_def = $child_focus->field_defs[$list_field['name']];
                     $key = $field_def['vname'];
             }
-            if(!empty($key))
+            if (!empty($key))
             {
-                $list_field['label'] = translate($key,$child_focus->module_dir);
-                $this->list_field_defs[$i]['label'] = preg_replace('/:$/','',$list_field['label']);
+                $list_field['label'] = translate($key, $child_focus->module_dir);
+                $this->list_field_defs[$i]['label'] = preg_replace('/:$/', '', $list_field['label']);
             }
             else
             {
-                $this->list_field_defs[$i]['label'] ='&nbsp;';
+                $this->list_field_defs[$i]['label'] = '&nbsp;';
             }
         }
     }
@@ -2036,7 +2036,7 @@ 
      * All Rights Reserved.
      * Contributor(s): ______________________________________.
      */
-     function setLocalSessionVariable($localVarName,$varName, $value) {
+     function setLocalSessionVariable($localVarName, $varName, $value) {
         $_SESSION[$localVarName."_".$varName] = $value;
      }
 
@@ -2046,11 +2046,11 @@ 
      * All Rights Reserved.
      * Contributor(s): ______________________________________.
      */
- function getLocalSessionVariable($localVarName,$varName) {
-    if(isset($_SESSION[$localVarName."_".$varName])) {
+ function getLocalSessionVariable($localVarName, $varName) {
+    if (isset($_SESSION[$localVarName."_".$varName])) {
         return $_SESSION[$localVarName."_".$varName];
     }
-    else{
+    else {
         return "";
     }
  }
@@ -2058,7 +2058,7 @@ 
  /* Set to true if you want Additional Details to appear in the listview
   */
  function setAdditionalDetails($value = true, $function = '') {
-    if(!empty($function)) $this->additionalDetailsFunction = $function;
+    if (!empty($function)) $this->additionalDetailsFunction = $function;
     $this->_additionalDetails = $value;
  }
 

Braces +173 added lines, -101 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -135,9 +137,13 @@ 
     }
 
     //when processing a multi-select popup.
-    if($this->process_for_popups && $this->multi_select_popup)  $this->shouldProcess =true;
+    if($this->process_for_popups && $this->multi_select_popup) {
+        $this->shouldProcess =true;
+    }
     //mass update turned off?
-    if(!$this->show_mass_update) $this->shouldProcess = false;
+    if(!$this->show_mass_update) {
+        $this->shouldProcess = false;
+    }
     if(is_subclass_of($seed, "SugarBean")) {
         if($seed->bean_implements('ACL')) {
             if(!ACLController::checkAccess($seed->module_dir,'list',true)) {
@@ -188,8 +194,9 @@ 
 {
         $this->source_module = $source_module;
         $this->subpanel_module = $subpanel_def->name;
-        if(!isset($this->xTemplate))
-            $this->createXTemplate();
+        if(!isset($this->xTemplate)) {
+                    $this->createXTemplate();
+        }
 
         $html_var = $this->subpanel_module . "_CELL";
 
@@ -280,8 +287,9 @@ 
     if ( empty($data) ) {
         $this->xTemplate->assign("ROW_COLOR", 'oddListRow');
         $thepanel=$subpanel_def;
-        if($subpanel_def->isCollection())
-            $thepanel=$subpanel_def->get_header_panel_def();
+        if($subpanel_def->isCollection()) {
+                    $thepanel=$subpanel_def->get_header_panel_def();
+        }
         $this->xTemplate->assign("COL_COUNT", count($thepanel->get_list_fields()));
         $this->xTemplate->parse($xtemplateSection.".nodata");
     }
@@ -339,8 +347,7 @@ 
         {
             $ROW_COLOR = 'oddListRow';
             $BG_COLOR =  $odd_bg;
-        }
-        else
+        } else
         {
             $ROW_COLOR = 'evenListRow';
             $BG_COLOR =  $even_bg;
@@ -353,8 +360,9 @@ 
         $layout_manager->setAttribute('context','List');
         $layout_manager->setAttribute('image_path',$this->local_image_path);
         $layout_manager->setAttribute('module_name', $subpanel_def->_instance_properties['module']);
-        if(!empty($this->child_focus))
-            $layout_manager->setAttribute('related_module_name',$this->child_focus->module_dir);
+        if(!empty($this->child_focus)) {
+                    $layout_manager->setAttribute('related_module_name',$this->child_focus->module_dir);
+        }
 
         //AG$subpanel_data = $this->list_field_defs;
         //$bla = array_pop($subpanel_data);
@@ -389,7 +397,9 @@ 
         $linked_field=$thepanel->get_data_source_name();
         $linked_field_set=$thepanel->get_data_source_name(true);
         static $count;
-        if(!isset($count))$count = 0;
+        if(!isset($count)) {
+            $count = 0;
+        }
 		/* BEGIN - SECURITY GROUPS */ 
 		/**
         $field_acl['DetailView'] = $aItem->ACLAccess('DetailView');
@@ -420,7 +430,7 @@ 
                 $this->xTemplate->assign('CELL', $widget_contents);
                 $this->xTemplate->parse($xtemplateSection.".row.cell");
 
-            }else if($usage != 'query_only')
+            } else if($usage != 'query_only')
             {
                 $list_field['name']=$field_name;
 
@@ -435,8 +445,11 @@ 
                     $list_field['owner_id'] = false;
                     $list_field['owner_module'] = false;
                 }
-                if(isset($list_field['alias'])) $list_field['name'] = $list_field['alias'];
-                else $list_field['name']=$field_name;
+                if(isset($list_field['alias'])) {
+                    $list_field['name'] = $list_field['alias'];
+                } else {
+                    $list_field['name']=$field_name;
+                }
                 $list_field['fields'] = $fields;
                 $list_field['module'] = $aItem->module_dir;
                 $list_field['start_link_wrapper'] = $this->start_link_wrapper;
@@ -485,7 +498,9 @@ 
                  $count++;
                 $this->xTemplate->assign('CELL_COUNT', $count);
                 $this->xTemplate->assign('CLASS', "");
-                if ( empty($widget_contents) ) $widget_contents = '&nbsp;';
+                if ( empty($widget_contents) ) {
+                    $widget_contents = '&nbsp;';
+                }
                 $this->xTemplate->assign('CELL', $widget_contents);
                 $this->xTemplate->parse($xtemplateSection.".row.cell");
                 } else {
@@ -495,7 +510,9 @@ 
 		                $widget_contents = $layout_manager->widgetDisplay($list_field);
 		                $this->xTemplate->assign('CELL_COUNT', $count);
 		                $this->xTemplate->assign('CLASS', "");
-		                if ( empty($widget_contents) ) $widget_contents = '&nbsp;';
+		                if ( empty($widget_contents) ) {
+		                    $widget_contents = '&nbsp;';
+		                }
 		                $this->xTemplate->assign('CELL', $widget_contents);
 		                $this->xTemplate->parse($xtemplateSection.".row.cell");
                 	} elseif (preg_match("/button/i", $list_field['name'])) {
@@ -503,8 +520,7 @@ 
                         {
                             $button_contents[] = $_content;
                             unset($_content);
-                        }
-                        else
+                        } else
                         {
                             $button_contents[] = '';
                         }
@@ -513,7 +529,9 @@ 
                			$this->xTemplate->assign('CLASS', "");
                			$widget_contents = $layout_manager->widgetDisplay($list_field);
 		                $this->xTemplate->assign('CELL_COUNT', $count);
-		                if ( empty($widget_contents) ) $widget_contents = '&nbsp;';
+		                if ( empty($widget_contents) ) {
+		                    $widget_contents = '&nbsp;';
+		                }
 		                $this->xTemplate->assign('CELL', $widget_contents);
 		                $this->xTemplate->parse($xtemplateSection.".row.cell");
                 	}
@@ -541,8 +559,7 @@ 
                     'class' => 'clickMenu subpanel records fancymenu button',
                     'flat' => false //assign flat value as false to display dropdown menu at any other preferences.
                 ), $this->xTemplate);
-            }
-            else
+            } else
             {
                 $action_button = '';
             }
@@ -629,11 +646,13 @@ 
 */
  function initNewXTemplate($XTemplatePath, $modString, $imagePath = null) {
     $this->setXTemplatePath($XTemplatePath);
-    if(isset($modString))
-        $this->setModStrings($modString);
-    if(isset($imagePath))
-        $this->setImagePath($imagePath);
-}
+    if(isset($modString)) {
+            $this->setModStrings($modString);
+    }
+    if(isset($imagePath)) {
+            $this->setImagePath($imagePath);
+    }
+    }
 
 
 function getOrderBy($varName, $defaultOrderBy='', $force_sortorder='') {
@@ -714,7 +733,7 @@ 
             }
             //Just clear from url...
             $this->appendToBaseUrl[$orderByColumn] = false;
-    }else {
+    } else {
         $this->query_orderby = "";
     }
     $this->sortby = $sortBy;
@@ -759,8 +778,10 @@ 
 */
  function setTheme($theme) {
     $this->local_theme = $theme;
-    if(isset($this->xTemplate))$this->xTemplate->assign("THEME", $this->local_theme);
-}
+    if(isset($this->xTemplate)) {
+        $this->xTemplate->assign("THEME", $this->local_theme);
+    }
+    }
 
 /**sets the AppStrings used only use if it is different from the global
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -770,8 +791,10 @@ 
  function setAppStrings($app_strings) {
     unset($this->local_app_strings);
     $this->local_app_strings = $app_strings;
-    if(isset($this->xTemplate))$this->xTemplate->assign("APP", $this->local_app_strings);
-}
+    if(isset($this->xTemplate)) {
+        $this->xTemplate->assign("APP", $this->local_app_strings);
+    }
+    }
 
 /**sets the ModStrings used
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -781,8 +804,10 @@ 
  function setModStrings($mod_strings) {
     unset($this->local_module_strings);
     $this->local_mod_strings = $mod_strings;
-    if(isset($this->xTemplate))$this->xTemplate->assign("MOD", $this->local_mod_strings);
-}
+    if(isset($this->xTemplate)) {
+        $this->xTemplate->assign("MOD", $this->local_mod_strings);
+    }
+    }
 
 /**sets the ImagePath used
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -794,8 +819,10 @@ 
     if(empty($this->local_image_path)) {
         $this->local_image_path = SugarThemeRegistry::get($this->local_theme)->getImagePath();
     }
-    if(isset($this->xTemplate))$this->xTemplate->assign("IMAGE_PATH", $this->local_image_path);
-}
+    if(isset($this->xTemplate)) {
+        $this->xTemplate->assign("IMAGE_PATH", $this->local_image_path);
+    }
+    }
 
 /**sets the currentModule only use if this is different from the global
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -805,8 +832,10 @@ 
  function setCurrentModule($currentModule) {
     unset($this->local_current_module);
     $this->local_current_module = $currentModule;
-    if(isset($this->xTemplate))$this->xTemplate->assign("MODULE_NAME", $this->local_current_module);
-}
+    if(isset($this->xTemplate)) {
+        $this->xTemplate->assign("MODULE_NAME", $this->local_current_module);
+    }
+    }
 
 /**INTERNAL FUNCTION creates an XTemplate DO NOT CALL THIS THIS IS AN INTERNAL FUNCTION
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -819,7 +848,9 @@ 
 
             $this->xTemplate = new XTemplate($this->xTemplatePath);
             $this->xTemplate->assign("APP", $this->local_app_strings);
-            if(isset($this->local_mod_strings))$this->xTemplate->assign("MOD", $this->local_mod_strings);
+            if(isset($this->local_mod_strings)) {
+                $this->xTemplate->assign("MOD", $this->local_mod_strings);
+            }
             $this->xTemplate->assign("THEME", $this->local_theme);
             $this->xTemplate->assign("IMAGE_PATH", $this->local_image_path);
             $this->xTemplate->assign("MODULE_NAME", $this->local_current_module);
@@ -896,7 +927,9 @@ 
 }
 
 function setUserVariable($localVarName,$varName, $value) {
-        if($this->is_dynamic ||  $localVarName == 'CELL')return;
+        if($this->is_dynamic ||  $localVarName == 'CELL') {
+            return;
+        }
         global $current_user;
         $current_user->setPreference($this->local_current_module."_".$localVarName."_".$varName, $value);
 }
@@ -920,7 +953,9 @@ 
 
 function getUserVariable($localVarName, $varName) {
     global $current_user;
-    if($this->is_dynamic ||  $localVarName == 'CELL')return;
+    if($this->is_dynamic ||  $localVarName == 'CELL') {
+        return;
+    }
     if(isset($_REQUEST[$this->getSessionVariableName($localVarName, $varName)])) {
 
             $this->setUserVariable($localVarName,$varName,$_REQUEST[$this->getSessionVariableName($localVarName, $varName)]);
@@ -999,11 +1034,21 @@ 
         //$filter = array('id', 'full_name');
         $filter=array();
         $ret_array = $seed->create_new_list_query($this->query_orderby, $this->query_where, $filter, $params, 0, '', true, $seed, true);
-        if(!is_array($params)) $params = array();
-        if(!isset($params['custom_select'])) $params['custom_select'] = '';
-        if(!isset($params['custom_from'])) $params['custom_from'] = '';
-        if(!isset($params['custom_where'])) $params['custom_where'] = '';
-        if(!isset($params['custom_order_by'])) $params['custom_order_by'] = '';
+        if(!is_array($params)) {
+            $params = array();
+        }
+        if(!isset($params['custom_select'])) {
+            $params['custom_select'] = '';
+        }
+        if(!isset($params['custom_from'])) {
+            $params['custom_from'] = '';
+        }
+        if(!isset($params['custom_where'])) {
+            $params['custom_where'] = '';
+        }
+        if(!isset($params['custom_order_by'])) {
+            $params['custom_order_by'] = '';
+        }
         $main_query = $ret_array['select'] . $params['custom_select'] . $ret_array['from'] . $params['custom_from'] . $ret_array['where'] . $params['custom_where'] . $ret_array['order_by'] . $params['custom_order_by'];
         SugarVCR::store($seed->module_dir,  $main_query);
         //ADDING VCR CONTROL
@@ -1064,8 +1109,7 @@ 
             {
                 $sort_order['session'] = $sort_order['session'] == 'asc' ? 'desc' : 'asc';
             }
-        }
-        else
+        } else
         {
             $sort_order['session'] = null;
         }
@@ -1097,7 +1141,7 @@ 
         if(!empty($this->response)){
             $response =& $this->response;
             echo 'cached';
-        }else{
+        } else{
             $response = SugarBean::get_union_related_list($sugarbean,$this->sortby, $this->sort_order, $this->query_where, $current_offset, -1, $this->records_per_page,$this->query_limit,$subpanel_def);
             $this->response =& $response;
         }
@@ -1105,7 +1149,9 @@ 
         $row_count = $response['row_count'];
         $next_offset = $response['next_offset'];
         $previous_offset = $response['previous_offset'];
-        if(!empty($response['current_offset']))$current_offset = $response['current_offset'];
+        if(!empty($response['current_offset'])) {
+            $current_offset = $response['current_offset'];
+        }
         global $list_view_row_count;
         $list_view_row_count = $row_count;
         $this->processListNavigation('dyn_list_view', $html_var, $current_offset, $next_offset, $previous_offset, $row_count, $sugarbean,$subpanel_def);
@@ -1116,7 +1162,9 @@ 
     function getBaseURL($html_varName) {
         static $cache = array();
 
-        if(!empty($cache[$html_varName]))return $cache[$html_varName];
+        if(!empty($cache[$html_varName])) {
+            return $cache[$html_varName];
+        }
         $blockVariables = array('mass', 'uid', 'massupdate', 'delete', 'merge', 'selectCount','current_query_by_page');
         if(!empty($this->base_URL)) {
             return $this->base_URL;
@@ -1136,10 +1184,11 @@ 
                 {
                     if(is_array($value)) {
                         foreach($value as $valuename=>$valuevalue) {
-                            if(substr_count($baseurl, '?') > 0)
-                                $baseurl	.= "&{$name}[]=".$valuevalue;
-                            else
-                                $baseurl	.= "?{$name}[]=".$valuevalue;
+                            if(substr_count($baseurl, '?') > 0) {
+                                                            $baseurl	.= "&{$name}[]=".$valuevalue;
+                            } else {
+                                                            $baseurl	.= "?{$name}[]=".$valuevalue;
+                            }
                         }
                     } else {
                         $value = urlencode($value);
@@ -1158,9 +1207,15 @@ 
                 if(substr_count($baseurl, '?') == 0) {
                     $baseurl .= '?';
                 }
-                if(isset($_REQUEST['action'])) $baseurl.= '&action='.$_REQUEST['action'];
-                if(isset($_REQUEST['record'])) $baseurl .= '&record='.$_REQUEST['record'];
-                if(isset($_REQUEST['module'])) $baseurl .= '&module='.$_REQUEST['module'];
+                if(isset($_REQUEST['action'])) {
+                    $baseurl.= '&action='.$_REQUEST['action'];
+                }
+                if(isset($_REQUEST['record'])) {
+                    $baseurl .= '&record='.$_REQUEST['record'];
+                }
+                if(isset($_REQUEST['module'])) {
+                    $baseurl .= '&module='.$_REQUEST['module'];
+                }
             }
 
             $baseurl .= "&".ListView::getSessionVariableName($html_varName,"offset")."=";
@@ -1187,11 +1242,13 @@ 
 
         $start_record = $current_offset + 1;
 
-        if(!is_numeric($col_count))
-            $col_count = 20;
+        if(!is_numeric($col_count)) {
+                    $col_count = 20;
+        }
 
-        if($row_count == 0)
-            $start_record = 0;
+        if($row_count == 0) {
+                    $start_record = 0;
+        }
 
         $end_record = $start_record + $this->records_per_page;
         // back up the the last page.
@@ -1199,10 +1256,11 @@ 
             $end_record = $row_count+1;
         }
         // Determine the start location of the last page
-        if($row_count == 0)
-            $number_pages = 0;
-        else
-            $number_pages = floor(($row_count - 1) / $this->records_per_page);
+        if($row_count == 0) {
+                    $number_pages = 0;
+        } else {
+                    $number_pages = floor(($row_count - 1) / $this->records_per_page);
+        }
 
         $last_offset = $number_pages * $this->records_per_page;
 
@@ -1262,7 +1320,7 @@ 
                     $onClick = '';
                     if(0 != preg_match('/javascript.*/', $start_URL)){
                         $onClick = "\"$start_URL;\"";
-                    }else{
+                    } else{
                         $onClick ="'location.href=\"$start_URL\";'";
                     }
                     $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("start","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_START'])."</button>";
@@ -1270,7 +1328,7 @@ 
                     $onClick = '';
                     if(0 != preg_match('/javascript.*/', $previous_URL)){
                         $onClick = "\"$previous_URL;\"";
-                    }else{
+                    } else{
                         $onClick = "'location.href=\"$previous_URL\";'";
                     }
                     $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("previous","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
@@ -1294,7 +1352,7 @@ 
                     $onClick = '';
                     if(0 != preg_match('/javascript.*/', $next_URL)){
                         $onClick = "\"$next_URL;\"";
-                    }else{
+                    } else{
                         $onClick ="'location.href=\"$next_URL\";'";
                     }
                     $next_link = "<button type='button' name='listViewNextButton' class='button' title='{$this->local_app_strings['LNK_LIST_NEXT']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("next","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_NEXT'])."</button>";
@@ -1302,7 +1360,7 @@ 
                     $onClick = '';
                     if(0 != preg_match('/javascript.*/', $end_URL)){
                         $onClick = "\"$end_URL;\"";
-                    }else{
+                    } else{
                         $onClick = "'location.href=\"$end_URL\";'";
                     }
                     $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("end","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_END'])."</button>";
@@ -1451,18 +1509,17 @@ 
                     //attempt to get the query to recreate this subpanel
                     if(!empty($this->response)){
                         $response =& $this->response;
-                    }else{
+                    } else{
                         $response = SugarBean::get_union_related_list($sugarbean,$this->sortby, $this->sort_order, $this->query_where, $current_offset, -1, $this->records_per_page,$this->query_limit,$subpanel_def);
                         $this->response = $response;
                     }
                     //if query is present, then pass it in as parameter
                     if (isset($response['query']) && !empty($response['query'])){
                         $html_text .= $subpanelTiles->get_buttons($subpanel_def, $response['query']);
-                    }else{
+                    } else{
                         $html_text .= $subpanelTiles->get_buttons($subpanel_def);
                     }
-                }
-                else {
+                } else {
                     $html_text .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\"><tr><td align=\"left\"  nowrap>$select_link&nbsp;$export_link&nbsp;$delete_link&nbsp;$selected_objects_span";
                 }
                 $html_text .= "</td>\n<td nowrap align=\"right\">".$start_link."&nbsp;&nbsp;".$previous_link."&nbsp;&nbsp;<span class='pageNumbers'>(".$start_record." - ".$end_record." ".$this->local_app_strings['LBL_LIST_OF']." ".$row_count.")</span>&nbsp;&nbsp;".$next_link."&nbsp;&nbsp;".$end_link."</td></tr></table>\n";
@@ -1490,9 +1547,15 @@ 
             }
             if($_SERVER['REQUEST_METHOD'] == 'POST') {
                 $this->base_URL .= '?';
-                if(isset($_REQUEST['action'])) $this->base_URL .= '&action='.$_REQUEST['action'];
-                if(isset($_REQUEST['record'])) $this->base_URL .= '&record='.$_REQUEST['record'];
-                if(isset($_REQUEST['module'])) $this->base_URL .= '&module='.$_REQUEST['module'];
+                if(isset($_REQUEST['action'])) {
+                    $this->base_URL .= '&action='.$_REQUEST['action'];
+                }
+                if(isset($_REQUEST['record'])) {
+                    $this->base_URL .= '&record='.$_REQUEST['record'];
+                }
+                if(isset($_REQUEST['module'])) {
+                    $this->base_URL .= '&module='.$_REQUEST['module'];
+                }
             }
             $this->base_URL .= "&".$this->getSessionVariableName($html_varName,"offset")."=";
         }
@@ -1623,8 +1686,7 @@ 
             {
                 $ROW_COLOR = 'oddListRow';
                 $BG_COLOR =  $odd_bg;
-            }
-            else
+            } else
             {
                 $ROW_COLOR = 'evenListRow';
                 $BG_COLOR =  $even_bg;
@@ -1640,8 +1702,7 @@ 
                 $this->xTemplate->assign('VALUE', $aItem);
                 $this->xTemplate->assign('INDEX', $count);
 
-            }
-            else
+            } else
             {
     //AED -- some modules do not have their additionalDetails.php established. Add a check to ensure require_once does not fail
     // Bug #2786
@@ -1657,7 +1718,9 @@ 
                     $results = $ad_function($fields);
                     $results['string'] = str_replace(array("&#039", "'"), '\&#039', $results['string']); // no xss!
 
-                    if(trim($results['string']) == '') $results['string'] = $app_strings['LBL_NONE'];
+                    if(trim($results['string']) == '') {
+                        $results['string'] = $app_strings['LBL_NONE'];
+                    }
                     $fields[$results['fieldToAddTo']] = $fields[$results['fieldToAddTo']].'</a>';
                 }
 
@@ -1781,12 +1844,21 @@ 
 	                $cell_width = empty($widget_args['width']) ? '' : $widget_args['width'];
 	                $this->xTemplate->assign('HEADER_CELL', $widget_contents);
 	                static $count;
-	            if(!isset($count))$count = 0; else $count++;
-                    if($col_count == 0 || $column_name == 'name') $footable = 'data-toggle="true"';
-                    else {
+	            if(!isset($count)) {
+	                $count = 0;
+	            } else {
+	                $count++;
+	            }
+                    if($col_count == 0 || $column_name == 'name') {
+                        $footable = 'data-toggle="true"';
+                    } else {
                         $footable = 'data-hide="phone"';
-                        if ($col_count > 2) $footable = 'data-hide="phone,phonelandscape"';
-                        if ($col_count > 4) $footable = 'data-hide="phone,phonelandscape,tablet"';
+                        if ($col_count > 2) {
+                            $footable = 'data-hide="phone,phonelandscape"';
+                        }
+                        if ($col_count > 4) {
+                            $footable = 'data-hide="phone,phonelandscape,tablet"';
+                        }
                     }
                     $this->xTemplate->assign('FOOTABLE', $footable);
 	                $this->xTemplate->assign('CELL_COUNT', $count);
@@ -1918,7 +1990,7 @@ 
         $sortStr = translate('LBL_ALT_SORT');
         if($upDown == '_down'){
             $sortStr = translate('LBL_ALT_SORT_DESC');
-        }elseif($upDown == '_up'){
+        } elseif($upDown == '_up'){
             $sortStr = translate('LBL_ALT_SORT_ASC');
         }
         return " width='$width' height='$height' align='absmiddle' alt='$sortStr'>";
@@ -1932,8 +2004,9 @@ 
 
         // Check the cache
         $result = sugar_cache_retrieve($cache_key);
-        if(!empty($result))
-        return $result;
+        if(!empty($result)) {
+                return $result;
+        }
 
         // No cache hit.  Calculate the value and return.
         $result = getimagesize($image);
@@ -1949,8 +2022,9 @@ 
 
         // Check the cache
         $result = sugar_cache_retrieve($cache_key);
-        if(!empty($result))
-        return $result;
+        if(!empty($result)) {
+                return $result;
+        }
 
         // No cache hit.  Calculate the value and return.
         $result = getimagesize($image);
@@ -1983,12 +2057,10 @@ 
 		if($orderBy == 'amount')
 		{
 			$this->xTemplateAssign('amount_arrow', $imgArrow);
-		}
-		else if($orderBy == 'amount_usdollar')
+		} else if($orderBy == 'amount_usdollar')
 		{
 			$this->xTemplateAssign('amount_usdollar_arrow', $imgArrow);
-		}
-		else
+		} else
 		{
 			$this->xTemplateAssign($orderBy.'_arrow', $imgArrow);
 		}
@@ -2018,8 +2090,7 @@ 
             {
                 $list_field['label'] = translate($key,$child_focus->module_dir);
                 $this->list_field_defs[$i]['label'] = preg_replace('/:$/','',$list_field['label']);
-            }
-            else
+            } else
             {
                 $this->list_field_defs[$i]['label'] ='&nbsp;';
             }
@@ -2049,8 +2120,7 @@ 
  function getLocalSessionVariable($localVarName,$varName) {
     if(isset($_SESSION[$localVarName."_".$varName])) {
         return $_SESSION[$localVarName."_".$varName];
-    }
-    else{
+    } else{
         return "";
     }
  }
@@ -2058,7 +2128,9 @@ 
  /* Set to true if you want Additional Details to appear in the listview
   */
  function setAdditionalDetails($value = true, $function = '') {
-    if(!empty($function)) $this->additionalDetailsFunction = $function;
+    if(!empty($function)) {
+        $this->additionalDetailsFunction = $function;
+    }
     $this->_additionalDetails = $value;
  }
 

include/ListView/ListViewData.php

Indentation +250 added lines, -250 removed lines

@@ -46,9 +46,9 @@ 
  */
 class ListViewData {
 
-	var $additionalDetails = true;
+    var $additionalDetails = true;
     var $listviewName = null;
-	var $additionalDetailsAllow = null;
+    var $additionalDetailsAllow = null;
     var $additionalDetailsAjax = true; // leave this true when using filter fields
     var $additionalDetailsFieldToAdd = 'NAME'; // where the span will be attached to
     var $base_url = null;
@@ -58,82 +58,82 @@ 
      */
     var $count_query = '';
 
-	/**
-	 * Constructor sets the limitName to look up the limit in $sugar_config
-	 *
-	 * @return ListViewData
-	 */
-	function ListViewData() {
-		$this->limitName = 'list_max_entries_per_page';
-		$this->db = DBManagerFactory::getInstance('listviews');
-	}
-
-	/**
-	 * checks the request for the order by and if that is not set then it checks the session for it
-	 *
-	 * @return array containing the keys orderBy => field being ordered off of and sortOrder => the sort order of that field
-	 */
-	function getOrderBy($orderBy = '', $direction = '') {
-		if (!empty($orderBy) || !empty($_REQUEST[$this->var_order_by])) {
+    /**
+     * Constructor sets the limitName to look up the limit in $sugar_config
+     *
+     * @return ListViewData
+     */
+    function ListViewData() {
+        $this->limitName = 'list_max_entries_per_page';
+        $this->db = DBManagerFactory::getInstance('listviews');
+    }
+
+    /**
+     * checks the request for the order by and if that is not set then it checks the session for it
+     *
+     * @return array containing the keys orderBy => field being ordered off of and sortOrder => the sort order of that field
+     */
+    function getOrderBy($orderBy = '', $direction = '') {
+        if (!empty($orderBy) || !empty($_REQUEST[$this->var_order_by])) {
             if(!empty($_REQUEST[$this->var_order_by])) {
-    			$direction = 'ASC';
-    			$orderBy = $_REQUEST[$this->var_order_by];
-    			if(!empty($_REQUEST['lvso']) && (empty($_SESSION['lvd']['last_ob']) || strcmp($orderBy, $_SESSION['lvd']['last_ob']) == 0) ){
-    				$direction = $_REQUEST['lvso'];
-    			}
+                $direction = 'ASC';
+                $orderBy = $_REQUEST[$this->var_order_by];
+                if(!empty($_REQUEST['lvso']) && (empty($_SESSION['lvd']['last_ob']) || strcmp($orderBy, $_SESSION['lvd']['last_ob']) == 0) ){
+                    $direction = $_REQUEST['lvso'];
+                }
             }
             $_SESSION[$this->var_order_by] = array('orderBy'=>$orderBy, 'direction'=> $direction);
             $_SESSION['lvd']['last_ob'] = $orderBy;
         }
-		else {
+        else {
             $userPreferenceOrder = $GLOBALS['current_user']->getPreference('listviewOrder', $this->var_name);
-			if(!empty($_SESSION[$this->var_order_by])) {
-				$orderBy = $_SESSION[$this->var_order_by]['orderBy'];
-				$direction = $_SESSION[$this->var_order_by]['direction'];
+            if(!empty($_SESSION[$this->var_order_by])) {
+                $orderBy = $_SESSION[$this->var_order_by]['orderBy'];
+                $direction = $_SESSION[$this->var_order_by]['direction'];
             } elseif (!empty($userPreferenceOrder)) {
                 $orderBy = $userPreferenceOrder['orderBy'];
                 $direction = $userPreferenceOrder['sortOrder'];
             } else {
-				$orderBy = 'date_entered';
-				$direction = 'DESC';
-			}
-		}
-		if(!empty($direction)) {
-    		if(strtolower($direction) == "desc") {
-    		    $direction = 'DESC';
-    		} else {
-    		    $direction = 'ASC';
-    		}
-		}
-		return array('orderBy' => $orderBy, 'sortOrder' => $direction);
-	}
-
-	/**
-	 * gets the reverse of the sort order for use on links to reverse a sort order from what is currently used
-	 *
-	 * @param STRING (ASC or DESC) $current_order
-	 * @return  STRING (ASC or DESC)
-	 */
-	function getReverseSortOrder($current_order){
-		return (strcmp(strtolower($current_order), 'asc') == 0)?'DESC':'ASC';
-	}
-	/**
-	 * gets the limit of how many rows to show per page
-	 *
-	 * @return INT (the limit)
-	 */
-	function getLimit() {
-		return $GLOBALS['sugar_config'][$this->limitName];
-	}
-
-	/**
-	 * returns the current offset
-	 *
-	 * @return INT (current offset)
-	 */
-	function getOffset() {
-		return (!empty($_REQUEST[$this->var_offset])) ? $_REQUEST[$this->var_offset] : 0;
-	}
+                $orderBy = 'date_entered';
+                $direction = 'DESC';
+            }
+        }
+        if(!empty($direction)) {
+            if(strtolower($direction) == "desc") {
+                $direction = 'DESC';
+            } else {
+                $direction = 'ASC';
+            }
+        }
+        return array('orderBy' => $orderBy, 'sortOrder' => $direction);
+    }
+
+    /**
+     * gets the reverse of the sort order for use on links to reverse a sort order from what is currently used
+     *
+     * @param STRING (ASC or DESC) $current_order
+     * @return  STRING (ASC or DESC)
+     */
+    function getReverseSortOrder($current_order){
+        return (strcmp(strtolower($current_order), 'asc') == 0)?'DESC':'ASC';
+    }
+    /**
+     * gets the limit of how many rows to show per page
+     *
+     * @return INT (the limit)
+     */
+    function getLimit() {
+        return $GLOBALS['sugar_config'][$this->limitName];
+    }
+
+    /**
+     * returns the current offset
+     *
+     * @return INT (current offset)
+     */
+    function getOffset() {
+        return (!empty($_REQUEST[$this->var_offset])) ? $_REQUEST[$this->var_offset] : 0;
+    }
 
     /**
      * generates the base url without
@@ -159,18 +159,18 @@ 
         return $params;
     }
 
-	/**
-	 * based off of a base name it sets base, offset, and order by variable names to retrieve them from requests and sessions
-	 *
-	 * @param unknown_type $baseName
-	 */
-	function setVariableName($baseName, $where, $listviewName = null){
+    /**
+     * based off of a base name it sets base, offset, and order by variable names to retrieve them from requests and sessions
+     *
+     * @param unknown_type $baseName
+     */
+    function setVariableName($baseName, $where, $listviewName = null){
         global $timedate;
         $module = (!empty($listviewName)) ? $listviewName: $_REQUEST['module'];
         $this->var_name = $module .'2_'. strtoupper($baseName);
 
-		$this->var_order_by = $this->var_name .'_ORDER_BY';
-		$this->var_offset = $this->var_name . '_offset';
+        $this->var_order_by = $this->var_name .'_ORDER_BY';
+        $this->var_offset = $this->var_name . '_offset';
         $timestamp = sugar_microtime();
         $this->stamp = $timestamp;
 
@@ -178,58 +178,58 @@ 
 
         $_SESSION[strtoupper($baseName) . "_FROM_LIST_VIEW"] = $timestamp;
         $_SESSION[strtoupper($baseName) . "_DETAIL_NAV_HISTORY"] = false;
-	}
-
-	function getTotalCount($main_query){
-		if(!empty($this->count_query)){
-		    $count_query = $this->count_query;
-		}else{
-	        $count_query = $this->seed->create_list_count_query($main_query);
-	    }
-		$result = $this->db->query($count_query);
-		if($row = $this->db->fetchByAssoc($result)){
-			return $row['c'];
-		}
-		return 0;
-	}
-
-	/**
-	 * takes in a seed and creates the list view query based off of that seed
-	 * if the $limit value is set to -1 then it will use the default limit and offset values
-	 *
-	 * it will return an array with two key values
-	 * 	1. 'data'=> this is an array of row data
-	 *  2. 'pageData'=> this is an array containg three values
-	 * 			a.'ordering'=> array('orderBy'=> the field being ordered by , 'sortOrder'=> 'ASC' or 'DESC')
-	 * 			b.'urls'=>array('baseURL'=>url used to generate other urls ,
-	 * 							'orderBy'=> the base url for order by
-	 * 							//the following may not be set (so check empty to see if they are set)
-	 * 							'nextPage'=> the url for the next group of results,
-	 * 							'prevPage'=> the url for the prev group of results,
-	 * 							'startPage'=> the url for the start of the group,
-	 * 							'endPage'=> the url for the last set of results in the group
-	 * 			c.'offsets'=>array(
-	 * 								'current'=>current offset
-	 * 								'next'=> next group offset
-	 * 								'prev'=> prev group offset
-	 * 								'end'=> the offset of the last group
-	 * 								'total'=> the total count (only accurate if totalCounted = true otherwise it is either the total count if less than the limit or the total count + 1 )
-	 * 								'totalCounted'=> if a count query was used to get the total count
-	 *
-	 * @param SugarBean $seed
-	 * @param string $where
-	 * @param int:0 $offset
-	 * @param int:-1 $limit
-	 * @param string[]:array() $filter_fields
-	 * @param array:array() $params
-	 * 	Potential $params are
+    }
+
+    function getTotalCount($main_query){
+        if(!empty($this->count_query)){
+            $count_query = $this->count_query;
+        }else{
+            $count_query = $this->seed->create_list_count_query($main_query);
+        }
+        $result = $this->db->query($count_query);
+        if($row = $this->db->fetchByAssoc($result)){
+            return $row['c'];
+        }
+        return 0;
+    }
+
+    /**
+     * takes in a seed and creates the list view query based off of that seed
+     * if the $limit value is set to -1 then it will use the default limit and offset values
+     *
+     * it will return an array with two key values
+     * 	1. 'data'=> this is an array of row data
+     *  2. 'pageData'=> this is an array containg three values
+     * 			a.'ordering'=> array('orderBy'=> the field being ordered by , 'sortOrder'=> 'ASC' or 'DESC')
+     * 			b.'urls'=>array('baseURL'=>url used to generate other urls ,
+     * 							'orderBy'=> the base url for order by
+     * 							//the following may not be set (so check empty to see if they are set)
+     * 							'nextPage'=> the url for the next group of results,
+     * 							'prevPage'=> the url for the prev group of results,
+     * 							'startPage'=> the url for the start of the group,
+     * 							'endPage'=> the url for the last set of results in the group
+     * 			c.'offsets'=>array(
+     * 								'current'=>current offset
+     * 								'next'=> next group offset
+     * 								'prev'=> prev group offset
+     * 								'end'=> the offset of the last group
+     * 								'total'=> the total count (only accurate if totalCounted = true otherwise it is either the total count if less than the limit or the total count + 1 )
+     * 								'totalCounted'=> if a count query was used to get the total count
+     *
+     * @param SugarBean $seed
+     * @param string $where
+     * @param int:0 $offset
+     * @param int:-1 $limit
+     * @param string[]:array() $filter_fields
+     * @param array:array() $params
+     * 	Potential $params are
 		$params['distinct'] = use distinct key word
 		$params['include_custom_fields'] = (on by default)
         $params['custom_XXXX'] = append custom statements to query
-	 * @param string:'id' $id_field
-	 * @return array('data'=> row data, 'pageData' => page data information, 'query' => original query string)
-	 */
-	function getListViewData($seed, $where, $offset=-1, $limit = -1, $filter_fields=array(),$params=array(),$id_field = 'id',$singleSelect=true) {
+     * @param string:'id' $id_field
+     * @return array('data'=> row data, 'pageData' => page data information, 'query' => original query string)
+     */
+    function getListViewData($seed, $where, $offset=-1, $limit = -1, $filter_fields=array(),$params=array(),$id_field = 'id',$singleSelect=true) {
         global $current_user;
         SugarVCR::erase($seed->module_dir);
         $this->seed =& $seed;
@@ -241,7 +241,7 @@ 
 
         $this->setVariableName($seed->object_name, $where, $this->listviewName);
 
-		$this->seed->id = '[SELECT_ID_LIST]';
+        $this->seed->id = '[SELECT_ID_LIST]';
 
         // if $params tell us to override all ordering
         if(!empty($params['overrideOrder']) && !empty($params['orderBy'])) {
@@ -265,11 +265,11 @@ 
             $orderby = substr($order['orderBy'],strpos($order['orderBy'],'.')+1);
         }
         if ($orderby != 'date_entered' && !in_array($orderby, array_keys($filter_fields))) {
-        	$order['orderBy'] = '';
-        	$order['sortOrder'] = '';
+            $order['orderBy'] = '';
+            $order['sortOrder'] = '';
         }
 
-		if (empty($order['orderBy'])) {
+        if (empty($order['orderBy'])) {
             $orderBy = '';
         } else {
             $orderBy = $order['orderBy'] . ' ' . $order['sortOrder'];
@@ -282,40 +282,40 @@ 
             $current_user->setPreference('listviewOrder', $order, 0, $this->var_name); // save preference
         }
 
-		// If $params tells us to override for the special last_name, first_name sorting
-		if (!empty($params['overrideLastNameOrder']) && $order['orderBy'] == 'last_name') {
-			$orderBy = 'last_name '.$order['sortOrder'].', first_name '.$order['sortOrder'];
-		}
+        // If $params tells us to override for the special last_name, first_name sorting
+        if (!empty($params['overrideLastNameOrder']) && $order['orderBy'] == 'last_name') {
+            $orderBy = 'last_name '.$order['sortOrder'].', first_name '.$order['sortOrder'];
+        }
 
-		$ret_array = $seed->create_new_list_query($orderBy, $where, $filter_fields, $params, 0, '', true, $seed, $singleSelect);
+        $ret_array = $seed->create_new_list_query($orderBy, $where, $filter_fields, $params, 0, '', true, $seed, $singleSelect);
         $ret_array['inner_join'] = '';
         if (!empty($this->seed->listview_inner_join)) {
             $ret_array['inner_join'] = ' ' . implode(' ', $this->seed->listview_inner_join) . ' ';
         }
 
-		if(!is_array($params)) $params = array();
+        if(!is_array($params)) $params = array();
         if(!isset($params['custom_select'])) $params['custom_select'] = '';
         if(!isset($params['custom_from'])) $params['custom_from'] = '';
         if(!isset($params['custom_where'])) $params['custom_where'] = '';
         if(!isset($params['custom_order_by'])) $params['custom_order_by'] = '';
-		$main_query = $ret_array['select'] . $params['custom_select'] . $ret_array['from'] . $params['custom_from'] . $ret_array['inner_join']. $ret_array['where'] . $params['custom_where'] . $ret_array['order_by'] . $params['custom_order_by'];
-		//C.L. - Fix for 23461
-		if(empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
-          	   $_SESSION['export_where'] = $ret_array['where'];
-		}
-   		if($limit < -1) {
-			$result = $this->db->query($main_query);
-		}
-		else {
-			if($limit == -1) {
-				$limit = $this->getLimit();
+        $main_query = $ret_array['select'] . $params['custom_select'] . $ret_array['from'] . $params['custom_from'] . $ret_array['inner_join']. $ret_array['where'] . $params['custom_where'] . $ret_array['order_by'] . $params['custom_order_by'];
+        //C.L. - Fix for 23461
+        if(empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
+                    $_SESSION['export_where'] = $ret_array['where'];
+        }
+            if($limit < -1) {
+            $result = $this->db->query($main_query);
+        }
+        else {
+            if($limit == -1) {
+                $limit = $this->getLimit();
             }
-			$dyn_offset = $this->getOffset();
-			if($dyn_offset > 0 || !is_int($dyn_offset))$offset = $dyn_offset;
+            $dyn_offset = $this->getOffset();
+            if($dyn_offset > 0 || !is_int($dyn_offset))$offset = $dyn_offset;
 
             if(strcmp($offset, 'end') == 0){
-            	$totalCount = $this->getTotalCount($main_query);
-            	$offset = (floor(($totalCount -1) / $limit)) * $limit;
+                $totalCount = $this->getTotalCount($main_query);
+                $offset = (floor(($totalCount -1) / $limit)) * $limit;
             }
             if($this->seed->ACLAccess('ListView')) {
                 $result = $this->db->limitQuery($main_query, $offset, $limit + 1);
@@ -324,27 +324,27 @@ 
                 $result = array();
             }
 
-		}
+        }
 
-		$data = array();
+        $data = array();
 
-		$temp = clone $seed;
+        $temp = clone $seed;
 
-		$rows = array();
-		$count = 0;
+        $rows = array();
+        $count = 0;
         $idIndex = array();
         $id_list = '';
 
-   		while(($row = $this->db->fetchByAssoc($result)) != null)
+            while(($row = $this->db->fetchByAssoc($result)) != null)
         {
-   			if($count < $limit)
+                if($count < $limit)
             {
-   				$id_list .= ',\''.$row[$id_field].'\'';
-   				$idIndex[$row[$id_field]][] = count($rows);
-   				$rows[] = $seed->convertRow($row);
-   			}
-   			$count++;
-   		}
+                    $id_list .= ',\''.$row[$id_field].'\'';
+                    $idIndex[$row[$id_field]][] = count($rows);
+                    $rows[] = $seed->convertRow($row);
+                }
+                $count++;
+            }
 
         if (!empty($id_list))
         {
@@ -352,10 +352,10 @@ 
         }
 
         SugarVCR::store($this->seed->module_dir,  $main_query);
-		if($count != 0) {
-			//NOW HANDLE SECONDARY QUERIES
-			if(!empty($ret_array['secondary_select'])) {
-				$secondary_query = $ret_array['secondary_select'] . $ret_array['secondary_from'] . ' WHERE '.$this->seed->table_name.'.id IN ' .$id_list;
+        if($count != 0) {
+            //NOW HANDLE SECONDARY QUERIES
+            if(!empty($ret_array['secondary_select'])) {
+                $secondary_query = $ret_array['secondary_select'] . $ret_array['secondary_from'] . ' WHERE '.$this->seed->table_name.'.id IN ' .$id_list;
                 if(isset($ret_array['order_by']))
                 {
                     $secondary_query .= ' ' . $ret_array['order_by'];
@@ -364,23 +364,23 @@ 
                 $secondary_result = $this->db->query($secondary_query);
 
                 $ref_id_count = array();
-				while($row = $this->db->fetchByAssoc($secondary_result)) {
+                while($row = $this->db->fetchByAssoc($secondary_result)) {
 
                     $ref_id_count[$row['ref_id']][] = true;
-					foreach($row as $name=>$value) {
-						//add it to every row with the given id
-						foreach($idIndex[$row['ref_id']] as $index){
-						    $rows[$index][$name]=$value;
-						}
-					}
-				}
+                    foreach($row as $name=>$value) {
+                        //add it to every row with the given id
+                        foreach($idIndex[$row['ref_id']] as $index){
+                            $rows[$index][$name]=$value;
+                        }
+                    }
+                }
 
                 $rows_keys = array_keys($rows);
                 foreach($rows_keys as $key)
                 {
                     $rows[$key]['secondary_select_count'] = count($ref_id_count[$rows[$key]['ref_id']]);
                 }
-			}
+            }
 
             // retrieve parent names
             if(!empty($filter_fields['parent_name']) && !empty($filter_fields['parent_id']) && !empty($filter_fields['parent_type'])) {
@@ -394,47 +394,47 @@ 
                     $parent_fields = $seed->retrieve_parent_fields($post_retrieve);
                     foreach($parent_fields as $child_id => $parent_data) {
                         //add it to every row with the given id
-						foreach($idIndex[$child_id] as $index){
-						    $rows[$index]['parent_name']= $parent_data['parent_name'];
-						}
+                        foreach($idIndex[$child_id] as $index){
+                            $rows[$index]['parent_name']= $parent_data['parent_name'];
+                        }
                     }
                 }
             }
 
-			$pageData = array();
+            $pageData = array();
 
-			reset($rows);
-			while($row = current($rows)){
+            reset($rows);
+            while($row = current($rows)){
 
                 $temp = clone $seed;
-			    $dataIndex = count($data);
-
-			    $temp->setupCustomFields($temp->module_dir);
-				$temp->loadFromRow($row);
-				if (empty($this->seed->assigned_user_id) && !empty($temp->assigned_user_id)) {
-				    $this->seed->assigned_user_id = $temp->assigned_user_id;
-				}
-				if($idIndex[$row[$id_field]][0] == $dataIndex){
-				    $pageData['tag'][$dataIndex] = $temp->listviewACLHelper();
-				}else{
-				    $pageData['tag'][$dataIndex] = $pageData['tag'][$idIndex[$row[$id_field]][0]];
-				}
-				$data[$dataIndex] = $temp->get_list_view_data($filter_fields);
+                $dataIndex = count($data);
+
+                $temp->setupCustomFields($temp->module_dir);
+                $temp->loadFromRow($row);
+                if (empty($this->seed->assigned_user_id) && !empty($temp->assigned_user_id)) {
+                    $this->seed->assigned_user_id = $temp->assigned_user_id;
+                }
+                if($idIndex[$row[$id_field]][0] == $dataIndex){
+                    $pageData['tag'][$dataIndex] = $temp->listviewACLHelper();
+                }else{
+                    $pageData['tag'][$dataIndex] = $pageData['tag'][$idIndex[$row[$id_field]][0]];
+                }
+                $data[$dataIndex] = $temp->get_list_view_data($filter_fields);
                 $detailViewAccess = $temp->ACLAccess('DetailView');
                 $editViewAccess = $temp->ACLAccess('EditView');
                 $pageData['rowAccess'][$dataIndex] = array('view' => $detailViewAccess, 'edit' => $editViewAccess);
                 $additionalDetailsAllow = $this->additionalDetails && $detailViewAccess && (file_exists(
-                         'modules/' . $temp->module_dir . '/metadata/additionalDetails.php'
-                     ) || file_exists('custom/modules/' . $temp->module_dir . '/metadata/additionalDetails.php'));
+                            'modules/' . $temp->module_dir . '/metadata/additionalDetails.php'
+                        ) || file_exists('custom/modules/' . $temp->module_dir . '/metadata/additionalDetails.php'));
                 $additionalDetailsEdit = $editViewAccess;
                 if($additionalDetailsAllow) {
                     if($this->additionalDetailsAjax) {
-					   $ar = $this->getAdditionalDetailsAjax($data[$dataIndex]['ID']);
+                        $ar = $this->getAdditionalDetailsAjax($data[$dataIndex]['ID']);
                     }
                     else {
                         $additionalDetailsFile = 'modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php';
                         if(file_exists('custom/modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php')){
-                        	$additionalDetailsFile = 'custom/modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php';
+                            $additionalDetailsFile = 'custom/modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php';
                         }
                         require_once($additionalDetailsFile);
                         $ar = $this->getAdditionalDetails($data[$dataIndex],
@@ -443,42 +443,42 @@ 
                     }
                     $pageData['additionalDetails'][$dataIndex] = $ar['string'];
                     $pageData['additionalDetails']['fieldToAddTo'] = $ar['fieldToAddTo'];
-				}
-				next($rows);
-			}
-		}
-		$nextOffset = -1;
-		$prevOffset = -1;
-		$endOffset = -1;
-		if($count > $limit) {
-			$nextOffset = $offset + $limit;
-		}
-
-		if($offset > 0) {
-			$prevOffset = $offset - $limit;
-			if($prevOffset < 0)$prevOffset = 0;
-		}
-		$totalCount = $count + $offset;
-
-		if( $count >= $limit && $totalCounted){
-			$totalCount  = $this->getTotalCount($main_query);
-		}
-		SugarVCR::recordIDs($this->seed->module_dir, array_keys($idIndex), $offset, $totalCount);
+                }
+                next($rows);
+            }
+        }
+        $nextOffset = -1;
+        $prevOffset = -1;
+        $endOffset = -1;
+        if($count > $limit) {
+            $nextOffset = $offset + $limit;
+        }
+
+        if($offset > 0) {
+            $prevOffset = $offset - $limit;
+            if($prevOffset < 0)$prevOffset = 0;
+        }
+        $totalCount = $count + $offset;
+
+        if( $count >= $limit && $totalCounted){
+            $totalCount  = $this->getTotalCount($main_query);
+        }
+        SugarVCR::recordIDs($this->seed->module_dir, array_keys($idIndex), $offset, $totalCount);
         $module_names = array(
             'Prospects' => 'Targets'
         );
-		$endOffset = (floor(($totalCount - 1) / $limit)) * $limit;
-		$pageData['ordering'] = $order;
-		$pageData['ordering']['sortOrder'] = $this->getReverseSortOrder($pageData['ordering']['sortOrder']);
+        $endOffset = (floor(($totalCount - 1) / $limit)) * $limit;
+        $pageData['ordering'] = $order;
+        $pageData['ordering']['sortOrder'] = $this->getReverseSortOrder($pageData['ordering']['sortOrder']);
         //get url parameters as an array
         $pageData['queries'] = $this->generateQueries($pageData['ordering']['sortOrder'], $offset, $prevOffset, $nextOffset,  $endOffset, $totalCounted);
         //join url parameters from array to a string
         $pageData['urls'] = $this->generateURLS($pageData['queries']);
-		$pageData['offsets'] = array( 'current'=>$offset, 'next'=>$nextOffset, 'prev'=>$prevOffset, 'end'=>$endOffset, 'total'=>$totalCount, 'totalCounted'=>$totalCounted);
-		$pageData['bean'] = array('objectName' => $seed->object_name, 'moduleDir' => $seed->module_dir, 'moduleName' => strtr($seed->module_dir, $module_names));
+        $pageData['offsets'] = array( 'current'=>$offset, 'next'=>$nextOffset, 'prev'=>$prevOffset, 'end'=>$endOffset, 'total'=>$totalCount, 'totalCounted'=>$totalCounted);
+        $pageData['bean'] = array('objectName' => $seed->object_name, 'moduleDir' => $seed->module_dir, 'moduleName' => strtr($seed->module_dir, $module_names));
         $pageData['stamp'] = $this->stamp;
         $pageData['access'] = array('view' => $this->seed->ACLAccess('DetailView'), 'edit' => $this->seed->ACLAccess('EditView'));
-		$pageData['idIndex'] = $idIndex;
+        $pageData['idIndex'] = $idIndex;
         if(!$this->seed->ACLAccess('ListView')) {
             $pageData['error'] = 'ACL restricted access';
         }
@@ -486,8 +486,8 @@ 
         $queryString = '';
 
         if( isset($_REQUEST["searchFormTab"]) && $_REQUEST["searchFormTab"] == "advanced_search" ||
-        	isset($_REQUEST["type_basic"]) && (count($_REQUEST["type_basic"] > 1) || $_REQUEST["type_basic"][0] != "") ||
-        	isset($_REQUEST["module"]) && $_REQUEST["module"] == "MergeRecords")
+            isset($_REQUEST["type_basic"]) && (count($_REQUEST["type_basic"] > 1) || $_REQUEST["type_basic"][0] != "") ||
+            isset($_REQUEST["module"]) && $_REQUEST["module"] == "MergeRecords")
         {
             $queryString = "-advanced_search";
         }
@@ -514,8 +514,8 @@ 
             }
         }
 
-		return array('data'=>$data , 'pageData'=>$pageData, 'query' => $queryString);
-	}
+        return array('data'=>$data , 'pageData'=>$pageData, 'query' => $queryString);
+    }
 
 
     /**
@@ -582,13 +582,13 @@ 
         return $queries;
     }
 
-	/**
-	 * generates the additional details span to be retrieved via ajax
-	 *
-	 * @param GUID id id of the record
-	 * @return array string to attach to field
-	 */
-	function getAdditionalDetailsAjax($id)
+    /**
+     * generates the additional details span to be retrieved via ajax
+     *
+     * @param GUID id id of the record
+     * @return array string to attach to field
+     */
+    function getAdditionalDetailsAjax($id)
     {
         global $app_strings;
 
@@ -596,10 +596,10 @@ 
 
         $extra = "<span id='adspan_" . $id . "' "
                 . "onclick=\"lvg_dtails('$id')\" "
-				. " style='position: relative;'><!--not_in_theme!--><img vertical-align='middle' class='info' border='0' alt='".$app_strings['LBL_ADDITIONAL_DETAILS']."' src='$jscalendarImage'></span>";
+                . " style='position: relative;'><!--not_in_theme!--><img vertical-align='middle' class='info' border='0' alt='".$app_strings['LBL_ADDITIONAL_DETAILS']."' src='$jscalendarImage'></span>";
 
         return array('fieldToAddTo' => $this->additionalDetailsFieldToAdd, 'string' => $extra);
-	}
+    }
 
     /**
      * generates the additional details values
@@ -622,25 +622,25 @@ 
         {
             $results['string'] = $app_strings['LBL_NONE'];
         }
-         	$close = false;
+                $close = false;
             $extra = "<img alt='{$app_strings['LBL_INFOINLINE']}' style='padding: 0px 5px 0px 2px' border='0' onclick=\"SUGAR.util.getStaticAdditionalDetails(this,'";
 
             $extra .= str_replace(array("\rn", "\r", "\n"), array('','','<br />'), $results['string']) ;
             $extra .= "','<div style=\'float:left\'>{$app_strings['LBL_ADDITIONAL_DETAILS']}</div><div style=\'float: right\'>";
 
-	        if($editAccess && !empty($results['editLink']))
-	        {
-	            $extra .=  "<a title=\'{$app_strings['LBL_EDIT_BUTTON']}\' href={$results['editLink']}><img style=\'margin-left: 2px;\' border=\'0\' src=\'".SugarThemeRegistry::current()->getImageURL('edit_inline.png')."\'></a>";
-	            $close = true;
-	        }
-	        $close = (!empty($results['viewLink'])) ? true : $close;
-	        $extra .= (!empty($results['viewLink']) ? "<a title=\'{$app_strings['LBL_VIEW_BUTTON']}\' href={$results['viewLink']}><img style=\'margin-left: 2px;\' border=\'0\' src=".SugarThemeRegistry::current()->getImageURL('view_inline.png')."></a>" : '');
+            if($editAccess && !empty($results['editLink']))
+            {
+                $extra .=  "<a title=\'{$app_strings['LBL_EDIT_BUTTON']}\' href={$results['editLink']}><img style=\'margin-left: 2px;\' border=\'0\' src=\'".SugarThemeRegistry::current()->getImageURL('edit_inline.png')."\'></a>";
+                $close = true;
+            }
+            $close = (!empty($results['viewLink'])) ? true : $close;
+            $extra .= (!empty($results['viewLink']) ? "<a title=\'{$app_strings['LBL_VIEW_BUTTON']}\' href={$results['viewLink']}><img style=\'margin-left: 2px;\' border=\'0\' src=".SugarThemeRegistry::current()->getImageURL('view_inline.png')."></a>" : '');
 
             if($close == true) {
-            	$closeVal = "true";
-            	$extra .=  "<a title=\'{$app_strings['LBL_ADDITIONAL_DETAILS_CLOSE_TITLE']}\' href=\'javascript: SUGAR.util.closeStaticAdditionalDetails();\'><img style=\'margin-left: 2px;\' border=\'0\' src=\'".SugarThemeRegistry::current()->getImageURL('close.png')."\'></a>";
+                $closeVal = "true";
+                $extra .=  "<a title=\'{$app_strings['LBL_ADDITIONAL_DETAILS_CLOSE_TITLE']}\' href=\'javascript: SUGAR.util.closeStaticAdditionalDetails();\'><img style=\'margin-left: 2px;\' border=\'0\' src=\'".SugarThemeRegistry::current()->getImageURL('close.png')."\'></a>";
             } else {
-            	$closeVal = "false";
+                $closeVal = "false";
             }
             $extra .= "',".$closeVal.")\" src='".SugarThemeRegistry::current()->getImageURL('info_inline.png')."' class='info'>";
 

Spacing +104 added lines, -104 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.
@@ -75,10 +75,10 @@ 
 	 */
 	function getOrderBy($orderBy = '', $direction = '') {
 		if (!empty($orderBy) || !empty($_REQUEST[$this->var_order_by])) {
-            if(!empty($_REQUEST[$this->var_order_by])) {
+            if (!empty($_REQUEST[$this->var_order_by])) {
     			$direction = 'ASC';
     			$orderBy = $_REQUEST[$this->var_order_by];
-    			if(!empty($_REQUEST['lvso']) && (empty($_SESSION['lvd']['last_ob']) || strcmp($orderBy, $_SESSION['lvd']['last_ob']) == 0) ){
+    			if (!empty($_REQUEST['lvso']) && (empty($_SESSION['lvd']['last_ob']) || strcmp($orderBy, $_SESSION['lvd']['last_ob']) == 0)) {
     				$direction = $_REQUEST['lvso'];
     			}
             }
@@ -87,7 +87,7 @@ 
         }
 		else {
             $userPreferenceOrder = $GLOBALS['current_user']->getPreference('listviewOrder', $this->var_name);
-			if(!empty($_SESSION[$this->var_order_by])) {
+			if (!empty($_SESSION[$this->var_order_by])) {
 				$orderBy = $_SESSION[$this->var_order_by]['orderBy'];
 				$direction = $_SESSION[$this->var_order_by]['direction'];
             } elseif (!empty($userPreferenceOrder)) {
@@ -98,8 +98,8 @@ 
 				$direction = 'DESC';
 			}
 		}
-		if(!empty($direction)) {
-    		if(strtolower($direction) == "desc") {
+		if (!empty($direction)) {
+    		if (strtolower($direction) == "desc") {
     		    $direction = 'DESC';
     		} else {
     		    $direction = 'ASC';
@@ -114,8 +114,8 @@ 
 	 * @param STRING (ASC or DESC) $current_order
 	 * @return  STRING (ASC or DESC)
 	 */
-	function getReverseSortOrder($current_order){
-		return (strcmp(strtolower($current_order), 'asc') == 0)?'DESC':'ASC';
+	function getReverseSortOrder($current_order) {
+		return (strcmp(strtolower($current_order), 'asc') == 0) ? 'DESC' : 'ASC';
 	}
 	/**
 	 * gets the limit of how many rows to show per page
@@ -145,8 +145,8 @@ 
     {
         global $beanList;
 
-        $blockVariables = array('mass', 'uid', 'massupdate', 'delete', 'merge', 'selectCount',$this->var_order_by, $this->var_offset, 'lvso', 'sortOrder', 'orderBy', 'request_data', 'current_query_by_page');
-        foreach($beanList as $bean)
+        $blockVariables = array('mass', 'uid', 'massupdate', 'delete', 'merge', 'selectCount', $this->var_order_by, $this->var_offset, 'lvso', 'sortOrder', 'orderBy', 'request_data', 'current_query_by_page');
+        foreach ($beanList as $bean)
         {
             $blockVariables[] = 'Home2_'.strtoupper($bean).'_ORDER_BY';
         }
@@ -164,30 +164,30 @@ 
 	 *
 	 * @param unknown_type $baseName
 	 */
-	function setVariableName($baseName, $where, $listviewName = null){
+	function setVariableName($baseName, $where, $listviewName = null) {
         global $timedate;
-        $module = (!empty($listviewName)) ? $listviewName: $_REQUEST['module'];
-        $this->var_name = $module .'2_'. strtoupper($baseName);
+        $module = (!empty($listviewName)) ? $listviewName : $_REQUEST['module'];
+        $this->var_name = $module.'2_'.strtoupper($baseName);
 
-		$this->var_order_by = $this->var_name .'_ORDER_BY';
-		$this->var_offset = $this->var_name . '_offset';
+		$this->var_order_by = $this->var_name.'_ORDER_BY';
+		$this->var_offset = $this->var_name.'_offset';
         $timestamp = sugar_microtime();
         $this->stamp = $timestamp;
 
-        $_SESSION[$module .'2_QUERY_QUERY'] = $where;
+        $_SESSION[$module.'2_QUERY_QUERY'] = $where;
 
-        $_SESSION[strtoupper($baseName) . "_FROM_LIST_VIEW"] = $timestamp;
-        $_SESSION[strtoupper($baseName) . "_DETAIL_NAV_HISTORY"] = false;
+        $_SESSION[strtoupper($baseName)."_FROM_LIST_VIEW"] = $timestamp;
+        $_SESSION[strtoupper($baseName)."_DETAIL_NAV_HISTORY"] = false;
 	}
 
-	function getTotalCount($main_query){
-		if(!empty($this->count_query)){
+	function getTotalCount($main_query) {
+		if (!empty($this->count_query)) {
 		    $count_query = $this->count_query;
-		}else{
+		} else {
 	        $count_query = $this->seed->create_list_count_query($main_query);
 	    }
 		$result = $this->db->query($count_query);
-		if($row = $this->db->fetchByAssoc($result)){
+		if ($row = $this->db->fetchByAssoc($result)) {
 			return $row['c'];
 		}
 		return 0;
@@ -229,13 +229,13 @@ 
 	 * @param string:'id' $id_field
 	 * @return array('data'=> row data, 'pageData' => page data information, 'query' => original query string)
 	 */
-	function getListViewData($seed, $where, $offset=-1, $limit = -1, $filter_fields=array(),$params=array(),$id_field = 'id',$singleSelect=true) {
+	function getListViewData($seed, $where, $offset = -1, $limit = -1, $filter_fields = array(), $params = array(), $id_field = 'id', $singleSelect = true) {
         global $current_user;
         SugarVCR::erase($seed->module_dir);
-        $this->seed =& $seed;
+        $this->seed = & $seed;
         $totalCounted = empty($GLOBALS['sugar_config']['disable_count_query']);
         $_SESSION['MAILMERGE_MODULE_FROM_LISTVIEW'] = $seed->module_dir;
-        if(empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup'){
+        if (empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
             $_SESSION['MAILMERGE_MODULE'] = $seed->module_dir;
         }
 
@@ -244,7 +244,7 @@ 
 		$this->seed->id = '[SELECT_ID_LIST]';
 
         // if $params tell us to override all ordering
-        if(!empty($params['overrideOrder']) && !empty($params['orderBy'])) {
+        if (!empty($params['overrideOrder']) && !empty($params['orderBy'])) {
             $order = $this->getOrderBy(strtolower($params['orderBy']), (empty($params['sortOrder']) ? '' : $params['sortOrder'])); // retreive from $_REQUEST
         }
         else {
@@ -252,17 +252,17 @@ 
         }
 
         // still empty? try to use settings passed in $param
-        if(empty($order['orderBy']) && !empty($params['orderBy'])) {
+        if (empty($order['orderBy']) && !empty($params['orderBy'])) {
             $order['orderBy'] = $params['orderBy'];
-            $order['sortOrder'] =  (empty($params['sortOrder']) ? '' : $params['sortOrder']);
+            $order['sortOrder'] = (empty($params['sortOrder']) ? '' : $params['sortOrder']);
         }
 
         //rrs - bug: 21788. Do not use Order by stmts with fields that are not in the query.
         // Bug 22740 - Tweak this check to strip off the table name off the order by parameter.
         // Samir Gandhi : Do not remove the report_cache.date_modified condition as the report list view is broken
         $orderby = $order['orderBy'];
-        if (strpos($order['orderBy'],'.') && ($order['orderBy'] != "report_cache.date_modified")) {
-            $orderby = substr($order['orderBy'],strpos($order['orderBy'],'.')+1);
+        if (strpos($order['orderBy'], '.') && ($order['orderBy'] != "report_cache.date_modified")) {
+            $orderby = substr($order['orderBy'], strpos($order['orderBy'], '.') + 1);
         }
         if ($orderby != 'date_entered' && !in_array($orderby, array_keys($filter_fields))) {
         	$order['orderBy'] = '';
@@ -272,10 +272,10 @@ 
 		if (empty($order['orderBy'])) {
             $orderBy = '';
         } else {
-            $orderBy = $order['orderBy'] . ' ' . $order['sortOrder'];
+            $orderBy = $order['orderBy'].' '.$order['sortOrder'];
             //wdong, Bug 25476, fix the sorting problem of Oracle.
             if (isset($params['custom_order_by_override']['ori_code']) && $order['orderBy'] == $params['custom_order_by_override']['ori_code'])
-                $orderBy = $params['custom_order_by_override']['custom_code'] . ' ' . $order['sortOrder'];
+                $orderBy = $params['custom_order_by_override']['custom_code'].' '.$order['sortOrder'];
         }
 
         if (empty($params['skipOrderSave'])) { // don't save preferences if told so
@@ -290,34 +290,34 @@ 
 		$ret_array = $seed->create_new_list_query($orderBy, $where, $filter_fields, $params, 0, '', true, $seed, $singleSelect);
         $ret_array['inner_join'] = '';
         if (!empty($this->seed->listview_inner_join)) {
-            $ret_array['inner_join'] = ' ' . implode(' ', $this->seed->listview_inner_join) . ' ';
+            $ret_array['inner_join'] = ' '.implode(' ', $this->seed->listview_inner_join).' ';
         }
 
-		if(!is_array($params)) $params = array();
-        if(!isset($params['custom_select'])) $params['custom_select'] = '';
-        if(!isset($params['custom_from'])) $params['custom_from'] = '';
-        if(!isset($params['custom_where'])) $params['custom_where'] = '';
-        if(!isset($params['custom_order_by'])) $params['custom_order_by'] = '';
-		$main_query = $ret_array['select'] . $params['custom_select'] . $ret_array['from'] . $params['custom_from'] . $ret_array['inner_join']. $ret_array['where'] . $params['custom_where'] . $ret_array['order_by'] . $params['custom_order_by'];
+		if (!is_array($params)) $params = array();
+        if (!isset($params['custom_select'])) $params['custom_select'] = '';
+        if (!isset($params['custom_from'])) $params['custom_from'] = '';
+        if (!isset($params['custom_where'])) $params['custom_where'] = '';
+        if (!isset($params['custom_order_by'])) $params['custom_order_by'] = '';
+		$main_query = $ret_array['select'].$params['custom_select'].$ret_array['from'].$params['custom_from'].$ret_array['inner_join'].$ret_array['where'].$params['custom_where'].$ret_array['order_by'].$params['custom_order_by'];
 		//C.L. - Fix for 23461
-		if(empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
+		if (empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
           	   $_SESSION['export_where'] = $ret_array['where'];
 		}
-   		if($limit < -1) {
+   		if ($limit < -1) {
 			$result = $this->db->query($main_query);
 		}
 		else {
-			if($limit == -1) {
+			if ($limit == -1) {
 				$limit = $this->getLimit();
             }
 			$dyn_offset = $this->getOffset();
-			if($dyn_offset > 0 || !is_int($dyn_offset))$offset = $dyn_offset;
+			if ($dyn_offset > 0 || !is_int($dyn_offset))$offset = $dyn_offset;
 
-            if(strcmp($offset, 'end') == 0){
+            if (strcmp($offset, 'end') == 0) {
             	$totalCount = $this->getTotalCount($main_query);
-            	$offset = (floor(($totalCount -1) / $limit)) * $limit;
+            	$offset = (floor(($totalCount - 1) / $limit)) * $limit;
             }
-            if($this->seed->ACLAccess('ListView')) {
+            if ($this->seed->ACLAccess('ListView')) {
                 $result = $this->db->limitQuery($main_query, $offset, $limit + 1);
             }
             else {
@@ -335,9 +335,9 @@ 
         $idIndex = array();
         $id_list = '';
 
-   		while(($row = $this->db->fetchByAssoc($result)) != null)
+   		while (($row = $this->db->fetchByAssoc($result)) != null)
         {
-   			if($count < $limit)
+   			if ($count < $limit)
             {
    				$id_list .= ',\''.$row[$id_field].'\'';
    				$idIndex[$row[$id_field]][] = count($rows);
@@ -351,51 +351,51 @@ 
             $id_list = '('.substr($id_list, 1).')';
         }
 
-        SugarVCR::store($this->seed->module_dir,  $main_query);
-		if($count != 0) {
+        SugarVCR::store($this->seed->module_dir, $main_query);
+		if ($count != 0) {
 			//NOW HANDLE SECONDARY QUERIES
-			if(!empty($ret_array['secondary_select'])) {
-				$secondary_query = $ret_array['secondary_select'] . $ret_array['secondary_from'] . ' WHERE '.$this->seed->table_name.'.id IN ' .$id_list;
-                if(isset($ret_array['order_by']))
+			if (!empty($ret_array['secondary_select'])) {
+				$secondary_query = $ret_array['secondary_select'].$ret_array['secondary_from'].' WHERE '.$this->seed->table_name.'.id IN '.$id_list;
+                if (isset($ret_array['order_by']))
                 {
-                    $secondary_query .= ' ' . $ret_array['order_by'];
+                    $secondary_query .= ' '.$ret_array['order_by'];
                 }
 
                 $secondary_result = $this->db->query($secondary_query);
 
                 $ref_id_count = array();
-				while($row = $this->db->fetchByAssoc($secondary_result)) {
+				while ($row = $this->db->fetchByAssoc($secondary_result)) {
 
                     $ref_id_count[$row['ref_id']][] = true;
-					foreach($row as $name=>$value) {
+					foreach ($row as $name=>$value) {
 						//add it to every row with the given id
-						foreach($idIndex[$row['ref_id']] as $index){
-						    $rows[$index][$name]=$value;
+						foreach ($idIndex[$row['ref_id']] as $index) {
+						    $rows[$index][$name] = $value;
 						}
 					}
 				}
 
                 $rows_keys = array_keys($rows);
-                foreach($rows_keys as $key)
+                foreach ($rows_keys as $key)
                 {
                     $rows[$key]['secondary_select_count'] = count($ref_id_count[$rows[$key]['ref_id']]);
                 }
 			}
 
             // retrieve parent names
-            if(!empty($filter_fields['parent_name']) && !empty($filter_fields['parent_id']) && !empty($filter_fields['parent_type'])) {
-                foreach($idIndex as $id => $rowIndex) {
-                    if(!isset($post_retrieve[$rows[$rowIndex[0]]['parent_type']])) {
+            if (!empty($filter_fields['parent_name']) && !empty($filter_fields['parent_id']) && !empty($filter_fields['parent_type'])) {
+                foreach ($idIndex as $id => $rowIndex) {
+                    if (!isset($post_retrieve[$rows[$rowIndex[0]]['parent_type']])) {
                         $post_retrieve[$rows[$rowIndex[0]]['parent_type']] = array();
                     }
-                    if(!empty($rows[$rowIndex[0]]['parent_id'])) $post_retrieve[$rows[$rowIndex[0]]['parent_type']][] = array('child_id' => $id , 'parent_id'=> $rows[$rowIndex[0]]['parent_id'], 'parent_type' => $rows[$rowIndex[0]]['parent_type'], 'type' => 'parent');
+                    if (!empty($rows[$rowIndex[0]]['parent_id'])) $post_retrieve[$rows[$rowIndex[0]]['parent_type']][] = array('child_id' => $id, 'parent_id'=> $rows[$rowIndex[0]]['parent_id'], 'parent_type' => $rows[$rowIndex[0]]['parent_type'], 'type' => 'parent');
                 }
-                if(isset($post_retrieve)) {
+                if (isset($post_retrieve)) {
                     $parent_fields = $seed->retrieve_parent_fields($post_retrieve);
-                    foreach($parent_fields as $child_id => $parent_data) {
+                    foreach ($parent_fields as $child_id => $parent_data) {
                         //add it to every row with the given id
-						foreach($idIndex[$child_id] as $index){
-						    $rows[$index]['parent_name']= $parent_data['parent_name'];
+						foreach ($idIndex[$child_id] as $index) {
+						    $rows[$index]['parent_name'] = $parent_data['parent_name'];
 						}
                     }
                 }
@@ -404,7 +404,7 @@ 
 			$pageData = array();
 
 			reset($rows);
-			while($row = current($rows)){
+			while ($row = current($rows)) {
 
                 $temp = clone $seed;
 			    $dataIndex = count($data);
@@ -414,9 +414,9 @@ 
 				if (empty($this->seed->assigned_user_id) && !empty($temp->assigned_user_id)) {
 				    $this->seed->assigned_user_id = $temp->assigned_user_id;
 				}
-				if($idIndex[$row[$id_field]][0] == $dataIndex){
+				if ($idIndex[$row[$id_field]][0] == $dataIndex) {
 				    $pageData['tag'][$dataIndex] = $temp->listviewACLHelper();
-				}else{
+				} else {
 				    $pageData['tag'][$dataIndex] = $pageData['tag'][$idIndex[$row[$id_field]][0]];
 				}
 				$data[$dataIndex] = $temp->get_list_view_data($filter_fields);
@@ -424,21 +424,21 @@ 
                 $editViewAccess = $temp->ACLAccess('EditView');
                 $pageData['rowAccess'][$dataIndex] = array('view' => $detailViewAccess, 'edit' => $editViewAccess);
                 $additionalDetailsAllow = $this->additionalDetails && $detailViewAccess && (file_exists(
-                         'modules/' . $temp->module_dir . '/metadata/additionalDetails.php'
-                     ) || file_exists('custom/modules/' . $temp->module_dir . '/metadata/additionalDetails.php'));
+                         'modules/'.$temp->module_dir.'/metadata/additionalDetails.php'
+                     ) || file_exists('custom/modules/'.$temp->module_dir.'/metadata/additionalDetails.php'));
                 $additionalDetailsEdit = $editViewAccess;
-                if($additionalDetailsAllow) {
-                    if($this->additionalDetailsAjax) {
+                if ($additionalDetailsAllow) {
+                    if ($this->additionalDetailsAjax) {
 					   $ar = $this->getAdditionalDetailsAjax($data[$dataIndex]['ID']);
                     }
                     else {
-                        $additionalDetailsFile = 'modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php';
-                        if(file_exists('custom/modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php')){
-                        	$additionalDetailsFile = 'custom/modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php';
+                        $additionalDetailsFile = 'modules/'.$this->seed->module_dir.'/metadata/additionalDetails.php';
+                        if (file_exists('custom/modules/'.$this->seed->module_dir.'/metadata/additionalDetails.php')) {
+                        	$additionalDetailsFile = 'custom/modules/'.$this->seed->module_dir.'/metadata/additionalDetails.php';
                         }
                         require_once($additionalDetailsFile);
                         $ar = $this->getAdditionalDetails($data[$dataIndex],
-                                    (empty($this->additionalDetailsFunction) ? 'additionalDetails' : $this->additionalDetailsFunction) . $this->seed->object_name,
+                                    (empty($this->additionalDetailsFunction) ? 'additionalDetails' : $this->additionalDetailsFunction).$this->seed->object_name,
                                     $additionalDetailsEdit);
                     }
                     $pageData['additionalDetails'][$dataIndex] = $ar['string'];
@@ -450,18 +450,18 @@ 
 		$nextOffset = -1;
 		$prevOffset = -1;
 		$endOffset = -1;
-		if($count > $limit) {
+		if ($count > $limit) {
 			$nextOffset = $offset + $limit;
 		}
 
-		if($offset > 0) {
+		if ($offset > 0) {
 			$prevOffset = $offset - $limit;
-			if($prevOffset < 0)$prevOffset = 0;
+			if ($prevOffset < 0)$prevOffset = 0;
 		}
 		$totalCount = $count + $offset;
 
-		if( $count >= $limit && $totalCounted){
-			$totalCount  = $this->getTotalCount($main_query);
+		if ($count >= $limit && $totalCounted) {
+			$totalCount = $this->getTotalCount($main_query);
 		}
 		SugarVCR::recordIDs($this->seed->module_dir, array_keys($idIndex), $offset, $totalCount);
         $module_names = array(
@@ -471,21 +471,21 @@ 
 		$pageData['ordering'] = $order;
 		$pageData['ordering']['sortOrder'] = $this->getReverseSortOrder($pageData['ordering']['sortOrder']);
         //get url parameters as an array
-        $pageData['queries'] = $this->generateQueries($pageData['ordering']['sortOrder'], $offset, $prevOffset, $nextOffset,  $endOffset, $totalCounted);
+        $pageData['queries'] = $this->generateQueries($pageData['ordering']['sortOrder'], $offset, $prevOffset, $nextOffset, $endOffset, $totalCounted);
         //join url parameters from array to a string
         $pageData['urls'] = $this->generateURLS($pageData['queries']);
-		$pageData['offsets'] = array( 'current'=>$offset, 'next'=>$nextOffset, 'prev'=>$prevOffset, 'end'=>$endOffset, 'total'=>$totalCount, 'totalCounted'=>$totalCounted);
+		$pageData['offsets'] = array('current'=>$offset, 'next'=>$nextOffset, 'prev'=>$prevOffset, 'end'=>$endOffset, 'total'=>$totalCount, 'totalCounted'=>$totalCounted);
 		$pageData['bean'] = array('objectName' => $seed->object_name, 'moduleDir' => $seed->module_dir, 'moduleName' => strtr($seed->module_dir, $module_names));
         $pageData['stamp'] = $this->stamp;
         $pageData['access'] = array('view' => $this->seed->ACLAccess('DetailView'), 'edit' => $this->seed->ACLAccess('EditView'));
 		$pageData['idIndex'] = $idIndex;
-        if(!$this->seed->ACLAccess('ListView')) {
+        if (!$this->seed->ACLAccess('ListView')) {
             $pageData['error'] = 'ACL restricted access';
         }
 
         $queryString = '';
 
-        if( isset($_REQUEST["searchFormTab"]) && $_REQUEST["searchFormTab"] == "advanced_search" ||
+        if (isset($_REQUEST["searchFormTab"]) && $_REQUEST["searchFormTab"] == "advanced_search" ||
         	isset($_REQUEST["type_basic"]) && (count($_REQUEST["type_basic"] > 1) || $_REQUEST["type_basic"][0] != "") ||
         	isset($_REQUEST["module"]) && $_REQUEST["module"] == "MergeRecords")
         {
@@ -493,19 +493,19 @@ 
         }
         else if (isset($_REQUEST["searchFormTab"]) && $_REQUEST["searchFormTab"] == "basic_search")
         {
-            if($seed->module_dir == "Reports") $searchMetaData = SearchFormReports::retrieveReportsSearchDefs();
+            if ($seed->module_dir == "Reports") $searchMetaData = SearchFormReports::retrieveReportsSearchDefs();
             else $searchMetaData = SearchForm::retrieveSearchDefs($seed->module_dir);
 
             $basicSearchFields = array();
 
-            if( isset($searchMetaData['searchdefs']) && isset($searchMetaData['searchdefs'][$seed->module_dir]['layout']['basic_search']) )
+            if (isset($searchMetaData['searchdefs']) && isset($searchMetaData['searchdefs'][$seed->module_dir]['layout']['basic_search']))
                 $basicSearchFields = $searchMetaData['searchdefs'][$seed->module_dir]['layout']['basic_search'];
 
-            foreach( $basicSearchFields as $basicSearchField)
+            foreach ($basicSearchFields as $basicSearchField)
             {
                 $field_name = (is_array($basicSearchField) && isset($basicSearchField['name'])) ? $basicSearchField['name'] : $basicSearchField;
                 $field_name .= "_basic";
-                if( isset($_REQUEST[$field_name])  && ( !is_array($basicSearchField) || !isset($basicSearchField['type']) || $basicSearchField['type'] == 'text' || $basicSearchField['type'] == 'name') )
+                if (isset($_REQUEST[$field_name]) && (!is_array($basicSearchField) || !isset($basicSearchField['type']) || $basicSearchField['type'] == 'text' || $basicSearchField['type'] == 'name'))
                 {
                     // Ensure the encoding is UTF-8
                     $queryString = htmlentities($_REQUEST[$field_name], null, 'UTF-8');
@@ -514,7 +514,7 @@ 
             }
         }
 
-		return array('data'=>$data , 'pageData'=>$pageData, 'query' => $queryString);
+		return array('data'=>$data, 'pageData'=>$pageData, 'query' => $queryString);
 	}
 
 
@@ -528,7 +528,7 @@ 
     {
         foreach ($queries as $name => $value)
         {
-            $queries[$name] = 'index.php?' . http_build_query($value);
+            $queries[$name] = 'index.php?'.http_build_query($value);
         }
         $this->base_url = $queries['baseURL'];
         return $queries;
@@ -554,22 +554,22 @@ 
         $queries['orderBy'] = $queries['baseURL'];
         $queries['orderBy'][$this->var_order_by] = '';
 
-        if($nextOffset > -1)
+        if ($nextOffset > -1)
         {
             $queries['nextPage'] = $queries['baseURL'];
             $queries['nextPage'][$this->var_offset] = $nextOffset;
         }
-        if($offset > 0)
+        if ($offset > 0)
         {
             $queries['startPage'] = $queries['baseURL'];
             $queries['startPage'][$this->var_offset] = 0;
         }
-        if($prevOffset > -1)
+        if ($prevOffset > -1)
         {
             $queries['prevPage'] = $queries['baseURL'];
             $queries['prevPage'][$this->var_offset] = $prevOffset;
         }
-        if($totalCounted)
+        if ($totalCounted)
         {
             $queries['endPage'] = $queries['baseURL'];
             $queries['endPage'][$this->var_offset] = $endOffset;
@@ -594,7 +594,7 @@ 
 
         $jscalendarImage = SugarThemeRegistry::current()->getImageURL('info_inline.gif');
 
-        $extra = "<span id='adspan_" . $id . "' "
+        $extra = "<span id='adspan_".$id."' "
                 . "onclick=\"lvg_dtails('$id')\" "
 				. " style='position: relative;'><!--not_in_theme!--><img vertical-align='middle' class='info' border='0' alt='".$app_strings['LBL_ADDITIONAL_DETAILS']."' src='$jscalendarImage'></span>";
 
@@ -618,27 +618,27 @@ 
 
         $results['string'] = str_replace(array("&#039", "'"), '\&#039', $results['string']); // no xss!
 
-        if(trim($results['string']) == '')
+        if (trim($results['string']) == '')
         {
             $results['string'] = $app_strings['LBL_NONE'];
         }
          	$close = false;
             $extra = "<img alt='{$app_strings['LBL_INFOINLINE']}' style='padding: 0px 5px 0px 2px' border='0' onclick=\"SUGAR.util.getStaticAdditionalDetails(this,'";
 
-            $extra .= str_replace(array("\rn", "\r", "\n"), array('','','<br />'), $results['string']) ;
+            $extra .= str_replace(array("\rn", "\r", "\n"), array('', '', '<br />'), $results['string']);
             $extra .= "','<div style=\'float:left\'>{$app_strings['LBL_ADDITIONAL_DETAILS']}</div><div style=\'float: right\'>";
 
-	        if($editAccess && !empty($results['editLink']))
+	        if ($editAccess && !empty($results['editLink']))
 	        {
-	            $extra .=  "<a title=\'{$app_strings['LBL_EDIT_BUTTON']}\' href={$results['editLink']}><img style=\'margin-left: 2px;\' border=\'0\' src=\'".SugarThemeRegistry::current()->getImageURL('edit_inline.png')."\'></a>";
+	            $extra .= "<a title=\'{$app_strings['LBL_EDIT_BUTTON']}\' href={$results['editLink']}><img style=\'margin-left: 2px;\' border=\'0\' src=\'".SugarThemeRegistry::current()->getImageURL('edit_inline.png')."\'></a>";
 	            $close = true;
 	        }
 	        $close = (!empty($results['viewLink'])) ? true : $close;
 	        $extra .= (!empty($results['viewLink']) ? "<a title=\'{$app_strings['LBL_VIEW_BUTTON']}\' href={$results['viewLink']}><img style=\'margin-left: 2px;\' border=\'0\' src=".SugarThemeRegistry::current()->getImageURL('view_inline.png')."></a>" : '');
 
-            if($close == true) {
+            if ($close == true) {
             	$closeVal = "true";
-            	$extra .=  "<a title=\'{$app_strings['LBL_ADDITIONAL_DETAILS_CLOSE_TITLE']}\' href=\'javascript: SUGAR.util.closeStaticAdditionalDetails();\'><img style=\'margin-left: 2px;\' border=\'0\' src=\'".SugarThemeRegistry::current()->getImageURL('close.png')."\'></a>";
+            	$extra .= "<a title=\'{$app_strings['LBL_ADDITIONAL_DETAILS_CLOSE_TITLE']}\' href=\'javascript: SUGAR.util.closeStaticAdditionalDetails();\'><img style=\'margin-left: 2px;\' border=\'0\' src=\'".SugarThemeRegistry::current()->getImageURL('close.png')."\'></a>";
             } else {
             	$closeVal = "false";
             }

Braces +47 added lines, -31 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -84,8 +86,7 @@ 
             }
             $_SESSION[$this->var_order_by] = array('orderBy'=>$orderBy, 'direction'=> $direction);
             $_SESSION['lvd']['last_ob'] = $orderBy;
-        }
-		else {
+        } else {
             $userPreferenceOrder = $GLOBALS['current_user']->getPreference('listviewOrder', $this->var_name);
 			if(!empty($_SESSION[$this->var_order_by])) {
 				$orderBy = $_SESSION[$this->var_order_by]['orderBy'];
@@ -183,7 +184,7 @@ 
 	function getTotalCount($main_query){
 		if(!empty($this->count_query)){
 		    $count_query = $this->count_query;
-		}else{
+		} else{
 	        $count_query = $this->seed->create_list_count_query($main_query);
 	    }
 		$result = $this->db->query($count_query);
@@ -246,8 +247,7 @@ 
         // if $params tell us to override all ordering
         if(!empty($params['overrideOrder']) && !empty($params['orderBy'])) {
             $order = $this->getOrderBy(strtolower($params['orderBy']), (empty($params['sortOrder']) ? '' : $params['sortOrder'])); // retreive from $_REQUEST
-        }
-        else {
+        } else {
             $order = $this->getOrderBy(); // retreive from $_REQUEST
         }
 
@@ -274,8 +274,9 @@ 
         } else {
             $orderBy = $order['orderBy'] . ' ' . $order['sortOrder'];
             //wdong, Bug 25476, fix the sorting problem of Oracle.
-            if (isset($params['custom_order_by_override']['ori_code']) && $order['orderBy'] == $params['custom_order_by_override']['ori_code'])
-                $orderBy = $params['custom_order_by_override']['custom_code'] . ' ' . $order['sortOrder'];
+            if (isset($params['custom_order_by_override']['ori_code']) && $order['orderBy'] == $params['custom_order_by_override']['ori_code']) {
+                            $orderBy = $params['custom_order_by_override']['custom_code'] . ' ' . $order['sortOrder'];
+            }
         }
 
         if (empty($params['skipOrderSave'])) { // don't save preferences if told so
@@ -293,11 +294,21 @@ 
             $ret_array['inner_join'] = ' ' . implode(' ', $this->seed->listview_inner_join) . ' ';
         }
 
-		if(!is_array($params)) $params = array();
-        if(!isset($params['custom_select'])) $params['custom_select'] = '';
-        if(!isset($params['custom_from'])) $params['custom_from'] = '';
-        if(!isset($params['custom_where'])) $params['custom_where'] = '';
-        if(!isset($params['custom_order_by'])) $params['custom_order_by'] = '';
+		if(!is_array($params)) {
+		    $params = array();
+		}
+        if(!isset($params['custom_select'])) {
+            $params['custom_select'] = '';
+        }
+        if(!isset($params['custom_from'])) {
+            $params['custom_from'] = '';
+        }
+        if(!isset($params['custom_where'])) {
+            $params['custom_where'] = '';
+        }
+        if(!isset($params['custom_order_by'])) {
+            $params['custom_order_by'] = '';
+        }
 		$main_query = $ret_array['select'] . $params['custom_select'] . $ret_array['from'] . $params['custom_from'] . $ret_array['inner_join']. $ret_array['where'] . $params['custom_where'] . $ret_array['order_by'] . $params['custom_order_by'];
 		//C.L. - Fix for 23461
 		if(empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
@@ -305,13 +316,14 @@ 
 		}
    		if($limit < -1) {
 			$result = $this->db->query($main_query);
-		}
-		else {
+		} else {
 			if($limit == -1) {
 				$limit = $this->getLimit();
             }
 			$dyn_offset = $this->getOffset();
-			if($dyn_offset > 0 || !is_int($dyn_offset))$offset = $dyn_offset;
+			if($dyn_offset > 0 || !is_int($dyn_offset)) {
+			    $offset = $dyn_offset;
+			}
 
             if(strcmp($offset, 'end') == 0){
             	$totalCount = $this->getTotalCount($main_query);
@@ -319,8 +331,7 @@ 
             }
             if($this->seed->ACLAccess('ListView')) {
                 $result = $this->db->limitQuery($main_query, $offset, $limit + 1);
-            }
-            else {
+            } else {
                 $result = array();
             }
 
@@ -388,7 +399,9 @@ 
                     if(!isset($post_retrieve[$rows[$rowIndex[0]]['parent_type']])) {
                         $post_retrieve[$rows[$rowIndex[0]]['parent_type']] = array();
                     }
-                    if(!empty($rows[$rowIndex[0]]['parent_id'])) $post_retrieve[$rows[$rowIndex[0]]['parent_type']][] = array('child_id' => $id , 'parent_id'=> $rows[$rowIndex[0]]['parent_id'], 'parent_type' => $rows[$rowIndex[0]]['parent_type'], 'type' => 'parent');
+                    if(!empty($rows[$rowIndex[0]]['parent_id'])) {
+                        $post_retrieve[$rows[$rowIndex[0]]['parent_type']][] = array('child_id' => $id , 'parent_id'=> $rows[$rowIndex[0]]['parent_id'], 'parent_type' => $rows[$rowIndex[0]]['parent_type'], 'type' => 'parent');
+                    }
                 }
                 if(isset($post_retrieve)) {
                     $parent_fields = $seed->retrieve_parent_fields($post_retrieve);
@@ -416,7 +429,7 @@ 
 				}
 				if($idIndex[$row[$id_field]][0] == $dataIndex){
 				    $pageData['tag'][$dataIndex] = $temp->listviewACLHelper();
-				}else{
+				} else{
 				    $pageData['tag'][$dataIndex] = $pageData['tag'][$idIndex[$row[$id_field]][0]];
 				}
 				$data[$dataIndex] = $temp->get_list_view_data($filter_fields);
@@ -430,8 +443,7 @@ 
                 if($additionalDetailsAllow) {
                     if($this->additionalDetailsAjax) {
 					   $ar = $this->getAdditionalDetailsAjax($data[$dataIndex]['ID']);
-                    }
-                    else {
+                    } else {
                         $additionalDetailsFile = 'modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php';
                         if(file_exists('custom/modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php')){
                         	$additionalDetailsFile = 'custom/modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php';
@@ -456,7 +468,9 @@ 
 
 		if($offset > 0) {
 			$prevOffset = $offset - $limit;
-			if($prevOffset < 0)$prevOffset = 0;
+			if($prevOffset < 0) {
+			    $prevOffset = 0;
+			}
 		}
 		$totalCount = $count + $offset;
 
@@ -490,16 +504,19 @@ 
         	isset($_REQUEST["module"]) && $_REQUEST["module"] == "MergeRecords")
         {
             $queryString = "-advanced_search";
-        }
-        else if (isset($_REQUEST["searchFormTab"]) && $_REQUEST["searchFormTab"] == "basic_search")
+        } else if (isset($_REQUEST["searchFormTab"]) && $_REQUEST["searchFormTab"] == "basic_search")
         {
-            if($seed->module_dir == "Reports") $searchMetaData = SearchFormReports::retrieveReportsSearchDefs();
-            else $searchMetaData = SearchForm::retrieveSearchDefs($seed->module_dir);
+            if($seed->module_dir == "Reports") {
+                $searchMetaData = SearchFormReports::retrieveReportsSearchDefs();
+            } else {
+                $searchMetaData = SearchForm::retrieveSearchDefs($seed->module_dir);
+            }
 
             $basicSearchFields = array();
 
-            if( isset($searchMetaData['searchdefs']) && isset($searchMetaData['searchdefs'][$seed->module_dir]['layout']['basic_search']) )
-                $basicSearchFields = $searchMetaData['searchdefs'][$seed->module_dir]['layout']['basic_search'];
+            if( isset($searchMetaData['searchdefs']) && isset($searchMetaData['searchdefs'][$seed->module_dir]['layout']['basic_search']) ) {
+                            $basicSearchFields = $searchMetaData['searchdefs'][$seed->module_dir]['layout']['basic_search'];
+            }
 
             foreach( $basicSearchFields as $basicSearchField)
             {
@@ -573,8 +590,7 @@ 
         {
             $queries['endPage'] = $queries['baseURL'];
             $queries['endPage'][$this->var_offset] = $endOffset;
-        }
-        else
+        } else
         {
             $queries['endPage'] = $queries['baseURL'];
             $queries['endPage'][$this->var_offset] = 'end';

include/utils/sugar_file_utils.php

Indentation +153 added lines, -153 removed lines

@@ -54,44 +54,44 @@ 
  * @return boolean - Returns true on success false on failure
  */
 function sugar_mkdir($pathname, $mode=null, $recursive=false, $context='') {
-	$mode = get_mode('dir_mode', $mode);
-
-	if ( sugar_is_dir($pathname,$mode) )
-	    return true;
-
-	$result = false;
-	if(empty($mode))
-		$mode = 0777;
-	if(empty($context)) {
-		$result = @mkdir($pathname, $mode, $recursive);
-	} else {
-		$result = @mkdir($pathname, $mode, $recursive, $context);
-	}
-
-	if($result){
-		if(!sugar_chmod($pathname, $mode)){
-			return false;
-		}
-		if(!empty($GLOBALS['sugar_config']['default_permissions']['user'])){
-			if(!sugar_chown($pathname)){
-				return false;
-			}
-		}
-		if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
-   			if(!sugar_chgrp($pathname)) {
-   				return false;
-   			}
-		}
-	}
-	else {
-		$errorMessage = "Cannot create directory $pathname cannot be touched";
-		if(is_null($GLOBALS['log'])) {
-			throw new Exception("Error occurred but the system doesn't have logger. Error message: \"$errorMessage\"");
-		}
-		$GLOBALS['log']->error($errorMessage);
-	}
-
-	return $result;
+    $mode = get_mode('dir_mode', $mode);
+
+    if ( sugar_is_dir($pathname,$mode) )
+        return true;
+
+    $result = false;
+    if(empty($mode))
+        $mode = 0777;
+    if(empty($context)) {
+        $result = @mkdir($pathname, $mode, $recursive);
+    } else {
+        $result = @mkdir($pathname, $mode, $recursive, $context);
+    }
+
+    if($result){
+        if(!sugar_chmod($pathname, $mode)){
+            return false;
+        }
+        if(!empty($GLOBALS['sugar_config']['default_permissions']['user'])){
+            if(!sugar_chown($pathname)){
+                return false;
+            }
+        }
+        if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
+                if(!sugar_chgrp($pathname)) {
+                    return false;
+                }
+        }
+    }
+    else {
+        $errorMessage = "Cannot create directory $pathname cannot be touched";
+        if(is_null($GLOBALS['log'])) {
+            throw new Exception("Error occurred but the system doesn't have logger. Error message: \"$errorMessage\"");
+        }
+        $GLOBALS['log']->error($errorMessage);
+    }
+
+    return $result;
 }
 
 /**
@@ -109,17 +109,17 @@ 
  * @return boolean - Returns a file pointer on success, false otherwise
  */
 function sugar_fopen($filename, $mode, $use_include_path=false, $context=null){
-	//check to see if the file exists, if not then use touch to create it.
-	if(!file_exists($filename)){
-		sugar_touch($filename);
-	}
+    //check to see if the file exists, if not then use touch to create it.
+    if(!file_exists($filename)){
+        sugar_touch($filename);
+    }
 
-	if(empty($context)) {
+    if(empty($context)) {
 
-		return fopen($filename, $mode, $use_include_path);
-	} else {
-		return fopen($filename, $mode, $use_include_path, $context);
-	}
+        return fopen($filename, $mode, $use_include_path);
+    } else {
+        return fopen($filename, $mode, $use_include_path, $context);
+    }
 }
 
 /**
@@ -137,23 +137,23 @@ 
  * @return int - Returns the number of bytes written to the file, false otherwise.
  */
 function sugar_file_put_contents($filename, $data, $flags=null, $context=null){
-	//check to see if the file exists, if not then use touch to create it.
-	if(!file_exists($filename)){
-		sugar_touch($filename);
-	}
-
-	if ( !is_writable($filename) ) {
-	    $GLOBALS['log']->error("File $filename cannot be written to");
-	    return false;
-	}
-
-	if(empty($flags)) {
-		return file_put_contents($filename, $data);
-	} elseif(empty($context)) {
-		return file_put_contents($filename, $data, $flags);
-	} else{
-		return file_put_contents($filename, $data, $flags, $context);
-	}
+    //check to see if the file exists, if not then use touch to create it.
+    if(!file_exists($filename)){
+        sugar_touch($filename);
+    }
+
+    if ( !is_writable($filename) ) {
+        $GLOBALS['log']->error("File $filename cannot be written to");
+        return false;
+    }
+
+    if(empty($flags)) {
+        return file_put_contents($filename, $data);
+    } elseif(empty($context)) {
+        return file_put_contents($filename, $data, $flags);
+    } else{
+        return file_put_contents($filename, $data, $flags, $context);
+    }
 }
 
 
@@ -198,7 +198,7 @@ 
 
     if(file_exists($filename))
     {
-       return sugar_chmod($filename, 0755);
+        return sugar_chmod($filename, 0755);
     }
 
     return false;
@@ -215,21 +215,21 @@ 
  * @return string|boolean - Returns a file data on success, false otherwise
  */
 function sugar_file_get_contents($filename, $use_include_path=false, $context=null){
-	//check to see if the file exists, if not then use touch to create it.
-	if(!file_exists($filename)){
-		sugar_touch($filename);
-	}
-
-	if ( !is_readable($filename) ) {
-	    $GLOBALS['log']->error("File $filename cannot be read");
-	    return false;
-	}
-
-	if(empty($context)) {
-		return file_get_contents($filename, $use_include_path);
-	} else {
-		return file_get_contents($filename, $use_include_path, $context);
-	}
+    //check to see if the file exists, if not then use touch to create it.
+    if(!file_exists($filename)){
+        sugar_touch($filename);
+    }
+
+    if ( !is_readable($filename) ) {
+        $GLOBALS['log']->error("File $filename cannot be read");
+        return false;
+    }
+
+    if(empty($context)) {
+        return file_get_contents($filename, $use_include_path);
+    } else {
+        return file_get_contents($filename, $use_include_path, $context);
+    }
 }
 
 /**
@@ -248,31 +248,31 @@ 
  */
 function sugar_touch($filename, $time=null, $atime=null) {
 
-   $result = false;
-
-   if(!empty($atime) && !empty($time)) {
-   	  $result = @touch($filename, $time, $atime);
-   } else if(!empty($time)) {
-   	  $result = @touch($filename, $time);
-   } else {
-   	  $result = @touch($filename);
-   }
-
-   if(!$result) {
-       $GLOBALS['log']->error("File $filename cannot be touched");
-       return $result;
-   }
-	if(!empty($GLOBALS['sugar_config']['default_permissions']['file_mode'])){
-		sugar_chmod($filename, $GLOBALS['sugar_config']['default_permissions']['file_mode']);
-	}
-	if(!empty($GLOBALS['sugar_config']['default_permissions']['user'])){
-		sugar_chown($filename);
-	}
-	if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
-		sugar_chgrp($filename);
-	}
-
-   return true;
+    $result = false;
+
+    if(!empty($atime) && !empty($time)) {
+            $result = @touch($filename, $time, $atime);
+    } else if(!empty($time)) {
+            $result = @touch($filename, $time);
+    } else {
+            $result = @touch($filename);
+    }
+
+    if(!$result) {
+        $GLOBALS['log']->error("File $filename cannot be touched");
+        return $result;
+    }
+    if(!empty($GLOBALS['sugar_config']['default_permissions']['file_mode'])){
+        sugar_chmod($filename, $GLOBALS['sugar_config']['default_permissions']['file_mode']);
+    }
+    if(!empty($GLOBALS['sugar_config']['default_permissions']['user'])){
+        sugar_chown($filename);
+    }
+    if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
+        sugar_chgrp($filename);
+    }
+
+    return true;
 }
 
 /**
@@ -287,17 +287,17 @@ 
 function sugar_chmod($filename, $mode=null) {
     if ( !is_int($mode) )
         $mode = (int) $mode;
-	if(!is_windows()){
-		if(!isset($mode)){
-			$mode = get_mode('file_mode', $mode);
-		}
+    if(!is_windows()){
+        if(!isset($mode)){
+            $mode = get_mode('file_mode', $mode);
+        }
         if(isset($mode) && $mode > 0){
-		   return @chmod($filename, $mode);
-		}else{
-	    	return false;
-		}
-	}
-	return true;
+            return @chmod($filename, $mode);
+        }else{
+            return false;
+        }
+    }
+    return true;
 }
 
 /**
@@ -310,19 +310,19 @@ 
  * @return boolean - Returns TRUE on success or FALSE on failure.
  */
 function sugar_chown($filename, $user='') {
-	if(!is_windows()){
-		if(strlen($user)){
-			return chown($filename, $user);
-		}else{
-			if(strlen($GLOBALS['sugar_config']['default_permissions']['user'])){
-				$user = $GLOBALS['sugar_config']['default_permissions']['user'];
-				return chown($filename, $user);
-			}else{
-				return false;
-			}
-		}
-	}
-	return true;
+    if(!is_windows()){
+        if(strlen($user)){
+            return chown($filename, $user);
+        }else{
+            if(strlen($GLOBALS['sugar_config']['default_permissions']['user'])){
+                $user = $GLOBALS['sugar_config']['default_permissions']['user'];
+                return chown($filename, $user);
+            }else{
+                return false;
+            }
+        }
+    }
+    return true;
 }
 
 /**
@@ -335,19 +335,19 @@ 
  * @return boolean - Returns TRUE on success or FALSE on failure.
  */
 function sugar_chgrp($filename, $group='') {
-	if(!is_windows()){
-		if(!empty($group)){
-			return chgrp($filename, $group);
-		}else{
-			if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
-				$group = $GLOBALS['sugar_config']['default_permissions']['group'];
-				return chgrp($filename, $group);
-			}else{
-				return false;
-			}
-		}
-	}
-	return true;
+    if(!is_windows()){
+        if(!empty($group)){
+            return chgrp($filename, $group);
+        }else{
+            if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
+                $group = $GLOBALS['sugar_config']['default_permissions']['group'];
+                return chgrp($filename, $group);
+            }else{
+                return false;
+            }
+        }
+    }
+    return true;
 }
 
 /**
@@ -361,26 +361,26 @@ 
  * @return int - the mode either found in the config file or passed in via the input parameter
  */
 function get_mode($key = 'dir_mode', $mode=null) {
-	if ( !is_int($mode) )
+    if ( !is_int($mode) )
         $mode = (int) $mode;
     if(!class_exists('SugarConfig', true)) {
-		require 'include/SugarObjects/SugarConfig.php';
-	}
-	if(!is_windows()){
-		$conf_inst=SugarConfig::getInstance();
-		$mode = $conf_inst->get('default_permissions.'.$key, $mode);
-	}
-	return $mode;
+        require 'include/SugarObjects/SugarConfig.php';
+    }
+    if(!is_windows()){
+        $conf_inst=SugarConfig::getInstance();
+        $mode = $conf_inst->get('default_permissions.'.$key, $mode);
+    }
+    return $mode;
 }
 
 function sugar_is_dir($path, $mode='r'){
-		if(defined('TEMPLATE_URL'))return is_dir($path, $mode);
-		return is_dir($path);
+        if(defined('TEMPLATE_URL'))return is_dir($path, $mode);
+        return is_dir($path);
 }
 
 function sugar_is_file($path, $mode='r'){
-		if(defined('TEMPLATE_URL'))return is_file($path, $mode);
-		return is_file($path);
+        if(defined('TEMPLATE_URL'))return is_file($path, $mode);
+        return is_file($path);
 }
 
 /**

Spacing +66 added lines, -66 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.
@@ -53,39 +53,39 @@ 
  * @param $context
  * @return boolean - Returns true on success false on failure
  */
-function sugar_mkdir($pathname, $mode=null, $recursive=false, $context='') {
+function sugar_mkdir($pathname, $mode = null, $recursive = false, $context = '') {
 	$mode = get_mode('dir_mode', $mode);
 
-	if ( sugar_is_dir($pathname,$mode) )
+	if (sugar_is_dir($pathname, $mode))
 	    return true;
 
 	$result = false;
-	if(empty($mode))
+	if (empty($mode))
 		$mode = 0777;
-	if(empty($context)) {
+	if (empty($context)) {
 		$result = @mkdir($pathname, $mode, $recursive);
 	} else {
 		$result = @mkdir($pathname, $mode, $recursive, $context);
 	}
 
-	if($result){
-		if(!sugar_chmod($pathname, $mode)){
+	if ($result) {
+		if (!sugar_chmod($pathname, $mode)) {
 			return false;
 		}
-		if(!empty($GLOBALS['sugar_config']['default_permissions']['user'])){
-			if(!sugar_chown($pathname)){
+		if (!empty($GLOBALS['sugar_config']['default_permissions']['user'])) {
+			if (!sugar_chown($pathname)) {
 				return false;
 			}
 		}
-		if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
-   			if(!sugar_chgrp($pathname)) {
+		if (!empty($GLOBALS['sugar_config']['default_permissions']['group'])) {
+   			if (!sugar_chgrp($pathname)) {
    				return false;
    			}
 		}
 	}
 	else {
 		$errorMessage = "Cannot create directory $pathname cannot be touched";
-		if(is_null($GLOBALS['log'])) {
+		if (is_null($GLOBALS['log'])) {
 			throw new Exception("Error occurred but the system doesn't have logger. Error message: \"$errorMessage\"");
 		}
 		$GLOBALS['log']->error($errorMessage);
@@ -108,13 +108,13 @@ 
  * @param $context
  * @return boolean - Returns a file pointer on success, false otherwise
  */
-function sugar_fopen($filename, $mode, $use_include_path=false, $context=null){
+function sugar_fopen($filename, $mode, $use_include_path = false, $context = null) {
 	//check to see if the file exists, if not then use touch to create it.
-	if(!file_exists($filename)){
+	if (!file_exists($filename)) {
 		sugar_touch($filename);
 	}
 
-	if(empty($context)) {
+	if (empty($context)) {
 
 		return fopen($filename, $mode, $use_include_path);
 	} else {
@@ -136,22 +136,22 @@ 
  * @param $context
  * @return int - Returns the number of bytes written to the file, false otherwise.
  */
-function sugar_file_put_contents($filename, $data, $flags=null, $context=null){
+function sugar_file_put_contents($filename, $data, $flags = null, $context = null) {
 	//check to see if the file exists, if not then use touch to create it.
-	if(!file_exists($filename)){
+	if (!file_exists($filename)) {
 		sugar_touch($filename);
 	}
 
-	if ( !is_writable($filename) ) {
+	if (!is_writable($filename)) {
 	    $GLOBALS['log']->error("File $filename cannot be written to");
 	    return false;
 	}
 
-	if(empty($flags)) {
+	if (empty($flags)) {
 		return file_put_contents($filename, $data);
-	} elseif(empty($context)) {
+	} elseif (empty($context)) {
 		return file_put_contents($filename, $data, $flags);
-	} else{
+	} else {
 		return file_put_contents($filename, $data, $flags, $context);
 	}
 }
@@ -169,13 +169,13 @@ 
  * @param context $context Context to pass into fopen operation
  * @return boolean - Returns true if $filename was created, false otherwise.
  */
-function sugar_file_put_contents_atomic($filename, $data, $mode='wb', $use_include_path=false, $context=null){
+function sugar_file_put_contents_atomic($filename, $data, $mode = 'wb', $use_include_path = false, $context = null) {
 
     $dir = dirname($filename);
     $temp = tempnam($dir, 'temp');
 
     if (!($f = @fopen($temp, $mode))) {
-        $temp =  $dir . DIRECTORY_SEPARATOR . uniqid('temp');
+        $temp = $dir.DIRECTORY_SEPARATOR.uniqid('temp');
         if (!($f = @fopen($temp, $mode))) {
             trigger_error("sugar_file_put_contents_atomic() : error writing temporary file '$temp'", E_USER_WARNING);
             return false;
@@ -196,7 +196,7 @@ 
         }
     }
 
-    if(file_exists($filename))
+    if (file_exists($filename))
     {
        return sugar_chmod($filename, 0755);
     }
@@ -214,18 +214,18 @@ 
  * @param $context
  * @return string|boolean - Returns a file data on success, false otherwise
  */
-function sugar_file_get_contents($filename, $use_include_path=false, $context=null){
+function sugar_file_get_contents($filename, $use_include_path = false, $context = null) {
 	//check to see if the file exists, if not then use touch to create it.
-	if(!file_exists($filename)){
+	if (!file_exists($filename)) {
 		sugar_touch($filename);
 	}
 
-	if ( !is_readable($filename) ) {
+	if (!is_readable($filename)) {
 	    $GLOBALS['log']->error("File $filename cannot be read");
 	    return false;
 	}
 
-	if(empty($context)) {
+	if (empty($context)) {
 		return file_get_contents($filename, $use_include_path);
 	} else {
 		return file_get_contents($filename, $use_include_path, $context);
@@ -246,29 +246,29 @@ 
  * @return boolean - Returns TRUE on success or FALSE on failure.
  *
  */
-function sugar_touch($filename, $time=null, $atime=null) {
+function sugar_touch($filename, $time = null, $atime = null) {
 
    $result = false;
 
-   if(!empty($atime) && !empty($time)) {
+   if (!empty($atime) && !empty($time)) {
    	  $result = @touch($filename, $time, $atime);
-   } else if(!empty($time)) {
+   } else if (!empty($time)) {
    	  $result = @touch($filename, $time);
    } else {
    	  $result = @touch($filename);
    }
 
-   if(!$result) {
+   if (!$result) {
        $GLOBALS['log']->error("File $filename cannot be touched");
        return $result;
    }
-	if(!empty($GLOBALS['sugar_config']['default_permissions']['file_mode'])){
+	if (!empty($GLOBALS['sugar_config']['default_permissions']['file_mode'])) {
 		sugar_chmod($filename, $GLOBALS['sugar_config']['default_permissions']['file_mode']);
 	}
-	if(!empty($GLOBALS['sugar_config']['default_permissions']['user'])){
+	if (!empty($GLOBALS['sugar_config']['default_permissions']['user'])) {
 		sugar_chown($filename);
 	}
-	if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
+	if (!empty($GLOBALS['sugar_config']['default_permissions']['group'])) {
 		sugar_chgrp($filename);
 	}
 
@@ -284,16 +284,16 @@ 
  * @param  int $mode The integer value of the permissions mode to set the created directory to
  * @return boolean   Returns TRUE on success or FALSE on failure.
  */
-function sugar_chmod($filename, $mode=null) {
-    if ( !is_int($mode) )
-        $mode = (int) $mode;
-	if(!is_windows()){
-		if(!isset($mode)){
+function sugar_chmod($filename, $mode = null) {
+    if (!is_int($mode))
+        $mode = (int)$mode;
+	if (!is_windows()) {
+		if (!isset($mode)) {
 			$mode = get_mode('file_mode', $mode);
 		}
-        if(isset($mode) && $mode > 0){
+        if (isset($mode) && $mode > 0) {
 		   return @chmod($filename, $mode);
-		}else{
+		} else {
 	    	return false;
 		}
 	}
@@ -309,15 +309,15 @@ 
  * @param user - A user name or number
  * @return boolean - Returns TRUE on success or FALSE on failure.
  */
-function sugar_chown($filename, $user='') {
-	if(!is_windows()){
-		if(strlen($user)){
+function sugar_chown($filename, $user = '') {
+	if (!is_windows()) {
+		if (strlen($user)) {
 			return chown($filename, $user);
-		}else{
-			if(strlen($GLOBALS['sugar_config']['default_permissions']['user'])){
+		} else {
+			if (strlen($GLOBALS['sugar_config']['default_permissions']['user'])) {
 				$user = $GLOBALS['sugar_config']['default_permissions']['user'];
 				return chown($filename, $user);
-			}else{
+			} else {
 				return false;
 			}
 		}
@@ -334,15 +334,15 @@ 
  * @param group - A group name or number
  * @return boolean - Returns TRUE on success or FALSE on failure.
  */
-function sugar_chgrp($filename, $group='') {
-	if(!is_windows()){
-		if(!empty($group)){
+function sugar_chgrp($filename, $group = '') {
+	if (!is_windows()) {
+		if (!empty($group)) {
 			return chgrp($filename, $group);
-		}else{
-			if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
+		} else {
+			if (!empty($GLOBALS['sugar_config']['default_permissions']['group'])) {
 				$group = $GLOBALS['sugar_config']['default_permissions']['group'];
 				return chgrp($filename, $group);
-			}else{
+			} else {
 				return false;
 			}
 		}
@@ -360,26 +360,26 @@ 
  * defined in the config file.
  * @return int - the mode either found in the config file or passed in via the input parameter
  */
-function get_mode($key = 'dir_mode', $mode=null) {
-	if ( !is_int($mode) )
-        $mode = (int) $mode;
-    if(!class_exists('SugarConfig', true)) {
+function get_mode($key = 'dir_mode', $mode = null) {
+	if (!is_int($mode))
+        $mode = (int)$mode;
+    if (!class_exists('SugarConfig', true)) {
 		require 'include/SugarObjects/SugarConfig.php';
 	}
-	if(!is_windows()){
-		$conf_inst=SugarConfig::getInstance();
+	if (!is_windows()) {
+		$conf_inst = SugarConfig::getInstance();
 		$mode = $conf_inst->get('default_permissions.'.$key, $mode);
 	}
 	return $mode;
 }
 
-function sugar_is_dir($path, $mode='r'){
-		if(defined('TEMPLATE_URL'))return is_dir($path, $mode);
+function sugar_is_dir($path, $mode = 'r') {
+		if (defined('TEMPLATE_URL'))return is_dir($path, $mode);
 		return is_dir($path);
 }
 
-function sugar_is_file($path, $mode='r'){
-		if(defined('TEMPLATE_URL'))return is_file($path, $mode);
+function sugar_is_file($path, $mode = 'r') {
+		if (defined('TEMPLATE_URL'))return is_file($path, $mode);
 		return is_file($path);
 }
 
@@ -391,10 +391,10 @@ 
 function sugar_cached($file)
 {
     static $cdir = null;
-    if(empty($cdir) && !empty($GLOBALS['sugar_config']['cache_dir'])) {
+    if (empty($cdir) && !empty($GLOBALS['sugar_config']['cache_dir'])) {
         $cdir = rtrim($GLOBALS['sugar_config']['cache_dir'], '/\\');
     }
-    if(empty($cdir)) {
+    if (empty($cdir)) {
         $cdir = "cache";
     }
     return "$cdir/$file";

Braces +27 added lines, -18 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -56,12 +58,14 @@ 
 function sugar_mkdir($pathname, $mode=null, $recursive=false, $context='') {
 	$mode = get_mode('dir_mode', $mode);
 
-	if ( sugar_is_dir($pathname,$mode) )
-	    return true;
+	if ( sugar_is_dir($pathname,$mode) ) {
+		    return true;
+	}
 
 	$result = false;
-	if(empty($mode))
-		$mode = 0777;
+	if(empty($mode)) {
+			$mode = 0777;
+	}
 	if(empty($context)) {
 		$result = @mkdir($pathname, $mode, $recursive);
 	} else {
@@ -82,8 +86,7 @@ 
    				return false;
    			}
 		}
-	}
-	else {
+	} else {
 		$errorMessage = "Cannot create directory $pathname cannot be touched";
 		if(is_null($GLOBALS['log'])) {
 			throw new Exception("Error occurred but the system doesn't have logger. Error message: \"$errorMessage\"");
@@ -285,15 +288,16 @@ 
  * @return boolean   Returns TRUE on success or FALSE on failure.
  */
 function sugar_chmod($filename, $mode=null) {
-    if ( !is_int($mode) )
-        $mode = (int) $mode;
+    if ( !is_int($mode) ) {
+            $mode = (int) $mode;
+    }
 	if(!is_windows()){
 		if(!isset($mode)){
 			$mode = get_mode('file_mode', $mode);
 		}
         if(isset($mode) && $mode > 0){
 		   return @chmod($filename, $mode);
-		}else{
+		} else{
 	    	return false;
 		}
 	}
@@ -313,11 +317,11 @@ 
 	if(!is_windows()){
 		if(strlen($user)){
 			return chown($filename, $user);
-		}else{
+		} else{
 			if(strlen($GLOBALS['sugar_config']['default_permissions']['user'])){
 				$user = $GLOBALS['sugar_config']['default_permissions']['user'];
 				return chown($filename, $user);
-			}else{
+			} else{
 				return false;
 			}
 		}
@@ -338,11 +342,11 @@ 
 	if(!is_windows()){
 		if(!empty($group)){
 			return chgrp($filename, $group);
-		}else{
+		} else{
 			if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
 				$group = $GLOBALS['sugar_config']['default_permissions']['group'];
 				return chgrp($filename, $group);
-			}else{
+			} else{
 				return false;
 			}
 		}
@@ -361,8 +365,9 @@ 
  * @return int - the mode either found in the config file or passed in via the input parameter
  */
 function get_mode($key = 'dir_mode', $mode=null) {
-	if ( !is_int($mode) )
-        $mode = (int) $mode;
+	if ( !is_int($mode) ) {
+	        $mode = (int) $mode;
+	}
     if(!class_exists('SugarConfig', true)) {
 		require 'include/SugarObjects/SugarConfig.php';
 	}
@@ -374,12 +379,16 @@ 
 }
 
 function sugar_is_dir($path, $mode='r'){
-		if(defined('TEMPLATE_URL'))return is_dir($path, $mode);
+		if(defined('TEMPLATE_URL')) {
+		    return is_dir($path, $mode);
+		}
 		return is_dir($path);
 }
 
 function sugar_is_file($path, $mode='r'){
-		if(defined('TEMPLATE_URL'))return is_file($path, $mode);
+		if(defined('TEMPLATE_URL')) {
+		    return is_file($path, $mode);
+		}
 		return is_file($path);
 }
 

include/modules.php

Indentation +2 added lines, -2 removed lines

@@ -237,7 +237,7 @@ 
     );
 $adminOnlyList = array(
                     //module => list of actions  (all says all actions are admin only)
-                   //'Administration'=>array('all'=>1, 'SupportPortal'=>'allow'),
+                    //'Administration'=>array('all'=>1, 'SupportPortal'=>'allow'),
                     'Dropdown'=>array('all'=>1),
                     'Dynamic'=>array('all'=>1),
                     'DynamicFields'=>array('all'=>1),
@@ -294,7 +294,7 @@ 
     'DocumentRevisions' => 'Documents',
     'EmailTemplates' => 'Emails',
     'EmailMarketing' => 'Campaigns',
- );
+    );
 $beanList['EAPM'] = 'EAPM';
 $beanFiles['EAPM'] = 'modules/EAPM/EAPM.php';
 $modules_exempt_from_availability_check['EAPM'] = 'EAPM';

Spacing +42 added lines, -42 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.
@@ -79,18 +79,18 @@ 
 $beanList['Cases']          = 'aCase';
 $beanList['Bugs']           = 'Bug';
 $beanList['ProspectLists']      = 'ProspectList';
-$beanList['Prospects']  = 'Prospect';
+$beanList['Prospects'] = 'Prospect';
 $beanList['Project']            = 'Project';
-$beanList['ProjectTask']            = 'ProjectTask';
+$beanList['ProjectTask'] = 'ProjectTask';
 $beanList['Campaigns']          = 'Campaign';
-$beanList['EmailMarketing']  = 'EmailMarketing';
+$beanList['EmailMarketing'] = 'EmailMarketing';
 $beanList['CampaignLog']        = 'CampaignLog';
 $beanList['CampaignTrackers']   = 'CampaignTracker';
-$beanList['Releases']       = 'Release';
+$beanList['Releases'] = 'Release';
 $beanList['Groups'] = 'Group';
 $beanList['EmailMan'] = 'EmailMan';
-$beanList['Schedulers']  = 'Scheduler';
-$beanList['SchedulersJobs']  = 'SchedulersJob';
+$beanList['Schedulers'] = 'Scheduler';
+$beanList['SchedulersJobs'] = 'SchedulersJob';
 $beanList['Contacts']       = 'Contact';
 $beanList['Accounts']       = 'Account';
 $beanList['DynamicFields']  = 'DynamicField';
@@ -106,19 +106,19 @@ 
 $beanList['Currencies']     = 'Currency';
 $beanList['Trackers']       = 'Tracker';
 $beanList['Connectors']     = 'Connectors';
-$beanList['Import_1']         = 'ImportMap';
+$beanList['Import_1'] = 'ImportMap';
 $beanList['Import_2']       = 'UsersLastImport';
 $beanList['Versions']       = 'Version';
 $beanList['Administration'] = 'Administration';
 $beanList['vCals']          = 'vCal';
 $beanList['CustomFields']   = 'CustomFields';
-$beanList['Alerts']  = 'Alert';
+$beanList['Alerts'] = 'Alert';
 
 
 
 
-$beanList['Documents']  = 'Document';
-$beanList['DocumentRevisions']  = 'DocumentRevision';
+$beanList['Documents'] = 'Document';
+$beanList['DocumentRevisions'] = 'DocumentRevision';
 $beanList['Roles']  = 'Role';
 
 $beanList['Audit']  = 'Audit';
@@ -152,24 +152,24 @@ 
 $beanFiles['aCase']         = 'modules/Cases/Case.php';
 $beanFiles['Bug']           = 'modules/Bugs/Bug.php';
 $beanFiles['Group'] = 'modules/Groups/Group.php';
-$beanFiles['CampaignLog']  = 'modules/CampaignLog/CampaignLog.php';
+$beanFiles['CampaignLog'] = 'modules/CampaignLog/CampaignLog.php';
 $beanFiles['Project']           = 'modules/Project/Project.php';
-$beanFiles['ProjectTask']           = 'modules/ProjectTask/ProjectTask.php';
+$beanFiles['ProjectTask'] = 'modules/ProjectTask/ProjectTask.php';
 $beanFiles['Campaign']          = 'modules/Campaigns/Campaign.php';
 $beanFiles['ProspectList']      = 'modules/ProspectLists/ProspectList.php';
-$beanFiles['Prospect']  = 'modules/Prospects/Prospect.php';
+$beanFiles['Prospect'] = 'modules/Prospects/Prospect.php';
 
-$beanFiles['EmailMarketing']          = 'modules/EmailMarketing/EmailMarketing.php';
-$beanFiles['CampaignTracker']  = 'modules/CampaignTrackers/CampaignTracker.php';
+$beanFiles['EmailMarketing'] = 'modules/EmailMarketing/EmailMarketing.php';
+$beanFiles['CampaignTracker'] = 'modules/CampaignTrackers/CampaignTracker.php';
 $beanFiles['Release']           = 'modules/Releases/Release.php';
 $beanFiles['EmailMan']          = 'modules/EmailMan/EmailMan.php';
 
-$beanFiles['Scheduler']  = 'modules/Schedulers/Scheduler.php';
-$beanFiles['SchedulersJob']  = 'modules/SchedulersJobs/SchedulersJob.php';
+$beanFiles['Scheduler'] = 'modules/Schedulers/Scheduler.php';
+$beanFiles['SchedulersJob'] = 'modules/SchedulersJobs/SchedulersJob.php';
 $beanFiles['Contact']       = 'modules/Contacts/Contact.php';
 $beanFiles['Account']       = 'modules/Accounts/Account.php';
 $beanFiles['Opportunity']   = 'modules/Opportunities/Opportunity.php';
-$beanFiles['EmailTemplate']         = 'modules/EmailTemplates/EmailTemplate.php';
+$beanFiles['EmailTemplate'] = 'modules/EmailTemplates/EmailTemplate.php';
 $beanFiles['Note']          = 'modules/Notes/Note.php';
 $beanFiles['Call']          = 'modules/Calls/Call.php';
 $beanFiles['Email']         = 'modules/Emails/Email.php';
@@ -177,21 +177,21 @@ 
 $beanFiles['Task']          = 'modules/Tasks/Task.php';
 $beanFiles['User']          = 'modules/Users/User.php';
 $beanFiles['Employee']      = 'modules/Employees/Employee.php';
-$beanFiles['Currency']          = 'modules/Currencies/Currency.php';
-$beanFiles['Tracker']          = 'modules/Trackers/Tracker.php';
+$beanFiles['Currency'] = 'modules/Currencies/Currency.php';
+$beanFiles['Tracker'] = 'modules/Trackers/Tracker.php';
 $beanFiles['ImportMap']     = 'modules/Import/maps/ImportMap.php';
-$beanFiles['UsersLastImport']= 'modules/Import/UsersLastImport.php';
-$beanFiles['Administration']= 'modules/Administration/Administration.php';
-$beanFiles['UpgradeHistory']= 'modules/Administration/UpgradeHistory.php';
+$beanFiles['UsersLastImport'] = 'modules/Import/UsersLastImport.php';
+$beanFiles['Administration'] = 'modules/Administration/Administration.php';
+$beanFiles['UpgradeHistory'] = 'modules/Administration/UpgradeHistory.php';
 $beanFiles['vCal']          = 'modules/vCals/vCal.php';
-$beanFiles['Alert']          = 'modules/Alerts/Alert.php';
-$beanFiles['Version']           = 'modules/Versions/Version.php';
+$beanFiles['Alert'] = 'modules/Alerts/Alert.php';
+$beanFiles['Version'] = 'modules/Versions/Version.php';
 
 
 
-$beanFiles['Role']          = 'modules/Roles/Role.php';
+$beanFiles['Role'] = 'modules/Roles/Role.php';
 
-$beanFiles['Document']  = 'modules/Documents/Document.php';
+$beanFiles['Document'] = 'modules/Documents/Document.php';
 $beanFiles['DocumentRevision']  = 'modules/DocumentRevisions/DocumentRevision.php';
 $beanFiles['FieldsMetaData']    = 'modules/DynamicFields/FieldsMetaData.php';
 //$beanFiles['Audit']           = 'modules/Audit/Audit.php';
@@ -204,7 +204,7 @@ 
 
 
 $beanFiles['SavedSearch']  = 'modules/SavedSearch/SavedSearch.php';
-$beanFiles['UserPreference']  = 'modules/UserPreferences/UserPreference.php';
+$beanFiles['UserPreference'] = 'modules/UserPreferences/UserPreference.php';
 $beanFiles['MergeRecord']  = 'modules/MergeRecords/MergeRecord.php';
 $beanFiles['EmailAddress'] = 'modules/EmailAddresses/EmailAddress.php';
 $beanFiles['EmailText'] = 'modules/EmailText/EmailText.php';
@@ -216,19 +216,19 @@ 
 //$beanList['Library']= 'Library';
 //$beanFiles['Library'] = 'modules/Library/Library.php';
 
-$beanFiles['Configurator']          = 'modules/Configurator/Configurator.php';
+$beanFiles['Configurator'] = 'modules/Configurator/Configurator.php';
 
 // added these lists for security settings for tabs
 $modInvisList = array('Administration', 'Currencies', 'CustomFields', 'Connectors',
     'Dropdown', 'Dynamic', 'DynamicFields', 'DynamicLayout', 'EditCustomFields',
-    'Help', 'Import',  'MySettings', 'EditCustomFields','FieldsMetaData',
+    'Help', 'Import', 'MySettings', 'EditCustomFields', 'FieldsMetaData',
     'UpgradeWizard', 'Trackers', 'Connectors', 'Employees', 'Calendar',
-    'Releases','Sync',
-    'Users',  'Versions', 'LabelEditor','Roles','EmailMarketing'
-    ,'OptimisticLock', 'TeamMemberships', 'TeamSets', 'TeamSetModule', 'Audit', 'MailMerge', 'MergeRecords', 'EmailAddresses','EmailText',
-    'Schedulers','Schedulers_jobs', /*'Queues',*/ 'EmailTemplates',
+    'Releases', 'Sync',
+    'Users', 'Versions', 'LabelEditor', 'Roles', 'EmailMarketing'
+    ,'OptimisticLock', 'TeamMemberships', 'TeamSets', 'TeamSetModule', 'Audit', 'MailMerge', 'MergeRecords', 'EmailAddresses', 'EmailText',
+    'Schedulers', 'Schedulers_jobs', /*'Queues',*/ 'EmailTemplates',
     'CampaignTrackers', 'CampaignLog', 'EmailMan', 'Prospects', 'ProspectLists',
-    'Groups','InboundEmail',
+    'Groups', 'InboundEmail',
     'ACLActions', 'ACLRoles',
     'DocumentRevisions',
     'ProjectTask',
@@ -265,15 +265,15 @@ 
 $modInvisList[] = 'Connectors';
 
 $report_include_modules = array();
-$report_include_modules['Currencies']='Currency';
+$report_include_modules['Currencies'] = 'Currency';
 //add prospects
-$report_include_modules['Prospects']='Prospect';
+$report_include_modules['Prospects'] = 'Prospect';
 $report_include_modules['DocumentRevisions'] = 'DocumentRevision';
 $report_include_modules['ProductCategories'] = 'ProductCategory';
 $report_include_modules['ProductTypes'] = 'ProductType';
 //add Tracker modules
 
-$report_include_modules['Trackers']         = 'Tracker';
+$report_include_modules['Trackers'] = 'Tracker';
 
 
 
@@ -323,9 +323,9 @@ 
 //the bean class name == dictionary entry/object name convention
 //No future module should need an entry here.
 $objectList = array();
-$objectList['Cases'] =  'Case';
-$objectList['Groups'] =  'User';
-$objectList['Users'] =  'User';
+$objectList['Cases'] = 'Case';
+$objectList['Groups'] = 'User';
+$objectList['Users'] = 'User';
 
 
 // knowledge base

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.