adamjakab / SuiteCRM

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

Braces +45 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');
+}
 
 require_once('modules/Campaigns/utils.php');
 
@@ -26,7 +28,9 @@ 
 
 
 //setting default flag value so due date and time not required
-if (!isset($focus->id)) $focus->date_due_flag = 1;
+if (!isset($focus->id)) {
+    $focus->date_due_flag = 1;
+}
 
 //needed when creating a new case with default values passed in
 if (isset($_REQUEST['contact_name']) && is_null($focus->contact_name)) {
@@ -85,12 +89,16 @@ 
 $xtpl->parse("main.variable_option");
 
 $returnAction = 'index';
-if (isset($_REQUEST['return_module'])) $xtpl->assign("RETURN_MODULE", $_REQUEST['return_module']);
+if (isset($_REQUEST['return_module'])) {
+    $xtpl->assign("RETURN_MODULE", $_REQUEST['return_module']);
+}
 if (isset($_REQUEST['return_action'])) {
     $xtpl->assign("RETURN_ACTION", $_REQUEST['return_action']);
     $returnAction = $_REQUEST['return_action'];
 }
-if (isset($_REQUEST['return_id'])) $xtpl->assign("RETURN_ID", $_REQUEST['return_id']);
+if (isset($_REQUEST['return_id'])) {
+    $xtpl->assign("RETURN_ID", $_REQUEST['return_id']);
+}
 // handle Create $module then Cancel
 if (empty($_REQUEST['return_id'])) {
     $xtpl->assign("RETURN_ACTION", 'index');
@@ -119,8 +127,9 @@ 
 );
 $json = getJSONobj();
 $xtpl->assign('encoded_assigned_users_popup_request_data', $json->encode($popup_request_data));
-if (!empty($focus->assigned_user_name))
+if (!empty($focus->assigned_user_name)) {
     $xtpl->assign("ASSIGNED_USER_NAME", $focus->assigned_user_name);
+}
 
 $xtpl->assign("assign_user_select", SugarThemeRegistry::current()->getImage('id-ff-select', '', null, null, '.png', $mod_strings['LBL_SELECT']));
 $xtpl->assign("assign_user_clear", SugarThemeRegistry::current()->getImage('id-ff-clear', '', null, null, '.gif', $mod_strings['LBL_ID_FF_CLEAR']));
@@ -142,24 +151,39 @@ 
 $xtpl->assign("JSLANG", $jsLang);
 
 $xtpl->assign("ID", $focus->id);
-if (isset($focus->name)) $xtpl->assign("NAME", $focus->name); else $xtpl->assign("NAME", "");
+if (isset($focus->name)) {
+    $xtpl->assign("NAME", $focus->name);
+} else {
+    $xtpl->assign("NAME", "");
+}
 
 //Bug45632
 /* BEGIN - SECURITY GROUPS */
 /**
  * if(isset($focus->assigned_user_id)) $xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id); else $xtpl->assign("ASSIGNED_USER_ID", "");
  */
-if (isset($focus->assigned_user_id)) $xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id);
-else if (empty($focus->id) && empty($focus->assigned_user_id)) {
+if (isset($focus->assigned_user_id)) {
+    $xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id);
+} else if (empty($focus->id) && empty($focus->assigned_user_id)) {
     global $current_user;
     $xtpl->assign("ASSIGNED_USER_ID", $current_user->id);
     $xtpl->assign("ASSIGNED_USER_NAME", get_assigned_user_name($current_user->id));
-} else $xtpl->assign("ASSIGNED_USER_ID", "");
+} else {
+    $xtpl->assign("ASSIGNED_USER_ID", "");
+}
 /* END - SECURITY GROUPS */
 //Bug45632
 
-if (isset($focus->description)) $xtpl->assign("DESCRIPTION", $focus->description); else $xtpl->assign("DESCRIPTION", "");
-if (isset($focus->subject)) $xtpl->assign("SUBJECT", $focus->subject); else $xtpl->assign("SUBJECT", "");
+if (isset($focus->description)) {
+    $xtpl->assign("DESCRIPTION", $focus->description);
+} else {
+    $xtpl->assign("DESCRIPTION", "");
+}
+if (isset($focus->subject)) {
+    $xtpl->assign("SUBJECT", $focus->subject);
+} else {
+    $xtpl->assign("SUBJECT", "");
+}
 if ($focus->published == 'on') {
     $xtpl->assign("PUBLISHED", "CHECKED");
 }
