adamjakab / SuiteCRM

data/Relationships/One2MRelationship.php

Spacing +2 added lines, -2 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.
@@ -152,7 +152,7 @@ 
 	        	$related = $link->getBeans();
 	        	
         		// Clear the relations from many side bean
-	        	foreach($related as $relBean) {
+	        	foreach ($related as $relBean) {
 	        		$this->remove($focus, $relBean);
 	        	}
             } else { // For non self-referencing, remove all the relationships from the many (RHS) side

data/Relationships/RelationshipFactory.php

Spacing +12 added lines, -12 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.
@@ -51,7 +51,7 @@ 
 
     protected $relationships;
 
-    protected function __construct(){
+    protected function __construct() {
         //Load the relationship definitions from the cache.
         $this->loadRelationships();
     }
@@ -75,7 +75,7 @@ 
     public static function deleteCache()
     {
         $file = self::getInstance()->getCacheFile();
-        if(sugar_is_file($file))
+        if (sugar_is_file($file))
         {
             unlink($file);
         }
@@ -98,7 +98,7 @@ 
         $def = $this->relationships[$relationshipName];
 
         $type = isset($def['true_relationship_type']) ? $def['true_relationship_type'] : $def['relationship_type'];
-        switch($type)
+        switch ($type)
         {
             case "many-to-many":
                 if (isset($def['rhs_module']) && $def['rhs_module'] == 'EmailAddresses')
@@ -112,7 +112,7 @@ 
             case "one-to-many":
                 require_once("data/Relationships/One2MBeanRelationship.php");
                 //If a relationship has no table or join keys, it must be bean based
-                if (empty($def['true_relationship_type']) || (empty($def['table']) && empty($def['join_table'])) || empty($def['join_key_rhs'])){
+                if (empty($def['true_relationship_type']) || (empty($def['table']) && empty($def['join_table'])) || empty($def['join_key_rhs'])) {
                     return new One2MBeanRelationship($def);
                 }
                 else {
@@ -120,7 +120,7 @@ 
                 }
                 break;
             case "one-to-one":
-                if (empty($def['true_relationship_type'])){
+                if (empty($def['true_relationship_type'])) {
                     require_once("data/Relationships/One2OneBeanRelationship.php");
                     return new One2OneBeanRelationship($def);
                 }
@@ -131,7 +131,7 @@ 
                 break;
         }
 
-        $GLOBALS['log']->fatal ("$relationshipName had an unknown type $type ");
+        $GLOBALS['log']->fatal("$relationshipName had an unknown type $type ");
 
         return false;
     }
@@ -149,7 +149,7 @@ 
 
     protected function loadRelationships()
     {
-        if(sugar_is_file($this->getCacheFile()))
+        if (sugar_is_file($this->getCacheFile()))
         {
             include($this->getCacheFile());
             $this->relationships = $relationships;
@@ -169,7 +169,7 @@ 
         if (empty($beanList))
             include("include/modules.php");
         //Reload ALL the module vardefs....
-        foreach($beanList as $moduleName => $beanName)
+        foreach ($beanList as $moduleName => $beanName)
         {
             VardefManager::loadVardef($moduleName, BeanFactory::getObjectName($moduleName), false, array(
                 //If relationships are not yet loaded, we can't figure out the rel_calc_fields.
@@ -184,13 +184,13 @@ 
         {
             if (!empty($def['relationships']))
             {
-                foreach($def['relationships'] as $relKey => $relDef)
+                foreach ($def['relationships'] as $relKey => $relDef)
                 {
                     if ($key == $relKey) //Relationship only entry, we need to capture everything
                         $relationships[$key] = array_merge(array('name' => $key), (array)$def, (array)$relDef);
                     else {
                         $relationships[$relKey] = array_merge(array('name' => $relKey), (array)$relDef);
-                        if(!empty($relationships[$relKey]['join_table']) && empty($relationships[$relKey]['fields'])
+                        if (!empty($relationships[$relKey]['join_table']) && empty($relationships[$relKey]['fields'])
                             && isset($dictionary[$relationships[$relKey]['join_table']]['fields'])) {
                             $relationships[$relKey]['fields'] = $dictionary[$relationships[$relKey]['join_table']]['fields'];
                         }
@@ -200,7 +200,7 @@ 
         }
         //Save it out
         sugar_mkdir(dirname($this->getCacheFile()), null, true);
-        $out = "<?php \n \$relationships = " . var_export($relationships, true) . ";";
+        $out = "<?php \n \$relationships = ".var_export($relationships, true).";";
         sugar_file_put_contents_atomic($this->getCacheFile(), $out);
 
         $this->relationships = $relationships;

data/Relationships/EmailAddressRelationship.php

Spacing +2 added lines, -2 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.
@@ -153,7 +153,7 @@ 
             } else {
                 $roleCheck .= " AND $table.bean_module";
             }
-            $roleCheck .= " = '" . $this->getLHSModule() . "'";
+            $roleCheck .= " = '".$this->getLHSModule()."'";
         }
 
         return $roleCheck;

themes/Suite7/css/colourSelector.php

Spacing +3 added lines, -3 removed lines

@@ -1,16 +1,16 @@
 <?php
 
 // config|_override.php
-if(is_file('../../../config.php')) {
+if (is_file('../../../config.php')) {
     require_once('../../../config.php');
 }
 
 // load up the config_override.php file.  This is used to provide default user settings
-if(is_file('../../../config_override.php')) {
+if (is_file('../../../config_override.php')) {
     require_once('../../../config_override.php');
 }
 
-if(!isset($sugar_config['theme_settings']['Suite7'])) return;
+if (!isset($sugar_config['theme_settings']['Suite7'])) return;
 
 //set file type back to css from php
 header("Content-type: text/css; charset: UTF-8");

soap.php

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- if(!defined('sugarEntry'))define('sugarEntry', true);
+ if (!defined('sugarEntry'))define('sugarEntry', true);
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -64,7 +64,7 @@ 
 $server->configureWSDL('sugarsoap', $NAMESPACE, $sugar_config['site_url'].'/soap.php');
 
 //New API is in these files
-if(!empty($administrator->settings['portal_on'])) {
+if (!empty($administrator->settings['portal_on'])) {
 	require_once('soap/SoapPortalUsers.php');
 }
 
@@ -78,7 +78,7 @@ 
 /* Begin the HTTP listener service and exit. */
 ob_clean();
 
-if (!isset($HTTP_RAW_POST_DATA)){
+if (!isset($HTTP_RAW_POST_DATA)) {
     $HTTP_RAW_POST_DATA = file_get_contents('php://input');
 }
 
@@ -87,8 +87,8 @@ 
 $resourceManager->setup('Soap');
 $observers = $resourceManager->getObservers();
 //Call set_soap_server for SoapResourceObserver instance(s)
-foreach($observers as $observer) {
-   if(method_exists($observer, 'set_soap_server')) {
+foreach ($observers as $observer) {
+   if (method_exists($observer, 'set_soap_server')) {
    	  $observer->set_soap_server($server);
    }
 }

modules/Connectors/InstallDefaultConnectors.php

Spacing +20 added lines, -20 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.
@@ -39,34 +39,34 @@ 
  ********************************************************************************/
 
 
-$default_modules_sources = array (
+$default_modules_sources = array(
   'Accounts' =>
-  array (
+  array(
      'ext_rest_insideview' => 'ext_rest_insideview',
   ),
   'Contacts' =>
-  array (
+  array(
      'ext_rest_insideview' => 'ext_rest_insideview',
   ),
   'Leads' =>
-  array (
+  array(
      'ext_rest_insideview' => 'ext_rest_insideview',
   ),
   'Prospects' =>
-  array (
+  array(
 
   ),
   'Opportunities' =>
-  array (
+  array(
     'ext_rest_insideview' => 'ext_rest_insideview',
   ),
 );
 
 $previous_connectors = array();
-if(file_exists('custom/modules/Connectors/metadata/connectors.php')){
+if (file_exists('custom/modules/Connectors/metadata/connectors.php')) {
     require('custom/modules/Connectors/metadata/connectors.php');
 
-    foreach($connectors as $connector_array){
+    foreach ($connectors as $connector_array) {
         $connector_id = $connector_array['id'];
         $previous_connectors[$connector_id] = $connector_id;
     }
@@ -74,14 +74,14 @@ 
 
 // Merge in old modules the customer added instead of overriding it completely with defaults
 // If they have customized their connectors modules
-if(file_exists('custom/modules/Connectors/metadata/display_config.php')){
+if (file_exists('custom/modules/Connectors/metadata/display_config.php')) {
     require('custom/modules/Connectors/metadata/display_config.php');
 
     // Remove the default settings from being copied over since they already existed
-    foreach($default_modules_sources as $module => $sources){
-        foreach($sources as $source_key => $source){
-            foreach($previous_connectors as $previous_connector){
-                if(in_array($previous_connector, $default_modules_sources[$module])){
+    foreach ($default_modules_sources as $module => $sources) {
+        foreach ($sources as $source_key => $source) {
+            foreach ($previous_connectors as $previous_connector) {
+                if (in_array($previous_connector, $default_modules_sources[$module])) {
                     unset($default_modules_sources[$module][$previous_connector]);
                 }
             }
@@ -89,24 +89,24 @@ 
     }
 
     // Merge in the new connector default settings with the current settings
-    if ( isset($modules_sources) && is_array($modules_sources) ) {
-        foreach($modules_sources as $module => $sources){
-            if(!empty($default_modules_sources[$module])){
+    if (isset($modules_sources) && is_array($modules_sources)) {
+        foreach ($modules_sources as $module => $sources) {
+            if (!empty($default_modules_sources[$module])) {
                 $merged = array_merge($modules_sources[$module], $default_modules_sources[$module]);
                 $default_modules_sources[$module] = $merged;
             }
-            else{
+            else {
                 $default_modules_sources[$module] = $modules_sources[$module];
             }
         }
     }
 }
 
-if(!file_exists('custom/modules/Connectors/metadata')) {
+if (!file_exists('custom/modules/Connectors/metadata')) {
    mkdir_recursive('custom/modules/Connectors/metadata');
 }
 
-if(!write_array_to_file('modules_sources', $default_modules_sources, 'custom/modules/Connectors/metadata/display_config.php')) {
+if (!write_array_to_file('modules_sources', $default_modules_sources, 'custom/modules/Connectors/metadata/display_config.php')) {
    $GLOBALS['log']->fatal('Cannot write file custom/modules/Connectors/metadata/display_config.php');
 }
 

modules/Connectors/action_view_map.php

Spacing +4 added lines, -4 removed lines

@@ -38,16 +38,16 @@
  ********************************************************************************/
 
 
-$action_view_map['retrievesource']= 'retrievesource';
-$action_view_map['step1']= 'step1';
-$action_view_map['step2']= 'step2';
+$action_view_map['retrievesource'] = 'retrievesource';
+$action_view_map['step1'] = 'step1';
+$action_view_map['step2'] = 'step2';
 
 //Admin main page
 $action_view_map['connectorsettings'] = 'connectorsettings';
 
 //Admin pages for the connector properties
 $action_view_map['modifyproperties'] = 'modifyproperties';
-$action_view_map['sourceproperties']= 'sourceproperties';
+$action_view_map['sourceproperties'] = 'sourceproperties';
 
 //Admin pages to enable/disable connector for modules
 $action_view_map['modifydisplay'] = 'modifydisplay';

modules/Prospects/ProspectFormBase.php

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.
@@ -46,71 +46,71 @@ 
  * Contributor(s): ______________________________________..
  ********************************************************************************/
 
-class ProspectFormBase  {
+class ProspectFormBase {
 
-function checkForDuplicates($prefix){
+function checkForDuplicates($prefix) {
 	global $local_log;
 	require_once('include/formbase.php');
 	
 	$focus = new Prospect();
-	if(!checkRequired($prefix, array_keys($focus->required_fields))){
+	if (!checkRequired($prefix, array_keys($focus->required_fields))) {
 		return null;
 	}
 	$query = '';
 	$baseQuery = 'select id,first_name, last_name, title, email1, email2  from prospects where deleted!=1 and (';
-	if(!empty($_POST[$prefix.'first_name']) && !empty($_POST[$prefix.'last_name'])){
-		$query = $baseQuery ."  (first_name like '". $_POST[$prefix.'first_name'] . "%' and last_name = '". $_POST[$prefix.'last_name'] ."')";
-	}else{
-			$query = $baseQuery ."  last_name = '". $_POST[$prefix.'last_name'] ."'";
+	if (!empty($_POST[$prefix.'first_name']) && !empty($_POST[$prefix.'last_name'])) {
+		$query = $baseQuery."  (first_name like '".$_POST[$prefix.'first_name']."%' and last_name = '".$_POST[$prefix.'last_name']."')";
+	} else {
+			$query = $baseQuery."  last_name = '".$_POST[$prefix.'last_name']."'";
 	}
-	if(!empty($_POST[$prefix.'email1'])){
-		if(empty($query)){
-		$query = $baseQuery. "  email1='". $_POST[$prefix.'email1'] . "' or email2 = '". $_POST[$prefix.'email1'] ."'";
-		}else {
-			$query .= "or email1='". $_POST[$prefix.'email1'] . "' or email2 = '". $_POST[$prefix.'email1'] ."'";
+	if (!empty($_POST[$prefix.'email1'])) {
+		if (empty($query)) {
+		$query = $baseQuery."  email1='".$_POST[$prefix.'email1']."' or email2 = '".$_POST[$prefix.'email1']."'";
+		} else {
+			$query .= "or email1='".$_POST[$prefix.'email1']."' or email2 = '".$_POST[$prefix.'email1']."'";
 		}
 	}
-	if(!empty($_POST[$prefix.'email2'])){
-		if(empty($query))	{
-			$query = $baseQuery. "  email1='". $_POST[$prefix.'email2'] . "' or email2 = '". $_POST[$prefix.'email2'] ."'";
-		}else{
-			$query .= "or email1='". $_POST[$prefix.'email2'] . "' or email2 = '". $_POST[$prefix.'email2'] ."'";
+	if (!empty($_POST[$prefix.'email2'])) {
+		if (empty($query)) {
+			$query = $baseQuery."  email1='".$_POST[$prefix.'email2']."' or email2 = '".$_POST[$prefix.'email2']."'";
+		} else {
+			$query .= "or email1='".$_POST[$prefix.'email2']."' or email2 = '".$_POST[$prefix.'email2']."'";
 		}
 
 	}
 
-	if(!empty($query)){
+	if (!empty($query)) {
 		$rows = array();
 		
 		$db = DBManagerFactory::getInstance();
 		$result = $db->query($query.');');
-        while($row = $db->fetchByAssoc($result)) {
+        while ($row = $db->fetchByAssoc($result)) {
             $rows[] = $row;
 		}
-		if(count($rows) > 0) return $rows;
+		if (count($rows) > 0) return $rows;
 		}
 	return null;
 }
 
 
-function buildTableForm($rows, $mod=''){
+function buildTableForm($rows, $mod = '') {
 	global $action;
-	if(!empty($mod)){
+	if (!empty($mod)) {
 	global $current_language;
 	$mod_strings = return_module_language($current_language, $mod);
-	}else global $mod_strings;
+	} else global $mod_strings;
 	global $app_strings;
 	$cols = sizeof($rows[0]) * 2 + 1;
 	if ($action != 'ShowDuplicates') 
 	{
-		$form = '<table width="100%"><tr><td>'.$mod_strings['MSG_DUPLICATE']. '</td></tr><tr><td height="20"></td></tr></table>';
+		$form = '<table width="100%"><tr><td>'.$mod_strings['MSG_DUPLICATE'].'</td></tr><tr><td height="20"></td></tr></table>';
 		$form .= "<form action='index.php' method='post' name='dupProspects'><input type='hidden' name='selectedProspect' value=''>";
 	}
 	else 
 	{
-		$form = '<table width="100%"><tr><td>'.$mod_strings['MSG_SHOW_DUPLICATES']. '</td></tr><tr><td height="20"></td></tr></table>';
+		$form = '<table width="100%"><tr><td>'.$mod_strings['MSG_SHOW_DUPLICATES'].'</td></tr><tr><td height="20"></td></tr></table>';
 	}
-	$form .= get_form_header($mod_strings['LBL_DUPLICATE'],"", '');
+	$form .= get_form_header($mod_strings['LBL_DUPLICATE'], "", '');
 	$form .= "<table width='100%' cellpadding='0' cellspacing='0'>	<tr >	";
 	if ($action != 'ShowDuplicates') 
 	{
@@ -120,16 +120,16 @@ 
 	require_once('include/formbase.php');
 	$form .= getPostToForm();
 
-	if(isset($rows[0])){
-		foreach ($rows[0] as $key=>$value){
-			if($key != 'id'){
-					$form .= "<td scope='col' >". $mod_strings[$mod_strings['db_'.$key]]. "</td>";
+	if (isset($rows[0])) {
+		foreach ($rows[0] as $key=>$value) {
+			if ($key != 'id') {
+					$form .= "<td scope='col' >".$mod_strings[$mod_strings['db_'.$key]]."</td>";
 			}
 		}
 		$form .= "</tr>";
 	}
 	$rowColor = 'oddListRowS1';
-	foreach($rows as $row){
+	foreach ($rows as $row) {
 
 		$form .= "<tr class='$rowColor'>";
 		if ($action != 'ShowDuplicates') 
@@ -138,8 +138,8 @@ 
 		$wasSet = false;
 
 		foreach ($row as $key=>$value) {
-            if($key != 'id') {
-                if(!$wasSet) {
+            if ($key != 'id') {
+                if (!$wasSet) {
                     $form .= "<td scope='row' ><a target='_blank' href='index.php?module=Prospects&action=DetailView&record=${row['id']}'>$value</a></td>\n";
                     $wasSet = true;
                 }
@@ -149,9 +149,9 @@ 
             }
 		}
 
-		if($rowColor == 'evenListRowS1'){
+		if ($rowColor == 'evenListRowS1') {
 			$rowColor = 'oddListRowS1';
-		}else{
+		} else {
 			 $rowColor = 'evenListRowS1';
 		}
 		$form .= "</tr>";
@@ -172,17 +172,17 @@ 
 
 
 }
-function getWideFormBody($prefix, $mod='',$formname='',  $prospect = ''){
-	if(!ACLController::checkAccess('Prospects', 'edit', true)){
+function getWideFormBody($prefix, $mod = '', $formname = '', $prospect = '') {
+	if (!ACLController::checkAccess('Prospects', 'edit', true)) {
 		return '';
 	}
 	
-	if(empty($prospect)){
+	if (empty($prospect)) {
 		$prospect = new Prospect();
 	}
 	global $mod_strings;
 $temp_strings = $mod_strings;
-if(!empty($mod)){
+if (!empty($mod)) {
 	global $current_language;
 	$mod_strings = return_module_language($current_language, $mod);
 }
@@ -194,7 +194,7 @@ 
 		$lbl_first_name = $mod_strings['LBL_FIRST_NAME'];
 		$lbl_last_name = $mod_strings['LBL_LAST_NAME'];
 		$lbl_phone = $mod_strings['LBL_OFFICE_PHONE'];
-		$lbl_address =  $mod_strings['LBL_PRIMARY_ADDRESS'];
+		$lbl_address = $mod_strings['LBL_PRIMARY_ADDRESS'];
 		$user_id = $current_user->id;
 		$lbl_email_address = $mod_strings['LBL_EMAIL_ADDRESS'];
 		$form = <<<EOQ
@@ -295,21 +295,21 @@ 
 $javascript = new javascript();
 $javascript->setFormName($formname);
 $javascript->setSugarBean(new Prospect());
-$javascript->addField('email1','false',$prefix);
-$javascript->addField('email2','false',$prefix);
+$javascript->addField('email1', 'false', $prefix);
+$javascript->addField('email2', 'false', $prefix);
 $javascript->addRequiredFields($prefix);
-$form .=$javascript->getScript();
+$form .= $javascript->getScript();
 $mod_strings = $temp_strings;
 return $form;
 }
 
-function getFormBody($prefix, $mod='', $formname=''){
-	if(!ACLController::checkAccess('Prospects', 'edit', true)){
+function getFormBody($prefix, $mod = '', $formname = '') {
+	if (!ACLController::checkAccess('Prospects', 'edit', true)) {
 		return '';
 	}
 global $mod_strings;
 $temp_strings = $mod_strings;
-if(!empty($mod)){
+if (!empty($mod)) {
 	global $current_language;
 	$mod_strings = return_module_language($current_language, $mod);
 }
@@ -359,22 +359,22 @@ 
 $javascript = new javascript();
 $javascript->setFormName($formname);
 $javascript->setSugarBean(new Prospect());
-$javascript->addField('email1','false',$prefix);
+$javascript->addField('email1', 'false', $prefix);
 $javascript->addRequiredFields($prefix);
 
-$form .=$javascript->getScript();
+$form .= $javascript->getScript();
 $mod_strings = $temp_strings;
 return $form;
 
 }
-function getForm($prefix, $mod=''){
-if(!ACLController::checkAccess('Prospects', 'edit', true)){
+function getForm($prefix, $mod = '') {
+if (!ACLController::checkAccess('Prospects', 'edit', true)) {
 		return '';
 	}
-if(!empty($mod)){
+if (!empty($mod)) {
 	global $current_language;
 	$mod_strings = return_module_language($current_language, $mod);
-}else global $mod_strings;
+} else global $mod_strings;
 global $app_strings;
 
 $lbl_save_button_title = $app_strings['LBL_SAVE_BUTTON_TITLE'];
@@ -389,7 +389,7 @@ 
 			<input type="hidden" name="${prefix}module" value="Prospects">
 			<input type="hidden" name="${prefix}action" value="Save">
 EOQ;
-$the_form .= $this->getFormBody($prefix,'Prospects', "${prefix}ProspectSave");
+$the_form .= $this->getFormBody($prefix, 'Prospects', "${prefix}ProspectSave");
 $the_form .= <<<EOQ
 		<input title="$lbl_save_button_title" accessKey="$lbl_save_button_key" class="button" type="submit" name="${prefix}button" value="  $lbl_save_button_label  " >
 		</form>
@@ -404,7 +404,7 @@ 
 }
 
 
-function handleSave($prefix,$redirect=true, $useRequired=false){
+function handleSave($prefix, $redirect = true, $useRequired = false) {
 	global $theme;
 	
 	
@@ -416,14 +416,14 @@ 
 	
 	
 	$focus = new Prospect();
-	if($useRequired &&  !checkRequired($prefix, array_keys($focus->required_fields))){
+	if ($useRequired && !checkRequired($prefix, array_keys($focus->required_fields))) {
 		return null;
 	}
 	$focus = populateFromPost($prefix, $focus);
-	if(!$focus->ACLAccess('Save')){
+	if (!$focus->ACLAccess('Save')) {
 		return null;
 	}
-	if (!isset($GLOBALS['check_notify'])) $GLOBALS['check_notify']=false;
+	if (!isset($GLOBALS['check_notify'])) $GLOBALS['check_notify'] = false;
 	
 	if (!isset($_POST[$prefix.'email_opt_out'])) $focus->email_opt_out = 0;
 	if (!isset($_POST[$prefix.'do_not_call'])) $focus->do_not_call = 0;
@@ -480,27 +480,27 @@ 
 	$return_id = $focus->id;
     
 	$GLOBALS['log']->debug("Saved record with id of ".$return_id);
-    if(isset($_POST['popup']) && $_POST['popup'] == 'true') {
+    if (isset($_POST['popup']) && $_POST['popup'] == 'true') {
         $get = '&module=';
-        if(!empty($_POST['return_module'])) $get .= $_POST['return_module'];
+        if (!empty($_POST['return_module'])) $get .= $_POST['return_module'];
         else $get .= 'Prospects';
         $get .= '&action=';
-        if(!empty($_POST['return_action'])) $get .= $_POST['return_action'];
+        if (!empty($_POST['return_action'])) $get .= $_POST['return_action'];
         else $get .= 'Popup';
-        if(!empty($_POST['return_id'])) $get .= '&return_id='.$_POST['return_id'];
-        if(!empty($_POST['popup'])) $get .= '&popup='.$_POST['popup'];
-        if(!empty($_POST['create'])) $get .= '&create='.$_POST['create'];
-        if(!empty($_POST['to_pdf'])) $get .= '&to_pdf='.$_POST['to_pdf'];
-        $get .= '&first_name=' . $focus->first_name;
-        $get .= '&last_name=' . $focus->last_name;
+        if (!empty($_POST['return_id'])) $get .= '&return_id='.$_POST['return_id'];
+        if (!empty($_POST['popup'])) $get .= '&popup='.$_POST['popup'];
+        if (!empty($_POST['create'])) $get .= '&create='.$_POST['create'];
+        if (!empty($_POST['to_pdf'])) $get .= '&to_pdf='.$_POST['to_pdf'];
+        $get .= '&first_name='.$focus->first_name;
+        $get .= '&last_name='.$focus->last_name;
         $get .= '&query=true';
         header("Location: index.php?$get");
         return;
     }
-	if($redirect){
+	if ($redirect) {
 	    require_once('include/formbase.php');
 	    handleRedirect($return_id, 'Prospects');
-	}else{
+	} else {
 		return $focus;
 	}
 }

modules/Prospects/metadata/additionalDetails.php

Spacing +31 added lines, -31 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.
@@ -41,49 +41,49 @@ 
 
 function additionalDetailsProspect($fields) {
 	static $mod_strings;
-	if(empty($mod_strings)) {
+	if (empty($mod_strings)) {
 		global $current_language;
 		$mod_strings = return_module_language($current_language, 'Prospects');
 	}
 		
 	$overlib_string = '';
 	
-	if(!empty($fields['ACCOUNT_NAME'])) $overlib_string .= '<b>'. $mod_strings['LBL_EDIT_ACCOUNT_NAME'] . '</b> ' . $fields['ACCOUNT_NAME'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET']) || !empty($fields['PRIMARY_ADDRESS_CITY']) ||
+	if (!empty($fields['ACCOUNT_NAME'])) $overlib_string .= '<b>'.$mod_strings['LBL_EDIT_ACCOUNT_NAME'].'</b> '.$fields['ACCOUNT_NAME'].'<br>';
+	if (!empty($fields['PRIMARY_ADDRESS_STREET']) || !empty($fields['PRIMARY_ADDRESS_CITY']) ||
 		!empty($fields['PRIMARY_ADDRESS_STATE']) || !empty($fields['PRIMARY_ADDRESS_POSTALCODE']) ||
 		!empty($fields['PRIMARY_ADDRESS_COUNTRY']))
-			$overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET_2'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_2'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET_3'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_3'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
-	if(!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
-	if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
+			$overlib_string .= '<b>'.$mod_strings['LBL_PRIMARY_ADDRESS'].'</b><br>';
+	if (!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'].'<br>';
+	if (!empty($fields['PRIMARY_ADDRESS_STREET_2'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_2'].'<br>';
+	if (!empty($fields['PRIMARY_ADDRESS_STREET_3'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_3'].'<br>';
+	if (!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'].', ';
+	if (!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'].' ';
+	if (!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'].' ';
+	if (!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'].'<br>';
+	if (strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
 		$overlib_string .= '<br>';  
-	if(!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
-	if(!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
-	if(!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
+	if (!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'.$mod_strings['LBL_MOBILE_PHONE'].'</b> <span class="phone">'.$fields['PHONE_MOBILE'].'</span><br>';
+	if (!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'.$mod_strings['LBL_HOME_PHONE'].'</b> <span class="phone">'.$fields['PHONE_HOME'].'</span><br>';
+	if (!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'.$mod_strings['LBL_OTHER_PHONE'].'</b> <span class="phone">'.$fields['PHONE_OTHER'].'</span><br>';
 
-	if(!empty($fields['EMAIL1'])) 
-		$overlib_string .= '<b>'. $mod_strings['LBL_EMAIL_ADDRESS'] . '</b> ' . 
-								 "<a href=index.php?module=Emails&action=Compose&contact_id={$fields['ID']}&" .
-								 "parent_type=Contacts&parent_id={$fields['ID']}&to_addrs_ids={$fields['ID']}&to_addrs_names" .
-								 "={$fields['FIRST_NAME']}&nbsp;{$fields['LAST_NAME']}&to_addrs_emails={$fields['EMAIL1']}&" .
-								 "to_email_addrs=" . urlencode("{$fields['FIRST_NAME']} {$fields['LAST_NAME']} <{$fields['EMAIL1']}>") .
+	if (!empty($fields['EMAIL1'])) 
+		$overlib_string .= '<b>'.$mod_strings['LBL_EMAIL_ADDRESS'].'</b> '. 
+								 "<a href=index.php?module=Emails&action=Compose&contact_id={$fields['ID']}&".
+								 "parent_type=Contacts&parent_id={$fields['ID']}&to_addrs_ids={$fields['ID']}&to_addrs_names".
+								 "={$fields['FIRST_NAME']}&nbsp;{$fields['LAST_NAME']}&to_addrs_emails={$fields['EMAIL1']}&".
+								 "to_email_addrs=".urlencode("{$fields['FIRST_NAME']} {$fields['LAST_NAME']} <{$fields['EMAIL1']}>").
 								 "&return_module=Contacts&return_action=ListView'>{$fields['EMAIL1']}</a><br>";
-	if(!empty($fields['EMAIL2'])) 
-		$overlib_string .= '<b>'. $mod_strings['LBL_OTHER_EMAIL_ADDRESS'] . '</b> ' . 
-								 "<a href=index.php?module=Emails&action=Compose&contact_id={$fields['ID']}&" .
-								 "parent_type=Contacts&parent_id={$fields['ID']}&to_addrs_ids={$fields['ID']}&to_addrs_names" .
-								 "={$fields['FIRST_NAME']}&nbsp;{$fields['LAST_NAME']}&to_addrs_emails={$fields['EMAIL2']}&" .
-								 "to_email_addrs=" . urlencode("{$fields['FIRST_NAME']} {$fields['LAST_NAME']} <{$fields['EMAIL2']}>") .
+	if (!empty($fields['EMAIL2'])) 
+		$overlib_string .= '<b>'.$mod_strings['LBL_OTHER_EMAIL_ADDRESS'].'</b> '. 
+								 "<a href=index.php?module=Emails&action=Compose&contact_id={$fields['ID']}&".
+								 "parent_type=Contacts&parent_id={$fields['ID']}&to_addrs_ids={$fields['ID']}&to_addrs_names".
+								 "={$fields['FIRST_NAME']}&nbsp;{$fields['LAST_NAME']}&to_addrs_emails={$fields['EMAIL2']}&".
+								 "to_email_addrs=".urlencode("{$fields['FIRST_NAME']} {$fields['LAST_NAME']} <{$fields['EMAIL2']}>").
 								 "&return_module=Contacts&return_action=ListView'>{$fields['EMAIL2']}</a><br>";
 	
-	if(!empty($fields['DESCRIPTION'])) { 
-		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+	if (!empty($fields['DESCRIPTION'])) { 
+		$overlib_string .= '<b>'.$mod_strings['LBL_DESCRIPTION'].'</b> '.substr($fields['DESCRIPTION'], 0, 300);
+		if (strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
 	}	
 	
 	return array('fieldToAddTo' => 'FULL_NAME',