adamjakab / SuiteCRM

include/generic/SugarWidgets/SugarWidgetSubPanelSelectAllButton.php

Indentation +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
     function display($defines, $additionalFormFields = null)
     {
         $button  = "<form method='post' action='/index.php?module=MODULE_NAME&action=CUSTOM_ACTION'>";
-       // $button .= "<input id='custom_hidden_1' type='hidden' name='custom_hidden_1' value=''/>";
+        // $button .= "<input id='custom_hidden_1' type='hidden' name='custom_hidden_1' value=''/>";
         $button .= "<input class='button' type='submit' name='Custom Save' value='Select All' />\n</form>";
         return $button;
     }

include/generic/SugarWidgets/SugarWidgetFieldid.php

Indentation +4 added lines, -4 removed lines

@@ -42,10 +42,10 @@
 class SugarWidgetFieldId extends SugarWidgetReportField
 {
 
- function queryFilterIs(&$layout_def)
- {
-		return $this->_get_column_select($layout_def)."='".$GLOBALS['db']->quote($layout_def['input_name0'])."'\n";
- }
+    function queryFilterIs(&$layout_def)
+    {
+        return $this->_get_column_select($layout_def)."='".$GLOBALS['db']->quote($layout_def['input_name0'])."'\n";
+    }
 
 
 }

include/generic/SugarWidgets/SugarWidgetSubPanelRemoveButtonAccount.php

Indentation +10 added lines, -10 removed lines

@@ -43,14 +43,14 @@
 
 
 class SugarWidgetSubPanelRemoveButtonAccount extends SugarWidgetSubPanelRemoveButton {
-	/**
-	 * 
-	 * @see SugarWidgetSubPanelRemoveButton::displayList()
-	 */
-	function displayList(&$layout_def) {
-		if (!$layout_def['EditView']) {
-			return false;
-		}
-		return parent::displayList($layout_def);
-	}
+    /**
+     * 
+     * @see SugarWidgetSubPanelRemoveButton::displayList()
+     */
+    function displayList(&$layout_def) {
+        if (!$layout_def['EditView']) {
+            return false;
+        }
+        return parent::displayList($layout_def);
+    }
 }
\ No newline at end of file

include/generic/SugarWidgets/SugarWidgetSubPanelActivitiesStatusField.php

Indentation +18 added lines, -18 removed lines

@@ -46,27 +46,27 @@
 
 class SugarWidgetSubPanelActivitiesStatusField extends SugarWidgetField
 {
-	function displayList($layout_def)
-	{
-		global $current_language;
-		$app_list_strings = return_app_list_strings_language($current_language);
+    function displayList($layout_def)
+    {
+        global $current_language;
+        $app_list_strings = return_app_list_strings_language($current_language);
 		
-		$module = empty($layout_def['module']) ? '' : $layout_def['module'];
+        $module = empty($layout_def['module']) ? '' : $layout_def['module'];
 		
-		if(isset($layout_def['varname']))
-		{
-			$key = strtoupper($layout_def['varname']);
-		}
-		else
-		{
-			$key = $this->_get_column_alias($layout_def);
-			$key = strtoupper($key);
-		}
+        if(isset($layout_def['varname']))
+        {
+            $key = strtoupper($layout_def['varname']);
+        }
+        else
+        {
+            $key = $this->_get_column_alias($layout_def);
+            $key = strtoupper($key);
+        }
 
-		$value = $layout_def['fields'][$key];
-		// cn: bug 5813, removing double-derivation of lang-pack value
-		return $value;
-	}
+        $value = $layout_def['fields'][$key];
+        // cn: bug 5813, removing double-derivation of lang-pack value
+        return $value;
+    }
 }
 
 ?>
\ No newline at end of file

include/generic/SugarWidgets/SugarWidgetSubPanelTopScheduleMeetingButton.php

Indentation +116 added lines, -116 removed lines

