adamjakab / SuiteCRM

include/generic/SugarWidgets/SugarWidgetSubPanelEditRoleButton.php

Indentation +21 added lines, -21 removed lines

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

include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateNoteButton.php

Indentation +115 added lines, -115 removed lines

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

include/generic/SugarWidgets/SugarWidgetFieldtext.php

Indentation +1 added lines, -1 removed lines

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

include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectContactsButton.php

Indentation +122 added lines, -122 removed lines

@@ -45,133 +45,133 @@
 
 class SugarWidgetSubPanelTopSelectContactsButton extends SugarWidgetSubPanelTopSelectButton
 {
-	//button_properties is a collection of properties associated with the widget_class definition. layoutmanager
-	function SugarWidgetSubPanelTopSelectContactsButton($button_properties=array())
-	{
-		$this->button_properties=$button_properties;
-	}
+    //button_properties is a collection of properties associated with the widget_class definition. layoutmanager
+    function SugarWidgetSubPanelTopSelectContactsButton($button_properties=array())
+    {
+        $this->button_properties=$button_properties;
+    }
 
     public function getWidgetId($buttonSuffix = true)
     {
         return parent::getWidgetId() . '_select_button';
     }
 
-	//widget_data is the collection of attributes associated with the button in the layout_defs file.
-	function display($widget_data, $additionalFormFields = NULL, $nonbutton = false)
-	{
-		global $app_strings;
-		$initial_filter = '';
-
-		$this->title = $app_strings['LBL_SELECT_CONTACT_BUTTON_TITLE'];
-		//$this->accesskey = $app_strings['LBL_SELECT_CONTACT_BUTTON_KEY'];
-		$this->value = $app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL'];
-
-		$this->module_name = 'Contacts';
-
-		if (is_array($this->button_properties)) {
-			if( isset($this->button_properties['title'])) {
-				$this->title = $app_strings[$this->button_properties['title']];
-			}
-			if( isset($this->button_properties['accesskey'])) {
-				//$this->accesskey = $app_strings[$this->button_properties['accesskey']];
-			}
-			if( isset($this->button_properties['form_value'])) {
-				$this->value = $app_strings[$this->button_properties['form_value']];
-			}
-			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"
-			.' disabled />';
-			return $button;
-		}
-
-		//refresh the whole page after end of action?
-		$refresh_page = 0;
-		if(!empty($widget_data['subpanel_definition']->_instance_properties['refresh_page'])){
-			$refresh_page = 1;
-		}
-
-		$subpanel_definition = $widget_data['subpanel_definition'];
-
-		$button_definition = $subpanel_definition->get_buttons();
-		$subpanel_name = $subpanel_definition->get_module_name();
-		if (empty($this->module_name)) {
-			$this->module_name = $subpanel_name;
-		}
-
-		if ($subpanel_name == 'Project'){
-			$link_field_name = 'project_contacts_1';
-		}
-		else{
-			$link_field_name = $subpanel_definition->get_data_source_name(true);
-		}
-
-		$popup_mode='Single';
-		if(isset($widget_data['mode'])){
-			$popup_mode=$widget_data['mode'];
-		}
-		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);
-					}
-				}
-			}
-		}
-		$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']);
-		}
-
-		$return_url = "index.php?module=$return_module&action=$return_action&subpanel=$subpanel_name&record=$return_id&sugar_body_only=1";
-
-		$popup_request_data = array(
-			'call_back_function' => 'set_return_and_save_background',
-			'form_name' => 'DetailView',
-			'field_to_name_array' => $fton_array,
-			'passthru_data' => array(
-				'child_field' => $this->module_name,
-				'return_url' => urlencode($return_url),
-				'link_field_name' => $link_field_name,
-				'module_name' => $this->module_name,
-				'refresh_page' => 1,
-			),
-		);
-
-		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']);
-		}
-
-		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']);
-			}
-		}
-		$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"
-			. " onclick='open_popup(\"$this->module_name\",600,400,\"$initial_filter\",true,true,$json_encoded_php_array,\"$popup_mode\",$create);' /></form>\n";
-	}
+    //widget_data is the collection of attributes associated with the button in the layout_defs file.
+    function display($widget_data, $additionalFormFields = NULL, $nonbutton = false)
+    {
+        global $app_strings;
+        $initial_filter = '';
+
+        $this->title = $app_strings['LBL_SELECT_CONTACT_BUTTON_TITLE'];
+        //$this->accesskey = $app_strings['LBL_SELECT_CONTACT_BUTTON_KEY'];
+        $this->value = $app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL'];
+
+        $this->module_name = 'Contacts';
+
+        if (is_array($this->button_properties)) {
+            if( isset($this->button_properties['title'])) {
+                $this->title = $app_strings[$this->button_properties['title']];
+            }
+            if( isset($this->button_properties['accesskey'])) {
+                //$this->accesskey = $app_strings[$this->button_properties['accesskey']];
+            }
+            if( isset($this->button_properties['form_value'])) {
+                $this->value = $app_strings[$this->button_properties['form_value']];
+            }
+            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"
+            .' disabled />';
+            return $button;
+        }
+
+        //refresh the whole page after end of action?
+        $refresh_page = 0;
+        if(!empty($widget_data['subpanel_definition']->_instance_properties['refresh_page'])){
+            $refresh_page = 1;
+        }
+
+        $subpanel_definition = $widget_data['subpanel_definition'];
+
+        $button_definition = $subpanel_definition->get_buttons();
+        $subpanel_name = $subpanel_definition->get_module_name();
+        if (empty($this->module_name)) {
+            $this->module_name = $subpanel_name;
+        }
+
+        if ($subpanel_name == 'Project'){
+            $link_field_name = 'project_contacts_1';
+        }
+        else{
+            $link_field_name = $subpanel_definition->get_data_source_name(true);
+        }
+
+        $popup_mode='Single';
+        if(isset($widget_data['mode'])){
+            $popup_mode=$widget_data['mode'];
+        }
+        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);
+                    }
+                }
+            }
+        }
+        $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']);
+        }
+
+        $return_url = "index.php?module=$return_module&action=$return_action&subpanel=$subpanel_name&record=$return_id&sugar_body_only=1";
+
+        $popup_request_data = array(
+            'call_back_function' => 'set_return_and_save_background',
+            'form_name' => 'DetailView',
+            'field_to_name_array' => $fton_array,
+            'passthru_data' => array(
+                'child_field' => $this->module_name,
+                'return_url' => urlencode($return_url),
+                'link_field_name' => $link_field_name,
+                'module_name' => $this->module_name,
+                'refresh_page' => 1,
+            ),
+        );
+
+        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']);
+        }
+
+        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']);
+            }
+        }
+        $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"
+            . " onclick='open_popup(\"$this->module_name\",600,400,\"$initial_filter\",true,true,$json_encoded_php_array,\"$popup_mode\",$create);' /></form>\n";
+    }
 }
 ?>

