adamjakab / SuiteCRM

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

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();

Indentation +166 added lines, -166 removed lines

@@ -54,30 +54,30 @@ 
      */
     protected $reporter;
 
-	function __construct(&$layout_manager) {
+    function __construct(&$layout_manager) {
         parent::__construct($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";
+    }
 
 }

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 +32 added lines, -32 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,13 +48,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) {
@@ -74,7 +74,7 @@ 
 	}
 
 	public function queryFilterone_of($layout_def) {
-		$arr = array ();
+		$arr = array();
 		foreach ($layout_def['input_name0'] as $value) {
 			$arr[] = $this->reporter->db->quoted($value);
 		}
@@ -83,7 +83,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);
 		}
@@ -93,9 +93,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);
@@ -114,11 +114,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>";
@@ -127,25 +127,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']);
@@ -157,14 +157,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;
 	}
@@ -177,11 +177,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']);
@@ -199,17 +199,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();
             }
         }
@@ -217,7 +217,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 +10 added lines, -11 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.
@@ -95,7 +97,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);
@@ -129,13 +131,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];
 		}
@@ -143,7 +145,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');
@@ -202,18 +204,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 '';
 	}
 	}

include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateNoteButton.php

Indentation +115 added lines, -115 removed lines

@@ -45,121 +45,121 @@
 
 class SugarWidgetSubPanelTopCreateNoteButton extends SugarWidgetSubPanelTopButtonQuickCreate
 {
-	function &_get_form($defines, $additionalFormFields = null, $asUrl = false)
-	{
-		global $app_strings;
-		global $currentModule;
-
-		$this->module="Notes";
-		$this->subpanelDiv = "history";
-
-		// Create the additional form fields with real values if they were not passed in
-		if(empty($additionalFormFields) && $this->additional_form_fields)
-		{
-			foreach($this->additional_form_fields as $key=>$value)
-			{
-				if(!empty($defines['focus']->$value))
-				{
-					$additionalFormFields[$key] = $defines['focus']->$value;
-				}
-				else
-				{
-					$additionalFormFields[$key] = '';
-				}
-			}
-		}
-
-		if(!empty($this->module))
-		{
-			$defines['child_module_name'] = $this->module;
-		}
-		else
-		{
-			$defines['child_module_name'] = $defines['module'];
-		}
-
-		if(!empty($this->subpanelDiv))
-		{
-			$defines['subpanelDiv'] = $this->subpanelDiv;
-		}
-
-		$defines['parent_bean_name'] = get_class( $defines['focus']);
-
-		$form = 'form' . $defines['child_module_name'];
-		$button = '<form onsubmit="return SUGAR.subpanelUtils.sendAndRetrieve(this.id, \'subpanel_' . strtolower($defines['subpanelDiv']) . '\', \'' . addslashes($app_strings['LBL_LOADING']) . '\');" action="index.php" method="post" name="form" id="form' . $form . "\">\n";
-
-		//module_button is used to override the value of module name
-		$button .= "<input type='hidden' name='target_module' value='".$defines['child_module_name']."'>\n";
-		$button .= "<input type='hidden' name='".strtolower($defines['parent_bean_name'])."_id' value='".$defines['focus']->id."'>\n";
-
-		if(isset($defines['focus']->name))
-		{
-			$button .= "<input type='hidden' name='".strtolower($defines['parent_bean_name'])."_name' value='".$defines['focus']->name."'>";
-		}
-
-		$button .= '<input type="hidden" name="to_pdf" value="true" />';
+    function &_get_form($defines, $additionalFormFields = null, $asUrl = false)
+    {
+        global $app_strings;
+        global $currentModule;
+
+        $this->module="Notes";
+        $this->subpanelDiv = "history";
+
+        // Create the additional form fields with real values if they were not passed in
+        if(empty($additionalFormFields) && $this->additional_form_fields)
+        {
+            foreach($this->additional_form_fields as $key=>$value)
+            {
+                if(!empty($defines['focus']->$value))
+                {
+                    $additionalFormFields[$key] = $defines['focus']->$value;
+                }
+                else
+                {
+                    $additionalFormFields[$key] = '';
+                }
+            }
+        }
+
+        if(!empty($this->module))
+        {
+            $defines['child_module_name'] = $this->module;
+        }
+        else
+        {
+            $defines['child_module_name'] = $defines['module'];
+        }
+
+        if(!empty($this->subpanelDiv))
+        {
+            $defines['subpanelDiv'] = $this->subpanelDiv;
+        }
+
+        $defines['parent_bean_name'] = get_class( $defines['focus']);
+
+        $form = 'form' . $defines['child_module_name'];
+        $button = '<form onsubmit="return SUGAR.subpanelUtils.sendAndRetrieve(this.id, \'subpanel_' . strtolower($defines['subpanelDiv']) . '\', \'' . addslashes($app_strings['LBL_LOADING']) . '\');" action="index.php" method="post" name="form" id="form' . $form . "\">\n";
+
+        //module_button is used to override the value of module name
+        $button .= "<input type='hidden' name='target_module' value='".$defines['child_module_name']."'>\n";
+        $button .= "<input type='hidden' name='".strtolower($defines['parent_bean_name'])."_id' value='".$defines['focus']->id."'>\n";
+
+        if(isset($defines['focus']->name))
+        {
+            $button .= "<input type='hidden' name='".strtolower($defines['parent_bean_name'])."_name' value='".$defines['focus']->name."'>";
+        }
+
+        $button .= '<input type="hidden" name="to_pdf" value="true" />';
         $button .= '<input type="hidden" name="tpl" value="QuickCreate.tpl" />';
-		$button .= '<input type="hidden" name="return_module" value="' . $currentModule . "\" />\n";
-		$button .= '<input type="hidden" name="return_action" value="' . $defines['action'] . "\" />\n";
-		$button .= '<input type="hidden" name="return_id" value="' . $defines['focus']->id . "\" />\n";
-		$button .= '<input type="hidden" name="record" value="" />';
-
-		// TODO: move this out and get $additionalFormFields working properly
-		if(empty($additionalFormFields['parent_type']))
-		{
-			if($defines['focus']->object_name=='Contact') {
-				$additionalFormFields['parent_type'] = 'Accounts';
-			}
-			else {
-				$additionalFormFields['parent_type'] = $defines['focus']->module_dir;
-			}
-		}
-		if(empty($additionalFormFields['parent_name']))
-		{
-			if($defines['focus']->object_name=='Contact') {
-				$additionalFormFields['parent_name'] = $defines['focus']->account_name;
-				$additionalFormFields['account_name'] = $defines['focus']->account_name;
-			}
-			else {
-				$additionalFormFields['parent_name'] = $defines['focus']->name;
-			}
-		}
-		if(empty($additionalFormFields['parent_id']))
-		{
-			if($defines['focus']->object_name=='Contact') {
-				$additionalFormFields['parent_id'] = $defines['focus']->account_id;
-				$additionalFormFields['account_id'] = $defines['focus']->account_id;
-			}
-			else {
-				$additionalFormFields['parent_id'] = $defines['focus']->id;
-			}
-		}
-
-		$button .= '<input type="hidden" name="action" value="SubpanelCreates" />' . "\n";
-		$button .= '<input type="hidden" name="module" value="Home" />' . "\n";
-		$button .= '<input type="hidden" name="target_action" value="QuickCreate" />' . "\n";
-
-		// fill in additional form fields for all but action
-		foreach($additionalFormFields as $key => $value)
-		{
-			if($key != 'action')
-			{
-				$button .= '<input type="hidden" name="' . $key . '" value="' . $value . '" />' . "\n";
-			}
-		}
-
-		return $button;
-	}
-
-
-	function display($defines, $additionalFormFields = null, $nonbutton = false)
-	{
-	    $focus = new Note;
-		if ( !$focus->ACLAccess('EditView') ) {
-		    return '';
-	    }
-
-		return parent::display($defines, $additionalFormFields);
-	}
+        $button .= '<input type="hidden" name="return_module" value="' . $currentModule . "\" />\n";
+        $button .= '<input type="hidden" name="return_action" value="' . $defines['action'] . "\" />\n";
+        $button .= '<input type="hidden" name="return_id" value="' . $defines['focus']->id . "\" />\n";
+        $button .= '<input type="hidden" name="record" value="" />';
+
+        // TODO: move this out and get $additionalFormFields working properly
+        if(empty($additionalFormFields['parent_type']))
+        {
+            if($defines['focus']->object_name=='Contact') {
+                $additionalFormFields['parent_type'] = 'Accounts';
+            }
+            else {
+                $additionalFormFields['parent_type'] = $defines['focus']->module_dir;
+            }
+        }
+        if(empty($additionalFormFields['parent_name']))
+        {
+            if($defines['focus']->object_name=='Contact') {
+                $additionalFormFields['parent_name'] = $defines['focus']->account_name;
+                $additionalFormFields['account_name'] = $defines['focus']->account_name;
+            }
+            else {
+                $additionalFormFields['parent_name'] = $defines['focus']->name;
+            }
+        }
+        if(empty($additionalFormFields['parent_id']))
+        {
+            if($defines['focus']->object_name=='Contact') {
+                $additionalFormFields['parent_id'] = $defines['focus']->account_id;
+                $additionalFormFields['account_id'] = $defines['focus']->account_id;
+            }
+            else {
+                $additionalFormFields['parent_id'] = $defines['focus']->id;
+            }
+        }
+
+        $button .= '<input type="hidden" name="action" value="SubpanelCreates" />' . "\n";
+        $button .= '<input type="hidden" name="module" value="Home" />' . "\n";
+        $button .= '<input type="hidden" name="target_action" value="QuickCreate" />' . "\n";
+
+        // fill in additional form fields for all but action
+        foreach($additionalFormFields as $key => $value)
+        {
+            if($key != 'action')
+            {
+                $button .= '<input type="hidden" name="' . $key . '" value="' . $value . '" />' . "\n";
+            }
+        }
+
+        return $button;
+    }
+
+
+    function display($defines, $additionalFormFields = null, $nonbutton = false)
+    {
+        $focus = new Note;
+        if ( !$focus->ACLAccess('EditView') ) {
+            return '';
+        }
+
+        return parent::display($defines, $additionalFormFields);
+    }
 }
 ?>

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.
@@ -50,15 +50,15 @@ 
 		global $app_strings;
 		global $currentModule;
 