@@ -45,121 +45,121 @@
 
 class SugarWidgetSubPanelTopScheduleMeetingButton extends SugarWidgetSubPanelTopButtonQuickCreate
 {
-	function &_get_form($defines, $additionalFormFields = null, $asUrl = false)
-	{
-		global $app_strings;
-		global $currentModule;
-
-		$this->module="Meetings";
-		$this->subpanelDiv = "activities";
-
-		// 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="Meetings";
+        $this->subpanelDiv = "activities";
+
+        // 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";
-			}
-		}
-		$button .= getVersionedScript('include/SugarFields/Fields/Datetimecombo/Datetimecombo.js')."\n";
-		$button .= getVersionedScript('cache/include/javascript/sugar_grp_jsolait.js')."\n";
-
-		return $button;
-	}
-
-	function display($defines, $additionalFormFields = null, $nonbutton = false)
-	{
-	    $focus = new Meeting;
-		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";
+            }
+        }
+        $button .= getVersionedScript('include/SugarFields/Fields/Datetimecombo/Datetimecombo.js')."\n";
+        $button .= getVersionedScript('cache/include/javascript/sugar_grp_jsolait.js')."\n";
+
+        return $button;
+    }
+
+    function display($defines, $additionalFormFields = null, $nonbutton = false)
+    {
+        $focus = new Meeting;
+        if ( !$focus->ACLAccess('EditView') ) {
+            return '';
+        }
+
+        return parent::display($defines, $additionalFormFields);
+    }
 }?>

include/generic/SugarWidgets/SugarWidgetSubPanelCloseButton.php

Indentation +22 added lines, -22 removed lines

@@ -45,34 +45,34 @@
 //TODO Rename this to close button field
 class SugarWidgetSubPanelCloseButton extends SugarWidgetField
 {
-	function displayList($layout_def)
-	{
-		global $app_strings;
+    function displayList($layout_def)
+    {
+        global $app_strings;
         global $subpanel_item_count;
-		$return_module = $_REQUEST['module'];
-		$return_id = $_REQUEST['record'];
-		$module_name = $layout_def['module'];
-		$record_id = $layout_def['fields']['ID'];
+        $return_module = $_REQUEST['module'];
+        $return_id = $_REQUEST['record'];
+        $module_name = $layout_def['module'];
+        $record_id = $layout_def['fields']['ID'];
         $unique_id = $layout_def['subpanel_id']."_close_".$subpanel_item_count; //bug 51512
 
-		// calls and meetings are held.
-		$new_status = 'Held';
+        // calls and meetings are held.
+        $new_status = 'Held';
 		
-		switch($module_name)
-		{
-			case 'Tasks':
-				$new_status = 'Completed';
-				break;
-		}
+        switch($module_name)
+        {
+            case 'Tasks':
+                $new_status = 'Completed';
+                break;
+        }
         
-		if ($layout_def['EditView']) {
-		    $html = "<a id=\"$unique_id\" onclick='SUGAR.util.closeActivityPanel.show(\"$module_name\",\"$record_id\",\"$new_status\",\"subpanel\",\"{$layout_def['subpanel_id']}\");' >".$app_strings['LNK_CLOSE']."</a>";
-		    return $html;
-		} else {
-		    return '';
-		}
+        if ($layout_def['EditView']) {
+            $html = "<a id=\"$unique_id\" onclick='SUGAR.util.closeActivityPanel.show(\"$module_name\",\"$record_id\",\"$new_status\",\"subpanel\",\"{$layout_def['subpanel_id']}\");' >".$app_strings['LNK_CLOSE']."</a>";
+            return $html;
+        } else {
+            return '';
+        }
 
-	}
+    }
 }
 
 ?>

include/generic/SugarWidgets/SugarWidgetSubPanelDeleteButton.php

Indentation +28 added lines, -28 removed lines

