adamjakab / SuiteCRM

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;

Braces +15 added lines, -9 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.
@@ -65,8 +67,9 @@ 
             return false;
         }
 
-            if ($lhs->$lhsLinkName->beansAreLoaded())
-                $lhs->$lhsLinkName->addBean($rhs);
+            if ($lhs->$lhsLinkName->beansAreLoaded()) {
+                            $lhs->$lhsLinkName->addBean($rhs);
+            }
 
             $this->callBeforeAdd($lhs, $rhs, $lhsLinkName);
 
@@ -75,11 +78,13 @@ 
 
         $this->addRow($dataToInsert);
 
-        if ($this->self_referencing)
-            $this->addSelfReferencing($lhs, $rhs, $additionalFields);
+        if ($this->self_referencing) {
+                    $this->addSelfReferencing($lhs, $rhs, $additionalFields);
+        }
 
-            if ($lhs->$lhsLinkName->beansAreLoaded())
-                $lhs->$lhsLinkName->addBean($rhs);
+            if ($lhs->$lhsLinkName->beansAreLoaded()) {
+                            $lhs->$lhsLinkName->addBean($rhs);
+            }
 
             $this->callAfterAdd($lhs, $rhs, $lhsLinkName);
 
@@ -120,8 +125,9 @@ 
 
         $this->removeRow($dataToRemove);
 
-        if ($this->self_referencing)
-            $this->removeSelfReferencing($lhs, $rhs);
+        if ($this->self_referencing) {
+                    $this->removeSelfReferencing($lhs, $rhs);
+        }
 
         if (empty($_SESSION['disable_workflow']) || $_SESSION['disable_workflow'] != "Yes")
         {

themes/SuiteR/css/colourSelector.php

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
     require_once('../../../config_override.php');
 }
 
-if(!isset($sugar_config['theme_settings']['SuiteR'])) return;
+if(!isset($sugar_config['theme_settings']['SuiteR'])) {
+    return;
+}
 
 //set file type back to css from php
 header("Content-type: text/css; charset: UTF-8");

Spacing +9 added lines, -9 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']['SuiteR'])) return;
+if (!isset($sugar_config['theme_settings']['SuiteR'])) return;
 
 //set file type back to css from php
 header("Content-type: text/css; charset: UTF-8");
@@ -33,21 +33,21 @@ 
 /* Dashlet CSS */
 
 .dashletPanel .h3Row{
-background: #<?php echo $sugar_config['theme_settings']['SuiteR']['dashlet'];?>;
+background: #<?php echo $sugar_config['theme_settings']['SuiteR']['dashlet']; ?>;
 }
 
 .dashletPanel .h3Row h3{
-color: #<?php echo $sugar_config['theme_settings']['SuiteR']['dashlet_headertext'];?> !important;
+color: #<?php echo $sugar_config['theme_settings']['SuiteR']['dashlet_headertext']; ?> !important;
 }
 
 .dashletPanel .h3Row .dashletToolSet .icon{
-fill: #<?php echo $sugar_config['theme_settings']['SuiteR']['dashlet_headertext'];?> !important;
+fill: #<?php echo $sugar_config['theme_settings']['SuiteR']['dashlet_headertext']; ?> !important;
 }
 
 /* Top navigation bar CSS */
 
 .navbar-inverse {
-background:#<?php echo $sugar_config['theme_settings']['SuiteR']['navbar'];?> !important;
+background:#<?php echo $sugar_config['theme_settings']['SuiteR']['navbar']; ?> !important;
 }
 
 .headerlinks a:link, .headerlinks a:visited, .navbar-inverse .navbar-brand, .moremenu a,  a[id^=grouptab], a[id^=moduleTab] {
@@ -75,8 +75,8 @@ 
 
 #searchform .btn
 {
-background:#<?php echo $sugar_config['theme_settings']['SuiteR']['navbar'];?> !important;
-color: #<?php echo $sugar_config['theme_settings']['SuiteR']['icon'];?> !important;
+background:#<?php echo $sugar_config['theme_settings']['SuiteR']['navbar']; ?> !important;
+color: #<?php echo $sugar_config['theme_settings']['SuiteR']['icon']; ?> !important;
 }
 
 #usermenu a{

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");

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
     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

Indentation +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.
@@ -65,7 +65,7 @@ 
 
 //New API is in these files
 if(!empty($administrator->settings['portal_on'])) {
-	require_once('soap/SoapPortalUsers.php');
+    require_once('soap/SoapPortalUsers.php');
 }
 
 require_once('soap/SoapSugarUsers.php');
@@ -88,9 +88,9 @@ 
 $observers = $resourceManager->getObservers();
 //Call set_soap_server for SoapResourceObserver instance(s)
 foreach($observers as $observer) {
-   if(method_exists($observer, 'set_soap_server')) {
-   	  $observer->set_soap_server($server);
-   }
+    if(method_exists($observer, 'set_soap_server')) {
+            $observer->set_soap_server($server);
+    }
 }
 
 $HTTP_RAW_POST_DATA = isset($HTTP_RAW_POST_DATA) ? $HTTP_RAW_POST_DATA : '';

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);
    }
 }

