Inspection of "Merge branch 'develop' into console-installer" - adamjakab/SuiteCRM - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — console-installer ( 3d54e5...e2b50d )

by Adam

created 2016-05-10 07:51 UTC

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

modules/Campaigns/CampaignDiagnostic.php 1 patch

Spacing +58 added lines, -58 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
 
 //if (!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
 //account for use within wizards
-if(!isset($_REQUEST['inline']) || $_REQUEST['inline'] != 'inline'){
+if (!isset($_REQUEST['inline']) || $_REQUEST['inline'] != 'inline') {
 	$params = array();
 	$params[] = "<a href='index.php?module=Campaigns&action=index'>{$mod_strings['LBL_MODULE_NAME']}</a>";
 	$params[] = $mod_strings['LBL_CAMPAIGN_DIAGNOSTICS'];
@@ -72,11 +72,11 @@  discard block
 block discarded – undo
 
 
 
-if(isset($_REQUEST['inline']) && $_REQUEST['inline'] == 'inline'){
+if (isset($_REQUEST['inline']) && $_REQUEST['inline'] == 'inline') {
     {
 
 }
-}else{
+} else {
     //use html if not inline
     $ss = new Sugar_Smarty();
     $ss->assign("MOD", $mod_strings);
@@ -104,18 +104,18 @@  discard block
 block discarded – undo
 $mboxTable = "<table border ='0' width='100%'  class='detail view' cellpadding='0' cellspacing='0'>";
 //put all rows returned into an array
 $mbox = array();
-while ($mbox_row = $focus->db->fetchByAssoc($mbox_res)){$mbox[] = $mbox_row;}
+while ($mbox_row = $focus->db->fetchByAssoc($mbox_res)) {$mbox[] = $mbox_row; }
     $mbox_msg = ' ';
 //if the array is not empty, then set "good" message
-if(isset($mbox) && count($mbox)>0){
-    $mboxTable .= "<tr><td colspan='5' style='text-align: left;'><b>" .count($mbox) ." ". $mod_strings['LBL_MAILBOX_CHECK1_GOOD']." </b>.</td></tr>";
+if (isset($mbox) && count($mbox) > 0) {
+    $mboxTable .= "<tr><td colspan='5' style='text-align: left;'><b>".count($mbox)." ".$mod_strings['LBL_MAILBOX_CHECK1_GOOD']." </b>.</td></tr>";
         $mboxTable .= "<tr><th scope='col' width='20%'><b>".$mod_strings['LBL_MAILBOX_NAME']."</b></th>"
                    .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_LOGIN']."</b></th>"
                    .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_MAILBOX']."</b></th>"
                    .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_SERVER_URL']."</b></th>"
                    .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_LIST_STATUS']."</b></th></tr>";
 
-    foreach($mbox as $details){
+    foreach ($mbox as $details) {
         $mboxTable .= "<tr><td>".$details['name']."</td>";
         $mboxTable .= "<td>".$details['email_user']."</td>";
         $mboxTable .= "<td>".$details['mailbox']."</td>";
@@ -123,64 +123,64 @@  discard block
 block discarded – undo
         $mboxTable .= "<td>".$details['status']."</td></tr>";
     }
 
-}else{
+} else {
     //if array is empty, then set "bad" message and increment health counter
-    $mboxTable .=  "<tr><td colspan='5'><b class='error'>". $mod_strings['LBL_MAILBOX_CHECK1_BAD']."</b></td></tr>";
-    $email_health =$email_health +1;
+    $mboxTable .= "<tr><td colspan='5'><b class='error'>".$mod_strings['LBL_MAILBOX_CHECK1_BAD']."</b></td></tr>";
+    $email_health = $email_health + 1;
 }
 
-$mboxTable.= '</table>' ;
+$mboxTable .= '</table>';
 
 
     
 $ss->assign("MAILBOXES_DETECTED_MESSAGE", $mboxTable);
 
 //email settings configured 
-$conf_msg="<table border='0' width='100%' class='detail view' cellpadding='0' cellspacing='0'>";
-if (strstr($focus->settings['notify_fromaddress'], 'example.com')){
+$conf_msg = "<table border='0' width='100%' class='detail view' cellpadding='0' cellspacing='0'>";
+if (strstr($focus->settings['notify_fromaddress'], 'example.com')) {
     //if from address is the default, then set "bad" message and increment health counter
     $conf_msg .= "<tr><td colspan = '5'><b class='error'> ".$mod_strings['LBL_MAILBOX_CHECK2_BAD']." </b></td></td>";
-    $email_health =$email_health +1;
-}else{
+    $email_health = $email_health + 1;
+} else {
     $conf_msg .= "<tr><td colspan = '5'><b> ".$mod_strings['LBL_MAILBOX_CHECK2_GOOD']."</b></td></tr>";
     $conf_msg .= "<tr><th scope='col' width='20%'><b>".$mod_strings['LBL_WIZ_FROM_NAME']."</b></th>"
                .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_WIZ_FROM_ADDRESS']."</b></th>"
                .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_MAIL_SENDTYPE']."</b></th>";
-    if($focus->settings['mail_sendtype']=='SMTP'){
+    if ($focus->settings['mail_sendtype'] == 'SMTP') {
      $conf_msg .= " <th scope='col' width='20%'><b>".$mod_strings['LBL_MAIL_SMTPSERVER']."</b></th>"
                .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_MAIL_SMTPUSER']."</b></th></tr>";
 
-    }else{$conf_msg .= "</tr>";}
+    } else {$conf_msg .= "</tr>"; }
                    
     
 
         $conf_msg .= "<tr><td>".$focus->settings['notify_fromname']."</td>";
         $conf_msg .= "<td>".$focus->settings['notify_fromaddress']."</td>";
         $conf_msg .= "<td>".$focus->settings['mail_sendtype']."</td>";
-     if($focus->settings['mail_sendtype']=='SMTP'){
+     if ($focus->settings['mail_sendtype'] == 'SMTP') {
         $conf_msg .= "<td>".$focus->settings['mail_smtpserver']."</td>";
         $conf_msg .= "<td>".$focus->settings['mail_smtpuser']."</td></tr>";
 
-    }else{$conf_msg .= "</tr>";}       
+    } else {$conf_msg .= "</tr>"; }       
 
 }
           
 $conf_msg .= '</table>'; 
 $ss->assign("EMAIL_SETTINGS_CONFIGURED_MESSAGE", $conf_msg);
-$email_setup_wiz_link='';
-if ($email_health>0){
-    if (is_admin($current_user)){
-        $email_setup_wiz_link="<a href='index.php?module=Campaigns&action=WizardEmailSetup'>".$mod_strings['LBL_EMAIL_SETUP_WIZ']."</a>";
-    }else{
-        $email_setup_wiz_link=$mod_strings['LBL_NON_ADMIN_ERROR_MSG'];
+$email_setup_wiz_link = '';
+if ($email_health > 0) {
+    if (is_admin($current_user)) {
+        $email_setup_wiz_link = "<a href='index.php?module=Campaigns&action=WizardEmailSetup'>".$mod_strings['LBL_EMAIL_SETUP_WIZ']."</a>";
+    } else {
+        $email_setup_wiz_link = $mod_strings['LBL_NON_ADMIN_ERROR_MSG'];
     }    
 }
 
 $ss->assign("EMAIL_SETUP_WIZ_LINK", $email_setup_wiz_link);
-$ss->assign( 'EMAIL_IMAGE', define_image($email_health, 2));
-$ss->assign( 'EMAIL_COMPONENTS', $mod_strings['LBL_EMAIL_COMPONENTS']);
-$ss->assign( 'SCHEDULER_COMPONENTS', $mod_strings['LBL_SCHEDULER_COMPONENTS']);
-$ss->assign( 'RECHECK_BTN', $mod_strings['LBL_RECHECK_BTN']);
+$ss->assign('EMAIL_IMAGE', define_image($email_health, 2));
+$ss->assign('EMAIL_COMPONENTS', $mod_strings['LBL_EMAIL_COMPONENTS']);
+$ss->assign('SCHEDULER_COMPONENTS', $mod_strings['LBL_SCHEDULER_COMPONENTS']);
+$ss->assign('RECHECK_BTN', $mod_strings['LBL_RECHECK_BTN']);
 
 /************* SCHEDULER COMPONENTS ************/
 
@@ -196,16 +196,16 @@  discard block
 block discarded – undo
 
 $scheds = array();
 //build the table rows for scheduler display
-while ($sched_row = $focus->db->fetchByAssoc($sched_res)){$scheds[] = $sched_row;}
-foreach ($scheds as $funct){
-  if( ($funct['job']==$check_sched1)  ||   ($funct['job']==$check_sched2)){
+while ($sched_row = $focus->db->fetchByAssoc($sched_res)) {$scheds[] = $sched_row; }
+foreach ($scheds as $funct) {
+  if (($funct['job'] == $check_sched1) || ($funct['job'] == $check_sched2)) {
         $sched_mes = 'use';
         $sched_mes_body .= "<tr><td style='text-align: left;'>".$funct['name']."</td>";
         $sched_mes_body .= "<td style='text-align: left;'>".$funct['status']."</td></tr>";
-        if($funct['job']==$check_sched1){
-            $check_sched1 ="found";
-        }else{
-            $check_sched2 ="found";
+        if ($funct['job'] == $check_sched1) {
+            $check_sched1 = "found";
+        } else {
+            $check_sched2 = "found";
         }  
         
   }
@@ -213,43 +213,43 @@  discard block
 block discarded – undo
 
 //determine which table header to use, based on whether or not schedulers were found
 $show_admin_link = false;
-if($sched_mes == 'use'){
+if ($sched_mes == 'use') {
     $sched_mes = "<h5>".$mod_strings['LBL_SCHEDULER_CHECK_GOOD']."</h5><br><table class='other view' cellspacing='1'>";
     $sched_mes .= "<tr><th scope='col' width='40%'><b>".$mod_strings['LBL_SCHEDULER_NAME']."</b></tH>"
                .  " <th scope='col' width='60%'><b>".$mod_strings['LBL_SCHEDULER_STATUS']."</b></tH></tr>";
             
-}else{
+} else {
     $sched_mes = "<table class='other view' cellspacing='1'>";
-    $sched_mes  .= "<tr><td colspan ='3'><font color='red'><b> ".$mod_strings['LBL_SCHEDULER_CHECK_BAD']."</b></font></td></tr>";
+    $sched_mes .= "<tr><td colspan ='3'><font color='red'><b> ".$mod_strings['LBL_SCHEDULER_CHECK_BAD']."</b></font></td></tr>";
     $show_admin_link = true;
 }
 
 //determine if error messages need to be displayed for schedulers
-if($check_sched2 != 'found'){
-    $sched_health =$sched_health +1;
-    $sched_mes_body  .= "<tr><td colspan ='3'><font color='red'> ".$mod_strings['LBL_SCHEDULER_CHECK1_BAD']."</font></td></tr>";
+if ($check_sched2 != 'found') {
+    $sched_health = $sched_health + 1;
+    $sched_mes_body .= "<tr><td colspan ='3'><font color='red'> ".$mod_strings['LBL_SCHEDULER_CHECK1_BAD']."</font></td></tr>";
 }
-if($check_sched1 != 'found'){
-    $sched_health =$sched_health +1;
-    $sched_mes_body  .= "<tr><td colspan ='3' scope='row'><font color='red'>".$mod_strings['LBL_SCHEDULER_CHECK2_BAD']."</font></td></tr>";
+if ($check_sched1 != 'found') {
+    $sched_health = $sched_health + 1;
+    $sched_mes_body .= "<tr><td colspan ='3' scope='row'><font color='red'>".$mod_strings['LBL_SCHEDULER_CHECK2_BAD']."</font></td></tr>";
 }
-$admin_sched_link='';
-if ($sched_health>0){
-    if (is_admin($current_user)){
-        $admin_sched_link="<a href='index.php?module=Schedulers&action=index'>".$mod_strings['LBL_SCHEDULER_LINK']."</a>";
-    }else{
-     $admin_sched_link=$mod_strings['LBL_NON_ADMIN_ERROR_MSG'];   
+$admin_sched_link = '';
+if ($sched_health > 0) {
+    if (is_admin($current_user)) {
+        $admin_sched_link = "<a href='index.php?module=Schedulers&action=index'>".$mod_strings['LBL_SCHEDULER_LINK']."</a>";
+    } else {
+     $admin_sched_link = $mod_strings['LBL_NON_ADMIN_ERROR_MSG'];   
     }    
 }    
 
 //put table html together and display
-    $final_sched_msg = $sched_mes . $sched_mes_body . '</table>' . $admin_sched_link;        
+    $final_sched_msg = $sched_mes.$sched_mes_body.'</table>'.$admin_sched_link;        
     $ss->assign("SCHEDULER_EMAILS_MESSAGE", $final_sched_msg);
-    $ss->assign( 'SCHEDULE_IMAGE', define_image($sched_health, 2));
+    $ss->assign('SCHEDULE_IMAGE', define_image($sched_health, 2));
 
 
 /********** FINAL END OF PAGE UI Stuff ********/
-if(!isset($_REQUEST['inline']) || $_REQUEST['inline'] != 'inline'){
+if (!isset($_REQUEST['inline']) || $_REQUEST['inline'] != 'inline') {
 
       $ss->display('modules/Campaigns/CampaignDiagnostic.html');
 }
@@ -264,18 +264,18 @@  discard block
 block discarded – undo
 function define_image($num, $total)
 { global $mod_strings;
     //if health number is equal to total number then all checks failed, set red image
-    if($num == $total){
+    if ($num == $total) {
         //red
         return SugarThemeRegistry::current()->getImage('red_camp', "align='absmiddle'", null, null, ".gif", $mod_strings['LBL_INVALID']);
 
 
-    }elseif($num == 0){
+    }elseif ($num == 0) {
         //if health number is zero, then all checks passed, set green image
         //green
        return SugarThemeRegistry::current()->getImage('green_camp', "align='absmiddle'", null, null, ".gif", $mod_strings['LBL_VALID']);
 
 
-    }else{
+    } else {
         //if health number is between total and num params, then some checks failed but not all, set yellow image
         //yellow
         return SugarThemeRegistry::current()->getImage('yellow_camp', "align='absmiddle'", null, null, ".gif", $mod_strings['LBL_ALERT']);

Please login to merge, or discard this patch.

modules/AOR_Conditions/vardefs.php 1 patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

modules/AOR_Conditions/conditionLines.php 1 patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

modules/EmailTemplates/field_arrays.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
  ********************************************************************************/
-$fields_array['EmailTemplate'] = array ('column_fields' => Array("id"
+$fields_array['EmailTemplate'] = array('column_fields' => Array("id"
 		, "date_entered"
 		, "date_modified"
 		, "modified_user_id"
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
 		, "name"
 		, "published"
 		),
-        'list_fields' =>  Array('id', 'name', 'description','date_modified'
+        'list_fields' =>  Array('id', 'name', 'description', 'date_modified'
 	),
     'required_fields' => array("name"=>1),
 );

Please login to merge, or discard this patch.

modules/EmailTemplates/PopupDocumentsCampaignTemplate.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?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.
@@ -73,8 +73,8 @@  discard block
 block discarded – undo
 
 
 $hide_clear_button = empty($_REQUEST['hide_clear_button']) ? false : true;
-$button  = "<form action='index.php' method='post' name='form' id='form'>\n";
-if(!$hide_clear_button)
+$button = "<form action='index.php' method='post' name='form' id='form'>\n";
+if (!$hide_clear_button)
 {
 	$button .= "<input type='button' name='button' class='button' onclick=\"send_back('','');\" title='"
 		.$app_strings['LBL_CLEAR_BUTTON_TITLE']."' value='  "
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
 $form->assign('MODULE_NAME', $currentModule);
 $form->assign('NAME', $name);
 $form->assign('DOCUMENT_NAME', $document_name);
-if(isset($_REQUEST['target'])) $form->assign('DOCUMENT_TARGET', $_REQUEST['target']);
+if (isset($_REQUEST['target'])) $form->assign('DOCUMENT_TARGET', $_REQUEST['target']);
 else $form->assign('DOCUMENT_TARGET', '');
 
 $form->assign('DOCUMENT_REVISION_ID', $document_revision_id);

Please login to merge, or discard this patch.

modules/EmailTemplates/AttachFiles.php 1 patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -55,17 +55,17 @@  discard block
 block discarded – undo
 
 $ret = array();
 
-foreach($_FILES as $k => $file) {
-	if(in_array(strtolower($_FILES[$k]['type']), $imgType) && $_FILES[$k]['size'] > 0) {
+foreach ($_FILES as $k => $file) {
+	if (in_array(strtolower($_FILES[$k]['type']), $imgType) && $_FILES[$k]['size'] > 0) {
 	    $upload_file = new UploadFile($k);
 		// check the file
-		if($upload_file->confirm_upload()) {
+		if ($upload_file->confirm_upload()) {
 		    $dest = $cachedir.basename($upload_file->get_stored_file_name()); // target name
 		    $guid = create_guid();
-		    if($upload_file->final_move($guid)) { // move to uploads
+		    if ($upload_file->final_move($guid)) { // move to uploads
 		        $path = $upload_file->get_upload_path($guid);
 		        // if file is OK, copy to cache
-		        if(verify_uploaded_image($path) && copy($path, $dest)) {
+		        if (verify_uploaded_image($path) && copy($path, $dest)) {
 		            $ret[] = $dest;
 		        }
 		        // remove temp file

Please login to merge, or discard this patch.

modules/EmailTemplates/EditView.php 1 patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -74,9 +74,9 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
     // 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 @@  discard block
 block discarded – undo
             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);

Please login to merge, or discard this patch.

modules/EmailTemplates/CheckDeletable.php 1 patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
 
 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;

Please login to merge, or discard this patch.

		@@ -74,9 +74,9 @@ discard block
		block discarded – undo
74	74	$GLOBALS['log']->info("EmailTemplate detail view");
75	75
76	76	if ($has_campaign \|\| $inboundEmail) {
77		- $xtpl = new XTemplate ('modules/EmailTemplates/EditView.html');
	77	+ $xtpl = new XTemplate('modules/EmailTemplates/EditView.html');
78	78	} else {
79		- $xtpl = new XTemplate ('modules/EmailTemplates/EditViewMain.html');
	79	+ $xtpl = new XTemplate('modules/EmailTemplates/EditViewMain.html');
80	80	} // else
81	81	$xtpl->assign("MOD", $mod_strings);
82	82	$xtpl->assign("APP", $app_strings);
		@@ -128,13 +128,13 @@ discard block
		block discarded – undo
128	128	require_once('include/QuickSearchDefaults.php');
129	129	$qsd = QuickSearchDefaults::getQuickSearchDefaults();
130	130	$sqs_objects = array('EditView_assigned_user_name' => $qsd->getQSUser());
131		-$quicksearch_js = '<script type="text/javascript" language="javascript">sqs_objects = ' . $json->encode($sqs_objects) . '; enableQS();</script>';
	131	+$quicksearch_js = '<script type="text/javascript" language="javascript">sqs_objects = '.$json->encode($sqs_objects).'; enableQS();</script>';
132	132
133	133	$xtpl->assign("CANCEL_SCRIPT", $cancel_script);
134		-$xtpl->assign("PRINT_URL", "index.php?" . $GLOBALS['request_string']);
135		-$xtpl->assign("JAVASCRIPT", get_set_focus_js() . $quicksearch_js);
	134	+$xtpl->assign("PRINT_URL", "index.php?".$GLOBALS['request_string']);
	135	+$xtpl->assign("JAVASCRIPT", get_set_focus_js().$quicksearch_js);
136	136
137		-if (!is_file(sugar_cached('jsLanguage/') . $GLOBALS['current_language'] . '.js')) {
	137	+if (!is_file(sugar_cached('jsLanguage/').$GLOBALS['current_language'].'.js')) {
138	138	require_once('include/language/jsLanguage.php');
139	139	jsLanguage::createAppStringsCache($GLOBALS['current_language']);
140	140	}
		@@ -183,18 +183,18 @@ discard block
		block discarded – undo
183	183	$record = $_REQUEST['record'];
184	184	}
185	185
186		- $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>");
	186	+ $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>");
187	187
188	188	}
189	189	if (isset($focus->parent_type) && $focus->parent_type != "") {
190		- $change_parent_button = "<input title='" . $app_strings['LBL_SELECT_BUTTON_TITLE'] . "'
191		-tabindex='3' type='button' class='button' value='" . $app_strings['LBL_SELECT_BUTTON_LABEL'] . "' name='button' LANGUAGE=javascript onclick='return
	190	+ $change_parent_button = "<input title='".$app_strings['LBL_SELECT_BUTTON_TITLE']."'
	191	+tabindex='3' type='button' class='button' value='" . $app_strings['LBL_SELECT_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='return
192	192	window.open(\"index.php?module=\"+ document.EditView.parent_type.value +
193	193	\"&action=Popup&html=Popup_picker&form=TasksEditView\",\"test\",\"width=600,height=400,resizable=1,scrollbars=1\");'>";
194	194	$xtpl->assign("CHANGE_PARENT_BUTTON", $change_parent_button);
195	195	}
196	196	if ($focus->parent_type == "Account") {
197		- $xtpl->assign("DEFAULT_SEARCH", "&query=true&account_id=$focus->parent_id&account_name=" . urlencode($focus->parent_name));
	197	+ $xtpl->assign("DEFAULT_SEARCH", "&query=true&account_id=$focus->parent_id&account_name=".urlencode($focus->parent_name));
198	198	}
199	199
200	200	$xtpl->assign("DESCRIPTION", $focus->description);
		@@ -251,7 +251,7 @@ discard block
		block discarded – undo
251	251	// If it's campaign then hide the Account.
252	252	if ($has_campaign) {
253	253	$dropdown = "<option value='Contacts'>
254		- " . $lblContactAndOthers . "
	254	+ " . $lblContactAndOthers."
255	255	</option>";
256	256	$xtpl->assign("DROPDOWN", $dropdown);
257	257	$xtpl->assign("DEFAULT_MODULE", 'Contacts');
		@@ -285,13 +285,13 @@ discard block
		block discarded – undo
285	285	if (empty($the_note->filename)) {
286	286	continue;
287	287	}
288		- $secureLink = 'index.php?entryPoint=download&id=' . $the_note->id . '&type=Notes';
289		- $attachments .= '<input type="checkbox" name="remove_attachment[]" value="' . $the_note->id . '"> ' . $app_strings['LNK_REMOVE'] . '  ';
290		- $attachments .= '<a href="' . $secureLink . '" target="_blank">' . $the_note->filename . '</a><br>';
	288	+ $secureLink = 'index.php?entryPoint=download&id='.$the_note->id.'&type=Notes';
	289	+ $attachments .= '<input type="checkbox" name="remove_attachment[]" value="'.$the_note->id.'"> '.$app_strings['LNK_REMOVE'].'  ';
	290	+ $attachments .= '<a href="'.$secureLink.'" target="_blank">'.$the_note->filename.'</a><br>';
291	291	}
292	292	}
293	293	$attJs = '<script type="text/javascript">';
294		- $attJs .= 'var lnk_remove = "' . $app_strings['LNK_REMOVE'] . '";';
	294	+ $attJs .= 'var lnk_remove = "'.$app_strings['LNK_REMOVE'].'";';
295	295	$attJs .= '</script>';
296	296	$xtpl->assign('ATTACHMENTS', $attachments);
297	297	$xtpl->assign('ATTACHMENTS_JAVASCRIPT', $attJs);

		@@ -1,5 +1,5 @@ discard block
		block discarded – undo
1	1	<?php
2		-if(!defined('sugarEntry') \|\| !sugarEntry) die('Not A Valid Entry Point');
	2	+if (!defined('sugarEntry') \|\| !sugarEntry) die('Not A Valid Entry Point');
3	3	/*********************************************************************************
4	4	* SugarCRM Community Edition is a customer relationship management program developed by
5	5	* SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
		@@ -56,52 +56,52 @@ discard block
		block discarded – undo
56	56
57	57	//-----------begin replacing text input tags that have been marked with text area tags
58	58	//get array of text areas strings to process
59		-$bodyHTML = html_entity_decode($_REQUEST['body_html'],ENT_QUOTES);
	59	+$bodyHTML = html_entity_decode($_REQUEST['body_html'], ENT_QUOTES);
60	60	//Bug53791
61	61	$bodyHTML = str_replace(chr(160), " ", $bodyHTML);
62	62
63		-while (strpos($bodyHTML, "ta_replace") !== false){
	63	+while (strpos($bodyHTML, "ta_replace") !== false) {
64	64
65	65	//define the marker edges of the sub string to process (opening and closing tag brackets)
66	66	$marker = strpos($bodyHTML, "ta_replace");
67		- $start_border = strpos($bodyHTML, "input", $marker) - 1;// to account for opening '<' char;
	67	+ $start_border = strpos($bodyHTML, "input", $marker) - 1; // to account for opening '<' char;
68	68	$end_border = strpos($bodyHTML, '>', $start_border); //get the closing tag after marker ">";
69	69
70	70	//extract the input tag string
71		- $working_str = substr($bodyHTML, $marker-3, $end_border-($marker-3) );
	71	+ $working_str = substr($bodyHTML, $marker - 3, $end_border - ($marker - 3));
72	72
73	73	//replace input markup with text areas markups
74		- $new_str = str_replace('input','textarea',$working_str);
	74	+ $new_str = str_replace('input', 'textarea', $working_str);
75	75	$new_str = str_replace("type='text'", ' ', $new_str);
76		- $new_str = $new_str . '> </textarea';
	76	+ $new_str = $new_str.'> </textarea';
77	77
78	78	//replace the marker with generic term
79	79	$new_str = str_replace('ta_replace', 'sugarslot', $new_str);
80	80
81	81	//merge the processed string back into bodyhtml string
82		- $bodyHTML = str_replace($working_str , $new_str, $bodyHTML);
	82	+ $bodyHTML = str_replace($working_str, $new_str, $bodyHTML);
83	83	}
84	84	//<<<----------end replacing marked text inputs with text area tags
85	85
86	86	$guid = create_guid();
87	87	$form_file = "upload://$guid";
88	88
89		-$SugarTiny = new SugarTinyMCE();
	89	+$SugarTiny = new SugarTinyMCE();
90	90	$html = $SugarTiny->cleanEncodedMCEHtml($bodyHTML);
91	91
92	92	//Check to ensure we have <html> tags in the form. Without them, IE8 will attempt to display the page as XML.
93	93	if (stripos($html, "<html") === false) {
94	94	$langHeader = get_language_header();
95		- $html = "<html {$langHeader}><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"></head><body>" . $html . "</body></html>";
	95	+ $html = "<html {$langHeader}><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"></head><body>".$html."</body></html>";
96	96	}
97	97	file_put_contents($form_file, $html);
98	98
99		-$xtpl=new XTemplate ('modules/Campaigns/WebToLeadDownloadForm.html');
	99	+$xtpl = new XTemplate('modules/Campaigns/WebToLeadDownloadForm.html');
100	100	$xtpl->assign("MOD", $mod_strings);
101	101	$xtpl->assign("APP", $app_strings);
102	102	$webformlink = "<b>$mod_strings[LBL_DOWNLOAD_TEXT_WEB_TO_LEAD_FORM]</b><br/>";
103	103	$webformlink .= "<a href=\"index.php?entryPoint=download&id={$guid}&isTempFile=1&tempName=WebToLeadForm.html&type=temp\">$mod_strings[LBL_DOWNLOAD_WEB_TO_LEAD_FORM]</a>";
104		-$xtpl->assign("LINK_TO_WEB_FORM",$webformlink);
	104	+$xtpl->assign("LINK_TO_WEB_FORM", $webformlink);
105	105	$xtpl->assign("RAW_SOURCE", htmlspecialchars($html));
106	106	$xtpl->parse("main.copy_source");
107	107	$xtpl->parse("main");

		@@ -26,9 +26,9 @@ discard block
		block discarded – undo
26	26	'table'=>'aor_conditions',
27	27	'audited'=>false,
28	28	'duplicate_merge'=>true,
29		- 'fields'=>array (
	29	+ 'fields'=>array(
30	30	'aor_report_id' =>
31		- array (
	31	+ array(
32	32	'required' => false,
33	33	'name' => 'aor_report_id',
34	34	'vname' => 'LBL_AOR_REPORT_ID',
		@@ -47,7 +47,7 @@ discard block
		block discarded – undo
47	47	'size' => '20',
48	48	),
49	49	'condition_order' =>
50		- array (
	50	+ array(
51	51	'required' => false,
52	52	'name' => 'condition_order',
53	53	'vname' => 'LBL_ORDER',
		@@ -79,14 +79,14 @@ discard block
		block discarded – undo
79	79	'type' => 'varchar',
80	80	),
81	81	'module_path' =>
82		- array (
	82	+ array(
83	83	'name' => 'module_path',
84	84	'type' => 'longtext',
85	85	'vname' => 'LBL_MODULE_PATH',
86	86	'isnull' => true,
87	87	),
88	88	'field' =>
89		- array (
	89	+ array(
90	90	'required' => false,
91	91	'name' => 'field',
92	92	'vname' => 'LBL_FIELD',
		@@ -108,7 +108,7 @@ discard block
		block discarded – undo
108	108	'dependency' => false,
109	109	),
110	110	'operator' =>
111		- array (
	111	+ array(
112	112	'required' => false,
113	113	'name' => 'operator',
114	114	'vname' => 'LBL_OPERATOR',
		@@ -131,7 +131,7 @@ discard block
		block discarded – undo
131	131	'dependency' => false,
132	132	),
133	133	'value_type' =>
134		- array (
	134	+ array(
135	135	'required' => false,
136	136	'name' => 'value_type',
137	137	'vname' => 'LBL_VALUE_TYPE',
		@@ -150,7 +150,7 @@ discard block
		block discarded – undo
150	150	'size' => '20',
151	151	),
152	152	'value' =>
153		- array (
	153	+ array(
154	154	'required' => false,
155	155	'name' => 'value',
156	156	'vname' => 'LBL_VALUE',
		@@ -169,7 +169,7 @@ discard block
		block discarded – undo
169	169	'size' => '20',
170	170	),
171	171	'parameter' =>
172		- array (
	172	+ array(
173	173	'required' => false,
174	174	'name' => 'parameter',
175	175	'vname' => 'LBL_PARAMETER',
		@@ -187,7 +187,7 @@ discard block
		block discarded – undo
187	187	'studio' => 'visible',
188	188	),
189	189	'aor_reports' =>
190		- array (
	190	+ array(
191	191	'name' => 'aor_reports',
192	192	'type' => 'link',
193	193	'relationship' => 'aor_report_aor_conditions',
		@@ -196,7 +196,7 @@ discard block
		block discarded – undo
196	196	'source'=>'non-db',
197	197	),
198	198	),
199		- 'relationships'=>array (
	199	+ 'relationships'=>array(
200	200	),
201	201	'indices' => array(
202	202	array(
		@@ -209,7 +209,7 @@ discard block
		block discarded – undo
209	209	'unified_search'=>true,
210	210	);
211	211
212		-if (!class_exists('VardefManager')){
	212	+if (!class_exists('VardefManager')) {
213	213	require_once('include/SugarObjects/VardefManager.php');
214	214	}
215		-VardefManager::createVardef('AOR_Conditions','AOR_Condition', array('basic'));
	215	+VardefManager::createVardef('AOR_Conditions', 'AOR_Condition', array('basic'));

		@@ -23,19 +23,19 @@ discard block
		block discarded – undo
23	23	*/
24	24
25	25
26		-function display_condition_lines($focus, $field, $value, $view){
	26	+function display_condition_lines($focus, $field, $value, $view) {
27	27
28	28	global $locale, $app_list_strings, $mod_strings;
29	29
30	30	$html = '';
31	31
32		- if (!is_file('cache/jsLanguage/AOR_Conditions/' . $GLOBALS['current_language'] . '.js')) {
	32	+ if (!is_file('cache/jsLanguage/AOR_Conditions/'.$GLOBALS['current_language'].'.js')) {
33	33	require_once ('include/language/jsLanguage.php');
34	34	jsLanguage::createModuleStringsCache('AOR_Conditions', $GLOBALS['current_language']);
35	35	}
36		- $html .= '<script src="cache/jsLanguage/AOR_Conditions/'. $GLOBALS['current_language'] . '.js"></script>';
	36	+ $html .= '<script src="cache/jsLanguage/AOR_Conditions/'.$GLOBALS['current_language'].'.js"></script>';
37	37
38		- if($view == 'EditView'){
	38	+ if ($view == 'EditView') {
39	39
40	40	$html .= '<script src="modules/AOR_Conditions/conditionLines.js"></script>';
41	41	$html .= "<table border='0' cellspacing='4' width='100%' id='conditionLines'></table>";
		@@ -45,12 +45,12 @@ discard block
		block discarded – undo
45	45	$html .= "</div>";
46	46
47	47
48		- if(isset($focus->report_module) && $focus->report_module != ''){
	48	+ if (isset($focus->report_module) && $focus->report_module != '') {
49	49	require_once("modules/AOW_WorkFlow/aow_utils.php");
50	50	$html .= "<script>";
51	51	$html .= "report_module = \"".$focus->report_module."\";";
52	52	$html .= "document.getElementById('btn_ConditionLine').disabled = '';";
53		- if($focus->id != ''){
	53	+ if ($focus->id != '') {
54	54	$sql = "SELECT id FROM aor_conditions WHERE aor_report_id = '".$focus->id."' AND deleted = 0 ORDER BY condition_order ASC";
55	55	$result = $focus->db->query($sql);
56	56
		@@ -58,8 +58,8 @@ discard block
		block discarded – undo
58	58	$condition_name = new AOR_Condition();
59	59	$condition_name->retrieve($row['id']);
60	60	$condition_name->module_path = unserialize(base64_decode($condition_name->module_path));
61		- $html .= "report_fields = \"".trim(preg_replace('/\s+/', ' ', getModuleFields(getRelatedModule($focus->report_module,$condition_name->module_path[0]))))."\";";
62		- if($condition_name->value_type == 'Date'){
	61	+ $html .= "report_fields = \"".trim(preg_replace('/\s+/', ' ', getModuleFields(getRelatedModule($focus->report_module, $condition_name->module_path[0]))))."\";";
	62	+ if ($condition_name->value_type == 'Date') {
63	63	$condition_name->value = unserialize(base64_decode($condition_name->value));
64	64	}
65	65	$condition_item = json_encode($condition_name->toArray());
		@@ -71,12 +71,12 @@ discard block
		block discarded – undo
71	71	}
72	72
73	73	}
74		- else if($view == 'DetailView'){
	74	+ else if ($view == 'DetailView') {
75	75	$html .= '<script src="modules/AOR_Conditions/conditionLines.js"></script>';
76	76	$html .= "<table border='0' cellspacing='0' width='100%' id='conditionLines'></table>";
77	77
78	78
79		- if(isset($focus->report_module) && $focus->report_module != ''){
	79	+ if (isset($focus->report_module) && $focus->report_module != '') {
80	80	require_once("modules/AOW_WorkFlow/aow_utils.php");
81	81	$html .= "<script>";
82	82	$html .= "report_fields = \"".trim(preg_replace('/\s+/', ' ', getModuleFields($focus->report_module)))."\";";
		@@ -88,7 +88,7 @@ discard block
		block discarded – undo
88	88	$condition_name = new AOR_Condition();
89	89	$condition_name->retrieve($row['id']);
90	90	$condition_name->module_path = unserialize(base64_decode($condition_name->module_path));
91		- if($condition_name->value_type == 'Date'){
	91	+ if ($condition_name->value_type == 'Date') {
92	92	$condition_name->value = unserialize(base64_decode($condition_name->value));
93	93	}
94	94	$condition_item = json_encode($condition_name->toArray());

adamjakab / SuiteCRM

Push — console-installer ( 3d54e5...e2b50d )

Category

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

Spacing +58 added lines, -58 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch