adamjakab / SuiteCRM

modules/Opportunities/metadata/metafiles.php

Indentation +8 added lines, -8 removed lines

@@ -43,13 +43,13 @@
  * To change the template for this generated file go to
  * Window - Preferences - PHPeclipse - PHP - Code Templates
  */
- $metafiles['Opportunities'] = array(
-	'detailviewdefs'  => 	'modules/Opportunities/metadata/detailviewdefs.php', 	
-	'editviewdefs'    => 	'modules/Opportunities/metadata/editviewdefs.php',
- 	'listviewdefs'    => 	'modules/Opportunities/metadata/listviewdefs.php',
- 	'searchdefs'      =>    'modules/Opportunities/metadata/searchdefs.php',
- 	'popupdefs'	      =>    'modules/Opportunities/metadata/popupdefs.php',
- 	'searchfields'	  =>    'modules/Opportunities/metadata/SearchFields.php',
+    $metafiles['Opportunities'] = array(
+    'detailviewdefs'  => 	'modules/Opportunities/metadata/detailviewdefs.php', 	
+    'editviewdefs'    => 	'modules/Opportunities/metadata/editviewdefs.php',
+        'listviewdefs'    => 	'modules/Opportunities/metadata/listviewdefs.php',
+        'searchdefs'      =>    'modules/Opportunities/metadata/searchdefs.php',
+        'popupdefs'	      =>    'modules/Opportunities/metadata/popupdefs.php',
+        'searchfields'	  =>    'modules/Opportunities/metadata/SearchFields.php',
 
- );
+    );
 ?>

modules/Opportunities/metadata/listviewdefs.php

Indentation +34 added lines, -34 removed lines

