adamjakab / SuiteCRM

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

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{

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

modules/EmailTemplates/field_arrays.php

Indentation +12 added lines, -12 removed lines

@@ -46,19 +46,19 @@
  * Contributor(s): ______________________________________..
  ********************************************************************************/
 $fields_array['EmailTemplate'] = array ('column_fields' => Array("id"
-		, "date_entered"
-		, "date_modified"
-		, "modified_user_id"
-		, "created_by"
-		, "description"
-		, "subject"
-		, "body"
-		, "body_html"
-		, "name"
-		, "published"
-		),
+        , "date_entered"
+        , "date_modified"
+        , "modified_user_id"
+        , "created_by"
+        , "description"
+        , "subject"
+        , "body"
+        , "body_html"
+        , "name"
+        , "published"
+        ),
         'list_fields' =>  Array('id', 'name', 'description','date_modified'
-	),
+    ),
     'required_fields' => array("name"=>1),
 );
 ?>
\ No newline at end of file

modules/EmailTemplates/AttachFiles.php

Indentation +24 added lines, -24 removed lines

@@ -38,10 +38,10 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
- //Request object must have these property values:
- //		Module: module name, this module should have a file called TreeData.php
- //		Function: name of the function to be called in TreeData.php, the function will be called statically.
- //		PARAM prefixed properties: array of these property/values will be passed to the function as parameter.
+    //Request object must have these property values:
+    //		Module: module name, this module should have a file called TreeData.php
+    //		Function: name of the function to be called in TreeData.php, the function will be called statically.
+    //		PARAM prefixed properties: array of these property/values will be passed to the function as parameter.
 
 
 require_once('include/JSON.php');
@@ -56,27 +56,27 @@ 
 $ret = array();
 
 foreach($_FILES as $k => $file) {
-	if(in_array(strtolower($_FILES[$k]['type']), $imgType) && $_FILES[$k]['size'] > 0) {
-	    $upload_file = new UploadFile($k);
-		// check the file
-		if($upload_file->confirm_upload()) {
-		    $dest = $cachedir.basename($upload_file->get_stored_file_name()); // target name
-		    $guid = create_guid();
-		    if($upload_file->final_move($guid)) { // move to uploads
-		        $path = $upload_file->get_upload_path($guid);
-		        // if file is OK, copy to cache
-		        if(verify_uploaded_image($path) && copy($path, $dest)) {
-		            $ret[] = $dest;
-		        }
-		        // remove temp file
-		        unlink($path);
-		    }
-		}
-	}
+    if(in_array(strtolower($_FILES[$k]['type']), $imgType) && $_FILES[$k]['size'] > 0) {
+        $upload_file = new UploadFile($k);
+        // check the file
+        if($upload_file->confirm_upload()) {
+            $dest = $cachedir.basename($upload_file->get_stored_file_name()); // target name
+            $guid = create_guid();
+            if($upload_file->final_move($guid)) { // move to uploads
+                $path = $upload_file->get_upload_path($guid);
+                // if file is OK, copy to cache
+                if(verify_uploaded_image($path) && copy($path, $dest)) {
+                    $ret[] = $dest;
+                }
+                // remove temp file
+                unlink($path);
+            }
+        }
+    }
 }
 
 if (!empty($ret)) {
-	$json = getJSONobj();
-	echo $json->encode($ret);
-	//return the parameters
+    $json = getJSONobj();
+    echo $json->encode($ret);
+    //return the parameters
 }

modules/EmailTemplates/CheckDeletable.php

Indentation +27 added lines, -27 removed lines