@@ -201,8 +225,16 @@ 
 $xtpl->assign("TYPE_OPTIONS", get_select_options_with_id($app_list_strings['record_type_display'], $focus->parent_type));
 //$xtpl->assign("DEFAULT_MODULE","Accounts");
 
-if (isset($focus->body)) $xtpl->assign("BODY", $focus->body); else $xtpl->assign("BODY", "");
-if (isset($focus->body_html)) $xtpl->assign("BODY_HTML", $focus->body_html); else $xtpl->assign("BODY_HTML", "");
+if (isset($focus->body)) {
+    $xtpl->assign("BODY", $focus->body);
+} else {
+    $xtpl->assign("BODY", "");
+}
+if (isset($focus->body_html)) {
+    $xtpl->assign("BODY_HTML", $focus->body_html);
+} else {
+    $xtpl->assign("BODY_HTML", "");
+}
 
 
 if (true) {

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

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;

Braces +6 added lines, -3 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.
@@ -50,8 +52,9 @@ 
 
 $focus = new EmailTemplate();
 if($_REQUEST['from'] == 'DetailView') {
-	if(!isset($_REQUEST['record']))
-		sugar_die("A record number must be specified to delete the template.");
+	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';

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>";
             }
         }

Braces +9 added lines, -4 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');
+}
 
 
 function generateFieldDefsJS2()
@@ -47,7 +49,9 @@ 
             $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) . '_';
+            if ($focus->object_name == 'Case') {
+                $prefixes[$key] = 'a' . strtolower($focus->object_name) . '_';
+            }
         }
     }
 
@@ -94,8 +98,9 @@ 
                         break;
                     }
                 }
-                if ($dup)
-                    $collection[$collectionKey][] = array("name" => $optionKey, "value" => $optionLabel);
+                if ($dup) {
+                                    $collection[$collectionKey][] = array("name" => $optionKey, "value" => $optionLabel);
+                }
             }
         }
     }

modules/EmailTemplates/EmailTemplate.php

Spacing +32 added lines, -32 removed lines

@@ -352,7 +352,7 @@ 
                             }
                             if (!empty($tracker_url) && !empty($template_text) && !empty($matches[0][$i][0]) && !empty($tracked_urls[$matches[0][$i][0]])) {
                                 $template_text = substr_replace($template_text, $tracker_url, $matches[0][$i][1], strlen($matches[0][$i][0]));
-                                $template_text = str_replace($sugar_config['site_url'] . '/' . $sugar_config['site_url'], $sugar_config['site_url'], $template_text);
+                                $template_text = str_replace($sugar_config['site_url'].'/'.$sugar_config['site_url'], $sugar_config['site_url'], $template_text);
                             }
                         }
                     }
@@ -406,10 +406,10 @@ 
         if ($beanList[$focus_name] == 'User') {
             $pattern_prefix = '$contact_user_';
         } else {
-            $pattern_prefix = '$' . strtolower($beanList[$focus_name]) . '_';
+            $pattern_prefix = '$'.strtolower($beanList[$focus_name]).'_';
         }
         $pattern_prefix_length = strlen($pattern_prefix);
-        $pattern = '/\\' . $pattern_prefix . '[A-Za-z_0-9]*/';
+        $pattern = '/\\'.$pattern_prefix.'[A-Za-z_0-9]*/';
 
         foreach ($template_text_array as $key => $template_text) {
             if (!isset($this->parsed_entities[$key])) {
@@ -505,16 +505,16 @@ 
                 $translated = translate($field_def['options'], 'Users', $user->$field_def['name']);
 
                 if (isset($translated) && !is_array($translated)) {
-                    $repl_arr["contact_user_" . $field_def['name']] = $translated;
+                    $repl_arr["contact_user_".$field_def['name']] = $translated;
                 } else { // unset enum field, make sure we have a match string to replace with ""
-                    $repl_arr["contact_user_" . $field_def['name']] = '';
+                    $repl_arr["contact_user_".$field_def['name']] = '';
                 }
             } else {
                 if (isset($user->$field_def['name'])) {
                     // bug 47647 - allow for fields to translate before adding to template
-                    $repl_arr["contact_user_" . $field_def['name']] = self::_convertToType($field_def['type'], $user->$field_def['name']);
+                    $repl_arr["contact_user_".$field_def['name']] = self::_convertToType($field_def['type'], $user->$field_def['name']);
                 } else {
-                    $repl_arr["contact_user_" . $field_def['name']] = "";
+                    $repl_arr["contact_user_".$field_def['name']] = "";
                 }
             }
         }