-		$this->module="Notes";
+		$this->module = "Notes";
 		$this->subpanelDiv = "history";
 
 		// Create the additional form fields with real values if they were not passed in
-		if(empty($additionalFormFields) && $this->additional_form_fields)
+		if (empty($additionalFormFields) && $this->additional_form_fields)
 		{
-			foreach($this->additional_form_fields as $key=>$value)
+			foreach ($this->additional_form_fields as $key=>$value)
 			{
-				if(!empty($defines['focus']->$value))
+				if (!empty($defines['focus']->$value))
 				{
 					$additionalFormFields[$key] = $defines['focus']->$value;
 				}
@@ -69,7 +69,7 @@ 
 			}
 		}
 
-		if(!empty($this->module))
+		if (!empty($this->module))
 		{
 			$defines['child_module_name'] = $this->module;
 		}
@@ -78,45 +78,45 @@ 
 			$defines['child_module_name'] = $defines['module'];
 		}
 
-		if(!empty($this->subpanelDiv))
+		if (!empty($this->subpanelDiv))
 		{
 			$defines['subpanelDiv'] = $this->subpanelDiv;
 		}
 
-		$defines['parent_bean_name'] = get_class( $defines['focus']);
+		$defines['parent_bean_name'] = get_class($defines['focus']);
 
