adamjakab / SuiteCRM

include/generic/SugarWidgets/SugarWidgetSubPanelTopMessage.php

Indentation +3 added lines, -3 removed lines

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

include/generic/SugarWidgets/SugarWidgetFieldenum.php

Indentation +104 added lines, -104 removed lines

@@ -58,39 +58,39 @@ 
     }
 
     public function queryFilteris($layout_def) {
-		$input_name0 = $layout_def['input_name0'];
-		if (is_array($layout_def['input_name0'])) {
-			$input_name0 = $layout_def['input_name0'][0];
-		}
-		return $this->_get_column_select($layout_def)." = ".$this->reporter->db->quoted($input_name0)."\n";
-	}
-
-	public function queryFilteris_not($layout_def) {
-		$input_name0 = $layout_def['input_name0'];
-		if (is_array($layout_def['input_name0'])) {
-			$input_name0 = $layout_def['input_name0'][0];
-		}
-		return $this->_get_column_select($layout_def)." <> ".$this->reporter->db->quoted($input_name0)."\n";
-	}
-
-	public function queryFilterone_of($layout_def) {
-		$arr = array ();
-		foreach ($layout_def['input_name0'] as $value) {
-			$arr[] = $this->reporter->db->quoted($value);
-		}
-		$str = implode(",", $arr);
-		return $this->_get_column_select($layout_def)." IN (".$str.")\n";
-	}
-
-	public function queryFilternot_one_of($layout_def) {
-		$arr = array ();
-		foreach ($layout_def['input_name0'] as $value) {
-			$arr[] = $this->reporter->db->quoted($value);
-		}
-	    $reporter = $this->layout_manager->getAttribute("reporter");
-		$str = implode(",", $arr);
-		return $this->_get_column_select($layout_def)." NOT IN (".$str.")\n";
-	}
+        $input_name0 = $layout_def['input_name0'];
+        if (is_array($layout_def['input_name0'])) {
+            $input_name0 = $layout_def['input_name0'][0];
+        }
+        return $this->_get_column_select($layout_def)." = ".$this->reporter->db->quoted($input_name0)."\n";
+    }
+
+    public function queryFilteris_not($layout_def) {
+        $input_name0 = $layout_def['input_name0'];
+        if (is_array($layout_def['input_name0'])) {
+            $input_name0 = $layout_def['input_name0'][0];
+        }
+        return $this->_get_column_select($layout_def)." <> ".$this->reporter->db->quoted($input_name0)."\n";
+    }
+
+    public function queryFilterone_of($layout_def) {
+        $arr = array ();
+        foreach ($layout_def['input_name0'] as $value) {
+            $arr[] = $this->reporter->db->quoted($value);
+        }
+        $str = implode(",", $arr);
+        return $this->_get_column_select($layout_def)." IN (".$str.")\n";
+    }
+
+    public function queryFilternot_one_of($layout_def) {
+        $arr = array ();
+        foreach ($layout_def['input_name0'] as $value) {
+            $arr[] = $this->reporter->db->quoted($value);
+        }
+        $reporter = $this->layout_manager->getAttribute("reporter");
+        $str = implode(",", $arr);
+        return $this->_get_column_select($layout_def)." NOT IN (".$str.")\n";
+    }
 
     function & displayList($layout_def) {
         if(!empty($layout_def['column_key'])){
@@ -116,84 +116,84 @@ 
                 $field_type = $field_def['type'];
                 $div_id = $field_def['module'] ."&$record&$field_name";
                 $str = "<div id='$div_id'>" . $cell . "&nbsp;"
-                     . SugarThemeRegistry::current()->getImage(
+                        . SugarThemeRegistry::current()->getImage(
                         "edit_inline",
                         "border='0' alt='Edit Layout' align='bottom' onClick='SUGAR.reportsInlineEdit.inlineEdit(" .
                         "\"$div_id\",\"$cell\",\"$module\",\"$record\",\"$field_name\",\"$field_type\");'"
-                       )
-                     . "</div>";
+                        )
+                        . "</div>";
             }
         }
         return $str;
     }
