adamjakab / SuiteCRM

modules/Documents/metadata/quickcreatedefs.php

Spacing +9 added lines, -9 removed lines

@@ -49,39 +49,39 @@
                                             array('label' => '10', 'field' => '30')
                                             ),
                             'includes' => 
-                              array (
+                              array(
                                 array('file' => 'include/javascript/popup_parent_helper.js'),
                                 array('file' => 'cache/include/javascript/sugar_grp_jsolait.js'),
                                 array('file' => 'modules/Documents/documents.js'),
                               ),
 ),
- 'panels' =>array (
+ 'panels' =>array(
   'default' => 
-  array (
+  array(
     
-    array (
+    array(
       'status_id',
     ),
-    array (
+    array(
       array('name'=>'filename', 
             'displayParams'=>array('required'=>true, 'onchangeSetFileNameTo' => 'document_name'),
             ),
     ),
     
-    array (
+    array(
       'document_name',
        array('name'=>'revision',
             'customCode' => '<input name="revision" type="text" value="{$fields.revision.value}" {$DISABLED}>'
            ),
     ),    
     
-    array (
-       array('name'=>'active_date','displayParams'=>array('required'=>true)),
+    array(
+       array('name'=>'active_date', 'displayParams'=>array('required'=>true)),
        'category_id',
     ),
     
 
-    array (
+    array(
       array('name'=>'description', 'displayParams'=>array('rows'=>10, 'cols'=>120)),
     ),
   ),

modules/Documents/metadata/listviewdefs.php

Spacing +13 added lines, -13 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -43,7 +43,7 @@ 
 
 $listViewDefs['Documents'] = array(
   'DOCUMENT_NAME' => 
-  array (
+  array(
     'width' => '20%',
     'label' => 'LBL_NAME',
     'link' => true,
@@ -51,16 +51,16 @@ 
     'bold' => true,
   ),
   'FILENAME' => 
-  array (
+  array(
     'width' => '20%',
     'label' => 'LBL_FILENAME',
     'link' => true,
     'default' => true,
     'bold' => false,
-    'displayParams' => array ( 'module' => 'Documents', ),
+    'displayParams' => array('module' => 'Documents',),
     'sortable' => false,
     'related_fields' => 
-    array (
+    array(
         0 => 'document_revision_id',
         1 => 'doc_id', 
         2 => 'doc_type',
@@ -68,30 +68,30 @@ 
     ),
   ),
   'CATEGORY_ID' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_LIST_CATEGORY',
     'default' => true,
   ),
   'SUBCATEGORY_ID' => 
-  array (
+  array(
     'width' => '15%',
     'label' => 'LBL_LIST_SUBCATEGORY',
     'default' => true,
   ),
   'LAST_REV_CREATE_DATE' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_LIST_LAST_REV_DATE',
     'default' => true,
     'sortable' => false,
     'related_fields' => 
-    array (
+    array(
       0 => 'document_revision_id',
     ),
   ),
   'EXP_DATE' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_LIST_EXP_DATE',
     'default' => true,
@@ -104,7 +104,7 @@ 
     'id' => 'ASSIGNED_USER_ID',
     'default' => true),
   'MODIFIED_BY_NAME' =>
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_MODIFIED_USER',
     'module' => 'Users',
@@ -112,11 +112,11 @@ 
     'default' => false,
     'sortable' => false,
     'related_fields' =>
-    array (
+    array(
       0 => 'modified_user_id',
     ),
     ),
-  'DATE_ENTERED' => array (
+  'DATE_ENTERED' => array(
     'width' => '10%',
     'label' => 'LBL_DATE_ENTERED',
     'default' => true,

modules/Employees/EmployeesStudioModule.php

Spacing +4 added lines, -4 removed lines

@@ -37,20 +37,20 @@
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-require_once 'modules/ModuleBuilder/Module/StudioModule.php' ;
+require_once 'modules/ModuleBuilder/Module/StudioModule.php';
 
 class EmployeesStudioModule extends StudioModule {
-    function getProvidedSubpanels ()
+    function getProvidedSubpanels()
     {
         // Much like pointy haired bosses, other modules should not be able to relate to Employees.
         return false;
     }
 
-    function getModule ()
+    function getModule()
     {
         $normalModules = parent::getModule();
         
-        if(isset($normalModules[translate('LBL_RELATIONSHIPS')])) {
+        if (isset($normalModules[translate('LBL_RELATIONSHIPS')])) {
             unset($normalModules[translate('LBL_RELATIONSHIPS')]);
         }
 

modules/Campaigns/PopupCampaignRoi.php

Spacing +34 added lines, -34 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.
@@ -65,60 +65,60 @@ 
 
 $GLOBALS['log']->info("Campaign detail view");
 
-$xtpl=new XTemplate ('modules/Campaigns/PopupCampaignRoi.html');
+$xtpl = new XTemplate('modules/Campaigns/PopupCampaignRoi.html');
 
 //_pp($_REQUEST['id']);
-$campaign_id=$_REQUEST['id'];
+$campaign_id = $_REQUEST['id'];
 $campaign = new Campaign();
-$opp_query1  = "select camp.name, camp.actual_cost,camp.budget,camp.expected_revenue,count(*) opp_count,SUM(opp.amount) as Revenue, SUM(camp.actual_cost) as Investment,
+$opp_query1 = "select camp.name, camp.actual_cost,camp.budget,camp.expected_revenue,count(*) opp_count,SUM(opp.amount) as Revenue, SUM(camp.actual_cost) as Investment,
                             ROUND((SUM(opp.amount) - SUM(camp.actual_cost))/(SUM(camp.actual_cost)), 2)*100 as ROI";
             $opp_query1 .= " from opportunities opp";
             $opp_query1 .= " right join campaigns camp on camp.id = opp.campaign_id";
             $opp_query1 .= " where opp.sales_stage = 'Closed Won' and camp.id='$campaign_id'";
             $opp_query1 .= " group by camp.name";
             //$opp_query1 .= " and deleted=0";
-            $opp_result1=$campaign->db->query($opp_query1);
-            $opp_data1=$campaign->db->fetchByAssoc($opp_result1);
+            $opp_result1 = $campaign->db->query($opp_query1);
+            $opp_data1 = $campaign->db->fetchByAssoc($opp_result1);
  //get the click-throughs
  $query_click = "SELECT count(*) hits ";
-			$query_click.= " FROM campaign_log ";
-			$query_click.= " WHERE campaign_id = '$campaign_id' AND activity_type='link' AND related_type='CampaignTrackers' AND archived=0 AND deleted=0";
+			$query_click .= " FROM campaign_log ";
+			$query_click .= " WHERE campaign_id = '$campaign_id' AND activity_type='link' AND related_type='CampaignTrackers' AND archived=0 AND deleted=0";
 
             //if $marketing id is specified, then lets filter the chart by the value
-            if (!empty($marketing_id)){
-                $query_click.= " AND marketing_id ='$marketing_id'";
+            if (!empty($marketing_id)) {
+                $query_click .= " AND marketing_id ='$marketing_id'";
             }
 
-			$query_click.= " GROUP BY  activity_type, target_type";
-			$query_click.= " ORDER BY  activity_type, target_type";
+			$query_click .= " GROUP BY  activity_type, target_type";
+			$query_click .= " ORDER BY  activity_type, target_type";
 			$result = $campaign->db->query($query_click);
 
 
   $xtpl->assign("OPP_COUNT", $opp_data1['opp_count']);
-  $xtpl->assign("ACTUAL_COST",$opp_data1['actual_cost']);
-  $xtpl->assign("PLANNED_BUDGET",$opp_data1['budget']);
-  $xtpl->assign("EXPECTED_REVENUE",$opp_data1['expected_revenue']);
+  $xtpl->assign("ACTUAL_COST", $opp_data1['actual_cost']);
+  $xtpl->assign("PLANNED_BUDGET", $opp_data1['budget']);
+  $xtpl->assign("EXPECTED_REVENUE", $opp_data1['expected_revenue']);
 
 
 
 
-	$currency  = new Currency();
-if(isset($focus->currency_id) && !empty($focus->currency_id))
+	$currency = new Currency();
+if (isset($focus->currency_id) && !empty($focus->currency_id))
 {
 	$currency->retrieve($focus->currency_id);
-	if( $currency->deleted != 1){
-		$xtpl->assign("CURRENCY", $currency->iso4217 .' '.$currency->symbol );
-	}else $xtpl->assign("CURRENCY", $currency->getDefaultISO4217() .' '.$currency->getDefaultCurrencySymbol() );
-}else{
+	if ($currency->deleted != 1) {
+		$xtpl->assign("CURRENCY", $currency->iso4217.' '.$currency->symbol);
+	} else $xtpl->assign("CURRENCY", $currency->getDefaultISO4217().' '.$currency->getDefaultCurrencySymbol());
+} else {
 
-	$xtpl->assign("CURRENCY", $currency->getDefaultISO4217() .' '.$currency->getDefaultCurrencySymbol() );
+	$xtpl->assign("CURRENCY", $currency->getDefaultISO4217().' '.$currency->getDefaultCurrencySymbol());
 
 }
 
 global $current_user;
-if(is_admin($current_user) && $_REQUEST['module'] != 'DynamicLayout' && !empty($_SESSION['editinplace'])){
+if (is_admin($current_user) && $_REQUEST['module'] != 'DynamicLayout' && !empty($_SESSION['editinplace'])) {
 
-	$xtpl->assign("ADMIN_EDIT","<a href='index.php?action=index&module=DynamicLayout&from_action=".$_REQUEST['action'] ."&from_module=".$_REQUEST['module'] ."&record=".$_REQUEST['record']. "'>".SugarThemeRegistry::current()->getImage("EditLayout","border='0' align='bottom'",null,null,'.gif',$mod_strings['LBL_EDIT_LAYOUT'])."</a>");
+	$xtpl->assign("ADMIN_EDIT", "<a href='index.php?action=index&module=DynamicLayout&from_action=".$_REQUEST['action']."&from_module=".$_REQUEST['module']."&record=".$_REQUEST['record']."'>".SugarThemeRegistry::current()->getImage("EditLayout", "border='0' align='bottom'", null, null, '.gif', $mod_strings['LBL_EDIT_LAYOUT'])."</a>");
 
 }
 
@@ -171,23 +171,23 @@ 
   */
 
 //add chart
-$seps				= array("-", "/");
-$dates				= array(date($GLOBALS['timedate']->dbDayFormat), $GLOBALS['timedate']->dbDayFormat);
-$dateFileNameSafe	= str_replace($seps, "_", $dates);
-$cache_file_name_roi	= $current_user->getUserPrivGuid()."_campaign_response_by_roi_".$dateFileNameSafe[0]."_".$dateFileNameSafe[1].".xml";
-$chart= new campaign_charts();
+$seps = array("-", "/");
+$dates = array(date($GLOBALS['timedate']->dbDayFormat), $GLOBALS['timedate']->dbDayFormat);
+$dateFileNameSafe = str_replace($seps, "_", $dates);
+$cache_file_name_roi = $current_user->getUserPrivGuid()."_campaign_response_by_roi_".$dateFileNameSafe[0]."_".$dateFileNameSafe[1].".xml";
+$chart = new campaign_charts();
 
 //ob_start();
 
     //if marketing id has been selected, then set "latest_marketing_id" to the selected value
     //latest marketing id will be passed in to filter the charts and subpanels
 
-    if(!empty($selected_marketing_id)){$latest_marketing_id = $selected_marketing_id;}
-    if(empty($latest_marketing_id) ||  $latest_marketing_id === 'all'){
-        $xtpl->assign("MY_CHART_ROI", $chart->campaign_response_roi_popup($app_list_strings['roi_type_dom'],$app_list_strings['roi_type_dom'],$campaign_id,sugar_cached("xml/") . $cache_file_name_roi,true));
-    }else{
+    if (!empty($selected_marketing_id)) {$latest_marketing_id = $selected_marketing_id; }
+    if (empty($latest_marketing_id) || $latest_marketing_id === 'all') {
+        $xtpl->assign("MY_CHART_ROI", $chart->campaign_response_roi_popup($app_list_strings['roi_type_dom'], $app_list_strings['roi_type_dom'], $campaign_id, sugar_cached("xml/").$cache_file_name_roi, true));
+    } else {
 
-    $xtpl->assign("MY_CHART_ROI", $chart->campaign_response_roi_popup($app_list_strings['roi_type_dom'],$app_list_strings['roi_type_dom'],$campaign_id,sugar_cached("xml/") .$cache_file_name_roi,true));
+    $xtpl->assign("MY_CHART_ROI", $chart->campaign_response_roi_popup($app_list_strings['roi_type_dom'], $app_list_strings['roi_type_dom'], $campaign_id, sugar_cached("xml/").$cache_file_name_roi, true));
     }
 
 //$output_html .= ob_get_contents();

modules/Campaigns/WizardEmailSetupSave.php

Spacing +13 added lines, -13 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -60,22 +60,22 @@ 
     //name is used as key in post, it is also used in creation of summary page for wizard,
     //so let's clean up the posting so we can reuse the save functionality for inbound emails and
     //from existing save.php's  
-    foreach($camp_steps as $step){
+    foreach ($camp_steps as $step) {
         clean_up_post($step);
     }
 /**************************** Save general Email Setup  *****************************/
 
 //we do not need to track location if location type is not set
-if(isset($_POST['tracking_entities_location_type'])) {
+if (isset($_POST['tracking_entities_location_type'])) {
     if ($_POST['tracking_entities_location_type'] != '2') {
         unset($_POST['tracking_entities_location']);
         unset($_POST['tracking_entities_location_type']);
     }
 }
 //if the check box is empty, then set it to 0
-if(!isset($_POST['mail_smtpauth_req'])) { $_POST['mail_smtpauth_req'] = 0; }
+if (!isset($_POST['mail_smtpauth_req'])) { $_POST['mail_smtpauth_req'] = 0; }
 //default ssl use to false
-if(!isset($_POST['mail_smtpssl'])) { $_POST['mail_smtpssl'] = 0; }
+if (!isset($_POST['mail_smtpssl'])) { $_POST['mail_smtpssl'] = 0; }
 //reuse existing saveconfig functionality
 $focus->saveConfig();
 
@@ -83,7 +83,7 @@ 
 
 /**************************** Add New Monitored Box  *****************************/
 //perform this if the option to create new mail box has been checked
-if(isset($_REQUEST['wiz_new_mbox']) && ($_REQUEST['wiz_new_mbox']=='1')){
+if (isset($_REQUEST['wiz_new_mbox']) && ($_REQUEST['wiz_new_mbox'] == '1')) {
     
    //Populate the Request variables that inboundemail expects
     $_REQUEST['mark_read'] = 1;
@@ -96,11 +96,11 @@ 
     require_once('modules/InboundEmail/Save.php');    
 
 }
-    if (!empty($_REQUEST['error'])){
+    if (!empty($_REQUEST['error'])) {
             //an error was found during inbound save.  This means the save was allowed but the inbound box had problems, return user to wizard
             //and display error message
             header("Location: index.php?action=WizardEmailSetup&module=Campaigns&error=true");
-    }else{
+    } else {
         //set navigation details
         header("Location: index.php?action=index&module=Campaigns");
     }
@@ -111,18 +111,18 @@ 
  * which does not expect the prefix, and still use the generic create summary functionality in wizard, which
  * does expect the prefix.  
  */
-function clean_up_post($prefix){
+function clean_up_post($prefix) {
 
     foreach ($_REQUEST as $key => $val) {
-              if((strstr($key, $prefix )) && (strpos($key, $prefix )== 0)){
-              $newkey  =substr($key, strlen($prefix)) ;
+              if ((strstr($key, $prefix)) && (strpos($key, $prefix) == 0)) {
+              $newkey = substr($key, strlen($prefix));
               $_REQUEST[$newkey] = $val;
          }               
     }
 
     foreach ($_POST as $key => $val) {
-              if((strstr($key, $prefix )) && (strpos($key, $prefix )== 0)){
-              $newkey  =substr($key, strlen($prefix)) ;
+              if ((strstr($key, $prefix)) && (strpos($key, $prefix) == 0)) {
+              $newkey = substr($key, strlen($prefix));
               $_POST[$newkey] = $val;
               
          }               

modules/Campaigns/DeleteTestCampaigns.php

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -55,7 +55,7 @@ 
  */
 function deleteTestRecords($focus)
 {
-    if(empty($focus) || empty($focus->id))
+    if (empty($focus) || empty($focus->id))
     {
         return;
     }
@@ -65,17 +65,17 @@ 
             WHERE campaign_log.campaign_id = '{$focus->id}' AND prospect_lists.list_type='test'");
     $test_ids = array();
     $test_list_ids = array();
-    while($row = $focus->db->fetchByAssoc($res)) {
+    while ($row = $focus->db->fetchByAssoc($res)) {
        $test_ids[] = $row['emailid'];
        $test_list_ids[$row['listid']] = true;
     }
     $test_list_ids = array_keys($test_list_ids);
     unset($res);
-    if(!empty($test_ids)) {
+    if (!empty($test_ids)) {
         $focus->db->query("UPDATE emails SET deleted=1 WHERE id IN ('".join("','", $test_ids)."')");
     }
 
-    if(!empty($test_list_ids)) {
+    if (!empty($test_list_ids)) {
         $query = "DELETE FROM emailman WHERE campaign_id = '{$focus->id}' AND list_id IN ('".join("','", $test_list_ids)."')";
         $focus->db->query($query);
 

modules/Campaigns/WizardEmailSetup.php

Spacing +24 added lines, -24 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.
@@ -52,10 +52,10 @@ 
 
 
 
-global $mod_strings,$app_list_strings,$app_strings,$current_user;
+global $mod_strings, $app_list_strings, $app_strings, $current_user;
 
 
-if (!is_admin($current_user)&& !is_admin_for_module($GLOBALS['current_user'],'Campaigns')) sugar_die("Unauthorized access to administration.");
+if (!is_admin($current_user) && !is_admin_for_module($GLOBALS['current_user'], 'Campaigns')) sugar_die("Unauthorized access to administration.");
 
 $params = array();
 $params[] = "<a href='index.php?module=Campaigns&action=index'>{$mod_strings['LBL_MODULE_NAME']}</a>";
@@ -101,25 +101,25 @@ 
 $ss->assign('PROTOCOL', get_select_options_with_id($protocol, ''));
 if (isset($focus->settings['massemailer_campaign_emails_per_run']) && !empty($focus->settings['massemailer_campaign_emails_per_run'])) {
     $ss->assign("EMAILS_PER_RUN", $focus->settings['massemailer_campaign_emails_per_run']);
-} else  {
+} else {
     $ss->assign("EMAILS_PER_RUN", 500);
 }
 
-if (!isset($focus->settings['massemailer_tracking_entities_location_type']) or empty($focus->settings['massemailer_tracking_entities_location_type']) or $focus->settings['massemailer_tracking_entities_location_type']=='1') {
+if (!isset($focus->settings['massemailer_tracking_entities_location_type']) or empty($focus->settings['massemailer_tracking_entities_location_type']) or $focus->settings['massemailer_tracking_entities_location_type'] == '1') {
     $ss->assign("DEFAULT_CHECKED", "checked");
     $ss->assign("TRACKING_ENTRIES_LOCATION_STATE", "disabled");
-    $ss->assign("TRACKING_ENTRIES_LOCATION",$mod_strings['TRACKING_ENTRIES_LOCATION_DEFAULT_VALUE']);
-} else  {
+    $ss->assign("TRACKING_ENTRIES_LOCATION", $mod_strings['TRACKING_ENTRIES_LOCATION_DEFAULT_VALUE']);
+} else {
     $ss->assign("USERDEFINED_CHECKED", "checked");
-    $ss->assign("TRACKING_ENTRIES_LOCATION",$focus->settings["massemailer_tracking_entities_location"]);
+    $ss->assign("TRACKING_ENTRIES_LOCATION", $focus->settings["massemailer_tracking_entities_location"]);
 }
 
-$ss->assign("SITEURL",$sugar_config['site_url']);
+$ss->assign("SITEURL", $sugar_config['site_url']);
 
 // Change the default campaign to not store a copy of each message.
-if (!empty($focus->settings['massemailer_email_copy']) and $focus->settings['massemailer_email_copy']=='1') {
+if (!empty($focus->settings['massemailer_email_copy']) and $focus->settings['massemailer_email_copy'] == '1') {
     $ss->assign("YES_CHECKED", "checked='checked'");
-} else  {
+} else {
     $ss->assign("NO_CHECKED", "checked='checked'");
 }
 
@@ -129,25 +129,25 @@ 
 /*********** New Mail Box UI DIV Stuff ****************/
 $mbox_qry = "select * from inbound_email where deleted ='0' and mailbox_type = 'bounce'";
 $mbox_res = $focus->db->query($mbox_qry);
-while ($mbox_row = $focus->db->fetchByAssoc($mbox_res)){$mbox[] = $mbox_row;}
+while ($mbox_row = $focus->db->fetchByAssoc($mbox_res)) {$mbox[] = $mbox_row; }
 $mbox_msg = ' ';
 $need_mbox = '';  
 
 $mboxTable = "<table class='list view' width='100%' border='0' cellspacing='1' cellpadding='1'>";
-if(isset($mbox) && count($mbox)>0){
-    $mboxTable .= "<tr><td colspan='5'><b>" .count($mbox) ." ". $mod_strings['LBL_MAILBOX_CHECK_WIZ_GOOD']." </b>.</td></tr>";
+if (isset($mbox) && count($mbox) > 0) {
+    $mboxTable .= "<tr><td colspan='5'><b>".count($mbox)." ".$mod_strings['LBL_MAILBOX_CHECK_WIZ_GOOD']." </b>.</td></tr>";
         $mboxTable .= "<tr class='listViewHRS1'><td width='20%'><b>".$mod_strings['LBL_MAILBOX_NAME']."</b></td>"
                    .  " <td width='20%'><b>".$mod_strings['LBL_LOGIN']."</b></td>"
                    .  " <td width='20%'><b>".$mod_strings['LBL_MAILBOX']."</b></td>" 
                    .  " <td width='20%'><b>".$mod_strings['LBL_SERVER_URL']."</b></td>"
                    .  " <td width='20%'><b>".$mod_strings['LBL_LIST_STATUS']."</b></td></tr>";
-    $colorclass=' ';
-    foreach($mbox as $details){
+    $colorclass = ' ';
+    foreach ($mbox as $details) {
                 
-     if( $colorclass == "class='evenListRowS1'"){
-            $colorclass= "class='oddListRowS1'";
-        }else{ 
-            $colorclass= "class='evenListRowS1'";
+     if ($colorclass == "class='evenListRowS1'") {
+            $colorclass = "class='oddListRowS1'";
+        } else { 
+            $colorclass = "class='evenListRowS1'";
         }           
         
         $mboxTable .= "<tr $colorclass>";
@@ -159,7 +159,7 @@ 
     }
 
 
-}else{
+} else {
 $need_mbox = 'checked';
 $mboxTable .= "<tr><td colspan='5'><b>".$mod_strings['LBL_MAILBOX_CHECK_WIZ_BAD']." </b>.</td></tr>";
 }        
@@ -167,7 +167,7 @@ 
 $ss->assign("MAILBOXES_DETECTED_MESSAGE", $mboxTable);
 $ss->assign("MBOX_NEEDED", $need_mbox);          
 $ss->assign('ROLLOVER', $email->rolloverStyle);
-if(!function_exists('imap_open')) {
+if (!function_exists('imap_open')) {
     $ss->assign('IE_DISABLED', 'DISABLED');   
 }
 /**************************** SUMMARY UI DIV Stuff *******************/
@@ -406,13 +406,13 @@ 
 </script>
 EOQ;
 
-if(isset($_REQUEST['error'])){
+if (isset($_REQUEST['error'])) {
     //if there is an error flagged, then we are coming here after a save where there was an error detected
     //on an inbound email save.  Display error to user so they are aware.
     $errorString = "<div class='error'>".$mod_strings['ERR_NO_OPTS_SAVED']."  <a href='index.php?module=InboundEmail&action=index'>".$mod_strings['ERR_REVIEW_EMAIL_SETTINGS']."</a></div>";
     $ss->assign('ERROR', $errorString);
     //navigate to inbound email page by default
-    $divScript .=" <script>navigate('next');</script>";
+    $divScript .= " <script>navigate('next');</script>";
 }
 
 $ss->assign("DIV_JAVASCRIPT", $divScript);

modules/Campaigns/ProcessBouncedEmails.php

Spacing +34 added lines, -34 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.
@@ -69,31 +69,31 @@ 
  * @param string $email_description
  * @return string
  */
-function createBouncedCampaignLogEntry($row,$email, $email_description)
+function createBouncedCampaignLogEntry($row, $email, $email_description)
 {
     $GLOBALS['log']->debug("Creating bounced email campaign log");
     $bounce = new CampaignLog();
-    $bounce->campaign_id=$row['campaign_id'];
-    $bounce->target_tracker_key=$row['target_tracker_key'];
-    $bounce->target_id= $row['target_id'];
-    $bounce->target_type=$row['target_type'];
-    $bounce->list_id=$row['list_id'];
-    $bounce->marketing_id=$row['marketing_id'];
+    $bounce->campaign_id = $row['campaign_id'];
+    $bounce->target_tracker_key = $row['target_tracker_key'];
+    $bounce->target_id = $row['target_id'];
+    $bounce->target_type = $row['target_type'];
+    $bounce->list_id = $row['list_id'];
+    $bounce->marketing_id = $row['marketing_id'];
 
-    $bounce->activity_date=$email->date_created;
-    $bounce->related_type='Emails';
-    $bounce->related_id= $email->id;
+    $bounce->activity_date = $email->date_created;
+    $bounce->related_type = 'Emails';
+    $bounce->related_id = $email->id;
 
     //do we have the phrase permanent error in the email body.
-    if (preg_match('/permanent[ ]*error/',$email_description))
+    if (preg_match('/permanent[ ]*error/', $email_description))
     {
-        $bounce->activity_type='invalid email';
+        $bounce->activity_type = 'invalid email';
         markEmailAddressInvalid($email);
     }
     else 
-        $bounce->activity_type='send error';
+        $bounce->activity_type = 'send error';
         
-    $return_id=$bounce->save();
+    $return_id = $bounce->save();
     return $return_id;
 }
 
@@ -104,11 +104,11 @@ 
  */
 function markEmailAddressInvalid($email_address)
 {
-    if(empty($email_address))
+    if (empty($email_address))
         return;
     $sea = new SugarEmailAddress();
-    $rs = $sea->retrieve_by_string_fields( array('email_address_caps' => trim(strtoupper($email_address))) );
-    if($rs != null)
+    $rs = $sea->retrieve_by_string_fields(array('email_address_caps' => trim(strtoupper($email_address))));
+    if ($rs != null)
     {
         $sea->AddUpdateEmailAddress($email_address, 1, 0, $rs->id);
     }
@@ -124,10 +124,10 @@ 
 {
     $row = FALSE;
     $targeted = new CampaignLog();
-    $where="campaign_log.activity_type='targeted' and campaign_log.target_tracker_key='{$identifier}'";
-    $query=$targeted->create_new_list_query('',$where);
-    $result=$targeted->db->query($query);
-    $row=$targeted->db->fetchByAssoc($result);
+    $where = "campaign_log.activity_type='targeted' and campaign_log.target_tracker_key='{$identifier}'";
+    $query = $targeted->create_new_list_query('', $where);
+    $result = $targeted->db->query($query);
+    $row = $targeted->db->fetchByAssoc($result);
     
     return $row;
 }
@@ -144,15 +144,15 @@ 
     $identifiers = array();
     $found = FALSE;
     //Check if the identifier is present in the header.
-    if(preg_match('/X-CampTrackID: [a-z0-9\-]*/',$email_description,$matches)) 
+    if (preg_match('/X-CampTrackID: [a-z0-9\-]*/', $email_description, $matches)) 
     {
-        $identifiers = preg_split('/X-CampTrackID: /',$matches[0],-1,PREG_SPLIT_NO_EMPTY);
+        $identifiers = preg_split('/X-CampTrackID: /', $matches[0], -1, PREG_SPLIT_NO_EMPTY);
         $found = TRUE;
         $GLOBALS['log']->debug("Found campaign identifier in header of email");  
     }
-    else if( preg_match('/index.php\?entryPoint=removeme&identifier=[a-z0-9\-]*/',$email_description, $matches) )
+    else if (preg_match('/index.php\?entryPoint=removeme&identifier=[a-z0-9\-]*/', $email_description, $matches))
     {
-        $identifiers = preg_split('/index.php\?entryPoint=removeme&identifier=/',$matches[0],-1,PREG_SPLIT_NO_EMPTY);
+        $identifiers = preg_split('/index.php\?entryPoint=removeme&identifier=/', $matches[0], -1, PREG_SPLIT_NO_EMPTY);
         $found = TRUE;
         $GLOBALS['log']->debug("Found campaign identifier in body of email");
     }
@@ -167,21 +167,21 @@ 
 	$email_description = $email->raw_source;
     	
 	//if raw_source is empty, try using the description instead
-    	if (empty($email_description)){
+    	if (empty($email_description)) {
         	$email_description = $email->description;
 	}
 
     $email_description .= retrieveErrorReportAttachment($email);
 
-	if (preg_match('/MAILER-DAEMON|POSTMASTER/i',$emailFromAddress)) 
+	if (preg_match('/MAILER-DAEMON|POSTMASTER/i', $emailFromAddress)) 
 	{
-	    $email_description=quoted_printable_decode($email_description);
-		$matches=array();
+	    $email_description = quoted_printable_decode($email_description);
+		$matches = array();
 		
 		//do we have the identifier tag in the email?
 		$identifierScanResults = checkBouncedEmailForIdentifier($email_description);
 		
-		if ( $identifierScanResults['found'] ) 
+		if ($identifierScanResults['found']) 
 		{
 			$matches = $identifierScanResults['matches'];
 			$identifiers = $identifierScanResults['identifiers'];
@@ -198,10 +198,10 @@ 
 					//do not create another campaign_log record is we already have an
 					//invalid email or send error entry for this tracker key.
 					$query_log = "select * from campaign_log where target_tracker_key='{$row['target_tracker_key']}'"; 
-					$query_log .=" and (activity_type='invalid email' or activity_type='send error')";
+					$query_log .= " and (activity_type='invalid email' or activity_type='send error')";
                     $targeted = new CampaignLog();
-					$result_log=$targeted->db->query($query_log);
-					$row_log=$targeted->db->fetchByAssoc($result_log);
+					$result_log = $targeted->db->query($query_log);
+					$row_log = $targeted->db->fetchByAssoc($result_log);
 
 					if (empty($row_log)) 
 					{

modules/Campaigns/CampaignDiagnostic.php

Spacing +58 added lines, -58 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -58,7 +58,7 @@ 
 
 //if (!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
 //account for use within wizards
-if(!isset($_REQUEST['inline']) || $_REQUEST['inline'] != 'inline'){
+if (!isset($_REQUEST['inline']) || $_REQUEST['inline'] != 'inline') {
 	$params = array();
 	$params[] = "<a href='index.php?module=Campaigns&action=index'>{$mod_strings['LBL_MODULE_NAME']}</a>";
 	$params[] = $mod_strings['LBL_CAMPAIGN_DIAGNOSTICS'];
@@ -72,11 +72,11 @@ 
 
 
 
-if(isset($_REQUEST['inline']) && $_REQUEST['inline'] == 'inline'){
+if (isset($_REQUEST['inline']) && $_REQUEST['inline'] == 'inline') {
     {
 
 }
-}else{
+} else {
     //use html if not inline
     $ss = new Sugar_Smarty();
     $ss->assign("MOD", $mod_strings);
@@ -104,18 +104,18 @@ 
 $mboxTable = "<table border ='0' width='100%'  class='detail view' cellpadding='0' cellspacing='0'>";
 //put all rows returned into an array
 $mbox = array();
-while ($mbox_row = $focus->db->fetchByAssoc($mbox_res)){$mbox[] = $mbox_row;}
+while ($mbox_row = $focus->db->fetchByAssoc($mbox_res)) {$mbox[] = $mbox_row; }
     $mbox_msg = ' ';
 //if the array is not empty, then set "good" message
-if(isset($mbox) && count($mbox)>0){
-    $mboxTable .= "<tr><td colspan='5' style='text-align: left;'><b>" .count($mbox) ." ". $mod_strings['LBL_MAILBOX_CHECK1_GOOD']." </b>.</td></tr>";
+if (isset($mbox) && count($mbox) > 0) {
+    $mboxTable .= "<tr><td colspan='5' style='text-align: left;'><b>".count($mbox)." ".$mod_strings['LBL_MAILBOX_CHECK1_GOOD']." </b>.</td></tr>";
         $mboxTable .= "<tr><th scope='col' width='20%'><b>".$mod_strings['LBL_MAILBOX_NAME']."</b></th>"
                    .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_LOGIN']."</b></th>"
                    .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_MAILBOX']."</b></th>"
                    .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_SERVER_URL']."</b></th>"
                    .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_LIST_STATUS']."</b></th></tr>";
 
-    foreach($mbox as $details){
+    foreach ($mbox as $details) {
         $mboxTable .= "<tr><td>".$details['name']."</td>";
         $mboxTable .= "<td>".$details['email_user']."</td>";
         $mboxTable .= "<td>".$details['mailbox']."</td>";
@@ -123,64 +123,64 @@ 
         $mboxTable .= "<td>".$details['status']."</td></tr>";
     }
 
-}else{
+} else {
     //if array is empty, then set "bad" message and increment health counter
-    $mboxTable .=  "<tr><td colspan='5'><b class='error'>". $mod_strings['LBL_MAILBOX_CHECK1_BAD']."</b></td></tr>";
-    $email_health =$email_health +1;
+    $mboxTable .= "<tr><td colspan='5'><b class='error'>".$mod_strings['LBL_MAILBOX_CHECK1_BAD']."</b></td></tr>";
+    $email_health = $email_health + 1;
 }
 
-$mboxTable.= '</table>' ;
+$mboxTable .= '</table>';
 
 
     
 $ss->assign("MAILBOXES_DETECTED_MESSAGE", $mboxTable);
 
 //email settings configured 
-$conf_msg="<table border='0' width='100%' class='detail view' cellpadding='0' cellspacing='0'>";
-if (strstr($focus->settings['notify_fromaddress'], 'example.com')){
+$conf_msg = "<table border='0' width='100%' class='detail view' cellpadding='0' cellspacing='0'>";
+if (strstr($focus->settings['notify_fromaddress'], 'example.com')) {
     //if from address is the default, then set "bad" message and increment health counter
     $conf_msg .= "<tr><td colspan = '5'><b class='error'> ".$mod_strings['LBL_MAILBOX_CHECK2_BAD']." </b></td></td>";
-    $email_health =$email_health +1;
-}else{
+    $email_health = $email_health + 1;
+} else {
     $conf_msg .= "<tr><td colspan = '5'><b> ".$mod_strings['LBL_MAILBOX_CHECK2_GOOD']."</b></td></tr>";
     $conf_msg .= "<tr><th scope='col' width='20%'><b>".$mod_strings['LBL_WIZ_FROM_NAME']."</b></th>"
                .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_WIZ_FROM_ADDRESS']."</b></th>"
                .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_MAIL_SENDTYPE']."</b></th>";
-    if($focus->settings['mail_sendtype']=='SMTP'){
+    if ($focus->settings['mail_sendtype'] == 'SMTP') {
      $conf_msg .= " <th scope='col' width='20%'><b>".$mod_strings['LBL_MAIL_SMTPSERVER']."</b></th>"
                .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_MAIL_SMTPUSER']."</b></th></tr>";
 
-    }else{$conf_msg .= "</tr>";}
+    } else {$conf_msg .= "</tr>"; }
                    
     
 
         $conf_msg .= "<tr><td>".$focus->settings['notify_fromname']."</td>";
         $conf_msg .= "<td>".$focus->settings['notify_fromaddress']."</td>";
         $conf_msg .= "<td>".$focus->settings['mail_sendtype']."</td>";
-     if($focus->settings['mail_sendtype']=='SMTP'){
+     if ($focus->settings['mail_sendtype'] == 'SMTP') {
         $conf_msg .= "<td>".$focus->settings['mail_smtpserver']."</td>";
         $conf_msg .= "<td>".$focus->settings['mail_smtpuser']."</td></tr>";
 
-    }else{$conf_msg .= "</tr>";}       
+    } else {$conf_msg .= "</tr>"; }       
 
 }
           
 $conf_msg .= '</table>'; 
 $ss->assign("EMAIL_SETTINGS_CONFIGURED_MESSAGE", $conf_msg);
-$email_setup_wiz_link='';
-if ($email_health>0){
-    if (is_admin($current_user)){
-        $email_setup_wiz_link="<a href='index.php?module=Campaigns&action=WizardEmailSetup'>".$mod_strings['LBL_EMAIL_SETUP_WIZ']."</a>";
-    }else{
-        $email_setup_wiz_link=$mod_strings['LBL_NON_ADMIN_ERROR_MSG'];
+$email_setup_wiz_link = '';
+if ($email_health > 0) {
+    if (is_admin($current_user)) {
+        $email_setup_wiz_link = "<a href='index.php?module=Campaigns&action=WizardEmailSetup'>".$mod_strings['LBL_EMAIL_SETUP_WIZ']."</a>";
+    } else {
+        $email_setup_wiz_link = $mod_strings['LBL_NON_ADMIN_ERROR_MSG'];
     }    
 }
 
 $ss->assign("EMAIL_SETUP_WIZ_LINK", $email_setup_wiz_link);
-$ss->assign( 'EMAIL_IMAGE', define_image($email_health, 2));
-$ss->assign( 'EMAIL_COMPONENTS', $mod_strings['LBL_EMAIL_COMPONENTS']);
-$ss->assign( 'SCHEDULER_COMPONENTS', $mod_strings['LBL_SCHEDULER_COMPONENTS']);
-$ss->assign( 'RECHECK_BTN', $mod_strings['LBL_RECHECK_BTN']);
+$ss->assign('EMAIL_IMAGE', define_image($email_health, 2));
+$ss->assign('EMAIL_COMPONENTS', $mod_strings['LBL_EMAIL_COMPONENTS']);
+$ss->assign('SCHEDULER_COMPONENTS', $mod_strings['LBL_SCHEDULER_COMPONENTS']);
+$ss->assign('RECHECK_BTN', $mod_strings['LBL_RECHECK_BTN']);
 
 /************* SCHEDULER COMPONENTS ************/
 
@@ -196,16 +196,16 @@ 
 
 $scheds = array();
 //build the table rows for scheduler display
-while ($sched_row = $focus->db->fetchByAssoc($sched_res)){$scheds[] = $sched_row;}
-foreach ($scheds as $funct){
-  if( ($funct['job']==$check_sched1)  ||   ($funct['job']==$check_sched2)){
+while ($sched_row = $focus->db->fetchByAssoc($sched_res)) {$scheds[] = $sched_row; }
+foreach ($scheds as $funct) {
+  if (($funct['job'] == $check_sched1) || ($funct['job'] == $check_sched2)) {
         $sched_mes = 'use';
         $sched_mes_body .= "<tr><td style='text-align: left;'>".$funct['name']."</td>";
         $sched_mes_body .= "<td style='text-align: left;'>".$funct['status']."</td></tr>";
-        if($funct['job']==$check_sched1){
-            $check_sched1 ="found";
-        }else{
-            $check_sched2 ="found";
+        if ($funct['job'] == $check_sched1) {
+            $check_sched1 = "found";
+        } else {
+            $check_sched2 = "found";
         }  
         
   }
@@ -213,43 +213,43 @@ 
 
 //determine which table header to use, based on whether or not schedulers were found
 $show_admin_link = false;
-if($sched_mes == 'use'){
+if ($sched_mes == 'use') {
     $sched_mes = "<h5>".$mod_strings['LBL_SCHEDULER_CHECK_GOOD']."</h5><br><table class='other view' cellspacing='1'>";
     $sched_mes .= "<tr><th scope='col' width='40%'><b>".$mod_strings['LBL_SCHEDULER_NAME']."</b></tH>"
                .  " <th scope='col' width='60%'><b>".$mod_strings['LBL_SCHEDULER_STATUS']."</b></tH></tr>";
             
-}else{
+} else {
     $sched_mes = "<table class='other view' cellspacing='1'>";
-    $sched_mes  .= "<tr><td colspan ='3'><font color='red'><b> ".$mod_strings['LBL_SCHEDULER_CHECK_BAD']."</b></font></td></tr>";
+    $sched_mes .= "<tr><td colspan ='3'><font color='red'><b> ".$mod_strings['LBL_SCHEDULER_CHECK_BAD']."</b></font></td></tr>";
     $show_admin_link = true;
 }
 
 //determine if error messages need to be displayed for schedulers
-if($check_sched2 != 'found'){
-    $sched_health =$sched_health +1;
-    $sched_mes_body  .= "<tr><td colspan ='3'><font color='red'> ".$mod_strings['LBL_SCHEDULER_CHECK1_BAD']."</font></td></tr>";
+if ($check_sched2 != 'found') {
+    $sched_health = $sched_health + 1;
+    $sched_mes_body .= "<tr><td colspan ='3'><font color='red'> ".$mod_strings['LBL_SCHEDULER_CHECK1_BAD']."</font></td></tr>";
 }
-if($check_sched1 != 'found'){
-    $sched_health =$sched_health +1;
-    $sched_mes_body  .= "<tr><td colspan ='3' scope='row'><font color='red'>".$mod_strings['LBL_SCHEDULER_CHECK2_BAD']."</font></td></tr>";
+if ($check_sched1 != 'found') {
+    $sched_health = $sched_health + 1;
+    $sched_mes_body .= "<tr><td colspan ='3' scope='row'><font color='red'>".$mod_strings['LBL_SCHEDULER_CHECK2_BAD']."</font></td></tr>";
 }
-$admin_sched_link='';
-if ($sched_health>0){
-    if (is_admin($current_user)){
-        $admin_sched_link="<a href='index.php?module=Schedulers&action=index'>".$mod_strings['LBL_SCHEDULER_LINK']."</a>";
-    }else{
-     $admin_sched_link=$mod_strings['LBL_NON_ADMIN_ERROR_MSG'];   
+$admin_sched_link = '';
+if ($sched_health > 0) {
+    if (is_admin($current_user)) {
+        $admin_sched_link = "<a href='index.php?module=Schedulers&action=index'>".$mod_strings['LBL_SCHEDULER_LINK']."</a>";
+    } else {
+     $admin_sched_link = $mod_strings['LBL_NON_ADMIN_ERROR_MSG'];   
     }    
 }    
 
 //put table html together and display
-    $final_sched_msg = $sched_mes . $sched_mes_body . '</table>' . $admin_sched_link;        
+    $final_sched_msg = $sched_mes.$sched_mes_body.'</table>'.$admin_sched_link;        
     $ss->assign("SCHEDULER_EMAILS_MESSAGE", $final_sched_msg);
-    $ss->assign( 'SCHEDULE_IMAGE', define_image($sched_health, 2));
+    $ss->assign('SCHEDULE_IMAGE', define_image($sched_health, 2));
 
 
 /********** FINAL END OF PAGE UI Stuff ********/
-if(!isset($_REQUEST['inline']) || $_REQUEST['inline'] != 'inline'){
+if (!isset($_REQUEST['inline']) || $_REQUEST['inline'] != 'inline') {
 
       $ss->display('modules/Campaigns/CampaignDiagnostic.html');
 }
@@ -264,18 +264,18 @@ 
 function define_image($num, $total)
 { global $mod_strings;
     //if health number is equal to total number then all checks failed, set red image
-    if($num == $total){
+    if ($num == $total) {
         //red
         return SugarThemeRegistry::current()->getImage('red_camp', "align='absmiddle'", null, null, ".gif", $mod_strings['LBL_INVALID']);
 
 
-    }elseif($num == 0){
+    }elseif ($num == 0) {
         //if health number is zero, then all checks passed, set green image
         //green
        return SugarThemeRegistry::current()->getImage('green_camp', "align='absmiddle'", null, null, ".gif", $mod_strings['LBL_VALID']);
 
 
-    }else{
+    } else {
         //if health number is between total and num params, then some checks failed but not all, set yellow image
         //yellow
         return SugarThemeRegistry::current()->getImage('yellow_camp', "align='absmiddle'", null, null, ".gif", $mod_strings['LBL_ALERT']);