@@ -44,40 +44,40 @@
 
 class SugarWidgetSubPanelDeleteButton extends SugarWidgetField
 {
-	function displayList($layout_def)
-	{
-		global $app_strings;
+    function displayList($layout_def)
+    {
+        global $app_strings;
         global $subpanel_item_count;
-		$return_module = $_REQUEST['module'];
-		$return_id = $_REQUEST['record'];
-		$module_name = $layout_def['module'];
-		$record_id = $layout_def['fields']['ID'];
+        $return_module = $_REQUEST['module'];
+        $return_id = $_REQUEST['record'];
+        $module_name = $layout_def['module'];
+        $record_id = $layout_def['fields']['ID'];
         $unique_id = $layout_def['subpanel_id']."_delete_".$subpanel_item_count; //bug 51512
 
-		// calls and meetings are held.
-		$new_status = 'Held';
+        // calls and meetings are held.
+        $new_status = 'Held';
 
-		switch($module_name)
-		{
-			case 'Tasks':
-				$new_status = 'Completed';
-				break;
-		}
-		$subpanel = $layout_def['subpanel_id'];
-		if (isset($layout_def['linked_field_set']) && !empty($layout_def['linked_field_set'])) {
-			$linked_field= $layout_def['linked_field_set'] ;
-		} else {
-			$linked_field = $layout_def['linked_field'];
-		}
-		$refresh_page = 0;
-		if(!empty($layout_def['refresh_page'])){
-			$refresh_page = 1;
-		}
+        switch($module_name)
+        {
+            case 'Tasks':
+                $new_status = 'Completed';
+                break;
+        }
+        $subpanel = $layout_def['subpanel_id'];
+        if (isset($layout_def['linked_field_set']) && !empty($layout_def['linked_field_set'])) {
+            $linked_field= $layout_def['linked_field_set'] ;
+        } else {
+            $linked_field = $layout_def['linked_field'];
+        }
+        $refresh_page = 0;
+        if(!empty($layout_def['refresh_page'])){
+            $refresh_page = 1;
+        }
 
-		$html = "<a id=\"$unique_id\" onclick='return sp_del_conf();' href=\"javascript:sub_p_del('$subpanel', '$module_name', '$record_id', $refresh_page);\">".$app_strings['LNK_DELETE']."</a>";
-		return $html;
+        $html = "<a id=\"$unique_id\" onclick='return sp_del_conf();' href=\"javascript:sub_p_del('$subpanel', '$module_name', '$record_id', $refresh_page);\">".$app_strings['LNK_DELETE']."</a>";
+        return $html;
 
-	}
+    }
 }
 
 ?>
\ No newline at end of file

include/generic/SugarWidgets/SugarWidgetFieldname.php

Indentation +163 added lines, -163 removed lines

@@ -52,33 +52,33 @@ 
         $this->reporter = $this->layout_manager->getAttribute('reporter');
     }
 
-	function displayList(&$layout_def)
-	{
-		if(empty($layout_def['column_key']))
-		{
-			return $this->displayListPlain($layout_def);
-		}
-
-		$module = $this->reporter->all_fields[$layout_def['column_key']]['module'];
-		$name = $layout_def['name'];
-		$layout_def['name'] = 'id';
-		$key = $this->_get_column_alias($layout_def);
-		$key = strtoupper($key);
-
-		if(empty($layout_def['fields'][$key]))
-		{
-		  $layout_def['name'] = $name;
-			return $this->displayListPlain($layout_def);
-		}
-
-		$record = $layout_def['fields'][$key];
-		$layout_def['name'] = $name;
-		global $current_user;
-		if ($module == 'Users' && !is_admin($current_user))
-        	$module = 'Employees';
-		$str = "<a target='_blank' href=\"index.php?action=DetailView&module=$module&record=$record\">";
-		$str .= $this->displayListPlain($layout_def);
-		$str .= "</a>";
+    function displayList(&$layout_def)
+    {
+        if(empty($layout_def['column_key']))
+        {
+            return $this->displayListPlain($layout_def);
+        }
+
+        $module = $this->reporter->all_fields[$layout_def['column_key']]['module'];
+        $name = $layout_def['name'];
+        $layout_def['name'] = 'id';
+        $key = $this->_get_column_alias($layout_def);
+        $key = strtoupper($key);
+
+        if(empty($layout_def['fields'][$key]))
+        {
+            $layout_def['name'] = $name;
+            return $this->displayListPlain($layout_def);
+        }
+
+        $record = $layout_def['fields'][$key];
+        $layout_def['name'] = $name;
+        global $current_user;
+        if ($module == 'Users' && !is_admin($current_user))
+            $module = 'Employees';
+        $str = "<a target='_blank' href=\"index.php?action=DetailView&module=$module&record=$record\">";
+        $str .= $this->displayListPlain($layout_def);
+        $str .= "</a>";
 
 
         global $sugar_config;
@@ -94,37 +94,37 @@ 
                 $str .= "&nbsp;" .SugarThemeRegistry::current()->getImage("edit_inline","border='0' alt='Edit Layout' align='bottom' onClick='SUGAR.reportsInlineEdit.inlineEdit(\"$div_id\",\"$value\",\"$module\",\"$record\",\"$field_name\",\"$field_type\");'");
             $str .= "</div>";
         }
-		return $str;
-	}
+        return $str;
+    }
 