-		$form = 'form' . $defines['child_module_name'];
-		$button = '<form onsubmit="return SUGAR.subpanelUtils.sendAndRetrieve(this.id, \'subpanel_' . strtolower($defines['subpanelDiv']) . '\', \'' . addslashes($app_strings['LBL_LOADING']) . '\');" action="index.php" method="post" name="form" id="form' . $form . "\">\n";
+		$form = 'form'.$defines['child_module_name'];
+		$button = '<form onsubmit="return SUGAR.subpanelUtils.sendAndRetrieve(this.id, \'subpanel_'.strtolower($defines['subpanelDiv']).'\', \''.addslashes($app_strings['LBL_LOADING']).'\');" action="index.php" method="post" name="form" id="form'.$form."\">\n";
 
 		//module_button is used to override the value of module name
 		$button .= "<input type='hidden' name='target_module' value='".$defines['child_module_name']."'>\n";
 		$button .= "<input type='hidden' name='".strtolower($defines['parent_bean_name'])."_id' value='".$defines['focus']->id."'>\n";
 
-		if(isset($defines['focus']->name))
+		if (isset($defines['focus']->name))
 		{
 			$button .= "<input type='hidden' name='".strtolower($defines['parent_bean_name'])."_name' value='".$defines['focus']->name."'>";
 		}
 
 		$button .= '<input type="hidden" name="to_pdf" value="true" />';
         $button .= '<input type="hidden" name="tpl" value="QuickCreate.tpl" />';
-		$button .= '<input type="hidden" name="return_module" value="' . $currentModule . "\" />\n";
-		$button .= '<input type="hidden" name="return_action" value="' . $defines['action'] . "\" />\n";
-		$button .= '<input type="hidden" name="return_id" value="' . $defines['focus']->id . "\" />\n";
+		$button .= '<input type="hidden" name="return_module" value="'.$currentModule."\" />\n";
+		$button .= '<input type="hidden" name="return_action" value="'.$defines['action']."\" />\n";
+		$button .= '<input type="hidden" name="return_id" value="'.$defines['focus']->id."\" />\n";
 		$button .= '<input type="hidden" name="record" value="" />';
 
 		// TODO: move this out and get $additionalFormFields working properly
