Test Failed
Push — CI ( 02428e...3e0292 )
by Adam
55:43
created
include/generic/SugarWidgets/SugarWidgetSubPanelEditRoleButton.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /*********************************************************************************
4 4
  * SugarCRM Community Edition is a customer relationship management program developed by
5 5
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -56,19 +56,19 @@  discard block
 block discarded – undo
56 56
         global $subpanel_item_count;
57 57
         $unique_id = $layout_def['subpanel_id']."_edit_".$subpanel_item_count; //bug 51512
58 58
 	
59
-		$href = 'index.php?module=' . $layout_def['module']
60
-			. '&action=' . 'ContactOpportunityRelationshipEdit'
61
-			. '&record=' . $layout_def['fields']['OPPORTUNITY_ROLE_ID']
62
-			. '&return_module=' . $_REQUEST['module']
63
-			. '&return_action=' . 'DetailView'
64
-			. '&return_id=' . $_REQUEST['record'];
59
+		$href = 'index.php?module='.$layout_def['module']
60
+			. '&action='.'ContactOpportunityRelationshipEdit'
61
+			. '&record='.$layout_def['fields']['OPPORTUNITY_ROLE_ID']
62
+			. '&return_module='.$_REQUEST['module']
63
+			. '&return_action='.'DetailView'
64
+			. '&return_id='.$_REQUEST['record'];
65 65
 			
66 66
 	//based on listview since that lets you select records
67
-	if($layout_def['ListView']){
68
-		return '<a href="' . $href . '"'
67
+	if ($layout_def['ListView']) {
68
+		return '<a href="'.$href.'"'
69 69
             . "id=\"$unique_id\""
70
-			. 'class="listViewTdToolsS1">' . $app_strings['LNK_EDIT'] .'</a>&nbsp;';
71
-	}else{
70
+			. 'class="listViewTdToolsS1">'.$app_strings['LNK_EDIT'].'</a>&nbsp;';
71
+	} else {
72 72
 		return '';
73 73
 	}
74 74
 	}
Please login to merge, or discard this patch.
include/generic/SugarWidgets/SugarWidgetFieldparent_type.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /*********************************************************************************
4 4
  * SugarCRM Community Edition is a customer relationship management program developed by
5 5
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -48,9 +48,9 @@  discard block
 block discarded – undo
48 48
     }
49 49
    
50 50
     function displayListPlain($layout_def) {
51
-        $value= $this->_get_list_value($layout_def);
52
-        if (isset($layout_def['widget_type']) && $layout_def['widget_type'] =='checkbox') {
53
-            if ($value != '' &&  ($value == 'on' || intval($value) == 1 || $value == 'yes'))  
51
+        $value = $this->_get_list_value($layout_def);
52
+        if (isset($layout_def['widget_type']) && $layout_def['widget_type'] == 'checkbox') {
53
+            if ($value != '' && ($value == 'on' || intval($value) == 1 || $value == 'yes'))  
54 54
             {
55 55
                 return "<input name='checkbox_display' class='checkbox' type='checkbox' disabled='true' checked>";
56 56
             }
Please login to merge, or discard this patch.
include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateNoteButton.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /*********************************************************************************
4 4
  * SugarCRM Community Edition is a customer relationship management program developed by
5 5
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -50,15 +50,15 @@  discard block
 block discarded – undo
50 50
 		global $app_strings;
51 51
 		global $currentModule;
52 52
 
53
-		$this->module="Notes";
53
+		$this->module = "Notes";
54 54
 		$this->subpanelDiv = "history";
55 55
 
56 56
 		// Create the additional form fields with real values if they were not passed in
57
-		if(empty($additionalFormFields) && $this->additional_form_fields)
57
+		if (empty($additionalFormFields) && $this->additional_form_fields)
58 58
 		{
59
-			foreach($this->additional_form_fields as $key=>$value)
59
+			foreach ($this->additional_form_fields as $key=>$value)
60 60
 			{
61
-				if(!empty($defines['focus']->$value))
61
+				if (!empty($defines['focus']->$value))
62 62
 				{
63 63
 					$additionalFormFields[$key] = $defines['focus']->$value;
64 64
 				}
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 			}
70 70
 		}
71 71
 
72
-		if(!empty($this->module))
72
+		if (!empty($this->module))
73 73
 		{
74 74
 			$defines['child_module_name'] = $this->module;
75 75
 		}
@@ -78,45 +78,45 @@  discard block
 block discarded – undo
78 78
 			$defines['child_module_name'] = $defines['module'];
79 79
 		}
80 80
 
81
-		if(!empty($this->subpanelDiv))
81
+		if (!empty($this->subpanelDiv))
82 82
 		{
83 83
 			$defines['subpanelDiv'] = $this->subpanelDiv;
84 84
 		}
85 85
 
86
-		$defines['parent_bean_name'] = get_class( $defines['focus']);
86
+		$defines['parent_bean_name'] = get_class($defines['focus']);
87 87
 
88
-		$form = 'form' . $defines['child_module_name'];
89
-		$button = '<form onsubmit="return SUGAR.subpanelUtils.sendAndRetrieve(this.id, \'subpanel_' . strtolower($defines['subpanelDiv']) . '\', \'' . addslashes($app_strings['LBL_LOADING']) . '\');" action="index.php" method="post" name="form" id="form' . $form . "\">\n";
88
+		$form = 'form'.$defines['child_module_name'];
89
+		$button = '<form onsubmit="return SUGAR.subpanelUtils.sendAndRetrieve(this.id, \'subpanel_'.strtolower($defines['subpanelDiv']).'\', \''.addslashes($app_strings['LBL_LOADING']).'\');" action="index.php" method="post" name="form" id="form'.$form."\">\n";
90 90
 
91 91
 		//module_button is used to override the value of module name
92 92
 		$button .= "<input type='hidden' name='target_module' value='".$defines['child_module_name']."'>\n";
93 93
 		$button .= "<input type='hidden' name='".strtolower($defines['parent_bean_name'])."_id' value='".$defines['focus']->id."'>\n";
94 94
 
95
-		if(isset($defines['focus']->name))
95
+		if (isset($defines['focus']->name))
96 96
 		{
97 97
 			$button .= "<input type='hidden' name='".strtolower($defines['parent_bean_name'])."_name' value='".$defines['focus']->name."'>";
98 98
 		}
99 99
 
100 100
 		$button .= '<input type="hidden" name="to_pdf" value="true" />';
101 101
         $button .= '<input type="hidden" name="tpl" value="QuickCreate.tpl" />';
102
-		$button .= '<input type="hidden" name="return_module" value="' . $currentModule . "\" />\n";
103
-		$button .= '<input type="hidden" name="return_action" value="' . $defines['action'] . "\" />\n";
104
-		$button .= '<input type="hidden" name="return_id" value="' . $defines['focus']->id . "\" />\n";
102
+		$button .= '<input type="hidden" name="return_module" value="'.$currentModule."\" />\n";
103
+		$button .= '<input type="hidden" name="return_action" value="'.$defines['action']."\" />\n";
104
+		$button .= '<input type="hidden" name="return_id" value="'.$defines['focus']->id."\" />\n";
105 105
 		$button .= '<input type="hidden" name="record" value="" />';
106 106
 
107 107
 		// TODO: move this out and get $additionalFormFields working properly
108
-		if(empty($additionalFormFields['parent_type']))
108
+		if (empty($additionalFormFields['parent_type']))
109 109
 		{
110
-			if($defines['focus']->object_name=='Contact') {
110
+			if ($defines['focus']->object_name == 'Contact') {
111 111
 				$additionalFormFields['parent_type'] = 'Accounts';
112 112
 			}
113 113
 			else {
114 114
 				$additionalFormFields['parent_type'] = $defines['focus']->module_dir;
115 115
 			}
116 116
 		}
117
-		if(empty($additionalFormFields['parent_name']))
117
+		if (empty($additionalFormFields['parent_name']))
118 118
 		{
119
-			if($defines['focus']->object_name=='Contact') {
119
+			if ($defines['focus']->object_name == 'Contact') {
120 120
 				$additionalFormFields['parent_name'] = $defines['focus']->account_name;
121 121
 				$additionalFormFields['account_name'] = $defines['focus']->account_name;
122 122
 			}
@@ -124,9 +124,9 @@  discard block
 block discarded – undo
124 124
 				$additionalFormFields['parent_name'] = $defines['focus']->name;
125 125
 			}
126 126
 		}
127
-		if(empty($additionalFormFields['parent_id']))
127
+		if (empty($additionalFormFields['parent_id']))
128 128
 		{
129
-			if($defines['focus']->object_name=='Contact') {
129
+			if ($defines['focus']->object_name == 'Contact') {
130 130
 				$additionalFormFields['parent_id'] = $defines['focus']->account_id;
131 131
 				$additionalFormFields['account_id'] = $defines['focus']->account_id;
132 132
 			}
@@ -135,16 +135,16 @@  discard block
 block discarded – undo
135 135
 			}
136 136
 		}
137 137
 
138
-		$button .= '<input type="hidden" name="action" value="SubpanelCreates" />' . "\n";
139
-		$button .= '<input type="hidden" name="module" value="Home" />' . "\n";
140
-		$button .= '<input type="hidden" name="target_action" value="QuickCreate" />' . "\n";
138
+		$button .= '<input type="hidden" name="action" value="SubpanelCreates" />'."\n";
139
+		$button .= '<input type="hidden" name="module" value="Home" />'."\n";
140
+		$button .= '<input type="hidden" name="target_action" value="QuickCreate" />'."\n";
141 141
 
142 142
 		// fill in additional form fields for all but action
143
-		foreach($additionalFormFields as $key => $value)
143
+		foreach ($additionalFormFields as $key => $value)
144 144
 		{
145
-			if($key != 'action')
145
+			if ($key != 'action')
146 146
 			{
147
-				$button .= '<input type="hidden" name="' . $key . '" value="' . $value . '" />' . "\n";
147
+				$button .= '<input type="hidden" name="'.$key.'" value="'.$value.'" />'."\n";
148 148
 			}
149 149
 		}
150 150
 
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 	function display($defines, $additionalFormFields = null, $nonbutton = false)
156 156
 	{
157 157
 	    $focus = new Note;
158
-		if ( !$focus->ACLAccess('EditView') ) {
158
+		if (!$focus->ACLAccess('EditView')) {
159 159
 		    return '';
160 160
 	    }
161 161
 
Please login to merge, or discard this patch.
include/generic/SugarWidgets/SugarWidgetFieldtext.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /*********************************************************************************
4 4
  * SugarCRM Community Edition is a customer relationship management program developed by
5 5
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
     function queryFilterNot_Equals_Str($layout_def)
57 57
     {
58 58
         $column = $this->_get_column_select($layout_def);
59
-        return "($column IS NULL OR ". $this->reporter->db->convert($column, "text2char")." != ".
59
+        return "($column IS NULL OR ".$this->reporter->db->convert($column, "text2char")." != ".
60 60
             $this->reporter->db->quoted($layout_def['input_name0']).")";
61 61
     }
62 62
 
Please login to merge, or discard this patch.
include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectContactsButton.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /*********************************************************************************
4 4
  * SugarCRM Community Edition is a customer relationship management program developed by
5 5
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -46,14 +46,14 @@  discard block
 block discarded – undo
46 46
 class SugarWidgetSubPanelTopSelectContactsButton extends SugarWidgetSubPanelTopSelectButton
47 47
 {
48 48
 	//button_properties is a collection of properties associated with the widget_class definition. layoutmanager
49
-	function SugarWidgetSubPanelTopSelectContactsButton($button_properties=array())
49
+	function SugarWidgetSubPanelTopSelectContactsButton($button_properties = array())
50 50
 	{
51
-		$this->button_properties=$button_properties;
51
+		$this->button_properties = $button_properties;
52 52
 	}
53 53
 
54 54
     public function getWidgetId($buttonSuffix = true)
55 55
     {
56
-        return parent::getWidgetId() . '_select_button';
56
+        return parent::getWidgetId().'_select_button';
57 57
     }
58 58
 
59 59
 	//widget_data is the collection of attributes associated with the button in the layout_defs file.
@@ -69,32 +69,32 @@  discard block
 block discarded – undo
69 69
 		$this->module_name = 'Contacts';
70 70
 
71 71
 		if (is_array($this->button_properties)) {
72
-			if( isset($this->button_properties['title'])) {
72
+			if (isset($this->button_properties['title'])) {
73 73
 				$this->title = $app_strings[$this->button_properties['title']];
74 74
 			}
75
-			if( isset($this->button_properties['accesskey'])) {
75
+			if (isset($this->button_properties['accesskey'])) {
76 76
 				//$this->accesskey = $app_strings[$this->button_properties['accesskey']];
77 77
 			}
78
-			if( isset($this->button_properties['form_value'])) {
78
+			if (isset($this->button_properties['form_value'])) {
79 79
 				$this->value = $app_strings[$this->button_properties['form_value']];
80 80
 			}
81
-			if( isset($this->button_properties['module'])) {
81
+			if (isset($this->button_properties['module'])) {
82 82
 				$this->module_name = $this->button_properties['module'];
83 83
 			}
84 84
 		}
85 85
 
86 86
 		$focus = $widget_data['focus'];
87
-		if(ACLController::moduleSupportsACL($widget_data['module']) && !ACLController::checkAccess($widget_data['module'], 'list', true)){
88
-			$button = ' <input type="button" name="' .$this->getWidgetId() . '" id="' .$this->getWidgetId() . '" class="button"' . "\"\n"
89
-			. ' title="' . $this->title . '"'
90
-			. ' value="' . $this->value . "\"\n"
87
+		if (ACLController::moduleSupportsACL($widget_data['module']) && !ACLController::checkAccess($widget_data['module'], 'list', true)) {
88
+			$button = ' <input type="button" name="'.$this->getWidgetId().'" id="'.$this->getWidgetId().'" class="button"'."\"\n"
89
+			. ' title="'.$this->title.'"'
90
+			. ' value="'.$this->value."\"\n"
91 91
 			.' disabled />';
92 92
 			return $button;
93 93
 		}
94 94
 
95 95
 		//refresh the whole page after end of action?
96 96
 		$refresh_page = 0;
97
-		if(!empty($widget_data['subpanel_definition']->_instance_properties['refresh_page'])){
97
+		if (!empty($widget_data['subpanel_definition']->_instance_properties['refresh_page'])) {
98 98
 			$refresh_page = 1;
99 99
 		}
100 100
 
@@ -106,38 +106,38 @@  discard block
 block discarded – undo
106 106
 			$this->module_name = $subpanel_name;
107 107
 		}
108 108
 
109
-		if ($subpanel_name == 'Project'){
109
+		if ($subpanel_name == 'Project') {
110 110
 			$link_field_name = 'project_contacts_1';
111 111
 		}
112
-		else{
112
+		else {
113 113
 			$link_field_name = $subpanel_definition->get_data_source_name(true);
114 114
 		}
115 115
 
116
-		$popup_mode='Single';
117
-		if(isset($widget_data['mode'])){
118
-			$popup_mode=$widget_data['mode'];
116
+		$popup_mode = 'Single';
117
+		if (isset($widget_data['mode'])) {
118
+			$popup_mode = $widget_data['mode'];
119 119
 		}
120
-		if(isset($widget_data['initial_filter_fields'])){
120
+		if (isset($widget_data['initial_filter_fields'])) {
121 121
 			if (is_array($widget_data['initial_filter_fields'])) {
122 122
 				foreach ($widget_data['initial_filter_fields'] as $value=>$alias) {
123 123
 					if (isset($focus->$value) and !empty($focus->$value)) {
124
-						$initial_filter.="&".$alias . '='.urlencode($focus->$value);
124
+						$initial_filter .= "&".$alias.'='.urlencode($focus->$value);
125 125
 					}
126 126
 				}
127 127
 			}
128 128
 		}
129
-		$create="true";
130
-		if(isset($widget_data['create'])){
131
-			$create=$widget_data['create'];
129
+		$create = "true";
130
+		if (isset($widget_data['create'])) {
131
+			$create = $widget_data['create'];
132 132
 		}
133 133
 		$return_module = $_REQUEST['module'];
134 134
 		$return_action = 'SubPanelViewer';
135 135
 		$return_id = $_REQUEST['record'];
136 136
 
137 137
 		//field_to_name_array
138
-		$fton_array= array('id' => 'subpanel_id');
139
-		if(isset($widget_data['field_to_name_array']) && is_array($widget_data['field_to_name_array'])){
140
-			$fton_array=array_merge($fton_array,$widget_data['field_to_name_array']);
138
+		$fton_array = array('id' => 'subpanel_id');
139
+		if (isset($widget_data['field_to_name_array']) && is_array($widget_data['field_to_name_array'])) {
140
+			$fton_array = array_merge($fton_array, $widget_data['field_to_name_array']);
141 141
 		}
142 142
 
143 143
 		$return_url = "index.php?module=$return_module&action=$return_action&subpanel=$subpanel_name&record=$return_id&sugar_body_only=1";
@@ -156,21 +156,21 @@  discard block
 block discarded – undo
156 156
 		);
157 157
 
158 158
 		if (is_array($this->button_properties) && !empty($this->button_properties['add_to_passthru_data'])) {
159
-			$popup_request_data['passthru_data']= array_merge($popup_request_data['passthru_data'],$this->button_properties['add_to_passthru_data']);
159
+			$popup_request_data['passthru_data'] = array_merge($popup_request_data['passthru_data'], $this->button_properties['add_to_passthru_data']);
160 160
 		}
161 161
 
162 162
 		if (is_array($this->button_properties) && !empty($this->button_properties['add_to_passthru_data']['return_type'])) {
163 163
 
164
-			if ($this->button_properties['add_to_passthru_data']['return_type']=='report') {
165
-				$initial_filter = "&module_name=". urlencode($widget_data['module']);
164
+			if ($this->button_properties['add_to_passthru_data']['return_type'] == 'report') {
165
+				$initial_filter = "&module_name=".urlencode($widget_data['module']);
166 166
 			}
167 167
 		}
168 168
 		$json_encoded_php_array = $this->_create_json_encoded_popup_request($popup_request_data);
169 169
 
170
-		return '<form action="index.php">' . "\n"
171
-			. ' <input type="button" name="' .$this->getWidgetId() . '" id="' .$this->getWidgetId() . '" class="button"' . "\"\n"
172
-				. ' title="' . $this->title . '"'
173
-			. ' value="' . $this->value . "\"\n"
170
+		return '<form action="index.php">'."\n"
171
+			. ' <input type="button" name="'.$this->getWidgetId().'" id="'.$this->getWidgetId().'" class="button"'."\"\n"
172
+				. ' title="'.$this->title.'"'
173
+			. ' value="'.$this->value."\"\n"
174 174
 			. " onclick='open_popup(\"$this->module_name\",600,400,\"$initial_filter\",true,true,$json_encoded_php_array,\"$popup_mode\",$create);' /></form>\n";
175 175
 	}
176 176
 }
Please login to merge, or discard this patch.
include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectAccountButton.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /*********************************************************************************
4 4
  * SugarCRM Community Edition is a customer relationship management program developed by
5 5
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 		* Bug25633 code change start
54 54
 		*/