Braces +4 added lines, -2 removed lines

@@ -1,6 +1,8 @@
 <?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.
 

modules/Connectors/InstallDefaultConnectors.php

Indentation +20 added lines, -20 removed lines

@@ -40,26 +40,26 @@ 
 
 
 $default_modules_sources = array (
-  'Accounts' =>
-  array (
-     'ext_rest_insideview' => 'ext_rest_insideview',
-  ),
-  'Contacts' =>
-  array (
-     'ext_rest_insideview' => 'ext_rest_insideview',
-  ),
-  'Leads' =>
-  array (
-     'ext_rest_insideview' => 'ext_rest_insideview',
-  ),
-  'Prospects' =>
-  array (
+    'Accounts' =>
+    array (
+        'ext_rest_insideview' => 'ext_rest_insideview',
+    ),
+    'Contacts' =>
+    array (
+        'ext_rest_insideview' => 'ext_rest_insideview',
+    ),
+    'Leads' =>
+    array (
+        'ext_rest_insideview' => 'ext_rest_insideview',
+    ),
+    'Prospects' =>
+    array (
 
-  ),
-  'Opportunities' =>
-  array (
+    ),
+    'Opportunities' =>
+    array (
     'ext_rest_insideview' => 'ext_rest_insideview',
-  ),
+    ),
 );
 
 $previous_connectors = array();
@@ -103,11 +103,11 @@ 
 }
 
 if(!file_exists('custom/modules/Connectors/metadata')) {
-   mkdir_recursive('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')) {
-   $GLOBALS['log']->fatal('Cannot write file custom/modules/Connectors/metadata/display_config.php');
+    $GLOBALS['log']->fatal('Cannot write file custom/modules/Connectors/metadata/display_config.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');
 }
 

Braces +4 added lines, -3 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.
@@ -94,8 +96,7 @@ 
             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];
             }
         }

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

Indentation +165 added lines, -165 removed lines

