adamjakab / SuiteCRM

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

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(

modules/Prospects/metadata/editviewdefs.php

Spacing +14 added lines, -14 removed lines

@@ -44,48 +44,48 @@ 
                                             array('label' => '10', 'field' => '30')
                                             ),
      ),
- 'panels' =>array (
+ 'panels' =>array(
   'lbl_prospect_information' => 
-  array (
+  array(
     
-    array (
-      array (
+    array(
+      array(
         'name' => 'first_name',
         'customCode' => '{html_options name="salutation" id="salutation" options=$fields.salutation.options selected=$fields.salutation.value}' 
       . '&nbsp;<input name="first_name"  id="first_name" size="25" maxlength="25" type="text" value="{$fields.first_name.value}">',
       ),
     ),
     
-    array (
+    array(
       array('name'=>'last_name',
             'displayParams'=>array('required'=>true),
       ),
       'phone_work',
     ),
     
-    array (
+    array(
       'title',
       'phone_mobile',
     ),
     
-    array (
+    array(
       'department',
       'phone_fax',
     ),
     
-    array (
+    array(
       'account_name',
     ),
     
-    array (
-      array (
+    array(
+      array(
 	      'name' => 'primary_address_street',
           'hideLabel' => true,      
 	      'type' => 'address',
 	      'displayParams'=>array('key'=>'primary', 'rows'=>2, 'cols'=>30, 'maxlength'=>150),
       ),
       
-      array (
+      array(
 	      'name' => 'alt_address_street',
 	      'hideLabel'=>true,
 	      'type' => 'address',
@@ -93,18 +93,18 @@ 
       ),
     ),
     array('email1'),
-    array (
+    array(
       array('name'=>'description', 
             'label'=>'LBL_DESCRIPTION'),
     ),
     ),
   'LBL_MORE_INFORMATION' => array(
-    array (
+    array(
       'do_not_call',
     ),
     ),
   'LBL_PANEL_ASSIGNMENT' => array(
-    array (
+    array(
 	  'assigned_user_name',
     ),    
 

modules/Prospects/metadata/popupdefs.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.
@@ -56,7 +56,7 @@ 
 						'create' =>
 							array('formBase' => 'ProspectFormBase.php',
 									'formBaseClass' => 'ProspectFormBase',
-									'getFormBodyParams' => array('','','ProspectSave'),
+									'getFormBodyParams' => array('', '', 'ProspectSave'),
 									'createButton' => 'LNK_NEW_PROSPECT'
 								  )
 						);

modules/Prospects/metadata/searchdefs.php

Spacing +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
                        ),
                 'layout' => array(
   					'basic_search' => array(
- 							array('name'=>'search_name','label' =>'LBL_NAME', 'type' => 'name'),
+ 							array('name'=>'search_name', 'label' =>'LBL_NAME', 'type' => 'name'),
                            array('name'=>'current_user_only', 'label'=>'LBL_CURRENT_USER_FILTER', 'type'=>'bool'),
                            
 						),
@@ -60,7 +60,7 @@ 
 							array('name' => 'address_street', 'label'=>'LBL_ANY_ADDRESS', 'type' => 'name'),
 							array('name' => 'address_state', 'label' =>'LBL_STATE', 'type' => 'name'),
 							array('name' => 'address_postalcode', 'label' =>'LBL_POSTAL_CODE', 'type' => 'name'),
-							array('name' => 'primary_address_country', 'label' =>'LBL_COUNTRY', 'type' => 'name', 'options' => 'countries_dom', ), 
+							array('name' => 'primary_address_country', 'label' =>'LBL_COUNTRY', 'type' => 'name', 'options' => 'countries_dom',), 
 							array('name' => 'assigned_user_id', 'type' => 'enum', 'label' => 'LBL_ASSIGNED_TO', 'function' => array('name' => 'get_user_array', 'params' => array(false))),
 							
 					),

modules/Prospects/metadata/SearchFields.php

Spacing +17 added lines, -17 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,12 +39,12 @@ 
  ********************************************************************************/
 
 $searchFields['Prospects'] = 
-	array (
-		'first_name' => array( 'query_type'=>'default'),
+	array(
+		'first_name' => array('query_type'=>'default'),
 		'last_name'=> array('query_type'=>'default'),
-		'search_name'=> array('query_type'=>'default','db_field'=>array('first_name','last_name'),'force_unifiedsearch'=>true),
+		'search_name'=> array('query_type'=>'default', 'db_field'=>array('first_name', 'last_name'), 'force_unifiedsearch'=>true),
 		'do_not_call'=> array('query_type'=>'default', 'operator'=>'='),
-		'phone'=> array('query_type'=>'default','db_field'=>array('phone_mobile','phone_work','phone_other','phone_fax','phone_home')),
+		'phone'=> array('query_type'=>'default', 'db_field'=>array('phone_mobile', 'phone_work', 'phone_other', 'phone_fax', 'phone_home')),
 		'email'=> array(
 			'query_type' => 'default',
 			'operator' => 'subquery',
@@ -54,20 +54,20 @@ 
 			),
 		),
 		'assistant'=> array('query_type'=>'default'),
-		'address_street'=> array('query_type'=>'default','db_field'=>array('primary_address_street','alt_address_street')),
-		'address_city'=> array('query_type'=>'default','db_field'=>array('primary_address_city','alt_address_city')),
-		'address_state'=> array('query_type'=>'default','db_field'=>array('primary_address_state','alt_address_state')),
-		'address_postalcode'=> array('query_type'=>'default','db_field'=>array('primary_address_postalcode','alt_address_postalcode')),
-		'address_country'=> array('query_type'=>'default','db_field'=>array('primary_address_country','alt_address_country')),
-		'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
+		'address_street'=> array('query_type'=>'default', 'db_field'=>array('primary_address_street', 'alt_address_street')),
+		'address_city'=> array('query_type'=>'default', 'db_field'=>array('primary_address_city', 'alt_address_city')),
+		'address_state'=> array('query_type'=>'default', 'db_field'=>array('primary_address_state', 'alt_address_state')),
+		'address_postalcode'=> array('query_type'=>'default', 'db_field'=>array('primary_address_postalcode', 'alt_address_postalcode')),
+		'address_country'=> array('query_type'=>'default', 'db_field'=>array('primary_address_country', 'alt_address_country')),
+		'current_user_only'=> array('query_type'=>'default', 'db_field'=>array('assigned_user_id'), 'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
 		'assigned_user_id'=> array('query_type'=>'default'),
 	   //Range Search Support 
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+	   'range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'end_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+       'end_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 	   //Range Search Support
 	);
 ?>

modules/Prospects/metadata/detailviewdefs.php

Spacing +42 added lines, -42 removed lines

@@ -38,27 +38,27 @@ 
  ********************************************************************************/
 
 $viewdefs ['Prospects'] = 
-array (
+array(
   'DetailView' => 
-  array (
+  array(
     'templateMeta' => 
-    array (
+    array(
       'form' => 
-      array (
+      array(
         'buttons' => 
-        array (
+        array(
           0 => 'EDIT',
           1 => 'DUPLICATE',
           2 => 'DELETE',
           3 => 
-          array (
+          array(
             'customCode' => '<input title="{$MOD.LBL_CONVERT_BUTTON_TITLE}" class="button" onclick="this.form.return_module.value=\'Prospects\'; this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$fields.id.value}\';this.form.module.value=\'Leads\';this.form.action.value=\'EditView\';" type="submit" name="CONVERT_LEAD_BTN" value="{$MOD.LBL_CONVERT_BUTTON_LABEL}"/>',
             'sugar_html' => 
-            array (
+            array(
               'type' => 'submit',
               'value' => '{$MOD.LBL_CONVERT_BUTTON_LABEL}',
               'htmlOptions' => 
-              array (
+              array(
                 'class' => 'button',
                 'name' => 'CONVERT_LEAD_BTN',
                 'id' => 'convert_target_button',
@@ -68,14 +68,14 @@ 
             ),
           ),
           4 => 
-          array (
+          array(
             'customCode' => '<input title="{$APP.LBL_MANAGE_SUBSCRIPTIONS}" class="button" onclick="this.form.return_module.value=\'Prospects\'; this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$fields.id.value}\'; this.form.action.value=\'Subscriptions\'; this.form.module.value=\'Campaigns\';" type="submit" name="Manage Subscriptions" value="{$APP.LBL_MANAGE_SUBSCRIPTIONS}"/>',
             'sugar_html' => 
-            array (
+            array(
               'type' => 'submit',
               'value' => '{$APP.LBL_MANAGE_SUBSCRIPTIONS}',
               'htmlOptions' => 
-              array (
+              array(
                 'class' => 'button',
                 'id' => 'manage_subscriptions_button',
                 'name' => 'Manage Subscriptions',
@@ -86,134 +86,134 @@ 
           ),
         ),
         'hidden' => 
-        array (
+        array(
           0 => '<input type="hidden" name="prospect_id" value="{$fields.id.value}">',
         ),
         'headerTpl' => 'modules/Prospects/tpls/DetailViewHeader.tpl',
       ),
       'maxColumns' => '2',
       'widths' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
         1 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
       ),
       'useTabs' => true,
       'tabDefs' => 
-      array (
+      array(
         'LBL_PROSPECT_INFORMATION' => 
-        array (
+        array(
           'newTab' => true,
           'panelDefault' => 'expanded',
         ),
         'LBL_MORE_INFORMATION' => 
-        array (
+        array(
           'newTab' => true,
           'panelDefault' => 'expanded',
         ),
         'LBL_PANEL_ASSIGNMENT' => 
-        array (
+        array(
           'newTab' => true,
           'panelDefault' => 'expanded',
         ),
       ),
     ),
     'panels' => 
-    array (
+    array(
       'lbl_prospect_information' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'full_name',
           ),
         ),
         1 => 
-        array (
+        array(
           0 => 'title',
           1 => 
-          array (
+          array(
             'name' => 'phone_work',
             'label' => 'LBL_OFFICE_PHONE',
           ),
         ),
         2 => 
-        array (
+        array(
           0 => 'department',
           1 => 'phone_mobile',
         ),
         3 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'account_name',
           ),
           1 => 'phone_fax',
         ),
         4 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'primary_address_street',
             'label' => 'LBL_PRIMARY_ADDRESS',
             'type' => 'address',
             'displayParams' => 
-            array (
+            array(
               'key' => 'primary',
             ),
           ),
           1 => 
-          array (
+          array(
             'name' => 'alt_address_street',
             'label' => 'LBL_ALTERNATE_ADDRESS',
             'type' => 'address',
             'displayParams' => 
-            array (
+            array(
               'key' => 'alt',
             ),
           ),
         ),
         5 => 
-        array (
+        array(
           0 => 'email1',
         ),
         6 => 
-        array (
+        array(
           0 => 'description',
         ),
         7 => 
-        array (
+        array(
           0 => 'assigned_user_name',
         ),
       ),
       'LBL_MORE_INFORMATION' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 'email_opt_out',
           1 => 'do_not_call',
         ),
       ),
       'LBL_PANEL_ASSIGNMENT' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'modified_by_name',
             'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}&nbsp;',
             'label' => 'LBL_DATE_MODIFIED',
           ),
           1 =>
-          array (
+          array(
             'name' => 'created_by_name',
             'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}&nbsp;',
             'label' => 'LBL_DATE_ENTERED',