adamjakab / SuiteCRM

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/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/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/SugarWidgetSubPanelTopCreateCampaignLogEntryButton.php

Spacing +27 added lines, -27 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 @@ 
 {
     public function getWidgetId($buttonSuffix = true)
     {
-        return parent::getWidgetId() . '_select_button';
+        return parent::getWidgetId().'_select_button';
     }
 
     function display($widget_data)
@@ -59,7 +59,7 @@ 
 
         $this->title = $app_strings['LBL_SELECT_BUTTON_TITLE'];
         $this->value = $app_strings['LBL_SELECT_BUTTON_LABEL'];
-        $this->module = 'Campaigns';//'CampaignLog';
+        $this->module = 'Campaigns'; //'CampaignLog';
         $this->module_name = 'Campaigns';
 
 
@@ -68,52 +68,52 @@ 
 
 
         $focus = $widget_data['focus'];
-        if(ACLController::moduleSupportsACL($widget_data['module']) && !ACLController::checkAccess($widget_data['module'], 'list', true)){
-            $button = ' <input type="button" name="' . $this->getWidgetId() . '" id="' . $this->getWidgetId() . '" class="button"' . "\n"
-            . ' title="' . $this->title . '"'
-            . ' value="' . $this->value . "\"\n"
+        if (ACLController::moduleSupportsACL($widget_data['module']) && !ACLController::checkAccess($widget_data['module'], 'list', true)) {
+            $button = ' <input type="button" name="'.$this->getWidgetId().'" id="'.$this->getWidgetId().'" class="button"'."\n"
+            . ' title="'.$this->title.'"'
+            . ' value="'.$this->value."\"\n"
             .' disabled />';
             return $button;
         }
 
         //refresh the whole page after end of action?
         $refresh_page = 0;
-        if(!empty($widget_data['subpanel_definition']->_instance_properties['refresh_page'])){
+        if (!empty($widget_data['subpanel_definition']->_instance_properties['refresh_page'])) {
             $refresh_page = 1;
         }
 
         $subpanel_definition = $widget_data['subpanel_definition'];
         $button_definition = $subpanel_definition->get_buttons();
-        $subpanel_name = $this->module;    //"Campaigns";//$subpanel_definition->get_module_name();
+        $subpanel_name = $this->module; //"Campaigns";//$subpanel_definition->get_module_name();
         if (empty($this->module_name)) {
             $this->module_name = $subpanel_name;
         }
         $link_field_name = $subpanel_definition->get_data_source_name(true);
-        $popup_mode='multiselect';
-        if(isset($widget_data['mode'])){
-            $popup_mode=$widget_data['mode'];
+        $popup_mode = 'multiselect';
+        if (isset($widget_data['mode'])) {
+            $popup_mode = $widget_data['mode'];
         }
-        if(isset($widget_data['initial_filter_fields'])){
+        if (isset($widget_data['initial_filter_fields'])) {
             if (is_array($widget_data['initial_filter_fields'])) {
                 foreach ($widget_data['initial_filter_fields'] as $value=>$alias) {
                     if (isset($focus->$value) and !empty($focus->$value)) {
-                        $initial_filter.="&".$alias . '='.urlencode($focus->$value);
+                        $initial_filter .= "&".$alias.'='.urlencode($focus->$value);
                     }
                 }
             }
         }
-        $create="true";
-        if(isset($widget_data['create'])){
-            $create=$widget_data['create'];
+        $create = "true";
+        if (isset($widget_data['create'])) {
+            $create = $widget_data['create'];
         }
         $return_module = $_REQUEST['module'];
         $return_action = 'SubPanelViewer';
         $return_id = $_REQUEST['record'];
 
         //field_to_name_array
-        $fton_array= array('id' => 'subpanel_id');
-        if(isset($widget_data['field_to_name_array']) && is_array($widget_data['field_to_name_array'])){
-            $fton_array=array_merge($fton_array,$widget_data['field_to_name_array']);
+        $fton_array = array('id' => 'subpanel_id');
+        if (isset($widget_data['field_to_name_array']) && is_array($widget_data['field_to_name_array'])) {
+            $fton_array = array_merge($fton_array, $widget_data['field_to_name_array']);
         }
 
         $return_url = "index.php?module=$return_module&action=$return_action&subpanel=$subpanel_name&record=$return_id&sugar_body_only=1";
@@ -132,20 +132,20 @@ 
         );
 
         if (is_array($this->button_properties) && !empty($this->button_properties['add_to_passthru_data'])) {
-            $popup_request_data['passthru_data']= array_merge($popup_request_data['passthru_data'],$this->button_properties['add_to_passthru_data']);
+            $popup_request_data['passthru_data'] = array_merge($popup_request_data['passthru_data'], $this->button_properties['add_to_passthru_data']);
         }
 
         if (is_array($this->button_properties) && !empty($this->button_properties['add_to_passthru_data']['return_type'])) {
 
-            if ($this->button_properties['add_to_passthru_data']['return_type']=='report') {
-                $initial_filter = "&module_name=". urlencode($widget_data['module']);
+            if ($this->button_properties['add_to_passthru_data']['return_type'] == 'report') {
+                $initial_filter = "&module_name=".urlencode($widget_data['module']);
             }
         }
         $json_encoded_php_array = $this->_create_json_encoded_popup_request($popup_request_data);
-        return '<form action="index.php?module=CampaignLog&action=AddCampaignLog&type=contact">' . "\n"
-            . ' <input type="button" name="' . $this->getWidgetId() . '_select_button" id="' . $this->getWidgetId() . '" class="button"' . "\n"
-                . ' title="' . $this->title . '"'
-            . ' value="' . $this->value . "\"\n"
+        return '<form action="index.php?module=CampaignLog&action=AddCampaignLog&type=contact">'."\n"
+            . ' <input type="button" name="'.$this->getWidgetId().'_select_button" id="'.$this->getWidgetId().'" class="button"'."\n"
+                . ' title="'.$this->title.'"'
+            . ' value="'.$this->value."\"\n"
             . " onclick='open_popup(\"$this->module_name\",600,400,\"$initial_filter\",true,true,$json_encoded_php_array,\"$popup_mode\",$create);' /></form>\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/SugarWidgetSubPanelTopMessage.php

Indentation +3 added lines, -3 removed lines

@@ -46,8 +46,8 @@
 
 class SugarWidgetSubPanelTopMessage extends SugarWidgetSubPanelTopButton
 {
-	function display($defines)
-	{
+    function display($defines)
+    {
         return $defines['message'];
-	}
+    }
 }
\ No newline at end of file

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/SugarWidgetFieldenum.php

Indentation +104 added lines, -104 removed lines

@@ -58,39 +58,39 @@ 
     }
 
     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];
-		}
-		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];
-		}
-		return $this->_get_column_select($layout_def)." <> ".$this->reporter->db->quoted($input_name0)."\n";
-	}
-
-	public function queryFilterone_of($layout_def) {
-		$arr = array ();
-		foreach ($layout_def['input_name0'] as $value) {
-			$arr[] = $this->reporter->db->quoted($value);
-		}
-		$str = implode(",", $arr);
-		return $this->_get_column_select($layout_def)." IN (".$str.")\n";
-	}
-
-	public function queryFilternot_one_of($layout_def) {
-		$arr = array ();
-		foreach ($layout_def['input_name0'] as $value) {
-			$arr[] = $this->reporter->db->quoted($value);
-		}
-	    $reporter = $this->layout_manager->getAttribute("reporter");
-		$str = implode(",", $arr);
-		return $this->_get_column_select($layout_def)." NOT IN (".$str.")\n";
-	}
+        $input_name0 = $layout_def['input_name0'];
+        if (is_array($layout_def['input_name0'])) {
+            $input_name0 = $layout_def['input_name0'][0];
+        }
+        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];
+        }
+        return $this->_get_column_select($layout_def)." <> ".$this->reporter->db->quoted($input_name0)."\n";
+    }
+
+    public function queryFilterone_of($layout_def) {
+        $arr = array ();
+        foreach ($layout_def['input_name0'] as $value) {
+            $arr[] = $this->reporter->db->quoted($value);
+        }
+        $str = implode(",", $arr);
+        return $this->_get_column_select($layout_def)." IN (".$str.")\n";
+    }
+
+    public function queryFilternot_one_of($layout_def) {
+        $arr = array ();
+        foreach ($layout_def['input_name0'] as $value) {
+            $arr[] = $this->reporter->db->quoted($value);
+        }
+        $reporter = $this->layout_manager->getAttribute("reporter");
+        $str = implode(",", $arr);
+        return $this->_get_column_select($layout_def)." NOT IN (".$str.")\n";
+    }
 
     function & displayList($layout_def) {
         if(!empty($layout_def['column_key'])){
@@ -116,84 +116,84 @@ 
                 $field_type = $field_def['type'];
                 $div_id = $field_def['module'] ."&$record&$field_name";
                 $str = "<div id='$div_id'>" . $cell . "&nbsp;"
-                     . SugarThemeRegistry::current()->getImage(
+                        . SugarThemeRegistry::current()->getImage(
                         "edit_inline",
                         "border='0' alt='Edit Layout' align='bottom' onClick='SUGAR.reportsInlineEdit.inlineEdit(" .
                         "\"$div_id\",\"$cell\",\"$module\",\"$record\",\"$field_name\",\"$field_type\");'"
-                       )
-                     . "</div>";
+                        )
+                        . "</div>";
             }
         }
         return $str;
     }