@@ -49,95 +49,95 @@ 
 class ProspectFormBase  {
 
 function checkForDuplicates($prefix){
-	global $local_log;
-	require_once('include/formbase.php');
+    global $local_log;
+    require_once('include/formbase.php');
 	
-	$focus = new Prospect();
-	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.'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($query)){
-		$rows = array();
+    $focus = new Prospect();
+    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.'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($query)){
+        $rows = array();
 		
-		$db = DBManagerFactory::getInstance();
-		$result = $db->query($query.');');
+        $db = DBManagerFactory::getInstance();
+        $result = $db->query($query.');');
         while($row = $db->fetchByAssoc($result)) {
             $rows[] = $row;
-		}
-		if(count($rows) > 0) return $rows;
-		}
-	return null;
+        }
+        if(count($rows) > 0) return $rows;
+        }
+    return null;
 }
 
 
 function buildTableForm($rows, $mod=''){
-	global $action;
-	if(!empty($mod)){
-	global $current_language;
-	$mod_strings = return_module_language($current_language, $mod);
-	}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 .= "<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 .= get_form_header($mod_strings['LBL_DUPLICATE'],"", '');
-	$form .= "<table width='100%' cellpadding='0' cellspacing='0'>	<tr >	";
-	if ($action != 'ShowDuplicates') 
-	{
-		$form .= "<td > &nbsp;</td>";
-	}
-
-	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>";
-			}
-		}
-		$form .= "</tr>";
-	}
-	$rowColor = 'oddListRowS1';
-	foreach($rows as $row){
-
-		$form .= "<tr class='$rowColor'>";
-		if ($action != 'ShowDuplicates') 
-			$form .= "<td width='1%' nowrap='nowrap' ><a href='#' onClick=\"document.dupProspects.selectedProspect.value='${row['id']}';document.dupProspects.submit() \">[${app_strings['LBL_SELECT_BUTTON_LABEL']}]</a>&nbsp;&nbsp;</td>\n";
+    global $action;
+    if(!empty($mod)){
+    global $current_language;
+    $mod_strings = return_module_language($current_language, $mod);
+    }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 .= "<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 .= get_form_header($mod_strings['LBL_DUPLICATE'],"", '');
+    $form .= "<table width='100%' cellpadding='0' cellspacing='0'>	<tr >	";
+    if ($action != 'ShowDuplicates') 
+    {
+        $form .= "<td > &nbsp;</td>";
+    }
+
+    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>";
+            }
+        }
+        $form .= "</tr>";
+    }
+    $rowColor = 'oddListRowS1';
+    foreach($rows as $row){
+
+        $form .= "<tr class='$rowColor'>";
+        if ($action != 'ShowDuplicates') 
+            $form .= "<td width='1%' nowrap='nowrap' ><a href='#' onClick=\"document.dupProspects.selectedProspect.value='${row['id']}';document.dupProspects.submit() \">[${app_strings['LBL_SELECT_BUTTON_LABEL']}]</a>&nbsp;&nbsp;</td>\n";
 		
-		$wasSet = false;
+        $wasSet = false;
 
-		foreach ($row as $key=>$value) {
+        foreach ($row as $key=>$value) {
             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";
@@ -147,25 +147,25 @@ 
                     $form .= "<td><a target='_blank' href='index.php?module=Prospects&action=DetailView&record=${row['id']}'>$value</a></td>\n";
                 }
             }
-		}
-
-		if($rowColor == 'evenListRowS1'){
-			$rowColor = 'oddListRowS1';
-		}else{
-			 $rowColor = 'evenListRowS1';
-		}
-		$form .= "</tr>";
-	}
-	$form .= "<tr ><td colspan='$cols' class='blackline'></td></tr>";
-	if ($action == 'ShowDuplicates') 
-	{
-		$form .= "</table><br><input title='${app_strings['LBL_SAVE_BUTTON_TITLE']}' accessKey='${app_strings['LBL_SAVE_BUTTON_KEY']}' class='button' onclick=\"this.form.action.value='Save';\" type='submit' name='button' value='  ${app_strings['LBL_SAVE_BUTTON_LABEL']}  '> <input title='${app_strings['LBL_CANCEL_BUTTON_TITLE']}' accessKey='${app_strings['LBL_CANCEL_BUTTON_KEY']}' class='button' onclick=\"this.form.action.value='ListView'; this.form.module.value='Prospects';\" type='submit' name='button' value='  ${app_strings['LBL_CANCEL_BUTTON_LABEL']}  '></form>";
-	}
-	else 
-	{
-		$form .= "</table><br><input type='submit' class='button' name='ContinueProspect' value='${mod_strings['LNK_NEW_PROSPECT']}'></form>";
-	}
-	return $form;
+        }
+
+        if($rowColor == 'evenListRowS1'){
+            $rowColor = 'oddListRowS1';
+        }else{
+                $rowColor = 'evenListRowS1';
+        }
+        $form .= "</tr>";
+    }
+    $form .= "<tr ><td colspan='$cols' class='blackline'></td></tr>";
+    if ($action == 'ShowDuplicates') 
+    {
+        $form .= "</table><br><input title='${app_strings['LBL_SAVE_BUTTON_TITLE']}' accessKey='${app_strings['LBL_SAVE_BUTTON_KEY']}' class='button' onclick=\"this.form.action.value='Save';\" type='submit' name='button' value='  ${app_strings['LBL_SAVE_BUTTON_LABEL']}  '> <input title='${app_strings['LBL_CANCEL_BUTTON_TITLE']}' accessKey='${app_strings['LBL_CANCEL_BUTTON_KEY']}' class='button' onclick=\"this.form.action.value='ListView'; this.form.module.value='Prospects';\" type='submit' name='button' value='  ${app_strings['LBL_CANCEL_BUTTON_LABEL']}  '></form>";
+    }
+    else 
+    {
+        $form .= "</table><br><input type='submit' class='button' name='ContinueProspect' value='${mod_strings['LNK_NEW_PROSPECT']}'></form>";
+    }
+    return $form;
 
 
 
