adamjakab / SuiteCRM

include/formbase.php

Indentation +122 added lines, -122 removed lines

@@ -54,14 +54,14 @@ 
  */
 function checkRequired($prefix, $required)
 {
-	foreach($required as $key)
-	{
-		if(!isset($_POST[$prefix.$key]) || number_empty($_POST[$prefix.$key]))
-		{
-			return false;
-		}
-	}
-	return true;
+    foreach($required as $key)
+    {
+        if(!isset($_POST[$prefix.$key]) || number_empty($_POST[$prefix.$key]))
+        {
+            return false;
+        }
+    }
+    return true;
 }
 
 /**
@@ -75,16 +75,16 @@ 
  */
 function populateFromPost($prefix, &$focus, $skipRetrieve = false, $checkACL = false)
 {
-	global $current_user;
+    global $current_user;
 
-	if(!empty($_REQUEST[$prefix.'record']) && !$skipRetrieve)
-		$focus->retrieve($_REQUEST[$prefix.'record']);
+    if(!empty($_REQUEST[$prefix.'record']) && !$skipRetrieve)
+        $focus->retrieve($_REQUEST[$prefix.'record']);
 
-	if(!empty($_POST['assigned_user_id']) && 
-	    ($focus->assigned_user_id != $_POST['assigned_user_id']) && 
-	    ($_POST['assigned_user_id'] != $current_user->id)) {
-		$GLOBALS['check_notify'] = true;
-	}
+    if(!empty($_POST['assigned_user_id']) && 
+        ($focus->assigned_user_id != $_POST['assigned_user_id']) && 
+        ($_POST['assigned_user_id'] != $current_user->id)) {
+        $GLOBALS['check_notify'] = true;
+    }
     if(isset($_POST['dup_checked']) && $_POST['dup_checked'] && isset($_POST['id']) && $_POST['id'] != '' ){
         $focus->new_with_id = true;
     }
@@ -106,15 +106,15 @@ 
         $relatedFields[$def['id_name']] = $field;
     }
 
-	foreach($focus->field_defs as $field=>$def) {
+    foreach($focus->field_defs as $field=>$def) {
         if ( $field == 'id' && !empty($focus->id) ) {
             // Don't try and overwrite the ID
             continue;
         }
 
 
-	    $type = !empty($def['custom_type']) ? $def['custom_type'] : $def['type'];
-		$sf = $sfh->getSugarField($type);
+        $type = !empty($def['custom_type']) ? $def['custom_type'] : $def['type'];
+        $sf = $sfh->getSugarField($type);
         if($sf != null){
             $sf->save($focus, $_POST, $field, $def, $prefix);
         } else {
@@ -152,15 +152,15 @@ 
 			$focus->$field = '';
 		}
 */
-	}
+    }
 
-	foreach($focus->additional_column_fields as $field) {
-		if(isset($_POST[$prefix.$field])) {
-			$value = $_POST[$prefix.$field];
-			$focus->$field = $value;
-		}
-	}
-	return $focus;
+    foreach($focus->additional_column_fields as $field) {
+        if(isset($_POST[$prefix.$field])) {
+            $value = $_POST[$prefix.$field];
+            $focus->$field = $value;
+        }
+    }
+    return $focus;
 }
 
 function add_hidden_elements($key, $value) {
@@ -182,73 +182,73 @@ 
 
 function getPostToForm($ignore='', $isRegularExpression=false)
 {
-	$fields = '';
-	if(!empty($ignore) && $isRegularExpression) {
-		foreach ($_POST as $key=>$value){
-			if(!preg_match($ignore, $key)) {
+    $fields = '';
+    if(!empty($ignore) && $isRegularExpression) {
+        foreach ($_POST as $key=>$value){
+            if(!preg_match($ignore, $key)) {
                                 $fields .= add_hidden_elements($key, $value);
-			}
-		}	
-	} else {
-		foreach ($_POST as $key=>$value){
-			if($key != $ignore) {
+            }
+        }	
+    } else {
+        foreach ($_POST as $key=>$value){
+            if($key != $ignore) {
                                 $fields .= add_hidden_elements($key, $value);
-			}
-		}
-	}
-	return $fields;
+            }
+        }
+    }
+    return $fields;
 }
 
 function getGetToForm($ignore='', $usePostAsAuthority = false)
 {
-	$fields = '';
-	foreach ($_GET as $key=>$value)
-	{
-		if($key != $ignore){
-			if(!$usePostAsAuthority || !isset($_POST[$key])){
-				$fields.= "<input type='hidden' name='$key' value='$value'>";
-			}
-		}
-	}
-	return $fields;
+    $fields = '';
+    foreach ($_GET as $key=>$value)
+    {
+        if($key != $ignore){
+            if(!$usePostAsAuthority || !isset($_POST[$key])){
+                $fields.= "<input type='hidden' name='$key' value='$value'>";
+            }
+        }
+    }
+    return $fields;
 
 }
 function getAnyToForm($ignore='', $usePostAsAuthority = false)
 {
-	$fields = getPostToForm($ignore);
-	$fields .= getGetToForm($ignore, $usePostAsAuthority);
-	return $fields;
+    $fields = getPostToForm($ignore);
+    $fields .= getGetToForm($ignore, $usePostAsAuthority);
+    return $fields;
 
 }
 
 function handleRedirect($return_id='', $return_module='', $additionalFlags = false)
 {
-	if(isset($_REQUEST['return_url']) && $_REQUEST['return_url'] != "")
-	{
-		header("Location: ". $_REQUEST['return_url']);
-		exit;
-	}
-
-	$url = buildRedirectURL($return_id, $return_module);
-	header($url);
-	exit;	
+    if(isset($_REQUEST['return_url']) && $_REQUEST['return_url'] != "")
+    {
+        header("Location: ". $_REQUEST['return_url']);
+        exit;
+    }
+
+    $url = buildRedirectURL($return_id, $return_module);
+    header($url);
+    exit;	
 }
 
 //eggsurplus: abstract to simplify unit testing
 function buildRedirectURL($return_id='', $return_module='') 
 {
     if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "")
-	{
-		$return_module = $_REQUEST['return_module'];
-	}
-	else
-	{
-		$return_module = $return_module;
-	}
-	if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "")
-	{
+    {
+        $return_module = $_REQUEST['return_module'];
+    }
+    else
+    {
+        $return_module = $return_module;
+    }
+    if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "")
+    {
 	    
-	   //if we are doing a "Close and Create New"
+        //if we are doing a "Close and Create New"
         if(isCloseAndCreateNewPressed())
         {
             $return_action = "EditView";    
@@ -257,40 +257,40 @@ 
             
             // Meeting Integration
             if(isset($_REQUEST['meetingIntegrationFlag']) && $_REQUEST['meetingIntegrationFlag'] == 1) {
-            	$additionalFlags = array('meetingIntegrationShowForm' => '1');
+                $additionalFlags = array('meetingIntegrationShowForm' => '1');
             }
             // END Meeting Integration
         } 
-		// if we create a new record "Save", we want to redirect to the DetailView
-		else if(isset($_REQUEST['action']) && $_REQUEST['action'] == "Save" 
-			&& $_REQUEST['return_module'] != 'Activities'
-			&& $_REQUEST['return_module'] != 'Home' 
-			&& $_REQUEST['return_module'] != 'Forecasts' 
-			&& $_REQUEST['return_module'] != 'Calendar'
-			&& $_REQUEST['return_module'] != 'MailMerge'
-			) 
-			{
-			    $return_action = 'DetailView';
-			} elseif($_REQUEST['return_module'] == 'Activities' || $_REQUEST['return_module'] == 'Calendar') {
-			$return_module = $_REQUEST['module'];
-			$return_action = $_REQUEST['return_action']; 
-			// wp: return action needs to be set for one-click close in task list
-		} 
-		else 
-		{
-			// if we "Cancel", we go back to the list view.
-			$return_action = $_REQUEST['return_action'];
-		}
-	}
-	else
-	{
-		$return_action = "DetailView";
-	}
+        // if we create a new record "Save", we want to redirect to the DetailView
+        else if(isset($_REQUEST['action']) && $_REQUEST['action'] == "Save" 
+            && $_REQUEST['return_module'] != 'Activities'
+            && $_REQUEST['return_module'] != 'Home' 
+            && $_REQUEST['return_module'] != 'Forecasts' 
+            && $_REQUEST['return_module'] != 'Calendar'
+            && $_REQUEST['return_module'] != 'MailMerge'
+            ) 
+            {
+                $return_action = 'DetailView';
+            } elseif($_REQUEST['return_module'] == 'Activities' || $_REQUEST['return_module'] == 'Calendar') {
+            $return_module = $_REQUEST['module'];
+            $return_action = $_REQUEST['return_action']; 
+            // wp: return action needs to be set for one-click close in task list
+        } 
+        else 
+        {
+            // if we "Cancel", we go back to the list view.
+            $return_action = $_REQUEST['return_action'];
+        }
+    }
+    else
+    {
+        $return_action = "DetailView";
+    }
 	