55 55
 		if (!ACLController::checkAccess($widget_data["module"], "edit", true)) {
56
-			return ;
56
+			return;
57 57
 		}
58 58
 		/*
59 59
 		* Bug25633 code change end
Please login to merge, or discard this patch.
include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectButton.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /*********************************************************************************
4 4
  * SugarCRM Community Edition is a customer relationship management program developed by
5 5
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -46,14 +46,14 @@  discard block
 block discarded – undo
46 46
 class SugarWidgetSubPanelTopSelectButton extends SugarWidgetSubPanelTopButton
47 47
 {
48 48
 	//button_properties is a collection of properties associated with the widget_class definition. layoutmanager
49
-	function SugarWidgetSubPanelTopSelectButton($button_properties=array())
49
+	function SugarWidgetSubPanelTopSelectButton($button_properties = array())
50 50
 	{
51
-		$this->button_properties=$button_properties;
51
+		$this->button_properties = $button_properties;
52 52
 	}
53 53
 
54 54
     public function getWidgetId($buttonSuffix = true)
55 55
     {
56
-        return parent::getWidgetId(false) . 'select_button';
56
+        return parent::getWidgetId(false).'select_button';
57 57
     }
58 58
 
59 59
     public function getDisplayName()
@@ -66,38 +66,38 @@  discard block
 block discarded – undo
66 66
 		global $app_strings;
67 67
 		$initial_filter = '';
68 68
 
69
-	    $this->title     = $this->getTitle();
69
+	    $this->title = $this->getTitle();
70 70
         $this->accesskey = $this->getAccesskey();
71 71
         $this->value     = $this->getDisplayName();
72 72
 
73 73
 		if (is_array($this->button_properties)) {
74
-			if( isset($this->button_properties['title'])) {
74
+			if (isset($this->button_properties['title'])) {
75 75
 				$this->title = $app_strings[$this->button_properties['title']];
76 76
 			}
77
-			if( isset($this->button_properties['accesskey'])) {
77
+			if (isset($this->button_properties['accesskey'])) {
78 78
 				$this->accesskey = $app_strings[$this->button_properties['accesskey']];
79 79
 			}
80
-			if( isset($this->button_properties['form_value'])) {
80
+			if (isset($this->button_properties['form_value'])) {
81 81
 				$this->value = $app_strings[$this->button_properties['form_value']];
82 82
 			}
83
-			if( isset($this->button_properties['module'])) {
83
+			if (isset($this->button_properties['module'])) {
84 84
 				$this->module_name = $this->button_properties['module'];
85 85
 			}
86 86
 		}
87 87
 
88 88
 
89 89
 		$focus = $widget_data['focus'];
90
-		if(ACLController::moduleSupportsACL($widget_data['module']) && !ACLController::checkAccess($widget_data['module'], 'list', true)){
91
-			$button = ' <input type="button" name="' . $this->getWidgetId() . '" id="' . $this->getWidgetId() . '" class="button"' . "\n"
92
-			. ' title="' . $this->title . '"'
93
-			. ' value="' . $this->value . "\"\n"
90
+		if (ACLController::moduleSupportsACL($widget_data['module']) && !ACLController::checkAccess($widget_data['module'], 'list', true)) {
91
+			$button = ' <input type="button" name="'.$this->getWidgetId().'" id="'.$this->getWidgetId().'" class="button"'."\n"
92
+			. ' title="'.$this->title.'"'
93
+			. ' value="'.$this->value."\"\n"
94 94
 			.' disabled />';
95 95
 			return $button;
96 96
 		}
97 97
 
98 98
 		//refresh the whole page after end of action?
99 99
 		$refresh_page = 0;
100
-		if(!empty($widget_data['subpanel_definition']->_instance_properties['refresh_page'])){
100
+		if (!empty($widget_data['subpanel_definition']->_instance_properties['refresh_page'])) {
101 101
 			$refresh_page = 1;
102 102
 		}
103 103
 
@@ -109,31 +109,31 @@  discard block
 block discarded – undo
109 109
 			$this->module_name = $subpanel_definition->get_module_name();
110 110
 		}
111 111
 		$link_field_name = $subpanel_definition->get_data_source_name(true);
112
-		$popup_mode='Single';
113
-		if(isset($widget_data['mode'])){
114
-			$popup_mode=$widget_data['mode'];
112
+		$popup_mode = 'Single';
113
+		if (isset($widget_data['mode'])) {
114
+			$popup_mode = $widget_data['mode'];
115 115
 		}
116
-		if(isset($widget_data['initial_filter_fields'])){
116
+		if (isset($widget_data['initial_filter_fields'])) {
117 117
 			if (is_array($widget_data['initial_filter_fields'])) {
118 118
 				foreach ($widget_data['initial_filter_fields'] as $value=>$alias) {
119 119
 					if (isset($focus->$value) and !empty($focus->$value)) {
120
-						$initial_filter.="&".$alias . '='.urlencode($focus->$value);
120
+						$initial_filter .= "&".$alias.'='.urlencode($focus->$value);
121 121
 					}
122 122
 				}
123 123
 			}
124 124
 		}
125
-		$create="true";
126
-		if(isset($widget_data['create'])){
127
-			$create=$widget_data['create'];
125
+		$create = "true";
126
+		if (isset($widget_data['create'])) {
127
+			$create = $widget_data['create'];
128 128
 		}
129 129
 		$return_module = $_REQUEST['module'];
130 130
 		$return_action = 'SubPanelViewer';
131 131
 		$return_id = $_REQUEST['record'];
132 132
 
133 133
 		//field_to_name_array
134
-		$fton_array= array('id' => 'subpanel_id');
135
-		if(isset($widget_data['field_to_name_array']) && is_array($widget_data['field_to_name_array'])){
136
-			$fton_array=array_merge($fton_array,$widget_data['field_to_name_array']);
134
+		$fton_array = array('id' => 'subpanel_id');
135
+		if (isset($widget_data['field_to_name_array']) && is_array($widget_data['field_to_name_array'])) {
136
+			$fton_array = array_merge($fton_array, $widget_data['field_to_name_array']);
137 137
 		}
138 138
 
139 139
 		$return_url = "index.php?module=$return_module&action=$return_action&subpanel=$subpanel_name&record=$return_id&sugar_body_only=1";
@@ -159,21 +159,21 @@  discard block
 block discarded – undo
159 159
 
160 160
                 if (is_array($this->button_properties) && !empty($this->button_properties['add_to_passthru_data'])) 
161 161
                 {
162
-                    $popup_request_data['passthru_data']= array_merge($popup_request_data['passthru_data'],$this->button_properties['add_to_passthru_data']);
162
+                    $popup_request_data['passthru_data'] = array_merge($popup_request_data['passthru_data'], $this->button_properties['add_to_passthru_data']);
163 163
                 }
164 164
 
165 165
 		if (is_array($this->button_properties) && !empty($this->button_properties['add_to_passthru_data']['return_type'])) {
166 166
 
167
-			if ($this->button_properties['add_to_passthru_data']['return_type']=='report') {
168
-				$initial_filter = "&module_name=". urlencode($widget_data['module']);
167
+			if ($this->button_properties['add_to_passthru_data']['return_type'] == 'report') {
168
+				$initial_filter = "&module_name=".urlencode($widget_data['module']);
169 169
 			}
170 170
 		}
171 171
         //acl_roles_users_selectuser_button
172 172
 
173 173
         $json_encoded_php_array = $this->_create_json_encoded_popup_request($popup_request_data);
174
-		return ' <input type="button" name="' . $this->getWidgetId() . '" id="' . $this->getWidgetId() . '" class="button"' . "\n"
175
-				. ' title="' . $this->title . '"'
176
-			. ' value="' . $this->value . "\"\n"
174
+		return ' <input type="button" name="'.$this->getWidgetId().'" id="'.$this->getWidgetId().'" class="button"'."\n"
175
+				. ' title="'.$this->title.'"'
176
+			. ' value="'.$this->value."\"\n"
177 177
 			. " onclick='open_popup(\"$this->module_name\",600,400,\"$initial_filter\",true,true,$json_encoded_php_array,\"$popup_mode\",$create);' />\n";
178 178
 	}
179 179
 
Please login to merge, or discard this patch.
include/generic/SugarWidgets/SugarWidgetFielddatetime.php 1 patch
Spacing   +54 added lines, -54 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /*********************************************************************************
4 4
  * SugarCRM Community Edition is a customer relationship management program developed by
5 5
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 class SugarWidgetFieldDateTime extends SugarWidgetReportField
45 45
 {
46 46
 	var $reporter;
47
-	var $assigned_user=null;
47
+	var $assigned_user = null;
48 48
 
49 49
     function SugarWidgetFieldDateTime($layout_manager)
50 50
     {
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 
67 67
 		$report_def_str = $json_obj->decode($this->reporter->report_def_str);
68 68
 
69
-		if(empty($report_def_str['assigned_user_id'])) return null;
69
+		if (empty($report_def_str['assigned_user_id'])) return null;
70 70
 
71 71
 		$this->assigned_user = new User();
72 72
 		$this->assigned_user->retrieve($report_def_str['assigned_user_id']);
@@ -111,12 +111,12 @@  discard block
 block discarded – undo
111 111
 	protected function expandDate($date, $end = false)
112 112
 	{
113 113
 	    global $timedate;
114
-	    if($this->hasTime($date)) {
114
+	    if ($this->hasTime($date)) {
115 115
 	        return $date;
116 116
 	    }
117 117
 
118 118
         //C.L. Bug 48616 - If the $date is set to the Today macro, then adjust accordingly
119
-        if(strtolower($date) == 'today')
119
+        if (strtolower($date) == 'today')
120 120
         {
121 121
            $startEnd = $timedate->getDayStartEndGMT($timedate->getNow(true));
122 122
            return $end ? $startEnd['end'] : $startEnd['start'];
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
         $date = $timedate->tzUser(new SugarDateTime());
127 127
         $date->setDate($parsed->year, $parsed->month, $parsed->day);
128 128
 
129
-	    if($end) {
129
+	    if ($end) {
130 130
 	        return $date->setTime(23, 59, 59);
131 131
 	    } else {
132 132
 	        return $date->setTime(0, 0, 0);
@@ -161,13 +161,13 @@  discard block
 block discarded – undo
161 161
         $column = $this->_get_column_select($layout_def);
162 162
         $begin = $layout_def['input_name0'];
163 163
         $hasTime = $this->hasTime($begin);
164
-        if(!$hasTime){
164
+        if (!$hasTime) {
165 165
      	    $end = $this->expandDate($begin, true);
166 166
             $begin = $this->expandDate($begin);
167 167
             $cond = $this->queryDateOp($column, $begin, "<", "datetime")." OR ".
168 168
                 $this->queryDateOp($column, $end, ">", "datetime");
169 169
         } else {
170
-            $cond =  $this->queryDateOp($column, $begin, "!=", "datetime");
170
+            $cond = $this->queryDateOp($column, $begin, "!=", "datetime");
171 171
         }
172 172
         return "($column IS NULL OR $cond)";
173 173
 	}
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
      * Get assigned or logged in user's current date and time value.
177 177
      * @param boolean $timestamp Format of return value, if set to true, return unix like timestamp , else a formatted date.
178 178
      */
