adamjakab / SuiteCRM

themes/SuiteR/css/colourSelector.php

Spacing +9 added lines, -9 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 
 // config|_override.php
-if(is_file('../../../config.php')) {
+if (is_file('../../../config.php')) {
     require_once('../../../config.php');
 }
 
 // load up the config_override.php file.  This is used to provide default user settings
-if(is_file('../../../config_override.php')) {
+if (is_file('../../../config_override.php')) {
     require_once('../../../config_override.php');
 }
 
-if(!isset($sugar_config['theme_settings']['SuiteR'])) return;
+if (!isset($sugar_config['theme_settings']['SuiteR'])) return;
 
 //set file type back to css from php
 header("Content-type: text/css; charset: UTF-8");
@@ -33,21 +33,21 @@ 
 /* Dashlet CSS */
 
 .dashletPanel .h3Row{
-background: #<?php echo $sugar_config['theme_settings']['SuiteR']['dashlet'];?>;
+background: #<?php echo $sugar_config['theme_settings']['SuiteR']['dashlet']; ?>;
 }
 
 .dashletPanel .h3Row h3{
-color: #<?php echo $sugar_config['theme_settings']['SuiteR']['dashlet_headertext'];?> !important;
+color: #<?php echo $sugar_config['theme_settings']['SuiteR']['dashlet_headertext']; ?> !important;
 }
 
 .dashletPanel .h3Row .dashletToolSet .icon{
-fill: #<?php echo $sugar_config['theme_settings']['SuiteR']['dashlet_headertext'];?> !important;
+fill: #<?php echo $sugar_config['theme_settings']['SuiteR']['dashlet_headertext']; ?> !important;
 }
 
 /* Top navigation bar CSS */
 
 .navbar-inverse {
-background:#<?php echo $sugar_config['theme_settings']['SuiteR']['navbar'];?> !important;
+background:#<?php echo $sugar_config['theme_settings']['SuiteR']['navbar']; ?> !important;
 }
 
 .headerlinks a:link, .headerlinks a:visited, .navbar-inverse .navbar-brand, .moremenu a,  a[id^=grouptab], a[id^=moduleTab] {
@@ -75,8 +75,8 @@ 
 
 #searchform .btn
 {
-background:#<?php echo $sugar_config['theme_settings']['SuiteR']['navbar'];?> !important;
-color: #<?php echo $sugar_config['theme_settings']['SuiteR']['icon'];?> !important;
+background:#<?php echo $sugar_config['theme_settings']['SuiteR']['navbar']; ?> !important;
+color: #<?php echo $sugar_config['theme_settings']['SuiteR']['icon']; ?> !important;
 }
 
 #usermenu a{

data/SugarBean.php

Spacing +836 added lines, -836 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -129,7 +129,7 @@ 
 	 *
 	 * @var BOOL
 	 */
-	var $process_save_dates =true;
+	var $process_save_dates = true;
 
     /**
      * This signals to the bean that it is being saved in a mass mode.
@@ -210,7 +210,7 @@ 
     /** Set this to true if you query contains a sub-select and bean is converting both select statements
     * into count queries.
     */
-    var $ungreedy_count=false;
+    var $ungreedy_count = false;
 
     /**
     * The name of the module folder for this type of bean.
@@ -227,14 +227,14 @@ 
     var $additional_column_fields = array();
     var $relationship_fields = array();
     var $current_notify_user;
-    var $fetched_row=false;
+    var $fetched_row = false;
     var $fetched_rel_row = array();
     var $layout_def;
     var $force_load_details = false;
     var $optimistic_lock = false;
     var $disable_custom_fields = false;
     var $number_formatting_done = false;
-    var $process_field_encrypted=false;
+    var $process_field_encrypted = false;
     /*
     * The default ACL type
     */
@@ -317,7 +317,7 @@ 
         $this->db = DBManagerFactory::getInstance();
         if (empty($this->module_name))
             $this->module_name = $this->module_dir;
-        if((false == $this->disable_vardefs && empty($loaded_defs[$this->object_name])) || !empty($GLOBALS['reload_vardefs']))
+        if ((false == $this->disable_vardefs && empty($loaded_defs[$this->object_name])) || !empty($GLOBALS['reload_vardefs']))
         {
             VardefManager::loadVardef($this->module_dir, $this->object_name);
 
@@ -325,7 +325,7 @@ 
             if (!empty($dictionary[$this->object_name]['fields'])) {
                 foreach ($dictionary[$this->object_name]['fields'] as $key=>$value_array) {
                     $column_fields[] = $key;
-                    if(!empty($value_array['required']) && !empty($value_array['name'])) {
+                    if (!empty($value_array['required']) && !empty($value_array['name'])) {
                         $this->required_fields[$value_array['name']] = 1;
                     }
                 }
@@ -333,57 +333,57 @@ 
             }
 
             //setup custom fields
-            if(!isset($this->custom_fields) &&
+            if (!isset($this->custom_fields) &&
                 empty($this->disable_custom_fields))
             {
                 $this->setupCustomFields($this->module_dir);
             }
             //load up field_arrays from CacheHandler;
-            if(empty($this->list_fields))
+            if (empty($this->list_fields))
                 $this->list_fields = $this->_loadCachedArray($this->module_dir, $this->object_name, 'list_fields');
-            if(empty($this->column_fields))
+            if (empty($this->column_fields))
                 $this->column_fields = $this->_loadCachedArray($this->module_dir, $this->object_name, 'column_fields');
-            if(empty($this->required_fields))
+            if (empty($this->required_fields))
                 $this->required_fields = $this->_loadCachedArray($this->module_dir, $this->object_name, 'required_fields');
 
-            if(isset($GLOBALS['dictionary'][$this->object_name]) && !$this->disable_vardefs)
+            if (isset($GLOBALS['dictionary'][$this->object_name]) && !$this->disable_vardefs)
             {
                 $this->field_name_map = $dictionary[$this->object_name]['fields'];
-                $this->field_defs =	$dictionary[$this->object_name]['fields'];
+                $this->field_defs = $dictionary[$this->object_name]['fields'];
 
-                if(!empty($dictionary[$this->object_name]['optimistic_locking']))
+                if (!empty($dictionary[$this->object_name]['optimistic_locking']))
                 {
-                    $this->optimistic_lock=true;
+                    $this->optimistic_lock = true;
                 }
             }
-            $loaded_defs[$this->object_name]['column_fields'] =& $this->column_fields;
-            $loaded_defs[$this->object_name]['list_fields'] =& $this->list_fields;
-            $loaded_defs[$this->object_name]['required_fields'] =& $this->required_fields;
-            $loaded_defs[$this->object_name]['field_name_map'] =& $this->field_name_map;
-            $loaded_defs[$this->object_name]['field_defs'] =& $this->field_defs;
+            $loaded_defs[$this->object_name]['column_fields'] = & $this->column_fields;
+            $loaded_defs[$this->object_name]['list_fields'] = & $this->list_fields;
+            $loaded_defs[$this->object_name]['required_fields'] = & $this->required_fields;
+            $loaded_defs[$this->object_name]['field_name_map'] = & $this->field_name_map;
+            $loaded_defs[$this->object_name]['field_defs'] = & $this->field_defs;
         }
         else
         {
-            $this->column_fields =& $loaded_defs[$this->object_name]['column_fields'] ;
-            $this->list_fields =& $loaded_defs[$this->object_name]['list_fields'];
-            $this->required_fields =& $loaded_defs[$this->object_name]['required_fields'];
-            $this->field_name_map =& $loaded_defs[$this->object_name]['field_name_map'];
-            $this->field_defs =& $loaded_defs[$this->object_name]['field_defs'];
+            $this->column_fields = & $loaded_defs[$this->object_name]['column_fields'];
+            $this->list_fields = & $loaded_defs[$this->object_name]['list_fields'];
+            $this->required_fields = & $loaded_defs[$this->object_name]['required_fields'];
+            $this->field_name_map = & $loaded_defs[$this->object_name]['field_name_map'];
+            $this->field_defs = & $loaded_defs[$this->object_name]['field_defs'];
             $this->added_custom_field_defs = true;
 
-            if(!isset($this->custom_fields) &&
+            if (!isset($this->custom_fields) &&
                 empty($this->disable_custom_fields))
             {
                 $this->setupCustomFields($this->module_dir, false);
             }
-            if(!empty($dictionary[$this->object_name]['optimistic_locking']))
+            if (!empty($dictionary[$this->object_name]['optimistic_locking']))
             {
-                $this->optimistic_lock=true;
+                $this->optimistic_lock = true;
             }
         }
 
-        if($this->bean_implements('ACL') && !empty($GLOBALS['current_user'])){
-            $this->acl_fields = (isset($dictionary[$this->object_name]['acl_fields']) && $dictionary[$this->object_name]['acl_fields'] === false)?false:true;
+        if ($this->bean_implements('ACL') && !empty($GLOBALS['current_user'])) {
+            $this->acl_fields = (isset($dictionary[$this->object_name]['acl_fields']) && $dictionary[$this->object_name]['acl_fields'] === false) ? false : true;
         }
         $this->populateDefaultValues();
     }
@@ -427,7 +427,7 @@ 
         if (!isset($this->audit_enabled_fields))
         {
 
-            $this->audit_enabled_fields=array();
+            $this->audit_enabled_fields = array();
             foreach ($this->field_defs as $field => $properties)
             {
 
@@ -437,7 +437,7 @@ 
                 )
                 {
 
-                    $this->audit_enabled_fields[$field]=$properties;
+                    $this->audit_enabled_fields[$field] = $properties;
                 }
             }
 
@@ -504,12 +504,12 @@ 
     function create_audit_table()
     {
         global $dictionary;
-        $table_name=$this->get_audit_table_name();
+        $table_name = $this->get_audit_table_name();
 
         require('metadata/audit_templateMetaData.php');
 
         // Bug: 52583 Need ability to customize template for audit tables
-        $custom = 'custom/metadata/audit_templateMetaData_' . $this->getTableName() . '.php';
+        $custom = 'custom/metadata/audit_templateMetaData_'.$this->getTableName().'.php';
         if (file_exists($custom))
         {
             require($custom);
@@ -519,14 +519,14 @@ 
         $indices = $dictionary['audit']['indices'];
 
         // Renaming template indexes to fit the particular audit table (removed the brittle hard coding)
-        foreach($indices as $nr => $properties){
-            $indices[$nr]['name'] = 'idx_' . strtolower($this->getTableName()) . '_' . $properties['name'];
+        foreach ($indices as $nr => $properties) {
+            $indices[$nr]['name'] = 'idx_'.strtolower($this->getTableName()).'_'.$properties['name'];
         }
 
         $engine = null;
-        if(isset($dictionary['audit']['engine'])) {
+        if (isset($dictionary['audit']['engine'])) {
             $engine = $dictionary['audit']['engine'];
-        } else if(isset($dictionary[$this->getObjectName()]['engine'])) {
+        } else if (isset($dictionary[$this->getObjectName()]['engine'])) {
             $engine = $dictionary[$this->getObjectName()]['engine'];
         }
 
@@ -545,7 +545,7 @@ 
      */
     public function getTableName()
     {
-        if(isset($this->table_name))
+        if (isset($this->table_name))
         {
             return $this->table_name;
         }
@@ -579,7 +579,7 @@ 
     function getIndices()
     {
         global $dictionary;
-        if(isset($dictionary[$this->getObjectName()]['indices']))
+        if (isset($dictionary[$this->getObjectName()]['indices']))
         {
             return $dictionary[$this->getObjectName()]['indices'];
         }
@@ -598,7 +598,7 @@ 
      */
     function getFieldDefinition($name)
     {
-        if ( !isset($this->field_defs[$name]) )
+        if (!isset($this->field_defs[$name]))
             return false;
 
         return $this->field_defs[$name];
@@ -616,7 +616,7 @@ 
     function getPrimaryFieldDefinition()
     {
         $def = $this->getFieldDefinition("id");
-        if(empty($def)) {
+        if (empty($def)) {
             $def = $this->getFieldDefinition(0);
         }
         if (empty($def)) {
@@ -639,13 +639,13 @@ 
      */
     function getFieldValue($name)
     {
-        if (!isset($this->$name)){
+        if (!isset($this->$name)) {
             return FALSE;
         }
-        if($this->$name === TRUE){
+        if ($this->$name === TRUE) {
             return 1;
         }
-        if($this->$name === FALSE){
+        if ($this->$name === FALSE) {
             return 0;
         }
         return $this->$name;
@@ -657,17 +657,17 @@ 
      */
     public function unPopulateDefaultValues()
     {
-        if ( !is_array($this->field_defs) )
+        if (!is_array($this->field_defs))
             return;
 
         foreach ($this->field_defs as $field => $value) {
-		    if( !empty($this->$field)
+		    if (!empty($this->$field)
                   && ((isset($value['default']) && $this->$field == $value['default']) || (!empty($value['display_default']) && $this->$field == $value['display_default']))
                     ) {
                 $this->$field = null;
                 continue;
             }
-            if(!empty($this->$field) && !empty($value['display_default']) && in_array($value['type'], array('date', 'datetime', 'datetimecombo')) &&
+            if (!empty($this->$field) && !empty($value['display_default']) && in_array($value['type'], array('date', 'datetime', 'datetimecombo')) &&
             $this->$field == $this->parseDateDefault($value['display_default'], ($value['type'] != 'date'))) {
                 $this->$field = null;
             }
@@ -684,10 +684,10 @@ 
     protected function parseDateDefault($value, $time = false)
     {
         global $timedate;
-        if($time) {
+        if ($time) {
             $dtAry = explode('&', $value, 2);
             $dateValue = $timedate->getNow(true)->modify($dtAry[0]);
-            if(!empty($dtAry[1])) {
+            if (!empty($dtAry[1])) {
                 $timeValue = $timedate->fromString($dtAry[1]);
                 $dateValue->setTime($timeValue->hour, $timeValue->min, $timeValue->sec);
             }
@@ -697,37 +697,37 @@ 
         }
     }
 
-    function populateDefaultValues($force=false){
-        if ( !is_array($this->field_defs) )
+    function populateDefaultValues($force = false) {
+        if (!is_array($this->field_defs))
             return;
-        foreach($this->field_defs as $field=>$value){
-            if((isset($value['default']) || !empty($value['display_default'])) && ($force || empty($this->$field))){
+        foreach ($this->field_defs as $field=>$value) {
+            if ((isset($value['default']) || !empty($value['display_default'])) && ($force || empty($this->$field))) {
                 $type = $value['type'];
 
-                switch($type){
+                switch ($type) {
                     case 'date':
-                        if(!empty($value['display_default'])){
+                        if (!empty($value['display_default'])) {
                             $this->$field = $this->parseDateDefault($value['display_default']);
                         }
                         break;
                    case 'datetime':
                    case 'datetimecombo':
-                        if(!empty($value['display_default'])){
+                        if (!empty($value['display_default'])) {
                             $this->$field = $this->parseDateDefault($value['display_default'], true);
                         }
                         break;
                     case 'multienum':
-                        if(empty($value['default']) && !empty($value['display_default']))
+                        if (empty($value['default']) && !empty($value['display_default']))
                             $this->$field = $value['display_default'];
                         else
                             $this->$field = $value['default'];
                         break;
                     case 'bool':
-                    	if(isset($this->$field)){
+                    	if (isset($this->$field)) {
                     		break;
                     	}
                     default:
-                        if ( isset($value['default']) && $value['default'] !== '' ) {
+                        if (isset($value['default']) && $value['default'] !== '') {
                             $this->$field = htmlentities($value['default'], ENT_QUOTES, 'UTF-8');
                         } else {
                             $this->$field = '';
@@ -755,20 +755,20 @@ 
      *
      * Internal function, do not override.
      */
-    static function removeRelationshipMeta($key,$db,$tablename,$dictionary,$module_dir)
+    static function removeRelationshipMeta($key, $db, $tablename, $dictionary, $module_dir)
     {
         //load the module dictionary if not supplied.
         if ((!isset($dictionary) or empty($dictionary)) && !empty($module_dir))
         {
-            $filename='modules/'. $module_dir . '/vardefs.php';
-            if(file_exists($filename))
+            $filename = 'modules/'.$module_dir.'/vardefs.php';
+            if (file_exists($filename))
             {
                 include($filename);
             }
         }
         if (!is_array($dictionary) or !array_key_exists($key, $dictionary))
         {
-            $GLOBALS['log']->fatal("removeRelationshipMeta: Metadata for table ".$tablename. " does not exist");
+            $GLOBALS['log']->fatal("removeRelationshipMeta: Metadata for table ".$tablename." does not exist");
             display_notice("meta data absent for table ".$tablename." keyed to $key ");
         }
         else
@@ -778,7 +778,7 @@ 
                 $RelationshipDefs = $dictionary[$key]['relationships'];
                 foreach ($RelationshipDefs as $rel_name)
                 {
-                    Relationship::delete($rel_name,$db);
+                    Relationship::delete($rel_name, $db);
                 }
             }
         }
@@ -792,9 +792,9 @@ 
      * @deprecated 4.5.1 - Nov 14, 2006
      * @static
     */
-    static function remove_relationship_meta($key,$db,$log,$tablename,$dictionary,$module_dir)
+    static function remove_relationship_meta($key, $db, $log, $tablename, $dictionary, $module_dir)
     {
-        SugarBean::removeRelationshipMeta($key,$db,$tablename,$dictionary,$module_dir);
+        SugarBean::removeRelationshipMeta($key, $db, $tablename, $dictionary, $module_dir);
     }
 
 
@@ -813,14 +813,14 @@ 
      *
      *  Internal function, do not override.
      */
-    static function createRelationshipMeta($key,$db,$tablename,$dictionary,$module_dir,$iscustom=false)
+    static function createRelationshipMeta($key, $db, $tablename, $dictionary, $module_dir, $iscustom = false)
     {
         //load the module dictionary if not supplied.
         if (empty($dictionary) && !empty($module_dir))
         {
-            if($iscustom)
+            if ($iscustom)
             {
-                $filename='custom/modules/' . $module_dir . '/Ext/Vardefs/vardefs.ext.php';
+                $filename = 'custom/modules/'.$module_dir.'/Ext/Vardefs/vardefs.ext.php';
             }
             else
             {
@@ -829,33 +829,33 @@ 
                     // a very special case for the Employees module
                     // this must be done because the Employees/vardefs.php does an include_once on
                     // Users/vardefs.php
-                    $filename='modules/Users/vardefs.php';
+                    $filename = 'modules/Users/vardefs.php';
                 }
                 else
                 {
-                    $filename='modules/'. $module_dir . '/vardefs.php';
+                    $filename = 'modules/'.$module_dir.'/vardefs.php';
                 }
             }
 
-            if(file_exists($filename))
+            if (file_exists($filename))
             {
                 include($filename);
                 // cn: bug 7679 - dictionary entries defined as $GLOBALS['name'] not found
-                if(empty($dictionary) || !empty($GLOBALS['dictionary'][$key]))
+                if (empty($dictionary) || !empty($GLOBALS['dictionary'][$key]))
                 {
                     $dictionary = $GLOBALS['dictionary'];
                 }
             }
             else
             {
-                $GLOBALS['log']->debug("createRelationshipMeta: no metadata file found" . $filename);
+                $GLOBALS['log']->debug("createRelationshipMeta: no metadata file found".$filename);
                 return;
             }
         }
 
         if (!is_array($dictionary) or !array_key_exists($key, $dictionary))
         {
-            $GLOBALS['log']->fatal("createRelationshipMeta: Metadata for table ".$tablename. " does not exist");
+            $GLOBALS['log']->fatal("createRelationshipMeta: Metadata for table ".$tablename." does not exist");
             display_notice("meta data absent for table ".$tablename." keyed to $key ");
         }
         else
@@ -865,23 +865,23 @@ 
 
                 $RelationshipDefs = $dictionary[$key]['relationships'];
 
-                $delimiter=',';
+                $delimiter = ',';
                 global $beanList;
-                $beanList_ucase=array_change_key_case  ( $beanList ,CASE_UPPER);
+                $beanList_ucase = array_change_key_case($beanList, CASE_UPPER);
                 foreach ($RelationshipDefs as $rel_name=>$rel_def)
                 {
                     if (isset($rel_def['lhs_module']) and !isset($beanList_ucase[strtoupper($rel_def['lhs_module'])])) {
-                        $GLOBALS['log']->debug('skipping orphaned relationship record ' . $rel_name . ' lhs module is missing ' . $rel_def['lhs_module']);
+                        $GLOBALS['log']->debug('skipping orphaned relationship record '.$rel_name.' lhs module is missing '.$rel_def['lhs_module']);
                         continue;
                     }
                     if (isset($rel_def['rhs_module']) and !isset($beanList_ucase[strtoupper($rel_def['rhs_module'])])) {
-                        $GLOBALS['log']->debug('skipping orphaned relationship record ' . $rel_name . ' rhs module is missing ' . $rel_def['rhs_module']);
+                        $GLOBALS['log']->debug('skipping orphaned relationship record '.$rel_name.' rhs module is missing '.$rel_def['rhs_module']);
                         continue;
                     }
 
 
                     //check whether relationship exists or not first.
-                    if (Relationship::exists($rel_name,$db))
+                    if (Relationship::exists($rel_name, $db))
                     {
                         $GLOBALS['log']->debug('Skipping, reltionship already exists '.$rel_name);
                     }
@@ -890,7 +890,7 @@ 
                         $seed = BeanFactory::getBean("Relationships");
                         $keys = array_keys($seed->field_defs);
                         $toInsert = array();
-                        foreach($keys as $key)
+                        foreach ($keys as $key)
                         {
                             if ($key == "id")
                             {
@@ -909,10 +909,10 @@ 
 
 
                         $column_list = implode(",", array_keys($toInsert));
-                        $value_list = "'" . implode("','", array_values($toInsert)) . "'";
+                        $value_list = "'".implode("','", array_values($toInsert))."'";
 
                         //create the record. todo add error check.
-                        $insert_string = "INSERT into relationships (" .$column_list. ") values (".$value_list.")";
+                        $insert_string = "INSERT into relationships (".$column_list.") values (".$value_list.")";
                         $db->query($insert_string, true);
                     }
                 }
@@ -931,9 +931,9 @@ 
      * @deprecated 4.5.1 - Nov 14, 2006
      * @static
     */
-    static function create_relationship_meta($key,&$db,&$log,$tablename,$dictionary,$module_dir)
+    static function create_relationship_meta($key, &$db, &$log, $tablename, $dictionary, $module_dir)
     {
-        SugarBean::createRelationshipMeta($key,$db,$tablename,$dictionary,$module_dir);
+        SugarBean::createRelationshipMeta($key, $db, $tablename, $dictionary, $module_dir);
     }
 
 
@@ -946,8 +946,8 @@ 
      */
     public function __clone()
     {
-        if(!empty($this->loaded_relationships)) {
-            foreach($this->loaded_relationships as $rel) {
+        if (!empty($this->loaded_relationships)) {
+            foreach ($this->loaded_relationships as $rel) {
                 unset($this->$rel);
             }
         }
@@ -1021,8 +1021,8 @@ 
     function load_relationships()
     {
         $GLOBALS['log']->debug("SugarBean.load_relationships, Loading all relationships of type link.");
-        $linked_fields=$this->get_linked_fields();
-        foreach($linked_fields as $name=>$properties)
+        $linked_fields = $this->get_linked_fields();
+        foreach ($linked_fields as $name=>$properties)
         {
             $this->load_relationship($name);
         }
@@ -1045,13 +1045,13 @@ 
      *
      * Internal function, do not override.
      */
-    function get_linked_beans($field_name,$bean_name = '', $order_by = '', $begin_index = 0, $end_index = -1, $deleted=0, $optional_where="")
+    function get_linked_beans($field_name, $bean_name = '', $order_by = '', $begin_index = 0, $end_index = -1, $deleted = 0, $optional_where = "")
     {
         //if bean_name is Case then use aCase
-        if($bean_name=="Case")
+        if ($bean_name == "Case")
             $bean_name = "aCase";
 
-        if($this->load_relationship($field_name)) {
+        if ($this->load_relationship($field_name)) {
             if ($this->$field_name instanceof Link) {
                 // some classes are still based on Link, e.g. TeamSetLink
                 return array_values($this->$field_name->getBeans(new $bean_name(), $order_by, $begin_index, $end_index, $deleted, $optional_where));
@@ -1082,7 +1082,7 @@ 
     function get_linked_fields()
     {
 
-        $linked_fields=array();
+        $linked_fields = array();
 
  //   	require_once('data/Link.php');
 
@@ -1093,9 +1093,9 @@ 
         {
             foreach ($fieldDefs as $name=>$properties)
             {
-                if (array_search('link',$properties) === 'type')
+                if (array_search('link', $properties) === 'type')
                 {
-                    $linked_fields[$name]=$properties;
+                    $linked_fields[$name] = $properties;
                 }
             }
         }
@@ -1115,38 +1115,38 @@ 
     {
         $importableFields = array();
 
-        $fieldDefs= $this->getFieldDefinitions();
+        $fieldDefs = $this->getFieldDefinitions();
 
         if (!empty($fieldDefs)) {
             foreach ($fieldDefs as $key=>$value_array) {
-                if ( (isset($value_array['importable'])
+                if ((isset($value_array['importable'])
                         && (is_string($value_array['importable']) && $value_array['importable'] == 'false'
                             || is_bool($value_array['importable']) && $value_array['importable'] == false))
                     || (isset($value_array['type']) && $value_array['type'] == 'link')
                     || (isset($value_array['auto_increment'])
-                        && ($value_array['type'] == true || $value_array['type'] == 'true')) ) {
+                        && ($value_array['type'] == true || $value_array['type'] == 'true'))) {
                     // only allow import if we force it
                     if (isset($value_array['importable'])
                         && (is_string($value_array['importable']) && $value_array['importable'] == 'true'
                            || is_bool($value_array['importable']) && $value_array['importable'] == true)) {
-                        $importableFields[$key]=$value_array;
+                        $importableFields[$key] = $value_array;
                     }
                 }
                 else {
 
                     //Expose the cooresponding id field of a relate field if it is only defined as a link so that users can relate records by id during import
-                    if( isset($value_array['type']) && ($value_array['type'] == 'relate') && isset($value_array['id_name']) )
+                    if (isset($value_array['type']) && ($value_array['type'] == 'relate') && isset($value_array['id_name']))
                     {
                         $idField = $value_array['id_name'];
-                        if( isset($fieldDefs[$idField]) && isset($fieldDefs[$idField]['type'] ) && $fieldDefs[$idField]['type'] == 'link' )
+                        if (isset($fieldDefs[$idField]) && isset($fieldDefs[$idField]['type']) && $fieldDefs[$idField]['type'] == 'link')
                         {
                             $tmpFieldDefs = $fieldDefs[$idField];
-                            $tmpFieldDefs['vname'] = translate($value_array['vname'], $this->module_dir) . " " . $GLOBALS['app_strings']['LBL_ID'];
-                            $importableFields[$idField]=$tmpFieldDefs;
+                            $tmpFieldDefs['vname'] = translate($value_array['vname'], $this->module_dir)." ".$GLOBALS['app_strings']['LBL_ID'];
+                            $importableFields[$idField] = $tmpFieldDefs;
                         }
                     }
 
-                    $importableFields[$key]=$value_array;
+                    $importableFields[$key] = $value_array;
                 }
             }
         }
@@ -1164,7 +1164,7 @@ 
     function get_related_fields()
     {
 
-        $related_fields=array();
+        $related_fields = array();
 
 //    	require_once('data/Link.php');
 
@@ -1175,9 +1175,9 @@ 
         {
             foreach ($fieldDefs as $name=>$properties)
             {
-                if (array_search('relate',$properties) === 'type')
+                if (array_search('relate', $properties) === 'type')
                 {
-                    $related_fields[$name]=$properties;
+                    $related_fields[$name] = $properties;
                 }
             }
         }
@@ -1195,8 +1195,8 @@ 
         $importable_fields = $this->get_importable_fields();
         $required_fields   = array();
 
-        foreach ( $importable_fields as $name => $properties ) {
-            if ( isset($properties['importable']) && is_string($properties['importable']) && $properties['importable'] == 'required' ) {
+        foreach ($importable_fields as $name => $properties) {
+            if (isset($properties['importable']) && is_string($properties['importable']) && $properties['importable'] == 'required') {
                 $required_fields[$name] = $properties;
             }
         }
@@ -1211,7 +1211,7 @@ 
      */
     function delete_linked($id)
     {
-        $linked_fields=$this->get_linked_fields();
+        $linked_fields = $this->get_linked_fields();
         foreach ($linked_fields as $name => $value)
         {
             if ($this->load_relationship($name))
@@ -1237,18 +1237,18 @@ 
         $key = $this->getObjectName();
         if (!array_key_exists($key, $dictionary))
         {
-            $GLOBALS['log']->fatal("create_tables: Metadata for table ".$this->table_name. " does not exist");
+            $GLOBALS['log']->fatal("create_tables: Metadata for table ".$this->table_name." does not exist");
             display_notice("meta data absent for table ".$this->table_name." keyed to $key ");
         }
         else
         {
-            if(!$this->db->tableExists($this->table_name))
+            if (!$this->db->tableExists($this->table_name))
             {
                 $this->db->createTable($this);
-                    if($this->bean_implements('ACL')){
-                        if(!empty($this->acltype)){
+                    if ($this->bean_implements('ACL')) {
+                        if (!empty($this->acltype)) {
                             ACLAction::addActions($this->getACLCategory(), $this->acltype);
-                        }else{
+                        } else {
                             ACLAction::addActions($this->getACLCategory());
                         }
                     }
@@ -1257,7 +1257,7 @@ 
             {
                 echo "Table already exists : $this->table_name<br>";
             }
-            if($this->is_AuditEnabled()){
+            if ($this->is_AuditEnabled()) {
                     if (!$this->db->tableExists($this->get_audit_table_name())) {
                         $this->create_audit_table();
                     }
@@ -1278,16 +1278,16 @@ 
         $key = $this->getObjectName();
         if (!array_key_exists($key, $dictionary))
         {
-            $GLOBALS['log']->fatal("drop_tables: Metadata for table ".$this->table_name. " does not exist");
+            $GLOBALS['log']->fatal("drop_tables: Metadata for table ".$this->table_name." does not exist");
             echo "meta data absent for table ".$this->table_name."<br>\n";
         } else {
-            if(empty($this->table_name))return;
+            if (empty($this->table_name))return;
             if ($this->db->tableExists($this->table_name))
 
                 $this->db->dropTable($this);
-            if ($this->db->tableExists($this->table_name. '_cstm'))
+            if ($this->db->tableExists($this->table_name.'_cstm'))
             {
-                $this->db->dropTableName($this->table_name. '_cstm');
+                $this->db->dropTableName($this->table_name.'_cstm');
                 DynamicField::deleteCache();
             }
             if ($this->db->tableExists($this->get_audit_table_name())) {
@@ -1306,7 +1306,7 @@ 
      * @param string $module_name setting up custom fields for this module.
      * @param boolean $clean_load Optional, default true, rebuilds the cache if set to true.
      */
-    function setupCustomFields($module_name, $clean_load=true)
+    function setupCustomFields($module_name, $clean_load = true)
     {
         $this->custom_fields = new DynamicField($module_name);
         $this->custom_fields->setup($this);
@@ -1317,17 +1317,17 @@ 
     * Cleans char, varchar, text, etc. fields of XSS type materials
     */
     function cleanBean() {
-        foreach($this->field_defs as $key => $def) {
+        foreach ($this->field_defs as $key => $def) {
 
             if (isset($def['type'])) {
-                $type=$def['type'];
+                $type = $def['type'];
             }
-            if(isset($def['dbType']))
+            if (isset($def['dbType']))
                 $type .= $def['dbType'];
 
-            if($def['type'] == 'html' || $def['type'] == 'longhtml') {
+            if ($def['type'] == 'html' || $def['type'] == 'longhtml') {
                 $this->$key = SugarCleaner::cleanHtml($this->$key, true);
-            } elseif((strpos($type, 'char') !== false ||
+            } elseif ((strpos($type, 'char') !== false ||
                 strpos($type, 'text') !== false ||
                 $type == 'enum') &&
                 !empty($this->$key)
@@ -1357,24 +1357,24 @@ 
         global $current_user, $action;
 
         $isUpdate = true;
-        if(empty($this->id))
+        if (empty($this->id))
         {
             $isUpdate = false;
         }
 
-		if ( $this->new_with_id == true )
+		if ($this->new_with_id == true)
 		{
 			$isUpdate = false;
 		}
-		if(empty($this->date_modified) || $this->update_date_modified)
+		if (empty($this->date_modified) || $this->update_date_modified)
 		{
 			$this->date_modified = $GLOBALS['timedate']->nowDb();
 		}
 
         $this->_checkOptimisticLocking($action, $isUpdate);
 
-        if(!empty($this->modified_by_name)) $this->old_modified_by_name = $this->modified_by_name;
-        if($this->update_modified_by)
+        if (!empty($this->modified_by_name)) $this->old_modified_by_name = $this->modified_by_name;
+        if ($this->update_modified_by)
         {
             $this->modified_user_id = 1;
 
@@ -1386,18 +1386,18 @@ 
         }
         if ($this->deleted != 1)
             $this->deleted = 0;
-        if(!$isUpdate)
+        if (!$isUpdate)
         {
             if (empty($this->date_entered))
             {
                 $this->date_entered = $this->date_modified;
             }
-            if($this->set_created_by == true)
+            if ($this->set_created_by == true)
             {
                 // created by should always be this user
                 $this->created_by = (isset($current_user)) ? $current_user->id : "";
             }
-            if( $this->new_with_id == false)
+            if ($this->new_with_id == false)
             {
                 $this->id = create_guid();
             }
@@ -1415,7 +1415,7 @@ 
             $this->save_relationship_changes($isUpdate);
             $GLOBALS['saving_relationships'] = false;
         }
-        if($isUpdate && !$this->update_date_entered)
+        if ($isUpdate && !$this->update_date_entered)
         {
             unset($this->date_entered);
         }
@@ -1437,7 +1437,7 @@ 
             $this->emailAddress->save($this->id, $this->module_dir);
         }
 
-        if(isset($this->custom_fields))
+        if (isset($this->custom_fields))
         {
             $this->custom_fields->bean = $this;
             $this->custom_fields->save($isUpdate);
@@ -1447,12 +1447,12 @@ 
         $this->preprocess_fields_on_save();
 
         //construct the SQL to create the audit record if auditing is enabled.
-        $auditDataChanges=array();
+        $auditDataChanges = array();
         if ($this->is_AuditEnabled()) {
             if ($isUpdate && !isset($this->fetched_row)) {
                 $GLOBALS['log']->debug('Auditing: Retrieve was not called, audit record will not be created.');
             } else {
-                $auditDataChanges=$this->db->getAuditDataChanges($this);
+                $auditDataChanges = $this->db->getAuditDataChanges($this);
             }
         }
 
@@ -1468,12 +1468,12 @@ 
         {
             foreach ($auditDataChanges as $change)
             {
-                $this->db->save_audit_records($this,$change);
+                $this->db->save_audit_records($this, $change);
             }
         }
 
 
-        if (empty($GLOBALS['resavingRelatedBeans'])){
+        if (empty($GLOBALS['resavingRelatedBeans'])) {
             SugarRelationship::resaveRelatedBeans();
         }
 
@@ -1485,10 +1485,10 @@ 
 
 		/* BEGIN - SECURITY GROUPS - inheritance */ 
 		require_once('modules/SecurityGroups/SecurityGroup.php');
-		SecurityGroup::inherit($this,$isUpdate);
+		SecurityGroup::inherit($this, $isUpdate);
 		/* END - SECURITY GROUPS */ 
         //If we aren't in setup mode and we have a current user and module, then we track
-        if(isset($GLOBALS['current_user']) && isset($this->module_dir))
+        if (isset($GLOBALS['current_user']) && isset($this->module_dir))
         {
             $this->track_view($current_user->id, $this->module_dir, 'save');
         }
@@ -1518,7 +1518,7 @@ 
             	AND (modified_user_id != '$modified_user_id' OR date_modified > $date)";
             $result = $this->db->query($query);
 
-            if($this->db->fetchByAssoc($result))
+            if ($this->db->fetchByAssoc($result))
             {
                 return true;
             }
@@ -1554,11 +1554,11 @@ 
     {
         global $current_user;
 
-        if(($this->object_name == 'Meeting' || $this->object_name == 'Call') || $notify_user->receive_notifications)
+        if (($this->object_name == 'Meeting' || $this->object_name == 'Call') || $notify_user->receive_notifications)
         {
             $sendToEmail = $notify_user->emailAddress->getPrimaryAddress($notify_user);
             $sendEmail = TRUE;
-            if(empty($sendToEmail)) {
+            if (empty($sendToEmail)) {
                 $GLOBALS['log']->warn("Notifications: no e-mail address set for user {$notify_user->user_name}, cancelling send");
                 $sendEmail = FALSE;
             }
@@ -1566,7 +1566,7 @@ 
             $notify_mail = $this->create_notification_email($notify_user);
             $notify_mail->setMailerForSystem();
 
-            if(empty($admin->settings['notify_send_from_assigning_user'])) {
+            if (empty($admin->settings['notify_send_from_assigning_user'])) {
                 $notify_mail->From = $admin->settings['notify_fromaddress'];
                 $notify_mail->FromName = (empty($admin->settings['notify_fromname'])) ? "" : $admin->settings['notify_fromname'];
             } else {
@@ -1583,31 +1583,31 @@ 
            $oe = new OutboundEmail();
             $oe = $oe->getUserMailerSettings($current_user);
             //only send if smtp server is defined
-            if($sendEmail){
+            if ($sendEmail) {
                 $smtpVerified = false;
 
                 //first check the user settings
-                if(!empty($oe->mail_smtpserver)){
+                if (!empty($oe->mail_smtpserver)) {
                     $smtpVerified = true;
                 }
 
                 //if still not verified, check against the system settings
-                if (!$smtpVerified){
+                if (!$smtpVerified) {
                     $oe = $oe->getSystemMailerSettings();
-                    if(!empty($oe->mail_smtpserver)){
+                    if (!empty($oe->mail_smtpserver)) {
                         $smtpVerified = true;
                     }
                 }
                 //if smtp was not verified against user or system, then do not send out email
-                if (!$smtpVerified){
+                if (!$smtpVerified) {
                     $GLOBALS['log']->fatal("Notifications: error sending e-mail, smtp server was not found ");
                     //break out
                     return;
                 }
 
-                if(!$notify_mail->Send()) {
+                if (!$notify_mail->Send()) {
                     $GLOBALS['log']->fatal("Notifications: error sending e-mail (method: {$notify_mail->Mailer}), (error: {$notify_mail->ErrorInfo})");
-                }else{
+                } else {
                     $GLOBALS['log']->info("Notifications: e-mail successfully sent");
                 }
             }
@@ -1636,15 +1636,15 @@ 
         $GLOBALS['log']->debug("Notifications: user has e-mail defined");
 
         $notify_mail = new SugarPHPMailer();
-        $notify_mail->AddAddress($notify_address,$locale->translateCharsetMIME(trim($notify_name), 'UTF-8', $OBCharset));
+        $notify_mail->AddAddress($notify_address, $locale->translateCharsetMIME(trim($notify_name), 'UTF-8', $OBCharset));
 
-        if(empty($_SESSION['authenticated_user_language'])) {
+        if (empty($_SESSION['authenticated_user_language'])) {
             $current_language = $sugar_config['default_language'];
         } else {
             $current_language = $_SESSION['authenticated_user_language'];
         }
         $xtpl = new XTemplate(get_notify_template_file($current_language));
-        if($this->module_dir == "Cases") {
+        if ($this->module_dir == "Cases") {
             $template_name = "Case"; //we should use Case, you can refer to the en_us.notify_template.html.
         }
         else {
@@ -1653,23 +1653,23 @@ 
 
         $this->current_notify_user = $notify_user;
 
-        if(in_array('set_notification_body', get_class_methods($this))) {
+        if (in_array('set_notification_body', get_class_methods($this))) {
             $xtpl = $this->set_notification_body($xtpl, $this);
         } else {
             $xtpl->assign("OBJECT", translate('LBL_MODULE_NAME'));
             $template_name = "Default";
         }
-        if(!empty($_SESSION["special_notification"]) && $_SESSION["special_notification"]) {
+        if (!empty($_SESSION["special_notification"]) && $_SESSION["special_notification"]) {
             $template_name = $beanList[$this->module_dir].'Special';
         }
-        if($this->special_notification) {
+        if ($this->special_notification) {
             $template_name = $beanList[$this->module_dir].'Special';
         }
         $xtpl->assign("ASSIGNED_USER", $this->new_assigned_user_name);
         $xtpl->assign("ASSIGNER", $current_user->name);
         $port = '';
 
-        if(isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) {
+        if (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) {
             $port = $_SERVER['SERVER_PORT'];
         }
 
@@ -1679,27 +1679,27 @@ 
 
         $httpHost = $_SERVER['HTTP_HOST'];
 
-        if($colon = strpos($httpHost, ':')) {
-            $httpHost    = substr($httpHost, 0, $colon);
+        if ($colon = strpos($httpHost, ':')) {
+            $httpHost = substr($httpHost, 0, $colon);
         }
 
         $parsedSiteUrl = parse_url($sugar_config['site_url']);
         $host = $parsedSiteUrl['host'];
-        if(!isset($parsedSiteUrl['port'])) {
+        if (!isset($parsedSiteUrl['port'])) {
             $parsedSiteUrl['port'] = 80;
         }
 
         $port		= ($parsedSiteUrl['port'] != 80) ? ":".$parsedSiteUrl['port'] : '';
         $path		= !empty($parsedSiteUrl['path']) ? $parsedSiteUrl['path'] : "";
-        $cleanUrl	= "{$parsedSiteUrl['scheme']}://{$host}{$port}{$path}";
+        $cleanUrl = "{$parsedSiteUrl['scheme']}://{$host}{$port}{$path}";
 
         $xtpl->assign("URL", $cleanUrl."/index.php?module={$this->module_dir}&action=DetailView&record={$this->id}");
         $xtpl->assign("SUGAR", "Sugar v{$sugar_version}");
         $xtpl->parse($template_name);
-        $xtpl->parse($template_name . "_Subject");
+        $xtpl->parse($template_name."_Subject");
 
         $notify_mail->Body = from_html(trim($xtpl->text($template_name)));
-        $notify_mail->Subject = from_html($xtpl->text($template_name . "_Subject"));
+        $notify_mail->Subject = from_html($xtpl->text($template_name."_Subject"));
 
         // cn: bug 8568 encode notify email in User's outbound email encoding
         $notify_mail->prepForOutbound();
@@ -1762,7 +1762,7 @@ 
             // $rel_id and $rel_link are not emty - request is from subpanel
             // $rel_link contains relationship name - checked by call load_relationship
             $isRelationshipLoaded = $this->load_relationship($rel_link);
-            if ($isRelationshipLoaded && !empty($this->$rel_link) && $this->$rel_link->getRelationshipObject() && $this->$rel_link->getRelationshipObject()->getLHSModule() == $this->$rel_link->getRelationshipObject()->getRHSModule() )
+            if ($isRelationshipLoaded && !empty($this->$rel_link) && $this->$rel_link->getRelationshipObject() && $this->$rel_link->getRelationshipObject()->getLHSModule() == $this->$rel_link->getRelationshipObject()->getRHSModule())
             {
                 $new_rel_link = $this->$rel_link->getRelationshipObject()->getLHSLink();
             }
@@ -1802,14 +1802,14 @@ 
 
                 if (in_array($id, $exclude)) continue;
 
-                if(!empty($this->$id))
+                if (!empty($this->$id))
                 {
                     // Bug #44930 We do not need to update main related field if it is changed from sub-panel.
                     if ($rel_name == $new_rel_link && $this->$id != $new_rel_id)
                     {
                         $new_rel_id = '';
                     }
-                    $GLOBALS['log']->debug('save_relationship_changes(): From relationship_field array - adding a relationship record: '.$rel_name . ' = ' . $this->$id);
+                    $GLOBALS['log']->debug('save_relationship_changes(): From relationship_field array - adding a relationship record: '.$rel_name.' = '.$this->$id);
                     //already related the new relationship id so let's set it to false so we don't add it again using the _REQUEST['relate_i'] mechanism in a later block
                     $this->load_relationship($rel_name);
                     $rel_add = $this->$rel_name->add($this->$id);
@@ -1820,7 +1820,7 @@ 
                 } else {
                     //if before value is not empty then attempt to delete relationship
                     if (!empty($this->rel_fields_before_value[$id])) {
-                        $GLOBALS['log']->debug('save_relationship_changes(): From relationship_field array - attempting to remove the relationship record, using relationship attribute' . $rel_name);
+                        $GLOBALS['log']->debug('save_relationship_changes(): From relationship_field array - attempting to remove the relationship record, using relationship attribute'.$rel_name);
                         $this->load_relationship($rel_name);
                         $this->$rel_name->delete($this->id, $this->rel_fields_before_value[$id]);
                     }
@@ -1863,30 +1863,30 @@ 
 
                         if (!empty($this->rel_fields_before_value[$idName]) && empty($this->$idName)) {
                             //if before value is not empty then attempt to delete relationship
-                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - attempting to remove the relationship record: {$def [ 'link' ]} = {$this->rel_fields_before_value[$def [ 'id_name' ]]}");
+                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - attempting to remove the relationship record: {$def ['link']} = {$this->rel_fields_before_value[$def ['id_name']]}");
                             $success = $this->$def ['link']->delete($this->id, $this->rel_fields_before_value[$def ['id_name']]);
                             // just need to make sure it's true and not an array as it's possible to return an array
-                            if($success == true) {
+                            if ($success == true) {
                                 $modified_relationships['remove']['success'][] = $def['link'];
                             } else {
                                 $modified_relationships['remove']['failure'][] = $def['link'];
                             }
-                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - attempting to remove the relationship record returned " . var_export($success, true));
+                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - attempting to remove the relationship record returned ".var_export($success, true));
                         }
 
                         if (!empty($this->$idName) && is_string($this->$idName)) {
-                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - attempting to add a relationship record - {$def [ 'link' ]} = {$this->$def [ 'id_name' ]}");
+                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - attempting to add a relationship record - {$def ['link']} = {$this->$def ['id_name']}");
 
                             $success = $this->$linkField->add($this->$idName);
 
                             // just need to make sure it's true and not an array as it's possible to return an array
-                            if($success == true) {
+                            if ($success == true) {
                                 $modified_relationships['add']['success'][] = $linkField;
                             } else {
                                 $modified_relationships['add']['failure'][] = $linkField;
                             }
 
-                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - add a relationship record returned " . var_export($success, true));
+                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - add a relationship record returned ".var_export($success, true));
                         }
                     } else {
                         $GLOBALS['log']->fatal("Failed to load relationship {$linkField} while saving {$this->module_dir}");
@@ -2040,48 +2040,48 @@ 
 		global $disable_date_format;
 		global $timedate;
 		if (empty($timedate))
-			$timedate=TimeDate::getInstance();
+			$timedate = TimeDate::getInstance();
 
-		if(empty($this->field_defs))
+		if (empty($this->field_defs))
 		{
 			return;
 		}
-		foreach($this->field_defs as $fieldDef)
+		foreach ($this->field_defs as $fieldDef)
 		{
 			$field = $fieldDef['name'];
-			if(!isset($this->processed_dates_times[$field]))
+			if (!isset($this->processed_dates_times[$field]))
 			{
 				$this->processed_dates_times[$field] = '1';
-				if(empty($this->$field)) continue;
-				if($field == 'date_modified' || $field == 'date_entered')
+				if (empty($this->$field)) continue;
+				if ($field == 'date_modified' || $field == 'date_entered')
 				{
 					$this->$field = $this->db->fromConvert($this->$field, 'datetime');
-					if(empty($disable_date_format)) {
+					if (empty($disable_date_format)) {
 						$this->$field = $timedate->to_display_date_time($this->$field);
 					}
 				}
-				elseif(isset($this->field_name_map[$field]['type']))
+				elseif (isset($this->field_name_map[$field]['type']))
 				{
 					$type = $this->field_name_map[$field]['type'];
 
-					if($type == 'relate'  && isset($this->field_name_map[$field]['custom_module']))
+					if ($type == 'relate' && isset($this->field_name_map[$field]['custom_module']))
 					{
 						$type = $this->field_name_map[$field]['type'];
 					}
 
-					if($type == 'date')
+					if ($type == 'date')
 					{
-						if($this->$field == '0000-00-00')
+						if ($this->$field == '0000-00-00')
 						{
 							$this->$field = '';
-						} elseif(!empty($this->field_name_map[$field]['rel_field']))
+						} elseif (!empty($this->field_name_map[$field]['rel_field']))
 						{
 							$rel_field = $this->field_name_map[$field]['rel_field'];
 
-							if(!empty($this->$rel_field))
+							if (!empty($this->$rel_field))
 							{
-								if(empty($disable_date_format)) {
-									$mergetime = $timedate->merge_date_time($this->$field,$this->$rel_field);
+								if (empty($disable_date_format)) {
+									$mergetime = $timedate->merge_date_time($this->$field, $this->$rel_field);
 									$this->$field = $timedate->to_display_date($mergetime);
 									$this->$rel_field = $timedate->to_display_time($mergetime);
 								}
@@ -2089,36 +2089,36 @@ 
 						}
 						else
 						{
-							if(empty($disable_date_format)) {
+							if (empty($disable_date_format)) {
 								$this->$field = $timedate->to_display_date($this->$field, false);
 							}
 						}
-					} elseif($type == 'datetime' || $type == 'datetimecombo')
+					} elseif ($type == 'datetime' || $type == 'datetimecombo')
 					{
-						if($this->$field == '0000-00-00 00:00:00')
+						if ($this->$field == '0000-00-00 00:00:00')
 						{
 							$this->$field = '';
 						}
 						else
 						{
-							if(empty($disable_date_format)) {
+							if (empty($disable_date_format)) {
 								$this->$field = $timedate->to_display_date_time($this->$field, true, true);
 							}
 						}
-					} elseif($type == 'time')
+					} elseif ($type == 'time')
 					{
-						if($this->$field == '00:00:00')
+						if ($this->$field == '00:00:00')
 						{
 							$this->$field = '';
 						} else
 						{
 							//$this->$field = from_db_convert($this->$field, 'time');
-							if(empty($this->field_name_map[$field]['rel_field']) && empty($disable_date_format))
+							if (empty($this->field_name_map[$field]['rel_field']) && empty($disable_date_format))
 							{
-								$this->$field = $timedate->to_display_time($this->$field,true, false);
+								$this->$field = $timedate->to_display_time($this->$field, true, false);
 							}
 						}
-					} elseif($type == 'encrypt' && empty($disable_date_format)){
+					} elseif ($type == 'encrypt' && empty($disable_date_format)) {
 						$this->$field = $this->decrypt_after_retrieve($this->$field);
 					}
 				}
@@ -2172,52 +2172,52 @@ 
         static $boolean_false_values = array('off', 'false', '0', 'no');
 
 
-        foreach($this->field_defs as $field=>$def)
+        foreach ($this->field_defs as $field=>$def)
             {
-            if ( !isset($this->$field) ) {
+            if (!isset($this->$field)) {
                 continue;
                 }
-            if ( (isset($def['source'])&&$def['source']=='non-db') || $field == 'deleted' ) {
+            if ((isset($def['source']) && $def['source'] == 'non-db') || $field == 'deleted') {
                 continue;
             }
-            if ( isset($this->fetched_row[$field]) && $this->$field == $this->fetched_row[$field] ) {
+            if (isset($this->fetched_row[$field]) && $this->$field == $this->fetched_row[$field]) {
                 // Don't hand out warnings because the field was untouched between retrieval and saving, most database drivers hand pretty much everything back as strings.
                 continue;
             }
             $reformatted = false;
-            switch($def['type']) {
+            switch ($def['type']) {
                 case 'datetime':
                 case 'datetimecombo':
-                    if(empty($this->$field)) break;
+                    if (empty($this->$field)) break;
                     if ($this->$field == 'NULL') {
                     	$this->$field = '';
                     	break;
                     }
-                    if ( ! preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}$/',$this->$field) ) {
+                    if (!preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}$/', $this->$field)) {
                         // This appears to be formatted in user date/time
                         $this->$field = $timedate->to_db($this->$field);
                         $reformatted = true;
                     }
                     break;
                 case 'date':
-                    if(empty($this->$field)) break;
+                    if (empty($this->$field)) break;
                     if ($this->$field == 'NULL') {
                     	$this->$field = '';
                     	break;
                     }
-                    if ( ! preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/',$this->$field) ) {
+                    if (!preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $this->$field)) {
                         // This date appears to be formatted in the user's format
                         $this->$field = $timedate->to_db_date($this->$field, false);
                         $reformatted = true;
                     }
                     break;
                 case 'time':
-                    if(empty($this->$field)) break;
+                    if (empty($this->$field)) break;
                     if ($this->$field == 'NULL') {
                     	$this->$field = '';
                     	break;
                     }
-                    if ( preg_match('/(am|pm)/i',$this->$field) ) {
+                    if (preg_match('/(am|pm)/i', $this->$field)) {
                         // This time appears to be formatted in the user's format
                         $this->$field = $timedate->fromUserTime($this->$field)->format(TimeDate::DB_TIME_FORMAT);
                         $reformatted = true;
@@ -2227,10 +2227,10 @@ 
                 case 'decimal':
                 case 'currency':
                 case 'float':
-                    if ( $this->$field === '' || $this->$field == NULL || $this->$field == 'NULL') {
+                    if ($this->$field === '' || $this->$field == NULL || $this->$field == 'NULL') {
                         continue;
                     }
-                    if ( is_string($this->$field) ) {
+                    if (is_string($this->$field)) {
                         $this->$field = (float)unformat_number($this->$field);
                         $reformatted = true;
                     }
@@ -2241,10 +2241,10 @@ 
                case 'short':
                case 'tinyint':
                case 'int':
-                    if ( $this->$field === '' || $this->$field == NULL || $this->$field == 'NULL') {
+                    if ($this->$field === '' || $this->$field == NULL || $this->$field == 'NULL') {
                         continue;
                     }
-                    if ( is_string($this->$field) ) {
+                    if (is_string($this->$field)) {
                         $this->$field = (int)unformat_number($this->$field);
                         $reformatted = true;
                     }
@@ -2252,9 +2252,9 @@ 
                case 'bool':
                    if (empty($this->$field)) {
                        $this->$field = false;
-                   } else if(true === $this->$field || 1 == $this->$field) {
+                   } else if (true === $this->$field || 1 == $this->$field) {
                        $this->$field = true;
-                   } else if(in_array(strval($this->$field), $boolean_false_values)) {
+                   } else if (in_array(strval($this->$field), $boolean_false_values)) {
                        $this->$field = false;
                        $reformatted = true;
                    } else {
@@ -2266,7 +2266,7 @@ 
                     $this->$field = $this->encrpyt_before_save($this->$field);
                     break;
             }
-            if ( $reformatted ) {
+            if ($reformatted) {
                 $GLOBALS['log']->deprecated('Formatting correction: '.$this->module_dir.'->'.$field.' had formatting automatically corrected. This will be removed in the future, please upgrade your external code');
             }
         }
@@ -2285,7 +2285,7 @@ 
      *
      * Internal function, do not override.
     */
-    function retrieve($id = -1, $encode=true,$deleted=true)
+    function retrieve($id = -1, $encode = true, $deleted = true)
     {
 
         $custom_logic_arguments['id'] = $id;
@@ -2297,27 +2297,27 @@ 
         }
         $custom_join = $this->getCustomJoin();
 
-        $query = "SELECT $this->table_name.*". $custom_join['select']. " FROM $this->table_name ";
+        $query = "SELECT $this->table_name.*".$custom_join['select']." FROM $this->table_name ";
 
         $query .= $custom_join['join'];
         $query .= " WHERE $this->table_name.id = ".$this->db->quoted($id);
         if ($deleted) $query .= " AND $this->table_name.deleted=0";
         $GLOBALS['log']->debug("Retrieve $this->object_name : ".$query);
-        $result = $this->db->limitQuery($query,0,1,true, "Retrieving record by id $this->table_name:$id found ");
-        if(empty($result))
+        $result = $this->db->limitQuery($query, 0, 1, true, "Retrieving record by id $this->table_name:$id found ");
+        if (empty($result))
         {
             return null;
         }
 
         $row = $this->db->fetchByAssoc($result, $encode);
-        if(empty($row))
+        if (empty($row))
         {
             return null;
         }
 
         //make copy of the fetched row for construction of audit record and for business logic/workflow
         $row = $this->convertRow($row);
-        $this->fetched_row=$row;
+        $this->fetched_row = $row;
         $this->populateFromRow($row);
 
         // fix defect #52438. implement the same logic as sugar_currency_format
@@ -2326,16 +2326,16 @@ 
 
         global $module, $action;
         //Just to get optimistic locking working for this release
-        if($this->optimistic_lock && $module == $this->module_dir && $action =='EditView' )
+        if ($this->optimistic_lock && $module == $this->module_dir && $action == 'EditView')
         {
-            $_SESSION['o_lock_id']= $id;
-            $_SESSION['o_lock_dm']= $this->date_modified;
+            $_SESSION['o_lock_id'] = $id;
+            $_SESSION['o_lock_dm'] = $this->date_modified;
             $_SESSION['o_lock_on'] = $this->object_name;
         }
         $this->processed_dates_times = array();
         $this->check_date_relationships_load();
 
-        if(isset($this->custom_fields))
+        if (isset($this->custom_fields))
         {
             $this->custom_fields->fill_relationships();
         }
@@ -2347,23 +2347,23 @@ 
          foreach ($this->get_related_fields() as $rel_field_name)
          {
              $field_name = $rel_field_name['name'];
-             if (! empty($this->$field_name))
+             if (!empty($this->$field_name))
              {
                  $this->fetched_rel_row[$rel_field_name['name']] = $this->$field_name;
              }
          }
         //make a copy of fields in the relationship_fields array. These field values will be used to
         //clear relationship.
-        foreach ( $this->field_defs as $key => $def )
+        foreach ($this->field_defs as $key => $def)
         {
-            if (isset($def [ 'type' ]) && $def [ 'type' ] == 'relate' && isset ( $def [ 'id_name'] ) && isset ( $def [ 'link'] ) && isset ( $def[ 'save' ])) {
+            if (isset($def ['type']) && $def ['type'] == 'relate' && isset ($def ['id_name']) && isset ($def ['link']) && isset ($def['save'])) {
                 if (isset($this->$key)) {
-                    $this->rel_fields_before_value[$key]=$this->$key;
-                    if (isset($this->$def [ 'id_name']))
-                        $this->rel_fields_before_value[$def [ 'id_name']]=$this->$def [ 'id_name'];
+                    $this->rel_fields_before_value[$key] = $this->$key;
+                    if (isset($this->$def ['id_name']))
+                        $this->rel_fields_before_value[$def ['id_name']] = $this->$def ['id_name'];
                 }
                 else
-                    $this->rel_fields_before_value[$key]=null;
+                    $this->rel_fields_before_value[$key] = null;
            }
         }
         if (isset($this->relationship_fields) && is_array($this->relationship_fields))
@@ -2371,9 +2371,9 @@ 
             foreach ($this->relationship_fields as $rel_id=>$rel_name)
             {
                 if (isset($this->$rel_id))
-                    $this->rel_fields_before_value[$rel_id]=$this->$rel_id;
+                    $this->rel_fields_before_value[$rel_id] = $this->$rel_id;
                 else
-                    $this->rel_fields_before_value[$rel_id]=null;
+                    $this->rel_fields_before_value[$rel_id] = null;
             }
         }
 
@@ -2396,16 +2396,16 @@ 
      */
     function populateFromRow($row)
     {
-        $nullvalue='';
-        foreach($this->field_defs as $field=>$field_value)
+        $nullvalue = '';
+        foreach ($this->field_defs as $field=>$field_value)
         {
-            if(($field == 'user_preferences' && $this->module_dir == 'Users') || ($field == 'internal' && $this->module_dir == 'Cases') )
+            if (($field == 'user_preferences' && $this->module_dir == 'Users') || ($field == 'internal' && $this->module_dir == 'Cases'))
                 continue;
-            if(isset($row[$field]))
+            if (isset($row[$field]))
             {
                 $this->$field = $row[$field];
-                $owner = $field . '_owner';
-                if(!empty($row[$owner])){
+                $owner = $field.'_owner';
+                if (!empty($row[$owner])) {
                     $this->$owner = $row[$owner];
                 }
             }
@@ -2447,48 +2447,48 @@ 
     function create_list_count_query($query)
     {
         // remove the 'order by' clause which is expected to be at the end of the query
-        $pattern = '/\sORDER BY.*/is';  // ignores the case
+        $pattern = '/\sORDER BY.*/is'; // ignores the case
         $replacement = '';
         $query = preg_replace($pattern, $replacement, $query);
         //handle distinct clause
         $star = '*';
-        if(substr_count(strtolower($query), 'distinct')){
-            if (!empty($this->seed) && !empty($this->seed->table_name ))
-                $star = 'DISTINCT ' . $this->seed->table_name . '.id';
+        if (substr_count(strtolower($query), 'distinct')) {
+            if (!empty($this->seed) && !empty($this->seed->table_name))
+                $star = 'DISTINCT '.$this->seed->table_name.'.id';
             else
-                $star = 'DISTINCT ' . $this->table_name . '.id';
+                $star = 'DISTINCT '.$this->table_name.'.id';
 
         }
 
         // change the select expression to 'count(*)'
-        $pattern = '/SELECT(.*?)(\s){1}FROM(\s){1}/is';  // ignores the case
-        $replacement = 'SELECT count(' . $star . ') c FROM ';
+        $pattern = '/SELECT(.*?)(\s){1}FROM(\s){1}/is'; // ignores the case
+        $replacement = 'SELECT count('.$star.') c FROM ';
 
         //if the passed query has union clause then replace all instances of the pattern.
         //this is very rare. I have seen this happening only from projects module.
         //in addition to this added a condition that has  union clause and uses
         //sub-selects.
-        if (strstr($query," UNION ALL ") !== false) {
+        if (strstr($query, " UNION ALL ") !== false) {
 
             //separate out all the queries.
-            $union_qs=explode(" UNION ALL ", $query);
+            $union_qs = explode(" UNION ALL ", $query);
             foreach ($union_qs as $key=>$union_query) {
                 $star = '*';
                 preg_match($pattern, $union_query, $matches);
                 if (!empty($matches)) {
                     if (stristr($matches[0], "distinct")) {
-                        if (!empty($this->seed) && !empty($this->seed->table_name ))
-                            $star = 'DISTINCT ' . $this->seed->table_name . '.id';
+                        if (!empty($this->seed) && !empty($this->seed->table_name))
+                            $star = 'DISTINCT '.$this->seed->table_name.'.id';
                         else
-                            $star = 'DISTINCT ' . $this->table_name . '.id';
+                            $star = 'DISTINCT '.$this->table_name.'.id';
                     }
                 } // if
-                $replacement = 'SELECT count(' . $star . ') c FROM ';
-                $union_qs[$key] = preg_replace($pattern, $replacement, $union_query,1);
+                $replacement = 'SELECT count('.$star.') c FROM ';
+                $union_qs[$key] = preg_replace($pattern, $replacement, $union_query, 1);
             }
-            $modified_select_query=implode(" UNION ALL ",$union_qs);
+            $modified_select_query = implode(" UNION ALL ", $union_qs);
         } else {
-            $modified_select_query = preg_replace($pattern, $replacement, $query,1);
+            $modified_select_query = preg_replace($pattern, $replacement, $query, 1);
         }
 
 
@@ -2511,15 +2511,15 @@ 
     * Internal function, do not override.
     *
     */
-    function get_list($order_by = "", $where = "", $row_offset = 0, $limit=-1, $max=-1, $show_deleted = 0, $singleSelect=false, $select_fields = array())
+    function get_list($order_by = "", $where = "", $row_offset = 0, $limit = -1, $max = -1, $show_deleted = 0, $singleSelect = false, $select_fields = array())
     {
         $GLOBALS['log']->debug("get_list:  order_by = '$order_by' and where = '$where' and limit = '$limit'");
-        if(isset($_SESSION['show_deleted']))
+        if (isset($_SESSION['show_deleted']))
         {
             $show_deleted = 1;
         }
 
-        if($this->bean_implements('ACL') && ACLController::requireOwner($this->module_dir, 'list') )
+        if ($this->bean_implements('ACL') && ACLController::requireOwner($this->module_dir, 'list'))
         {
             global $current_user;
             $owner_where = $this->getOwnerWhere($current_user->id);
@@ -2527,15 +2527,15 @@ 
             //rrs - because $this->getOwnerWhere() can return '' we need to be sure to check for it and
             //handle it properly else you could get into a situation where you are create a where stmt like
             //WHERE .. AND ''
-            if(!empty($owner_where)){
-                if(empty($where)){
+            if (!empty($owner_where)) {
+                if (empty($where)) {
                     $where = $owner_where;
-                }else{
-                    $where .= ' AND '.  $owner_where;
+                } else {
+                    $where .= ' AND '.$owner_where;
                 }
             }
         }
-        $query = $this->create_new_list_query($order_by, $where,$select_fields,array(), $show_deleted,'',false,null,$singleSelect);
+        $query = $this->create_new_list_query($order_by, $where, $select_fields, array(), $show_deleted, '', false, null, $singleSelect);
         return $this->process_list_query($query, $row_offset, $limit, $max, $where);
     }
 
@@ -2581,9 +2581,9 @@ 
 
                 if (empty($field_defs['table']) && !$suppress_table_name) {
                     if ($source == 'db') {
-                        $list_column[0] = $bean_queried->table_name . '.' . $list_column[0] ;
+                        $list_column[0] = $bean_queried->table_name.'.'.$list_column[0];
                     } elseif ($source == 'custom_fields') {
-                        $list_column[0] = $bean_queried->table_name . '_cstm.' . $list_column[0] ;
+                        $list_column[0] = $bean_queried->table_name.'_cstm.'.$list_column[0];
                     }
                 }
 
@@ -2637,49 +2637,49 @@ 
     *
     * Internal function, do not override.
     */
-    function get_detail($order_by = "", $where = "",  $offset = 0, $row_offset = 0, $limit=-1, $max=-1, $show_deleted = 0)
+    function get_detail($order_by = "", $where = "", $offset = 0, $row_offset = 0, $limit = -1, $max = -1, $show_deleted = 0)
     {
         $GLOBALS['log']->debug("get_detail:  order_by = '$order_by' and where = '$where' and limit = '$limit' and offset = '$offset'");
-        if(isset($_SESSION['show_deleted']))
+        if (isset($_SESSION['show_deleted']))
         {
             $show_deleted = 1;
         }
 
-        if($this->bean_implements('ACL') && ACLController::requireOwner($this->module_dir, 'list') )
+        if ($this->bean_implements('ACL') && ACLController::requireOwner($this->module_dir, 'list'))
         {
             global $current_user;
             $owner_where = $this->getOwnerWhere($current_user->id);
 
-            if(empty($where))
+            if (empty($where))
             {
                 $where = $owner_where;
             }
             else
             {
-                $where .= ' AND '.  $owner_where;
+                $where .= ' AND '.$owner_where;
             }
         }
 
 		/* BEGIN - SECURITY GROUPS */
-    	if($this->bean_implements('ACL') && ACLController::requireSecurityGroup($this->module_dir, 'list') )
+    	if ($this->bean_implements('ACL') && ACLController::requireSecurityGroup($this->module_dir, 'list'))
     	{
 			require_once('modules/SecurityGroups/SecurityGroup.php');
     		global $current_user;
     		$owner_where = $this->getOwnerWhere($current_user->id);
-    		$group_where = SecurityGroup::getGroupWhere($this->table_name,$this->module_dir,$current_user->id);
-	    	if(!empty($owner_where)){
-				if(empty($where))
+    		$group_where = SecurityGroup::getGroupWhere($this->table_name, $this->module_dir, $current_user->id);
+	    	if (!empty($owner_where)) {
+				if (empty($where))
 	    		{
-	    			$where = " (".  $owner_where." or ".$group_where.") ";
+	    			$where = " (".$owner_where." or ".$group_where.") ";
 	    		} else {
-	    			$where .= " AND (".  $owner_where." or ".$group_where.") ";
+	    			$where .= " AND (".$owner_where." or ".$group_where.") ";
 	    		}
 			} else {
-				$where .= ' AND '.  $group_where;
+				$where .= ' AND '.$group_where;
 			}
     	}
     	/* END - SECURITY GROUPS */
-        $query = $this->create_new_list_query($order_by, $where,array(),array(), $show_deleted, $offset);
+        $query = $this->create_new_list_query($order_by, $where, array(), array(), $show_deleted, $offset);
 
         //Add Limit and Offset to query
         //$query .= " LIMIT 1 OFFSET $offset";
@@ -2698,13 +2698,13 @@ 
     *
     * Internal function, do not override.
     */
-    function get_related_list($child_seed,$related_field_name, $order_by = "", $where = "",
-    $row_offset = 0, $limit=-1, $max=-1, $show_deleted = 0)
+    function get_related_list($child_seed, $related_field_name, $order_by = "", $where = "",
+    $row_offset = 0, $limit = -1, $max = -1, $show_deleted = 0)
     {
         global $layout_edit_mode;
         $query_array = array();
 
-        if(isset($layout_edit_mode) && $layout_edit_mode)
+        if (isset($layout_edit_mode) && $layout_edit_mode)
         {
             $response = array();
             $child_seed->assign_display_fields($child_seed->module_dir);
@@ -2716,7 +2716,7 @@ 
             return $response;
         }
         $GLOBALS['log']->debug("get_related_list:  order_by = '$order_by' and where = '$where' and limit = '$limit'");
-        if(isset($_SESSION['show_deleted']))
+        if (isset($_SESSION['show_deleted']))
         {
             $show_deleted = 1;
         }
@@ -2735,22 +2735,22 @@ 
         }
 
         $entire_where = $query_array['where'];
-        if(!empty($where))
+        if (!empty($where))
         {
-            if(empty($entire_where))
+            if (empty($entire_where))
             {
-                $entire_where = ' WHERE ' . $where;
+                $entire_where = ' WHERE '.$where;
             }
             else
             {
-                $entire_where .= ' AND ' . $where;
+                $entire_where .= ' AND '.$where;
             }
         }
 
-        $query = 'SELECT '.$child_seed->table_name.'.* ' . $query_array['from'] . ' ' . $entire_where;
-        if(!empty($order_by))
+        $query = 'SELECT '.$child_seed->table_name.'.* '.$query_array['from'].' '.$entire_where;
+        if (!empty($order_by))
         {
-            $query .= " ORDER BY " . $order_by;
+            $query .= " ORDER BY ".$order_by;
         }
 
         return $child_seed->process_list_query($query, $row_offset, $limit, $max, $where);
@@ -2761,27 +2761,27 @@ 
     {
         global $layout_edit_mode, $beanFiles, $beanList;
         $subqueries = array();
-        foreach($subpanel_list as $this_subpanel)
+        foreach ($subpanel_list as $this_subpanel)
         {
-            if(!$this_subpanel->isDatasourceFunction() || ($this_subpanel->isDatasourceFunction()
+            if (!$this_subpanel->isDatasourceFunction() || ($this_subpanel->isDatasourceFunction()
                 && isset($this_subpanel->_instance_properties['generate_select'])
-                && $this_subpanel->_instance_properties['generate_select']==true))
+                && $this_subpanel->_instance_properties['generate_select'] == true))
             {
                 //the custom query function must return an array with
                 if ($this_subpanel->isDatasourceFunction()) {
                     $shortcut_function_name = $this_subpanel->get_data_source_name();
-                    $parameters=$this_subpanel->get_function_parameters();
+                    $parameters = $this_subpanel->get_function_parameters();
                     if (!empty($parameters))
                     {
                         //if the import file function is set, then import the file to call the custom function from
-                        if (is_array($parameters)  && isset($parameters['import_function_file'])){
+                        if (is_array($parameters) && isset($parameters['import_function_file'])) {
                             //this call may happen multiple times, so only require if function does not exist
-                            if(!function_exists($shortcut_function_name)){
+                            if (!function_exists($shortcut_function_name)) {
                                 require_once($parameters['import_function_file']);
                             }
                             //call function from required file
                             $query_array = $shortcut_function_name($parameters);
-                        }else{
+                        } else {
                             //call function from parent bean
                             $query_array = $parentbean->$shortcut_function_name($parameters);
                         }
@@ -2790,9 +2790,9 @@ 
                     {
                         $query_array = $parentbean->$shortcut_function_name();
                     }
-                }  else {
+                } else {
                     $related_field_name = $this_subpanel->get_data_source_name();
-                    if (!$parentbean->load_relationship($related_field_name)){
+                    if (!$parentbean->load_relationship($related_field_name)) {
                         unset ($parentbean->$related_field_name);
                         continue;
                     }
@@ -2801,15 +2801,15 @@ 
                 $table_where = preg_replace('/^\s*WHERE/i', '', $this_subpanel->get_where());
                 $where_definition = preg_replace('/^\s*WHERE/i', '', $query_array['where']);
 
-                if(!empty($table_where))
+                if (!empty($table_where))
                 {
-                    if(empty($where_definition))
+                    if (empty($where_definition))
                     {
                         $where_definition = $table_where;
                     }
                     else
                     {
-                        $where_definition .= ' AND ' . $table_where;
+                        $where_definition .= ' AND '.$table_where;
                     }
                 }
 
@@ -2824,21 +2824,21 @@ 
 
 
                 $list_fields = $this_subpanel->get_list_fields();
-                foreach($list_fields as $list_key=>$list_field)
+                foreach ($list_fields as $list_key=>$list_field)
                 {
-                    if(isset($list_field['usage']) && $list_field['usage'] == 'display_only')
+                    if (isset($list_field['usage']) && $list_field['usage'] == 'display_only')
                     {
                         unset($list_fields[$list_key]);
                     }
                 }
 
 
-                if(!$subpanel_def->isCollection() && isset($list_fields[$order_by]) && isset($submodule->field_defs[$order_by])&& (!isset($submodule->field_defs[$order_by]['source']) || $submodule->field_defs[$order_by]['source'] == 'db'))
+                if (!$subpanel_def->isCollection() && isset($list_fields[$order_by]) && isset($submodule->field_defs[$order_by]) && (!isset($submodule->field_defs[$order_by]['source']) || $submodule->field_defs[$order_by]['source'] == 'db'))
                 {
-                    $order_by = $submodule->table_name .'.'. $order_by;
+                    $order_by = $submodule->table_name.'.'.$order_by;
                 }
                 $table_name = $this_subpanel->table_name;
-                $panel_name=$this_subpanel->name;
+                $panel_name = $this_subpanel->name;
                 $params = array();
                 $params['distinct'] = $this_subpanel->distinct_query();
 
@@ -2849,7 +2849,7 @@ 
                 // use single select in case when sorting by relate field
                 $singleSelect = $submodule->is_relate_field($order_by);
 
-                $subquery = $submodule->create_new_list_query('',$subwhere ,$list_fields,$params, 0,'', true,$parentbean, $singleSelect);
+                $subquery = $submodule->create_new_list_query('', $subwhere, $list_fields, $params, 0, '', true, $parentbean, $singleSelect);
 
                 $subquery['select'] = $subquery['select']." , '$panel_name' panel_name ";
                 $subquery['from'] = $subquery['from'].$query_array['join'];
@@ -2881,27 +2881,27 @@ 
      *
      * Internal Function, do not overide.
      */
-    static function get_union_related_list($parentbean, $order_by = "", $sort_order='', $where = "",
-    $row_offset = 0, $limit=-1, $max=-1, $show_deleted = 0, $subpanel_def)
+    static function get_union_related_list($parentbean, $order_by = "", $sort_order = '', $where = "",
+    $row_offset = 0, $limit = -1, $max = -1, $show_deleted = 0, $subpanel_def)
     {
         $secondary_queries = array();
         global $layout_edit_mode, $beanFiles, $beanList;
 
-        if(isset($_SESSION['show_deleted']))
+        if (isset($_SESSION['show_deleted']))
         {
             $show_deleted = 1;
         }
         $final_query = '';
         $final_query_rows = '';
-        $subpanel_list=array();
+        $subpanel_list = array();
         if ($subpanel_def->isCollection())
         {
             $subpanel_def->load_sub_subpanels();
-            $subpanel_list=$subpanel_def->sub_subpanels;
+            $subpanel_list = $subpanel_def->sub_subpanels;
         }
         else
         {
-            $subpanel_list[]=$subpanel_def;
+            $subpanel_list[] = $subpanel_def;
         }
 
         $first = true;
@@ -2910,36 +2910,36 @@ 
         //The second loop merges the queries and forces them to select the same number of columns
         //All columns in a sub-subpanel group must have the same aliases
         //If the subpanel is a datasource function, it can't be a collection so we just poll that function for the and return that
-        foreach($subpanel_list as $this_subpanel)
+        foreach ($subpanel_list as $this_subpanel)
         {
-            if($this_subpanel->isDatasourceFunction() && empty($this_subpanel->_instance_properties['generate_select']))
+            if ($this_subpanel->isDatasourceFunction() && empty($this_subpanel->_instance_properties['generate_select']))
             {
                 $shortcut_function_name = $this_subpanel->get_data_source_name();
-                $parameters=$this_subpanel->get_function_parameters();
+                $parameters = $this_subpanel->get_function_parameters();
                 if (!empty($parameters))
                 {
                     //if the import file function is set, then import the file to call the custom function from
-                    if (is_array($parameters)  && isset($parameters['import_function_file'])){
+                    if (is_array($parameters) && isset($parameters['import_function_file'])) {
                         //this call may happen multiple times, so only require if function does not exist
-                        if(!function_exists($shortcut_function_name)){
+                        if (!function_exists($shortcut_function_name)) {
                             require_once($parameters['import_function_file']);
                         }
                         //call function from required file
-                        $tmp_final_query =  $shortcut_function_name($parameters);
-                    }else{
+                        $tmp_final_query = $shortcut_function_name($parameters);
+                    } else {
                         //call function from parent bean
-                        $tmp_final_query =  $parentbean->$shortcut_function_name($parameters);
+                        $tmp_final_query = $parentbean->$shortcut_function_name($parameters);
                     }
                 } else {
                     $tmp_final_query = $parentbean->$shortcut_function_name();
                 }
-                if(!$first)
+                if (!$first)
                     {
-                        $final_query_rows .= ' UNION ALL ( '.$parentbean->create_list_count_query($tmp_final_query, $parameters) . ' )';
-                        $final_query .= ' UNION ALL ( '.$tmp_final_query . ' )';
+                        $final_query_rows .= ' UNION ALL ( '.$parentbean->create_list_count_query($tmp_final_query, $parameters).' )';
+                        $final_query .= ' UNION ALL ( '.$tmp_final_query.' )';
                     } else {
-                        $final_query_rows = '(' . $parentbean->create_list_count_query($tmp_final_query, $parameters) . ')';
-                        $final_query = '(' . $tmp_final_query . ')';
+                        $final_query_rows = '('.$parentbean->create_list_count_query($tmp_final_query, $parameters).')';
+                        $final_query = '('.$tmp_final_query.')';
                         $first = false;
                     }
                 }
@@ -2949,10 +2949,10 @@ 
         {
             $subqueries = SugarBean::build_sub_queries_for_union($subpanel_list, $subpanel_def, $parentbean, $order_by);
             $all_fields = array();
-            foreach($subqueries as $i => $subquery)
+            foreach ($subqueries as $i => $subquery)
             {
                 $query_fields = $GLOBALS['db']->getSelectFieldsFromQuery($subquery['select']);
-                foreach($query_fields as $field => $select)
+                foreach ($query_fields as $field => $select)
                 {
                     if (!in_array($field, $all_fields))
                         $all_fields[] = $field;
@@ -2961,10 +2961,10 @@ 
             }
             $first = true;
             //Now ensure the queries have the same set of fields in the same order.
-            foreach($subqueries as $subquery)
+            foreach ($subqueries as $subquery)
             {
                 $subquery['select'] = "SELECT";
-                foreach($all_fields as $field)
+                foreach ($all_fields as $field)
                 {
                     if (!isset($subquery['query_fields'][$field]))
                     {
@@ -2975,56 +2975,56 @@ 
                         $subquery['select'] .= " {$subquery['query_fields'][$field]},";
                     }
                 }
-                $subquery['select'] = substr($subquery['select'], 0 , strlen($subquery['select']) - 1);
+                $subquery['select'] = substr($subquery['select'], 0, strlen($subquery['select']) - 1);
                 //Put the query into the final_query
-                $query =  $subquery['select'] . " " . $subquery['from'] . " " . $subquery['where'];
-                if(!$first)
+                $query = $subquery['select']." ".$subquery['from']." ".$subquery['where'];
+                if (!$first)
                 {
-                    $query = ' UNION ALL ( '.$query . ' )';
+                    $query = ' UNION ALL ( '.$query.' )';
                     $final_query_rows .= " UNION ALL ";
                 } else {
-                    $query = '(' . $query . ')';
+                    $query = '('.$query.')';
                     $first = false;
                 }
                 $query_array = $subquery['query_array'];
-                $select_position=strpos($query_array['select'],"SELECT");
-                $distinct_position=strpos($query_array['select'],"DISTINCT");
+                $select_position = strpos($query_array['select'], "SELECT");
+                $distinct_position = strpos($query_array['select'], "DISTINCT");
                 if (!empty($subquery['params']['distinct']) && !empty($subpanel_def->table_name))
                 {
-                    $query_rows = "( SELECT count(DISTINCT ". $subpanel_def->table_name . ".id)".  $subquery['from_min'].$query_array['join']. $subquery['where'].' )';
+                    $query_rows = "( SELECT count(DISTINCT ".$subpanel_def->table_name.".id)".$subquery['from_min'].$query_array['join'].$subquery['where'].' )';
                 }
-                elseif ($select_position !== false && $distinct_position!= false)
+                elseif ($select_position !== false && $distinct_position != false)
                 {
-                    $query_rows = "( ".substr_replace($query_array['select'],"SELECT count(",$select_position,6). ")" .  $subquery['from_min'].$query_array['join']. $subquery['where'].' )';
+                    $query_rows = "( ".substr_replace($query_array['select'], "SELECT count(", $select_position, 6).")".$subquery['from_min'].$query_array['join'].$subquery['where'].' )';
                 }
                 else
                 {
                     //resort to default behavior.
-                    $query_rows = "( SELECT count(*)".  $subquery['from_min'].$query_array['join']. $subquery['where'].' )';
+                    $query_rows = "( SELECT count(*)".$subquery['from_min'].$query_array['join'].$subquery['where'].' )';
                 }
-                if(!empty($subquery['secondary_select']))
+                if (!empty($subquery['secondary_select']))
                 {
 
-                    $subquerystring= $subquery['secondary_select'] . $subquery['secondary_from'].$query_array['join']. $subquery['where'];
+                    $subquerystring = $subquery['secondary_select'].$subquery['secondary_from'].$query_array['join'].$subquery['where'];
                     if (!empty($subquery['secondary_where']))
                     {
                         if (empty($subquery['where']))
                         {
-                            $subquerystring.=" WHERE " .$subquery['secondary_where'];
+                            $subquerystring .= " WHERE ".$subquery['secondary_where'];
                         }
                         else
                         {
-                            $subquerystring.=" AND " .$subquery['secondary_where'];
+                            $subquerystring .= " AND ".$subquery['secondary_where'];
                         }
                     }
-                    $secondary_queries[]=$subquerystring;
+                    $secondary_queries[] = $subquerystring;
                 }
                 $final_query .= $query;
                 $final_query_rows .= $query_rows;
             }
         }
 
-        if(!empty($order_by))
+        if (!empty($order_by))
         {
             $isCollection = $subpanel_def->isCollection();
             if ($isCollection) {
@@ -3038,20 +3038,20 @@ 
             }
 
             if (!empty($sort_order)) {
-                $order_by .= ' ' . $sort_order;
+                $order_by .= ' '.$sort_order;
             }
 
             $order_by = $parentbean->process_order_by($order_by, $submodule, $suppress_table_name);
             if (!empty($order_by)) {
-                $final_query .= ' ORDER BY ' . $order_by;
+                $final_query .= ' ORDER BY '.$order_by;
             }
         }
 
 
-        if(isset($layout_edit_mode) && $layout_edit_mode)
+        if (isset($layout_edit_mode) && $layout_edit_mode)
         {
             $response = array();
-            if(!empty($submodule))
+            if (!empty($submodule))
             {
                 $submodule->assign_display_fields($submodule->module_dir);
                 $response['list'] = array($submodule);
@@ -3068,7 +3068,7 @@ 
             return $response;
         }
 
-        return $parentbean->process_union_list_query($parentbean, $final_query, $row_offset, $limit, $max, '',$subpanel_def, $final_query_rows, $secondary_queries);
+        return $parentbean->process_union_list_query($parentbean, $final_query, $row_offset, $limit, $max, '', $subpanel_def, $final_query_rows, $secondary_queries);
     }
 
 
@@ -3080,14 +3080,14 @@ 
     * @param boolean $check_dates. defaults to false
     * @param int $show_deleted show deleted records. defaults to 0
     */
-    function get_full_list($order_by = "", $where = "", $check_dates=false, $show_deleted = 0)
+    function get_full_list($order_by = "", $where = "", $check_dates = false, $show_deleted = 0)
     {
         $GLOBALS['log']->debug("get_full_list:  order_by = '$order_by' and where = '$where'");
-        if(isset($_SESSION['show_deleted']))
+        if (isset($_SESSION['show_deleted']))
         {
             $show_deleted = 1;
         }
-        $query = $this->create_new_list_query($order_by, $where,array(),array(), $show_deleted);
+        $query = $this->create_new_list_query($order_by, $where, array(), array(), $show_deleted);
         return $this->process_full_list_query($query, $check_dates);
     }
 
@@ -3107,29 +3107,29 @@ 
      * @param boolean $singleSelect Optional, default false.
      * @return String select query string, optionally an array value will be returned if $return_array= true.
      */
-	function create_new_list_query($order_by, $where,$filter=array(),$params=array(), $show_deleted = 0,$join_type='', $return_array = false,$parentbean=null, $singleSelect = false, $ifListForExport = false)
+	function create_new_list_query($order_by, $where, $filter = array(), $params = array(), $show_deleted = 0, $join_type = '', $return_array = false, $parentbean = null, $singleSelect = false, $ifListForExport = false)
     {
         global $beanFiles, $beanList;
         $selectedFields = array();
         $secondarySelectedFields = array();
         $ret_array = array();
         $distinct = '';
-        if($this->bean_implements('ACL') && ACLController::requireOwner($this->module_dir, 'list') )
+        if ($this->bean_implements('ACL') && ACLController::requireOwner($this->module_dir, 'list'))
         {
             global $current_user;
             $owner_where = $this->getOwnerWhere($current_user->id);
-            if(empty($where))
+            if (empty($where))
             {
                 $where = $owner_where;
             }
             else
             {
-                $where .= ' AND '.  $owner_where;
+                $where .= ' AND '.$owner_where;
             }
         }
 		/* BEGIN - SECURITY GROUPS */
     	global $current_user, $sugar_config;
-    	if($this->module_dir == 'Users' && !is_admin($current_user)
+    	if ($this->module_dir == 'Users' && !is_admin($current_user)
 				&& isset($sugar_config['securitysuite_filter_user_list'])
 				&& $sugar_config['securitysuite_filter_user_list'] == true
     	) {
@@ -3137,36 +3137,36 @@ 
     		global $current_user;
     		$group_where = SecurityGroup::getGroupUsersWhere($current_user->id);
     		//$group_where = "user_name = 'admin'";
-    		if(empty($where))
+    		if (empty($where))
     		{
     			$where = " (".$group_where.") ";
     		} else {
     			$where .= " AND (".$group_where.") ";
     		}
     	} else
-    	if($this->bean_implements('ACL') && ACLController::requireSecurityGroup($this->module_dir, 'list') )
+    	if ($this->bean_implements('ACL') && ACLController::requireSecurityGroup($this->module_dir, 'list'))
     	{
 			require_once('modules/SecurityGroups/SecurityGroup.php');
     		global $current_user;
     		$owner_where = $this->getOwnerWhere($current_user->id);
-    		$group_where = SecurityGroup::getGroupWhere($this->table_name,$this->module_dir,$current_user->id);
-	    	if(!empty($owner_where)){
-				if(empty($where))
+    		$group_where = SecurityGroup::getGroupWhere($this->table_name, $this->module_dir, $current_user->id);
+	    	if (!empty($owner_where)) {
+				if (empty($where))
 	    		{
-	    			$where = " (".  $owner_where." or ".$group_where.") ";
+	    			$where = " (".$owner_where." or ".$group_where.") ";
 	    		} else {
-	    			$where .= " AND (".  $owner_where." or ".$group_where.") ";
+	    			$where .= " AND (".$owner_where." or ".$group_where.") ";
 	    		}
 			} else {
-				$where .= ' AND '.  $group_where;
+				$where .= ' AND '.$group_where;
 			}
     	}
     	/* END - SECURITY GROUPS */
-        if(!empty($params['distinct']))
+        if (!empty($params['distinct']))
         {
             $distinct = ' DISTINCT ';
         }
-        if(empty($filter))
+        if (empty($filter))
         {
             $ret_array['select'] = " SELECT $distinct $this->table_name.* ";
         }
@@ -3176,21 +3176,21 @@ 
         }
         $ret_array['from'] = " FROM $this->table_name ";
         $ret_array['from_min'] = $ret_array['from'];
-        $ret_array['secondary_from'] = $ret_array['from'] ;
+        $ret_array['secondary_from'] = $ret_array['from'];
         $ret_array['where'] = '';
         $ret_array['order_by'] = '';
         //secondary selects are selects that need to be run after the primary query to retrieve additional info on main
-        if($singleSelect)
+        if ($singleSelect)
         {
-            $ret_array['secondary_select']=& $ret_array['select'];
+            $ret_array['secondary_select'] = & $ret_array['select'];
             $ret_array['secondary_from'] = & $ret_array['from'];
         }
         else
         {
             $ret_array['secondary_select'] = '';
         }
-        $custom_join = $this->getCustomJoin( empty($filter)? true: $filter );
-        if((!isset($params['include_custom_fields']) || $params['include_custom_fields']))
+        $custom_join = $this->getCustomJoin(empty($filter) ? true : $filter);
+        if ((!isset($params['include_custom_fields']) || $params['include_custom_fields']))
         {
             $ret_array['select'] .= $custom_join['select'];
         }
@@ -3206,43 +3206,43 @@ 
         }
 
         $joined_tables = array();
-        if(!empty($params['joined_tables']))
+        if (!empty($params['joined_tables']))
         {
-            foreach($params['joined_tables'] as $table)
+            foreach ($params['joined_tables'] as $table)
             {
                 $joined_tables[$table] = 1;
             }
         }
 
-        if(!empty($filter))
+        if (!empty($filter))
         {
             $filterKeys = array_keys($filter);
-            if(is_numeric($filterKeys[0]))
+            if (is_numeric($filterKeys[0]))
             {
                 $fields = array();
-                foreach($filter as $field)
+                foreach ($filter as $field)
                 {
                     $field = strtolower($field);
                     //remove out id field so we don't duplicate it
-                    if ( $field == 'id' && !empty($filter) ) {
+                    if ($field == 'id' && !empty($filter)) {
                         continue;
                     }
-                    if(isset($this->field_defs[$field]))
+                    if (isset($this->field_defs[$field]))
                     {
-                        $fields[$field]= $this->field_defs[$field];
+                        $fields[$field] = $this->field_defs[$field];
                     }
                     else
                     {
                         $fields[$field] = array('force_exists'=>true);
                     }
                 }
-            }else{
-                $fields = 	$filter;
+            } else {
+                $fields = $filter;
             }
         }
         else
         {
-            $fields = 	$this->field_defs;
+            $fields = $this->field_defs;
         }
 
         $used_join_key = array();
@@ -3250,7 +3250,7 @@ 
 	//walk through the fields and for every relationship field add their relationship_info field
 	//relationshipfield-aliases are resolved in SugarBean::create_new_list_query through their relationship_info field
 	$addrelate = array();
-	foreach($fields as $field=>$value)
+	foreach ($fields as $field=>$value)
 	{
 		if (isset($this->field_defs[$field]) && isset($this->field_defs[$field]['source']) && 
 			$this->field_defs[$field]['source'] == 'non-db')
@@ -3259,27 +3259,27 @@ 
 			if ($addrelatefield)
 				$addrelate[$addrelatefield] = true;
 		}
-		if(!empty($this->field_defs[$field]['id_name'])){
+		if (!empty($this->field_defs[$field]['id_name'])) {
 			$addrelate[$this->field_defs[$field]['id_name']] = true;
 		}
 	}
 
 	$fields = array_merge($addrelate, $fields);
 
-        foreach($fields as $field=>$value)
+        foreach ($fields as $field=>$value)
         {
             //alias is used to alias field names
-            $alias='';
-            if 	(isset($value['alias']))
+            $alias = '';
+            if (isset($value['alias']))
             {
-                $alias =' as ' . $value['alias'] . ' ';
+                $alias = ' as '.$value['alias'].' ';
             }
 
-            if(empty($this->field_defs[$field]) || !empty($value['force_blank']) )
+            if (empty($this->field_defs[$field]) || !empty($value['force_blank']))
             {
-                if(!empty($filter) && isset($filter[$field]['force_exists']) && $filter[$field]['force_exists'])
+                if (!empty($filter) && isset($filter[$field]['force_exists']) && $filter[$field]['force_exists'])
                 {
-                    if ( isset($filter[$field]['force_default']) )
+                    if (isset($filter[$field]['force_default']))
                         $ret_array['select'] .= ", {$filter[$field]['force_default']} $field ";
                     else
                     //spaces are a fix for length issue problem with unions.  The union only returns the maximum number of characters from the first select statement.
@@ -3311,14 +3311,14 @@ 
                 	continue;
             }
 
-            if(  (!isset($data['source']) || $data['source'] == 'db') && (!empty($alias) || !empty($filter) ))
+            if ((!isset($data['source']) || $data['source'] == 'db') && (!empty($alias) || !empty($filter)))
             {
                 $ret_array['select'] .= ", $this->table_name.$field $alias";
                 $selectedFields["$this->table_name.$field"] = true;
-            } else if(  (!isset($data['source']) || $data['source'] == 'custom_fields') && (!empty($alias) || !empty($filter) )) {
+            } else if ((!isset($data['source']) || $data['source'] == 'custom_fields') && (!empty($alias) || !empty($filter))) {
                 //add this column only if it has NOT already been added to select statement string
-                $colPos = strpos($ret_array['select'],"$this->table_name"."_cstm".".$field");
-                if(!$colPos || $colPos<0)
+                $colPos = strpos($ret_array['select'], "$this->table_name"."_cstm".".$field");
+                if (!$colPos || $colPos < 0)
                 {
                     $ret_array['select'] .= ", $this->table_name"."_cstm".".$field $alias";
                 }
@@ -3326,22 +3326,22 @@ 
                 $selectedFields["$this->table_name.$field"] = true;
             }
 
-            if($data['type'] != 'relate' && isset($data['db_concat_fields']))
+            if ($data['type'] != 'relate' && isset($data['db_concat_fields']))
             {
-                $ret_array['select'] .= ", " . $this->db->concat($this->table_name, $data['db_concat_fields']) . " as $field";
+                $ret_array['select'] .= ", ".$this->db->concat($this->table_name, $data['db_concat_fields'])." as $field";
                 $selectedFields[$this->db->concat($this->table_name, $data['db_concat_fields'])] = true;
             }
             //Custom relate field or relate fields built in module builder which have no link field associated.
             if ($data['type'] == 'relate' && (isset($data['custom_module']) || isset($data['ext2']))) {
-                $joinTableAlias = 'jt' . $jtcount;
+                $joinTableAlias = 'jt'.$jtcount;
                 $relateJoinInfo = $this->custom_fields->getRelateJoin($data, $joinTableAlias, false);
                 $ret_array['select'] .= $relateJoinInfo['select'];
                 $ret_array['from'] .= $relateJoinInfo['from'];
                 //Replace any references to the relationship in the where clause with the new alias
                 //If the link isn't set, assume that search used the local table for the field
                 $searchTable = isset($data['link']) ? $relateJoinInfo['rel_table'] : $this->table_name;
-                $field_name = $relateJoinInfo['rel_table'] . '.' . !empty($data['name'])?$data['name']:'name';
-                $where = preg_replace('/(^|[\s(])' . $field_name . '/' , '${1}' . $relateJoinInfo['name_field'], $where);
+                $field_name = $relateJoinInfo['rel_table'].'.'.!empty($data['name']) ? $data['name'] : 'name';
+                $where = preg_replace('/(^|[\s(])'.$field_name.'/', '${1}'.$relateJoinInfo['name_field'], $where);
                 $jtcount++;
             }
             //Parent Field
@@ -3349,7 +3349,7 @@ 
                 //See if we need to join anything by inspecting the where clause
                 $match = preg_match('/(^|[\s(])parent_([a-zA-Z]+_?[a-zA-Z]+)_([a-zA-Z]+_?[a-zA-Z]+)\.name/', $where, $matches);
                 if ($match) {
-                    $joinTableAlias = 'jt' . $jtcount;
+                    $joinTableAlias = 'jt'.$jtcount;
                     $joinModule = $matches[2];
                     $joinTable = $matches[3];
                     $localTable = $this->table_name;
@@ -3363,7 +3363,7 @@ 
                     if (isset($rel_mod->field_defs['name']))
                     {
                         $name_field_def = $rel_mod->field_defs['name'];
-                        if(isset($name_field_def['db_concat_fields']))
+                        if (isset($name_field_def['db_concat_fields']))
                         {
                             $nameField = $this->db->concat($joinTableAlias, $name_field_def['db_concat_fields']);
                         }
@@ -3372,7 +3372,7 @@ 
                     $ret_array['from'] .= " LEFT JOIN $joinTable $joinTableAlias
                         ON $localTable.{$data['id_name']} = $joinTableAlias.id";
                     //Replace any references to the relationship in the where clause with the new alias
-                    $where = preg_replace('/(^|[\s(])parent_' . $joinModule . '_' . $joinTable . '\.name/', '${1}' . $nameField, $where);
+                    $where = preg_replace('/(^|[\s(])parent_'.$joinModule.'_'.$joinTable.'\.name/', '${1}'.$nameField, $where);
                     $jtcount++;
                 }
             }
@@ -3381,10 +3381,10 @@ 
             {
                 $linkField = $data['link'];
                 $this->load_relationship($linkField);
-                if(!empty($this->$linkField))
+                if (!empty($this->$linkField))
                 {
                     $params = array();
-                    if(empty($join_type))
+                    if (empty($join_type))
                     {
                         $params['join_type'] = ' LEFT JOIN ';
                     }
@@ -3392,22 +3392,22 @@ 
                     {
                         $params['join_type'] = $join_type;
                     }
-                    if(isset($data['join_name']))
+                    if (isset($data['join_name']))
                     {
                         $params['join_table_alias'] = $data['join_name'];
                     }
                     else
                     {
-                        $params['join_table_alias']	= 'jt' . $jtcount;
+                        $params['join_table_alias'] = 'jt'.$jtcount;
 
                     }
-                    if(isset($data['join_link_name']))
+                    if (isset($data['join_link_name']))
                     {
                         $params['join_table_link_alias'] = $data['join_link_name'];
                     }
                     else
                     {
-                        $params['join_table_link_alias'] = 'jtl' . $jtcount;
+                        $params['join_table_link_alias'] = 'jtl'.$jtcount;
                     }
                     $join_primary = !isset($data['join_primary']) || $data['join_primary'];
 
@@ -3420,126 +3420,126 @@ 
 					global $beanFiles, $beanList;
                     // °3/21/2014 FIX NS-TEAM - Relationship fields could not be displayed in subpanels
                     //if($data['rname'] && !empty($beanFiles[$beanList[$rel_module]])) {
-                    if(isset($data['rname']) && $data['rname'] == 'name' && !empty($beanFiles[$beanList[$rel_module]])) {
+                    if (isset($data['rname']) && $data['rname'] == 'name' && !empty($beanFiles[$beanList[$rel_module]])) {
 
 						//create an instance of the related bean
 						require_once($beanFiles[$beanList[$rel_module]]);
 						$rel_mod = new $beanList[$rel_module]();
 						//if bean has first and last name fields, then name should be concatenated
-						if(isset($rel_mod->field_name_map['first_name']) && isset($rel_mod->field_name_map['last_name'])){
+						if (isset($rel_mod->field_name_map['first_name']) && isset($rel_mod->field_name_map['last_name'])) {
 								$data['db_concat_fields'] = array(0=>'first_name', 1=>'last_name');
 						}
 					}
 
 
-    				if($join['type'] == 'many-to-many')
+    				if ($join['type'] == 'many-to-many')
     				{
-    					if(empty($ret_array['secondary_select']))
+    					if (empty($ret_array['secondary_select']))
     					{
     						$ret_array['secondary_select'] = " SELECT $this->table_name.id ref_id  ";
 
-                            if(!empty($beanFiles[$beanList[$rel_module]]) && $join_primary)
+                            if (!empty($beanFiles[$beanList[$rel_module]]) && $join_primary)
                             {
                                 require_once($beanFiles[$beanList[$rel_module]]);
                                 $rel_mod = new $beanList[$rel_module]();
-                                if(isset($rel_mod->field_defs['assigned_user_id']))
+                                if (isset($rel_mod->field_defs['assigned_user_id']))
                                 {
-                                    $ret_array['secondary_select'].= " , ".	$params['join_table_alias'] . ".assigned_user_id {$field}_owner, '$rel_module' {$field}_mod";
+                                    $ret_array['secondary_select'] .= " , ".$params['join_table_alias'].".assigned_user_id {$field}_owner, '$rel_module' {$field}_mod";
                                 }
                                 else
                                 {
-                                    if(isset($rel_mod->field_defs['created_by']))
+                                    if (isset($rel_mod->field_defs['created_by']))
                                     {
-                                        $ret_array['secondary_select'].= " , ".	$params['join_table_alias'] . ".created_by {$field}_owner , '$rel_module' {$field}_mod";
+                                        $ret_array['secondary_select'] .= " , ".$params['join_table_alias'].".created_by {$field}_owner , '$rel_module' {$field}_mod";
                                     }
                                 }
                             }
                         }
 
-                        if(isset($data['db_concat_fields']))
+                        if (isset($data['db_concat_fields']))
                         {
-                            $ret_array['secondary_select'] .= ' , ' . $this->db->concat($params['join_table_alias'], $data['db_concat_fields']) . ' ' . $field;
+                            $ret_array['secondary_select'] .= ' , '.$this->db->concat($params['join_table_alias'], $data['db_concat_fields']).' '.$field;
                         }
                         else
                         {
-                            if(!isset($data['relationship_fields']))
+                            if (!isset($data['relationship_fields']))
                             {
-                                $ret_array['secondary_select'] .= ' , ' . $params['join_table_alias'] . '.' . $data['rname'] . ' ' . $field;
+                                $ret_array['secondary_select'] .= ' , '.$params['join_table_alias'].'.'.$data['rname'].' '.$field;
                             }
                         }
-                        if(!$singleSelect)
+                        if (!$singleSelect)
                         {
                             $ret_array['select'] .= ", '                                                                                                                                                                                                                                                              ' $field ";
                         }
-                        $count_used =0;
-                        foreach($used_join_key as $used_key) {
-                            if($used_key == $join['rel_key']) $count_used++;
+                        $count_used = 0;
+                        foreach ($used_join_key as $used_key) {
+                            if ($used_key == $join['rel_key']) $count_used++;
                         }
-                        if($count_used <= 1) {//27416, the $ret_array['secondary_select'] should always generate, regardless the dbtype
+                        if ($count_used <= 1) {//27416, the $ret_array['secondary_select'] should always generate, regardless the dbtype
                             // add rel_key only if it was not aready added
-                            if(!$singleSelect)
+                            if (!$singleSelect)
                             {
-                                $ret_array['select'] .= ", '                                    '  " . $join['rel_key'] . ' ';
+                                $ret_array['select'] .= ", '                                    '  ".$join['rel_key'].' ';
                             }
-                            $ret_array['secondary_select'] .= ', ' . $params['join_table_link_alias'].'.'. $join['rel_key'] .' ' . $join['rel_key'];
+                            $ret_array['secondary_select'] .= ', '.$params['join_table_link_alias'].'.'.$join['rel_key'].' '.$join['rel_key'];
                         }
-                        if(isset($data['relationship_fields']))
+                        if (isset($data['relationship_fields']))
                         {
-                            foreach($data['relationship_fields'] as $r_name=>$alias_name)
+                            foreach ($data['relationship_fields'] as $r_name=>$alias_name)
                             {
-                                if(!empty( $secondarySelectedFields[$alias_name]))continue;
-                                $ret_array['secondary_select'] .= ', ' . $params['join_table_link_alias'].'.'. $r_name .' ' . $alias_name;
+                                if (!empty($secondarySelectedFields[$alias_name]))continue;
+                                $ret_array['secondary_select'] .= ', '.$params['join_table_link_alias'].'.'.$r_name.' '.$alias_name;
                                 $secondarySelectedFields[$alias_name] = true;
                             }
                         }
-                        if(!$table_joined)
+                        if (!$table_joined)
                         {
-                            $ret_array['secondary_from'] .= ' ' . $join['join']. ' AND ' . $params['join_table_alias'].'.deleted=0';
+                            $ret_array['secondary_from'] .= ' '.$join['join'].' AND '.$params['join_table_alias'].'.deleted=0';
                             if (isset($data['link_type']) && $data['link_type'] == 'relationship_info' && ($parentbean instanceOf SugarBean))
                             {
-                                $ret_array['secondary_where'] = $params['join_table_link_alias'] . '.' . $join['rel_key']. "='" .$parentbean->id . "'";
+                                $ret_array['secondary_where'] = $params['join_table_link_alias'].'.'.$join['rel_key']."='".$parentbean->id."'";
                             }
                         }
                     }
                     else
                     {
-                        if(isset($data['db_concat_fields']))
+                        if (isset($data['db_concat_fields']))
                         {
-                            $ret_array['select'] .= ' , ' . $this->db->concat($params['join_table_alias'], $data['db_concat_fields']) . ' ' . $field;
+                            $ret_array['select'] .= ' , '.$this->db->concat($params['join_table_alias'], $data['db_concat_fields']).' '.$field;
                         }
                         else
                         {
-                            $ret_array['select'] .= ' , ' . $params['join_table_alias'] . '.' . $data['rname'] . ' ' . $field;
+                            $ret_array['select'] .= ' , '.$params['join_table_alias'].'.'.$data['rname'].' '.$field;
                         }
-                        if(isset($data['additionalFields'])){
-                            foreach($data['additionalFields'] as $k=>$v){
+                        if (isset($data['additionalFields'])) {
+                            foreach ($data['additionalFields'] as $k=>$v) {
                                 if (!empty($data['id_name']) && $data['id_name'] == $v && !empty($fields[$data['id_name']])) {
                                     continue;
                                 }
-                                $ret_array['select'] .= ' , ' . $params['join_table_alias'] . '.' . $k . ' ' . $v;
+                                $ret_array['select'] .= ' , '.$params['join_table_alias'].'.'.$k.' '.$v;
                             }
                         }
-                        if(!$table_joined)
+                        if (!$table_joined)
                         {
-                            $ret_array['from'] .= ' ' . $join['join']. ' AND ' . $params['join_table_alias'].'.deleted=0';
-                            if(!empty($beanList[$rel_module]) && !empty($beanFiles[$beanList[$rel_module]]))
+                            $ret_array['from'] .= ' '.$join['join'].' AND '.$params['join_table_alias'].'.deleted=0';
+                            if (!empty($beanList[$rel_module]) && !empty($beanFiles[$beanList[$rel_module]]))
                             {
                                 require_once($beanFiles[$beanList[$rel_module]]);
                                 $rel_mod = new $beanList[$rel_module]();
-                                if(isset($value['target_record_key']) && !empty($filter))
+                                if (isset($value['target_record_key']) && !empty($filter))
                                 {
                                     $selectedFields[$this->table_name.'.'.$value['target_record_key']] = true;
                                     $ret_array['select'] .= " , $this->table_name.{$value['target_record_key']} ";
                                 }
-                                if(isset($rel_mod->field_defs['assigned_user_id']))
+                                if (isset($rel_mod->field_defs['assigned_user_id']))
                                 {
-                                    $ret_array['select'] .= ' , ' .$params['join_table_alias'] . '.assigned_user_id ' .  $field . '_owner';
+                                    $ret_array['select'] .= ' , '.$params['join_table_alias'].'.assigned_user_id '.$field.'_owner';
                                 }
                                 else
                                 {
-                                    $ret_array['select'] .= ' , ' .$params['join_table_alias'] . '.created_by ' .  $field . '_owner';
+                                    $ret_array['select'] .= ' , '.$params['join_table_alias'].'.created_by '.$field.'_owner';
                                 }
-                                $ret_array['select'] .= "  , '".$rel_module  ."' " .  $field . '_mod';
+                                $ret_array['select'] .= "  , '".$rel_module."' ".$field.'_mod';
 
                             }
                         }
@@ -3547,65 +3547,65 @@ 
                     // To fix SOAP stuff where we are trying to retrieve all the accounts data where accounts.id = ..
                     // and this code changes accounts to jt4 as there is a self join with the accounts table.
                     //Martin fix #27494
-                    if(isset($data['db_concat_fields'])){
+                    if (isset($data['db_concat_fields'])) {
                     	$buildWhere = false;
-                        if(in_array('first_name', $data['db_concat_fields']) && in_array('last_name', $data['db_concat_fields']))
+                        if (in_array('first_name', $data['db_concat_fields']) && in_array('last_name', $data['db_concat_fields']))
                     	{
                      	   $exp = '/\(\s*?'.$data['name'].'.*?\%\'\s*?\)/';
-                    	   if(preg_match($exp, $where, $matches))
+                    	   if (preg_match($exp, $where, $matches))
                     	   {
                     	   	  $search_expression = $matches[0];
                     	   	  //Create three search conditions - first + last, first, last
-                    	   	  $first_name_search = str_replace($data['name'], $params['join_table_alias'] . '.first_name', $search_expression);
-                    	   	  $last_name_search = str_replace($data['name'], $params['join_table_alias'] . '.last_name', $search_expression);
+                    	   	  $first_name_search = str_replace($data['name'], $params['join_table_alias'].'.first_name', $search_expression);
+                    	   	  $last_name_search = str_replace($data['name'], $params['join_table_alias'].'.last_name', $search_expression);
 							  $full_name_search = str_replace($data['name'], $this->db->concat($params['join_table_alias'], $data['db_concat_fields']), $search_expression);
 							  $buildWhere = true;
-							  $where = str_replace($search_expression, '(' . $full_name_search . ' OR ' . $first_name_search . ' OR ' . $last_name_search . ')', $where);
+							  $where = str_replace($search_expression, '('.$full_name_search.' OR '.$first_name_search.' OR '.$last_name_search.')', $where);
                     	   }
                     	}
 
-                    	if(!$buildWhere)
+                    	if (!$buildWhere)
                     	{
 	                       $db_field = $this->db->concat($params['join_table_alias'], $data['db_concat_fields']);
 	                       $where = preg_replace('/'.$data['name'].'/', $db_field, $where);
 
 				// For relationship fields replace their alias by the corresponsding link table and r_name
-				if(isset($data['relationship_fields']))
-					foreach($data['relationship_fields'] as $r_name=>$alias_name)
+				if (isset($data['relationship_fields']))
+					foreach ($data['relationship_fields'] as $r_name=>$alias_name)
 					{
 						$db_field = $this->db->concat($params['join_table_link_alias'], $r_name);
-						$where = preg_replace('/' . $alias_name . '/', $db_field, $where);
+						$where = preg_replace('/'.$alias_name.'/', $db_field, $where);
 					}
                     	}
-                    }else{
-                        $where = preg_replace('/(^|[\s(])' . $data['name'] . '/', '${1}' . $params['join_table_alias'] . '.'.$data['rname'], $where);
+                    } else {
+                        $where = preg_replace('/(^|[\s(])'.$data['name'].'/', '${1}'.$params['join_table_alias'].'.'.$data['rname'], $where);
 
 			// For relationship fields replace their alias by the corresponsding link table and r_name
-			if(isset($data['relationship_fields']))
-				foreach($data['relationship_fields'] as $r_name=>$alias_name)
-					$where = preg_replace('/(^|[\s(])' . $alias_name . '/', '${1}' . $params['join_table_link_alias'] . '.'.$r_name, $where);
+			if (isset($data['relationship_fields']))
+				foreach ($data['relationship_fields'] as $r_name=>$alias_name)
+					$where = preg_replace('/(^|[\s(])'.$alias_name.'/', '${1}'.$params['join_table_link_alias'].'.'.$r_name, $where);
                     }
-                    if(!$table_joined)
+                    if (!$table_joined)
                     {
-                        $joined_tables[$params['join_table_alias']]=1;
-                        $joined_tables[$params['join_table_link_alias']]=1;
+                        $joined_tables[$params['join_table_alias']] = 1;
+                        $joined_tables[$params['join_table_link_alias']] = 1;
                     }
 
                     $jtcount++;
                 }
             }
         }
-        if(!empty($filter))
+        if (!empty($filter))
         {
-            if(isset($this->field_defs['assigned_user_id']) && empty($selectedFields[$this->table_name.'.assigned_user_id']))
+            if (isset($this->field_defs['assigned_user_id']) && empty($selectedFields[$this->table_name.'.assigned_user_id']))
             {
                 $ret_array['select'] .= ", $this->table_name.assigned_user_id ";
             }
-            else if(isset($this->field_defs['created_by']) &&  empty($selectedFields[$this->table_name.'.created_by']))
+            else if (isset($this->field_defs['created_by']) && empty($selectedFields[$this->table_name.'.created_by']))
             {
                 $ret_array['select'] .= ", $this->table_name.created_by ";
             }
-            if(isset($this->field_defs['system_id']) && empty($selectedFields[$this->table_name.'.system_id']))
+            if (isset($this->field_defs['system_id']) && empty($selectedFields[$this->table_name.'.system_id']))
             {
                 $ret_array['select'] .= ", $this->table_name.system_id ";
             }
@@ -3613,21 +3613,21 @@ 
         }
 
 	if ($ifListForExport) {
-		if(isset($this->field_defs['email1'])) {
-			$ret_array['select'].= " ,email_addresses.email_address email1";
-			$ret_array['from'].= " LEFT JOIN email_addr_bean_rel on {$this->table_name}.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='{$this->module_dir}' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1 LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id ";
+		if (isset($this->field_defs['email1'])) {
+			$ret_array['select'] .= " ,email_addresses.email_address email1";
+			$ret_array['from'] .= " LEFT JOIN email_addr_bean_rel on {$this->table_name}.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='{$this->module_dir}' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1 LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id ";
 		}
 	}
 
         $where_auto = '1=1';
-        if($show_deleted == 0)
+        if ($show_deleted == 0)
         {
             $where_auto = "$this->table_name.deleted=0";
-        }else if($show_deleted == 1)
+        } else if ($show_deleted == 1)
         {
             $where_auto = "$this->table_name.deleted=1";
         }
-        if($where != "")
+        if ($where != "")
             $ret_array['where'] = " where ($where) AND $where_auto";
         else
             $ret_array['where'] = " where $where_auto";
@@ -3635,21 +3635,21 @@ 
         //make call to process the order by clause
         $order_by = $this->process_order_by($order_by);
         if (!empty($order_by)) {
-            $ret_array['order_by'] = " ORDER BY " . $order_by;
+            $ret_array['order_by'] = " ORDER BY ".$order_by;
         }
-        if($singleSelect)
+        if ($singleSelect)
         {
             unset($ret_array['secondary_where']);
             unset($ret_array['secondary_from']);
             unset($ret_array['secondary_select']);
         }
 
-        if($return_array)
+        if ($return_array)
         {
             return $ret_array;
         }
 
-        return  $ret_array['select'] . $ret_array['from'] . $ret_array['where']. $ret_array['order_by'];
+        return  $ret_array['select'].$ret_array['from'].$ret_array['where'].$ret_array['order_by'];
     }
 
 	// Check if field is defined through a relationship_info field, add this field when not present 
@@ -3680,13 +3680,13 @@ 
         global $beanList, $beanFiles;
         $templates = array();
         $parent_child_map = array();
-        foreach($type_info as $children_info)
+        foreach ($type_info as $children_info)
         {
-            foreach($children_info as $child_info)
+            foreach ($children_info as $child_info)
             {
-                if($child_info['type'] == 'parent')
+                if ($child_info['type'] == 'parent')
                 {
-                    if(empty($templates[$child_info['parent_type']]))
+                    if (empty($templates[$child_info['parent_type']]))
                     {
                         //Test emails will have an invalid parent_type, don't try to load the non-existent parent bean
                         if ($child_info['parent_type'] == 'test') {
@@ -3694,7 +3694,7 @@ 
                         }
                         $class = $beanList[$child_info['parent_type']];
                         // Added to avoid error below; just silently fail and write message to log
-                        if ( empty($beanFiles[$class]) ) {
+                        if (empty($beanFiles[$class])) {
                             $GLOBALS['log']->error($this->object_name.'::retrieve_parent_fields() - cannot load class "'.$class.'", skip loading.');
                             continue;
                         }
@@ -3702,30 +3702,30 @@ 
                         $templates[$child_info['parent_type']] = new $class();
                     }
 
-                    if(empty($queries[$child_info['parent_type']]))
+                    if (empty($queries[$child_info['parent_type']]))
                     {
                         $queries[$child_info['parent_type']] = "SELECT id ";
                         $field_def = $templates[$child_info['parent_type']]->field_defs['name'];
-                        if(isset($field_def['db_concat_fields']))
+                        if (isset($field_def['db_concat_fields']))
                         {
-                            $queries[$child_info['parent_type']] .= ' , ' . $this->db->concat($templates[$child_info['parent_type']]->table_name, $field_def['db_concat_fields']) . ' parent_name';
+                            $queries[$child_info['parent_type']] .= ' , '.$this->db->concat($templates[$child_info['parent_type']]->table_name, $field_def['db_concat_fields']).' parent_name';
                         }
                         else
                         {
                             $queries[$child_info['parent_type']] .= ' , name parent_name';
                         }
-                        if(isset($templates[$child_info['parent_type']]->field_defs['assigned_user_id']))
+                        if (isset($templates[$child_info['parent_type']]->field_defs['assigned_user_id']))
                         {
-                            $queries[$child_info['parent_type']] .= ", assigned_user_id parent_name_owner , '{$child_info['parent_type']}' parent_name_mod";;
-                        }else if(isset($templates[$child_info['parent_type']]->field_defs['created_by']))
+                            $queries[$child_info['parent_type']] .= ", assigned_user_id parent_name_owner , '{$child_info['parent_type']}' parent_name_mod"; ;
+                        } else if (isset($templates[$child_info['parent_type']]->field_defs['created_by']))
                         {
                             $queries[$child_info['parent_type']] .= ", created_by parent_name_owner, '{$child_info['parent_type']}' parent_name_mod";
                         }
-                        $queries[$child_info['parent_type']] .= " FROM " . $templates[$child_info['parent_type']]->table_name ." WHERE id IN ('{$child_info['parent_id']}'";
+                        $queries[$child_info['parent_type']] .= " FROM ".$templates[$child_info['parent_type']]->table_name." WHERE id IN ('{$child_info['parent_id']}'";
                     }
                     else
                     {
-                        if(empty($parent_child_map[$child_info['parent_id']]))
+                        if (empty($parent_child_map[$child_info['parent_id']]))
                         $queries[$child_info['parent_type']] .= " ,'{$child_info['parent_id']}'";
                     }
                     $parent_child_map[$child_info['parent_id']][] = $child_info['child_id'];
@@ -3733,21 +3733,21 @@ 
             }
         }
         $results = array();
-        foreach($queries as $query)
+        foreach ($queries as $query)
         {
-            $result = $this->db->query($query . ')');
-            while($row = $this->db->fetchByAssoc($result))
+            $result = $this->db->query($query.')');
+            while ($row = $this->db->fetchByAssoc($result))
             {
                 $results[$row['id']] = $row;
             }
         }
 
         $child_results = array();
-        foreach($parent_child_map as $parent_key=>$parent_child)
+        foreach ($parent_child_map as $parent_key=>$parent_child)
         {
-            foreach($parent_child as $child)
+            foreach ($parent_child as $child)
             {
-                if(isset( $results[$parent_key]))
+                if (isset($results[$parent_key]))
                 {
                     $child_results[$child] = $results[$parent_key];
                 }
@@ -3767,7 +3767,7 @@ 
      * @param string $where Optional, additional filter criteria.
      * @return array Fetched data
      */
-    function process_list_query($query, $row_offset, $limit= -1, $max_per_page = -1, $where = '')
+    function process_list_query($query, $row_offset, $limit = -1, $max_per_page = -1, $where = '')
     {
         global $sugar_config;
         $db = DBManagerFactory::getInstance('listviews');
@@ -3776,33 +3776,33 @@ 
         */
         $toEnd = strval($row_offset) == 'end';
         $GLOBALS['log']->debug("process_list_query: ".$query);
-        if($max_per_page == -1)
+        if ($max_per_page == -1)
         {
-            $max_per_page 	= $sugar_config['list_max_entries_per_page'];
+            $max_per_page = $sugar_config['list_max_entries_per_page'];
         }
         // Check to see if we have a count query available.
-        if(empty($sugar_config['disable_count_query']) || $toEnd)
+        if (empty($sugar_config['disable_count_query']) || $toEnd)
         {
             $count_query = $this->create_list_count_query($query);
-            if(!empty($count_query) && (empty($limit) || $limit == -1))
+            if (!empty($count_query) && (empty($limit) || $limit == -1))
             {
                 // We have a count query.  Run it and get the results.
                 $result = $db->query($count_query, true, "Error running count query for $this->object_name List: ");
                 $assoc = $db->fetchByAssoc($result);
-                if(!empty($assoc['c']))
+                if (!empty($assoc['c']))
                 {
                     $rows_found = $assoc['c'];
                     $limit = $sugar_config['list_max_entries_per_page'];
                 }
-                if( $toEnd)
+                if ($toEnd)
                 {
-                    $row_offset = (floor(($rows_found -1) / $limit)) * $limit;
+                    $row_offset = (floor(($rows_found - 1) / $limit)) * $limit;
                 }
             }
         }
         else
         {
-            if((empty($limit) || $limit == -1))
+            if ((empty($limit) || $limit == -1))
             {
                 $limit = $max_per_page + 1;
                 $max_per_page = $limit;
@@ -3810,17 +3810,17 @@ 
 
         }
 
-        if(empty($row_offset))
+        if (empty($row_offset))
         {
             $row_offset = 0;
         }
-        if(!empty($limit) && $limit != -1 && $limit != -99)
+        if (!empty($limit) && $limit != -1 && $limit != -99)
         {
-            $result = $db->limitQuery($query, $row_offset, $limit,true,"Error retrieving $this->object_name list: ");
+            $result = $db->limitQuery($query, $row_offset, $limit, true, "Error retrieving $this->object_name list: ");
         }
         else
         {
-            $result = $db->query($query,true,"Error retrieving $this->object_name list: ");
+            $result = $db->query($query, true, "Error retrieving $this->object_name list: ");
         }
 
         $list = Array();
@@ -3843,21 +3843,21 @@ 
                 /** @var SugarBean $temp */
                 $temp = new $class();
 
-                foreach($this->field_defs as $field=>$value)
+                foreach ($this->field_defs as $field=>$value)
                 {
                     if (isset($row[$field]))
                     {
                         $temp->$field = $row[$field];
-                        $owner_field = $field . '_owner';
-                        if(isset($row[$owner_field]))
+                        $owner_field = $field.'_owner';
+                        if (isset($row[$owner_field]))
                         {
                             $temp->$owner_field = $row[$owner_field];
                         }
 
                         $GLOBALS['log']->debug("$temp->object_name({$row['id']}): ".$field." = ".$temp->$field);
-                    }else if (isset($row[$this->table_name .'.'.$field]))
+                    } else if (isset($row[$this->table_name.'.'.$field]))
                     {
-                        $temp->$field = $row[$this->table_name .'.'.$field];
+                        $temp->$field = $row[$this->table_name.'.'.$field];
                     }
                     else
                     {
@@ -3867,7 +3867,7 @@ 
 
                 $temp->check_date_relationships_load();
                 $temp->fill_in_additional_list_fields();
-                if($temp->hasCustomFields()) $temp->custom_fields->fill_relationships();
+                if ($temp->hasCustomFields()) $temp->custom_fields->fill_relationships();
                 $temp->call_custom_logic("process_record");
 
                 // fix defect #44206. implement the same logic as sugar_currency_format
@@ -3877,17 +3877,17 @@ 
 
                 $index++;
             }
-        if(!empty($sugar_config['disable_count_query']) && !empty($limit))
+        if (!empty($sugar_config['disable_count_query']) && !empty($limit))
         {
 
             $rows_found = $row_offset + count($list);
 
-            if(!$toEnd)
+            if (!$toEnd)
             {
                 $next_offset--;
                 $previous_offset++;
             }
-        } else if(!isset($rows_found)){
+        } else if (!isset($rows_found)) {
             $rows_found = $row_offset + count($list);
         }
 
@@ -3896,7 +3896,7 @@ 
         $response['row_count'] = $rows_found;
         $response['next_offset'] = $next_offset;
         $response['previous_offset'] = $previous_offset;
-        $response['current_offset'] = $row_offset ;
+        $response['current_offset'] = $row_offset;
         return $response;
     }
 
@@ -3908,18 +3908,18 @@ 
      * @param boolean $is_count_query Optional, Default false, set to true if passed query is a count query.
      * @return int count of rows found
     */
-    function _get_num_rows_in_query($query, $is_count_query=false)
+    function _get_num_rows_in_query($query, $is_count_query = false)
     {
         $num_rows_in_query = 0;
         if (!$is_count_query)
         {
             $count_query = SugarBean::create_list_count_query($query);
         } else
-            $count_query=$query;
+            $count_query = $query;
 
         $result = $this->db->query($count_query, true, "Error running count query for $this->object_name List: ");
         $row_num = 0;
-        while($row = $this->db->fetchByAssoc($result, true))
+        while ($row = $this->db->fetchByAssoc($result, true))
         {
             $num_rows_in_query += current($row);
         }
@@ -3944,7 +3944,7 @@ 
      * @return array Fetched data.
      */
     function process_union_list_query($parent_bean, $query,
-    $row_offset, $limit= -1, $max_per_page = -1, $where = '', $subpanel_def, $query_row_count='', $secondary_queries = array())
+    $row_offset, $limit = -1, $max_per_page = -1, $where = '', $subpanel_def, $query_row_count = '', $secondary_queries = array())
 
     {
         $db = DBManagerFactory::getInstance('listviews');
@@ -3953,52 +3953,52 @@ 
         */
         $toEnd = strval($row_offset) == 'end';
         global $sugar_config;
-        $use_count_query=false;
-        $processing_collection=$subpanel_def->isCollection();
+        $use_count_query = false;
+        $processing_collection = $subpanel_def->isCollection();
 
         $GLOBALS['log']->debug("process_union_list_query: ".$query);
-        if($max_per_page == -1)
+        if ($max_per_page == -1)
         {
-            $max_per_page 	= $sugar_config['list_max_entries_per_subpanel'];
+            $max_per_page = $sugar_config['list_max_entries_per_subpanel'];
         }
-        if(empty($query_row_count))
+        if (empty($query_row_count))
         {
             $query_row_count = $query;
         }
-        $distinct_position=strpos($query_row_count,"DISTINCT");
+        $distinct_position = strpos($query_row_count, "DISTINCT");
 
-        if ($distinct_position!= false)
+        if ($distinct_position != false)
         {
-            $use_count_query=true;
+            $use_count_query = true;
         }
         $performSecondQuery = true;
-        if(empty($sugar_config['disable_count_query']) || $toEnd)
+        if (empty($sugar_config['disable_count_query']) || $toEnd)
         {
-            $rows_found = $this->_get_num_rows_in_query($query_row_count,$use_count_query);
-            if($rows_found < 1)
+            $rows_found = $this->_get_num_rows_in_query($query_row_count, $use_count_query);
+            if ($rows_found < 1)
             {
                 $performSecondQuery = false;
             }
-            if(!empty($rows_found) && (empty($limit) || $limit == -1))
+            if (!empty($rows_found) && (empty($limit) || $limit == -1))
             {
                 $limit = $max_per_page;
             }
-            if( $toEnd)
+            if ($toEnd)
             {
-                $row_offset = (floor(($rows_found -1) / $limit)) * $limit;
+                $row_offset = (floor(($rows_found - 1) / $limit)) * $limit;
 
             }
         }
         else
         {
-            if((empty($limit) || $limit == -1))
+            if ((empty($limit) || $limit == -1))
             {
                 $limit = $max_per_page + 1;
                 $max_per_page = $limit;
             }
         }
 
-        if(empty($row_offset))
+        if (empty($row_offset))
         {
             $row_offset = 0;
         }
@@ -4006,15 +4006,15 @@ 
         $previous_offset = $row_offset - $max_per_page;
         $next_offset = $row_offset + $max_per_page;
 
-        if($performSecondQuery)
+        if ($performSecondQuery)
         {
-            if(!empty($limit) && $limit != -1 && $limit != -99)
+            if (!empty($limit) && $limit != -1 && $limit != -99)
             {
-                $result = $db->limitQuery($query, $row_offset, $limit,true,"Error retrieving $parent_bean->object_name list: ");
+                $result = $db->limitQuery($query, $row_offset, $limit, true, "Error retrieving $parent_bean->object_name list: ");
             }
             else
             {
-                $result = $db->query($query,true,"Error retrieving $this->object_name list: ");
+                $result = $db->query($query, true, "Error retrieving $this->object_name list: ");
             }
                 //use -99 to return all
 
@@ -4024,22 +4024,22 @@ 
 
                 $post_retrieve = array();
                 $isFirstTime = true;
-                while($row)
+                while ($row)
                 {
                     $function_fields = array();
-                    if(($index < $row_offset + $max_per_page || $max_per_page == -99))
+                    if (($index < $row_offset + $max_per_page || $max_per_page == -99))
                     {
                         if ($processing_collection)
                         {
-                            $current_bean =$subpanel_def->sub_subpanels[$row['panel_name']]->template_instance;
-                            if(!$isFirstTime)
+                            $current_bean = $subpanel_def->sub_subpanels[$row['panel_name']]->template_instance;
+                            if (!$isFirstTime)
                             {
                                 $class = get_class($subpanel_def->sub_subpanels[$row['panel_name']]->template_instance);
                                 $current_bean = new $class();
                             }
                         } else {
-                            $current_bean=$subpanel_def->template_instance;
-                            if(!$isFirstTime)
+                            $current_bean = $subpanel_def->template_instance;
+                            if (!$isFirstTime)
                             {
                                 $class = get_class($subpanel_def->template_instance);
                                 $current_bean = new $class();
@@ -4049,9 +4049,9 @@ 
                         //set the panel name in the bean instance.
                         if (isset($row['panel_name']))
                         {
-                            $current_bean->panel_name=$row['panel_name'];
+                            $current_bean->panel_name = $row['panel_name'];
                         }
-                        foreach($current_bean->field_defs as $field=>$value)
+                        foreach ($current_bean->field_defs as $field=>$value)
                         {
 
                             if (isset($row[$field]))
@@ -4059,60 +4059,60 @@ 
                                 $current_bean->$field = $this->convertField($row[$field], $value);
                                 unset($row[$field]);
                             }
-                            else if (isset($row[$this->table_name .'.'.$field]))
+                            else if (isset($row[$this->table_name.'.'.$field]))
                             {
-                                $current_bean->$field = $this->convertField($row[$this->table_name .'.'.$field], $value);
-                                unset($row[$this->table_name .'.'.$field]);
+                                $current_bean->$field = $this->convertField($row[$this->table_name.'.'.$field], $value);
+                                unset($row[$this->table_name.'.'.$field]);
                             }
                             else
                             {
                                 $current_bean->$field = "";
                                 unset($row[$field]);
                             }
-                            if(isset($value['source']) && $value['source'] == 'function')
+                            if (isset($value['source']) && $value['source'] == 'function')
                             {
-                                $function_fields[]=$field;
+                                $function_fields[] = $field;
                             }
                         }
-                        foreach($row as $key=>$value)
+                        foreach ($row as $key=>$value)
                         {
                             $current_bean->$key = $value;
                         }
-                        foreach($function_fields as $function_field)
+                        foreach ($function_fields as $function_field)
                         {
                             $value = $current_bean->field_defs[$function_field];
                             $can_execute = true;
                             $execute_params = array();
                             $execute_function = array();
-                            if(!empty($value['function_class']))
+                            if (!empty($value['function_class']))
                             {
-                                $execute_function[] = 	$value['function_class'];
-                                $execute_function[] = 	$value['function_name'];
+                                $execute_function[] = $value['function_class'];
+                                $execute_function[] = $value['function_name'];
                             }
                             else
                             {
-                                $execute_function	= $value['function_name'];
+                                $execute_function = $value['function_name'];
                             }
-                            foreach($value['function_params'] as $param )
+                            foreach ($value['function_params'] as $param)
                             {
-                                if (empty($value['function_params_source']) or $value['function_params_source']=='parent')
+                                if (empty($value['function_params_source']) or $value['function_params_source'] == 'parent')
                                 {
-                                    if(empty($this->$param))
+                                    if (empty($this->$param))
                                     {
                                         $can_execute = false;
-                                    } else if($param == '$this') {
+                                    } else if ($param == '$this') {
                                         $execute_params[] = $this;
                                     }
                                     else
                                     {
                                         $execute_params[] = $this->$param;
                                     }
-                                } else if ($value['function_params_source']=='this')
+                                } else if ($value['function_params_source'] == 'this')
                                 {
-                                    if(empty($current_bean->$param))
+                                    if (empty($current_bean->$param))
                                     {
                                         $can_execute = false;
-                                    } else if($param == '$this') {
+                                    } else if ($param == '$this') {
                                         $execute_params[] = $current_bean;
                                     }
                                     else
@@ -4126,18 +4126,18 @@ 
                                 }
 
                             }
-                            if($can_execute)
+                            if ($can_execute)
                             {
-                                if(!empty($value['function_require']))
+                                if (!empty($value['function_require']))
                                 {
                                     require_once($value['function_require']);
                                 }
                                 $current_bean->$function_field = call_user_func_array($execute_function, $execute_params);
                             }
                         }
-                        if(!empty($current_bean->parent_type) && !empty($current_bean->parent_id))
+                        if (!empty($current_bean->parent_type) && !empty($current_bean->parent_id))
                         {
-                            if(!isset($post_retrieve[$current_bean->parent_type]))
+                            if (!isset($post_retrieve[$current_bean->parent_type]))
                             {
                                 $post_retrieve[$current_bean->parent_type] = array();
                             }
@@ -4151,22 +4151,22 @@ 
                     $row = $db->fetchByAssoc($result);
                 }
             //now handle retrieving many-to-many relationships
-            if(!empty($list))
+            if (!empty($list))
             {
-                foreach($secondary_queries as $query2)
+                foreach ($secondary_queries as $query2)
                 {
                     $result2 = $db->query($query2);
 
                     $row2 = $db->fetchByAssoc($result2);
-                    while($row2)
+                    while ($row2)
                     {
                         $id_ref = $row2['ref_id'];
 
-                        if(isset($list[$id_ref]))
+                        if (isset($list[$id_ref]))
                         {
-                            foreach($row2 as $r2key=>$r2value)
+                            foreach ($row2 as $r2key=>$r2value)
                             {
-                                if($r2key != 'ref_id')
+                                if ($r2key != 'ref_id')
                                 {
                                     $list[$id_ref]->$r2key = $r2value;
                                 }
@@ -4178,7 +4178,7 @@ 
 
             }
 
-            if(isset($post_retrieve))
+            if (isset($post_retrieve))
             {
                 $parent_fields = $this->retrieve_parent_fields($post_retrieve);
             }
@@ -4186,16 +4186,16 @@ 
             {
                 $parent_fields = array();
             }
-            if(!empty($sugar_config['disable_count_query']) && !empty($limit))
+            if (!empty($sugar_config['disable_count_query']) && !empty($limit))
             {
             	//C.L. Bug 43535 - Use the $index value to set the $rows_found value here
                 $rows_found = isset($index) ? $index : $row_offset + count($list);
 
-                if(count($list) >= $limit)
+                if (count($list) >= $limit)
                 {
                     array_pop($list);
                 }
-                if(!$toEnd)
+                if (!$toEnd)
                 {
                     $next_offset--;
                     $previous_offset++;
@@ -4204,7 +4204,7 @@ 
         }
         else
         {
-            $row_found 	= 0;
+            $row_found = 0;
             $parent_fields = array();
         }
         $response = array();
@@ -4213,7 +4213,7 @@ 
         $response['row_count'] = $rows_found;
         $response['next_offset'] = $next_offset;
         $response['previous_offset'] = $previous_offset;
-        $response['current_offset'] = $row_offset ;
+        $response['current_offset'] = $row_offset;
         $response['query'] = $query;
 
         return $response;
@@ -4233,35 +4233,35 @@ 
      * @return array Fetched data.
      *
      */
-    function process_detail_query($query, $row_offset, $limit= -1, $max_per_page = -1, $where = '', $offset = 0)
+    function process_detail_query($query, $row_offset, $limit = -1, $max_per_page = -1, $where = '', $offset = 0)
     {
         global $sugar_config;
         $GLOBALS['log']->debug("process_detail_query: ".$query);
-        if($max_per_page == -1)
+        if ($max_per_page == -1)
         {
-            $max_per_page 	= $sugar_config['list_max_entries_per_page'];
+            $max_per_page = $sugar_config['list_max_entries_per_page'];
         }
 
         // Check to see if we have a count query available.
         $count_query = $this->create_list_count_query($query);
 
-        if(!empty($count_query) && (empty($limit) || $limit == -1))
+        if (!empty($count_query) && (empty($limit) || $limit == -1))
         {
             // We have a count query.  Run it and get the results.
             $result = $this->db->query($count_query, true, "Error running count query for $this->object_name List: ");
             $assoc = $this->db->fetchByAssoc($result);
-            if(!empty($assoc['c']))
+            if (!empty($assoc['c']))
             {
                 $total_rows = $assoc['c'];
             }
         }
 
-        if(empty($row_offset))
+        if (empty($row_offset))
         {
             $row_offset = 0;
         }
 
-        $result = $this->db->limitQuery($query, $offset, 1, true,"Error retrieving $this->object_name list: ");
+        $result = $this->db->limitQuery($query, $offset, 1, true, "Error retrieving $this->object_name list: ");
 
         $previous_offset = $row_offset - $max_per_page;
         $next_offset = $row_offset + $max_per_page;
@@ -4272,7 +4272,7 @@ 
         $response = Array();
         $response['bean'] = $this;
         if (empty($total_rows))
-            $total_rows=0;
+            $total_rows = 0;
         $response['row_count'] = $total_rows;
         $response['next_offset'] = $next_offset;
         $response['previous_offset'] = $previous_offset;
@@ -4289,12 +4289,12 @@ 
      * @return array Fetched data.
      *
      */
-    function process_full_list_query($query, $check_date=false)
+    function process_full_list_query($query, $check_date = false)
     {
 
         $GLOBALS['log']->debug("process_full_list_query: query is ".$query);
         $result = $this->db->query($query, false);
-        $GLOBALS['log']->debug("process_full_list_query: result is ".print_r($result,true));
+        $GLOBALS['log']->debug("process_full_list_query: result is ".print_r($result, true));
         $class = get_class($this);
         $isFirstTime = true;
         $bean = new $class();
@@ -4303,13 +4303,13 @@ 
         while (($row = $bean->db->fetchByAssoc($result)) != null)
         {
             $row = $this->convertRow($row);
-            if(!$isFirstTime)
+            if (!$isFirstTime)
             {
                 $bean = new $class();
             }
             $isFirstTime = false;
 
-            foreach($bean->field_defs as $field=>$value)
+            foreach ($bean->field_defs as $field=>$value)
             {
                 if (isset($row[$field]))
                 {
@@ -4321,7 +4321,7 @@ 
                     $bean->$field = '';
                 }
             }
-            if($check_date)
+            if ($check_date)
             {
                 $bean->processed_dates_times = array();
                 $bean->check_date_relationships_load();
@@ -4346,10 +4346,10 @@ 
     * @param string $current_module - String value of the module being processed.
     * @param string $current_view - String value of the current view
 	*/
-	function track_view($user_id, $current_module, $current_view='')
+	function track_view($user_id, $current_module, $current_view = '')
 	{
 	    $trackerManager = TrackerManager::getInstance();
-		if($monitor = $trackerManager->getMonitor('tracker')){
+		if ($monitor = $trackerManager->getMonitor('tracker')) {
 	        $monitor->setValue('date_modified', $GLOBALS['timedate']->nowDb());
 	        $monitor->setValue('user_id', $user_id);
 	        $monitor->setValue('module_name', $current_module);
@@ -4378,8 +4378,8 @@ 
     * account for instance.  This method is only used for populating extra fields
     * in lists.
     */
-    function fill_in_additional_list_fields(){
-        if(!empty($this->field_defs['parent_name']) && empty($this->parent_name)){
+    function fill_in_additional_list_fields() {
+        if (!empty($this->field_defs['parent_name']) && empty($this->parent_name)) {
             $this->fill_in_additional_parent_fields();
         }
     }
@@ -4393,17 +4393,17 @@ 
     */
     function fill_in_additional_detail_fields()
     {
-        if(!empty($this->field_defs['assigned_user_name']) && !empty($this->assigned_user_id)){
+        if (!empty($this->field_defs['assigned_user_name']) && !empty($this->assigned_user_id)) {
 
             $this->assigned_user_name = get_assigned_user_name($this->assigned_user_id);
 
         }
-		if(!empty($this->field_defs['created_by']) && !empty($this->created_by))
+		if (!empty($this->field_defs['created_by']) && !empty($this->created_by))
 		$this->created_by_name = get_assigned_user_name($this->created_by);
-		if(!empty($this->field_defs['modified_user_id']) && !empty($this->modified_user_id))
+		if (!empty($this->field_defs['modified_user_id']) && !empty($this->modified_user_id))
 		$this->modified_by_name = get_assigned_user_name($this->modified_user_id);
 
-		if(!empty($this->field_defs['parent_name'])){
+		if (!empty($this->field_defs['parent_name'])) {
 			$this->fill_in_additional_parent_fields();
 		}
     }
@@ -4414,17 +4414,17 @@ 
     */
     function fill_in_additional_parent_fields() {
 
-        if(!empty($this->parent_id) && !empty($this->last_parent_id) && $this->last_parent_id == $this->parent_id){
+        if (!empty($this->parent_id) && !empty($this->last_parent_id) && $this->last_parent_id == $this->parent_id) {
             return false;
-        }else{
+        } else {
             $this->parent_name = '';
         }
-        if(!empty($this->parent_type)) {
+        if (!empty($this->parent_type)) {
             $this->last_parent_id = $this->parent_id;
             $this->getRelatedFields($this->parent_type, $this->parent_id, array('name'=>'parent_name', 'document_name' => 'parent_document_name', 'first_name'=>'parent_first_name', 'last_name'=>'parent_last_name'));
-            if(!empty($this->parent_first_name) || !empty($this->parent_last_name) ){
+            if (!empty($this->parent_first_name) || !empty($this->parent_last_name)) {
                 $this->parent_name = $GLOBALS['locale']->getLocaleFormattedName($this->parent_first_name, $this->parent_last_name);
-            } else if(!empty($this->parent_document_name)){
+            } else if (!empty($this->parent_document_name)) {
                 $this->parent_name = $this->parent_document_name;
             }
         }
@@ -4434,7 +4434,7 @@ 
      * Fill in a link field
      */
 
-    function fill_in_link_field( $linkFieldName , $def)
+    function fill_in_link_field($linkFieldName, $def)
     {
         $idField = $linkFieldName;
         //If the id_name provided really was an ID, don't try to load it as a link. Use the normal link
@@ -4444,8 +4444,8 @@ 
         }
         if ($this->load_relationship($linkFieldName))
         {
-            $list=$this->$linkFieldName->get();
-            $this->$idField = '' ; // match up with null value in $this->populateFromRow()
+            $list = $this->$linkFieldName->get();
+            $this->$idField = ''; // match up with null value in $this->populateFromRow()
             if (!empty($list))
                 $this->$idField = $list[0];
         }
@@ -4454,22 +4454,22 @@ 
     /**
     * Fill in fields where type = relate
     */
-    function fill_in_relationship_fields(){
+    function fill_in_relationship_fields() {
         global $fill_in_rel_depth;
-        if(empty($fill_in_rel_depth) || $fill_in_rel_depth < 0)
+        if (empty($fill_in_rel_depth) || $fill_in_rel_depth < 0)
             $fill_in_rel_depth = 0;
 
-        if($fill_in_rel_depth > 1)
+        if ($fill_in_rel_depth > 1)
             return;
 
         $fill_in_rel_depth++;
 
-        foreach($this->field_defs as $field)
+        foreach ($this->field_defs as $field)
         {
-            if(0 == strcmp($field['type'],'relate') && !empty($field['module']))
+            if (0 == strcmp($field['type'], 'relate') && !empty($field['module']))
             {
                 $name = $field['name'];
-                if(empty($this->$name))
+                if (empty($this->$name))
                 {
                     // set the value of this relate field in this bean ($this->$field['name']) to the value of the 'name' field in the related module for the record identified by the value of $this->$field['id_name']
                     $related_module = $field['module'];
@@ -4479,11 +4479,11 @@ 
                     {
                        $this->fill_in_link_field($id_name, $field);
                     }
-                    if(!empty($this->$id_name) && ( $this->object_name != $related_module || ( $this->object_name == $related_module && $this->$id_name != $this->id ))){
-                        if(isset($GLOBALS['beanList'][ $related_module])){
+                    if (!empty($this->$id_name) && ($this->object_name != $related_module || ($this->object_name == $related_module && $this->$id_name != $this->id))) {
+                        if (isset($GLOBALS['beanList'][$related_module])) {
                             $class = $GLOBALS['beanList'][$related_module];
 
-                            if(!empty($this->$id_name) && file_exists($GLOBALS['beanFiles'][$class]) && isset($this->$name)){
+                            if (!empty($this->$id_name) && file_exists($GLOBALS['beanFiles'][$class]) && isset($this->$name)) {
                                 require_once($GLOBALS['beanFiles'][$class]);
                                 $mod = new $class();
 
@@ -4500,17 +4500,17 @@ 
                             }
                         }
                     }
-                    if(!empty($this->$id_name) && isset($this->$name))
+                    if (!empty($this->$id_name) && isset($this->$name))
                     {
-                        if(!isset($field['additionalFields']))
+                        if (!isset($field['additionalFields']))
                            $field['additionalFields'] = array();
-                        if(!empty($field['rname']))
+                        if (!empty($field['rname']))
                         {
-                            $field['additionalFields'][$field['rname']]= $name;
+                            $field['additionalFields'][$field['rname']] = $name;
                         }
                         else
                         {
-                            $field['additionalFields']['name']= $name;
+                            $field['additionalFields']['name'] = $name;
                         }
                         $this->getRelatedFields($related_module, $this->$id_name, $field['additionalFields']);
                     }
@@ -4540,7 +4540,7 @@ 
 		global $current_user;
 		$date_modified = $GLOBALS['timedate']->nowDb();
         $id = $this->db->quote($id);
-		if(isset($_SESSION['show_deleted']))
+		if (isset($_SESSION['show_deleted']))
 		{
 			$this->mark_undeleted($id);
 		}
@@ -4551,7 +4551,7 @@ 
 			$this->call_custom_logic("before_delete", $custom_logic_arguments);
             $this->deleted = 1;
             $this->mark_relationships_deleted($id);
-            if ( isset($this->field_defs['modified_user_id']) ) {
+            if (isset($this->field_defs['modified_user_id'])) {
                 if (!empty($current_user)) {
                     $this->modified_user_id = $current_user->id;
                 } else {
@@ -4561,7 +4561,7 @@ 
             } else {
                 $query = "UPDATE $this->table_name set deleted=1 , date_modified = '$date_modified' where id='$id'";
             }
-            $this->db->query($query, true,"Error marking record deleted: ");
+            $this->db->query($query, true, "Error marking record deleted: ");
 
             SugarRelationship::resaveRelatedBeans();
 
@@ -4589,8 +4589,8 @@ 
         $this->call_custom_logic("before_restore", $custom_logic_arguments);
 
 		$date_modified = $GLOBALS['timedate']->nowDb();
-		$query = "UPDATE $this->table_name set deleted=0 , date_modified = '$date_modified' where id='" . $this->db->quote($id) ."'";
-		$this->db->query($query, true,"Error marking record undeleted: ");
+		$query = "UPDATE $this->table_name set deleted=0 , date_modified = '$date_modified' where id='".$this->db->quote($id)."'";
+		$this->db->query($query, true, "Error marking record undeleted: ");
 
         $this->restoreFiles();
 
@@ -4643,19 +4643,19 @@ 
 
         $directory = $this->deleteFileDirectory();
 
-        $isCreated = sugar_is_dir('upload://deleted/' . $directory);
+        $isCreated = sugar_is_dir('upload://deleted/'.$directory);
         if (!$isCreated) {
-            sugar_mkdir('upload://deleted/' . $directory, 0777, true);
-            $isCreated = sugar_is_dir('upload://deleted/' . $directory);
+            sugar_mkdir('upload://deleted/'.$directory, 0777, true);
+            $isCreated = sugar_is_dir('upload://deleted/'.$directory);
         }
         if (!$isCreated) {
             return false;
         }
 
         foreach ($files as $file) {
-            if (file_exists('upload://' . $file)) {
-                if (!sugar_rename('upload://' . $file, 'upload://deleted/' . $directory . '/' . $file)) {
-                    $GLOBALS['log']->error('Could not move file ' . $file . ' to deleted directory');
+            if (file_exists('upload://'.$file)) {
+                if (!sugar_rename('upload://'.$file, 'upload://deleted/'.$directory.'/'.$file)) {
+                    $GLOBALS['log']->error('Could not move file '.$file.' to deleted directory');
                 }
             }
         }
@@ -4675,7 +4675,7 @@ 
         }
         if (empty($record['id'])) {
             $record['id'] = $db->quoted(create_guid());
-            $db->query('INSERT INTO cron_remove_documents (' . implode(', ', array_keys($record)) . ') VALUES(' . implode(', ', $record) . ')');
+            $db->query('INSERT INTO cron_remove_documents ('.implode(', ', array_keys($record)).') VALUES('.implode(', ', $record).')');
         } else {
             $db->query("UPDATE cron_remove_documents SET date_modified={$record['date_modified']} WHERE id={$record['id']}");
         }
@@ -4704,9 +4704,9 @@ 
         $directory = $this->deleteFileDirectory();
 
         foreach ($files as $file) {
-            if (sugar_is_file('upload://deleted/' . $directory . '/' . $file)) {
-                if (!sugar_rename('upload://deleted/' . $directory . '/' . $file, 'upload://' . $file)) {
-                    $GLOBALS['log']->error('Could not move file ' . $directory . '/' . $file . ' from deleted directory');
+            if (sugar_is_file('upload://deleted/'.$directory.'/'.$file)) {
+                if (!sugar_rename('upload://deleted/'.$directory.'/'.$file, 'upload://'.$file)) {
+                    $GLOBALS['log']->error('Could not move file '.$directory.'/'.$file.' from deleted directory');
                 }
             }
         }
@@ -4715,7 +4715,7 @@ 
          * @var DBManager $db
          */
         global $db;
-        $db->query('DELETE FROM cron_remove_documents WHERE bean_id=' . $db->quoted($this->id));
+        $db->query('DELETE FROM cron_remove_documents WHERE bean_id='.$db->quoted($this->id));
 
         return true;
     }
@@ -4803,9 +4803,9 @@ 
         $GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
         $db = DBManagerFactory::getInstance('listviews');
 
-        if(!empty($row_offset) && $row_offset != 0 && !empty($limit) && $limit != -1)
+        if (!empty($row_offset) && $row_offset != 0 && !empty($limit) && $limit != -1)
         {
-            $result = $db->limitQuery($query, $row_offset, $limit,true,"Error retrieving $template->object_name list: ");
+            $result = $db->limitQuery($query, $row_offset, $limit, true, "Error retrieving $template->object_name list: ");
         }
         else
         {
@@ -4815,16 +4815,16 @@ 
         $list = Array();
         $isFirstTime = true;
         $class = get_class($template);
-        while($row = $this->db->fetchByAssoc($result))
+        while ($row = $this->db->fetchByAssoc($result))
         {
-            if(!$isFirstTime)
+            if (!$isFirstTime)
             {
                 $template = new $class();
             }
             $isFirstTime = false;
             $record = $template->retrieve($row['id']);
 
-            if($record != null)
+            if ($record != null)
             {
                 // this copies the object into the array
                 $list[] = $template;
@@ -4842,12 +4842,12 @@ 
     * @param string $query - the query that should be executed to build the list
     * @param object $template - The object that should be used to copy the records.
     */
-  function build_related_list_where($query, &$template, $where='', $in='', $order_by, $limit='', $row_offset = 0)
+  function build_related_list_where($query, &$template, $where = '', $in = '', $order_by, $limit = '', $row_offset = 0)
   {
     $db = DBManagerFactory::getInstance('listviews');
     // No need to do an additional query
     $GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
-    if(empty($in) && !empty($query))
+    if (empty($in) && !empty($query))
     {
         $idList = $this->build_related_in($query);
         $in = $idList['in'];
@@ -4863,19 +4863,19 @@ 
     $query .= $custom_join['join'];
 
     $query .= " WHERE deleted=0 AND id IN $in";
-    if(!empty($where))
+    if (!empty($where))
     {
         $query .= " AND $where";
     }
 
 
-    if(!empty($order_by))
+    if (!empty($order_by))
     {
         $query .= "ORDER BY $order_by";
     }
     if (!empty($limit))
     {
-        $result = $db->limitQuery($query, $row_offset, $limit,true,"Error retrieving $this->object_name list: ");
+        $result = $db->limitQuery($query, $row_offset, $limit, true, "Error retrieving $this->object_name list: ");
     }
     else
     {
@@ -4887,16 +4887,16 @@ 
     $class = get_class($template);
 
     $disable_security_flag = ($template->disable_row_level_security) ? true : false;
-    while($row = $db->fetchByAssoc($result))
+    while ($row = $db->fetchByAssoc($result))
     {
-        if(!$isFirstTime)
+        if (!$isFirstTime)
         {
             $template = new $class();
             $template->disable_row_level_security = $disable_security_flag;
         }
         $isFirstTime = false;
         $record = $template->retrieve($row['id']);
-        if($record != null)
+        if ($record != null)
         {
             // this copies the object into the array
             $list[] = $template;
@@ -4917,22 +4917,22 @@ 
         $idList = array();
         $result = $this->db->query($query, true);
         $ids = '';
-        while($row = $this->db->fetchByAssoc($result))
+        while ($row = $this->db->fetchByAssoc($result))
         {
             $idList[] = $row['id'];
-            if(empty($ids))
+            if (empty($ids))
             {
-                $ids = "('" . $row['id'] . "'";
+                $ids = "('".$row['id']."'";
             }
             else
             {
-                $ids .= ",'" . $row['id'] . "'";
+                $ids .= ",'".$row['id']."'";
             }
         }
-        if(empty($ids))
+        if (empty($ids))
         {
             $ids = "('')";
-        }else{
+        } else {
             $ids .= ')';
         }
 
@@ -4958,16 +4958,16 @@ 
         $list = Array();
         $isFirstTime = true;
         $class = get_class($template);
-        while($row = $this->db->fetchByAssoc($result))
+        while ($row = $this->db->fetchByAssoc($result))
         {
             // Create a blank copy
             $copy = $template;
-            if(!$isFirstTime)
+            if (!$isFirstTime)
             {
                 $copy = new $class();
             }
             $isFirstTime = false;
-            foreach($field_list as $field)
+            foreach ($field_list as $field)
             {
                 // Copy the relevant fields
                 $copy->$field = $row[$field];
@@ -4999,14 +4999,14 @@ 
 
         $return_array = Array();
         global $app_list_strings, $mod_strings;
-        foreach($this->field_defs as $field=>$value){
+        foreach ($this->field_defs as $field=>$value) {
 
-            if(isset($this->$field)){
+            if (isset($this->$field)) {
 
                 // cn: bug 12270 - sensitive fields being passed arbitrarily in listViews
-                if(isset($sensitiveFields[$field]))
+                if (isset($sensitiveFields[$field]))
                     continue;
-                if(!isset($cache[$field]))
+                if (!isset($cache[$field]))
                     $cache[$field] = strtoupper($field);
 
                 //Fields hidden by Dependent Fields
@@ -5016,30 +5016,30 @@ 
                 }
                 //cn: if $field is a _dom, detect and return VALUE not KEY
                 //cl: empty function check for meta-data enum types that have values loaded from a function
-                else if (((!empty($value['type']) && ($value['type'] == 'enum' || $value['type'] == 'radioenum') ))  && empty($value['function'])){
-                    if(!empty($value['options']) && !empty($app_list_strings[$value['options']][$this->$field])){
+                else if (((!empty($value['type']) && ($value['type'] == 'enum' || $value['type'] == 'radioenum'))) && empty($value['function'])) {
+                    if (!empty($value['options']) && !empty($app_list_strings[$value['options']][$this->$field])) {
                         $return_array[$cache[$field]] = $app_list_strings[$value['options']][$this->$field];
                     }
                     //nsingh- bug 21672. some modules such as manufacturers, Releases do not have a listing for select fields in the $app_list_strings. Must also check $mod_strings to localize.
-                    elseif(!empty($value['options']) && !empty($mod_strings[$value['options']][$this->$field]))
+                    elseif (!empty($value['options']) && !empty($mod_strings[$value['options']][$this->$field]))
                     {
                         $return_array[$cache[$field]] = $mod_strings[$value['options']][$this->$field];
                     }
-                    else{
+                    else {
                         $return_array[$cache[$field]] = $this->$field;
                     }
                     //end bug 21672
 // tjy: no need to do this str_replace as the changes in 29994 for ListViewGeneric.tpl for translation handle this now
 //				}elseif(!empty($value['type']) && $value['type'] == 'multienum'&& empty($value['function'])){
 //					$return_array[strtoupper($field)] = str_replace('^,^', ', ', $this->$field );
-                }elseif(!empty($value['custom_module']) && $value['type'] != 'currency'){
+                }elseif (!empty($value['custom_module']) && $value['type'] != 'currency') {
 //					$this->format_field($value);
                     $return_array[$cache[$field]] = $this->$field;
-                }else{
+                } else {
                     $return_array[$cache[$field]] = $this->$field;
                 }
                 // handle "Assigned User Name"
-                if($field == 'assigned_user_name'){
+                if ($field == 'assigned_user_name') {
                     $return_array['ASSIGNED_USER_NAME'] = get_assigned_user_name($this->assigned_user_id);
                 }
             }
@@ -5061,7 +5061,7 @@ 
      * @param boolean $deleted Optional, default true, if set to false deleted filter will not be added.
      * @return string The WHERE clause
      */
-    function get_where($fields_array, $deleted=true)
+    function get_where($fields_array, $deleted = true)
     {
         $where_clause = "";
         foreach ($fields_array as $name=>$value)
@@ -5071,10 +5071,10 @@ 
             }
             $name = $this->db->getValidDBName($name);
 
-            $where_clause .= "$name = ".$this->db->quoted($value,false);
+            $where_clause .= "$name = ".$this->db->quoted($value, false);
         }
-        if(!empty($where_clause)) {
-            if($deleted) {
+        if (!empty($where_clause)) {
+            if ($deleted) {
                 return "WHERE $where_clause AND deleted=0";
             } else {
                 return "WHERE $where_clause";
@@ -5094,24 +5094,24 @@ 
      * @param boolean $deleted Optional, default true, if set to false deleted filter will not be added.
      * @return object Instance of this bean with fetched data.
      */
-    function retrieve_by_string_fields($fields_array, $encode=true, $deleted=true)
+    function retrieve_by_string_fields($fields_array, $encode = true, $deleted = true)
     {
         $where_clause = $this->get_where($fields_array, $deleted);
         $custom_join = $this->getCustomJoin();
-        $query = "SELECT $this->table_name.*". $custom_join['select']. " FROM $this->table_name " . $custom_join['join'];
+        $query = "SELECT $this->table_name.*".$custom_join['select']." FROM $this->table_name ".$custom_join['join'];
         $query .= " $where_clause";
         $GLOBALS['log']->debug("Retrieve $this->object_name: ".$query);
         //requireSingleResult has been deprecated.
         //$result = $this->db->requireSingleResult($query, true, "Retrieving record $where_clause:");
-        $result = $this->db->limitQuery($query,0,1,true, "Retrieving record $where_clause:");
+        $result = $this->db->limitQuery($query, 0, 1, true, "Retrieving record $where_clause:");
 
 
-        if( empty($result))
+        if (empty($result))
         {
             return null;
         }
         $row = $this->db->fetchByAssoc($result, $encode);
-        if(empty($row))
+        if (empty($row))
         {
             return null;
         }
@@ -5138,7 +5138,7 @@ 
     {
         foreach ($this->special_functions as $func_name)
         {
-            if ( method_exists($this,$func_name) )
+            if (method_exists($this, $func_name))
             {
                 $this->$func_name();
             }
@@ -5153,52 +5153,52 @@ 
     {
     }
 
-    function getRelatedFields($module, $id, $fields, $return_array = false){
-        if(empty($GLOBALS['beanList'][$module]))return '';
+    function getRelatedFields($module, $id, $fields, $return_array = false) {
+        if (empty($GLOBALS['beanList'][$module]))return '';
         $object = BeanFactory::getObjectName($module);
 
         VardefManager::loadVardef($module, $object);
-        if(empty($GLOBALS['dictionary'][$object]['table']))return '';
+        if (empty($GLOBALS['dictionary'][$object]['table']))return '';
         $table = $GLOBALS['dictionary'][$object]['table'];
-        $query  = 'SELECT id';
-        foreach($fields as $field=>$alias){
-            if(!empty($GLOBALS['dictionary'][$object]['fields'][$field]['db_concat_fields'])){
-                $query .= ' ,' .$this->db->concat($table, $GLOBALS['dictionary'][$object]['fields'][$field]['db_concat_fields']) .  ' as ' . $alias ;
-            }else if(!empty($GLOBALS['dictionary'][$object]['fields'][$field]) &&
+        $query = 'SELECT id';
+        foreach ($fields as $field=>$alias) {
+            if (!empty($GLOBALS['dictionary'][$object]['fields'][$field]['db_concat_fields'])) {
+                $query .= ' ,'.$this->db->concat($table, $GLOBALS['dictionary'][$object]['fields'][$field]['db_concat_fields']).' as '.$alias;
+            } else if (!empty($GLOBALS['dictionary'][$object]['fields'][$field]) &&
                 (empty($GLOBALS['dictionary'][$object]['fields'][$field]['source']) ||
                 $GLOBALS['dictionary'][$object]['fields'][$field]['source'] != "non-db"))
             {
-                $query .= ' ,' .$table . '.' . $field . ' as ' . $alias;
+                $query .= ' ,'.$table.'.'.$field.' as '.$alias;
             }
-            if(!$return_array)$this->$alias = '';
+            if (!$return_array)$this->$alias = '';
         }
-        if($query == 'SELECT id' || empty($id)){
+        if ($query == 'SELECT id' || empty($id)) {
             return '';
         }
 
 
-        if(isset($GLOBALS['dictionary'][$object]['fields']['assigned_user_id']))
+        if (isset($GLOBALS['dictionary'][$object]['fields']['assigned_user_id']))
         {
-            $query .= " , ".	$table  . ".assigned_user_id owner";
+            $query .= " , ".$table.".assigned_user_id owner";
 
         }
-        else if(isset($GLOBALS['dictionary'][$object]['fields']['created_by']))
+        else if (isset($GLOBALS['dictionary'][$object]['fields']['created_by']))
         {
-            $query .= " , ".	$table . ".created_by owner";
+            $query .= " , ".$table.".created_by owner";
 
         }
-        $query .=  ' FROM ' . $table . ' WHERE deleted=0 AND id=';
-        $result = $GLOBALS['db']->query($query . "'$id'" );
+        $query .= ' FROM '.$table.' WHERE deleted=0 AND id=';
+        $result = $GLOBALS['db']->query($query."'$id'");
         $row = $GLOBALS['db']->fetchByAssoc($result);
-        if($return_array){
+        if ($return_array) {
             return $row;
         }
-        $owner = (empty($row['owner']))?'':$row['owner'];
-        foreach($fields as $alias){
-            $this->$alias = (!empty($row[$alias]))? $row[$alias]: '';
-            $alias = $alias  .'_owner';
+        $owner = (empty($row['owner'])) ? '' : $row['owner'];
+        foreach ($fields as $alias) {
+            $this->$alias = (!empty($row[$alias])) ? $row[$alias] : '';
+            $alias = $alias.'_owner';
             $this->$alias = $owner;
-            $a_mod = $alias  .'_mod';
+            $a_mod = $alias.'_mod';
             $this->$a_mod = $module;
         }
 
@@ -5214,39 +5214,39 @@ 
     function assign_display_fields($currentModule)
     {
         global $timedate;
-        foreach($this->column_fields as $field)
+        foreach ($this->column_fields as $field)
         {
-            if(isset($this->field_name_map[$field]) && empty($this->$field))
+            if (isset($this->field_name_map[$field]) && empty($this->$field))
             {
-                if($this->field_name_map[$field]['type'] != 'date' && $this->field_name_map[$field]['type'] != 'enum')
+                if ($this->field_name_map[$field]['type'] != 'date' && $this->field_name_map[$field]['type'] != 'enum')
                 $this->$field = $field;
-                if($this->field_name_map[$field]['type'] == 'date')
+                if ($this->field_name_map[$field]['type'] == 'date')
                 {
                     $this->$field = $timedate->to_display_date('1980-07-09');
                 }
-                if($this->field_name_map[$field]['type'] == 'enum')
+                if ($this->field_name_map[$field]['type'] == 'enum')
                 {
                     $dom = $this->field_name_map[$field]['options'];
                     global $current_language, $app_list_strings;
                     $mod_strings = return_module_language($current_language, $currentModule);
 
-                    if(isset($mod_strings[$dom]))
+                    if (isset($mod_strings[$dom]))
                     {
                         $options = $mod_strings[$dom];
-                        foreach($options as $key=>$value)
+                        foreach ($options as $key=>$value)
                         {
-                            if(!empty($key) && empty($this->$field ))
+                            if (!empty($key) && empty($this->$field))
                             {
                                 $this->$field = $key;
                             }
                         }
                     }
-                    if(isset($app_list_strings[$dom]))
+                    if (isset($app_list_strings[$dom]))
                     {
                         $options = $app_list_strings[$dom];
-                        foreach($options as $key=>$value)
+                        foreach ($options as $key=>$value)
                         {
-                            if(!empty($key) && empty($this->$field ))
+                            if (!empty($key) && empty($this->$field))
                             {
                                 $this->$field = $key;
                             }
@@ -5263,61 +5263,61 @@ 
     * 	RELATIONSHIP HANDLING
     */
 
-    function set_relationship($table, $relate_values, $check_duplicates = true,$do_update=false,$data_values=null)
+    function set_relationship($table, $relate_values, $check_duplicates = true, $do_update = false, $data_values = null)
     {
         $where = '';
 
 		// make sure there is a date modified
 		$date_modified = $this->db->convert("'".$GLOBALS['timedate']->nowDb()."'", 'datetime');
 
-        $row=null;
-        if($check_duplicates)
+        $row = null;
+        if ($check_duplicates)
         {
             $query = "SELECT * FROM $table ";
             $where = "WHERE deleted = '0'  ";
-            foreach($relate_values as $name=>$value)
+            foreach ($relate_values as $name=>$value)
             {
                 $where .= " AND $name = '$value' ";
             }
             $query .= $where;
-            $result = $this->db->query($query, false, "Looking For Duplicate Relationship:" . $query);
-            $row=$this->db->fetchByAssoc($result);
+            $result = $this->db->query($query, false, "Looking For Duplicate Relationship:".$query);
+            $row = $this->db->fetchByAssoc($result);
         }
 
-        if(!$check_duplicates || empty($row) )
+        if (!$check_duplicates || empty($row))
         {
             unset($relate_values['id']);
-            if ( isset($data_values))
+            if (isset($data_values))
             {
-                $relate_values = array_merge($relate_values,$data_values);
+                $relate_values = array_merge($relate_values, $data_values);
             }
-            $query = "INSERT INTO $table (id, ". implode(',', array_keys($relate_values)) . ", date_modified) VALUES ('" . create_guid() . "', " . "'" . implode("', '", $relate_values) . "', ".$date_modified.")" ;
+            $query = "INSERT INTO $table (id, ".implode(',', array_keys($relate_values)).", date_modified) VALUES ('".create_guid()."', "."'".implode("', '", $relate_values)."', ".$date_modified.")";
 
-            $this->db->query($query, false, "Creating Relationship:" . $query);
+            $this->db->query($query, false, "Creating Relationship:".$query);
         }
         else if ($do_update)
         {
             $conds = array();
-            foreach($data_values as $key=>$value)
+            foreach ($data_values as $key=>$value)
             {
-                array_push($conds,$key."='".$this->db->quote($value)."'");
+                array_push($conds, $key."='".$this->db->quote($value)."'");
             }
-            $query = "UPDATE $table SET ". implode(',', $conds).",date_modified=".$date_modified." ".$where;
-            $this->db->query($query, false, "Updating Relationship:" . $query);
+            $query = "UPDATE $table SET ".implode(',', $conds).",date_modified=".$date_modified." ".$where;
+            $this->db->query($query, false, "Updating Relationship:".$query);
         }
     }
 
     function retrieve_relationships($table, $values, $select_id)
     {
         $query = "SELECT $select_id FROM $table WHERE deleted = 0  ";
-        foreach($values as $name=>$value)
+        foreach ($values as $name=>$value)
         {
             $query .= " AND $name = '$value' ";
         }
         $query .= " ORDER BY $select_id ";
-        $result = $this->db->query($query, false, "Retrieving Relationship:" . $query);
+        $result = $this->db->query($query, false, "Retrieving Relationship:".$query);
         $ids = array();
-        while($row = $this->db->fetchByAssoc($result))
+        while ($row = $this->db->fetchByAssoc($result))
         {
             $ids[] = $row;
         }
@@ -5328,16 +5328,16 @@ 
     function loadLayoutDefs()
     {
         global $layout_defs;
-        if(empty( $this->layout_def) && file_exists('modules/'. $this->module_dir . '/layout_defs.php'))
+        if (empty($this->layout_def) && file_exists('modules/'.$this->module_dir.'/layout_defs.php'))
         {
-            include_once('modules/'. $this->module_dir . '/layout_defs.php');
-            if(file_exists('custom/modules/'. $this->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php'))
+            include_once('modules/'.$this->module_dir.'/layout_defs.php');
+            if (file_exists('custom/modules/'.$this->module_dir.'/Ext/Layoutdefs/layoutdefs.ext.php'))
             {
-                include_once('custom/modules/'. $this->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php');
+                include_once('custom/modules/'.$this->module_dir.'/Ext/Layoutdefs/layoutdefs.ext.php');
             }
-            if ( empty( $layout_defs[get_class($this)]))
+            if (empty($layout_defs[get_class($this)]))
             {
-                echo "\$layout_defs[" . get_class($this) . "]; does not exist";
+                echo "\$layout_defs[".get_class($this)."]; does not exist";
             }
 
             $this->layout_def = $layout_defs[get_class($this)];
@@ -5371,12 +5371,12 @@ 
     */
     function call_custom_logic($event, $arguments = null)
     {
-        if(!isset($this->processed) || $this->processed == false){
+        if (!isset($this->processed) || $this->processed == false) {
             //add some logic to ensure we do not get into an infinite loop
-            if(!empty($this->logicHookDepth[$event])) {
-                if($this->logicHookDepth[$event] > $this->max_logic_depth)
+            if (!empty($this->logicHookDepth[$event])) {
+                if ($this->logicHookDepth[$event] > $this->max_logic_depth)
                     return;
-            }else
+            } else
                 $this->logicHookDepth[$event] = 0;
 
             //we have to put the increment operator here
@@ -5421,7 +5421,7 @@ 
             $GLOBALS['log']->fatal("SUGARBEAN: cannot find Real Key for custom field of type dropdown - cannot return Value.");
             return false;
         }
-        if(isset($realKey))
+        if (isset($realKey))
         {
             return $this->custom_fields->avail_fields[$name][$realKey];
         }
@@ -5440,17 +5440,17 @@ 
 	/**
     function ACLAccess($view,$is_owner='not_set')
 	*/
-    function ACLAccess($view,$is_owner='not_set',$in_group='not_set')
+    function ACLAccess($view, $is_owner = 'not_set', $in_group = 'not_set')
     {
         global $current_user;
-        if($current_user->isAdmin()) {
+        if ($current_user->isAdmin()) {
             return true;
         }
         $not_set = false;
 		/**
         if($is_owner == 'not_set')
 		*/
-    	if($is_owner === 'not_set') //eggsurplus: should be ===
+    	if ($is_owner === 'not_set') //eggsurplus: should be ===
         {
             $not_set = true;
             $is_owner = $this->isOwner($current_user->id);
@@ -5461,7 +5461,7 @@ 
 		$view = strtolower($view);
 		$action = '';
 		// DJM - OBS Customizations - END CHANGE
-    	if($in_group === 'not_set')
+    	if ($in_group === 'not_set')
     	{
 			require_once("modules/SecurityGroups/SecurityGroup.php");
 			// DJM - OBS Customizations - May 2009
@@ -5487,7 +5487,7 @@ 
  		   			$action = "view";
 					break;
  		   		case 'delete':
- 		   			$action = "delete" ;
+ 		   			$action = "delete";
 					break;
  		   		case 'export':
  		   			$action = "export";
@@ -5499,11 +5499,11 @@ 
 					$action = "";
 					break;
     			}
-			$in_group = SecurityGroup::groupHasAccess($this->module_dir,$this->id, $action); 
+			$in_group = SecurityGroup::groupHasAccess($this->module_dir, $this->id, $action); 
 			// DJM - OBS Customizations - END CHANGE
     	}
         //if we don't implent acls return true
-        if(!$this->bean_implements('ACL'))
+        if (!$this->bean_implements('ACL'))
         return true;
         $view = strtolower($view);
         switch ($view)
@@ -5514,15 +5514,15 @@ 
 				/**
                 return ACLController::checkAccess($this->module_dir,'list', true);
 				*/
-    			return ACLController::checkAccess($this->module_dir,'list', true, $this->acltype, $in_group);
+    			return ACLController::checkAccess($this->module_dir, 'list', true, $this->acltype, $in_group);
             case 'edit':
             case 'save':
-                if( !$is_owner && $not_set && !empty($this->id)){
+                if (!$is_owner && $not_set && !empty($this->id)) {
                     $class = get_class($this);
                     $temp = new $class();
-                    if(!empty($this->fetched_row) && !empty($this->fetched_row['id']) && !empty($this->fetched_row['assigned_user_id']) && !empty($this->fetched_row['created_by'])){
+                    if (!empty($this->fetched_row) && !empty($this->fetched_row['id']) && !empty($this->fetched_row['assigned_user_id']) && !empty($this->fetched_row['created_by'])) {
                         $temp->populateFromRow($this->fetched_row);
-                    }else{
+                    } else {
                         $temp->retrieve($this->id);
                     }
                     $is_owner = $temp->isOwner($current_user->id);
@@ -5532,29 +5532,29 @@ 
 				/**
                 return ACLController::checkAccess($this->module_dir,'edit', $is_owner, $this->acltype);
 				*/
-    			return ACLController::checkAccess($this->module_dir,'edit', $is_owner, $this->acltype, $in_group);
+    			return ACLController::checkAccess($this->module_dir, 'edit', $is_owner, $this->acltype, $in_group);
             case 'view':
             case 'detail':
             case 'detailview':
 				/**
                 return ACLController::checkAccess($this->module_dir,'view', $is_owner, $this->acltype);
 				*/
-    			return ACLController::checkAccess($this->module_dir,'view', $is_owner, $this->acltype, $in_group);
+    			return ACLController::checkAccess($this->module_dir, 'view', $is_owner, $this->acltype, $in_group);
             case 'delete':
 				/**
                 return ACLController::checkAccess($this->module_dir,'delete', $is_owner, $this->acltype);
 				*/
-    			return ACLController::checkAccess($this->module_dir,'delete', $is_owner, $this->acltype, $in_group);
+    			return ACLController::checkAccess($this->module_dir, 'delete', $is_owner, $this->acltype, $in_group);
             case 'export':
 				/**
                 return ACLController::checkAccess($this->module_dir,'export', $is_owner, $this->acltype);
 				*/
-    			return ACLController::checkAccess($this->module_dir,'export', $is_owner, $this->acltype, $in_group);
+    			return ACLController::checkAccess($this->module_dir, 'export', $is_owner, $this->acltype, $in_group);
             case 'import':
 				/**
                 return ACLController::checkAccess($this->module_dir,'import', true, $this->acltype);
 				*/
-    			return ACLController::checkAccess($this->module_dir,'import', true, $this->acltype, $in_group);
+    			return ACLController::checkAccess($this->module_dir, 'import', true, $this->acltype, $in_group);
         }
         //if it is not one of the above views then it should be implemented on the page level
         return true;
@@ -5570,12 +5570,12 @@ 
     {
         if (isset($this->field_defs['assigned_user_id']))
         {
-            return $returnFieldName? 'assigned_user_id': $this->assigned_user_id;
+            return $returnFieldName ? 'assigned_user_id' : $this->assigned_user_id;
         }
 
         if (isset($this->field_defs['created_by']))
         {
-            return $returnFieldName? 'created_by': $this->created_by;
+            return $returnFieldName ? 'created_by' : $this->created_by;
         }
 
         return '';
@@ -5590,7 +5590,7 @@ 
     function isOwner($user_id)
     {
         //if we don't have an id we must be the owner as we are creating it
-        if(!isset($this->id))
+        if (!isset($this->id))
         {
             return true;
         }
@@ -5601,13 +5601,13 @@ 
             }
             return false;
         } elseif (isset($this->assigned_user_id)) {
-            if($this->assigned_user_id == $user_id) return true;
+            if ($this->assigned_user_id == $user_id) return true;
             return false;
         }
         else
         {
             //other wise if there is a created_by that is the owner
-            if(isset($this->created_by) && $this->created_by == $user_id)
+            if (isset($this->created_by) && $this->created_by == $user_id)
             {
                 return true;
             }
@@ -5622,11 +5622,11 @@ 
     */
     function getOwnerWhere($user_id)
     {
-        if(isset($this->field_defs['assigned_user_id']))
+        if (isset($this->field_defs['assigned_user_id']))
         {
             return " $this->table_name.assigned_user_id ='$user_id' ";
         }
-        if(isset($this->field_defs['created_by']))
+        if (isset($this->field_defs['created_by']))
         {
             return " $this->table_name.created_by ='$user_id' ";
         }
@@ -5643,7 +5643,7 @@ 
     function listviewACLHelper()
     {
         $array_assign = array();
-        if($this->ACLAccess('DetailView'))
+        if ($this->ACLAccess('DetailView'))
         {
             $array_assign['MAIN'] = 'a';
         }
@@ -5659,27 +5659,27 @@ 
     *
     * @return array of fields with id, name, access and category
     */
-    function toArray($dbOnly = false, $stringOnly = false, $upperKeys=false)
+    function toArray($dbOnly = false, $stringOnly = false, $upperKeys = false)
     {
         static $cache = array();
         $arr = array();
 
-        foreach($this->field_defs as $field=>$data)
+        foreach ($this->field_defs as $field=>$data)
         {
-            if( !$dbOnly || !isset($data['source']) || $data['source'] == 'db')
-            if(!$stringOnly || is_string($this->$field))
-            if($upperKeys)
+            if (!$dbOnly || !isset($data['source']) || $data['source'] == 'db')
+            if (!$stringOnly || is_string($this->$field))
+            if ($upperKeys)
             {
-                                if(!isset($cache[$field])){
+                                if (!isset($cache[$field])) {
                                     $cache[$field] = strtoupper($field);
                                 }
                 $arr[$cache[$field]] = $this->$field;
             }
             else
             {
-                if(isset($this->$field)){
+                if (isset($this->$field)) {
                     $arr[$field] = $this->$field;
-                }else{
+                } else {
                     $arr[$field] = '';
                 }
             }
@@ -5694,7 +5694,7 @@ 
     */
     function fromArray($arr)
     {
-        foreach($arr as $name=>$value)
+        foreach ($arr as $name=>$value)
         {
             $this->$name = $value;
         }
@@ -5708,7 +5708,7 @@ 
      */
     public function convertRow($row)
     {
-        foreach($this->field_defs as $name => $fieldDef)
+        foreach ($this->field_defs as $name => $fieldDef)
 		{
 		    // skip empty fields and non-db fields
             if (isset($name) && !empty($row[$name])) {
@@ -5754,7 +5754,7 @@ 
 
         $this->fill_in_additional_list_fields();
 
-        if($this->hasCustomFields())$this->custom_fields->fill_relationships();
+        if ($this->hasCustomFields())$this->custom_fields->fill_relationships();
         $this->call_custom_logic("process_record");
     }
 
@@ -5773,7 +5773,7 @@ 
     *
     * Internal function do not override.
     */
-   function create_qualified_order_by( $order_by, $qualify)
+   function create_qualified_order_by($order_by, $qualify)
    {	// if the column is empty, but the sort order is defined, the value will throw an error, so do not proceed if no order by is given
     if (empty($order_by))
     {
@@ -5782,10 +5782,10 @@ 
     $order_by_clause = " ORDER BY ";
     $tmp = explode(",", $order_by);
     $comma = ' ';
-    foreach ( $tmp as $stmp)
+    foreach ($tmp as $stmp)
     {
-        $stmp = (substr_count($stmp, ".") > 0?trim($stmp):"$qualify." . trim($stmp));
-        $order_by_clause .= $comma . $stmp;
+        $stmp = (substr_count($stmp, ".") > 0 ? trim($stmp) : "$qualify.".trim($stmp));
+        $order_by_clause .= $comma.$stmp;
         $comma = ", ";
     }
     return $order_by_clause;
@@ -5805,16 +5805,16 @@ 
             $street_field_2 = $street_field.'_2';
             $street_field_3 = $street_field.'_3';
             $street_field_4 = $street_field.'_4';
-            if ( isset($this->$street_field_2)) {
-                $this->$street_field .= "\n". $this->$street_field_2;
+            if (isset($this->$street_field_2)) {
+                $this->$street_field .= "\n".$this->$street_field_2;
                 unset($this->$street_field_2);
             }
-            if ( isset($this->$street_field_3)) {
-                $this->$street_field .= "\n". $this->$street_field_3;
+            if (isset($this->$street_field_3)) {
+                $this->$street_field .= "\n".$this->$street_field_3;
                 unset($this->$street_field_3);
             }
-            if ( isset($this->$street_field_4)) {
-                $this->$street_field .= "\n". $this->$street_field_4;
+            if (isset($this->$street_field_4)) {
+                $this->$street_field .= "\n".$this->$street_field_4;
                 unset($this->$street_field_4);
             }
             $this->$street_field = trim($this->$street_field, "\n");
@@ -5823,7 +5823,7 @@ 
 
     protected function getEncryptKey()
     {
-        if(empty(self::$field_key)) {
+        if (empty(self::$field_key)) {
             self::$field_key = blowfishGetKey('encrypt_field');
         }
         return self::$field_key;
@@ -5847,7 +5847,7 @@ 
  */
     function decrypt_after_retrieve($value)
     {
-        if(empty($value)) return $value; // no need to decrypt empty
+        if (empty($value)) return $value; // no need to decrypt empty
         require_once("include/utils/encryption_utils.php");
         return blowfishDecode($this->getEncryptKey(), $value);
     }
@@ -5856,19 +5856,19 @@ 
     * Moved from save() method, functionality is the same, but this is intended to handle
     * Optimistic locking functionality.
     */
-    private function _checkOptimisticLocking($action, $isUpdate){
-        if($this->optimistic_lock && !isset($_SESSION['o_lock_fs'])){
-            if(isset($_SESSION['o_lock_id']) && $_SESSION['o_lock_id'] == $this->id && $_SESSION['o_lock_on'] == $this->object_name)
+    private function _checkOptimisticLocking($action, $isUpdate) {
+        if ($this->optimistic_lock && !isset($_SESSION['o_lock_fs'])) {
+            if (isset($_SESSION['o_lock_id']) && $_SESSION['o_lock_id'] == $this->id && $_SESSION['o_lock_on'] == $this->object_name)
             {
-                if($action == 'Save' && $isUpdate && isset($this->modified_user_id) && $this->has_been_modified_since($_SESSION['o_lock_dm'], $this->modified_user_id))
+                if ($action == 'Save' && $isUpdate && isset($this->modified_user_id) && $this->has_been_modified_since($_SESSION['o_lock_dm'], $this->modified_user_id))
                 {
                     $_SESSION['o_lock_class'] = get_class($this);
                     $_SESSION['o_lock_module'] = $this->module_dir;
                     $_SESSION['o_lock_object'] = $this->toArray();
                     $saveform = "<form name='save' id='save' method='POST'>";
-                    foreach($_POST as $key=>$arg)
+                    foreach ($_POST as $key=>$arg)
                     {
-                        $saveform .= "<input type='hidden' name='". addslashes($key) ."' value='". addslashes($arg) ."'>";
+                        $saveform .= "<input type='hidden' name='".addslashes($key)."' value='".addslashes($arg)."'>";
                     }
                     $saveform .= "</form><script>document.getElementById('save').submit();</script>";
                     $_SESSION['o_lock_save'] = $saveform;
@@ -5885,20 +5885,20 @@ 
         }
         else
         {
-            if(isset($_SESSION['o_lock_object']))	{ unset ($_SESSION['o_lock_object']); }
-            if(isset($_SESSION['o_lock_id']))		{ unset ($_SESSION['o_lock_id']); }
-            if(isset($_SESSION['o_lock_dm']))		{ unset ($_SESSION['o_lock_dm']); }
-            if(isset($_SESSION['o_lock_fs']))		{ unset ($_SESSION['o_lock_fs']); }
-            if(isset($_SESSION['o_lock_save']))		{ unset ($_SESSION['o_lock_save']); }
+            if (isset($_SESSION['o_lock_object'])) { unset ($_SESSION['o_lock_object']); }
+            if (isset($_SESSION['o_lock_id'])) { unset ($_SESSION['o_lock_id']); }
+            if (isset($_SESSION['o_lock_dm'])) { unset ($_SESSION['o_lock_dm']); }
+            if (isset($_SESSION['o_lock_fs'])) { unset ($_SESSION['o_lock_fs']); }
+            if (isset($_SESSION['o_lock_save'])) { unset ($_SESSION['o_lock_save']); }
         }
     }
 
     /**
     * Send assignment notifications and invites for meetings and calls
     */
-    private function _sendNotifications($check_notify){
-        if($check_notify || (isset($this->notify_inworkflow) && $this->notify_inworkflow == true) // cn: bug 5795 - no invites sent to Contacts, and also bug 25995, in workflow, it will set the notify_on_save=true.
-           && !$this->isOwner($this->created_by) )  // cn: bug 42727 no need to send email to owner (within workflow)
+    private function _sendNotifications($check_notify) {
+        if ($check_notify || (isset($this->notify_inworkflow) && $this->notify_inworkflow == true) // cn: bug 5795 - no invites sent to Contacts, and also bug 25995, in workflow, it will set the notify_on_save=true.
+           && !$this->isOwner($this->created_by))  // cn: bug 42727 no need to send email to owner (within workflow)
         {
             $admin = new Administration();
             $admin->retrieveSettings();
@@ -5909,7 +5909,7 @@ 
                 $GLOBALS['log']->info("Notifications: user assignment has changed, checking if user receives notifications");
                 $sendNotifications = true;
             }
-            elseif(isset($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == 1)
+            elseif (isset($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == 1)
             {
                 // cn: bug 5795 Send Invites failing for Contacts
                 $sendNotifications = true;
@@ -5920,7 +5920,7 @@ 
             }
 
 
-            if($sendNotifications == true)
+            if ($sendNotifications == true)
             {
                 $notify_list = $this->get_notification_recipients();
                 foreach ($notify_list as $notify_user)
@@ -5981,10 +5981,10 @@ 
 
         $cache_key = "load_cached_array.$module_dir.$module.$key";
         $result = sugar_cache_retrieve($cache_key);
-        if(!empty($result))
+        if (!empty($result))
         {
         	// Use SugarCache::EXTERNAL_CACHE_NULL_VALUE to store null values in the cache.
-        	if($result == SugarCache::EXTERNAL_CACHE_NULL_VALUE)
+        	if ($result == SugarCache::EXTERNAL_CACHE_NULL_VALUE)
         	{
         		return null;
         	}
@@ -5992,16 +5992,16 @@ 
             return $result;
         }
 
-        if(file_exists('modules/'.$module_dir.'/'.$fileName))
+        if (file_exists('modules/'.$module_dir.'/'.$fileName))
         {
             // If the data was not loaded, try loading again....
-            if(!isset($moduleDefs[$module]))
+            if (!isset($moduleDefs[$module]))
             {
                 include('modules/'.$module_dir.'/'.$fileName);
                 $moduleDefs[$module] = $fields_array;
             }
             // Now that we have tried loading, make sure it was loaded
-            if(empty($moduleDefs[$module]) || empty($moduleDefs[$module][$module][$key]))
+            if (empty($moduleDefs[$module]) || empty($moduleDefs[$module][$module][$key]))
             {
                 // It was not loaded....  Fail.  Cache null to prevent future repeats of this calculation
 				sugar_cache_put($cache_key, SugarCache::EXTERNAL_CACHE_NULL_VALUE);
@@ -6026,7 +6026,7 @@ 
      */
     public function getACLCategory()
     {
-        return !empty($this->acl_category)?$this->acl_category:$this->module_dir;
+        return !empty($this->acl_category) ? $this->acl_category : $this->module_dir;
     }
 
     /**
@@ -6075,7 +6075,7 @@ 
             'select' => '',
             'join' => ''
         );
-        if(isset($this->custom_fields))
+        if (isset($this->custom_fields))
         {
             $result = $this->custom_fields->getJOIN($expandedList, $includeRelates, $where);
         }
@@ -6097,7 +6097,7 @@ 
                 // walk through all currency-related fields
                 foreach ($this->field_defs as $this_field) {
                     if (isset($this_field['type']) && $this_field['type'] == 'relate'
-                        && isset($this_field['module'])  && $this_field['module'] == 'Currencies'
+                        && isset($this_field['module']) && $this_field['module'] == 'Currencies'
                         && isset($this_field['id_name']) && $this_field['id_name'] == 'currency_id') {
                         // populate related properties manually
                         $this_property = $this_field['name'];

modules/ACLActions/ACLAction.php

Spacing +96 added lines, -96 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -38,19 +38,19 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 /* BEGIN - SECURITY GROUPS */
-if(file_exists("modules/ACLActions/actiondefs.override.php")){
+if (file_exists("modules/ACLActions/actiondefs.override.php")) {
 	require_once("modules/ACLActions/actiondefs.override.php");
 } else {
 require_once('modules/ACLActions/actiondefs.php');
 }
 /* END - SECURITY GROUPS */
-class ACLAction  extends SugarBean{
+class ACLAction  extends SugarBean {
     var $module_dir = 'ACLActions';
     var $object_name = 'ACLAction';
     var $table_name = 'acl_actions';
     var $new_schema = true;
     var $disable_custom_fields = true;
-    function ACLAction(){
+    function ACLAction() {
         parent::SugarBean();
     }
 
@@ -61,17 +61,17 @@ 
     * @param STRING $category - the category (e.g module name - Accounts, Contacts)
     * @param STRING $type - the type (e.g. 'module', 'field')
     */
-    static function addActions($category, $type='module'){
+    static function addActions($category, $type = 'module') {
         global $ACLActions;
         $db = DBManagerFactory::getInstance();
-        if(isset($ACLActions[$type])){
-            foreach($ACLActions[$type]['actions'] as $action_name =>$action_def){
+        if (isset($ACLActions[$type])) {
+            foreach ($ACLActions[$type]['actions'] as $action_name =>$action_def) {
 
                 $action = new ACLAction();
-                $query = "SELECT * FROM " . $action->table_name . " WHERE name='$action_name' AND category = '$category' AND acltype='$type' AND deleted=0 ";
+                $query = "SELECT * FROM ".$action->table_name." WHERE name='$action_name' AND category = '$category' AND acltype='$type' AND deleted=0 ";
                 $result = $db->query($query);
                 //only add if an action with that name and category don't exist
-                $row=$db->fetchByAssoc($result);
+                $row = $db->fetchByAssoc($result);
                 if ($row == null) {
                     $action->name = $action_name;
                     $action->category = $category;
@@ -84,7 +84,7 @@ 
                 }
             }
 
-        }else{
+        } else {
             sugar_die("FAILED TO ADD: $category - TYPE $type NOT DEFINED IN modules/ACLActions/actiondefs.php");
         }
 
@@ -97,22 +97,22 @@ 
     * @param STRING $category - the category (e.g module name - Accounts, Contacts)
     * @param STRING $type - the type (e.g. 'module', 'field')
     */
-    public static function removeActions($category, $type='module'){
+    public static function removeActions($category, $type = 'module') {
         global $ACLActions;
         $db = DBManagerFactory::getInstance();
-        if(isset($ACLActions[$type])){
-            foreach($ACLActions[$type]['actions'] as $action_name =>$action_def){
+        if (isset($ACLActions[$type])) {
+            foreach ($ACLActions[$type]['actions'] as $action_name =>$action_def) {
 
                 $action = new ACLAction();
-                $query = "SELECT * FROM " . $action->table_name . " WHERE name='$action_name' AND category = '$category' AND acltype='$type' and deleted=0";
+                $query = "SELECT * FROM ".$action->table_name." WHERE name='$action_name' AND category = '$category' AND acltype='$type' and deleted=0";
                 $result = $db->query($query);
                 //only add if an action with that name and category don't exist
-                $row=$db->fetchByAssoc($result);
+                $row = $db->fetchByAssoc($result);
                 if ($row != null) {
                     $action->mark_deleted($row['id']);
                 }
             }
-        }else{
+        } else {
             sugar_die("FAILED TO REMOVE: $category : $name - TYPE $type NOT DEFINED IN modules/ACLActions/actiondefs.php");
         }
     }
@@ -125,9 +125,9 @@ 
     * @param INT $access - the access level you want the color for
     * @return the color either name or hex representation or false if the level does not exist
     */
-    protected static function AccessColor($access){
+    protected static function AccessColor($access) {
         global $ACLActionAccessLevels;
-        if(isset($ACLActionAccessLevels[$access])){
+        if (isset($ACLActionAccessLevels[$access])) {
 
             return $ACLActionAccessLevels[$access]['color'];
         }
@@ -143,9 +143,9 @@ 
     * @param INT $access - the access level you want the color for
     * @return the translated access level name or false if the level does not exist
     */
-    static function AccessName($access){
+    static function AccessName($access) {
         global $ACLActionAccessLevels;
-        if(isset($ACLActionAccessLevels[$access])){
+        if (isset($ACLActionAccessLevels[$access])) {
             return translate($ACLActionAccessLevels[$access]['label'], 'ACLActions');
         }
         return false;
@@ -160,10 +160,10 @@ 
      * @param INT $access - the access level you want the color for
      * @return the access level label or false if the level does not exist
      */
-    protected static function AccessLabel($access){
+    protected static function AccessLabel($access) {
         global $ACLActionAccessLevels;
-        if(isset($ACLActionAccessLevels[$access])){
-            $label=preg_replace('/(LBL_ACCESS_)(.*)/', '$2', $ACLActionAccessLevels[$access]['label']);
+        if (isset($ACLActionAccessLevels[$access])) {
+            $label = preg_replace('/(LBL_ACCESS_)(.*)/', '$2', $ACLActionAccessLevels[$access]['label']);
             return strtolower($label);
 
         }
@@ -176,12 +176,12 @@ 
     * this is used for building select boxes
     * @return array containg access levels (ints) as keys and access names as values
     */
-    protected static function getAccessOptions( $action, $type='module'){
+    protected static function getAccessOptions($action, $type = 'module') {
         global $ACLActions;
         $options = array();
 
-        if(empty($ACLActions[$type]['actions'][$action]['aclaccess']))return $options;
-        foreach($ACLActions[$type]['actions'][$action]['aclaccess'] as $action){
+        if (empty($ACLActions[$type]['actions'][$action]['aclaccess']))return $options;
+        foreach ($ACLActions[$type]['actions'][$action]['aclaccess'] as $action) {
             $options[$action] = ACLAction::AccessName($action);
         }
         return $options;
@@ -194,12 +194,12 @@ 
     *
     *
     */
-    public static function getDefaultActions($type='module', $action=''){
+    public static function getDefaultActions($type = 'module', $action = '') {
         $query = "SELECT * FROM acl_actions WHERE deleted=0 ";
-        if(!empty($type)){
+        if (!empty($type)) {
             $query .= " AND acltype='$type'";
         }
-        if(!empty($action)){
+        if (!empty($action)) {
             $query .= "AND name='$action'";
         }
         $query .= " ORDER BY category";
@@ -207,7 +207,7 @@ 
         $db = DBManagerFactory::getInstance();
         $result = $db->query($query);
         $default_actions = array();
-        while($row = $db->fetchByAssoc($result) ){
+        while ($row = $db->fetchByAssoc($result)) {
             $acl = new ACLAction();
             $acl->populateFromRow($row);
             $default_actions[] = $acl;
@@ -226,19 +226,19 @@ 
     * @return ARRAY of ACLActionsArray
     */
 
-    static function getUserActions($user_id,$refresh=false, $category='',$type='', $action=''){
+    static function getUserActions($user_id, $refresh = false, $category = '', $type = '', $action = '') {
         //check in the session if we already have it loaded
-        if(!$refresh && !empty($_SESSION['ACL'][$user_id])){
-            if(empty($category) && empty($action)){
+        if (!$refresh && !empty($_SESSION['ACL'][$user_id])) {
+            if (empty($category) && empty($action)) {
                 return $_SESSION['ACL'][$user_id];
-            }else{
-                if(!empty($category) && isset($_SESSION['ACL'][$user_id][$category])){
-                    if(empty($action)){
-                        if(empty($type)){
+            } else {
+                if (!empty($category) && isset($_SESSION['ACL'][$user_id][$category])) {
+                    if (empty($action)) {
+                        if (empty($type)) {
                             return $_SESSION['ACL'][$user_id][$category];
                         }
                         return $_SESSION['ACL'][$user_id][$category][$type];
-                    }else if(!empty($type) && isset($_SESSION['ACL'][$user_id][$category][$type][$action])){
+                    } else if (!empty($type) && isset($_SESSION['ACL'][$user_id][$category][$type][$action])) {
                         return $_SESSION['ACL'][$user_id][$category][$type][$action];
                     }
                 }
@@ -247,13 +247,13 @@ 
         //if we don't have it loaded then lets check against the db
         $additional_where = '';
         $db = DBManagerFactory::getInstance();
-        if(!empty($category)){
+        if (!empty($category)) {
             $additional_where .= " AND acl_actions.category = '$category' ";
         }
-        if(!empty($action)){
+        if (!empty($action)) {
             $additional_where .= " AND acl_actions.name = '$action' ";
         }
-        if(!empty($type)){
+        if (!empty($type)) {
             $additional_where .= " AND acl_actions.acltype = '$type' ";
         }
 		/* BEGIN - SECURITY GROUPS */ 
@@ -294,38 +294,38 @@ 
 		$has_user_role = false; //used for user_role_precedence
 		$has_role = false; //used to determine if default actions can be ignored. If a user has a defined role don't use the defaults
 		/* END - SECURITY GROUPS */
-        while($row = $db->fetchByAssoc($result, FALSE) ){
+        while ($row = $db->fetchByAssoc($result, FALSE)) {
 			/* BEGIN - SECURITY GROUPS */ 
-			if($has_user_role == false && $row['user_role'] == 1) {
+			if ($has_user_role == false && $row['user_role'] == 1) {
 				$has_user_role = true;
 			}
-			if($has_role == false && ($row['user_role'] == 1 || $row['user_role'] ==0)) {
+			if ($has_role == false && ($row['user_role'] == 1 || $row['user_role'] == 0)) {
 				$has_role = true;
 			}
 			//if user roles should take precedence over group roles and we have a user role 
 			//break when we get to processing the group roles
-			if($has_user_role == true && $row['user_role'] == 0 
+			if ($has_user_role == true && $row['user_role'] == 0 
 					&& isset($sugar_config['securitysuite_user_role_precedence'])
-					&& $sugar_config['securitysuite_user_role_precedence'] == true ) 
+					&& $sugar_config['securitysuite_user_role_precedence'] == true) 
 			{
 				break; 
 			}
-			if($row['user_role'] == -1 && $has_role == true) {
+			if ($row['user_role'] == -1 && $has_role == true) {
 				break; //no need for default actions when a role is assigned to the user or user's group already
 			}
 			/* END - SECURITY GROUPS */
             $acl = new ACLAction();
-            $isOverride  = false;
+            $isOverride = false;
             $acl->populateFromRow($row);
-            if(!empty($row['access_override'])){
+            if (!empty($row['access_override'])) {
                 $acl->aclaccess = $row['access_override'];
                 $isOverride = true;
             }
-            if(!isset($selected_actions[$acl->category])){
+            if (!isset($selected_actions[$acl->category])) {
                 $selected_actions[$acl->category] = array();
 
             }
-            if(!isset($selected_actions[$acl->category][$acl->acltype][$acl->name])
+            if (!isset($selected_actions[$acl->category][$acl->acltype][$acl->name])
 				|| (
 					/* BEGIN - SECURITY GROUPS - additive security*/
 					(
@@ -353,18 +353,18 @@ 
         }
 
         //only set the session variable if it was a full list;
-        if(empty($category) && empty($action)){
-            if(!isset($_SESSION['ACL'])){
+        if (empty($category) && empty($action)) {
+            if (!isset($_SESSION['ACL'])) {
                 $_SESSION['ACL'] = array();
             }
             $_SESSION['ACL'][$user_id] = $selected_actions;
-        }else{
-            if(empty($action) && !empty($category)){
-                if(!empty($type)){
-                    $_SESSION['ACL'][$user_id][$category][$type] = $selected_actions[$category][$type];}
+        } else {
+            if (empty($action) && !empty($category)) {
+                if (!empty($type)) {
+                    $_SESSION['ACL'][$user_id][$category][$type] = $selected_actions[$category][$type]; }
                 $_SESSION['ACL'][$user_id][$category] = $selected_actions[$category];
-            }else{
-                if(!empty($action) && !empty($category) && !empty($type)){
+            } else {
+                if (!empty($action) && !empty($category) && !empty($type)) {
                 $_SESSION['ACL'][$user_id][$category][$type][$action] = $selected_actions[$category][$action];
 
             }
@@ -400,7 +400,7 @@ 
 	/**
     static function hasAccess($is_owner=false, $access = 0){
 	*/
-	static function hasAccess($is_owner=false, $in_group=false, $access = 0, ACLAction $action = null){
+	static function hasAccess($is_owner = false, $in_group = false, $access = 0, ACLAction $action = null) {
 		/**
         if($access != 0 && $access == ACL_ALLOW_ALL || ($is_owner && $access == ACL_ALLOW_OWNER))return true;
        //if this exists, then this function is not static, so check the aclaccess parameter
@@ -409,14 +409,14 @@ 
             return true;
         }
 		*/
-		if($access != 0 && ($access == ACL_ALLOW_ALL 
-			|| ($is_owner && ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP) )  //if owner that's better than in group so count it...better way to clean this up?
+		if ($access != 0 && ($access == ACL_ALLOW_ALL 
+			|| ($is_owner && ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP))  //if owner that's better than in group so count it...better way to clean this up?
 			|| ($in_group && $access == ACL_ALLOW_GROUP) //need to pass if in group with access somehow
 		)) {
 			return true;
 		}
-        if(!is_null($action) && isset($action->aclaccess)){
-			if($action->aclaccess == ACL_ALLOW_ALL
+        if (!is_null($action) && isset($action->aclaccess)) {
+			if ($action->aclaccess == ACL_ALLOW_ALL
 				|| ($is_owner && $action->aclaccess == ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP))
 				|| ($in_group && $access == ACL_ALLOW_GROUP) //need to pass if in group with access somehow
 			) {
@@ -438,15 +438,15 @@ 
 	 * @param STRING $type
 	 * @return boolean
 	 */
-	static function userNeedsSecurityGroup($user_id, $category, $action,$type='module'){
+	static function userNeedsSecurityGroup($user_id, $category, $action, $type = 'module') {
 		//check if we don't have it set in the cache if not lets reload the cache
 		
-		if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+		if (empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
 			ACLAction::getUserActions($user_id, false);
 			
 		}
 		
-		if(!empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+		if (!empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
 			return $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'] == ACL_ALLOW_GROUP;
 		}
         return false;
@@ -472,19 +472,19 @@ 
 	/**
     public static function userHasAccess($user_id, $category, $action,$type='module', $is_owner = false){
 	*/
-	public static function userHasAccess($user_id, $category, $action,$type='module', $is_owner = false, $in_group = false){
+	public static function userHasAccess($user_id, $category, $action, $type = 'module', $is_owner = false, $in_group = false) {
        global $current_user;
-       if($current_user->isAdminForModule($category)&& !isset($_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'])){
+       if ($current_user->isAdminForModule($category) && !isset($_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'])) {
         return true;
         }
         //check if we don't have it set in the cache if not lets reload the cache
-        if(ACLAction::getUserAccessLevel($user_id, $category, 'access', $type) < ACL_ALLOW_ENABLED) return false;
-        if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+        if (ACLAction::getUserAccessLevel($user_id, $category, 'access', $type) < ACL_ALLOW_ENABLED) return false;
+        if (empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
             ACLAction::getUserActions($user_id, false);
 
         }
 
-        if(!empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+        if (!empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
 /**
             return ACLAction::hasAccess($is_owner, $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess']);
 */
@@ -504,12 +504,12 @@ 
     * @param STRING $type
     * @return INT (ACCESS LEVEL)
     */
-    public static function getUserAccessLevel($user_id, $category, $action,$type='module'){
-        if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+    public static function getUserAccessLevel($user_id, $category, $action, $type = 'module') {
+        if (empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
             ACLAction::getUserActions($user_id, false);
 
         }
-        if(!empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+        if (!empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
             if (!empty($_SESSION['ACL'][$user_id][$category][$type]['admin']) && $_SESSION['ACL'][$user_id][$category][$type]['admin']['aclaccess'] >= ACL_ALLOW_ADMIN)
             {
                 // If you have admin access for a module, all ACL's are allowed
@@ -529,16 +529,16 @@ 
     * @param STRING $type
     * @return boolean
     */
-    public static function userNeedsOwnership($user_id, $category, $action,$type='module'){
+    public static function userNeedsOwnership($user_id, $category, $action, $type = 'module') {
         //check if we don't have it set in the cache if not lets reload the cache
 
-        if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+        if (empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
             ACLAction::getUserActions($user_id, false);
 
         }
 
 
-        if(!empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+        if (!empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
             return $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'] == ACL_ALLOW_OWNER;
         }
         return false;
@@ -551,18 +551,18 @@ 
     *
     * @param unknown_type $categories
     */
-    public static function setupCategoriesMatrix(&$categories){
+    public static function setupCategoriesMatrix(&$categories) {
         global $ACLActions, $current_user;
         $names = array();
         $disabled = array();
-        foreach($categories as $cat_name=>$category){
-            foreach($category as $type_name=>$type){
-                foreach($type as $act_name=>$action){
+        foreach ($categories as $cat_name=>$category) {
+            foreach ($category as $type_name=>$type) {
+                foreach ($type as $act_name=>$action) {
                     $names[$act_name] = translate($ACLActions[$type_name]['actions'][$act_name]['label'], 'ACLActions');
                     $categories[$cat_name][$type_name][$act_name]['accessColor'] = ACLAction::AccessColor($action['aclaccess']);
-                    if($type_name== 'module'){
+                    if ($type_name == 'module') {
 
-                        if($act_name != 'aclaccess' && $categories[$cat_name]['module']['access']['aclaccess'] == ACL_ALLOW_DISABLED){
+                        if ($act_name != 'aclaccess' && $categories[$cat_name]['module']['access']['aclaccess'] == ACL_ALLOW_DISABLED) {
                             $categories[$cat_name][$type_name][$act_name]['accessColor'] = 'darkgray';
                             $disabled[] = $cat_name;
                         }
@@ -571,19 +571,19 @@ 
                     $categories[$cat_name][$type_name][$act_name]['accessName'] = ACLAction::AccessName($action['aclaccess']);
                     $categories[$cat_name][$type_name][$act_name]['accessLabel'] = ACLAction::AccessLabel($action['aclaccess']);
 
-                    if($cat_name=='Users'&& $act_name=='admin'){
-                        $categories[$cat_name][$type_name][$act_name]['accessOptions'][ACL_ALLOW_DEFAULT]=ACLAction::AccessName(ACL_ALLOW_DEFAULT);;
-                        $categories[$cat_name][$type_name][$act_name]['accessOptions'][ACL_ALLOW_DEV]=ACLAction::AccessName(ACL_ALLOW_DEV);;
+                    if ($cat_name == 'Users' && $act_name == 'admin') {
+                        $categories[$cat_name][$type_name][$act_name]['accessOptions'][ACL_ALLOW_DEFAULT] = ACLAction::AccessName(ACL_ALLOW_DEFAULT); ;
+                        $categories[$cat_name][$type_name][$act_name]['accessOptions'][ACL_ALLOW_DEV] = ACLAction::AccessName(ACL_ALLOW_DEV); ;
                     }
-                    else{
-                    $categories[$cat_name][$type_name][$act_name]['accessOptions'] =  ACLAction::getAccessOptions($act_name, $type_name);
+                    else {
+                    $categories[$cat_name][$type_name][$act_name]['accessOptions'] = ACLAction::getAccessOptions($act_name, $type_name);
                     }
                 }
             }
         }
 
-        if(!is_admin($current_user)){
-            foreach($disabled as $cat_name){
+        if (!is_admin($current_user)) {
+            foreach ($disabled as $cat_name) {
                 unset($categories[$cat_name]);
             }
         }
@@ -598,10 +598,10 @@ 
     *
     * @return array of fields with id, name, access and category
     */
-    function toArray($dbOnly = false, $stringOnly = false, $upperKeys = false){
+    function toArray($dbOnly = false, $stringOnly = false, $upperKeys = false) {
         $array_fields = array('id', 'aclaccess');
         $arr = array();
-        foreach($array_fields as $field){
+        foreach ($array_fields as $field) {
             $arr[$field] = $this->$field;
         }
         return $arr;
@@ -613,8 +613,8 @@ 
     *
     * @param Array $arr
     */
-    function fromArray($arr){
-        foreach($arr as $name=>$value){
+    function fromArray($arr) {
+        foreach ($arr as $name=>$value) {
             $this->$name = $value;
         }
     }
@@ -624,7 +624,7 @@ 
     * clears the session variable storing the cache information for acls
     *
     */
-    function clearSessionCache(){
+    function clearSessionCache() {
         unset($_SESSION['ACL']);
     }
 

modules/AOS_Products_Quotes/Line_Items.php

Spacing +38 added lines, -38 removed lines

@@ -22,7 +22,7 @@ 
  * @author SalesAgility <info@salesagility.com>
  */
 
-function display_lines($focus, $field, $value, $view){
+function display_lines($focus, $field, $value, $view) {
 
     global $sugar_config, $locale, $app_list_strings, $mod_strings;
 
@@ -31,10 +31,10 @@ 
 
     $html = '';
 
-    if($view == 'EditView'){
+    if ($view == 'EditView') {
 
         $html .= '<script src="modules/AOS_Products_Quotes/line_items.js"></script>';
-        if(file_exists('custom/modules/AOS_Products_Quotes/line_items.js')){
+        if (file_exists('custom/modules/AOS_Products_Quotes/line_items.js')) {
             $html .= '<script src="custom/modules/AOS_Products_Quotes/line_items.js"></script>';
         }
         $html .= '<script language="javascript">var sig_digits = '.$locale->getPrecision().';';
@@ -45,18 +45,18 @@ 
 
         $html .= "<table border='0' cellspacing='4' width='37.5%' id='lineItems'></table>";
 
-        if($enable_groups){
+        if ($enable_groups) {
             $html .= "<div style='padding-top: 10px; padding-bottom:10px;'>";
             $html .= "<input type=\"button\" tabindex=\"116\" class=\"button\" value=\"".$mod_strings['LBL_ADD_GROUP']."\" id=\"addGroup\" onclick=\"insertGroup(0)\" />";
             $html .= "</div>";
         }
         $html .= '<input type="hidden" name="vathidden" id="vathidden" value="'.get_select_options_with_id($app_list_strings['vat_list'], '').'">
 				  <input type="hidden" name="discounthidden" id="discounthidden" value="'.get_select_options_with_id($app_list_strings['discount_list'], '').'">';
-        if($focus->id != '') {
+        if ($focus->id != '') {
             require_once('modules/AOS_Products_Quotes/AOS_Products_Quotes.php');
             require_once('modules/AOS_Line_Item_Groups/AOS_Line_Item_Groups.php');
 
-            $sql = "SELECT pg.id, pg.group_id FROM aos_products_quotes pg LEFT JOIN aos_line_item_groups lig ON pg.group_id = lig.id WHERE pg.parent_type = '" . $focus->object_name . "' AND pg.parent_id = '" . $focus->id . "' AND pg.deleted = 0 ORDER BY lig.number ASC, pg.number ASC";
+            $sql = "SELECT pg.id, pg.group_id FROM aos_products_quotes pg LEFT JOIN aos_line_item_groups lig ON pg.group_id = lig.id WHERE pg.parent_type = '".$focus->object_name."' AND pg.parent_id = '".$focus->id."' AND pg.deleted = 0 ORDER BY lig.number ASC, pg.number ASC";
 
             $result = $focus->db->query($sql);
             $html .= "<script>
@@ -75,17 +75,17 @@ 
                     $group_item = json_encode($group_item->toArray());
                 }
                 $html .= "<script>
-                        insertLineItems(" . $line_item . "," . $group_item . ");
+                        insertLineItems(" . $line_item.",".$group_item.");
                     </script>";
 
             }
         }
-        if(!$enable_groups){
+        if (!$enable_groups) {
             $html .= '<script>insertGroup();</script>';
         }
 
     }
-    else if($view == 'DetailView'){
+    else if ($view == 'DetailView') {
         $params = array('currency_id' => $focus->currency_id);
 
         $sql = "SELECT pg.id, pg.group_id FROM aos_products_quotes pg LEFT JOIN aos_line_item_groups lig ON pg.group_id = lig.id WHERE pg.parent_type = '".$focus->object_name."' AND pg.parent_id = '".$focus->id."' AND pg.deleted = 0 ORDER BY lig.number ASC, pg.number ASC";
@@ -109,9 +109,9 @@ 
             $line_item->retrieve($row['id']);
 
 
-            if($enable_groups && ($group_id != $row['group_id'] || $i == 0)){
+            if ($enable_groups && ($group_id != $row['group_id'] || $i == 0)) {
                 $html .= $groupStart.$product.$service.$groupEnd;
-                if($i != 0)$html .= "<tr><td colspan='9' nowrap='nowrap'><br></td></tr>";
+                if ($i != 0)$html .= "<tr><td colspan='9' nowrap='nowrap'><br></td></tr>";
                 $groupStart = '';
                 $groupEnd = '';
                 $product = '';
@@ -152,8 +152,8 @@ 
                 $groupEnd .= "<td class='tabDetailViewDL' style='text-align: right;padding:2px;'>".currency_format_number($group_item->total_amount, $params)."</td>";
                 $groupEnd .= "</tr>";
             }
-            if($line_item->product_id != '0' && $line_item->product_id != null){
-                if($productCount == 0)
+            if ($line_item->product_id != '0' && $line_item->product_id != null) {
+                if ($productCount == 0)
                 {
                     $product .= "<tr>";
                     $product .= "<td width='5%' class='tabDetailViewDL' style='text-align: left;padding:2px;' scope='row'>&nbsp;</td>";
@@ -169,26 +169,26 @@ 
                 }
 
                 $product .= "<tr>";
-                $product_note = wordwrap($line_item->description,40,"<br />\n");
+                $product_note = wordwrap($line_item->description, 40, "<br />\n");
                 $product .= "<td class='tabDetailViewDF' style='text-align: left; padding:2px;'>".++$productCount."</td>";
-                $product .= "<td class='tabDetailViewDF' style='padding:2px;'>".stripDecimalPointsAndTrailingZeroes(format_number($line_item->product_qty),$sep[1])."</td>";
+                $product .= "<td class='tabDetailViewDF' style='padding:2px;'>".stripDecimalPointsAndTrailingZeroes(format_number($line_item->product_qty), $sep[1])."</td>";
 
                 $product .= "<td class='tabDetailViewDF' style='padding:2px;'><a href='index.php?module=AOS_Products&action=DetailView&record=".$line_item->product_id."' class='tabDetailViewDFLink'>".$line_item->name."</a><br />".$product_note."</td>";
-                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_list_price,$params)."</td>";
+                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_list_price, $params)."</td>";
 
                 $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".get_discount_string($line_item->discount, $line_item->product_discount, $params, $locale, $sep)."</td>";
 
-                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_unit_price,$params )."</td>";
-                if($locale->getPrecision()){
-                    $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".rtrim(rtrim(format_number($line_item->vat), '0'),$sep[1])."%</td>";
+                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_unit_price, $params)."</td>";
+                if ($locale->getPrecision()) {
+                    $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".rtrim(rtrim(format_number($line_item->vat), '0'), $sep[1])."%</td>";
                 } else {
                     $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".format_number($line_item->vat)."%</td>";
                 }
-                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->vat_amt,$params )."</td>";
-                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_total_price,$params )."</td>";
+                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->vat_amt, $params)."</td>";
+                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_total_price, $params)."</td>";
                 $product .= "</tr>";
             } else {
-                if($serviceCount == 0)
+                if ($serviceCount == 0)
                 {
                     $service .= "<tr>";
                     $service .= "<td width='5%' class='tabDetailViewDL' style='text-align: left;padding:2px;' scope='row'>&nbsp;</td>";
@@ -205,15 +205,15 @@ 
                 $service .= "<tr>";
                 $service .= "<td class='tabDetailViewDF' style='text-align: left; padding:2px;'>".++$serviceCount."</td>";
                 $service .= "<td class='tabDetailViewDF' style='padding:2px;' colspan='2'>".$line_item->name."</td>";
-                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_list_price,$params)."</td>";
+                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_list_price, $params)."</td>";
 
                 $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".get_discount_string($line_item->discount, $line_item->product_discount, $params, $locale, $sep)."</td>";
 
 
-                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_unit_price,$params)."</td>";
+                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_unit_price, $params)."</td>";
                 $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".rtrim(rtrim(format_number($line_item->vat), '0'), $sep[1])."%</td>";
-                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->vat_amt,$params )."</td>";
-                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_total_price,$params )."</td>";
+                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->vat_amt, $params)."</td>";
+                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_total_price, $params)."</td>";
                 $service .= "</tr>";
 
             }
@@ -230,22 +230,22 @@ 
 //field was 0.
 //The approach below will strip off the fractional part if it is only zeroes (and in this case the decimal separator
 //will also be stripped off) The custom decimal separator is passed in to the function from the locale settings
-function stripDecimalPointsAndTrailingZeroes($inputString,$decimalSeparator)
+function stripDecimalPointsAndTrailingZeroes($inputString, $decimalSeparator)
 {
-    return preg_replace('/'.preg_quote($decimalSeparator).'[0]+$/','',$inputString);
+    return preg_replace('/'.preg_quote($decimalSeparator).'[0]+$/', '', $inputString);
 }
 
-function get_discount_string($type, $amount, $params, $locale, $sep){
-    if($amount != '' && $amount != '0.00')
+function get_discount_string($type, $amount, $params, $locale, $sep) {
+    if ($amount != '' && $amount != '0.00')
     {
-        if($type == 'Amount')
+        if ($type == 'Amount')
         {
-            return currency_format_number($amount,$params )."</td>";
+            return currency_format_number($amount, $params)."</td>";
         }
-        else if($locale->getPrecision())
+        else if ($locale->getPrecision())
         {
-            return rtrim(rtrim(format_number($amount), '0'),$sep[1])."%";
-        } else{
+            return rtrim(rtrim(format_number($amount), '0'), $sep[1])."%";
+        } else {
             return format_number($amount)."%";
         }
     }
@@ -255,12 +255,12 @@ 
     }
 }
 
-function display_shipping_vat($focus, $field, $value, $view){
+function display_shipping_vat($focus, $field, $value, $view) {
 
-    if($view == 'EditView'){
+    if ($view == 'EditView') {
         global $app_list_strings;
 
-        if($value != '') $value = format_number($value);
+        if ($value != '') $value = format_number($value);
 
         $html = "<input id='shipping_tax_amt' type='text' tabindex='0' title='' value='".$value."' maxlength='26,6' size='22' name='shipping_tax_amt' onblur='calculateTotal(\"lineItems\");'>";
         $html .= "<select name='shipping_tax' id='shipping_tax' onchange='calculateTotal(\"lineItems\");' >".get_select_options_with_id($app_list_strings['vat_list'], (isset($focus->shipping_tax) ? $focus->shipping_tax : ''))."</select>";

modules/AOS_Products_Quotes/AOS_Products_Quotes.php

Spacing +8 added lines, -8 removed lines

@@ -51,22 +51,22 @@ 
     function save_lines($post_data, $parent, $groups = array(), $key = '')
     {
 
-        $line_count = isset($post_data[$key . 'name']) ? count($post_data[$key . 'name']) : 0;
+        $line_count = isset($post_data[$key.'name']) ? count($post_data[$key.'name']) : 0;
         $j = 0;
         for ($i = 0; $i < $line_count; ++$i) {
 
-            if ($post_data[$key . 'deleted'][$i] == 1) {
-                $this->mark_deleted($post_data[$key . 'id'][$i]);
+            if ($post_data[$key.'deleted'][$i] == 1) {
+                $this->mark_deleted($post_data[$key.'id'][$i]);
             } else {
                 $product_quote = new AOS_Products_Quotes();
                 foreach ($this->field_defs as $field_def) {
                     $field_name = $field_def['name'];
-                    if (isset($post_data[$key . $field_name][$i])) {
-                        $product_quote->$field_name = $post_data[$key . $field_name][$i];
+                    if (isset($post_data[$key.$field_name][$i])) {
+                        $product_quote->$field_name = $post_data[$key.$field_name][$i];
                     }
                 }
-                if (isset($post_data[$key . 'group_number'][$i])) {
-                    $product_quote->group_id = $groups[$post_data[$key . 'group_number'][$i]];
+                if (isset($post_data[$key.'group_number'][$i])) {
+                    $product_quote->group_id = $groups[$post_data[$key.'group_number'][$i]];
                 }
                 if (trim($product_quote->product_id) != '' && trim($product_quote->name) != '' && trim($product_quote->product_unit_price) != '') {
                     $product_quote->number = ++$j;
@@ -75,7 +75,7 @@ 
                     $product_quote->currency_id = $parent->currency_id;
                     $product_quote->parent_type = $parent->object_name;
                     $product_quote->save();
-                    $_POST[$key . 'id'][$i] = $product_quote->id;
+                    $_POST[$key.'id'][$i] = $product_quote->id;
                 }
             }
         }

modules/Reminders/Reminder.php

Spacing +9 added lines, -9 removed lines

@@ -322,7 +322,7 @@ 
                             $timeRemind = $popupReminder->timer_popup;
                             $timeStart -= $timeRemind;
 
-                            $url = 'index.php?action=DetailView&module=' . $popupReminder->related_event_module . '&record=' . $popupReminder->related_event_module_id;
+                            $url = 'index.php?action=DetailView&module='.$popupReminder->related_event_module.'&record='.$popupReminder->related_event_module_id;
                             $instructions = $app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING_MSG'];
 
                             if ($popupReminder->related_event_module == 'Meetings') {
@@ -342,8 +342,8 @@ 
 
                             $relatedToMeeting = $alert->getRelatedName($popupReminder->related_event_module, $popupReminder->related_event_module_id);
 
-                            $description = empty($desc1) ? '' : $app_strings['MSG_JS_ALERT_MTG_REMINDER_AGENDA'] . $desc1 . "\n";
-                            $description = $description . "\n" . $app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'] . (isset($relatedEvent->status) ? $relatedEvent->status : '') . "\n" . $app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO'] . $relatedToMeeting;
+                            $description = empty($desc1) ? '' : $app_strings['MSG_JS_ALERT_MTG_REMINDER_AGENDA'].$desc1."\n";
+                            $description = $description."\n".$app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'].(isset($relatedEvent->status) ? $relatedEvent->status : '')."\n".$app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO'].$relatedToMeeting;
 
 
                             if (isset($relatedEvent->date_start)) {
@@ -361,9 +361,9 @@ 
 
                             // standard functionality
                             $alert->addAlert($app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING'], $meetingName,
-                                $app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'] . $time,
-                                $app_strings['MSG_JS_ALERT_MTG_REMINDER_LOC'] . $location .
-                                $description .
+                                $app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'].$time,
+                                $app_strings['MSG_JS_ALERT_MTG_REMINDER_LOC'].$location.
+                                $description.
                                 $instructions,
                                 $timeStart - strtotime($alertDateTimeNow),
                                 $url
@@ -426,7 +426,7 @@ 
 
     private function upgradeEventPersonQuery(SugarBean $event, $person_table)
     {
-        $eventIdField = strtolower($event->object_name) . '_id';
+        $eventIdField = strtolower($event->object_name).'_id';
         $query = "
 			SELECT * FROM {$event->table_name}_{$person_table}
 			WHERE
@@ -440,9 +440,9 @@ 
     {
         $eventIdField = array_search($event->table_name, $event->relationship_fields);
         if (!$eventIdField) {
-            $eventIdField = strtolower($event->object_name . '_id');
+            $eventIdField = strtolower($event->object_name.'_id');
         }
-        $personIdField = strtolower($person->object_name) . '_id';
+        $personIdField = strtolower($person->object_name).'_id';
         $query = "
 			SELECT * FROM {$event->table_name}_{$person->table_name}
 			WHERE

modules/AOR_Reports/controller.php

Spacing +148 added lines, -148 removed lines

@@ -31,19 +31,19 @@ 
     protected function action_getModuleFields()
     {
         if (!empty($_REQUEST['aor_module']) && $_REQUEST['aor_module'] != '') {
-            if(isset($_REQUEST['rel_field']) &&  $_REQUEST['rel_field'] != ''){
-                $module = getRelatedModule($_REQUEST['aor_module'],$_REQUEST['rel_field']);
+            if (isset($_REQUEST['rel_field']) && $_REQUEST['rel_field'] != '') {
+                $module = getRelatedModule($_REQUEST['aor_module'], $_REQUEST['rel_field']);
             } else {
                 $module = $_REQUEST['aor_module'];
             }
             $val = !empty($_REQUEST['aor_value']) ? $_REQUEST['aor_value'] : '';
-            echo getModuleFields($module,$_REQUEST['view'],$val);
+            echo getModuleFields($module, $_REQUEST['view'], $val);
         }
         die;
 
     }
-    function action_getVarDefs(){
-        if($_REQUEST['aor_module']){
+    function action_getVarDefs() {
+        if ($_REQUEST['aor_module']) {
             $bean = BeanFactory::getBean($_REQUEST['aor_module']);
             echo json_encode((array)$bean->field_defs[$_REQUEST['aor_request']]);
             die();
@@ -69,11 +69,11 @@ 
         die;
     }
 
-    protected function action_changeReportPage(){
+    protected function action_changeReportPage() {
         $tableId = !empty($_REQUEST['table_id']) ? $_REQUEST['table_id'] : '';
         $group = !empty($_REQUEST['group']) ? $_REQUEST['group'] : '';
         $offset = !empty($_REQUEST['offset']) ? $_REQUEST['offset'] : 0;
-        if(!empty($this->bean->id)){
+        if (!empty($this->bean->id)) {
             $this->bean->user_parameters = requestToUserParameters();
             //echo $this->bean->build_report_html($offset, true,$group,$tableId);
             echo $this->bean->build_group_report($offset, true);
@@ -82,17 +82,17 @@ 
         die();
     }
 
-    protected function action_getParametersForReport(){
-        if(empty($_REQUEST['record'])){
+    protected function action_getParametersForReport() {
+        if (empty($_REQUEST['record'])) {
             echo json_encode(array());
             return;
         }
-        $report = BeanFactory::getBean('AOR_Reports',$_REQUEST['record']);
-        if(!$report){
+        $report = BeanFactory::getBean('AOR_Reports', $_REQUEST['record']);
+        if (!$report) {
             echo json_encode(array());
             return;
         }
-        if(empty($report->id)) {
+        if (empty($report->id)) {
             echo json_encode(array());
             return;
         }
@@ -100,24 +100,24 @@ 
         echo json_encode($conditions);
     }
 
-    protected function action_getChartsForReport(){
-        if(empty($_REQUEST['record'])){
+    protected function action_getChartsForReport() {
+        if (empty($_REQUEST['record'])) {
             echo json_encode(array());
             return;
         }
-        $report = BeanFactory::getBean('AOR_Reports',$_REQUEST['record']);
-        if(!$report){
+        $report = BeanFactory::getBean('AOR_Reports', $_REQUEST['record']);
+        if (!$report) {
             echo json_encode(array());
             return;
         }
         $charts = array();
-        foreach($report->get_linked_beans('aor_charts','AOR_Charts') as $chart){
+        foreach ($report->get_linked_beans('aor_charts', 'AOR_Charts') as $chart) {
             $charts[$chart->id] = $chart->name;
         }
         echo json_encode($charts);
     }
 
-    protected function action_addToProspectList(){
+    protected function action_addToProspectList() {
         global $beanList;
 
         require_once('modules/Relationships/Relationship.php');
@@ -135,13 +135,13 @@ 
             $result = $this->bean->db->query($sql);
             $beans = array();
             while ($row = $this->bean->db->fetchByAssoc($result)) {
-                if (isset($row[$module->table_name.'_id'])){
+                if (isset($row[$module->table_name.'_id'])) {
                     $beans[] = $row[$module->table_name.'_id'];
                 }
             }
-            if(!empty($beans)){
-                foreach($prospectList->field_defs as $field=>$def){
-                    if($def['type'] == 'link' && !empty($def['relationship']) && $def['relationship'] == $key){
+            if (!empty($beans)) {
+                foreach ($prospectList->field_defs as $field=>$def) {
+                    if ($def['type'] == 'link' && !empty($def['relationship']) && $def['relationship'] == $key) {
                         $prospectList->load_relationship($field);
                         $prospectList->$field->add($beans);
                     }
@@ -170,41 +170,41 @@ 
         error_reporting(0);
         require_once('modules/AOS_PDF_Templates/PDF_Lib/mpdf.php');
 
-        $d_image = explode('?',SugarThemeRegistry::current()->getImageURL('company_logo.png'));
+        $d_image = explode('?', SugarThemeRegistry::current()->getImageURL('company_logo.png'));
         $graphs = $_POST["graphsForPDF"];
         $graphHtml = "<div class='reportGraphs' style='width:100%; text-align:center;'>";
 
         $chartsPerRow = $this->bean->graphs_per_row;
         $countOfCharts = count($graphs);
-        if($countOfCharts > 0)
+        if ($countOfCharts > 0)
         {
-            $width = ((int)100/$chartsPerRow);
+            $width = ((int)100 / $chartsPerRow);
 
             $modulusRemainder = $countOfCharts % $chartsPerRow;
 
-            if($modulusRemainder > 0)
+            if ($modulusRemainder > 0)
             {
-                $modulusWidth = ((int)100/$modulusRemainder);
+                $modulusWidth = ((int)100 / $modulusRemainder);
                 $itemsWithModulus = $countOfCharts - $modulusRemainder;
             }
 
 
-            for($x =0; $x < $countOfCharts; $x++)
+            for ($x = 0; $x < $countOfCharts; $x++)
             {
-                if(is_null($itemsWithModulus) ||  $x < $itemsWithModulus)
-                    $graphHtml.="<img src='.$graphs[$x].' style='width:$width%;' />";
+                if (is_null($itemsWithModulus) || $x < $itemsWithModulus)
+                    $graphHtml .= "<img src='.$graphs[$x].' style='width:$width%;' />";
                 else
-                    $graphHtml.="<img src='.$graphs[$x].' style='width:$modulusWidth%;' />";
+                    $graphHtml .= "<img src='.$graphs[$x].' style='width:$modulusWidth%;' />";
             }
 
 /*            foreach($graphs as $g)
             {
                 $graphHtml.="<img src='.$g.' style='width:$width%;' />";
             }*/
-            $graphHtml.="</div>";
+            $graphHtml .= "</div>";
         }
 
-        $head =  '<table style="width: 100%; font-family: Arial; text-align: center;" border="0" cellpadding="2" cellspacing="2">
+        $head = '<table style="width: 100%; font-family: Arial; text-align: center;" border="0" cellpadding="2" cellspacing="2">
                 <tbody style="text-align: left;">
                 <tr style="text-align: left;">
                 <td style="text-align: left;">
@@ -229,25 +229,25 @@ 
 
         $this->bean->user_parameters = requestToUserParameters();
 
-        $printable = $this->bean->build_group_report(-1,false);
-        $stylesheet = file_get_contents(SugarThemeRegistry::current()->getCSSURL('style.css',false));
+        $printable = $this->bean->build_group_report(-1, false);
+        $stylesheet = file_get_contents(SugarThemeRegistry::current()->getCSSURL('style.css', false));
         ob_clean();
-        try{
-            $pdf=new mPDF('en','A4','','DejaVuSansCondensed');
+        try {
+            $pdf = new mPDF('en', 'A4', '', 'DejaVuSansCondensed');
             $pdf->setAutoFont();
-            $pdf->WriteHTML($stylesheet,1);
-            $pdf->WriteHTML($head,2);
-            $pdf->WriteHTML($printable,3);
+            $pdf->WriteHTML($stylesheet, 1);
+            $pdf->WriteHTML($head, 2);
+            $pdf->WriteHTML($printable, 3);
             $pdf->Output($this->bean->name.'.pdf', "D");
 
-        }catch(mPDF_exception $e){
+        }catch (mPDF_exception $e) {
             echo $e;
         }
 
         die;
     }
 
-    protected function action_getModuleFunctionField(){
+    protected function action_getModuleFunctionField() {
         global $app_list_strings;
 
         $view = $_REQUEST['view'];
@@ -256,31 +256,31 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if($view == 'EditView'){
-            echo "<select type='text' style='width:100px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_function_list'], $value) ."</select>";
-        }else{
+        if ($view == 'EditView') {
+            echo "<select type='text' style='width:100px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>".get_select_options_with_id($app_list_strings['aor_function_list'], $value)."</select>";
+        } else {
             echo $app_list_strings['aor_function_list'][$value];
         }
         die;
     }
 
 
-    protected function action_getModuleOperatorField(){
+    protected function action_getModuleOperatorField() {
 
         global $app_list_strings, $beanFiles, $beanList;
 
-        if(isset($_REQUEST['rel_field']) &&  $_REQUEST['rel_field'] != ''){
-            $module = getRelatedModule($_REQUEST['aor_module'],$_REQUEST['rel_field']);
+        if (isset($_REQUEST['rel_field']) && $_REQUEST['rel_field'] != '') {
+            $module = getRelatedModule($_REQUEST['aor_module'], $_REQUEST['rel_field']);
         } else {
             $module = $_REQUEST['aor_module'];
         }
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if (isset($_REQUEST['view'])) $view = $_REQUEST['view'];
+        else $view = 'EditView';
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
+        if (isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
         else $value = '';
 
 
@@ -288,12 +288,12 @@ 
         $focus = new $beanList[$module];
         $vardef = $focus->getFieldDefinition($fieldname);
 
-        switch($vardef['type']) {
+        switch ($vardef['type']) {
             case 'double':
             case 'decimal':
             case 'float':
             case 'currency':
-                $valid_opp = array('Equal_To','Not_Equal_To','Greater_Than','Less_Than','Greater_Than_or_Equal_To','Less_Than_or_Equal_To');
+                $valid_opp = array('Equal_To', 'Not_Equal_To', 'Greater_Than', 'Less_Than', 'Greater_Than_or_Equal_To', 'Less_Than_or_Equal_To');
                 break;
             case 'uint':
             case 'ulong':
@@ -301,24 +301,24 @@ 
             case 'short':
             case 'tinyint':
             case 'int':
-                $valid_opp = array('Equal_To','Not_Equal_To','Greater_Than','Less_Than','Greater_Than_or_Equal_To','Less_Than_or_Equal_To');
+                $valid_opp = array('Equal_To', 'Not_Equal_To', 'Greater_Than', 'Less_Than', 'Greater_Than_or_Equal_To', 'Less_Than_or_Equal_To');
                 break;
             case 'date':
             case 'datetime':
             case 'datetimecombo':
-                $valid_opp = array('Equal_To','Not_Equal_To','Greater_Than','Less_Than','Greater_Than_or_Equal_To','Less_Than_or_Equal_To');
+                $valid_opp = array('Equal_To', 'Not_Equal_To', 'Greater_Than', 'Less_Than', 'Greater_Than_or_Equal_To', 'Less_Than_or_Equal_To');
                 break;
             case 'enum':
             case 'multienum':
-                $valid_opp = array('Equal_To','Not_Equal_To');
+                $valid_opp = array('Equal_To', 'Not_Equal_To');
                 break;
             default:
-                $valid_opp = array('Equal_To','Not_Equal_To','Contains', 'Starts_With', 'Ends_With',);
+                $valid_opp = array('Equal_To', 'Not_Equal_To', 'Contains', 'Starts_With', 'Ends_With',);
                 break;
         }
 
-        foreach($app_list_strings['aor_operator_list'] as $key => $keyValue){
-            if(!in_array($key, $valid_opp)){
+        foreach ($app_list_strings['aor_operator_list'] as $key => $keyValue) {
+            if (!in_array($key, $valid_opp)) {
                 unset($app_list_strings['aor_operator_list'][$key]);
             }
         }
@@ -326,31 +326,31 @@ 
 
 
         $app_list_strings['aor_operator_list'];
-        if($view == 'EditView'){
-            echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_operator_list'], $value) ."</select>";
-        }else{
+        if ($view == 'EditView') {
+            echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>".get_select_options_with_id($app_list_strings['aor_operator_list'], $value)."</select>";
+        } else {
             echo $app_list_strings['aor_operator_list'][$value];
         }
         die;
 
     }
 
-    protected function action_getFieldTypeOptions(){
+    protected function action_getFieldTypeOptions() {
 
         global $app_list_strings, $beanFiles, $beanList;
 
-        if(isset($_REQUEST['rel_field']) &&  $_REQUEST['rel_field'] != ''){
-            $module = getRelatedModule($_REQUEST['aor_module'],$_REQUEST['rel_field']);
+        if (isset($_REQUEST['rel_field']) && $_REQUEST['rel_field'] != '') {
+            $module = getRelatedModule($_REQUEST['aor_module'], $_REQUEST['rel_field']);
         } else {
             $module = $_REQUEST['aor_module'];
         }
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if (isset($_REQUEST['view'])) $view = $_REQUEST['view'];
+        else $view = 'EditView';
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
+        if (isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
         else $value = '';
 
 
@@ -358,12 +358,12 @@ 
         $focus = new $beanList[$module];
         $vardef = $focus->getFieldDefinition($fieldname);
 
-        switch($vardef['type']) {
+        switch ($vardef['type']) {
             case 'double':
             case 'decimal':
             case 'float':
             case 'currency':
-                $valid_opp = array('Value','Field');
+                $valid_opp = array('Value', 'Field');
                 break;
             case 'uint':
             case 'ulong':
@@ -371,50 +371,50 @@ 
             case 'short':
             case 'tinyint':
             case 'int':
-                $valid_opp = array('Value','Field');
+                $valid_opp = array('Value', 'Field');
                 break;
             case 'date':
             case 'datetime':
             case 'datetimecombo':
-                $valid_opp = array('Value','Field', 'Date', 'Period');
+                $valid_opp = array('Value', 'Field', 'Date', 'Period');
                 break;
             case 'enum':
             case 'dynamicenum':
             case 'multienum':
-                $valid_opp = array('Value','Field', 'Multi');
+                $valid_opp = array('Value', 'Field', 'Multi');
                 break;
             default:
                 // Added to compare fields like assinged to with the current user
-                if( (isset($vardef['module']) && $vardef['module'] == "Users") || $vardef['name'] = 'id') {
-                    $valid_opp = array('Value','Field', 'CurrentUserID');
+                if ((isset($vardef['module']) && $vardef['module'] == "Users") || $vardef['name'] = 'id') {
+                    $valid_opp = array('Value', 'Field', 'CurrentUserID');
                 } else {
-                    $valid_opp = array('Value','Field');
+                    $valid_opp = array('Value', 'Field');
                 }
 
                 break;
         }
 
-        foreach($app_list_strings['aor_condition_type_list'] as $key => $keyValue){
-            if(!in_array($key, $valid_opp)){
+        foreach ($app_list_strings['aor_condition_type_list'] as $key => $keyValue) {
+            if (!in_array($key, $valid_opp)) {
                 unset($app_list_strings['aor_condition_type_list'][$key]);
             }
         }
 
-        if($view == 'EditView'){
-            echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_condition_type_list'], $value) ."</select>";
-        }else{
+        if ($view == 'EditView') {
+            echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>".get_select_options_with_id($app_list_strings['aor_condition_type_list'], $value)."</select>";
+        } else {
             echo $app_list_strings['aor_condition_type_list'][$value];
         }
         die;
 
     }
 
-    protected function action_getActionFieldTypeOptions(){
+    protected function action_getActionFieldTypeOptions() {
 
         global $app_list_strings, $beanFiles, $beanList;
 
-        if(isset($_REQUEST['rel_field']) &&  $_REQUEST['rel_field'] != ''){
-            $module = getRelatedModule($_REQUEST['aor_module'],$_REQUEST['rel_field']);
+        if (isset($_REQUEST['rel_field']) && $_REQUEST['rel_field'] != '') {
+            $module = getRelatedModule($_REQUEST['aor_module'], $_REQUEST['rel_field']);
         } else {
             $module = $_REQUEST['aor_module'];
         }
@@ -422,10 +422,10 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if (isset($_REQUEST['view'])) $view = $_REQUEST['view'];
+        else $view = 'EditView';
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
+        if (isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
         else $value = '';
 
 
@@ -433,12 +433,12 @@ 
         $focus = new $beanList[$module];
         $vardef = $focus->getFieldDefinition($fieldname);
 
-        switch($vardef['type']) {
+        switch ($vardef['type']) {
             case 'double':
             case 'decimal':
             case 'float':
             case 'currency':
-                $valid_opp = array('Value','Field');
+                $valid_opp = array('Value', 'Field');
                 break;
             case 'uint':
             case 'ulong':
@@ -446,35 +446,35 @@ 
             case 'short':
             case 'tinyint':
             case 'int':
-                $valid_opp = array('Value','Field');
+                $valid_opp = array('Value', 'Field');
                 break;
             case 'date':
             case 'datetime':
             case 'datetimecombo':
-                $valid_opp = array('Value','Field', 'Date');
+                $valid_opp = array('Value', 'Field', 'Date');
                 break;
             case 'enum':
             case 'multienum':
-                $valid_opp = array('Value','Field');
+                $valid_opp = array('Value', 'Field');
                 break;
             case 'relate':
-                $valid_opp = array('Value','Field');
-                if($vardef['module'] == 'Users') $valid_opp = array('Value','Field','Round_Robin','Least_Busy','Random');
+                $valid_opp = array('Value', 'Field');
+                if ($vardef['module'] == 'Users') $valid_opp = array('Value', 'Field', 'Round_Robin', 'Least_Busy', 'Random');
                 break;
             default:
-                $valid_opp = array('Value','Field');
+                $valid_opp = array('Value', 'Field');
                 break;
         }
 
-        foreach($app_list_strings['aor_action_type_list'] as $key => $keyValue){
-            if(!in_array($key, $valid_opp)){
+        foreach ($app_list_strings['aor_action_type_list'] as $key => $keyValue) {
+            if (!in_array($key, $valid_opp)) {
                 unset($app_list_strings['aor_action_type_list'][$key]);
             }
         }
 
-        if($view == 'EditView'){
-            echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_action_type_list'], $value) ."</select>";
-        }else{
+        if ($view == 'EditView') {
+            echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>".get_select_options_with_id($app_list_strings['aor_action_type_list'], $value)."</select>";
+        } else {
             echo $app_list_strings['aor_action_type_list'][$value];
         }
         die;
@@ -483,8 +483,8 @@ 
 
     protected function action_getModuleFieldType()
     {
-        if(isset($_REQUEST['rel_field']) &&  $_REQUEST['rel_field'] != ''){
-            $rel_module = getRelatedModule($_REQUEST['aor_module'],$_REQUEST['rel_field']);
+        if (isset($_REQUEST['rel_field']) && $_REQUEST['rel_field'] != '') {
+            $rel_module = getRelatedModule($_REQUEST['aor_module'], $_REQUEST['rel_field']);
         } else {
             $rel_module = $_REQUEST['aor_module'];
         }
@@ -493,18 +493,18 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if (isset($_REQUEST['view'])) $view = $_REQUEST['view'];
+        else $view = 'EditView';
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
+        if (isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
         else $value = '';
 
-        switch($_REQUEST['aor_type']) {
+        switch ($_REQUEST['aor_type']) {
             case 'Field':
-                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
-                if($view == 'EditView'){
-                    echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". getModuleFields($module, $view, $value) ."</select>";
-                }else{
+                if (isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
+                if ($view == 'EditView') {
+                    echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>".getModuleFields($module, $view, $value)."</select>";
+                } else {
                     echo getModuleFields($module, $view, $value);
                 }
                 break;
@@ -512,13 +512,13 @@ 
                 echo getDateField($module, $aor_field, $view, $value, false);
                 break;
             case 'Multi':
-                echo getModuleField($rel_module,$fieldname, $aor_field, $view, $value,'multienum');
+                echo getModuleField($rel_module, $fieldname, $aor_field, $view, $value, 'multienum');
                 break;
             case 'Period':
-                if($view == 'EditView'){
-                    echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". getDropdownList('date_time_period_list',$_REQUEST['aor_value']) ."</select>";
-                }else{
-                    echo getDropdownList('date_time_period_list',$_REQUEST['aor_value']);
+                if ($view == 'EditView') {
+                    echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>".getDropdownList('date_time_period_list', $_REQUEST['aor_value'])."</select>";
+                } else {
+                    echo getDropdownList('date_time_period_list', $_REQUEST['aor_value']);
                 }
 
                 break;
@@ -526,7 +526,7 @@ 
                 break;
             case 'Value':
             default:
-                echo getModuleField($rel_module,$fieldname, $aor_field, $view, $value );
+                echo getModuleField($rel_module, $fieldname, $aor_field, $view, $value);
                 break;
         }
         die;
@@ -539,23 +539,23 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if (isset($_REQUEST['view'])) $view = $_REQUEST['view'];
+        else $view = 'EditView';
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
+        if (isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
         else $value = '';
 
-        switch($_REQUEST['aor_type']) {
+        switch ($_REQUEST['aor_type']) {
             case 'Field':
-                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
-                if($view == 'EditView'){
-                    echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". getModuleFields($module, $view, $value) ."</select>";
-                }else{
+                if (isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
+                if ($view == 'EditView') {
+                    echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>".getModuleFields($module, $view, $value)."</select>";
+                } else {
                     echo getModuleFields($module, $view, $value);
                 }
                 break;
             case 'Date':
-                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
+                if (isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
                 echo getDateField($module, $aor_field, $view, $value);
                 break;
             Case 'Round_Robin';
@@ -565,7 +565,7 @@ 
                 break;
             case 'Value':
             default:
-                echo getModuleField($module,$fieldname, $aor_field, $view, $value );
+                echo getModuleField($module, $fieldname, $aor_field, $view, $value);
                 break;
         }
         die;
@@ -574,13 +574,13 @@ 
 
     protected function action_getModuleField()
     {
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if (isset($_REQUEST['view'])) $view = $_REQUEST['view'];
+        else $view = 'EditView';
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
+        if (isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
         else $value = '';
 
-        echo getModuleField($_REQUEST['aor_module'],$_REQUEST['aor_fieldname'], $_REQUEST['aor_newfieldname'], $view, $value );
+        echo getModuleField($_REQUEST['aor_module'], $_REQUEST['aor_fieldname'], $_REQUEST['aor_newfieldname'], $view, $value);
         die;
     }
 
@@ -590,31 +590,31 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if (isset($_REQUEST['view'])) $view = $_REQUEST['view'];
+        else $view = 'EditView';
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
+        if (isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
         else $value = '';
 
-        switch($_REQUEST['aor_type']) {
+        switch ($_REQUEST['aor_type']) {
             case 'Field':
-                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
-                if($view == 'EditView'){
-                    echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". getModuleFields($module, $view, $value) ."</select>";
-                }else{
+                if (isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
+                if ($view == 'EditView') {
+                    echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>".getModuleFields($module, $view, $value)."</select>";
+                } else {
                     echo getModuleFields($module, $view, $value);
                 }
                 break;
             case 'Value':
             default:
-                echo getModuleField($module,$fieldname, $aor_field, $view, $value );
+                echo getModuleField($module, $fieldname, $aor_field, $view, $value);
                 break;
         }
         die;
 
     }
 
-    protected function action_getRelActionFieldTypeOptions(){
+    protected function action_getRelActionFieldTypeOptions() {
 
         global $app_list_strings, $beanFiles, $beanList;
 
@@ -623,10 +623,10 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if (isset($_REQUEST['view'])) $view = $_REQUEST['view'];
+        else $view = 'EditView';
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
+        if (isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
         else $value = '';
 
 
@@ -643,15 +643,15 @@ 
         }*/
         $valid_opp = array('Value');
 
-        foreach($app_list_strings['aor_rel_action_type_list'] as $key => $keyValue){
-            if(!in_array($key, $valid_opp)){
+        foreach ($app_list_strings['aor_rel_action_type_list'] as $key => $keyValue) {
+            if (!in_array($key, $valid_opp)) {
                 unset($app_list_strings['aor_rel_action_type_list'][$key]);
             }
         }
 
-        if($view == 'EditView'){
-            echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_rel_action_type_list'], $value) ."</select>";
-        }else{
+        if ($view == 'EditView') {
+            echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>".get_select_options_with_id($app_list_strings['aor_rel_action_type_list'], $value)."</select>";
+        } else {
             echo $app_list_strings['aor_rel_action_type_list'][$value];
         }
         die;

modules/AOR_Reports/AOR_Report.php

Spacing +257 added lines, -257 removed lines

@@ -28,7 +28,7 @@ 
 	var $object_name = 'AOR_Report';
 	var $table_name = 'aor_reports';
 	var $importable = true;
-	var $disable_row_level_security = true ;
+	var $disable_row_level_security = true;
 
 	var $id;
 	var $name;
@@ -47,25 +47,25 @@ 
 	var $assigned_user_link;
 	var $report_module;
 
-	function AOR_Report(){
+	function AOR_Report() {
 		parent::Basic();
         $this->load_report_beans();
         require_once('modules/AOW_WorkFlow/aow_utils.php');
 	}
 
-	function bean_implements($interface){
-		switch($interface){
+	function bean_implements($interface) {
+		switch ($interface) {
 			case 'ACL': return true;
 		}
 		return false;
 	}
 
-    function save($check_notify = FALSE){
+    function save($check_notify = FALSE) {
 
         // TODO: process of saveing the fields and conditions is too long so we will have to make some optimization on save_lines functions
         set_time_limit(3600);
 
-        if (empty($this->id)){
+        if (empty($this->id)) {
             unset($_POST['aor_conditions_id']);
             unset($_POST['aor_fields_id']);
         }
@@ -85,13 +85,13 @@ 
         $chart->save_lines($_POST, $this, 'aor_chart_');
     }
 
-    function load_report_beans(){
+    function load_report_beans() {
         global $beanList, $app_list_strings;
 
         $app_list_strings['aor_moduleList'] = $app_list_strings['moduleList'];
 
-        foreach($app_list_strings['aor_moduleList'] as $mkey => $mvalue){
-            if(!isset($beanList[$mkey]) || str_begin($mkey, 'AOR_') || str_begin($mkey, 'AOW_')){
+        foreach ($app_list_strings['aor_moduleList'] as $mkey => $mvalue) {
+            if (!isset($beanList[$mkey]) || str_begin($mkey, 'AOR_') || str_begin($mkey, 'AOW_')) {
                 unset($app_list_strings['aor_moduleList'][$mkey]);
             }
         }
@@ -102,12 +102,12 @@ 
     }
 
 
-    function getReportFields(){
+    function getReportFields() {
         $fields = array();
-        foreach($this->get_linked_beans('aor_fields','AOR_Fields') as $field){
+        foreach ($this->get_linked_beans('aor_fields', 'AOR_Fields') as $field) {
             $fields[] = $field;
         }
-        usort($fields,function($a,$b){
+        usort($fields, function($a, $b) {
             return $a->field_order - $b->field_order;
         });
         return $fields;
@@ -118,10 +118,10 @@ 
     const CHART_TYPE_RGRAPH = 'rgraph';
 
 
-    function build_report_chart($chartIds = null, $chartType = self::CHART_TYPE_PCHART){
+    function build_report_chart($chartIds = null, $chartType = self::CHART_TYPE_PCHART) {
         global $beanList;
-        $linkedCharts = $this->get_linked_beans('aor_charts','AOR_Charts');
-	if(!$linkedCharts){
+        $linkedCharts = $this->get_linked_beans('aor_charts', 'AOR_Charts');
+	if (!$linkedCharts) {
             //No charts to display
             return '';
         }
@@ -145,16 +145,16 @@ 
 
             $field_module = $this->report_module;
             $field_alias = $field_bean->table_name;
-            if($path[0] != $this->report_module){
-                foreach($path as $rel){
-                    if(empty($rel)){
+            if ($path[0] != $this->report_module) {
+                foreach ($path as $rel) {
+                    if (empty($rel)) {
                         continue;
                     }
-                    $field_module = getRelatedModule($field_module,$rel);
-                    $field_alias = $field_alias . ':'.$rel;
+                    $field_module = getRelatedModule($field_module, $rel);
+                    $field_alias = $field_alias.':'.$rel;
                 }
             }
-            $label = str_replace(' ','_',$field->label).$i;
+            $label = str_replace(' ', '_', $field->label).$i;
             $fields[$label]['field'] = $field->field;
             $fields[$label]['label'] = $field->label;
             $fields[$label]['display'] = $field->display;
@@ -169,10 +169,10 @@ 
 
             // get the main group
 
-            if($field->group_display) {
+            if ($field->group_display) {
 
                 // if we have a main group already thats wrong cause only one main grouping field possible
-                if(!is_null($mainGroupField)) {
+                if (!is_null($mainGroupField)) {
                     $GLOBALS['log']->fatal('main group already found');
                 }
 
@@ -187,18 +187,18 @@ 
         $query = $this->build_report_query();
         $result = $this->db->query($query);
         $data = array();
-        while($row = $this->db->fetchByAssoc($result, false))
+        while ($row = $this->db->fetchByAssoc($result, false))
         {
-            foreach($fields as $name => $att){
+            foreach ($fields as $name => $att) {
 
                 $currency_id = isset($row[$att['alias'].'_currency_id']) ? $row[$att['alias'].'_currency_id'] : '';
 
-                switch ($att['function']){
+                switch ($att['function']) {
                     case 'COUNT':
                         break;
                     default:
-                        if(!is_numeric($row[$name])) {
-                            $row[$name] = trim(strip_tags(getModuleField($att['module'], $att['field'], $att['field'], 'DetailView', $row[$name], '', $currency_id,$att['params'])));
+                        if (!is_numeric($row[$name])) {
+                            $row[$name] = trim(strip_tags(getModuleField($att['module'], $att['field'], $att['field'], 'DetailView', $row[$name], '', $currency_id, $att['params'])));
 
                         }
                         break;
@@ -208,7 +208,7 @@ 
         }
         $fields = $this->getReportFields();
 
-        switch($chartType) {
+        switch ($chartType) {
             case self::CHART_TYPE_PCHART:
                 $html = '<script src="modules/AOR_Charts/lib/pChart/imagemap.js"></script>';
                 break;
@@ -216,17 +216,17 @@ 
                 $html = '<script src="modules/AOR_Reports/js/Chart.js"></script>';
                 break;
             case self::CHART_TYPE_RGRAPH:
-                if($_REQUEST['module']!= 'Home')//Need the require_once for the rgraphincludes as they are only loaded when the home page is hit
+                if ($_REQUEST['module'] != 'Home')//Need the require_once for the rgraphincludes as they are only loaded when the home page is hit
                     require_once('include/SuiteGraphs/RGraphIncludes.php');
 
                 break;
         }
         $x = 0;
-        foreach($linkedCharts as $chart){
-            if($chartIds !== null && !in_array($chart->id,$chartIds)){
+        foreach ($linkedCharts as $chart) {
+            if ($chartIds !== null && !in_array($chart->id, $chartIds)) {
                 continue;
             }
-            $html .= $chart->buildChartHTML($data,$fields,$x, $chartType, $mainGroupField);
+            $html .= $chart->buildChartHTML($data, $fields, $x, $chartType, $mainGroupField);
             $x++;
         }
         return $html;
@@ -238,12 +238,12 @@ 
 
         $rows = $this->getGroupDisplayFieldByReportId($this->id, $level);
 
-        if(count($rows) > 1) {
-            $GLOBALS['log']->fatal('ambiguous group display for report ' . $this->id);
+        if (count($rows) > 1) {
+            $GLOBALS['log']->fatal('ambiguous group display for report '.$this->id);
         }
-        else if(count($rows) == 1){
+        else if (count($rows) == 1) {
             $rows[0]['module_path'] = unserialize(base64_decode($rows[0]['module_path']));
-            if(!$rows[0]['module_path'][0]) {
+            if (!$rows[0]['module_path'][0]) {
                 $module = new $beanList[$this->report_module]();
                 $rows[0]['field_id_name'] = $module->field_defs[$rows[0]['field']]['id_name'] ? $module->field_defs[$rows[0]['field']]['id_name'] : $module->field_defs[$rows[0]['field']]['name'];
                 $rows[0]['module_path'][0] = $module->table_name;
@@ -253,23 +253,23 @@ 
             }
             $path[] = $rows[0];
 
-            if($level>10) {
+            if ($level > 10) {
                 $msg = 'Too many nested groups';
                 $GLOBALS['log']->fatal($msg);
                 return null;
             }
 
-            return $this->buildMultiGroupReport($offset, $links, $level+1, $path);
+            return $this->buildMultiGroupReport($offset, $links, $level + 1, $path);
         }
-        else if(!$rows) {
-            if($path) {
+        else if (!$rows) {
+            if ($path) {
                 $html = '';
                 foreach ($path as $pth) {
                     $_fieldIdName = $this->db->quoteIdentifier($pth['field_id_name']);
-                    $query = "SELECT $_fieldIdName FROM " . $this->db->quoteIdentifier($pth['module_path'][0]) . " GROUP BY $_fieldIdName;";
+                    $query = "SELECT $_fieldIdName FROM ".$this->db->quoteIdentifier($pth['module_path'][0])." GROUP BY $_fieldIdName;";
                     $values = $this->dbSelect($query);
 
-                    foreach($values as $value) {
+                    foreach ($values as $value) {
 
                         //$where = [ $this->db->quote($pth['module_path'][0]) . '.' . $_fieldIdName . ' = \'' . $this->db->quote($value[$pth['field_id_name']]) . '\'' ];
 
@@ -305,7 +305,7 @@ 
         // escape values for query
 
         $_id = $this->db->quote($reportId);
-        $_level = (int) $level;
+        $_level = (int)$level;
 
         // get results array
 
@@ -320,7 +320,7 @@ 
         $results = $this->db->query($query);
 
         $rows = array();
-        while($row = $this->db->fetchByAssoc($results)) {
+        while ($row = $this->db->fetchByAssoc($results)) {
             $rows[] = $row;
         }
 
@@ -329,20 +329,20 @@ 
 
     private function getMultiGroupFrameHTML($header, $body) {
         $html = '<div class="multi-group-list" style="border: 1px solid black; padding: 10px;">
-                    <h3>' . $header . '</h3>
-                    <div class="multi-group-list-inner">' . $body . '</div>
+                    <h3>' . $header.'</h3>
+                    <div class="multi-group-list-inner">' . $body.'</div>
                 </div>';
         return $html;
     }
 
     private function addDataIdValueToInnertext($html) {
         preg_match('/\sdata-id-value\s*=\s*"([^"]*)"/', $html, $match);
-        $html = preg_replace('/(>)([^<]*)(<\/\w+>$)/', '$1$2' . $match[1] . '$3', $html);
+        $html = preg_replace('/(>)([^<]*)(<\/\w+>$)/', '$1$2'.$match[1].'$3', $html);
         return $html;
     }
 
 
-    function build_group_report($offset = -1, $links = true, $extra = array()){
+    function build_group_report($offset = -1, $links = true, $extra = array()) {
         global $beanList;
 
         $html = '';
@@ -353,23 +353,23 @@ 
         $sql = "SELECT id FROM aor_fields WHERE aor_report_id = '".$this->id."' AND group_display = 1 AND deleted = 0 ORDER BY field_order ASC";
         $field_id = $this->db->getOne($sql);
 
-        if(!$field_id) {
-            $query_array['select'][] = $module->table_name . ".id AS '" . $module->table_name . "_id'";
+        if (!$field_id) {
+            $query_array['select'][] = $module->table_name.".id AS '".$module->table_name."_id'";
         }
 
-        if($field_id != ''){
+        if ($field_id != '') {
             $field = new AOR_Field();
             $field->retrieve($field_id);
 
-            $field_label = str_replace(' ','_',$field->label);
+            $field_label = str_replace(' ', '_', $field->label);
 
             $path = unserialize(base64_decode($field->module_path));
 
             $field_module = $module;
             $table_alias = $field_module->table_name;
-            if(!empty($path[0]) && $path[0] != $module->module_dir){
-                foreach($path as $rel){
-                    $new_field_module = new $beanList[getRelatedModule($field_module->module_dir,$rel)];
+            if (!empty($path[0]) && $path[0] != $module->module_dir) {
+                foreach ($path as $rel) {
+                    $new_field_module = new $beanList[getRelatedModule($field_module->module_dir, $rel)];
                     $oldAlias = $table_alias;
                     $table_alias = $table_alias.":".$rel;
 
@@ -383,71 +383,71 @@ 
 
             $data = $field_module->field_defs[$field->field];
 
-            if($data['type'] == 'relate' && isset($data['id_name'])) {
+            if ($data['type'] == 'relate' && isset($data['id_name'])) {
                 $field->field = $data['id_name'];
             }
 
-            if($data['type'] == 'currency' && !stripos($field->field, '_USD') && isset($field_module->field_defs['currency_id'])) {
-                if((isset($field_module->field_defs['currency_id']['source']) && $field_module->field_defs['currency_id']['source'] == 'custom_fields')) {
+            if ($data['type'] == 'currency' && !stripos($field->field, '_USD') && isset($field_module->field_defs['currency_id'])) {
+                if ((isset($field_module->field_defs['currency_id']['source']) && $field_module->field_defs['currency_id']['source'] == 'custom_fields')) {
                     $query['select'][$table_alias.'_currency_id'] = $table_alias.'_cstm'.".currency_id AS '".$table_alias."_currency_id'";
                 } else {
-                    $query_array['select'][$table_alias . '_currency_id'] = $table_alias . ".currency_id AS '" . $table_alias . "_currency_id'";
+                    $query_array['select'][$table_alias.'_currency_id'] = $table_alias.".currency_id AS '".$table_alias."_currency_id'";
                 }
             }
 
-            if(  (isset($data['source']) && $data['source'] == 'custom_fields')) {
+            if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
                 $select_field = $this->db->quoteIdentifier($table_alias.'_cstm').'.'.$field->field;
                 // ? $query_array = $this->build_report_query_join($table_alias.'_cstm', $table_alias.'_cstm',$table_alias, $field_module, 'custom', $query);
                 $query_array = $this->build_report_query_join($table_alias.'_cstm', $table_alias.'_cstm', $field_module, 'custom', $query);
             } else {
-                $select_field= $this->db->quoteIdentifier($table_alias).'.'.$field->field;
+                $select_field = $this->db->quoteIdentifier($table_alias).'.'.$field->field;
             }
 
-            if($field->sort_by != ''){
+            if ($field->sort_by != '') {
                 $query_array['sort_by'][] = $field_label.' '.$field->sort_by;
             }
 
-            if($field->group_by == 1){
+            if ($field->group_by == 1) {
                 $query_array['group_by'][] = $select_field;
             }
 
-            if($field->field_function != null){
+            if ($field->field_function != null) {
                 $select_field = $field->field_function.'('.$select_field.')';
             }
 
-            $query_array['select'][] = $select_field ." AS '".$field_label."'";
-            if(isset($extra['select']) && $extra['select']) {
-                foreach($extra['select'] as $selectField => $selectAlias) {
-                    if($selectAlias) {
-                        $query_array['select'][] = $selectField . " AS " . $selectAlias;
+            $query_array['select'][] = $select_field." AS '".$field_label."'";
+            if (isset($extra['select']) && $extra['select']) {
+                foreach ($extra['select'] as $selectField => $selectAlias) {
+                    if ($selectAlias) {
+                        $query_array['select'][] = $selectField." AS ".$selectAlias;
                     }
                     else {
                         $query_array['select'][] = $selectField;
                     }
                 }
             }
-            $query_array['where'][] = $select_field ." IS NOT NULL AND ";
-            if(isset($extra['where']) && $extra['where']) {
-                $query_array['where'][] = implode(' AND ', $extra['where']) . ' AND ';
+            $query_array['where'][] = $select_field." IS NOT NULL AND ";
+            if (isset($extra['where']) && $extra['where']) {
+                $query_array['where'][] = implode(' AND ', $extra['where']).' AND ';
             }
 
             $query_array = $this->build_report_query_where($query_array);
 
-            foreach ($query_array['select'] as $select){
-                $query .=  ($query == '' ? 'SELECT ' : ', ').$select;
+            foreach ($query_array['select'] as $select) {
+                $query .= ($query == '' ? 'SELECT ' : ', ').$select;
             }
 
             $query .= ' FROM '.$module->table_name.' ';
 
-            if(isset($query_array['join'])){
-                foreach ($query_array['join'] as $join){
+            if (isset($query_array['join'])) {
+                foreach ($query_array['join'] as $join) {
                     $query .= $join;
                 }
             }
-            if(isset($query_array['where'])){
+            if (isset($query_array['where'])) {
                 $query_where = '';
-                foreach ($query_array['where'] as $where){
-                    $query_where .=  ($query_where == '' ? 'WHERE ' : ' ').$where;
+                foreach ($query_array['where'] as $where) {
+                    $query_where .= ($query_where == '' ? 'WHERE ' : ' ').$where;
                 }
 
                 $query_where = $this->queryWhereRepair($query_where);
@@ -455,41 +455,41 @@ 
                 $query .= ' '.$query_where;
             }
 
-            if(isset($query_array['group_by'])){
+            if (isset($query_array['group_by'])) {
                 $query_group_by = '';
-                foreach ($query_array['group_by'] as $group_by){
-                    $query_group_by .=  ($query_group_by == '' ? 'GROUP BY ' : ', ').$group_by;
+                foreach ($query_array['group_by'] as $group_by) {
+                    $query_group_by .= ($query_group_by == '' ? 'GROUP BY ' : ', ').$group_by;
                 }
                 $query .= ' '.$query_group_by;
             }
 
-            if(isset($query_array['sort_by'])){
+            if (isset($query_array['sort_by'])) {
                 $query_sort_by = '';
-                foreach ($query_array['sort_by'] as $sort_by){
-                    $query_sort_by .=  ($query_sort_by == '' ? 'ORDER BY ' : ', ').$sort_by;
+                foreach ($query_array['sort_by'] as $sort_by) {
+                    $query_sort_by .= ($query_sort_by == '' ? 'ORDER BY ' : ', ').$sort_by;
                 }
                 $query .= ' '.$query_sort_by;
             }
 
-            $query .= ' group by ' . $field_label;
+            $query .= ' group by '.$field_label;
 
             $result = $this->db->query($query);
 
             while ($row = $this->db->fetchByAssoc($result)) {
-                if($html != '') $html .= '<br />';
+                if ($html != '') $html .= '<br />';
 
                $html .= $this->build_report_html($offset, $links, $row[$field_label], '', $extra);
 
             }
         }
 
-        if($html == '') $html = $this->build_report_html($offset, $links);
+        if ($html == '') $html = $this->build_report_html($offset, $links);
         return $html;
 
     }
 
 
-    function build_report_html($offset = -1, $links = true, $group_value = '', $tableIdentifier = '', $extra = array()){
+    function build_report_html($offset = -1, $links = true, $group_value = '', $tableIdentifier = '', $extra = array()) {
 
         global $beanList, $sugar_config;
 
@@ -502,22 +502,22 @@ 
         // We have a count query.  Run it and get the results.
         $result = $this->db->query($count_query);
         $assoc = $this->db->fetchByAssoc($result);
-        if(!empty($assoc['c']))
+        if (!empty($assoc['c']))
         {
             $total_rows = $assoc['c'];
         }
 
         $html = "<table class='list' id='report_table".$group_value."' width='100%' cellspacing='0' cellpadding='0' border='0' repeat_header='1'>";
 
-        if($offset >= 0){
+        if ($offset >= 0) {
             $start = 0;
             $end = 0;
             $previous_offset = 0;
             $next_offset = 0;
             $last_offset = 0;
 
-            if($total_rows > 0){
-                $start = $offset +1;
+            if ($total_rows > 0) {
+                $start = $offset + 1;
                 $end = (($offset + $max_rows) < $total_rows) ? $offset + $max_rows : $total_rows;
                 $previous_offset = ($offset - $max_rows) < 0 ? 0 : $offset - $max_rows;
                 $next_offset = $offset + $max_rows;
@@ -529,36 +529,36 @@ 
 
             $moduleFieldByGroupValue = $this->getModuleFieldByGroupValue($beanList, $group_value);
 
-            $html .="<td colspan='18'>
+            $html .= "<td colspan='18'>
                        <table class='paginationTable' border='0' cellpadding='0' cellspacing='0' width='100%'>
                         <td style='text-align:left' ><H3><a href=\"javascript:void(0)\" class=\"collapseLink\" onclick=\"groupedReportToggler.toggleList(this);\"><img border=\"0\" id=\"detailpanel_1_img_hide\" src=\"themes/SuiteR/images/basic_search.gif\"></a>$moduleFieldByGroupValue</H3></td>
                         <td class='paginationChangeButtons' align='right' nowrap='nowrap' width='1%'>";
 
-            if($offset == 0){
-                $html .="<button type='button' id='listViewStartButton_top' name='listViewStartButton' title='Start' class='button' disabled='disabled'>
+            if ($offset == 0) {
+                $html .= "<button type='button' id='listViewStartButton_top' name='listViewStartButton' title='Start' class='button' disabled='disabled'>
                     <img src='".SugarThemeRegistry::current()->getImageURL('start_off.gif')."' alt='Start' align='absmiddle' border='0'>
                 </button>
                 <button type='button' id='listViewPrevButton_top' name='listViewPrevButton' class='button' title='Previous' disabled='disabled'>
                     <img src='".SugarThemeRegistry::current()->getImageURL('previous_off.gif')."' alt='Previous' align='absmiddle' border='0'>
                 </button>";
             } else {
-                $html .="<button type='button' id='listViewStartButton_top' name='listViewStartButton' title='Start' class='button' onclick='changeReportPage(\"".$this->id."\",0,\"".$group_value."\",\"".$tableIdentifier."\")'>
+                $html .= "<button type='button' id='listViewStartButton_top' name='listViewStartButton' title='Start' class='button' onclick='changeReportPage(\"".$this->id."\",0,\"".$group_value."\",\"".$tableIdentifier."\")'>
                     <img src='".SugarThemeRegistry::current()->getImageURL('start.gif')."' alt='Start' align='absmiddle' border='0'>
                 </button>
                 <button type='button' id='listViewPrevButton_top' name='listViewPrevButton' class='button' title='Previous' onclick='changeReportPage(\"".$this->id."\",".$previous_offset.",\"".$group_value."\",\"".$tableIdentifier."\")'>
                     <img src='".SugarThemeRegistry::current()->getImageURL('previous.gif')."' alt='Previous' align='absmiddle' border='0'>
                 </button>";
             }
-            $html .=" <span class='pageNumbers'>(".$start ." - ".$end ." of ". $total_rows .")</span>";
-            if($next_offset < $total_rows){
-                $html .="<button type='button' id='listViewNextButton_top' name='listViewNextButton' title='Next' class='button' onclick='changeReportPage(\"".$this->id."\",".$next_offset.",\"".$group_value."\",\"".$tableIdentifier."\")'>
+            $html .= " <span class='pageNumbers'>(".$start." - ".$end." of ".$total_rows.")</span>";
+            if ($next_offset < $total_rows) {
+                $html .= "<button type='button' id='listViewNextButton_top' name='listViewNextButton' title='Next' class='button' onclick='changeReportPage(\"".$this->id."\",".$next_offset.",\"".$group_value."\",\"".$tableIdentifier."\")'>
                         <img src='".SugarThemeRegistry::current()->getImageURL('next.gif')."' alt='Next' align='absmiddle' border='0'>
                     </button>
                      <button type='button' id='listViewEndButton_top' name='listViewEndButton' title='End' class='button' onclick='changeReportPage(\"".$this->id."\",".$last_offset.",\"".$group_value."\",\"".$tableIdentifier."\")'>
                         <img src='".SugarThemeRegistry::current()->getImageURL('end.gif')."' alt='End' align='absmiddle' border='0'>
                     </button>";
             } else {
-                $html .="<button type='button' id='listViewNextButton_top' name='listViewNextButton' title='Next' class='button'  disabled='disabled'>
+                $html .= "<button type='button' id='listViewNextButton_top' name='listViewNextButton' title='Next' class='button'  disabled='disabled'>
                         <img src='".SugarThemeRegistry::current()->getImageURL('next_off.gif')."' alt='Next' align='absmiddle' border='0'>
                     </button>
                      <button type='button' id='listViewEndButton_top' name='listViewEndButton' title='End' class='button'  disabled='disabled'>
@@ -567,12 +567,12 @@ 
 
             }
 
-            $html .="</td>
+            $html .= "</td>
                        </table>
                       </td>";
 
-            $html .="</tr></thead>";
-        } else{
+            $html .= "</tr></thead>";
+        } else {
 
             $moduleFieldByGroupValue = $this->getModuleFieldByGroupValue($beanList, $group_value);
 
@@ -598,16 +598,16 @@ 
 
             $field_module = $this->report_module;
             $field_alias = $field_bean->table_name;
-            if($path[0] != $this->report_module){
-                foreach($path as $rel){
-                    if(empty($rel)){
+            if ($path[0] != $this->report_module) {
+                foreach ($path as $rel) {
+                    if (empty($rel)) {
                         continue;
                     }
-                    $field_module = getRelatedModule($field_module,$rel);
-                    $field_alias = $field_alias . ':'.$rel;
+                    $field_module = getRelatedModule($field_module, $rel);
+                    $field_alias = $field_alias.':'.$rel;
                 }
             }
-            $label = str_replace(' ','_',$field->label).$i;
+            $label = str_replace(' ', '_', $field->label).$i;
             $fields[$label]['field'] = $field->field;
             $fields[$label]['label'] = $field->label;
             $fields[$label]['display'] = $field->display;
@@ -620,7 +620,7 @@ 
             $fields[$label]['params'] = array("date_format" => $field->format);
 
 
-            if($fields[$label]['display']){
+            if ($fields[$label]['display']) {
                 $html .= "<th scope='col'>";
                 $html .= "<div style='white-space: normal;' width='100%' align='left'>";
                 $html .= $field->label;
@@ -633,7 +633,7 @@ 
         $html .= "</thead>";
         $html .= "<tbody>";
 
-        if($offset >= 0){
+        if ($offset >= 0) {
             $result = $this->db->limitQuery($report_sql, $offset, $max_rows);
         } else {
             $result = $this->db->query($report_sql);
@@ -646,39 +646,39 @@ 
         while ($row = $this->db->fetchByAssoc($result)) {
             $html .= "<tr class='".$row_class."' height='20'>";
 
-            foreach($fields as $name => $att){
-                if($att['display']){
+            foreach ($fields as $name => $att) {
+                if ($att['display']) {
                     $html .= "<td class='' valign='top' align='left'>";
-                    if($att['link'] && $links){
-                        $html .= "<a href='" . $sugar_config['site_url'] . "/index.php?module=".$att['module']."&action=DetailView&record=".$row[$att['alias'].'_id']."'>";
+                    if ($att['link'] && $links) {
+                        $html .= "<a href='".$sugar_config['site_url']."/index.php?module=".$att['module']."&action=DetailView&record=".$row[$att['alias'].'_id']."'>";
                     }
 
                     $currency_id = isset($row[$att['alias'].'_currency_id']) ? $row[$att['alias'].'_currency_id'] : '';
 
-                    switch ($att['function']){
+                    switch ($att['function']) {
                         case 'COUNT':
                         //case 'SUM':
                             $html .= $row[$name];
                             break;
                         default:
 
-                            $html .= getModuleField($att['module'], $att['field'], $att['field'], 'DetailView',$row[$name],'',$currency_id, $att['params']);
+                            $html .= getModuleField($att['module'], $att['field'], $att['field'], 'DetailView', $row[$name], '', $currency_id, $att['params']);
                             break;
                     }
-                    if($att['total']){
+                    if ($att['total']) {
                         $totals[$name][] = $row[$name];
                     }
-                    if($att['link'] && $links) $html .= "</a>";
+                    if ($att['link'] && $links) $html .= "</a>";
                     $html .= "</td>";
                 }
             }
             $html .= "</tr>";
 
-            $row_class = $row_class == 'oddListRowS1' ?  'evenListRowS1':'oddListRowS1';
+            $row_class = $row_class == 'oddListRowS1' ? 'evenListRowS1' : 'oddListRowS1';
         }
         $html .= "</tbody>";
 
-        $html .= $this->getTotalHtml($fields,$totals);
+        $html .= $this->getTotalHtml($fields, $totals);
 
         $html .= "</table>";
 
@@ -721,13 +721,13 @@ 
 
             $field_module = $this->report_module;
             $field_alias = $field_bean->table_name;
-            if($path[0] != $this->report_module){
-                foreach($path as $rel){
-                    if(empty($rel)){
+            if ($path[0] != $this->report_module) {
+                foreach ($path as $rel) {
+                    if (empty($rel)) {
                         continue;
                     }
-                    $field_module = getRelatedModule($field_module,$rel);
-                    $field_alias = $field_alias . ':'.$rel;
+                    $field_module = getRelatedModule($field_module, $rel);
+                    $field_alias = $field_alias.':'.$rel;
                 }
             }
 
@@ -740,31 +740,31 @@ 
         return $moduleFieldByGroupValue;
     }
 
-    function getTotalHTML($fields,$totals){
+    function getTotalHTML($fields, $totals) {
         global $app_list_strings;
         $html = '';
         $html .= "<tbody>";
         $html .= "<tr>";
-        foreach($fields as $label => $field){
-            if(!$field['display']){
+        foreach ($fields as $label => $field) {
+            if (!$field['display']) {
                 continue;
             }
-            if($field['total']){
-                $totalLabel = $field['label'] ." ".$app_list_strings['aor_total_options'][$field['total']];
+            if ($field['total']) {
+                $totalLabel = $field['label']." ".$app_list_strings['aor_total_options'][$field['total']];
                 $html .= "<th>{$totalLabel}</th>";
-            }else{
+            } else {
                 $html .= "<th></th>";
             }
         }
         $html .= "</tr>";
         $html .= "<tr>";
-        foreach($fields as $label => $field){
-            if(!$field['display']){
+        foreach ($fields as $label => $field) {
+            if (!$field['display']) {
                 continue;
             }
-            if($field['total'] && isset($totals[$label])){
-                $html .= "<td>".$this->calculateTotal($field['total'],$totals[$label])."</td>";
-            }else{
+            if ($field['total'] && isset($totals[$label])) {
+                $html .= "<td>".$this->calculateTotal($field['total'], $totals[$label])."</td>";
+            } else {
                 $html .= "<td></td>";
             }
         }
@@ -773,24 +773,24 @@ 
         return $html;
     }
 
-    function calculateTotal($type, $totals){
-        switch($type){
+    function calculateTotal($type, $totals) {
+        switch ($type) {
             case 'SUM':
                 return array_sum($totals);
             case 'COUNT':
                 return count($totals);
             case 'AVG':
-                return array_sum($totals)/count($totals);
+                return array_sum($totals) / count($totals);
             default:
                 return '';
         }
     }
 
-    private function encloseForCSV($field){
+    private function encloseForCSV($field) {
         return '"'.$field.'"';
     }
 
-    function build_report_csv(){
+    function build_report_csv() {
 
         ini_set('zlib.output_compression', 'Off');
 
@@ -814,20 +814,20 @@ 
             $path = unserialize(base64_decode($field->module_path));
 
             $field_module = $this->report_module;
-            if($path[0] != $this->report_module){
-                foreach($path as $rel){
-                    $field_module = getRelatedModule($field_module,$rel);
+            if ($path[0] != $this->report_module) {
+                foreach ($path as $rel) {
+                    $field_module = getRelatedModule($field_module, $rel);
                 }
             }
-            $label = str_replace(' ','_',$field->label).$i;
+            $label = str_replace(' ', '_', $field->label).$i;
             $fields[$label]['field'] = $field->field;
             $fields[$label]['display'] = $field->display;
             $fields[$label]['function'] = $field->field_function;
             $fields[$label]['module'] = $field_module;
 
 
-            if($field->display){
-                $csv.= $this->encloseForCSV($field->label);
+            if ($field->display) {
+                $csv .= $this->encloseForCSV($field->label);
                 $csv .= $delimiter;
             }
             ++$i;
@@ -838,30 +838,30 @@ 
 
         while ($row = $this->db->fetchByAssoc($result)) {
             $csv .= "\r\n";
-            foreach($fields as $name => $att){
-                if($att['display']){
-                    if($att['function'] != '' )
+            foreach ($fields as $name => $att) {
+                if ($att['display']) {
+                    if ($att['function'] != '')
                         $csv .= $this->encloseForCSV($row[$name]);
                     else
-                        $csv .= $this->encloseForCSV(trim(strip_tags(getModuleField($att['module'], $att['field'], $att['field'], 'DetailView',$row[$name]))));
+                        $csv .= $this->encloseForCSV(trim(strip_tags(getModuleField($att['module'], $att['field'], $att['field'], 'DetailView', $row[$name]))));
                     $csv .= $delimiter;
                 }
             }
         }
 
-        $csv= $GLOBALS['locale']->translateCharset($csv, 'UTF-8', $GLOBALS['locale']->getExportCharset());
+        $csv = $GLOBALS['locale']->translateCharset($csv, 'UTF-8', $GLOBALS['locale']->getExportCharset());
 
         ob_clean();
         header("Pragma: cache");
         header("Content-type: text/comma-separated-values; charset=".$GLOBALS['locale']->getExportCharset());
         header("Content-Disposition: attachment; filename=\"{$this->name}.csv\"");
         header("Content-transfer-encoding: binary");
-        header("Expires: Mon, 26 Jul 1997 05:00:00 GMT" );
-        header("Last-Modified: " . TimeDate::httpTime() );
-        header("Cache-Control: post-check=0, pre-check=0", false );
+        header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+        header("Last-Modified: ".TimeDate::httpTime());
+        header("Cache-Control: post-check=0, pre-check=0", false);
         header("Content-Length: ".mb_strlen($csv, '8bit'));
         if (!empty($sugar_config['export_excel_compatible'])) {
-            $csv==chr(255) . chr(254) . mb_convert_encoding($csv, 'UTF-16LE', 'UTF-8');
+            $csv == chr(255).chr(254).mb_convert_encoding($csv, 'UTF-16LE', 'UTF-8');
         }
         print $csv;
 
@@ -870,7 +870,7 @@ 
 
 
 
-    function build_report_query($group_value ='', $extra = array()){
+    function build_report_query($group_value = '', $extra = array()) {
         global $beanList;
 
         $module = new $beanList[$this->report_module]();
@@ -879,26 +879,26 @@ 
         $query_array = array();
 
         $query_array = $this->build_report_query_select($query_array, $group_value);
-        if(isset($extra['where']) && $extra['where']) {
-            $query_array['where'][] = implode(' AND ', $extra['where']) . ' AND ';
+        if (isset($extra['where']) && $extra['where']) {
+            $query_array['where'][] = implode(' AND ', $extra['where']).' AND ';
         }
         $query_array = $this->build_report_query_where($query_array);
 
-        foreach ($query_array['select'] as $select){
-            $query .=  ($query == '' ? 'SELECT ' : ', ').$select;
+        foreach ($query_array['select'] as $select) {
+            $query .= ($query == '' ? 'SELECT ' : ', ').$select;
         }
 
         $query .= ' FROM '.$this->db->quoteIdentifier($module->table_name).' ';
 
-        if(isset($query_array['join'])){
-            foreach ($query_array['join'] as $join){
+        if (isset($query_array['join'])) {
+            foreach ($query_array['join'] as $join) {
                 $query .= $join;
             }
         }
-        if(isset($query_array['where'])){
+        if (isset($query_array['where'])) {
             $query_where = '';
-            foreach ($query_array['where'] as $where){
-                $query_where .=  ($query_where == '' ? 'WHERE ' : ' ').$where;
+            foreach ($query_array['where'] as $where) {
+                $query_where .= ($query_where == '' ? 'WHERE ' : ' ').$where;
             }
 
             $query_where = $this->queryWhereRepair($query_where);
@@ -906,18 +906,18 @@ 
             $query .= ' '.$query_where;
         }
 
-        if(isset($query_array['group_by'])){
+        if (isset($query_array['group_by'])) {
             $query_group_by = '';
-            foreach ($query_array['group_by'] as $group_by){
-                $query_group_by .=  ($query_group_by == '' ? 'GROUP BY ' : ', ').$group_by;
+            foreach ($query_array['group_by'] as $group_by) {
+                $query_group_by .= ($query_group_by == '' ? 'GROUP BY ' : ', ').$group_by;
             }
             $query .= ' '.$query_group_by;
         }
 
-        if(isset($query_array['sort_by'])){
+        if (isset($query_array['sort_by'])) {
             $query_sort_by = '';
-            foreach ($query_array['sort_by'] as $sort_by){
-                $query_sort_by .=  ($query_sort_by == '' ? 'ORDER BY ' : ', ').$sort_by;
+            foreach ($query_array['sort_by'] as $sort_by) {
+                $query_sort_by .= ($query_sort_by == '' ? 'ORDER BY ' : ', ').$sort_by;
             }
             $query .= ' '.$query_sort_by;
         }
@@ -931,11 +931,11 @@ 
 
         $safe = 0;
         $query_where_clean = '';
-        while($query_where_clean != $query_where) {
+        while ($query_where_clean != $query_where) {
             $query_where_clean = $query_where;
             $query_where = preg_replace('/\b(AND|OR)\s*\(\s*\)|[^\w+\s*]\(\s*\)/i', '', $query_where_clean);
             $safe++;
-            if($safe>100){
+            if ($safe > 100) {
                 $GLOBALS['log']->fatal('Invalid report query conditions');
                 break;
             }
@@ -944,10 +944,10 @@ 
         return $query_where;
     }
 
-    function build_report_query_select($query = array(), $group_value =''){
+    function build_report_query_select($query = array(), $group_value = '') {
         global $beanList;
 
-        if($beanList[$this->report_module]){
+        if ($beanList[$this->report_module]) {
             $module = new $beanList[$this->report_module]();
 
             $query['select'][] = $this->db->quoteIdentifier($module->table_name).".id AS '".$module->table_name."_id'";
@@ -960,16 +960,16 @@ 
                 $field = new AOR_Field();
                 $field->retrieve($row['id']);
 
-                $field->label = str_replace(' ','_',$field->label).$i;
+                $field->label = str_replace(' ', '_', $field->label).$i;
 
                 $path = unserialize(base64_decode($field->module_path));
 
                 $field_module = $module;
                 $table_alias = $field_module->table_name;
                 $oldAlias = $table_alias;
-                if(!empty($path[0]) && $path[0] != $module->module_dir){
-                    foreach($path as $rel){
-                        $new_field_module = new $beanList[getRelatedModule($field_module->module_dir,$rel)];
+                if (!empty($path[0]) && $path[0] != $module->module_dir) {
+                    foreach ($path as $rel) {
+                        $new_field_module = new $beanList[getRelatedModule($field_module->module_dir, $rel)];
                         $oldAlias = $table_alias;
                         $table_alias = $table_alias.":".$rel;
                         $query = $this->build_report_query_join($rel, $table_alias, $oldAlias, $field_module, 'relationship', $query, $new_field_module);
@@ -980,54 +980,54 @@ 
 
                 $data = $field_module->field_defs[$field->field];
 
-                if($data['type'] == 'relate' && isset($data['id_name'])) {
+                if ($data['type'] == 'relate' && isset($data['id_name'])) {
                     $field->field = $data['id_name'];
                     $data_new = $field_module->field_defs[$field->field];
-                    if(isset($data_new['source']) && $data_new['source'] == 'non-db' && $data_new['type'] != 'link' && isset($data['link'])){
+                    if (isset($data_new['source']) && $data_new['source'] == 'non-db' && $data_new['type'] != 'link' && isset($data['link'])) {
                         $data_new['type'] = 'link';
                         $data_new['relationship'] = $data['link'];
                     }
                     $data = $data_new;
                 }
 
-                if($data['type'] == 'link' && $data['source'] == 'non-db') {
-                    $new_field_module = new $beanList[getRelatedModule($field_module->module_dir,$data['relationship'])];
+                if ($data['type'] == 'link' && $data['source'] == 'non-db') {
+                    $new_field_module = new $beanList[getRelatedModule($field_module->module_dir, $data['relationship'])];
                     $table_alias = $data['relationship'];
-                    $query = $this->build_report_query_join($data['relationship'],$table_alias, $oldAlias, $field_module, 'relationship', $query, $new_field_module);
+                    $query = $this->build_report_query_join($data['relationship'], $table_alias, $oldAlias, $field_module, 'relationship', $query, $new_field_module);
                     $field_module = $new_field_module;
                     $field->field = 'id';
                 }
 
-                if($data['type'] == 'currency' && isset($field_module->field_defs['currency_id'])) {
-                    if((isset($field_module->field_defs['currency_id']['source']) && $field_module->field_defs['currency_id']['source'] == 'custom_fields')) {
+                if ($data['type'] == 'currency' && isset($field_module->field_defs['currency_id'])) {
+                    if ((isset($field_module->field_defs['currency_id']['source']) && $field_module->field_defs['currency_id']['source'] == 'custom_fields')) {
                         $query['select'][$table_alias.'_currency_id'] = $this->db->quoteIdentifier($table_alias.'_cstm').".currency_id AS '".$table_alias."_currency_id'";
                     } else {
                         $query['select'][$table_alias.'_currency_id'] = $this->db->quoteIdentifier($table_alias).".currency_id AS '".$table_alias."_currency_id'";
                     }
                 }
 
-                if((isset($data['source']) && $data['source'] == 'custom_fields')) {
+                if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
                     $select_field = $this->db->quoteIdentifier($table_alias.'_cstm').'.'.$field->field;
-                    $query = $this->build_report_query_join($table_alias.'_cstm', $table_alias.'_cstm',$table_alias, $field_module, 'custom', $query);
+                    $query = $this->build_report_query_join($table_alias.'_cstm', $table_alias.'_cstm', $table_alias, $field_module, 'custom', $query);
                 } else {
-                    $select_field= $this->db->quoteIdentifier($table_alias).'.'.$field->field;
+                    $select_field = $this->db->quoteIdentifier($table_alias).'.'.$field->field;
                 }
 
-                if($field->sort_by != ''){
+                if ($field->sort_by != '') {
                     $query['sort_by'][] = $select_field." ".$field->sort_by;
                 }
 
-                if($field->group_by == 1){
-                    $query['group_by'][] = $field->format ? str_replace('(%1)', '(' . $select_field . ')', preg_replace(array('/\s+/', '/Y/', '/m/', '/d/'), array(', ', 'YEAR(%1)', 'MONTH(%1)', 'DAY(%1)'), trim(preg_replace('/[^Ymd]/', ' ', $field->format)))) : $select_field;
+                if ($field->group_by == 1) {
+                    $query['group_by'][] = $field->format ? str_replace('(%1)', '('.$select_field.')', preg_replace(array('/\s+/', '/Y/', '/m/', '/d/'), array(', ', 'YEAR(%1)', 'MONTH(%1)', 'DAY(%1)'), trim(preg_replace('/[^Ymd]/', ' ', $field->format)))) : $select_field;
                 }
 
-                if($field->field_function != null){
+                if ($field->field_function != null) {
                     $select_field = $field->field_function.'('.$select_field.')';
                 }
 
-                $query['select'][] = $select_field ." AS '".$field->label."'";
+                $query['select'][] = $select_field." AS '".$field->label."'";
 
-                if($field->group_display == 1 && $group_value) $query['where'][] = $select_field." = '".$group_value."' AND ";
+                if ($field->group_display == 1 && $group_value) $query['where'][] = $select_field." = '".$group_value."' AND ";
                     ++$i;
             }
         }
@@ -1035,30 +1035,30 @@ 
     }
 
 
-    function build_report_query_join($name, $alias, $parentAlias, SugarBean $module, $type, $query = array(),SugarBean $rel_module = null ){
+    function build_report_query_join($name, $alias, $parentAlias, SugarBean $module, $type, $query = array(), SugarBean $rel_module = null) {
 
-        if(!isset($query['join'][$alias])){
+        if (!isset($query['join'][$alias])) {
 
-            switch ($type){
+            switch ($type) {
                 case 'custom':
-                    $query['join'][$alias] = 'LEFT JOIN '.$this->db->quoteIdentifier($module->get_custom_table_name()).' '.$this->db->quoteIdentifier($name).' ON '.$this->db->quoteIdentifier($parentAlias).'.id = '. $this->db->quoteIdentifier($name).'.id_c ';
+                    $query['join'][$alias] = 'LEFT JOIN '.$this->db->quoteIdentifier($module->get_custom_table_name()).' '.$this->db->quoteIdentifier($name).' ON '.$this->db->quoteIdentifier($parentAlias).'.id = '.$this->db->quoteIdentifier($name).'.id_c ';
                     break;
 
                 case 'relationship':
-                    if($module->load_relationship($name)){
+                    if ($module->load_relationship($name)) {
                         $params['join_type'] = 'LEFT JOIN';
-                        if($module->$name->relationship_type != 'one-to-many'){
-                            if($module->$name->getSide() == REL_LHS){
+                        if ($module->$name->relationship_type != 'one-to-many') {
+                            if ($module->$name->getSide() == REL_LHS) {
                                 $params['right_join_table_alias'] = $this->db->quoteIdentifier($alias);
                                 $params['join_table_alias'] = $this->db->quoteIdentifier($alias);
                                 $params['left_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
-                            }else{
+                            } else {
                                 $params['right_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
                                 $params['join_table_alias'] = $this->db->quoteIdentifier($alias);
                                 $params['left_join_table_alias'] = $this->db->quoteIdentifier($alias);
                             }
 
-                        }else{
+                        } else {
                             $params['right_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
                             $params['join_table_alias'] = $this->db->quoteIdentifier($alias);
                             $params['left_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
@@ -1067,7 +1067,7 @@ 
                         $params['join_table_link_alias'] = $this->db->quoteIdentifier($linkAlias);
                         $join = $module->$name->getJoin($params, true);
                         $query['join'][$alias] = $join['join'];
-                        if($rel_module != null) {
+                        if ($rel_module != null) {
                             $query['join'][$alias] .= $this->build_report_access_query($rel_module, $name);
                         }
                         $query['select'][] = $join['select']." AS '".$alias."_id'";
@@ -1082,11 +1082,11 @@ 
         return $query;
     }
 
-    function build_report_access_query(SugarBean $module, $alias){
+    function build_report_access_query(SugarBean $module, $alias) {
 
         $module->table_name = $alias;
         $where = '';
-        if($module->bean_implements('ACL') && ACLController::requireOwner($module->module_dir, 'list') )
+        if ($module->bean_implements('ACL') && ACLController::requireOwner($module->module_dir, 'list'))
         {
             global $current_user;
             $owner_where = $module->getOwnerWhere($current_user->id);
@@ -1094,18 +1094,18 @@ 
 
         }
 
-        if(file_exists('modules/SecurityGroups/SecurityGroup.php')){
+        if (file_exists('modules/SecurityGroups/SecurityGroup.php')) {
             /* BEGIN - SECURITY GROUPS */
-            if($module->bean_implements('ACL') && ACLController::requireSecurityGroup($module->module_dir, 'list') )
+            if ($module->bean_implements('ACL') && ACLController::requireSecurityGroup($module->module_dir, 'list'))
             {
                 require_once('modules/SecurityGroups/SecurityGroup.php');
                 global $current_user;
                 $owner_where = $module->getOwnerWhere($current_user->id);
-                $group_where = SecurityGroup::getGroupWhere($alias,$module->module_dir,$current_user->id);
-                if(!empty($owner_where)){
-                    $where .= " AND (".  $owner_where." or ".$group_where.") ";
+                $group_where = SecurityGroup::getGroupWhere($alias, $module->module_dir, $current_user->id);
+                if (!empty($owner_where)) {
+                    $where .= " AND (".$owner_where." or ".$group_where.") ";
                 } else {
-                    $where .= ' AND '.  $group_where;
+                    $where .= ' AND '.$group_where;
                 }
             }
             /* END - SECURITY GROUPS */
@@ -1118,16 +1118,16 @@ 
      * @param array $query
      * @return array
      */
-    function build_report_query_where($query = array()){
+    function build_report_query_where($query = array()) {
         global $beanList, $app_list_strings, $sugar_config;
 
         $closure = false;
-        if(!empty($query['where'])) {
+        if (!empty($query['where'])) {
             $query['where'][] = '(';
             $closure = true;
         }
 
-        if($beanList[$this->report_module]){
+        if ($beanList[$this->report_module]) {
             $module = new $beanList[$this->report_module]();
 
             $sql = "SELECT id FROM aor_conditions WHERE aor_report_id = '".$this->id."' AND deleted = 0 ORDER BY condition_order ASC";
@@ -1144,21 +1144,21 @@ 
                 $condition_module = $module;
                 $table_alias = $condition_module->table_name;
                 $oldAlias = $table_alias;
-                if(!empty($path[0]) && $path[0] != $module->module_dir){
-                    foreach($path as $rel){
-                        if(empty($rel)){
+                if (!empty($path[0]) && $path[0] != $module->module_dir) {
+                    foreach ($path as $rel) {
+                        if (empty($rel)) {
                             continue;
                         }
                         // Bug: Prevents relationships from loading.
                         //$rel = strtolower($rel);
-                        $new_condition_module = new $beanList[getRelatedModule($condition_module->module_dir,$rel)];
+                        $new_condition_module = new $beanList[getRelatedModule($condition_module->module_dir, $rel)];
                         $oldAlias = $table_alias;
                         $table_alias = $table_alias.":".$rel;
                         $query = $this->build_report_query_join($rel, $table_alias, $oldAlias, $condition_module, 'relationship', $query, $new_condition_module);
                         $condition_module = $new_condition_module;
                     }
                 }
-                if(isset($app_list_strings['aor_sql_operator_list'][$condition->operator])) {
+                if (isset($app_list_strings['aor_sql_operator_list'][$condition->operator])) {
                     $where_set = false;
 
                     $data = $condition_module->field_defs[$condition->field];
@@ -1173,24 +1173,24 @@ 
                         $data = $data_new;
                     }
 
-                    if($data['type'] == 'link' && $data['source'] == 'non-db') {
-                        $new_field_module = new $beanList[getRelatedModule($condition_module->module_dir,$data['relationship'])];
+                    if ($data['type'] == 'link' && $data['source'] == 'non-db') {
+                        $new_field_module = new $beanList[getRelatedModule($condition_module->module_dir, $data['relationship'])];
                         $table_alias = $data['relationship'];
-                        $query = $this->build_report_query_join($data['relationship'],$table_alias, $oldAlias, $condition_module, 'relationship', $query, $new_field_module);
+                        $query = $this->build_report_query_join($data['relationship'], $table_alias, $oldAlias, $condition_module, 'relationship', $query, $new_field_module);
                         $condition_module = $new_field_module;
 
                         // Debugging: security groups conditions - It's a hack to just get the query working
-                        if($condition_module->module_dir = 'SecurityGroups' && count($path) > 1) {
+                        if ($condition_module->module_dir = 'SecurityGroups' && count($path) > 1) {
 //                            $table_alias = 'opportunities:assigned_user_link:SecurityGroups' ;
-                            $table_alias = $oldAlias. ':' .$rel;
+                            $table_alias = $oldAlias.':'.$rel;
                         }
                         $condition->field = 'id';
                     }
                     if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
-                        $field = $this->db->quoteIdentifier($table_alias . '_cstm') . '.' . $condition->field;
-                        $query = $this->build_report_query_join($table_alias . '_cstm', $table_alias . '_cstm', $oldAlias, $condition_module, 'custom', $query);
+                        $field = $this->db->quoteIdentifier($table_alias.'_cstm').'.'.$condition->field;
+                        $query = $this->build_report_query_join($table_alias.'_cstm', $table_alias.'_cstm', $oldAlias, $condition_module, 'custom', $query);
                     } else {
-                        $field = $this->db->quoteIdentifier($table_alias) . '.' . $condition->field;
+                        $field = $this->db->quoteIdentifier($table_alias).'.'.$condition->field;
                     }
 
                     if (!empty($this->user_parameters[$condition->id]) && $condition->parameter) {
@@ -1222,10 +1222,10 @@ 
                                 $condition->field = 'id';
                             }
                             if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
-                                $value = $condition_module->table_name . '_cstm.' . $condition->value;
-                                $query = $this->build_report_query_join($condition_module->table_name . '_cstm', $table_alias . '_cstm', $table_alias, $condition_module, 'custom', $query);
+                                $value = $condition_module->table_name.'_cstm.'.$condition->value;
+                                $query = $this->build_report_query_join($condition_module->table_name.'_cstm', $table_alias.'_cstm', $table_alias, $condition_module, 'custom', $query);
                             } else {
-                                $value = ($table_alias ? "`$table_alias`" : $condition_module->table_name) . '.' . $condition->value;
+                                $value = ($table_alias ? "`$table_alias`" : $condition_module->table_name).'.'.$condition->value;
                             }
                             break;
 
@@ -1237,10 +1237,10 @@ 
                                 } else {
                                     $value = 'NOW()';
                                 }
-                            } else if($params[0] == 'today'){
-                                if($sugar_config['dbconfig']['db_type'] == 'mssql'){
+                            } else if ($params[0] == 'today') {
+                                if ($sugar_config['dbconfig']['db_type'] == 'mssql') {
                                     //$field =
-                                    $value  = 'CAST(GETDATE() AS DATE)';
+                                    $value = 'CAST(GETDATE() AS DATE)';
                                 } else {
                                     $field = 'DATE('.$field.')';
                                     $value = 'Curdate()';
@@ -1248,10 +1248,10 @@ 
                             } else {
                                 $data = $condition_module->field_defs[$params[0]];
                                 if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
-                                    $value = $condition_module->table_name . '_cstm.' . $params[0];
-                                    $query = $this->build_report_query_join($condition_module->table_name . '_cstm', $table_alias . '_cstm', $table_alias, $condition_module, 'custom', $query);
+                                    $value = $condition_module->table_name.'_cstm.'.$params[0];
+                                    $query = $this->build_report_query_join($condition_module->table_name.'_cstm', $table_alias.'_cstm', $table_alias, $condition_module, 'custom', $query);
                                 } else {
-                                    $value = $condition_module->table_name . '.' . $params[0];
+                                    $value = $condition_module->table_name.'.'.$params[0];
                                 }
                             }
 
@@ -1262,9 +1262,9 @@ 
                                         $params[3] = 'hours';
                                     default:
                                         if ($sugar_config['dbconfig']['db_type'] == 'mssql') {
-                                            $value = "DATEADD(" . $params[3] . ",  " . $app_list_strings['aor_date_operator'][$params[1]] . " $params[2], $value)";
+                                            $value = "DATEADD(".$params[3].",  ".$app_list_strings['aor_date_operator'][$params[1]]." $params[2], $value)";
                                         } else {
-                                            $value = "DATE_ADD($value, INTERVAL " . $app_list_strings['aor_date_operator'][$params[1]] . " $params[2] " . $params[3] . ")";
+                                            $value = "DATE_ADD($value, INTERVAL ".$app_list_strings['aor_date_operator'][$params[1]]." $params[2] ".$params[3].")";
                                         }
                                         break;
                                 }
@@ -1279,11 +1279,11 @@ 
                                 $value = '(';
                                 foreach ($multi_values as $multi_value) {
                                     if ($value != '(') $value .= $sep;
-                                    $value .= $field . ' ' . $app_list_strings['aor_sql_operator_list'][$condition->operator] . " '" . $multi_value . "'";
+                                    $value .= $field.' '.$app_list_strings['aor_sql_operator_list'][$condition->operator]." '".$multi_value."'";
                                 }
                                 $value .= ')';
                             }
-                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ': 'AND ')) . $value;
+                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).$value;
                             $where_set = true;
                             break;
                         case "Period":
@@ -1292,20 +1292,20 @@ 
                             } else {
                                 $params = base64_decode($condition->value);
                             }
-                            $value = '"' . getPeriodDate($params)->format('Y-m-d H:i:s') . '"';
+                            $value = '"'.getPeriodDate($params)->format('Y-m-d H:i:s').'"';
                             break;
                         case "CurrentUserID":
                             global $current_user;
-                            $value = '"' . $current_user->id . '"';
+                            $value = '"'.$current_user->id.'"';
                             break;
                         case 'Value':
                         default:
-                            $value = "'" . $this->db->quote($condition->value) . "'";
+                            $value = "'".$this->db->quote($condition->value)."'";
                             break;
                     }
 
                     //handle like conditions
-                    Switch($condition->operator) {
+                    Switch ($condition->operator) {
                         case 'Contains':
                             $value = "CONCAT('%', ".$value." ,'%')";
                             break;
@@ -1317,17 +1317,17 @@ 
                             break;
                     }
 
-                    if($condition->value_type == 'Value' && !$condition->value && $condition->operator == 'Equal_To') {
+                    if ($condition->value_type == 'Value' && !$condition->value && $condition->operator == 'Equal_To') {
                         $value = "{$value} OR {$field} IS NULL";
                     }
 
-                    if (!$where_set) $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ': 'AND ')) . $field . ' ' . $app_list_strings['aor_sql_operator_list'][$condition->operator] . ' ' . $value;
+                    if (!$where_set) $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).$field.' '.$app_list_strings['aor_sql_operator_list'][$condition->operator].' '.$value;
 
                     $tiltLogicOp = false;
                 }
-                else if($condition->parenthesis) {
-                    if($condition->parenthesis == 'START') {
-                        $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ' : 'AND ')) .  '(';
+                else if ($condition->parenthesis) {
+                    if ($condition->parenthesis == 'START') {
+                        $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).'(';
                         $tiltLogicOp = true;
                     }
                     else {
@@ -1341,7 +1341,7 @@ 
 
             }
 
-            if(isset($query['where']) && $query['where']) {
+            if (isset($query['where']) && $query['where']) {
                 array_unshift($query['where'], '(');
                 $query['where'][] = ') AND ';
             }
@@ -1349,7 +1349,7 @@ 
 
         }
 
-        if($closure) {
+        if ($closure) {
             $query['where'][] = ')';
         }
 

modules/AOR_Conditions/AOR_Condition.php

Spacing +13 added lines, -13 removed lines

@@ -79,40 +79,40 @@
 
         require_once('modules/AOW_WorkFlow/aow_utils.php');
 
-        $line_count = count($post_data[$key . 'field']);
+        $line_count = count($post_data[$key.'field']);
         $j = 0;
         for ($i = 0; $i < $line_count; ++$i) {
 
-            if ($post_data[$key . 'deleted'][$i] == 1) {
-                $this->mark_deleted($post_data[$key . 'id'][$i]);
+            if ($post_data[$key.'deleted'][$i] == 1) {
+                $this->mark_deleted($post_data[$key.'id'][$i]);
             } else {
                 $condition = new AOR_Condition();
                 foreach ($this->field_defs as $field_def) {
                     $field_name = $field_def['name'];
-                    if (isset($post_data[$key . $field_name][$i])) {
-                        if (is_array($post_data[$key . $field_name][$i])) {
+                    if (isset($post_data[$key.$field_name][$i])) {
+                        if (is_array($post_data[$key.$field_name][$i])) {
 
                             switch ($condition->value_type) {
                                 case 'Date':
-                                    $post_data[$key . $field_name][$i] = base64_encode(serialize($post_data[$key . $field_name][$i]));
+                                    $post_data[$key.$field_name][$i] = base64_encode(serialize($post_data[$key.$field_name][$i]));
                                     break;
                                 default:
-                                    $post_data[$key . $field_name][$i] = encodeMultienumValue($post_data[$key . $field_name][$i]);
+                                    $post_data[$key.$field_name][$i] = encodeMultienumValue($post_data[$key.$field_name][$i]);
                             }
-                        } else if ($field_name == 'value' && $post_data[$key . 'value_type'][$i] === 'Value') {
-                            $post_data[$key . $field_name][$i] = fixUpFormatting($_REQUEST['report_module'], $condition->field, $post_data[$key . $field_name][$i]);
+                        } else if ($field_name == 'value' && $post_data[$key.'value_type'][$i] === 'Value') {
+                            $post_data[$key.$field_name][$i] = fixUpFormatting($_REQUEST['report_module'], $condition->field, $post_data[$key.$field_name][$i]);
                         } else if ($field_name == 'parameter') {
-                            $post_data[$key . $field_name][$i] = isset($post_data[$key . $field_name][$i]);
+                            $post_data[$key.$field_name][$i] = isset($post_data[$key.$field_name][$i]);
                         } else if ($field_name == 'module_path') {
-                            $post_data[$key . $field_name][$i] = base64_encode(serialize(explode(":", $post_data[$key . $field_name][$i])));
+                            $post_data[$key.$field_name][$i] = base64_encode(serialize(explode(":", $post_data[$key.$field_name][$i])));
                         }
-                        if ($field_name == 'parenthesis' && $post_data[$key . $field_name][$i] == 'END') {
+                        if ($field_name == 'parenthesis' && $post_data[$key.$field_name][$i] == 'END') {
                             if (!isset($lastParenthesisStartConditionId)) {
                                 throw new Exception('a closure parenthesis has no starter pair');
                             }
                             $condition->parenthesis = $lastParenthesisStartConditionId;
                         } else {
-                            $condition->$field_name = $post_data[$key . $field_name][$i];
+                            $condition->$field_name = $post_data[$key.$field_name][$i];
                         }
                     } else if ($field_name == 'parameter') {
                         $condition->$field_name = 0;