-	function & displayListPlain($layout_def) {
-		if(!empty($layout_def['column_key'])){
-			$field_def = $this->reporter->all_fields[$layout_def['column_key']];
-		}else if(!empty($layout_def['fields'])){
-			$field_def = $layout_def['fields'];
-		}
-
-		if (!empty($layout_def['table_key'] ) &&( empty ($field_def['fields']) || empty ($field_def['fields'][0]) || empty ($field_def['fields'][1]))){
-			$value = $this->_get_list_value($layout_def);
-		}else if(!empty($layout_def['name']) && !empty($layout_def['fields'])){
-			$key = strtoupper($layout_def['name']);
-			$value = $layout_def['fields'][$key];
-		}
-		$cell = '';
-
-			if(isset($field_def['options'])){
-				$cell = translate($field_def['options'], $field_def['module'], $value);
-			}else if(isset($field_def['type']) && $field_def['type'] == 'enum' && isset($field_def['function'])){
-	            global $beanFiles;
-	            if(empty($beanFiles)) {
-	                include('include/modules.php');
-	            }
-	            $bean_name = get_singular_bean_name($field_def['module']);
-	            require_once($beanFiles[$bean_name]);
-	            $list = $field_def['function']();
-	            $cell = $list[$value];
-	        }
-		if (is_array($cell)) {
-
-			//#22632
-			$value = unencodeMultienum($value);
-			$cell=array();
-			foreach($value as $val){
-				$returnVal = translate($field_def['options'],$field_def['module'],$val);
-				if(!is_array($returnVal)){
-					array_push( $cell, translate($field_def['options'],$field_def['module'],$val));
-				}
-			}
-			$cell = implode(", ",$cell);
-		}
-		return $cell;
-	}
-
-	public function queryOrderBy($layout_def) {
-		$field_def = $this->reporter->all_fields[$layout_def['column_key']];
-		if (!empty ($field_def['sort_on'])) {
-			$order_by = $layout_def['table_alias'].".".$field_def['sort_on'];
-		} else {
-			$order_by = $this->_get_column_select($layout_def);
-		}
-		$list = array();
+    function & displayListPlain($layout_def) {
+        if(!empty($layout_def['column_key'])){
+            $field_def = $this->reporter->all_fields[$layout_def['column_key']];
+        }else if(!empty($layout_def['fields'])){
+            $field_def = $layout_def['fields'];
+        }
+
+        if (!empty($layout_def['table_key'] ) &&( empty ($field_def['fields']) || empty ($field_def['fields'][0]) || empty ($field_def['fields'][1]))){
+            $value = $this->_get_list_value($layout_def);
+        }else if(!empty($layout_def['name']) && !empty($layout_def['fields'])){
+            $key = strtoupper($layout_def['name']);
+            $value = $layout_def['fields'][$key];
+        }
+        $cell = '';
+
+            if(isset($field_def['options'])){
+                $cell = translate($field_def['options'], $field_def['module'], $value);
+            }else if(isset($field_def['type']) && $field_def['type'] == 'enum' && isset($field_def['function'])){
+                global $beanFiles;
+                if(empty($beanFiles)) {
+                    include('include/modules.php');
+                }
+                $bean_name = get_singular_bean_name($field_def['module']);
+                require_once($beanFiles[$bean_name]);
+                $list = $field_def['function']();
+                $cell = $list[$value];
+            }
+        if (is_array($cell)) {
+
+            //#22632
+            $value = unencodeMultienum($value);
+            $cell=array();
+            foreach($value as $val){
+                $returnVal = translate($field_def['options'],$field_def['module'],$val);
+                if(!is_array($returnVal)){
+                    array_push( $cell, translate($field_def['options'],$field_def['module'],$val));
+                }
+            }
+            $cell = implode(", ",$cell);
+        }
+        return $cell;
+    }
+
+    public function queryOrderBy($layout_def) {
+        $field_def = $this->reporter->all_fields[$layout_def['column_key']];
+        if (!empty ($field_def['sort_on'])) {
+            $order_by = $layout_def['table_alias'].".".$field_def['sort_on'];
+        } else {
+            $order_by = $this->_get_column_select($layout_def);
+        }
+        $list = array();
         if(isset($field_def['options'])) {
-		    $list = translate($field_def['options'], $field_def['module']);
+            $list = translate($field_def['options'], $field_def['module']);
         } elseif(isset($field_def['type']) && $field_def['type'] == 'enum' && isset($field_def['function'])) {
-	        global $beanFiles;
-		    if(empty($beanFiles)) {
-		        include('include/modules.php');
-		    }
-		    $bean_name = get_singular_bean_name($field_def['module']);
-		    require_once($beanFiles[$bean_name]);
+            global $beanFiles;
+            if(empty($beanFiles)) {
+                include('include/modules.php');
+            }
+            $bean_name = get_singular_bean_name($field_def['module']);
+            require_once($beanFiles[$bean_name]);
             $list = $field_def['function']();
         }
-		if (empty ($layout_def['sort_dir']) || $layout_def['sort_dir'] == 'a') {
-			$order_dir = "ASC";
-		} else {
-			$order_dir = "DESC";
-		}
-		return $this->reporter->db->orderByEnum($order_by, $list, $order_dir);
+        if (empty ($layout_def['sort_dir']) || $layout_def['sort_dir'] == 'a') {
+            $order_dir = "ASC";
+        } else {
+            $order_dir = "DESC";
+        }
+        return $this->reporter->db->orderByEnum($order_by, $list, $order_dir);
     }
 
     public function displayInput($layout_def) {
@@ -204,13 +204,13 @@ 
                 $ops = $layout_def['options'];
             }
             elseif (isset($layout_def['options']) && isset($app_list_strings[$layout_def['options']])){
-            	$ops = $app_list_strings[$layout_def['options']];
+                $ops = $app_list_strings[$layout_def['options']];
                 if(array_key_exists('', $app_list_strings[$layout_def['options']])) {
-             	   unset($ops['']);
-	            }
+                    unset($ops['']);
+                }
             }
             else{
-            	$ops = array();
+                $ops = array();
             }
         }
         else {

include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectUsersButton.php

Indentation +124 added lines, -124 removed lines

@@ -45,137 +45,137 @@
 
 class SugarWidgetSubPanelTopSelectUsersButton extends SugarWidgetSubPanelTopSelectButton
 {
-	//button_properties is a collection of properties associated with the widget_class definition. layoutmanager
-	function SugarWidgetSubPanelTopSelectUsersButton($button_properties=array())
-	{
-		$this->button_properties=$button_properties;
-	}
+    //button_properties is a collection of properties associated with the widget_class definition. layoutmanager
+    function SugarWidgetSubPanelTopSelectUsersButton($button_properties=array())
+    {
+        $this->button_properties=$button_properties;
+    }
 
     function getDisplayName()
     {
         return $GLOBALS['app_strings']['LBL_SELECT_USER_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 = '';
-
-		$this->title = $app_strings['LBL_SELECT_USER_BUTTON_TITLE'];
-		//$this->accesskey = $app_strings['LBL_SELECT_USER_BUTTON_KEY'];
-		$this->value = $this->getDisplayName();
-
-		$this->module_name = 'Users';
-
-		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_users_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);
-					}
-				}
-			}
-		}
-
-		if (!empty($widget_data['filter_out_is_admin'])) {
+    //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_USER_BUTTON_TITLE'];
+        //$this->accesskey = $app_strings['LBL_SELECT_USER_BUTTON_KEY'];
+        $this->value = $this->getDisplayName();
+
+        $this->module_name = 'Users';
+
+        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_users_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);
+                    }
+                }
+            }
+        }
+
+        if (!empty($widget_data['filter_out_is_admin'])) {
             $initial_filter.="&is_admin_advanced=0";
         }
 
-		$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";
-	}
+        $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/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');
     }
 
 }