179
-	function get_users_current_date_time($timestamp=false)
179
+	function get_users_current_date_time($timestamp = false)
180 180
 	{
181 181
 	 	global $current_user;
182 182
         global $timedate;
@@ -190,9 +190,9 @@  discard block
 block discarded – undo
190 190
         	return $begin;
191 191
         } else {
192 192
         	$begin_parts = explode(' ', $begin);
193
-        	$date_parts=explode('-', $begin_parts[0]);
194
-        	$time_parts=explode(':', $begin_parts[1]);
195
-        	$curr_timestamp=mktime($time_parts[0],$time_parts[1],0,$date_parts[1], $date_parts[2],$date_parts[0]);
193
+        	$date_parts = explode('-', $begin_parts[0]);
194
+        	$time_parts = explode(':', $begin_parts[1]);
195
+        	$curr_timestamp = mktime($time_parts[0], $time_parts[1], 0, $date_parts[1], $date_parts[2], $date_parts[0]);
196 196
         	return $curr_timestamp;
197 197
         }
198 198
 
@@ -202,23 +202,23 @@  discard block
 block discarded – undo
202 202
 	 * @param int $days Adjust date by this number of days, negative values are valid.
203 203
 	 * @param time string falg for desired time value, start: minimum time, end: maximum time, default: current time