include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectAccountButton.php

Indentation +9 added lines, -9 removed lines

@@ -44,21 +44,21 @@
 
 
 class SugarWidgetSubPanelTopSelectAccountButton extends SugarWidgetSubPanelTopSelectButton {
-	function display($widget_data, $additionalFormFields = NULL, $nonbutton = false)
-	{
-		/*
+    function display($widget_data, $additionalFormFields = NULL, $nonbutton = false)
+    {
+        /*
 		* i.dymovsky
 		* Because when user role can't edit Accounts, it also can't edit Membership Organizations. Select button leads to change MO list
 		* See bug 25633
 		* Bug25633 code change start
 		*/
-		if (!ACLController::checkAccess($widget_data["module"], "edit", true)) {
-			return ;
-		}
-		/*
+        if (!ACLController::checkAccess($widget_data["module"], "edit", true)) {
+            return ;
+        }
+        /*
 		* Bug25633 code change end
 		*/
 		
-		return parent::display($widget_data);
-	}
+        return parent::display($widget_data);
+    }
 }

include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectButton.php

Indentation +105 added lines, -105 removed lines

@@ -45,11 +45,11 @@ 
 
 class SugarWidgetSubPanelTopSelectButton extends SugarWidgetSubPanelTopButton
 {
-	//button_properties is a collection of properties associated with the widget_class definition. layoutmanager
-	function SugarWidgetSubPanelTopSelectButton($button_properties=array())
-	{
-		$this->button_properties=$button_properties;
-	}
+    //button_properties is a collection of properties associated with the widget_class definition. layoutmanager
+    function SugarWidgetSubPanelTopSelectButton($button_properties=array())
+    {
+        $this->button_properties=$button_properties;
+    }
 
     public function getWidgetId($buttonSuffix = true)
     {
@@ -60,96 +60,96 @@ 
     {
         return $GLOBALS['app_strings']['LBL_SELECT_BUTTON_LABEL'];
     }
-	//widget_data is the collection of attributes associated with the button in the layout_defs file.
-	function display($widget_data, $additionalFormFields = NULL, $nonbutton = false)
-	{
-		global $app_strings;
-		$initial_filter = '';
+    //widget_data is the collection of attributes associated with the button in the layout_defs file.
+    function display($widget_data, $additionalFormFields = NULL, $nonbutton = false)
+    {
+        global $app_strings;
+        $initial_filter = '';
 
-	    $this->title     = $this->getTitle();
+        $this->title     = $this->getTitle();
         $this->accesskey = $this->getAccesskey();
         $this->value     = $this->getDisplayName();
 
-		if (is_array($this->button_properties)) {
-			if( isset($this->button_properties['title'])) {
-				$this->title = $app_strings[$this->button_properties['title']];
-			}
-			if( isset($this->button_properties['accesskey'])) {
-				$this->accesskey = $app_strings[$this->button_properties['accesskey']];
-			}
-			if( isset($this->button_properties['form_value'])) {
-				$this->value = $app_strings[$this->button_properties['form_value']];
-			}
-			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"
-			.' disabled />';
-			return $button;
-		}
-
-		//refresh the whole page after end of action?
-		$refresh_page = 0;
-		if(!empty($widget_data['subpanel_definition']->_instance_properties['refresh_page'])){
-			$refresh_page = 1;
-		}
-
-		$subpanel_definition = $widget_data['subpanel_definition'];
-		$button_definition = $subpanel_definition->get_buttons();
+        if (is_array($this->button_properties)) {
+            if( isset($this->button_properties['title'])) {
+                $this->title = $app_strings[$this->button_properties['title']];
+            }
+            if( isset($this->button_properties['accesskey'])) {
+                $this->accesskey = $app_strings[$this->button_properties['accesskey']];
+            }
+            if( isset($this->button_properties['form_value'])) {
+                $this->value = $app_strings[$this->button_properties['form_value']];
+            }
+            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"
+            .' disabled />';
+            return $button;
+        }
+
+        //refresh the whole page after end of action?
+        $refresh_page = 0;
+        if(!empty($widget_data['subpanel_definition']->_instance_properties['refresh_page'])){
+            $refresh_page = 1;
+        }
+
+        $subpanel_definition = $widget_data['subpanel_definition'];
+        $button_definition = $subpanel_definition->get_buttons();
 
         $subpanel_name = $subpanel_definition->get_name();
-		if (empty($this->module_name)) {
-			$this->module_name = $subpanel_definition->get_module_name();
-		}
-		$link_field_name = $subpanel_definition->get_data_source_name(true);
-		$popup_mode='Single';
-		if(isset($widget_data['mode'])){
-			$popup_mode=$widget_data['mode'];
-		}
-		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);
-					}
-				}
-			}
-		}
-		$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']);
-		}
-
-		$return_url = "index.php?module=$return_module&action=$return_action&subpanel=$subpanel_name&record=$return_id&sugar_body_only=1";
-
-		$popup_request_data = array(
-			'call_back_function' => 'set_return_and_save_background',
-			'form_name' => 'DetailView',
-			'field_to_name_array' => $fton_array,
-			'passthru_data' => array(
-				'child_field' => $subpanel_name,
-				'return_url' => urlencode($return_url),
-				'link_field_name' => $link_field_name,
-				'module_name' => $subpanel_name,
-				'refresh_page'=>$refresh_page,
-			),
-		);
+        if (empty($this->module_name)) {
+            $this->module_name = $subpanel_definition->get_module_name();
+        }
+        $link_field_name = $subpanel_definition->get_data_source_name(true);
+        $popup_mode='Single';
+        if(isset($widget_data['mode'])){
+            $popup_mode=$widget_data['mode'];
+        }
+        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);
+                    }
+                }
+            }
+        }
+        $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']);
+        }
+
+        $return_url = "index.php?module=$return_module&action=$return_action&subpanel=$subpanel_name&record=$return_id&sugar_body_only=1";
+
+        $popup_request_data = array(
+            'call_back_function' => 'set_return_and_save_background',
+            'form_name' => 'DetailView',
+            'field_to_name_array' => $fton_array,
+            'passthru_data' => array(
+                'child_field' => $subpanel_name,
+                'return_url' => urlencode($return_url),
+                'link_field_name' => $link_field_name,
+                'module_name' => $subpanel_name,
+                'refresh_page'=>$refresh_page,
+            ),
+        );
 
                 // bugfix #57850 add marketing_id to the request data to allow filtering based on it
                 if (!empty($_REQUEST['mkt_id']))
