adamjakab / SuiteCRM

modules/AOR_Charts/AOR_Chart.php

Indentation +21 added lines, -21 removed lines

@@ -25,25 +25,25 @@ 
 class AOR_Chart extends Basic {
 
     var $colours = "['#1f78b4','#a6cee3','#b2df8a','#33a02c','#fb9a99','#e31a1c','#fdbf6f','#ff7f00','#cab2d6','#6a3d9a','#ffff99','#b15928']";
-	var $new_schema = true;
-	var $module_dir = 'AOR_Charts';
-	var $object_name = 'AOR_Chart';
-	var $table_name = 'aor_charts';
-	var $importable = true;
-	var $disable_row_level_security = true ;
+    var $new_schema = true;
+    var $module_dir = 'AOR_Charts';
+    var $object_name = 'AOR_Chart';
+    var $table_name = 'aor_charts';
+    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 $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 $type;
     var $x_field;
@@ -52,9 +52,9 @@ 
 
 
 
-	function AOR_Chart(){
-		parent::Basic();
-	}
+    function AOR_Chart(){
+        parent::Basic();
+    }
 
     function save_lines(array $post,AOR_Report $bean,$postKey){
         $seenIds = array();

Spacing +147 added lines, -147 removed lines

@@ -30,7 +30,7 @@ 
 	var $object_name = 'AOR_Chart';
 	var $table_name = 'aor_charts';
 	var $importable = true;
-	var $disable_row_level_security = true ;
+	var $disable_row_level_security = true;
 	
 	var $id;
 	var $name;
@@ -52,148 +52,148 @@ 
 
 
 
-	function AOR_Chart(){
+	function AOR_Chart() {
 		parent::Basic();
 	}
 
-    function save_lines(array $post,AOR_Report $bean,$postKey){
+    function save_lines(array $post, AOR_Report $bean, $postKey) {
         $seenIds = array();
-        if(isset($post[$postKey.'id'])) {
-            foreach ($post[$postKey . 'id'] as $key => $id) {
+        if (isset($post[$postKey.'id'])) {
+            foreach ($post[$postKey.'id'] as $key => $id) {
                 if ($id) {
                     $aorChart = BeanFactory::getBean('AOR_Charts', $id);
                 } else {
                     $aorChart = BeanFactory::newBean('AOR_Charts');
                 }
-                $aorChart->name = $post[$postKey . 'title'][$key];
-                $aorChart->type = $post[$postKey . 'type'][$key];
-                $aorChart->x_field = $post[$postKey . 'x_field'][$key];
-                $aorChart->y_field = $post[$postKey . 'y_field'][$key];
+                $aorChart->name = $post[$postKey.'title'][$key];
+                $aorChart->type = $post[$postKey.'type'][$key];
+                $aorChart->x_field = $post[$postKey.'x_field'][$key];
+                $aorChart->y_field = $post[$postKey.'y_field'][$key];
                 $aorChart->aor_report_id = $bean->id;
                 $aorChart->save();
                 $seenIds[] = $aorChart->id;
             }
         }
         //Any beans that exist but aren't in $seenIds must have been removed.
-        foreach($bean->get_linked_beans('aor_charts','AOR_Charts') as $chart){
-            if(!in_array($chart->id,$seenIds)){
+        foreach ($bean->get_linked_beans('aor_charts', 'AOR_Charts') as $chart) {
+            if (!in_array($chart->id, $seenIds)) {
                 $chart->mark_deleted($chart->id);
             }
         }
     }
 
-    private function getValidChartTypes(){
-        return array('bar','line','pie','radar','rose', 'grouped_bar', 'stacked_bar');
+    private function getValidChartTypes() {
+        return array('bar', 'line', 'pie', 'radar', 'rose', 'grouped_bar', 'stacked_bar');
     }
 
 
-    private function getColour($seed,$rgbArray = false){
+    private function getColour($seed, $rgbArray = false) {
         $hash = md5($seed);
         $r = hexdec(substr($hash, 0, 2));
         $g = hexdec(substr($hash, 2, 2));
         $b = hexdec(substr($hash, 4, 2));
-        if($rgbArray){
-            return array('R'=>$r,'G'=>$g,'B'=>$b);
+        if ($rgbArray) {
+            return array('R'=>$r, 'G'=>$g, 'B'=>$b);
         }
         $highR = $r + 10;
         $highG = $g + 10;
         $highB = $b + 10;
-        $main = '#'.str_pad(dechex($r),2,'0',STR_PAD_LEFT)
-            .str_pad(dechex($g),2,'0',STR_PAD_LEFT)
-            .str_pad(dechex($b),2,'0',STR_PAD_LEFT);
+        $main = '#'.str_pad(dechex($r), 2, '0', STR_PAD_LEFT)
+            .str_pad(dechex($g), 2, '0', STR_PAD_LEFT)
+            .str_pad(dechex($b), 2, '0', STR_PAD_LEFT);
         $highlight = '#'.dechex($highR).dechex($highG).dechex($highB);
-        return array('main'=>$main,'highlight'=>$highlight);
+        return array('main'=>$main, 'highlight'=>$highlight);
     }
 
-    function buildChartImageBar($chartPicture,$recordImageMap = false){
+    function buildChartImageBar($chartPicture, $recordImageMap = false) {
         $scaleSettings = array("DrawSubTicks" => false, "LabelRotation" => 30, 'MinDivHeight' => 50);
         $chartPicture->drawScale($scaleSettings);
         $chartPicture->drawBarChart(array("RecordImageMap"=>$recordImageMap));
     }
 
-    function buildChartImagePie($chartPicture,$chartData, $reportData,$imageHeight, $imageWidth, $xName,$recordImageMap){
-        $PieChart = new pPie($chartPicture,$chartData);
+    function buildChartImagePie($chartPicture, $chartData, $reportData, $imageHeight, $imageWidth, $xName, $recordImageMap) {
+        $PieChart = new pPie($chartPicture, $chartData);
         $x = 0;
-        foreach($reportData as $row){
-            $PieChart->setSliceColor($x,$this->getColour($row[$xName],true));
+        foreach ($reportData as $row) {
+            $PieChart->setSliceColor($x, $this->getColour($row[$xName], true));
             $x++;
         }
-        $PieChart->draw2DPie($imageWidth/3,$imageHeight/2,array("Border"=>TRUE,'Radius'=>200,''=>true,"RecordImageMap"=>$recordImageMap));
-        $PieChart->drawPieLegend($imageWidth*0.7,$imageHeight/3, array('FontSize'=>10,"FontName"=>"modules/AOR_Charts/lib/pChart/fonts/verdana.ttf",'BoxSize'=>14));
+        $PieChart->draw2DPie($imageWidth / 3, $imageHeight / 2, array("Border"=>TRUE, 'Radius'=>200, ''=>true, "RecordImageMap"=>$recordImageMap));
+        $PieChart->drawPieLegend($imageWidth * 0.7, $imageHeight / 3, array('FontSize'=>10, "FontName"=>"modules/AOR_Charts/lib/pChart/fonts/verdana.ttf", 'BoxSize'=>14));
     }
 
-    function buildChartImageLine($chartPicture, $recordImageMap = false){
-        $scaleSettings = array("XMargin"=>10,"YMargin"=>10,"GridR"=>200,"GridG"=>200,"GridB"=>200,'MinDivHeight' => 50,"LabelRotation" => 30);
+    function buildChartImageLine($chartPicture, $recordImageMap = false) {
+        $scaleSettings = array("XMargin"=>10, "YMargin"=>10, "GridR"=>200, "GridG"=>200, "GridB"=>200, 'MinDivHeight' => 50, "LabelRotation" => 30);
         $chartPicture->drawScale($scaleSettings);
         $chartPicture->drawLineChart(array("RecordImageMap"=>$recordImageMap));
     }
 
-    function buildChartImageRadar($chartPicture, $chartData,$recordImageMap){
+    function buildChartImageRadar($chartPicture, $chartData, $recordImageMap) {
         $SplitChart = new pRadar();
-        $Options = array("LabelPos"=>RADAR_LABELS_HORIZONTAL,"RecordImageMap"=>$recordImageMap);
-        $SplitChart->drawRadar($chartPicture,$chartData,$Options);
+        $Options = array("LabelPos"=>RADAR_LABELS_HORIZONTAL, "RecordImageMap"=>$recordImageMap);
+        $SplitChart->drawRadar($chartPicture, $chartData, $Options);
 
     }
 
-    public function buildChartImage(array $reportData, array $fields,$asDataURI = true, $generateImageMapId = false){
+    public function buildChartImage(array $reportData, array $fields, $asDataURI = true, $generateImageMapId = false) {
         global $current_user;
         require_once 'modules/AOR_Charts/lib/pChart/pChart.php';
 
-        if($generateImageMapId !== false){
+        if ($generateImageMapId !== false) {
             $generateImageMapId = $current_user->id."-".$generateImageMapId;
         }
 
         $html = '';
-        if(!in_array($this->type, $this->getValidChartTypes())){
+        if (!in_array($this->type, $this->getValidChartTypes())) {
             return $html;
         }
         $x = $fields[$this->x_field];
         $y = $fields[$this->y_field];
-        if(!$x || !$y){
+        if (!$x || !$y) {
             //Malformed chart object - missing an axis field
             return '';
         }
-        $xName = str_replace(' ','_',$x->label) . $this->x_field;
-        $yName = str_replace(' ','_',$y->label) . $this->y_field;
+        $xName = str_replace(' ', '_', $x->label).$this->x_field;
+        $yName = str_replace(' ', '_', $y->label).$this->y_field;
 
         $chartData = new pData();
         $chartData->loadPalette("modules/AOR_Charts/lib/pChart/palettes/navy.color", TRUE);
         $labels = array();
-        foreach($reportData as $row){
-            $chartData->addPoints($row[$yName],'data');
-            $chartData->addPoints($row[$xName],'Labels');
+        foreach ($reportData as $row) {
+            $chartData->addPoints($row[$yName], 'data');
+            $chartData->addPoints($row[$xName], 'Labels');
             $labels[] = $row[$xName];
         }
 
-        $chartData->setSerieDescription("Months","Month");
+        $chartData->setSerieDescription("Months", "Month");
         $chartData->setAbscissa("Labels");
 
         $imageHeight = 700;
         $imageWidth = 700;
 
-        $chartPicture = new pImage($imageWidth,$imageHeight,$chartData);
-        if($generateImageMapId){
+        $chartPicture = new pImage($imageWidth, $imageHeight, $chartData);
+        if ($generateImageMapId) {
             $imageMapDir = create_cache_directory('modules/AOR_Charts/ImageMap/'.$current_user->id.'/');
-            $chartPicture->initialiseImageMap($generateImageMapId,IMAGE_MAP_STORAGE_FILE,$generateImageMapId,$imageMapDir);
+            $chartPicture->initialiseImageMap($generateImageMapId, IMAGE_MAP_STORAGE_FILE, $generateImageMapId, $imageMapDir);
         }
 
         $chartPicture->Antialias = True;
 
-        $chartPicture->drawFilledRectangle(0,0,$imageWidth-1,$imageHeight-1,array("R"=>240,"G"=>240,"B"=>240,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0,));
+        $chartPicture->drawFilledRectangle(0, 0, $imageWidth - 1, $imageHeight - 1, array("R"=>240, "G"=>240, "B"=>240, "BorderR"=>0, "BorderG"=>0, "BorderB"=>0,));
 
-        $chartPicture->setFontProperties(array("FontName"=>"modules/AOR_Charts/lib/pChart/fonts/verdana.ttf","FontSize"=>14));
+        $chartPicture->setFontProperties(array("FontName"=>"modules/AOR_Charts/lib/pChart/fonts/verdana.ttf", "FontSize"=>14));
 
-        $chartPicture->drawText($imageWidth/2,20,$this->name,array("R"=>0,"G"=>0,"B"=>0,'Align'=>TEXT_ALIGN_TOPMIDDLE));
-        $chartPicture->setFontProperties(array("FontName"=>"modules/AOR_Charts/lib/pChart/fonts/verdana.ttf","FontSize"=>6));
+        $chartPicture->drawText($imageWidth / 2, 20, $this->name, array("R"=>0, "G"=>0, "B"=>0, 'Align'=>TEXT_ALIGN_TOPMIDDLE));
+        $chartPicture->setFontProperties(array("FontName"=>"modules/AOR_Charts/lib/pChart/fonts/verdana.ttf", "FontSize"=>6));
 
-        $chartPicture->setGraphArea(60,60,$imageWidth-60,$imageHeight-100);
+        $chartPicture->setGraphArea(60, 60, $imageWidth - 60, $imageHeight - 100);
 
-        switch($this->type){
+        switch ($this->type) {
             case 'radar':
                 $this->buildChartImageRadar($chartPicture, $chartData, !empty($generateImageMapId));
                 break;
             case 'pie':
-                $this->buildChartImagePie($chartPicture,$chartData, $reportData,$imageHeight, $imageWidth, $xName, !empty($generateImageMapId));
+                $this->buildChartImagePie($chartPicture, $chartData, $reportData, $imageHeight, $imageWidth, $xName, !empty($generateImageMapId));
                 break;
             case 'line':
                 $this->buildChartImageLine($chartPicture, !empty($generateImageMapId));
@@ -203,50 +203,50 @@ 
                 $this->buildChartImageBar($chartPicture, !empty($generateImageMapId));
                 break;
         }
-        if($generateImageMapId) {
+        if ($generateImageMapId) {
             $chartPicture->replaceImageMapTitle("data", $labels);
         }
         ob_start();
         $chartPicture->render('');
         $img = ob_get_clean();
-        if($asDataURI){
+        if ($asDataURI) {
             return 'data:image/png;base64,'.base64_encode($img);
-        }else{
+        } else {
             return $img;
         }
     }
 
-    public function buildChartHTML(array $reportData, array $fields,$index = 0, $chartType = AOR_Report::CHART_TYPE_PCHART, AOR_Field $mainGroupField = null){
-        switch($chartType){
+    public function buildChartHTML(array $reportData, array $fields, $index = 0, $chartType = AOR_Report::CHART_TYPE_PCHART, AOR_Field $mainGroupField = null) {
+        switch ($chartType) {
             case AOR_Report::CHART_TYPE_PCHART:
-                return $this->buildChartHTMLPChart($reportData,$fields,$index);
+                return $this->buildChartHTMLPChart($reportData, $fields, $index);
             case AOR_Report::CHART_TYPE_CHARTJS:
-                return $this->buildChartHTMLChartJS($reportData,$fields);
+                return $this->buildChartHTMLChartJS($reportData, $fields);
             case AOR_Report::CHART_TYPE_RGRAPH:
-                return $this->buildChartHTMLRGraph($reportData,$fields, $mainGroupField);
+                return $this->buildChartHTMLRGraph($reportData, $fields, $mainGroupField);
         }
         return '';
     }
 
 
-    private function buildChartHTMLRGraph(array $reportData, array $fields, AOR_Field $mainGroupField = null){
+    private function buildChartHTMLRGraph(array $reportData, array $fields, AOR_Field $mainGroupField = null) {
         $html = '';
-        if(!in_array($this->type, $this->getValidChartTypes())){
+        if (!in_array($this->type, $this->getValidChartTypes())) {
             return $html;
         }
         $x = $fields[$this->x_field];
         $y = $fields[$this->y_field];
-        if(!$x || !$y){
+        if (!$x || !$y) {
             //Malformed chart object - missing an axis field
             return '';
         }
-        $xName = str_replace(' ','_',$x->label) . $this->x_field;
-        $yName = str_replace(' ','_',$y->label) . $this->y_field;
+        $xName = str_replace(' ', '_', $x->label).$this->x_field;
+        $yName = str_replace(' ', '_', $y->label).$this->y_field;
 
         $defaultHeight = 500;
         $defaultWidth = 900;
 
-        switch($this->type){
+        switch ($this->type) {
             /*
              //Polar was not implemented for the previous library (it is not in the getValidChartTypes method)
             case 'polar':
@@ -257,56 +257,56 @@ 
             */
             case 'radar':
                 $chartFunction = 'Radar';
-                $data = $this->getRGraphBarChartData($reportData, $xName,$yName);
+                $data = $this->getRGraphBarChartData($reportData, $xName, $yName);
                 $config = $this->getRadarChartConfig();
-                $chart = $this->getRGraphRadarChart(json_encode($data['data']), json_encode($data['labels']),json_encode($data['tooltips']), $this->name, $this->id, $defaultHeight,$defaultWidth);
+                $chart = $this->getRGraphRadarChart(json_encode($data['data']), json_encode($data['labels']), json_encode($data['tooltips']), $this->name, $this->id, $defaultHeight, $defaultWidth);
                 break;
             case 'pie':
                 $chartFunction = 'Pie';
-                $data = $this->getRGraphBarChartData($reportData, $xName,$yName);
+                $data = $this->getRGraphBarChartData($reportData, $xName, $yName);
                 $config = $this->getPieChartConfig();
-                $chart = $this->getRGraphPieChart(json_encode($data['data']), json_encode($data['labels']),json_encode($data['tooltips']), $this->name, $this->id,  $defaultHeight,$defaultWidth);
+                $chart = $this->getRGraphPieChart(json_encode($data['data']), json_encode($data['labels']), json_encode($data['tooltips']), $this->name, $this->id, $defaultHeight, $defaultWidth);
                 break;
             case 'line':
                 $chartFunction = 'Line';
-                $data = $this->getRGraphBarChartData($reportData, $xName,$yName);
+                $data = $this->getRGraphBarChartData($reportData, $xName, $yName);
                 $config = $this->getLineChartConfig();
-                $chart = $this->getRGraphLineChart(json_encode($data['data']), json_encode($data['labels']),json_encode($data['tooltips']), $this->name, $this->id,  $defaultHeight,$defaultWidth);
+                $chart = $this->getRGraphLineChart(json_encode($data['data']), json_encode($data['labels']), json_encode($data['tooltips']), $this->name, $this->id, $defaultHeight, $defaultWidth);
                 break;
             case 'rose':
                 $chartFunction = 'Rose';
-                $data = $this->getRGraphBarChartData($reportData, $xName,$yName);
+                $data = $this->getRGraphBarChartData($reportData, $xName, $yName);
                 $config = $this->getRoseChartConfig();
-                $chart = $this->getRGraphRoseChart(json_encode($data['data']), json_encode($data['labels']),json_encode($data['tooltips']), $this->name, $this->id,  $defaultHeight,$defaultWidth);
+                $chart = $this->getRGraphRoseChart(json_encode($data['data']), json_encode($data['labels']), json_encode($data['tooltips']), $this->name, $this->id, $defaultHeight, $defaultWidth);
                 break;
             case 'grouped_bar':
                 $chartFunction = 'Grouped bar';
-                $data = $this->getRGraphGroupedBarChartData($reportData, $xName,$yName, $mainGroupField);
+                $data = $this->getRGraphGroupedBarChartData($reportData, $xName, $yName, $mainGroupField);
                 $config = $this->getGroupedBarChartConfig();
-                $chart = $this->getRGraphGroupedBarChart(json_encode($data['data']), json_encode($data['labels']), json_encode($data['tooltips']), $this->name, $this->id,  $defaultHeight,$defaultWidth, true);
+                $chart = $this->getRGraphGroupedBarChart(json_encode($data['data']), json_encode($data['labels']), json_encode($data['tooltips']), $this->name, $this->id, $defaultHeight, $defaultWidth, true);
                 break;
             case 'stacked_bar':
                 $chartFunction = 'Stacked bar';
-                $data = $this->getRGraphGroupedBarChartData($reportData, $xName,$yName, $mainGroupField);
+                $data = $this->getRGraphGroupedBarChartData($reportData, $xName, $yName, $mainGroupField);
                 $config = $this->getStackedBarChartConfig();
-                $chart = $this->getRGraphGroupedBarChart(json_encode($data['data']), json_encode($data['labels']), json_encode($data['tooltips']), $this->name, $this->id,  $defaultHeight,$defaultWidth, false);
+                $chart = $this->getRGraphGroupedBarChart(json_encode($data['data']), json_encode($data['labels']), json_encode($data['tooltips']), $this->name, $this->id, $defaultHeight, $defaultWidth, false);
                 break;
             case 'bar':
             default:
                 $chartFunction = 'Bar';
-                $data = $this->getRGraphBarChartData($reportData, $xName,$yName);
+                $data = $this->getRGraphBarChartData($reportData, $xName, $yName);
                 $config = $this->getBarChartConfig();
-                $chart = $this->getRGraphBarChart(json_encode($data['data']), json_encode($data['labels']), json_encode($data['tooltips']), $this->name, $this->id,  $defaultHeight,$defaultWidth);
+                $chart = $this->getRGraphBarChart(json_encode($data['data']), json_encode($data['labels']), json_encode($data['tooltips']), $this->name, $this->id, $defaultHeight, $defaultWidth);
                 break;
         }
 
         return $chart;
     }
 
-    private function getRGraphRoseChart($chartDataValues, $chartLabelValues,$chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400)
+    private function getRGraphRoseChart($chartDataValues, $chartLabelValues, $chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400)
     {
         $dataArray = json_decode($chartDataValues);
-        if(!is_array($dataArray)||count($dataArray) < 1)
+        if (!is_array($dataArray) || count($dataArray) < 1)
         {
             return "<h3>$this->noDataMessage</h3>";
         }
@@ -340,14 +340,14 @@ 
     //I have not used a parameter for getRGraphBarChart to say whether to group etc, as the future development could be quite different
     //for both, hence the separate methods.  However, the $grouped parameter allows us to specify whether the chart is grouped (true)
     //or stacked (false)
-    private function getRGraphGroupedBarChart($chartDataValues, $chartLabelValues,$chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400, $grouped = false)
+    private function getRGraphGroupedBarChart($chartDataValues, $chartLabelValues, $chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400, $grouped = false)
     {
         //$keys = array_keys($chartTooltips);
 
 
-        $i=0;
-        foreach($chartDataValues as $rowKey => $row) {
-            foreach($row as $key => $value) {
+        $i = 0;
+        foreach ($chartDataValues as $rowKey => $row) {
+            foreach ($row as $key => $value) {
                 $_tooltips[$rowKey][$key] = $chartTooltips[$i];
                 $i++;
             }
@@ -356,9 +356,9 @@ 
 
         $dataArray = json_decode($chartDataValues);
         $grouping = 'grouped'; //$mainGroupField->label; //'grouped';
-        if(!$grouped)
-            $grouping='stacked';
-        if(!is_array($dataArray)||count($dataArray) < 1)
+        if (!$grouped)
+            $grouping = 'stacked';
+        if (!is_array($dataArray) || count($dataArray) < 1)
         {
             return "<h3>$this->noDataMessage</h3>";
         }
@@ -399,10 +399,10 @@ 
 
 
 
-    private function getRGraphBarChart($chartDataValues, $chartLabelValues,$chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400)
+    private function getRGraphBarChart($chartDataValues, $chartLabelValues, $chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400)
     {
         $dataArray = json_decode($chartDataValues);
-        if(!is_array($dataArray)||count($dataArray) < 1)
+        if (!is_array($dataArray) || count($dataArray) < 1)
         {
             return "<h3>$this->noDataMessage</h3>";
         }
@@ -439,10 +439,10 @@ 
         return $html;
     }
 
-    private function getRGraphRadarChart($chartDataValues, $chartLabelValues,$chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400)
+    private function getRGraphRadarChart($chartDataValues, $chartLabelValues, $chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400)
     {
         $dataArray = json_decode($chartDataValues);
-        if(!is_array($dataArray)||count($dataArray) < 1)
+        if (!is_array($dataArray) || count($dataArray) < 1)
         {
             return "<h3>$this->noDataMessage</h3>";
         }
@@ -472,10 +472,10 @@ 
         return $html;
     }
 
-    private function getRGraphPieChart($chartDataValues, $chartLabelValues,$chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400)
+    private function getRGraphPieChart($chartDataValues, $chartLabelValues, $chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400)
     {
         $dataArray = json_decode($chartDataValues);
-        if(!is_array($dataArray)||count($dataArray) < 1)
+        if (!is_array($dataArray) || count($dataArray) < 1)
         {
             return "<h3>$this->noDataMessage</h3>";
         }
@@ -508,10 +508,10 @@ 
         return $html;
     }
 
-    private function getRGraphLineChart($chartDataValues, $chartLabelValues,$chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400)
+    private function getRGraphLineChart($chartDataValues, $chartLabelValues, $chartTooltips, $chartName, $chartId, $chartHeight = 400, $chartWidth = 400)
     {
         $dataArray = json_decode($chartDataValues);
-        if(!is_array($dataArray)||count($dataArray) < 1)
+        if (!is_array($dataArray) || count($dataArray) < 1)
         {
             return "<h3>$this->noDataMessage</h3>";
         }
@@ -551,45 +551,45 @@ 
         return $html;
     }
 
-    private function buildChartHTMLChartJS(array $reportData, array $fields){
+    private function buildChartHTMLChartJS(array $reportData, array $fields) {
         $html = '';
-        if(!in_array($this->type, $this->getValidChartTypes())){
+        if (!in_array($this->type, $this->getValidChartTypes())) {
             return $html;
         }
         $x = $fields[$this->x_field];
         $y = $fields[$this->y_field];
-        if(!$x || !$y){
+        if (!$x || !$y) {
             //Malformed chart object - missing an axis field
             return '';
         }
-        $xName = str_replace(' ','_',$x->label) . $this->x_field;
-        $yName = str_replace(' ','_',$y->label) . $this->y_field;
+        $xName = str_replace(' ', '_', $x->label).$this->x_field;
+        $yName = str_replace(' ', '_', $y->label).$this->y_field;
 
-        switch($this->type){
+        switch ($this->type) {
             case 'polar':
                 $chartFunction = 'PolarArea';
-                $data = $this->getPolarChartData($reportData, $xName,$yName);
+                $data = $this->getPolarChartData($reportData, $xName, $yName);
                 $config = $this->getPolarChartConfig();
                 break;
             case 'radar':
                 $chartFunction = 'Radar';
-                $data = $this->getRadarChartData($reportData, $xName,$yName);
+                $data = $this->getRadarChartData($reportData, $xName, $yName);
                 $config = $this->getRadarChartConfig();
                 break;
             case 'pie':
                 $chartFunction = 'Pie';
-                $data = $this->getPieChartData($reportData, $xName,$yName);
+                $data = $this->getPieChartData($reportData, $xName, $yName);
                 $config = $this->getPieChartConfig();
                 break;
             case 'line':
                 $chartFunction = 'Line';
-                $data = $this->getLineChartData($reportData, $xName,$yName);
+                $data = $this->getLineChartData($reportData, $xName, $yName);
                 $config = $this->getLineChartConfig();
                 break;
             case 'bar':
             default:
                 $chartFunction = 'Bar';
-                $data = $this->getBarChartData($reportData, $xName,$yName);
+                $data = $this->getBarChartData($reportData, $xName, $yName);
                 $config = $this->getBarChartConfig();
                 break;
         }
@@ -616,9 +616,9 @@ 
         return $html;
     }
 
-    private function buildChartHTMLPChart(array $reportData, array $fields,$index = 0){
+    private function buildChartHTMLPChart(array $reportData, array $fields, $index = 0) {
         $html = '';
-        $imgUri = $this->buildChartImage($reportData,$fields,true,$index);
+        $imgUri = $this->buildChartImage($reportData, $fields, true, $index);
         $img = "<img id='{$this->id}_img' src='{$imgUri}'>";
         $html .= $img;
         $html .= <<<EOF
@@ -633,24 +633,24 @@ 
 
     private function getShortenedLabel($label, $maxLabelSize = 20)
     {
-        if(strlen($label) > $maxLabelSize)
+        if (strlen($label) > $maxLabelSize)
         {
-            return substr($label,0,$maxLabelSize).'...';
+            return substr($label, 0, $maxLabelSize).'...';
         }
         else
             return $label;
     }
 
 
-    private function getRGraphGroupedBarChartData($reportData, $xName,$yName, AOR_Field $mainGroupField = null){
+    private function getRGraphGroupedBarChartData($reportData, $xName, $yName, AOR_Field $mainGroupField = null) {
 
 
         // get z-axis name
 
         $zName = null;
-        foreach($reportData[0] as $key => $value) {
+        foreach ($reportData[0] as $key => $value) {
             $field = str_replace(' ', '_', is_null($mainGroupField) ? 'no data' : $mainGroupField->label);
-            if (preg_match('/^' . $field . '[0-9]+/', $key)) {
+            if (preg_match('/^'.$field.'[0-9]+/', $key)) {
                 $zName = $key;
                 break;
             }
@@ -664,20 +664,20 @@ 
         $tooltips = array();
 
         $usedKeys = array();
-        foreach($reportData as $key => $row) {
+        foreach ($reportData as $key => $row) {
             $filter = $row[$xName];
-            foreach($reportData as $key2 => $row2) {
-                if($row2[$xName] == $filter && !in_array($key, $usedKeys)) {
-                    $data      [ $row[$xName]  ]   [] = (float) $row[$yName];
-                    $tooltips  [ $row[$xName]  ]   [] = $row[$zName];
+            foreach ($reportData as $key2 => $row2) {
+                if ($row2[$xName] == $filter && !in_array($key, $usedKeys)) {
+                    $data      [$row[$xName]]   [] = (float)$row[$yName];
+                    $tooltips  [$row[$xName]]   [] = $row[$zName];
                     $usedKeys[] = $key;
                 }
             }
         }
 
         $_data = array();
-        foreach($data as $label => $values) {
-            foreach($values as $key => $value) {
+        foreach ($data as $label => $values) {
+            foreach ($values as $key => $value) {
                 $_data[$label][$tooltips[$label][$key]] = $value;
             }
         }
@@ -689,11 +689,11 @@ 
         $_data = array();
         $_labels = array();
         $_tooltips = array();
-        foreach($data as $label => $values) {
+        foreach ($data as $label => $values) {
             $_labels[] = $this->getShortenedLabel($label);
             $_values = array();
-            foreach($values as $tooltip => $value) {
-                $_tooltips[] = $tooltip . " ($value)";
+            foreach ($values as $tooltip => $value) {
+                $_tooltips[] = $tooltip." ($value)";
                 $_values[] = $value;
             }
             $_data[] = $_values;
@@ -711,11 +711,11 @@ 
 
     }
 
-    private function getRGraphBarChartData($reportData, $xName,$yName){
-        $chart['labels']=array();
-        $chart['data']=array();
-        $chart['tooltips']=array();
-        foreach($reportData as $row){
+    private function getRGraphBarChartData($reportData, $xName, $yName) {
+        $chart['labels'] = array();
+        $chart['data'] = array();
+        $chart['tooltips'] = array();
+        foreach ($reportData as $row) {
             $chart['labels'][] = $this->getShortenedLabel($row[$xName]);
             $chart['tooltips'][] = $row[$xName];
             $chart['data'][] = (float)$row[$yName];
@@ -725,11 +725,11 @@ 
     }
 
 
-    private function getBarChartData($reportData, $xName,$yName){
+    private function getBarChartData($reportData, $xName, $yName) {
         $data = array();
         $data['labels'] = array();
         $datasetData = array();
-        foreach($reportData as $row){
+        foreach ($reportData as $row) {
             $data['labels'][] = $row[$xName];
             $datasetData[] = $row[$yName];
         }
@@ -746,14 +746,14 @@ 
         return $data;
     }
 
-    private function getLineChartData($reportData, $xName,$yName){
-        return $this->getBarChartData($reportData, $xName,$yName);
+    private function getLineChartData($reportData, $xName, $yName) {
+        return $this->getBarChartData($reportData, $xName, $yName);
     }
 
-    private function getBarChartConfig(){
+    private function getBarChartConfig() {
         return array();
     }
-    private function getLineChartConfig(){
+    private function getLineChartConfig() {
         return $this->getBarChartConfig();
     }
 
@@ -767,36 +767,36 @@ 
         return $this->getBarChartConfig();
     }
 
-    private function getRoseChartConfig(){
+    private function getRoseChartConfig() {
         return $this->getBarChartConfig();
     }
 
-    private function getRadarChartData($reportData, $xName,$yName){
-        return $this->getBarChartData($reportData, $xName,$yName);
+    private function getRadarChartData($reportData, $xName, $yName) {
+        return $this->getBarChartData($reportData, $xName, $yName);
     }
 
-    private function getPolarChartData($reportData, $xName,$yName){
-        return $this->getPieChartData($reportData, $xName,$yName);
+    private function getPolarChartData($reportData, $xName, $yName) {
+        return $this->getPieChartData($reportData, $xName, $yName);
     }
 
-    private function getRadarChartConfig(){
+    private function getRadarChartConfig() {
         return array();
     }
 
-    private function getPolarChartConfig(){
+    private function getPolarChartConfig() {
         return $this->getPieChartConfig();
     }
-    private function getPieChartConfig(){
+    private function getPieChartConfig() {
         $config = array();
         $config['legendTemplate'] = "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<segments.length; i++){%><li><span style=\"background-color:<%=segments[i].fillColor%>\">&nbsp;&nbsp;&nbsp;&nbsp;</span>&nbsp;<%if(segments[i].label){%><%=segments[i].label%><%}%></li><%}%></ul>";
         return $config;
     }
 
-    private function getPieChartData($reportData, $xName,$yName){
+    private function getPieChartData($reportData, $xName, $yName) {
         $data = array();
 
-        foreach($reportData as $row){
-            if(!$row[$yName]){
+        foreach ($reportData as $row) {
+            if (!$row[$yName]) {
                 continue;
             }
             $colour = $this->getColour($row[$xName]);

modules/AOR_Reports/controller.php

Indentation +21 added lines, -21 removed lines

@@ -1,26 +1,26 @@
 <?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>
+     */
 
 /**
  * This file adds support for studio

Spacing +148 added lines, -148 removed lines

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

modules/AOR_Reports/language/en_us.lang.php

Indentation +58 added lines, -58 removed lines

@@ -23,66 +23,66 @@
  */
 
 $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:',
 );

themes/SuiteR/css/colourSelector.php

Spacing +9 added lines, -9 removed lines

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

data/SugarBean.php

Indentation +739 added lines, -739 removed lines

@@ -84,27 +84,27 @@ 
     public $id;
 
     /**
-	 * When createing a bean, you can specify a value in the id column as
-	 * long as that value is unique.  During save, if the system finds an
-	 * id, it assumes it is an update.  Setting new_with_id to true will
-	 * make sure the system performs an insert instead of an update.
-	 *
-	 * @var BOOL -- default false
-	 */
-	var $new_with_id = false;
-
-
-	/**
-	 * How deep logic hooks can go
-	 * @var int
-	 */
-	protected $max_logic_depth = 10;
-
-	/**
-	 * Disble vardefs.  This should be set to true only for beans that do not have varders.  Tracker is an example
-	 *
-	 * @var BOOL -- default false
-	 */
+     * When createing a bean, you can specify a value in the id column as
+     * long as that value is unique.  During save, if the system finds an
+     * id, it assumes it is an update.  Setting new_with_id to true will
+     * make sure the system performs an insert instead of an update.
+     *
+     * @var BOOL -- default false
+     */
+    var $new_with_id = false;
+
+
+    /**
+     * How deep logic hooks can go
+     * @var int
+     */
+    protected $max_logic_depth = 10;
+
+    /**
+     * Disble vardefs.  This should be set to true only for beans that do not have varders.  Tracker is an example
+     *
+     * @var BOOL -- default false
+     */
     var $disable_vardefs = false;
 
 
@@ -116,20 +116,20 @@ 
      */
     var $new_assigned_user_name;
 
-	/**
-	 * An array of booleans.  This array is cleared out when data is loaded.
-	 * As date/times are converted, a "1" is placed under the key, the field is converted.
-	 *
-	 * @var Array of booleans
-	 */
-	var $processed_dates_times = array();
+    /**
+     * An array of booleans.  This array is cleared out when data is loaded.
+     * As date/times are converted, a "1" is placed under the key, the field is converted.
+     *
+     * @var Array of booleans
+     */
+    var $processed_dates_times = array();
 
-	/**
-	 * Whether to process date/time fields for storage in the database in GMT
-	 *
-	 * @var BOOL
-	 */
-	var $process_save_dates =true;
+    /**
+     * Whether to process date/time fields for storage in the database in GMT
+     *
+     * @var BOOL
+     */
+    var $process_save_dates =true;
 
     /**
      * This signals to the bean that it is being saved in a mass mode.
@@ -140,20 +140,20 @@ 
      */
     var $save_from_post = true;
 
-	/**
-	 * When running a query on related items using the method: retrieve_by_string_fields
-	 * this value will be set to true if more than one item matches the search criteria.
-	 *
-	 * @var BOOL
-	 */
-	var $duplicates_found = false;
+    /**
+     * When running a query on related items using the method: retrieve_by_string_fields
+     * this value will be set to true if more than one item matches the search criteria.
+     *
+     * @var BOOL
+     */
+    var $duplicates_found = false;
 
-	/**
-	 * true if this bean has been deleted, false otherwise.
-	 *
-	 * @var BOOL
-	 */
-	var $deleted = 0;
+    /**
+     * true if this bean has been deleted, false otherwise.
+     *
+     * @var BOOL
+     */
+    var $deleted = 0;
 
     /**
      * Should the date modified column of the bean be updated during save?
@@ -201,22 +201,22 @@ 
     var $table_name = '';
 
     /**
-    * This is the singular name of the bean.  (i.e. Contact).
-    *
-    * @var String
-    */
+     * This is the singular name of the bean.  (i.e. Contact).
+     *
+     * @var String
+     */
     var $object_name = '';
 
     /** Set this to true if you query contains a sub-select and bean is converting both select statements
-    * into count queries.
-    */
+     * into count queries.
+     */
     var $ungreedy_count=false;
 
     /**
-    * The name of the module folder for this type of bean.
-    *
-    * @var String
-    */
+     * The name of the module folder for this type of bean.
+     *
+     * @var String
+     */
     var $module_dir = '';
     var $module_name = '';
     var $field_name_map;
@@ -249,8 +249,8 @@ 
     var $importable = false;
 
     /**
-    * Set to true in the child beans if the module use the special notification template
-    */
+     * Set to true in the child beans if the module use the special notification template
+     */
     var $special_notification = false;
 
     /**
@@ -282,7 +282,7 @@ 
      */
     protected $loaded_relationships = array();
 
-	/**
+    /**
      * set to true if dependent fields updated
      */
     protected $is_updated_dependent_fields = false;
@@ -661,7 +661,7 @@ 
             return;
 
         foreach ($this->field_defs as $field => $value) {
-		    if( !empty($this->$field)
+            if( !empty($this->$field)
                   && ((isset($value['default']) && $this->$field == $value['default']) || (!empty($value['display_default']) && $this->$field == $value['display_default']))
                     ) {
                 $this->$field = null;
@@ -710,7 +710,7 @@ 
                             $this->$field = $this->parseDateDefault($value['display_default']);
                         }
                         break;
-                   case 'datetime':
+                    case 'datetime':
                    case 'datetimecombo':
                         if(!empty($value['display_default'])){
                             $this->$field = $this->parseDateDefault($value['display_default'], true);
@@ -723,9 +723,9 @@ 
                             $this->$field = $value['default'];
                         break;
                     case 'bool':
-                    	if(isset($this->$field)){
-                    		break;
-                    	}
+                        if(isset($this->$field)){
+                            break;
+                        }
                     default:
                         if ( isset($value['default']) && $value['default'] !== '' ) {
                             $this->$field = htmlentities($value['default'], ENT_QUOTES, 'UTF-8');
@@ -788,10 +788,10 @@ 
     /**
      * This method has been deprecated.
      *
-    * @see removeRelationshipMeta()
+     * @see removeRelationshipMeta()
      * @deprecated 4.5.1 - Nov 14, 2006
      * @static
-    */
+     */
     static function remove_relationship_meta($key,$db,$log,$tablename,$dictionary,$module_dir)
     {
         SugarBean::removeRelationshipMeta($key,$db,$tablename,$dictionary,$module_dir);
@@ -927,10 +927,10 @@ 
 
     /**
      * This method has been deprecated.
-    * @see createRelationshipMeta()
+     * @see createRelationshipMeta()
      * @deprecated 4.5.1 - Nov 14, 2006
      * @static
-    */
+     */
     static function create_relationship_meta($key,&$db,&$log,$tablename,$dictionary,$module_dir)
     {
         SugarBean::createRelationshipMeta($key,$db,$tablename,$dictionary,$module_dir);
@@ -1084,7 +1084,7 @@ 
 
         $linked_fields=array();
 
- //   	require_once('data/Link.php');
+    //   	require_once('data/Link.php');
 
         $fieldDefs = $this->getFieldDefinitions();
 
@@ -1314,8 +1314,8 @@ 
     }
 
     /**
-    * Cleans char, varchar, text, etc. fields of XSS type materials
-    */
+     * Cleans char, varchar, text, etc. fields of XSS type materials
+     */
     function cleanBean() {
         foreach($this->field_defs as $key => $def) {
 
@@ -1338,14 +1338,14 @@ 
     }
 
     /**
-    * Implements a generic insert and update logic for any SugarBean
-    * This method only works for subclasses that implement the same variable names.
-    * This method uses the presence of an id field that is not null to signify and update.
-    * The id field should not be set otherwise.
-    *
-    * @param boolean $check_notify Optional, default false, if set to true assignee of the record is notified via email.
-    * @todo Add support for field type validation and encoding of parameters.
-    */
+     * Implements a generic insert and update logic for any SugarBean
+     * This method only works for subclasses that implement the same variable names.
+     * This method uses the presence of an id field that is not null to signify and update.
+     * The id field should not be set otherwise.
+     *
+     * @param boolean $check_notify Optional, default false, if set to true assignee of the record is notified via email.
+     * @todo Add support for field type validation and encoding of parameters.
+     */
     function save($check_notify = FALSE)
     {
         $this->in_save = true;
@@ -1362,14 +1362,14 @@ 
             $isUpdate = false;
         }
 
-		if ( $this->new_with_id == true )
-		{
-			$isUpdate = false;
-		}
-		if(empty($this->date_modified) || $this->update_date_modified)
-		{
-			$this->date_modified = $GLOBALS['timedate']->nowDb();
-		}
+        if ( $this->new_with_id == true )
+        {
+            $isUpdate = false;
+        }
+        if(empty($this->date_modified) || $this->update_date_modified)
+        {
+            $this->date_modified = $GLOBALS['timedate']->nowDb();
+        }
 
         $this->_checkOptimisticLocking($action, $isUpdate);
 
@@ -1483,10 +1483,10 @@ 
         }
 
 
-		/* BEGIN - SECURITY GROUPS - inheritance */ 
-		require_once('modules/SecurityGroups/SecurityGroup.php');
-		SecurityGroup::inherit($this,$isUpdate);
-		/* END - SECURITY GROUPS */ 
+        /* BEGIN - SECURITY GROUPS - inheritance */ 
+        require_once('modules/SecurityGroups/SecurityGroup.php');
+        SecurityGroup::inherit($this,$isUpdate);
+        /* END - SECURITY GROUPS */ 
         //If we aren't in setup mode and we have a current user and module, then we track
         if(isset($GLOBALS['current_user']) && isset($this->module_dir))
         {
@@ -1527,8 +1527,8 @@ 
     }
 
     /**
-    * Determines which users receive a notification
-    */
+     * Determines which users receive a notification
+     */
     function get_notification_recipients() {
         $notify_user = new User();
         $notify_user->retrieve($this->assigned_user_id);
@@ -1545,11 +1545,11 @@ 
     }
 
     /**
-    * Handles sending out email notifications when items are first assigned to users
-    *
-    * @param string $notify_user user to notify
-    * @param string $admin the admin user that sends out the notification
-    */
+     * Handles sending out email notifications when items are first assigned to users
+     *
+     * @param string $notify_user user to notify
+     * @param string $admin the admin user that sends out the notification
+     */
     function send_assignment_notifications($notify_user, $admin)
     {
         global $current_user;
@@ -1580,7 +1580,7 @@ 
                 $notify_mail->FromName = $from_name;
             }
 
-           $oe = new OutboundEmail();
+            $oe = new OutboundEmail();
             $oe = $oe->getUserMailerSettings($current_user);
             //only send if smtp server is defined
             if($sendEmail){
@@ -1616,9 +1616,9 @@ 
     }
 
     /**
-    * This function handles create the email notifications email.
-    * @param string $notify_user the user to send the notification email to
-    */
+     * This function handles create the email notifications email.
+     * @param string $notify_user the user to send the notification email to
+     */
     function create_notification_email($notify_user) {
         global $sugar_version;
         global $sugar_config;
@@ -2027,104 +2027,104 @@ 
     }
 
     /**
-    * This function retrieves a record of the appropriate type from the DB.
-    * It fills in all of the fields from the DB into the object it was called on.
-    *
-    * @param $id - If ID is specified, it overrides the current value of $this->id.  If not specified the current value of $this->id will be used.
-    * @return this - The object that it was called apon or null if exactly 1 record was not found.
-    *
-	*/
-
-	function check_date_relationships_load()
-	{
-		global $disable_date_format;
-		global $timedate;
-		if (empty($timedate))
-			$timedate=TimeDate::getInstance();
-
-		if(empty($this->field_defs))
-		{
-			return;
-		}
-		foreach($this->field_defs as $fieldDef)
-		{
-			$field = $fieldDef['name'];
-			if(!isset($this->processed_dates_times[$field]))
-			{
-				$this->processed_dates_times[$field] = '1';
-				if(empty($this->$field)) continue;
-				if($field == 'date_modified' || $field == 'date_entered')
-				{
-					$this->$field = $this->db->fromConvert($this->$field, 'datetime');
-					if(empty($disable_date_format)) {
-						$this->$field = $timedate->to_display_date_time($this->$field);
-					}
-				}
-				elseif(isset($this->field_name_map[$field]['type']))
-				{
-					$type = $this->field_name_map[$field]['type'];
-
-					if($type == 'relate'  && isset($this->field_name_map[$field]['custom_module']))
-					{
-						$type = $this->field_name_map[$field]['type'];
-					}
-
-					if($type == 'date')
-					{
-						if($this->$field == '0000-00-00')
-						{
-							$this->$field = '';
-						} elseif(!empty($this->field_name_map[$field]['rel_field']))
-						{
-							$rel_field = $this->field_name_map[$field]['rel_field'];
-
-							if(!empty($this->$rel_field))
-							{
-								if(empty($disable_date_format)) {
-									$mergetime = $timedate->merge_date_time($this->$field,$this->$rel_field);
-									$this->$field = $timedate->to_display_date($mergetime);
-									$this->$rel_field = $timedate->to_display_time($mergetime);
-								}
-							}
-						}
-						else
-						{
-							if(empty($disable_date_format)) {
-								$this->$field = $timedate->to_display_date($this->$field, false);
-							}
-						}
-					} elseif($type == 'datetime' || $type == 'datetimecombo')
-					{
-						if($this->$field == '0000-00-00 00:00:00')
-						{
-							$this->$field = '';
-						}
-						else
-						{
-							if(empty($disable_date_format)) {
-								$this->$field = $timedate->to_display_date_time($this->$field, true, true);
-							}
-						}
-					} elseif($type == 'time')
-					{
-						if($this->$field == '00:00:00')
-						{
-							$this->$field = '';
-						} else
-						{
-							//$this->$field = from_db_convert($this->$field, 'time');
-							if(empty($this->field_name_map[$field]['rel_field']) && empty($disable_date_format))
-							{
-								$this->$field = $timedate->to_display_time($this->$field,true, false);
-							}
-						}
-					} elseif($type == 'encrypt' && empty($disable_date_format)){
-						$this->$field = $this->decrypt_after_retrieve($this->$field);
-					}
-				}
-			}
-		}
-	}
+     * This function retrieves a record of the appropriate type from the DB.
+     * It fills in all of the fields from the DB into the object it was called on.
+     *
+     * @param $id - If ID is specified, it overrides the current value of $this->id.  If not specified the current value of $this->id will be used.
+     * @return this - The object that it was called apon or null if exactly 1 record was not found.
+     *
+     */
+
+    function check_date_relationships_load()
+    {
+        global $disable_date_format;
+        global $timedate;
+        if (empty($timedate))
+            $timedate=TimeDate::getInstance();
+
+        if(empty($this->field_defs))
+        {
+            return;
+        }
+        foreach($this->field_defs as $fieldDef)
+        {
+            $field = $fieldDef['name'];
+            if(!isset($this->processed_dates_times[$field]))
+            {
+                $this->processed_dates_times[$field] = '1';
+                if(empty($this->$field)) continue;
+                if($field == 'date_modified' || $field == 'date_entered')
+                {
+                    $this->$field = $this->db->fromConvert($this->$field, 'datetime');
+                    if(empty($disable_date_format)) {
+                        $this->$field = $timedate->to_display_date_time($this->$field);
+                    }
+                }
+                elseif(isset($this->field_name_map[$field]['type']))
+                {
+                    $type = $this->field_name_map[$field]['type'];
+
+                    if($type == 'relate'  && isset($this->field_name_map[$field]['custom_module']))
+                    {
+                        $type = $this->field_name_map[$field]['type'];
+                    }
+
+                    if($type == 'date')
+                    {
+                        if($this->$field == '0000-00-00')
+                        {
+                            $this->$field = '';
+                        } elseif(!empty($this->field_name_map[$field]['rel_field']))
+                        {
+                            $rel_field = $this->field_name_map[$field]['rel_field'];
+
+                            if(!empty($this->$rel_field))
+                            {
+                                if(empty($disable_date_format)) {
+                                    $mergetime = $timedate->merge_date_time($this->$field,$this->$rel_field);
+                                    $this->$field = $timedate->to_display_date($mergetime);
+                                    $this->$rel_field = $timedate->to_display_time($mergetime);
+                                }
+                            }
+                        }
+                        else
+                        {
+                            if(empty($disable_date_format)) {
+                                $this->$field = $timedate->to_display_date($this->$field, false);
+                            }
+                        }
+                    } elseif($type == 'datetime' || $type == 'datetimecombo')
+                    {
+                        if($this->$field == '0000-00-00 00:00:00')
+                        {
+                            $this->$field = '';
+                        }
+                        else
+                        {
+                            if(empty($disable_date_format)) {
+                                $this->$field = $timedate->to_display_date_time($this->$field, true, true);
+                            }
+                        }
+                    } elseif($type == 'time')
+                    {
+                        if($this->$field == '00:00:00')
+                        {
+                            $this->$field = '';
+                        } else
+                        {
+                            //$this->$field = from_db_convert($this->$field, 'time');
+                            if(empty($this->field_name_map[$field]['rel_field']) && empty($disable_date_format))
+                            {
+                                $this->$field = $timedate->to_display_time($this->$field,true, false);
+                            }
+                        }
+                    } elseif($type == 'encrypt' && empty($disable_date_format)){
+                        $this->$field = $this->decrypt_after_retrieve($this->$field);
+                    }
+                }
+            }
+        }
+    }
 
     /**
      * This function processes the fields before save.
@@ -2136,21 +2136,21 @@ 
     }
 
     /**
-    * Removes formatting from values posted from the user interface.
+     * Removes formatting from values posted from the user interface.
      * It only unformats numbers.  Function relies on user/system prefernce for format strings.
      *
      * Internal Function, do not override.
-    */
+     */
     function unformat_all_fields()
     {
         $GLOBALS['log']->deprecated('SugarBean.php: unformat_all_fields() is deprecated');
     }
 
     /**
-    * This functions adds formatting to all number fields before presenting them to user interface.
+     * This functions adds formatting to all number fields before presenting them to user interface.
      *
      * Internal function, do not override.
-    */
+     */
     function format_all_fields()
     {
         $GLOBALS['log']->deprecated('SugarBean.php: format_all_fields() is deprecated');
@@ -2190,8 +2190,8 @@ 
                 case 'datetimecombo':
                     if(empty($this->$field)) break;
                     if ($this->$field == 'NULL') {
-                    	$this->$field = '';
-                    	break;
+                        $this->$field = '';
+                        break;
                     }
                     if ( ! preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}$/',$this->$field) ) {
                         // This appears to be formatted in user date/time
@@ -2202,8 +2202,8 @@ 
                 case 'date':
                     if(empty($this->$field)) break;
                     if ($this->$field == 'NULL') {
-                    	$this->$field = '';
-                    	break;
+                        $this->$field = '';
+                        break;
                     }
                     if ( ! preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/',$this->$field) ) {
                         // This date appears to be formatted in the user's format
@@ -2214,8 +2214,8 @@ 
                 case 'time':
                     if(empty($this->$field)) break;
                     if ($this->$field == 'NULL') {
-                    	$this->$field = '';
-                    	break;
+                        $this->$field = '';
+                        break;
                     }
                     if ( preg_match('/(am|pm)/i',$this->$field) ) {
                         // This time appears to be formatted in the user's format
@@ -2235,7 +2235,7 @@ 
                         $reformatted = true;
                     }
                     break;
-               case 'uint':
+                case 'uint':
                case 'ulong':
                case 'long':
                case 'short':
@@ -2248,21 +2248,21 @@ 
                         $this->$field = (int)unformat_number($this->$field);
                         $reformatted = true;
                     }
-                   break;
-               case 'bool':
+                    break;
+                case 'bool':
                    if (empty($this->$field)) {
-                       $this->$field = false;
-                   } else if(true === $this->$field || 1 == $this->$field) {
-                       $this->$field = true;
-                   } else if(in_array(strval($this->$field), $boolean_false_values)) {
-                       $this->$field = false;
-                       $reformatted = true;
-                   } else {
-                       $this->$field = true;
-                       $reformatted = true;
-                   }
-                   break;
-               case 'encrypt':
+                        $this->$field = false;
+                    } else if(true === $this->$field || 1 == $this->$field) {
+                        $this->$field = true;
+                    } else if(in_array(strval($this->$field), $boolean_false_values)) {
+                        $this->$field = false;
+                        $reformatted = true;
+                    } else {
+                        $this->$field = true;
+                        $reformatted = true;
+                    }
+                    break;
+                case 'encrypt':
                     $this->$field = $this->encrpyt_before_save($this->$field);
                     break;
             }
@@ -2284,7 +2284,7 @@ 
      * @param boolean $deleted Optional, default true, if set to false deleted filter will not be added.
      *
      * Internal function, do not override.
-    */
+     */
     function retrieve($id = -1, $encode=true,$deleted=true)
     {
 
@@ -2340,18 +2340,18 @@ 
             $this->custom_fields->fill_relationships();
         }
 
-		$this->is_updated_dependent_fields = false;
+        $this->is_updated_dependent_fields = false;
         $this->fill_in_additional_detail_fields();
         $this->fill_in_relationship_fields();
 // save related fields values for audit
-         foreach ($this->get_related_fields() as $rel_field_name)
-         {
-             $field_name = $rel_field_name['name'];
-             if (! empty($this->$field_name))
-             {
-                 $this->fetched_rel_row[$rel_field_name['name']] = $this->$field_name;
-             }
-         }
+            foreach ($this->get_related_fields() as $rel_field_name)
+            {
+                $field_name = $rel_field_name['name'];
+                if (! empty($this->$field_name))
+                {
+                    $this->fetched_rel_row[$rel_field_name['name']] = $this->$field_name;
+                }
+            }
         //make a copy of fields in the relationship_fields array. These field values will be used to
         //clear relationship.
         foreach ( $this->field_defs as $key => $def )
@@ -2364,7 +2364,7 @@ 
                 }
                 else
                     $this->rel_fields_before_value[$key]=null;
-           }
+            }
         }
         if (isset($this->relationship_fields) && is_array($this->relationship_fields))
         {
@@ -2419,14 +2419,14 @@ 
 
 
     /**
-    * Add any required joins to the list count query.  The joins are required if there
-    * is a field in the $where clause that needs to be joined.
-    *
-    * @param string $query
-    * @param string $where
-    *
-    * Internal Function, do Not override.
-    */
+     * Add any required joins to the list count query.  The joins are required if there
+     * is a field in the $where clause that needs to be joined.
+     *
+     * @param string $query
+     * @param string $where
+     *
+     * Internal Function, do Not override.
+     */
     function add_list_count_joins(&$query, $where)
     {
         $custom_join = $this->getCustomJoin();
@@ -2435,15 +2435,15 @@ 
     }
 
     /**
-    * Changes the select expression of the given query to be 'count(*)' so you
-    * can get the number of items the query will return.  This is used to
-    * populate the upper limit on ListViews.
+     * Changes the select expression of the given query to be 'count(*)' so you
+     * can get the number of items the query will return.  This is used to
+     * populate the upper limit on ListViews.
      *
      * @param string $query Select query string
      * @return string count query
      *
      * Internal function, do not override.
-    */
+     */
     function create_list_count_query($query)
     {
         // remove the 'order by' clause which is expected to be at the end of the query
@@ -2496,21 +2496,21 @@ 
     }
 
     /**
-    * This function returns a paged list of the current object type.  It is intended to allow for
-    * hopping back and forth through pages of data.  It only retrieves what is on the current page.
-    *
-    * @internal This method must be called on a new instance.  It trashes the values of all the fields in the current one.
-    * @param string $order_by
-    * @param string $where Additional where clause
-    * @param int $row_offset Optaional,default 0, starting row number
-    * @param init $limit Optional, default -1
-    * @param int $max Optional, default -1
-    * @param boolean $show_deleted Optional, default 0, if set to 1 system will show deleted records.
-    * @return array Fetched data.
-    *
-    * Internal function, do not override.
-    *
-    */
+     * This function returns a paged list of the current object type.  It is intended to allow for
+     * hopping back and forth through pages of data.  It only retrieves what is on the current page.
+     *
+     * @internal This method must be called on a new instance.  It trashes the values of all the fields in the current one.
+     * @param string $order_by
+     * @param string $where Additional where clause
+     * @param int $row_offset Optaional,default 0, starting row number
+     * @param init $limit Optional, default -1
+     * @param int $max Optional, default -1
+     * @param boolean $show_deleted Optional, default 0, if set to 1 system will show deleted records.
+     * @return array Fetched data.
+     *
+     * Internal function, do not override.
+     *
+     */
     function get_list($order_by = "", $where = "", $row_offset = 0, $limit=-1, $max=-1, $show_deleted = 0, $singleSelect=false, $select_fields = array())
     {
         $GLOBALS['log']->debug("get_list:  order_by = '$order_by' and where = '$where' and limit = '$limit'");
@@ -2540,15 +2540,15 @@ 
     }
 
     /**
-    * Prefixes column names with this bean's table name.
-    *
-    * @param string $order_by  Order by clause to be processed
-    * @param SugarBean $submodule name of the module this order by clause is for
-    * @param boolean $suppress_table_name Whether table name should be suppressed
-    * @return string Processed order by clause
-    *
-    * Internal function, do not override.
-    */
+     * Prefixes column names with this bean's table name.
+     *
+     * @param string $order_by  Order by clause to be processed
+     * @param SugarBean $submodule name of the module this order by clause is for
+     * @param boolean $suppress_table_name Whether table name should be suppressed
+     * @return string Processed order by clause
+     *
+     * Internal function, do not override.
+     */
     public function process_order_by($order_by, $submodule = null, $suppress_table_name = false)
     {
         if (empty($order_by))
@@ -2622,21 +2622,21 @@ 
 
 
     /**
-    * Returns a detail object like retrieving of the current object type.
-    *
-    * It is intended for use in navigation buttons on the DetailView.  It will pass an offset and limit argument to the sql query.
-    * @internal This method must be called on a new instance.  It overrides the values of all the fields in the current one.
-    *
-    * @param string $order_by
-    * @param string $where Additional where clause
-    * @param int $row_offset Optaional,default 0, starting row number
-    * @param init $limit Optional, default -1
-    * @param int $max Optional, default -1
-    * @param boolean $show_deleted Optioanl, default 0, if set to 1 system will show deleted records.
-    * @return array Fetched data.
-    *
-    * Internal function, do not override.
-    */
+     * Returns a detail object like retrieving of the current object type.
+     *
+     * It is intended for use in navigation buttons on the DetailView.  It will pass an offset and limit argument to the sql query.
+     * @internal This method must be called on a new instance.  It overrides the values of all the fields in the current one.
+     *
+     * @param string $order_by
+     * @param string $where Additional where clause
+     * @param int $row_offset Optaional,default 0, starting row number
+     * @param init $limit Optional, default -1
+     * @param int $max Optional, default -1
+     * @param boolean $show_deleted Optioanl, default 0, if set to 1 system will show deleted records.
+     * @return array Fetched data.
+     *
+     * Internal function, do not override.
+     */
     function get_detail($order_by = "", $where = "",  $offset = 0, $row_offset = 0, $limit=-1, $max=-1, $show_deleted = 0)
     {
         $GLOBALS['log']->debug("get_detail:  order_by = '$order_by' and where = '$where' and limit = '$limit' and offset = '$offset'");
@@ -2660,25 +2660,25 @@ 
             }
         }
 
-		/* BEGIN - SECURITY GROUPS */
-    	if($this->bean_implements('ACL') && ACLController::requireSecurityGroup($this->module_dir, 'list') )
-    	{
-			require_once('modules/SecurityGroups/SecurityGroup.php');
-    		global $current_user;
-    		$owner_where = $this->getOwnerWhere($current_user->id);
-    		$group_where = SecurityGroup::getGroupWhere($this->table_name,$this->module_dir,$current_user->id);
-	    	if(!empty($owner_where)){
-				if(empty($where))
-	    		{
-	    			$where = " (".  $owner_where." or ".$group_where.") ";
-	    		} else {
-	    			$where .= " AND (".  $owner_where." or ".$group_where.") ";
-	    		}
-			} else {
-				$where .= ' AND '.  $group_where;
-			}
-    	}
-    	/* END - SECURITY GROUPS */
+        /* BEGIN - SECURITY GROUPS */
+        if($this->bean_implements('ACL') && ACLController::requireSecurityGroup($this->module_dir, 'list') )
+        {
+            require_once('modules/SecurityGroups/SecurityGroup.php');
+            global $current_user;
+            $owner_where = $this->getOwnerWhere($current_user->id);
+            $group_where = SecurityGroup::getGroupWhere($this->table_name,$this->module_dir,$current_user->id);
+            if(!empty($owner_where)){
+                if(empty($where))
+                {
+                    $where = " (".  $owner_where." or ".$group_where.") ";
+                } else {
+                    $where .= " AND (".  $owner_where." or ".$group_where.") ";
+                }
+            } else {
+                $where .= ' AND '.  $group_where;
+            }
+        }
+        /* END - SECURITY GROUPS */
         $query = $this->create_new_list_query($order_by, $where,array(),array(), $show_deleted, $offset);
 
         //Add Limit and Offset to query
@@ -2688,16 +2688,16 @@ 
     }
 
     /**
-    * Fetches data from all related tables.
-    *
-    * @param object $child_seed
-    * @param string $related_field_name relation to fetch data for
-    * @param string $order_by Optional, default empty
-    * @param string $where Optional, additional where clause
-    * @return array Fetched data.
-    *
-    * Internal function, do not override.
-    */
+     * Fetches data from all related tables.
+     *
+     * @param object $child_seed
+     * @param string $related_field_name relation to fetch data for
+     * @param string $order_by Optional, default empty
+     * @param string $where Optional, additional where clause
+     * @return array Fetched data.
+     *
+     * Internal function, do not override.
+     */
     function get_related_list($child_seed,$related_field_name, $order_by = "", $where = "",
     $row_offset = 0, $limit=-1, $max=-1, $show_deleted = 0)
     {
@@ -3073,13 +3073,13 @@ 
 
 
     /**
-    * Returns a full (ie non-paged) list of the current object type.
-    *
-    * @param string $order_by the order by SQL parameter. defaults to ""
-    * @param string $where where clause. defaults to ""
-    * @param boolean $check_dates. defaults to false
-    * @param int $show_deleted show deleted records. defaults to 0
-    */
+     * Returns a full (ie non-paged) list of the current object type.
+     *
+     * @param string $order_by the order by SQL parameter. defaults to ""
+     * @param string $where where clause. defaults to ""
+     * @param boolean $check_dates. defaults to false
+     * @param int $show_deleted show deleted records. defaults to 0
+     */
     function get_full_list($order_by = "", $where = "", $check_dates=false, $show_deleted = 0)
     {
         $GLOBALS['log']->debug("get_full_list:  order_by = '$order_by' and where = '$where'");
@@ -3107,7 +3107,7 @@ 
      * @param boolean $singleSelect Optional, default false.
      * @return String select query string, optionally an array value will be returned if $return_array= true.
      */
-	function create_new_list_query($order_by, $where,$filter=array(),$params=array(), $show_deleted = 0,$join_type='', $return_array = false,$parentbean=null, $singleSelect = false, $ifListForExport = false)
+    function create_new_list_query($order_by, $where,$filter=array(),$params=array(), $show_deleted = 0,$join_type='', $return_array = false,$parentbean=null, $singleSelect = false, $ifListForExport = false)
     {
         global $beanFiles, $beanList;
         $selectedFields = array();
@@ -3127,41 +3127,41 @@ 
                 $where .= ' AND '.  $owner_where;
             }
         }
-		/* BEGIN - SECURITY GROUPS */
-    	global $current_user, $sugar_config;
-    	if($this->module_dir == 'Users' && !is_admin($current_user)
-				&& isset($sugar_config['securitysuite_filter_user_list'])
-				&& $sugar_config['securitysuite_filter_user_list'] == true
-    	) {
-			require_once('modules/SecurityGroups/SecurityGroup.php');
-    		global $current_user;
-    		$group_where = SecurityGroup::getGroupUsersWhere($current_user->id);
-    		//$group_where = "user_name = 'admin'";
-    		if(empty($where))
-    		{
-    			$where = " (".$group_where.") ";
-    		} else {
-    			$where .= " AND (".$group_where.") ";
-    		}
-    	} else
-    	if($this->bean_implements('ACL') && ACLController::requireSecurityGroup($this->module_dir, 'list') )
-    	{
-			require_once('modules/SecurityGroups/SecurityGroup.php');
-    		global $current_user;
-    		$owner_where = $this->getOwnerWhere($current_user->id);
-    		$group_where = SecurityGroup::getGroupWhere($this->table_name,$this->module_dir,$current_user->id);
-	    	if(!empty($owner_where)){
-				if(empty($where))
-	    		{
-	    			$where = " (".  $owner_where." or ".$group_where.") ";
-	    		} else {
-	    			$where .= " AND (".  $owner_where." or ".$group_where.") ";
-	    		}
-			} else {
-				$where .= ' AND '.  $group_where;
-			}
-    	}
-    	/* END - SECURITY GROUPS */
+        /* BEGIN - SECURITY GROUPS */
+        global $current_user, $sugar_config;
+        if($this->module_dir == 'Users' && !is_admin($current_user)
+                && isset($sugar_config['securitysuite_filter_user_list'])
+                && $sugar_config['securitysuite_filter_user_list'] == true
+        ) {
+            require_once('modules/SecurityGroups/SecurityGroup.php');
+            global $current_user;
+            $group_where = SecurityGroup::getGroupUsersWhere($current_user->id);
+            //$group_where = "user_name = 'admin'";
+            if(empty($where))
+            {
+                $where = " (".$group_where.") ";
+            } else {
+                $where .= " AND (".$group_where.") ";
+            }
+        } else
+        if($this->bean_implements('ACL') && ACLController::requireSecurityGroup($this->module_dir, 'list') )
+        {
+            require_once('modules/SecurityGroups/SecurityGroup.php');
+            global $current_user;
+            $owner_where = $this->getOwnerWhere($current_user->id);
+            $group_where = SecurityGroup::getGroupWhere($this->table_name,$this->module_dir,$current_user->id);
+            if(!empty($owner_where)){
+                if(empty($where))
+                {
+                    $where = " (".  $owner_where." or ".$group_where.") ";
+                } else {
+                    $where .= " AND (".  $owner_where." or ".$group_where.") ";
+                }
+            } else {
+                $where .= ' AND '.  $group_where;
+            }
+        }
+        /* END - SECURITY GROUPS */
         if(!empty($params['distinct']))
         {
             $distinct = ' DISTINCT ';
@@ -3247,24 +3247,24 @@ 
 
         $used_join_key = array();
 
-	//walk through the fields and for every relationship field add their relationship_info field
-	//relationshipfield-aliases are resolved in SugarBean::create_new_list_query through their relationship_info field
-	$addrelate = array();
-	foreach($fields as $field=>$value)
-	{
-		if (isset($this->field_defs[$field]) && isset($this->field_defs[$field]['source']) && 
-			$this->field_defs[$field]['source'] == 'non-db')
-		{
-			$addrelatefield = $this->get_relationship_field($field);
-			if ($addrelatefield)
-				$addrelate[$addrelatefield] = true;
-		}
-		if(!empty($this->field_defs[$field]['id_name'])){
-			$addrelate[$this->field_defs[$field]['id_name']] = true;
-		}
-	}
-
-	$fields = array_merge($addrelate, $fields);
+    //walk through the fields and for every relationship field add their relationship_info field
+    //relationshipfield-aliases are resolved in SugarBean::create_new_list_query through their relationship_info field
+    $addrelate = array();
+    foreach($fields as $field=>$value)
+    {
+        if (isset($this->field_defs[$field]) && isset($this->field_defs[$field]['source']) && 
+            $this->field_defs[$field]['source'] == 'non-db')
+        {
+            $addrelatefield = $this->get_relationship_field($field);
+            if ($addrelatefield)
+                $addrelate[$addrelatefield] = true;
+        }
+        if(!empty($this->field_defs[$field]['id_name'])){
+            $addrelate[$this->field_defs[$field]['id_name']] = true;
+        }
+    }
+
+    $fields = array_merge($addrelate, $fields);
 
         foreach($fields as $field=>$value)
         {
@@ -3297,7 +3297,7 @@ 
             //in opportunities module remove the contact_role/opportunity_role field.
             if (isset($data['relationship_fields']) and !empty($data['relationship_fields']))
             {
-		$process_field = false;
+        $process_field = false;
                 foreach ($data['relationship_fields'] as $field_name)
                 {
                     if (isset($fields[$field_name]))
@@ -3307,8 +3307,8 @@ 
                     }
                 }
 		
-            	if (!$process_field)
-                	continue;
+                if (!$process_field)
+                    continue;
             }
 
             if(  (!isset($data['source']) || $data['source'] == 'db') && (!empty($alias) || !empty($filter) ))
@@ -3416,27 +3416,27 @@ 
                     $rel_module = $this->$linkField->getRelatedModuleName();
                     $table_joined = !empty($joined_tables[$params['join_table_alias']]) || (!empty($joined_tables[$params['join_table_link_alias']]) && isset($data['link_type']) && $data['link_type'] == 'relationship_info');
 
-					//if rname is set to 'name', and bean files exist, then check if field should be a concatenated name
-					global $beanFiles, $beanList;
+                    //if rname is set to 'name', and bean files exist, then check if field should be a concatenated name
+                    global $beanFiles, $beanList;
                     // °3/21/2014 FIX NS-TEAM - Relationship fields could not be displayed in subpanels
                     //if($data['rname'] && !empty($beanFiles[$beanList[$rel_module]])) {
                     if(isset($data['rname']) && $data['rname'] == 'name' && !empty($beanFiles[$beanList[$rel_module]])) {
 
-						//create an instance of the related bean
-						require_once($beanFiles[$beanList[$rel_module]]);
-						$rel_mod = new $beanList[$rel_module]();
-						//if bean has first and last name fields, then name should be concatenated
-						if(isset($rel_mod->field_name_map['first_name']) && isset($rel_mod->field_name_map['last_name'])){
-								$data['db_concat_fields'] = array(0=>'first_name', 1=>'last_name');
-						}
-					}
+                        //create an instance of the related bean
+                        require_once($beanFiles[$beanList[$rel_module]]);
+                        $rel_mod = new $beanList[$rel_module]();
+                        //if bean has first and last name fields, then name should be concatenated
+                        if(isset($rel_mod->field_name_map['first_name']) && isset($rel_mod->field_name_map['last_name'])){
+                                $data['db_concat_fields'] = array(0=>'first_name', 1=>'last_name');
+                        }
+                    }
 
 
-    				if($join['type'] == 'many-to-many')
-    				{
-    					if(empty($ret_array['secondary_select']))
-    					{
-    						$ret_array['secondary_select'] = " SELECT $this->table_name.id ref_id  ";
+                    if($join['type'] == 'many-to-many')
+                    {
+                        if(empty($ret_array['secondary_select']))
+                        {
+                            $ret_array['secondary_select'] = " SELECT $this->table_name.id ref_id  ";
 
                             if(!empty($beanFiles[$beanList[$rel_module]]) && $join_primary)
                             {
@@ -3548,42 +3548,42 @@ 
                     // and this code changes accounts to jt4 as there is a self join with the accounts table.
                     //Martin fix #27494
                     if(isset($data['db_concat_fields'])){
-                    	$buildWhere = false;
+                        $buildWhere = false;
                         if(in_array('first_name', $data['db_concat_fields']) && in_array('last_name', $data['db_concat_fields']))
-                    	{
-                     	   $exp = '/\(\s*?'.$data['name'].'.*?\%\'\s*?\)/';
-                    	   if(preg_match($exp, $where, $matches))
-                    	   {
-                    	   	  $search_expression = $matches[0];
-                    	   	  //Create three search conditions - first + last, first, last
-                    	   	  $first_name_search = str_replace($data['name'], $params['join_table_alias'] . '.first_name', $search_expression);
-                    	   	  $last_name_search = str_replace($data['name'], $params['join_table_alias'] . '.last_name', $search_expression);
-							  $full_name_search = str_replace($data['name'], $this->db->concat($params['join_table_alias'], $data['db_concat_fields']), $search_expression);
-							  $buildWhere = true;
-							  $where = str_replace($search_expression, '(' . $full_name_search . ' OR ' . $first_name_search . ' OR ' . $last_name_search . ')', $where);
-                    	   }
-                    	}
-
-                    	if(!$buildWhere)
-                    	{
-	                       $db_field = $this->db->concat($params['join_table_alias'], $data['db_concat_fields']);
-	                       $where = preg_replace('/'.$data['name'].'/', $db_field, $where);
-
-				// For relationship fields replace their alias by the corresponsding link table and r_name
-				if(isset($data['relationship_fields']))
-					foreach($data['relationship_fields'] as $r_name=>$alias_name)
-					{
-						$db_field = $this->db->concat($params['join_table_link_alias'], $r_name);
-						$where = preg_replace('/' . $alias_name . '/', $db_field, $where);
-					}
-                    	}
+                        {
+                            $exp = '/\(\s*?'.$data['name'].'.*?\%\'\s*?\)/';
+                            if(preg_match($exp, $where, $matches))
+                            {
+                                    $search_expression = $matches[0];
+                                    //Create three search conditions - first + last, first, last
+                                    $first_name_search = str_replace($data['name'], $params['join_table_alias'] . '.first_name', $search_expression);
+                                    $last_name_search = str_replace($data['name'], $params['join_table_alias'] . '.last_name', $search_expression);
+                                $full_name_search = str_replace($data['name'], $this->db->concat($params['join_table_alias'], $data['db_concat_fields']), $search_expression);
+                                $buildWhere = true;
+                                $where = str_replace($search_expression, '(' . $full_name_search . ' OR ' . $first_name_search . ' OR ' . $last_name_search . ')', $where);
+                            }
+                        }
+
+                        if(!$buildWhere)
+                        {
+                            $db_field = $this->db->concat($params['join_table_alias'], $data['db_concat_fields']);
+                            $where = preg_replace('/'.$data['name'].'/', $db_field, $where);
+
+                // For relationship fields replace their alias by the corresponsding link table and r_name
+                if(isset($data['relationship_fields']))
+                    foreach($data['relationship_fields'] as $r_name=>$alias_name)
+                    {
+                        $db_field = $this->db->concat($params['join_table_link_alias'], $r_name);
+                        $where = preg_replace('/' . $alias_name . '/', $db_field, $where);
+                    }
+                        }
                     }else{
                         $where = preg_replace('/(^|[\s(])' . $data['name'] . '/', '${1}' . $params['join_table_alias'] . '.'.$data['rname'], $where);
 
-			// For relationship fields replace their alias by the corresponsding link table and r_name
-			if(isset($data['relationship_fields']))
-				foreach($data['relationship_fields'] as $r_name=>$alias_name)
-					$where = preg_replace('/(^|[\s(])' . $alias_name . '/', '${1}' . $params['join_table_link_alias'] . '.'.$r_name, $where);
+            // For relationship fields replace their alias by the corresponsding link table and r_name
+            if(isset($data['relationship_fields']))
+                foreach($data['relationship_fields'] as $r_name=>$alias_name)
+                    $where = preg_replace('/(^|[\s(])' . $alias_name . '/', '${1}' . $params['join_table_link_alias'] . '.'.$r_name, $where);
                     }
                     if(!$table_joined)
                     {
@@ -3612,12 +3612,12 @@ 
 
         }
 
-	if ($ifListForExport) {
-		if(isset($this->field_defs['email1'])) {
-			$ret_array['select'].= " ,email_addresses.email_address email1";
-			$ret_array['from'].= " LEFT JOIN email_addr_bean_rel on {$this->table_name}.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='{$this->module_dir}' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1 LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id ";
-		}
-	}
+    if ($ifListForExport) {
+        if(isset($this->field_defs['email1'])) {
+            $ret_array['select'].= " ,email_addresses.email_address email1";
+            $ret_array['from'].= " LEFT JOIN email_addr_bean_rel on {$this->table_name}.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='{$this->module_dir}' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1 LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id ";
+        }
+    }
 
         $where_auto = '1=1';
         if($show_deleted == 0)
@@ -3652,20 +3652,20 @@ 
         return  $ret_array['select'] . $ret_array['from'] . $ret_array['where']. $ret_array['order_by'];
     }
 
-	// Check if field is defined through a relationship_info field, add this field when not present 
-	function get_relationship_field($field)
-	{
-		foreach ($this->field_defs as $field_def => $value)
-		{
-			if (isset($value['relationship_fields']) && 
-				in_array($field, $value['relationship_fields']) &&
+    // Check if field is defined through a relationship_info field, add this field when not present 
+    function get_relationship_field($field)
+    {
+        foreach ($this->field_defs as $field_def => $value)
+        {
+            if (isset($value['relationship_fields']) && 
+                in_array($field, $value['relationship_fields']) &&
                 (!isset($value['link_type']) || $value['link_type'] != 'relationship_info')
             )
-				return $field_def;
-		}
+                return $field_def;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
     /**
      * Returns parent record data for objects that store relationship information
@@ -3772,8 +3772,8 @@ 
         global $sugar_config;
         $db = DBManagerFactory::getInstance('listviews');
         /**
-        * if the row_offset is set to 'end' go to the end of the list
-        */
+         * if the row_offset is set to 'end' go to the end of the list
+         */
         $toEnd = strval($row_offset) == 'end';
         $GLOBALS['log']->debug("process_list_query: ".$query);
         if($max_per_page == -1)
@@ -3901,13 +3901,13 @@ 
     }
 
     /**
-    * Returns the number of rows that the given SQL query should produce
+     * Returns the number of rows that the given SQL query should produce
      *
      * Internal function, do not override.
      * @param string $query valid select  query
      * @param boolean $is_count_query Optional, Default false, set to true if passed query is a count query.
      * @return int count of rows found
-    */
+     */
     function _get_num_rows_in_query($query, $is_count_query=false)
     {
         $num_rows_in_query = 0;
@@ -3949,8 +3949,8 @@ 
     {
         $db = DBManagerFactory::getInstance('listviews');
         /**
-        * if the row_offset is set to 'end' go to the end of the list
-        */
+         * if the row_offset is set to 'end' go to the end of the list
+         */
         $toEnd = strval($row_offset) == 'end';
         global $sugar_config;
         $use_count_query=false;
@@ -4188,7 +4188,7 @@ 
             }
             if(!empty($sugar_config['disable_count_query']) && !empty($limit))
             {
-            	//C.L. Bug 43535 - Use the $index value to set the $rows_found value here
+                //C.L. Bug 43535 - Use the $index value to set the $rows_found value here
                 $rows_found = isset($index) ? $index : $row_offset + count($list);
 
                 if(count($list) >= $limit)
@@ -4338,28 +4338,28 @@ 
     }
 
     /**
-    * Tracks the viewing of a detail record.
-    * This leverages get_summary_text() which is object specific.
-    *
-    * Internal function, do not override.
-    * @param string $user_id - String value of the user that is viewing the record.
-    * @param string $current_module - String value of the module being processed.
-    * @param string $current_view - String value of the current view
-	*/
-	function track_view($user_id, $current_module, $current_view='')
-	{
-	    $trackerManager = TrackerManager::getInstance();
-		if($monitor = $trackerManager->getMonitor('tracker')){
-	        $monitor->setValue('date_modified', $GLOBALS['timedate']->nowDb());
-	        $monitor->setValue('user_id', $user_id);
-	        $monitor->setValue('module_name', $current_module);
-	        $monitor->setValue('action', $current_view);
-	        $monitor->setValue('item_id', $this->id);
-	        $monitor->setValue('item_summary', $this->get_summary_text());
-	        $monitor->setValue('visible', $this->tracker_visibility);
-	        $trackerManager->saveMonitor($monitor);
-		}
-	}
+     * Tracks the viewing of a detail record.
+     * This leverages get_summary_text() which is object specific.
+     *
+     * Internal function, do not override.
+     * @param string $user_id - String value of the user that is viewing the record.
+     * @param string $current_module - String value of the module being processed.
+     * @param string $current_view - String value of the current view
+     */
+    function track_view($user_id, $current_module, $current_view='')
+    {
+        $trackerManager = TrackerManager::getInstance();
+        if($monitor = $trackerManager->getMonitor('tracker')){
+            $monitor->setValue('date_modified', $GLOBALS['timedate']->nowDb());
+            $monitor->setValue('user_id', $user_id);
+            $monitor->setValue('module_name', $current_module);
+            $monitor->setValue('action', $current_view);
+            $monitor->setValue('item_id', $this->id);
+            $monitor->setValue('item_summary', $this->get_summary_text());
+            $monitor->setValue('visible', $this->tracker_visibility);
+            $trackerManager->saveMonitor($monitor);
+        }
+    }
 
     /**
      * Returns the summary text that should show up in the recent history list for this object.
@@ -4372,12 +4372,12 @@ 
     }
 
     /**
-    * This is designed to be overridden and add specific fields to each record.
-    * This allows the generic query to fill in the major fields, and then targeted
-    * queries to get related fields and add them to the record.  The contact's
-    * account for instance.  This method is only used for populating extra fields
-    * in lists.
-    */
+     * This is designed to be overridden and add specific fields to each record.
+     * This allows the generic query to fill in the major fields, and then targeted
+     * queries to get related fields and add them to the record.  The contact's
+     * account for instance.  This method is only used for populating extra fields
+     * in lists.
+     */
     function fill_in_additional_list_fields(){
         if(!empty($this->field_defs['parent_name']) && empty($this->parent_name)){
             $this->fill_in_additional_parent_fields();
@@ -4385,12 +4385,12 @@ 
     }
 
     /**
-    * This is designed to be overridden and add specific fields to each record.
-    * This allows the generic query to fill in the major fields, and then targeted
-    * queries to get related fields and add them to the record.  The contact's
-    * account for instance.  This method is only used for populating extra fields
-    * in the detail form
-    */
+     * This is designed to be overridden and add specific fields to each record.
+     * This allows the generic query to fill in the major fields, and then targeted
+     * queries to get related fields and add them to the record.  The contact's
+     * account for instance.  This method is only used for populating extra fields
+     * in the detail form
+     */
     function fill_in_additional_detail_fields()
     {
         if(!empty($this->field_defs['assigned_user_name']) && !empty($this->assigned_user_id)){
@@ -4398,20 +4398,20 @@ 
             $this->assigned_user_name = get_assigned_user_name($this->assigned_user_id);
 
         }
-		if(!empty($this->field_defs['created_by']) && !empty($this->created_by))
-		$this->created_by_name = get_assigned_user_name($this->created_by);
-		if(!empty($this->field_defs['modified_user_id']) && !empty($this->modified_user_id))
-		$this->modified_by_name = get_assigned_user_name($this->modified_user_id);
+        if(!empty($this->field_defs['created_by']) && !empty($this->created_by))
+        $this->created_by_name = get_assigned_user_name($this->created_by);
+        if(!empty($this->field_defs['modified_user_id']) && !empty($this->modified_user_id))
+        $this->modified_by_name = get_assigned_user_name($this->modified_user_id);
 
-		if(!empty($this->field_defs['parent_name'])){
-			$this->fill_in_additional_parent_fields();
-		}
+        if(!empty($this->field_defs['parent_name'])){
+            $this->fill_in_additional_parent_fields();
+        }
     }
 
     /**
-    * This is desgined to be overridden or called from extending bean. This method
-    * will fill in any parent_name fields.
-    */
+     * This is desgined to be overridden or called from extending bean. This method
+     * will fill in any parent_name fields.
+     */
     function fill_in_additional_parent_fields() {
 
         if(!empty($this->parent_id) && !empty($this->last_parent_id) && $this->last_parent_id == $this->parent_id){
@@ -4452,8 +4452,8 @@ 
     }
 
     /**
-    * Fill in fields where type = relate
-    */
+     * Fill in fields where type = relate
+     */
     function fill_in_relationship_fields(){
         global $fill_in_rel_depth;
         if(empty($fill_in_rel_depth) || $fill_in_rel_depth < 0)
@@ -4477,7 +4477,7 @@ 
 
                     if (empty($this->$id_name))
                     {
-                       $this->fill_in_link_field($id_name, $field);
+                        $this->fill_in_link_field($id_name, $field);
                     }
                     if(!empty($this->$id_name) && ( $this->object_name != $related_module || ( $this->object_name == $related_module && $this->$id_name != $this->id ))){
                         if(isset($GLOBALS['beanList'][ $related_module])){
@@ -4503,7 +4503,7 @@ 
                     if(!empty($this->$id_name) && isset($this->$name))
                     {
                         if(!isset($field['additionalFields']))
-                           $field['additionalFields'] = array();
+                            $field['additionalFields'] = array();
                         if(!empty($field['rname']))
                         {
                             $field['additionalFields'][$field['rname']]= $name;
@@ -4521,8 +4521,8 @@ 
     }
 
     /**
-    * This is a helper function that is used to quickly created indexes when creating tables.
-    */
+     * This is a helper function that is used to quickly created indexes when creating tables.
+     */
     function create_index($query)
     {
         $GLOBALS['log']->info("create_index: $query");
@@ -4534,21 +4534,21 @@ 
      * This function should be overridden in each module.  It marks an item as deleted.
      *
      * If it is not overridden, then marking this type of item is not allowed
-	 */
-	function mark_deleted($id)
-	{
-		global $current_user;
-		$date_modified = $GLOBALS['timedate']->nowDb();
+     */
+    function mark_deleted($id)
+    {
+        global $current_user;
+        $date_modified = $GLOBALS['timedate']->nowDb();
         $id = $this->db->quote($id);
-		if(isset($_SESSION['show_deleted']))
-		{
-			$this->mark_undeleted($id);
-		}
-		else
-		{
-			// call the custom business logic
-			$custom_logic_arguments['id'] = $id;
-			$this->call_custom_logic("before_delete", $custom_logic_arguments);
+        if(isset($_SESSION['show_deleted']))
+        {
+            $this->mark_undeleted($id);
+        }
+        else
+        {
+            // call the custom business logic
+            $custom_logic_arguments['id'] = $id;
+            $this->call_custom_logic("before_delete", $custom_logic_arguments);
             $this->deleted = 1;
             $this->mark_relationships_deleted($id);
             if ( isset($this->field_defs['modified_user_id']) ) {
@@ -4581,16 +4581,16 @@ 
      * Restores data deleted by call to mark_deleted() function.
      *
      * Internal function, do not override.
-    */
+     */
     function mark_undeleted($id)
     {
         // call the custom business logic
         $custom_logic_arguments['id'] = $id;
         $this->call_custom_logic("before_restore", $custom_logic_arguments);
 
-		$date_modified = $GLOBALS['timedate']->nowDb();
-		$query = "UPDATE $this->table_name set deleted=0 , date_modified = '$date_modified' where id='" . $this->db->quote($id) ."'";
-		$this->db->query($query, true,"Error marking record undeleted: ");
+        $date_modified = $GLOBALS['timedate']->nowDb();
+        $query = "UPDATE $this->table_name set deleted=0 , date_modified = '$date_modified' where id='" . $this->db->quote($id) ."'";
+        $this->db->query($query, true,"Error marking record undeleted: ");
 
         $this->restoreFiles();
 
@@ -4598,17 +4598,17 @@ 
         $this->call_custom_logic("after_restore", $custom_logic_arguments);
     }
 
-   /**
-    * This function deletes relationships to this object.  It should be overridden
-    * to handle the relationships of the specific object.
-    * This function is called when the item itself is being deleted.
-    *
-    * @param int $id id of the relationship to delete
-    */
-   function mark_relationships_deleted($id)
-   {
+    /**
+     * This function deletes relationships to this object.  It should be overridden
+     * to handle the relationships of the specific object.
+     * This function is called when the item itself is being deleted.
+     *
+     * @param int $id id of the relationship to delete
+     */
+    function mark_relationships_deleted($id)
+    {
     $this->delete_linked($id);
-   }
+    }
 
     /**
      * Returns path for files of bean or false on error
@@ -4788,16 +4788,16 @@ 
     }
 
     /**
-    * This function is used to execute the query and create an array template objects
-    * from the resulting ids from the query.
-    * It is currently used for building sub-panel arrays.
-    *
-    * @param string $query - the query that should be executed to build the list
-    * @param object $template - The object that should be used to copy the records.
-    * @param int $row_offset Optional, default 0
-    * @param int $limit Optional, default -1
-    * @return array
-    */
+     * This function is used to execute the query and create an array template objects
+     * from the resulting ids from the query.
+     * It is currently used for building sub-panel arrays.
+     *
+     * @param string $query - the query that should be executed to build the list
+     * @param object $template - The object that should be used to copy the records.
+     * @param int $row_offset Optional, default 0
+     * @param int $limit Optional, default -1
+     * @return array
+     */
     function build_related_list($query, &$template, $row_offset = 0, $limit = -1)
     {
         $GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
@@ -4833,17 +4833,17 @@ 
         return $list;
     }
 
-  /**
-    * This function is used to execute the query and create an array template objects
-    * from the resulting ids from the query.
-    * It is currently used for building sub-panel arrays. It supports an additional
-    * where clause that is executed as a filter on the results
-    *
-    * @param string $query - the query that should be executed to build the list
-    * @param object $template - The object that should be used to copy the records.
-    */
-  function build_related_list_where($query, &$template, $where='', $in='', $order_by, $limit='', $row_offset = 0)
-  {
+    /**
+     * This function is used to execute the query and create an array template objects
+     * from the resulting ids from the query.
+     * It is currently used for building sub-panel arrays. It supports an additional
+     * where clause that is executed as a filter on the results
+     *
+     * @param string $query - the query that should be executed to build the list
+     * @param object $template - The object that should be used to copy the records.
+     */
+    function build_related_list_where($query, &$template, $where='', $in='', $order_by, $limit='', $row_offset = 0)
+    {
     $db = DBManagerFactory::getInstance('listviews');
     // No need to do an additional query
     $GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
@@ -4904,7 +4904,7 @@ 
     }
 
     return $list;
-  }
+    }
 
     /**
      * Constructs an comma separated list of ids from passed query results.
@@ -4940,15 +4940,15 @@ 
     }
 
     /**
-    * Optionally copies values from fetched row into the bean.
-    *
-    * Internal function, do not override.
-    *
-    * @param string $query - the query that should be executed to build the list
-    * @param object $template - The object that should be used to copy the records
-    * @param array $field_list List of  fields.
-    * @return array
-    */
+     * Optionally copies values from fetched row into the bean.
+     *
+     * Internal function, do not override.
+     *
+     * @param string $query - the query that should be executed to build the list
+     * @param object $template - The object that should be used to copy the records
+     * @param array $field_list List of  fields.
+     * @return array
+     */
     function build_related_list2($query, &$template, &$field_list)
     {
         $GLOBALS['log']->debug("Finding linked values $this->object_name: ".$query);
@@ -5121,19 +5121,19 @@ 
         $row = $this->convertRow($row);
         $this->fetched_row = $row;
         $this->fromArray($row);
-		$this->is_updated_dependent_fields = false;
+        $this->is_updated_dependent_fields = false;
         $this->fill_in_additional_detail_fields();
         return $this;
     }
 
     /**
-    * This method is called during an import before inserting a bean
-    * Define an associative array called $special_fields
-    * the keys are user defined, and don't directly map to the bean's fields
-    * the value is the method name within that bean that will do extra
-    * processing for that field. example: 'full_name'=>'get_names_from_full_name'
-    *
-    */
+     * This method is called during an import before inserting a bean
+     * Define an associative array called $special_fields
+     * the keys are user defined, and don't directly map to the bean's fields
+     * the value is the method name within that bean that will do extra
+     * processing for that field. example: 'full_name'=>'get_names_from_full_name'
+     *
+     */
     function process_special_fields()
     {
         foreach ($this->special_functions as $func_name)
@@ -5267,8 +5267,8 @@ 
     {
         $where = '';
 
-		// make sure there is a date modified
-		$date_modified = $this->db->convert("'".$GLOBALS['timedate']->nowDb()."'", 'datetime');
+        // make sure there is a date modified
+        $date_modified = $this->db->convert("'".$GLOBALS['timedate']->nowDb()."'", 'datetime');
 
         $row=null;
         if($check_duplicates)
@@ -5345,30 +5345,30 @@ 
     }
 
     /**
-    * Trigger custom logic for this module that is defined for the provided hook
-    * The custom logic file is located under custom/modules/[CURRENT_MODULE]/logic_hooks.php.
-    * That file should define the $hook_version that should be used.
-    * It should also define the $hook_array.  The $hook_array will be a two dimensional array
-    * the first dimension is the name of the event, the second dimension is the information needed
-    * to fire the hook.  Each entry in the top level array should be defined on a single line to make it
-    * easier to automatically replace this file.  There should be no contents of this file that are not replacable.
-    *
-    * $hook_array['before_save'][] = Array(1, testtype, 'custom/modules/Leads/test12.php', 'TestClass', 'lead_before_save_1');
-    * This sample line creates a before_save hook.  The hooks are procesed in the order in which they
-    * are added to the array.  The second dimension is an array of:
-    *		processing index (for sorting before exporting the array)
-    *		A logic type hook
-    *		label/type
-    *		php file to include
-    *		php class the method is in
-    *		php method to call
-    *
-    * The method signature for version 1 hooks is:
-    * function NAME(&$bean, $event, $arguments)
-    * 		$bean - $this bean passed in by reference.
-    *		$event - The string for the current event (i.e. before_save)
-    * 		$arguments - An array of arguments that are specific to the event.
-    */
+     * Trigger custom logic for this module that is defined for the provided hook
+     * The custom logic file is located under custom/modules/[CURRENT_MODULE]/logic_hooks.php.
+     * That file should define the $hook_version that should be used.
+     * It should also define the $hook_array.  The $hook_array will be a two dimensional array
+     * the first dimension is the name of the event, the second dimension is the information needed
+     * to fire the hook.  Each entry in the top level array should be defined on a single line to make it
+     * easier to automatically replace this file.  There should be no contents of this file that are not replacable.
+     *
+     * $hook_array['before_save'][] = Array(1, testtype, 'custom/modules/Leads/test12.php', 'TestClass', 'lead_before_save_1');
+     * This sample line creates a before_save hook.  The hooks are procesed in the order in which they
+     * are added to the array.  The second dimension is an array of:
+     *		processing index (for sorting before exporting the array)
+     *		A logic type hook
+     *		label/type
+     *		php file to include
+     *		php class the method is in
+     *		php method to call
+     *
+     * The method signature for version 1 hooks is:
+     * function NAME(&$bean, $event, $arguments)
+     * 		$bean - $this bean passed in by reference.
+     *		$event - The string for the current event (i.e. before_save)
+     * 		$arguments - An array of arguments that are specific to the event.
+     */
     function call_custom_logic($event, $arguments = null)
     {
         if(!isset($this->processed) || $this->processed == false){
@@ -5432,14 +5432,14 @@ 
         return false;
     }
     /**
-    * Check whether the user has access to a particular view for the current bean/module
-    * @param $view string required, the view to determine access for i.e. DetailView, ListView...
-    * @param $is_owner bool optional, this is part of the ACL check if the current user is an owner they will receive different access
-    */
-	/* BEGIN - SECURITY GROUPS - aclaccess */  
-	/**
+     * Check whether the user has access to a particular view for the current bean/module
+     * @param $view string required, the view to determine access for i.e. DetailView, ListView...
+     * @param $is_owner bool optional, this is part of the ACL check if the current user is an owner they will receive different access
+     */
+    /* BEGIN - SECURITY GROUPS - aclaccess */  
+    /**
     function ACLAccess($view,$is_owner='not_set')
-	*/
+     */
     function ACLAccess($view,$is_owner='not_set',$in_group='not_set')
     {
         global $current_user;
@@ -5447,61 +5447,61 @@ 
             return true;
         }
         $not_set = false;
-		/**
+        /**
         if($is_owner == 'not_set')
-		*/
-    	if($is_owner === 'not_set') //eggsurplus: should be ===
+         */
+        if($is_owner === 'not_set') //eggsurplus: should be ===
         {
             $not_set = true;
             $is_owner = $this->isOwner($current_user->id);
         }
-		// DJM - OBS Customizations - May 2009
-		// Moved this code to convert to lowercase from below.
-		// Added new action variable.
-		$view = strtolower($view);
-		$action = '';
-		// DJM - OBS Customizations - END CHANGE
-    	if($in_group === 'not_set')
-    	{
-			require_once("modules/SecurityGroups/SecurityGroup.php");
-			// DJM - OBS Customizations - May 2009
-			// Added the following switch statement to convert the view
-			// into an action value.  As per the switch below.
-			// Added the action parameter to the groupHasAccess call.
-    			switch ($view)
-    			{
-    				case 'list':
-    				case 'index':
-    				case 'listview':
-    					$action = "list";
-					break;
-    				case 'edit':
-    				case 'save':
-		    		case 'popupeditview':
- 		   		case 'editview':
-  		  			$action = "edit";
-					break;
- 		   		case 'view':
- 		   		case 'detail':
- 		   		case 'detailview':
- 		   			$action = "view";
-					break;
- 		   		case 'delete':
- 		   			$action = "delete" ;
-					break;
- 		   		case 'export':
- 		   			$action = "export";
-					break;
- 		   		case 'import':
-  		  			$action = "import";
-					break;
-				default:
-					$action = "";
-					break;
-    			}
-			$in_group = SecurityGroup::groupHasAccess($this->module_dir,$this->id, $action); 
-			// DJM - OBS Customizations - END CHANGE
-    	}
+        // DJM - OBS Customizations - May 2009
+        // Moved this code to convert to lowercase from below.
+        // Added new action variable.
+        $view = strtolower($view);
+        $action = '';
+        // DJM - OBS Customizations - END CHANGE
+        if($in_group === 'not_set')
+        {
+            require_once("modules/SecurityGroups/SecurityGroup.php");
+            // DJM - OBS Customizations - May 2009
+            // Added the following switch statement to convert the view
+            // into an action value.  As per the switch below.
+            // Added the action parameter to the groupHasAccess call.
+                switch ($view)
+                {
+                    case 'list':
+                    case 'index':
+                    case 'listview':
+                        $action = "list";
+                    break;
+                    case 'edit':
+                    case 'save':
+                    case 'popupeditview':
+                    case 'editview':
+                        $action = "edit";
+                    break;
+                    case 'view':
+                    case 'detail':
+                    case 'detailview':
+                        $action = "view";
+                    break;
+                    case 'delete':
+                        $action = "delete" ;
+                    break;
+                    case 'export':
+                        $action = "export";
+                    break;
+                    case 'import':
+                        $action = "import";
+                    break;
+                default:
+                    $action = "";
+                    break;
+                }
+            $in_group = SecurityGroup::groupHasAccess($this->module_dir,$this->id, $action); 
+            // DJM - OBS Customizations - END CHANGE
+        }
         //if we don't implent acls return true
         if(!$this->bean_implements('ACL'))
         return true;
@@ -5511,10 +5511,10 @@ 
             case 'list':
             case 'index':
             case 'listview':
-				/**
+                /**
                 return ACLController::checkAccess($this->module_dir,'list', true);
-				*/
-    			return ACLController::checkAccess($this->module_dir,'list', true, $this->acltype, $in_group);
+                 */
+                return ACLController::checkAccess($this->module_dir,'list', true, $this->acltype, $in_group);
             case 'edit':
             case 'save':
                 if( !$is_owner && $not_set && !empty($this->id)){
@@ -5529,32 +5529,32 @@ 
                 }
             case 'popupeditview':
             case 'editview':
-				/**
+                /**
                 return ACLController::checkAccess($this->module_dir,'edit', $is_owner, $this->acltype);
-				*/
-    			return ACLController::checkAccess($this->module_dir,'edit', $is_owner, $this->acltype, $in_group);
+                 */
+                return ACLController::checkAccess($this->module_dir,'edit', $is_owner, $this->acltype, $in_group);
             case 'view':
             case 'detail':
             case 'detailview':
-				/**
+                /**
                 return ACLController::checkAccess($this->module_dir,'view', $is_owner, $this->acltype);
-				*/
-    			return ACLController::checkAccess($this->module_dir,'view', $is_owner, $this->acltype, $in_group);
+                 */
+                return ACLController::checkAccess($this->module_dir,'view', $is_owner, $this->acltype, $in_group);
             case 'delete':
-				/**
+                /**
                 return ACLController::checkAccess($this->module_dir,'delete', $is_owner, $this->acltype);
-				*/
-    			return ACLController::checkAccess($this->module_dir,'delete', $is_owner, $this->acltype, $in_group);
+                 */
+                return ACLController::checkAccess($this->module_dir,'delete', $is_owner, $this->acltype, $in_group);
             case 'export':
-				/**
+                /**
                 return ACLController::checkAccess($this->module_dir,'export', $is_owner, $this->acltype);
-				*/
-    			return ACLController::checkAccess($this->module_dir,'export', $is_owner, $this->acltype, $in_group);
+                 */
+                return ACLController::checkAccess($this->module_dir,'export', $is_owner, $this->acltype, $in_group);
             case 'import':
-				/**
+                /**
                 return ACLController::checkAccess($this->module_dir,'import', true, $this->acltype);
-				*/
-    			return ACLController::checkAccess($this->module_dir,'import', true, $this->acltype, $in_group);
+                 */
+                return ACLController::checkAccess($this->module_dir,'import', true, $this->acltype, $in_group);
         }
         //if it is not one of the above views then it should be implemented on the page level
         return true;
@@ -5562,10 +5562,10 @@ 
     /* END - SECURITY GROUPS */
 
     /**
-    * Get owner field
-    *
-    * @return STRING
-    */
+     * Get owner field
+     *
+     * @return STRING
+     */
     function getOwnerField($returnFieldName = false)
     {
         if (isset($this->field_defs['assigned_user_id']))
@@ -5582,11 +5582,11 @@ 
     }
 
     /**
-    * Returns true of false if the user_id passed is the owner
-    *
-    * @param GUID $user_id
-    * @return boolean
-    */
+     * Returns true of false if the user_id passed is the owner
+     *
+     * @param GUID $user_id
+     * @return boolean
+     */
     function isOwner($user_id)
     {
         //if we don't have an id we must be the owner as we are creating it
@@ -5615,11 +5615,11 @@ 
         return false;
     }
     /**
-    * Gets there where statement for checking if a user is an owner
-    *
-    * @param GUID $user_id
-    * @return STRING
-    */
+     * Gets there where statement for checking if a user is an owner
+     *
+     * @param GUID $user_id
+     * @return STRING
+     */
     function getOwnerWhere($user_id)
     {
         if(isset($this->field_defs['assigned_user_id']))
@@ -5634,12 +5634,12 @@ 
     }
 
     /**
-    *
-    * Used in order to manage ListView links and if they should
-    * links or not based on the ACL permissions of the user
-    *
-    * @return ARRAY of STRINGS
-    */
+     *
+     * Used in order to manage ListView links and if they should
+     * links or not based on the ACL permissions of the user
+     *
+     * @return ARRAY of STRINGS
+     */
     function listviewACLHelper()
     {
         $array_assign = array();
@@ -5655,10 +5655,10 @@ 
     }
 
     /**
-    * returns this bean as an array
-    *
-    * @return array of fields with id, name, access and category
-    */
+     * returns this bean as an array
+     *
+     * @return array of fields with id, name, access and category
+     */
     function toArray($dbOnly = false, $stringOnly = false, $upperKeys=false)
     {
         static $cache = array();
@@ -5688,10 +5688,10 @@ 
     }
 
     /**
-    * Converts an array into an acl mapping name value pairs into files
-    *
-    * @param Array $arr
-    */
+     * Converts an array into an acl mapping name value pairs into files
+     *
+     * @param Array $arr
+     */
     function fromArray($arr)
     {
         foreach($arr as $name=>$value)
@@ -5709,13 +5709,13 @@ 
     public function convertRow($row)
     {
         foreach($this->field_defs as $name => $fieldDef)
-		{
-		    // skip empty fields and non-db fields
+        {
+            // skip empty fields and non-db fields
             if (isset($name) && !empty($row[$name])) {
                 $row[$name] = $this->convertField($row[$name], $fieldDef);
             }
         }
-		return $row;
+        return $row;
     }
 
     /**
@@ -5763,18 +5763,18 @@ 
         return !empty($GLOBALS['dictionary'][$this->object_name]['custom_fields']);
     }
 
-   /**
-    * Ensure that fields within order by clauses are properly qualified with
-    * their tablename.  This qualification is a requirement for sql server support.
-    *
-    * @param string $order_by original order by from the query
-    * @param string $qualify prefix for columns in the order by list.
-    * @return  prefixed
-    *
-    * Internal function do not override.
-    */
-   function create_qualified_order_by( $order_by, $qualify)
-   {	// if the column is empty, but the sort order is defined, the value will throw an error, so do not proceed if no order by is given
+    /**
+     * Ensure that fields within order by clauses are properly qualified with
+     * their tablename.  This qualification is a requirement for sql server support.
+     *
+     * @param string $order_by original order by from the query
+     * @param string $qualify prefix for columns in the order by list.
+     * @return  prefixed
+     *
+     * Internal function do not override.
+     */
+    function create_qualified_order_by( $order_by, $qualify)
+    {	// if the column is empty, but the sort order is defined, the value will throw an error, so do not proceed if no order by is given
     if (empty($order_by))
     {
         return $order_by;
@@ -5789,17 +5789,17 @@ 
         $comma = ", ";
     }
     return $order_by_clause;
-   }
+    }
 
-   /**
-    * Combined the contents of street field 2 thru 4 into the main field
-    *
-    * @param string $street_field
-    */
+    /**
+     * Combined the contents of street field 2 thru 4 into the main field
+     *
+     * @param string $street_field
+     */
 
-   function add_address_streets(
-       $street_field
-       )
+    function add_address_streets(
+        $street_field
+        )
     {
         if (isset($this->$street_field)) {
             $street_field_2 = $street_field.'_2';
@@ -5853,9 +5853,9 @@ 
     }
 
     /**
-    * Moved from save() method, functionality is the same, but this is intended to handle
-    * Optimistic locking functionality.
-    */
+     * Moved from save() method, functionality is the same, but this is intended to handle
+     * Optimistic locking functionality.
+     */
     private function _checkOptimisticLocking($action, $isUpdate){
         if($this->optimistic_lock && !isset($_SESSION['o_lock_fs'])){
             if(isset($_SESSION['o_lock_id']) && $_SESSION['o_lock_id'] == $this->id && $_SESSION['o_lock_on'] == $this->object_name)
@@ -5894,8 +5894,8 @@ 
     }
 
     /**
-    * Send assignment notifications and invites for meetings and calls
-    */
+     * Send assignment notifications and invites for meetings and calls
+     */
     private function _sendNotifications($check_notify){
         if($check_notify || (isset($this->notify_inworkflow) && $this->notify_inworkflow == true) // cn: bug 5795 - no invites sent to Contacts, and also bug 25995, in workflow, it will set the notify_on_save=true.
            && !$this->isOwner($this->created_by) )  // cn: bug 42727 no need to send email to owner (within workflow)
@@ -5983,11 +5983,11 @@ 
         $result = sugar_cache_retrieve($cache_key);
         if(!empty($result))
         {
-        	// Use SugarCache::EXTERNAL_CACHE_NULL_VALUE to store null values in the cache.
-        	if($result == SugarCache::EXTERNAL_CACHE_NULL_VALUE)
-        	{
-        		return null;
-        	}
+            // Use SugarCache::EXTERNAL_CACHE_NULL_VALUE to store null values in the cache.
+            if($result == SugarCache::EXTERNAL_CACHE_NULL_VALUE)
+            {
+                return null;
+            }
 
             return $result;
         }
@@ -6004,7 +6004,7 @@ 
             if(empty($moduleDefs[$module]) || empty($moduleDefs[$module][$module][$key]))
             {
                 // It was not loaded....  Fail.  Cache null to prevent future repeats of this calculation
-				sugar_cache_put($cache_key, SugarCache::EXTERNAL_CACHE_NULL_VALUE);
+                sugar_cache_put($cache_key, SugarCache::EXTERNAL_CACHE_NULL_VALUE);
                 return  null;
             }
 
@@ -6015,8 +6015,8 @@ 
 
         // It was not loaded....  Fail.  Cache null to prevent future repeats of this calculation
         sugar_cache_put($cache_key, SugarCache::EXTERNAL_CACHE_NULL_VALUE);
-		return null;
-	}
+        return null;
+    }
 
     /**
      * Returns the ACL category for this module; defaults to the SugarBean::$acl_category if defined
@@ -6037,10 +6037,10 @@ 
      * @param string $where
      * @return string SQL query
      */
-	public function create_export_query($order_by, $where)
-	{
-		return $this->create_new_list_query($order_by, $where, array(), array(), 0, '', false, $this, true, true);
-	}
+    public function create_export_query($order_by, $where)
+    {
+        return $this->create_new_list_query($order_by, $where, array(), array(), 0, '', false, $this, true, true);
+    }
 
     /**
      * Determine whether the given field is a relate field

Spacing +836 added lines, -836 removed lines

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

modules/Users/language/en_us.lang.php

Indentation +2 added lines, -2 removed lines

@@ -48,8 +48,8 @@
 $mod_strings = array (
     'LBL_DELETE_USER_CONFIRM'           => 'When the User record is deleted, the corresponding Employee record will also be deleted. After the user is deleted, any workflow definitions and reports involving the user might need to be updated.<br/><br/> Deleting a User record cannot be undone.',
 
-	'LBL_DELETE_GROUP_CONFIRM'          => 'Are you sure you want to delete this Group User? Click OK to delete the User record.<br/>After clicking OK, you will be given the ability to reassign records assigned to the Group User to another user.',
-	'LBL_DELETE_PORTAL_CONFIRM'         => 'Are you sure you want to delete this Portal API User? Click OK to delete the User record.',
+    'LBL_DELETE_GROUP_CONFIRM'          => 'Are you sure you want to delete this Group User? Click OK to delete the User record.<br/>After clicking OK, you will be given the ability to reassign records assigned to the Group User to another user.',
+    'LBL_DELETE_PORTAL_CONFIRM'         => 'Are you sure you want to delete this Portal API User? Click OK to delete the User record.',
 
 
     'LNK_IMPORT_USERS' => 'Import Users',

modules/ACLActions/ACLAction.php

Indentation +185 added lines, -185 removed lines

@@ -39,7 +39,7 @@ 
  ********************************************************************************/
 /* BEGIN - SECURITY GROUPS */
 if(file_exists("modules/ACLActions/actiondefs.override.php")){
-	require_once("modules/ACLActions/actiondefs.override.php");
+    require_once("modules/ACLActions/actiondefs.override.php");
 } else {
 require_once('modules/ACLActions/actiondefs.php');
 }
@@ -55,12 +55,12 @@ 
     }
 
     /**
-    * static addActions($category, $type='module')
-    * Adds all default actions for a category/type
-    *
-    * @param STRING $category - the category (e.g module name - Accounts, Contacts)
-    * @param STRING $type - the type (e.g. 'module', 'field')
-    */
+     * static addActions($category, $type='module')
+     * Adds all default actions for a category/type
+     *
+     * @param STRING $category - the category (e.g module name - Accounts, Contacts)
+     * @param STRING $type - the type (e.g. 'module', 'field')
+     */
     static function addActions($category, $type='module'){
         global $ACLActions;
         $db = DBManagerFactory::getInstance();
@@ -91,12 +91,12 @@ 
     }
 
     /**
-    * static removeActions($category, $type='module')
-    * Removes all default actions for a category/type
-    *
-    * @param STRING $category - the category (e.g module name - Accounts, Contacts)
-    * @param STRING $type - the type (e.g. 'module', 'field')
-    */
+     * static removeActions($category, $type='module')
+     * Removes all default actions for a category/type
+     *
+     * @param STRING $category - the category (e.g module name - Accounts, Contacts)
+     * @param STRING $type - the type (e.g. 'module', 'field')
+     */
     public static function removeActions($category, $type='module'){
         global $ACLActions;
         $db = DBManagerFactory::getInstance();
@@ -118,13 +118,13 @@ 
     }
 
     /**
-    * static AccessColor($access)
-    *
-    * returns the color associated with an access level
-    * these colors exist in the definitions in modules/ACLActions/actiondefs.php
-    * @param INT $access - the access level you want the color for
-    * @return the color either name or hex representation or false if the level does not exist
-    */
+     * static AccessColor($access)
+     *
+     * returns the color associated with an access level
+     * these colors exist in the definitions in modules/ACLActions/actiondefs.php
+     * @param INT $access - the access level you want the color for
+     * @return the color either name or hex representation or false if the level does not exist
+     */
     protected static function AccessColor($access){
         global $ACLActionAccessLevels;
         if(isset($ACLActionAccessLevels[$access])){
@@ -136,13 +136,13 @@ 
     }
 
     /**
-    * static AccessName($access)
-    *
-    * returns the translated name  associated with an access level
-    * these label definitions  exist in the definitions in modules/ACLActions/actiondefs.php
-    * @param INT $access - the access level you want the color for
-    * @return the translated access level name or false if the level does not exist
-    */
+     * static AccessName($access)
+     *
+     * returns the translated name  associated with an access level
+     * these label definitions  exist in the definitions in modules/ACLActions/actiondefs.php
+     * @param INT $access - the access level you want the color for
+     * @return the translated access level name or false if the level does not exist
+     */
     static function AccessName($access){
         global $ACLActionAccessLevels;
         if(isset($ACLActionAccessLevels[$access])){
@@ -172,10 +172,10 @@ 
     }
 
     /**
-    * static getAccessOptions()
-    * this is used for building select boxes
-    * @return array containg access levels (ints) as keys and access names as values
-    */
+     * static getAccessOptions()
+     * this is used for building select boxes
+     * @return array containg access levels (ints) as keys and access names as values
+     */
     protected static function getAccessOptions( $action, $type='module'){
         global $ACLActions;
         $options = array();
@@ -189,11 +189,11 @@ 
     }
 
     /**
-    * function static getDefaultActions()
-    * This function will return a list of acl actions with their default access levels
-    *
-    *
-    */
+     * function static getDefaultActions()
+     * This function will return a list of acl actions with their default access levels
+     *
+     *
+     */
     public static function getDefaultActions($type='module', $action=''){
         $query = "SELECT * FROM acl_actions WHERE deleted=0 ";
         if(!empty($type)){
@@ -217,14 +217,14 @@ 
 
 
     /**
-    * static getUserActions($user_id,$refresh=false, $category='', $action='')
-    * returns a list of user actions
-    * @param GUID $user_id
-    * @param BOOLEAN $refresh
-    * @param STRING $category
-    * @param STRING $action
-    * @return ARRAY of ACLActionsArray
-    */
+     * static getUserActions($user_id,$refresh=false, $category='', $action='')
+     * returns a list of user actions
+     * @param GUID $user_id
+     * @param BOOLEAN $refresh
+     * @param STRING $category
+     * @param STRING $action
+     * @return ARRAY of ACLActionsArray
+     */
 
     static function getUserActions($user_id,$refresh=false, $category='',$type='', $action=''){
         //check in the session if we already have it loaded
@@ -256,15 +256,15 @@ 
         if(!empty($type)){
             $additional_where .= " AND acl_actions.acltype = '$type' ";
         }
-		/* BEGIN - SECURITY GROUPS */ 
-		/**
+        /* BEGIN - SECURITY GROUPS */ 
+        /**
         $query = "SELECT acl_actions .*, acl_roles_actions.access_override
                     FROM acl_actions
                     LEFT JOIN acl_roles_users ON acl_roles_users.user_id = '$user_id' AND  acl_roles_users.deleted = 0
                     LEFT JOIN acl_roles_actions ON acl_roles_actions.role_id = acl_roles_users.role_id AND acl_roles_actions.action_id = acl_actions.id AND acl_roles_actions.deleted=0
                     WHERE acl_actions.deleted=0 $additional_where ORDER BY category,name";
-		*/
-		$query = "(SELECT acl_actions .*, acl_roles_actions.access_override, 1 as user_role
+         */
+        $query = "(SELECT acl_actions .*, acl_roles_actions.access_override, 1 as user_role
 				FROM acl_actions
 				INNER JOIN acl_roles_users ON acl_roles_users.user_id = '$user_id' AND  acl_roles_users.deleted = 0
 				LEFT JOIN acl_roles_actions ON acl_roles_actions.role_id = acl_roles_users.role_id AND acl_roles_actions.action_id = acl_actions.id AND acl_roles_actions.deleted=0
@@ -286,34 +286,34 @@ 
 				WHERE acl_actions.deleted = 0 )
 
 				ORDER BY user_role desc, category,name,access_override desc"; //want non-null to show first
-		 /* END - SECURITY GROUPS */
+            /* END - SECURITY GROUPS */
         $result = $db->query($query);
         $selected_actions = array();
-		/* BEGIN - SECURITY GROUPS */ 
-		global $sugar_config;
-		$has_user_role = false; //used for user_role_precedence
-		$has_role = false; //used to determine if default actions can be ignored. If a user has a defined role don't use the defaults
-		/* END - SECURITY GROUPS */
+        /* BEGIN - SECURITY GROUPS */ 
+        global $sugar_config;
+        $has_user_role = false; //used for user_role_precedence
+        $has_role = false; //used to determine if default actions can be ignored. If a user has a defined role don't use the defaults
+        /* END - SECURITY GROUPS */
         while($row = $db->fetchByAssoc($result, FALSE) ){
-			/* BEGIN - SECURITY GROUPS */ 
-			if($has_user_role == false && $row['user_role'] == 1) {
-				$has_user_role = true;
-			}
-			if($has_role == false && ($row['user_role'] == 1 || $row['user_role'] ==0)) {
-				$has_role = true;
-			}
-			//if user roles should take precedence over group roles and we have a user role 
-			//break when we get to processing the group roles
-			if($has_user_role == true && $row['user_role'] == 0 
-					&& isset($sugar_config['securitysuite_user_role_precedence'])
-					&& $sugar_config['securitysuite_user_role_precedence'] == true ) 
-			{
-				break; 
-			}
-			if($row['user_role'] == -1 && $has_role == true) {
-				break; //no need for default actions when a role is assigned to the user or user's group already
-			}
-			/* END - SECURITY GROUPS */
+            /* BEGIN - SECURITY GROUPS */ 
+            if($has_user_role == false && $row['user_role'] == 1) {
+                $has_user_role = true;
+            }
+            if($has_role == false && ($row['user_role'] == 1 || $row['user_role'] ==0)) {
+                $has_role = true;
+            }
+            //if user roles should take precedence over group roles and we have a user role 
+            //break when we get to processing the group roles
+            if($has_user_role == true && $row['user_role'] == 0 
+                    && isset($sugar_config['securitysuite_user_role_precedence'])
+                    && $sugar_config['securitysuite_user_role_precedence'] == true ) 
+            {
+                break; 
+            }
+            if($row['user_role'] == -1 && $has_role == true) {
+                break; //no need for default actions when a role is assigned to the user or user's group already
+            }
+            /* END - SECURITY GROUPS */
             $acl = new ACLAction();
             $isOverride  = false;
             $acl->populateFromRow($row);
@@ -326,16 +326,16 @@ 
 
             }
             if(!isset($selected_actions[$acl->category][$acl->acltype][$acl->name])
-				|| (
-					/* BEGIN - SECURITY GROUPS - additive security*/
-					(
-						(isset($sugar_config['securitysuite_additive']) && $sugar_config['securitysuite_additive'] == true
-						&& $selected_actions[$acl->category][$acl->acltype][$acl->name]['aclaccess'] < $acl->aclaccess) 
-					||
-						((!isset($sugar_config['securitysuite_additive']) || $sugar_config['securitysuite_additive'] == false)
-						&& $selected_actions[$acl->category][$acl->acltype][$acl->name]['aclaccess'] > $acl->aclaccess) 
-					)
-					/* END - SECURITY GROUPS */
+                || (
+                    /* BEGIN - SECURITY GROUPS - additive security*/
+                    (
+                        (isset($sugar_config['securitysuite_additive']) && $sugar_config['securitysuite_additive'] == true
+                        && $selected_actions[$acl->category][$acl->acltype][$acl->name]['aclaccess'] < $acl->aclaccess) 
+                    ||
+                        ((!isset($sugar_config['securitysuite_additive']) || $sugar_config['securitysuite_additive'] == false)
+                        && $selected_actions[$acl->category][$acl->acltype][$acl->name]['aclaccess'] > $acl->aclaccess) 
+                    )
+                    /* END - SECURITY GROUPS */
                     && $isOverride
                     )
                 ||
@@ -388,70 +388,70 @@ 
     }
     
     /**
-    * (static/ non-static)function hasAccess($is_owner= false , $access = 0)
-    * checks if a user has access to this acl if the user is an owner it will check if owners have access
-    *
-    * This function may either be used statically or not. If used staticlly a user must pass in an access level not equal to zero
-    * @param boolean $is_owner
-    * @param int $access
-    * @return true or false
-    */
-	/* BEGIN - SECURITY GROUPS */
-	/**
+     * (static/ non-static)function hasAccess($is_owner= false , $access = 0)
+     * checks if a user has access to this acl if the user is an owner it will check if owners have access
+     *
+     * This function may either be used statically or not. If used staticlly a user must pass in an access level not equal to zero
+     * @param boolean $is_owner
+     * @param int $access
+     * @return true or false
+     */
+    /* BEGIN - SECURITY GROUPS */
+    /**
     static function hasAccess($is_owner=false, $access = 0){
-	*/
-	static function hasAccess($is_owner=false, $in_group=false, $access = 0, ACLAction $action = null){
-		/**
+     */
+    static function hasAccess($is_owner=false, $in_group=false, $access = 0, ACLAction $action = null){
+        /**
         if($access != 0 && $access == ACL_ALLOW_ALL || ($is_owner && $access == ACL_ALLOW_OWNER))return true;
        //if this exists, then this function is not static, so check the aclaccess parameter
         if(isset($this) && isset($this->aclaccess)){
             if($this->aclaccess == ACL_ALLOW_ALL || ($is_owner && $this->aclaccess == ACL_ALLOW_OWNER))
             return true;
         }
-		*/
-		if($access != 0 && ($access == ACL_ALLOW_ALL 
-			|| ($is_owner && ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP) )  //if owner that's better than in group so count it...better way to clean this up?
-			|| ($in_group && $access == ACL_ALLOW_GROUP) //need to pass if in group with access somehow
-		)) {
-			return true;
-		}
+         */
+        if($access != 0 && ($access == ACL_ALLOW_ALL 
+            || ($is_owner && ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP) )  //if owner that's better than in group so count it...better way to clean this up?
+            || ($in_group && $access == ACL_ALLOW_GROUP) //need to pass if in group with access somehow
+        )) {
+            return true;
+        }
         if(!is_null($action) && isset($action->aclaccess)){
-			if($action->aclaccess == ACL_ALLOW_ALL
-				|| ($is_owner && $action->aclaccess == ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP))
-				|| ($in_group && $access == ACL_ALLOW_GROUP) //need to pass if in group with access somehow
-			) {
-            	return true;
-        	}
-		}
+            if($action->aclaccess == ACL_ALLOW_ALL
+                || ($is_owner && $action->aclaccess == ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP))
+                || ($in_group && $access == ACL_ALLOW_GROUP) //need to pass if in group with access somehow
+            ) {
+                return true;
+            }
+        }
         return false;
     }
-	/* END - SECURITY GROUPS */
-
-	/* BEGIN - SECURITY GROUPS */
-	/**
-	 * STATIC function userNeedsSecurityGroup($user_id, $category, $action,$type='module')
-	 * checks if a user should have ownership to do an action
-	 *
-	 * @param GUID $user_id
-	 * @param STRING $category
-	 * @param STRING $action
-	 * @param STRING $type
-	 * @return boolean
-	 */
-	static function userNeedsSecurityGroup($user_id, $category, $action,$type='module'){
-		//check if we don't have it set in the cache if not lets reload the cache
+    /* END - SECURITY GROUPS */
+
+    /* BEGIN - SECURITY GROUPS */
+    /**
+     * STATIC function userNeedsSecurityGroup($user_id, $category, $action,$type='module')
+     * checks if a user should have ownership to do an action
+     *
+     * @param GUID $user_id
+     * @param STRING $category
+     * @param STRING $action
+     * @param STRING $type
+     * @return boolean
+     */
+    static function userNeedsSecurityGroup($user_id, $category, $action,$type='module'){
+        //check if we don't have it set in the cache if not lets reload the cache
 		
-		if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
-			ACLAction::getUserActions($user_id, false);
+        if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+            ACLAction::getUserActions($user_id, false);
 			
-		}
+        }
 		
-		if(!empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
-			return $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'] == ACL_ALLOW_GROUP;
-		}
+        if(!empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+            return $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'] == ACL_ALLOW_GROUP;
+        }
         return false;
     }
-	/* END - SECURITY GROUPS */	
+    /* END - SECURITY GROUPS */	
 
 
 
@@ -461,20 +461,20 @@ 
 
 
     /**
-    * static function userHasAccess($user_id, $category, $action, $is_owner = false)
-    *
-    * @param GUID $user_id the user id who you want to check access for
-    * @param STRING $category the category you would like to check access for
-    * @param STRING $action the action of that category you would like to check access for
-    * @param BOOLEAN OPTIONAL $is_owner if the object is owned by the user you are checking access for
-    */
-	/* BEGIN - SECURITY GROUPS - added $in_group */
-	/**
+     * static function userHasAccess($user_id, $category, $action, $is_owner = false)
+     *
+     * @param GUID $user_id the user id who you want to check access for
+     * @param STRING $category the category you would like to check access for
+     * @param STRING $action the action of that category you would like to check access for
+     * @param BOOLEAN OPTIONAL $is_owner if the object is owned by the user you are checking access for
+     */
+    /* BEGIN - SECURITY GROUPS - added $in_group */
+    /**
     public static function userHasAccess($user_id, $category, $action,$type='module', $is_owner = false){
-	*/
-	public static function userHasAccess($user_id, $category, $action,$type='module', $is_owner = false, $in_group = false){
-       global $current_user;
-       if($current_user->isAdminForModule($category)&& !isset($_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'])){
+     */
+    public static function userHasAccess($user_id, $category, $action,$type='module', $is_owner = false, $in_group = false){
+        global $current_user;
+        if($current_user->isAdminForModule($category)&& !isset($_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'])){
         return true;
         }
         //check if we don't have it set in the cache if not lets reload the cache
@@ -488,22 +488,22 @@ 
 /**
             return ACLAction::hasAccess($is_owner, $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess']);
 */
-			return ACLAction::hasAccess($is_owner, $in_group, $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess']);
+            return ACLAction::hasAccess($is_owner, $in_group, $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess']);
         }
         return false;
 
     }
-	/* END - SECURITY GROUPS */
+    /* END - SECURITY GROUPS */
     /**
-    * function getUserAccessLevel($user_id, $category, $action,$type='module')
-    * returns the access level for a given category and action
-    *
-    * @param GUID  $user_id
-    * @param STRING $category
-    * @param STRING $action
-    * @param STRING $type
-    * @return INT (ACCESS LEVEL)
-    */
+     * function getUserAccessLevel($user_id, $category, $action,$type='module')
+     * returns the access level for a given category and action
+     *
+     * @param GUID  $user_id
+     * @param STRING $category
+     * @param STRING $action
+     * @param STRING $type
+     * @return INT (ACCESS LEVEL)
+     */
     public static function getUserAccessLevel($user_id, $category, $action,$type='module'){
         if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
             ACLAction::getUserActions($user_id, false);
@@ -520,15 +520,15 @@ 
     }
 
     /**
-    * STATIC function userNeedsOwnership($user_id, $category, $action,$type='module')
-    * checks if a user should have ownership to do an action
-    *
-    * @param GUID $user_id
-    * @param STRING $category
-    * @param STRING $action
-    * @param STRING $type
-    * @return boolean
-    */
+     * STATIC function userNeedsOwnership($user_id, $category, $action,$type='module')
+     * checks if a user should have ownership to do an action
+     *
+     * @param GUID $user_id
+     * @param STRING $category
+     * @param STRING $action
+     * @param STRING $type
+     * @return boolean
+     */
     public static function userNeedsOwnership($user_id, $category, $action,$type='module'){
         //check if we don't have it set in the cache if not lets reload the cache
 
@@ -545,12 +545,12 @@ 
 
     }
     /**
-    *
-    * static pass by ref setupCategoriesMatrix(&$categories)
-    * takes in an array of categories and modifes them adding display information
-    *
-    * @param unknown_type $categories
-    */
+     *
+     * static pass by ref setupCategoriesMatrix(&$categories)
+     * takes in an array of categories and modifes them adding display information
+     *
+     * @param unknown_type $categories
+     */
     public static function setupCategoriesMatrix(&$categories){
         global $ACLActions, $current_user;
         $names = array();
@@ -593,11 +593,11 @@ 
 
 
     /**
-    * function toArray()
-    * returns this acl as an array
-    *
-    * @return array of fields with id, name, access and category
-    */
+     * function toArray()
+     * returns this acl as an array
+     *
+     * @return array of fields with id, name, access and category
+     */
     function toArray($dbOnly = false, $stringOnly = false, $upperKeys = false){
         $array_fields = array('id', 'aclaccess');
         $arr = array();
@@ -608,11 +608,11 @@ 
     }
 
     /**
-    * function fromArray($arr)
-    * converts an array into an acl mapping name value pairs into files
-    *
-    * @param Array $arr
-    */
+     * function fromArray($arr)
+     * converts an array into an acl mapping name value pairs into files
+     *
+     * @param Array $arr
+     */
     function fromArray($arr){
         foreach($arr as $name=>$value){
             $this->$name = $value;
@@ -620,10 +620,10 @@ 
     }
 
     /**
-    * function clearSessionCache()
-    * clears the session variable storing the cache information for acls
-    *
-    */
+     * function clearSessionCache()
+     * clears the session variable storing the cache information for acls
+     *
+     */
     function clearSessionCache(){
         unset($_SESSION['ACL']);
     }

Spacing +96 added lines, -96 removed lines

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

modules/AOS_Products_Quotes/Line_Items.php

Spacing +38 added lines, -38 removed lines

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

modules/AOS_Products_Quotes/AOS_Products_Quotes.php

Spacing +8 added lines, -8 removed lines

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