-	function _get_normal_column_select($layout_def)
-	{
+    function _get_normal_column_select($layout_def)
+    {
         if ( isset($this->reporter->all_fields) ) {
             $field_def = $this->reporter->all_fields[$layout_def['column_key']];
         } else {
             $field_def = array();
         }
 
-		if (empty($field_def['fields']) || empty($field_def['fields'][0]) || empty($field_def['fields'][1]))
-		{
-			return parent::_get_column_select($layout_def);
-		}
+        if (empty($field_def['fields']) || empty($field_def['fields'][0]) || empty($field_def['fields'][1]))
+        {
+            return parent::_get_column_select($layout_def);
+        }
 
-		//	 'fields' are the two fields to concatenate to create the name.
-		if ( ! empty($layout_def['table_alias'])) {
-		    $alias = $this->reporter->db->concat($layout_def['table_alias'], $field_def['fields']);
-		} elseif (! empty($layout_def['name'])) {
-			$alias = $layout_def['name'];
-		} else {
-			$alias = "*";
-		}
+        //	 'fields' are the two fields to concatenate to create the name.
+        if ( ! empty($layout_def['table_alias'])) {
+            $alias = $this->reporter->db->concat($layout_def['table_alias'], $field_def['fields']);
+        } elseif (! empty($layout_def['name'])) {
+            $alias = $layout_def['name'];
+        } else {
+            $alias = "*";
+        }
 
-		return $alias;
-	}
+        return $alias;
+    }
 