204 204
 	 */
205
-	function get_db_date($days,$time) {
205
+	function get_db_date($days, $time) {
206 206
         global $timedate;
207 207
 
208
-        $begin = date($GLOBALS['timedate']->get_db_date_time_format(), time()+(86400 * $days));  //gmt date with day adjustment applied.
208
+        $begin = date($GLOBALS['timedate']->get_db_date_time_format(), time() + (86400 * $days)); //gmt date with day adjustment applied.
209 209
         //kbrill bug #13884
210 210
         //$begin = $timedate->to_display_date_time($begin,true,true,$this->assigned_user);
211 211
 		$begin = $timedate->handle_offset($begin, $timedate->get_db_date_time_format(), false, $this->assigned_user);
212 212
 
213
-        if ($time=='start') {
213
+        if ($time == 'start') {
214 214
             $begin_parts = explode(' ', $begin);
215
-            $be = $begin_parts[0] . ' 00:00:00';
215
+            $be = $begin_parts[0].' 00:00:00';
216 216
         }
217
-        else if ($time=='end') {
217
+        else if ($time == 'end') {
218 218
             $begin_parts = explode(' ', $begin);
219
-            $be = $begin_parts[0] . ' 23:59:59';
219
+            $be = $begin_parts[0].' 23:59:59';
220 220
         } else {
221
-            $be=$begin;
221
+            $be = $begin;
222 222
         }
223 223
 
224 224
         //convert date to db format without converting to GMT.
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 	 * @param string $begin start date value (in DB format)
234 234
 	 * @param string $end End date value (in DB format)
235 235
 	 */
236
-	function get_start_end_date_filter(& $layout_def, $begin,$end)
236
+	function get_start_end_date_filter(& $layout_def, $begin, $end)
237 237
 	{
238 238
 	    if (isset ($layout_def['rel_field'])) {
239 239
 	        $field_name = $this->reporter->db->convert(
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
     protected function queryDateOp($arg1, $arg2, $op, $type)
261 261
     {
262 262
         global $timedate;
263
-        if($arg2 instanceof DateTime) {
263
+        if ($arg2 instanceof DateTime) {
264 264
             $arg2 = $timedate->asDbType($arg2, $type);
265 265
         }
266 266
         return "$arg1 $op ".$this->reporter->db->convert($this->reporter->db->quoted($arg2), $type)."\n";
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
     {
286 286
         $begin = $day->get_day_begin();
287 287
         $end = $day->get_day_end();
288
-        return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
288
+        return $this->get_start_end_date_filter($layout_def, $begin->asDb(), $end->asDb());
289 289
     }
290 290
 
291 291
 	function queryFilterTP_yesterday($layout_def)
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
 		$begin = $this->now()->get("-6 days")->get_day_begin();
314 314
 		$end = $this->now()->get_day_end();
315 315
 
316
-		return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
316
+		return $this->get_start_end_date_filter($layout_def, $begin->asDb(), $end->asDb());
317 317
 	}
318 318
 
319 319
 	function queryFilterTP_next_7_days($layout_def)
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
323 323
 		$begin = $this->now()->get_day_begin();
324 324
 		$end = $this->now()->get("+6 days")->get_day_end();
325 325
 
326
-		return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
326
+		return $this->get_start_end_date_filter($layout_def, $begin->asDb(), $end->asDb());
327 327
 	}
328 328
 
329 329
     /**
@@ -336,14 +336,14 @@  discard block
 block discarded – undo
336 336
         $begin = $month->setTime(0, 0, 0);
337 337
         $end = clone($begin);
338 338
 		$end->setDate($begin->year, $begin->month, $begin->days_in_month)->setTime(23, 59, 59);
339
-        return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
339
+        return $this->get_start_end_date_filter($layout_def, $begin->asDb(), $end->asDb());
340 340
     }
341 341
 
342 342
     function queryFilterTP_last_month($layout_def)
343 343
 	{
344 344
 		global $timedate;
345 345
 		$month = $this->now();
346
-		return $this->queryMonth($layout_def, $month->setDate($month->year, $month->month-1, 1));
346
+		return $this->queryMonth($layout_def, $month->setDate($month->year, $month->month - 1, 1));
347 347
 	}
348 348
 
349 349
 	function queryFilterTP_this_month($layout_def)
@@ -363,7 +363,7 @@  discard block
 block discarded – undo
363 363
 	{
364 364
 		global $timedate;
365 365
 		$month = $this->now();
366
-		return $this->queryMonth($layout_def, $month->setDate($month->year, $month->month+1, 1));
366
+		return $this->queryMonth($layout_def, $month->setDate($month->year, $month->month + 1, 1));
367 367
 	}
368 368
 
369 369
 	function queryFilterTP_last_30_days($layout_def)
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
 		global $timedate;
372 372
 		$begin = $this->now()->get("-29 days")->get_day_begin();
373 373
 		$end = $this->now()->get_day_end();
374
-		return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
374
+		return $this->get_start_end_date_filter($layout_def, $begin->asDb(), $end->asDb());
375 375
 	}
376 376
 
377 377
 	function queryFilterTP_next_30_days($layout_def)
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
 		global $timedate;
380 380
 		$begin = $this->now()->get_day_begin();
381 381
 		$end = $this->now()->get("+29 days")->get_day_end();
382
-		return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
382
+		return $this->get_start_end_date_filter($layout_def, $begin->asDb(), $end->asDb());
383 383
 	}
384 384
 
385 385
     /**
@@ -457,10 +457,10 @@  discard block
 block discarded – undo
457 457
 	{
458 458
 		global $timedate;
459 459
 		$begin = $this->now();
460
-		$begin->setDate($begin->year-1, 1, 1)->setTime(0, 0);
460
+		$begin->setDate($begin->year - 1, 1, 1)->setTime(0, 0);
461 461
 		$end = clone $begin;
462 462
 		$end->setDate($end->year, 12, 31)->setTime(23, 59, 59);
463
-		return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
463
+		return $this->get_start_end_date_filter($layout_def, $begin->asDb(), $end->asDb());
464 464
 	}
465 465
 
466 466
 	function queryFilterTP_this_year($layout_def)
@@ -470,17 +470,17 @@  discard block
 block discarded – undo
470 470
 		$begin->setDate($begin->year, 1, 1)->setTime(0, 0);
471 471
 		$end = clone $begin;
472 472
 		$end->setDate($end->year, 12, 31)->setTime(23, 59, 59);
473
-		return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
473
+		return $this->get_start_end_date_filter($layout_def, $begin->asDb(), $end->asDb());
474 474
 	}
475 475
 
476 476
 	function queryFilterTP_next_year(& $layout_def)
477 477
 	{
478 478
 		global $timedate;
479 479
 		$begin = $this->now();
480
-		$begin->setDate($begin->year+1, 1, 1)->setTime(0, 0);
480
+		$begin->setDate($begin->year + 1, 1, 1)->setTime(0, 0);
481 481
 		$end = clone $begin;
482 482
 		$end->setDate($end->year, 12, 31)->setTime(23, 59, 59);
483
-		return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb());
483
+		return $this->get_start_end_date_filter($layout_def, $begin->asDb(), $end->asDb());
484 484
 	}
485 485
 
486 486
 	function queryGroupBy($layout_def)
@@ -489,7 +489,7 @@  discard block
 block discarded – undo
489 489
 		if (!empty ($layout_def['qualifier'])) {
490 490
 			$func_name = 'queryGroupBy'.$layout_def['qualifier'];
491 491
 			if (method_exists($this, $func_name)) {
492
-				return $this-> $func_name ($layout_def)." \n";
492
+				return $this-> $func_name($layout_def)." \n";
493 493
 			}
494 494
 		}
495 495
 		return parent :: queryGroupBy($layout_def)." \n";
@@ -498,9 +498,9 @@  discard block
 block discarded – undo
498 498
 	function queryOrderBy($layout_def)
499 499
 	{
500 500
         if (!empty ($layout_def['qualifier'])) {
501
-			$func_name ='queryOrderBy'.$layout_def['qualifier'];
501
+			$func_name = 'queryOrderBy'.$layout_def['qualifier'];
502 502
 			if (method_exists($this, $func_name)) {
503
-				return $this-> $func_name ($layout_def)."\n";
503
+				return $this-> $func_name($layout_def)."\n";
504 504
 			}
505 505
 		}
506 506
 		$order_by = parent :: queryOrderBy($layout_def)."\n";
@@ -511,15 +511,15 @@  discard block
 block discarded – undo
511 511
         global $timedate;
512 512
         $content = parent:: displayListPlain($layout_def);
513 513
         // awu: this if condition happens only in Reports where group by month comes back as YYYY-mm format
514
-        if (count(explode('-',$content)) == 2){
514
+        if (count(explode('-', $content)) == 2) {
515 515
             return $content;
516 516
         // if date field
517
-        }elseif(substr_count($layout_def['type'], 'date') > 0){
517
+        }elseif (substr_count($layout_def['type'], 'date') > 0) {
518 518
             // if date time field
519
-            if(substr_count($layout_def['type'], 'time') > 0 && $this->get_time_part($content)!= false){
519
+            if (substr_count($layout_def['type'], 'time') > 0 && $this->get_time_part($content) != false) {
520 520
                 $td = $timedate->to_display_date_time($content);
521 521
                 return $td;
522
-            }else{// if date only field
522
+            } else {// if date only field
523 523
                 $td = $timedate->to_display_date($content, false); // Avoid PHP notice of returning by reference.
524 524
                 return $td;
525 525
             }
@@ -530,7 +530,7 @@  discard block
 block discarded – undo
530 530
     {
531 531
         global $timedate;
532 532
 
533
-        $date_parts=$timedate->split_date_time($date_time_value);
533
+        $date_parts = $timedate->split_date_time($date_time_value);
534 534
         if (count($date_parts) > 1) {
535 535
             return $date_parts[1];
536 536
         } else {
@@ -544,7 +544,7 @@  discard block
 block discarded – undo
544 544
         if (!empty ($layout_def['column_function'])) {
545 545
             $func_name = 'displayList'.$layout_def['column_function'];
546 546
             if (method_exists($this, $func_name)) {
547
-                return $this-> $func_name ($layout_def);
547
+                return $this-> $func_name($layout_def);
548 548
             }
549 549
         }
550 550
         $content = parent :: displayListPlain($layout_def);
@@ -556,7 +556,7 @@  discard block
 block discarded – undo
556 556
 		if (!empty ($layout_def['column_function'])) {
557 557
 			$func_name = 'querySelect'.$layout_def['column_function'];
558 558
 			if (method_exists($this, $func_name)) {
559
-				return $this-> $func_name ($layout_def)." \n";
559
+				return $this-> $func_name($layout_def)." \n";
560 560
 			}
561 561
 		}
562 562
 		return parent :: querySelect($layout_def)." \n";
@@ -598,7 +598,7 @@  discard block
 block discarded – undo
598 598
         {
599 599
             $return = $this->reporter->db->convert($return, 'add_tz_offset');
600 600
         }
601
-        return $this->reporter->db->convert($return, "date_format", array('%Y-%m')) . ' ' . $this->_get_column_alias($layout_def) . "\n";
601
+        return $this->reporter->db->convert($return, "date_format", array('%Y-%m')).' '.$this->_get_column_alias($layout_def)."\n";
602 602
     }
603 603
 
604 604
     /**
@@ -614,7 +614,7 @@  discard block
 block discarded – undo
614 614
         {
615 615
             $return = $this->reporter->db->convert($return, 'add_tz_offset');
616 616
         }
617
-        return $this->reporter->db->convert($return, "date_format", array('%Y-%m')) . "\n";
617
+        return $this->reporter->db->convert($return, "date_format", array('%Y-%m'))."\n";
618 618
     }
619 619
 
620 620
     /**
@@ -634,11 +634,11 @@  discard block
 block discarded – undo
634 634
 
635 635
         if (empty($layout_def['sort_dir']) || $layout_def['sort_dir'] == 'a')
636 636
         {
637
-            return $orderBy . " ASC\n";
637
+            return $orderBy." ASC\n";
638 638
         }
639 639
         else
640 640
         {
641
-            return $orderBy . " DESC\n";
641
+            return $orderBy." DESC\n";
642 642
         }
643 643
     }
644 644
 
@@ -655,7 +655,7 @@  discard block
 block discarded – undo
655 655
         {
656 656
             $return = $this->reporter->db->convert($return, 'add_tz_offset');
657 657
         }
658
-        return $this->reporter->db->convert($return, "date_format", array('%Y-%m-%d')) . ' ' . $this->_get_column_alias($layout_def) . "\n";
658
+        return $this->reporter->db->convert($return, "date_format", array('%Y-%m-%d')).' '.$this->_get_column_alias($layout_def)."\n";
659 659
     }
660 660
 
661 661
     /**
@@ -671,7 +671,7 @@  discard block
 block discarded – undo
671 671
         {
672 672
             $return = $this->reporter->db->convert($return, 'add_tz_offset');
673 673
         }
674
-        return $this->reporter->db->convert($return, "date_format", array('%Y-%m-%d')) . "\n";
674
+        return $this->reporter->db->convert($return, "date_format", array('%Y-%m-%d'))."\n";
675 675
     }
676 676
 
677 677
     /**
@@ -687,7 +687,7 @@  discard block
 block discarded – undo
687 687
         {
688 688
             $return = $this->reporter->db->convert($return, 'add_tz_offset');
689 689
         }
690
-        return $this->reporter->db->convert($return, "date_format", array('%Y')) . ' ' . $this->_get_column_alias($layout_def) . "\n";
690
+        return $this->reporter->db->convert($return, "date_format", array('%Y')).' '.$this->_get_column_alias($layout_def)."\n";
691 691
     }
692 692
 
693 693
     /**
@@ -703,7 +703,7 @@  discard block
 block discarded – undo
703 703
         {
704 704
             $return = $this->reporter->db->convert($return, 'add_tz_offset');
705 705
         }
706
-        return $this->reporter->db->convert($return, "date_format", array('%Y')) . "\n";
706
+        return $this->reporter->db->convert($return, "date_format", array('%Y'))."\n";
707 707
     }
708 708
 
709 709
 	function querySelectquarter($layout_def)
@@ -751,11 +751,11 @@  discard block
 block discarded – undo
751 751
 
752 752
         if (empty($layout_def['sort_dir']) || $layout_def['sort_dir'] == 'a')
753 753
         {
754
-            return $orderBy . " ASC\n";
754
+            return $orderBy." ASC\n";
755 755
         }
756 756
         else
757 757
         {
758
-            return $orderBy . " DESC\n";
758
+            return $orderBy." DESC\n";
759 759
         }
760 760
     }
761 761
 
Please login to merge, or discard this patch.
include/generic/SugarWidgets/SugarWidgetFielddatetimecombo.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /*********************************************************************************
4 4
  * SugarCRM Community Edition is a customer relationship management program developed by
5 5
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 
44 44
 class SugarWidgetFieldDateTimecombo extends SugarWidgetFieldDateTime {
45 45
 	var $reporter;
46
-	var $assigned_user=null;
46
+	var $assigned_user = null;
47 47
 
48 48
     function SugarWidgetFieldDateTimecombo(&$layout_manager) {
49 49
         parent::SugarWidgetFieldDateTime($layout_manager);
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 	//If there is requirement, we can modify report.js::addFilterInputDatetimesBetween and this function
54 54
 	function queryFilterBetween_Datetimes(& $layout_def) {
55 55
 		global $timedate;
56
-		if($this->getAssignedUser()) {
56
+		if ($this->getAssignedUser()) {
57 57
 			$begin = $timedate->handle_offset($layout_def['input_name0'], $timedate->get_db_date_time_format(), false, $this->assigned_user);
58 58
 			$end = $timedate->handle_offset($layout_def['input_name2'], $timedate->get_db_date_time_format(), false, $this->assigned_user);
59 59
 		}
Please login to merge, or discard this patch.