@@ -540,8 +540,8 @@ 
                 continue;
             }
             $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                'contact_' . $field_def['name'] => '',
-                'contact_account_' . $field_def['name'] => '',
+                'contact_'.$field_def['name'] => '',
+                'contact_account_'.$field_def['name'] => '',
             ));
         }
         foreach ($prospect->field_defs as $field_def) {
@@ -549,8 +549,8 @@ 
                 continue;
             }
             $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                'contact_' . $field_def['name'] => '',
-                'contact_account_' . $field_def['name'] => '',
+                'contact_'.$field_def['name'] => '',
+                'contact_account_'.$field_def['name'] => '',
             ));
         }
         foreach ($contact->field_defs as $field_def) {
@@ -558,8 +558,8 @@ 
                 continue;
             }
             $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                'contact_' . $field_def['name'] => '',
-                'contact_account_' . $field_def['name'] => '',
+                'contact_'.$field_def['name'] => '',
+                'contact_account_'.$field_def['name'] => '',
             ));
         }
         foreach ($acct->field_defs as $field_def) {
@@ -567,8 +567,8 @@ 
                 continue;
             }
             $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                'account_' . $field_def['name'] => '',
-                'account_contact_' . $field_def['name'] => '',
+                'account_'.$field_def['name'] => '',
+                'account_contact_'.$field_def['name'] => '',
             ));
         }
         // cn: end bug 9277 fix
@@ -592,21 +592,21 @@ 
 
                         if (isset($translated) && !is_array($translated)) {
                             $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                                'account_' . $field_def['name'] => $translated,
-                                'contact_account_' . $field_def['name'] => $translated,
+                                'account_'.$field_def['name'] => $translated,
+                                'contact_account_'.$field_def['name'] => $translated,
                             ));
                         } else { // unset enum field, make sure we have a match string to replace with ""
                             $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                                'account_' . $field_def['name'] => '',
-                                'contact_account_' . $field_def['name'] => '',
+                                'account_'.$field_def['name'] => '',
+                                'contact_account_'.$field_def['name'] => '',
                             ));
                         }
                     } else {
                         // bug 47647 - allow for fields to translate before adding to template
                         $translated = self::_convertToType($field_def['type'], $acct->$field_def['name']);
                         $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                            'account_' . $field_def['name'] => $translated,
-                            'contact_account_' . $field_def['name'] => $translated,
+                            'account_'.$field_def['name'] => $translated,
+                            'contact_account_'.$field_def['name'] => $translated,
                         ));
                     }
                 }
@@ -636,13 +636,13 @@ 
 
                     if (isset($translated) && !is_array($translated)) {
                         $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                            'contact_' . $field_def['name'] => $translated,
-                            'contact_account_' . $field_def['name'] => $translated,
+                            'contact_'.$field_def['name'] => $translated,
+                            'contact_account_'.$field_def['name'] => $translated,
                         ));
                     } else { // unset enum field, make sure we have a match string to replace with ""
                         $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                            'contact_' . $field_def['name'] => '',
-                            'contact_account_' . $field_def['name'] => '',
+                            'contact_'.$field_def['name'] => '',
+                            'contact_account_'.$field_def['name'] => '',
                         ));
                     }
                 } else {
@@ -650,8 +650,8 @@ 
                         // bug 47647 - allow for fields to translate before adding to template
                         $translated = self::_convertToType($field_def['type'], $contact->$field_def['name']);
                         $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                            'contact_' . $field_def['name'] => $translated,
-                            'contact_account_' . $field_def['name'] => $translated,
+                            'contact_'.$field_def['name'] => $translated,
+                            'contact_account_'.$field_def['name'] => $translated,
                         ));
                     } // if
                 }