@@ -162,35 +162,35 @@ 
                     $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 (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']);
+            }
+        }
         //acl_roles_users_selectuser_button
 
         $json_encoded_php_array = $this->_create_json_encoded_popup_request($popup_request_data);
-		return ' <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);' />\n";
-	}
+        return ' <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);' />\n";
+    }
 
     /**
-    * @return string
-    */
+     * @return string
+     */
     protected function getTitle()
     {
-       return translate('LBL_SELECT_BUTTON_TITLE');
+        return translate('LBL_SELECT_BUTTON_TITLE');
     }
 
     /**
-    * @return string
-    */
+     * @return string
+     */
     protected function getAccesskey()
     {
-       return translate('LBL_SELECT_BUTTON_KEY');
+        return translate('LBL_SELECT_BUTTON_KEY');
     }
 
 }

include/generic/SugarWidgets/SugarWidgetFielddatetime.php

Indentation +280 added lines, -280 removed lines

@@ -43,39 +43,39 @@ 
 
 class SugarWidgetFieldDateTime extends SugarWidgetReportField
 {
-	var $reporter;
-	var $assigned_user=null;
+    var $reporter;
+    var $assigned_user=null;
 
     function SugarWidgetFieldDateTime($layout_manager)
     {
         parent::SugarWidgetReportField($layout_manager);
     }
 
-	// 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);
@@ -93,7 +93,7 @@ 
             '=',
             "datetime"
         );
-	}
+    }
 
     /**
      * expandDate
@@ -108,61 +108,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");
@@ -170,45 +170,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;
+            $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) {
+    }
+    /**
+     * 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);
@@ -225,38 +225,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;
@@ -276,7 +276,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
@@ -288,43 +288,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
@@ -335,20 +335,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();
@@ -357,30 +357,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
@@ -453,59 +453,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 ='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 = '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;
+    }
 
     function displayListPlain($layout_def) {
         global $timedate;
@@ -551,39 +551,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 displayListmonth($layout_def)
-	{
-		global $app_list_strings;
-		$display = '';
-		$match = array();
+    }
+
+    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();
         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
@@ -706,32 +706,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
@@ -760,23 +760,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']}'>";

include/generic/SugarWidgets/SugarWidgetFielddatetimecombo.php

Indentation +18 added lines, -18 removed lines

@@ -42,28 +42,28 @@
 
 
 class SugarWidgetFieldDateTimecombo extends SugarWidgetFieldDateTime {
-	var $reporter;
-	var $assigned_user=null;
+    var $reporter;
+    var $assigned_user=null;
 
     function SugarWidgetFieldDateTimecombo(&$layout_manager) {
         parent::SugarWidgetFieldDateTime($layout_manager);
         $this->reporter = $this->layout_manager->getAttribute('reporter');
     }
-	//TODO:now for date time field , we just search from date start to date end. The time is from 00:00:00 to 23:59:59
-	//If there is requirement, we can modify report.js::addFilterInputDatetimesBetween and this function
-	function queryFilterBetween_Datetimes(& $layout_def) {
-		global $timedate;
-		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 {
-			$begin = $layout_def['input_name0'];
-			$end = $layout_def['input_name1'];
-		}
-		return "(".$this->_get_column_select($layout_def).">=".$this->reporter->db->convert($this->reporter->db->quoted($begin), "datetime").
-			" AND\n ".$this->_get_column_select($layout_def)."<=".$this->reporter->db->convert($this->reporter->db->quoted($end), "datetime").
-			")\n";
-	}
+    //TODO:now for date time field , we just search from date start to date end. The time is from 00:00:00 to 23:59:59
+    //If there is requirement, we can modify report.js::addFilterInputDatetimesBetween and this function
+    function queryFilterBetween_Datetimes(& $layout_def) {
+        global $timedate;
+        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 {
+            $begin = $layout_def['input_name0'];
+            $end = $layout_def['input_name1'];
+        }
+        return "(".$this->_get_column_select($layout_def).">=".$this->reporter->db->convert($this->reporter->db->quoted($begin), "datetime").
+            " AND\n ".$this->_get_column_select($layout_def)."<=".$this->reporter->db->convert($this->reporter->db->quoted($end), "datetime").
+            ")\n";
+    }
 
 }

include/generic/SugarWidgets/SugarWidgetSubPanelTopButton.php

Indentation +97 added lines, -97 removed lines

@@ -46,60 +46,60 @@ 
 class SugarWidgetSubPanelTopButton extends SugarWidget
 {
     var $module;
-	var $title;
-	var $access_key;
-	var $form_value;
-	var $additional_form_fields;
-	var $acl;
+    var $title;
+    var $access_key;
+    var $form_value;
+    var $additional_form_fields;
+    var $acl;
 
 //TODO rename defines to layout defs and make it a member variable instead of passing it multiple layers with extra copying.
 
-	/** Take the keys for the strings and look them up.  Module is literal, the rest are label keys
-	*/
-	function SugarWidgetSubPanelTopButton($module='', $title='', $access_key='', $form_value='')
-	{
-		global $app_strings;
-
-		if(is_array($module))
-		{
-			// it is really the class details from the mapping
-			$class_details = $module;
-
-			// If keys were passed into the constructor, translate them from keys to values.
-			if(!empty($class_details['module']))
-				$this->module = $class_details['module'];
-			if(!empty($class_details['title']))
-				$this->title = $app_strings[$class_details['title']];
-			if(!empty($class_details['access_key']))
-				$this->access_key = $app_strings[$class_details['access_key']];
-			if(!empty($class_details['form_value']))
-				$this->form_value = translate($class_details['form_value'], $this->module);
-			if(!empty($class_details['additional_form_fields']))
-				$this->additional_form_fields = $class_details['additional_form_fields'];
-			if(!empty($class_details['ACL'])){
-				$this->acl = $class_details['ACL'];
-			}
-		}
-		else
-		{
-			$this->module = $module;
-
-			// If keys were passed into the constructor, translate them from keys to values.
-			if(!empty($title))
-				$this->title = $app_strings[$title];
-			if(!empty($access_key))
-				$this->access_key = $app_strings[$access_key];
-			if(!empty($form_value))
-				$this->form_value = translate($form_value, $module);
-		}
-	}
+    /** Take the keys for the strings and look them up.  Module is literal, the rest are label keys
+     */
+    function SugarWidgetSubPanelTopButton($module='', $title='', $access_key='', $form_value='')
+    {
+        global $app_strings;
+
+        if(is_array($module))
+        {
+            // it is really the class details from the mapping
+            $class_details = $module;
+
+            // If keys were passed into the constructor, translate them from keys to values.
+            if(!empty($class_details['module']))
+                $this->module = $class_details['module'];
+            if(!empty($class_details['title']))
+                $this->title = $app_strings[$class_details['title']];
+            if(!empty($class_details['access_key']))
+                $this->access_key = $app_strings[$class_details['access_key']];
+            if(!empty($class_details['form_value']))
+                $this->form_value = translate($class_details['form_value'], $this->module);
+            if(!empty($class_details['additional_form_fields']))
+                $this->additional_form_fields = $class_details['additional_form_fields'];
+            if(!empty($class_details['ACL'])){
+                $this->acl = $class_details['ACL'];
+            }
+        }
+        else
+        {
+            $this->module = $module;
+
+            // If keys were passed into the constructor, translate them from keys to values.
+            if(!empty($title))
+                $this->title = $app_strings[$title];
+            if(!empty($access_key))
+                $this->access_key = $app_strings[$access_key];
+            if(!empty($form_value))
+                $this->form_value = translate($form_value, $module);
+        }
+    }
 
     public function getWidgetId($buttonSuffix = true)
     {
-    	$widgetID = parent::getWidgetId() . '_'.preg_replace('[ ]', '', mb_strtolower($this->form_value, 'UTF-8'));
-    	if($buttonSuffix){
-    		$widgetID .= '_button';
-    	}
+        $widgetID = parent::getWidgetId() . '_'.preg_replace('[ ]', '', mb_strtolower($this->form_value, 'UTF-8'));
+        if($buttonSuffix){
+            $widgetID .= '_button';
+        }
         return $widgetID;
     }
 