@@ -173,31 +173,31 @@ 
 
 }
 function getWideFormBody($prefix, $mod='',$formname='',  $prospect = ''){
-	if(!ACLController::checkAccess('Prospects', 'edit', true)){
-		return '';
-	}
+    if(!ACLController::checkAccess('Prospects', 'edit', true)){
+        return '';
+    }
 	
-	if(empty($prospect)){
-		$prospect = new Prospect();
-	}
-	global $mod_strings;
+    if(empty($prospect)){
+        $prospect = new Prospect();
+    }
+    global $mod_strings;
 $temp_strings = $mod_strings;
 if(!empty($mod)){
-	global $current_language;
-	$mod_strings = return_module_language($current_language, $mod);
+    global $current_language;
+    $mod_strings = return_module_language($current_language, $mod);
 }
-		global $app_strings;
-		global $current_user;
-		global $app_list_strings;
-		$primary_address_country_options = get_select_options_with_id($app_list_strings['countries_dom'], $prospect->primary_address_country);
-		$lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL'];
-		$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'];
-		$user_id = $current_user->id;
-		$lbl_email_address = $mod_strings['LBL_EMAIL_ADDRESS'];
-		$form = <<<EOQ
+        global $app_strings;
+        global $current_user;
+        global $app_list_strings;
+        $primary_address_country_options = get_select_options_with_id($app_list_strings['countries_dom'], $prospect->primary_address_country);
+        $lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL'];
+        $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'];
+        $user_id = $current_user->id;
+        $lbl_email_address = $mod_strings['LBL_EMAIL_ADDRESS'];
+        $form = <<<EOQ
 		<input type="hidden" name="${prefix}record" value="">
 		<input type="hidden" name="${prefix}assigned_user_id" value='${user_id}'>
 		<table border='0' celpadding="0" cellspacing="0" width='100%'>
@@ -304,26 +304,26 @@ 
 }
 
 function getFormBody($prefix, $mod='', $formname=''){
-	if(!ACLController::checkAccess('Prospects', 'edit', true)){
-		return '';
-	}
+    if(!ACLController::checkAccess('Prospects', 'edit', true)){
+        return '';
+    }
 global $mod_strings;
 $temp_strings = $mod_strings;
 if(!empty($mod)){
-	global $current_language;
-	$mod_strings = return_module_language($current_language, $mod);
+    global $current_language;
+    $mod_strings = return_module_language($current_language, $mod);
 }
-		global $app_strings;
-		global $current_user;
-		$lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL'];
-		$lbl_first_name = $mod_strings['LBL_FIRST_NAME'];
-		$lbl_last_name = $mod_strings['LBL_LAST_NAME'];
-		$lbl_phone = $mod_strings['LBL_PHONE'];
-		$user_id = $current_user->id;
-		$lbl_email_address = $mod_strings['LBL_EMAIL_ADDRESS'];
+        global $app_strings;
+        global $current_user;
+        $lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL'];
+        $lbl_first_name = $mod_strings['LBL_FIRST_NAME'];
+        $lbl_last_name = $mod_strings['LBL_LAST_NAME'];
+        $lbl_phone = $mod_strings['LBL_PHONE'];
+        $user_id = $current_user->id;
+        $lbl_email_address = $mod_strings['LBL_EMAIL_ADDRESS'];
 if ($formname == 'EmailEditView')
 {
-		$form = <<<EOQ
+        $form = <<<EOQ
 		<input type="hidden" name="${prefix}record" value="">
 		<input type="hidden" name="${prefix}email2" value="">
 		<input type="hidden" name="${prefix}phone_work" value="">
@@ -339,7 +339,7 @@ 
 }
 else
 {
-		$form = <<<EOQ
+        $form = <<<EOQ
 		<input type="hidden" name="${prefix}record" value="">
 		<input type="hidden" name="${prefix}email2" value="">
 		<input type="hidden" name="${prefix}assigned_user_id" value='${user_id}'>
@@ -369,11 +369,11 @@ 
 }
 function getForm($prefix, $mod=''){
 if(!ACLController::checkAccess('Prospects', 'edit', true)){
-		return '';
-	}
+        return '';
+    }
 if(!empty($mod)){
-	global $current_language;
-	$mod_strings = return_module_language($current_language, $mod);
+    global $current_language;
+    $mod_strings = return_module_language($current_language, $mod);
 }else global $mod_strings;
 global $app_strings;
 
@@ -405,31 +405,31 @@ 
 
 
 function handleSave($prefix,$redirect=true, $useRequired=false){
-	global $theme;
+    global $theme;
 	
 	
 	
 	
-	require_once('include/formbase.php');
+    require_once('include/formbase.php');
 	
-	global $timedate;
+    global $timedate;
 	
 	
-	$focus = new Prospect();
-	if($useRequired &&  !checkRequired($prefix, array_keys($focus->required_fields))){
-		return null;
-	}
-	$focus = populateFromPost($prefix, $focus);
-	if(!$focus->ACLAccess('Save')){
-		return null;
-	}
-	if (!isset($GLOBALS['check_notify'])) $GLOBALS['check_notify']=false;
+    $focus = new Prospect();
+    if($useRequired &&  !checkRequired($prefix, array_keys($focus->required_fields))){
+        return null;
+    }
+    $focus = populateFromPost($prefix, $focus);
+    if(!$focus->ACLAccess('Save')){
+        return null;
+    }
+    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;
+    if (!isset($_POST[$prefix.'email_opt_out'])) $focus->email_opt_out = 0;
+    if (!isset($_POST[$prefix.'do_not_call'])) $focus->do_not_call = 0;
 	
-	if (empty($_POST['record']) && empty($_POST['dup_checked'])) {
-		/*
+    if (empty($_POST['record']) && empty($_POST['dup_checked'])) {
+        /*
 		// we don't check dupes on Prospects - this is the dirtiest data in the system
 		//$duplicateProspects = $this->checkForDuplicates($prefix);
 		if(isset($duplicateProspects)){
@@ -473,13 +473,13 @@ 
 			header("Location: index.php?$get");
 			return null;
 		}*/
-	}
-	global $current_user;
+    }
+    global $current_user;
 
-	$focus->save($GLOBALS['check_notify']);
-	$return_id = $focus->id;
+    $focus->save($GLOBALS['check_notify']);
+    $return_id = $focus->id;
     
-	$GLOBALS['log']->debug("Saved record with id of ".$return_id);
+    $GLOBALS['log']->debug("Saved record with id of ".$return_id);
     if(isset($_POST['popup']) && $_POST['popup'] == 'true') {
         $get = '&module=';
         if(!empty($_POST['return_module'])) $get .= $_POST['return_module'];
@@ -497,12 +497,12 @@ 
         header("Location: index.php?$get");
         return;
     }
-	if($redirect){
-	    require_once('include/formbase.php');
-	    handleRedirect($return_id, 'Prospects');
-	}else{
-		return $focus;
-	}
+    if($redirect){
+        require_once('include/formbase.php');
+        handleRedirect($return_id, 'Prospects');
+    }else{
+        return $focus;
+    }
 }
 
 }

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;
 	}
 }