@@ -42,43 +42,43 @@ 
 
 
 $listViewDefs['Opportunities'] = array(
-	'NAME' => array(
-		'width'   => '30',  
-		'label'   => 'LBL_LIST_OPPORTUNITY_NAME', 
-		'link'    => true,
+    'NAME' => array(
+        'width'   => '30',  
+        'label'   => 'LBL_LIST_OPPORTUNITY_NAME', 
+        'link'    => true,
         'default' => true),
-	'ACCOUNT_NAME' => array(
-		'width'   => '20', 
-		'label'   => 'LBL_LIST_ACCOUNT_NAME', 
-		'id'      => 'ACCOUNT_ID',
+    'ACCOUNT_NAME' => array(
+        'width'   => '20', 
+        'label'   => 'LBL_LIST_ACCOUNT_NAME', 
+        'id'      => 'ACCOUNT_ID',
         'module'  => 'Accounts',
-		'link'    => true,
+        'link'    => true,
         'default' => true,
         'sortable'=> true,
         'ACLTag' => 'ACCOUNT',
         'contextMenu' => array('objectType' => 'sugarAccount', 
-                               'metaData' => array('return_module' => 'Contacts', 
-                                                   'return_action' => 'ListView', 
-                                                   'module' => 'Accounts',
-                                                   'return_action' => 'ListView', 
-                                                   'parent_id' => '{$ACCOUNT_ID}', 
-                                                   'parent_name' => '{$ACCOUNT_NAME}', 
-                                                   'account_id' => '{$ACCOUNT_ID}', 
-                                                   'account_name' => '{$ACCOUNT_NAME}',
-                                                   ),
-                              ),
+                                'metaData' => array('return_module' => 'Contacts', 
+                                                    'return_action' => 'ListView', 
+                                                    'module' => 'Accounts',
+                                                    'return_action' => 'ListView', 
+                                                    'parent_id' => '{$ACCOUNT_ID}', 
+                                                    'parent_name' => '{$ACCOUNT_NAME}', 
+                                                    'account_id' => '{$ACCOUNT_ID}', 
+                                                    'account_name' => '{$ACCOUNT_NAME}',
+                                                    ),
+                                ),
         'related_fields' => array('account_id')),
-	'SALES_STAGE' => array(
-		'width'   => '10',  
-		'label'   => 'LBL_LIST_SALES_STAGE',
+    'SALES_STAGE' => array(
+        'width'   => '10',  
+        'label'   => 'LBL_LIST_SALES_STAGE',
         'default' => true), 
-	'AMOUNT_USDOLLAR' => array(
-		'width'   => '10', 
-		'label'   => 'LBL_LIST_AMOUNT_USDOLLAR',
+    'AMOUNT_USDOLLAR' => array(
+        'width'   => '10', 
+        'label'   => 'LBL_LIST_AMOUNT_USDOLLAR',
         'align'   => 'right',
         'default' => true,
         'currency_format' => true,
-	),  
+    ),  
     'OPPORTUNITY_TYPE' => array(
         'width' => '15', 
         'label' => 'LBL_TYPE'),
@@ -91,17 +91,17 @@ 
     'PROBABILITY' => array(
         'width' => '10', 
         'label' => 'LBL_PROBABILITY'),
-	'DATE_CLOSED' => array(
-		'width' => '10', 
-		'label' => 'LBL_LIST_DATE_CLOSED',
+    'DATE_CLOSED' => array(
+        'width' => '10', 
+        'label' => 'LBL_LIST_DATE_CLOSED',
         'default' => true),
     'CREATED_BY_NAME' => array(
         'width' => '10', 
         'label' => 'LBL_CREATED'),
-	'ASSIGNED_USER_NAME' => array(
-		'width' => '5', 
-		'label' => 'LBL_LIST_ASSIGNED_USER',
-		'module' => 'Employees',
+    'ASSIGNED_USER_NAME' => array(
+        'width' => '5', 
+        'label' => 'LBL_LIST_ASSIGNED_USER',
+        'module' => 'Employees',
         'id' => 'ASSIGNED_USER_ID',
         'default' => true),
     'MODIFIED_BY_NAME' => array(
@@ -110,7 +110,7 @@ 
     'DATE_ENTERED' => array(
         'width' => '10', 
         'label' => 'LBL_DATE_ENTERED',
-		'default' => true)
+        'default' => true)
 );
 
 ?>

modules/Opportunities/OpportunityFormBase.php

Indentation +129 added lines, -129 removed lines

@@ -45,97 +45,97 @@ 
 
 
 function checkForDuplicates($prefix){
-	require_once('include/formbase.php');
+    require_once('include/formbase.php');
 	
-	$focus = new Opportunity();
-	$query = '';
-	$baseQuery = 'select id, name, sales_stage,amount, date_closed  from opportunities where deleted!=1 and (';
-
-	if(isset($_POST[$prefix.'name']) && !empty($_POST[$prefix.'name'])){
-		$query = $baseQuery ."  name like '%".$_POST[$prefix.'name']."%'";
-		$query .= getLikeForEachWord('name', $_POST[$prefix.'name']);
-	}
-
-	if(!empty($query)){
-		$rows = array();
-		global $db;
-		$result = $db->query($query.')');
-		$i=-1;
-		while(($row=$db->fetchByAssoc($result)) != null) {
-			$i++;
-			$rows[$i] = $row;
-		}
-		if ($i==-1) return null;
+    $focus = new Opportunity();
+    $query = '';
+    $baseQuery = 'select id, name, sales_stage,amount, date_closed  from opportunities where deleted!=1 and (';
+
+    if(isset($_POST[$prefix.'name']) && !empty($_POST[$prefix.'name'])){
+        $query = $baseQuery ."  name like '%".$_POST[$prefix.'name']."%'";
+        $query .= getLikeForEachWord('name', $_POST[$prefix.'name']);
+    }
+
+    if(!empty($query)){
+        $rows = array();
+        global $db;
+        $result = $db->query($query.')');
+        $i=-1;
+        while(($row=$db->fetchByAssoc($result)) != null) {
+            $i++;
+            $rows[$i] = $row;
+        }
+        if ($i==-1) return null;
 		
-		return $rows;		
-	}
-	return null;
+        return $rows;		
+    }
+    return null;
 }
 
 
 function buildTableForm($rows, $mod='Opportunities'){
-	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;
-	$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='dupOpps'><input type='hidden' name='selectedOpportunity' value=''>";
-	$form .= "<table width='100%' cellpadding='0' cellspacing='0' class='list view'>";
-	$form .= "<tr class='pagination'><td colspan='$cols'><table width='100%' cellspacing='0' cellpadding='0' border='0'><tr><td><input type='submit' class='button' name='ContinueOpportunity' value='${mod_strings['LNK_NEW_OPPORTUNITY']}'></td></tr></table></td></tr><tr>";
-	$form .= "<tr><td scope='col'>&nbsp;</td>";
+    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;
+    $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='dupOpps'><input type='hidden' name='selectedOpportunity' value=''>";
+    $form .= "<table width='100%' cellpadding='0' cellspacing='0' class='list view'>";
+    $form .= "<tr class='pagination'><td colspan='$cols'><table width='100%' cellspacing='0' cellpadding='0' border='0'><tr><td><input type='submit' class='button' name='ContinueOpportunity' value='${mod_strings['LNK_NEW_OPPORTUNITY']}'></td></tr></table></td></tr><tr>";
+    $form .= "<tr><td scope='col'>&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'>";
-
-		$form .= "<td width='1%' nowrap='nowrap'><a href='#' onclick='document.dupOpps.selectedOpportunity.value=\"${row['id']}\";document.dupOpps.submit();'>[${app_strings['LBL_SELECT_BUTTON_LABEL']}]</a>&nbsp;&nbsp;</td>";
-		$wasSet = false;
-		foreach ($row as $key=>$value){
-				if($key != 'id'){
-					if(!$wasSet){
-					$form .= "<td scope='row'><a target='_blank' href='index.php?module=Opportunities&action=DetailView&record=${row['id']}'>$value</a></td>";
-					$wasSet = true;
-					}else{
-					$form .= "<td><a target='_blank' href='index.php?module=Opportunities&action=DetailView&record=${row['id']}'>$value</a></td>";
-					}
-				}}
-
-		if($rowColor == 'evenListRowS1'){
-			$rowColor = 'oddListRowS1';
-		}else{
-			 $rowColor = 'evenListRowS1';
-		}
-		$form .= "</tr>";
-	}
+    $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'>";
+
+        $form .= "<td width='1%' nowrap='nowrap'><a href='#' onclick='document.dupOpps.selectedOpportunity.value=\"${row['id']}\";document.dupOpps.submit();'>[${app_strings['LBL_SELECT_BUTTON_LABEL']}]</a>&nbsp;&nbsp;</td>";
+        $wasSet = false;
+        foreach ($row as $key=>$value){
+                if($key != 'id'){
+                    if(!$wasSet){
+                    $form .= "<td scope='row'><a target='_blank' href='index.php?module=Opportunities&action=DetailView&record=${row['id']}'>$value</a></td>";
+                    $wasSet = true;
+                    }else{
+                    $form .= "<td><a target='_blank' href='index.php?module=Opportunities&action=DetailView&record=${row['id']}'>$value</a></td>";
+                    }
+                }}
+
+        if($rowColor == 'evenListRowS1'){
+            $rowColor = 'oddListRowS1';
+        }else{
+                $rowColor = 'evenListRowS1';
+        }
+        $form .= "</tr>";
+    }
     $form .= "<tr class='pagination'><td colspan='$cols'><table width='100%' cellspacing='0' cellpadding='0' border='0'><tr><td><input type='submit' class='button' name='ContinueOpportunity' value='${mod_strings['LNK_NEW_OPPORTUNITY']}'></td></tr></table></td></tr><tr>";
-	$form .= "</table><BR></form>";
+    $form .= "</table><BR></form>";
 
-	return $form;
+    return $form;
 
 
 
 }
 
 function getForm($prefix, $mod='Opportunities'){
-	if(!ACLController::checkAccess('Opportunities', 'edit', true)){
-		return '';
-	}
+    if(!ACLController::checkAccess('Opportunities', 'edit', true)){
+        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;
 global $sugar_version, $sugar_config;
@@ -165,18 +165,18 @@ 
 }
 
 function getWideFormBody($prefix, $mod='Opportunities', $formname='', $lead='', $showaccount = true){
-	if(!ACLController::checkAccess('Opportunities', 'edit', true)){
-		return '';
-	}
-	if(empty($lead)){
-		$lead = new Lead();
-	}
+    if(!ACLController::checkAccess('Opportunities', 'edit', true)){
+        return '';
+    }
+    if(empty($lead)){
+        $lead = new Lead();
+    }
 global $mod_strings, $sugar_config;
 $showaccount = $showaccount && $sugar_config['require_accounts'];
 $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;
@@ -215,9 +215,9 @@ 
 $ntc_date_format = $timedate->get_user_date_format();
 $cal_dateformat = $timedate->get_cal_date_format();
 if (isset($lead->assigned_user_id)) {
-	$user_id=$lead->assigned_user_id;
+    $user_id=$lead->assigned_user_id;
 } else {
-	$user_id = $current_user->id;
+    $user_id = $current_user->id;
 }
 
 
@@ -229,9 +229,9 @@ 
 
 
 if (isset($lead->opportunity_amount)) {
-	$opp_amount=$lead->opportunity_amount;
+    $opp_amount=$lead->opportunity_amount;
 } else {
- 	$opp_amount='';
+        $opp_amount='';
 }
 $jsCalendarImage = SugarThemeRegistry::current()->getImageURL('jscalendar.gif');
 $the_form .= <<<EOQ
@@ -257,7 +257,7 @@ 
 </tr>
 EOQ;
 if($showaccount){
-	$the_form .= <<<EOQ
+    $the_form .= <<<EOQ
 <tr>
     <td scope="row">${mod_strings['LBL_ACCOUNT_NAME']}&nbsp;<span class="required">${lbl_required_symbol}</span></td>
 </tr>
@@ -285,9 +285,9 @@ 
 </tr>
 EOQ;
 //carry forward custom lead fields to opportunities during Lead Conversion
-	$tempOpp = new Opportunity();
-	if (method_exists($lead, 'convertCustomFieldsForm')) $lead->convertCustomFieldsForm($the_form, $tempOpp, $prefix);
-	unset($tempOpp);
+    $tempOpp = new Opportunity();
+    if (method_exists($lead, 'convertCustomFieldsForm')) $lead->convertCustomFieldsForm($the_form, $tempOpp, $prefix);
+    unset($tempOpp);
 
 $the_form .= <<<EOQ
 
@@ -315,12 +315,12 @@ 
 } // end getWideFormBody
 
 function getFormBody($prefix, $mod='Opportunities', $formname=''){
-	if(!ACLController::checkAccess('Opportunities', 'edit', true)){
-		return '';
-	}
+    if(!ACLController::checkAccess('Opportunities', 'edit', true)){
+        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;
 global $app_list_strings;
@@ -363,13 +363,13 @@ 
 /// SETUP ACCOUNT POPUP
 
 $popup_request_data = array(
-	'call_back_function' => 'set_return',
-	'form_name' => "{$prefix}OppSave",
-	'field_to_name_array' => array(
-		'id' => 'account_id',
-		'name' => 'account_name',
-		),
-	);
+    'call_back_function' => 'set_return',
+    'form_name' => "{$prefix}OppSave",
+    'field_to_name_array' => array(
+        'id' => 'account_id',
+        'name' => 'account_name',
+        ),
+    );
 
 $json = getJSONobj();
 $encoded_popup_request_data = $json->encode($popup_request_data);
@@ -429,12 +429,12 @@ 
     global $current_user;
 	
 	
-	require_once('include/formbase.php');
+    require_once('include/formbase.php');
 	
-	$focus = new Opportunity();
-	if($useRequired &&  !checkRequired($prefix, array_keys($focus->required_fields))){
-		return null;
-	}
+    $focus = new Opportunity();
+    if($useRequired &&  !checkRequired($prefix, array_keys($focus->required_fields))){
+        return null;
+    }
 
     if(empty($_POST['currency_id'])){
         $currency_id = $current_user->getPreference('currency');
@@ -442,28 +442,28 @@ 
             $focus->currency_id =   $currency_id;
         }
     }
-	$focus = populateFromPost($prefix, $focus);
-	if( !ACLController::checkAccess($focus->module_dir, 'edit', $focus->isOwner($current_user->id))){
-		ACLController::displayNoAccess(true);
-	}
-	$check_notify = FALSE;
-	if (isset($GLOBALS['check_notify'])) {
-		$check_notify = $GLOBALS['check_notify'];
-	}
-
-	$focus->save($check_notify);
-
-	if(!empty($_POST['duplicate_parent_id'])){
-		clone_relationship($focus->db, array('opportunities_contacts'),'opportunity_id',  $_POST['duplicate_parent_id'], $focus->id);
-	}
-	$return_id = $focus->id;
+    $focus = populateFromPost($prefix, $focus);
+    if( !ACLController::checkAccess($focus->module_dir, 'edit', $focus->isOwner($current_user->id))){
+        ACLController::displayNoAccess(true);
+    }
+    $check_notify = FALSE;
+    if (isset($GLOBALS['check_notify'])) {
+        $check_notify = $GLOBALS['check_notify'];
+    }
+
+    $focus->save($check_notify);
+
+    if(!empty($_POST['duplicate_parent_id'])){
+        clone_relationship($focus->db, array('opportunities_contacts'),'opportunity_id',  $_POST['duplicate_parent_id'], $focus->id);
+    }
+    $return_id = $focus->id;
 	
-	$GLOBALS['log']->debug("Saved record with id of ".$return_id);
-	if($redirect){
-		handleRedirect($return_id,"Opportunities" );
-	}else{
-		return $focus;
-	}
+    $GLOBALS['log']->debug("Saved record with id of ".$return_id);
+    if($redirect){
+        handleRedirect($return_id,"Opportunities" );
+    }else{
+        return $focus;
+    }
 }
 
 }

modules/ProspectLists/field_arrays.php

Indentation +8 added lines, -8 removed lines

@@ -46,15 +46,15 @@
  * Contributor(s): ______________________________________..
  ********************************************************************************/
 $fields_array['ProspectList'] = array ('column_fields' => array(
-				"id", "date_entered",
-				"date_modified", "modified_user_id",
-				"assigned_user_id", "created_by",
-				"name", "description",'list_type','domain_name',
-	),
+                "id", "date_entered",
+                "date_modified", "modified_user_id",
+                "assigned_user_id", "created_by",
+                "name", "description",'list_type','domain_name',
+    ),
         'list_fields' =>  array(
-				'id', 'name', 'description','list_type',
-				'assigned_user_id','assigned_user_name',
-	),
+                'id', 'name', 'description','list_type',
+                'assigned_user_id','assigned_user_name',
+    ),
     'required_fields' =>  array('name'=>1,'list_type'=>2),
 );
 ?>