-	function _get_column_select($layout_def)
-	{
-		global $locale, $current_user;
+    function _get_column_select($layout_def)
+    {
+        global $locale, $current_user;
 
         if ( isset($this->reporter->all_fields) ) {
             $field_def = $this->reporter->all_fields[$layout_def['column_key']];
@@ -135,141 +135,141 @@ 
         //	 'fields' are the two fields to concatenate to create the name
         if(!isset($field_def['fields']))
         {
-			return $this->_get_normal_column_select($layout_def);
+            return $this->_get_normal_column_select($layout_def);
+        }
+        $localeNameFormat = $locale->getLocaleFormatMacro($current_user);
+        $localeNameFormat = trim(preg_replace('/s/i', '', $localeNameFormat));
+
+        if (empty($field_def['fields']) || empty($field_def['fields'][0]) || empty($field_def['fields'][1])) {
+            return parent::_get_column_select($layout_def);
+        }
+
+        if ( ! empty($layout_def['table_alias'])) {
+            $comps = preg_split("/([fl])/", $localeNameFormat, null, PREG_SPLIT_DELIM_CAPTURE);
+            $name = array();
+            foreach($comps as $val) {
+                if($val == 'f') {
+                    $name[] = $this->reporter->db->convert($layout_def['table_alias'].".".$field_def['fields'][0], 'IFNULL', array("''"));
+                } elseif($val == 'l') {
+                    $name[] = $this->reporter->db->convert($layout_def['table_alias'].".".$field_def['fields'][1], 'IFNULL', array("''"));
+                } else {
+                    if(!empty($val)) {
+                        $name[] = $this->reporter->db->quoted($val);
+                    }
+                }
+            }
+            $alias = $this->reporter->db->convert($name, "CONCAT");
+        } elseif (! empty($layout_def['name']))	{
+            $alias = $layout_def['name'];
+        } else {
+            $alias = "*";
+        }
+
+        return $alias;
+    }
+
+    function queryFilterIs($layout_def)
+    {
+
+        $layout_def['name'] = 'id';
+        $layout_def['type'] = 'id';
+        $input_name0 = $layout_def['input_name0'];
+
+        if ( is_array($layout_def['input_name0']))
+        {
+            $input_name0 = $layout_def['input_name0'][0];
+        }
+        if ($input_name0 == 'Current User') {
+            global $current_user;
+            $input_name0 = $current_user->id;
+        }
+
+        return SugarWidgetFieldid::_get_column_select($layout_def)."="
+            .$this->reporter->db->quoted($input_name0)."\n";
+    }
+
+    function queryFilteris_not($layout_def)
+    {
+
+        $layout_def['name'] = 'id';
+        $layout_def['type'] = 'id';
+        $input_name0 = $layout_def['input_name0'];
+
+        if ( is_array($layout_def['input_name0']))
+        {
+            $input_name0 = $layout_def['input_name0'][0];
+        }
+        if ($input_name0 == 'Current User') {
+            global $current_user;
+            $input_name0 = $current_user->id;
         }
-		$localeNameFormat = $locale->getLocaleFormatMacro($current_user);
-		$localeNameFormat = trim(preg_replace('/s/i', '', $localeNameFormat));
-
-		if (empty($field_def['fields']) || empty($field_def['fields'][0]) || empty($field_def['fields'][1])) {
-			return parent::_get_column_select($layout_def);
-		}
-
-		if ( ! empty($layout_def['table_alias'])) {
-		    $comps = preg_split("/([fl])/", $localeNameFormat, null, PREG_SPLIT_DELIM_CAPTURE);
-		    $name = array();
-		    foreach($comps as $val) {
-		        if($val == 'f') {
-		            $name[] = $this->reporter->db->convert($layout_def['table_alias'].".".$field_def['fields'][0], 'IFNULL', array("''"));
-		        } elseif($val == 'l') {
-		            $name[] = $this->reporter->db->convert($layout_def['table_alias'].".".$field_def['fields'][1], 'IFNULL', array("''"));
-		        } else {
-		            if(!empty($val)) {
-		                $name[] = $this->reporter->db->quoted($val);
-		            }
-		        }
-		    }
-		    $alias = $this->reporter->db->convert($name, "CONCAT");
-		} elseif (! empty($layout_def['name']))	{
-			$alias = $layout_def['name'];
-		} else {
-			$alias = "*";
-		}
-
-		return $alias;
-	}
-
-	function queryFilterIs($layout_def)
-	{
-
-		$layout_def['name'] = 'id';
-		$layout_def['type'] = 'id';
-		$input_name0 = $layout_def['input_name0'];
-
-		if ( is_array($layout_def['input_name0']))
-		{
-			$input_name0 = $layout_def['input_name0'][0];
-		}
-		if ($input_name0 == 'Current User') {
-			global $current_user;
-			$input_name0 = $current_user->id;
-		}
-
-		return SugarWidgetFieldid::_get_column_select($layout_def)."="
-			.$this->reporter->db->quoted($input_name0)."\n";
-	}
-
-	function queryFilteris_not($layout_def)
-	{
-
-		$layout_def['name'] = 'id';
-		$layout_def['type'] = 'id';
-		$input_name0 = $layout_def['input_name0'];
-
-		if ( is_array($layout_def['input_name0']))
-		{
-			$input_name0 = $layout_def['input_name0'][0];
-		}
-		if ($input_name0 == 'Current User') {
-			global $current_user;
-			$input_name0 = $current_user->id;
-		}
-
-		return SugarWidgetFieldid::_get_column_select($layout_def)."<>"
-			.$this->reporter->db->quoted($input_name0)."\n";
-	}
+
+        return SugarWidgetFieldid::_get_column_select($layout_def)."<>"
+            .$this->reporter->db->quoted($input_name0)."\n";
+    }
 
     // $rename_columns, if true then you're coming from reports
-	function queryFilterone_of($layout_def, $rename_columns = true)
-	{
+    function queryFilterone_of($layout_def, $rename_columns = true)
+    {
 
         if($rename_columns) { // this was a hack to get reports working, sugarwidgets should not be renaming $name!
-    		$layout_def['name'] = 'id';
-    		$layout_def['type'] = 'id';
+            $layout_def['name'] = 'id';
+            $layout_def['type'] = 'id';
+        }
+        $arr = array();
+
+        foreach($layout_def['input_name0'] as $value)
+        {
+            if ($value == 'Current User') {
+                global $current_user;
+                array_push($arr,$this->reporter->db->quoted($current_user->id));
+            }
+            else
+                array_push($arr,$this->reporter->db->quoted($value));
         }
-		$arr = array();
-
-		foreach($layout_def['input_name0'] as $value)
-		{
-			if ($value == 'Current User') {
-				global $current_user;
-				array_push($arr,$this->reporter->db->quoted($current_user->id));
-			}
-			else
-				array_push($arr,$this->reporter->db->quoted($value));
-		}
-
-		$str = implode(",",$arr);
-
-		return SugarWidgetFieldid::_get_column_select($layout_def)." IN (".$str.")\n";
-	}
+
+        $str = implode(",",$arr);
+
+        return SugarWidgetFieldid::_get_column_select($layout_def)." IN (".$str.")\n";
+    }
     // $rename_columns, if true then you're coming from reports
-	function queryFilternot_one_of($layout_def, $rename_columns = true)
-	{
+    function queryFilternot_one_of($layout_def, $rename_columns = true)
+    {
 
         if($rename_columns) { // this was a hack to get reports working, sugarwidgets should not be renaming $name!
-    		$layout_def['name'] = 'id';
-    		$layout_def['type'] = 'id';
+            $layout_def['name'] = 'id';
+            $layout_def['type'] = 'id';
         }
-		$arr = array();
+        $arr = array();
 
-		foreach($layout_def['input_name0'] as $value)
-		{
-			if ($value == 'Current User') {
-				global $current_user;
-				array_push($arr,$this->reporter->db->quoted($current_user->id));
-			}
-			else
-				array_push($arr,$this->reporter->db->quoted($value));
-		}
+        foreach($layout_def['input_name0'] as $value)
+        {
+            if ($value == 'Current User') {
+                global $current_user;
+                array_push($arr,$this->reporter->db->quoted($current_user->id));
+            }
+            else
+                array_push($arr,$this->reporter->db->quoted($value));
+        }
 
-		$str = implode(",",$arr);
+        $str = implode(",",$arr);
 
-		return SugarWidgetFieldid::_get_column_select($layout_def)." NOT IN (".$str.")\n";
-	}
+        return SugarWidgetFieldid::_get_column_select($layout_def)." NOT IN (".$str.")\n";
+    }
 
-	function &queryGroupBy($layout_def)
-	{
+    function &queryGroupBy($layout_def)
+    {
         if($layout_def['name'] == 'full_name') {
-             $layout_def['name'] = 'id';
-             $layout_def['type'] = 'id';
+                $layout_def['name'] = 'id';
+                $layout_def['type'] = 'id';
 
-             $group_by =  SugarWidgetFieldid::_get_column_select($layout_def)."\n";
+                $group_by =  SugarWidgetFieldid::_get_column_select($layout_def)."\n";
         } else {
             // group by clause for user name passes through here.
-             $group_by = $this->_get_column_select($layout_def)."\n";
+                $group_by = $this->_get_column_select($layout_def)."\n";
         }
         return $group_by;
-	}
+    }
 }
 
 ?>

include/generic/SugarWidgets/SugarWidgetFieldurl.php

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
 class SugarWidgetFieldURL extends SugarWidgetFieldVarchar
 {
- 	/* Display item as link
+        /* Display item as link
      * @param array $layout_def definition of field which we want to display as link
      * @return string html code
      */