adamjakab / SuiteCRM

include/generic/SugarWidgets/SugarWidgetFielddouble.php

Indentation +3 added lines, -3 removed lines

@@ -42,9 +42,9 @@
 
 class SugarWidgetFieldDouble extends SugarWidgetFieldInt
 {
-	function SugarWidgetFieldDouble(&$layout_manager) {
-		parent::SugarWidgetFieldInt($layout_manager);
-	}	
+    function SugarWidgetFieldDouble(&$layout_manager) {
+        parent::SugarWidgetFieldInt($layout_manager);
+    }	
 }
 
 ?>

Spacing +1 added lines, -1 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.

Braces +3 added lines, -1 removed lines

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

include/generic/SugarWidgets/SugarWidgetSubPanelRemoveButtonProjects.php

Indentation +66 added lines, -66 removed lines

@@ -45,83 +45,83 @@
 
 class SugarWidgetSubPanelRemoveButtonProjects extends SugarWidgetField
 {
-	function displayHeaderCell(&$layout_def)
-	{
-		return ' ';
-	}
+    function displayHeaderCell(&$layout_def)
+    {
+        return ' ';
+    }
 
-	function displayList(&$layout_def)
-	{
-		global $app_strings;
+    function displayList(&$layout_def)
+    {
+        global $app_strings;
 		
-		global $current_user;
+        global $current_user;
 		
-		$parent_record_id = $_REQUEST['record'];
-		$parent_module = $_REQUEST['module'];
+        $parent_record_id = $_REQUEST['record'];
+        $parent_module = $_REQUEST['module'];
 
-		if ($layout_def['module'] == 'Holidays'){
-			$action = 'DeleteHolidayRelationship';
-		}
-		else if ($layout_def['module'] == 'Users' || $layout_def['module'] == 'Contacts'){
-			$action = 'DeleteResourceRelationship';
-		}
-		else{
-			$action = 'DeleteRelationship';
-		}
+        if ($layout_def['module'] == 'Holidays'){
+            $action = 'DeleteHolidayRelationship';
+        }
+        else if ($layout_def['module'] == 'Users' || $layout_def['module'] == 'Contacts'){
+            $action = 'DeleteResourceRelationship';
+        }
+        else{
+            $action = 'DeleteRelationship';
+        }
 
-		$record = $layout_def['fields']['ID'];
-		$current_module=$layout_def['module'];	
-		$hideremove=false;			
+        $record = $layout_def['fields']['ID'];
+        $current_module=$layout_def['module'];	
+        $hideremove=false;			
 		
-		$return_module = $_REQUEST['module'];
-		$return_action = 'SubPanelViewer';
-		$subpanel = $layout_def['subpanel_id'];
-		$return_id = $_REQUEST['record'];
+        $return_module = $_REQUEST['module'];
+        $return_action = 'SubPanelViewer';
+        $subpanel = $layout_def['subpanel_id'];
+        $return_id = $_REQUEST['record'];
 		
 		
-		$focus = new Project();
+        $focus = new Project();
 		
-		$focus->retrieve($return_id);
+        $focus->retrieve($return_id);
 		
-		if ($current_user->id == $focus->assigned_user_id || is_admin($current_user)){
-			$is_owner = true;
-		}
-		else{
-			$is_owner = false;
-		}
+        if ($current_user->id == $focus->assigned_user_id || is_admin($current_user)){
+            $is_owner = true;
+        }
+        else{
+            $is_owner = false;
+        }
 				
-		if (isset($layout_def['linked_field_set']) && !empty($layout_def['linked_field_set'])) {
-			$linked_field= $layout_def['linked_field_set'] ;
-		} else {
-			$linked_field = $layout_def['linked_field'];
-		}
-		$refresh_page = 0;
-		if(!empty($layout_def['refresh_page'])){
-			$refresh_page = 1;
-		}
-		$return_url = "index.php?module=$return_module&action=$return_action&subpanel=$subpanel&record=$return_id&sugar_body_only=1&inline=1";
+        if (isset($layout_def['linked_field_set']) && !empty($layout_def['linked_field_set'])) {
+            $linked_field= $layout_def['linked_field_set'] ;
+        } else {
+            $linked_field = $layout_def['linked_field'];
+        }
+        $refresh_page = 0;
+        if(!empty($layout_def['refresh_page'])){
+            $refresh_page = 1;
+        }
+        $return_url = "index.php?module=$return_module&action=$return_action&subpanel=$subpanel&record=$return_id&sugar_body_only=1&inline=1";
 
-		$icon_remove_text = strtolower($app_strings['LBL_ID_FF_REMOVE']);
-		$icon_remove_html = SugarThemeRegistry::current()->getImage( 'delete_inline', 'align="absmiddle" border="0"',null,null,'.gif','');//setting alt to blank on purpose on subpanels for 508
-		$remove_url = $layout_def['start_link_wrapper']
-			. "index.php?module=$parent_module"
-			. "&action=$action"
-			. "&record=$parent_record_id"
-			. "&linked_field=$linked_field"
-			. "&linked_id=$record"
-			. "&return_url=" . urlencode(urlencode($return_url))
-			. "&refresh_page=1"
-			. $layout_def['end_link_wrapper'];
-		$remove_confirmation_text = $app_strings['NTC_REMOVE_CONFIRMATION'];
-		//based on listview since that lets you select records
-		if($layout_def['ListView'] && !$hideremove && $is_owner) {
-			return '<a href="' . $remove_url . '"'
-			. ' class="listViewTdToolsS1"'
-			. " onclick=\"return confirm('$remove_confirmation_text');\""
-			. ">$icon_remove_html&nbsp;$icon_remove_text</a>";
-		}else{
-			return '';
-		}
-	}
+        $icon_remove_text = strtolower($app_strings['LBL_ID_FF_REMOVE']);
+        $icon_remove_html = SugarThemeRegistry::current()->getImage( 'delete_inline', 'align="absmiddle" border="0"',null,null,'.gif','');//setting alt to blank on purpose on subpanels for 508
+        $remove_url = $layout_def['start_link_wrapper']
+            . "index.php?module=$parent_module"
+            . "&action=$action"
+            . "&record=$parent_record_id"
+            . "&linked_field=$linked_field"
+            . "&linked_id=$record"
+            . "&return_url=" . urlencode(urlencode($return_url))
+            . "&refresh_page=1"
+            . $layout_def['end_link_wrapper'];
+        $remove_confirmation_text = $app_strings['NTC_REMOVE_CONFIRMATION'];
+        //based on listview since that lets you select records
+        if($layout_def['ListView'] && !$hideremove && $is_owner) {
+            return '<a href="' . $remove_url . '"'
+            . ' class="listViewTdToolsS1"'
+            . " onclick=\"return confirm('$remove_confirmation_text');\""
+            . ">$icon_remove_html&nbsp;$icon_remove_text</a>";
+        }else{
+            return '';
+        }
+    }
 }
 ?>
\ No newline at end of file

Spacing +15 added lines, -15 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.
@@ -59,19 +59,19 @@ 
 		$parent_record_id = $_REQUEST['record'];
 		$parent_module = $_REQUEST['module'];
 