@@ -671,27 +671,27 @@ 
 
                     if (isset($translated) && !is_array($translated)) {
                         $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                            strtolower($beanList[$bean_name]) . "_" . $field_def['name'] => $translated,
+                            strtolower($beanList[$bean_name])."_".$field_def['name'] => $translated,
                         ));
                     } else { // unset enum field, make sure we have a match string to replace with ""
                         $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                            strtolower($beanList[$bean_name]) . "_" . $field_def['name'] => '',
+                            strtolower($beanList[$bean_name])."_".$field_def['name'] => '',
                         ));
                     }
                 } else {
                     // bug 47647 - translate currencies to appropriate values
                     $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                        strtolower($beanList[$bean_name]) . "_" . $field_def['name'] => self::_convertToType($field_def['type'], $focus->$field_def['name']),
+                        strtolower($beanList[$bean_name])."_".$field_def['name'] => self::_convertToType($field_def['type'], $focus->$field_def['name']),
                     ));
                 }
             } else {
                 if ($field_def['name'] == 'full_name') {
                     $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                        strtolower($beanList[$bean_name]) . '_full_name' => $focus->get_summary_text(),
+                        strtolower($beanList[$bean_name]).'_full_name' => $focus->get_summary_text(),
                     ));
                 } else {
                     $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                        strtolower($beanList[$bean_name]) . "_" . $field_def['name'] => '',
+                        strtolower($beanList[$bean_name])."_".$field_def['name'] => '',
                     ));
                 }
             }

Braces +18 added lines, -11 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.
@@ -179,8 +181,9 @@ 
                             break;
                         }
                     }
-                    if ($dup)
-                        $collection[$collectionKey][] = array("name" => $optionKey, "value" => $optionLabel);
+                    if ($dup) {
+                                            $collection[$collectionKey][] = array("name" => $optionKey, "value" => $optionLabel);
+                    }
                 }
             }
         }
@@ -253,8 +256,9 @@ 
                             break;
                         }
                     }
-                    if ($dup)
-                        $collection[$collectionKey][] = array("name" => $optionKey, "value" => $optionLabel);
+                    if ($dup) {
+                                            $collection[$collectionKey][] = array("name" => $optionKey, "value" => $optionLabel);
+                    }
                 }
             }
         }
@@ -314,8 +318,9 @@ 
     function parse_tracker_urls($template_text_array, $url_template, $tracked_urls, $removeme_url_template)
     {
         global $beanFiles, $beanList, $app_list_strings, $sugar_config;
-        if (!isset($this->parsed_urls))
-            $this->parsed_urls = array();
+        if (!isset($this->parsed_urls)) {
+                    $this->parsed_urls = array();
+        }
 
         $return_array = $template_text_array;
         if (count($tracked_urls) > 0) {
@@ -398,8 +403,9 @@ 
             $user->retrieve($focus->assigned_user_id);
         }
 
-        if (!isset($this->parsed_entities))
-            $this->parsed_entities = array();
+        if (!isset($this->parsed_entities)) {
+                    $this->parsed_entities = array();
+        }
 
         //parse the template and find all the dynamic strings that need replacement.
         // Bug #48111 It's strange why prefix for User module is contact_user (see self::generateFieldDefsJS method)
@@ -775,8 +781,9 @@ 
         $template = new EmailTemplate();
         $optionKey = $template->field_defs['type']['options'];
         $options = $GLOBALS['app_list_strings'][$optionKey];
-        if (!is_admin($GLOBALS['current_user']) && isset($options['workflow']))
-            unset($options['workflow']);
+        if (!is_admin($GLOBALS['current_user']) && isset($options['workflow'])) {
+                    unset($options['workflow']);
+        }
 
         return $options;
     }

Doc Comments +1 added lines, -3 removed lines

@@ -118,8 +118,6 @@ 
 
     /**
      * Generates the extended field_defs for creating macros
-     * @param object $bean SugarBean
-     * @param string $prefix "contact_", "user_" etc.
      * @return
      */
     function generateFieldDefsJS()