Braces +53 added lines, -26 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.
@@ -60,20 +62,20 @@ 
 	$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{
+	} 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 {
+		} 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{
+		} else{
 			$query .= "or email1='". $_POST[$prefix.'email2'] . "' or email2 = '". $_POST[$prefix.'email2'] ."'";
 		}
 
@@ -87,7 +89,9 @@ 
         while($row = $db->fetchByAssoc($result)) {
             $rows[] = $row;
 		}
-		if(count($rows) > 0) return $rows;
+		if(count($rows) > 0) {
+		    return $rows;
+		}
 		}
 	return null;
 }
@@ -98,15 +102,16 @@ 
 	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 .= "<form action='index.php' method='post' name='dupProspects'><input type='hidden' name='selectedProspect' value=''>";
-	}
-	else 
+	} else 
 	{
 		$form = '<table width="100%"><tr><td>'.$mod_strings['MSG_SHOW_DUPLICATES']. '</td></tr><tr><td height="20"></td></tr></table>';
 	}
@@ -132,8 +137,9 @@ 
 	foreach($rows as $row){
 
 		$form .= "<tr class='$rowColor'>";
-		if ($action != 'ShowDuplicates') 
-			$form .= "<td width='1%' nowrap='nowrap' ><a href='#' onClick=\"document.dupProspects.selectedProspect.value='${row['id']}';document.dupProspects.submit() \">[${app_strings['LBL_SELECT_BUTTON_LABEL']}]</a>&nbsp;&nbsp;</td>\n";
+		if ($action != 'ShowDuplicates') {
+					$form .= "<td width='1%' nowrap='nowrap' ><a href='#' onClick=\"document.dupProspects.selectedProspect.value='${row['id']}';document.dupProspects.submit() \">[${app_strings['LBL_SELECT_BUTTON_LABEL']}]</a>&nbsp;&nbsp;</td>\n";
+		}
 		
 		$wasSet = false;
 
@@ -142,8 +148,7 @@ 
                 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;
-                }
-                else {
+                } else {
                     $form .= "<td><a target='_blank' href='index.php?module=Prospects&action=DetailView&record=${row['id']}'>$value</a></td>\n";
                 }
             }