-		if ($layout_def['module'] == 'Holidays'){
+		if ($layout_def['module'] == 'Holidays') {
 			$action = 'DeleteHolidayRelationship';
 		}
-		else if ($layout_def['module'] == 'Users' || $layout_def['module'] == 'Contacts'){
+		else if ($layout_def['module'] == 'Users' || $layout_def['module'] == 'Contacts') {
 			$action = 'DeleteResourceRelationship';
 		}
-		else{
+		else {
 			$action = 'DeleteRelationship';
 		}
 
 		$record = $layout_def['fields']['ID'];
-		$current_module=$layout_def['module'];	
-		$hideremove=false;			
+		$current_module = $layout_def['module'];	
+		$hideremove = false;			
 		
 		$return_module = $_REQUEST['module'];
 		$return_action = 'SubPanelViewer';
@@ -83,43 +83,43 @@ 
 		
 		$focus->retrieve($return_id);
 		
-		if ($current_user->id == $focus->assigned_user_id || is_admin($current_user)){
+		if ($current_user->id == $focus->assigned_user_id || is_admin($current_user)) {
 			$is_owner = true;
 		}
-		else{
+		else {
 			$is_owner = false;
 		}
 				
 		if (isset($layout_def['linked_field_set']) && !empty($layout_def['linked_field_set'])) {
-			$linked_field= $layout_def['linked_field_set'] ;
+			$linked_field = $layout_def['linked_field_set'];
 		} else {
 			$linked_field = $layout_def['linked_field'];
 		}
 		$refresh_page = 0;
-		if(!empty($layout_def['refresh_page'])){
+		if (!empty($layout_def['refresh_page'])) {
 			$refresh_page = 1;
 		}
 		$return_url = "index.php?module=$return_module&action=$return_action&subpanel=$subpanel&record=$return_id&sugar_body_only=1&inline=1";
 
 		$icon_remove_text = strtolower($app_strings['LBL_ID_FF_REMOVE']);
-		$icon_remove_html = SugarThemeRegistry::current()->getImage( 'delete_inline', 'align="absmiddle" border="0"',null,null,'.gif','');//setting alt to blank on purpose on subpanels for 508
+		$icon_remove_html = SugarThemeRegistry::current()->getImage('delete_inline', 'align="absmiddle" border="0"', null, null, '.gif', ''); //setting alt to blank on purpose on subpanels for 508
 		$remove_url = $layout_def['start_link_wrapper']
 			. "index.php?module=$parent_module"
 			. "&action=$action"
 			. "&record=$parent_record_id"
 			. "&linked_field=$linked_field"
 			. "&linked_id=$record"
-			. "&return_url=" . urlencode(urlencode($return_url))
+			. "&return_url=".urlencode(urlencode($return_url))
 			. "&refresh_page=1"
 			. $layout_def['end_link_wrapper'];
 		$remove_confirmation_text = $app_strings['NTC_REMOVE_CONFIRMATION'];
 		//based on listview since that lets you select records
-		if($layout_def['ListView'] && !$hideremove && $is_owner) {
-			return '<a href="' . $remove_url . '"'
+		if ($layout_def['ListView'] && !$hideremove && $is_owner) {
+			return '<a href="'.$remove_url.'"'
 			. ' class="listViewTdToolsS1"'
 			. " onclick=\"return confirm('$remove_confirmation_text');\""
 			. ">$icon_remove_html&nbsp;$icon_remove_text</a>";
-		}else{
+		} else {
 			return '';
 		}
 	}

Braces +7 added lines, -8 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -61,11 +63,9 @@ 
 
 		if ($layout_def['module'] == 'Holidays'){
 			$action = 'DeleteHolidayRelationship';
-		}
-		else if ($layout_def['module'] == 'Users' || $layout_def['module'] == 'Contacts'){
+		} else if ($layout_def['module'] == 'Users' || $layout_def['module'] == 'Contacts'){
 			$action = 'DeleteResourceRelationship';
-		}
-		else{
+		} else{
 			$action = 'DeleteRelationship';
 		}
 
@@ -85,8 +85,7 @@ 
 		
 		if ($current_user->id == $focus->assigned_user_id || is_admin($current_user)){
 			$is_owner = true;
-		}
-		else{
+		} else{
 			$is_owner = false;
 		}
 				
@@ -119,7 +118,7 @@ 
 			. ' class="listViewTdToolsS1"'
 			. " onclick=\"return confirm('$remove_confirmation_text');\""
 			. ">$icon_remove_html&nbsp;$icon_remove_text</a>";
-		}else{
+		} else{
 			return '';
 		}
 	}

include/generic/SugarWidgets/SugarWidgetFieldmultienum.php

Indentation +60 added lines, -60 removed lines

@@ -41,26 +41,26 @@ 
 
 
 class SugarWidgetFieldMultiEnum extends SugarWidgetFieldEnum {
-	public function queryFilternot_one_of(&$layout_def) {
-		$arr = array ();
-		foreach ($layout_def['input_name0'] as $value) {
-			array_push($arr, "'".$GLOBALS['db']->quote($value)."'");
-		}
-	    $reporter = $this->layout_manager->getAttribute("reporter");
+    public function queryFilternot_one_of(&$layout_def) {
+        $arr = array ();
+        foreach ($layout_def['input_name0'] as $value) {
+            array_push($arr, "'".$GLOBALS['db']->quote($value)."'");
+        }
+        $reporter = $this->layout_manager->getAttribute("reporter");
 
-    	$col_name = $this->_get_column_select($layout_def) . " NOT LIKE " ;
-    	$arr_count = count($arr);
-    	$query = "";
-    	foreach($arr as $key=>$val) {
-    		$query .= $col_name;
-			$value = preg_replace("/^'/", "'%", $val, 1);
-			$value = preg_replace("/'$/", "%'", $value, 1);
-			$query .= $value;
-			if ($key != ($arr_count - 1))
-    			$query.= " OR " ;	
-    	}
-		return '('.$query.')';        
-	}
+        $col_name = $this->_get_column_select($layout_def) . " NOT LIKE " ;
+        $arr_count = count($arr);
+        $query = "";
+        foreach($arr as $key=>$val) {
+            $query .= $col_name;
+            $value = preg_replace("/^'/", "'%", $val, 1);
+            $value = preg_replace("/'$/", "%'", $value, 1);
+            $query .= $value;
+            if ($key != ($arr_count - 1))
+                $query.= " OR " ;	
+        }
+        return '('.$query.')';        
+    }
         
     public function queryFilterone_of(&$layout_def) {
         //Fix for inaccurate filtering of contacts in Contacts dashlet on multiselects.
@@ -72,47 +72,47 @@ 
                 array_push($arr, "'^^'");
             }
         }
-	    $reporter = $this->layout_manager->getAttribute("reporter");
+        $reporter = $this->layout_manager->getAttribute("reporter");
 
-    	$col_name = $this->_get_column_select($layout_def) . " LIKE " ;
-    	$arr_count = count($arr);
-    	$query = "";
-    	foreach($arr as $key=>$val) {
-    		$query .= $col_name;
-			$value = preg_replace("/^'/", "'%", $val, 1);
-			$value = preg_replace("/'$/", "%'", $value, 1);
-			$query .= $value;
-			if ($key != ($arr_count - 1))
-    			$query.= " OR " ;	
-    	}
-		return '('.$query.')';        
-	}
+        $col_name = $this->_get_column_select($layout_def) . " LIKE " ;
+        $arr_count = count($arr);
+        $query = "";
+        foreach($arr as $key=>$val) {
+            $query .= $col_name;
+            $value = preg_replace("/^'/", "'%", $val, 1);
+            $value = preg_replace("/'$/", "%'", $value, 1);
+            $query .= $value;
+            if ($key != ($arr_count - 1))
+                $query.= " OR " ;	
+        }
+        return '('.$query.')';        
+    }
 
-	public function queryFilteris($layout_def) {
-		$input_name0 = $layout_def['input_name0'];
-		if (is_array($layout_def['input_name0'])) {
-			$input_name0 = $layout_def['input_name0'][0];
-		}
+    public function queryFilteris($layout_def) {
+        $input_name0 = $layout_def['input_name0'];
+        if (is_array($layout_def['input_name0'])) {
+            $input_name0 = $layout_def['input_name0'][0];
+        }
 
-		// Bug 40022
-		// IS filter doesn't add the carets (^) to multienum custom field values  
-		$input_name0 = $this->encodeMultienumCustom($layout_def, $input_name0);
+        // Bug 40022
+        // IS filter doesn't add the carets (^) to multienum custom field values  
+        $input_name0 = $this->encodeMultienumCustom($layout_def, $input_name0);
 		
-		return $this->_get_column_select($layout_def)." = ".$this->reporter->db->quoted($input_name0)."\n";
-	}
+        return $this->_get_column_select($layout_def)." = ".$this->reporter->db->quoted($input_name0)."\n";
+    }
 
-	public function queryFilteris_not($layout_def) {
-		$input_name0 = $layout_def['input_name0'];
-		if (is_array($layout_def['input_name0'])) {
-			$input_name0 = $layout_def['input_name0'][0];
-		}
+    public function queryFilteris_not($layout_def) {
+        $input_name0 = $layout_def['input_name0'];
+        if (is_array($layout_def['input_name0'])) {
+            $input_name0 = $layout_def['input_name0'][0];
+        }
 
-		// Bug 50549
-		// IS NOT filter doesn't add the carets (^) to multienum custom field values  
-		$input_name0 = $this->encodeMultienumCustom($layout_def, $input_name0);
+        // Bug 50549
+        // IS NOT filter doesn't add the carets (^) to multienum custom field values  
+        $input_name0 = $this->encodeMultienumCustom($layout_def, $input_name0);
 		
-		return $this->_get_column_select($layout_def)." <> ".$this->reporter->db->quoted($input_name0)."\n";
-	}
+        return $this->_get_column_select($layout_def)." <> ".$this->reporter->db->quoted($input_name0)."\n";
+    }
 	
     /**
      * Returns an OrderBy query for multi-select. We treat multi-select the same as a normal field because
@@ -131,13 +131,13 @@ 
      * @return string
      */
     private function encodeMultienumCustom($layout_def, $value) {
-    	$field_def = $this->reporter->getFieldDefFromLayoutDef($layout_def);
-    	// Check if it is a custom field
-		if (!empty($field_def['source']) && ($field_def['source'] == 'custom_fields' || ($field_def['source'] == 'non-db' && !empty($field_def['ext2']) && !empty($field_def['id']))) && !empty($field_def['real_table']))
-		{
-			$value = encodeMultienumValue(array($value)); 
-		}
-		return $value;
+        $field_def = $this->reporter->getFieldDefFromLayoutDef($layout_def);
+        // Check if it is a custom field
+        if (!empty($field_def['source']) && ($field_def['source'] == 'custom_fields' || ($field_def['source'] == 'non-db' && !empty($field_def['ext2']) && !empty($field_def['id']))) && !empty($field_def['real_table']))
+        {
+            $value = encodeMultienumValue(array($value)); 
+        }
+        return $value;
     }
 }
 ?>

Spacing +10 added lines, -10 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.
@@ -42,22 +42,22 @@ 
 
 class SugarWidgetFieldMultiEnum extends SugarWidgetFieldEnum {
 	public function queryFilternot_one_of(&$layout_def) {
-		$arr = array ();
+		$arr = array();
 		foreach ($layout_def['input_name0'] as $value) {
 			array_push($arr, "'".$GLOBALS['db']->quote($value)."'");
 		}
 	    $reporter = $this->layout_manager->getAttribute("reporter");
 
-    	$col_name = $this->_get_column_select($layout_def) . " NOT LIKE " ;
+    	$col_name = $this->_get_column_select($layout_def)." NOT LIKE ";
     	$arr_count = count($arr);
     	$query = "";
-    	foreach($arr as $key=>$val) {
+    	foreach ($arr as $key=>$val) {
     		$query .= $col_name;
 			$value = preg_replace("/^'/", "'%", $val, 1);
 			$value = preg_replace("/'$/", "%'", $value, 1);
 			$query .= $value;
 			if ($key != ($arr_count - 1))
-    			$query.= " OR " ;	
+    			$query .= " OR ";	
     	}
 		return '('.$query.')';        
 	}
@@ -66,24 +66,24 @@ 
         //Fix for inaccurate filtering of contacts in Contacts dashlet on multiselects.
         $arr = array();
         foreach ($layout_def['input_name0'] as $value) {
-            if($value != ""){
+            if ($value != "") {
                 array_push($arr, "'".$GLOBALS['db']->quote($value)."'");
-            }else{
+            } else {
                 array_push($arr, "'^^'");
             }
         }
 	    $reporter = $this->layout_manager->getAttribute("reporter");
 
-    	$col_name = $this->_get_column_select($layout_def) . " LIKE " ;
+    	$col_name = $this->_get_column_select($layout_def)." LIKE ";
     	$arr_count = count($arr);
     	$query = "";
-    	foreach($arr as $key=>$val) {
+    	foreach ($arr as $key=>$val) {
     		$query .= $col_name;
 			$value = preg_replace("/^'/", "'%", $val, 1);
 			$value = preg_replace("/'$/", "%'", $value, 1);
 			$query .= $value;
 			if ($key != ($arr_count - 1))
-    			$query.= " OR " ;	
+    			$query .= " OR ";	
     	}
 		return '('.$query.')';        
 	}

Braces +10 added lines, -6 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -56,8 +58,9 @@ 
 			$value = preg_replace("/^'/", "'%", $val, 1);
 			$value = preg_replace("/'$/", "%'", $value, 1);
 			$query .= $value;
-			if ($key != ($arr_count - 1))
-    			$query.= " OR " ;	
+			if ($key != ($arr_count - 1)) {
+			    			$query.= " OR " ;
+			}
     	}
 		return '('.$query.')';        
 	}
@@ -68,7 +71,7 @@ 
         foreach ($layout_def['input_name0'] as $value) {
             if($value != ""){
                 array_push($arr, "'".$GLOBALS['db']->quote($value)."'");
-            }else{
+            } else{
                 array_push($arr, "'^^'");
             }
         }
@@ -82,8 +85,9 @@ 
 			$value = preg_replace("/^'/", "'%", $val, 1);
 			$value = preg_replace("/'$/", "%'", $value, 1);
 			$query .= $value;
-			if ($key != ($arr_count - 1))
-    			$query.= " OR " ;	
+			if ($key != ($arr_count - 1)) {
+			    			$query.= " OR " ;
+			}
     	}
 		return '('.$query.')';        
 	}

