adamjakab / SuiteCRM

include/generic/SugarWidgets/SugarWidgetFielddatetimecombo.php

Spacing +5 added lines, -5 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.
@@ -43,7 +43,7 @@ 
 
 class SugarWidgetFieldDateTimecombo extends SugarWidgetFieldDateTime {
 	var $reporter;
-	var $assigned_user=null;
+	var $assigned_user = null;
 
     function __construct(&$layout_manager) {
         parent::__construct($layout_manager);
@@ -53,9 +53,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
      */
-    function SugarWidgetFieldDateTimecombo(&$layout_manager){
+    function SugarWidgetFieldDateTimecombo(&$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 {
@@ -68,7 +68,7 @@ 
 	//If there is requirement, we can modify report.js::addFilterInputDatetimesBetween and this function
 	function queryFilterBetween_Datetimes(& $layout_def) {
 		global $timedate;
-		if($this->getAssignedUser()) {
+		if ($this->getAssignedUser()) {
 			$begin = $timedate->handle_offset($layout_def['input_name0'], $timedate->get_db_date_time_format(), false, $this->assigned_user);
 			$end = $timedate->handle_offset($layout_def['input_name2'], $timedate->get_db_date_time_format(), false, $this->assigned_user);
 		}

Braces +5 added lines, -5 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.
@@ -57,8 +59,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);
@@ -71,8 +72,7 @@ 
 		if($this->getAssignedUser()) {
 			$begin = $timedate->handle_offset($layout_def['input_name0'], $timedate->get_db_date_time_format(), false, $this->assigned_user);
 			$end = $timedate->handle_offset($layout_def['input_name2'], $timedate->get_db_date_time_format(), false, $this->assigned_user);
-		}
-		else {
+		} else {
 			$begin = $layout_def['input_name0'];
 			$end = $layout_def['input_name1'];
 		}

include/generic/SugarWidgets/SugarWidgetFielddatetime.php

Indentation +282 added lines, -282 removed lines

@@ -43,8 +43,8 @@ 
 
 class SugarWidgetFieldDateTime extends SugarWidgetReportField
 {
-	var $reporter;
-	var $assigned_user=null;
+    var $reporter;
+    var $assigned_user=null;
 
     function __construct($layout_manager)
     {
@@ -66,31 +66,31 @@ 
     }
 
 
-	// get the reporter attribute
+    // get the reporter attribute
     // deprecated, now called in the constructor
     /**
      * @deprecated
      */
-	function getReporter() {
-	}
+    function getReporter() {
+    }
 
-	// get the assigned user of the report
-	function getAssignedUser()
-	{
-		$json_obj = getJSONobj();
+    // get the assigned user of the report
+    function getAssignedUser()
+    {
+        $json_obj = getJSONobj();
 
-		$report_def_str = $json_obj->decode($this->reporter->report_def_str);
+        $report_def_str = $json_obj->decode($this->reporter->report_def_str);
 
-		if(empty($report_def_str['assigned_user_id'])) return null;
+        if(empty($report_def_str['assigned_user_id'])) return null;
 
-		$this->assigned_user = new User();
-		$this->assigned_user->retrieve($report_def_str['assigned_user_id']);
-		return $this->assigned_user;
-	}
+        $this->assigned_user = new User();
+        $this->assigned_user->retrieve($report_def_str['assigned_user_id']);
+        return $this->assigned_user;
+    }
 
-	function queryFilterOn($layout_def)
-	{
-		global $timedate;
+    function queryFilterOn($layout_def)
+    {
+        global $timedate;
         $begin = $layout_def['input_name0'];
         $hasTime = $this->hasTime($begin);
         $date = $timedate->fromString($begin);
@@ -108,7 +108,7 @@ 
             '=',
             "datetime"
         );
-	}
+    }
 
     /**
      * expandDate
@@ -123,61 +123,61 @@ 
      * @param bool $end Boolean value indicating whether or not this is for an end time period or not
      * @return $date TimeDate object with time value applied
      */
-	protected function expandDate($date, $end = false)
-	{
-	    global $timedate;
-	    if($this->hasTime($date)) {
-	        return $date;
-	    }
+    protected function expandDate($date, $end = false)
+    {
+        global $timedate;
+        if($this->hasTime($date)) {
+            return $date;
+        }
 
         //C.L. Bug 48616 - If the $date is set to the Today macro, then adjust accordingly
         if(strtolower($date) == 'today')
         {
-           $startEnd = $timedate->getDayStartEndGMT($timedate->getNow(true));
-           return $end ? $startEnd['end'] : $startEnd['start'];
+            $startEnd = $timedate->getDayStartEndGMT($timedate->getNow(true));
+            return $end ? $startEnd['end'] : $startEnd['start'];
         }
 
         $parsed = $timedate->fromDbDate($date);
         $date = $timedate->tzUser(new SugarDateTime());
         $date->setDate($parsed->year, $parsed->month, $parsed->day);
 
-	    if($end) {
-	        return $date->setTime(23, 59, 59);
-	    } else {
-	        return $date->setTime(0, 0, 0);
-	    }
-	}
+        if($end) {
+            return $date->setTime(23, 59, 59);
+        } else {
+            return $date->setTime(0, 0, 0);
+        }
+    }
 
-	function queryFilterBefore($layout_def)
-	{
+    function queryFilterBefore($layout_def)
+    {
         $begin = $this->expandDate($layout_def['input_name0']);
         return $this->queryDateOp($this->_get_column_select($layout_def), $begin, '<', "datetime");
-	}
+    }
 
-	function queryFilterAfter($layout_def)
-	{
+    function queryFilterAfter($layout_def)
+    {
         $begin = $this->expandDate($layout_def['input_name0'], true);
         return $this->queryDateOp($this->_get_column_select($layout_def), $begin, '>', "datetime");
-	}
+    }
 
-	function queryFilterBetween_Dates($layout_def)
-	{
+    function queryFilterBetween_Dates($layout_def)
+    {
         $begin = $this->expandDate($layout_def['input_name0']);
-     	$end = $this->expandDate($layout_def['input_name1'], true);
+            $end = $this->expandDate($layout_def['input_name1'], true);
         $column = $this->_get_column_select($layout_def);
-	    return "(".$this->queryDateOp($column, $begin, ">=", "datetime")." AND ".
+        return "(".$this->queryDateOp($column, $begin, ">=", "datetime")." AND ".
             $this->queryDateOp($column, $end, "<=", "datetime").")\n";
-	}
+    }
 
-	function queryFilterNot_Equals_str($layout_def)
-	{
-		global $timedate;
+    function queryFilterNot_Equals_str($layout_def)
+    {
+        global $timedate;
 
         $column = $this->_get_column_select($layout_def);
         $begin = $layout_def['input_name0'];
         $hasTime = $this->hasTime($begin);
         if(!$hasTime){
-     	    $end = $this->expandDate($begin, true);
+                $end = $this->expandDate($begin, true);
             $begin = $this->expandDate($begin);
             $cond = $this->queryDateOp($column, $begin, "<", "datetime")." OR ".
                 $this->queryDateOp($column, $end, ">", "datetime");
@@ -185,45 +185,45 @@ 
             $cond =  $this->queryDateOp($column, $begin, "!=", "datetime");
         }
         return "($column IS NULL OR $cond)";
-	}
+    }
 
     /**
      * Get assigned or logged in user's current date and time value.
      * @param boolean $timestamp Format of return value, if set to true, return unix like timestamp , else a formatted date.
      */
-	function get_users_current_date_time($timestamp=false)
-	{
-	 	global $current_user;
+    function get_users_current_date_time($timestamp=false)
+    {
+            global $current_user;
         global $timedate;
 
         $begin = TimeDate::getInstance()->nowDb();
         //kbrill bug #13884
-       	//$begin = $timedate->to_display_date_time($begin,true,true,$this->assigned_user);
-		$begin = $timedate->handle_offset($begin, $timedate->get_db_date_time_format(), false, $this->assigned_user);
+            //$begin = $timedate->to_display_date_time($begin,true,true,$this->assigned_user);
+        $begin = $timedate->handle_offset($begin, $timedate->get_db_date_time_format(), false, $this->assigned_user);
 
         if (!$timestamp) {
-        	return $begin;
+            return $begin;
         } else {
-        	$begin_parts = explode(' ', $begin);
-        	$date_parts=explode('-', $begin_parts[0]);
-        	$time_parts=explode(':', $begin_parts[1]);
-        	$curr_timestamp=mktime($time_parts[0],$time_parts[1],0,$date_parts[1], $date_parts[2],$date_parts[0]);
-        	return $curr_timestamp;
-        }
-
-	}
-	/**
-	 * Get specified date and time for a particalur day, in current user's timezone.
-	 * @param int $days Adjust date by this number of days, negative values are valid.
-	 * @param time string falg for desired time value, start: minimum time, end: maximum time, default: current time
-	 */
-	function get_db_date($days,$time) {
+            $begin_parts = explode(' ', $begin);
+            $date_parts=explode('-', $begin_parts[0]);
+            $time_parts=explode(':', $begin_parts[1]);
+            $curr_timestamp=mktime($time_parts[0],$time_parts[1],0,$date_parts[1], $date_parts[2],$date_parts[0]);
+            return $curr_timestamp;
+        }
+
+    }
+    /**
+     * Get specified date and time for a particalur day, in current user's timezone.
+     * @param int $days Adjust date by this number of days, negative values are valid.
+     * @param time string falg for desired time value, start: minimum time, end: maximum time, default: current time
+     */
+    function get_db_date($days,$time) {
         global $timedate;
 
         $begin = date($GLOBALS['timedate']->get_db_date_time_format(), time()+(86400 * $days));  //gmt date with day adjustment applied.
         //kbrill bug #13884
         //$begin = $timedate->to_display_date_time($begin,true,true,$this->assigned_user);
-		$begin = $timedate->handle_offset($begin, $timedate->get_db_date_time_format(), false, $this->assigned_user);
+        $begin = $timedate->handle_offset($begin, $timedate->get_db_date_time_format(), false, $this->assigned_user);
 
         if ($time=='start') {
             $begin_parts = explode(' ', $begin);
@@ -240,38 +240,38 @@ 
         $begin = $timedate->handle_offset($be, $timedate->get_db_date_time_format(), false, $this->assigned_user);
 
         return $begin;
-	}
-
-	/**
-	 * Get filter string for a date field.
-	 * @param array layout_def field def for field being filtered
-	 * @param string $begin start date value (in DB format)
-	 * @param string $end End date value (in DB format)
-	 */
-	function get_start_end_date_filter(& $layout_def, $begin,$end)
-	{
-	    if (isset ($layout_def['rel_field'])) {
-	        $field_name = $this->reporter->db->convert(
-	            $this->reporter->db->convert($this->_get_column_select($layout_def), 'date_format', '%Y-%m-%d'),
-	            "CONCAT",
-	            array("' '", $this->reporter->db->convert($layout_def['rel_field'], 'time_format'))
-	        );
-	    } else {
-	       $field_name = $this->_get_column_select($layout_def);
-	    }
-	    return $field_name.">=".$this->reporter->db->quoted($begin)." AND ".$field_name."<=".$this->reporter->db->quoted($end)."\n";
-	}
-
-	/**
-	 * Create query for binary operation of field of certain type
-	 * Produces query like:
-	 * arg1 op to_date(arg2), e.g.:
-	 * 		date_closed < '2009-12-01'
-	 * @param string $arg1 1st arg - column name
-	 * @param string|DateTime $arg2 2nd arg - value to be converted
-	 * @param string $op
-	 * @param string $type
-	 */
+    }
+
+    /**
+     * Get filter string for a date field.
+     * @param array layout_def field def for field being filtered
+     * @param string $begin start date value (in DB format)
+     * @param string $end End date value (in DB format)
+     */
+    function get_start_end_date_filter(& $layout_def, $begin,$end)
+    {
+        if (isset ($layout_def['rel_field'])) {
+            $field_name = $this->reporter->db->convert(
+                $this->reporter->db->convert($this->_get_column_select($layout_def), 'date_format', '%Y-%m-%d'),
+                "CONCAT",
+                array("' '", $this->reporter->db->convert($layout_def['rel_field'], 'time_format'))
+            );
+        } else {
+            $field_name = $this->_get_column_select($layout_def);
+        }
+        return $field_name.">=".$this->reporter->db->quoted($begin)." AND ".$field_name."<=".$this->reporter->db->quoted($end)."\n";
+    }
+
+    /**
+     * Create query for binary operation of field of certain type
+     * Produces query like:
+     * arg1 op to_date(arg2), e.g.:
+     * 		date_closed < '2009-12-01'
+     * @param string $arg1 1st arg - column name
+     * @param string|DateTime $arg2 2nd arg - value to be converted
+     * @param string $op
+     * @param string $type
+     */
     protected function queryDateOp($arg1, $arg2, $op, $type)
     {
         global $timedate;
@@ -291,7 +291,7 @@ 
         return $timedate->tzUser($timedate->getNow(), $this->getAssignedUser());
     }
 
-	/**
+    /**
      * Create query from the beginning to the end of certain day
      * @param array $layout_def
      * @param SugarDateTime $day
@@ -303,43 +303,43 @@ 
         return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
     }
 
-	function queryFilterTP_yesterday($layout_def)
-	{
-		global $timedate;
-		return $this->queryDay($layout_def, $this->now()->get("-1 day"));
-	}
+    function queryFilterTP_yesterday($layout_def)
+    {
+        global $timedate;
+        return $this->queryDay($layout_def, $this->now()->get("-1 day"));
+    }
 
-	function queryFilterTP_today($layout_def)
-	{
-		global $timedate;
-		return $this->queryDay($layout_def, $this->now());
-	}
+    function queryFilterTP_today($layout_def)
+    {
+        global $timedate;
+        return $this->queryDay($layout_def, $this->now());
+    }
 
-	function queryFilterTP_tomorrow(& $layout_def)
-	{
-		global $timedate;
-		return $this->queryDay($layout_def, $this->now()->get("+1 day"));
-	}
+    function queryFilterTP_tomorrow(& $layout_def)
+    {
+        global $timedate;
+        return $this->queryDay($layout_def, $this->now()->get("+1 day"));
+    }
 
-	function queryFilterTP_last_7_days($layout_def)
-	{
-		global $timedate;
+    function queryFilterTP_last_7_days($layout_def)
+    {
+        global $timedate;
 
-		$begin = $this->now()->get("-6 days")->get_day_begin();
-		$end = $this->now()->get_day_end();
+        $begin = $this->now()->get("-6 days")->get_day_begin();
+        $end = $this->now()->get_day_end();
 
-		return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
-	}
+        return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
+    }
 
-	function queryFilterTP_next_7_days($layout_def)
-	{
-		global $timedate;
+    function queryFilterTP_next_7_days($layout_def)
+    {
+        global $timedate;
 
-		$begin = $this->now()->get_day_begin();
-		$end = $this->now()->get("+6 days")->get_day_end();
+        $begin = $this->now()->get_day_begin();
+        $end = $this->now()->get("+6 days")->get_day_end();
 
-		return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
-	}
+        return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
+    }
 
     /**
      * Create query from the beginning to the end of certain month
@@ -350,20 +350,20 @@ 
     {
         $begin = $month->setTime(0, 0, 0);
         $end = clone($begin);
-		$end->setDate($begin->year, $begin->month, $begin->days_in_month)->setTime(23, 59, 59);
+        $end->setDate($begin->year, $begin->month, $begin->days_in_month)->setTime(23, 59, 59);
         return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
     }
 
     function queryFilterTP_last_month($layout_def)
-	{
-		global $timedate;
-		$month = $this->now();
-		return $this->queryMonth($layout_def, $month->setDate($month->year, $month->month-1, 1));
-	}
+    {
+        global $timedate;
+        $month = $this->now();
+        return $this->queryMonth($layout_def, $month->setDate($month->year, $month->month-1, 1));
+    }
 
-	function queryFilterTP_this_month($layout_def)
-	{
-		global $timedate;
+    function queryFilterTP_this_month($layout_def)
+    {
+        global $timedate;
 
         //Bug 62414 - take timezone into account when determining current month
         $now = $this->now();
@@ -372,30 +372,30 @@ 
         $now->modify($timezoneOffset);
 
         return $this->queryMonth($layout_def, $now->get_day_by_index_this_month(0));
-	}
-
-	function queryFilterTP_next_month($layout_def)
-	{
-		global $timedate;
-		$month = $this->now();
-		return $this->queryMonth($layout_def, $month->setDate($month->year, $month->month+1, 1));
-	}
-
-	function queryFilterTP_last_30_days($layout_def)
-	{
-		global $timedate;
-		$begin = $this->now()->get("-29 days")->get_day_begin();
-		$end = $this->now()->get_day_end();
-		return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
-	}
-
-	function queryFilterTP_next_30_days($layout_def)
-	{
-		global $timedate;
-		$begin = $this->now()->get_day_begin();
-		$end = $this->now()->get("+29 days")->get_day_end();
-		return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
-	}
+    }
+
+    function queryFilterTP_next_month($layout_def)
+    {
+        global $timedate;
+        $month = $this->now();
+        return $this->queryMonth($layout_def, $month->setDate($month->year, $month->month+1, 1));
+    }
+
+    function queryFilterTP_last_30_days($layout_def)
+    {
+        global $timedate;
+        $begin = $this->now()->get("-29 days")->get_day_begin();
+        $end = $this->now()->get_day_end();
+        return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
+    }
+
+    function queryFilterTP_next_30_days($layout_def)
+    {
+        global $timedate;
+        $begin = $this->now()->get_day_begin();
+        $end = $this->now()->get("+29 days")->get_day_end();
+        return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
+    }
 
     /**
      * Return the between WHERE query for Quarter filter
@@ -468,59 +468,59 @@ 
         return $this->getQuarterFilter($layout_def, '+3 month');
     }
 
-	function queryFilterTP_last_year($layout_def)
-	{
-		global $timedate;
-		$begin = $this->now();
-		$begin->setDate($begin->year-1, 1, 1)->setTime(0, 0);
-		$end = clone $begin;
-		$end->setDate($end->year, 12, 31)->setTime(23, 59, 59);
-		return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
-	}
-
-	function queryFilterTP_this_year($layout_def)
-	{
-		global $timedate;
-		$begin = $this->now();
-		$begin->setDate($begin->year, 1, 1)->setTime(0, 0);
-		$end = clone $begin;
-		$end->setDate($end->year, 12, 31)->setTime(23, 59, 59);
-		return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
-	}
-
-	function queryFilterTP_next_year(& $layout_def)
-	{
-		global $timedate;
-		$begin = $this->now();
-		$begin->setDate($begin->year+1, 1, 1)->setTime(0, 0);
-		$end = clone $begin;
-		$end->setDate($end->year, 12, 31)->setTime(23, 59, 59);
-		return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
-	}
-
-	function queryGroupBy($layout_def)
-	{
-		// i guess qualifier and column_function are the same..
-		if (!empty ($layout_def['qualifier'])) {
-			$func_name = 'queryGroupBy'.$layout_def['qualifier'];
-			if (method_exists($this, $func_name)) {
-				return $this-> $func_name ($layout_def)." \n";
-			}
-		}
-		return parent :: queryGroupBy($layout_def)." \n";
-	}
-
-	function queryOrderBy($layout_def)
-	{
+    function queryFilterTP_last_year($layout_def)
+    {
+        global $timedate;
+        $begin = $this->now();
+        $begin->setDate($begin->year-1, 1, 1)->setTime(0, 0);
+        $end = clone $begin;
+        $end->setDate($end->year, 12, 31)->setTime(23, 59, 59);
+        return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
+    }
+
+    function queryFilterTP_this_year($layout_def)
+    {
+        global $timedate;
+        $begin = $this->now();
+        $begin->setDate($begin->year, 1, 1)->setTime(0, 0);
+        $end = clone $begin;
+        $end->setDate($end->year, 12, 31)->setTime(23, 59, 59);
+        return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
+    }
+
+    function queryFilterTP_next_year(& $layout_def)
+    {
+        global $timedate;
+        $begin = $this->now();
+        $begin->setDate($begin->year+1, 1, 1)->setTime(0, 0);
+        $end = clone $begin;
+        $end->setDate($end->year, 12, 31)->setTime(23, 59, 59);
+        return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
+    }
+
+    function queryGroupBy($layout_def)
+    {
+        // i guess qualifier and column_function are the same..
+        if (!empty ($layout_def['qualifier'])) {
+            $func_name = 'queryGroupBy'.$layout_def['qualifier'];
+            if (method_exists($this, $func_name)) {
+                return $this-> $func_name ($layout_def)." \n";
+            }
+        }
+        return parent :: queryGroupBy($layout_def)." \n";
+    }
+
+    function queryOrderBy($layout_def)
+    {
         if (!empty ($layout_def['qualifier'])) {
-			$func_name ='queryOrderBy'.$layout_def['qualifier'];
-			if (method_exists($this, $func_name)) {
-				return $this-> $func_name ($layout_def)."\n";
-			}
-		}
-		$order_by = parent :: queryOrderBy($layout_def)."\n";
-		return $order_by;
-	}
+            $func_name ='queryOrderBy'.$layout_def['qualifier'];
+            if (method_exists($this, $func_name)) {
+                return $this-> $func_name ($layout_def)."\n";
+            }
+        }
+        $order_by = parent :: queryOrderBy($layout_def)."\n";
+        return $order_by;
+    }
 
     function displayListPlain($layout_def) {
         global $timedate;
@@ -566,39 +566,39 @@ 
         return $timedate->to_display_date_time($content);
     }
 
-	function querySelect(& $layout_def) {
-		// i guess qualifier and column_function are the same..
-		if (!empty ($layout_def['column_function'])) {
-			$func_name = 'querySelect'.$layout_def['column_function'];
-			if (method_exists($this, $func_name)) {
-				return $this-> $func_name ($layout_def)." \n";
-			}
-		}
-		return parent :: querySelect($layout_def)." \n";
-	}
-	function & displayListday(& $layout_def) {
+    function querySelect(& $layout_def) {
+        // i guess qualifier and column_function are the same..
+        if (!empty ($layout_def['column_function'])) {
+            $func_name = 'querySelect'.$layout_def['column_function'];
+            if (method_exists($this, $func_name)) {
+                return $this-> $func_name ($layout_def)." \n";
+            }
+        }
+        return parent :: querySelect($layout_def)." \n";
+    }
+    function & displayListday(& $layout_def) {
+        $value = parent:: displayListPlain($layout_def);
+        return $value;
+    }
+
+    function & displayListyear(& $layout_def) {
+        global $app_list_strings;
         $value = parent:: displayListPlain($layout_def);
         return $value;
-	}
-
-	function & displayListyear(& $layout_def) {
-		global $app_list_strings;
-    	$value = parent:: displayListPlain($layout_def);
-    	return $value;
-	}
-
-	function displayListmonth($layout_def)
-	{
-		global $app_list_strings;
-		$display = '';
-		$match = array();
+    }
+
+    function displayListmonth($layout_def)
+    {
+        global $app_list_strings;
+        $display = '';
+        $match = array();
         if (preg_match('/(\d{4})-(\d\d)/', $this->displayListPlain($layout_def), $match)) {
-			$match[2] = preg_replace('/^0/', '', $match[2]);
-			$display = $app_list_strings['dom_cal_month_long'][$match[2]]." {$match[1]}";
-		}
-		return $display;
+            $match[2] = preg_replace('/^0/', '', $match[2]);
+            $display = $app_list_strings['dom_cal_month_long'][$match[2]]." {$match[1]}";
+        }
+        return $display;
 
-	}
+    }
 
     /**
      * Returns part of query for select
@@ -721,32 +721,32 @@ 
         return $this->reporter->db->convert($return, "date_format", array('%Y')) . "\n";
     }
 
-	function querySelectquarter($layout_def)
-	{
-	    $column = $this->_get_column_select($layout_def);
-	    return $this->reporter->db->convert($this->reporter->db->convert($column, "date_format", array('%Y')),
-	        	'CONCAT',
-	            array("'-'", $this->reporter->db->convert($column, "quarter")))
-	        ." ".$this->_get_column_alias($layout_def)."\n";
-	}
+    function querySelectquarter($layout_def)
+    {
+        $column = $this->_get_column_select($layout_def);
+        return $this->reporter->db->convert($this->reporter->db->convert($column, "date_format", array('%Y')),
+                'CONCAT',
+                array("'-'", $this->reporter->db->convert($column, "quarter")))
+            ." ".$this->_get_column_alias($layout_def)."\n";
+    }
 
-	function displayListquarter(& $layout_def) {
-		$match = array();
+    function displayListquarter(& $layout_def) {
+        $match = array();
         if (preg_match('/(\d{4})-(\d)/', $this->displayListPlain($layout_def), $match)) {
-			return "Q".$match[2]." ".$match[1];
-		}
-		return '';
+            return "Q".$match[2]." ".$match[1];
+        }
+        return '';
 
-	}
+    }
 
-	function queryGroupByQuarter($layout_def)
-	{
-		$this->getReporter();
+    function queryGroupByQuarter($layout_def)
+    {
+        $this->getReporter();
         $column = $this->_get_column_select($layout_def);
-	    return $this->reporter->db->convert($this->reporter->db->convert($column, "date_format", array('%Y')),
-	        	'CONCAT',
-	            array("'-'", $this->reporter->db->convert($column, "quarter")));
-	}
+        return $this->reporter->db->convert($this->reporter->db->convert($column, "date_format", array('%Y')),
+                'CONCAT',
+                array("'-'", $this->reporter->db->convert($column, "quarter")));
+    }
 
     /**
      * For oracle we have to return order by string like group by string instead of return field alias
@@ -775,23 +775,23 @@ 
     }
 
     function displayInput(&$layout_def) {
-    	global $timedate, $current_language, $app_strings;
+        global $timedate, $current_language, $app_strings;
         $home_mod_strings = return_module_language($current_language, 'Home');
         $filterTypes = array(' '                 => $app_strings['LBL_NONE'],
-                             'TP_today'         => $home_mod_strings['LBL_TODAY'],
-                             'TP_yesterday'     => $home_mod_strings['LBL_YESTERDAY'],
-                             'TP_tomorrow'      => $home_mod_strings['LBL_TOMORROW'],
-                             'TP_this_month'    => $home_mod_strings['LBL_THIS_MONTH'],
-                             'TP_this_year'     => $home_mod_strings['LBL_THIS_YEAR'],
-                             'TP_last_30_days'  => $home_mod_strings['LBL_LAST_30_DAYS'],
-                             'TP_last_7_days'   => $home_mod_strings['LBL_LAST_7_DAYS'],
-                             'TP_last_month'    => $home_mod_strings['LBL_LAST_MONTH'],
-                             'TP_last_year'     => $home_mod_strings['LBL_LAST_YEAR'],
-                             'TP_next_30_days'  => $home_mod_strings['LBL_NEXT_30_DAYS'],
-                             'TP_next_7_days'   => $home_mod_strings['LBL_NEXT_7_DAYS'],
-                             'TP_next_month'    => $home_mod_strings['LBL_NEXT_MONTH'],
-                             'TP_next_year'     => $home_mod_strings['LBL_NEXT_YEAR'],
-                             );
+                                'TP_today'         => $home_mod_strings['LBL_TODAY'],
+                                'TP_yesterday'     => $home_mod_strings['LBL_YESTERDAY'],
+                                'TP_tomorrow'      => $home_mod_strings['LBL_TOMORROW'],
+                                'TP_this_month'    => $home_mod_strings['LBL_THIS_MONTH'],
+                                'TP_this_year'     => $home_mod_strings['LBL_THIS_YEAR'],
+                                'TP_last_30_days'  => $home_mod_strings['LBL_LAST_30_DAYS'],
+                                'TP_last_7_days'   => $home_mod_strings['LBL_LAST_7_DAYS'],
+                                'TP_last_month'    => $home_mod_strings['LBL_LAST_MONTH'],
+                                'TP_last_year'     => $home_mod_strings['LBL_LAST_YEAR'],
+                                'TP_next_30_days'  => $home_mod_strings['LBL_NEXT_30_DAYS'],
+                                'TP_next_7_days'   => $home_mod_strings['LBL_NEXT_7_DAYS'],
+                                'TP_next_month'    => $home_mod_strings['LBL_NEXT_MONTH'],
+                                'TP_next_year'     => $home_mod_strings['LBL_NEXT_YEAR'],
+                                );
 
         $cal_dateformat = $timedate->get_cal_date_format();
         $str = "<select name='type_{$layout_def['name']}'>";

Spacing +56 added lines, -56 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.
@@ -44,7 +44,7 @@ 
 class SugarWidgetFieldDateTime extends SugarWidgetReportField
 {
 	var $reporter;
-	var $assigned_user=null;
+	var $assigned_user = null;
 
     function __construct($layout_manager)
     {
@@ -54,9 +54,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
      */
-    function SugarWidgetFieldDateTime($layout_manager){
+    function SugarWidgetFieldDateTime($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 {
@@ -81,7 +81,7 @@ 
 
 		$report_def_str = $json_obj->decode($this->reporter->report_def_str);
 
-		if(empty($report_def_str['assigned_user_id'])) return null;
+		if (empty($report_def_str['assigned_user_id'])) return null;
 
 		$this->assigned_user = new User();
 		$this->assigned_user->retrieve($report_def_str['assigned_user_id']);
@@ -126,12 +126,12 @@ 
 	protected function expandDate($date, $end = false)
 	{
 	    global $timedate;
-	    if($this->hasTime($date)) {
+	    if ($this->hasTime($date)) {
 	        return $date;
 	    }
 
         //C.L. Bug 48616 - If the $date is set to the Today macro, then adjust accordingly
-        if(strtolower($date) == 'today')
+        if (strtolower($date) == 'today')
         {
            $startEnd = $timedate->getDayStartEndGMT($timedate->getNow(true));
            return $end ? $startEnd['end'] : $startEnd['start'];
@@ -141,7 +141,7 @@ 
         $date = $timedate->tzUser(new SugarDateTime());
         $date->setDate($parsed->year, $parsed->month, $parsed->day);
 
-	    if($end) {
+	    if ($end) {
 	        return $date->setTime(23, 59, 59);
 	    } else {
 	        return $date->setTime(0, 0, 0);
@@ -176,13 +176,13 @@ 
         $column = $this->_get_column_select($layout_def);
         $begin = $layout_def['input_name0'];
         $hasTime = $this->hasTime($begin);
-        if(!$hasTime){
+        if (!$hasTime) {
      	    $end = $this->expandDate($begin, true);
             $begin = $this->expandDate($begin);
             $cond = $this->queryDateOp($column, $begin, "<", "datetime")." OR ".
                 $this->queryDateOp($column, $end, ">", "datetime");
         } else {
-            $cond =  $this->queryDateOp($column, $begin, "!=", "datetime");
+            $cond = $this->queryDateOp($column, $begin, "!=", "datetime");
         }
         return "($column IS NULL OR $cond)";
 	}
@@ -191,7 +191,7 @@ 
      * Get assigned or logged in user's current date and time value.
      * @param boolean $timestamp Format of return value, if set to true, return unix like timestamp , else a formatted date.
      */
-	function get_users_current_date_time($timestamp=false)
+	function get_users_current_date_time($timestamp = false)
 	{
 	 	global $current_user;
         global $timedate;
@@ -205,9 +205,9 @@ 
         	return $begin;
         } else {
         	$begin_parts = explode(' ', $begin);
-        	$date_parts=explode('-', $begin_parts[0]);
-        	$time_parts=explode(':', $begin_parts[1]);
-        	$curr_timestamp=mktime($time_parts[0],$time_parts[1],0,$date_parts[1], $date_parts[2],$date_parts[0]);
+        	$date_parts = explode('-', $begin_parts[0]);
+        	$time_parts = explode(':', $begin_parts[1]);
+        	$curr_timestamp = mktime($time_parts[0], $time_parts[1], 0, $date_parts[1], $date_parts[2], $date_parts[0]);
         	return $curr_timestamp;
         }
 
@@ -217,23 +217,23 @@ 
 	 * @param int $days Adjust date by this number of days, negative values are valid.
 	 * @param time string falg for desired time value, start: minimum time, end: maximum time, default: current time
 	 */
-	function get_db_date($days,$time) {
+	function get_db_date($days, $time) {
         global $timedate;
 
-        $begin = date($GLOBALS['timedate']->get_db_date_time_format(), time()+(86400 * $days));  //gmt date with day adjustment applied.
+        $begin = date($GLOBALS['timedate']->get_db_date_time_format(), time() + (86400 * $days)); //gmt date with day adjustment applied.
         //kbrill bug #13884
         //$begin = $timedate->to_display_date_time($begin,true,true,$this->assigned_user);
 		$begin = $timedate->handle_offset($begin, $timedate->get_db_date_time_format(), false, $this->assigned_user);
 
-        if ($time=='start') {
+        if ($time == 'start') {
             $begin_parts = explode(' ', $begin);
-            $be = $begin_parts[0] . ' 00:00:00';
+            $be = $begin_parts[0].' 00:00:00';
         }
-        else if ($time=='end') {
+        else if ($time == 'end') {
             $begin_parts = explode(' ', $begin);
-            $be = $begin_parts[0] . ' 23:59:59';
+            $be = $begin_parts[0].' 23:59:59';
         } else {
-            $be=$begin;
+            $be = $begin;
         }
 
         //convert date to db format without converting to GMT.
@@ -248,7 +248,7 @@ 
 	 * @param string $begin start date value (in DB format)
 	 * @param string $end End date value (in DB format)
 	 */
-	function get_start_end_date_filter(& $layout_def, $begin,$end)
+	function get_start_end_date_filter(& $layout_def, $begin, $end)
 	{
 	    if (isset ($layout_def['rel_field'])) {
 	        $field_name = $this->reporter->db->convert(
@@ -275,7 +275,7 @@ 
     protected function queryDateOp($arg1, $arg2, $op, $type)
     {
         global $timedate;
-        if($arg2 instanceof DateTime) {
+        if ($arg2 instanceof DateTime) {
             $arg2 = $timedate->asDbType($arg2, $type);
         }
         return "$arg1 $op ".$this->reporter->db->convert($this->reporter->db->quoted($arg2), $type)."\n";
@@ -300,7 +300,7 @@ 
     {
         $begin = $day->get_day_begin();
         $end = $day->get_day_end();
-        return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
+        return $this->get_start_end_date_filter($layout_def, $begin->asDb(), $end->asDb());
     }
 
 	function queryFilterTP_yesterday($layout_def)
@@ -328,7 +328,7 @@ 
 		$begin = $this->now()->get("-6 days")->get_day_begin();
 		$end = $this->now()->get_day_end();
 
-		return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
+		return $this->get_start_end_date_filter($layout_def, $begin->asDb(), $end->asDb());
 	}
 
 	function queryFilterTP_next_7_days($layout_def)
@@ -338,7 +338,7 @@ 
 		$begin = $this->now()->get_day_begin();
 		$end = $this->now()->get("+6 days")->get_day_end();
 
-		return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
+		return $this->get_start_end_date_filter($layout_def, $begin->asDb(), $end->asDb());
 	}
 
     /**
@@ -351,14 +351,14 @@ 
         $begin = $month->setTime(0, 0, 0);
         $end = clone($begin);
 		$end->setDate($begin->year, $begin->month, $begin->days_in_month)->setTime(23, 59, 59);
-        return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
+        return $this->get_start_end_date_filter($layout_def, $begin->asDb(), $end->asDb());
     }
 
     function queryFilterTP_last_month($layout_def)
 	{
 		global $timedate;
 		$month = $this->now();
-		return $this->queryMonth($layout_def, $month->setDate($month->year, $month->month-1, 1));
+		return $this->queryMonth($layout_def, $month->setDate($month->year, $month->month - 1, 1));
 	}
 
 	function queryFilterTP_this_month($layout_def)
@@ -378,7 +378,7 @@ 
 	{
 		global $timedate;
 		$month = $this->now();
-		return $this->queryMonth($layout_def, $month->setDate($month->year, $month->month+1, 1));
+		return $this->queryMonth($layout_def, $month->setDate($month->year, $month->month + 1, 1));
 	}
 
 	function queryFilterTP_last_30_days($layout_def)
@@ -386,7 +386,7 @@ 
 		global $timedate;
 		$begin = $this->now()->get("-29 days")->get_day_begin();
 		$end = $this->now()->get_day_end();
-		return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
+		return $this->get_start_end_date_filter($layout_def, $begin->asDb(), $end->asDb());
 	}
 
 	function queryFilterTP_next_30_days($layout_def)
@@ -394,7 +394,7 @@ 
 		global $timedate;
 		$begin = $this->now()->get_day_begin();
 		$end = $this->now()->get("+29 days")->get_day_end();
-		return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
+		return $this->get_start_end_date_filter($layout_def, $begin->asDb(), $end->asDb());
 	}
 
     /**
@@ -472,10 +472,10 @@ 
 	{
 		global $timedate;
 		$begin = $this->now();
-		$begin->setDate($begin->year-1, 1, 1)->setTime(0, 0);
+		$begin->setDate($begin->year - 1, 1, 1)->setTime(0, 0);
 		$end = clone $begin;
 		$end->setDate($end->year, 12, 31)->setTime(23, 59, 59);
-		return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
+		return $this->get_start_end_date_filter($layout_def, $begin->asDb(), $end->asDb());
 	}
 
 	function queryFilterTP_this_year($layout_def)
@@ -485,17 +485,17 @@ 
 		$begin->setDate($begin->year, 1, 1)->setTime(0, 0);
 		$end = clone $begin;
 		$end->setDate($end->year, 12, 31)->setTime(23, 59, 59);
-		return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
+		return $this->get_start_end_date_filter($layout_def, $begin->asDb(), $end->asDb());
 	}
 
 	function queryFilterTP_next_year(& $layout_def)
 	{
 		global $timedate;
 		$begin = $this->now();
-		$begin->setDate($begin->year+1, 1, 1)->setTime(0, 0);
+		$begin->setDate($begin->year + 1, 1, 1)->setTime(0, 0);
 		$end = clone $begin;
 		$end->setDate($end->year, 12, 31)->setTime(23, 59, 59);
-		return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
+		return $this->get_start_end_date_filter($layout_def, $begin->asDb(), $end->asDb());
 	}
 
 	function queryGroupBy($layout_def)
@@ -504,7 +504,7 @@ 
 		if (!empty ($layout_def['qualifier'])) {
 			$func_name = 'queryGroupBy'.$layout_def['qualifier'];
 			if (method_exists($this, $func_name)) {
-				return $this-> $func_name ($layout_def)." \n";
+				return $this-> $func_name($layout_def)." \n";
 			}
 		}
 		return parent :: queryGroupBy($layout_def)." \n";
@@ -513,9 +513,9 @@ 
 	function queryOrderBy($layout_def)
 	{
         if (!empty ($layout_def['qualifier'])) {
-			$func_name ='queryOrderBy'.$layout_def['qualifier'];
+			$func_name = 'queryOrderBy'.$layout_def['qualifier'];
 			if (method_exists($this, $func_name)) {
-				return $this-> $func_name ($layout_def)."\n";
+				return $this-> $func_name($layout_def)."\n";
 			}
 		}
 		$order_by = parent :: queryOrderBy($layout_def)."\n";
@@ -526,15 +526,15 @@ 
         global $timedate;
         $content = parent:: displayListPlain($layout_def);
         // awu: this if condition happens only in Reports where group by month comes back as YYYY-mm format
-        if (count(explode('-',$content)) == 2){
+        if (count(explode('-', $content)) == 2) {
             return $content;
         // if date field
-        }elseif(substr_count($layout_def['type'], 'date') > 0){
+        }elseif (substr_count($layout_def['type'], 'date') > 0) {
             // if date time field
-            if(substr_count($layout_def['type'], 'time') > 0 && $this->get_time_part($content)!= false){
+            if (substr_count($layout_def['type'], 'time') > 0 && $this->get_time_part($content) != false) {
                 $td = $timedate->to_display_date_time($content);
                 return $td;
-            }else{// if date only field
+            } else {// if date only field
                 $td = $timedate->to_display_date($content, false); // Avoid PHP notice of returning by reference.
                 return $td;
             }
@@ -545,7 +545,7 @@ 
     {
         global $timedate;
 
-        $date_parts=$timedate->split_date_time($date_time_value);
+        $date_parts = $timedate->split_date_time($date_time_value);
         if (count($date_parts) > 1) {
             return $date_parts[1];
         } else {
@@ -559,7 +559,7 @@ 
         if (!empty ($layout_def['column_function'])) {
             $func_name = 'displayList'.$layout_def['column_function'];
             if (method_exists($this, $func_name)) {
-                return $this-> $func_name ($layout_def);
+                return $this-> $func_name($layout_def);
             }
         }
         $content = parent :: displayListPlain($layout_def);
@@ -571,7 +571,7 @@ 
 		if (!empty ($layout_def['column_function'])) {
 			$func_name = 'querySelect'.$layout_def['column_function'];
 			if (method_exists($this, $func_name)) {
-				return $this-> $func_name ($layout_def)." \n";
+				return $this-> $func_name($layout_def)." \n";
 			}
 		}
 		return parent :: querySelect($layout_def)." \n";
@@ -613,7 +613,7 @@ 
         {
             $return = $this->reporter->db->convert($return, 'add_tz_offset');
         }
-        return $this->reporter->db->convert($return, "date_format", array('%Y-%m')) . ' ' . $this->_get_column_alias($layout_def) . "\n";
+        return $this->reporter->db->convert($return, "date_format", array('%Y-%m')).' '.$this->_get_column_alias($layout_def)."\n";
     }
 
     /**
@@ -629,7 +629,7 @@ 
         {
             $return = $this->reporter->db->convert($return, 'add_tz_offset');
         }
-        return $this->reporter->db->convert($return, "date_format", array('%Y-%m')) . "\n";
+        return $this->reporter->db->convert($return, "date_format", array('%Y-%m'))."\n";
     }
 
     /**
@@ -649,11 +649,11 @@ 
 
         if (empty($layout_def['sort_dir']) || $layout_def['sort_dir'] == 'a')
         {
-            return $orderBy . " ASC\n";
+            return $orderBy." ASC\n";
         }
         else
         {
-            return $orderBy . " DESC\n";
+            return $orderBy." DESC\n";
         }
     }
 
@@ -670,7 +670,7 @@ 
         {
             $return = $this->reporter->db->convert($return, 'add_tz_offset');
         }
-        return $this->reporter->db->convert($return, "date_format", array('%Y-%m-%d')) . ' ' . $this->_get_column_alias($layout_def) . "\n";
+        return $this->reporter->db->convert($return, "date_format", array('%Y-%m-%d')).' '.$this->_get_column_alias($layout_def)."\n";
     }
 
     /**
@@ -686,7 +686,7 @@ 
         {
             $return = $this->reporter->db->convert($return, 'add_tz_offset');
         }
-        return $this->reporter->db->convert($return, "date_format", array('%Y-%m-%d')) . "\n";
+        return $this->reporter->db->convert($return, "date_format", array('%Y-%m-%d'))."\n";
     }
 
     /**
@@ -702,7 +702,7 @@ 
         {
             $return = $this->reporter->db->convert($return, 'add_tz_offset');
         }
-        return $this->reporter->db->convert($return, "date_format", array('%Y')) . ' ' . $this->_get_column_alias($layout_def) . "\n";
+        return $this->reporter->db->convert($return, "date_format", array('%Y')).' '.$this->_get_column_alias($layout_def)."\n";
     }
 
     /**
@@ -718,7 +718,7 @@ 
         {
             $return = $this->reporter->db->convert($return, 'add_tz_offset');
         }
-        return $this->reporter->db->convert($return, "date_format", array('%Y')) . "\n";
+        return $this->reporter->db->convert($return, "date_format", array('%Y'))."\n";
     }
 
 	function querySelectquarter($layout_def)
@@ -766,11 +766,11 @@ 
 
         if (empty($layout_def['sort_dir']) || $layout_def['sort_dir'] == 'a')
         {
-            return $orderBy . " ASC\n";
+            return $orderBy." ASC\n";
         }
         else
         {
-            return $orderBy . " DESC\n";
+            return $orderBy." DESC\n";
         }
     }
 

Braces +12 added lines, -12 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.
@@ -58,8 +60,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);
@@ -81,7 +82,9 @@ 
 
 		$report_def_str = $json_obj->decode($this->reporter->report_def_str);
 
-		if(empty($report_def_str['assigned_user_id'])) return null;
+		if(empty($report_def_str['assigned_user_id'])) {
+		    return null;
+		}
 
 		$this->assigned_user = new User();
 		$this->assigned_user->retrieve($report_def_str['assigned_user_id']);
@@ -228,8 +231,7 @@ 
         if ($time=='start') {
             $begin_parts = explode(' ', $begin);
             $be = $begin_parts[0] . ' 00:00:00';
-        }
-        else if ($time=='end') {
+        } else if ($time=='end') {
             $begin_parts = explode(' ', $begin);
             $be = $begin_parts[0] . ' 23:59:59';
         } else {
@@ -529,12 +531,12 @@ 
         if (count(explode('-',$content)) == 2){
             return $content;
         // if date field
-        }elseif(substr_count($layout_def['type'], 'date') > 0){
+        } elseif(substr_count($layout_def['type'], 'date') > 0){
             // if date time field
             if(substr_count($layout_def['type'], 'time') > 0 && $this->get_time_part($content)!= false){
                 $td = $timedate->to_display_date_time($content);
                 return $td;
-            }else{// if date only field
+            } else{// if date only field
                 $td = $timedate->to_display_date($content, false); // Avoid PHP notice of returning by reference.
                 return $td;
             }
@@ -650,8 +652,7 @@ 
         if (empty($layout_def['sort_dir']) || $layout_def['sort_dir'] == 'a')
         {
             return $orderBy . " ASC\n";
-        }
-        else
+        } else
         {
             return $orderBy . " DESC\n";
         }
@@ -767,8 +768,7 @@ 
         if (empty($layout_def['sort_dir']) || $layout_def['sort_dir'] == 'a')
         {
             return $orderBy . " ASC\n";
-        }
-        else
+        } else
         {
             return $orderBy . " DESC\n";
         }

include/generic/SugarWidgets/SugarWidgetReportField.php

Indentation +163 added lines, -163 removed lines

@@ -54,7 +54,7 @@ 
      */
     protected $reporter;
 
-	function __construct(&$layout_manager) {
+    function __construct(&$layout_manager) {
         parent::__construct($layout_manager);
         $this->reporter = $this->layout_manager->getAttribute("reporter");
     }
@@ -74,25 +74,25 @@ 
     }
 
 
-	function  getSubClass($layout_def)
-	{
-		if (! empty($layout_def['type']))
-		{
+    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;
-		}
-	}
+            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 display($layout_def)
+    {
         $obj = $this->getSubClass($layout_def);
 
         $context = $this->layout_manager->getAttribute('context');//_ppd($context);
@@ -106,51 +106,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
@@ -179,66 +179,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
@@ -252,22 +252,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
 
@@ -277,40 +277,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';
@@ -337,49 +337,49 @@ 
                 array_push($alias_arr,$layout_def['name']);
         }
 
-		global $used_aliases, $alias_map;
+        global $used_aliases, $alias_map;
 
         $alias = strtolower(implode("_",$alias_arr));
 
         $short_alias = $this->getTruncatedColumnAlias($alias);
 
-		if ( empty($used_aliases[$short_alias]))
-		{
-			$alias_map[$alias] = $short_alias;
-		    $used_aliases[$short_alias] = 1;
-          	return $short_alias;
-		} else if ( ! empty($alias_map[$alias]) )
-		{
-			return $alias_map[$alias];
-		} else {
-			$alias_map[$alias] = $short_alias.'_'.$used_aliases[$short_alias];
-		  $used_aliases[$short_alias]++;
-			return $alias_map[$alias];
-		}
- }
-
- function queryFilterEmpty($layout_def)
- {
-     $column = $this->_get_column_select($layout_def);
-     return "($column IS NULL OR $column = ".$this->reporter->db->emptyValue($layout_def['type']).")";
- }
-
- function queryFilterIs($layout_def)
- {
- 	return '( '.$this->_get_column_select($layout_def)."='".$GLOBALS['db']->quote($layout_def['input_name0'])."')\n";
- }
-
- function queryFilteris_not($layout_def)
- {
- 	return '( '.$this->_get_column_select($layout_def)."<>'".$GLOBALS['db']->quote($layout_def['input_name0'])."')\n";
- }
-
- function queryFilterNot_Empty($layout_def)
- {
-     /** @var $db DBManager */
-     $db = $this->reporter->db;
-     $column = $this->_get_column_select($layout_def);
-     return "(coalesce(" . $db->convert($column, "length") . ",0) > 0)\n";
- }
+        if ( empty($used_aliases[$short_alias]))
+        {
+            $alias_map[$alias] = $short_alias;
+            $used_aliases[$short_alias] = 1;
+                return $short_alias;
+        } else if ( ! empty($alias_map[$alias]) )
+        {
+            return $alias_map[$alias];
+        } else {
+            $alias_map[$alias] = $short_alias.'_'.$used_aliases[$short_alias];
+            $used_aliases[$short_alias]++;
+            return $alias_map[$alias];
+        }
+    }
+
+    function queryFilterEmpty($layout_def)
+    {
+        $column = $this->_get_column_select($layout_def);
+        return "($column IS NULL OR $column = ".$this->reporter->db->emptyValue($layout_def['type']).")";
+    }
+
+    function queryFilterIs($layout_def)
+    {
+        return '( '.$this->_get_column_select($layout_def)."='".$GLOBALS['db']->quote($layout_def['input_name0'])."')\n";
+    }
+
+    function queryFilteris_not($layout_def)
+    {
+        return '( '.$this->_get_column_select($layout_def)."<>'".$GLOBALS['db']->quote($layout_def['input_name0'])."')\n";
+    }
+
+    function queryFilterNot_Empty($layout_def)
+    {
+        /** @var $db DBManager */
+        $db = $this->reporter->db;
+        $column = $this->_get_column_select($layout_def);
+        return "(coalesce(" . $db->convert($column, "length") . ",0) > 0)\n";
+    }
 
 }

Spacing +49 added lines, -49 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.
@@ -62,9 +62,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
      */
-    function SugarWidgetReportField(&$layout_manager){
+    function SugarWidgetReportField(&$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 {
@@ -76,7 +76,7 @@ 
 
 	function  getSubClass($layout_def)
 	{
-		if (! empty($layout_def['type']))
+		if (!empty($layout_def['type']))
 		{
 
 			if ($layout_def['type'] == 'time') {
@@ -95,11 +95,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
@@ -111,20 +111,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)));
 	}
  }
 
@@ -135,15 +135,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')
     	{
@@ -168,7 +168,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
@@ -199,7 +199,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']))
     {
@@ -208,8 +208,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";
@@ -218,10 +218,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 {
@@ -238,27 +238,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'];
                 		}
                 	}
@@ -266,12 +266,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();
@@ -291,7 +291,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
@@ -311,44 +311,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 {
@@ -379,7 +379,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 +12 added lines, -10 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.
@@ -66,8 +68,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);
@@ -199,19 +200,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";
 	}
 

include/generic/SugarWidgets/SugarWidgetFieldenum.php

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

Spacing +28 added lines, -28 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 @@ 
 
 function get_currency()
 {
-        global $current_user,$global_currency_obj;
+        global $current_user, $global_currency_obj;
         if (empty($global_currency_obj))
         {
         $global_currency_obj = new Currency();
       //  $global_currency_symbol = '$';
 
-        if($current_user->getPreference('currency') )
+        if ($current_user->getPreference('currency'))
         {
                 $global_currency_obj->retrieve($current_user->getPreference('currency'));
         }
@@ -77,9 +77,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
      */
-    function SugarWidgetFieldCurrency(&$layout_manager){
+    function SugarWidgetFieldCurrency(&$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 {
@@ -97,9 +97,9 @@ 
             $currency_id = $locale->getPrecedentPreference('currency');
 
             // If it's not grouped, or if it's grouped around a system currency column, look up the currency symbol so we can display it next to the amount
-            if ( empty($layout_def['group_function']) || $this->isSystemCurrency($layout_def) ) {
+            if (empty($layout_def['group_function']) || $this->isSystemCurrency($layout_def)) {
                 $c = $this->getCurrency($layout_def);
-                if(!empty($c['currency_id']) && !empty($c['currency_symbol']))
+                if (!empty($c['currency_id']) && !empty($c['currency_symbol']))
                 {
                     $symbol = $c['currency_symbol'];
                     $currency_id = $c['currency_id'];
@@ -109,15 +109,15 @@ 
             $layout_def['currency_id'] = $currency_id;
             $display = $this->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'];
         }
         $record = '';
         if ($layout_def['table_key'] == 'self' && isset($layout_def['fields']['PRIMARYID']))
             $record = $layout_def['fields']['PRIMARYID'];
-        else if (isset($layout_def['fields'][strtoupper($layout_def['table_alias']."_id")])){
+        else if (isset($layout_def['fields'][strtoupper($layout_def['table_alias']."_id")])) {
             $record = $layout_def['fields'][strtoupper($layout_def['table_alias']."_id")];
         }
         if (!empty($record)) {
@@ -125,11 +125,11 @@ 
 	        $field_type = $field_def['type'];
 	        $module = $field_def['module'];
 
-	        $div_id = $module ."&$record&$field_name";
+	        $div_id = $module."&$record&$field_name";
 	        $str = "<div id='$div_id'>".$display;
             global $sugar_config;
             if (isset ($sugar_config['enable_inline_reports_edit']) && $sugar_config['enable_inline_reports_edit']) {
-                $str .= "&nbsp;" .SugarThemeRegistry::current()->getImage("edit_inline","border='0' alt='Edit Layout' align='bottom' onClick='SUGAR.reportsInlineEdit.inlineEdit(\"$div_id\",\"$value\",\"$module\",\"$record\",\"$field_name\",\"$field_type\",\"$currency_id\",\"$symbol\");'");
+                $str .= "&nbsp;".SugarThemeRegistry::current()->getImage("edit_inline", "border='0' alt='Edit Layout' align='bottom' onClick='SUGAR.reportsInlineEdit.inlineEdit(\"$div_id\",\"$value\",\"$module\",\"$record\",\"$field_name\",\"$field_type\",\"$currency_id\",\"$symbol\");'");
             }
 	        $str .= "</div>";
 	        return $str;
@@ -170,13 +170,13 @@ 
      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)." > ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0'])). " AND ". $this->_get_column_select($layout_def)." < ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name1']))."\n";
+ function queryFilterBetween(&$layout_def) {
+     return $this->_get_column_select($layout_def)." > ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))." AND ".$this->_get_column_select($layout_def)." < ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name1']))."\n";
  }
 
  function isSystemCurrency(&$layout_def)
  {
-     if (strpos($layout_def['name'],'_usdoll') === false) {
+     if (strpos($layout_def['name'], '_usdoll') === false) {
          return false;
      } else {
          return true;
@@ -187,8 +187,8 @@ 
  {
     // add currency column to select
     $table = $this->getCurrencyIdTable($layout_def);
-    if($table) {
-        return $this->_get_column_select($layout_def)." ".$this->_get_column_alias($layout_def)." , ".$table.".currency_id ". $this->getTruncatedColumnAlias($this->_get_column_alias($layout_def)."_currency") . "\n";
+    if ($table) {
+        return $this->_get_column_select($layout_def)." ".$this->_get_column_alias($layout_def)." , ".$table.".currency_id ".$this->getTruncatedColumnAlias($this->_get_column_alias($layout_def)."_currency")."\n";
     }
     return $this->_get_column_select($layout_def)." ".$this->_get_column_alias($layout_def)."\n";
  }
@@ -197,7 +197,7 @@ 
  {
     // add currency column to group by
     $table = $this->getCurrencyIdTable($layout_def);
-    if($table) {
+    if ($table) {
         return $this->_get_column_select($layout_def)." , ".$table.".currency_id \n";
     }
     return $this->_get_column_select($layout_def)." \n";
@@ -206,9 +206,9 @@ 
  function getCurrencyIdTable($layout_def)
  {
     // We need to fetch the currency id as well
-    if ( !$this->isSystemCurrency($layout_def) && empty($layout_def['group_function'])) {
+    if (!$this->isSystemCurrency($layout_def) && empty($layout_def['group_function'])) {
 
-        if ( !empty($layout_def['table_alias']) ) {
+        if (!empty($layout_def['table_alias'])) {
             $table = $layout_def['table_alias'];
         } else {
             $table = '';
@@ -219,16 +219,16 @@ 
             $real_table = $this->reporter->all_fields[$layout_def['column_key']]['real_table'];
 
         $add_currency_id = false;
-        if(!empty($table)) {
+        if (!empty($table)) {
             $cols = $GLOBALS['db']->getHelper()->get_columns($real_table);
             $add_currency_id = isset($cols['currency_id']) ? true : false;
 
-            if(!$add_currency_id && preg_match('/.*?_cstm$/i', $real_table)) {
+            if (!$add_currency_id && preg_match('/.*?_cstm$/i', $real_table)) {
                 $table = str_replace('_cstm', '', $table);
                 $cols = $GLOBALS['db']->getHelper()->get_columns($table);
                 $add_currency_id = isset($cols['currency_id']) ? true : false;
             }
-            if($add_currency_id) {
+            if ($add_currency_id) {
                 return $table;
             }
         }
@@ -245,7 +245,7 @@ 
     {
         $currency_id = false;
         $currency_symbol = false;
-        if(isset($layout_def['currency_symbol']) && isset($layout_def['currency_id']))
+        if (isset($layout_def['currency_symbol']) && isset($layout_def['currency_id']))
         {
             $currency_symbol = $layout_def['currency_symbol'];
             $currency_id = $layout_def['currency_id'];
@@ -253,7 +253,7 @@ 
         else
         {
             $key = strtoupper(isset($layout_def['varname']) ? $layout_def['varname'] : $this->_get_column_alias($layout_def));
-            if ( $this->isSystemCurrency($layout_def) )
+            if ($this->isSystemCurrency($layout_def))
             {
                 $currency_id = '-99';
             }
@@ -261,14 +261,14 @@ 
             {
                 $currency_id = $layout_def['fields'][$key.'_CURRENCY'];
             }
-            elseif(isset($layout_def['fields'][$this->getTruncatedColumnAlias($this->_get_column_alias($layout_def)."_currency")]))
+            elseif (isset($layout_def['fields'][$this->getTruncatedColumnAlias($this->_get_column_alias($layout_def)."_currency")]))
             {
                 $currency_id = $layout_def['fields'][$this->getTruncatedColumnAlias($this->_get_column_alias($layout_def)."_currency")];
             }
-            if($currency_id)
+            if ($currency_id)
             {
                 $currency = BeanFactory::getBean('Currencies', $currency_id);
-                if(!empty($currency ->symbol))
+                if (!empty($currency ->symbol))
                 {
                     $currency_symbol = $currency ->symbol;
                 }

Braces +17 added lines, -19 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.
@@ -57,8 +59,7 @@ 
         if($current_user->getPreference('currency') )
         {
                 $global_currency_obj->retrieve($current_user->getPreference('currency'));
-        }
-        else
+        } else
         {
                 $global_currency_obj->retrieve('-99');
         }
@@ -81,8 +82,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);
@@ -111,13 +111,13 @@ 
 
         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'];
         }
         $record = '';
-        if ($layout_def['table_key'] == 'self' && isset($layout_def['fields']['PRIMARYID']))
-            $record = $layout_def['fields']['PRIMARYID'];
-        else if (isset($layout_def['fields'][strtoupper($layout_def['table_alias']."_id")])){
+        if ($layout_def['table_key'] == 'self' && isset($layout_def['fields']['PRIMARYID'])) {
+                    $record = $layout_def['fields']['PRIMARYID'];
+        } else if (isset($layout_def['fields'][strtoupper($layout_def['table_alias']."_id")])){
             $record = $layout_def['fields'][strtoupper($layout_def['table_alias']."_id")];
         }
         if (!empty($record)) {
@@ -133,9 +133,9 @@ 
             }
 	        $str .= "</div>";
 	        return $str;
+        } else {
+                    return $display;
         }
-        else
-            return $display;
     }
 
     function displayListPlain($layout_def) {
@@ -215,8 +215,9 @@ 
         }
 
         $real_table = '';
-        if (!empty($this->reporter->all_fields[$layout_def['column_key']]['real_table']))
-            $real_table = $this->reporter->all_fields[$layout_def['column_key']]['real_table'];
+        if (!empty($this->reporter->all_fields[$layout_def['column_key']]['real_table'])) {
+                    $real_table = $this->reporter->all_fields[$layout_def['column_key']]['real_table'];
+        }
 
         $add_currency_id = false;
         if(!empty($table)) {
@@ -249,19 +250,16 @@ 
         {
             $currency_symbol = $layout_def['currency_symbol'];
             $currency_id = $layout_def['currency_id'];
-        }
-        else
+        } else
         {
             $key = strtoupper(isset($layout_def['varname']) ? $layout_def['varname'] : $this->_get_column_alias($layout_def));
             if ( $this->isSystemCurrency($layout_def) )
             {
                 $currency_id = '-99';
-            }
-            elseif (isset($layout_def['fields'][$key.'_CURRENCY']))
+            } elseif (isset($layout_def['fields'][$key.'_CURRENCY']))
             {
                 $currency_id = $layout_def['fields'][$key.'_CURRENCY'];
-            }
-            elseif(isset($layout_def['fields'][$this->getTruncatedColumnAlias($this->_get_column_alias($layout_def)."_currency")]))
+            } elseif(isset($layout_def['fields'][$this->getTruncatedColumnAlias($this->_get_column_alias($layout_def)."_currency")]))
             {
                 $currency_id = $layout_def['fields'][$this->getTruncatedColumnAlias($this->_get_column_alias($layout_def)."_currency")];
             }

include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectUsersButton.php

Spacing +35 added lines, -35 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 @@ 
 class SugarWidgetSubPanelTopSelectUsersButton extends SugarWidgetSubPanelTopSelectButton
 {
 	//button_properties is a collection of properties associated with the widget_class definition. layoutmanager
-	function __construct($button_properties=array())
+	function __construct($button_properties = array())
 	{
-		$this->button_properties=$button_properties;
+		$this->button_properties = $button_properties;
 	}
 
     /**
      * @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
      */
-    function SugarWidgetSubPanelTopSelectUsersButton($button_properties=array()){
+    function SugarWidgetSubPanelTopSelectUsersButton($button_properties = array()) {
         $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 {
@@ -83,32 +83,32 @@ 
 		$this->module_name = 'Users';
 
 		if (is_array($this->button_properties)) {
-			if( isset($this->button_properties['title'])) {
+			if (isset($this->button_properties['title'])) {
 				$this->title = $app_strings[$this->button_properties['title']];
 			}
-			if( isset($this->button_properties['accesskey'])) {
+			if (isset($this->button_properties['accesskey'])) {
 				//$this->accesskey = $app_strings[$this->button_properties['accesskey']];
 			}
-			if( isset($this->button_properties['form_value'])) {
+			if (isset($this->button_properties['form_value'])) {
 				$this->value = $app_strings[$this->button_properties['form_value']];
 			}
-			if( isset($this->button_properties['module'])) {
+			if (isset($this->button_properties['module'])) {
 				$this->module_name = $this->button_properties['module'];
 			}
 		}
 
 		$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;
 		}
 
@@ -120,43 +120,43 @@ 
 			$this->module_name = $subpanel_name;
 		}
 
-		if ($subpanel_name == 'Project'){
+		if ($subpanel_name == 'Project') {
 			$link_field_name = 'project_users_1';
 		}
-		else{
+		else {
 			$link_field_name = $subpanel_definition->get_data_source_name(true);
 		}
 
-		$popup_mode='Single';
-		if(isset($widget_data['mode'])){
-			$popup_mode=$widget_data['mode'];
+		$popup_mode = 'Single';
+		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);
 					}
 				}
 			}
 		}
 
 		if (!empty($widget_data['filter_out_is_admin'])) {
-            $initial_filter.="&is_admin_advanced=0";
+            $initial_filter .= "&is_admin_advanced=0";
         }
 
-		$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";
@@ -175,21 +175,21 @@ 
 		);
 
 		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">' . "\n"
-			. ' <input type="button" name="' .$this->getWidgetId() . '" id="' .$this->getWidgetId() . '" class="button"' . "\"\n"
-				. ' title="' . $this->title . '"'
-			. ' value="' . $this->value . "\"\n"
+		return '<form action="index.php">'."\n"
+			. ' <input type="button" name="'.$this->getWidgetId().'" 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 +5 added lines, -5 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.
@@ -58,8 +60,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($button_properties);
@@ -123,8 +124,7 @@ 
 
 		if ($subpanel_name == 'Project'){
 			$link_field_name = 'project_contacts_1';
-		}
-		else{
+		} else{
 			$link_field_name = $subpanel_definition->get_data_source_name(true);
 		}
 

include/generic/SugarWidgets/SugarWidgetFieldlong.php

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.
@@ -58,9 +58,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
      */
-    function SugarWidgetFieldLong(&$layout_manager){
+    function SugarWidgetFieldLong(&$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 {

Braces +4 added lines, -3 removed lines

@@ -43,7 +43,9 @@ 
  * Date: 06/03/15
  * Comments
  */
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 class CasesController extends SugarController {
 
@@ -90,8 +92,7 @@ 
                 $count++;
             }
             echo '</table>';
-        }
-        else {
+        } else {
             echo $mod_strings['LBL_NO_SUGGESTIONS'];
         }
         die();

include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectContactsButton.php

Spacing +35 added lines, -35 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 @@ 
 class SugarWidgetSubPanelTopSelectContactsButton extends SugarWidgetSubPanelTopSelectButton
 {
 	//button_properties is a collection of properties associated with the widget_class definition. layoutmanager
-	function __construct($button_properties=array())
+	function __construct($button_properties = array())
 	{
-		$this->button_properties=$button_properties;
+		$this->button_properties = $button_properties;
 	}
 
     /**
      * @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
      */
-    function SugarWidgetSubPanelTopSelectContactsButton($button_properties=array()){
+    function SugarWidgetSubPanelTopSelectContactsButton($button_properties = array()) {
         $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 {
@@ -68,7 +68,7 @@ 
 
     public function getWidgetId($buttonSuffix = true)
     {
-        return parent::getWidgetId() . '_select_button';
+        return parent::getWidgetId().'_select_button';
     }
 
 	//widget_data is the collection of attributes associated with the button in the layout_defs file.
@@ -84,32 +84,32 @@ 
 		$this->module_name = 'Contacts';
 
 		if (is_array($this->button_properties)) {
-			if( isset($this->button_properties['title'])) {
+			if (isset($this->button_properties['title'])) {
 				$this->title = $app_strings[$this->button_properties['title']];
 			}
-			if( isset($this->button_properties['accesskey'])) {
+			if (isset($this->button_properties['accesskey'])) {
 				//$this->accesskey = $app_strings[$this->button_properties['accesskey']];
 			}
-			if( isset($this->button_properties['form_value'])) {
+			if (isset($this->button_properties['form_value'])) {
 				$this->value = $app_strings[$this->button_properties['form_value']];
 			}
-			if( isset($this->button_properties['module'])) {
+			if (isset($this->button_properties['module'])) {
 				$this->module_name = $this->button_properties['module'];
 			}
 		}
 
 		$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;
 		}
 
@@ -121,38 +121,38 @@ 
 			$this->module_name = $subpanel_name;
 		}
 
-		if ($subpanel_name == 'Project'){
+		if ($subpanel_name == 'Project') {
 			$link_field_name = 'project_contacts_1';
 		}
-		else{
+		else {
 			$link_field_name = $subpanel_definition->get_data_source_name(true);
 		}
 
-		$popup_mode='Single';
-		if(isset($widget_data['mode'])){
-			$popup_mode=$widget_data['mode'];
+		$popup_mode = 'Single';
+		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";
@@ -171,21 +171,21 @@ 
 		);
 
 		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">' . "\n"
-			. ' <input type="button" name="' .$this->getWidgetId() . '" id="' .$this->getWidgetId() . '" class="button"' . "\"\n"
-				. ' title="' . $this->title . '"'
-			. ' value="' . $this->value . "\"\n"
+		return '<form action="index.php">'."\n"
+			. ' <input type="button" name="'.$this->getWidgetId().'" 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 +5 added lines, -5 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.
@@ -58,8 +60,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($button_properties);
@@ -123,8 +124,7 @@ 
 
 		if ($subpanel_name == 'Project'){
 			$link_field_name = 'project_contacts_1';
-		}
-		else{
+		} else{
 			$link_field_name = $subpanel_definition->get_data_source_name(true);
 		}
 

include/generic/SugarWidgets/SugarWidgetFieldCronSchedule.php

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');
 class SugarWidgetFieldCronSchedule extends SugarWidgetFieldVarchar
 {
     public function __construct($layout_manager) {
@@ -9,9 +9,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 SugarWidgetFieldCronSchedule($layout_manager){
+    public function SugarWidgetFieldCronSchedule($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 {

Braces +4 added lines, -3 removed lines

@@ -43,7 +43,9 @@ 
  * Date: 06/03/15
  * Comments
  */
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 class CasesController extends SugarController {
 
@@ -90,8 +92,7 @@ 
                 $count++;
             }
             echo '</table>';
-        }
-        else {
+        } else {
             echo $mod_strings['LBL_NO_SUGGESTIONS'];
         }
         die();