-	if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "")
-	{
-		$return_id = $_REQUEST['return_id'];
-	}
+    if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "")
+    {
+        $return_id = $_REQUEST['return_id'];
+    }
 
     $add = "";
     if(isset($additionalFlags) && !empty($additionalFlags)) {
@@ -320,16 +320,16 @@ 
             return "Location: $url";
         }
     } else {
-    	$standard = "action=$return_action&module=$return_module&record=$return_id&isDuplicate=true&return_module=$return_module&return_action=$return_action&status=$status";
+        $standard = "action=$return_action&module=$return_module&record=$return_id&isDuplicate=true&return_module=$return_module&return_action=$return_action&status=$status";
         $url="index.php?{$standard}{$add}";
         if(!empty($_REQUEST['ajax_load']))
         {
             $ajax_ret = array(
-                 'content' => "<script>SUGAR.ajaxUI.loadContent('$url');</script>\n",
-                 'menu' => array(
-                     'module' => $return_module,
-                     'label' => translate($return_module),
-                 ),
+                    'content' => "<script>SUGAR.ajaxUI.loadContent('$url');</script>\n",
+                    'menu' => array(
+                        'module' => $return_module,
+                        'label' => translate($return_module),
+                    ),
             );
             $json = getJSONobj();
             echo $json->encode($ajax_ret);
@@ -341,21 +341,21 @@ 
 
 function getLikeForEachWord($fieldname, $value, $minsize=4)
 {
-	$value = trim($value);
-	$values = explode(' ',$value);
-	$ret = '';
-	foreach($values as $val)
-	{
-		if(strlen($val) >= $minsize)
-		{
-			if(!empty($ret))
-			{
-				$ret .= ' or';
-			}
-			$ret .= ' '. $fieldname . ' LIKE %'.$val.'%';
-		}
+    $value = trim($value);
+    $values = explode(' ',$value);
+    $ret = '';
+    foreach($values as $val)
+    {
+        if(strlen($val) >= $minsize)
+        {
+            if(!empty($ret))
+            {
+                $ret .= ' or';
+            }
+            $ret .= ' '. $fieldname . ' LIKE %'.$val.'%';
+        }
 
-	}
+    }
 
 
 }

Spacing +69 added lines, -69 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -54,9 +54,9 @@ 
  */
 function checkRequired($prefix, $required)
 {
-	foreach($required as $key)
+	foreach ($required as $key)
 	{
-		if(!isset($_POST[$prefix.$key]) || number_empty($_POST[$prefix.$key]))
+		if (!isset($_POST[$prefix.$key]) || number_empty($_POST[$prefix.$key]))
 		{
 			return false;
 		}
@@ -77,15 +77,15 @@ 
 {
 	global $current_user;
 
-	if(!empty($_REQUEST[$prefix.'record']) && !$skipRetrieve)
+	if (!empty($_REQUEST[$prefix.'record']) && !$skipRetrieve)
 		$focus->retrieve($_REQUEST[$prefix.'record']);
 
-	if(!empty($_POST['assigned_user_id']) && 
+	if (!empty($_POST['assigned_user_id']) && 
 	    ($focus->assigned_user_id != $_POST['assigned_user_id']) && 
 	    ($_POST['assigned_user_id'] != $current_user->id)) {
 		$GLOBALS['check_notify'] = true;
 	}
-    if(isset($_POST['dup_checked']) && $_POST['dup_checked'] && isset($_POST['id']) && $_POST['id'] != '' ){
+    if (isset($_POST['dup_checked']) && $_POST['dup_checked'] && isset($_POST['id']) && $_POST['id'] != '') {
         $focus->new_with_id = true;
     }
     require_once('include/SugarFields/SugarFieldHandler.php');
@@ -106,8 +106,8 @@ 
         $relatedFields[$def['id_name']] = $field;
     }
 
-	foreach($focus->field_defs as $field=>$def) {
-        if ( $field == 'id' && !empty($focus->id) ) {
+	foreach ($focus->field_defs as $field=>$def) {
+        if ($field == 'id' && !empty($focus->id)) {
             // Don't try and overwrite the ID
             continue;
         }
@@ -115,7 +115,7 @@ 
 
 	    $type = !empty($def['custom_type']) ? $def['custom_type'] : $def['type'];
 		$sf = $sfh->getSugarField($type);
-        if($sf != null){
+        if ($sf != null) {
             $sf->save($focus, $_POST, $field, $def, $prefix);
         } else {
             $GLOBALS['log']->fatal("Field '$field' does not have a SugarField handler");
@@ -154,8 +154,8 @@ 
 */
 	}
 
-	foreach($focus->additional_column_fields as $field) {
-		if(isset($_POST[$prefix.$field])) {
+	foreach ($focus->additional_column_fields as $field) {
+		if (isset($_POST[$prefix.$field])) {
 			$value = $_POST[$prefix.$field];
 			$focus->$field = $value;
 		}
@@ -180,18 +180,18 @@ 
 }
 
 
-function getPostToForm($ignore='', $isRegularExpression=false)
+function getPostToForm($ignore = '', $isRegularExpression = false)
 {
 	$fields = '';
-	if(!empty($ignore) && $isRegularExpression) {
-		foreach ($_POST as $key=>$value){
-			if(!preg_match($ignore, $key)) {
+	if (!empty($ignore) && $isRegularExpression) {
+		foreach ($_POST as $key=>$value) {
+			if (!preg_match($ignore, $key)) {
                                 $fields .= add_hidden_elements($key, $value);
 			}
 		}	
 	} else {
-		foreach ($_POST as $key=>$value){
-			if($key != $ignore) {
+		foreach ($_POST as $key=>$value) {
+			if ($key != $ignore) {
                                 $fields .= add_hidden_elements($key, $value);
 			}
 		}
@@ -199,21 +199,21 @@ 
 	return $fields;
 }
 
-function getGetToForm($ignore='', $usePostAsAuthority = false)
+function getGetToForm($ignore = '', $usePostAsAuthority = false)
 {
 	$fields = '';
 	foreach ($_GET as $key=>$value)
 	{
-		if($key != $ignore){
-			if(!$usePostAsAuthority || !isset($_POST[$key])){
-				$fields.= "<input type='hidden' name='$key' value='$value'>";
+		if ($key != $ignore) {
+			if (!$usePostAsAuthority || !isset($_POST[$key])) {
+				$fields .= "<input type='hidden' name='$key' value='$value'>";
 			}
 		}
 	}
 	return $fields;
 
 }
-function getAnyToForm($ignore='', $usePostAsAuthority = false)
+function getAnyToForm($ignore = '', $usePostAsAuthority = false)
 {
 	$fields = getPostToForm($ignore);
 	$fields .= getGetToForm($ignore, $usePostAsAuthority);
@@ -221,11 +221,11 @@ 
 
 }
 
-function handleRedirect($return_id='', $return_module='', $additionalFlags = false)
+function handleRedirect($return_id = '', $return_module = '', $additionalFlags = false)
 {
-	if(isset($_REQUEST['return_url']) && $_REQUEST['return_url'] != "")
+	if (isset($_REQUEST['return_url']) && $_REQUEST['return_url'] != "")
 	{
-		header("Location: ". $_REQUEST['return_url']);
+		header("Location: ".$_REQUEST['return_url']);
 		exit;
 	}
 
@@ -235,9 +235,9 @@ 
 }
 
 //eggsurplus: abstract to simplify unit testing
-function buildRedirectURL($return_id='', $return_module='') 
+function buildRedirectURL($return_id = '', $return_module = '') 
 {
-    if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "")
+    if (isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "")
 	{
 		$return_module = $_REQUEST['return_module'];
 	}
@@ -245,24 +245,24 @@ 
 	{
 		$return_module = $return_module;
 	}
-	if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "")
+	if (isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "")
 	{
 	    
 	   //if we are doing a "Close and Create New"
-        if(isCloseAndCreateNewPressed())
+        if (isCloseAndCreateNewPressed())
         {
             $return_action = "EditView";    
             $isDuplicate = "true";        
             $status = "";
             
             // Meeting Integration
-            if(isset($_REQUEST['meetingIntegrationFlag']) && $_REQUEST['meetingIntegrationFlag'] == 1) {
+            if (isset($_REQUEST['meetingIntegrationFlag']) && $_REQUEST['meetingIntegrationFlag'] == 1) {
             	$additionalFlags = array('meetingIntegrationShowForm' => '1');
             }
             // END Meeting Integration
         } 
 		// if we create a new record "Save", we want to redirect to the DetailView
-		else if(isset($_REQUEST['action']) && $_REQUEST['action'] == "Save" 
+		else if (isset($_REQUEST['action']) && $_REQUEST['action'] == "Save" 
 			&& $_REQUEST['return_module'] != 'Activities'
 			&& $_REQUEST['return_module'] != 'Home' 
 			&& $_REQUEST['return_module'] != 'Forecasts' 
@@ -271,7 +271,7 @@ 
 			) 
 			{
 			    $return_action = 'DetailView';
-			} elseif($_REQUEST['return_module'] == 'Activities' || $_REQUEST['return_module'] == 'Calendar') {
+			} elseif ($_REQUEST['return_module'] == 'Activities' || $_REQUEST['return_module'] == 'Calendar') {
 			$return_module = $_REQUEST['module'];
 			$return_action = $_REQUEST['return_action']; 
 			// wp: return action needs to be set for one-click close in task list
@@ -287,25 +287,25 @@ 
 		$return_action = "DetailView";
 	}
 	
-	if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "")
+	if (isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "")
 	{
 		$return_id = $_REQUEST['return_id'];
 	}
 
     $add = "";
-    if(isset($additionalFlags) && !empty($additionalFlags)) {
-        foreach($additionalFlags as $k => $v) {
+    if (isset($additionalFlags) && !empty($additionalFlags)) {
+        foreach ($additionalFlags as $k => $v) {
             $add .= "&{$k}={$v}";
         }
     }
     
     if (!isset($isDuplicate) || !$isDuplicate)
     {
-        $url="index.php?action=$return_action&module=$return_module&record=$return_id&return_module=$return_module&return_action=$return_action{$add}";
-        if(isset($_REQUEST['offset']) && empty($_REQUEST['duplicateSave'])) {
+        $url = "index.php?action=$return_action&module=$return_module&record=$return_id&return_module=$return_module&return_action=$return_action{$add}";
+        if (isset($_REQUEST['offset']) && empty($_REQUEST['duplicateSave'])) {
             $url .= "&offset=".$_REQUEST['offset'];
         }
-        if(!empty($_REQUEST['ajax_load']))
+        if (!empty($_REQUEST['ajax_load']))
         {
             $ajax_ret = array(
                 'content' => "<script>SUGAR.ajaxUI.loadContent('$url');</script>\n",
@@ -321,8 +321,8 @@ 
         }
     } else {
     	$standard = "action=$return_action&module=$return_module&record=$return_id&isDuplicate=true&return_module=$return_module&return_action=$return_action&status=$status";
-        $url="index.php?{$standard}{$add}";
-        if(!empty($_REQUEST['ajax_load']))
+        $url = "index.php?{$standard}{$add}";
+        if (!empty($_REQUEST['ajax_load']))
         {
             $ajax_ret = array(
                  'content' => "<script>SUGAR.ajaxUI.loadContent('$url');</script>\n",
@@ -339,20 +339,20 @@ 
     }
 }
 
-function getLikeForEachWord($fieldname, $value, $minsize=4)
+function getLikeForEachWord($fieldname, $value, $minsize = 4)
 {
 	$value = trim($value);
-	$values = explode(' ',$value);
+	$values = explode(' ', $value);
 	$ret = '';
-	foreach($values as $val)
+	foreach ($values as $val)
 	{
-		if(strlen($val) >= $minsize)
+		if (strlen($val) >= $minsize)
 		{
-			if(!empty($ret))
+			if (!empty($ret))
 			{
 				$ret .= ' or';
 			}
-			$ret .= ' '. $fieldname . ' LIKE %'.$val.'%';
+			$ret .= ' '.$fieldname.' LIKE %'.$val.'%';
 		}
 
 	}
@@ -373,36 +373,36 @@ 
  * @see include/generic/Save2.php
  */
 
-function add_prospects_to_prospect_list($parent_id,$child_id)
+function add_prospects_to_prospect_list($parent_id, $child_id)
 {
-    $focus=BeanFactory::getBean('Prospects');
-    if(is_array($child_id)){
+    $focus = BeanFactory::getBean('Prospects');
+    if (is_array($child_id)) {
         $uids = $child_id;
     }
-    else{
+    else {
         $uids = array($child_id);
     }
 
     $relationship = '';
-    foreach($focus->get_linked_fields() as $field => $def) {
+    foreach ($focus->get_linked_fields() as $field => $def) {
         if ($focus->load_relationship($field)) {
-            if ( $focus->$field->getRelatedModuleName() == 'ProspectLists' ) {
+            if ($focus->$field->getRelatedModuleName() == 'ProspectLists') {
                 $relationship = $field;
                 break;
             }
         }
     }
 
-    if ( $relationship != '' ) {
-        foreach ( $uids as $id) {
+    if ($relationship != '') {
+        foreach ($uids as $id) {
             $focus->retrieve($id);
             $focus->load_relationship($relationship);
-            $focus->prospect_lists->add( $parent_id );
+            $focus->prospect_lists->add($parent_id);
         }
     }
 }
 
-function add_to_prospect_list($query_panel,$parent_module,$parent_type,$parent_id,$child_id,$link_attribute,$link_type,$parent)
+function add_to_prospect_list($query_panel, $parent_module, $parent_type, $parent_id, $child_id, $link_attribute, $link_type, $parent)
 {
     $GLOBALS['log']->debug('add_prospects_to_prospect_list:parameters:'.$query_panel);
     $GLOBALS['log']->debug('add_prospects_to_prospect_list:parameters:'.$parent_module);
@@ -419,21 +419,21 @@ 
     }
     $focus = new $parent_type();
     $focus->retrieve($parent_id);
-    if(empty($focus->id)) {
+    if (empty($focus->id)) {
         return false;
     }
-    if(empty($parent)) {
+    if (empty($parent)) {
         return false;
     }
 
     //if link_type is default then load relationship once and add all the child ids.
-    $relationship_attribute=$link_attribute;
+    $relationship_attribute = $link_attribute;
 
     //find all prospects based on the query
 
     $subpanel = new SubPanelTiles($parent, $parent->module_dir);
-    $thisPanel=$subpanel->subpanel_definitions->load_subpanel($query_panel);
-    if(empty($thisPanel)) {
+    $thisPanel = $subpanel->subpanel_definitions->load_subpanel($query_panel);
+    if (empty($thisPanel)) {
         return false;
     }
 
@@ -443,12 +443,12 @@ 
         $thisPanel->_instance_properties['function_parameters']['EMAIL_MARKETING_ID_VALUE'] = $_REQUEST['marketing_id'];
     }
 
-    $result = SugarBean::get_union_related_list($parent, '', '', '', 0, -99,-99,'', $thisPanel);
+    $result = SugarBean::get_union_related_list($parent, '', '', '', 0, -99, -99, '', $thisPanel);
 
-    if(!empty($result['list'])) {
-        foreach($result['list'] as $object) {
+    if (!empty($result['list'])) {
+        foreach ($result['list'] as $object) {
             if ($link_type != 'default') {
-                $relationship_attribute=strtolower($object->$link_attribute);
+                $relationship_attribute = strtolower($object->$link_attribute);
             }
             $GLOBALS['log']->debug('add_prospects_to_prospect_list:relationship_attribute:'.$relationship_attribute);
             // load relationship for the first time or on change of relationship atribute.
@@ -462,7 +462,7 @@ 
 }
 
 //Link rows returned by a report to parent record.
-function save_from_report($report_id,$parent_id, $module_name, $relationship_attr_name) {
+function save_from_report($report_id, $parent_id, $module_name, $relationship_attr_name) {
     global $beanFiles;
     global $beanList;
 
@@ -472,7 +472,7 @@ 
     $GLOBALS['log']->debug("Save2:Module Name=".$module_name);
     $GLOBALS['log']->debug("Save2:Relationship Attribute Name=".$relationship_attr_name);
 
-    $GLOBALS['log']->debug("Save2:Bean Name=" . $module_name);
+    $GLOBALS['log']->debug("Save2:Bean Name=".$module_name);
     $focus = BeanFactory::newBean($module_name);
 
     $focus->retrieve($parent_id);
@@ -481,7 +481,7 @@ 
     //fetch report definition.
     global $current_language, $report_modules, $modules_report;
 
-    $mod_strings = return_module_language($current_language,"Reports");
+    $mod_strings = return_module_language($current_language, "Reports");
 
 
     $saved = new SavedReport();
@@ -498,7 +498,7 @@ 
     $result = $report->db->query($sql);
 
     $reportBean = BeanFactory::newBean($saved->module);
-    while($row = $report->db->fetchByAssoc($result))
+    while ($row = $report->db->fetchByAssoc($result))
     {
         $reportBean->id = $row['primaryid'];
         $focus->$relationship_attr_name->add($reportBean);

Braces +10 added lines, -11 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -77,8 +79,9 @@ 
 {
 	global $current_user;
 
-	if(!empty($_REQUEST[$prefix.'record']) && !$skipRetrieve)
-		$focus->retrieve($_REQUEST[$prefix.'record']);
+	if(!empty($_REQUEST[$prefix.'record']) && !$skipRetrieve) {
+			$focus->retrieve($_REQUEST[$prefix.'record']);
+	}
 
 	if(!empty($_POST['assigned_user_id']) && 
 	    ($focus->assigned_user_id != $_POST['assigned_user_id']) && 
@@ -240,8 +243,7 @@ 
     if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "")
 	{
 		$return_module = $_REQUEST['return_module'];
-	}
-	else
+	} else
 	{
 		$return_module = $return_module;
 	}
@@ -275,14 +277,12 @@ 
 			$return_module = $_REQUEST['module'];
 			$return_action = $_REQUEST['return_action']; 
 			// wp: return action needs to be set for one-click close in task list
-		} 
-		else 
+		} else 
 		{
 			// if we "Cancel", we go back to the list view.
 			$return_action = $_REQUEST['return_action'];
 		}
-	}
-	else
+	} else
 	{
 		$return_action = "DetailView";
 	}
@@ -378,8 +378,7 @@ 
     $focus=BeanFactory::getBean('Prospects');
     if(is_array($child_id)){
         $uids = $child_id;
-    }
-    else{
+    } else{
         $uids = array($child_id);
     }
 

include/SubPanel/SubPanelSearchDisplay.php

Indentation +3 added lines, -3 removed lines

@@ -46,12 +46,12 @@ 
 
 if(empty($_REQUEST['module']))
 {
-	die("'module' was not defined");
+    die("'module' was not defined");
 }
 
 if(!isset($beanList[$_REQUEST['module']]))
 {
-	die("'".$_REQUEST['module']."' is not defined in \$beanList");
+    die("'".$_REQUEST['module']."' is not defined in \$beanList");
 }
 
 if (!isset($_REQUEST['subpanel'])) {
@@ -67,7 +67,7 @@ 
 include('include/SubPanel/SubPanel.php');
 $layout_def_key = '';
 if(!empty($_REQUEST['layout_def_key'])){
-	$layout_def_key = $_REQUEST['layout_def_key'];
+    $layout_def_key = $_REQUEST['layout_def_key'];
 }
 
 $subpanel_object = new CustomSubPanel($module, $record, $subpanel,null, $layout_def_key, $collection);

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -38,18 +38,18 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-ini_set('display_errors',1);
+ini_set('display_errors', 1);
 
 global $beanList;
 global $beanFiles;
 
 
-if(empty($_REQUEST['module']))
+if (empty($_REQUEST['module']))
 {
 	die("'module' was not defined");
 }
 
-if(!isset($beanList[$_REQUEST['module']]))
+if (!isset($beanList[$_REQUEST['module']]))
 {
 	die("'".$_REQUEST['module']."' is not defined in \$beanList");
 }
@@ -66,11 +66,11 @@ 
 
 include('include/SubPanel/SubPanel.php');
 $layout_def_key = '';
-if(!empty($_REQUEST['layout_def_key'])){
+if (!empty($_REQUEST['layout_def_key'])) {
 	$layout_def_key = $_REQUEST['layout_def_key'];
 }
 
-$subpanel_object = new CustomSubPanel($module, $record, $subpanel,null, $layout_def_key, $collection);
+$subpanel_object = new CustomSubPanel($module, $record, $subpanel, null, $layout_def_key, $collection);
 
 echo $subpanel_object->getSearchForm();
 

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

include/SubPanel/registered_layout_defs.php

Indentation +2 added lines, -2 removed lines

@@ -49,8 +49,8 @@
 function get_layout_defs()
 {
     //TODO add global memory cache support here.  If there is an in memory cache, leverage it.
-	global $layout_defs;
-	return $layout_defs;
+    global $layout_defs;
+    return $layout_defs;
 }
 
 ?>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

include/SubPanel/SubPanelTilesTabs.php

Braces +22 added lines, -17 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -111,8 +113,9 @@ 
     function _getTabs($tabs, $showTabs = true, $selectedGroup='All')
     {
         //WDong Bug: 12258 "All" tab in the middle of a record's detail view is not localized.
-        if($selectedGroup=='All')
-        	$selectedGroup=translate('LBL_TABGROUP_ALL');
+        if($selectedGroup=='All') {
+                	$selectedGroup=translate('LBL_TABGROUP_ALL');
+        }
 
     	// Set up a mapping from subpanelID, found in the $tabs list, to the source module name
     	// As the $GLOBALS['tabStructure'] array holds the Group Tabs by module name we need to efficiently convert between the two
@@ -127,8 +130,9 @@ 
             // Bug #44344 : Custom relationships under same module only show once in subpanel tabs
             // use object property instead new object to have ability run unit test (can override subpanel_definitions)
             $subpanel =  $this->subpanel_definitions->load_subpanel( $subpanelID );
-    		if ($subpanel !== false)
-    		  $moduleNames [ $subpanelID ] = $subpanel->get_module_name() ;
+    		if ($subpanel !== false) {
+    		    		  $moduleNames [ $subpanelID ] = $subpanel->get_module_name() ;
+    		}
     	}
 
     	$groups =  array () ;
@@ -138,11 +142,12 @@ 
         {
             foreach( $subModules['modules'] as $key => $subModule )
             {
-    			foreach ( $tabs as $subpanelID )
-                    if (isset($moduleNames[ $subpanelID ] ) && strcasecmp( $subModule , $moduleNames[ $subpanelID ] ) === 0)
+    			foreach ( $tabs as $subpanelID ) {
+    			                    if (isset($moduleNames[ $subpanelID ] ) && strcasecmp( $subModule , $moduleNames[ $subpanelID ] ) === 0)
                     {
                         // Bug #44344 : Custom relationships under same module only show once in subpanel tabs
                         $groups [ translate ( $mainTab ) ] [ 'modules' ] [] = $subpanelID ;
+    			}
                     	$found [ $subpanelID ] = true ;
                 	}
             }
@@ -152,8 +157,9 @@ 
 
         foreach( $tabs as $subpanelID )
         {
-        	if ( ! isset ( $found [ $subpanelID ] ) )
-	        	$groups [ translate ('LBL_TABGROUP_OTHER') ]['modules'] [] = $subpanelID ;
+        	if ( ! isset ( $found [ $subpanelID ] ) ) {
+        		        	$groups [ translate ('LBL_TABGROUP_OTHER') ]['modules'] [] = $subpanelID ;
+        	}
         }
 
         /* Move history to same tab as activities */
@@ -168,8 +174,7 @@ 
                     	/* Move hist from there to here */
                         $groups[$mainTab]['modules'] []= 'history';
                     }
-                }
-                else if(false !== ($i = array_search('history', array_map('strtolower', $group['modules']))))
+                } else if(false !== ($i = array_search('history', array_map('strtolower', $group['modules']))))
                 {
                     unset($groups[$mainTab]['modules'][$i]);
                     if(empty($groups[$mainTab]['modules']))
@@ -184,10 +189,11 @@ 
          * Note that if a tab group already exists with the name 'All',
          * it will be overwritten in this union operation.
          */
-        if(count($groups) <= 1)
-        	$groups = array(translate('LBL_TABGROUP_ALL') => array('label' => translate('LBL_TABGROUP_ALL'), 'modules' => $tabs));
-        else
-            $groups = array(translate('LBL_TABGROUP_ALL') => array('label' => translate('LBL_TABGROUP_ALL'), 'modules' => $tabs)) + $groups;
+        if(count($groups) <= 1) {
+                	$groups = array(translate('LBL_TABGROUP_ALL') => array('label' => translate('LBL_TABGROUP_ALL'), 'modules' => $tabs));
+        } else {
+                    $groups = array(translate('LBL_TABGROUP_ALL') => array('label' => translate('LBL_TABGROUP_ALL'), 'modules' => $tabs)) + $groups;
+        }
         /* Note - all $display checking and array_intersects with $tabs
          * are now redundant (thanks to GroupedTabStructure), and could
          * be removed for performance, but for now can stay to help ensure
@@ -261,8 +267,7 @@ 
             	$sugarTab->setup($sugarTabs, $otherTabs, $displayTabs, $selectedGroup);
             	$sugarTab->display();
             }
-        }
-        else
+        } else
         {
             $tabs = SubPanelTilesTabs::applyUserCustomLayoutToTabs($tabs, $selectedGroup);
 

Indentation +51 added lines, -51 removed lines

@@ -48,15 +48,15 @@ 
 class SubPanelTilesTabs extends SubPanelTiles
 {
 
-	function __construct(&$focus, $layout_def_key='', $layout_def_override = '')
-	{
+    function __construct(&$focus, $layout_def_key='', $layout_def_override = '')
+    {
 
-		$this->focus = $focus;
-		$this->id = $focus->id;
-		$this->module = $focus->module_dir;
-		$this->layout_def_key = $layout_def_key;
-		$this->subpanel_definitions = new SubPanelDefinitions($focus, $layout_def_key, $layout_def_override);
-	}
+        $this->focus = $focus;
+        $this->id = $focus->id;
+        $this->module = $focus->module_dir;
+        $this->layout_def_key = $layout_def_key;
+        $this->subpanel_definitions = new SubPanelDefinitions($focus, $layout_def_key, $layout_def_override);
+    }
 
     function getSubpanelGroupLayout($selectedGroup)
     {
@@ -77,9 +77,9 @@ 
     {
         //WDong Bug: 12258 "All" tab in the middle of a record's detail view is not localized.
         if($key=='All')
-    	{
-    		$key=translate('LBL_TABGROUP_ALL');
-    	}
+        {
+            $key=translate('LBL_TABGROUP_ALL');
+        }
         $usersCustomLayout = SubPanelTilesTabs::getSubpanelGroupLayout($key);
         if(!empty($usersCustomLayout))
         {
@@ -91,7 +91,7 @@ 
             $tabs = array_intersect($usersCustomLayout, $tabs);
             foreach($diff as $subpanel)
             {
-            	$tabs []= $subpanel;
+                $tabs []= $subpanel;
             }
         }
 
@@ -112,39 +112,39 @@ 
     {
         //WDong Bug: 12258 "All" tab in the middle of a record's detail view is not localized.
         if($selectedGroup=='All')
-        	$selectedGroup=translate('LBL_TABGROUP_ALL');
-
-    	// Set up a mapping from subpanelID, found in the $tabs list, to the source module name
-    	// As the $GLOBALS['tabStructure'] array holds the Group Tabs by module name we need to efficiently convert between the two
-    	// when constructing the subpanel tabs
-    	// Note that we can't use the very similar GroupedTabStructure class as it lacks this mapping, and logically, it is designed
-    	// for use when constructing the module by module tabs, not the subpanel tabs, as we move away from using module names to represent
-    	// subpanels, and use unique subpanel IDs instead.
-
-    	$moduleNames = array () ;
-    	foreach ( $tabs as $subpanelID )
-    	{
+            $selectedGroup=translate('LBL_TABGROUP_ALL');
+
+        // Set up a mapping from subpanelID, found in the $tabs list, to the source module name
+        // As the $GLOBALS['tabStructure'] array holds the Group Tabs by module name we need to efficiently convert between the two
+        // when constructing the subpanel tabs
+        // Note that we can't use the very similar GroupedTabStructure class as it lacks this mapping, and logically, it is designed
+        // for use when constructing the module by module tabs, not the subpanel tabs, as we move away from using module names to represent
+        // subpanels, and use unique subpanel IDs instead.
+
+        $moduleNames = array () ;
+        foreach ( $tabs as $subpanelID )
+        {
             // Bug #44344 : Custom relationships under same module only show once in subpanel tabs
             // use object property instead new object to have ability run unit test (can override subpanel_definitions)
             $subpanel =  $this->subpanel_definitions->load_subpanel( $subpanelID );
-    		if ($subpanel !== false)
-    		  $moduleNames [ $subpanelID ] = $subpanel->get_module_name() ;
-    	}
+            if ($subpanel !== false)
+                $moduleNames [ $subpanelID ] = $subpanel->get_module_name() ;
+        }
 
-    	$groups =  array () ;
-    	$found = array () ;
+        $groups =  array () ;
+        $found = array () ;
 
         foreach( $GLOBALS['tabStructure'] as $mainTab => $subModules)
         {
             foreach( $subModules['modules'] as $key => $subModule )
             {
-    			foreach ( $tabs as $subpanelID )
+                foreach ( $tabs as $subpanelID )
                     if (isset($moduleNames[ $subpanelID ] ) && strcasecmp( $subModule , $moduleNames[ $subpanelID ] ) === 0)
                     {
                         // Bug #44344 : Custom relationships under same module only show once in subpanel tabs
                         $groups [ translate ( $mainTab ) ] [ 'modules' ] [] = $subpanelID ;
-                    	$found [ $subpanelID ] = true ;
-                	}
+                        $found [ $subpanelID ] = true ;
+                    }
             }
         }
 
@@ -152,8 +152,8 @@ 
 
         foreach( $tabs as $subpanelID )
         {
-        	if ( ! isset ( $found [ $subpanelID ] ) )
-	        	$groups [ translate ('LBL_TABGROUP_OTHER') ]['modules'] [] = $subpanelID ;
+            if ( ! isset ( $found [ $subpanelID ] ) )
+                $groups [ translate ('LBL_TABGROUP_OTHER') ]['modules'] [] = $subpanelID ;
         }
 
         /* Move history to same tab as activities */
@@ -161,11 +161,11 @@ 
         {
             foreach($groups as $mainTab => $group)
             {
-            	if(in_array('activities', array_map('strtolower', $group['modules'])))
+                if(in_array('activities', array_map('strtolower', $group['modules'])))
                 {
-                	if(!in_array('history', array_map('strtolower', $group['modules'])))
+                    if(!in_array('history', array_map('strtolower', $group['modules'])))
                     {
-                    	/* Move hist from there to here */
+                        /* Move hist from there to here */
                         $groups[$mainTab]['modules'] []= 'history';
                     }
                 }
@@ -174,7 +174,7 @@ 
                     unset($groups[$mainTab]['modules'][$i]);
                     if(empty($groups[$mainTab]['modules']))
                     {
-                    	unset($groups[$mainTab]);
+                        unset($groups[$mainTab]);
                     }
                 }
             }
@@ -185,7 +185,7 @@ 
          * it will be overwritten in this union operation.
          */
         if(count($groups) <= 1)
-        	$groups = array(translate('LBL_TABGROUP_ALL') => array('label' => translate('LBL_TABGROUP_ALL'), 'modules' => $tabs));
+            $groups = array(translate('LBL_TABGROUP_ALL') => array('label' => translate('LBL_TABGROUP_ALL'), 'modules' => $tabs));
         else
             $groups = array(translate('LBL_TABGROUP_ALL') => array('label' => translate('LBL_TABGROUP_ALL'), 'modules' => $tabs)) + $groups;
         /* Note - all $display checking and array_intersects with $tabs
@@ -197,14 +197,14 @@ 
         $retTabs = array();
         if($showTabs)
         {
-        	require_once('include/SubPanel/SugarTab.php');
-        	$sugarTab = new SugarTab();
+            require_once('include/SubPanel/SugarTab.php');
+            $sugarTab = new SugarTab();
 
             $displayTabs = array();
             $otherTabs = array();
 
-    	    foreach ($groups as $key=>$tab)
-    		{
+            foreach ($groups as $key=>$tab)
+            {
                 $display = false;
                 foreach($tab['modules'] as $subkey=>$subtab)
                 {
@@ -227,9 +227,9 @@ 
                     $relevantTabs = SubPanelTilesTabs::applyUserCustomLayoutToTabs($tabs, $key);
 
                     $sugarTabs[$key] = array(//'url'=>'index.php?module=' . $_REQUEST['module'] . '&record=' . $_REQUEST['record'] . '&action=' . $_REQUEST['action']. '&subpanel=' . $key.'#tabs',
-                                         //'url'=>"javascript:SUGAR.util.retrieveAndFill('index.php?to_pdf=1&module=MySettings&action=LoadTabSubpanels&loadModule={$_REQUEST['module']}&record={$_REQUEST['record']}&subpanel=$key','subpanel_list',null,null,null);",
-                                         'label'=>( !empty($tab['label']) ? $tab['label']: $key ),
-                                         'type'=>$selected);
+                                            //'url'=>"javascript:SUGAR.util.retrieveAndFill('index.php?to_pdf=1&module=MySettings&action=LoadTabSubpanels&loadModule={$_REQUEST['module']}&record={$_REQUEST['record']}&subpanel=$key','subpanel_list',null,null,null);",
+                                            'label'=>( !empty($tab['label']) ? $tab['label']: $key ),
+                                            'type'=>$selected);
 
                     $otherTabs[$key] = array('key'=>$key, 'tabs'=>array());
 
@@ -246,7 +246,7 @@ 
                         $retTabs = $orderedTabs;
                     }
                 }
-    		}
+            }
 
             if(empty($displayTabs) && !empty($otherTabs))
             {
@@ -258,8 +258,8 @@ 
             }
 
             if (!empty($sugarTabs) || !empty($otherTabs) ) {
-            	$sugarTab->setup($sugarTabs, $otherTabs, $displayTabs, $selectedGroup);
-            	$sugarTab->display();
+                $sugarTab->setup($sugarTabs, $otherTabs, $displayTabs, $selectedGroup);
+                $sugarTab->display();
             }
         }
         else
@@ -269,7 +269,7 @@ 
             $retTabs = array_intersect($tabs, array_map('strtolower', $groups[$selectedGroup]['modules']));
         }
 
-		return $retTabs;
-	}
+        return $retTabs;
+    }
 }
 ?>

Spacing +46 added lines, -46 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -48,7 +48,7 @@ 
 class SubPanelTilesTabs extends SubPanelTiles
 {
 
-	function __construct(&$focus, $layout_def_key='', $layout_def_override = '')
+	function __construct(&$focus, $layout_def_key = '', $layout_def_override = '')
 	{
 
 		$this->focus = $focus;
@@ -64,7 +64,7 @@ 
 
         $layoutParams = $this->module;
         //WDong Bug: 12258 "All" tab in the middle of a record's detail view is not localized.
-        if($selectedGroup != translate('LBL_TABGROUP_ALL'))
+        if ($selectedGroup != translate('LBL_TABGROUP_ALL'))
         {
             $layoutParams .= ':'.$selectedGroup;
         }
@@ -73,15 +73,15 @@ 
         return $current_user->getPreference('subpanelLayout', $layoutParams);
     }
 
-    function applyUserCustomLayoutToTabs($tabs, $key='All')
+    function applyUserCustomLayoutToTabs($tabs, $key = 'All')
     {
         //WDong Bug: 12258 "All" tab in the middle of a record's detail view is not localized.
-        if($key=='All')
+        if ($key == 'All')
     	{
-    		$key=translate('LBL_TABGROUP_ALL');
+    		$key = translate('LBL_TABGROUP_ALL');
     	}
         $usersCustomLayout = SubPanelTilesTabs::getSubpanelGroupLayout($key);
-        if(!empty($usersCustomLayout))
+        if (!empty($usersCustomLayout))
         {
             /* Return elements of the custom layout
              * which occur in $tabs in unchanged order.
@@ -89,9 +89,9 @@ 
              * not included in the layout. */
             $diff = array_diff($tabs, $usersCustomLayout);
             $tabs = array_intersect($usersCustomLayout, $tabs);
-            foreach($diff as $subpanel)
+            foreach ($diff as $subpanel)
             {
-            	$tabs []= $subpanel;
+            	$tabs [] = $subpanel;
             }
         }
 
@@ -104,15 +104,15 @@ 
      * @param boolean $showTabs	Call the view code to display the generated tabs
      * @param string $selectedGroup	(Optional) Name of any selected tab (defaults to 'All')
      */
-    function getTabs($showTabs = true, $selectedGroup='') {
+    function getTabs($showTabs = true, $selectedGroup = '') {
         $args = func_get_args();
         return call_user_func_array(array($this, '_getTabs'), $args);
     }
-    function _getTabs($tabs, $showTabs = true, $selectedGroup='All')
+    function _getTabs($tabs, $showTabs = true, $selectedGroup = 'All')
     {
         //WDong Bug: 12258 "All" tab in the middle of a record's detail view is not localized.
-        if($selectedGroup=='All')
-        	$selectedGroup=translate('LBL_TABGROUP_ALL');
+        if ($selectedGroup == 'All')
+        	$selectedGroup = translate('LBL_TABGROUP_ALL');
 
     	// Set up a mapping from subpanelID, found in the $tabs list, to the source module name
     	// As the $GLOBALS['tabStructure'] array holds the Group Tabs by module name we need to efficiently convert between the two
@@ -121,58 +121,58 @@ 
     	// for use when constructing the module by module tabs, not the subpanel tabs, as we move away from using module names to represent
     	// subpanels, and use unique subpanel IDs instead.
 
-    	$moduleNames = array () ;
-    	foreach ( $tabs as $subpanelID )
+    	$moduleNames = array();
+    	foreach ($tabs as $subpanelID)
     	{
             // Bug #44344 : Custom relationships under same module only show once in subpanel tabs
             // use object property instead new object to have ability run unit test (can override subpanel_definitions)
-            $subpanel =  $this->subpanel_definitions->load_subpanel( $subpanelID );
+            $subpanel = $this->subpanel_definitions->load_subpanel($subpanelID);
     		if ($subpanel !== false)
-    		  $moduleNames [ $subpanelID ] = $subpanel->get_module_name() ;
+    		  $moduleNames [$subpanelID] = $subpanel->get_module_name();
     	}
 
-    	$groups =  array () ;
-    	$found = array () ;
+    	$groups = array();
+    	$found = array();
 
-        foreach( $GLOBALS['tabStructure'] as $mainTab => $subModules)
+        foreach ($GLOBALS['tabStructure'] as $mainTab => $subModules)
         {
-            foreach( $subModules['modules'] as $key => $subModule )
+            foreach ($subModules['modules'] as $key => $subModule)
             {
-    			foreach ( $tabs as $subpanelID )
-                    if (isset($moduleNames[ $subpanelID ] ) && strcasecmp( $subModule , $moduleNames[ $subpanelID ] ) === 0)
+    			foreach ($tabs as $subpanelID)
+                    if (isset($moduleNames[$subpanelID]) && strcasecmp($subModule, $moduleNames[$subpanelID]) === 0)
                     {
                         // Bug #44344 : Custom relationships under same module only show once in subpanel tabs
-                        $groups [ translate ( $mainTab ) ] [ 'modules' ] [] = $subpanelID ;
-                    	$found [ $subpanelID ] = true ;
+                        $groups [translate($mainTab)] ['modules'] [] = $subpanelID;
+                    	$found [$subpanelID] = true;
                 	}
             }
         }
 
         // Put all the remaining subpanels into the 'Other' tab.
 
-        foreach( $tabs as $subpanelID )
+        foreach ($tabs as $subpanelID)
         {
-        	if ( ! isset ( $found [ $subpanelID ] ) )
-	        	$groups [ translate ('LBL_TABGROUP_OTHER') ]['modules'] [] = $subpanelID ;
+        	if (!isset ($found [$subpanelID]))
+	        	$groups [translate('LBL_TABGROUP_OTHER')]['modules'] [] = $subpanelID;
         }
 
         /* Move history to same tab as activities */
-        if(in_array('history', $tabs) && in_array('activities', $tabs))
+        if (in_array('history', $tabs) && in_array('activities', $tabs))
         {
-            foreach($groups as $mainTab => $group)
+            foreach ($groups as $mainTab => $group)
             {
-            	if(in_array('activities', array_map('strtolower', $group['modules'])))
+            	if (in_array('activities', array_map('strtolower', $group['modules'])))
                 {
-                	if(!in_array('history', array_map('strtolower', $group['modules'])))
+                	if (!in_array('history', array_map('strtolower', $group['modules'])))
                     {
                     	/* Move hist from there to here */
-                        $groups[$mainTab]['modules'] []= 'history';
+                        $groups[$mainTab]['modules'] [] = 'history';
                     }
                 }
-                else if(false !== ($i = array_search('history', array_map('strtolower', $group['modules']))))
+                else if (false !== ($i = array_search('history', array_map('strtolower', $group['modules']))))
                 {
                     unset($groups[$mainTab]['modules'][$i]);
-                    if(empty($groups[$mainTab]['modules']))
+                    if (empty($groups[$mainTab]['modules']))
                     {
                     	unset($groups[$mainTab]);
                     }
@@ -184,7 +184,7 @@ 
          * Note that if a tab group already exists with the name 'All',
          * it will be overwritten in this union operation.
          */
-        if(count($groups) <= 1)
+        if (count($groups) <= 1)
         	$groups = array(translate('LBL_TABGROUP_ALL') => array('label' => translate('LBL_TABGROUP_ALL'), 'modules' => $tabs));
         else
             $groups = array(translate('LBL_TABGROUP_ALL') => array('label' => translate('LBL_TABGROUP_ALL'), 'modules' => $tabs)) + $groups;
@@ -195,7 +195,7 @@ 
          */
 
         $retTabs = array();
-        if($showTabs)
+        if ($showTabs)
         {
         	require_once('include/SubPanel/SugarTab.php');
         	$sugarTab = new SugarTab();
@@ -206,9 +206,9 @@ 
     	    foreach ($groups as $key=>$tab)
     		{
                 $display = false;
-                foreach($tab['modules'] as $subkey=>$subtab)
+                foreach ($tab['modules'] as $subkey=>$subtab)
                 {
-                    if(in_array(strtolower($subtab), $tabs))
+                    if (in_array(strtolower($subtab), $tabs))
                     {
                         $display = true;
                         break;
@@ -217,30 +217,30 @@ 
 
                 $selected = '';
 
-                if($selectedGroup == $key)
+                if ($selectedGroup == $key)
                 {
                     $selected = 'current';
                 }
 
-                if($display)
+                if ($display)
                 {
                     $relevantTabs = SubPanelTilesTabs::applyUserCustomLayoutToTabs($tabs, $key);
 
                     $sugarTabs[$key] = array(//'url'=>'index.php?module=' . $_REQUEST['module'] . '&record=' . $_REQUEST['record'] . '&action=' . $_REQUEST['action']. '&subpanel=' . $key.'#tabs',
                                          //'url'=>"javascript:SUGAR.util.retrieveAndFill('index.php?to_pdf=1&module=MySettings&action=LoadTabSubpanels&loadModule={$_REQUEST['module']}&record={$_REQUEST['record']}&subpanel=$key','subpanel_list',null,null,null);",
-                                         'label'=>( !empty($tab['label']) ? $tab['label']: $key ),
+                                         'label'=>(!empty($tab['label']) ? $tab['label'] : $key),
                                          'type'=>$selected);
 
                     $otherTabs[$key] = array('key'=>$key, 'tabs'=>array());
 
                     $orderedTabs = array_intersect($relevantTabs, array_map('strtolower', $groups[$key]['modules']));
 
-                    foreach($orderedTabs as $subkey => $subtab)
+                    foreach ($orderedTabs as $subkey => $subtab)
                     {
                         $otherTabs[$key]['tabs'][$subkey] = array('key'=>$subtab, 'label'=>translate($this->subpanel_definitions->layout_defs['subpanel_setup'][$subtab]['title_key']));
                     }
 
-                    if($selectedGroup == $key)
+                    if ($selectedGroup == $key)
                     {
                         $displayTabs = $otherTabs[$key]['tabs'];
                         $retTabs = $orderedTabs;
@@ -248,7 +248,7 @@ 
                 }
     		}
 
-            if(empty($displayTabs) && !empty($otherTabs))
+            if (empty($displayTabs) && !empty($otherTabs))
             {
                 //WDong Bug: 12258 "All" tab in the middle of a record's detail view is not localized.
                 $selectedGroup = translate('LBL_TABGROUP_ALL');
@@ -257,7 +257,7 @@ 
                 $retTabs = array_intersect($tabs, array_map('strtolower', $groups[$selectedGroup]['modules']));
             }
 
-            if (!empty($sugarTabs) || !empty($otherTabs) ) {
+            if (!empty($sugarTabs) || !empty($otherTabs)) {
             	$sugarTab->setup($sugarTabs, $otherTabs, $displayTabs, $selectedGroup);
             	$sugarTab->display();
             }

include/generic/SugarWidgets/SugarWidgetSubPanelGetLatestButton.php

Indentation +29 added lines, -29 removed lines

@@ -45,40 +45,40 @@
 
 class SugarWidgetSubPanelGetLatestButton extends SugarWidgetField
 {
-	function displayHeaderCell($layout_def)
-	{
-		return ' ';
-	}
+    function displayHeaderCell($layout_def)
+    {
+        return ' ';
+    }
 
-	function displayList($layout_def)
-	{
-		//if the contract has been executed or selected_revision is same as latest revision
-		//then hide the latest button. 		
-		//if the contract state is executed or document is not a template hide this action.
-		if ((!empty($layout_def['fields']['CONTRACT_STATUS']) && $layout_def['fields']['CONTRACT_STATUS']=='executed') or
-			$layout_def['fields']['SELECTED_REVISION_ID']== $layout_def['fields']['LATEST_REVISION_ID']) {
-			return "";
-		}
+    function displayList($layout_def)
+    {
+        //if the contract has been executed or selected_revision is same as latest revision
+        //then hide the latest button. 		
+        //if the contract state is executed or document is not a template hide this action.
+        if ((!empty($layout_def['fields']['CONTRACT_STATUS']) && $layout_def['fields']['CONTRACT_STATUS']=='executed') or
+            $layout_def['fields']['SELECTED_REVISION_ID']== $layout_def['fields']['LATEST_REVISION_ID']) {
+            return "";
+        }
 		
-		global $app_strings;
+        global $app_strings;
 		
 
-		$href = 'index.php?module=' . $layout_def['module']
-			. '&action=' . 'GetLatestRevision'
-			. '&record=' . $layout_def['fields']['ID']
-			. '&return_module=' . $_REQUEST['module']
-			. '&return_action=' . 'DetailView'
-			. '&return_id=' . $_REQUEST['record']
-			. '&get_latest_for_id=' . $layout_def['fields']['LINKED_ID'];
+        $href = 'index.php?module=' . $layout_def['module']
+            . '&action=' . 'GetLatestRevision'
+            . '&record=' . $layout_def['fields']['ID']
+            . '&return_module=' . $_REQUEST['module']
+            . '&return_action=' . 'DetailView'
+            . '&return_id=' . $_REQUEST['record']
+            . '&get_latest_for_id=' . $layout_def['fields']['LINKED_ID'];
 
-		$edit_icon_html = SugarThemeRegistry::current()->getImage( 'getLatestDocument','align="absmiddle" border="0"',null,null,'.gif',$app_strings['LNK_GET_LATEST']);
-		if($layout_def['EditView']){
-			return '<a href="' . $href . '"' . "title ='". $app_strings['LNK_GET_LATEST_TOOLTIP']  ."'"
-			. 'class="listViewTdToolsS1">' . $edit_icon_html . '&nbsp;' . $app_strings['LNK_GET_LATEST'] .'</a>&nbsp;';
-		}else{
-			return '';
-		}
-	}
+        $edit_icon_html = SugarThemeRegistry::current()->getImage( 'getLatestDocument','align="absmiddle" border="0"',null,null,'.gif',$app_strings['LNK_GET_LATEST']);
+        if($layout_def['EditView']){
+            return '<a href="' . $href . '"' . "title ='". $app_strings['LNK_GET_LATEST_TOOLTIP']  ."'"
+            . 'class="listViewTdToolsS1">' . $edit_icon_html . '&nbsp;' . $app_strings['LNK_GET_LATEST'] .'</a>&nbsp;';
+        }else{
+            return '';
+        }
+    }
 		
 }
 

Spacing +15 added lines, -15 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -55,27 +55,27 @@ 
 		//if the contract has been executed or selected_revision is same as latest revision
 		//then hide the latest button. 		
 		//if the contract state is executed or document is not a template hide this action.
-		if ((!empty($layout_def['fields']['CONTRACT_STATUS']) && $layout_def['fields']['CONTRACT_STATUS']=='executed') or
-			$layout_def['fields']['SELECTED_REVISION_ID']== $layout_def['fields']['LATEST_REVISION_ID']) {
+		if ((!empty($layout_def['fields']['CONTRACT_STATUS']) && $layout_def['fields']['CONTRACT_STATUS'] == 'executed') or
+			$layout_def['fields']['SELECTED_REVISION_ID'] == $layout_def['fields']['LATEST_REVISION_ID']) {
 			return "";
 		}
 		
 		global $app_strings;
 		
 
-		$href = 'index.php?module=' . $layout_def['module']
-			. '&action=' . 'GetLatestRevision'
-			. '&record=' . $layout_def['fields']['ID']
-			. '&return_module=' . $_REQUEST['module']
-			. '&return_action=' . 'DetailView'
-			. '&return_id=' . $_REQUEST['record']
-			. '&get_latest_for_id=' . $layout_def['fields']['LINKED_ID'];
+		$href = 'index.php?module='.$layout_def['module']
+			. '&action='.'GetLatestRevision'
+			. '&record='.$layout_def['fields']['ID']
+			. '&return_module='.$_REQUEST['module']
+			. '&return_action='.'DetailView'
+			. '&return_id='.$_REQUEST['record']
+			. '&get_latest_for_id='.$layout_def['fields']['LINKED_ID'];
 
-		$edit_icon_html = SugarThemeRegistry::current()->getImage( 'getLatestDocument','align="absmiddle" border="0"',null,null,'.gif',$app_strings['LNK_GET_LATEST']);
-		if($layout_def['EditView']){
-			return '<a href="' . $href . '"' . "title ='". $app_strings['LNK_GET_LATEST_TOOLTIP']  ."'"
-			. 'class="listViewTdToolsS1">' . $edit_icon_html . '&nbsp;' . $app_strings['LNK_GET_LATEST'] .'</a>&nbsp;';
-		}else{
+		$edit_icon_html = SugarThemeRegistry::current()->getImage('getLatestDocument', 'align="absmiddle" border="0"', null, null, '.gif', $app_strings['LNK_GET_LATEST']);
+		if ($layout_def['EditView']) {
+			return '<a href="'.$href.'"'."title ='".$app_strings['LNK_GET_LATEST_TOOLTIP']."'"
+			. 'class="listViewTdToolsS1">'.$edit_icon_html.'&nbsp;'.$app_strings['LNK_GET_LATEST'].'</a>&nbsp;';
+		} else {
 			return '';
 		}
 	}

Braces +4 added lines, -2 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -111,7 +113,7 @@ 
 		if($layout_def['ListView']) {
             return "<a href=\"javascript:sub_p_rem('$subpanel', '$linked_field'" .", '$record', $refresh_page);\""
 			        . ' class="listViewTdToolsS1"' . " onclick=\"return sp_rem_conf();\"" . ">$icon_remove_text</a>";
-		}else{
+		} else{
 			return '';
 		}
 	}

include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateLeadNameButton.php

Indentation +67 added lines, -67 removed lines

@@ -51,77 +51,77 @@
         return parent::getWidgetId();
     }
 
-	function display($defines, $additionalFormFields = NULL, $nonbutton = false)
-	{
-		global $app_strings;
-		global $currentModule;
+    function display($defines, $additionalFormFields = NULL, $nonbutton = false)
+    {
+        global $app_strings;
+        global $currentModule;
 
-		$title = $app_strings['LBL_NEW_BUTTON_TITLE'];
-		//$accesskey = $app_strings['LBL_NEW_BUTTON_KEY'];
-		$value = $app_strings['LBL_NEW_BUTTON_LABEL'];
-		$this->module = 'Leads';
-		if( ACLController::moduleSupportsACL($defines['module'])  && !ACLController::checkAccess($defines['module'], 'edit', true)){
-			$button = "<input title='$title'class='button' type='button' name='button' value='  $value  ' disabled/>\n";
-			return $button;
-		}
+        $title = $app_strings['LBL_NEW_BUTTON_TITLE'];
+        //$accesskey = $app_strings['LBL_NEW_BUTTON_KEY'];
+        $value = $app_strings['LBL_NEW_BUTTON_LABEL'];
+        $this->module = 'Leads';
+        if( ACLController::moduleSupportsACL($defines['module'])  && !ACLController::checkAccess($defines['module'], 'edit', true)){
+            $button = "<input title='$title'class='button' type='button' name='button' value='  $value  ' disabled/>\n";
+            return $button;
+        }
 		
-		$additionalFormFields = array();
+        $additionalFormFields = array();
 		
-		//from accounts
-		if ($defines['focus']->object_name == 'Account') {
-			if(isset($defines['focus']->billing_address_street)) 
-				$additionalFormFields['primary_address_street'] = $defines['focus']->billing_address_street;
-			if(isset($defines['focus']->billing_address_city)) 
-				$additionalFormFields['primary_address_city'] = $defines['focus']->billing_address_city;						  		
-			if(isset($defines['focus']->billing_address_state)) 
-				$additionalFormFields['primary_address_state'] = $defines['focus']->billing_address_state;
-			if(isset($defines['focus']->billing_address_country)) 
-				$additionalFormFields['primary_address_country'] = $defines['focus']->billing_address_country;
-			if(isset($defines['focus']->billing_address_postalcode)) 
-				$additionalFormFields['primary_address_postalcode'] = $defines['focus']->billing_address_postalcode;
-			if(isset($defines['focus']->phone_office)) 
-				$additionalFormFields['phone_work'] = $defines['focus']->phone_office;
-			if(isset($defines['focus']->id)) 
-				$additionalFormFields['account_id'] = $defines['focus']->id;
-		}
-		//from contacts
-		if ($defines['focus']->object_name == 'Contact') {
-			if(isset($defines['focus']->salutation)) 
-				$additionalFormFields['salutation'] = $defines['focus']->salutation;
-			if(isset($defines['focus']->first_name)) 
-				$additionalFormFields['first_name'] = $defines['focus']->first_name;
-			if(isset($defines['focus']->last_name)) 
-				$additionalFormFields['last_name'] = $defines['focus']->last_name;
-			if(isset($defines['focus']->primary_address_street)) 
-				$additionalFormFields['primary_address_street'] = $defines['focus']->primary_address_street;
-			if(isset($defines['focus']->primary_address_city)) 
-				$additionalFormFields['primary_address_city'] = $defines['focus']->primary_address_city;						  		
-			if(isset($defines['focus']->primary_address_state)) 
-				$additionalFormFields['primary_address_state'] = $defines['focus']->primary_address_state;
-			if(isset($defines['focus']->primary_address_country)) 
-				$additionalFormFields['primary_address_country'] = $defines['focus']->primary_address_country;
-			if(isset($defines['focus']->primary_address_postalcode)) 
-				$additionalFormFields['primary_address_postalcode'] = $defines['focus']->primary_address_postalcode;
-			if(isset($defines['focus']->phone_work)) 
-				$additionalFormFields['phone_work'] = $defines['focus']->phone_work;
-			if(isset($defines['focus']->id)) 
-				$additionalFormFields['contact_id'] = $defines['focus']->id;
-		}
+        //from accounts
+        if ($defines['focus']->object_name == 'Account') {
+            if(isset($defines['focus']->billing_address_street)) 
+                $additionalFormFields['primary_address_street'] = $defines['focus']->billing_address_street;
+            if(isset($defines['focus']->billing_address_city)) 
+                $additionalFormFields['primary_address_city'] = $defines['focus']->billing_address_city;						  		
+            if(isset($defines['focus']->billing_address_state)) 
+                $additionalFormFields['primary_address_state'] = $defines['focus']->billing_address_state;
+            if(isset($defines['focus']->billing_address_country)) 
+                $additionalFormFields['primary_address_country'] = $defines['focus']->billing_address_country;
+            if(isset($defines['focus']->billing_address_postalcode)) 
+                $additionalFormFields['primary_address_postalcode'] = $defines['focus']->billing_address_postalcode;
+            if(isset($defines['focus']->phone_office)) 
+                $additionalFormFields['phone_work'] = $defines['focus']->phone_office;
+            if(isset($defines['focus']->id)) 
+                $additionalFormFields['account_id'] = $defines['focus']->id;
+        }
+        //from contacts
+        if ($defines['focus']->object_name == 'Contact') {
+            if(isset($defines['focus']->salutation)) 
+                $additionalFormFields['salutation'] = $defines['focus']->salutation;
+            if(isset($defines['focus']->first_name)) 
+                $additionalFormFields['first_name'] = $defines['focus']->first_name;
+            if(isset($defines['focus']->last_name)) 
+                $additionalFormFields['last_name'] = $defines['focus']->last_name;
+            if(isset($defines['focus']->primary_address_street)) 
+                $additionalFormFields['primary_address_street'] = $defines['focus']->primary_address_street;
+            if(isset($defines['focus']->primary_address_city)) 
+                $additionalFormFields['primary_address_city'] = $defines['focus']->primary_address_city;						  		
+            if(isset($defines['focus']->primary_address_state)) 
+                $additionalFormFields['primary_address_state'] = $defines['focus']->primary_address_state;
+            if(isset($defines['focus']->primary_address_country)) 
+                $additionalFormFields['primary_address_country'] = $defines['focus']->primary_address_country;
+            if(isset($defines['focus']->primary_address_postalcode)) 
+                $additionalFormFields['primary_address_postalcode'] = $defines['focus']->primary_address_postalcode;
+            if(isset($defines['focus']->phone_work)) 
+                $additionalFormFields['phone_work'] = $defines['focus']->phone_work;
+            if(isset($defines['focus']->id)) 
+                $additionalFormFields['contact_id'] = $defines['focus']->id;
+        }
 		
-		//from opportunities
-		if ($defines['focus']->object_name == 'Opportunity') {
-			if(isset($defines['focus']->id)) 
-				$additionalFormFields['opportunity_id'] = $defines['focus']->id;
-			if(isset($defines['focus']->account_name)) 
-				$additionalFormFields['account_name'] = $defines['focus']->account_name;
-			if(isset($defines['focus']->account_id)) 
-				$additionalFormFields['account_id'] = $defines['focus']->account_id;
-		}
+        //from opportunities
+        if ($defines['focus']->object_name == 'Opportunity') {
+            if(isset($defines['focus']->id)) 
+                $additionalFormFields['opportunity_id'] = $defines['focus']->id;
+            if(isset($defines['focus']->account_name)) 
+                $additionalFormFields['account_name'] = $defines['focus']->account_name;
+            if(isset($defines['focus']->account_id)) 
+                $additionalFormFields['account_id'] = $defines['focus']->account_id;
+        }
 		
-		$button = $this->_get_form($defines, $additionalFormFields);
-		$button .= "<input title='$title' class='button' type='submit' name='{$this->getWidgetId()}_button' id='{$this->getWidgetId()}' value='  $value  '/>\n";
-		$button .= "</form>";
-		return $button;
-	}
+        $button = $this->_get_form($defines, $additionalFormFields);
+        $button .= "<input title='$title' class='button' type='submit' name='{$this->getWidgetId()}_button' id='{$this->getWidgetId()}' value='  $value  '/>\n";
+        $button .= "</form>";
+        return $button;
+    }
 }
 ?>
\ No newline at end of file

Spacing +22 added lines, -22 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -60,7 +60,7 @@ 
 		//$accesskey = $app_strings['LBL_NEW_BUTTON_KEY'];
 		$value = $app_strings['LBL_NEW_BUTTON_LABEL'];
 		$this->module = 'Leads';
-		if( ACLController::moduleSupportsACL($defines['module'])  && !ACLController::checkAccess($defines['module'], 'edit', true)){
+		if (ACLController::moduleSupportsACL($defines['module']) && !ACLController::checkAccess($defines['module'], 'edit', true)) {
 			$button = "<input title='$title'class='button' type='button' name='button' value='  $value  ' disabled/>\n";
 			return $button;
 		}
@@ -69,52 +69,52 @@ 
 		
 		//from accounts
 		if ($defines['focus']->object_name == 'Account') {
-			if(isset($defines['focus']->billing_address_street)) 
+			if (isset($defines['focus']->billing_address_street)) 
 				$additionalFormFields['primary_address_street'] = $defines['focus']->billing_address_street;
-			if(isset($defines['focus']->billing_address_city)) 
+			if (isset($defines['focus']->billing_address_city)) 
 				$additionalFormFields['primary_address_city'] = $defines['focus']->billing_address_city;						  		
-			if(isset($defines['focus']->billing_address_state)) 
+			if (isset($defines['focus']->billing_address_state)) 
 				$additionalFormFields['primary_address_state'] = $defines['focus']->billing_address_state;
-			if(isset($defines['focus']->billing_address_country)) 
+			if (isset($defines['focus']->billing_address_country)) 
 				$additionalFormFields['primary_address_country'] = $defines['focus']->billing_address_country;
-			if(isset($defines['focus']->billing_address_postalcode)) 
+			if (isset($defines['focus']->billing_address_postalcode)) 
 				$additionalFormFields['primary_address_postalcode'] = $defines['focus']->billing_address_postalcode;
-			if(isset($defines['focus']->phone_office)) 
+			if (isset($defines['focus']->phone_office)) 
 				$additionalFormFields['phone_work'] = $defines['focus']->phone_office;
-			if(isset($defines['focus']->id)) 
+			if (isset($defines['focus']->id)) 
 				$additionalFormFields['account_id'] = $defines['focus']->id;
 		}
 		//from contacts
 		if ($defines['focus']->object_name == 'Contact') {
-			if(isset($defines['focus']->salutation)) 
+			if (isset($defines['focus']->salutation)) 
 				$additionalFormFields['salutation'] = $defines['focus']->salutation;
-			if(isset($defines['focus']->first_name)) 
+			if (isset($defines['focus']->first_name)) 
 				$additionalFormFields['first_name'] = $defines['focus']->first_name;
-			if(isset($defines['focus']->last_name)) 
+			if (isset($defines['focus']->last_name)) 
 				$additionalFormFields['last_name'] = $defines['focus']->last_name;
-			if(isset($defines['focus']->primary_address_street)) 
+			if (isset($defines['focus']->primary_address_street)) 
 				$additionalFormFields['primary_address_street'] = $defines['focus']->primary_address_street;
-			if(isset($defines['focus']->primary_address_city)) 
+			if (isset($defines['focus']->primary_address_city)) 
 				$additionalFormFields['primary_address_city'] = $defines['focus']->primary_address_city;						  		
-			if(isset($defines['focus']->primary_address_state)) 
+			if (isset($defines['focus']->primary_address_state)) 
 				$additionalFormFields['primary_address_state'] = $defines['focus']->primary_address_state;
-			if(isset($defines['focus']->primary_address_country)) 
+			if (isset($defines['focus']->primary_address_country)) 
 				$additionalFormFields['primary_address_country'] = $defines['focus']->primary_address_country;
-			if(isset($defines['focus']->primary_address_postalcode)) 
+			if (isset($defines['focus']->primary_address_postalcode)) 
 				$additionalFormFields['primary_address_postalcode'] = $defines['focus']->primary_address_postalcode;
-			if(isset($defines['focus']->phone_work)) 
+			if (isset($defines['focus']->phone_work)) 
 				$additionalFormFields['phone_work'] = $defines['focus']->phone_work;
-			if(isset($defines['focus']->id)) 
+			if (isset($defines['focus']->id)) 
 				$additionalFormFields['contact_id'] = $defines['focus']->id;
 		}
 		
 		//from opportunities
 		if ($defines['focus']->object_name == 'Opportunity') {
-			if(isset($defines['focus']->id)) 
+			if (isset($defines['focus']->id)) 
 				$additionalFormFields['opportunity_id'] = $defines['focus']->id;
-			if(isset($defines['focus']->account_name)) 
+			if (isset($defines['focus']->account_name)) 
 				$additionalFormFields['account_name'] = $defines['focus']->account_name;
-			if(isset($defines['focus']->account_id)) 
+			if (isset($defines['focus']->account_id)) 
 				$additionalFormFields['account_id'] = $defines['focus']->account_id;
 		}
 		

Braces +63 added lines, -41 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -69,53 +71,73 @@ 
 		
 		//from accounts
 		if ($defines['focus']->object_name == 'Account') {
-			if(isset($defines['focus']->billing_address_street)) 
-				$additionalFormFields['primary_address_street'] = $defines['focus']->billing_address_street;
-			if(isset($defines['focus']->billing_address_city)) 
-				$additionalFormFields['primary_address_city'] = $defines['focus']->billing_address_city;						  		
-			if(isset($defines['focus']->billing_address_state)) 
-				$additionalFormFields['primary_address_state'] = $defines['focus']->billing_address_state;
-			if(isset($defines['focus']->billing_address_country)) 
-				$additionalFormFields['primary_address_country'] = $defines['focus']->billing_address_country;
-			if(isset($defines['focus']->billing_address_postalcode)) 
-				$additionalFormFields['primary_address_postalcode'] = $defines['focus']->billing_address_postalcode;
-			if(isset($defines['focus']->phone_office)) 
-				$additionalFormFields['phone_work'] = $defines['focus']->phone_office;
-			if(isset($defines['focus']->id)) 
-				$additionalFormFields['account_id'] = $defines['focus']->id;
+			if(isset($defines['focus']->billing_address_street)) {
+							$additionalFormFields['primary_address_street'] = $defines['focus']->billing_address_street;
+			}
+			if(isset($defines['focus']->billing_address_city)) {
+							$additionalFormFields['primary_address_city'] = $defines['focus']->billing_address_city;
+			}
+			if(isset($defines['focus']->billing_address_state)) {
+							$additionalFormFields['primary_address_state'] = $defines['focus']->billing_address_state;
+			}
+			if(isset($defines['focus']->billing_address_country)) {
+							$additionalFormFields['primary_address_country'] = $defines['focus']->billing_address_country;
+			}
+			if(isset($defines['focus']->billing_address_postalcode)) {
+							$additionalFormFields['primary_address_postalcode'] = $defines['focus']->billing_address_postalcode;
+			}
+			if(isset($defines['focus']->phone_office)) {
+							$additionalFormFields['phone_work'] = $defines['focus']->phone_office;
+			}
+			if(isset($defines['focus']->id)) {
+							$additionalFormFields['account_id'] = $defines['focus']->id;
+			}
 		}
 		//from contacts
 		if ($defines['focus']->object_name == 'Contact') {
-			if(isset($defines['focus']->salutation)) 
-				$additionalFormFields['salutation'] = $defines['focus']->salutation;
-			if(isset($defines['focus']->first_name)) 
-				$additionalFormFields['first_name'] = $defines['focus']->first_name;
-			if(isset($defines['focus']->last_name)) 
-				$additionalFormFields['last_name'] = $defines['focus']->last_name;
-			if(isset($defines['focus']->primary_address_street)) 
-				$additionalFormFields['primary_address_street'] = $defines['focus']->primary_address_street;
-			if(isset($defines['focus']->primary_address_city)) 
-				$additionalFormFields['primary_address_city'] = $defines['focus']->primary_address_city;						  		
-			if(isset($defines['focus']->primary_address_state)) 
-				$additionalFormFields['primary_address_state'] = $defines['focus']->primary_address_state;
-			if(isset($defines['focus']->primary_address_country)) 
-				$additionalFormFields['primary_address_country'] = $defines['focus']->primary_address_country;
-			if(isset($defines['focus']->primary_address_postalcode)) 
-				$additionalFormFields['primary_address_postalcode'] = $defines['focus']->primary_address_postalcode;
-			if(isset($defines['focus']->phone_work)) 
-				$additionalFormFields['phone_work'] = $defines['focus']->phone_work;
-			if(isset($defines['focus']->id)) 
-				$additionalFormFields['contact_id'] = $defines['focus']->id;
+			if(isset($defines['focus']->salutation)) {
+							$additionalFormFields['salutation'] = $defines['focus']->salutation;
+			}
+			if(isset($defines['focus']->first_name)) {
+							$additionalFormFields['first_name'] = $defines['focus']->first_name;
+			}
+			if(isset($defines['focus']->last_name)) {
+							$additionalFormFields['last_name'] = $defines['focus']->last_name;
+			}
+			if(isset($defines['focus']->primary_address_street)) {
+							$additionalFormFields['primary_address_street'] = $defines['focus']->primary_address_street;
+			}
+			if(isset($defines['focus']->primary_address_city)) {
+							$additionalFormFields['primary_address_city'] = $defines['focus']->primary_address_city;
+			}
+			if(isset($defines['focus']->primary_address_state)) {
+							$additionalFormFields['primary_address_state'] = $defines['focus']->primary_address_state;
+			}
+			if(isset($defines['focus']->primary_address_country)) {
+							$additionalFormFields['primary_address_country'] = $defines['focus']->primary_address_country;
+			}
+			if(isset($defines['focus']->primary_address_postalcode)) {
+							$additionalFormFields['primary_address_postalcode'] = $defines['focus']->primary_address_postalcode;
+			}
+			if(isset($defines['focus']->phone_work)) {
+							$additionalFormFields['phone_work'] = $defines['focus']->phone_work;
+			}
+			if(isset($defines['focus']->id)) {
+							$additionalFormFields['contact_id'] = $defines['focus']->id;
+			}
 		}
 		
 		//from opportunities
 		if ($defines['focus']->object_name == 'Opportunity') {
-			if(isset($defines['focus']->id)) 
-				$additionalFormFields['opportunity_id'] = $defines['focus']->id;
-			if(isset($defines['focus']->account_name)) 
-				$additionalFormFields['account_name'] = $defines['focus']->account_name;
-			if(isset($defines['focus']->account_id)) 
-				$additionalFormFields['account_id'] = $defines['focus']->account_id;
+			if(isset($defines['focus']->id)) {
+							$additionalFormFields['opportunity_id'] = $defines['focus']->id;
+			}
+			if(isset($defines['focus']->account_name)) {
+							$additionalFormFields['account_name'] = $defines['focus']->account_name;
+			}
+			if(isset($defines['focus']->account_id)) {
+							$additionalFormFields['account_id'] = $defines['focus']->account_id;
+			}
 		}
 		
 		$button = $this->_get_form($defines, $additionalFormFields);

include/generic/SugarWidgets/SugarWidgetFieldrelate.php

Indentation +16 added lines, -16 removed lines

@@ -174,25 +174,25 @@ 
         return $this->_get_column_select($layout_def) . " IN ('" . implode("', '", $ids) . "')";
     }
 
-	//for to_pdf/to_csv
-	function displayListPlain($layout_def) {
-	    $reporter = $this->layout_manager->getAttribute("reporter");
-		$field_def = $reporter->all_fields[$layout_def['column_key']];
-		$display = strtoupper($field_def['secondary_table'].'_name');
-		//#31797  , we should get the table alias in a global registered array:selected_loaded_custom_links
-		if(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table']])){
-			$display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table']]['join_table_alias'].'_name');
-		}
+    //for to_pdf/to_csv
+    function displayListPlain($layout_def) {
+        $reporter = $this->layout_manager->getAttribute("reporter");
+        $field_def = $reporter->all_fields[$layout_def['column_key']];
+        $display = strtoupper($field_def['secondary_table'].'_name');
+        //#31797  , we should get the table alias in a global registered array:selected_loaded_custom_links
+        if(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table']])){
+            $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table']]['join_table_alias'].'_name');
+        }
         elseif(isset($field_def['rep_rel_name']) && isset($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]))
         {
             $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]['join_table_alias'].'_name');
         }
-		elseif(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']])){
-			$display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']]['join_table_alias'].'_name');
-		}
-		$cell = $layout_def['fields'][$display];
-		return $cell;
-	}
+        elseif(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']])){
+            $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']]['join_table_alias'].'_name');
+        }
+        $cell = $layout_def['fields'][$display];
+        return $cell;
+    }
 
     function displayList($layout_def) {
         $reporter = $this->layout_manager->getAttribute("reporter");
@@ -201,7 +201,7 @@ 
 
         //#31797  , we should get the table alias in a global registered array:selected_loaded_custom_links
         if(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table']])){
-             $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table']]['join_table_alias'].'_name');
+                $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table']]['join_table_alias'].'_name');
         }
         elseif(isset($field_def['rep_rel_name']) && isset($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]))
         {

Spacing +13 added lines, -13 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -58,18 +58,18 @@ 
         {
             $values[] = $layout_def['input_name0'];
         }
-        $html = '<select name="' . $layout_def['name'] . '[]" multiple="true">';
+        $html = '<select name="'.$layout_def['name'].'[]" multiple="true">';
 
         $query = $this->displayInputQuery($layout_def);
         $result = $this->reporter->db->query($query);
         while ($row = $this->reporter->db->fetchByAssoc($result))
         {
-            $html .= '<option value="' . $row['id'] . '"';
+            $html .= '<option value="'.$row['id'].'"';
             if (in_array($row['id'], $values))
             {
                 $html .= ' selected="selected"';
             }
-            $html .= '>' . htmlspecialchars($row['title']) . '</option>';
+            $html .= '>'.htmlspecialchars($row['title']).'</option>';
         }
 
         $html .= '</select>';
@@ -134,7 +134,7 @@ 
             $ids[] = $row['id'];
         }
         $layout_def['name'] = 'id';
-        return $this->_get_column_select($layout_def) . " IN ('" . implode("', '", $ids) . "')";
+        return $this->_get_column_select($layout_def)." IN ('".implode("', '", $ids)."')";
     }
 
     /**
@@ -154,7 +154,7 @@ 
         $module = isset($layout_def['custom_module']) ? $layout_def['custom_module'] : $layout_def['module'];
         $seed = BeanFactory::getBean($module);
 
-        foreach($layout_def['input_name0'] as $beanId)
+        foreach ($layout_def['input_name0'] as $beanId)
         {
             if (!empty($relation->lhs_module) && !empty($relation->rhs_module)
                 && $relation->lhs_module == $relation->rhs_module) {
@@ -171,7 +171,7 @@ 
         }
         $ids = array_unique($ids);
         $layout_def['name'] = 'id';
-        return $this->_get_column_select($layout_def) . " IN ('" . implode("', '", $ids) . "')";
+        return $this->_get_column_select($layout_def)." IN ('".implode("', '", $ids)."')";
     }
 
 	//for to_pdf/to_csv
@@ -180,14 +180,14 @@ 
 		$field_def = $reporter->all_fields[$layout_def['column_key']];
 		$display = strtoupper($field_def['secondary_table'].'_name');
 		//#31797  , we should get the table alias in a global registered array:selected_loaded_custom_links
-		if(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table']])){
+		if (!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table']])) {
 			$display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table']]['join_table_alias'].'_name');
 		}
-        elseif(isset($field_def['rep_rel_name']) && isset($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]))
+        elseif (isset($field_def['rep_rel_name']) && isset($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]))
         {
             $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]['join_table_alias'].'_name');
         }
-		elseif(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']])){
+		elseif (!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']])) {
 			$display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']]['join_table_alias'].'_name');
 		}
 		$cell = $layout_def['fields'][$display];
@@ -200,14 +200,14 @@ 
         $display = strtoupper($field_def['secondary_table'].'_name');
 
         //#31797  , we should get the table alias in a global registered array:selected_loaded_custom_links
-        if(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table']])){
+        if (!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table']])) {
              $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table']]['join_table_alias'].'_name');
         }
-        elseif(isset($field_def['rep_rel_name']) && isset($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]))
+        elseif (isset($field_def['rep_rel_name']) && isset($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]))
         {
             $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]['join_table_alias'].'_name');
         }
-        elseif(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']])){
+        elseif (!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']])) {
             $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']]['join_table_alias'].'_name');
         }
         $recordField = $this->getTruncatedColumnAlias(strtoupper($layout_def['table_alias']).'_'.strtoupper($layout_def['name']));

Braces +8 added lines, -11 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -53,8 +55,7 @@ 
         if (is_array($layout_def['input_name0']))
         {
             $values = $layout_def['input_name0'];
-        }
-        else
+        } else
         {
             $values[] = $layout_def['input_name0'];
         }
@@ -182,12 +183,10 @@ 
 		//#31797  , we should get the table alias in a global registered array:selected_loaded_custom_links
 		if(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table']])){
 			$display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table']]['join_table_alias'].'_name');
-		}
-        elseif(isset($field_def['rep_rel_name']) && isset($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]))
+		} elseif(isset($field_def['rep_rel_name']) && isset($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]))
         {
             $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]['join_table_alias'].'_name');
-        }
-		elseif(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']])){
+        } elseif(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']])){
 			$display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']]['join_table_alias'].'_name');
 		}
 		$cell = $layout_def['fields'][$display];
@@ -202,12 +201,10 @@ 
         //#31797  , we should get the table alias in a global registered array:selected_loaded_custom_links
         if(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table']])){
              $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table']]['join_table_alias'].'_name');
-        }
-        elseif(isset($field_def['rep_rel_name']) && isset($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]))
+        } elseif(isset($field_def['rep_rel_name']) && isset($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]))
         {
             $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]['join_table_alias'].'_name');
-        }
-        elseif(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']])){
+        } elseif(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']])){
             $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']]['join_table_alias'].'_name');
         }
         $recordField = $this->getTruncatedColumnAlias(strtoupper($layout_def['table_alias']).'_'.strtoupper($layout_def['name']));

include/generic/SugarWidgets/SugarWidgetSubPanelCheck.php

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -45,16 +45,16 @@ 
 {
     function displayListPlain($layout_def) {
 
-        $value= $this->_get_list_value($layout_def);
+        $value = $this->_get_list_value($layout_def);
 
-        if (isset($layout_def['widget_type']) && $layout_def['widget_type'] =='checkbox') {
+        if (isset($layout_def['widget_type']) && $layout_def['widget_type'] == 'checkbox') {
 
-            if ($value != '' &&  ($value == 'on' || intval($value) == 1 || $value == 'yes'))
+            if ($value != '' && ($value == 'on' || intval($value) == 1 || $value == 'yes'))
             {
                 return "&nbsp;<input name='checkbox_display' class='checkbox' type='checkbox' disabled='true' checked>";
             }
             //Modification to allow checkboxes to be displayed correctly in subpanel
-            if ($layout_def['checkbox_value']=='true'){
+            if ($layout_def['checkbox_value'] == 'true') {
                 return "&nbsp;<input name='".$layout_def['module']."checkbox_display[]' class='checkbox' type='checkbox' id='".$layout_def['module']."checkbox_display_id[]' value=\"".$layout_def['fields']['ID']."\" onclick=''>";
             }
 

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

include/generic/SugarWidgets/SugarWidgetSubPanelTopArchiveEmailButton.php

Indentation +32 added lines, -32 removed lines

@@ -45,41 +45,41 @@
 
 class SugarWidgetSubPanelTopArchiveEmailButton extends SugarWidgetSubPanelTopButton
 {
-	function display($defines, $additionalFormFields = NULL, $nonbutton = false)
-	{
-		if((ACLController::moduleSupportsACL($defines['module'])  && !ACLController::checkAccess($defines['module'], 'edit', true) ||
-			$defines['module'] == "History" & !ACLController::checkAccess("Emails", 'edit', true))){
-			$temp = '';
-			return $temp;
-		}
+    function display($defines, $additionalFormFields = NULL, $nonbutton = false)
+    {
+        if((ACLController::moduleSupportsACL($defines['module'])  && !ACLController::checkAccess($defines['module'], 'edit', true) ||
+            $defines['module'] == "History" & !ACLController::checkAccess("Emails", 'edit', true))){
+            $temp = '';
+            return $temp;
+        }
 		
-		global $app_strings;
-		global $mod_strings;
-		global $currentModule;
+        global $app_strings;
+        global $mod_strings;
+        global $currentModule;
 
-		$title = $app_strings['LBL_TRACK_EMAIL_BUTTON_TITLE'];
-		$value = $app_strings['LBL_TRACK_EMAIL_BUTTON_LABEL'];
-		$this->module = 'Emails';
+        $title = $app_strings['LBL_TRACK_EMAIL_BUTTON_TITLE'];
+        $value = $app_strings['LBL_TRACK_EMAIL_BUTTON_LABEL'];
+        $this->module = 'Emails';
 
-		$additionalFormFields = array();
-		$additionalFormFields['type'] = 'archived';
-		// cn: bug 5727 - must override the parents' parent for contacts (which could be an Account)
-		$additionalFormFields['parent_type'] = $defines['focus']->module_dir; 
-		$additionalFormFields['parent_id'] = $defines['focus']->id;
-		$additionalFormFields['parent_name'] = $defines['focus']->name;
+        $additionalFormFields = array();
+        $additionalFormFields['type'] = 'archived';
+        // cn: bug 5727 - must override the parents' parent for contacts (which could be an Account)
+        $additionalFormFields['parent_type'] = $defines['focus']->module_dir; 
+        $additionalFormFields['parent_id'] = $defines['focus']->id;
+        $additionalFormFields['parent_name'] = $defines['focus']->name;
 
-		if(isset($defines['focus']->email1))
-		{
-			$additionalFormFields['to_email_addrs'] = $defines['focus']->email1;
-		}
-		if(ACLController::moduleSupportsACL($defines['module'])  && !ACLController::checkAccess($defines['module'], 'edit', true)){
-			$button = "<input id='".preg_replace('[ ]', '', $value)."_button'  title='$title' class='button' type='button' name='".preg_replace('[ ]', '', mb_strtolower($value, 'UTF-8'))."_button' value='$value' disabled/>\n";
-			return $button;
-		}
-		$button = $this->_get_form($defines, $additionalFormFields);
-		$button .= "<input id='".preg_replace('[ ]', '', $value)."_button' title='$title' class='button' type='submit' name='".preg_replace('[ ]', '', mb_strtolower($value, 'UTF-8'))."_button' value='$value'/>\n";
-		$button .= "</form>";
-		return $button;
-	}
+        if(isset($defines['focus']->email1))
+        {
+            $additionalFormFields['to_email_addrs'] = $defines['focus']->email1;
+        }
+        if(ACLController::moduleSupportsACL($defines['module'])  && !ACLController::checkAccess($defines['module'], 'edit', true)){
+            $button = "<input id='".preg_replace('[ ]', '', $value)."_button'  title='$title' class='button' type='button' name='".preg_replace('[ ]', '', mb_strtolower($value, 'UTF-8'))."_button' value='$value' disabled/>\n";
+            return $button;
+        }
+        $button = $this->_get_form($defines, $additionalFormFields);
+        $button .= "<input id='".preg_replace('[ ]', '', $value)."_button' title='$title' class='button' type='submit' name='".preg_replace('[ ]', '', mb_strtolower($value, 'UTF-8'))."_button' value='$value'/>\n";
+        $button .= "</form>";
+        return $button;
+    }
 }
 ?>

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -47,8 +47,8 @@ 
 {
 	function display($defines, $additionalFormFields = NULL, $nonbutton = false)
 	{
-		if((ACLController::moduleSupportsACL($defines['module'])  && !ACLController::checkAccess($defines['module'], 'edit', true) ||
-			$defines['module'] == "History" & !ACLController::checkAccess("Emails", 'edit', true))){
+		if ((ACLController::moduleSupportsACL($defines['module']) && !ACLController::checkAccess($defines['module'], 'edit', true) ||
+			$defines['module'] == "History" & !ACLController::checkAccess("Emails", 'edit', true))) {
 			$temp = '';
 			return $temp;
 		}
@@ -68,11 +68,11 @@ 
 		$additionalFormFields['parent_id'] = $defines['focus']->id;
 		$additionalFormFields['parent_name'] = $defines['focus']->name;
 
-		if(isset($defines['focus']->email1))
+		if (isset($defines['focus']->email1))
 		{
 			$additionalFormFields['to_email_addrs'] = $defines['focus']->email1;
 		}
-		if(ACLController::moduleSupportsACL($defines['module'])  && !ACLController::checkAccess($defines['module'], 'edit', true)){
+		if (ACLController::moduleSupportsACL($defines['module']) && !ACLController::checkAccess($defines['module'], 'edit', true)) {
 			$button = "<input id='".preg_replace('[ ]', '', $value)."_button'  title='$title' class='button' type='button' name='".preg_replace('[ ]', '', mb_strtolower($value, 'UTF-8'))."_button' value='$value' disabled/>\n";
 			return $button;
 		}

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.