@@ -125,7 +125,7 @@ 
         }
 
 
-		if(!empty($this->module))
+        if(!empty($this->module))
         {
             $defines['child_module_name'] = $this->module;
         }
@@ -135,7 +135,7 @@ 
         }
 
         $defines['parent_bean_name'] = get_class( $defines['focus']);
-		$relationship_name = $this->get_subpanel_relationship_name($defines);
+        $relationship_name = $this->get_subpanel_relationship_name($defines);
 
 
         $formValues = array();
@@ -150,10 +150,10 @@ 
             // #26451,add these fields for custom one-to-many relate field.
             if(!empty($defines['child_module_name'])){
                 $formValues[$relationship_name."_name"] = $defines['focus']->name;
-            	$childFocusName = !empty($GLOBALS['beanList'][$defines['child_module_name']]) ? $GLOBALS['beanList'][$defines['child_module_name']] : "";
-            	if(!empty($GLOBALS['dictionary'][ $childFocusName ]["fields"][$relationship_name .'_name']['id_name'])){
-            		$formValues[$GLOBALS['dictionary'][ $childFocusName ]["fields"][$relationship_name .'_name']['id_name']] = $defines['focus']->id;
-            	}
+                $childFocusName = !empty($GLOBALS['beanList'][$defines['child_module_name']]) ? $GLOBALS['beanList'][$defines['child_module_name']] : "";
+                if(!empty($GLOBALS['dictionary'][ $childFocusName ]["fields"][$relationship_name .'_name']['id_name'])){
+                    $formValues[$GLOBALS['dictionary'][ $childFocusName ]["fields"][$relationship_name .'_name']['id_name']] = $defines['focus']->id;
+                }
             }
         }
 