\ No newline at end of file

modules/ProspectLists/ProspectListFormBase.php

Indentation +71 added lines, -71 removed lines

@@ -52,71 +52,71 @@ 
 
 function getForm($prefix, $mod='', $form=''){
 	
-	if(!ACLController::checkAccess('ProspectLists', 'edit', true)){
-		return '';
-	}
+    if(!ACLController::checkAccess('ProspectLists', 'edit', true)){
+        return '';
+    }
 	
-	if(!empty($mod)){
-		global $current_language;
-		$mod_strings = return_module_language($current_language, $mod);
-	} else {
-		global $mod_strings;
-	}
-	global $app_strings,$current_user;
+    if(!empty($mod)){
+        global $current_language;
+        $mod_strings = return_module_language($current_language, $mod);
+    } else {
+        global $mod_strings;
+    }
+    global $app_strings,$current_user;
 	
-	$lbl_save_button_title = $app_strings['LBL_SAVE_BUTTON_TITLE'];
-	$lbl_save_button_key = $app_strings['LBL_SAVE_BUTTON_KEY'];
-	$lbl_save_button_label = $app_strings['LBL_SAVE_BUTTON_LABEL'];
-	$user_id = $current_user->id;
+    $lbl_save_button_title = $app_strings['LBL_SAVE_BUTTON_TITLE'];
+    $lbl_save_button_key = $app_strings['LBL_SAVE_BUTTON_KEY'];
+    $lbl_save_button_label = $app_strings['LBL_SAVE_BUTTON_LABEL'];
+    $user_id = $current_user->id;
 
 
-	$the_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
-	$the_form .= <<<EOQ
+    $the_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
+    $the_form .= <<<EOQ
 		<form name="${prefix}ProspectListSave" onSubmit="return check_form('${prefix}ProspectListSave');" method="POST" action="index.php">
 			<input type="hidden" name="${prefix}module" value="ProspectLists">
 			<input type="hidden" name="${prefix}action" value="Save">
 			<input type="hidden" name="assigned_user_id" value='${user_id}'>
 EOQ;
 
-	$the_form .= $this->getFormBody($prefix, $mod, $prefix."ProspectListSave");
-	$the_form .= <<<EOQ
+    $the_form .= $this->getFormBody($prefix, $mod, $prefix."ProspectListSave");
+    $the_form .= <<<EOQ
 		<p><input title="$lbl_save_button_title" accessKey="$lbl_save_button_key" class="button" type="submit" name="button" value="  $lbl_save_button_label  " ></p>
 		</form>
 
 EOQ;
 
-	$the_form .= get_left_form_footer();
-	$the_form .= get_validate_record_js();
+    $the_form .= get_left_form_footer();
+    $the_form .= get_validate_record_js();
 
-	return $the_form;	
+    return $the_form;	
 }
 
 function getFormBody($prefix, $mod='',$formname='', $size='30',$script=true) {
-	if(!ACLController::checkAccess('ProspectLists', '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 $app_strings;
-	global $current_user;
-	global $app_list_strings;
+    if(!ACLController::checkAccess('ProspectLists', '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 $app_strings;
+    global $current_user;
+    global $app_list_strings;
 	
-	$lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL'];
-	$lbl_save_button_title = $app_strings['LBL_SAVE_BUTTON_TITLE'];
-	$lbl_save_button_key = $app_strings['LBL_SAVE_BUTTON_KEY'];
-	$lbl_save_button_label = $app_strings['LBL_SAVE_BUTTON_LABEL'];
-	$user_id = $current_user->id;
+    $lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL'];
+    $lbl_save_button_title = $app_strings['LBL_SAVE_BUTTON_TITLE'];
+    $lbl_save_button_key = $app_strings['LBL_SAVE_BUTTON_KEY'];
+    $lbl_save_button_label = $app_strings['LBL_SAVE_BUTTON_LABEL'];
+    $user_id = $current_user->id;
 
-	$list_options=get_select_options_with_id($app_list_strings['prospect_list_type_dom'], 'default');
+    $list_options=get_select_options_with_id($app_list_strings['prospect_list_type_dom'], 'default');
 	
-	$lbl_prospect_list_name = $mod_strings['LBL_PROSPECT_LIST_NAME'];
-	$lbl_list_type = $mod_strings['LBL_LIST_TYPE'];
+    $lbl_prospect_list_name = $mod_strings['LBL_PROSPECT_LIST_NAME'];
+    $lbl_list_type = $mod_strings['LBL_LIST_TYPE'];
 	
-	$form = <<<EOQ
+    $form = <<<EOQ
 			<p><input type="hidden" name="record" value="">
 			$lbl_prospect_list_name&nbsp;<span class="required">$lbl_required_symbol</span><br>
 			<input name='name' type="text" value=""><br>
@@ -126,43 +126,43 @@ 
 
 	
 	
-	$javascript = new javascript();
-	$javascript->setFormName($formname);
-	$javascript->setSugarBean(new ProspectList());
-	$javascript->addRequiredFields($prefix);
-	$form .=$javascript->getScript();
-	$mod_strings = $temp_strings;
-	return $form;
+    $javascript = new javascript();
+    $javascript->setFormName($formname);
+    $javascript->setSugarBean(new ProspectList());
+    $javascript->addRequiredFields($prefix);
+    $form .=$javascript->getScript();
+    $mod_strings = $temp_strings;
+    return $form;
 }
 
-	function handleSave($prefix,$redirect=true, $useRequired=false){
+    function handleSave($prefix,$redirect=true, $useRequired=false){
 		
 		
-		require_once('include/formbase.php');
+        require_once('include/formbase.php');
 	
 		
-		$focus = new ProspectList();
-		if($useRequired &&  !checkRequired($prefix, array_keys($focus->required_fields))){
-			return null;
-		}
-		$focus = populateFromPost($prefix, $focus);
-		if(!$focus->ACLAccess('Save')){
-			ACLController::displayNoAccess(true);
-			sugar_cleanup(true);
-		}
-		if(empty($focus->name)){
-			return null;
-		}	
+        $focus = new ProspectList();
+        if($useRequired &&  !checkRequired($prefix, array_keys($focus->required_fields))){
+            return null;
+        }
+        $focus = populateFromPost($prefix, $focus);
+        if(!$focus->ACLAccess('Save')){
+            ACLController::displayNoAccess(true);
+            sugar_cleanup(true);
+        }
+        if(empty($focus->name)){
+            return null;
+        }	
         if ( !isset($focus->assigned_user_id) || $focus->assigned_user_id == '' )
             $focus->assigned_user_id = $GLOBALS['current_user']->id;
 	
-		$return_id = $focus->save();
-		if($redirect){
-			$GLOBALS['log']->debug("Saved record with id of ".$return_id);
-			handleRedirect($return_id, "ProspectLists");
-		} else { 
-			return $focus;
-		}
-	}
+        $return_id = $focus->save();
+        if($redirect){
+            $GLOBALS['log']->debug("Saved record with id of ".$return_id);
+            handleRedirect($return_id, "ProspectLists");
+        } else { 
+            return $focus;
+        }
+    }
 }
 ?>

modules/ProspectLists/TargetListUpdate.php

Indentation +33 added lines, -33 removed lines

@@ -54,42 +54,42 @@
 
 $uids = array();
 if($_REQUEST['select_entire_list'] == '1'){
-	$order_by = '';
+    $order_by = '';
 
-	require_once('include/MassUpdate.php');
-	$mass = new MassUpdate();
-	$mass->generateSearchWhere($_REQUEST['module'], $_REQUEST['current_query_by_page']);
-	$ret_array = create_export_query_relate_link_patch($_REQUEST['module'], $mass->searchFields, $mass->where_clauses);
-	/* BEGIN - SECURITY GROUPS */
-	//need to hijack the $ret_array['where'] of securitygorup required
-	if($focus->bean_implements('ACL') && ACLController::requireSecurityGroup($focus->module_dir, 'list') )
-	{
-		require_once('modules/SecurityGroups/SecurityGroup.php');
-		global $current_user;
-		$owner_where = $focus->getOwnerWhere($current_user->id);
-		$group_where = SecurityGroup::getGroupWhere($focus->table_name,$focus->module_dir,$current_user->id);
-		if(!empty($owner_where)){
-			if(empty($ret_array['where']))
-			{
-				$ret_array['where'] = " (".  $owner_where." or ".$group_where.") ";
-			} else {
-				$ret_array['where'] .= " AND (".  $owner_where." or ".$group_where.") ";
-			}
-		} else {
-			$ret_array['where'] .= ' AND '.  $group_where;
-		}
-	}
-	/* END - SECURITY GROUPS */
-	$query = $focus->create_export_query($order_by, $ret_array['where'], $ret_array['join']);
-	$result = $GLOBALS['db']->query($query,true);
-	$uids = array();
-	while($val = $GLOBALS['db']->fetchByAssoc($result,false))
-	{
-		array_push($uids, $val['id']);
-	}
+    require_once('include/MassUpdate.php');
+    $mass = new MassUpdate();
+    $mass->generateSearchWhere($_REQUEST['module'], $_REQUEST['current_query_by_page']);
+    $ret_array = create_export_query_relate_link_patch($_REQUEST['module'], $mass->searchFields, $mass->where_clauses);
+    /* BEGIN - SECURITY GROUPS */
+    //need to hijack the $ret_array['where'] of securitygorup required
+    if($focus->bean_implements('ACL') && ACLController::requireSecurityGroup($focus->module_dir, 'list') )
+    {
+        require_once('modules/SecurityGroups/SecurityGroup.php');
+        global $current_user;
+        $owner_where = $focus->getOwnerWhere($current_user->id);
+        $group_where = SecurityGroup::getGroupWhere($focus->table_name,$focus->module_dir,$current_user->id);
+        if(!empty($owner_where)){
+            if(empty($ret_array['where']))
+            {
+                $ret_array['where'] = " (".  $owner_where." or ".$group_where.") ";
+            } else {
+                $ret_array['where'] .= " AND (".  $owner_where." or ".$group_where.") ";
+            }
+        } else {
+            $ret_array['where'] .= ' AND '.  $group_where;
+        }
+    }
+    /* END - SECURITY GROUPS */
+    $query = $focus->create_export_query($order_by, $ret_array['where'], $ret_array['join']);
+    $result = $GLOBALS['db']->query($query,true);
+    $uids = array();
+    while($val = $GLOBALS['db']->fetchByAssoc($result,false))
+    {
+        array_push($uids, $val['id']);
+    }
 }
 else{
-	$uids = explode ( ',', $_POST['uids'] );
+    $uids = explode ( ',', $_POST['uids'] );
 }
 
 // find the relationship to use

modules/ProspectLists/ProspectList.php

Indentation +201 added lines, -201 removed lines

@@ -50,107 +50,107 @@ 
 
 
 class ProspectList extends SugarBean {
-	var $field_name_map;
+    var $field_name_map;
 	
-	// Stored fields
-	var $id;
-	var $date_entered;
-	var $date_modified;
-	var $modified_user_id;
-	var $assigned_user_id;
-	var $created_by;
-	var $created_by_name;
-	var $modified_by_name;
-	var $list_type;
-	var $domain_name;
-
-	var $name;
-	var $description;
+    // Stored fields
+    var $id;
+    var $date_entered;
+    var $date_modified;
+    var $modified_user_id;
+    var $assigned_user_id;
+    var $created_by;
+    var $created_by_name;
+    var $modified_by_name;
+    var $list_type;
+    var $domain_name;
+
+    var $name;
+    var $description;
 	
-	// These are related
-	var $assigned_user_name;
-	var $prospect_id;
-	var $contact_id;
-	var $lead_id;
-
-	// module name definitions and table relations
-	var $table_name = "prospect_lists";
-	var $module_dir = 'ProspectLists';
-	var $rel_prospects_table = "prospect_lists_prospects";
-	var $object_name = "ProspectList";
-
-	// This is used to retrieve related fields from form posts.
-	var $additional_column_fields = array(
-		'assigned_user_name', 'assigned_user_id', 'campaign_id',
-	);
-	var $relationship_fields = array(
-		'campaign_id'=>'campaigns',
-		'prospect_list_prospects' => 'prospects',
-	);
+    // These are related
+    var $assigned_user_name;
+    var $prospect_id;
+    var $contact_id;
+    var $lead_id;
+
+    // module name definitions and table relations
+    var $table_name = "prospect_lists";
+    var $module_dir = 'ProspectLists';
+    var $rel_prospects_table = "prospect_lists_prospects";
+    var $object_name = "ProspectList";
+
+    // This is used to retrieve related fields from form posts.
+    var $additional_column_fields = array(
+        'assigned_user_name', 'assigned_user_id', 'campaign_id',
+    );
+    var $relationship_fields = array(
+        'campaign_id'=>'campaigns',
+        'prospect_list_prospects' => 'prospects',
+    );
 
     var $entry_count;
     
-	function ProspectList() {
-		global $sugar_config;
-		parent::SugarBean();
+    function ProspectList() {
+        global $sugar_config;
+        parent::SugarBean();
 		
-	}
+    }
 
-	var $new_schema = true;
+    var $new_schema = true;
 
-	function get_summary_text()
-	{
-		return "$this->name";
-	}
+    function get_summary_text()
+    {
+        return "$this->name";
+    }
 
-	function create_list_query($order_by, $where, $show_deleted = 0)
-	{
+    function create_list_query($order_by, $where, $show_deleted = 0)
+    {
         $custom_join = $this->getCustomJoin();
 		
-		$query = "SELECT ";
-		$query .= "users.user_name as assigned_user_name, ";
-		$query .= "prospect_lists.*";
+        $query = "SELECT ";
+        $query .= "users.user_name as assigned_user_name, ";
+        $query .= "prospect_lists.*";
 
         $query .= $custom_join['select'];
-		$query .= " FROM prospect_lists ";
+        $query .= " FROM prospect_lists ";
 
-		$query .= "LEFT JOIN users
+        $query .= "LEFT JOIN users
 					ON prospect_lists.assigned_user_id=users.id ";
 
         $query .= $custom_join['join'];
 
-			$where_auto = '1=1';
-				if($show_deleted == 0){
-                	$where_auto = "$this->table_name.deleted=0";
-				}else if($show_deleted == 1){
-                	$where_auto = "$this->table_name.deleted=1";
-				}
+            $where_auto = '1=1';
+                if($show_deleted == 0){
+                    $where_auto = "$this->table_name.deleted=0";
+                }else if($show_deleted == 1){
+                    $where_auto = "$this->table_name.deleted=1";
+                }
 
-		if($where != "")
-			$query .= "where $where AND ".$where_auto;
-		else
-			$query .= "where ".$where_auto;
+        if($where != "")
+            $query .= "where $where AND ".$where_auto;
+        else
+            $query .= "where ".$where_auto;
 
-		if($order_by != "")
-			$query .= " ORDER BY $order_by";
-		else
-			$query .= " ORDER BY prospect_lists.name";
+        if($order_by != "")
+            $query .= " ORDER BY $order_by";
+        else
+            $query .= " ORDER BY prospect_lists.name";
 
-		return $query;
-	}
+        return $query;
+    }
 
 
-	function create_export_query($order_by, $where)
-	{
+    function create_export_query($order_by, $where)
+    {
 
                                 $query = "SELECT
                                 prospect_lists.*,
                                 users.user_name as assigned_user_name ";
-	                            $query .= "FROM prospect_lists ";
-		$query .= 				"LEFT JOIN users
+                                $query .= "FROM prospect_lists ";
+        $query .= 				"LEFT JOIN users
                                 ON prospect_lists.assigned_user_id=users.id ";
 
-		$where_auto = " prospect_lists.deleted=0";
+        $where_auto = " prospect_lists.deleted=0";
 
         if($where != "")
                 $query .= " WHERE $where AND ".$where_auto;
@@ -164,47 +164,47 @@ 
         return $query;
     }
 
-	function create_export_members_query($record_id)
-	{
-		$members = array(	'Accounts' 	=> array('has_custom_fields' => false, 'fields' => array()), 
-					'Contacts' 	=> array('has_custom_fields' => false, 'fields' => array()),
-					'Users' 	=> array('has_custom_fields' => false, 'fields' => array()),
-					'Prospects' 	=> array('has_custom_fields' => false, 'fields' => array()),
-					'Leads' 	=> array('has_custom_fields' => false, 'fields' => array())
-				);
-
-		// query all custom fields in the fields_meta_data table for the modules which are being exported 
-		$db = DBManagerFactory::getInstance();
-		$result = $db->query("select name, custom_module from fields_meta_data where custom_module in ('" . 
-					implode("', '", array_keys($members)) . "')",
-					true,
-					"ProspectList::create_export_members_query() : error querying custom fields");
-
-		// cycle through the custom fields and put them in the members array according to 
-		// what module the field belongs
-		// take into account that the same custom field may exist in more modules
-		while($val = $db->fetchByAssoc($result, false)) 
-		{
-			$fieldname = $val['name'];
-
-			foreach($members as $membername => &$memberarr)	
-			{
-				// if the field belongs to this module, then query it in the cstm table
-				if ($membername == $val['custom_module'])
-				{
-					$memberarr['has_custom_fields'] = true;
-					$memberarr['fields'][$fieldname] = 
-						strtolower($membername) . '_cstm.'.$fieldname . ' AS ' . $fieldname;
-				}
-				// else, only if for this module no entry exists for this field, query an empty string
-				else if (!isset($memberarr['fields'][$val['name']]))
-				{
-					$memberarr['fields'][$fieldname] = "'' AS " . $fieldname;
-				}
-			}
-		}
-
-		$leads_query = "SELECT l.id AS id, 'Leads' AS related_type, '' AS \"name\", l.first_name AS first_name, l.last_name AS last_name, l.title AS title, l.salutation AS salutation, 
+    function create_export_members_query($record_id)
+    {
+        $members = array(	'Accounts' 	=> array('has_custom_fields' => false, 'fields' => array()), 
+                    'Contacts' 	=> array('has_custom_fields' => false, 'fields' => array()),
+                    'Users' 	=> array('has_custom_fields' => false, 'fields' => array()),
+                    'Prospects' 	=> array('has_custom_fields' => false, 'fields' => array()),
+                    'Leads' 	=> array('has_custom_fields' => false, 'fields' => array())
+                );
+
+        // query all custom fields in the fields_meta_data table for the modules which are being exported 
+        $db = DBManagerFactory::getInstance();
+        $result = $db->query("select name, custom_module from fields_meta_data where custom_module in ('" . 
+                    implode("', '", array_keys($members)) . "')",
+                    true,
+                    "ProspectList::create_export_members_query() : error querying custom fields");
+
+        // cycle through the custom fields and put them in the members array according to 
+        // what module the field belongs
+        // take into account that the same custom field may exist in more modules
+        while($val = $db->fetchByAssoc($result, false)) 
+        {
+            $fieldname = $val['name'];
+
+            foreach($members as $membername => &$memberarr)	
+            {
+                // if the field belongs to this module, then query it in the cstm table
+                if ($membername == $val['custom_module'])
+                {
+                    $memberarr['has_custom_fields'] = true;
+                    $memberarr['fields'][$fieldname] = 
+                        strtolower($membername) . '_cstm.'.$fieldname . ' AS ' . $fieldname;
+                }
+                // else, only if for this module no entry exists for this field, query an empty string
+                else if (!isset($memberarr['fields'][$val['name']]))
+                {
+                    $memberarr['fields'][$fieldname] = "'' AS " . $fieldname;
+                }
+            }
+        }
+
+        $leads_query = "SELECT l.id AS id, 'Leads' AS related_type, '' AS \"name\", l.first_name AS first_name, l.last_name AS last_name, l.title AS title, l.salutation AS salutation, 
 				l.primary_address_street AS primary_address_street,l.primary_address_city AS primary_address_city, l.primary_address_state AS primary_address_state, l.primary_address_postalcode AS primary_address_postalcode, l.primary_address_country AS primary_address_country,
 				l.account_name AS account_name,
 				ea.email_address AS primary_email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
@@ -219,7 +219,7 @@ 
 				AND l.deleted=0
 				AND (ear.deleted=0 OR ear.deleted IS NULL)";
 
-		$users_query = "SELECT u.id AS id, 'Users' AS related_type, '' AS \"name\", u.first_name AS first_name, u.last_name AS last_name,u.title AS title, '' AS salutation, 
+        $users_query = "SELECT u.id AS id, 'Users' AS related_type, '' AS \"name\", u.first_name AS first_name, u.last_name AS last_name,u.title AS title, '' AS salutation, 
 				u.address_street AS primary_address_street,u.address_city AS primary_address_city, u.address_state AS primary_address_state,  u.address_postalcode AS primary_address_postalcode, u.address_country AS primary_address_country,
 				'' AS account_name,
 				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
@@ -234,7 +234,7 @@ 
 				AND u.deleted=0
 				AND (ear.deleted=0 OR ear.deleted IS NULL)";
 
-		$contacts_query = "SELECT c.id AS id, 'Contacts' AS related_type, '' AS \"name\", c.first_name AS first_name, c.last_name AS last_name,c.title AS title, c.salutation AS salutation, 
+        $contacts_query = "SELECT c.id AS id, 'Contacts' AS related_type, '' AS \"name\", c.first_name AS first_name, c.last_name AS last_name,c.title AS title, c.salutation AS salutation, 
 				c.primary_address_street AS primary_address_street,c.primary_address_city AS primary_address_city, c.primary_address_state AS primary_address_state,  c.primary_address_postalcode AS primary_address_postalcode, c.primary_address_country AS primary_address_country,
 				a.name AS account_name,
 				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
@@ -250,7 +250,7 @@ 
 				AND ac.deleted=0
                 AND (ear.deleted=0 OR ear.deleted IS NULL)";
 
-		$prospects_query = "SELECT p.id AS id, 'Prospects' AS related_type, '' AS \"name\", p.first_name AS first_name, p.last_name AS last_name,p.title AS title, p.salutation AS salutation, 
+        $prospects_query = "SELECT p.id AS id, 'Prospects' AS related_type, '' AS \"name\", p.first_name AS first_name, p.last_name AS last_name,p.title AS title, p.salutation AS salutation, 
 				p.primary_address_street AS primary_address_street,p.primary_address_city AS primary_address_city, p.primary_address_state AS primary_address_state,  p.primary_address_postalcode AS primary_address_postalcode, p.primary_address_country AS primary_address_country,
 				p.account_name AS account_name,
 				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
@@ -265,7 +265,7 @@ 
 				AND p.deleted=0
 				AND (ear.deleted=0 OR ear.deleted IS NULL)";
 
-		$accounts_query = "SELECT a.id AS id, 'Accounts' AS related_type, a.name AS \"name\", '' AS first_name, '' AS last_name,'' AS title, '' AS salutation, 
+        $accounts_query = "SELECT a.id AS id, 'Accounts' AS related_type, a.name AS \"name\", '' AS first_name, '' AS last_name,'' AS title, '' AS salutation, 
 				a.billing_address_street AS primary_address_street,a.billing_address_city AS primary_address_city, a.billing_address_state AS primary_address_state, a.billing_address_postalcode AS primary_address_postalcode, a.billing_address_country AS primary_address_country,
 				'' AS account_name,
 				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
@@ -279,115 +279,115 @@ 
 				WHERE plp.prospect_list_id = $record_id  AND plp.deleted=0 
 				AND a.deleted=0
 				AND (ear.deleted=0 OR ear.deleted IS NULL)";
-		$order_by = "ORDER BY related_type, id, primary_address DESC";
-		$query = "$leads_query UNION ALL $users_query UNION ALL $contacts_query UNION ALL $prospects_query UNION ALL $accounts_query $order_by";
-		return $query;
-	}
+        $order_by = "ORDER BY related_type, id, primary_address DESC";
+        $query = "$leads_query UNION ALL $users_query UNION ALL $contacts_query UNION ALL $prospects_query UNION ALL $accounts_query $order_by";
+        return $query;
+    }
 	
-	function save_relationship_changes($is_update, $exclude = array())
+    function save_relationship_changes($is_update, $exclude = array())
     {
-    	parent::save_relationship_changes($is_update, $exclude);
-		if($this->lead_id != "")
-	   		$this->set_prospect_relationship($this->id, $this->lead_id, "lead");
-    	if($this->contact_id != "")
-    		$this->set_prospect_relationship($this->id, $this->contact_id, "contact");
-    	if($this->prospect_id != "")
-    		$this->set_prospect_relationship($this->id, $this->contact_id, "prospect");
+        parent::save_relationship_changes($is_update, $exclude);
+        if($this->lead_id != "")
+                $this->set_prospect_relationship($this->id, $this->lead_id, "lead");
+        if($this->contact_id != "")
+            $this->set_prospect_relationship($this->id, $this->contact_id, "contact");
+        if($this->prospect_id != "")
+            $this->set_prospect_relationship($this->id, $this->contact_id, "prospect");
     }
 
-	function set_prospect_relationship($prospect_list_id, &$link_ids, $link_name)
-	{
-		$link_field = sprintf("%s_id", $link_name);
+    function set_prospect_relationship($prospect_list_id, &$link_ids, $link_name)
+    {
+        $link_field = sprintf("%s_id", $link_name);
 		
-		foreach($link_ids as $link_id)
-		{
-			$this->set_relationship('prospect_lists_prospects', array( $link_field=>$link_id, 'prospect_list_id'=>$prospect_list_id ));
-		}
-	}
-
-	function set_prospect_relationship_single($prospect_list_id, $link_id, $link_name)
-	{
-		$link_field = sprintf("%s_id", $link_name);
+        foreach($link_ids as $link_id)
+        {
+            $this->set_relationship('prospect_lists_prospects', array( $link_field=>$link_id, 'prospect_list_id'=>$prospect_list_id ));
+        }
+    }
+
+    function set_prospect_relationship_single($prospect_list_id, $link_id, $link_name)
+    {
+        $link_field = sprintf("%s_id", $link_name);
 		
-		$this->set_relationship('prospect_lists_prospects', array( $link_field=>$link_id, 'prospect_list_id'=>$prospect_list_id ));
-	}
+        $this->set_relationship('prospect_lists_prospects', array( $link_field=>$link_id, 'prospect_list_id'=>$prospect_list_id ));
+    }
 
 
-	function clear_prospect_relationship($prospect_list_id, $link_id, $link_name)
-	{
-		$link_field = sprintf("%s_id", $link_name);
-		$where_clause = " AND $link_field = '$link_id' ";
+    function clear_prospect_relationship($prospect_list_id, $link_id, $link_name)
+    {
+        $link_field = sprintf("%s_id", $link_name);
+        $where_clause = " AND $link_field = '$link_id' ";
 		
-		$query = sprintf("DELETE FROM prospect_lists_prospects WHERE prospect_list_id='%s' AND deleted = '0' %s", $prospect_list_id, $where_clause);
+        $query = sprintf("DELETE FROM prospect_lists_prospects WHERE prospect_list_id='%s' AND deleted = '0' %s", $prospect_list_id, $where_clause);
 	
-		$this->db->query($query, true, "Error clearing prospect/prospect_list relationship: ");
-	}
+        $this->db->query($query, true, "Error clearing prospect/prospect_list relationship: ");
+    }
 	
 
-	function mark_relationships_deleted($id)
-	{
-	}
+    function mark_relationships_deleted($id)
+    {
+    }
 
-	function fill_in_additional_list_fields()
-	{
-	}
+    function fill_in_additional_list_fields()
+    {
+    }
 
-	function fill_in_additional_detail_fields()
-	{
-		parent::fill_in_additional_detail_fields();
+    function fill_in_additional_detail_fields()
+    {
+        parent::fill_in_additional_detail_fields();
         $this->entry_count = $this->get_entry_count();
-	}
+    }
 
 	
-	function update_currency_id($fromid, $toid){
-	}
+    function update_currency_id($fromid, $toid){
+    }
 
 
-	function get_entry_count()
-	{
-		$query = "SELECT count(*) AS num FROM prospect_lists_prospects WHERE prospect_list_id='$this->id' AND deleted = '0'";
-		$result = $this->db->query($query, true, "Grabbing prospect_list entry count");
+    function get_entry_count()
+    {
+        $query = "SELECT count(*) AS num FROM prospect_lists_prospects WHERE prospect_list_id='$this->id' AND deleted = '0'";
+        $result = $this->db->query($query, true, "Grabbing prospect_list entry count");
 		
-		$row = $this->db->fetchByAssoc($result);
+        $row = $this->db->fetchByAssoc($result);
 
-		if($row)
-			return $row['num'];
-		else
-			return 0;
-	}
+        if($row)
+            return $row['num'];
+        else
+            return 0;
+    }
 		
 		
-	function get_list_view_data(){
-		$temp_array = $this->get_list_view_array();
-		$temp_array["ENTRY_COUNT"] = $this->get_entry_count();		
-		return $temp_array;
-	}
-	/**
+    function get_list_view_data(){
+        $temp_array = $this->get_list_view_array();
+        $temp_array["ENTRY_COUNT"] = $this->get_entry_count();		
+        return $temp_array;
+    }
+    /**
 		builds a generic search based on the query string using or
 		do not include any $this-> because this is called on without having the class instantiated
-	*/
-	function build_generic_where_clause ($the_query_string) 
-	{
-		$where_clauses = Array();
-		$the_query_string = $GLOBALS['db']->quote($the_query_string);
-		array_push($where_clauses, "prospect_lists.name like '$the_query_string%'");
+     */
+    function build_generic_where_clause ($the_query_string) 
+    {
+        $where_clauses = Array();
+        $the_query_string = $GLOBALS['db']->quote($the_query_string);
+        array_push($where_clauses, "prospect_lists.name like '$the_query_string%'");
 
-		$the_where = "";
-		foreach($where_clauses as $clause)
-		{
-			if($the_where != "") $the_where .= " or ";
-			$the_where .= $clause;
-		}
+        $the_where = "";
+        foreach($where_clauses as $clause)
+        {
+            if($the_where != "") $the_where .= " or ";
+            $the_where .= $clause;
+        }
 
 
-		return $the_where;
-	}
+        return $the_where;
+    }
 
-	function save($check_notify = FALSE) {
+    function save($check_notify = FALSE) {
 
-		return parent::save($check_notify);
+        return parent::save($check_notify);
 
-	}
+    }
 
     function mark_deleted($id){
         $query = "UPDATE prospect_lists_prospects SET deleted = 1 WHERE prospect_list_id = '{$id}' ";
@@ -395,12 +395,12 @@ 
         return parent::mark_deleted($id);
     }
 	
-	 function bean_implements($interface){
-		switch($interface){
-			case 'ACL':return true;
-		}
-		return false;
-	}
+        function bean_implements($interface){
+        switch($interface){
+            case 'ACL':return true;
+        }
+        return false;
+    }
 
 }
 

modules/ProspectLists/SubPanelView.php

Indentation +21 added lines, -21 removed lines

@@ -67,9 +67,9 @@ 
 $button  = "<form action='index.php' method='post' name='ProspectListForm' id='ProspectListForm'>\n";
 $button .= "<input type='hidden' name='module' value='ProspectLists'>\n";
 if ($currentModule == 'Campaigns') {
-	$button .= "<input type='hidden' name='campaign_id' value='$focus->id'>\n";
-	$button .= "<input type='hidden' name='record' value='$focus->id'>\n";
-	$button .= "<input type='hidden' name='campaign_name' value=\"$focus->name\">\n";
+    $button .= "<input type='hidden' name='campaign_id' value='$focus->id'>\n";
+    $button .= "<input type='hidden' name='record' value='$focus->id'>\n";
+    $button .= "<input type='hidden' name='campaign_name' value=\"$focus->name\">\n";
 }
 $button .= "<input type='hidden' name='prospect_list_id' value=''>\n";
 $button .= "<input type='hidden' name='return_module' value='".$currentModule."'>\n";
@@ -80,28 +80,28 @@ 
 $button .= "<input title='".$app_strings['LBL_NEW_BUTTON_TITLE']."' accessyKey='".$app_strings['LBL_NEW_BUTTON_KEY']."' class='button' onclick=\"this.form.action.value='EditView'\" type='submit' name='New' value='  ".$app_strings['LBL_NEW_BUTTON_LABEL']."  '>\n";
 if ($currentModule == 'Campaigns')
 {
-	///////////////////////////////////////
-	///
-	/// SETUP PARENT POPUP
+    ///////////////////////////////////////
+    ///
+    /// SETUP PARENT POPUP
 	
-	$popup_request_data = array(
-		'call_back_function' => 'set_return_prospect_list_and_save',
-		'form_name' => 'ProspectListForm',
-		'field_to_name_array' => array(
-			'id' => 'prospect_list_id',
-			),
-		);
+    $popup_request_data = array(
+        'call_back_function' => 'set_return_prospect_list_and_save',
+        'form_name' => 'ProspectListForm',
+        'field_to_name_array' => array(
+            'id' => 'prospect_list_id',
+            ),
+        );
 	
-	$json = getJSONobj();
-	$encoded_popup_request_data = $json->encode($popup_request_data);
+    $json = getJSONobj();
+    $encoded_popup_request_data = $json->encode($popup_request_data);
 	
-	//
-	///////////////////////////////////////
+    //
+    ///////////////////////////////////////
 	
-	$button .= "<input title='".$app_strings['LBL_SELECT_BUTTON_TITLE']
-		." 'accessyKey='".$app_strings['LBL_SELECT_BUTTON_KEY']
-		."' type='button' class='button' value='  ".$app_strings['LBL_SELECT_BUTTON_LABEL']
-		."  ' name='button' onclick='open_popup(\"ProspectLists\", 600, 400, \"\", false, true, {$encoded_popup_request_data});'>\n";
+    $button .= "<input title='".$app_strings['LBL_SELECT_BUTTON_TITLE']
+        ." 'accessyKey='".$app_strings['LBL_SELECT_BUTTON_KEY']
+        ."' type='button' class='button' value='  ".$app_strings['LBL_SELECT_BUTTON_LABEL']
+        ."  ' name='button' onclick='open_popup(\"ProspectLists\", 600, 400, \"\", false, true, {$encoded_popup_request_data});'>\n";
 //		."  ' name='button' onclick='window.open(\"index.php?module=ProspectLists&action=Popup&html=Popup_picker&form=DetailView&form_submit=true&query=true\",\"new\",\"width=600,height=400,resizable=1,scrollbars=1\");'>\n";
 }
 

modules/AOS_Products/AOS_Products_sugar.php

Indentation +39 added lines, -39 removed lines

@@ -32,53 +32,53 @@
 
 
 class AOS_Products_sugar extends Basic {
-	var $new_schema = true;
-	var $module_dir = 'AOS_Products';
-	var $object_name = 'AOS_Products';
-	var $table_name = 'aos_products';
-	var $importable = true;
+    var $new_schema = true;
+    var $module_dir = 'AOS_Products';
+    var $object_name = 'AOS_Products';
+    var $table_name = 'aos_products';
+    var $importable = true;
 
-	var $disable_row_level_security = true ; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
+    var $disable_row_level_security = true ; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
 
-		var $id;
-		var $name;
-		var $date_entered;
-		var $date_modified;
-		var $modified_user_id;
-		var $modified_by_name;
-		var $created_by;
-		var $created_by_name;
-		var $description;
-		var $deleted;
-		var $created_by_link;
-		var $modified_user_link;
-		var $assigned_user_id;
-		var $assigned_user_name;
-		var $assigned_user_link;
-		var $maincode;
-		var $part_number;
-		var $category;
-		var $type;
-		var $cost;
-		var $currency_id;
-		var $price;
-		var $url;
-		var $contact_id;
-		var $contact;
+        var $id;
+        var $name;
+        var $date_entered;
+        var $date_modified;
+        var $modified_user_id;
+        var $modified_by_name;
+        var $created_by;
+        var $created_by_name;
+        var $description;
+        var $deleted;
+        var $created_by_link;
+        var $modified_user_link;
+        var $assigned_user_id;
+        var $assigned_user_name;
+        var $assigned_user_link;
+        var $maincode;
+        var $part_number;
+        var $category;
+        var $type;
+        var $cost;
+        var $currency_id;
+        var $price;
+        var $url;
+        var $contact_id;
+        var $contact;
 	
 
 
 
 
-	function AOS_Products_sugar(){	
-		parent::Basic();
-	}
+    function AOS_Products_sugar(){	
+        parent::Basic();
+    }
 	
-	function bean_implements($interface){
-		switch($interface){
-			case 'ACL': return true;
-		}
-		return false;
+    function bean_implements($interface){
+        switch($interface){
+            case 'ACL': return true;
+        }
+        return false;
 }
 		
 }