@@ -366,7 +364,7 @@ 
     /**
      *
      * Method for replace "preg_match_all" in method "parse_tracker_urls"
-     * @param $text string String in which we need to search all string that match the pattern {.}
+     * @param string $text string String in which we need to search all string that match the pattern {.}
      * @return array result of search
      */
     private function _preg_match_tracker_url($text)

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

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

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

Braces +18 added lines, -31 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');
+}
 
 	global $db;
 	 
@@ -29,16 +31,13 @@ 
                     
                     $url = $event->accept_redirect;
                     header('Location: ' . $url);    
-                }
-                else{
+                } else{
                     echo 'Thank you for accepting';
                 }   
-    		}
-    		else {
+    		} 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_contacts_c WHERE fp_events_contactsfp_events_ida="'.$event->id.'" AND fp_events_contactscontacts_idb="'.$delegate_id.'"';
              $check = $db->getOne($check_q);
@@ -52,12 +51,10 @@ 
                     $url = $event->decline_redirect;
                     header('Location: ' . $url);    
                     
-                }
-                else{
+                } else{
                     echo 'Thank you for declining';
                 }
-    		}
-    		else {
+    		} 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.';
     		}
     	}
@@ -79,16 +76,13 @@ 
                     
                     $url = $event->accept_redirect;
                     header('Location: ' . $url);    
-                }
-                else{
+                } else{
                     echo 'Thank you for accepting';
                 }   
-            }
-            else {
+            } 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);
@@ -101,12 +95,10 @@ 
                     $url = $event->decline_redirect;
                     header('Location: ' . $url);    
                     
-                }
-                else{
+                } else{
                     echo 'Thank you for declining';
                 }
-            }
-            else {
+            } 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.';
             }
     	}
@@ -127,16 +119,13 @@ 
                     
                     $url = $event->accept_redirect;
                     header('Location: ' . $url);    
-                }
-                else{
+                } else{
                     echo 'Thank you for accepting';
                 }   
-            }
-            else {
+            } else {
                 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);
@@ -150,12 +139,10 @@ 
                     $url = $event->decline_redirect;
                     header('Location: ' . $url);    
                     
-                }
-                else{
+                } else{
                     echo 'Thank you for declining';
                 }
-            }
-            else {
+            } else {
                 echo 'There was a problem with the link please contact the sender of the invite';
             }
     	}

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

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

Braces +6 added lines, -4 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,7 +58,7 @@ 
 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) ) {
@@ -68,10 +70,10 @@ 
         $ss->assign('bean',$meetingBean->toArray());
         $ss->display($tplFile);
     }
-}else{
+} 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) ) {

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',
 );
 ?>

Spacing +2 added lines, -2 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.
@@ -38,7 +38,7 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-$mod_strings = array (
+$mod_strings = array(
 'LBL_MODULE_NAME' => 'Roles',
 'LBL_MODULE_TITLE' => 'Roles: Home',
 'LBL_ROLE'=>'Role',

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/Meetings/MeetingsQuickCreate.php

Indentation +59 added lines, -59 removed lines

@@ -54,9 +54,9 @@ 
         parent::process();
 
         $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("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().')');
 		
 
 
@@ -75,52 +75,52 @@ 
         $this->javascript->setSugarBean($focus);
         $this->javascript->addAllFields('');
 
-		if (is_null($focus->date_start))
-			$focus->date_start = $timedate->to_display_date(TimeDate::getInstance()->nowDb());
-		if (is_null($focus->time_start))
-			$focus->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
-		if (!isset ($focus->duration_hours))
-			$focus->duration_hours = "1";
+        if (is_null($focus->date_start))
+            $focus->date_start = $timedate->to_display_date(TimeDate::getInstance()->nowDb());
+        if (is_null($focus->time_start))
+            $focus->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
+        if (!isset ($focus->duration_hours))
+            $focus->duration_hours = "1";
 
         
         $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];
+            $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));
-		$time_start_hour = intval(substr($focus->time_start, 0, 2));
-		$time_start_minutes = substr($focus->time_start, 3, 5);
+        $this->ss->assign("DATE_START", $focus->date_start);
+        $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);
 		