@@ -50,38 +50,38 @@
 
 $focus = new EmailTemplate();
 if($_REQUEST['from'] == 'DetailView') {
-	if(!isset($_REQUEST['record']))
-		sugar_die("A record number must be specified to delete the template.");
-	$focus->retrieve($_REQUEST['record']);
-	if(check_email_template_in_use($focus)) {
-		echo 'true';
-		return;
-	}
-	echo 'false';
+    if(!isset($_REQUEST['record']))
+        sugar_die("A record number must be specified to delete the template.");
+    $focus->retrieve($_REQUEST['record']);
+    if(check_email_template_in_use($focus)) {
+        echo 'true';
+        return;
+    }
+    echo 'false';
 } else if($_REQUEST['from'] == 'ListView') {
-	$returnString = '';
-	$idArray = explode(',', $_REQUEST['records']);
-	foreach($idArray as $key => $value) {
-		if($focus->retrieve($value)) {
-			if(check_email_template_in_use($focus)) {
-				$returnString .= $focus->name . ',';
-			}
-		}
-	}
-	$returnString = substr($returnString, 0, -1);
-	echo $returnString;
+    $returnString = '';
+    $idArray = explode(',', $_REQUEST['records']);
+    foreach($idArray as $key => $value) {
+        if($focus->retrieve($value)) {
+            if(check_email_template_in_use($focus)) {
+                $returnString .= $focus->name . ',';
+            }
+        }
+    }
+    $returnString = substr($returnString, 0, -1);
+    echo $returnString;
 } else {
-	echo '';
+    echo '';
 }
 
 function check_email_template_in_use($focus)
 {
-	if($focus->is_used_by_email_marketing()) {
-		return true;
-	}
-	$system = $GLOBALS['sugar_config']['passwordsetting'];
-	if($focus->id == $system['generatepasswordtmpl'] || $focus->id == $system['lostpasswordtmpl']) {
-	    return true;
-	}
+    if($focus->is_used_by_email_marketing()) {
+        return true;
+    }
+    $system = $GLOBALS['sugar_config']['passwordsetting'];
+    if($focus->id == $system['generatepasswordtmpl'] || $focus->id == $system['lostpasswordtmpl']) {
+        return true;
+    }
     return false;
 }

modules/FP_events/responseEntryPoint.php

Indentation +52 added lines, -52 removed lines

@@ -1,29 +1,29 @@ 
 <?php
 if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
-	global $db;
+    global $db;
 	 
-	$even_id = $_GET['event'];
-	$delegate_id = $_GET['delegate'];
-	$type = $_GET['type'];
-	$response = $_GET['response'];	
+    $even_id = $_GET['event'];
+    $delegate_id = $_GET['delegate'];
+    $type = $_GET['type'];
+    $response = $_GET['response'];	
 
