adamjakab / SuiteCRM

modules/UpgradeWizard/upgradeTimeCounter.php

Indentation +7 added lines, -7 removed lines

@@ -72,18 +72,18 @@
  }
 */
 
- $_SESSION['totalUpgradeTime'] = $_SESSION['totalUpgradeTime']+$_REQUEST['upgradeStepTime'];
- $response = $_SESSION['totalUpgradeTime'];
+    $_SESSION['totalUpgradeTime'] = $_SESSION['totalUpgradeTime']+$_REQUEST['upgradeStepTime'];
+    $response = $_SESSION['totalUpgradeTime'];
 
 $GLOBALS['log']->fatal('TOTAL TIME .....'.$_SESSION['totalUpgradeTime']);
- //$uptime = $uptime+$_REQUEST['upgradeStepTime'];
- $GLOBALS['log']->fatal($response);
+    //$uptime = $uptime+$_REQUEST['upgradeStepTime'];
+    $GLOBALS['log']->fatal($response);
 
 
- if (!empty($response)) {
+    if (!empty($response)) {
     $json = getJSONobj();
-	print $json->encode($response);
- }
+    print $json->encode($response);
+    }
 
 sugar_cleanup();
 exit();

Spacing +2 added lines, -2 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.
@@ -72,7 +72,7 @@ 
  }
 */
 
- $_SESSION['totalUpgradeTime'] = $_SESSION['totalUpgradeTime']+$_REQUEST['upgradeStepTime'];
+ $_SESSION['totalUpgradeTime'] = $_SESSION['totalUpgradeTime'] + $_REQUEST['upgradeStepTime'];
  $response = $_SESSION['totalUpgradeTime'];
 
 $GLOBALS['log']->fatal('TOTAL TIME .....'.$_SESSION['totalUpgradeTime']);

Braces +3 added lines, -1 removed lines

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

modules/UpgradeWizard/UpgradeRemoval.php

Indentation +35 added lines, -35 removed lines

@@ -68,7 +68,7 @@ 
  */
 public function getFilesToRemove($version)
 {
-	return array();
+    return array();
 }
 
 /**
@@ -79,31 +79,31 @@ 
  */
 public function processFilesToRemove($files=array())
 {
-	if(empty($files) || !is_array($files))
-	{
-		return;
-	}	
+    if(empty($files) || !is_array($files))
+    {
+        return;
+    }	
 	
-	require_once('include/dir_inc.php');
+    require_once('include/dir_inc.php');
 	
-	if(!file_exists('custom/backup'))
-	{
-	   mkdir_recursive('custom/backup');
-	}
+    if(!file_exists('custom/backup'))
+    {
+        mkdir_recursive('custom/backup');
+    }
 	
-	foreach($files as $file)
-	{		
-		if(file_exists($file))
-		{
-			$this->backup($file);   
-			if(is_dir($file))
-			{
-			  rmdir_recursive($file);	
-			} else {
-			  unlink($file);
-			}
-	    }
-	}
+    foreach($files as $file)
+    {		
+        if(file_exists($file))
+        {
+            $this->backup($file);   
+            if(is_dir($file))
+            {
+                rmdir_recursive($file);	
+            } else {
+                unlink($file);
+            }
+        }
+    }
 }
 
 
@@ -115,20 +115,20 @@ 
  */
 protected function backup($file)
 {
-	$basename = basename($file);
-	$basepath = str_replace($basename, '', $file);
+    $basename = basename($file);
+    $basepath = str_replace($basename, '', $file);
 
-	if(!empty($basepath) && !file_exists('custom/backup/' . $basepath))
-	{
-	   mkdir_recursive('custom/backup/' . $basepath);
-	}
+    if(!empty($basepath) && !file_exists('custom/backup/' . $basepath))
+    {
+        mkdir_recursive('custom/backup/' . $basepath);
+    }
 	
-	if(is_dir($file))
-	{
-    	copy_recursive($file, 'custom/backup/' . $file);	
-	} else {
-		copy($file, 'custom/backup/' . $file);
-	}
+    if(is_dir($file))
+    {
+        copy_recursive($file, 'custom/backup/' . $file);	
+    } else {
+        copy($file, 'custom/backup/' . $file);
+    }
 }
 
 }

Spacing +12 added lines, -12 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.
@@ -77,26 +77,26 @@ 
  * 
  * @param mixed $files 
  */