-		if(empty($additionalFormFields['parent_type']))
+		if (empty($additionalFormFields['parent_type']))
 		{
-			if($defines['focus']->object_name=='Contact') {
+			if ($defines['focus']->object_name == 'Contact') {
 				$additionalFormFields['parent_type'] = 'Accounts';
 			}
 			else {
 				$additionalFormFields['parent_type'] = $defines['focus']->module_dir;
 			}
 		}
-		if(empty($additionalFormFields['parent_name']))
+		if (empty($additionalFormFields['parent_name']))
 		{
-			if($defines['focus']->object_name=='Contact') {
+			if ($defines['focus']->object_name == 'Contact') {
 				$additionalFormFields['parent_name'] = $defines['focus']->account_name;
 				$additionalFormFields['account_name'] = $defines['focus']->account_name;
 			}
@@ -124,9 +124,9 @@ 
 				$additionalFormFields['parent_name'] = $defines['focus']->name;
 			}
 		}
-		if(empty($additionalFormFields['parent_id']))
+		if (empty($additionalFormFields['parent_id']))
 		{
-			if($defines['focus']->object_name=='Contact') {
+			if ($defines['focus']->object_name == 'Contact') {
 				$additionalFormFields['parent_id'] = $defines['focus']->account_id;
 				$additionalFormFields['account_id'] = $defines['focus']->account_id;
 			}
@@ -135,16 +135,16 @@ 
 			}
 		}
 
-		$button .= '<input type="hidden" name="action" value="SubpanelCreates" />' . "\n";
-		$button .= '<input type="hidden" name="module" value="Home" />' . "\n";
-		$button .= '<input type="hidden" name="target_action" value="QuickCreate" />' . "\n";
+		$button .= '<input type="hidden" name="action" value="SubpanelCreates" />'."\n";
+		$button .= '<input type="hidden" name="module" value="Home" />'."\n";
+		$button .= '<input type="hidden" name="target_action" value="QuickCreate" />'."\n";
 
 		// fill in additional form fields for all but action
-		foreach($additionalFormFields as $key => $value)
+		foreach ($additionalFormFields as $key => $value)
 		{
-			if($key != 'action')
+			if ($key != 'action')
 			{
-				$button .= '<input type="hidden" name="' . $key . '" value="' . $value . '" />' . "\n";
+				$button .= '<input type="hidden" name="'.$key.'" value="'.$value.'" />'."\n";
 			}
 		}
 
@@ -155,7 +155,7 @@ 
 	function display($defines, $additionalFormFields = null, $nonbutton = false)
 	{
 	    $focus = new Note;
-		if ( !$focus->ACLAccess('EditView') ) {
+		if (!$focus->ACLAccess('EditView')) {
 		    return '';
 	    }
 

Braces +8 added lines, -11 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,8 +63,7 @@ 
 				if(!empty($defines['focus']->$value))
 				{
 					$additionalFormFields[$key] = $defines['focus']->$value;
-				}
-				else
+				} else
 				{
 					$additionalFormFields[$key] = '';
 				}
@@ -72,8 +73,7 @@ 
 		if(!empty($this->module))
 		{
 			$defines['child_module_name'] = $this->module;
-		}
-		else
+		} else
 		{
 			$defines['child_module_name'] = $defines['module'];
 		}
@@ -109,8 +109,7 @@ 
 		{
 			if($defines['focus']->object_name=='Contact') {
 				$additionalFormFields['parent_type'] = 'Accounts';
-			}
-			else {
+			} else {
 				$additionalFormFields['parent_type'] = $defines['focus']->module_dir;
 			}
 		}
@@ -119,8 +118,7 @@ 
 			if($defines['focus']->object_name=='Contact') {
 				$additionalFormFields['parent_name'] = $defines['focus']->account_name;
 				$additionalFormFields['account_name'] = $defines['focus']->account_name;
-			}
-			else {
+			} else {
 				$additionalFormFields['parent_name'] = $defines['focus']->name;
 			}
 		}
@@ -129,8 +127,7 @@ 
 			if($defines['focus']->object_name=='Contact') {
 				$additionalFormFields['parent_id'] = $defines['focus']->account_id;
 				$additionalFormFields['account_id'] = $defines['focus']->account_id;
-			}
-			else {
+			} else {
 				$additionalFormFields['parent_id'] = $defines['focus']->id;
 			}
 		}

include/generic/SugarWidgets/SugarWidgetFieldtext.php

Indentation +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
     function queryFilterEquals($layout_def)
     {
         return $this->reporter->db->convert($this->_get_column_select($layout_def), "text2char").
-        	" = ".$this->reporter->db->quoted($layout_def['input_name0']);
+            " = ".$this->reporter->db->quoted($layout_def['input_name0']);
     }
 
     function queryFilterNot_Equals_Str($layout_def)

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -56,7 +56,7 @@ 
     function queryFilterNot_Equals_Str($layout_def)
     {
         $column = $this->_get_column_select($layout_def);
-        return "($column IS NULL OR ". $this->reporter->db->convert($column, "text2char")." != ".
+        return "($column IS NULL OR ".$this->reporter->db->convert($column, "text2char")." != ".
             $this->reporter->db->quoted($layout_def['input_name0']).")";
     }
 

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.