-	//get event
+    //get event
     $event = new FP_events();
     $event->retrieve($even_id);
     
     if($type == 'c'){
     	
-    	$event->load_relationship('fp_events_contacts'); // get related contacts
+        $event->load_relationship('fp_events_contacts'); // get related contacts
 
-    	if($response == 'accept'){
+        if($response == 'accept'){
 
             //check to see if they have already responded to the email
             $check_q = 'SELECT email_responded FROM fp_events_contacts_c WHERE fp_events_contactsfp_events_ida="'.$event->id.'" AND fp_events_contactscontacts_idb="'.$delegate_id.'"';
-             $check = $db->getOne($check_q);
-    		//update contact to accepted
-    		$query = 'UPDATE fp_events_contacts_c SET accept_status="Accepted", email_responded="1" WHERE fp_events_contactsfp_events_ida="'.$event->id.'" AND fp_events_contactscontacts_idb="'.$delegate_id.'" AND email_responded="0"';
-    		if($db->query($query) && $check != '1'){
+                $check = $db->getOne($check_q);
+            //update contact to accepted
+            $query = 'UPDATE fp_events_contacts_c SET accept_status="Accepted", email_responded="1" WHERE fp_events_contactsfp_events_ida="'.$event->id.'" AND fp_events_contactscontacts_idb="'.$delegate_id.'" AND email_responded="0"';
+            if($db->query($query) && $check != '1'){
     			
                 if(!IsNullOrEmptyString($event->accept_redirect)){
                     
@@ -33,17 +33,17 @@ 
                 else{
                     echo 'Thank you for accepting';
                 }   
-    		}
-    		else {
-    			echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
-    		}	
-    	}
-    	else if($response == 'decline'){
-    		//check to see if they have already responded to the email
+            }
+            else {
+                echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
+            }	
+        }
+        else if($response == 'decline'){
+            //check to see if they have already responded to the email
             $check_q = 'SELECT email_responded FROM fp_events_contacts_c WHERE fp_events_contactsfp_events_ida="'.$event->id.'" AND fp_events_contactscontacts_idb="'.$delegate_id.'"';
-             $check = $db->getOne($check_q);
+                $check = $db->getOne($check_q);
             //update contact to accepted
-    		$query = 'UPDATE fp_events_contacts_c SET accept_status="Declined", email_responded="1" WHERE fp_events_contactsfp_events_ida="'.$event->id.'" AND fp_events_contactscontacts_idb="'.$delegate_id.'" AND email_responded="0"';
+            $query = 'UPDATE fp_events_contacts_c SET accept_status="Declined", email_responded="1" WHERE fp_events_contactsfp_events_ida="'.$event->id.'" AND fp_events_contactscontacts_idb="'.$delegate_id.'" AND email_responded="0"';
     		
             if($db->query($query) && $check != '1'){
     			
@@ -56,24 +56,24 @@ 
                 else{
                     echo 'Thank you for declining';
                 }
-    		}
-    		else {
-    			echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
-    		}
-    	}
+            }
+            else {
+                echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
+            }
+        }
     }
     if($type == 't'){
     	
-    	$event->load_relationship('fp_events_prospects_1'); //get related targets
+        $event->load_relationship('fp_events_prospects_1'); //get related targets
 
-    	if($response == 'accept'){
+        if($response == 'accept'){
             //check to see if they have already responded to the email
             $check_q = 'SELECT email_responded FROM fp_events_prospects_1_c WHERE fp_events_prospects_1fp_events_ida="'.$event->id.'" AND fp_events_prospects_1prospects_idb="'.$delegate_id.'"';
-             $check = $db->getOne($check_q);
+                $check = $db->getOne($check_q);
 
-    		//update contact to accepted
-    		$query = 'UPDATE fp_events_prospects_1_c SET accept_status="Accepted", email_responded="1" WHERE fp_events_prospects_1fp_events_ida="'.$event->id.'" AND fp_events_prospects_1prospects_idb="'.$delegate_id.'" AND email_responded="0"';
-    		if($db->query($query) && $check != '1'){
+            //update contact to accepted
+            $query = 'UPDATE fp_events_prospects_1_c SET accept_status="Accepted", email_responded="1" WHERE fp_events_prospects_1fp_events_ida="'.$event->id.'" AND fp_events_prospects_1prospects_idb="'.$delegate_id.'" AND email_responded="0"';
+            if($db->query($query) && $check != '1'){
                 
                 if(!IsNullOrEmptyString($event->accept_redirect)){
                     
@@ -87,14 +87,14 @@ 
             else {
                 echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
             }   
-    	}
-    	else if($response == 'decline'){
+        }
+        else if($response == 'decline'){
             //check to see if they have already responded to the email
             $check_q = 'SELECT email_responded FROM fp_events_prospects_1_c WHERE fp_events_prospects_1fp_events_ida="'.$event->id.'" AND fp_events_prospects_1prospects_idb="'.$delegate_id.'"';
-             $check = $db->getOne($check_q);
-    		//update contact to accepted
-    		$query = 'UPDATE fp_events_prospects_1_c SET accept_status="Declined", email_responded="1" WHERE fp_events_prospects_1fp_events_ida="'.$event->id.'" AND fp_events_prospects_1prospects_idb="'.$delegate_id.'" AND email_responded="0"';
-    		if($db->query($query) && $check != '1'){
+                $check = $db->getOne($check_q);
+            //update contact to accepted
+            $query = 'UPDATE fp_events_prospects_1_c SET accept_status="Declined", email_responded="1" WHERE fp_events_prospects_1fp_events_ida="'.$event->id.'" AND fp_events_prospects_1prospects_idb="'.$delegate_id.'" AND email_responded="0"';
+            if($db->query($query) && $check != '1'){
                 
                 if(!IsNullOrEmptyString($event->decline_redirect)){
 
@@ -109,19 +109,19 @@ 
             else {
                 echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
             }
-    	}
+        }
     }
     if($type == 'l'){
     	
-    	$event->load_relationship('fp_events_leads_1'); //get related leads
+        $event->load_relationship('fp_events_leads_1'); //get related leads
 
-    	if($response == 'accept'){
+        if($response == 'accept'){
             //check to see if they have already responded to the email
             $check_q = 'SELECT email_responded FROM fp_events_leads_1_c WHERE ffp_events_leads_1fp_events_ida="'.$event->id.'" AND fp_events_leads_1leads_idb="'.$delegate_id.'"';
-             $check = $db->getOne($check_q);
-    		//update contact to accepted
-    		$query = 'UPDATE fp_events_leads_1_c SET accept_status="Accepted", email_responded="1" WHERE fp_events_leads_1fp_events_ida="'.$event->id.'" AND fp_events_leads_1leads_idb="'.$delegate_id.'" AND email_responded="0"';
-    		if($db->query($query) && $check != '1'){
+                $check = $db->getOne($check_q);
+            //update contact to accepted
+            $query = 'UPDATE fp_events_leads_1_c SET accept_status="Accepted", email_responded="1" WHERE fp_events_leads_1fp_events_ida="'.$event->id.'" AND fp_events_leads_1leads_idb="'.$delegate_id.'" AND email_responded="0"';
+            if($db->query($query) && $check != '1'){
                 
                 if(!IsNullOrEmptyString($event->accept_redirect)){
                     
@@ -135,15 +135,15 @@ 
             else {
                 echo 'There was a problem with the link please contact the sender of the invite';
             }   
-    	}
-    	else if($response == 'decline'){
-    		//check to see if they have already responded to the email
+        }
+        else if($response == 'decline'){
+            //check to see if they have already responded to the email
             $check_q = 'SELECT email_responded FROM fp_events_leads_1_c WHERE fp_events_leads_1fp_events_ida="'.$event->id.'" AND fp_events_leads_1leads_idb="'.$delegate_id.'"';
-             $check = $db->getOne($check_q);
+                $check = $db->getOne($check_q);
             //update contact to accepted
-    		$query = 'UPDATE fp_events_leads_1_c SET accept_status="Declined", email_responded="1" WHERE fp_events_leads_1fp_events_ida="'.$event->id.'" AND fp_events_leads_1leads_idb="'.$delegate_id.'" AND email_responded="0"';
+            $query = 'UPDATE fp_events_leads_1_c SET accept_status="Declined", email_responded="1" WHERE fp_events_leads_1fp_events_ida="'.$event->id.'" AND fp_events_leads_1leads_idb="'.$delegate_id.'" AND email_responded="0"';
 
-    		if($db->query($query) && $check != '1'){
+            if($db->query($query) && $check != '1'){
                 
                 if(!IsNullOrEmptyString($event->decline_redirect)){
 
@@ -158,7 +158,7 @@ 
             else {
                 echo 'There was a problem with the link please contact the sender of the invite';
             }
-    	}
+        }
     }
     // Function for basic field validation (present and neither empty nor only white space nor just 'http://')
     function IsNullOrEmptyString($question){

modules/Meetings/JoinExternalMeeting.php

Indentation +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
     }
 }else{
     if(isset($row['id']) || $meetingBean->assigned_user_id == $GLOBALS['current_user']->id || is_admin($GLOBALS['current_user']) || is_admin_for_module($GLOBALS['current_user'],'Meetings')){
-      SugarApplication::redirect($meetingBean->join_url);
+        SugarApplication::redirect($meetingBean->join_url);
     }else{
         //if the user is not invited or the owner of the meeting or an admin then they cannot join the meeting.
         $tplFile = 'modules/Meetings/tpls/extMeetingNotInvited.tpl';

modules/Meetings/language/en_us.lang.php

Indentation +84 added lines, -84 removed lines

@@ -47,75 +47,75 @@ 
  ********************************************************************************/
 
 $mod_strings = array (
-	'ERR_DELETE_RECORD' => 'A record number must be specified to delete the meeting.',
+    'ERR_DELETE_RECORD' => 'A record number must be specified to delete the meeting.',
 
-	'LBL_ACCEPT_THIS'=>'Accept?',
-	'LBL_ADD_BUTTON'=> 'Add',
-	'LBL_ADD_INVITEE' => 'Add Invitees',
-	'LBL_COLON' => ':',
-	'LBL_CONTACT_NAME' => 'Contact:',
-	'LBL_CONTACTS_SUBPANEL_TITLE' => 'Contacts',
-	'LBL_CREATED_BY'=>'Created by',
-	'LBL_DATE_END'=>'End Date',
-	'LBL_DATE_TIME' => 'Start Date & Time:',
-	'LBL_DATE' => 'Start Date:',
-	'LBL_DEFAULT_SUBPANEL_TITLE' => 'Meetings',
-	'LBL_DEL'=> 'Del',
-	'LBL_DESCRIPTION_INFORMATION' => 'Description Information',
-	'LBL_DESCRIPTION' => 'Description:',
+    'LBL_ACCEPT_THIS'=>'Accept?',
+    'LBL_ADD_BUTTON'=> 'Add',
+    'LBL_ADD_INVITEE' => 'Add Invitees',
+    'LBL_COLON' => ':',
+    'LBL_CONTACT_NAME' => 'Contact:',
+    'LBL_CONTACTS_SUBPANEL_TITLE' => 'Contacts',
+    'LBL_CREATED_BY'=>'Created by',
+    'LBL_DATE_END'=>'End Date',
+    'LBL_DATE_TIME' => 'Start Date & Time:',
+    'LBL_DATE' => 'Start Date:',
+    'LBL_DEFAULT_SUBPANEL_TITLE' => 'Meetings',
+    'LBL_DEL'=> 'Del',
+    'LBL_DESCRIPTION_INFORMATION' => 'Description Information',
+    'LBL_DESCRIPTION' => 'Description:',
     'LBL_DIRECTION' => 'Direction:',
-	'LBL_DURATION_HOURS' => 'Duration Hours:',
-	'LBL_DURATION_MINUTES' => 'Duration Minutes:',
-	'LBL_DURATION' => 'Duration:',
-	'LBL_EMAIL' => 'Email',
-	'LBL_FIRST_NAME' => 'First Name',
-	'LBL_HISTORY_SUBPANEL_TITLE' => 'Notes',
-	'LBL_HOURS_ABBREV' => 'h',
-	'LBL_HOURS_MINS' => '(hours/minutes)',
-	'LBL_INVITEE' => 'Invitees',
-	'LBL_LAST_NAME' => 'Last Name',
-	'LBL_ASSIGNED_TO_NAME'=>'Assigned to:',
-	'LBL_LIST_ASSIGNED_TO_NAME' => 'Assigned User',
-	'LBL_LIST_CLOSE' => 'Close',
-	'LBL_LIST_CONTACT' => 'Contact',
-	'LBL_LIST_DATE_MODIFIED'=>'Date Modified',
-	'LBL_LIST_DATE' => 'Start Date',
-	'LBL_LIST_DIRECTION' => 'Direction',
-	'LBL_LIST_DUE_DATE'=>'Due Date',
-	'LBL_LIST_FORM_TITLE' => 'Meeting List',
-	'LBL_LIST_MY_MEETINGS' => 'My Meetings',
-	'LBL_LIST_RELATED_TO' => 'Related to',
-	'LBL_LIST_STATUS'=>'Status',
-	'LBL_LIST_SUBJECT' => 'Subject',
-	'LBL_LIST_TIME' => 'Start Time',
-	'LBL_LEADS_SUBPANEL_TITLE' => 'Leads',
-	'LBL_LOCATION' => 'Location:',
-	'LBL_MEETING' => 'Meeting:',
-	'LBL_MINSS_ABBREV' => 'm',
-	'LBL_MODIFIED_BY'=>'Modified by',
-	'LBL_MODULE_NAME' => 'Meetings',
-	'LBL_MODULE_TITLE' => 'Meetings: Home',
-	'LBL_NAME' => 'Name',
-	'LBL_NEW_FORM_TITLE' => 'Create Appointment',
-	'LBL_OUTLOOK_ID' => 'Outlook ID',
-	'LBL_SEQUENCE' => 'Meeting update sequence',
-	'LBL_PHONE' => 'Phone Office:',
-	'LBL_REMINDER_TIME'=>'Reminder Time',
+    'LBL_DURATION_HOURS' => 'Duration Hours:',
+    'LBL_DURATION_MINUTES' => 'Duration Minutes:',
+    'LBL_DURATION' => 'Duration:',
+    'LBL_EMAIL' => 'Email',
+    'LBL_FIRST_NAME' => 'First Name',
+    'LBL_HISTORY_SUBPANEL_TITLE' => 'Notes',
+    'LBL_HOURS_ABBREV' => 'h',
+    'LBL_HOURS_MINS' => '(hours/minutes)',
+    'LBL_INVITEE' => 'Invitees',
+    'LBL_LAST_NAME' => 'Last Name',
+    'LBL_ASSIGNED_TO_NAME'=>'Assigned to:',
+    'LBL_LIST_ASSIGNED_TO_NAME' => 'Assigned User',
+    'LBL_LIST_CLOSE' => 'Close',
+    'LBL_LIST_CONTACT' => 'Contact',
+    'LBL_LIST_DATE_MODIFIED'=>'Date Modified',
+    'LBL_LIST_DATE' => 'Start Date',
+    'LBL_LIST_DIRECTION' => 'Direction',
+    'LBL_LIST_DUE_DATE'=>'Due Date',
+    'LBL_LIST_FORM_TITLE' => 'Meeting List',
+    'LBL_LIST_MY_MEETINGS' => 'My Meetings',
+    'LBL_LIST_RELATED_TO' => 'Related to',
+    'LBL_LIST_STATUS'=>'Status',
+    'LBL_LIST_SUBJECT' => 'Subject',
+    'LBL_LIST_TIME' => 'Start Time',
+    'LBL_LEADS_SUBPANEL_TITLE' => 'Leads',
+    'LBL_LOCATION' => 'Location:',
+    'LBL_MEETING' => 'Meeting:',
+    'LBL_MINSS_ABBREV' => 'm',
+    'LBL_MODIFIED_BY'=>'Modified by',
+    'LBL_MODULE_NAME' => 'Meetings',
+    'LBL_MODULE_TITLE' => 'Meetings: Home',
+    'LBL_NAME' => 'Name',
+    'LBL_NEW_FORM_TITLE' => 'Create Appointment',
+    'LBL_OUTLOOK_ID' => 'Outlook ID',
+    'LBL_SEQUENCE' => 'Meeting update sequence',
+    'LBL_PHONE' => 'Phone Office:',
+    'LBL_REMINDER_TIME'=>'Reminder Time',
     'LBL_EMAIL_REMINDER_SENT' => 'Email reminder sent',
-	'LBL_REMINDER' => 'Reminders:',
-	'LBL_REMINDER_POPUP' => 'Popup',
-	'LBL_REMINDER_EMAIL' => 'Email',
+    'LBL_REMINDER' => 'Reminders:',
+    'LBL_REMINDER_POPUP' => 'Popup',
+    'LBL_REMINDER_EMAIL' => 'Email',
     'LBL_REMINDER_EMAIL_ALL_INVITEES' => 'Email all invitees',
     'LBL_EMAIL_REMINDER' => 'Email Reminder',
     'LBL_EMAIL_REMINDER_TIME' => 'Email Reminder Time',
     'LBL_REMOVE' => 'rem',
-	'LBL_SCHEDULING_FORM_TITLE' => 'Scheduling',
-	'LBL_SEARCH_BUTTON'=> 'Search',
-	'LBL_SEARCH_FORM_TITLE' => 'Meeting Search',
-	'LBL_SEND_BUTTON_KEY'=>'I',
-	'LBL_SEND_BUTTON_LABEL'=>'Save & Send Invites',
-	'LBL_SEND_BUTTON_TITLE'=>'Save & Send Invites',
-	'LBL_STATUS' => 'Status:',
+    'LBL_SCHEDULING_FORM_TITLE' => 'Scheduling',
+    'LBL_SEARCH_BUTTON'=> 'Search',
+    'LBL_SEARCH_FORM_TITLE' => 'Meeting Search',
+    'LBL_SEND_BUTTON_KEY'=>'I',
+    'LBL_SEND_BUTTON_LABEL'=>'Save & Send Invites',
+    'LBL_SEND_BUTTON_TITLE'=>'Save & Send Invites',
+    'LBL_STATUS' => 'Status:',
     'LBL_TYPE' => 'Meeting Type',
     'LBL_PASSWORD' => 'Meeting Password',
     'LBL_URL' => 'Start/Join Meeting',
@@ -123,25 +123,25 @@ 
     'LBL_DISPLAYED_URL' => 'Display URL',
     'LBL_CREATOR' => 'Meeting Creator',
     'LBL_EXTERNALID' => 'External App ID',
-	'LBL_SUBJECT' => 'Subject:',
-	'LBL_TIME' => 'Start Time:',
-	'LBL_USERS_SUBPANEL_TITLE' => 'Users',
-	'LBL_ACTIVITIES_REPORTS' => 'Activities Report',
+    'LBL_SUBJECT' => 'Subject:',
+    'LBL_TIME' => 'Start Time:',
+    'LBL_USERS_SUBPANEL_TITLE' => 'Users',
+    'LBL_ACTIVITIES_REPORTS' => 'Activities Report',
     'LBL_PARENT_TYPE' => 'Parent Type',
     'LBL_PARENT_ID' => 'Parent ID',
-	'LNK_MEETING_LIST'=>'View Meetings',
-	'LNK_NEW_APPOINTMENT' => 'Create Appointment',
-	'LNK_NEW_MEETING'=>'Schedule Meeting',
-	'LNK_IMPORT_MEETINGS' => 'Import Meetings',
+    'LNK_MEETING_LIST'=>'View Meetings',
+    'LNK_NEW_APPOINTMENT' => 'Create Appointment',
+    'LNK_NEW_MEETING'=>'Schedule Meeting',
+    'LNK_IMPORT_MEETINGS' => 'Import Meetings',
 
-	'NTC_REMOVE_INVITEE' => 'Are you sure you want to remove this invitee from the meeting?',
+    'NTC_REMOVE_INVITEE' => 'Are you sure you want to remove this invitee from the meeting?',
     'LBL_CREATED_USER' => 'Created User',
     'LBL_MODIFIED_USER' => 'Modified User',
     'NOTICE_DURATION_TIME' => 'Duration time must be greater than 0',
     'LBL_MEETING_INFORMATION' => 'Overview',
-	'LBL_LIST_JOIN_MEETING' => 'Join Meeting',
-	'LBL_JOIN_EXT_MEETING' => 'Join Meeting',
-	'LBL_HOST_EXT_MEETING' => 'Start Meeting',
+    'LBL_LIST_JOIN_MEETING' => 'Join Meeting',
+    'LBL_JOIN_EXT_MEETING' => 'Join Meeting',
+    'LBL_HOST_EXT_MEETING' => 'Start Meeting',
     'LBL_ACCEPT_STATUS' => 'Accept Status',
     'LBL_ACCEPT_LINK' => 'Accept Link',
     // You are not invited to the meeting messages
@@ -154,7 +154,7 @@ 
     'LBL_EXTNOSTART_HEADER' => 'Error: Cannot Start Meeting',
     'LBL_EXTNOSTART_MAIN' => 'You cannot start this meeting because you are not an Administrator or the owner of the meeting.',
 
-  //For export labels
+    //For export labels
     'LBL_EXPORT_JOIN_URL' => 'Join Url',
     'LBL_EXPORT_HOST_URL' => 'Host Url',
     'LBL_EXPORT_DISPLAYED_URL' => 'Displayed Url',
@@ -190,14 +190,14 @@ 
     'LBL_SYNCED_RECURRING_MSG' => 'This meeting originated in another system and was synced to SuiteCRM. To make changes, go to the original meeting within the other system. Changes made in the other system can be synced to this record.',
     'LBL_RELATED_TO' => 'Related to:',
 
-	// for reminders
-	'LBL_REMINDERS' => 'Reminders',
-	'LBL_REMINDERS_ACTIONS' => 'Actions:',
-	'LBL_REMINDERS_POPUP' => 'Popup',
-	'LBL_REMINDERS_EMAIL' => 'Email invitees',
-	'LBL_REMINDERS_WHEN' => 'When:',
-	'LBL_REMINDERS_REMOVE_REMINDER' => 'Remove reminder',
-	'LBL_REMINDERS_ADD_ALL_INVITEES' => 'Add All Invitees',
-	'LBL_REMINDERS_ADD_REMINDER' => 'Add reminder',
+    // for reminders
+    'LBL_REMINDERS' => 'Reminders',
+    'LBL_REMINDERS_ACTIONS' => 'Actions:',
+    'LBL_REMINDERS_POPUP' => 'Popup',
+    'LBL_REMINDERS_EMAIL' => 'Email invitees',
+    'LBL_REMINDERS_WHEN' => 'When:',
+    'LBL_REMINDERS_REMOVE_REMINDER' => 'Remove reminder',
+    'LBL_REMINDERS_ADD_ALL_INVITEES' => 'Add All Invitees',
+    'LBL_REMINDERS_ADD_REMINDER' => 'Add reminder',
 );
 ?>