-public function processFilesToRemove($files=array())
+public function processFilesToRemove($files = array())
 {
-	if(empty($files) || !is_array($files))
+	if (empty($files) || !is_array($files))
 	{
 		return;
 	}	
 	
 	require_once('include/dir_inc.php');
 	
-	if(!file_exists('custom/backup'))
+	if (!file_exists('custom/backup'))
 	{
 	   mkdir_recursive('custom/backup');
 	}
 	
-	foreach($files as $file)
+	foreach ($files as $file)
 	{		
-		if(file_exists($file))
+		if (file_exists($file))
 		{
 			$this->backup($file);   
-			if(is_dir($file))
+			if (is_dir($file))
 			{
 			  rmdir_recursive($file);	
 			} else {
@@ -118,16 +118,16 @@ 
 	$basename = basename($file);
 	$basepath = str_replace($basename, '', $file);
 
-	if(!empty($basepath) && !file_exists('custom/backup/' . $basepath))
+	if (!empty($basepath) && !file_exists('custom/backup/'.$basepath))
 	{
-	   mkdir_recursive('custom/backup/' . $basepath);
+	   mkdir_recursive('custom/backup/'.$basepath);
 	}
 	
-	if(is_dir($file))
+	if (is_dir($file))
 	{
-    	copy_recursive($file, 'custom/backup/' . $file);	
+    	copy_recursive($file, 'custom/backup/'.$file);	
 	} else {
-		copy($file, 'custom/backup/' . $file);
+		copy($file, 'custom/backup/'.$file);
 	}
 }
 

Braces +3 added lines, -1 removed lines

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

modules/UpgradeWizard/populateColumns.php

Indentation +21 added lines, -21 removed lines

@@ -38,10 +38,10 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
- //Request object must have these property values:
- //		Module: module name, this module should have a file called TreeData.php
- //		Function: name of the function to be called in TreeData.php, the function will be called statically.
- //		PARAM prefixed properties: array of these property/values will be passed to the function as parameter.
+    //Request object must have these property values:
+    //		Module: module name, this module should have a file called TreeData.php
+    //		Function: name of the function to be called in TreeData.php, the function will be called statically.
+    //		PARAM prefixed properties: array of these property/values will be passed to the function as parameter.
 
 require_once('include/JSON.php');
 require_once('include/entryPoint.php');
@@ -52,25 +52,25 @@ 
 
 $json = getJSONobj();
 $selectedTable = $json->decode(html_entity_decode($_REQUEST['selectedTable']));
- if(isset($tagArticleIds['jsonObject']) && $tagArticleIds['jsonObject'] != null){
-	$selectedTable = $selectedTable['jsonObject'];
-  }
+    if(isset($tagArticleIds['jsonObject']) && $tagArticleIds['jsonObject'] != null){
+    $selectedTable = $selectedTable['jsonObject'];
+    }
 $GLOBALS['log']->fatal('************ comes here *********');
 //$GLOBALS['log']->fatal($_REQUEST['selectedTable']);
 function tableColumns($table_name){
-	$GLOBALS['log']->fatal('********TABLE PASSED******* '.$table_name);
-	global $sugar_config;
-	global $setup_db_database_name;
+    $GLOBALS['log']->fatal('********TABLE PASSED******* '.$table_name);
+    global $sugar_config;
+    global $setup_db_database_name;
     global $setup_db_host_name;
     global $setup_db_host_instance;
     global $setup_db_admin_user_name;
     global $setup_db_admin_password;
     
-	//$db = &DBManagerFactory::getInstance('information_schema');
+    //$db = &DBManagerFactory::getInstance('information_schema');
 
-	$db_name= $sugar_config['dbconfig']['db_name'];
-	$setup_db_host_name = $sugar_config['dbconfig']['db_host_name'];
-  	$setup_db_admin_user_name = $sugar_config['dbconfig']['db_user_name'];
+    $db_name= $sugar_config['dbconfig']['db_name'];
+    $setup_db_host_name = $sugar_config['dbconfig']['db_host_name'];
+        $setup_db_admin_user_name = $sugar_config['dbconfig']['db_user_name'];
     $setup_db_host_instance = $sugar_config['dbconfig']['db_host_instance'];
     $setup_db_admin_password = $sugar_config['dbconfig']['db_password'];
 
@@ -78,27 +78,27 @@ 
     mysql_select_db('information_schema');
 
     $qu="SELECT column_name FROM information_schema.columns WHERE table_schema = '".$db_name."' AND table_name = '".$table_name."'";
-	$ct =mysql_query($qu,$link);
+    $ct =mysql_query($qu,$link);
     //$cols= '';
     $colsDrop = array();
     while($row = mysql_fetch_assoc($ct)){
-    	 $colsDrop[] =$row['column_name'];
+            $colsDrop[] =$row['column_name'];
     }
     return $colsDrop;
 }
 
 $colsDrop = tableColumns($_REQUEST['selectedTable']);
 if($colsDrop != null){
-	$colsDropDown = "<option value=".$_REQUEST['selectedTable']." Columns>".$_REQUEST['selectedTable']." Columns</option>";
-	foreach($colsDrop as $col){
-		$colsDropDown .="<option value={$col}>{$col}</option>";
-	}
+    $colsDropDown = "<option value=".$_REQUEST['selectedTable']." Columns>".$_REQUEST['selectedTable']." Columns</option>";
+    foreach($colsDrop as $col){
+        $colsDropDown .="<option value={$col}>{$col}</option>";
+    }
 }
 //$response = "<script>document.getElementById('select_column').innerHTML=$colsDropDown</script>";
 $response = $colsDropDown;
 
 if (!empty($response)) {
-	echo $response;
+    echo $response;
 }
 sugar_cleanup();
 exit();

Spacing +11 added lines, -11 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.
@@ -52,12 +52,12 @@ 
 
 $json = getJSONobj();
 $selectedTable = $json->decode(html_entity_decode($_REQUEST['selectedTable']));
- if(isset($tagArticleIds['jsonObject']) && $tagArticleIds['jsonObject'] != null){
+ if (isset($tagArticleIds['jsonObject']) && $tagArticleIds['jsonObject'] != null) {
 	$selectedTable = $selectedTable['jsonObject'];
   }
 $GLOBALS['log']->fatal('************ comes here *********');
 //$GLOBALS['log']->fatal($_REQUEST['selectedTable']);
-function tableColumns($table_name){
+function tableColumns($table_name) {
 	$GLOBALS['log']->fatal('********TABLE PASSED******* '.$table_name);
 	global $sugar_config;
 	global $setup_db_database_name;
@@ -68,7 +68,7 @@ 
     
 	//$db = &DBManagerFactory::getInstance('information_schema');
 
-	$db_name= $sugar_config['dbconfig']['db_name'];
+	$db_name = $sugar_config['dbconfig']['db_name'];
 	$setup_db_host_name = $sugar_config['dbconfig']['db_host_name'];
   	$setup_db_admin_user_name = $sugar_config['dbconfig']['db_user_name'];
     $setup_db_host_instance = $sugar_config['dbconfig']['db_host_instance'];
@@ -77,21 +77,21 @@ 
     $link = @mysql_connect($setup_db_host_name, $setup_db_admin_user_name, $setup_db_admin_password);
     mysql_select_db('information_schema');
 
-    $qu="SELECT column_name FROM information_schema.columns WHERE table_schema = '".$db_name."' AND table_name = '".$table_name."'";
-	$ct =mysql_query($qu,$link);
+    $qu = "SELECT column_name FROM information_schema.columns WHERE table_schema = '".$db_name."' AND table_name = '".$table_name."'";
+	$ct = mysql_query($qu, $link);
     //$cols= '';
     $colsDrop = array();
-    while($row = mysql_fetch_assoc($ct)){
-    	 $colsDrop[] =$row['column_name'];
+    while ($row = mysql_fetch_assoc($ct)) {
+    	 $colsDrop[] = $row['column_name'];
     }
     return $colsDrop;
 }
 
 $colsDrop = tableColumns($_REQUEST['selectedTable']);
-if($colsDrop != null){
+if ($colsDrop != null) {
 	$colsDropDown = "<option value=".$_REQUEST['selectedTable']." Columns>".$_REQUEST['selectedTable']." Columns</option>";
-	foreach($colsDrop as $col){
-		$colsDropDown .="<option value={$col}>{$col}</option>";
+	foreach ($colsDrop as $col) {
+		$colsDropDown .= "<option value={$col}>{$col}</option>";
 	}
 }
 //$response = "<script>document.getElementById('select_column').innerHTML=$colsDropDown</script>";

Braces +3 added lines, -1 removed lines

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

modules/UpgradeWizard/silentUpgrade.php

Indentation +36 added lines, -36 removed lines

@@ -35,29 +35,29 @@ 
  ********************************************************************************/
 
 function build_argument_string($arguments=array()) {
-   if(!is_array($arguments)) {
-   	  return '';
-   }
+    if(!is_array($arguments)) {
+            return '';
+    }
 
-   $argument_string = '';
-   $count = 0;
-   foreach($arguments as $arg) {
-   	   if($count != 0)
-   	   {
-   	   	  //If current directory or parent directory is specified, substitute with full path
-   	   	  if($arg == '.')
-   	   	  {
-   	   	  	 $arg = getcwd();
-   	   	  } else if ($arg == '..') {
-   	   	  	 $dir = getcwd();
-			 $arg = substr($dir, 0, strrpos($dir, DIRECTORY_SEPARATOR));
-   	   	  }
-          $argument_string .= ' ' . escapeshellarg($arg);
-   	   }
-   	   $count++;
-   }
+    $argument_string = '';
+    $count = 0;
+    foreach($arguments as $arg) {
+            if($count != 0)
+            {
+                //If current directory or parent directory is specified, substitute with full path
+                if($arg == '.')
+                {
+                        $arg = getcwd();
+                } else if ($arg == '..') {
+                        $dir = getcwd();
+                $arg = substr($dir, 0, strrpos($dir, DIRECTORY_SEPARATOR));
+                }
+            $argument_string .= ' ' . escapeshellarg($arg);
+            }
+            $count++;
+    }
 
-   return $argument_string;
+    return $argument_string;
 }
 
 //Bug 52872. Dies if the request does not come from CLI.
@@ -75,8 +75,8 @@ 
                 $run_dce_upgrade = true;
                 //set the php path if found
                 if(is_file($argv[7].'dce_config.php')){
-                   include($argv[7].'dce_config.php');
-                   $php_path = $dce_config['client_php_path'].'/';
+                    include($argv[7].'dce_config.php');
+                    $php_path = $dce_config['client_php_path'].'/';
                 }
 }
 
@@ -92,25 +92,25 @@ 
 $has_error = $output == 0 ? false : true;
 
 if(!$has_error) {
-	if($run_dce_upgrade) {
-		$step2 = $php_path."php -f {$php_dir}silentUpgrade_dce_step1.php " . build_argument_string($argv);
-		passthru($step2, $output);
-	} else {
-		$step2 = "php -f {$php_dir}silentUpgrade_step2.php " . build_argument_string($argv);
-		passthru($step2, $output);
-	}
+    if($run_dce_upgrade) {
+        $step2 = $php_path."php -f {$php_dir}silentUpgrade_dce_step1.php " . build_argument_string($argv);
+        passthru($step2, $output);
+    } else {
+        $step2 = "php -f {$php_dir}silentUpgrade_step2.php " . build_argument_string($argv);
+        passthru($step2, $output);
+    }
 }
 
 if($run_dce_upgrade) {
-	$has_error = $output == 0 ? false : true;
-	if(!$has_error) {
-	   $step3 = $php_path."php -f {$php_dir}silentUpgrade_dce_step2.php " . build_argument_string($argv);
-	   passthru($step3, $output);
-	}
+    $has_error = $output == 0 ? false : true;
+    if(!$has_error) {
+        $step3 = $php_path."php -f {$php_dir}silentUpgrade_dce_step2.php " . build_argument_string($argv);
+        passthru($step3, $output);
+    }
 }
 
 if($output != 0) {
-   echo "***************         silentupgrade failed         ***************: $output\n";
+    echo "***************         silentupgrade failed         ***************: $output\n";
 }
 exit($output);
 ?>

Spacing +19 added lines, -19 removed lines

@@ -34,25 +34,25 @@ 
  * "Powered by SugarCRM".
  ********************************************************************************/
 
-function build_argument_string($arguments=array()) {
-   if(!is_array($arguments)) {
+function build_argument_string($arguments = array()) {
+   if (!is_array($arguments)) {
    	  return '';
    }
 
    $argument_string = '';
    $count = 0;
-   foreach($arguments as $arg) {
-   	   if($count != 0)
+   foreach ($arguments as $arg) {
+   	   if ($count != 0)
    	   {
    	   	  //If current directory or parent directory is specified, substitute with full path
-   	   	  if($arg == '.')
+   	   	  if ($arg == '.')
    	   	  {
    	   	  	 $arg = getcwd();
    	   	  } else if ($arg == '..') {
    	   	  	 $dir = getcwd();
 			 $arg = substr($dir, 0, strrpos($dir, DIRECTORY_SEPARATOR));
    	   	  }
-          $argument_string .= ' ' . escapeshellarg($arg);
+          $argument_string .= ' '.escapeshellarg($arg);
    	   }
    	   $count++;
    }
@@ -69,12 +69,12 @@ 
 
 $php_path = '';
 $run_dce_upgrade = false;
-if(isset($argv[3]) && is_dir($argv[3]) && file_exists($argv[3]."/ini_setup.php")) {
+if (isset($argv[3]) && is_dir($argv[3]) && file_exists($argv[3]."/ini_setup.php")) {
                 //this is a dce call, set the dce flag
                 chdir($argv[3]);
                 $run_dce_upgrade = true;
                 //set the php path if found
-                if(is_file($argv[7].'dce_config.php')){
+                if (is_file($argv[7].'dce_config.php')) {
                    include($argv[7].'dce_config.php');
                    $php_path = $dce_config['client_php_path'].'/';
                 }
@@ -82,34 +82,34 @@ 
 
 $php_file = $argv[0];
 $p_info = pathinfo($php_file);
-$php_dir = (isset($p_info['dirname']) && $p_info['dirname'] != '.') ?  $p_info['dirname'] . '/' : '';
+$php_dir = (isset($p_info['dirname']) && $p_info['dirname'] != '.') ? $p_info['dirname'].'/' : '';
 
-$step1 = $php_path."php -f {$php_dir}silentUpgrade_step1.php " . build_argument_string($argv);
+$step1 = $php_path."php -f {$php_dir}silentUpgrade_step1.php ".build_argument_string($argv);
 passthru($step1, $output);
-if($output != 0) {
+if ($output != 0) {
     echo "***************         step1 failed         ***************: $output\n";
 }
 $has_error = $output == 0 ? false : true;
 
-if(!$has_error) {
-	if($run_dce_upgrade) {
-		$step2 = $php_path."php -f {$php_dir}silentUpgrade_dce_step1.php " . build_argument_string($argv);
+if (!$has_error) {
+	if ($run_dce_upgrade) {
+		$step2 = $php_path."php -f {$php_dir}silentUpgrade_dce_step1.php ".build_argument_string($argv);
 		passthru($step2, $output);
 	} else {
-		$step2 = "php -f {$php_dir}silentUpgrade_step2.php " . build_argument_string($argv);
+		$step2 = "php -f {$php_dir}silentUpgrade_step2.php ".build_argument_string($argv);
 		passthru($step2, $output);
 	}
 }
 
-if($run_dce_upgrade) {
+if ($run_dce_upgrade) {
 	$has_error = $output == 0 ? false : true;
-	if(!$has_error) {
-	   $step3 = $php_path."php -f {$php_dir}silentUpgrade_dce_step2.php " . build_argument_string($argv);
+	if (!$has_error) {
+	   $step3 = $php_path."php -f {$php_dir}silentUpgrade_dce_step2.php ".build_argument_string($argv);
 	   passthru($step3, $output);
 	}
 }
 
-if($output != 0) {
+if ($output != 0) {
    echo "***************         silentupgrade failed         ***************: $output\n";
 }
 exit($output);

modules/AOR_Reports/vardefs.php

Indentation +56 added lines, -56 removed lines

@@ -38,45 +38,45 @@ 
  ********************************************************************************/
 
 $dictionary['AOR_Report'] = array(
-	'table'=>'aor_reports',
-	'audited'=>true,
-	'duplicate_merge'=>true,
-	'fields'=>array (
-	  'report_module' => 
-	  array (
-		'required' => true,
-		'name' => 'report_module',
-		'vname' => 'LBL_REPORT_MODULE',
-		'type' => 'enum',
-		'massupdate' => 0,
-		'default' => '',
-		'no_default' => false,
-		'comments' => '',
-		'help' => '',
-		'importable' => 'true',
-		'duplicate_merge' => 'disabled',
-		'duplicate_merge_dom_value' => '0',
-		'audited' => true,
-		'reportable' => true,
-		'unified_search' => false,
-		'merge_filter' => 'disabled',
-		'len' => 100,
-		'size' => '20',
-		'options' => 'aor_moduleList',
-		'studio' => 'visible',
-		'dependency' => false,
-	  ),
+    'table'=>'aor_reports',
+    'audited'=>true,
+    'duplicate_merge'=>true,
+    'fields'=>array (
+        'report_module' => 
+        array (
+        'required' => true,
+        'name' => 'report_module',
+        'vname' => 'LBL_REPORT_MODULE',
+        'type' => 'enum',
+        'massupdate' => 0,
+        'default' => '',
+        'no_default' => false,
+        'comments' => '',
+        'help' => '',
+        'importable' => 'true',
+        'duplicate_merge' => 'disabled',
+        'duplicate_merge_dom_value' => '0',
+        'audited' => true,
+        'reportable' => true,
+        'unified_search' => false,
+        'merge_filter' => 'disabled',
+        'len' => 100,
+        'size' => '20',
+        'options' => 'aor_moduleList',
+        'studio' => 'visible',
+        'dependency' => false,
+        ),
 
-	'graphs_per_row' =>
-	array (
-		'required' => true,
-		'name' => 'graphs_per_row',
-		'vname' => 'LBL_GRAPHS_PER_ROW',
-		'type' => 'int',
-		'massupdate' => 0,
-		'default' => 2,
-		'no_default' => false,
-	),
+    'graphs_per_row' =>
+    array (
+        'required' => true,
+        'name' => 'graphs_per_row',
+        'vname' => 'LBL_GRAPHS_PER_ROW',
+        'type' => 'int',
+        'massupdate' => 0,
+        'default' => 2,
+        'no_default' => false,
+    ),
 
     'field_lines' =>
     array (
@@ -118,8 +118,8 @@ 
             'include' => 'modules/AOR_Conditions/conditionLines.php'
         ),
     ),
-  'aor_fields' =>
-  array (
+    'aor_fields' =>
+    array (
     'name' => 'aor_fields',
     'type' => 'link',
     'relationship' => 'aor_reports_aor_fields',
@@ -127,26 +127,26 @@ 
     'bean_name'=>'AOR_Field',
     'source'=>'non-db',
     'id_name' => 'aor_report_id',
-  ),
-  'aor_conditions' =>
-  array (
-     'name' => 'aor_conditions',
-     'type' => 'link',
-     'relationship' => 'aor_reports_aor_conditions',
-     'module'=>'AOR_Conditions',
-     'bean_name'=>'AOR_Condition',
-     'source'=>'non-db',
-  ),
-  'aor_charts' =>
-      array (
+    ),
+    'aor_conditions' =>
+    array (
+        'name' => 'aor_conditions',
+        'type' => 'link',
+        'relationship' => 'aor_reports_aor_conditions',
+        'module'=>'AOR_Conditions',
+        'bean_name'=>'AOR_Condition',
+        'source'=>'non-db',
+    ),
+    'aor_charts' =>
+        array (
         'name' => 'aor_charts',
         'type' => 'link',
         'relationship' => 'aor_charts_aor_reports',
         'source' => 'non-db',
         'id_name' => 'aor_report_id',
         'vname' => 'LBL_AOR_CHARTS',
-      ),
-  'aor_scheduled_reports' =>
+        ),
+    'aor_scheduled_reports' =>
     array (
         'name' => 'aor_scheduled_reports',
         'type' => 'link',
@@ -188,8 +188,8 @@ 
         'relationship_type'=>'one-to-many',
     ),
 ),
-	'optimistic_locking'=>true,
-	'unified_search'=>true,
+    'optimistic_locking'=>true,
+    'unified_search'=>true,
 );
 
 if (!class_exists('VardefManager')){

Spacing +15 added lines, -15 removed lines

@@ -41,9 +41,9 @@ 
 	'table'=>'aor_reports',
 	'audited'=>true,
 	'duplicate_merge'=>true,
-	'fields'=>array (
+	'fields'=>array(
 	  'report_module' => 
-	  array (
+	  array(
 		'required' => true,
 		'name' => 'report_module',
 		'vname' => 'LBL_REPORT_MODULE',
@@ -68,7 +68,7 @@ 
 	  ),
 
 	'graphs_per_row' =>
-	array (
+	array(
 		'required' => true,
 		'name' => 'graphs_per_row',
 		'vname' => 'LBL_GRAPHS_PER_ROW',
@@ -79,7 +79,7 @@ 
 	),
 
     'field_lines' =>
-    array (
+    array(
         'required' => false,
         'name' => 'field_lines',
         'vname' => 'LBL_FIELD_LINES',
@@ -92,14 +92,14 @@ 
         'audited' => false,
         'reportable' => false,
         'function' =>
-        array (
+        array(
             'name' => 'display_field_lines',
             'returns' => 'html',
             'include' => 'modules/AOR_Fields/fieldLines.php'
         ),
     ),
     'condition_lines' =>
-    array (
+    array(
         'required' => false,
         'name' => 'condition_lines',
         'vname' => 'LBL_CONDITION_LINES',
@@ -112,14 +112,14 @@ 
         'audited' => false,
         'reportable' => false,
         'function' =>
-        array (
+        array(
             'name' => 'display_condition_lines',
             'returns' => 'html',
             'include' => 'modules/AOR_Conditions/conditionLines.php'
         ),
     ),
   'aor_fields' =>
-  array (
+  array(
     'name' => 'aor_fields',
     'type' => 'link',
     'relationship' => 'aor_reports_aor_fields',
@@ -129,7 +129,7 @@ 
     'id_name' => 'aor_report_id',
   ),
   'aor_conditions' =>
-  array (
+  array(
      'name' => 'aor_conditions',
      'type' => 'link',
      'relationship' => 'aor_reports_aor_conditions',
@@ -138,7 +138,7 @@ 
      'source'=>'non-db',
   ),
   'aor_charts' =>
-      array (
+      array(
         'name' => 'aor_charts',
         'type' => 'link',
         'relationship' => 'aor_charts_aor_reports',
@@ -147,7 +147,7 @@ 
         'vname' => 'LBL_AOR_CHARTS',
       ),
   'aor_scheduled_reports' =>
-    array (
+    array(
         'name' => 'aor_scheduled_reports',
         'type' => 'link',
         'relationship' => 'aor_scheduled_reports_aor_reports',
@@ -157,7 +157,7 @@ 
     ),
 
 ),
-'relationships'=>array (
+'relationships'=>array(
     'aor_reports_aor_fields' =>
     array(
         'lhs_module'=> 'AOR_Reports',
@@ -178,7 +178,7 @@ 
         'rhs_key' => 'aor_report_id',
         'relationship_type'=>'one-to-many',
     ),
-    "aor_scheduled_reports_aor_reports" => array (
+    "aor_scheduled_reports_aor_reports" => array(
         'lhs_module'=> 'AOR_Reports',
         'lhs_table'=> 'aor_reports',
         'lhs_key' => 'id',
@@ -192,8 +192,8 @@ 
 	'unified_search'=>true,
 );
 
-if (!class_exists('VardefManager')){
+if (!class_exists('VardefManager')) {
         require_once('include/SugarObjects/VardefManager.php');
 }
-VardefManager::createVardef('AOR_Reports','AOR_Report', array('basic','assignable','security_groups'));
+VardefManager::createVardef('AOR_Reports', 'AOR_Report', array('basic', 'assignable', 'security_groups'));
 

modules/AOR_Reports/aor_utils.php

Spacing +3 added lines, -3 removed lines

@@ -62,7 +62,7 @@ 
     $fieldDisplay = $currentBean->field_name_map[$field]['vname'];
     $fieldDisplay = translate($fieldDisplay, $currentBean->module_dir);
     $fieldDisplay = trim($fieldDisplay, ':');
-    foreach($modulePathDisplay as &$module) {
+    foreach ($modulePathDisplay as &$module) {
         $module = isset($app_list_strings['aor_moduleList'][$module]) ? $app_list_strings['aor_moduleList'][$module] : (
             isset($app_list_strings['moduleList'][$module]) ? $app_list_strings['moduleList'][$module] : $module
         );
@@ -73,7 +73,7 @@ 
 function requestToUserParameters()
 {
     $params = array();
-    if(isset($_REQUEST['parameter_id']) && $_REQUEST['parameter_id']) {
+    if (isset($_REQUEST['parameter_id']) && $_REQUEST['parameter_id']) {
         foreach ($_REQUEST['parameter_id'] as $key => $parameterId) {
             if ($_REQUEST['parameter_type'][$key] === 'Multi') {
                 $_REQUEST['parameter_value'][$key] = encodeMultienumValue(explode(',', $_REQUEST['parameter_value'][$key]));
@@ -228,7 +228,7 @@ 
     $offsetMonths -= 1;
     // Offset months
     if ($offsetMonths > 0) {
-        $q1start->add(new DateInterval('P' . $offsetMonths . 'M'));
+        $q1start->add(new DateInterval('P'.$offsetMonths.'M'));
     }
     $q1end = DateTime::createFromFormat(DATE_ISO8601, $q1start->format(DATE_ISO8601));
     $q1end->add(new DateInterval('P2M'));

Doc Comments +3 added lines

@@ -88,6 +88,9 @@
     return $params;
 }
 
+/**
+ * @param SugarBean $report
+ */
 function getConditionsAsParameters($report, $override = array())
 {
     if (empty($report)) {

modules/AOR_Reports/language/en_us.lang.php

Indentation +79 added lines, -79 removed lines

@@ -1,88 +1,88 @@
 <?php
 /**
- * Advanced OpenReports, SugarCRM Reporting.
- * @package Advanced OpenReports for SugarCRM
- * @copyright SalesAgility Ltd http://www.salesagility.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
- * along with this program; if not, see http://www.gnu.org/licenses
- * or write to the Free Software Foundation,Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301  USA
- *
- * @author SalesAgility <info@salesagility.com>
- */
+     * Advanced OpenReports, SugarCRM Reporting.
+     * @package Advanced OpenReports for SugarCRM
+     * @copyright SalesAgility Ltd http://www.salesagility.com
+     *
+     * This program is free software; you can redistribute it and/or modify
+     * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+     * the Free Software Foundation; either version 3 of the License, or
+     * (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+     * along with this program; if not, see http://www.gnu.org/licenses
+     * or write to the Free Software Foundation,Inc., 51 Franklin Street,
+     * Fifth Floor, Boston, MA 02110-1301  USA
+     *
+     * @author SalesAgility <info@salesagility.com>
+     */
 
 $mod_strings = array (
-  'LBL_ASSIGNED_TO_ID' => 'Assigned User Id',
-  'LBL_ASSIGNED_TO_NAME' => 'Assigned to',
-  'LBL_ID' => 'ID',
-  'LBL_DATE_ENTERED' => 'Date Created',
-  'LBL_DATE_MODIFIED' => 'Date Modified',
-  'LBL_MODIFIED' => 'Modified By',
-  'LBL_MODIFIED_ID' => 'Modified By Id',
-  'LBL_MODIFIED_NAME' => 'Modified By Name',
-  'LBL_CREATED' => 'Created By',
-  'LBL_CREATED_ID' => 'Created By Id',
-  'LBL_DESCRIPTION' => 'Description',
-  'LBL_DELETED' => 'Deleted',
-  'LBL_NAME' => 'Name',
-  'LBL_CREATED_USER' => 'Created by User',
-  'LBL_MODIFIED_USER' => 'Modified by User',
-  'LBL_LIST_NAME' => 'Name',
-  'LBL_EDIT_BUTTON' => 'Edit',
-  'LBL_REMOVE' => 'Remove',
-  'LBL_LIST_FORM_TITLE' => 'Reports List',
-  'LBL_MODULE_NAME' => 'Reports',
-  'LBL_MODULE_TITLE' => 'Reports',
-  'LBL_HOMEPAGE_TITLE' => 'My Reports',
-  'LNK_NEW_RECORD' => 'Create Report',
-  'LNK_LIST' => 'View Reports',
-  'LNK_IMPORT_AOR_REPORTS' => 'Import Reports',
-  'LBL_SEARCH_FORM_TITLE' => 'Search Reports',
-  'LBL_HISTORY_SUBPANEL_TITLE' => 'View History',
-  'LBL_ACTIVITIES_SUBPANEL_TITLE' => 'Activities',
-  'LBL_AOR_REPORTS_SUBPANEL_TITLE' => 'Reports',
-  'LBL_NEW_FORM_TITLE' => 'New Reports',
-  'LBL_REPORT_MODULE' => 'Report Module',
+    'LBL_ASSIGNED_TO_ID' => 'Assigned User Id',
+    'LBL_ASSIGNED_TO_NAME' => 'Assigned to',
+    'LBL_ID' => 'ID',
+    'LBL_DATE_ENTERED' => 'Date Created',
+    'LBL_DATE_MODIFIED' => 'Date Modified',
+    'LBL_MODIFIED' => 'Modified By',
+    'LBL_MODIFIED_ID' => 'Modified By Id',
+    'LBL_MODIFIED_NAME' => 'Modified By Name',
+    'LBL_CREATED' => 'Created By',
+    'LBL_CREATED_ID' => 'Created By Id',
+    'LBL_DESCRIPTION' => 'Description',
+    'LBL_DELETED' => 'Deleted',
+    'LBL_NAME' => 'Name',
+    'LBL_CREATED_USER' => 'Created by User',
+    'LBL_MODIFIED_USER' => 'Modified by User',
+    'LBL_LIST_NAME' => 'Name',
+    'LBL_EDIT_BUTTON' => 'Edit',
+    'LBL_REMOVE' => 'Remove',
+    'LBL_LIST_FORM_TITLE' => 'Reports List',
+    'LBL_MODULE_NAME' => 'Reports',
+    'LBL_MODULE_TITLE' => 'Reports',
+    'LBL_HOMEPAGE_TITLE' => 'My Reports',
+    'LNK_NEW_RECORD' => 'Create Report',
+    'LNK_LIST' => 'View Reports',
+    'LNK_IMPORT_AOR_REPORTS' => 'Import Reports',
+    'LBL_SEARCH_FORM_TITLE' => 'Search Reports',
+    'LBL_HISTORY_SUBPANEL_TITLE' => 'View History',
+    'LBL_ACTIVITIES_SUBPANEL_TITLE' => 'Activities',
+    'LBL_AOR_REPORTS_SUBPANEL_TITLE' => 'Reports',
+    'LBL_NEW_FORM_TITLE' => 'New Reports',
+    'LBL_REPORT_MODULE' => 'Report Module',
     'LBL_GRAPHS_PER_ROW' => 'Charts per row',
-  'LBL_FIELD_LINES' => 'Display Fields',
-  'LBL_ADD_FIELD' => 'Add Field',
-  'LBL_CONDITION_LINES' => 'Conditions',
-  'LBL_ADD_CONDITION' => 'Add Condition',
-  'LBL_EXPORT' => 'Export',
-  'LBL_DOWNLOAD_PDF' => 'Download PDF',
-  'LBL_ADD_TO_PROSPECT_LIST' => 'Add To Target List',
-  'LBL_AOR_MODULETREE_SUBPANEL_TITLE' => 'Module tree',
-  'LBL_AOR_FIELDS_SUBPANEL_TITLE' => 'Fields',
-  'LBL_AOR_CONDITIONS_SUBPANEL_TITLE' => 'Conditions',
-  'LBL_TOTAL' => 'Total',
-  'LBL_AOR_CHARTS_SUBPANEL_TITLE' => 'Charts',
-  'LBL_ADD_CHART' => 'Add chart',
+    'LBL_FIELD_LINES' => 'Display Fields',
+    'LBL_ADD_FIELD' => 'Add Field',
+    'LBL_CONDITION_LINES' => 'Conditions',
+    'LBL_ADD_CONDITION' => 'Add Condition',
+    'LBL_EXPORT' => 'Export',
+    'LBL_DOWNLOAD_PDF' => 'Download PDF',
+    'LBL_ADD_TO_PROSPECT_LIST' => 'Add To Target List',
+    'LBL_AOR_MODULETREE_SUBPANEL_TITLE' => 'Module tree',
+    'LBL_AOR_FIELDS_SUBPANEL_TITLE' => 'Fields',
+    'LBL_AOR_CONDITIONS_SUBPANEL_TITLE' => 'Conditions',
+    'LBL_TOTAL' => 'Total',
+    'LBL_AOR_CHARTS_SUBPANEL_TITLE' => 'Charts',
+    'LBL_ADD_CHART' => 'Add chart',
     'LBL_ADD_PARENTHESIS' => 'Drop parenthesis',
-  'LBL_CHART_TITLE' => 'Title',
-  'LBL_CHART_TYPE' => 'Type',
-  'LBL_CHART_X_FIELD' => 'X Axis',
-  'LBL_CHART_Y_FIELD' => 'Y Axis',
-  'LBL_AOR_REPORTS_DASHLET' => 'Reports',
-  'LBL_DASHLET_TITLE' => 'Title',
-  'LBL_DASHLET_REPORT' => 'Report',
-  'LBL_DASHLET_CHOOSE_REPORT' => 'Please choose a report',
-  'LBL_DASHLET_SAVE' => 'Save',
-  'LBL_DASHLET_CHARTS' => 'Charts',
-  'LBL_DASHLET_ONLY_CHARTS' => 'Only show charts',
-  'LBL_AOR_SCHEDULED_REPORTS_AOR_REPORTS_FROM_AOR_SCHEDULED_REPORTS_TITLE' => 'Scheduled Reports',
-  'LBL_UPDATE_PARAMETERS' => 'Update',
-  'LBL_PARAMETERS' => 'Parameters',
+    'LBL_CHART_TITLE' => 'Title',
+    'LBL_CHART_TYPE' => 'Type',
+    'LBL_CHART_X_FIELD' => 'X Axis',
+    'LBL_CHART_Y_FIELD' => 'Y Axis',
+    'LBL_AOR_REPORTS_DASHLET' => 'Reports',
+    'LBL_DASHLET_TITLE' => 'Title',
+    'LBL_DASHLET_REPORT' => 'Report',
+    'LBL_DASHLET_CHOOSE_REPORT' => 'Please choose a report',
+    'LBL_DASHLET_SAVE' => 'Save',
+    'LBL_DASHLET_CHARTS' => 'Charts',
+    'LBL_DASHLET_ONLY_CHARTS' => 'Only show charts',
+    'LBL_AOR_SCHEDULED_REPORTS_AOR_REPORTS_FROM_AOR_SCHEDULED_REPORTS_TITLE' => 'Scheduled Reports',
+    'LBL_UPDATE_PARAMETERS' => 'Update',
+    'LBL_PARAMETERS' => 'Parameters',
     'LBL_TOOLTIP_DRAG_DROP_ELEMS' => 'Drag and drop elements into field or condition area',
     'LBL_MAIN_GROUPS' => 'Main Group:',
 );

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
  * @author SalesAgility <info@salesagility.com>
  */
 
-$mod_strings = array (
+$mod_strings = array(
   'LBL_ASSIGNED_TO_ID' => 'Assigned User Id',
   'LBL_ASSIGNED_TO_NAME' => 'Assigned to',
   'LBL_ID' => 'ID',

modules/AOR_Reports/AOR_Report.php

Spacing +252 added lines, -252 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,7 +118,7 @@ 
     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;
 
 
@@ -141,16 +141,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;
@@ -163,10 +163,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');
                 }
 
@@ -181,17 +181,17 @@ 
         $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])) {
+                        if (!is_numeric($row[$name])) {
                             $row[$name] = trim(strip_tags(getModuleField($att['module'], $att['field'], $att['field'], 'DetailView', $row[$name], '', $currency_id)));
                         }
                         break;
@@ -203,7 +203,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;
@@ -211,17 +211,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($this->get_linked_beans('aor_charts','AOR_Charts') as $chart){
-            if($chartIds !== null && !in_array($chart->id,$chartIds)){
+        foreach ($this->get_linked_beans('aor_charts', 'AOR_Charts') 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;
@@ -233,12 +233,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;
@@ -248,23 +248,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']]) . '\'' ];
 
@@ -300,7 +300,7 @@ 
         // escape values for query
 
         $_id = $this->db->quote($reportId);
-        $_level = (int) $level;
+        $_level = (int)$level;
 
         // get results array
 
@@ -315,7 +315,7 @@ 
         $results = $this->db->query($query);
 
         $rows = array();
-        while($row = $this->db->fetchByAssoc($results)) {
+        while ($row = $this->db->fetchByAssoc($results)) {
             $rows[] = $row;
         }
 
@@ -324,20 +324,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 = '';
@@ -348,23 +348,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;
 
@@ -378,71 +378,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);
@@ -450,41 +450,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;
 
@@ -497,22 +497,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;
@@ -524,36 +524,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'>
@@ -562,12 +562,12 @@ 
 
             }
 
-            $html .="</td>
+            $html .= "</td>
                        </table>
                       </td>";
 
-            $html .="</tr></thead>";
-        } else{
+            $html .= "</tr></thead>";
+        } else {
 
             $moduleFieldByGroupValue = $this->getModuleFieldByGroupValue($beanList, $group_value);
 
@@ -593,16 +593,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;
@@ -615,7 +615,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;
@@ -628,7 +628,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);
@@ -641,39 +641,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>";
 
@@ -716,13 +716,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;
                 }
             }
 
@@ -735,31 +735,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>";
             }
         }
@@ -768,24 +768,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');
 
@@ -809,20 +809,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;
@@ -833,30 +833,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;
 
@@ -865,7 +865,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]();
@@ -874,26 +874,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);
@@ -901,18 +901,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;
         }
@@ -926,11 +926,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*\)|\(\s*\)/i', '', $query_where_clean);
             $safe++;
-            if($safe>100){
+            if ($safe > 100) {
                 $GLOBALS['log']->fatal('Invalid report query conditions');
                 break;
             }
@@ -939,10 +939,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'";
@@ -955,16 +955,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);
@@ -975,54 +975,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;
             }
         }
@@ -1030,30 +1030,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);
@@ -1062,7 +1062,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'";
@@ -1077,11 +1077,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);
@@ -1089,18 +1089,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 */
@@ -1113,16 +1113,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";
@@ -1139,21 +1139,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];
@@ -1168,24 +1168,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) {
@@ -1217,10 +1217,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 = $condition_module->table_name . '.' . $condition->value;
+                                $value = $condition_module->table_name.'.'.$condition->value;
                             }
                             break;
 
@@ -1232,10 +1232,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()';
@@ -1243,10 +1243,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];
                                 }
                             }
 
@@ -1257,9 +1257,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;
                                 }
@@ -1274,7 +1274,7 @@ 
                                 $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 .= ')';
                             }
@@ -1287,20 +1287,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;
@@ -1313,13 +1313,13 @@ 
                     }
 
 
-                    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 {
@@ -1333,7 +1333,7 @@ 
 
             }
 
-            if(isset($query['where']) && $query['where']) {
+            if (isset($query['where']) && $query['where']) {
                 array_unshift($query['where'], '(');
                 $query['where'][] = ') AND ';
             }
@@ -1341,7 +1341,7 @@ 
 
         }
 
-        if($closure) {
+        if ($closure) {
             $query['where'][] = ')';
         }
 

Braces +42 added lines, -34 removed lines

@@ -211,8 +211,10 @@ 
                 $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;
         }
@@ -235,15 +237,13 @@ 
 
         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]) {
                 $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;
-            }
-            else {
+            } else {
                 $rows[0]['field_id_name'] = $rows[0]['field'];
             }
             $path[] = $rows[0];
@@ -255,8 +255,7 @@ 
             }
 
             return $this->buildMultiGroupReport($offset, $links, $level+1, $path);
-        }
-        else if(!$rows) {
+        } else if(!$rows) {
             if($path) {
                 $html = '';
                 foreach ($path as $pth) {
@@ -274,12 +273,10 @@ 
                     }
                 }
                 return $html;
-            }
-            else {
+            } else {
                 return $this->build_group_report($offset, $links);
             }
-        }
-        else {
+        } else {
             throw new Exception('incorrect results');
         }
         throw new Exception('incorrect state');
@@ -415,8 +412,7 @@ 
                 foreach($extra['select'] as $selectField => $selectAlias) {
                     if($selectAlias) {
                         $query_array['select'][] = $selectField . " AS " . $selectAlias;
-                    }
-                    else {
+                    } else {
                         $query_array['select'][] = $selectField;
                     }
                 }
@@ -471,14 +467,18 @@ 
             $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;
 
     }
@@ -663,7 +663,9 @@ 
                     if($att['total']){
                         $totals[$name][] = $row[$name];
                     }
-                    if($att['link'] && $links) $html .= "</a>";
+                    if($att['link'] && $links) {
+                        $html .= "</a>";
+                    }
                     $html .= "</td>";
                 }
             }
@@ -747,7 +749,7 @@ 
             if($field['total']){
                 $totalLabel = $field['label'] ." ".$app_list_strings['aor_total_options'][$field['total']];
                 $html .= "<th>{$totalLabel}</th>";
-            }else{
+            } else{
                 $html .= "<th></th>";
             }
         }
@@ -759,7 +761,7 @@ 
             }
             if($field['total'] && isset($totals[$label])){
                 $html .= "<td>".$this->calculateTotal($field['total'],$totals[$label])."</td>";
-            }else{
+            } else{
                 $html .= "<td></td>";
             }
         }
@@ -835,10 +837,11 @@ 
             $csv .= "\r\n";
             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]))));
+                    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 .= $delimiter;
                 }
             }
@@ -1022,7 +1025,9 @@ 
 
                 $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;
             }
         }
@@ -1047,13 +1052,13 @@ 
                                 $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);
@@ -1268,12 +1273,16 @@ 
 
                         case 'Multi':
                             $sep = ' AND ';
-                            if ($condition->operator == 'Equal_To') $sep = ' OR ';
+                            if ($condition->operator == 'Equal_To') {
+                                $sep = ' OR ';
+                            }
                             $multi_values = unencodeMultienum($condition->value);
                             if (!empty($multi_values)) {
                                 $value = '(';
                                 foreach ($multi_values as $multi_value) {
-                                    if ($value != '(') $value .= $sep;
+                                    if ($value != '(') {
+                                        $value .= $sep;
+                                    }
                                     $value .= $field . ' ' . $app_list_strings['aor_sql_operator_list'][$condition->operator] . " '" . $multi_value . "'";
                                 }
                                 $value .= ')';
@@ -1313,21 +1322,20 @@ 
                     }
 
 
-                    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) {
+                } else if($condition->parenthesis) {
                     if($condition->parenthesis == 'START') {
                         $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ' : 'AND ')) .  '(';
                         $tiltLogicOp = true;
-                    }
-                    else {
+                    } else {
                         $query['where'][] = ')';
                         $tiltLogicOp = false;
                     }
-                }
-                else {
+                } else {
                     $GLOBALS['log']->debug('illegal condition');
                 }
 

Doc Comments +12 added lines

@@ -322,6 +322,9 @@ 
         return $rows;
     }
 
+    /**
+     * @param string $body
+     */
     private function getMultiGroupFrameHTML($header, $body) {
         $html = '<div class="multi-group-list" style="border: 1px solid black; padding: 10px;">
                     <h3>' . $header . '</h3>
@@ -330,6 +333,9 @@ 
         return $html;
     }
 
+    /**
+     * @param string $html
+     */
     private function addDataIdValueToInnertext($html) {
         preg_match('/\sdata-id-value\s*=\s*"([^"]*)"/', $html, $match);
         $html = preg_replace('/(>)([^<]*)(<\/\w+>$)/', '$1$2' . $match[1] . '$3', $html);
@@ -920,6 +926,9 @@ 
 
     }
 
+    /**
+     * @param string $query_where
+     */
     private function queryWhereRepair($query_where) {
 
         // remove empty parenthesis and fix query syntax
@@ -1030,6 +1039,9 @@ 
     }
 
 
+    /**
+     * @param string $type
+     */
     function build_report_query_join($name, $alias, $parentAlias, SugarBean $module, $type, $query = array(),SugarBean $rel_module = null ){
 
         if(!isset($query['join'][$alias])){

Indentation +34 added lines, -34 removed lines

@@ -23,42 +23,42 @@ 
  */
 
 class AOR_Report extends Basic {
-	var $new_schema = true;
-	var $module_dir = 'AOR_Reports';
-	var $object_name = 'AOR_Report';
-	var $table_name = 'aor_reports';
-	var $importable = true;
-	var $disable_row_level_security = true ;
-
-	var $id;
-	var $name;
-	var $date_entered;
-	var $date_modified;
-	var $modified_user_id;
-	var $modified_by_name;
-	var $created_by;
-	var $created_by_name;
-	var $description;
-	var $deleted;
-	var $created_by_link;
-	var $modified_user_link;
-	var $assigned_user_id;
-	var $assigned_user_name;
-	var $assigned_user_link;
-	var $report_module;
-
-	function AOR_Report(){
-		parent::Basic();
+    var $new_schema = true;
+    var $module_dir = 'AOR_Reports';
+    var $object_name = 'AOR_Report';
+    var $table_name = 'aor_reports';
+    var $importable = true;
+    var $disable_row_level_security = true ;
+
+    var $id;
+    var $name;
+    var $date_entered;
+    var $date_modified;
+    var $modified_user_id;
+    var $modified_by_name;
+    var $created_by;
+    var $created_by_name;
+    var $description;
+    var $deleted;
+    var $created_by_link;
+    var $modified_user_link;
+    var $assigned_user_id;
+    var $assigned_user_name;
+    var $assigned_user_link;
+    var $report_module;
+
+    function AOR_Report(){
+        parent::Basic();
         $this->load_report_beans();
         require_once('modules/AOW_WorkFlow/aow_utils.php');
-	}
+    }
 
-	function bean_implements($interface){
-		switch($interface){
-			case 'ACL': return true;
-		}
-		return false;
-	}
+    function bean_implements($interface){
+        switch($interface){
+            case 'ACL': return true;
+        }
+        return false;
+    }
 
     function save($check_notify = FALSE){
 
@@ -473,7 +473,7 @@ 
             while ($row = $this->db->fetchByAssoc($result)) {
                 if($html != '') $html .= '<br />';
 
-               $html .= $this->build_report_html($offset, $links, $row[$field_label], '', $extra);
+                $html .= $this->build_report_html($offset, $links, $row[$field_label], '', $extra);
 
             }
         }

modules/AOR_Reports/metadata/editviewdefs.php

Spacing +13 added lines, -13 removed lines

@@ -23,21 +23,21 @@ 
  */
 
 $viewdefs ['AOR_Reports'] =
-array (
+array(
   'EditView' => 
-  array (
+  array(
     'templateMeta' => 
-    array (
+    array(
       'maxColumns' => '2',
       'widths' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
         1 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
@@ -49,18 +49,18 @@ 
         ),
     ),
     'panels' => 
-    array (
+    array(
       'default' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 'name',
           1 => 'assigned_user_name',
         ),
         1 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'report_module',
             'studio' => 'visible',
             'label' => 'LBL_REPORT_MODULE',
@@ -68,9 +68,9 @@ 
           1 => '',
         ),
           2 =>
-              array (
+              array(
                   0 =>
-                      array (
+                      array(
                           'name' => 'graphs_per_row',
                           'label' => 'LBL_GRAPHS_PER_ROW',
                       ),

Indentation +30 added lines, -30 removed lines

@@ -24,25 +24,25 @@ 
 
 $viewdefs ['AOR_Reports'] =
 array (
-  'EditView' => 
-  array (
+    'EditView' => 
+    array (
     'templateMeta' => 
     array (
-      'maxColumns' => '2',
-      'widths' => 
-      array (
+        'maxColumns' => '2',
+        'widths' => 
+        array (
         0 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
         1 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
+        ),
         ),
-      ),
-      'useTabs' => false,
+        'useTabs' => false,
         'form' => array(
             'headerTpl' => 'modules/AOR_Reports/tpls/EditViewHeader.tpl',
             'footerTpl' => 'modules/AOR_Reports/tpls/EditViewFooter.tpl',
@@ -50,38 +50,38 @@ 
     ),
     'panels' => 
     array (
-      'default' => 
-      array (
+        'default' => 
+        array (
         0 => 
         array (
-          0 => 'name',
-          1 => 'assigned_user_name',
+            0 => 'name',
+            1 => 'assigned_user_name',
         ),
         1 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'report_module',
             'studio' => 'visible',
             'label' => 'LBL_REPORT_MODULE',
-          ),
-          1 => '',
+            ),
+            1 => '',
         ),
-          2 =>
-              array (
-                  0 =>
-                      array (
-                          'name' => 'graphs_per_row',
-                          'label' => 'LBL_GRAPHS_PER_ROW',
-                      ),
-                  1 => '',
-              ),
+            2 =>
+                array (
+                    0 =>
+                        array (
+                            'name' => 'graphs_per_row',
+                            'label' => 'LBL_GRAPHS_PER_ROW',
+                        ),
+                    1 => '',
+                ),
 //        2 =>
 //        array (
 //          0 => 'description',
 //        ),
-      ),
+        ),
+    ),
     ),
-  ),
 );
 ?>