adamjakab / SuiteCRM

modules/Campaigns/WebToLeadCapture.php

Spacing +41 added lines, -41 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.
@@ -47,7 +47,7 @@ 
 
 $mod_strings = return_module_language($sugar_config['default_language'], 'Leads');
 
-$app_list_strings['record_type_module'] = array('Contact'=>'Contacts', 'Account'=>'Accounts', 'Opportunity'=>'Opportunities', 'Case'=>'Cases', 'Note'=>'Notes', 'Call'=>'Calls', 'Email'=>'Emails', 'Meeting'=>'Meetings', 'Task'=>'Tasks', 'Lead'=>'Leads','Bug'=>'Bugs',
+$app_list_strings['record_type_module'] = array('Contact'=>'Contacts', 'Account'=>'Accounts', 'Opportunity'=>'Opportunities', 'Case'=>'Cases', 'Note'=>'Notes', 'Call'=>'Calls', 'Email'=>'Emails', 'Meeting'=>'Meetings', 'Task'=>'Tasks', 'Lead'=>'Leads', 'Bug'=>'Bugs',
 
 );
 
@@ -61,18 +61,18 @@ 
 if (isset($_POST['campaign_id']) && !empty($_POST['campaign_id'])) {
 	    //adding the client ip address
 	    $_POST['client_id_address'] = query_client_ip();
-		$campaign_id=$_POST['campaign_id'];
+		$campaign_id = $_POST['campaign_id'];
 		$campaign = new Campaign();
 		$camp_query  = "select name,id from campaigns where id='$campaign_id'";
 		$camp_query .= " and deleted=0";
-        $camp_result=$campaign->db->query($camp_query);
+        $camp_result = $campaign->db->query($camp_query);
         $camp_data = $campaign->db->fetchByAssoc($camp_result);
         // Bug 41292 - have to select marketing_id for new lead
         $db = DBManagerFactory::getInstance();
         $marketing = new EmailMarketing();
         $marketing_query = $marketing->create_new_list_query(
                 'date_start desc, date_modified desc',
-                "campaign_id = '{$campaign_id}' and status = 'active' and date_start < " . $db->convert('', 'today'),
+                "campaign_id = '{$campaign_id}' and status = 'active' and date_start < ".$db->convert('', 'today'),
                 array('id')
         );
         $marketing_result = $db->limitQuery($marketing_query, 0, 1, true);
@@ -83,22 +83,22 @@ 
 			$current_user->retrieve($_REQUEST['assigned_user_id']);
 		} 
 
-	    if(isset($camp_data) && $camp_data != null ){
+	    if (isset($camp_data) && $camp_data != null) {
 			$leadForm = new LeadFormBase();
             $lead = new Lead();
 			$prefix = '';
-			if(!empty($_POST['prefix'])){
+			if (!empty($_POST['prefix'])) {
 				$prefix = $_POST['prefix'];
 			}
 
-			if(empty($lead->id)) {
+			if (empty($lead->id)) {
                 $lead->id = create_guid();
                 $lead->new_with_id = true;
             }
             $GLOBALS['check_notify'] = true;
 
             //bug: 47574 - make sure, that webtolead_email1 field has same required attribute as email1 field
-            if(isset($lead->required_fields['email1'])){
+            if (isset($lead->required_fields['email1'])) {
                 $lead->required_fields['webtolead_email1'] = $lead->required_fields['email1'];
             }
             
@@ -114,7 +114,7 @@ 
             // checkRequired needs a major overhaul before it works for web to lead forms.
             $lead = $leadForm->handleSave($prefix, false, false, false, $lead);
             
-			if(!empty($lead)){
+			if (!empty($lead)) {
 				
 	            //create campaign log
 	            $camplog = new CampaignLog();
@@ -123,9 +123,9 @@ 
 	            $camplog->related_type = $lead->module_dir;
 	            $camplog->activity_type = "lead";
 	            $camplog->target_type = $lead->module_dir;
-	            $campaign_log->activity_date=$timedate->now();
-	            $camplog->target_id    = $lead->id;
-                if(isset($marketing_data['id']))
+	            $campaign_log->activity_date = $timedate->now();
+	            $camplog->target_id = $lead->id;
+                if (isset($marketing_data['id']))
                 {
                     $camplog->marketing_id = $marketing_data['id'];
                 }
@@ -155,7 +155,7 @@ 
                 
 		        $lead->load_relationship('campaigns');
 		        $lead->campaigns->add($camplog->id);
-                if(!empty($GLOBALS['check_notify'])) {
+                if (!empty($GLOBALS['check_notify'])) {
                     $lead->save($GLOBALS['check_notify']);
                 }
                 else {
@@ -164,47 +164,47 @@ 
             }
 
             //in case there are forms out there still using email_opt_out
-            if(isset($_POST['webtolead_email_opt_out']) || isset($_POST['email_opt_out'])){
+            if (isset($_POST['webtolead_email_opt_out']) || isset($_POST['email_opt_out'])) {
                     
-                if(isset ($lead->email1) && !empty($lead->email1)){
+                if (isset ($lead->email1) && !empty($lead->email1)) {
                     $sea = new SugarEmailAddress();
-                    $sea->AddUpdateEmailAddress($lead->email1,0,1);
+                    $sea->AddUpdateEmailAddress($lead->email1, 0, 1);
                 }   
-                if(isset ($lead->email2) && !empty($lead->email2)){
+                if (isset ($lead->email2) && !empty($lead->email2)) {
                     $sea = new SugarEmailAddress();
-                    $sea->AddUpdateEmailAddress($lead->email2,0,1);
+                    $sea->AddUpdateEmailAddress($lead->email2, 0, 1);
                     
                 }
             }              
-			if(isset($_POST['redirect_url']) && !empty($_POST['redirect_url'])){
+			if (isset($_POST['redirect_url']) && !empty($_POST['redirect_url'])) {
 			    // Get the redirect url, and make sure the query string is not too long
 		        $redirect_url = $_POST['redirect_url'];
 		        $query_string = '';
 				$first_char = '&';
-				if(strpos($redirect_url, '?') === FALSE){
+				if (strpos($redirect_url, '?') === FALSE) {
 					$first_char = '?';
 				}
 				$first_iteration = true;
 				$get_and_post = array_merge($_GET, $_POST);
-				foreach($get_and_post as $param => $value) {
+				foreach ($get_and_post as $param => $value) {
 
-					if($param == 'redirect_url' && $param == 'submit')
+					if ($param == 'redirect_url' && $param == 'submit')
 						continue;
 					
-					if($first_iteration){
+					if ($first_iteration) {
 						$first_iteration = false;
 						$query_string .= $first_char;
 					}
-					else{
+					else {
 						$query_string .= "&";
 					}
 					$query_string .= "{$param}=".urlencode($value);
 				}
-				if(empty($lead)) {
-					if($first_iteration){
+				if (empty($lead)) {
+					if ($first_iteration) {
 						$query_string .= $first_char;
 					}
-					else{
+					else {
 						$query_string .= "&";
 					}
 					$query_string .= "error=1";
@@ -215,46 +215,46 @@ 
 
 				// Check if the headers have been sent, or if the redirect url is greater than 2083 characters (IE max URL length)
 				//   and use a javascript form submission if that is the case.
-			    if(headers_sent() || strlen($redirect_url) > 2083){
-    				echo '<html ' . get_language_header() . '><head><title>SugarCRM</title></head><body>';
-    				echo '<form name="redirect" action="' .$_POST['redirect_url']. '" method="GET">';
+			    if (headers_sent() || strlen($redirect_url) > 2083) {
+    				echo '<html '.get_language_header().'><head><title>SugarCRM</title></head><body>';
+    				echo '<form name="redirect" action="'.$_POST['redirect_url'].'" method="GET">';
     
-    				foreach($_POST as $param => $value) {
-    					if($param != 'redirect_url' ||$param != 'submit') {
+    				foreach ($_POST as $param => $value) {
+    					if ($param != 'redirect_url' || $param != 'submit') {
     						echo '<input type="hidden" name="'.$param.'" value="'.$value.'">';
     					}
     				}
-    				if(empty($lead)) {
+    				if (empty($lead)) {
     					echo '<input type="hidden" name="error" value="1">';
     				}
     				echo '</form><script language="javascript" type="text/javascript">document.redirect.submit();</script>';
     				echo '</body></html>';
     			}
-				else{
+				else {
     				header("Location: {$redirect_url}");
     				die();
 			    }
 			}
-			else{
+			else {
 				echo $mod_strings['LBL_THANKS_FOR_SUBMITTING_LEAD'];
 			}
 			sugar_cleanup();
 			// die to keep code from running into redirect case below
 			die();
 	    }
-	   else{
+	   else {
 	  	  echo $mod_strings['LBL_SERVER_IS_CURRENTLY_UNAVAILABLE'];
 	  }
 }
 
 if (!empty($_POST['redirect'])) {
-    if(headers_sent()){
-    	echo '<html ' . get_language_header() . '><head><title>SugarCRM</title></head><body>';
-    	echo '<form name="redirect" action="' .$_POST['redirect']. '" method="GET">';
+    if (headers_sent()) {
+    	echo '<html '.get_language_header().'><head><title>SugarCRM</title></head><body>';
+    	echo '<form name="redirect" action="'.$_POST['redirect'].'" method="GET">';
     	echo '</form><script language="javascript" type="text/javascript">document.redirect.submit();</script>';
     	echo '</body></html>';
     }
-    else{
+    else {
     	header("Location: {$_POST['redirect']}");
     	die();
     }

Braces +13 added lines, -17 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -157,8 +159,7 @@ 
 		        $lead->campaigns->add($camplog->id);
                 if(!empty($GLOBALS['check_notify'])) {
                     $lead->save($GLOBALS['check_notify']);
-                }
-                else {
+                } else {
                     $lead->save(FALSE);
                 }
             }
@@ -188,14 +189,14 @@ 
 				$get_and_post = array_merge($_GET, $_POST);
 				foreach($get_and_post as $param => $value) {
 
-					if($param == 'redirect_url' && $param == 'submit')
-						continue;
+					if($param == 'redirect_url' && $param == 'submit') {
+											continue;
+					}
 					
 					if($first_iteration){
 						$first_iteration = false;
 						$query_string .= $first_char;
-					}
-					else{
+					} else{
 						$query_string .= "&";
 					}
 					$query_string .= "{$param}=".urlencode($value);
@@ -203,8 +204,7 @@ 
 				if(empty($lead)) {
 					if($first_iteration){
 						$query_string .= $first_char;
-					}
-					else{
+					} else{
 						$query_string .= "&";
 					}
 					$query_string .= "error=1";
@@ -229,20 +229,17 @@ 
     				}
     				echo '</form><script language="javascript" type="text/javascript">document.redirect.submit();</script>';
     				echo '</body></html>';
-    			}
-				else{
+    			} else{
     				header("Location: {$redirect_url}");
     				die();
 			    }
-			}
-			else{
+			} else{
 				echo $mod_strings['LBL_THANKS_FOR_SUBMITTING_LEAD'];
 			}
 			sugar_cleanup();
 			// die to keep code from running into redirect case below
 			die();
-	    }
-	   else{
+	    } else{
 	  	  echo $mod_strings['LBL_SERVER_IS_CURRENTLY_UNAVAILABLE'];
 	  }
 }
@@ -253,8 +250,7 @@ 
     	echo '<form name="redirect" action="' .$_POST['redirect']. '" method="GET">';
     	echo '</form><script language="javascript" type="text/javascript">document.redirect.submit();</script>';
     	echo '</body></html>';
-    }
-    else{
+    } else{
     	header("Location: {$_POST['redirect']}");
     	die();
     }

Indentation +105 added lines, -105 removed lines

@@ -55,16 +55,16 @@ 
  * To make your changes upgrade safe create a file called leadCapture_override.php and place the changes there
  */
 $users = array(
-	'PUT A RANDOM KEY FROM THE WEBSITE HERE' => array('name'=>'PUT THE USER_NAME HERE', 'pass'=>'PUT THE USER_HASH FOR THE RESPECTIVE USER HERE'),
+    'PUT A RANDOM KEY FROM THE WEBSITE HERE' => array('name'=>'PUT THE USER_NAME HERE', 'pass'=>'PUT THE USER_HASH FOR THE RESPECTIVE USER HERE'),
 );
 
 if (isset($_POST['campaign_id']) && !empty($_POST['campaign_id'])) {
-	    //adding the client ip address
-	    $_POST['client_id_address'] = query_client_ip();
-		$campaign_id=$_POST['campaign_id'];
-		$campaign = new Campaign();
-		$camp_query  = "select name,id from campaigns where id='$campaign_id'";
-		$camp_query .= " and deleted=0";
+        //adding the client ip address
+        $_POST['client_id_address'] = query_client_ip();
+        $campaign_id=$_POST['campaign_id'];
+        $campaign = new Campaign();
+        $camp_query  = "select name,id from campaigns where id='$campaign_id'";
+        $camp_query .= " and deleted=0";
         $camp_result=$campaign->db->query($camp_query);
         $camp_data = $campaign->db->fetchByAssoc($camp_result);
         // Bug 41292 - have to select marketing_id for new lead
@@ -78,20 +78,20 @@ 
         $marketing_result = $db->limitQuery($marketing_query, 0, 1, true);
         $marketing_data = $db->fetchByAssoc($marketing_result);
         // .Bug 41292
-		if (isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id'])) {
-			$current_user = new User();
-			$current_user->retrieve($_REQUEST['assigned_user_id']);
-		} 
+        if (isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id'])) {
+            $current_user = new User();
+            $current_user->retrieve($_REQUEST['assigned_user_id']);
+        } 
 
-	    if(isset($camp_data) && $camp_data != null ){
-			$leadForm = new LeadFormBase();
+        if(isset($camp_data) && $camp_data != null ){
+            $leadForm = new LeadFormBase();
             $lead = new Lead();
-			$prefix = '';
-			if(!empty($_POST['prefix'])){
-				$prefix = $_POST['prefix'];
-			}
+            $prefix = '';
+            if(!empty($_POST['prefix'])){
+                $prefix = $_POST['prefix'];
+            }
 
-			if(empty($lead->id)) {
+            if(empty($lead->id)) {
                 $lead->id = create_guid();
                 $lead->new_with_id = true;
             }
@@ -114,47 +114,47 @@ 
             // checkRequired needs a major overhaul before it works for web to lead forms.
             $lead = $leadForm->handleSave($prefix, false, false, false, $lead);
             
-			if(!empty($lead)){
+            if(!empty($lead)){
 				
-	            //create campaign log
-	            $camplog = new CampaignLog();
-	            $camplog->campaign_id  = $_POST['campaign_id'];
-	            $camplog->related_id   = $lead->id;
-	            $camplog->related_type = $lead->module_dir;
-	            $camplog->activity_type = "lead";
-	            $camplog->target_type = $lead->module_dir;
-	            $campaign_log->activity_date=$timedate->now();
-	            $camplog->target_id    = $lead->id;
+                //create campaign log
+                $camplog = new CampaignLog();
+                $camplog->campaign_id  = $_POST['campaign_id'];
+                $camplog->related_id   = $lead->id;
+                $camplog->related_type = $lead->module_dir;
+                $camplog->activity_type = "lead";
+                $camplog->target_type = $lead->module_dir;
+                $campaign_log->activity_date=$timedate->now();
+                $camplog->target_id    = $lead->id;
                 if(isset($marketing_data['id']))
                 {
                     $camplog->marketing_id = $marketing_data['id'];
                 }
-	            $camplog->save();
+                $camplog->save();
 
-		        //link campaignlog and lead
+                //link campaignlog and lead
 
-		        if (isset($_POST['email1']) && $_POST['email1'] != null)
+                if (isset($_POST['email1']) && $_POST['email1'] != null)
                 {
                     $lead->email1 = $_POST['email1'];
-		        } 
+                } 
                 //in case there are old forms used webtolead_email1
                 elseif (isset($_POST['webtolead_email1']) && $_POST['webtolead_email1'] != null)
                 {
                     $lead->email1 = $_POST['webtolead_email1'];
                 }
                 
-		        if (isset($_POST['email2']) && $_POST['email2'] != null)
+                if (isset($_POST['email2']) && $_POST['email2'] != null)
                 {
                     $lead->email2 = $_POST['email2'];
-		        } 
+                } 
                 //in case there are old forms used webtolead_email2
                 elseif (isset($_POST['webtolead_email2']) && $_POST['webtolead_email2'] != null)
                 {
                     $lead->email2 = $_POST['webtolead_email2'];
                 }
                 
-		        $lead->load_relationship('campaigns');
-		        $lead->campaigns->add($camplog->id);
+                $lead->load_relationship('campaigns');
+                $lead->campaigns->add($camplog->id);
                 if(!empty($GLOBALS['check_notify'])) {
                     $lead->save($GLOBALS['check_notify']);
                 }
@@ -176,87 +176,87 @@ 
                     
                 }
             }              
-			if(isset($_POST['redirect_url']) && !empty($_POST['redirect_url'])){
-			    // Get the redirect url, and make sure the query string is not too long
-		        $redirect_url = $_POST['redirect_url'];
-		        $query_string = '';
-				$first_char = '&';
-				if(strpos($redirect_url, '?') === FALSE){
-					$first_char = '?';
-				}
-				$first_iteration = true;
-				$get_and_post = array_merge($_GET, $_POST);
-				foreach($get_and_post as $param => $value) {
+            if(isset($_POST['redirect_url']) && !empty($_POST['redirect_url'])){
+                // Get the redirect url, and make sure the query string is not too long
+                $redirect_url = $_POST['redirect_url'];
+                $query_string = '';
+                $first_char = '&';
+                if(strpos($redirect_url, '?') === FALSE){
+                    $first_char = '?';
+                }
+                $first_iteration = true;
+                $get_and_post = array_merge($_GET, $_POST);
+                foreach($get_and_post as $param => $value) {
 
-					if($param == 'redirect_url' && $param == 'submit')
-						continue;
+                    if($param == 'redirect_url' && $param == 'submit')
+                        continue;
 					
-					if($first_iteration){
-						$first_iteration = false;
-						$query_string .= $first_char;
-					}
-					else{
-						$query_string .= "&";
-					}
-					$query_string .= "{$param}=".urlencode($value);
-				}
-				if(empty($lead)) {
-					if($first_iteration){
-						$query_string .= $first_char;
-					}
-					else{
-						$query_string .= "&";
-					}
-					$query_string .= "error=1";
-				}
+                    if($first_iteration){
+                        $first_iteration = false;
+                        $query_string .= $first_char;
+                    }
+                    else{
+                        $query_string .= "&";
+                    }
+                    $query_string .= "{$param}=".urlencode($value);
+                }
+                if(empty($lead)) {
+                    if($first_iteration){
+                        $query_string .= $first_char;
+                    }
+                    else{
+                        $query_string .= "&";
+                    }
+                    $query_string .= "error=1";
+                }
 				
-				$redirect_url = $redirect_url.$query_string;
+                $redirect_url = $redirect_url.$query_string;
 
 
-				// Check if the headers have been sent, or if the redirect url is greater than 2083 characters (IE max URL length)
-				//   and use a javascript form submission if that is the case.
-			    if(headers_sent() || strlen($redirect_url) > 2083){
-    				echo '<html ' . get_language_header() . '><head><title>SugarCRM</title></head><body>';
-    				echo '<form name="redirect" action="' .$_POST['redirect_url']. '" method="GET">';
+                // Check if the headers have been sent, or if the redirect url is greater than 2083 characters (IE max URL length)
+                //   and use a javascript form submission if that is the case.
+                if(headers_sent() || strlen($redirect_url) > 2083){
+                    echo '<html ' . get_language_header() . '><head><title>SugarCRM</title></head><body>';
+                    echo '<form name="redirect" action="' .$_POST['redirect_url']. '" method="GET">';
     
-    				foreach($_POST as $param => $value) {
-    					if($param != 'redirect_url' ||$param != 'submit') {
-    						echo '<input type="hidden" name="'.$param.'" value="'.$value.'">';
-    					}
-    				}
-    				if(empty($lead)) {
-    					echo '<input type="hidden" name="error" value="1">';
-    				}
-    				echo '</form><script language="javascript" type="text/javascript">document.redirect.submit();</script>';
-    				echo '</body></html>';
-    			}
-				else{
-    				header("Location: {$redirect_url}");
-    				die();
-			    }
-			}
-			else{
-				echo $mod_strings['LBL_THANKS_FOR_SUBMITTING'];
-			}
-			sugar_cleanup();
-			// die to keep code from running into redirect case below
-			die();
-	    }
-	   else{
-	  	  echo $mod_strings['LBL_SERVER_IS_CURRENTLY_UNAVAILABLE'];
-	  }
+                    foreach($_POST as $param => $value) {
+                        if($param != 'redirect_url' ||$param != 'submit') {
+                            echo '<input type="hidden" name="'.$param.'" value="'.$value.'">';
+                        }
+                    }
+                    if(empty($lead)) {
+                        echo '<input type="hidden" name="error" value="1">';
+                    }
+                    echo '</form><script language="javascript" type="text/javascript">document.redirect.submit();</script>';
+                    echo '</body></html>';
+                }
+                else{
+                    header("Location: {$redirect_url}");
+                    die();
+                }
+            }
+            else{
+                echo $mod_strings['LBL_THANKS_FOR_SUBMITTING'];
+            }
+            sugar_cleanup();
+            // die to keep code from running into redirect case below
+            die();
+        }
+        else{
+            echo $mod_strings['LBL_SERVER_IS_CURRENTLY_UNAVAILABLE'];
+        }
 }
 
 if (!empty($_POST['redirect'])) {
     if(headers_sent()){
-    	echo '<html ' . get_language_header() . '><head><title>SugarCRM</title></head><body>';
-    	echo '<form name="redirect" action="' .$_POST['redirect']. '" method="GET">';
-    	echo '</form><script language="javascript" type="text/javascript">document.redirect.submit();</script>';
-    	echo '</body></html>';
+        echo '<html ' . get_language_header() . '><head><title>SugarCRM</title></head><body>';
+        echo '<form name="redirect" action="' .$_POST['redirect']. '" method="GET">';
+        echo '</form><script language="javascript" type="text/javascript">document.redirect.submit();</script>';
+        echo '</body></html>';
     }
     else{
-    	header("Location: {$_POST['redirect']}");
-    	die();
+        header("Location: {$_POST['redirect']}");
+        die();
     }
 }
 

modules/Campaigns/DeleteTestCampaigns.php

Indentation +2 added lines, -2 removed lines

@@ -66,8 +66,8 @@
     $test_ids = array();
     $test_list_ids = array();
     while($row = $focus->db->fetchByAssoc($res)) {
-       $test_ids[] = $row['emailid'];
-       $test_list_ids[$row['listid']] = true;
+        $test_ids[] = $row['emailid'];
+        $test_list_ids[$row['listid']] = true;
     }
     $test_list_ids = array_keys($test_list_ids);
     unset($res);

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

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/Campaigns/WizardEmailSetup.php

Indentation +6 added lines, -6 removed lines

@@ -137,14 +137,14 @@ 
 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>";
+                    .  " <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){
                 
-     if( $colorclass == "class='evenListRowS1'"){
+        if( $colorclass == "class='evenListRowS1'"){
             $colorclass= "class='oddListRowS1'";
         }else{ 
             $colorclass= "class='evenListRowS1'";
@@ -175,7 +175,7 @@ 
 /**************************** WIZARD UI DIV Stuff *******************/
   
 //  this is the wizard control script that resides in page    
- $divScript = <<<EOQ
+    $divScript = <<<EOQ
  <script type="text/javascript" language="javascript">  
 
     //this function toggles visibility of fields based on selected options

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

Braces +17 added lines, -7 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -55,7 +57,9 @@ 
 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>";
@@ -78,9 +82,15 @@ 
 $ss = new Sugar_Smarty();
 $ss->assign("MOD", $mod_strings);
 $ss->assign("APP", $app_strings);
-if (isset($_REQUEST['return_module'])) $ss->assign("RETURN_MODULE", $_REQUEST['return_module']);
-if (isset($_REQUEST['return_action'])) $ss->assign("RETURN_ACTION", $_REQUEST['return_action']);
-if (isset($_REQUEST['return_id'])) $ss->assign("RETURN_ID", $_REQUEST['return_id']);
+if (isset($_REQUEST['return_module'])) {
+    $ss->assign("RETURN_MODULE", $_REQUEST['return_module']);
+}
+if (isset($_REQUEST['return_action'])) {
+    $ss->assign("RETURN_ACTION", $_REQUEST['return_action']);
+}
+if (isset($_REQUEST['return_id'])) {
+    $ss->assign("RETURN_ID", $_REQUEST['return_id']);
+}
 
 
 
@@ -146,7 +156,7 @@ 
                 
      if( $colorclass == "class='evenListRowS1'"){
             $colorclass= "class='oddListRowS1'";
-        }else{ 
+        } else{ 
             $colorclass= "class='evenListRowS1'";
         }           
         
@@ -159,7 +169,7 @@ 
     }
 
 
-}else{
+} else{
 $need_mbox = 'checked';
 $mboxTable .= "<tr><td colspan='5'><b>".$mod_strings['LBL_MAILBOX_CHECK_WIZ_BAD']." </b>.</td></tr>";
 }        

modules/Campaigns/ProcessBouncedEmails.php

Indentation +68 added lines, -68 removed lines

@@ -56,7 +56,7 @@ 
     $query = "SELECT description FROM notes WHERE file_mime_type = 'messsage/rfc822' AND parent_type='Emails' AND parent_id = '".$email->id."' AND deleted=0";
     $rs = $GLOBALS['db']->query($query);
     while ($row = $GLOBALS['db']->fetchByAssoc($rs)) 
-		$contents .= $row['description'];
+        $contents .= $row['description'];
 
     return $contents;
 }
@@ -162,80 +162,80 @@ 
 
 function campaign_process_bounced_emails(&$email, &$email_header) 
 {
-	global $sugar_config;
-	$emailFromAddress = $email_header->fromaddress;
-	$email_description = $email->raw_source;
+    global $sugar_config;
+    $emailFromAddress = $email_header->fromaddress;
+    $email_description = $email->raw_source;
     	
-	//if raw_source is empty, try using the description instead
-    	if (empty($email_description)){
-        	$email_description = $email->description;
-	}
+    //if raw_source is empty, try using the description instead
+        if (empty($email_description)){
+            $email_description = $email->description;
+    }
 
     $email_description .= retrieveErrorReportAttachment($email);
 
-	if (preg_match('/MAILER-DAEMON|POSTMASTER/i',$emailFromAddress)) 
-	{
-	    $email_description=quoted_printable_decode($email_description);
-		$matches=array();
+    if (preg_match('/MAILER-DAEMON|POSTMASTER/i',$emailFromAddress)) 
+    {
+        $email_description=quoted_printable_decode($email_description);
+        $matches=array();
 		
-		//do we have the identifier tag in the email?
-		$identifierScanResults = checkBouncedEmailForIdentifier($email_description);
+        //do we have the identifier tag in the email?
+        $identifierScanResults = checkBouncedEmailForIdentifier($email_description);
 		
-		if ( $identifierScanResults['found'] ) 
-		{
-			$matches = $identifierScanResults['matches'];
-			$identifiers = $identifierScanResults['identifiers'];
-
-			if (!empty($identifiers)) 
-			{
-				//array should have only one element in it.
-				$identifier = trim($identifiers[0]);
-				$row = getExistingCampaignLogEntry($identifier);
+        if ( $identifierScanResults['found'] ) 
+        {
+            $matches = $identifierScanResults['matches'];
+            $identifiers = $identifierScanResults['identifiers'];
+
+            if (!empty($identifiers)) 
+            {
+                //array should have only one element in it.
+                $identifier = trim($identifiers[0]);
+                $row = getExistingCampaignLogEntry($identifier);
 				
-				//Found entry
-				if (!empty($row)) 
-				{
-					//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')";
+                //Found entry
+                if (!empty($row)) 
+                {
+                    //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')";
                     $targeted = new CampaignLog();
-					$result_log=$targeted->db->query($query_log);
-					$row_log=$targeted->db->fetchByAssoc($result_log);
-
-					if (empty($row_log)) 
-					{
-						$return_id = createBouncedCampaignLogEntry($row, $email, $email_description);	
-						return TRUE;
-					}				
-					else 
-					{
-					    $GLOBALS['log']->debug("Warning: campaign log entry already exists for identifier $identifier");
-					    return FALSE;
-					}
-				} 
-				else 
-				{
-				    $GLOBALS['log']->info("Warning: skipping bounced email with this tracker_key(identifier) in the message body: ".$identifier);
-					return FALSE;
-				}			
-    		} 
-    		else 
-    		{
-    			$GLOBALS['log']->info("Warning: Empty identifier for campaign log.");
-    			return FALSE;
-    		}
-    	}  
-    	else 
-    	{
-    	    $GLOBALS['log']->info("Warning: skipping bounced email because it does not have the removeme link.");	
-    		return FALSE;	
-      	}
-  } 
-  else 
-  {
-	$GLOBALS['log']->info("Warning: skipping bounced email because the sender is not MAILER-DAEMON.");
-	return FALSE;
-  }
+                    $result_log=$targeted->db->query($query_log);
+                    $row_log=$targeted->db->fetchByAssoc($result_log);
+
+                    if (empty($row_log)) 
+                    {
+                        $return_id = createBouncedCampaignLogEntry($row, $email, $email_description);	
+                        return TRUE;
+                    }				
+                    else 
+                    {
+                        $GLOBALS['log']->debug("Warning: campaign log entry already exists for identifier $identifier");
+                        return FALSE;
+                    }
+                } 
+                else 
+                {
+                    $GLOBALS['log']->info("Warning: skipping bounced email with this tracker_key(identifier) in the message body: ".$identifier);
+                    return FALSE;
+                }			
+            } 
+            else 
+            {
+                $GLOBALS['log']->info("Warning: Empty identifier for campaign log.");
+                return FALSE;
+            }
+        }  
+        else 
+        {
+            $GLOBALS['log']->info("Warning: skipping bounced email because it does not have the removeme link.");	
+            return FALSE;	
+            }
+    } 
+    else 
+    {
+    $GLOBALS['log']->info("Warning: skipping bounced email because the sender is not MAILER-DAEMON.");
+    return FALSE;
+    }
 }
 ?>

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)) 
 					{

Braces +17 added lines, -19 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -55,8 +57,9 @@ 
     $contents = "";
     $query = "SELECT description FROM notes WHERE file_mime_type = 'messsage/rfc822' AND parent_type='Emails' AND parent_id = '".$email->id."' AND deleted=0";
     $rs = $GLOBALS['db']->query($query);
-    while ($row = $GLOBALS['db']->fetchByAssoc($rs)) 
-		$contents .= $row['description'];
+    while ($row = $GLOBALS['db']->fetchByAssoc($rs)) {
+    		$contents .= $row['description'];
+    }
 
     return $contents;
 }
@@ -89,9 +92,9 @@ 
     {
         $bounce->activity_type='invalid email';
         markEmailAddressInvalid($email);
+    } else {
+            $bounce->activity_type='send error';
     }
-    else 
-        $bounce->activity_type='send error';
         
     $return_id=$bounce->save();
     return $return_id;
@@ -104,8 +107,9 @@ 
  */
 function markEmailAddressInvalid($email_address)
 {
-    if(empty($email_address))
-        return;
+    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)
@@ -149,8 +153,7 @@ 
         $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);
         $found = TRUE;
@@ -207,32 +210,27 @@ 
 					{
 						$return_id = createBouncedCampaignLogEntry($row, $email, $email_description);	
 						return TRUE;
-					}				
-					else 
+					} else 
 					{
 					    $GLOBALS['log']->debug("Warning: campaign log entry already exists for identifier $identifier");
 					    return FALSE;
 					}
-				} 
-				else 
+				} else 
 				{
 				    $GLOBALS['log']->info("Warning: skipping bounced email with this tracker_key(identifier) in the message body: ".$identifier);
 					return FALSE;
 				}			
-    		} 
-    		else 
+    		} else 
     		{
     			$GLOBALS['log']->info("Warning: Empty identifier for campaign log.");
     			return FALSE;
     		}
-    	}  
-    	else 
+    	} else 
     	{
     	    $GLOBALS['log']->info("Warning: skipping bounced email because it does not have the removeme link.");	
     		return FALSE;	
       	}
-  } 
-  else 
+  } else 
   {
 	$GLOBALS['log']->info("Warning: skipping bounced email because the sender is not MAILER-DAEMON.");
 	return FALSE;

Doc Comments +3 added lines, -1 removed lines

@@ -100,7 +100,7 @@ 
 /**
  * Given an email address, mark it as invalid.
  *
- * @param $email_address
+ * @param Email $email_address
  */
 function markEmailAddressInvalid($email_address)
 {
@@ -118,6 +118,7 @@ 
  * Get the existing campaign log entry by tracker key.
  * 
  * @param string Target Key
+ * @param string $identifier
  * @return array Campaign Log Row
  */
 function getExistingCampaignLogEntry($identifier)
@@ -136,6 +137,7 @@ 
  * Scan the bounced email searching for a valid target identifier.
  * 
  * @param string Email Description
+ * @param string $email_description
  * @return array Results including matches and identifier
  */
 function checkBouncedEmailForIdentifier($email_description)

modules/Campaigns/WebToLeadFormSave.php

Spacing +12 added lines, -12 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -56,52 +56,52 @@ 
 
 //-----------begin replacing text input tags that have been marked with text area tags
 //get array of text areas strings to process
-$bodyHTML = html_entity_decode($_REQUEST['body_html'],ENT_QUOTES);
+$bodyHTML = html_entity_decode($_REQUEST['body_html'], ENT_QUOTES);
 //Bug53791
 $bodyHTML = str_replace(chr(160), " ", $bodyHTML);
 
-while (strpos($bodyHTML, "ta_replace") !== false){
+while (strpos($bodyHTML, "ta_replace") !== false) {
 
 	//define the marker edges of the sub string to process (opening and closing tag brackets)
 	$marker = strpos($bodyHTML, "ta_replace");
-	$start_border = strpos($bodyHTML, "input", $marker) - 1;// to account for opening '<' char;
+	$start_border = strpos($bodyHTML, "input", $marker) - 1; // to account for opening '<' char;
 	$end_border = strpos($bodyHTML, '>', $start_border); //get the closing tag after marker ">";
 
 	//extract the input tag string
-	$working_str = substr($bodyHTML, $marker-3, $end_border-($marker-3) );
+	$working_str = substr($bodyHTML, $marker - 3, $end_border - ($marker - 3));
 
 	//replace input markup with text areas markups
-	$new_str = str_replace('input','textarea',$working_str);
+	$new_str = str_replace('input', 'textarea', $working_str);
 	$new_str = str_replace("type='text'", ' ', $new_str);
-	$new_str = $new_str . '> </textarea';
+	$new_str = $new_str.'> </textarea';
 
 	//replace the marker with generic term
 	$new_str = str_replace('ta_replace', 'sugarslot', $new_str);
 
 	//merge the processed string back into bodyhtml string
-	$bodyHTML = str_replace($working_str , $new_str, $bodyHTML);
+	$bodyHTML = str_replace($working_str, $new_str, $bodyHTML);
 }
 //<<<----------end replacing marked text inputs with text area tags
 
 $guid = create_guid();
 $form_file = "upload://$guid";
 
-$SugarTiny =  new SugarTinyMCE();
+$SugarTiny = new SugarTinyMCE();
 $html = $SugarTiny->cleanEncodedMCEHtml($bodyHTML);
 
 //Check to ensure we have <html> tags in the form. Without them, IE8 will attempt to display the page as XML.
 if (stripos($html, "<html") === false) {
     $langHeader = get_language_header();
-    $html = "<html {$langHeader}><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"></head><body>" . $html . "</body></html>";
+    $html = "<html {$langHeader}><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"></head><body>".$html."</body></html>";
 }
 file_put_contents($form_file, $html);
 
-$xtpl=new XTemplate ('modules/Campaigns/WebToLeadDownloadForm.html');
+$xtpl = new XTemplate('modules/Campaigns/WebToLeadDownloadForm.html');
 $xtpl->assign("MOD", $mod_strings);
 $xtpl->assign("APP", $app_strings);
 $webformlink = "<b>$mod_strings[LBL_DOWNLOAD_TEXT_WEB_TO_LEAD_FORM]</b><br/>";
 $webformlink .= "<a href=\"index.php?entryPoint=download&id={$guid}&isTempFile=1&tempName=WebToLeadForm.html&type=temp\">$mod_strings[LBL_DOWNLOAD_WEB_TO_LEAD_FORM]</a>";
-$xtpl->assign("LINK_TO_WEB_FORM",$webformlink);
+$xtpl->assign("LINK_TO_WEB_FORM", $webformlink);
 $xtpl->assign("RAW_SOURCE", htmlspecialchars($html)); 
 $xtpl->parse("main.copy_source");
 $xtpl->parse("main");

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

Indentation +16 added lines, -16 removed lines

@@ -62,27 +62,27 @@
 
 while (strpos($bodyHTML, "ta_replace") !== false){
 
-	//define the marker edges of the sub string to process (opening and closing tag brackets)
-	$marker = strpos($bodyHTML, "ta_replace");
-	$start_border = strpos($bodyHTML, "input", $marker) - 1;// to account for opening '<' char;
-	$end_border = strpos($bodyHTML, '>', $start_border); //get the closing tag after marker ">";
+    //define the marker edges of the sub string to process (opening and closing tag brackets)
+    $marker = strpos($bodyHTML, "ta_replace");
+    $start_border = strpos($bodyHTML, "input", $marker) - 1;// to account for opening '<' char;
+    $end_border = strpos($bodyHTML, '>', $start_border); //get the closing tag after marker ">";
 
-	//extract the input tag string
-	$working_str = substr($bodyHTML, $marker-3, $end_border-($marker-3) );
+    //extract the input tag string
+    $working_str = substr($bodyHTML, $marker-3, $end_border-($marker-3) );
 
-	//replace input markup with text areas markups
-	$new_str = str_replace('input','textarea',$working_str);
-	$new_str = str_replace("type=\"text\"", ' ', $new_str);
-	$new_str = $new_str . '> </textarea';
+    //replace input markup with text areas markups
+    $new_str = str_replace('input','textarea',$working_str);
+    $new_str = str_replace("type=\"text\"", ' ', $new_str);
+    $new_str = $new_str . '> </textarea';
 
-	//replace the marker with generic term
-	$new_str = str_replace('ta_replace', 'sugarslot', $new_str);
+    //replace the marker with generic term
+    $new_str = str_replace('ta_replace', 'sugarslot', $new_str);
 
-	// NET-enabling start-tag requires SHORTTAG YES
-	$new_str = str_replace('/> </textarea>', '> </textarea>', $new_str);
+    // NET-enabling start-tag requires SHORTTAG YES
+    $new_str = str_replace('/> </textarea>', '> </textarea>', $new_str);
 
-	//merge the processed string back into bodyhtml string
-	$bodyHTML = str_replace($working_str , $new_str, $bodyHTML);
+    //merge the processed string back into bodyhtml string
+    $bodyHTML = str_replace($working_str , $new_str, $bodyHTML);
 }
 //<<<----------end replacing marked text inputs with text area tags
 

modules/Campaigns/CampaignDiagnostic.php

Indentation +19 added lines, -19 removed lines

@@ -59,11 +59,11 @@ 
 //if (!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
 //account for use within wizards
 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'];
+    $params = array();
+    $params[] = "<a href='index.php?module=Campaigns&action=index'>{$mod_strings['LBL_MODULE_NAME']}</a>";
+    $params[] = $mod_strings['LBL_CAMPAIGN_DIAGNOSTICS'];
 	
-	echo getClassicModuleTitle('Campaigns', $params, true);
+    echo getClassicModuleTitle('Campaigns', $params, true);
 }
 
 global $theme;
@@ -110,10 +110,10 @@ 
 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>";
+                    .  " <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){
         $mboxTable .= "<tr><td>".$details['name']."</td>";
@@ -144,11 +144,11 @@ 
 }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>";
+                .  " <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'){
-     $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>";
+        $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>";}
                    
@@ -157,7 +157,7 @@ 
         $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>";
 
@@ -198,7 +198,7 @@ 
 //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)){
+    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>";
@@ -208,7 +208,7 @@ 
             $check_sched2 ="found";
         }  
         
-  }
+    }
 }
 
 //determine which table header to use, based on whether or not schedulers were found
@@ -216,7 +216,7 @@ 
 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>";
+                .  " <th scope='col' width='60%'><b>".$mod_strings['LBL_SCHEDULER_STATUS']."</b></tH></tr>";
             
 }else{
     $sched_mes = "<table class='other view' cellspacing='1'>";
@@ -238,7 +238,7 @@ 
     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=$mod_strings['LBL_NON_ADMIN_ERROR_MSG'];   
     }    
 }    
 
@@ -251,7 +251,7 @@ 
 /********** FINAL END OF PAGE UI Stuff ********/
 if(!isset($_REQUEST['inline']) || $_REQUEST['inline'] != 'inline'){
 
-      $ss->display('modules/Campaigns/CampaignDiagnostic.html');
+        $ss->display('modules/Campaigns/CampaignDiagnostic.html');
 }
 
 /**
@@ -272,7 +272,7 @@ 
     }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']);
+        return SugarThemeRegistry::current()->getImage('green_camp', "align='absmiddle'", null, null, ".gif", $mod_strings['LBL_VALID']);
 
 
     }else{

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']);

Braces +23 added lines, -15 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -76,14 +78,20 @@ 
     {
 
 }
-}else{
+} else{
     //use html if not inline
     $ss = new Sugar_Smarty();
     $ss->assign("MOD", $mod_strings);
     $ss->assign("APP", $app_strings);
-    if (isset($_REQUEST['return_module'])) $ss->assign("RETURN_MODULE", $_REQUEST['return_module']);
-    if (isset($_REQUEST['return_action'])) $ss->assign("RETURN_ACTION", $_REQUEST['return_action']);
-    if (isset($_REQUEST['return_id'])) $ss->assign("RETURN_ID", $_REQUEST['return_id']);
+    if (isset($_REQUEST['return_module'])) {
+        $ss->assign("RETURN_MODULE", $_REQUEST['return_module']);
+    }
+    if (isset($_REQUEST['return_action'])) {
+        $ss->assign("RETURN_ACTION", $_REQUEST['return_action']);
+    }
+    if (isset($_REQUEST['return_id'])) {
+        $ss->assign("RETURN_ID", $_REQUEST['return_id']);
+    }
     // handle Create $module then Cancel
     if (empty($_REQUEST['return_id'])) {
         $ss->assign("RETURN_ACTION", 'index');
@@ -123,7 +131,7 @@ 
         $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;
@@ -141,7 +149,7 @@ 
     //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{
+} 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>"
@@ -150,7 +158,7 @@ 
      $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>";}
                    
     
 
@@ -161,7 +169,7 @@ 
         $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>";}       
 
 }
           
@@ -171,7 +179,7 @@ 
 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{
+    } else{
         $email_setup_wiz_link=$mod_strings['LBL_NON_ADMIN_ERROR_MSG'];
     }    
 }
@@ -204,7 +212,7 @@ 
         $sched_mes_body .= "<td style='text-align: left;'>".$funct['status']."</td></tr>";
         if($funct['job']==$check_sched1){
             $check_sched1 ="found";
-        }else{
+        } else{
             $check_sched2 ="found";
         }  
         
@@ -218,7 +226,7 @@ 
     $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>";
     $show_admin_link = true;
@@ -237,7 +245,7 @@ 
 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{
+    } else{
      $admin_sched_link=$mod_strings['LBL_NON_ADMIN_ERROR_MSG'];   
     }    
 }    
@@ -269,13 +277,13 @@ 
         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']);

modules/Campaigns/WizardMarketingSave.php

Indentation +14 added lines, -14 removed lines

@@ -65,8 +65,8 @@ 
     }
         
 }else{
-     //default to just saving and exiting wizard
-     $master = 'save';   
+        //default to just saving and exiting wizard
+        $master = 'save';   
 }
 
 
@@ -90,17 +90,17 @@ 
 }
 
     foreach ($_REQUEST as $key => $val) {
-              if((strstr($key, $prefix )) && (strpos($key, $prefix )== 0)){
-              $newkey  =substr($key, strlen($prefix)) ;
-              $_REQUEST[$newkey] = $val;
-         }               
+                if((strstr($key, $prefix )) && (strpos($key, $prefix )== 0)){
+                $newkey  =substr($key, strlen($prefix)) ;
+                $_REQUEST[$newkey] = $val;
+            }               
     }
 
     foreach ($_REQUEST as $key => $val) {
-              if((strstr($key, $prefix )) && (strpos($key, $prefix )== 0)){
-              $newkey  =substr($key, strlen($prefix)) ;
-              $_REQUEST[$newkey] = $val;
-         }               
+                if((strstr($key, $prefix )) && (strpos($key, $prefix )== 0)){
+                $newkey  =substr($key, strlen($prefix)) ;
+                $_REQUEST[$newkey] = $val;
+            }               
     }
 
 if(!empty($_REQUEST['meridiem'])){
@@ -108,9 +108,9 @@ 
 }
 
 if(empty($_REQUEST['time_start'])) {
-  $_REQUEST['date_start'] = $_REQUEST['date_start'] . ' 00:00';	
+    $_REQUEST['date_start'] = $_REQUEST['date_start'] . ' 00:00';	
 } else {
-  $_REQUEST['date_start'] = $_REQUEST['date_start'] . ' ' . $_REQUEST['time_start'];
+    $_REQUEST['date_start'] = $_REQUEST['date_start'] . ' ' . $_REQUEST['time_start'];
 }
 
 foreach($marketing->column_fields as $field)
@@ -180,8 +180,8 @@ 
     $_REQUEST['record'] =$marketing->campaign_id;
     $_POST['record']=$marketing->campaign_id;
     $_REQUEST['mode'] = $master;
-     $_POST['mode'] = $master; 
-     $_REQUEST['from_wiz']= 'true';
+        $_POST['mode'] = $master; 
+        $_REQUEST['from_wiz']= 'true';
     require_once('modules/Campaigns/QueueCampaign.php');
 }
 

Spacing +38 added lines, -38 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.
@@ -53,18 +53,18 @@ 
 $master = 'save';
 if (isset($_REQUEST['wiz_home_next_step']) && !empty($_REQUEST['wiz_home_next_step'])) {
     
-    if($_REQUEST['wiz_home_next_step']==3){
+    if ($_REQUEST['wiz_home_next_step'] == 3) {
         //user has chosen to save and schedule this campaign for email
         $master = 'send';
-    }elseif($_REQUEST['wiz_home_next_step']==2){
+    }elseif ($_REQUEST['wiz_home_next_step'] == 2) {
         //user has chosen to save and send this campaign in test mode
         $master = 'test';
-    }else{
+    } else {
         //user has chosen to simply save
-        $master  = 'save';        
+        $master = 'save';        
     }
         
-}else{
+} else {
      //default to just saving and exiting wizard
      $master = 'save';   
 }
@@ -77,7 +77,7 @@ 
 if (isset($_REQUEST['record']) && !empty($_REQUEST['record'])) {
     $marketing->retrieve($_REQUEST['record']);
 }
-if(!$marketing->ACLAccess('Save')){
+if (!$marketing->ACLAccess('Save')) {
         ACLController::displayNoAccess(true);
         sugar_cleanup(true);
 }
@@ -90,40 +90,40 @@ 
 }
 
     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 ($_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;
          }               
     }
 
-if(!empty($_REQUEST['meridiem'])){
-    $_REQUEST['time_start'] = $timedate->merge_time_meridiem($_REQUEST['time_start'],$timedate->get_time_format(), $_REQUEST['meridiem']);
+if (!empty($_REQUEST['meridiem'])) {
+    $_REQUEST['time_start'] = $timedate->merge_time_meridiem($_REQUEST['time_start'], $timedate->get_time_format(), $_REQUEST['meridiem']);
 }
 
-if(empty($_REQUEST['time_start'])) {
-  $_REQUEST['date_start'] = $_REQUEST['date_start'] . ' 00:00';	
+if (empty($_REQUEST['time_start'])) {
+  $_REQUEST['date_start'] = $_REQUEST['date_start'].' 00:00';	
 } else {
-  $_REQUEST['date_start'] = $_REQUEST['date_start'] . ' ' . $_REQUEST['time_start'];
+  $_REQUEST['date_start'] = $_REQUEST['date_start'].' '.$_REQUEST['time_start'];
 }
 
-foreach($marketing->column_fields as $field)
+foreach ($marketing->column_fields as $field)
 {
     if ($field == 'all_prospect_lists') {
-        if(isset($_REQUEST[$field]) && $_REQUEST[$field]='on' )
+        if (isset($_REQUEST[$field]) && $_REQUEST[$field] = 'on')
         {
             $marketing->$field = 1;
         } else {
             $marketing->$field = 0;         
         }
-    }else {
-        if(isset($_REQUEST[$field]))
+    } else {
+        if (isset($_REQUEST[$field]))
         {
             $value = $_REQUEST[$field];
             $marketing->$field = trim($value);
@@ -131,9 +131,9 @@ 
     }
 }
 
-foreach($marketing->additional_column_fields as $field)
+foreach ($marketing->additional_column_fields as $field)
 {
-    if(isset($_REQUEST[$field]))
+    if (isset($_REQUEST[$field]))
     {
         $value = $_REQUEST[$field];
         $marketing->$field = $value;
@@ -145,8 +145,8 @@ 
 
 //add prospect lists to campaign.
 $marketing->load_relationship('prospectlists');
-$prospectlists=$marketing->prospectlists->get();
-if ($marketing->all_prospect_lists==1) {
+$prospectlists = $marketing->prospectlists->get();
+if ($marketing->all_prospect_lists == 1) {
     //remove all related prospect lists.
     if (!empty($prospectlists)) {
         $marketing->prospectlists->delete($marketing->id);
@@ -155,7 +155,7 @@ 
     if (isset($_REQUEST['message_for']) && is_array($_REQUEST['message_for'])) {
         foreach ($_REQUEST['message_for'] as $prospect_list_id) {
             
-            $key=array_search($prospect_list_id,$prospectlists);
+            $key = array_search($prospect_list_id, $prospectlists);
             if ($key === null or $key === false) {
                 $marketing->prospectlists->add($prospect_list_id);          
             } else {
@@ -164,7 +164,7 @@ 
         }
         if (count($prospectlists) != 0) {
             foreach ($prospectlists as $key=>$list_id) {
-                $marketing->prospectlists->delete($marketing->id,$list_id);             
+                $marketing->prospectlists->delete($marketing->id, $list_id);             
             }   
         }
     }
@@ -174,21 +174,21 @@ 
 $mass[] = $marketing->id; 
 //if sending an email was chosen, set all the needed variables for queuing campaign
 
-if($master !='save'){
-    $_REQUEST['mass']= $mass;
-    $_POST['mass']=$mass;
-    $_REQUEST['record'] =$marketing->campaign_id;
-    $_POST['record']=$marketing->campaign_id;
+if ($master != 'save') {
+    $_REQUEST['mass'] = $mass;
+    $_POST['mass'] = $mass;
+    $_REQUEST['record'] = $marketing->campaign_id;
+    $_POST['record'] = $marketing->campaign_id;
     $_REQUEST['mode'] = $master;
      $_POST['mode'] = $master; 
-     $_REQUEST['from_wiz']= 'true';
+     $_REQUEST['from_wiz'] = 'true';
     require_once('modules/Campaigns/QueueCampaign.php');
 }
 
-if(isset($_REQUEST['show_wizard_summary']) && $_REQUEST['show_wizard_summary']) {
+if (isset($_REQUEST['show_wizard_summary']) && $_REQUEST['show_wizard_summary']) {
 
-    if( (isset($_REQUEST['sendMarketingEmailTest']) && $_REQUEST['sendMarketingEmailTest']) ||
-        (isset($_REQUEST['sendMarketingEmailSchedule']) && $_REQUEST['sendMarketingEmailSchedule']) ) {
+    if ((isset($_REQUEST['sendMarketingEmailTest']) && $_REQUEST['sendMarketingEmailTest']) ||
+        (isset($_REQUEST['sendMarketingEmailSchedule']) && $_REQUEST['sendMarketingEmailSchedule'])) {
         // set correct post variables..
         $_POST['module'] = 'Campaigns';
         $_POST['action'] = 'QueueCampaign';
@@ -200,10 +200,10 @@ 
         $_POST['direct_step'] = '1';
         //$_POST['campaign_id'] = '';
         $_POST['wiz_mass'] = $marketing->id;
-        if(isset($_REQUEST['sendMarketingEmailTest']) && $_REQUEST['sendMarketingEmailTest']) {
+        if (isset($_REQUEST['sendMarketingEmailTest']) && $_REQUEST['sendMarketingEmailTest']) {
             $_POST['mode'] = 'test';
         }
-        else if(isset($_REQUEST['sendMarketingEmailSchedule']) && $_REQUEST['sendMarketingEmailSchedule']) {
+        else if (isset($_REQUEST['sendMarketingEmailSchedule']) && $_REQUEST['sendMarketingEmailSchedule']) {
             $_POST['mode'] = 'send';
             $_SESSION['msg'] = 'LBL_EMAILS_SCHEDULED';
         }
@@ -217,7 +217,7 @@ 
         exit;
     }
 
-    $header_URL = "Location: index.php?action=WizardMarketing&module=Campaigns&return_module=Campaigns&return_action=WizardHome&return_id=" . $marketing->campaign_id . "&campaign_id=" . $marketing->campaign_id . "&jump=3&marketing_id=" . $marketing->id;
+    $header_URL = "Location: index.php?action=WizardMarketing&module=Campaigns&return_module=Campaigns&return_action=WizardHome&return_id=".$marketing->campaign_id."&campaign_id=".$marketing->campaign_id."&jump=3&marketing_id=".$marketing->id;
 }
 else {
     $header_URL = "Location: index.php?action=WizardHome&module=Campaigns&record=".$marketing->campaign_id;

Braces +11 added lines, -13 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -56,15 +58,15 @@ 
     if($_REQUEST['wiz_home_next_step']==3){
         //user has chosen to save and schedule this campaign for email
         $master = 'send';
-    }elseif($_REQUEST['wiz_home_next_step']==2){
+    } elseif($_REQUEST['wiz_home_next_step']==2){
         //user has chosen to save and send this campaign in test mode
         $master = 'test';
-    }else{
+    } else{
         //user has chosen to simply save
         $master  = 'save';        
     }
         
-}else{
+} else{
      //default to just saving and exiting wizard
      $master = 'save';   
 }
@@ -84,8 +86,7 @@ 
 
 if (!empty($_REQUEST['assigned_user_id']) && ($marketing->assigned_user_id != $_REQUEST['assigned_user_id']) && ($_POST['assigned_user_id'] != $current_user->id)) {
     $check_notify = TRUE;
-}
-else {
+} else {
     $check_notify = FALSE;
 }
 
@@ -122,7 +123,7 @@ 
         } else {
             $marketing->$field = 0;         
         }
-    }else {
+    } else {
         if(isset($_REQUEST[$field]))
         {
             $value = $_REQUEST[$field];
@@ -202,12 +203,10 @@ 
         $_POST['wiz_mass'] = $marketing->id;
         if(isset($_REQUEST['sendMarketingEmailTest']) && $_REQUEST['sendMarketingEmailTest']) {
             $_POST['mode'] = 'test';
-        }
-        else if(isset($_REQUEST['sendMarketingEmailSchedule']) && $_REQUEST['sendMarketingEmailSchedule']) {
+        } else if(isset($_REQUEST['sendMarketingEmailSchedule']) && $_REQUEST['sendMarketingEmailSchedule']) {
             $_POST['mode'] = 'send';
             $_SESSION['msg'] = 'LBL_EMAILS_SCHEDULED';
-        }
-        else {
+        } else {
             throw new Exception('request error');
         }
 
@@ -218,8 +217,7 @@ 
     }
 
     $header_URL = "Location: index.php?action=WizardMarketing&module=Campaigns&return_module=Campaigns&return_action=WizardHome&return_id=" . $marketing->campaign_id . "&campaign_id=" . $marketing->campaign_id . "&jump=3&marketing_id=" . $marketing->id;
-}
-else {
+} else {
     $header_URL = "Location: index.php?action=WizardHome&module=Campaigns&record=".$marketing->campaign_id;
 }
 

modules/AOR_Conditions/vardefs.php

Spacing +13 added lines, -13 removed lines

@@ -26,9 +26,9 @@ 
 	'table'=>'aor_conditions',
 	'audited'=>false,
 	'duplicate_merge'=>true,
-	'fields'=>array (
+	'fields'=>array(
   'aor_report_id' =>
-  array (
+  array(
     'required' => false,
     'name' => 'aor_report_id',
     'vname' => 'LBL_AOR_REPORT_ID',
@@ -47,7 +47,7 @@ 
     'size' => '20',
   ),
   'condition_order' => 
-  array (
+  array(
     'required' => false,
     'name' => 'condition_order',
     'vname' => 'LBL_ORDER',
@@ -79,14 +79,14 @@ 
             'type' => 'varchar',
         ),
   'module_path' =>
-  array (
+  array(
     'name' => 'module_path',
     'type' => 'longtext',
     'vname' => 'LBL_MODULE_PATH',
     'isnull' => true,
   ),
   'field' => 
-  array (
+  array(
     'required' => false,
     'name' => 'field',
     'vname' => 'LBL_FIELD',
@@ -108,7 +108,7 @@ 
     'dependency' => false,
   ),
   'operator' => 
-  array (
+  array(
     'required' => false,
     'name' => 'operator',
     'vname' => 'LBL_OPERATOR',
@@ -131,7 +131,7 @@ 
     'dependency' => false,
   ),
     'value_type' =>
-    array (
+    array(
     'required' => false,
     'name' => 'value_type',
     'vname' => 'LBL_VALUE_TYPE',
@@ -150,7 +150,7 @@ 
     'size' => '20',
     ),
   'value' => 
-  array (
+  array(
     'required' => false,
     'name' => 'value',
     'vname' => 'LBL_VALUE',
@@ -169,7 +169,7 @@ 
     'size' => '20',
   ),
         'parameter' =>
-            array (
+            array(
                 'required' => false,
                 'name' => 'parameter',
                 'vname' => 'LBL_PARAMETER',
@@ -187,7 +187,7 @@ 
                 'studio' => 'visible',
             ),
   'aor_reports' =>
-  array (
+  array(
     'name' => 'aor_reports',
     'type' => 'link',
     'relationship' => 'aor_report_aor_conditions',
@@ -196,7 +196,7 @@ 
     'source'=>'non-db',
   ),
 ),
-	'relationships'=>array (
+	'relationships'=>array(
 ),
     'indices' => array(
         array(
@@ -209,7 +209,7 @@ 
 	'unified_search'=>true,
 );
 
-if (!class_exists('VardefManager')){
+if (!class_exists('VardefManager')) {
         require_once('include/SugarObjects/VardefManager.php');
 }
-VardefManager::createVardef('AOR_Conditions','AOR_Condition', array('basic'));
+VardefManager::createVardef('AOR_Conditions', 'AOR_Condition', array('basic'));

Indentation +29 added lines, -29 removed lines

@@ -23,12 +23,12 @@ 
  */
 
 $dictionary['AOR_Condition'] = array(
-	'table'=>'aor_conditions',
-	'audited'=>false,
-	'duplicate_merge'=>true,
-	'fields'=>array (
-  'aor_report_id' =>
-  array (
+    'table'=>'aor_conditions',
+    'audited'=>false,
+    'duplicate_merge'=>true,
+    'fields'=>array (
+    'aor_report_id' =>
+    array (
     'required' => false,
     'name' => 'aor_report_id',
     'vname' => 'LBL_AOR_REPORT_ID',
@@ -45,9 +45,9 @@ 
     'merge_filter' => 'disabled',
     'len' => 36,
     'size' => '20',
-  ),
-  'condition_order' => 
-  array (
+    ),
+    'condition_order' => 
+    array (
     'required' => false,
     'name' => 'condition_order',
     'vname' => 'LBL_ORDER',
@@ -66,7 +66,7 @@ 
     'size' => '20',
     'enable_range_search' => false,
     'disable_num_format' => '',
-  ),
+    ),
         'logic_op' => array(
             'name' => 'logic_op',
             'vname' => 'LBL_LOGIC_OP',
@@ -78,15 +78,15 @@ 
             'vname' => 'LBL_PARENTHESIS',
             'type' => 'varchar',
         ),
-  'module_path' =>
-  array (
+    'module_path' =>
+    array (
     'name' => 'module_path',
     'type' => 'longtext',
     'vname' => 'LBL_MODULE_PATH',
     'isnull' => true,
-  ),
-  'field' => 
-  array (
+    ),
+    'field' => 
+    array (
     'required' => false,
     'name' => 'field',
     'vname' => 'LBL_FIELD',
@@ -106,9 +106,9 @@ 
     'options' => 'user_type_dom',
     'studio' => 'visible',
     'dependency' => false,
-  ),
-  'operator' => 
-  array (
+    ),
+    'operator' => 
+    array (
     'required' => false,
     'name' => 'operator',
     'vname' => 'LBL_OPERATOR',
@@ -129,7 +129,7 @@ 
     'options' => 'aor_operator_list',
     'studio' => 'visible',
     'dependency' => false,
-  ),
+    ),
     'value_type' =>
     array (
     'required' => false,
@@ -152,9 +152,9 @@ 
     'options' => 'aor_condition_type_list',
     'studio' => 'visible',
     'dependency' => false,
-  ),
-  'value' => 
-  array (
+    ),
+    'value' => 
+    array (
     'required' => false,
     'name' => 'value',
     'vname' => 'LBL_VALUE',
@@ -171,7 +171,7 @@ 
     'merge_filter' => 'disabled',
     'len' => '255',
     'size' => '20',
-  ),
+    ),
         'parameter' =>
             array (
                 'required' => false,
@@ -190,17 +190,17 @@ 
                 'merge_filter' => 'disabled',
                 'studio' => 'visible',
             ),
-  'aor_reports' =>
-  array (
+    'aor_reports' =>
+    array (
     'name' => 'aor_reports',
     'type' => 'link',
     'relationship' => 'aor_report_aor_conditions',
     'module'=>'AOR_Reports',
     'bean_name'=>'AOR_Reports',
     'source'=>'non-db',
-  ),
+    ),
 ),
-	'relationships'=>array (
+    'relationships'=>array (
 ),
     'indices' => array(
         array(
@@ -209,8 +209,8 @@ 
             'fields' => array('aor_report_id'),
         ),
     ),
-	'optimistic_locking'=>true,
-	'unified_search'=>true,
+    'optimistic_locking'=>true,
+    'unified_search'=>true,
 );
 
 if (!class_exists('VardefManager')){

modules/AOR_Conditions/conditionLines.php

Spacing +11 added lines, -11 removed lines

@@ -23,19 +23,19 @@ 
  */
 
 
-function display_condition_lines($focus, $field, $value, $view){
+function display_condition_lines($focus, $field, $value, $view) {
 
     global $locale, $app_list_strings, $mod_strings;
 
     $html = '';
 
-    if (!is_file('cache/jsLanguage/AOR_Conditions/' . $GLOBALS['current_language'] . '.js')) {
+    if (!is_file('cache/jsLanguage/AOR_Conditions/'.$GLOBALS['current_language'].'.js')) {
         require_once ('include/language/jsLanguage.php');
         jsLanguage::createModuleStringsCache('AOR_Conditions', $GLOBALS['current_language']);
     }
-    $html .= '<script src="cache/jsLanguage/AOR_Conditions/'. $GLOBALS['current_language'] . '.js"></script>';
+    $html .= '<script src="cache/jsLanguage/AOR_Conditions/'.$GLOBALS['current_language'].'.js"></script>';
 
-    if($view == 'EditView'){
+    if ($view == 'EditView') {
 
         $html .= '<script src="modules/AOR_Conditions/conditionLines.js"></script>';
         $html .= "<table border='0' cellspacing='4' width='100%' id='conditionLines'></table>";
@@ -45,12 +45,12 @@ 
         $html .= "</div>";
 
 
-        if(isset($focus->report_module) && $focus->report_module != ''){
+        if (isset($focus->report_module) && $focus->report_module != '') {
             require_once("modules/AOW_WorkFlow/aow_utils.php");
             $html .= "<script>";
             $html .= "report_module = \"".$focus->report_module."\";";
             $html .= "document.getElementById('btn_ConditionLine').disabled = '';";
-            if($focus->id != ''){
+            if ($focus->id != '') {
                 $sql = "SELECT id FROM aor_conditions WHERE aor_report_id = '".$focus->id."' AND deleted = 0 ORDER BY condition_order ASC";
                 $result = $focus->db->query($sql);
 
@@ -58,8 +58,8 @@ 
                     $condition_name = new AOR_Condition();
                     $condition_name->retrieve($row['id']);
                     $condition_name->module_path = unserialize(base64_decode($condition_name->module_path));
-                    $html .= "report_fields = \"".trim(preg_replace('/\s+/', ' ', getModuleFields(getRelatedModule($focus->report_module,$condition_name->module_path[0]))))."\";";
-                    if($condition_name->value_type == 'Date'){
+                    $html .= "report_fields = \"".trim(preg_replace('/\s+/', ' ', getModuleFields(getRelatedModule($focus->report_module, $condition_name->module_path[0]))))."\";";
+                    if ($condition_name->value_type == 'Date') {
                         $condition_name->value = unserialize(base64_decode($condition_name->value));
                     }
                     $condition_item = json_encode($condition_name->toArray());
@@ -71,12 +71,12 @@ 
         }
 
     }
-    else if($view == 'DetailView'){
+    else if ($view == 'DetailView') {
         $html .= '<script src="modules/AOR_Conditions/conditionLines.js"></script>';
         $html .= "<table border='0' cellspacing='0' width='100%' id='conditionLines'></table>";
 
 
-        if(isset($focus->report_module) && $focus->report_module != ''){
+        if (isset($focus->report_module) && $focus->report_module != '') {
             require_once("modules/AOW_WorkFlow/aow_utils.php");
             $html .= "<script>";
             $html .= "report_fields = \"".trim(preg_replace('/\s+/', ' ', getModuleFields($focus->report_module)))."\";";
@@ -88,7 +88,7 @@ 
                 $condition_name = new AOR_Condition();
                 $condition_name->retrieve($row['id']);
                 $condition_name->module_path = unserialize(base64_decode($condition_name->module_path));
-                if($condition_name->value_type == 'Date'){
+                if ($condition_name->value_type == 'Date') {
                     $condition_name->value = unserialize(base64_decode($condition_name->value));
                 }
                 $condition_item = json_encode($condition_name->toArray());

Braces +1 added lines, -2 removed lines

@@ -70,8 +70,7 @@
             $html .= "</script>";
         }
 
-    }
-    else if($view == 'DetailView'){
+    } else if($view == 'DetailView'){
         $html .= '<script src="modules/AOR_Conditions/conditionLines.js"></script>';
         $html .= "<table border='0' cellspacing='0' width='100%' id='conditionLines'></table>";