include/generic/SugarWidgets/SugarWidgetFieldvarchar.php

Indentation +35 added lines, -35 removed lines

@@ -41,53 +41,53 @@
 
 class SugarWidgetFieldVarchar extends SugarWidgetReportField
 {
- function SugarWidgetFieldVarchar(&$layout_manager) 
- {
+    function SugarWidgetFieldVarchar(&$layout_manager) 
+    {
         parent::SugarWidgetReportField($layout_manager);
- }
+    }
  
- function queryFilterEquals(&$layout_def)
- {
-		return $this->_get_column_select($layout_def)."='".$GLOBALS['db']->quote($layout_def['input_name0'])."'\n";
- }
+    function queryFilterEquals(&$layout_def)
+    {
+        return $this->_get_column_select($layout_def)."='".$GLOBALS['db']->quote($layout_def['input_name0'])."'\n";
+    }
 
- function queryFilterNot_Equals_Str(&$layout_def)
- {
-		return $this->_get_column_select($layout_def)."!='".$GLOBALS['db']->quote($layout_def['input_name0'])."'\n";
- }
+    function queryFilterNot_Equals_Str(&$layout_def)
+    {
+        return $this->_get_column_select($layout_def)."!='".$GLOBALS['db']->quote($layout_def['input_name0'])."'\n";
+    }
 
- function queryFilterContains(&$layout_def)
- {
-		return $this->_get_column_select($layout_def)." LIKE '%".$GLOBALS['db']->quote($layout_def['input_name0'])."%'\n";
- }
-  function queryFilterdoes_not_contain(&$layout_def)
- {
-		return $this->_get_column_select($layout_def)." NOT LIKE '%".$GLOBALS['db']->quote($layout_def['input_name0'])."%'\n";
- }
+    function queryFilterContains(&$layout_def)
+    {
+        return $this->_get_column_select($layout_def)." LIKE '%".$GLOBALS['db']->quote($layout_def['input_name0'])."%'\n";
+    }
+    function queryFilterdoes_not_contain(&$layout_def)
+    {
+        return $this->_get_column_select($layout_def)." NOT LIKE '%".$GLOBALS['db']->quote($layout_def['input_name0'])."%'\n";
+    }
 
- function queryFilterStarts_With(&$layout_def)
- {
-		return $this->_get_column_select($layout_def)." LIKE '".$GLOBALS['db']->quote($layout_def['input_name0'])."%'\n";
- }
+    function queryFilterStarts_With(&$layout_def)
+    {
+        return $this->_get_column_select($layout_def)." LIKE '".$GLOBALS['db']->quote($layout_def['input_name0'])."%'\n";
+    }
 
- function queryFilterEnds_With(&$layout_def)
- {
-		return $this->_get_column_select($layout_def)." LIKE '%".$GLOBALS['db']->quote($layout_def['input_name0'])."'\n";
- }
+    function queryFilterEnds_With(&$layout_def)
+    {
+        return $this->_get_column_select($layout_def)." LIKE '%".$GLOBALS['db']->quote($layout_def['input_name0'])."'\n";
+    }
  
- function queryFilterone_of(&$layout_def)
- {
+    function queryFilterone_of(&$layout_def)
+    {
     foreach($layout_def['input_name0'] as $key => $value) {
         $layout_def['input_name0'][$key] = $GLOBALS['db']->quote($value); 
     }
     return $this->_get_column_select($layout_def) . " IN ('" . implode("','", $layout_def['input_name0']) . "')\n";
- }
+    }
   
- function displayInput(&$layout_def) 
- {
- 		$str = '<input type="text" size="20" value="' . $layout_def['input_name0'] . '" name="' . $layout_def['name'] . '">';
- 		return $str;
- }
+    function displayInput(&$layout_def) 
+    {
+            $str = '<input type="text" size="20" value="' . $layout_def['input_name0'] . '" name="' . $layout_def['name'] . '">';
+            return $str;
+    }
 }
 
 ?>

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -77,15 +77,15 @@ 
  
  function queryFilterone_of(&$layout_def)
  {
-    foreach($layout_def['input_name0'] as $key => $value) {
+    foreach ($layout_def['input_name0'] as $key => $value) {
         $layout_def['input_name0'][$key] = $GLOBALS['db']->quote($value); 
     }
-    return $this->_get_column_select($layout_def) . " IN ('" . implode("','", $layout_def['input_name0']) . "')\n";
+    return $this->_get_column_select($layout_def)." IN ('".implode("','", $layout_def['input_name0'])."')\n";
  }
   
  function displayInput(&$layout_def) 
  {
- 		$str = '<input type="text" size="20" value="' . $layout_def['input_name0'] . '" name="' . $layout_def['name'] . '">';
+ 		$str = '<input type="text" size="20" value="'.$layout_def['input_name0'].'" name="'.$layout_def['name'].'">';
  		return $str;
  }
 }