-		if ($time_start_minutes > 0 && $time_start_minutes < 15) {
-			$time_start_minutes = "15";
-		} else
-			if ($time_start_minutes > 15 && $time_start_minutes < 30) {
-				$time_start_minutes = "30";
-			} else
-				if ($time_start_minutes > 30 && $time_start_minutes < 45) {
-					$time_start_minutes = "45";
-				} else
-					if ($time_start_minutes > 45) {
-						$time_start_hour += 1;
-						$time_start_minutes = "00";
-					}
+        if ($time_start_minutes > 0 && $time_start_minutes < 15) {
+            $time_start_minutes = "15";
+        } else
+            if ($time_start_minutes > 15 && $time_start_minutes < 30) {
+                $time_start_minutes = "30";
+            } else
+                if ($time_start_minutes > 30 && $time_start_minutes < 45) {
+                    $time_start_minutes = "45";
+                } else
+                    if ($time_start_minutes > 45) {
+                        $time_start_hour += 1;
+                        $time_start_minutes = "00";
+                    }
 		
 		
-		// We default the to assume that the time preference is set to 11:00 (i.e. without meridiem)
-		$hours_arr = array ();
-		$num_of_hours = 24;
-		$start_at = 0;
+        // We default the to assume that the time preference is set to 11:00 (i.e. without meridiem)
+        $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')) {
-		   $num_of_hours = 13;
-		   $start_at = 1;	
-		} 
+        $time_pref = $timedate->get_time_format();
+        if(strpos($time_pref, 'a') || strpos($time_pref, 'A')) {
+            $num_of_hours = 13;
+            $start_at = 1;	
+        } 
 		
-		/*
+        /*
 		// Seems to be problematic... $time_meridiem is always empty
 		if (empty ($time_meridiem)) {
 			$num_of_hours = 24;
@@ -128,37 +128,37 @@ 
 		}
 		*/
 		
-		for ($i = $start_at; $i < $num_of_hours; $i ++) {
-			$i = $i."";
-			if (strlen($i) == 1) {
-				$i = "0".$i;
-			}
-			$hours_arr[$i] = $i;
-		}
+        for ($i = $start_at; $i < $num_of_hours; $i ++) {
+            $i = $i."";
+            if (strlen($i) == 1) {
+                $i = "0".$i;
+            }
+            $hours_arr[$i] = $i;
+        }
 
         $this->ss->assign("TIME_START_HOUR_OPTIONS", get_select_options_with_id($hours_arr, $time_start_hour));
-		$this->ss->assign("TIME_START_MINUTE_OPTIONS", get_select_options_with_id($focus->minutes_values, $time_start_minutes));
-		$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));
+        $this->ss->assign("TIME_START_MINUTE_OPTIONS", get_select_options_with_id($focus->minutes_values, $time_start_minutes));
+        $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 (strpos($time_pref, 'a')) {
+            if (strpos($time_pref, 'a')) {
 		   	   
-               if(!isset($focus->meridiem_am_values)) {
-                  $focus->meridiem_am_values = array('am'=>'am', 'pm'=>'pm');
-               } 		
+                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'));
+                $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)) {
-		          $focus->meridiem_AM_values = array('AM'=>'AM', 'PM'=>'PM');
-		       }
+            } else {
+                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'));
+                $this->ss->assign("TIME_MERIDIEM", get_select_options_with_id($focus->meridiem_AM_values, $time_start_hour < 12 ? 'AM' : 'PM'));
                
-		   } //if-else
+            } //if-else
            
         }
 

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

Braces +12 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.
@@ -75,12 +77,15 @@ 
         $this->javascript->setSugarBean($focus);
         $this->javascript->addAllFields('');
 
-		if (is_null($focus->date_start))
-			$focus->date_start = $timedate->to_display_date(TimeDate::getInstance()->nowDb());
-		if (is_null($focus->time_start))
-			$focus->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
-		if (!isset ($focus->duration_hours))
-			$focus->duration_hours = "1";
+		if (is_null($focus->date_start)) {
+					$focus->date_start = $timedate->to_display_date(TimeDate::getInstance()->nowDb());
+		}
+		if (is_null($focus->time_start)) {
+					$focus->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
+		}
+		if (!isset ($focus->duration_hours)) {
+					$focus->duration_hours = "1";
+		}
 
         
         $date_start_array=explode(" ",trim($focus->date_start));