adamjakab / SuiteCRM

modules/EmailTemplates/field_arrays.php

Spacing +3 added lines, -3 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.
@@ -45,7 +45,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
  ********************************************************************************/
-$fields_array['EmailTemplate'] = array ('column_fields' => Array("id"
+$fields_array['EmailTemplate'] = array('column_fields' => Array("id"
 		, "date_entered"
 		, "date_modified"
 		, "modified_user_id"
@@ -57,7 +57,7 @@ 
 		, "name"
 		, "published"
 		),
-        'list_fields' =>  Array('id', 'name', 'description','date_modified'
+        'list_fields' =>  Array('id', 'name', 'description', 'date_modified'
 	),
     'required_fields' => array("name"=>1),
 );

modules/EmailTemplates/AttachFiles.php

Spacing +6 added lines, -6 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,17 +55,17 @@ 
 
 $ret = array();
 
-foreach($_FILES as $k => $file) {
-	if(in_array(strtolower($_FILES[$k]['type']), $imgType) && $_FILES[$k]['size'] > 0) {
+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()) {
+		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
+		    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)) {
+		        if (verify_uploaded_image($path) && copy($path, $dest)) {
 		            $ret[] = $dest;
 		        }
 		        // remove temp file

modules/EmailTemplates/EditView.php

Spacing +15 added lines, -15 removed lines

@@ -74,9 +74,9 @@ 
 $GLOBALS['log']->info("EmailTemplate detail view");
 
 if ($has_campaign || $inboundEmail) {
-    $xtpl = new XTemplate ('modules/EmailTemplates/EditView.html');
+    $xtpl = new XTemplate('modules/EmailTemplates/EditView.html');
 } else {
-    $xtpl = new XTemplate ('modules/EmailTemplates/EditViewMain.html');
+    $xtpl = new XTemplate('modules/EmailTemplates/EditViewMain.html');
 } // else
 $xtpl->assign("MOD", $mod_strings);
 $xtpl->assign("APP", $app_strings);
@@ -128,13 +128,13 @@ 
 require_once('include/QuickSearchDefaults.php');
 $qsd = QuickSearchDefaults::getQuickSearchDefaults();
 $sqs_objects = array('EditView_assigned_user_name' => $qsd->getQSUser());
-$quicksearch_js = '<script type="text/javascript" language="javascript">sqs_objects = ' . $json->encode($sqs_objects) . '; enableQS();</script>';
+$quicksearch_js = '<script type="text/javascript" language="javascript">sqs_objects = '.$json->encode($sqs_objects).'; enableQS();</script>';
 
 $xtpl->assign("CANCEL_SCRIPT", $cancel_script);
-$xtpl->assign("PRINT_URL", "index.php?" . $GLOBALS['request_string']);
-$xtpl->assign("JAVASCRIPT", get_set_focus_js() . $quicksearch_js);
+$xtpl->assign("PRINT_URL", "index.php?".$GLOBALS['request_string']);
+$xtpl->assign("JAVASCRIPT", get_set_focus_js().$quicksearch_js);
 
-if (!is_file(sugar_cached('jsLanguage/') . $GLOBALS['current_language'] . '.js')) {
+if (!is_file(sugar_cached('jsLanguage/').$GLOBALS['current_language'].'.js')) {
     require_once('include/language/jsLanguage.php');
     jsLanguage::createAppStringsCache($GLOBALS['current_language']);
 }
@@ -183,18 +183,18 @@ 
         $record = $_REQUEST['record'];
     }
 
-    $xtpl->assign("ADMIN_EDIT", "<a href='index.php?action=index&module=DynamicLayout&from_action=" . $_REQUEST['action'] . "&from_module=" . $_REQUEST['module'] . "&record=" . $record . "'>" . SugarThemeRegistry::current()->getImage("EditLayout", "border='0' align='bottom'", null, null, '.gif', $mod_strings['LBL_EDIT_LAYOUT']) . "</a>");
+    $xtpl->assign("ADMIN_EDIT", "<a href='index.php?action=index&module=DynamicLayout&from_action=".$_REQUEST['action']."&from_module=".$_REQUEST['module']."&record=".$record."'>".SugarThemeRegistry::current()->getImage("EditLayout", "border='0' align='bottom'", null, null, '.gif', $mod_strings['LBL_EDIT_LAYOUT'])."</a>");
 
 }
 if (isset($focus->parent_type) && $focus->parent_type != "") {
-    $change_parent_button = "<input title='" . $app_strings['LBL_SELECT_BUTTON_TITLE'] . "'
-tabindex='3' type='button' class='button' value='" . $app_strings['LBL_SELECT_BUTTON_LABEL'] . "' name='button' LANGUAGE=javascript onclick='return
+    $change_parent_button = "<input title='".$app_strings['LBL_SELECT_BUTTON_TITLE']."'
+tabindex='3' type='button' class='button' value='" . $app_strings['LBL_SELECT_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='return
 window.open(\"index.php?module=\"+ document.EditView.parent_type.value +
 \"&action=Popup&html=Popup_picker&form=TasksEditView\",\"test\",\"width=600,height=400,resizable=1,scrollbars=1\");'>";
     $xtpl->assign("CHANGE_PARENT_BUTTON", $change_parent_button);
 }
 if ($focus->parent_type == "Account") {
-    $xtpl->assign("DEFAULT_SEARCH", "&query=true&account_id=$focus->parent_id&account_name=" . urlencode($focus->parent_name));
+    $xtpl->assign("DEFAULT_SEARCH", "&query=true&account_id=$focus->parent_id&account_name=".urlencode($focus->parent_name));
 }
 
 $xtpl->assign("DESCRIPTION", $focus->description);
@@ -251,7 +251,7 @@ 
     // If it's campaign then hide the Account.
     if ($has_campaign) {
         $dropdown = "<option value='Contacts'>
-						" . $lblContactAndOthers . "
+						" . $lblContactAndOthers."
 			       </option>";
         $xtpl->assign("DROPDOWN", $dropdown);
         $xtpl->assign("DEFAULT_MODULE", 'Contacts');
@@ -285,13 +285,13 @@ 
             if (empty($the_note->filename)) {
                 continue;
             }
-            $secureLink = 'index.php?entryPoint=download&id=' . $the_note->id . '&type=Notes';
-            $attachments .= '<input type="checkbox" name="remove_attachment[]" value="' . $the_note->id . '"> ' . $app_strings['LNK_REMOVE'] . '&nbsp;&nbsp;';
-            $attachments .= '<a href="' . $secureLink . '" target="_blank">' . $the_note->filename . '</a><br>';
+            $secureLink = 'index.php?entryPoint=download&id='.$the_note->id.'&type=Notes';
+            $attachments .= '<input type="checkbox" name="remove_attachment[]" value="'.$the_note->id.'"> '.$app_strings['LNK_REMOVE'].'&nbsp;&nbsp;';
+            $attachments .= '<a href="'.$secureLink.'" target="_blank">'.$the_note->filename.'</a><br>';
         }
     }
     $attJs = '<script type="text/javascript">';
-    $attJs .= 'var lnk_remove = "' . $app_strings['LNK_REMOVE'] . '";';
+    $attJs .= 'var lnk_remove = "'.$app_strings['LNK_REMOVE'].'";';
     $attJs .= '</script>';
     $xtpl->assign('ATTACHMENTS', $attachments);
     $xtpl->assign('ATTACHMENTS_JAVASCRIPT', $attJs);

modules/EmailTemplates/CheckDeletable.php

Spacing +11 added lines, -11 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.
@@ -49,22 +49,22 @@ 
 require_once('modules/EmailTemplates/EmailTemplate.php');
 
 $focus = new EmailTemplate();
-if($_REQUEST['from'] == 'DetailView') {
-	if(!isset($_REQUEST['record']))
+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)) {
+	if (check_email_template_in_use($focus)) {
 		echo 'true';
 		return;
 	}
 	echo 'false';
-} else if($_REQUEST['from'] == 'ListView') {
+} 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 . ',';
+	foreach ($idArray as $key => $value) {
+		if ($focus->retrieve($value)) {
+			if (check_email_template_in_use($focus)) {
+				$returnString .= $focus->name.',';
 			}
 		}
 	}
@@ -76,11 +76,11 @@ 
 
 function check_email_template_in_use($focus)
 {
-	if($focus->is_used_by_email_marketing()) {
+	if ($focus->is_used_by_email_marketing()) {
 		return true;
 	}
 	$system = $GLOBALS['sugar_config']['passwordsetting'];
-	if($focus->id == $system['generatepasswordtmpl'] || $focus->id == $system['lostpasswordtmpl']) {
+	if ($focus->id == $system['generatepasswordtmpl'] || $focus->id == $system['lostpasswordtmpl']) {
 	    return true;
 	}
     return false;

modules/EmailTemplates/templateFields.php

Spacing +8 added lines, -8 removed lines

@@ -46,8 +46,8 @@ 
             require_once($beanFiles[$beanList[$key]]);
             $focus = new $beanList[$key];
             $loopControl[$key][$key] = $focus;
-            $prefixes[$key] = strtolower($focus->object_name) . '_';
-            if ($focus->object_name == 'Case') $prefixes[$key] = 'a' . strtolower($focus->object_name) . '_';
+            $prefixes[$key] = strtolower($focus->object_name).'_';
+            if ($focus->object_name == 'Case') $prefixes[$key] = 'a'.strtolower($focus->object_name).'_';
         }
     }
 
@@ -125,16 +125,16 @@ 
         if (isset($beanList[$key]) && isset($beanFiles[$beanList[$key]]) && !str_begin($key, 'AOW_') && !str_begin($key, 'zr2_')) {
 
             if ($key == 'Contacts') {
-                $dropdown .= "<option value='" . $key . "'>
-						" . $lblContactAndOthers . "
+                $dropdown .= "<option value='".$key."'>
+						" . $lblContactAndOthers."
 		  	       </option>";
             } else if (isset($app_list_strings['moduleListSingular'][$key])) {
-                $dropdown .= "<option value='" . $key . "'>
-						" . $app_list_strings['moduleListSingular'][$key] . "
+                $dropdown .= "<option value='".$key."'>
+						" . $app_list_strings['moduleListSingular'][$key]."
 		  	       </option>";
             } else {
-                $dropdown .= "<option value='" . $key . "'>
-						" . $app_list_strings['moduleList'][$key] . "
+                $dropdown .= "<option value='".$key."'>
+						" . $app_list_strings['moduleList'][$key]."
 		  	       </option>";
             }
         }

modules/Calendar/processScreenSize.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  */
 
 
-if(
+if (
     (isset($_SESSION['screen_height']) ? $_SESSION['screen_height'] : null) != (isset($_POST['height']) ? $_POST['height'] : null) ||
     (isset($_SESSION['screen_width']) ? $_SESSION['screen_width'] : null) != (isset($_POST['width']) ? $_POST['width'] : null)) {
     $_SESSION['screen_height'] = $_POST['height'];

modules/FP_events/responseEntryPoint.php

Spacing +36 added lines, -36 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');
 
 	global $db;
 	 
@@ -12,25 +12,25 @@ 
     $event = new FP_events();
     $event->retrieve($even_id);
     
-    if($type == 'c'){
+    if ($type == 'c') {
     	
     	$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'){
+    		if ($db->query($query) && $check != '1') {
     			
-                if(!IsNullOrEmptyString($event->accept_redirect)){
+                if (!IsNullOrEmptyString($event->accept_redirect)) {
                     
                     $url = $event->accept_redirect;
-                    header('Location: ' . $url);    
+                    header('Location: '.$url);    
                 }
-                else{
+                else {
                     echo 'Thank you for accepting';
                 }   
     		}
@@ -38,22 +38,22 @@ 
     			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_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="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'){
+            if ($db->query($query) && $check != '1') {
     			
-                if(!IsNullOrEmptyString($event->decline_redirect)){
+                if (!IsNullOrEmptyString($event->decline_redirect)) {
 
                     $url = $event->decline_redirect;
-                    header('Location: ' . $url);    
+                    header('Location: '.$url);    
                     
                 }
-                else{
+                else {
                     echo 'Thank you for declining';
                 }
     		}
@@ -62,25 +62,25 @@ 
     		}
     	}
     }
-    if($type == 't'){
+    if ($type == 't') {
     	
     	$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);
 
     		//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 ($db->query($query) && $check != '1') {
                 
-                if(!IsNullOrEmptyString($event->accept_redirect)){
+                if (!IsNullOrEmptyString($event->accept_redirect)) {
                     
                     $url = $event->accept_redirect;
-                    header('Location: ' . $url);    
+                    header('Location: '.$url);    
                 }
-                else{
+                else {
                     echo 'Thank you for accepting';
                 }   
             }
@@ -88,21 +88,21 @@ 
                 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'){
+    		if ($db->query($query) && $check != '1') {
                 
-                if(!IsNullOrEmptyString($event->decline_redirect)){
+                if (!IsNullOrEmptyString($event->decline_redirect)) {
 
                     $url = $event->decline_redirect;
-                    header('Location: ' . $url);    
+                    header('Location: '.$url);    
                     
                 }
-                else{
+                else {
                     echo 'Thank you for declining';
                 }
             }
@@ -111,24 +111,24 @@ 
             }
     	}
     }
-    if($type == 'l'){
+    if ($type == 'l') {
     	
     	$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'){
+    		if ($db->query($query) && $check != '1') {
                 
-                if(!IsNullOrEmptyString($event->accept_redirect)){
+                if (!IsNullOrEmptyString($event->accept_redirect)) {
                     
                     $url = $event->accept_redirect;
-                    header('Location: ' . $url);    
+                    header('Location: '.$url);    
                 }
-                else{
+                else {
                     echo 'Thank you for accepting';
                 }   
             }
@@ -136,22 +136,22 @@ 
                 echo 'There was a problem with the link please contact the sender of the invite';
             }   
     	}
-    	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_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);
             //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"';
 
-    		if($db->query($query) && $check != '1'){
+    		if ($db->query($query) && $check != '1') {
                 
-                if(!IsNullOrEmptyString($event->decline_redirect)){
+                if (!IsNullOrEmptyString($event->decline_redirect)) {
 
                     $url = $event->decline_redirect;
-                    header('Location: ' . $url);    
+                    header('Location: '.$url);    
                     
                 }
-                else{
+                else {
                     echo 'Thank you for declining';
                 }
             }
@@ -161,8 +161,8 @@ 
     	}
     }
     // Function for basic field validation (present and neither empty nor only white space nor just 'http://')
-    function IsNullOrEmptyString($question){
-        return (!isset($question) || trim($question)==='' || $question =='http://');
+    function IsNullOrEmptyString($question) {
+        return (!isset($question) || trim($question) === '' || $question == 'http://');
     }
 
 ?>

modules/Meetings/JoinExternalMeeting.php

Spacing +14 added lines, -14 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,40 +47,40 @@ 
 
 global $db, $current_user, $mod_strings, $app_strings, $app_list_strings;
 
-$ret = $db->query("SELECT id FROM meetings_users WHERE meeting_id = '".$db->quote($_REQUEST['meeting_id'])."' AND user_id = '".$current_user->id."' AND deleted = 0",true);
+$ret = $db->query("SELECT id FROM meetings_users WHERE meeting_id = '".$db->quote($_REQUEST['meeting_id'])."' AND user_id = '".$current_user->id."' AND deleted = 0", true);
 $row = $db->fetchByAssoc($ret);
 
 $meetingBean = loadBean('Meetings');
 $meetingBean->retrieve($_REQUEST['meeting_id']);
 
-if ( $_REQUEST['host_meeting'] == '1' ) {
-    if($meetingBean->assigned_user_id == $GLOBALS['current_user']->id || is_admin($GLOBALS['current_user']) || is_admin_for_module($GLOBALS['current_user'],'Meetings')){
+if ($_REQUEST['host_meeting'] == '1') {
+    if ($meetingBean->assigned_user_id == $GLOBALS['current_user']->id || is_admin($GLOBALS['current_user']) || is_admin_for_module($GLOBALS['current_user'], 'Meetings')) {
         SugarApplication::redirect($meetingBean->host_url);
-    }else{
+    } else {
         //since they are now the owner of the meeting nor an Admin they cannot start the meeting.
         $tplFile = 'modules/Meetings/tpls/extMeetingNoStart.tpl';
-        if ( file_exists('custom/'.$tplFile) ) {
+        if (file_exists('custom/'.$tplFile)) {
             $tplFile = 'custom/'.$tplFile;
         }
 
         $ss = new Sugar_Smarty();
-        $ss->assign('current_user',$current_user);
-        $ss->assign('bean',$meetingBean->toArray());
+        $ss->assign('current_user', $current_user);
+        $ss->assign('bean', $meetingBean->toArray());
         $ss->display($tplFile);
     }
-}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')){
+} 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);
-    }else{
+    } 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';
-        if ( file_exists('custom/'.$tplFile) ) {
+        if (file_exists('custom/'.$tplFile)) {
             $tplFile = 'custom/'.$tplFile;
         }
 
         $ss = new Sugar_Smarty();
-        $ss->assign('current_user',$current_user);
-        $ss->assign('bean',$meetingBean->toArray());
+        $ss->assign('current_user', $current_user);
+        $ss->assign('bean', $meetingBean->toArray());
         $ss->display($tplFile);
     }
 }
\ No newline at end of file

modules/Meetings/MeetingsQuickCreate.php

Spacing +13 added lines, -13 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -55,13 +55,13 @@ 
 
         $this->ss->assign("STATUS_OPTIONS", get_select_options_with_id($app_list_strings['meeting_status_dom'], $app_list_strings['meeting_status_default']));
 		$this->ss->assign("CALENDAR_DATEFORMAT", $timedate->get_cal_date_format());
-		$this->ss->assign("TIME_FORMAT", '('. $timedate->get_user_time_format().')');
-		$this->ss->assign("USER_DATEFORMAT", '('. $timedate->get_user_date_format().')');
+		$this->ss->assign("TIME_FORMAT", '('.$timedate->get_user_time_format().')');
+		$this->ss->assign("USER_DATEFORMAT", '('.$timedate->get_user_date_format().')');
 		
 
 
         
-        if($this->viaAJAX) { // override for ajax call
+        if ($this->viaAJAX) { // override for ajax call
             $this->ss->assign('saveOnclick', "onclick='if(check_form(\"meetingsQuickCreate\")) return SUGAR.subpanelUtils.inlineSave(this.form.id, \"activities\"); else return false;'");
             $this->ss->assign('cancelOnclick', "onclick='return SUGAR.subpanelUtils.cancelCreate(\"subpanel_activities\")';");
         }
@@ -83,14 +83,14 @@ 
 			$focus->duration_hours = "1";
 
         
-        $date_start_array=explode(" ",trim($focus->date_start));
-        if (count($date_start_array)==2) {
+        $date_start_array = explode(" ", trim($focus->date_start));
+        if (count($date_start_array) == 2) {
 			$focus->time_start = $timedate->to_db_time($date_start_array[1], false);
         	//$focus->date_start = $date_start_array[0];
         }
 
 		$this->ss->assign("DATE_START", $focus->date_start);
-		$this->ss->assign("TIME_START", substr($focus->time_start,0,5));
+		$this->ss->assign("TIME_START", substr($focus->time_start, 0, 5));
 		$time_start_hour = intval(substr($focus->time_start, 0, 2));
 		$time_start_minutes = substr($focus->time_start, 3, 5);
 		
@@ -110,12 +110,12 @@ 
 		
 		
 		// We default the to assume that the time preference is set to 11:00 (i.e. without meridiem)
-		$hours_arr = array ();
+		$hours_arr = array();
 		$num_of_hours = 24;
 		$start_at = 0;
 
 		$time_pref = $timedate->get_time_format();
-		if(strpos($time_pref, 'a') || strpos($time_pref, 'A')) {
+		if (strpos($time_pref, 'a') || strpos($time_pref, 'A')) {
 		   $num_of_hours = 13;
 		   $start_at = 1;	
 		} 
@@ -128,7 +128,7 @@ 
 		}
 		*/
 		
-		for ($i = $start_at; $i < $num_of_hours; $i ++) {
+		for ($i = $start_at; $i < $num_of_hours; $i++) {
 			$i = $i."";
 			if (strlen($i) == 1) {
 				$i = "0".$i;
@@ -141,18 +141,18 @@ 
 		$this->ss->assign("DURATION_HOURS", $focus->duration_hours);
 		$this->ss->assign("DURATION_MINUTES_OPTIONS", get_select_options_with_id($focus->minutes_values, $focus->duration_minutes));
         // Test to see if time format is 11:00am; otherwise it's 11:00AM 
-        if($num_of_hours == 13) {    
+        if ($num_of_hours == 13) {    
         		
 		   if (strpos($time_pref, 'a')) {
 		   	   
-               if(!isset($focus->meridiem_am_values)) {
+               if (!isset($focus->meridiem_am_values)) {
                   $focus->meridiem_am_values = array('am'=>'am', 'pm'=>'pm');
                } 		
                
                $this->ss->assign("TIME_MERIDIEM", get_select_options_with_id($focus->meridiem_am_values, $time_start_hour < 12 ? 'am' : 'pm'));
                
 		   } else {
-		       if(!isset($focus->meridiem_AM_values)) {
+		       if (!isset($focus->meridiem_AM_values)) {
 		          $focus->meridiem_AM_values = array('AM'=>'AM', 'PM'=>'PM');
 		       }