adamjakab / SuiteCRM

include/database/MssqlManager.php

Indentation +156 added lines, -156 removed lines

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

modules/Users/authentication/AuthenticationController.php

Indentation +133 added lines, -133 removed lines

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

install/performSetup.php

Indentation +18 added lines, -18 removed lines

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

install/installConfig.php

Indentation +4 added lines, -4 removed lines

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

tests/tests/modules/Meetings/MeetingTest.php

Indentation +17 added lines, -17 removed lines

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

tests/tests/modules/Calls/CallTest.php

Indentation +3 added lines, -3 removed lines

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

modules/Meetings/Meeting.php

Indentation +652 added lines, -652 removed lines

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

modules/Calls/Call.php

Indentation +526 added lines, -526 removed lines

@@ -47,176 +47,176 @@ 
  ********************************************************************************/
 
 class Call extends SugarBean {
-	var $field_name_map;
-	// Stored fields
-	var $id;
-	var $json_id;
-	var $date_entered;
-	var $date_modified;
-	var $assigned_user_id;
-	var $modified_user_id;
-	var $description;
-	var $name;
-	var $status;
-	var $date_start;
-	var $time_start;
-	var $duration_hours;
-	var $duration_minutes;
-	var $date_end;
-	var $parent_type;
-	var $parent_type_options;
-	var $parent_id;
-	var $contact_id;
-	var $user_id;
-	var $lead_id;
-	var $direction;
-	var $reminder_time;
-	var $reminder_time_options;
-	var $reminder_checked;
-	var $email_reminder_time;
-	var $email_reminder_checked;
-	var $email_reminder_sent;
-	var $required;
-	var $accept_status;
-	var $created_by;
-	var $created_by_name;
-	var $modified_by_name;
-	var $parent_name;
-	var $contact_name;
-	var $contact_phone;
-	var $contact_email;
-	var $account_id;
-	var $opportunity_id;
-	var $case_id;
-	var $assigned_user_name;
-	var $note_id;
+    var $field_name_map;
+    // Stored fields
+    var $id;
+    var $json_id;
+    var $date_entered;
+    var $date_modified;
+    var $assigned_user_id;
+    var $modified_user_id;
+    var $description;
+    var $name;
+    var $status;
+    var $date_start;
+    var $time_start;
+    var $duration_hours;
+    var $duration_minutes;
+    var $date_end;
+    var $parent_type;
+    var $parent_type_options;
+    var $parent_id;
+    var $contact_id;
+    var $user_id;
+    var $lead_id;
+    var $direction;
+    var $reminder_time;
+    var $reminder_time_options;
+    var $reminder_checked;
+    var $email_reminder_time;
+    var $email_reminder_checked;
+    var $email_reminder_sent;
+    var $required;
+    var $accept_status;
+    var $created_by;
+    var $created_by_name;
+    var $modified_by_name;
+    var $parent_name;
+    var $contact_name;
+    var $contact_phone;
+    var $contact_email;
+    var $account_id;
+    var $opportunity_id;
+    var $case_id;
+    var $assigned_user_name;
+    var $note_id;
     var $outlook_id;
-	var $update_vcal = true;
-	var $contacts_arr;
-	var $users_arr;
-	var $leads_arr;
-	var $default_call_name_values = array('Assemble catalogs', 'Make travel arrangements', 'Send a letter', 'Send contract', 'Send fax', 'Send a follow-up letter', 'Send literature', 'Send proposal', 'Send quote');
-	var $minutes_value_default = 15;
-	var $minutes_values = array('0'=>'00','15'=>'15','30'=>'30','45'=>'45');
-	var $table_name = "calls";
-	var $rel_users_table = "calls_users";
-	var $rel_contacts_table = "calls_contacts";
+    var $update_vcal = true;
+    var $contacts_arr;
+    var $users_arr;
+    var $leads_arr;
+    var $default_call_name_values = array('Assemble catalogs', 'Make travel arrangements', 'Send a letter', 'Send contract', 'Send fax', 'Send a follow-up letter', 'Send literature', 'Send proposal', 'Send quote');
+    var $minutes_value_default = 15;
+    var $minutes_values = array('0'=>'00','15'=>'15','30'=>'30','45'=>'45');
+    var $table_name = "calls";
+    var $rel_users_table = "calls_users";
+    var $rel_contacts_table = "calls_contacts";
     var $rel_leads_table = "calls_leads";
-	var $module_dir = 'Calls';
-	var $object_name = "Call";
-	var $new_schema = true;
-	var $importable = true;
-	var $syncing = false;
-	var $recurring_source;
-
-	// This is used to retrieve related fields from form posts.
-	var $additional_column_fields = array('assigned_user_name', 'assigned_user_id', 'contact_id', 'user_id', 'contact_name');
-	var $relationship_fields = array(	'account_id'		=> 'accounts',
-										'opportunity_id'	=> 'opportunities',
-										'contact_id'		=> 'contacts',
-										'case_id'			=> 'cases',
-										'user_id'			=> 'users',
-										'assigned_user_id'	=> 'users',
-										'note_id'			=> 'notes',
+    var $module_dir = 'Calls';
+    var $object_name = "Call";
+    var $new_schema = true;
+    var $importable = true;
+    var $syncing = false;
+    var $recurring_source;
+
+    // This is used to retrieve related fields from form posts.
+    var $additional_column_fields = array('assigned_user_name', 'assigned_user_id', 'contact_id', 'user_id', 'contact_name');
+    var $relationship_fields = array(	'account_id'		=> 'accounts',
+                                        'opportunity_id'	=> 'opportunities',
+                                        'contact_id'		=> 'contacts',
+                                        'case_id'			=> 'cases',
+                                        'user_id'			=> 'users',
+                                        'assigned_user_id'	=> 'users',
+                                        'note_id'			=> 'notes',
                                         'lead_id'			=> 'leads',
-								);
-
-	public function __construct() {
-		parent::__construct();
-		global $app_list_strings;
-
-       	$this->setupCustomFields('Calls');
-
-		foreach ($this->field_defs as $field) {
-			$this->field_name_map[$field['name']] = $field;
-		}
-
-
-
-
-         if(!empty($GLOBALS['app_list_strings']['duration_intervals']))
-        	$this->minutes_values = $GLOBALS['app_list_strings']['duration_intervals'];
-	}
-
-	/**
-	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
-	 */
-	public function Call(){
-		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-		if(isset($GLOBALS['log'])) {
-			$GLOBALS['log']->deprecated($deprecatedMessage);
-		}
-		else {
-			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
-		}
-		self::__construct();
-	}
-
-	/**
-	 * Disable edit if call is recurring and source is not Sugar. It should be edited only from Outlook.
-	 * @param $view string
-	 * @param $is_owner bool
-	 */
-	function ACLAccess($view,$is_owner='not_set',$in_group='not_set'){
-		// don't check if call is being synced from Outlook
-		if($this->syncing == false){
-			$view = strtolower($view);
-			switch($view){
-				case 'edit':
-				case 'save':
-				case 'editview':
-				case 'delete':
-					if(!empty($this->recurring_source) && $this->recurring_source != "Sugar"){
-						return false;
-					}
-			}
-		}
-		return parent::ACLAccess($view,$is_owner,$in_group);
-	}
+                                );
+
+    public function __construct() {
+        parent::__construct();
+        global $app_list_strings;
+
+            $this->setupCustomFields('Calls');
+
+        foreach ($this->field_defs as $field) {
+            $this->field_name_map[$field['name']] = $field;
+        }
+
+
+
+
+            if(!empty($GLOBALS['app_list_strings']['duration_intervals']))
+            $this->minutes_values = $GLOBALS['app_list_strings']['duration_intervals'];
+    }
+
+    /**
+     * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
+     */
+    public function Call(){
+        $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
+        if(isset($GLOBALS['log'])) {
+            $GLOBALS['log']->deprecated($deprecatedMessage);
+        }
+        else {
+            trigger_error($deprecatedMessage, E_USER_DEPRECATED);
+        }
+        self::__construct();
+    }
+
+    /**
+     * Disable edit if call is recurring and source is not Sugar. It should be edited only from Outlook.
+     * @param $view string
+     * @param $is_owner bool
+     */
+    function ACLAccess($view,$is_owner='not_set',$in_group='not_set'){
+        // don't check if call is being synced from Outlook
+        if($this->syncing == false){
+            $view = strtolower($view);
+            switch($view){
+                case 'edit':
+                case 'save':
+                case 'editview':
+                case 'delete':
+                    if(!empty($this->recurring_source) && $this->recurring_source != "Sugar"){
+                        return false;
+                    }
+            }
+        }
+        return parent::ACLAccess($view,$is_owner,$in_group);
+    }
     // save date_end by calculating user input
     // this is for calendar
-	function save($check_notify = FALSE) {
-		global $timedate,$current_user;
+    function save($check_notify = FALSE) {
+        global $timedate,$current_user;
 
-	    if(isset($this->date_start) && isset($this->duration_hours) && isset($this->duration_minutes))
+        if(isset($this->date_start) && isset($this->duration_hours) && isset($this->duration_minutes))
         {
-    	    $td = $timedate->fromDb($this->date_start);
-    	    if($td)
-    	    {
-	        	$this->date_end = $td->modify("+{$this->duration_hours} hours {$this->duration_minutes} mins")->asDb();
-    	    }
+            $td = $timedate->fromDb($this->date_start);
+            if($td)
+            {
+                $this->date_end = $td->modify("+{$this->duration_hours} hours {$this->duration_minutes} mins")->asDb();
+            }
         }
 
-		if(!empty($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == '1') {
-			$check_notify = true;
+        if(!empty($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == '1') {
+            $check_notify = true;
         } else {
-			$check_notify = false;
-		}
-		if(empty($_REQUEST['send_invites'])) {
-			if(!empty($this->id)) {
-				$old_record = new Call();
-				$old_record->retrieve($this->id);
-				$old_assigned_user_id = $old_record->assigned_user_id;
-			}
-			if((empty($this->id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $GLOBALS['current_user']->id != $_REQUEST['assigned_user_id']) || (isset($old_assigned_user_id) && !empty($old_assigned_user_id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $old_assigned_user_id != $_REQUEST['assigned_user_id']) ){
-				$this->special_notification = true;
-				if(!isset($GLOBALS['resavingRelatedBeans']) || $GLOBALS['resavingRelatedBeans'] == false) {
-					$check_notify = true;
-				}
+            $check_notify = false;
+        }
+        if(empty($_REQUEST['send_invites'])) {
+            if(!empty($this->id)) {
+                $old_record = new Call();
+                $old_record->retrieve($this->id);
+                $old_assigned_user_id = $old_record->assigned_user_id;
+            }
+            if((empty($this->id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $GLOBALS['current_user']->id != $_REQUEST['assigned_user_id']) || (isset($old_assigned_user_id) && !empty($old_assigned_user_id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $old_assigned_user_id != $_REQUEST['assigned_user_id']) ){
+                $this->special_notification = true;
+                if(!isset($GLOBALS['resavingRelatedBeans']) || $GLOBALS['resavingRelatedBeans'] == false) {
+                    $check_notify = true;
+                }
                 if(isset($_REQUEST['assigned_user_name'])) {
                     $this->new_assigned_user_name = $_REQUEST['assigned_user_name'];
                 }
-			}
-		}
+            }
+        }
         if (empty($this->status) ) {
             $this->status = $this->getDefaultStatus();
         }
 
-		// prevent a mass mailing for recurring meetings created in Calendar module
-		if (empty($this->id) && !empty($_REQUEST['module']) && $_REQUEST['module'] == "Calendar" && !empty($_REQUEST['repeat_type']) && !empty($this->repeat_parent_id)) {
-			$check_notify = false;
-		}
-		/*nsingh 7/3/08  commenting out as bug #20814 is invalid
+        // prevent a mass mailing for recurring meetings created in Calendar module
+        if (empty($this->id) && !empty($_REQUEST['module']) && $_REQUEST['module'] == "Calendar" && !empty($_REQUEST['repeat_type']) && !empty($this->repeat_parent_id)) {
+            $check_notify = false;
+        }
+        /*nsingh 7/3/08  commenting out as bug #20814 is invalid
 		if($current_user->getPreference('reminder_time')!= -1 &&  isset($_POST['reminder_checked']) && isset($_POST['reminder_time']) && $_POST['reminder_checked']==0  && $_POST['reminder_time']==-1){
 			$this->reminder_checked = '1';
 			$this->reminder_time = $current_user->getPreference('reminder_time');
@@ -227,87 +227,87 @@ 
 
 
         if($this->update_vcal) {
-			vCal::cache_sugar_vcal($current_user);
+            vCal::cache_sugar_vcal($current_user);
         }
 
-		if(isset($_REQUEST['reminders_data'])) {
-			Reminder::saveRemindersDataJson('Calls', $return_id, html_entity_decode($_REQUEST['reminders_data']));
-		}
+        if(isset($_REQUEST['reminders_data'])) {
+            Reminder::saveRemindersDataJson('Calls', $return_id, html_entity_decode($_REQUEST['reminders_data']));
+        }
 
         return $return_id;
-	}
+    }
 
-	/** Returns a list of the associated contacts
-	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
-	 * All Rights Reserved..
-	 * Contributor(s): ______________________________________..
-	*/
-	function get_contacts()
-	{
-		// First, get the list of IDs.
-		$query = "SELECT contact_id as id from calls_contacts where call_id='$this->id' AND deleted=0";
+    /** Returns a list of the associated contacts
+     * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
+     * All Rights Reserved..
+     * Contributor(s): ______________________________________..
+     */
+    function get_contacts()
+    {
+        // First, get the list of IDs.
+        $query = "SELECT contact_id as id from calls_contacts where call_id='$this->id' AND deleted=0";
 
-		return $this->build_related_list($query, new Contact());
-	}
+        return $this->build_related_list($query, new Contact());
+    }
 
 
-	function get_summary_text()
-	{
-		return "$this->name";
-	}
+    function get_summary_text()
+    {
+        return "$this->name";
+    }
 
-	function create_list_query($order_by, $where, $show_deleted=0)
-	{
+    function create_list_query($order_by, $where, $show_deleted=0)
+    {
         $custom_join = $this->getCustomJoin();
                 $query = "SELECT ";
-		$query .= "
+        $query .= "
 			calls.*,";
-			if ( preg_match("/calls_users\.user_id/",$where))
-			{
-				$query .= "calls_users.required,
+            if ( preg_match("/calls_users\.user_id/",$where))
+            {
+                $query .= "calls_users.required,
 				calls_users.accept_status,";
-			}
+            }
 
-			$query .= "
+            $query .= "
 			users.user_name as assigned_user_name";
         $query .= $custom_join['select'];
 
-			// this line will help generate a GMT-metric to compare to a locale's timezone
+            // this line will help generate a GMT-metric to compare to a locale's timezone
 
-			if ( preg_match("/contacts/",$where)){
-				$query .= ", contacts.first_name, contacts.last_name";
-				$query .= ", contacts.assigned_user_id contact_name_owner";
-			}
-			$query .= " FROM calls ";
+            if ( preg_match("/contacts/",$where)){
+                $query .= ", contacts.first_name, contacts.last_name";
+                $query .= ", contacts.assigned_user_id contact_name_owner";
+            }
+            $query .= " FROM calls ";
 
-			if ( preg_match("/contacts/",$where)){
-				$query .=	"LEFT JOIN calls_contacts
+            if ( preg_match("/contacts/",$where)){
+                $query .=	"LEFT JOIN calls_contacts
 	                    ON calls.id=calls_contacts.call_id
 	                    LEFT JOIN contacts
 	                    ON calls_contacts.contact_id=contacts.id ";
-			}
-			if ( preg_match('/calls_users\.user_id/',$where))
-			{
-		$query .= "LEFT JOIN calls_users
+            }
+            if ( preg_match('/calls_users\.user_id/',$where))
+            {
+        $query .= "LEFT JOIN calls_users
 			ON calls.id=calls_users.call_id and calls_users.deleted=0 ";
-			}
-			$query .= "
+            }
+            $query .= "
 			LEFT JOIN users
 			ON calls.assigned_user_id=users.id ";
         $query .= $custom_join['join'];
-			$where_auto = '1=1';
-       		 if($show_deleted == 0){
-            	$where_auto = " $this->table_name.deleted=0  ";
-			}else if($show_deleted == 1){
-				$where_auto = " $this->table_name.deleted=1 ";
-			}
+            $where_auto = '1=1';
+                if($show_deleted == 0){
+                $where_auto = " $this->table_name.deleted=0  ";
+            }else if($show_deleted == 1){
+                $where_auto = " $this->table_name.deleted=1 ";
+            }
 
-			//$where_auto .= " GROUP BY calls.id";
+            //$where_auto .= " GROUP BY calls.id";
 
-		if($where != "")
-			$query .= "where $where AND ".$where_auto;
-		else
-			$query .= "where ".$where_auto;
+        if($where != "")
+            $query .= "where $where AND ".$where_auto;
+        else
+            $query .= "where ".$where_auto;
 
         $order_by = $this->process_order_by($order_by);
         if (empty($order_by)) {
@@ -315,14 +315,14 @@ 
         }
         $query .= ' ORDER BY ' . $order_by;
 
-		return $query;
-	}
+        return $query;
+    }
 
         function create_export_query($order_by, $where, $relate_link_join='')
         {
             $custom_join = $this->getCustomJoin(true, true, $where);
             $custom_join['join'] .= $relate_link_join;
-			$contact_required = stristr($where, "contacts");
+            $contact_required = stristr($where, "contacts");
             if($contact_required)
             {
                     $query = "SELECT calls.*, contacts.first_name, contacts.last_name, users.user_name as assigned_user_name ";
@@ -339,11 +339,11 @@ 
             }
 
 
-			$query .= "  LEFT JOIN users ON calls.assigned_user_id=users.id ";
+            $query .= "  LEFT JOIN users ON calls.assigned_user_id=users.id ";
 
             $query .= $custom_join['join'];
 
-			if($where != "")
+            if($where != "")
                     $query .= "where $where AND ".$where_auto;
             else
                     $query .= "where ".$where_auto;
@@ -361,199 +361,199 @@ 
 
 
 
-	function fill_in_additional_detail_fields()
-	{
-		global $locale;
-		parent::fill_in_additional_detail_fields();
-		if (!empty($this->contact_id)) {
-			$query  = "SELECT first_name, last_name FROM contacts ";
-			$query .= "WHERE id='$this->contact_id' AND deleted=0";
-			$result = $this->db->limitQuery($query,0,1,true," Error filling in additional detail fields: ");
-
-			// Get the contact name.
-			$row = $this->db->fetchByAssoc($result);
-			$GLOBALS['log']->info("additional call fields $query");
-			if($row != null)
-			{
-				$this->contact_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name'], '', '');
-				$GLOBALS['log']->debug("Call($this->id): contact_name = $this->contact_name");
-				$GLOBALS['log']->debug("Call($this->id): contact_id = $this->contact_id");
-			}
-		}
-		if (!isset($this->duration_minutes)) {
-			$this->duration_minutes = $this->minutes_value_default;
-		}
+    function fill_in_additional_detail_fields()
+    {
+        global $locale;
+        parent::fill_in_additional_detail_fields();
+        if (!empty($this->contact_id)) {
+            $query  = "SELECT first_name, last_name FROM contacts ";
+            $query .= "WHERE id='$this->contact_id' AND deleted=0";
+            $result = $this->db->limitQuery($query,0,1,true," Error filling in additional detail fields: ");
+
+            // Get the contact name.
+            $row = $this->db->fetchByAssoc($result);
+            $GLOBALS['log']->info("additional call fields $query");
+            if($row != null)
+            {
+                $this->contact_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name'], '', '');
+                $GLOBALS['log']->debug("Call($this->id): contact_name = $this->contact_name");
+                $GLOBALS['log']->debug("Call($this->id): contact_id = $this->contact_id");
+            }
+        }
+        if (!isset($this->duration_minutes)) {
+            $this->duration_minutes = $this->minutes_value_default;
+        }
 
         global $timedate;
         //setting default date and time
-		if (is_null($this->date_start)) {
-			$this->date_start = $timedate->now();
-		}
-
-		if (is_null($this->duration_hours))
-			$this->duration_hours = "0";
-		if (is_null($this->duration_minutes))
-			$this->duration_minutes = "1";
-
-		$this->fill_in_additional_parent_fields();
-
-		global $app_list_strings;
-		$parent_types = $app_list_strings['record_type_display'];
-		$disabled_parent_types = ACLController::disabledModuleList($parent_types,false, 'list');
-		foreach($disabled_parent_types as $disabled_parent_type){
-			if($disabled_parent_type != $this->parent_type){
-				unset($parent_types[$disabled_parent_type]);
-			}
-		}
-
-		$this->parent_type_options = get_select_options_with_id($parent_types, $this->parent_type);
-
-		if (empty($this->reminder_time)) {
-			$this->reminder_time = -1;
-		}
-
-		if ( empty($this->id) ) {
-		    $reminder_t = $GLOBALS['current_user']->getPreference('reminder_time');
-		    if ( isset($reminder_t) )
-		        $this->reminder_time = $reminder_t;
-		}
-		$this->reminder_checked = $this->reminder_time == -1 ? false : true;
-
-		if (empty($this->email_reminder_time)) {
-			$this->email_reminder_time = -1;
-		}
-		if(empty($this->id)){
-			$reminder_t = $GLOBALS['current_user']->getPreference('email_reminder_time');
-			if(isset($reminder_t))
-		    		$this->email_reminder_time = $reminder_t;
-		}
-		$this->email_reminder_checked = $this->email_reminder_time == -1 ? false : true;
-
-		if (isset ($_REQUEST['parent_type']) && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'SubpanelEdits')) {
-			$this->parent_type = $_REQUEST['parent_type'];
-		} elseif (is_null($this->parent_type)) {
-			$this->parent_type = $app_list_strings['record_type_default_key'];
-		}
-	}
-
-
-	function get_list_view_data(){
-		$call_fields = $this->get_list_view_array();
-		global $app_list_strings, $focus, $action, $currentModule;
-		if (isset($focus->id)) $id = $focus->id;
-		else $id = '';
-		if (isset($this->parent_type) && $this->parent_type != null)
-		{
-			$call_fields['PARENT_MODULE'] = $this->parent_type;
-		}
-		if ($this->status == "Planned") {
-			//cn: added this if() to deal with sequential Closes in Meetings.  this is a hack to a hack (formbase.php->handleRedirect)
-			if(empty($action))
-			    $action = "index";
+        if (is_null($this->date_start)) {
+            $this->date_start = $timedate->now();
+        }
+
+        if (is_null($this->duration_hours))
+            $this->duration_hours = "0";
+        if (is_null($this->duration_minutes))
+            $this->duration_minutes = "1";
+
+        $this->fill_in_additional_parent_fields();
+
+        global $app_list_strings;
+        $parent_types = $app_list_strings['record_type_display'];
+        $disabled_parent_types = ACLController::disabledModuleList($parent_types,false, 'list');
+        foreach($disabled_parent_types as $disabled_parent_type){
+            if($disabled_parent_type != $this->parent_type){
+                unset($parent_types[$disabled_parent_type]);
+            }
+        }
+
+        $this->parent_type_options = get_select_options_with_id($parent_types, $this->parent_type);
+
+        if (empty($this->reminder_time)) {
+            $this->reminder_time = -1;
+        }
+
+        if ( empty($this->id) ) {
+            $reminder_t = $GLOBALS['current_user']->getPreference('reminder_time');
+            if ( isset($reminder_t) )
+                $this->reminder_time = $reminder_t;
+        }
+        $this->reminder_checked = $this->reminder_time == -1 ? false : true;
+
+        if (empty($this->email_reminder_time)) {
+            $this->email_reminder_time = -1;
+        }
+        if(empty($this->id)){
+            $reminder_t = $GLOBALS['current_user']->getPreference('email_reminder_time');
+            if(isset($reminder_t))
+                    $this->email_reminder_time = $reminder_t;
+        }
+        $this->email_reminder_checked = $this->email_reminder_time == -1 ? false : true;
+
+        if (isset ($_REQUEST['parent_type']) && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'SubpanelEdits')) {
+            $this->parent_type = $_REQUEST['parent_type'];
+        } elseif (is_null($this->parent_type)) {
+            $this->parent_type = $app_list_strings['record_type_default_key'];
+        }
+    }
+
+
+    function get_list_view_data(){
+        $call_fields = $this->get_list_view_array();
+        global $app_list_strings, $focus, $action, $currentModule;
+        if (isset($focus->id)) $id = $focus->id;
+        else $id = '';
+        if (isset($this->parent_type) && $this->parent_type != null)
+        {
+            $call_fields['PARENT_MODULE'] = $this->parent_type;
+        }
+        if ($this->status == "Planned") {
+            //cn: added this if() to deal with sequential Closes in Meetings.  this is a hack to a hack (formbase.php->handleRedirect)
+            if(empty($action))
+                $action = "index";
 
             $setCompleteUrl = "<a id='{$this->id}' onclick='SUGAR.util.closeActivityPanel.show(\"{$this->module_dir}\",\"{$this->id}\",\"Held\",\"listview\",\"1\");'>";
-			if ($this->ACLAccess('edit')) {
+            if ($this->ACLAccess('edit')) {
                 $call_fields['SET_COMPLETE'] = $setCompleteUrl . SugarThemeRegistry::current()->getImage("close_inline"," border='0'",null,null,'.gif',translate('LBL_CLOSEINLINE'))."</a>";
             } else {
                 $call_fields['SET_COMPLETE'] = '';
             }
-		}
-		global $timedate;
-		$today = $timedate->nowDb();
-		$nextday = $timedate->asDbDate($timedate->getNow()->modify("+1 day"));
-		$mergeTime = $call_fields['DATE_START']; //$timedate->merge_date_time($call_fields['DATE_START'], $call_fields['TIME_START']);
-		$date_db = $timedate->to_db($mergeTime);
-		if( $date_db	< $today){
-			$call_fields['DATE_START']= "<font class='overdueTask'>".$call_fields['DATE_START']."</font>";
-		}else if($date_db < $nextday){
-			$call_fields['DATE_START'] = "<font class='todaysTask'>".$call_fields['DATE_START']."</font>";
-		}else{
-			$call_fields['DATE_START'] = "<font class='futureTask'>".$call_fields['DATE_START']."</font>";
-		}
-		$this->fill_in_additional_detail_fields();
-
-		//make sure we grab the localized version of the contact name, if a contact is provided
-		if (!empty($this->contact_id)) {
-           // Bug# 46125 - make first name, last name, salutation and title of Contacts respect field level ACLs
+        }
+        global $timedate;
+        $today = $timedate->nowDb();
+        $nextday = $timedate->asDbDate($timedate->getNow()->modify("+1 day"));
+        $mergeTime = $call_fields['DATE_START']; //$timedate->merge_date_time($call_fields['DATE_START'], $call_fields['TIME_START']);
+        $date_db = $timedate->to_db($mergeTime);
+        if( $date_db	< $today){
+            $call_fields['DATE_START']= "<font class='overdueTask'>".$call_fields['DATE_START']."</font>";
+        }else if($date_db < $nextday){
+            $call_fields['DATE_START'] = "<font class='todaysTask'>".$call_fields['DATE_START']."</font>";
+        }else{
+            $call_fields['DATE_START'] = "<font class='futureTask'>".$call_fields['DATE_START']."</font>";
+        }
+        $this->fill_in_additional_detail_fields();
+
+        //make sure we grab the localized version of the contact name, if a contact is provided
+        if (!empty($this->contact_id)) {
+            // Bug# 46125 - make first name, last name, salutation and title of Contacts respect field level ACLs
             $contact_temp = BeanFactory::getBean("Contacts", $this->contact_id);
             if(!empty($contact_temp)) {
                 $contact_temp->_create_proper_name_field();
                 $this->contact_name = $contact_temp->full_name;
             }
-		}
+        }
 
         $call_fields['CONTACT_ID'] = $this->contact_id;
         $call_fields['CONTACT_NAME'] = $this->contact_name;
-		$call_fields['PARENT_NAME'] = $this->parent_name;
+        $call_fields['PARENT_NAME'] = $this->parent_name;
         $call_fields['REMINDER_CHECKED'] = $this->reminder_time==-1 ? false : true;
-	    $call_fields['EMAIL_REMINDER_CHECKED'] = $this->email_reminder_time==-1 ? false : true;
+        $call_fields['EMAIL_REMINDER_CHECKED'] = $this->email_reminder_time==-1 ? false : true;
 
-		return $call_fields;
-	}
+        return $call_fields;
+    }
 
-	function set_notification_body($xtpl, $call) {
-		global $sugar_config;
-		global $app_list_strings;
-		global $current_user;
-		global $app_list_strings;
-		global $timedate;
+    function set_notification_body($xtpl, $call) {
+        global $sugar_config;
+        global $app_list_strings;
+        global $current_user;
+        global $app_list_strings;
+        global $timedate;
 
         // rrs: bug 42684 - passing a contact breaks this call
-		$notifyUser =($call->current_notify_user->object_name == 'User') ? $call->current_notify_user : $current_user;
-
-
-		// Assumes $call dates are in user format
-		$calldate = $timedate->fromDb($call->date_start);
-		$xOffset = $timedate->asUser($calldate, $notifyUser).' '.$timedate->userTimezoneSuffix($calldate, $notifyUser);
-
-		if ( strtolower(get_class($call->current_notify_user)) == 'contact' ) {
-			$xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
-				  '/index.php?entryPoint=acceptDecline&module=Calls&contact_id='.$call->current_notify_user->id.'&record='.$call->id);
-		} elseif ( strtolower(get_class($call->current_notify_user)) == 'lead' ) {
-			$xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
-				  '/index.php?entryPoint=acceptDecline&module=Calls&lead_id='.$call->current_notify_user->id.'&record='.$call->id);
-		} else {
-			$xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
-				  '/index.php?entryPoint=acceptDecline&module=Calls&user_id='.$call->current_notify_user->id.'&record='.$call->id);
-		}
-
-		$xtpl->assign("CALL_TO", $call->current_notify_user->new_assigned_user_name);
-		$xtpl->assign("CALL_SUBJECT", $call->name);
-		$xtpl->assign("CALL_STARTDATE", $xOffset);
-		$xtpl->assign("CALL_HOURS", $call->duration_hours);
-		$xtpl->assign("CALL_MINUTES", $call->duration_minutes);
-		$xtpl->assign("CALL_STATUS", ((isset($call->status))?$app_list_strings['call_status_dom'][$call->status] : ""));
-		$xtpl->assign("CALL_DESCRIPTION", $call->description);
-
-		return $xtpl;
-	}
-
-
-	function get_call_users() {
-		$template = new User();
-		// First, get the list of IDs.
-		$query = "SELECT calls_users.required, calls_users.accept_status, calls_users.user_id from calls_users where calls_users.call_id='$this->id' AND calls_users.deleted=0";
-		$GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
-		$result = $this->db->query($query, true);
-		$list = Array();
-
-		while($row = $this->db->fetchByAssoc($result)) {
-			$template = new User(); // PHP 5 will retrieve by reference, always over-writing the "old" one
-			$record = $template->retrieve($row['user_id']);
-			$template->required = $row['required'];
-			$template->accept_status = $row['accept_status'];
-
-			if($record != null) {
-			    // this copies the object into the array
-				$list[] = $template;
-			}
-		}
-		return $list;
-	}
-
-
-  function get_invite_calls(&$user)
-  {
+        $notifyUser =($call->current_notify_user->object_name == 'User') ? $call->current_notify_user : $current_user;
+
+
+        // Assumes $call dates are in user format
+        $calldate = $timedate->fromDb($call->date_start);
+        $xOffset = $timedate->asUser($calldate, $notifyUser).' '.$timedate->userTimezoneSuffix($calldate, $notifyUser);
+
+        if ( strtolower(get_class($call->current_notify_user)) == 'contact' ) {
+            $xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
+                    '/index.php?entryPoint=acceptDecline&module=Calls&contact_id='.$call->current_notify_user->id.'&record='.$call->id);
+        } elseif ( strtolower(get_class($call->current_notify_user)) == 'lead' ) {
+            $xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
+                    '/index.php?entryPoint=acceptDecline&module=Calls&lead_id='.$call->current_notify_user->id.'&record='.$call->id);
+        } else {
+            $xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
+                    '/index.php?entryPoint=acceptDecline&module=Calls&user_id='.$call->current_notify_user->id.'&record='.$call->id);
+        }
+
+        $xtpl->assign("CALL_TO", $call->current_notify_user->new_assigned_user_name);
+        $xtpl->assign("CALL_SUBJECT", $call->name);
+        $xtpl->assign("CALL_STARTDATE", $xOffset);
+        $xtpl->assign("CALL_HOURS", $call->duration_hours);
+        $xtpl->assign("CALL_MINUTES", $call->duration_minutes);
+        $xtpl->assign("CALL_STATUS", ((isset($call->status))?$app_list_strings['call_status_dom'][$call->status] : ""));
+        $xtpl->assign("CALL_DESCRIPTION", $call->description);
+
+        return $xtpl;
+    }
+
+
+    function get_call_users() {
+        $template = new User();
+        // First, get the list of IDs.
+        $query = "SELECT calls_users.required, calls_users.accept_status, calls_users.user_id from calls_users where calls_users.call_id='$this->id' AND calls_users.deleted=0";
+        $GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
+        $result = $this->db->query($query, true);
+        $list = Array();
+
+        while($row = $this->db->fetchByAssoc($result)) {
+            $template = new User(); // PHP 5 will retrieve by reference, always over-writing the "old" one
+            $record = $template->retrieve($row['user_id']);
+            $template->required = $row['required'];
+            $template->accept_status = $row['accept_status'];
+
+            if($record != null) {
+                // this copies the object into the array
+                $list[] = $template;
+            }
+        }
+        return $list;
+    }
+
+
+    function get_invite_calls(&$user)
+    {
     $template = $this;
     // First, get the list of IDs.
     $query = "SELECT calls_users.required, calls_users.accept_status, calls_users.call_id from calls_users where calls_users.user_id='$user->id' AND ( calls_users.accept_status IS NULL OR  calls_users.accept_status='none') AND calls_users.deleted=0";
@@ -568,182 +568,182 @@ 
 
     while($row = $this->db->fetchByAssoc($result))
     {
-      $record = $template->retrieve($row['call_id']);
-      $template->required = $row['required'];
-      $template->accept_status = $row['accept_status'];
+        $record = $template->retrieve($row['call_id']);
+        $template->required = $row['required'];
+        $template->accept_status = $row['accept_status'];
 
 
-      if($record != null)
-      {
+        if($record != null)
+        {
         // this copies the object into the array
         $list[] = $template;
-      }
+        }
     }
     return $list;
 
-  }
+    }
 
 
-  function set_accept_status(&$user,$status)
-  {
+    function set_accept_status(&$user,$status)
+    {
     if ( $user->object_name == 'User')
     {
-      $relate_values = array('user_id'=>$user->id,'call_id'=>$this->id);
-      $data_values = array('accept_status'=>$status);
-      $this->set_relationship($this->rel_users_table, $relate_values, true, true,$data_values);
-      global $current_user;
+        $relate_values = array('user_id'=>$user->id,'call_id'=>$this->id);
+        $data_values = array('accept_status'=>$status);
+        $this->set_relationship($this->rel_users_table, $relate_values, true, true,$data_values);
+        global $current_user;
 
-      if ( $this->update_vcal )
-      {
+        if ( $this->update_vcal )
+        {
         vCal::cache_sugar_vcal($user);
-      }
+        }
     }
     else if ( $user->object_name == 'Contact')
     {
-      $relate_values = array('contact_id'=>$user->id,'call_id'=>$this->id);
-      $data_values = array('accept_status'=>$status);
-      $this->set_relationship($this->rel_contacts_table, $relate_values, true, true,$data_values);
+        $relate_values = array('contact_id'=>$user->id,'call_id'=>$this->id);
+        $data_values = array('accept_status'=>$status);
+        $this->set_relationship($this->rel_contacts_table, $relate_values, true, true,$data_values);
     }
     else if ( $user->object_name == 'Lead')
     {
-      $relate_values = array('lead_id'=>$user->id,'call_id'=>$this->id);
-      $data_values = array('accept_status'=>$status);
-      $this->set_relationship($this->rel_leads_table, $relate_values, true, true,$data_values);
+        $relate_values = array('lead_id'=>$user->id,'call_id'=>$this->id);
+        $data_values = array('accept_status'=>$status);
+        $this->set_relationship($this->rel_leads_table, $relate_values, true, true,$data_values);
+    }
     }
-  }
 
 
 
-	function get_notification_recipients() {
-		if($this->special_notification) {
-			return parent::get_notification_recipients();
-		}
+    function get_notification_recipients() {
+        if($this->special_notification) {
+            return parent::get_notification_recipients();
+        }
 
 //		$GLOBALS['log']->debug('Call.php->get_notification_recipients():'.print_r($this,true));
-		$list = array();
+        $list = array();
         if(!is_array($this->contacts_arr)) {
-			$this->contacts_arr =	array();
-		}
+            $this->contacts_arr =	array();
+        }
 
-		if(!is_array($this->users_arr)) {
-			$this->users_arr =	array();
-		}
+        if(!is_array($this->users_arr)) {
+            $this->users_arr =	array();
+        }
 
         if(!is_array($this->leads_arr)) {
-			$this->leads_arr =	array();
-		}
-
-		foreach($this->users_arr as $user_id) {
-			$notify_user = new User();
-			$notify_user->retrieve($user_id);
-			$notify_user->new_assigned_user_name = $notify_user->full_name;
-			$GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
-			$list[$notify_user->id] = $notify_user;
-		}
-
-		foreach($this->contacts_arr as $contact_id) {
-			$notify_user = new Contact();
-			$notify_user->retrieve($contact_id);
-			$notify_user->new_assigned_user_name = $notify_user->full_name;
-			$GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
-			$list[$notify_user->id] = $notify_user;
-		}
+            $this->leads_arr =	array();
+        }
+
+        foreach($this->users_arr as $user_id) {
+            $notify_user = new User();
+            $notify_user->retrieve($user_id);
+            $notify_user->new_assigned_user_name = $notify_user->full_name;
+            $GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
+            $list[$notify_user->id] = $notify_user;
+        }
+
+        foreach($this->contacts_arr as $contact_id) {
+            $notify_user = new Contact();
+            $notify_user->retrieve($contact_id);
+            $notify_user->new_assigned_user_name = $notify_user->full_name;
+            $GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
+            $list[$notify_user->id] = $notify_user;
+        }
 
         foreach($this->leads_arr as $lead_id) {
-			$notify_user = new Lead();
-			$notify_user->retrieve($lead_id);
-			$notify_user->new_assigned_user_name = $notify_user->full_name;
-			$GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
-			$list[$notify_user->id] = $notify_user;
-		}
-		global $sugar_config;
-		if(isset($sugar_config['disable_notify_current_user']) && $sugar_config['disable_notify_current_user']) {
-			global $current_user;
-			if(isset($list[$current_user->id]))
-				unset($list[$current_user->id]);
-		}
+            $notify_user = new Lead();
+            $notify_user->retrieve($lead_id);
+            $notify_user->new_assigned_user_name = $notify_user->full_name;
+            $GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
+            $list[$notify_user->id] = $notify_user;
+        }
+        global $sugar_config;
+        if(isset($sugar_config['disable_notify_current_user']) && $sugar_config['disable_notify_current_user']) {
+            global $current_user;
+            if(isset($list[$current_user->id]))
+                unset($list[$current_user->id]);
+        }
 //		$GLOBALS['log']->debug('Call.php->get_notification_recipients():'.print_r($list,true));
-		return $list;
-	}
+        return $list;
+    }
 
     function bean_implements($interface){
-		switch($interface){
-			case 'ACL':return true;
-		}
-		return false;
-	}
-
-	function listviewACLHelper(){
-		$array_assign = parent::listviewACLHelper();
-		$is_owner = false;
-		$in_group = false; //SECURITY GROUPS
-		if(!empty($this->parent_name)){
-
-			if(!empty($this->parent_name_owner)){
-				global $current_user;
-				$is_owner = $current_user->id == $this->parent_name_owner;
-			}
-			/* BEGIN - SECURITY GROUPS */
-			//parent_name_owner not being set for whatever reason so we need to figure this out
-			else if(!empty($this->parent_type) && !empty($this->parent_id)) {
-				global $current_user;
+        switch($interface){
+            case 'ACL':return true;
+        }
+        return false;
+    }
+
+    function listviewACLHelper(){
+        $array_assign = parent::listviewACLHelper();
+        $is_owner = false;
+        $in_group = false; //SECURITY GROUPS
+        if(!empty($this->parent_name)){
+
+            if(!empty($this->parent_name_owner)){
+                global $current_user;
+                $is_owner = $current_user->id == $this->parent_name_owner;
+            }
+            /* BEGIN - SECURITY GROUPS */
+            //parent_name_owner not being set for whatever reason so we need to figure this out
+            else if(!empty($this->parent_type) && !empty($this->parent_id)) {
+                global $current_user;
                 $parent_bean = BeanFactory::getBean($this->parent_type,$this->parent_id);
                 if($parent_bean !== false) {
-                	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
+                    $is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
-			}
-			require_once("modules/SecurityGroups/SecurityGroup.php");
-			$in_group = SecurityGroup::groupHasAccess($this->parent_type, $this->parent_id, 'view');
-        	/* END - SECURITY GROUPS */
-		}
-
-			/* BEGIN - SECURITY GROUPS */
-			/**
+            }
+            require_once("modules/SecurityGroups/SecurityGroup.php");
+            $in_group = SecurityGroup::groupHasAccess($this->parent_type, $this->parent_id, 'view');
+            /* END - SECURITY GROUPS */
+        }
+
+            /* BEGIN - SECURITY GROUPS */
+            /**
 			if(!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner)){
-			*/
-			if(!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner, 'module', $in_group)){
-        	/* END - SECURITY GROUPS */
-				$array_assign['PARENT'] = 'a';
-			}else{
-				$array_assign['PARENT'] = 'span';
-			}
-		$is_owner = false;
-		$in_group = false; //SECURITY GROUPS
-		if(!empty($this->contact_name)){
-
-			if(!empty($this->contact_name_owner)){
-				global $current_user;
-				$is_owner = $current_user->id == $this->contact_name_owner;
-			}
-			/* BEGIN - SECURITY GROUPS */
-			//contact_name_owner not being set for whatever reason so we need to figure this out
-			else {
-				global $current_user;
+             */
+            if(!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner, 'module', $in_group)){
+            /* END - SECURITY GROUPS */
+                $array_assign['PARENT'] = 'a';
+            }else{
+                $array_assign['PARENT'] = 'span';
+            }
+        $is_owner = false;
+        $in_group = false; //SECURITY GROUPS
+        if(!empty($this->contact_name)){
+
+            if(!empty($this->contact_name_owner)){
+                global $current_user;
+                $is_owner = $current_user->id == $this->contact_name_owner;
+            }
+            /* BEGIN - SECURITY GROUPS */
+            //contact_name_owner not being set for whatever reason so we need to figure this out
+            else {
+                global $current_user;
                 $parent_bean = BeanFactory::getBean('Contacts',$this->contact_id);
                 if($parent_bean !== false) {
-                	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
+                    $is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
-			}
-			require_once("modules/SecurityGroups/SecurityGroup.php");
-			$in_group = SecurityGroup::groupHasAccess('Contacts', $this->contact_id, 'view');
-        	/* END - SECURITY GROUPS */
-		}
-			/* BEGIN - SECURITY GROUPS */
-			/**
+            }
+            require_once("modules/SecurityGroups/SecurityGroup.php");
+            $in_group = SecurityGroup::groupHasAccess('Contacts', $this->contact_id, 'view');
+            /* END - SECURITY GROUPS */
+        }
+            /* BEGIN - SECURITY GROUPS */
+            /**
 			if( ACLController::checkAccess('Contacts', 'view', $is_owner)){
-			*/
-			if( ACLController::checkAccess('Contacts', 'view', $is_owner, 'module', $in_group)){
-        	/* END - SECURITY GROUPS */
-				$array_assign['CONTACT'] = 'a';
-			}else{
-				$array_assign['CONTACT'] = 'span';
-			}
-
-		return $array_assign;
-	}
-
-	function save_relationship_changes($is_update, $exclude = array()) {
-		if(empty($this->in_workflow))
+             */
+            if( ACLController::checkAccess('Contacts', 'view', $is_owner, 'module', $in_group)){
+            /* END - SECURITY GROUPS */
+                $array_assign['CONTACT'] = 'a';
+            }else{
+                $array_assign['CONTACT'] = 'span';
+            }
+
+        return $array_assign;
+    }
+
+    function save_relationship_changes($is_update, $exclude = array()) {
+        if(empty($this->in_workflow))
         {
             if(empty($this->in_import))
             {
@@ -751,12 +751,12 @@ 
                 //add assigned_user_id to exclude list and let the logic from MeetingFormBase determine whether assigned user id gets added to the relationship
                 if(!empty($GLOBALS['soap_server_object']))
                 {
-           		    $exclude = array('lead_id', 'contact_id', 'user_id');
-           	    }
+                        $exclude = array('lead_id', 'contact_id', 'user_id');
+                    }
                 else
                 {
-	                $exclude = array('lead_id', 'contact_id', 'user_id', 'assigned_user_id');
-           	    }
+                    $exclude = array('lead_id', 'contact_id', 'user_id', 'assigned_user_id');
+                    }
             }
             else
             {
@@ -765,15 +765,15 @@ 
 
 
         }
-		parent::save_relationship_changes($is_update, $exclude);
-	}
+        parent::save_relationship_changes($is_update, $exclude);
+    }
 
     public function getDefaultStatus()
     {
-         $def = $this->field_defs['status'];
-         if (isset($def['default'])) {
-             return $def['default'];
-         } else {
+            $def = $this->field_defs['status'];
+            if (isset($def['default'])) {
+                return $def['default'];
+            } else {
             $app = return_app_list_strings_language($GLOBALS['current_language']);
             if (isset($def['options']) && isset($app[$def['options']])) {
                 $keys = array_keys($app[$def['options']]);

modules/ProspectLists/ProspectList.php

Indentation +202 added lines, -202 removed lines

@@ -50,51 +50,51 @@ 
 
 
 class ProspectList extends SugarBean {
-	var $field_name_map;
-
-	// Stored fields
-	var $id;
-	var $date_entered;
-	var $date_modified;
-	var $modified_user_id;
-	var $assigned_user_id;
-	var $created_by;
-	var $created_by_name;
-	var $modified_by_name;
-	var $list_type;
-	var $domain_name;
-
-	var $name;
-	var $description;
-
-	// These are related
-	var $assigned_user_name;
-	var $prospect_id;
-	var $contact_id;
-	var $lead_id;
-
-	// module name definitions and table relations
-	var $table_name = "prospect_lists";
-	var $module_dir = 'ProspectLists';
-	var $rel_prospects_table = "prospect_lists_prospects";
-	var $object_name = "ProspectList";
-
-	// This is used to retrieve related fields from form posts.
-	var $additional_column_fields = array(
-		'assigned_user_name', 'assigned_user_id', 'campaign_id',
-	);
-	var $relationship_fields = array(
-		'campaign_id'=>'campaigns',
-		'prospect_list_prospects' => 'prospects',
-	);
+    var $field_name_map;
+
+    // Stored fields
+    var $id;
+    var $date_entered;
+    var $date_modified;
+    var $modified_user_id;
+    var $assigned_user_id;
+    var $created_by;
+    var $created_by_name;
+    var $modified_by_name;
+    var $list_type;
+    var $domain_name;
+
+    var $name;
+    var $description;
+
+    // These are related
+    var $assigned_user_name;
+    var $prospect_id;
+    var $contact_id;
+    var $lead_id;
+
+    // module name definitions and table relations
+    var $table_name = "prospect_lists";
+    var $module_dir = 'ProspectLists';
+    var $rel_prospects_table = "prospect_lists_prospects";
+    var $object_name = "ProspectList";
+
+    // This is used to retrieve related fields from form posts.
+    var $additional_column_fields = array(
+        'assigned_user_name', 'assigned_user_id', 'campaign_id',
+    );
+    var $relationship_fields = array(
+        'campaign_id'=>'campaigns',
+        'prospect_list_prospects' => 'prospects',
+    );
 
     var $entry_count;
 
     public function __construct() {
-		global $sugar_config;
-		parent::__construct();
+        global $sugar_config;
+        parent::__construct();
 
-	}
+    }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
@@ -111,61 +111,61 @@ 
     }
 
 
-	var $new_schema = true;
+    var $new_schema = true;
 
-	function get_summary_text()
-	{
-		return "$this->name";
-	}
+    function get_summary_text()
+    {
+        return "$this->name";
+    }
 
-	function create_list_query($order_by, $where, $show_deleted = 0)
-	{
+    function create_list_query($order_by, $where, $show_deleted = 0)
+    {
         $custom_join = $this->getCustomJoin();
 
-		$query = "SELECT ";
-		$query .= "users.user_name as assigned_user_name, ";
-		$query .= "prospect_lists.*";
+        $query = "SELECT ";
+        $query .= "users.user_name as assigned_user_name, ";
+        $query .= "prospect_lists.*";
 
         $query .= $custom_join['select'];
-		$query .= " FROM prospect_lists ";
+        $query .= " FROM prospect_lists ";
 
-		$query .= "LEFT JOIN users
+        $query .= "LEFT JOIN users
 					ON prospect_lists.assigned_user_id=users.id ";
 
         $query .= $custom_join['join'];
 
-			$where_auto = '1=1';
-				if($show_deleted == 0){
-                	$where_auto = "$this->table_name.deleted=0";
-				}else if($show_deleted == 1){
-                	$where_auto = "$this->table_name.deleted=1";
-				}
+            $where_auto = '1=1';
+                if($show_deleted == 0){
+                    $where_auto = "$this->table_name.deleted=0";
+                }else if($show_deleted == 1){
+                    $where_auto = "$this->table_name.deleted=1";
+                }
 
-		if($where != "")
-			$query .= "where $where AND ".$where_auto;
-		else
-			$query .= "where ".$where_auto;
+        if($where != "")
+            $query .= "where $where AND ".$where_auto;
+        else
+            $query .= "where ".$where_auto;
 
-		if($order_by != "")
-			$query .= " ORDER BY $order_by";
-		else
-			$query .= " ORDER BY prospect_lists.name";
+        if($order_by != "")
+            $query .= " ORDER BY $order_by";
+        else
+            $query .= " ORDER BY prospect_lists.name";
 
-		return $query;
-	}
+        return $query;
+    }
 
 
-	function create_export_query($order_by, $where)
-	{
+    function create_export_query($order_by, $where)
+    {
 
                                 $query = "SELECT
                                 prospect_lists.*,
                                 users.user_name as assigned_user_name ";
-	                            $query .= "FROM prospect_lists ";
-		$query .= 				"LEFT JOIN users
+                                $query .= "FROM prospect_lists ";
+        $query .= 				"LEFT JOIN users
                                 ON prospect_lists.assigned_user_id=users.id ";
 
-		$where_auto = " prospect_lists.deleted=0";
+        $where_auto = " prospect_lists.deleted=0";
 
         if($where != "")
                 $query .= " WHERE $where AND ".$where_auto;
@@ -179,47 +179,47 @@ 
         return $query;
     }
 
-	function create_export_members_query($record_id)
-	{
-		$members = array(	'Accounts' 	=> array('has_custom_fields' => false, 'fields' => array()),
-					'Contacts' 	=> array('has_custom_fields' => false, 'fields' => array()),
-					'Users' 	=> array('has_custom_fields' => false, 'fields' => array()),
-					'Prospects' 	=> array('has_custom_fields' => false, 'fields' => array()),
-					'Leads' 	=> array('has_custom_fields' => false, 'fields' => array())
-				);
-
-		// query all custom fields in the fields_meta_data table for the modules which are being exported
-		$db = DBManagerFactory::getInstance();
-		$result = $db->query("select name, custom_module from fields_meta_data where custom_module in ('" .
-					implode("', '", array_keys($members)) . "')",
-					true,
-					"ProspectList::create_export_members_query() : error querying custom fields");
-
-		// cycle through the custom fields and put them in the members array according to
-		// what module the field belongs
-		// take into account that the same custom field may exist in more modules
-		while($val = $db->fetchByAssoc($result, false))
-		{
-			$fieldname = $val['name'];
-
-			foreach($members as $membername => &$memberarr)
-			{
-				// if the field belongs to this module, then query it in the cstm table
-				if ($membername == $val['custom_module'])
-				{
-					$memberarr['has_custom_fields'] = true;
-					$memberarr['fields'][$fieldname] =
-						strtolower($membername) . '_cstm.'.$fieldname . ' AS ' . $fieldname;
-				}
-				// else, only if for this module no entry exists for this field, query an empty string
-				else if (!isset($memberarr['fields'][$val['name']]))
-				{
-					$memberarr['fields'][$fieldname] = "'' AS " . $fieldname;
-				}
-			}
-		}
-
-		$leads_query = "SELECT l.id AS id, 'Leads' AS related_type, '' AS \"name\", l.first_name AS first_name, l.last_name AS last_name, l.title AS title, l.salutation AS salutation,
+    function create_export_members_query($record_id)
+    {
+        $members = array(	'Accounts' 	=> array('has_custom_fields' => false, 'fields' => array()),
+                    'Contacts' 	=> array('has_custom_fields' => false, 'fields' => array()),
+                    'Users' 	=> array('has_custom_fields' => false, 'fields' => array()),
+                    'Prospects' 	=> array('has_custom_fields' => false, 'fields' => array()),
+                    'Leads' 	=> array('has_custom_fields' => false, 'fields' => array())
+                );
+
+        // query all custom fields in the fields_meta_data table for the modules which are being exported
+        $db = DBManagerFactory::getInstance();
+        $result = $db->query("select name, custom_module from fields_meta_data where custom_module in ('" .
+                    implode("', '", array_keys($members)) . "')",
+                    true,
+                    "ProspectList::create_export_members_query() : error querying custom fields");
+
+        // cycle through the custom fields and put them in the members array according to
+        // what module the field belongs
+        // take into account that the same custom field may exist in more modules
+        while($val = $db->fetchByAssoc($result, false))
+        {
+            $fieldname = $val['name'];
+
+            foreach($members as $membername => &$memberarr)
+            {
+                // if the field belongs to this module, then query it in the cstm table
+                if ($membername == $val['custom_module'])
+                {
+                    $memberarr['has_custom_fields'] = true;
+                    $memberarr['fields'][$fieldname] =
+                        strtolower($membername) . '_cstm.'.$fieldname . ' AS ' . $fieldname;
+                }
+                // else, only if for this module no entry exists for this field, query an empty string
+                else if (!isset($memberarr['fields'][$val['name']]))
+                {
+                    $memberarr['fields'][$fieldname] = "'' AS " . $fieldname;
+                }
+            }
+        }
+
+        $leads_query = "SELECT l.id AS id, 'Leads' AS related_type, '' AS \"name\", l.first_name AS first_name, l.last_name AS last_name, l.title AS title, l.salutation AS salutation,
 				l.primary_address_street AS primary_address_street,l.primary_address_city AS primary_address_city, l.primary_address_state AS primary_address_state, l.primary_address_postalcode AS primary_address_postalcode, l.primary_address_country AS primary_address_country,
 				l.account_name AS account_name,
 				ea.email_address AS primary_email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
@@ -234,7 +234,7 @@ 
 				AND l.deleted=0
 				AND (ear.deleted=0 OR ear.deleted IS NULL)";
 
-		$users_query = "SELECT u.id AS id, 'Users' AS related_type, '' AS \"name\", u.first_name AS first_name, u.last_name AS last_name,u.title AS title, '' AS salutation,
+        $users_query = "SELECT u.id AS id, 'Users' AS related_type, '' AS \"name\", u.first_name AS first_name, u.last_name AS last_name,u.title AS title, '' AS salutation,
 				u.address_street AS primary_address_street,u.address_city AS primary_address_city, u.address_state AS primary_address_state,  u.address_postalcode AS primary_address_postalcode, u.address_country AS primary_address_country,
 				'' AS account_name,
 				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
@@ -249,7 +249,7 @@ 
 				AND u.deleted=0
 				AND (ear.deleted=0 OR ear.deleted IS NULL)";
 
-		$contacts_query = "SELECT c.id AS id, 'Contacts' AS related_type, '' AS \"name\", c.first_name AS first_name, c.last_name AS last_name,c.title AS title, c.salutation AS salutation,
+        $contacts_query = "SELECT c.id AS id, 'Contacts' AS related_type, '' AS \"name\", c.first_name AS first_name, c.last_name AS last_name,c.title AS title, c.salutation AS salutation,
 				c.primary_address_street AS primary_address_street,c.primary_address_city AS primary_address_city, c.primary_address_state AS primary_address_state,  c.primary_address_postalcode AS primary_address_postalcode, c.primary_address_country AS primary_address_country,
 				a.name AS account_name,
 				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
@@ -265,7 +265,7 @@ 
 				AND c.deleted=0
                 AND (ear.deleted=0 OR ear.deleted IS NULL)";
 
-		$prospects_query = "SELECT p.id AS id, 'Prospects' AS related_type, '' AS \"name\", p.first_name AS first_name, p.last_name AS last_name,p.title AS title, p.salutation AS salutation,
+        $prospects_query = "SELECT p.id AS id, 'Prospects' AS related_type, '' AS \"name\", p.first_name AS first_name, p.last_name AS last_name,p.title AS title, p.salutation AS salutation,
 				p.primary_address_street AS primary_address_street,p.primary_address_city AS primary_address_city, p.primary_address_state AS primary_address_state,  p.primary_address_postalcode AS primary_address_postalcode, p.primary_address_country AS primary_address_country,
 				p.account_name AS account_name,
 				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
@@ -280,7 +280,7 @@ 
 				AND p.deleted=0
 				AND (ear.deleted=0 OR ear.deleted IS NULL)";
 
-		$accounts_query = "SELECT a.id AS id, 'Accounts' AS related_type, a.name AS \"name\", '' AS first_name, '' AS last_name,'' AS title, '' AS salutation,
+        $accounts_query = "SELECT a.id AS id, 'Accounts' AS related_type, a.name AS \"name\", '' AS first_name, '' AS last_name,'' AS title, '' AS salutation,
 				a.billing_address_street AS primary_address_street,a.billing_address_city AS primary_address_city, a.billing_address_state AS primary_address_state, a.billing_address_postalcode AS primary_address_postalcode, a.billing_address_country AS primary_address_country,
 				'' AS account_name,
 				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
@@ -294,115 +294,115 @@ 
 				WHERE plp.prospect_list_id = $record_id  AND plp.deleted=0
 				AND a.deleted=0
 				AND (ear.deleted=0 OR ear.deleted IS NULL)";
-		$order_by = "ORDER BY related_type, id, primary_address DESC";
-		$query = "$leads_query UNION ALL $users_query UNION ALL $contacts_query UNION ALL $prospects_query UNION ALL $accounts_query $order_by";
-		return $query;
-	}
+        $order_by = "ORDER BY related_type, id, primary_address DESC";
+        $query = "$leads_query UNION ALL $users_query UNION ALL $contacts_query UNION ALL $prospects_query UNION ALL $accounts_query $order_by";
+        return $query;
+    }
 
-	function save_relationship_changes($is_update, $exclude = array())
+    function save_relationship_changes($is_update, $exclude = array())
     {
-    	parent::save_relationship_changes($is_update, $exclude);
-		if($this->lead_id != "")
-	   		$this->set_prospect_relationship($this->id, $this->lead_id, "lead");
-    	if($this->contact_id != "")
-    		$this->set_prospect_relationship($this->id, $this->contact_id, "contact");
-    	if($this->prospect_id != "")
-    		$this->set_prospect_relationship($this->id, $this->contact_id, "prospect");
+        parent::save_relationship_changes($is_update, $exclude);
+        if($this->lead_id != "")
+                $this->set_prospect_relationship($this->id, $this->lead_id, "lead");
+        if($this->contact_id != "")
+            $this->set_prospect_relationship($this->id, $this->contact_id, "contact");
+        if($this->prospect_id != "")
+            $this->set_prospect_relationship($this->id, $this->contact_id, "prospect");
     }
 
-	function set_prospect_relationship($prospect_list_id, &$link_ids, $link_name)
-	{
-		$link_field = sprintf("%s_id", $link_name);
+    function set_prospect_relationship($prospect_list_id, &$link_ids, $link_name)
+    {
+        $link_field = sprintf("%s_id", $link_name);
 
-		foreach($link_ids as $link_id)
-		{
-			$this->set_relationship('prospect_lists_prospects', array( $link_field=>$link_id, 'prospect_list_id'=>$prospect_list_id ));
-		}
-	}
+        foreach($link_ids as $link_id)
+        {
+            $this->set_relationship('prospect_lists_prospects', array( $link_field=>$link_id, 'prospect_list_id'=>$prospect_list_id ));
+        }
+    }
 
-	function set_prospect_relationship_single($prospect_list_id, $link_id, $link_name)
-	{
-		$link_field = sprintf("%s_id", $link_name);
+    function set_prospect_relationship_single($prospect_list_id, $link_id, $link_name)
+    {
+        $link_field = sprintf("%s_id", $link_name);
 
-		$this->set_relationship('prospect_lists_prospects', array( $link_field=>$link_id, 'prospect_list_id'=>$prospect_list_id ));
-	}
+        $this->set_relationship('prospect_lists_prospects', array( $link_field=>$link_id, 'prospect_list_id'=>$prospect_list_id ));
+    }
 
 
-	function clear_prospect_relationship($prospect_list_id, $link_id, $link_name)
-	{
-		$link_field = sprintf("%s_id", $link_name);
-		$where_clause = " AND $link_field = '$link_id' ";
+    function clear_prospect_relationship($prospect_list_id, $link_id, $link_name)
+    {
+        $link_field = sprintf("%s_id", $link_name);
+        $where_clause = " AND $link_field = '$link_id' ";
 
-		$query = sprintf("DELETE FROM prospect_lists_prospects WHERE prospect_list_id='%s' AND deleted = '0' %s", $prospect_list_id, $where_clause);
+        $query = sprintf("DELETE FROM prospect_lists_prospects WHERE prospect_list_id='%s' AND deleted = '0' %s", $prospect_list_id, $where_clause);
 
-		$this->db->query($query, true, "Error clearing prospect/prospect_list relationship: ");
-	}
+        $this->db->query($query, true, "Error clearing prospect/prospect_list relationship: ");
+    }
 
 
-	function mark_relationships_deleted($id)
-	{
-	}
+    function mark_relationships_deleted($id)
+    {
+    }
 
-	function fill_in_additional_list_fields()
-	{
-	}
+    function fill_in_additional_list_fields()
+    {
+    }
 
-	function fill_in_additional_detail_fields()
-	{
-		parent::fill_in_additional_detail_fields();
+    function fill_in_additional_detail_fields()
+    {
+        parent::fill_in_additional_detail_fields();
         $this->entry_count = $this->get_entry_count();
-	}
+    }
 
 
-	function update_currency_id($fromid, $toid){
-	}
+    function update_currency_id($fromid, $toid){
+    }
 
 
-	function get_entry_count()
-	{
-		$query = "SELECT count(*) AS num FROM prospect_lists_prospects WHERE prospect_list_id='$this->id' AND deleted = '0'";
-		$result = $this->db->query($query, true, "Grabbing prospect_list entry count");
+    function get_entry_count()
+    {
+        $query = "SELECT count(*) AS num FROM prospect_lists_prospects WHERE prospect_list_id='$this->id' AND deleted = '0'";
+        $result = $this->db->query($query, true, "Grabbing prospect_list entry count");
 
-		$row = $this->db->fetchByAssoc($result);
+        $row = $this->db->fetchByAssoc($result);
 
-		if($row)
-			return $row['num'];
-		else
-			return 0;
-	}
+        if($row)
+            return $row['num'];
+        else
+            return 0;
+    }
 
 
-	function get_list_view_data(){
-		$temp_array = $this->get_list_view_array();
-		$temp_array["ENTRY_COUNT"] = $this->get_entry_count();
-		return $temp_array;
-	}
-	/**
+    function get_list_view_data(){
+        $temp_array = $this->get_list_view_array();
+        $temp_array["ENTRY_COUNT"] = $this->get_entry_count();
+        return $temp_array;
+    }
+    /**
 		builds a generic search based on the query string using or
 		do not include any $this-> because this is called on without having the class instantiated
-	*/
-	function build_generic_where_clause ($the_query_string)
-	{
-		$where_clauses = Array();
-		$the_query_string = $GLOBALS['db']->quote($the_query_string);
-		array_push($where_clauses, "prospect_lists.name like '$the_query_string%'");
-
-		$the_where = "";
-		foreach($where_clauses as $clause)
-		{
-			if($the_where != "") $the_where .= " or ";
-			$the_where .= $clause;
-		}
+     */
+    function build_generic_where_clause ($the_query_string)
+    {
+        $where_clauses = Array();
+        $the_query_string = $GLOBALS['db']->quote($the_query_string);
+        array_push($where_clauses, "prospect_lists.name like '$the_query_string%'");
+
+        $the_where = "";
+        foreach($where_clauses as $clause)
+        {
+            if($the_where != "") $the_where .= " or ";
+            $the_where .= $clause;
+        }
 
 
-		return $the_where;
-	}
+        return $the_where;
+    }
 
-	function save($check_notify = FALSE) {
+    function save($check_notify = FALSE) {
 
-		return parent::save($check_notify);
+        return parent::save($check_notify);
 
-	}
+    }
 
     function mark_deleted($id){
         $query = "UPDATE prospect_lists_prospects SET deleted = 1 WHERE prospect_list_id = '{$id}' ";
@@ -410,12 +410,12 @@ 
         return parent::mark_deleted($id);
     }
 
-	 function bean_implements($interface){
-		switch($interface){
-			case 'ACL':return true;
-		}
-		return false;
-	}
+        function bean_implements($interface){
+        switch($interface){
+            case 'ACL':return true;
+        }
+        return false;
+    }
 
 }