@@ -216,7 +216,7 @@ 
                 $additionalFormFields['parent_id'] = $defines['focus']->account_id;
                 $additionalFormFields['account_id'] = $defines['focus']->account_id;
             } else if($defines['focus']->object_name=='Contract') {
-            	$additionalFormFields['contract_id'] = $defines['focus']->id;
+                $additionalFormFields['contract_id'] = $defines['focus']->id;
             } else {
                 $additionalFormFields['parent_id'] = $defines['focus']->id;
             }
@@ -266,17 +266,17 @@ 
         }
     }
 
-	/** This default function is used to create the HTML for a simple button */
-	function display($defines, $additionalFormFields = null, $nonbutton = false)
-	{
-		$temp='';
-		$inputID = $this->getWidgetId();
+    /** This default function is used to create the HTML for a simple button */
+    function display($defines, $additionalFormFields = null, $nonbutton = false)
+    {
+        $temp='';
+        $inputID = $this->getWidgetId();
 
-		if(!empty($this->acl) && ACLController::moduleSupportsACL($defines['module'])  &&  !ACLController::checkAccess($defines['module'], $this->acl, true)){
-			return $temp;
-		}
+        if(!empty($this->acl) && ACLController::moduleSupportsACL($defines['module'])  &&  !ACLController::checkAccess($defines['module'], $this->acl, true)){
+            return $temp;
+        }
 
-		global $app_strings;
+        global $app_strings;
 
         if ( isset($_REQUEST['layout_def_key']) && $_REQUEST['layout_def_key'] == 'UserEAPM' ) {
             // Subpanels generally don't go on the editview, so we have to handle this special
@@ -291,39 +291,39 @@ 
             $button = "<a onclick=''>$this->form_value";
         }
         return $button;
-	}
-
-	/**
-	 * Returns a string that is the JSON encoded version of the popup request.
-	 * Perhaps this function should be moved to a more globally accessible location?
-	 */
-	function _create_json_encoded_popup_request($popup_request_data)
-	{
-	    return json_encode($popup_request_data);
-	}
-
-	/**
-	 * get_subpanel_relationship_name
-	 * Get the relationship name based on the subapnel definition
-	 * @param mixed $defines The subpanel definition
-	 */
-	function get_subpanel_relationship_name($defines) {
-		 $relationship_name = '';
-		 if(!empty($defines)) {
-		 	$relationship_name = isset($defines['module']) ? $defines['module'] : '';
-	     	$dataSource = $defines['subpanel_definition']->get_data_source_name(true);
-         	if (!empty($dataSource)) {
-				$relationship_name = $dataSource;
-				//Try to set the relationship name to the real relationship, not the link.
-				if (!empty($defines['subpanel_definition']->parent_bean->field_defs[$dataSource])
-				 && !empty($defines['subpanel_definition']->parent_bean->field_defs[$dataSource]['relationship']))
-				{
-					$relationship_name = $defines['subpanel_definition']->parent_bean->field_defs[$dataSource]['relationship'];
-				}
-			}
-		 }
-		 return $relationship_name;
-	}
+    }
+
+    /**
+     * Returns a string that is the JSON encoded version of the popup request.
+     * Perhaps this function should be moved to a more globally accessible location?
+     */
+    function _create_json_encoded_popup_request($popup_request_data)
+    {
+        return json_encode($popup_request_data);
+    }
+
+    /**
+     * get_subpanel_relationship_name
+     * Get the relationship name based on the subapnel definition
+     * @param mixed $defines The subpanel definition
+     */
+    function get_subpanel_relationship_name($defines) {
+            $relationship_name = '';
+            if(!empty($defines)) {
+                $relationship_name = isset($defines['module']) ? $defines['module'] : '';
+                $dataSource = $defines['subpanel_definition']->get_data_source_name(true);
+                if (!empty($dataSource)) {
+                $relationship_name = $dataSource;
+                //Try to set the relationship name to the real relationship, not the link.
+                if (!empty($defines['subpanel_definition']->parent_bean->field_defs[$dataSource])
+                 && !empty($defines['subpanel_definition']->parent_bean->field_defs[$dataSource]['relationship']))
+                {
+                    $relationship_name = $defines['subpanel_definition']->parent_bean->field_defs[$dataSource]['relationship'];
+                }
+            }
+            }
+            return $relationship_name;
+    }
 
 }
 ?>