-	function & displayListPlain($layout_def) {
-		if(!empty($layout_def['column_key'])){
-			$field_def = $this->reporter->all_fields[$layout_def['column_key']];
-		}else if(!empty($layout_def['fields'])){
-			$field_def = $layout_def['fields'];
-		}
-
-		if (!empty($layout_def['table_key'] ) &&( empty ($field_def['fields']) || empty ($field_def['fields'][0]) || empty ($field_def['fields'][1]))){
-			$value = $this->_get_list_value($layout_def);
-		}else if(!empty($layout_def['name']) && !empty($layout_def['fields'])){
-			$key = strtoupper($layout_def['name']);
-			$value = $layout_def['fields'][$key];
-		}
-		$cell = '';
-
-			if(isset($field_def['options'])){
-				$cell = translate($field_def['options'], $field_def['module'], $value);
-			}else if(isset($field_def['type']) && $field_def['type'] == 'enum' && isset($field_def['function'])){
-	            global $beanFiles;
-	            if(empty($beanFiles)) {
-	                include('include/modules.php');
-	            }
-	            $bean_name = get_singular_bean_name($field_def['module']);
-	            require_once($beanFiles[$bean_name]);
-	            $list = $field_def['function']();
-	            $cell = $list[$value];
-	        }
-		if (is_array($cell)) {
-
-			//#22632
-			$value = unencodeMultienum($value);
-			$cell=array();
-			foreach($value as $val){
-				$returnVal = translate($field_def['options'],$field_def['module'],$val);
-				if(!is_array($returnVal)){
-					array_push( $cell, translate($field_def['options'],$field_def['module'],$val));
-				}
-			}
-			$cell = implode(", ",$cell);
-		}
-		return $cell;
-	}
-
-	public function queryOrderBy($layout_def) {
-		$field_def = $this->reporter->all_fields[$layout_def['column_key']];
-		if (!empty ($field_def['sort_on'])) {
-			$order_by = $layout_def['table_alias'].".".$field_def['sort_on'];
-		} else {
-			$order_by = $this->_get_column_select($layout_def);
-		}
-		$list = array();
+    function & displayListPlain($layout_def) {
+        if(!empty($layout_def['column_key'])){
+            $field_def = $this->reporter->all_fields[$layout_def['column_key']];
+        }else if(!empty($layout_def['fields'])){
+            $field_def = $layout_def['fields'];
+        }
+
+        if (!empty($layout_def['table_key'] ) &&( empty ($field_def['fields']) || empty ($field_def['fields'][0]) || empty ($field_def['fields'][1]))){
+            $value = $this->_get_list_value($layout_def);
+        }else if(!empty($layout_def['name']) && !empty($layout_def['fields'])){
+            $key = strtoupper($layout_def['name']);
+            $value = $layout_def['fields'][$key];
+        }
+        $cell = '';
+
+            if(isset($field_def['options'])){
+                $cell = translate($field_def['options'], $field_def['module'], $value);
+            }else if(isset($field_def['type']) && $field_def['type'] == 'enum' && isset($field_def['function'])){
+                global $beanFiles;
+                if(empty($beanFiles)) {
+                    include('include/modules.php');
+                }
+                $bean_name = get_singular_bean_name($field_def['module']);
+                require_once($beanFiles[$bean_name]);
+                $list = $field_def['function']();
+                $cell = $list[$value];
+            }
+        if (is_array($cell)) {
+
+            //#22632
+            $value = unencodeMultienum($value);
+            $cell=array();
+            foreach($value as $val){
+                $returnVal = translate($field_def['options'],$field_def['module'],$val);
+                if(!is_array($returnVal)){
+                    array_push( $cell, translate($field_def['options'],$field_def['module'],$val));
+                }
+            }
+            $cell = implode(", ",$cell);
+        }
+        return $cell;
+    }
+
+    public function queryOrderBy($layout_def) {
+        $field_def = $this->reporter->all_fields[$layout_def['column_key']];
+        if (!empty ($field_def['sort_on'])) {
+            $order_by = $layout_def['table_alias'].".".$field_def['sort_on'];
+        } else {
+            $order_by = $this->_get_column_select($layout_def);
+        }
+        $list = array();
         if(isset($field_def['options'])) {
-		    $list = translate($field_def['options'], $field_def['module']);
+            $list = translate($field_def['options'], $field_def['module']);
         } elseif(isset($field_def['type']) && $field_def['type'] == 'enum' && isset($field_def['function'])) {
-	        global $beanFiles;
-		    if(empty($beanFiles)) {
-		        include('include/modules.php');
-		    }
-		    $bean_name = get_singular_bean_name($field_def['module']);
-		    require_once($beanFiles[$bean_name]);
+            global $beanFiles;
+            if(empty($beanFiles)) {
+                include('include/modules.php');
+            }
+            $bean_name = get_singular_bean_name($field_def['module']);
+            require_once($beanFiles[$bean_name]);
             $list = $field_def['function']();
         }
-		if (empty ($layout_def['sort_dir']) || $layout_def['sort_dir'] == 'a') {
-			$order_dir = "ASC";
-		} else {
-			$order_dir = "DESC";
-		}
-		return $this->reporter->db->orderByEnum($order_by, $list, $order_dir);
+        if (empty ($layout_def['sort_dir']) || $layout_def['sort_dir'] == 'a') {
+            $order_dir = "ASC";
+        } else {
+            $order_dir = "DESC";
+        }
+        return $this->reporter->db->orderByEnum($order_by, $list, $order_dir);
     }
 
     public function displayInput($layout_def) {
@@ -204,13 +204,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 +34 added lines, -34 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.
@@ -48,9 +48,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function SugarWidgetFieldEnum($layout_manager){
+    public function SugarWidgetFieldEnum($layout_manager) {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -63,13 +63,13 @@ 
     public function queryFilterEmpty($layout_def)
     {
         $column = $this->_get_column_select($layout_def);
-        return "(coalesce(" . $this->reporter->db->convert($column, "length") . ",0) = 0 OR $column = '^^')";
+        return "(coalesce(".$this->reporter->db->convert($column, "length").",0) = 0 OR $column = '^^')";
     }
 
     public function queryFilterNot_Empty($layout_def)
     {
         $column = $this->_get_column_select($layout_def);
-        return "(coalesce(" . $this->reporter->db->convert($column, "length") . ",0) > 0 AND $column != '^^' )\n";
+        return "(coalesce(".$this->reporter->db->convert($column, "length").",0) > 0 AND $column != '^^' )\n";
     }
 
     public function queryFilteris($layout_def) {
@@ -89,7 +89,7 @@ 
 	}
 
 	public function queryFilterone_of($layout_def) {
-		$arr = array ();
+		$arr = array();
 		foreach ($layout_def['input_name0'] as $value) {
 			$arr[] = $this->reporter->db->quoted($value);
 		}
@@ -98,7 +98,7 @@ 
 	}
 
 	public function queryFilternot_one_of($layout_def) {
-		$arr = array ();
+		$arr = array();
 		foreach ($layout_def['input_name0'] as $value) {
 			$arr[] = $this->reporter->db->quoted($value);
 		}
@@ -108,9 +108,9 @@ 
 	}
 
     function & displayList($layout_def) {
-        if(!empty($layout_def['column_key'])){
+        if (!empty($layout_def['column_key'])) {
             $field_def = $this->reporter->all_fields[$layout_def['column_key']];
-        }else if(!empty($layout_def['fields'])){
+        } else if (!empty($layout_def['fields'])) {
             $field_def = $layout_def['fields'];
         }
         $cell = $this->displayListPlain($layout_def);
@@ -129,11 +129,11 @@ 
                 $record = $layout_def['fields'][$key];
                 $field_name = $field_def['name'];
                 $field_type = $field_def['type'];
-                $div_id = $field_def['module'] ."&$record&$field_name";
-                $str = "<div id='$div_id'>" . $cell . "&nbsp;"
+                $div_id = $field_def['module']."&$record&$field_name";
+                $str = "<div id='$div_id'>".$cell."&nbsp;"
                      . SugarThemeRegistry::current()->getImage(
                         "edit_inline",
-                        "border='0' alt='Edit Layout' align='bottom' onClick='SUGAR.reportsInlineEdit.inlineEdit(" .
+                        "border='0' alt='Edit Layout' align='bottom' onClick='SUGAR.reportsInlineEdit.inlineEdit(".
                         "\"$div_id\",\"$cell\",\"$module\",\"$record\",\"$field_name\",\"$field_type\");'"
                        )
                      . "</div>";
@@ -142,25 +142,25 @@ 
         return $str;
     }
 	function & displayListPlain($layout_def) {
-		if(!empty($layout_def['column_key'])){
+		if (!empty($layout_def['column_key'])) {
 			$field_def = $this->reporter->all_fields[$layout_def['column_key']];
-		}else if(!empty($layout_def['fields'])){
+		} else if (!empty($layout_def['fields'])) {
 			$field_def = $layout_def['fields'];
 		}
 
-		if (!empty($layout_def['table_key'] ) &&( empty ($field_def['fields']) || empty ($field_def['fields'][0]) || empty ($field_def['fields'][1]))){
+		if (!empty($layout_def['table_key']) && (empty ($field_def['fields']) || empty ($field_def['fields'][0]) || empty ($field_def['fields'][1]))) {
 			$value = $this->_get_list_value($layout_def);
-		}else if(!empty($layout_def['name']) && !empty($layout_def['fields'])){
+		} else if (!empty($layout_def['name']) && !empty($layout_def['fields'])) {
 			$key = strtoupper($layout_def['name']);
 			$value = $layout_def['fields'][$key];
 		}
 		$cell = '';
 
-			if(isset($field_def['options'])){
+			if (isset($field_def['options'])) {
 				$cell = translate($field_def['options'], $field_def['module'], $value);
-			}else if(isset($field_def['type']) && $field_def['type'] == 'enum' && isset($field_def['function'])){
+			} else if (isset($field_def['type']) && $field_def['type'] == 'enum' && isset($field_def['function'])) {
 	            global $beanFiles;
-	            if(empty($beanFiles)) {
+	            if (empty($beanFiles)) {
 	                include('include/modules.php');
 	            }
 	            $bean_name = get_singular_bean_name($field_def['module']);
@@ -172,14 +172,14 @@ 
 
 			//#22632
 			$value = unencodeMultienum($value);
-			$cell=array();
-			foreach($value as $val){
-				$returnVal = translate($field_def['options'],$field_def['module'],$val);
-				if(!is_array($returnVal)){
-					array_push( $cell, translate($field_def['options'],$field_def['module'],$val));
+			$cell = array();
+			foreach ($value as $val) {
+				$returnVal = translate($field_def['options'], $field_def['module'], $val);
+				if (!is_array($returnVal)) {
+					array_push($cell, translate($field_def['options'], $field_def['module'], $val));
 				}
 			}
-			$cell = implode(", ",$cell);
+			$cell = implode(", ", $cell);
 		}
 		return $cell;
 	}
@@ -192,11 +192,11 @@ 
 			$order_by = $this->_get_column_select($layout_def);
 		}
 		$list = array();
-        if(isset($field_def['options'])) {
+        if (isset($field_def['options'])) {
 		    $list = translate($field_def['options'], $field_def['module']);
-        } elseif(isset($field_def['type']) && $field_def['type'] == 'enum' && isset($field_def['function'])) {
+        } elseif (isset($field_def['type']) && $field_def['type'] == 'enum' && isset($field_def['function'])) {
 	        global $beanFiles;
-		    if(empty($beanFiles)) {
+		    if (empty($beanFiles)) {
 		        include('include/modules.php');
 		    }
 		    $bean_name = get_singular_bean_name($field_def['module']);
@@ -214,17 +214,17 @@ 
     public function displayInput($layout_def) {
         global $app_list_strings;
 
-        if(!empty($layout_def['remove_blank']) && $layout_def['remove_blank']) {
-            if ( isset($layout_def['options']) &&  is_array($layout_def['options']) ) {
+        if (!empty($layout_def['remove_blank']) && $layout_def['remove_blank']) {
+            if (isset($layout_def['options']) && 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();
             }
         }
@@ -232,7 +232,7 @@ 
             $ops = $app_list_strings[$layout_def['options']];
         }
 
-        $str = '<select multiple="true" size="3" name="' . $layout_def['name'] . '[]">';
+        $str = '<select multiple="true" size="3" name="'.$layout_def['name'].'[]">';
         $str .= get_select_options_with_id($ops, $layout_def['input_name0']);
         $str .= '</select>';
         return $str;

Braces +11 added lines, -13 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.
@@ -52,8 +54,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($layout_manager);
@@ -110,7 +111,7 @@ 
     function & displayList($layout_def) {
         if(!empty($layout_def['column_key'])){
             $field_def = $this->reporter->all_fields[$layout_def['column_key']];
-        }else if(!empty($layout_def['fields'])){
+        } else if(!empty($layout_def['fields'])){
             $field_def = $layout_def['fields'];
         }
         $cell = $this->displayListPlain($layout_def);
@@ -144,13 +145,13 @@ 
 	function & displayListPlain($layout_def) {
 		if(!empty($layout_def['column_key'])){
 			$field_def = $this->reporter->all_fields[$layout_def['column_key']];
-		}else if(!empty($layout_def['fields'])){
+		} else if(!empty($layout_def['fields'])){
 			$field_def = $layout_def['fields'];
 		}
 
 		if (!empty($layout_def['table_key'] ) &&( empty ($field_def['fields']) || empty ($field_def['fields'][0]) || empty ($field_def['fields'][1]))){
 			$value = $this->_get_list_value($layout_def);
-		}else if(!empty($layout_def['name']) && !empty($layout_def['fields'])){
+		} else if(!empty($layout_def['name']) && !empty($layout_def['fields'])){
 			$key = strtoupper($layout_def['name']);
 			$value = $layout_def['fields'][$key];
 		}
@@ -158,7 +159,7 @@ 
 
 			if(isset($field_def['options'])){
 				$cell = translate($field_def['options'], $field_def['module'], $value);
-			}else if(isset($field_def['type']) && $field_def['type'] == 'enum' && isset($field_def['function'])){
+			} else if(isset($field_def['type']) && $field_def['type'] == 'enum' && isset($field_def['function'])){
 	            global $beanFiles;
 	            if(empty($beanFiles)) {
 	                include('include/modules.php');
@@ -217,18 +218,15 @@ 
         if(!empty($layout_def['remove_blank']) && $layout_def['remove_blank']) {
             if ( isset($layout_def['options']) &&  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/SugarWidgetSubPanelEditRoleButton.php

Indentation +21 added lines, -21 removed lines

@@ -45,33 +45,33 @@
 
 class SugarWidgetSubPanelEditRoleButton 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 $subpanel_item_count;
         $unique_id = $layout_def['subpanel_id']."_edit_".$subpanel_item_count; //bug 51512
 	
-		$href = 'index.php?module=' . $layout_def['module']
-			. '&action=' . 'ContactOpportunityRelationshipEdit'
-			. '&record=' . $layout_def['fields']['OPPORTUNITY_ROLE_ID']
-			. '&return_module=' . $_REQUEST['module']
-			. '&return_action=' . 'DetailView'
-			. '&return_id=' . $_REQUEST['record'];
+        $href = 'index.php?module=' . $layout_def['module']
+            . '&action=' . 'ContactOpportunityRelationshipEdit'
+            . '&record=' . $layout_def['fields']['OPPORTUNITY_ROLE_ID']
+            . '&return_module=' . $_REQUEST['module']
+            . '&return_action=' . 'DetailView'
+            . '&return_id=' . $_REQUEST['record'];
 			
-	//based on listview since that lets you select records
-	if($layout_def['ListView']){
-		return '<a href="' . $href . '"'
+    //based on listview since that lets you select records
+    if($layout_def['ListView']){
+        return '<a href="' . $href . '"'
             . "id=\"$unique_id\""
-			. 'class="listViewTdToolsS1">' . $app_strings['LNK_EDIT'] .'</a>&nbsp;';
-	}else{
-		return '';
-	}
-	}
+            . 'class="listViewTdToolsS1">' . $app_strings['LNK_EDIT'] .'</a>&nbsp;';
+    }else{
+        return '';
+    }
+    }
 }
 
 ?>
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -56,19 +56,19 @@ 
         global $subpanel_item_count;
         $unique_id = $layout_def['subpanel_id']."_edit_".$subpanel_item_count; //bug 51512
 	
-		$href = 'index.php?module=' . $layout_def['module']
-			. '&action=' . 'ContactOpportunityRelationshipEdit'
-			. '&record=' . $layout_def['fields']['OPPORTUNITY_ROLE_ID']
-			. '&return_module=' . $_REQUEST['module']
-			. '&return_action=' . 'DetailView'
-			. '&return_id=' . $_REQUEST['record'];
+		$href = 'index.php?module='.$layout_def['module']
+			. '&action='.'ContactOpportunityRelationshipEdit'
+			. '&record='.$layout_def['fields']['OPPORTUNITY_ROLE_ID']
+			. '&return_module='.$_REQUEST['module']
+			. '&return_action='.'DetailView'
+			. '&return_id='.$_REQUEST['record'];
 			
 	//based on listview since that lets you select records
-	if($layout_def['ListView']){
-		return '<a href="' . $href . '"'
+	if ($layout_def['ListView']) {
+		return '<a href="'.$href.'"'
             . "id=\"$unique_id\""
-			. 'class="listViewTdToolsS1">' . $app_strings['LNK_EDIT'] .'</a>&nbsp;';
-	}else{
+			. 'class="listViewTdToolsS1">'.$app_strings['LNK_EDIT'].'</a>&nbsp;';
+	} else {
 		return '';
 	}
 	}

Braces +4 added lines, -2 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.
@@ -68,7 +70,7 @@ 
 		return '<a href="' . $href . '"'
             . "id=\"$unique_id\""
 			. 'class="listViewTdToolsS1">' . $app_strings['LNK_EDIT'] .'</a>&nbsp;';
-	}else{
+	} else{
 		return '';
 	}
 	}