Braces +3 added lines, -1 removed lines

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

include/generic/SugarWidgets/SugarWidgetFielddate.php

Indentation +14 added lines, -14 removed lines

@@ -54,7 +54,7 @@ 
             }
         }
         $content = $this->displayListPlain($layout_def);
-		return $content;
+        return $content;
     }
 
     function queryFilterBefore($layout_def)
@@ -88,26 +88,26 @@ 
             $this->queryDateOp($column, $end, "<=", "date").")\n";
     }
 
-	function queryFilterTP_yesterday($layout_def)
-	{
-		global $timedate;
+    function queryFilterTP_yesterday($layout_def)
+    {
+        global $timedate;
         $layout_def['input_name0'] = $timedate->asDbDate($timedate->getNow(true)->get("-1 day"));
         return $this->queryFilterOn($layout_def);
-	}
+    }
 
-	function queryFilterTP_today($layout_def)
-	{
-		global $timedate;
+    function queryFilterTP_today($layout_def)
+    {
+        global $timedate;
         $layout_def['input_name0'] = $timedate->asDbDate($timedate->getNow(true));
         return $this->queryFilterOn($layout_def);
-	}
+    }
 
-	function queryFilterTP_tomorrow(& $layout_def)
-	{
-		global $timedate;
-		$layout_def['input_name0'] = $timedate->asDbDate($timedate->getNow(true)->get("+1 day"));
+    function queryFilterTP_tomorrow(& $layout_def)
+    {
+        global $timedate;
+        $layout_def['input_name0'] = $timedate->asDbDate($timedate->getNow(true)->get("+1 day"));
         return $this->queryFilterOn($layout_def);
-	}
+    }
 
     protected function queryMonth($layout_def, $month)
     {

Spacing +3 added lines, -3 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.
@@ -46,9 +46,9 @@ 
     {
         global $timedate;
         // i guess qualifier and column_function are the same..
-        if (! empty($layout_def['column_function'])) {
+        if (!empty($layout_def['column_function'])) {
             $func_name = 'displayList'.$layout_def['column_function'];
-            if ( method_exists($this,$func_name)) {
+            if (method_exists($this, $func_name)) {
                 $display = $this->$func_name($layout_def);
                 return $display;
             }

Braces +3 added lines, -1 removed lines

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

include/generic/SugarWidgets/SugarWidget.php

Indentation +38 added lines, -38 removed lines

@@ -49,37 +49,37 @@ 
  */
 class SugarWidget
 {
-	var $layout_manager = null;
-	var $widget_id;
+    var $layout_manager = null;
+    var $widget_id;
     protected $form_value;
     protected $parent_bean;
 
-	function SugarWidget(&$layout_manager)
-	{
-		$this->layout_manager = $layout_manager;
-	}
-	function display($layout_def)
-	{
-		return 'display class undefined';
-	}
+    function SugarWidget(&$layout_manager)
+    {
+        $this->layout_manager = $layout_manager;
+    }
+    function display($layout_def)
+    {
+        return 'display class undefined';
+    }
 
-	/**
-	 * getSubpanelWidgetId
-	 * This is a utility function to return a widget's unique id
-	 * @return id String label of the widget's unique id
-	 */
-	public function getWidgetId() {
-	   return $this->widget_id;
-	}
+    /**
+     * getSubpanelWidgetId
+     * This is a utility function to return a widget's unique id
+     * @return id String label of the widget's unique id
+     */
+    public function getWidgetId() {
+        return $this->widget_id;
+    }
 
-	/**
-	 * setSubpanelWidgetId
-	 * This is a utility function to set the id for a widget
-	 * @param id String value to set the widget's unique id
-	 */
-	public function setWidgetId($id='') {
-		$this->widget_id = $id;
-	}
+    /**
+     * setSubpanelWidgetId
+     * This is a utility function to set the id for a widget
+     * @param id String value to set the widget's unique id
+     */
+    public function setWidgetId($id='') {
+        $this->widget_id = $id;
+    }
 
     public function getDisplayName()
     {
@@ -94,20 +94,20 @@ 
     {
         $this->parent_bean = $parent_bean;
     }
-   /**
-    * getTruncatedColumnAlias
-    * This function ensures that a column alias is no more than 28 characters.  Should the column_name
-    * argument exceed 28 charcters, it creates an alias using the first 22 characters of the column_name
-    * plus an md5 of the first 6 characters of the lowercased column_name value.
-    *
-    */
+    /**
+     * getTruncatedColumnAlias
+     * This function ensures that a column alias is no more than 28 characters.  Should the column_name
+     * argument exceed 28 charcters, it creates an alias using the first 22 characters of the column_name
+     * plus an md5 of the first 6 characters of the lowercased column_name value.
+     *
+     */
     protected function getTruncatedColumnAlias($column_name)
     {
-	  	if(empty($column_name) || !is_string($column_name) || strlen($column_name) < 28)
-	  	{
-	  	   return $column_name;
-	  	}
-	    return strtoupper(substr($column_name,0,22) . substr(md5(strtolower($column_name)), 0, 6));
+            if(empty($column_name) || !is_string($column_name) || strlen($column_name) < 28)
+            {
+                return $column_name;
+            }
+        return strtoupper(substr($column_name,0,22) . substr(md5(strtolower($column_name)), 0, 6));
     }
 }
 

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -77,7 +77,7 @@ 
 	 * This is a utility function to set the id for a widget
 	 * @param id String value to set the widget's unique id
 	 */
-	public function setWidgetId($id='') {
+	public function setWidgetId($id = '') {
 		$this->widget_id = $id;
 	}
 
@@ -103,11 +103,11 @@ 
     */
     protected function getTruncatedColumnAlias($column_name)
     {
-	  	if(empty($column_name) || !is_string($column_name) || strlen($column_name) < 28)
+	  	if (empty($column_name) || !is_string($column_name) || strlen($column_name) < 28)
 	  	{
 	  	   return $column_name;
 	  	}
-	    return strtoupper(substr($column_name,0,22) . substr(md5(strtolower($column_name)), 0, 6));
+	    return strtoupper(substr($column_name, 0, 22).substr(md5(strtolower($column_name)), 0, 6));
     }
 }
 

Braces +3 added lines, -1 removed lines

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

Doc Comments +2 added lines, -1 removed lines

@@ -66,7 +66,7 @@ 
 	/**
 	 * getSubpanelWidgetId
 	 * This is a utility function to return a widget's unique id
-	 * @return id String label of the widget's unique id
+	 * @return string String label of the widget's unique id
 	 */
 	public function getWidgetId() {
 	   return $this->widget_id;
@@ -100,6 +100,7 @@ 
     * argument exceed 28 charcters, it creates an alias using the first 22 characters of the column_name
     * plus an md5 of the first 6 characters of the lowercased column_name value.
     *
+    * @param string $column_name
     */
     protected function getTruncatedColumnAlias($column_name)
     {

include/generic/SugarWidgets/SugarWidgetFieldfloat.php

Indentation +26 added lines, -26 removed lines

@@ -41,8 +41,8 @@ 
 
 class SugarWidgetFieldFloat extends SugarWidgetFieldInt
 {
- function displayList($layout_def)
- {
+    function displayList($layout_def)
+    {
  	
     $vardef = $this->getVardef($layout_def);
 
@@ -51,37 +51,37 @@ 
     } else {
         $precision = null;
     }
-	return format_number(parent::displayListPlain($layout_def), $precision, $precision);
- }
+    return format_number(parent::displayListPlain($layout_def), $precision, $precision);
+    }
 
- function displayListPlain($layout_def)
- {
-     return $this->displayList($layout_def);
- }
- function queryFilterEquals(&$layout_def)
- {	
+    function displayListPlain($layout_def)
+    {
+        return $this->displayList($layout_def);
+    }
+    function queryFilterEquals(&$layout_def)
+    {	
     return $this->_get_column_select($layout_def)."= ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))."\n";
- }
+    }
                                                                                  
- function queryFilterNot_Equals(&$layout_def)
- {
-	return $this->_get_column_select($layout_def)."!=".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))."\n";
- }
+    function queryFilterNot_Equals(&$layout_def)
+    {
+    return $this->_get_column_select($layout_def)."!=".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))."\n";
+    }
                                                                                  
- function queryFilterGreater(&$layout_def)
- {
+    function queryFilterGreater(&$layout_def)
+    {
     return $this->_get_column_select($layout_def)." > ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))."\n";
- }
+    }
                                                                                  
- function queryFilterLess(&$layout_def)
- {
-	return $this->_get_column_select($layout_def)." < ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))."\n";
- }
+    function queryFilterLess(&$layout_def)
+    {
+    return $this->_get_column_select($layout_def)." < ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))."\n";
+    }
 
- function queryFilterBetween(&$layout_def)
- {
-	return $this->_get_column_select($layout_def)." BETWEEN ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0'])). " AND " . $GLOBALS['db']->quote(unformat_number($layout_def['input_name1'])) . "\n";
- }
+    function queryFilterBetween(&$layout_def)
+    {
+    return $this->_get_column_select($layout_def)." BETWEEN ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0'])). " AND " . $GLOBALS['db']->quote(unformat_number($layout_def['input_name1'])) . "\n";
+    }
 
 
 }

Spacing +3 added lines, -3 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.
@@ -46,7 +46,7 @@ 
  	
     $vardef = $this->getVardef($layout_def);
 
-    if ( isset($vardef['precision']) ) {
+    if (isset($vardef['precision'])) {
         $precision = $vardef['precision'];
     } else {
         $precision = null;
@@ -80,7 +80,7 @@ 
 
  function queryFilterBetween(&$layout_def)
  {
-	return $this->_get_column_select($layout_def)." BETWEEN ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0'])). " AND " . $GLOBALS['db']->quote(unformat_number($layout_def['input_name1'])) . "\n";
+	return $this->_get_column_select($layout_def)." BETWEEN ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))." AND ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name1']))."\n";
  }
 
 

Braces +3 added lines, -1 removed lines

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

include/generic/SugarWidgets/SugarWidgetFieldsingleenum.php

Indentation +4 added lines, -4 removed lines

@@ -51,13 +51,13 @@
                 $ops = $layout_def['options'];
             }
             elseif (isset($layout_def['options']) && isset($app_list_strings[$layout_def['options']])){ 
-            	$ops = $app_list_strings[$layout_def['options']];
+                $ops = $app_list_strings[$layout_def['options']];
                 if(array_key_exists('', $app_list_strings[$layout_def['options']])) {
-             	   unset($ops['']);
-	            }
+                    unset($ops['']);
+                }
             }
             else{
-            	$ops = array();
+                $ops = array();
             }
         }
         else {

Spacing +7 added lines, -7 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.
@@ -46,17 +46,17 @@ 
     function displayInput(&$layout_def) {
         global $app_list_strings;
 
-        if(!empty($layout_def['remove_blank']) && $layout_def['remove_blank']) {
-            if ( is_array($layout_def['options']) ) {
+        if (!empty($layout_def['remove_blank']) && $layout_def['remove_blank']) {
+            if (is_array($layout_def['options'])) {
                 $ops = $layout_def['options'];
             }
-            elseif (isset($layout_def['options']) && isset($app_list_strings[$layout_def['options']])){ 
+            elseif (isset($layout_def['options']) && isset($app_list_strings[$layout_def['options']])) { 
             	$ops = $app_list_strings[$layout_def['options']];
-                if(array_key_exists('', $app_list_strings[$layout_def['options']])) {
+                if (array_key_exists('', $app_list_strings[$layout_def['options']])) {
              	   unset($ops['']);
 	            }
             }
-            else{
+            else {
             	$ops = array();
             }
         }
@@ -64,7 +64,7 @@ 
             $ops = $app_list_strings[$layout_def['options']];
         }
         
-        $str = '<select name="' . $layout_def['name'] . '">';
+        $str = '<select name="'.$layout_def['name'].'">';
         $str .= get_select_options_with_id($ops, $layout_def['input_name0']);
         $str .= '</select>';
         return $str;

Braces +6 added lines, -7 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -49,18 +51,15 @@ 
         if(!empty($layout_def['remove_blank']) && $layout_def['remove_blank']) {
             if ( is_array($layout_def['options']) ) {
                 $ops = $layout_def['options'];
-            }
-            elseif (isset($layout_def['options']) && isset($app_list_strings[$layout_def['options']])){ 
+            } elseif (isset($layout_def['options']) && isset($app_list_strings[$layout_def['options']])){ 
             	$ops = $app_list_strings[$layout_def['options']];
                 if(array_key_exists('', $app_list_strings[$layout_def['options']])) {
              	   unset($ops['']);
 	            }
-            }
-            else{
+            } else{
             	$ops = array();
             }
-        }
-        else {
+        } else {
             $ops = $app_list_strings[$layout_def['options']];
         }
         

include/generic/SugarWidgets/SugarWidgetReportField.php

Indentation +166 added lines, -166 removed lines

@@ -54,30 +54,30 @@ 
      */
     protected $reporter;
 
-	function SugarWidgetReportField(&$layout_manager) {
+    function SugarWidgetReportField(&$layout_manager) {
         parent::SugarWidgetField($layout_manager);
         $this->reporter = $this->layout_manager->getAttribute("reporter");
     }
 
-	function  getSubClass($layout_def)
-	{
-		if (! empty($layout_def['type']))
-		{
-
-			if ($layout_def['type'] == 'time') {
-				$layout_def['widget_class'] = 'Fielddate';
-			} else {
-				$layout_def['widget_class'] = 'Field'.$layout_def['type'];
-			}
-			return $this->layout_manager->getClassFromWidgetDef($layout_def);
-		} else {
-			return $this;
-		}
-	}
-
-
- function display($layout_def)
- {
+    function  getSubClass($layout_def)
+    {
+        if (! empty($layout_def['type']))
+        {
+
+            if ($layout_def['type'] == 'time') {
+                $layout_def['widget_class'] = 'Fielddate';
+            } else {
+                $layout_def['widget_class'] = 'Field'.$layout_def['type'];
+            }
+            return $this->layout_manager->getClassFromWidgetDef($layout_def);
+        } else {
+            return $this;
+        }
+    }
+
+
+    function display($layout_def)
+    {
         $obj = $this->getSubClass($layout_def);
 
         $context = $this->layout_manager->getAttribute('context');//_ppd($context);
@@ -91,51 +91,51 @@ 
         {
                 return 'display not found:'.$func_name;
         }
- }
+    }
 
- function _get_column_select_special($layout_def)
- {
- 		$alias = '';
-		 if ( ! empty($layout_def['table_alias']))
-		 {
-			$alias = $layout_def['table_alias'];
-		 }
+    function _get_column_select_special($layout_def)
+    {
+            $alias = '';
+            if ( ! empty($layout_def['table_alias']))
+            {
+            $alias = $layout_def['table_alias'];
+            }
 
     if ($layout_def['name'] == 'weighted_sum' )
     {
         return sprintf("SUM(%s * %s * 0.01)", $this->reporter->db->convert("$alias.probability","IFNULL", array(0)),
             $this->reporter->db->convert("$alias.amount_usdollar","IFNULL", array(0)));
-	}
+    }
     if ($layout_def['name'] == 'weighted_amount' )
     {
         return sprintf("AVG(%s * %s * 0.01)", $this->reporter->db->convert("$alias.probability","IFNULL", array(0)),
             $this->reporter->db->convert("$alias.amount_usdollar","IFNULL", array(0)));
-	}
- }
-
- function _get_column_select($layout_def)
- {
- 	global $reportAlias;
- 	if (!isset($reportAlias)) {
- 		$reportAlias = array();
- 	}
-
-	if ( ! empty($layout_def['table_alias'])) {
-		$alias = $layout_def['table_alias'].".".$layout_def['name'];
-	} else if (! empty($layout_def['name'])) {
-		$alias = $layout_def['name'];
-	} else {
-		$alias = "*";
-	}
-
-	if ( ! empty($layout_def['group_function']) )
-	{
-    	if ($layout_def['name'] == 'weighted_sum' || $layout_def['name'] == 'weighted_amount')
-    	{
-    			$alias = $this->_get_column_select_special($layout_def);
-    			$reportAlias[$alias] = $layout_def;
-				return $alias;
-    	}
+    }
+    }
+
+    function _get_column_select($layout_def)
+    {
+        global $reportAlias;
+        if (!isset($reportAlias)) {
+            $reportAlias = array();
+        }
+
+    if ( ! empty($layout_def['table_alias'])) {
+        $alias = $layout_def['table_alias'].".".$layout_def['name'];
+    } else if (! empty($layout_def['name'])) {
+        $alias = $layout_def['name'];
+    } else {
+        $alias = "*";
+    }
+
+    if ( ! empty($layout_def['group_function']) )
+    {
+        if ($layout_def['name'] == 'weighted_sum' || $layout_def['name'] == 'weighted_amount')
+        {
+                $alias = $this->_get_column_select_special($layout_def);
+                $reportAlias[$alias] = $layout_def;
+                return $alias;
+        }
 
         // Use IFNULL only if it's not AVG aggregate
         // because it adds NULL rows to the count when it should not, thus getting wrong result
@@ -164,66 +164,66 @@ 
             }
 
         }
-	}
+    }
 
-	$reportAlias[$alias] = $layout_def;
-	return $alias;
- }
+    $reportAlias[$alias] = $layout_def;
+    return $alias;
+    }
 
- function querySelect(&$layout_def)
- {
+    function querySelect(&$layout_def)
+    {
     return $this->_get_column_select($layout_def)." ".$this->_get_column_alias($layout_def)."\n";
- }
+    }
 
- function queryGroupBy($layout_def)
- {
-	return $this->_get_column_select($layout_def)." \n";
- }
+    function queryGroupBy($layout_def)
+    {
+    return $this->_get_column_select($layout_def)." \n";
+    }
 
 
- function queryOrderBy($layout_def)
- {
-     $field_def = array();
-	if(!empty($this->reporter->all_fields[$layout_def['column_key']])) $field_def = $this->reporter->all_fields[$layout_def['column_key']];
+    function queryOrderBy($layout_def)
+    {
+        $field_def = array();
+    if(!empty($this->reporter->all_fields[$layout_def['column_key']])) $field_def = $this->reporter->all_fields[$layout_def['column_key']];
 
     if (!empty($layout_def['group_function']))
     {
         $order_by = $this->_get_column_alias($layout_def);
     }
     elseif (!empty($field_def['sort_on']))
-	{
-			$order_by = $layout_def['table_alias'].".".$field_def['sort_on'];
+    {
+            $order_by = $layout_def['table_alias'].".".$field_def['sort_on'];
             if(!empty($field_def['sort_on2']))
                 $order_by .= ', ' . $layout_def['table_alias'].".".$field_def['sort_on2'];
     }
-	else {
-		$order_by = $this->_get_column_alias($layout_def)." \n";
-	}
+    else {
+        $order_by = $this->_get_column_alias($layout_def)." \n";
+    }
 
-     //use sugar db function convert on order by string to convert to varchar.  This is mainly for db's
-     //that do not allow sorting on clob/text fields
+        //use sugar db function convert on order by string to convert to varchar.  This is mainly for db's
+        //that do not allow sorting on clob/text fields
     if ($this->reporter->db->isTextType($this->reporter->db->getFieldType($field_def))) {
         $order_by = $this->reporter->db->convert($order_by,'text2char', array(10000)); // array(10000) is for db2 only
     }
 
-			if ( empty($layout_def['sort_dir']) || $layout_def['sort_dir'] == 'a')
-			{
-				return $order_by." ASC";
-			} else {
-				return $order_by." DESC";
-			}
- }
+            if ( empty($layout_def['sort_dir']) || $layout_def['sort_dir'] == 'a')
+            {
+                return $order_by." ASC";
+            } else {
+                return $order_by." DESC";
+            }
+    }
 
 
- function queryFilter($layout_def)
- {
-	$method_name = "queryFilter".$layout_def['qualifier_name'];
-	return $this->$method_name($layout_def);
- }
+    function queryFilter($layout_def)
+    {
+    $method_name = "queryFilter".$layout_def['qualifier_name'];
+    return $this->$method_name($layout_def);
+    }
 
-	function displayHeaderCell($layout_def)
-	{
-				global $start_link_wrapper,$end_link_wrapper;
+    function displayHeaderCell($layout_def)
+    {
+                global $start_link_wrapper,$end_link_wrapper;
 
 
                 // don't show sort links if name isn't defined
@@ -237,22 +237,22 @@ 
 
                 $sort_by ='';
                 if ( ! empty($layout_def['table_key']) && ! empty($layout_def['name']) ) {
-                	if (! empty($layout_def['group_function']) && $layout_def['group_function'] == 'count') {
+                    if (! empty($layout_def['group_function']) && $layout_def['group_function'] == 'count') {
                         $sort_by = $layout_def['table_key'].":".'count';
-                	} else {
-                    	$sort_by = $layout_def['table_key'].":".$layout_def['name'];
+                    } else {
+                        $sort_by = $layout_def['table_key'].":".$layout_def['name'];
                         if ( ! empty($layout_def['column_function'])) {
-                        	$sort_by .= ':'.$layout_def['column_function'];
-                		} else if ( ! empty($layout_def['group_function']) ) {
-                        	$sort_by .= ':'.$layout_def['group_function'];
-                		}
-                	}
+                            $sort_by .= ':'.$layout_def['column_function'];
+                        } else if ( ! empty($layout_def['group_function']) ) {
+                            $sort_by .= ':'.$layout_def['group_function'];
+                        }
+                    }
                 } else {
-                	return $this->displayHeaderCellPlain($layout_def);
+                    return $this->displayHeaderCellPlain($layout_def);
                 }
 
                 $start = empty($start_link_wrapper) ? '': $start_link_wrapper;
-				$end = empty($end_link_wrapper) ? '': $end_link_wrapper;
+                $end = empty($end_link_wrapper) ? '': $end_link_wrapper;
 
                 // unable to retrieve the vardef here, exclude columns of type clob/text from being sortable
 
@@ -262,40 +262,40 @@ 
                     $objListView = new ListView();
                     $header_cell .= $objListView->getArrowUpDownStart(isset($layout_def['sort']) ? $layout_def['sort'] : '');
                     $header_cell .= $objListView->getArrowUpDownEnd(isset($layout_def['sort']) ? $layout_def['sort'] : '');
-		            $header_cell .= "</a>";
-					return $header_cell;
-				}
+                    $header_cell .= "</a>";
+                    return $header_cell;
+                }
 
-		        return $this->displayHeaderCellPlain($layout_def);
+                return $this->displayHeaderCellPlain($layout_def);
     }
 
-	function query($layout_def)
- 	{
-       		 $obj = $this->getSubClass($layout_def);
+    function query($layout_def)
+        {
+                $obj = $this->getSubClass($layout_def);
 
-        	$context = $this->layout_manager->getAttribute('context');
-       	 	$func_name = 'query'.$context;
+            $context = $this->layout_manager->getAttribute('context');
+                $func_name = 'query'.$context;
 
-        	if ( ! empty($context) && method_exists($obj,$func_name))
-       		 {
-               		 return  $obj->$func_name($layout_def);
-        	} else
-        	{
-                	return '';
-		}
- 	}
+            if ( ! empty($context) && method_exists($obj,$func_name))
+                {
+                        return  $obj->$func_name($layout_def);
+            } else
+            {
+                    return '';
+        }
+        }
 
- function _get_column_alias($layout_def)
- {
+    function _get_column_alias($layout_def)
+    {
         $alias_arr = array();
 
-	if (!empty($layout_def['table_key']) && $layout_def['table_key'] == 'self' && !empty($layout_def['name']) && $layout_def['name'] == 'id')
-	{
-		return 'primaryid';
-	}
+    if (!empty($layout_def['table_key']) && $layout_def['table_key'] == 'self' && !empty($layout_def['name']) && $layout_def['name'] == 'id')
+    {
+        return 'primaryid';
+    }
 
-     // Bug: 44605
-     // this comment is being added to trigger the upgrade package
+        // Bug: 44605
+        // this comment is being added to trigger the upgrade package
         if ( ! empty($layout_def['group_function']) && $layout_def['group_function']=='count')
         {
                 return $layout_def['table_alias'] . '__count';
@@ -322,49 +322,49 @@ 
                 array_push($alias_arr,$layout_def['name']);
         }
 
-		global $used_aliases, $alias_map;
+        global $used_aliases, $alias_map;
 
         $alias = strtolower(implode("_",$alias_arr));
 
         $short_alias = $this->getTruncatedColumnAlias($alias);
 
-		if ( empty($used_aliases[$short_alias]))
-		{
-			$alias_map[$alias] = $short_alias;
-		    $used_aliases[$short_alias] = 1;
-          	return $short_alias;
-		} else if ( ! empty($alias_map[$alias]) )
-		{
-			return $alias_map[$alias];
-		} else {
-			$alias_map[$alias] = $short_alias.'_'.$used_aliases[$short_alias];
-		  $used_aliases[$short_alias]++;
-			return $alias_map[$alias];
-		}
- }
-
- function queryFilterEmpty($layout_def)
- {
-     $column = $this->_get_column_select($layout_def);
-     return "($column IS NULL OR $column = ".$this->reporter->db->emptyValue($layout_def['type']).")";
- }
-
- function queryFilterIs($layout_def)
- {
- 	return '( '.$this->_get_column_select($layout_def)."='".$GLOBALS['db']->quote($layout_def['input_name0'])."')\n";
- }
-
- function queryFilteris_not($layout_def)
- {
- 	return '( '.$this->_get_column_select($layout_def)."<>'".$GLOBALS['db']->quote($layout_def['input_name0'])."')\n";
- }
-
- function queryFilterNot_Empty($layout_def)
- {
-     /** @var $db DBManager */
-     $db = $this->reporter->db;
-     $column = $this->_get_column_select($layout_def);
-     return "(coalesce(" . $db->convert($column, "length") . ",0) > 0)\n";
- }
+        if ( empty($used_aliases[$short_alias]))
+        {
+            $alias_map[$alias] = $short_alias;
+            $used_aliases[$short_alias] = 1;
+                return $short_alias;
+        } else if ( ! empty($alias_map[$alias]) )
+        {
+            return $alias_map[$alias];
+        } else {
+            $alias_map[$alias] = $short_alias.'_'.$used_aliases[$short_alias];
+            $used_aliases[$short_alias]++;
+            return $alias_map[$alias];
+        }
+    }
+
+    function queryFilterEmpty($layout_def)
+    {
+        $column = $this->_get_column_select($layout_def);
+        return "($column IS NULL OR $column = ".$this->reporter->db->emptyValue($layout_def['type']).")";
+    }
+
+    function queryFilterIs($layout_def)
+    {
+        return '( '.$this->_get_column_select($layout_def)."='".$GLOBALS['db']->quote($layout_def['input_name0'])."')\n";
+    }
+
+    function queryFilteris_not($layout_def)
+    {
+        return '( '.$this->_get_column_select($layout_def)."<>'".$GLOBALS['db']->quote($layout_def['input_name0'])."')\n";
+    }
+
+    function queryFilterNot_Empty($layout_def)
+    {
+        /** @var $db DBManager */
+        $db = $this->reporter->db;
+        $column = $this->_get_column_select($layout_def);
+        return "(coalesce(" . $db->convert($column, "length") . ",0) > 0)\n";
+    }
 
 }

Spacing +47 added lines, -47 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.
@@ -61,7 +61,7 @@ 
 
 	function  getSubClass($layout_def)
 	{
-		if (! empty($layout_def['type']))
+		if (!empty($layout_def['type']))
 		{
 
 			if ($layout_def['type'] == 'time') {
@@ -80,11 +80,11 @@ 
  {
         $obj = $this->getSubClass($layout_def);
 
-        $context = $this->layout_manager->getAttribute('context');//_ppd($context);
+        $context = $this->layout_manager->getAttribute('context'); //_ppd($context);
         $func_name = 'display'.$context;
 
 
-        if ( ! empty($context) && method_exists($obj,$func_name))
+        if (!empty($context) && method_exists($obj, $func_name))
         {
                 return  $obj->$func_name($layout_def);
         } else
@@ -96,20 +96,20 @@ 
  function _get_column_select_special($layout_def)
  {
  		$alias = '';
-		 if ( ! empty($layout_def['table_alias']))
+		 if (!empty($layout_def['table_alias']))
 		 {
 			$alias = $layout_def['table_alias'];
 		 }
 
-    if ($layout_def['name'] == 'weighted_sum' )
+    if ($layout_def['name'] == 'weighted_sum')
     {
-        return sprintf("SUM(%s * %s * 0.01)", $this->reporter->db->convert("$alias.probability","IFNULL", array(0)),
-            $this->reporter->db->convert("$alias.amount_usdollar","IFNULL", array(0)));
+        return sprintf("SUM(%s * %s * 0.01)", $this->reporter->db->convert("$alias.probability", "IFNULL", array(0)),
+            $this->reporter->db->convert("$alias.amount_usdollar", "IFNULL", array(0)));
 	}
-    if ($layout_def['name'] == 'weighted_amount' )
+    if ($layout_def['name'] == 'weighted_amount')
     {
-        return sprintf("AVG(%s * %s * 0.01)", $this->reporter->db->convert("$alias.probability","IFNULL", array(0)),
-            $this->reporter->db->convert("$alias.amount_usdollar","IFNULL", array(0)));
+        return sprintf("AVG(%s * %s * 0.01)", $this->reporter->db->convert("$alias.probability", "IFNULL", array(0)),
+            $this->reporter->db->convert("$alias.amount_usdollar", "IFNULL", array(0)));
 	}
  }
 
@@ -120,15 +120,15 @@ 
  		$reportAlias = array();
  	}
 
-	if ( ! empty($layout_def['table_alias'])) {
+	if (!empty($layout_def['table_alias'])) {
 		$alias = $layout_def['table_alias'].".".$layout_def['name'];
-	} else if (! empty($layout_def['name'])) {
+	} else if (!empty($layout_def['name'])) {
 		$alias = $layout_def['name'];
 	} else {
 		$alias = "*";
 	}
 
-	if ( ! empty($layout_def['group_function']) )
+	if (!empty($layout_def['group_function']))
 	{
     	if ($layout_def['name'] == 'weighted_sum' || $layout_def['name'] == 'weighted_amount')
     	{
@@ -153,7 +153,7 @@ 
             if ($layout_def['group_function'] != 'avg') {
                 $alias = "{$layout_def['group_function']}($alias/{$query})*{$currency->conversion_rate}";
             } else {
-                $alias = $this->reporter->db->convert("$alias/$query", "AVG") . " * {$currency->conversion_rate}";
+                $alias = $this->reporter->db->convert("$alias/$query", "AVG")." * {$currency->conversion_rate}";
             }
         } else {
             // We need to use convert() for AVG because of Oracle
@@ -184,7 +184,7 @@ 
  function queryOrderBy($layout_def)
  {
      $field_def = array();
-	if(!empty($this->reporter->all_fields[$layout_def['column_key']])) $field_def = $this->reporter->all_fields[$layout_def['column_key']];
+	if (!empty($this->reporter->all_fields[$layout_def['column_key']])) $field_def = $this->reporter->all_fields[$layout_def['column_key']];
 
     if (!empty($layout_def['group_function']))
     {
@@ -193,8 +193,8 @@ 
     elseif (!empty($field_def['sort_on']))
 	{
 			$order_by = $layout_def['table_alias'].".".$field_def['sort_on'];
-            if(!empty($field_def['sort_on2']))
-                $order_by .= ', ' . $layout_def['table_alias'].".".$field_def['sort_on2'];
+            if (!empty($field_def['sort_on2']))
+                $order_by .= ', '.$layout_def['table_alias'].".".$field_def['sort_on2'];
     }
 	else {
 		$order_by = $this->_get_column_alias($layout_def)." \n";
@@ -203,10 +203,10 @@ 
      //use sugar db function convert on order by string to convert to varchar.  This is mainly for db's
      //that do not allow sorting on clob/text fields
     if ($this->reporter->db->isTextType($this->reporter->db->getFieldType($field_def))) {
-        $order_by = $this->reporter->db->convert($order_by,'text2char', array(10000)); // array(10000) is for db2 only
+        $order_by = $this->reporter->db->convert($order_by, 'text2char', array(10000)); // array(10000) is for db2 only
     }
 
-			if ( empty($layout_def['sort_dir']) || $layout_def['sort_dir'] == 'a')
+			if (empty($layout_def['sort_dir']) || $layout_def['sort_dir'] == 'a')
 			{
 				return $order_by." ASC";
 			} else {
@@ -223,27 +223,27 @@ 
 
 	function displayHeaderCell($layout_def)
 	{
-				global $start_link_wrapper,$end_link_wrapper;
+				global $start_link_wrapper, $end_link_wrapper;
 
 
                 // don't show sort links if name isn't defined
                 $no_sort = $this->layout_manager->getAttribute('no_sort');
-                if(empty($layout_def['name']) || ! empty($no_sort) || ! empty($layout_def['no_sort']))
+                if (empty($layout_def['name']) || !empty($no_sort) || !empty($layout_def['no_sort']))
                 {
                         return $layout_def['label'];
                 }
 
 
 
-                $sort_by ='';
-                if ( ! empty($layout_def['table_key']) && ! empty($layout_def['name']) ) {
-                	if (! empty($layout_def['group_function']) && $layout_def['group_function'] == 'count') {
+                $sort_by = '';
+                if (!empty($layout_def['table_key']) && !empty($layout_def['name'])) {
+                	if (!empty($layout_def['group_function']) && $layout_def['group_function'] == 'count') {
                         $sort_by = $layout_def['table_key'].":".'count';
                 	} else {
                     	$sort_by = $layout_def['table_key'].":".$layout_def['name'];
-                        if ( ! empty($layout_def['column_function'])) {
+                        if (!empty($layout_def['column_function'])) {
                         	$sort_by .= ':'.$layout_def['column_function'];
-                		} else if ( ! empty($layout_def['group_function']) ) {
+                		} else if (!empty($layout_def['group_function'])) {
                         	$sort_by .= ':'.$layout_def['group_function'];
                 		}
                 	}
@@ -251,12 +251,12 @@ 
                 	return $this->displayHeaderCellPlain($layout_def);
                 }
 
-                $start = empty($start_link_wrapper) ? '': $start_link_wrapper;
-				$end = empty($end_link_wrapper) ? '': $end_link_wrapper;
+                $start = empty($start_link_wrapper) ? '' : $start_link_wrapper;
+				$end = empty($end_link_wrapper) ? '' : $end_link_wrapper;
 
                 // unable to retrieve the vardef here, exclude columns of type clob/text from being sortable
 
-                if(!in_array($layout_def['name'], array('description', 'account_description', 'lead_source_description', 'status_description', 'to_addrs', 'cc_addrs', 'bcc_addrs', 'work_log', 'objective', 'resolution'))) {
+                if (!in_array($layout_def['name'], array('description', 'account_description', 'lead_source_description', 'status_description', 'to_addrs', 'cc_addrs', 'bcc_addrs', 'work_log', 'objective', 'resolution'))) {
                     $header_cell = "<a class=\"listViewThLinkS1\" href=\"".$start.$sort_by.$end."\">";
                     $header_cell .= $this->displayHeaderCellPlain($layout_def);
                     $objListView = new ListView();
@@ -276,7 +276,7 @@ 
         	$context = $this->layout_manager->getAttribute('context');
        	 	$func_name = 'query'.$context;
 
-        	if ( ! empty($context) && method_exists($obj,$func_name))
+        	if (!empty($context) && method_exists($obj, $func_name))
        		 {
                		 return  $obj->$func_name($layout_def);
         	} else
@@ -296,44 +296,44 @@ 
 
      // Bug: 44605
      // this comment is being added to trigger the upgrade package
-        if ( ! empty($layout_def['group_function']) && $layout_def['group_function']=='count')
+        if (!empty($layout_def['group_function']) && $layout_def['group_function'] == 'count')
         {
-                return $layout_def['table_alias'] . '__count';
+                return $layout_def['table_alias'].'__count';
         }
 
-        if ( ! empty($layout_def['table_alias']))
+        if (!empty($layout_def['table_alias']))
         {
-                array_push($alias_arr,$layout_def['table_alias']);
+                array_push($alias_arr, $layout_def['table_alias']);
         }
 
-        if ( ! empty($layout_def['group_function']) && $layout_def['group_function'] != 'weighted_amount' && $layout_def['group_function'] != 'weighted_sum')
+        if (!empty($layout_def['group_function']) && $layout_def['group_function'] != 'weighted_amount' && $layout_def['group_function'] != 'weighted_sum')
         {
-                array_push($alias_arr,$layout_def['group_function']);
-        } else if ( ! empty($layout_def['column_function']))
+                array_push($alias_arr, $layout_def['group_function']);
+        } else if (!empty($layout_def['column_function']))
         {
-                array_push($alias_arr,$layout_def['column_function']);
-        } else if ( ! empty($layout_def['qualifier']))
+                array_push($alias_arr, $layout_def['column_function']);
+        } else if (!empty($layout_def['qualifier']))
         {
-                array_push($alias_arr,$layout_def['qualifier']);
+                array_push($alias_arr, $layout_def['qualifier']);
         }
 
-        if ( ! empty($layout_def['name']))
+        if (!empty($layout_def['name']))
         {
-                array_push($alias_arr,$layout_def['name']);
+                array_push($alias_arr, $layout_def['name']);
         }
 
 		global $used_aliases, $alias_map;
 
-        $alias = strtolower(implode("_",$alias_arr));
+        $alias = strtolower(implode("_", $alias_arr));
 
         $short_alias = $this->getTruncatedColumnAlias($alias);
 
-		if ( empty($used_aliases[$short_alias]))
+		if (empty($used_aliases[$short_alias]))
 		{
 			$alias_map[$alias] = $short_alias;
 		    $used_aliases[$short_alias] = 1;
           	return $short_alias;
-		} else if ( ! empty($alias_map[$alias]) )
+		} else if (!empty($alias_map[$alias]))
 		{
 			return $alias_map[$alias];
 		} else {
@@ -364,7 +364,7 @@ 
      /** @var $db DBManager */
      $db = $this->reporter->db;
      $column = $this->_get_column_select($layout_def);
-     return "(coalesce(" . $db->convert($column, "length") . ",0) > 0)\n";
+     return "(coalesce(".$db->convert($column, "length").",0) > 0)\n";
  }
 
 }

Braces +11 added lines, -8 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -184,19 +186,20 @@ 
  function queryOrderBy($layout_def)
  {
      $field_def = array();
-	if(!empty($this->reporter->all_fields[$layout_def['column_key']])) $field_def = $this->reporter->all_fields[$layout_def['column_key']];
+	if(!empty($this->reporter->all_fields[$layout_def['column_key']])) {
+	    $field_def = $this->reporter->all_fields[$layout_def['column_key']];
+	}
 
     if (!empty($layout_def['group_function']))
     {
         $order_by = $this->_get_column_alias($layout_def);
-    }
-    elseif (!empty($field_def['sort_on']))
+    } elseif (!empty($field_def['sort_on']))
 	{
 			$order_by = $layout_def['table_alias'].".".$field_def['sort_on'];
-            if(!empty($field_def['sort_on2']))
-                $order_by .= ', ' . $layout_def['table_alias'].".".$field_def['sort_on2'];
-    }
-	else {
+            if(!empty($field_def['sort_on2'])) {
+                            $order_by .= ', ' . $layout_def['table_alias'].".".$field_def['sort_on2'];
+            }
+    } else {
 		$order_by = $this->_get_column_alias($layout_def)." \n";
 	}
 

Doc Comments +3 added lines

@@ -285,6 +285,9 @@
 		}
  	}
 
+ /**
+  * @return string
+  */
  function _get_column_alias($layout_def)
  {
         $alias_arr = array();