@@ -151,7 +156,7 @@ 
 
 		if($rowColor == 'evenListRowS1'){
 			$rowColor = 'oddListRowS1';
-		}else{
+		} else{
 			 $rowColor = 'evenListRowS1';
 		}
 		$form .= "</tr>";
@@ -374,7 +379,9 @@ 
 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'];
@@ -423,10 +430,16 @@ 
 	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;
+	if (!isset($_POST[$prefix.'email_opt_out'])) {
+	    $focus->email_opt_out = 0;
+	}
+	if (!isset($_POST[$prefix.'do_not_call'])) {
+	    $focus->do_not_call = 0;
+	}
 	
 	if (empty($_POST['record']) && empty($_POST['dup_checked'])) {
 		/*
@@ -482,15 +495,29 @@ 
 	$GLOBALS['log']->debug("Saved record with id of ".$return_id);
     if(isset($_POST['popup']) && $_POST['popup'] == 'true') {
         $get = '&module=';
-        if(!empty($_POST['return_module'])) $get .= $_POST['return_module'];
-        else $get .= 'Prospects';
+        if(!empty($_POST['return_module'])) {
+            $get .= $_POST['return_module'];
+        } else {
+            $get .= 'Prospects';
+        }
         $get .= '&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'];
+        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;
         $get .= '&query=true';
@@ -500,7 +527,7 @@ 
 	if($redirect){
 	    require_once('include/formbase.php');
 	    handleRedirect($return_id, 'Prospects');
-	}else{
+	} else{
 		return $focus;
 	}
 }

modules/Prospects/metadata/additionalDetails.php

Indentation +46 added lines, -46 removed lines

@@ -40,58 +40,58 @@
 
 
 function additionalDetailsProspect($fields) {
-	static $mod_strings;
-	if(empty($mod_strings)) {
-		global $current_language;
-		$mod_strings = return_module_language($current_language, 'Prospects');
-	}
+    static $mod_strings;
+    if(empty($mod_strings)) {
+        global $current_language;
+        $mod_strings = return_module_language($current_language, 'Prospects');
+    }
 		
-	$overlib_string = '';
+    $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']) ||
-		!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 .= '<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['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 .= '<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']}>") .
-								 "&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']}>") .
-								 "&return_module=Contacts&return_action=ListView'>{$fields['EMAIL2']}</a><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']}>") .
+                                    "&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']}>") .
+                                    "&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', 
-				 'string' => $overlib_string, 
-				 'editLink' => "index.php?action=EditView&module=Prospects&return_module=Prospects&record={$fields['ID']}", 
-				 'viewLink' => "index.php?action=DetailView&module=Prospects&return_module=Prospects&record={$fields['ID']}");
+    return array('fieldToAddTo' => 'FULL_NAME', 
+                    'string' => $overlib_string, 
+                    'editLink' => "index.php?action=EditView&module=Prospects&return_module=Prospects&record={$fields['ID']}", 
+                    'viewLink' => "index.php?action=DetailView&module=Prospects&return_module=Prospects&record={$fields['ID']}");
 	
 }
  
- ?>
+    ?>
  

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', 

Braces +51 added lines, -21 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.
@@ -48,42 +50,70 @@ 
 		
 	$overlib_string = '';
 	
-	if(!empty($fields['ACCOUNT_NAME'])) $overlib_string .= '<b>'. $mod_strings['LBL_EDIT_ACCOUNT_NAME'] . '</b> ' . $fields['ACCOUNT_NAME'] . '<br>';
+	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 .= '<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>';
+		!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 .= '<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> ' . 
+	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> ' . 
+	}
+	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(strlen($fields['DESCRIPTION']) > 300) {
+		    $overlib_string .= '...';
+		}
 	}	
 	
 	return array('fieldToAddTo' => 'FULL_NAME', 

modules/Prospects/metadata/subpaneldefs.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
             'sort_by' => 'date_start',
             'title_key' => 'LBL_ACTIVITIES_SUBPANEL_TITLE',
             'type' => 'collection',
-            'subpanel_name' => 'activities',   //this values is not associated with a physical file.
+            'subpanel_name' => 'activities', //this values is not associated with a physical file.
             'module' => 'Activities',
 
             'top_buttons' => array(
@@ -82,7 +82,7 @@ 
             'sort_by' => 'date_entered',
             'title_key' => 'LBL_HISTORY_SUBPANEL_TITLE',
             'type' => 'collection',
-            'subpanel_name' => 'history',   //this values is not associated with a physical file.
+            'subpanel_name' => 'history', //this values is not associated with a physical file.
             'module' => 'History',
 
             'top_buttons' => array(

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.