adamjakab / SuiteCRM

modules/Campaigns/WebToPersonCapture.php

Spacing +2 added lines, -2 removed lines

@@ -237,7 +237,7 @@ 
             } else {
                 $header_URL = "Location: {$redirect_url}";
 
-                if(preg_match('/\s*Location:\s*(.*)$/', $header_URL, $matches)) {
+                if (preg_match('/\s*Location:\s*(.*)$/', $header_URL, $matches)) {
                     $href = $matches[1];
                     SugarApplication::redirect($href);
                 }
@@ -273,7 +273,7 @@ 
     } else {
         $header_URL = "Location: {$_POST['redirect']}";
 
-        if(preg_match('/\s*Location:\s*(.*)$/', $header_URL, $matches)) {
+        if (preg_match('/\s*Location:\s*(.*)$/', $header_URL, $matches)) {
             $href = $matches[1];
             SugarApplication::redirect($href);
         }

Braces +2 added lines, -4 removed lines

@@ -240,8 +240,7 @@ 
                 if(preg_match('/\s*Location:\s*(.*)$/', $header_URL, $matches)) {
                     $href = $matches[1];
                     SugarApplication::redirect($href);
-                }
-                else {
+                } else {
                     header($header_URL);
                 }
 
@@ -276,8 +275,7 @@ 
         if(preg_match('/\s*Location:\s*(.*)$/', $header_URL, $matches)) {
             $href = $matches[1];
             SugarApplication::redirect($href);
-        }
-        else {
+        } else {
             header($header_URL);
         }
 

modules/Campaigns/WizardCampaignSave.php

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -42,7 +42,7 @@ 
 
 function getTemplateValidationMessages($templateId) {
     $msgs = array();
-    if(!$templateId) {
+    if (!$templateId) {
         $msgs[] = 'LBL_NO_SELECTED_TEMPLATE';
     }
     else {
@@ -64,7 +64,7 @@ 
 $campaignId = $db->quote($_POST['campaignId']);
 $marketingId = $db->quote($_POST['marketingId']);
 $func = isset($_REQUEST['func']) ? $_REQUEST['func'] : null;
-if($func == 'getTemplateValidation') {
+if ($func == 'getTemplateValidation') {
     if (!empty($_POST['templateId'])) {
         $templateId = $db->quote($_POST['templateId']);
     }
@@ -88,7 +88,7 @@ 
     if (!$marketingId) {
         if (!empty($_SESSION['campaignWizard'][$campaignId]['defaultSelectedMarketingId']) && $func != 'createEmailMarketing') {
             $marketingId = $_SESSION['campaignWizard'][$campaignId]['defaultSelectedMarketingId'];
-        } else if($func != 'createEmailMarketing') {
+        } else if ($func != 'createEmailMarketing') {
             $marketing = new EmailMarketing();
             $marketing->save();
             $marketingId = $marketing->id;
@@ -107,7 +107,7 @@ 
     if (!empty($_POST['templateId'])) {
         $marketing->template_id = $templateId;
     }
-    if($func != 'createEmailMarketing') {
+    if ($func != 'createEmailMarketing') {
         $marketing->save();
     }
 

Braces +6 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.
@@ -44,8 +46,7 @@ 
     $msgs = array();
     if(!$templateId) {
         $msgs[] = 'LBL_NO_SELECTED_TEMPLATE';
-    }
-    else {
+    } else {
         $template = new EmailTemplate();
         $template->retrieve($templateId);
         if (!$template->subject) {
@@ -67,8 +68,7 @@ 
 if($func == 'getTemplateValidation') {
     if (!empty($_POST['templateId'])) {
         $templateId = $db->quote($_POST['templateId']);
-    }
-    else {
+    } else {
         if (!$marketingId) {
             if (!empty($_SESSION['campaignWizard'][$campaignId]['defaultSelectedMarketingId']) && $func != 'createEmailMarketing') {
                 $marketingId = $_SESSION['campaignWizard'][$campaignId]['defaultSelectedMarketingId'];
@@ -83,8 +83,7 @@ 
     $return['marketingValidationMessages'] = $marketing->validate();
 
     echo json_encode($return);
-}
-else {
+} else {
     if (!$marketingId) {
         if (!empty($_SESSION['campaignWizard'][$campaignId]['defaultSelectedMarketingId']) && $func != 'createEmailMarketing') {
             $marketingId = $_SESSION['campaignWizard'][$campaignId]['defaultSelectedMarketingId'];

modules/Campaigns/WebToLeadCreation.php

Indentation +13 added lines, -13 removed lines

@@ -108,23 +108,23 @@
 $json = getJSONobj();
 // Users Popup
 $popup_request_data = array(
-	'call_back_function' => 'set_return',
-	'form_name' => 'WebToLeadCreation',
-	'field_to_name_array' => array(
-		'id' => 'assigned_user_id',
-		'user_name' => 'assigned_user_name',
-		),
-	);
+    'call_back_function' => 'set_return',
+    'form_name' => 'WebToLeadCreation',
+    'field_to_name_array' => array(
+        'id' => 'assigned_user_id',
+        'user_name' => 'assigned_user_name',
+        ),
+    );
 $xtpl->assign('encoded_users_popup_request_data', $json->encode($popup_request_data));
 
 //Campaigns popup
 $popup_request_data = array(
-		'call_back_function' => 'set_return',
-		'form_name' => 'WebToLeadCreation',
-		'field_to_name_array' => array(
-			'id' => 'campaign_id',
-			'name' => 'campaign_name',
-		),
+        'call_back_function' => 'set_return',
+        'form_name' => 'WebToLeadCreation',
+        'field_to_name_array' => array(
+            'id' => 'campaign_id',
+            'name' => 'campaign_name',
+        ),
 );
 $encoded_users_popup_request_data = $json->encode($popup_request_data);
 $xtpl->assign('encoded_campaigns_popup_request_data' , $json->encode($popup_request_data));

Spacing +48 added lines, -48 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.
@@ -51,28 +51,28 @@ 
 
 require_once('modules/Campaigns/utils.php');
 
-global $mod_strings, $app_list_strings, $app_strings, $current_user, $import_bean_map,$import_file_name, $theme;
+global $mod_strings, $app_list_strings, $app_strings, $current_user, $import_bean_map, $import_file_name, $theme;
 
-$xtpl=new XTemplate ('modules/Campaigns/WebToLeadCreation.html');
+$xtpl = new XTemplate('modules/Campaigns/WebToLeadCreation.html');
 $xtpl->assign("MOD", $mod_strings);
 $xtpl->assign("APP", $app_strings);
-if(isset($_REQUEST['module']))
+if (isset($_REQUEST['module']))
 {
     $xtpl->assign("MODULE", $_REQUEST['module']);
 }
-if(isset($_REQUEST['return_module']))
+if (isset($_REQUEST['return_module']))
 {
     $xtpl->assign("RETURN_MODULE", $_REQUEST['return_module']);
 }
-if(isset($_REQUEST['return_id']))
+if (isset($_REQUEST['return_id']))
 {
     $xtpl->assign("RETURN_ID", $_REQUEST['return_id']);
 }
-if(isset($_REQUEST['return_id']))
+if (isset($_REQUEST['return_id']))
 {
     $xtpl->assign("RETURN_ACTION", $_REQUEST['return_action']);
 }
-if(isset($_REQUEST['record']))
+if (isset($_REQUEST['record']))
 {
     $xtpl->assign("RECORD", $_REQUEST['record']);
 }
@@ -86,21 +86,21 @@ 
 
 $beanList = filterFieldsFromBeans($subclasses);
 
-$xtpl->assign("BEAN_LIST",json_encode($beanList));
+$xtpl->assign("BEAN_LIST", json_encode($beanList));
 
 $personTypeList = "<select id='personTypeSelect'>";
-if(count($beanList) > 0)
+if (count($beanList) > 0)
 {
-    $count=0;
-    foreach($beanList as $b)
+    $count = 0;
+    foreach ($beanList as $b)
     {
-        $personTypeList.="<option value='".$count."'>".$b->name."</option>";
+        $personTypeList .= "<option value='".$count."'>".$b->name."</option>";
         $count++;
     }
 }
 else
 {
-    $personTypeList.="<option value='noPerson'>No matching types</option>";
+    $personTypeList .= "<option value='noPerson'>No matching types</option>";
 }
 
 $site_url = $sugar_config['site_url'];
@@ -127,18 +127,18 @@ 
 		),
 );
 $encoded_users_popup_request_data = $json->encode($popup_request_data);
-$xtpl->assign('encoded_campaigns_popup_request_data' , $json->encode($popup_request_data));
+$xtpl->assign('encoded_campaigns_popup_request_data', $json->encode($popup_request_data));
 
 $field_defs_js = "var field_defs = {'Contacts':[";
 
-$xtpl->assign("WEB_POST_URL",$web_post_url);
+$xtpl->assign("WEB_POST_URL", $web_post_url);
 
 if (empty($focus->assigned_user_id) && empty($focus->id))  $focus->assigned_user_id = $current_user->id;
 if (empty($focus->assigned_name) && empty($focus->id))  $focus->assigned_user_name = $current_user->user_name;
 $xtpl->assign("ASSIGNED_USER_NAME", $focus->assigned_user_name);
-$xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id );
+$xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id);
 
-$xtpl->assign("REDIRECT_URL_DEFAULT",'http://');
+$xtpl->assign("REDIRECT_URL_DEFAULT", 'http://');
 
 $xtpl->parse("main");
 $xtpl->out("main");
@@ -148,71 +148,71 @@ 
 {
     global $app_strings;
     $formattedBeans = array();
-    foreach($beans as $b)
+    foreach ($beans as $b)
     {
         $formattedFields = array();
 //bug: 47574 - make sure, that webtolead_email1 field has same required attribute as email1 field
-        if(isset($b->field_defs['webtolead_email1']) && isset($b->field_defs['email1']) && isset($b->field_defs['email1']['required'])){
+        if (isset($b->field_defs['webtolead_email1']) && isset($b->field_defs['email1']) && isset($b->field_defs['email1']['required'])) {
             $b->field_defs['webtolead_email1']['required'] = $b->field_defs['email1']['required'];
         }
 
-        foreach($b->field_defs as $field_def)
+        foreach ($b->field_defs as $field_def)
         {
             $email_fields = false;
-            if($field_def['name']== 'email1' || $field_def['name']== 'email2')
+            if ($field_def['name'] == 'email1' || $field_def['name'] == 'email2')
             {
                 $email_fields = true;
             }
-            if($field_def['name']!= 'account_name'){
-                if( ( $field_def['type'] == 'relate' && empty($field_def['custom_type']) )
-                    || $field_def['type'] == 'assigned_user_name' || $field_def['type'] =='link' || $field_def['type'] =='function'
-                    || (isset($field_def['source'])  && $field_def['source']=='non-db' && !$email_fields) || $field_def['type'] == 'id')
+            if ($field_def['name'] != 'account_name') {
+                if (($field_def['type'] == 'relate' && empty($field_def['custom_type']))
+                    || $field_def['type'] == 'assigned_user_name' || $field_def['type'] == 'link' || $field_def['type'] == 'function'
+                    || (isset($field_def['source']) && $field_def['source'] == 'non-db' && !$email_fields) || $field_def['type'] == 'id')
                 {
                     continue;
                 }
             }
-            if($field_def['name']== 'deleted' || $field_def['name']=='converted' || $field_def['name']=='date_entered'
-                || $field_def['name']== 'date_modified' || $field_def['name']=='modified_user_id'
-                || $field_def['name']=='assigned_user_id' || $field_def['name']=='created_by'
-                || $field_def['name']=='team_id')
+            if ($field_def['name'] == 'deleted' || $field_def['name'] == 'converted' || $field_def['name'] == 'date_entered'
+                || $field_def['name'] == 'date_modified' || $field_def['name'] == 'modified_user_id'
+                || $field_def['name'] == 'assigned_user_id' || $field_def['name'] == 'created_by'
+                || $field_def['name'] == 'team_id')
             {
                 continue;
             }
 
             //If the field is hidden in the studio settings, then do not show
-            if(isset($field_def['studio']) && isset($field_def['studio']['editview']) && $field_def['studio']['editview']=== false )
+            if (isset($field_def['studio']) && isset($field_def['studio']['editview']) && $field_def['studio']['editview'] === false)
             {
                 continue;
             }
 
 
-            $field_def['vname'] = preg_replace('/:$/','',translate($field_def['vname'], $b->module_dir));
+            $field_def['vname'] = preg_replace('/:$/', '', translate($field_def['vname'], $b->module_dir));
 
             //$cols_name = "{'".$field_def['vname']."'}";
             $col_arr = array();
-            if((isset($field_def['required']) && $field_def['required'] != null && $field_def['required'] != 0)
-                || $field_def['name']=='last_name'
-            ){
-                $cols_name=$field_def['vname'].' '.$app_strings['LBL_REQUIRED_SYMBOL'];
-                $col_arr[0]=$cols_name;
-                $col_arr[1]=$field_def['name'];
-                $col_arr[2]=true;
+            if ((isset($field_def['required']) && $field_def['required'] != null && $field_def['required'] != 0)
+                || $field_def['name'] == 'last_name'
+            ) {
+                $cols_name = $field_def['vname'].' '.$app_strings['LBL_REQUIRED_SYMBOL'];
+                $col_arr[0] = $cols_name;
+                $col_arr[1] = $field_def['name'];
+                $col_arr[2] = true;
             }
-            else{
-                $cols_name=$field_def['vname'];
-                $col_arr[0]=$cols_name;
-                $col_arr[1]=$field_def['name'];
+            else {
+                $cols_name = $field_def['vname'];
+                $col_arr[0] = $cols_name;
+                $col_arr[1] = $field_def['name'];
             }
-            if (! in_array($cols_name, $formattedFields))
+            if (!in_array($cols_name, $formattedFields))
             {
-                array_push($formattedFields,$col_arr);
+                array_push($formattedFields, $col_arr);
             }
         }
 
         $holder = new stdClass();
         $holder->name = $b->object_name;
         $holder->fields = $formattedFields;
-        $holder->moduleKnownAs = translate($b->module_name,'LBL_MODULE_NAME');
+        $holder->moduleKnownAs = translate($b->module_name, 'LBL_MODULE_NAME');
         $holder->moduleDir = $b->module_dir;
         $holder->moduleName = $b->module_name;
         $formattedBeans[] = $holder;
@@ -229,10 +229,10 @@ 
 function getListOfExtendingClasses($superclass)
 {
     $subclasses = array();
-    foreach($GLOBALS['moduleList'] as $mod)
+    foreach ($GLOBALS['moduleList'] as $mod)
     {
         $item = BeanFactory::getBean($mod);
-        if($item && is_subclass_of($item,$superclass))
+        if ($item && is_subclass_of($item, $superclass))
             $subclasses[] = $item;
     }
     return $subclasses;

Braces +14 added lines, -9 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.
@@ -97,8 +99,7 @@ 
         $personTypeList.="<option value='".$count."'>".$b->name."</option>";
         $count++;
     }
-}
-else
+} else
 {
     $personTypeList.="<option value='noPerson'>No matching types</option>";
 }
@@ -133,8 +134,12 @@ 
 
 $xtpl->assign("WEB_POST_URL",$web_post_url);
 
-if (empty($focus->assigned_user_id) && empty($focus->id))  $focus->assigned_user_id = $current_user->id;
-if (empty($focus->assigned_name) && empty($focus->id))  $focus->assigned_user_name = $current_user->user_name;
+if (empty($focus->assigned_user_id) && empty($focus->id)) {
+    $focus->assigned_user_id = $current_user->id;
+}
+if (empty($focus->assigned_name) && empty($focus->id)) {
+    $focus->assigned_user_name = $current_user->user_name;
+}
 $xtpl->assign("ASSIGNED_USER_NAME", $focus->assigned_user_name);
 $xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id );
 
@@ -197,8 +202,7 @@ 
                 $col_arr[0]=$cols_name;
                 $col_arr[1]=$field_def['name'];
                 $col_arr[2]=true;
-            }
-            else{
+            } else{
                 $cols_name=$field_def['vname'];
                 $col_arr[0]=$cols_name;
                 $col_arr[1]=$field_def['name'];
@@ -232,8 +236,9 @@ 
     foreach($GLOBALS['moduleList'] as $mod)
     {
         $item = BeanFactory::getBean($mod);
-        if($item && is_subclass_of($item,$superclass))
-            $subclasses[] = $item;
+        if($item && is_subclass_of($item,$superclass)) {
+                    $subclasses[] = $item;
+        }
     }
     return $subclasses;
 }

modules/Campaigns/WizardEmailSetupSave.php

Spacing +15 added lines, -15 removed lines

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

Braces +6 added lines, -6 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.
@@ -104,20 +106,18 @@ 
         if(preg_match('/\s*Location:\s*(.*)$/', $header_URL, $matches)) {
             $href = $matches[1];
             SugarApplication::redirect($href);
-        }
-        else {
+        } else {
             header($headers);
         }
 
-    }else{
+    } else{
         //set navigation details
         $header_URL = "Location: index.php?action=index&module=Campaigns";
 
         if(preg_match('/\s*Location:\s*(.*)$/', $header_URL, $matches)) {
             $href = $matches[1];
             SugarApplication::redirect($href);
-        }
-        else {
+        } else {
             header($header_URL);
         }
 

modules/Campaigns/DotListWizardMenu.php

Spacing +3 added lines, -3 removed lines

@@ -23,14 +23,14 @@
 
     private function getWizardMenuItemHTML($i, $label, $link = false)
     {
-        if($i >= 4) {
+        if ($i >= 4) {
             parse_str($link, $args);
-            if(empty($args['marketing_id'])) {
+            if (empty($args['marketing_id'])) {
                 $link = false;
             }
         }
 
-        if($link != false) {
+        if ($link != false) {
             $html = '<li id="nav_step'.$i.'" class="nav-steps" data-nav-step="'.$i.'" data-nav-url="'.$link.'"><div>'.$label.'</div></li>';
         } else {
             $html = '<li id="nav_step'.$i.'" class="nav-steps" data-nav-step="'.$i.'"  data-nav-url=""><div>'.$label.'</div></li>';

modules/Campaigns/WizardMarketingSave.php

Spacing +40 added lines, -40 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -53,18 +53,18 @@ 
 $master = 'save';
 if (isset($_REQUEST['wiz_home_next_step']) && !empty($_REQUEST['wiz_home_next_step'])) {
     
-    if($_REQUEST['wiz_home_next_step']==3){
+    if ($_REQUEST['wiz_home_next_step'] == 3) {
         //user has chosen to save and schedule this campaign for email
         $master = 'send';
-    }elseif($_REQUEST['wiz_home_next_step']==2){
+    }elseif ($_REQUEST['wiz_home_next_step'] == 2) {
         //user has chosen to save and send this campaign in test mode
         $master = 'test';
-    }else{
+    } else {
         //user has chosen to simply save
-        $master  = 'save';        
+        $master = 'save';        
     }
         
-}else{
+} else {
      //default to just saving and exiting wizard
      $master = 'save';   
 }
@@ -78,11 +78,11 @@ 
     $marketing->retrieve($_REQUEST['record']);
 }
 else {
-    if(!empty($_SESSION['campaignWizard'][$_REQUEST['campaign_id']]['defaultSelectedMarketingId'])) {
+    if (!empty($_SESSION['campaignWizard'][$_REQUEST['campaign_id']]['defaultSelectedMarketingId'])) {
         $marketing->retrieve($_SESSION['campaignWizard'][$_REQUEST['campaign_id']]['defaultSelectedMarketingId']);
     }
 }
-if(!$marketing->ACLAccess('Save')){
+if (!$marketing->ACLAccess('Save')) {
         ACLController::displayNoAccess(true);
         sugar_cleanup(true);
 }
@@ -95,40 +95,40 @@ 
 }
 
     foreach ($_REQUEST as $key => $val) {
-              if((strstr($key, $prefix )) && (strpos($key, $prefix )== 0)){
-              $newkey  =substr($key, strlen($prefix)) ;
+              if ((strstr($key, $prefix)) && (strpos($key, $prefix) == 0)) {
+              $newkey = substr($key, strlen($prefix));
               $_REQUEST[$newkey] = $val;
          }               
     }
 
     foreach ($_REQUEST as $key => $val) {
-              if((strstr($key, $prefix )) && (strpos($key, $prefix )== 0)){
-              $newkey  =substr($key, strlen($prefix)) ;
+              if ((strstr($key, $prefix)) && (strpos($key, $prefix) == 0)) {
+              $newkey = substr($key, strlen($prefix));
               $_REQUEST[$newkey] = $val;
          }               
     }
 
-if(!empty($_REQUEST['meridiem'])){
-    $_REQUEST['time_start'] = $timedate->merge_time_meridiem($_REQUEST['time_start'],$timedate->get_time_format(), $_REQUEST['meridiem']);
+if (!empty($_REQUEST['meridiem'])) {
+    $_REQUEST['time_start'] = $timedate->merge_time_meridiem($_REQUEST['time_start'], $timedate->get_time_format(), $_REQUEST['meridiem']);
 }
 
-if(empty($_REQUEST['time_start'])) {
-  $_REQUEST['date_start'] = $_REQUEST['date_start'] . ' 00:00';	
+if (empty($_REQUEST['time_start'])) {
+  $_REQUEST['date_start'] = $_REQUEST['date_start'].' 00:00';	
 } else {
-  $_REQUEST['date_start'] = $_REQUEST['date_start'] . ' ' . $_REQUEST['time_start'];
+  $_REQUEST['date_start'] = $_REQUEST['date_start'].' '.$_REQUEST['time_start'];
 }
 
-foreach($marketing->column_fields as $field)
+foreach ($marketing->column_fields as $field)
 {
     if ($field == 'all_prospect_lists') {
-        if(isset($_REQUEST[$field]) && $_REQUEST[$field]='on' )
+        if (isset($_REQUEST[$field]) && $_REQUEST[$field] = 'on')
         {
             $marketing->$field = 1;
         } else {
             $marketing->$field = 0;         
         }
-    }else {
-        if(isset($_REQUEST[$field]))
+    } else {
+        if (isset($_REQUEST[$field]))
         {
             $value = $_REQUEST[$field];
             $marketing->$field = trim($value);
@@ -136,9 +136,9 @@ 
     }
 }
 
-foreach($marketing->additional_column_fields as $field)
+foreach ($marketing->additional_column_fields as $field)
 {
-    if(isset($_REQUEST[$field]))
+    if (isset($_REQUEST[$field]))
     {
         $value = $_REQUEST[$field];
         $marketing->$field = $value;
@@ -150,8 +150,8 @@ 
 
 //add prospect lists to campaign.
 $marketing->load_relationship('prospectlists');
-$prospectlists=$marketing->prospectlists->get();
-if ($marketing->all_prospect_lists==1) {
+$prospectlists = $marketing->prospectlists->get();
+if ($marketing->all_prospect_lists == 1) {
     //remove all related prospect lists.
     if (!empty($prospectlists)) {
         $marketing->prospectlists->delete($marketing->id);
@@ -160,7 +160,7 @@ 
     if (isset($_REQUEST['message_for']) && is_array($_REQUEST['message_for'])) {
         foreach ($_REQUEST['message_for'] as $prospect_list_id) {
             
-            $key=array_search($prospect_list_id,$prospectlists);
+            $key = array_search($prospect_list_id, $prospectlists);
             if ($key === null or $key === false) {
                 $marketing->prospectlists->add($prospect_list_id);          
             } else {
@@ -169,7 +169,7 @@ 
         }
         if (count($prospectlists) != 0) {
             foreach ($prospectlists as $key=>$list_id) {
-                $marketing->prospectlists->delete($marketing->id,$list_id);             
+                $marketing->prospectlists->delete($marketing->id, $list_id);             
             }   
         }
     }
@@ -179,21 +179,21 @@ 
 $mass[] = $marketing->id; 
 //if sending an email was chosen, set all the needed variables for queuing campaign
 
-if($master !='save'){
-    $_REQUEST['mass']= $mass;
-    $_POST['mass']=$mass;
-    $_REQUEST['record'] =$marketing->campaign_id;
-    $_POST['record']=$marketing->campaign_id;
+if ($master != 'save') {
+    $_REQUEST['mass'] = $mass;
+    $_POST['mass'] = $mass;
+    $_REQUEST['record'] = $marketing->campaign_id;
+    $_POST['record'] = $marketing->campaign_id;
     $_REQUEST['mode'] = $master;
      $_POST['mode'] = $master; 
-     $_REQUEST['from_wiz']= 'true';
+     $_REQUEST['from_wiz'] = 'true';
     require_once('modules/Campaigns/QueueCampaign.php');
 }
 
-if(isset($_REQUEST['show_wizard_summary']) && $_REQUEST['show_wizard_summary']) {
+if (isset($_REQUEST['show_wizard_summary']) && $_REQUEST['show_wizard_summary']) {
 
-    if( (isset($_REQUEST['sendMarketingEmailTest']) && $_REQUEST['sendMarketingEmailTest']) ||
-        (isset($_REQUEST['sendMarketingEmailSchedule']) && $_REQUEST['sendMarketingEmailSchedule']) ) {
+    if ((isset($_REQUEST['sendMarketingEmailTest']) && $_REQUEST['sendMarketingEmailTest']) ||
+        (isset($_REQUEST['sendMarketingEmailSchedule']) && $_REQUEST['sendMarketingEmailSchedule'])) {
         // set correct post variables..
         $_POST['module'] = 'Campaigns';
         $_POST['action'] = 'QueueCampaign';
@@ -205,10 +205,10 @@ 
         $_POST['direct_step'] = '1';
         //$_POST['campaign_id'] = '';
         $_POST['wiz_mass'] = $marketing->id;
-        if(isset($_REQUEST['sendMarketingEmailTest']) && $_REQUEST['sendMarketingEmailTest']) {
+        if (isset($_REQUEST['sendMarketingEmailTest']) && $_REQUEST['sendMarketingEmailTest']) {
             $_POST['mode'] = 'test';
         }
-        else if(isset($_REQUEST['sendMarketingEmailSchedule']) && $_REQUEST['sendMarketingEmailSchedule']) {
+        else if (isset($_REQUEST['sendMarketingEmailSchedule']) && $_REQUEST['sendMarketingEmailSchedule']) {
             $_POST['mode'] = 'send';
             $_SESSION['msg'] = 'LBL_EMAILS_SCHEDULED';
         }
@@ -222,7 +222,7 @@ 
         exit;
     }
 
-    $header_URL = "Location: index.php?action=WizardMarketing&module=Campaigns&return_module=Campaigns&return_action=WizardHome&return_id=" . $marketing->campaign_id . "&campaign_id=" . $marketing->campaign_id . "&jump=3&marketing_id=" . $marketing->id;
+    $header_URL = "Location: index.php?action=WizardMarketing&module=Campaigns&return_module=Campaigns&return_action=WizardHome&return_id=".$marketing->campaign_id."&campaign_id=".$marketing->campaign_id."&jump=3&marketing_id=".$marketing->id;
 }
 else {
     $header_URL = "Location: index.php?action=WizardHome&module=Campaigns&record=".$marketing->campaign_id;
@@ -230,7 +230,7 @@ 
 
 $GLOBALS['log']->debug("about to post header URL of: $header_URL");
 
-if(preg_match('/\s*Location:\s*(.*)$/', $header_URL, $matches)) {
+if (preg_match('/\s*Location:\s*(.*)$/', $header_URL, $matches)) {
     $href = $matches[1];
     SugarApplication::redirect($href);
 }

Braces +13 added lines, -17 removed lines

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

modules/Campaigns/WebToLeadFormBuilder.php

Spacing +44 added lines, -44 removed lines

@@ -119,7 +119,7 @@ 
     // -- fields
 
     private static function getFieldLabelHTML($fieldLabel, $fieldRequired, $webRequiredSymbol) {
-        $html = '<label>' . $fieldLabel . ($fieldRequired ? "<span class='required'>$webRequiredSymbol</span>" : '') . '</label>';
+        $html = '<label>'.$fieldLabel.($fieldRequired ? "<span class='required'>$webRequiredSymbol</span>" : '').'</label>';
         return $html;
     }
 
@@ -137,11 +137,11 @@ 
 
         $html .= self::getFieldLabelHTML($fieldLabel, $fieldRequired, $webRequiredSymbol);
 
-        if(isset($lead->field_defs[$colsField]['isMultiSelect']) && $lead->field_defs[$colsField]['isMultiSelect'] ==1){
+        if (isset($lead->field_defs[$colsField]['isMultiSelect']) && $lead->field_defs[$colsField]['isMultiSelect'] == 1) {
             $html .= self::getFieldEnumMultiSelectHTML($fieldName, $leadOptions, $fieldRequired);
-        }elseif(ifRadioButton($lead->field_defs[$colsField]['name'])){
+        }elseif (ifRadioButton($lead->field_defs[$colsField]['name'])) {
             $html .= self::getFieldEnumRadioGroupHTML($appListStringsFieldOptions, $lead, $fieldName, $colsField, $fieldRequired);
-        }else{
+        } else {
             $html .= self::getFieldEnumSelectHTML($fieldName, $leadOptions, $fieldRequired);
         }
         return $html;
@@ -156,17 +156,17 @@ 
     private static function getFieldEnumRadioGroupHTML($appListStringsFieldOptions, $lead, $fieldName, $colsField, $fieldRequired) {
         $_required = $fieldRequired ? ' required' : '';
         $html = '';
-        foreach($appListStringsFieldOptions as $field_option_key => $field_option){
-            if($field_option != null){
-                if(!empty($lead->$fieldName) && in_array($field_option_key,unencodeMultienum($lead->$fieldName))) {
+        foreach ($appListStringsFieldOptions as $field_option_key => $field_option) {
+            if ($field_option != null) {
+                if (!empty($lead->$fieldName) && in_array($field_option_key, unencodeMultienum($lead->$fieldName))) {
                     $_checked = ' checked';
                 }
                 else {
                     $_checked = '';
                 }
-                $html .="<input id=\"{$colsField}_$field_option_key\" name=\"$colsField\" value=\"$field_option_key\" type=\"radio\"$_checked$_required>";
+                $html .= "<input id=\"{$colsField}_$field_option_key\" name=\"$colsField\" value=\"$field_option_key\" type=\"radio\"$_checked$_required>";
                 // todo ??? -->
-                $html .="<span ='document.getElementById('".$lead->field_defs[$colsField]."_$field_option_key').checked =true style='cursor:default'; onmousedown='return false;'>$field_option</span><br>";
+                $html .= "<span ='document.getElementById('".$lead->field_defs[$colsField]."_$field_option_key').checked =true style='cursor:default'; onmousedown='return false;'>$field_option</span><br>";
             }
         }
         return $html;
@@ -199,10 +199,10 @@ 
     // char strings
 
     private static function getFieldCharsHTML($fieldName, $fieldLabel, $fieldRequired, $webRequiredSymbol) {
-        $isRequired = $fieldName=='last_name' || $fieldRequired;
+        $isRequired = $fieldName == 'last_name' || $fieldRequired;
         $_required = $isRequired ? ' required' : '';
         $html = self::getFieldLabelHTML($fieldLabel, $isRequired, $webRequiredSymbol);
-        $_type = $fieldName=='email1'||$fieldName=='email2' ? 'email' : 'text';
+        $_type = $fieldName == 'email1' || $fieldName == 'email2' ? 'email' : 'text';
         $html .= "<input id=\"$fieldName\" name=\"$fieldName\" type=\"$_type\"$_required>";
         return $html;
     }
@@ -239,64 +239,64 @@ 
     private static function getFormTwoColumns($request, $formCols) {
         $colsFirst = isset($request[$formCols[0]]) ? $request[$formCols[0]] : null;
         $colsSecond = isset($request[$formCols[1]]) ? $request[$formCols[1]] : null;
-        if(!empty($colsFirst) && !empty($colsSecond)){
-            if(count($colsFirst) < count($colsSecond)){
-                $columns= count($colsSecond);
+        if (!empty($colsFirst) && !empty($colsSecond)) {
+            if (count($colsFirst) < count($colsSecond)) {
+                $columns = count($colsSecond);
             }
-            if(count($colsFirst) > count($colsSecond) || count($colsFirst) == count($colsSecond)){
-                $columns= count($colsFirst);
+            if (count($colsFirst) > count($colsSecond) || count($colsFirst) == count($colsSecond)) {
+                $columns = count($colsFirst);
             }
         }
-        else if(!empty($colsFirst)){
-            $columns= count($colsFirst);
+        else if (!empty($colsFirst)) {
+            $columns = count($colsFirst);
         }
-        else if(!empty($colsSecond)){
-            $columns= count($colsSecond);
+        else if (!empty($colsSecond)) {
+            $columns = count($colsSecond);
         }
         return $columns;
     }
 
     private static function getBooleanFields($boolFields) {
-        $boolean_fields='';
-        if($boolFields != null ){
-            foreach($boolFields as $boo){
-                $boolean_fields=$boolean_fields.$boo.';';
+        $boolean_fields = '';
+        if ($boolFields != null) {
+            foreach ($boolFields as $boo) {
+                $boolean_fields = $boolean_fields.$boo.';';
             }
         }
         return $boolean_fields;
     }
 
     private static function getArrayOfFieldInfo($lead, $colsField, &$requiredFields) {
-        $field_vname= preg_replace('/:$/','',translate($lead->field_defs[$colsField]['vname'], $lead->module_dir));
-        $field_name= $colsField;
-        $field_label = $field_vname .": ";
-        if(isset($lead->field_defs[$colsField]['custom_type']) && $lead->field_defs[$colsField]['custom_type'] != null){
-            $field_type= $lead->field_defs[$colsField]['custom_type'];
+        $field_vname = preg_replace('/:$/', '', translate($lead->field_defs[$colsField]['vname'], $lead->module_dir));
+        $field_name = $colsField;
+        $field_label = $field_vname.": ";
+        if (isset($lead->field_defs[$colsField]['custom_type']) && $lead->field_defs[$colsField]['custom_type'] != null) {
+            $field_type = $lead->field_defs[$colsField]['custom_type'];
         }
-        else{
-            $field_type= $lead->field_defs[$colsField]['type'];
+        else {
+            $field_type = $lead->field_defs[$colsField]['type'];
         }
 
         //bug: 47574 - make sure, that webtolead_email1 field has same required attribute as email1 field
-        if($colsField == 'webtolead_email1' && isset($lead->field_defs['email1']) && isset($lead->field_defs['email1']['required'])){
+        if ($colsField == 'webtolead_email1' && isset($lead->field_defs['email1']) && isset($lead->field_defs['email1']['required'])) {
             $lead->field_defs['webtolead_email1']['required'] = $lead->field_defs['email1']['required'];
         }
 
         $field_required = '';
-        if(isset($lead->field_defs[$colsField]['required']) && $lead->field_defs[$colsField]['required'] != null
-            && $lead->field_defs[$colsField]['required'] != 0){
+        if (isset($lead->field_defs[$colsField]['required']) && $lead->field_defs[$colsField]['required'] != null
+            && $lead->field_defs[$colsField]['required'] != 0) {
             $field_required = $lead->field_defs[$colsField]['required'];
-            if (! in_array($lead->field_defs[$colsField]['name'], $requiredFields)){
-                array_push($requiredFields,$lead->field_defs[$colsField]['name']);
+            if (!in_array($lead->field_defs[$colsField]['name'], $requiredFields)) {
+                array_push($requiredFields, $lead->field_defs[$colsField]['name']);
             }
         }
-        if($lead->field_defs[$colsField]['name']=='last_name'){
-            if (! in_array($lead->field_defs[$colsField]['name'], $requiredFields)){
-                array_push($requiredFields,$lead->field_defs[$colsField]['name']);
+        if ($lead->field_defs[$colsField]['name'] == 'last_name') {
+            if (!in_array($lead->field_defs[$colsField]['name'], $requiredFields)) {
+                array_push($requiredFields, $lead->field_defs[$colsField]['name']);
             }
         }
         $field_options = null;
-        if($field_type=='multienum' || $field_type=='enum' || $field_type=='radioenum')  $field_options= $lead->field_defs[$colsField]['options'];
+        if ($field_type == 'multienum' || $field_type == 'enum' || $field_type == 'radioenum')  $field_options = $lead->field_defs[$colsField]['options'];
         return array($field_name, $field_label, $field_type, $field_required, $field_options);
     }
 
@@ -334,14 +334,14 @@ 
 
         $required_fields = array();
         $bool_fields = array();
-        for($i= 0; $i<$columns;$i++){
+        for ($i = 0; $i < $columns; $i++) {
 
             $colsFields = array();
-            foreach($formCols as $k => $formCol) {
+            foreach ($formCols as $k => $formCol) {
                 $colsFields[$k] = !empty($request[$formCol][$i]) ? $request[$formCol][$i] : null;
             }
 
-            if($colsFieldCount = count($formCols)) {
+            if ($colsFieldCount = count($formCols)) {
 
                 $colHtml = '';
                 $foundField = false;
@@ -396,7 +396,7 @@ 
 
                 }
 
-                if($foundField) {
+                if ($foundField) {
                     $Web_To_Lead_Form_html .= self::getRowStartHTML();
                     $Web_To_Lead_Form_html .= $colHtml;
                     $Web_To_Lead_Form_html .= self:: getRowFinishHTML();

modules/DynamicFields/DynamicField.php

Spacing +39 added lines, -39 removed lines

@@ -64,7 +64,7 @@ 
         global $sugar_config;
         $this->module = (!empty($module)) ? $module : ((isset($_REQUEST['module']) && !empty($_REQUEST['module'])) ? $_REQUEST ['module'] : '');
         $this->base_path = "custom/Extension/modules/{$this->module}/Ext/Vardefs";
-        if(isset($sugar_config['dbconfig'])) {
+        if (isset($sugar_config['dbconfig'])) {
             $this->db = DBManagerFactory::getInstance();
         }
     }
@@ -133,7 +133,7 @@ 
      */
     public function setLabel($language = 'en_us', $key, $value)
     {
-        $params ['label_' . $key] = $value;
+        $params ['label_'.$key] = $value;
         require_once 'modules/ModuleBuilder/parsers/parser.label.php';
         $parser = new ParserLabel($this->module);
         $parser->handleSave($params, $language);
@@ -168,7 +168,7 @@ 
             return false;
         }
 
-        $GLOBALS['log']->debug('rebuilding cache for ' . $module);
+        $GLOBALS['log']->debug('rebuilding cache for '.$module);
         $query = "SELECT * FROM fields_meta_data WHERE $where deleted = 0";
 
         $result = $this->db->query($query);
@@ -336,20 +336,20 @@ 
                 }
             }
         }
-        $join = ' LEFT JOIN ' . $this->bean->table_name . '_cstm ON ' . $this->bean->table_name . '.id = ' . $this->bean->table_name . '_cstm.id_c ';
+        $join = ' LEFT JOIN '.$this->bean->table_name.'_cstm ON '.$this->bean->table_name.'.id = '.$this->bean->table_name.'_cstm.id_c ';
 
         if ($includeRelates) {
             $jtAlias = 'relJoin';
             $jtCount = 1;
             foreach ($this->bean->field_defs as $name => $field) {
                 if ($field['type'] == 'relate' && isset($field['custom_module'])) {
-                    $relateJoinInfo = $this->getRelateJoin($field, $jtAlias . $jtCount);
+                    $relateJoinInfo = $this->getRelateJoin($field, $jtAlias.$jtCount);
                     $select .= $relateJoinInfo['select'];
                     $join .= $relateJoinInfo['from'];
                     //bug 27654 martin
                     if ($where) {
-                        $pattern = '/' . $field['name'] . '\slike/i';
-                        $replacement = $relateJoinInfo['name_field'] . ' like';
+                        $pattern = '/'.$field['name'].'\slike/i';
+                        $replacement = $relateJoinInfo['name_field'].' like';
                         $where = preg_replace($pattern, $replacement, $where);
                     }
                     ++$jtCount;
@@ -385,7 +385,7 @@ 
                 $name_field = $this->db->concat($joinTableAlias, $name_field_def['db_concat_fields']);
             } //If the name field is non-db, we need to find another field to display
             elseif (!empty($rel_mod->field_defs['name']['source']) && $rel_mod->field_defs['name']['source'] == 'non-db' && !empty($field_def['rname'])) {
-                $name_field = "$joinTableAlias." . $field_def['rname'];
+                $name_field = "$joinTableAlias.".$field_def['rname'];
             } else {
                 $name_field = "$joinTableAlias.name";
             }
@@ -394,7 +394,7 @@ 
         $relID = $field_def['id_name'];
         $ret_array['rel_table'] = $rel_table;
         $ret_array['name_field'] = $name_field;
-        $ret_array['select'] = ($withIdName ? ", {$tableName}.{$relID}" : '') . ", {$name_field} {$field_def['name']} ";
+        $ret_array['select'] = ($withIdName ? ", {$tableName}.{$relID}" : '').", {$name_field} {$field_def['name']} ";
         $ret_array['from'] = " LEFT JOIN $rel_table $joinTableAlias ON $tableName.$relID = $joinTableAlias.id"
             . " AND $joinTableAlias.deleted=0 ";
 
@@ -443,10 +443,10 @@ 
         if ($this->bean->hasCustomFields() && isset($this->bean->id)) {
             $query = '';
             if ($isUpdate) {
-                $query = 'UPDATE ' . $this->bean->table_name . '_cstm SET ';
+                $query = 'UPDATE '.$this->bean->table_name.'_cstm SET ';
             }
-            $queryInsert = 'INSERT INTO ' . $this->bean->table_name . '_cstm (id_c';
-            $values = "('" . $this->bean->id . "'";
+            $queryInsert = 'INSERT INTO '.$this->bean->table_name.'_cstm (id_c';
+            $values = "('".$this->bean->id."'";
             $first = true;
             foreach ($this->bean->field_defs as $name => $field) {
                 if (empty($field['source']) || $field['source'] != 'custom_fields') {
@@ -484,18 +484,18 @@ 
                     }
                     if ($isUpdate) {
                         if ($first) {
-                            $query .= " $name=$quote" . $this->db->quote($val) . "$quote";
+                            $query .= " $name=$quote".$this->db->quote($val)."$quote";
                         } else {
-                            $query .= " ,$name=$quote" . $this->db->quote($val) . "$quote";
+                            $query .= " ,$name=$quote".$this->db->quote($val)."$quote";
                         }
                     }
                     $first = false;
                     $queryInsert .= " ,$name";
-                    $values .= " ,$quote" . $this->db->quote($val) . "$quote";
+                    $values .= " ,$quote".$this->db->quote($val)."$quote";
                 }
             }
             if ($isUpdate) {
-                $query .= " WHERE id_c='" . $this->bean->id . "'";
+                $query .= " WHERE id_c='".$this->bean->id."'";
             }
 
             $queryInsert .= " ) VALUES $values )";
@@ -538,8 +538,8 @@ 
             $object_name = $newName != false ? $newName : $object_name;
         }
 
-        $this->db->query("DELETE FROM fields_meta_data WHERE id='" . $this->module . $widget->name . "'");
-        $sql = $widget->get_db_delete_alter_table($this->bean->table_name . '_cstm');
+        $this->db->query("DELETE FROM fields_meta_data WHERE id='".$this->module.$widget->name."'");
+        $sql = $widget->get_db_delete_alter_table($this->bean->table_name.'_cstm');
         if (!empty($sql)) {
             $this->db->query($sql);
         }
@@ -599,7 +599,7 @@ 
         $db_name = $field->name;
 
         $fmd = new FieldsMetaData();
-        $id = $fmd->retrieve($object_name . $db_name, true, false);
+        $id = $fmd->retrieve($object_name.$db_name, true, false);
         $is_update = false;
         $label = strtoupper($field->label);
         if (!empty($id)) {
@@ -609,7 +609,7 @@ 
             $field->name = $db_name;
         }
         $this->createCustomTable();
-        $fmd->id = $object_name . $db_name;
+        $fmd->id = $object_name.$db_name;
         $fmd->custom_module = $object_name;
         $fmd->name = $db_name;
         $fmd->vname = $label;
@@ -645,20 +645,20 @@ 
                 // resetting default and default_value does not work for multienum and causes trouble for MsSQL
                 // so using a temporary variable here to indicate that we don't want default for this query
                 $field->no_default = 1;
-                $query = $field->get_db_add_alter_table($this->bean->table_name . '_cstm');
+                $query = $field->get_db_add_alter_table($this->bean->table_name.'_cstm');
                 // unset temporary member variable
                 unset($field->no_default);
                 if (!empty($query)) {
                     $this->db->query($query, true, 'Cannot create column');
                     $field->default = $fmd->default_value;
                     $field->default_value = $fmd->default_value;
-                    $query = $field->get_db_modify_alter_table($this->bean->table_name . '_cstm');
+                    $query = $field->get_db_modify_alter_table($this->bean->table_name.'_cstm');
                     if (!empty($query)) {
                         $this->db->query($query, true, 'Cannot set default');
                     }
                 }
             } else {
-                $query = $field->get_db_modify_alter_table($this->bean->table_name . '_cstm');
+                $query = $field->get_db_modify_alter_table($this->bean->table_name.'_cstm');
                 if (!empty($query)) {
                     $this->db->query($query, true, 'Cannot modify field');
                 }
@@ -747,9 +747,9 @@ 
         $vBean = $bean_name == 'aCase' ? 'Case' : $bean_name;
         $file_loc = "$this->base_path/sugarfield_{$field->name}.php";
 
-        $out = "<?php\n // created: " . date('Y-m-d H:i:s') . "\n";
+        $out = "<?php\n // created: ".date('Y-m-d H:i:s')."\n";
         foreach ($def_override as $property => $val) {
-            $out .= override_value_to_string_recursive(array($vBean, 'fields', $field->name, $property), 'dictionary', $val) . "\n";
+            $out .= override_value_to_string_recursive(array($vBean, 'fields', $field->name, $property), 'dictionary', $val)."\n";
         }
 
         $out .= "\n ?>";
@@ -840,8 +840,8 @@ 
     public function createCustomTable($execute = true)
     {
         $out = '';
-        if (!$this->db->tableExists($this->bean->table_name . '_cstm')) {
-            $GLOBALS['log']->debug('creating custom table for ' . $this->bean->table_name);
+        if (!$this->db->tableExists($this->bean->table_name.'_cstm')) {
+            $GLOBALS['log']->debug('creating custom table for '.$this->bean->table_name);
             $idDef = array(
                 'id_c' => array(
                     'name' => 'id_c',
@@ -851,15 +851,15 @@ 
             );
             $idIdx = array(
                 'id' => array(
-                    'name' => $this->bean->table_name . '_cstm_pk',
+                    'name' => $this->bean->table_name.'_cstm_pk',
                     'type' => 'primary',
                     'fields' => array('id_c'),
                 ),
             );
 
-            $query = $this->db->createTableSQLParams($this->bean->table_name . '_cstm', $idDef, $idIdx);
+            $query = $this->db->createTableSQLParams($this->bean->table_name.'_cstm', $idDef, $idIdx);
             if (!$this->db->supports('inline_keys')) {
-                $indicesArr = $this->db->getConstraintSql($idIdx, $this->bean->table_name . '_cstm');
+                $indicesArr = $this->db->getConstraintSql($idIdx, $this->bean->table_name.'_cstm');
             } else {
                 $indicesArr = array();
             }
@@ -871,9 +871,9 @@ 
                     }
                 }
             }
-            $out = $query . "\n";
+            $out = $query."\n";
             if (!empty($indicesArr)) {
-                $out .= implode("\n", $indicesArr) . "\n";
+                $out .= implode("\n", $indicesArr)."\n";
             }
 
             $out .= $this->add_existing_custom_fields($execute);
@@ -914,8 +914,8 @@ 
         $field = get_widget($data ['type']);
         $field->populateFromRow($data);
         $query = "/*MISSING IN DATABASE - {$data['name']} -  ROW*/\n"
-            . $field->get_db_add_alter_table($this->bean->table_name . '_cstm');
-        $out = $query . "\n";
+            . $field->get_db_add_alter_table($this->bean->table_name.'_cstm');
+        $out = $query."\n";
         if ($execute) {
             $this->db->query($query);
         }
@@ -937,7 +937,7 @@ 
         //Otherwise make sure all the custom fields defined in the vardefs exist in the custom table.
         //We aren't checking for data types, just that the column exists.
         $db = $this->db;
-        $tablename = $this->bean->table_name . '_cstm';
+        $tablename = $this->bean->table_name.'_cstm';
         $compareFieldDefs = $db->get_columns($tablename);
         foreach ($this->bean->field_defs as $name => $data) {
             if (empty($data['source']) || $data['source'] != 'custom_fields') {
@@ -981,14 +981,14 @@ 
         $systemLabel = $field_key;
         if (!$this->use_existing_labels) { // use_existing_labels defaults to false in this module; as of today, only set to true by ModuleInstaller.php
             while (isset($mod_strings [$systemLabel]) && $count <= $limit) {
-                $systemLabel = $field_key . "_$count";
+                $systemLabel = $field_key."_$count";
                 ++$count;
             }
         }
         $selMod = (!empty($_REQUEST['view_module'])) ? $_REQUEST['view_module'] : $this->module;
         require_once 'modules/ModuleBuilder/parsers/parser.label.php';
         $parser = new ParserLabel($selMod, isset($_REQUEST ['view_package']) ? $_REQUEST ['view_package'] : null);
-        $parser->handleSave(array('label_' . $systemLabel => $displayLabel), $GLOBALS ['current_language']);
+        $parser->handleSave(array('label_'.$systemLabel => $displayLabel), $GLOBALS ['current_language']);
 
         return $systemLabel;
     }
@@ -1026,7 +1026,7 @@ 
         if (isset($this->avail_fields)) {
             foreach ($this->avail_fields as $name => $value) {
                 if (!empty($_REQUEST[$name])) {
-                    $where_clauses[] = $this->bean->table_name . "_cstm.$name LIKE '" . $this->db->quote($_REQUEST[$name]) . "%'";
+                    $where_clauses[] = $this->bean->table_name."_cstm.$name LIKE '".$this->db->quote($_REQUEST[$name])."%'";
                 }
             }
         }
@@ -1050,7 +1050,7 @@ 
             return false;
         }
 
-        $query = 'SELECT * FROM ' . $this->bean->table_name . "_cstm WHERE id_c='" . $this->bean->id . "'";
+        $query = 'SELECT * FROM '.$this->bean->table_name."_cstm WHERE id_c='".$this->bean->id."'";
         $result = $this->db->query($query);
         $row = $this->db->fetchByAssoc($result);
 

modules/ModuleBuilder/parsers/parser.label.php

Spacing +14 added lines, -14 removed lines

@@ -80,7 +80,7 @@ 
         $labels = array();
         foreach ($params as $key => $value) {
             if (preg_match('/^label_/', $key) && strcmp($value, 'no_change') != 0) {
-                $labels [ strtoupper(substr($key, 6)) ] = SugarCleaner::cleanHtml(from_html($value), false);
+                $labels [strtoupper(substr($key, 6))] = SugarCleaner::cleanHtml(from_html($value), false);
             }
         }
         if (!empty($this->packageName)) {
@@ -103,7 +103,7 @@ 
      */
     public static function removeLabel($language, $label, $labelvalue, $moduleName, $basepath = null, $forRelationshipLabel = false)
     {
-        $GLOBALS [ 'log' ]->debug("ParserLabel->removeLabels($language, \$label, \$labelvalue, $moduleName, $basepath );");
+        $GLOBALS ['log']->debug("ParserLabel->removeLabels($language, \$label, \$labelvalue, $moduleName, $basepath );");
         if (is_null($basepath)) {
             $deployedModule = true;
             $basepath = "custom/modules/$moduleName/language";
@@ -150,7 +150,7 @@ 
 
         if ($changed) {
             if (!write_array_to_file('mod_strings', $mod_strings, $filename)) {
-                $GLOBALS [ 'log' ]->fatal("Could not write $filename");
+                $GLOBALS ['log']->fatal("Could not write $filename");
             } else {
                 // if we have a cache to worry about, then clear it now
                 if ($deployedModule) {
@@ -174,8 +174,8 @@ 
      */
     public static function addLabels($language, $labels, $moduleName, $basepath = null, $forRelationshipLabel = false)
     {
-        $GLOBALS [ 'log' ]->debug("ParserLabel->addLabels($language, \$labels, $moduleName, $basepath );");
-        $GLOBALS [ 'log' ]->debug('$labels:'.print_r($labels, true));
+        $GLOBALS ['log']->debug("ParserLabel->addLabels($language, \$labels, $moduleName, $basepath );");
+        $GLOBALS ['log']->debug('$labels:'.print_r($labels, true));
 
         $deployedModule = false;
         if (is_null($basepath)) {
@@ -214,22 +214,22 @@ 
         //$charset = (isset($app_strings['LBL_CHARSET'])) ? $app_strings['LBL_CHARSET'] : $GLOBALS['sugar_config']['default_charset'] ;
 
             foreach ($labels as $key => $value) {
-                if (!isset($mod_strings [ $key ]) || strcmp($value, $mod_strings [ $key ]) != 0) {
+                if (!isset($mod_strings [$key]) || strcmp($value, $mod_strings [$key]) != 0) {
                     $mod_strings [$key] = to_html(strip_tags(from_html($value))); // must match encoding used in view.labels.php
                     $changed = true;
                 }
             }
 
         if ($changed) {
-            $GLOBALS [ 'log' ]->debug("ParserLabel->addLabels: writing new mod_strings to $filename");
-            $GLOBALS [ 'log' ]->debug('ParserLabel->addLabels: mod_strings='.print_r($mod_strings, true));
+            $GLOBALS ['log']->debug("ParserLabel->addLabels: writing new mod_strings to $filename");
+            $GLOBALS ['log']->debug('ParserLabel->addLabels: mod_strings='.print_r($mod_strings, true));
             if (!write_array_to_file('mod_strings', $mod_strings, $filename)) {
-                $GLOBALS [ 'log' ]->fatal("Could not write $filename");
+                $GLOBALS ['log']->fatal("Could not write $filename");
             } else {
                 // if we have a cache to worry about, then clear it now
                 if ($deployedModule) {
                     SugarCache::cleanOpcodes();
-                    $GLOBALS [ 'log' ]->debug('PaserLabel->addLabels: clearing language cache');
+                    $GLOBALS ['log']->debug('PaserLabel->addLabels: clearing language cache');
                     $cache_key = 'module_language.'.$language.$moduleName;
                     sugar_cache_clear($cache_key);
                     LanguageManager::clearLanguageCache($moduleName, $language);
@@ -279,7 +279,7 @@ 
                     $file_contents = fopen($extension_filename, 'w');
                     fputs($file_contents, $out, strlen($out));
                     fclose($file_contents);
-                } catch (Exception $e) {
+                }catch (Exception $e) {
                     $GLOBALS ['log']->fatal("Could not write $filename");
                     $GLOBALS ['log']->fatal('Exception '.$e->getMessage());
                 }
@@ -321,7 +321,7 @@ 
                     $file_contents = fopen($relationships_filename, 'w');
                     fputs($file_contents, $out, strlen($out));
                     fclose($file_contents);
-                } catch (Exception $e) {
+                }catch (Exception $e) {
                     $GLOBALS ['log']->fatal("Could not write $filename");
                     $GLOBALS ['log']->fatal('Exception '.$e->getMessage());
                     $failed_to_write = true;
@@ -356,8 +356,8 @@ 
     {
         foreach ($metadata as $definition) {
             $labels = array();
-            $labels[$definition [ 'system_label' ]] = $definition [ 'display_label' ];
-            self::addLabels($language, $labels, $definition [ 'module' ], null, true);
+            $labels[$definition ['system_label']] = $definition ['display_label'];
+            self::addLabels($language, $labels, $definition ['module'], null, true);
         }
     }