Inspection of "Merge remote-tracking branch 'origin/console-insta..." - adamjakab/SuiteCRM - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — console-installer ( e2b50d...6ce748 )

by Adam

created 2016-07-04 09:50 UTC

Status

Spacing +27 added lines, -27 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.
@@ -39,33 +39,33 @@  discard block
 block discarded – undo
  ********************************************************************************/
 global $current_user;
 $module_name = "Calls";
-$searchFields['Calls'] = array (
+$searchFields['Calls'] = array(
   'name' =>
-  array (
+  array(
     'query_type' => 'default',
   ),
   'contact_name' => 
-  array (
+  array(
     'query_type' => 'default',
     'db_field' => 
-    array (
+    array(
       0 => 'contacts.first_name',
       1 => 'contacts.last_name',
     ),
   ),
   'date_start' => 
-  array (
+  array(
     'query_type' => 'default',
   ),
   'location' => 
-  array (
+  array(
     'query_type' => 'default',
   ),
   'current_user_only' => 
-  array (
+  array(
     'query_type' => 'default',
     'db_field' => 
-    array (
+    array(
       0 => 'assigned_user_id',
     ),
     'my_items' => true,
@@ -73,98 +73,98 @@  discard block
 block discarded – undo
     'type' => 'bool',
   ),
   'assigned_user_id' => 
-  array (
+  array(
     'query_type' => 'default',
   ),
   'status' => 
-  array (
+  array(
     'query_type' => 'default',
     'options' => 'call_status_dom',
     'template_var' => 'STATUS_FILTER',
   ),
   'open_only' => 
-  array (
+  array(
     'query_type' => 'default',
     'db_field' => 
-    array (
+    array(
       0 => 'status',
     ),
     'operator' => 'not in',
     'closed_values' => 
-    array (
+    array(
       0 => 'Held',
       1 => 'Not Held',
     ),
     'type' => 'bool',
   ),
   'range_date_entered' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'start_range_date_entered' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'end_range_date_entered' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'range_date_modified' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'start_range_date_modified' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'end_range_date_modified' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'range_date_start' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'start_range_date_start' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'end_range_date_start' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'range_date_end' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'start_range_date_end' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'end_range_date_end' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
@@ -175,6 +175,6 @@  discard block
 block discarded – undo
         'subquery' => "SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = '".$module_name."'
-			                        and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
+			                        and favorites.assigned_user_id = '" .$current_user->id."') OR NOT ({0}",
         'db_field'=>array('id')),
 );
\ No newline at end of file

Please login to merge, or discard this patch.

modules/Cases/metadata/SearchFields.php 1 patch

Spacing +22 added lines, -22 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.
@@ -39,42 +39,42 @@  discard block
 block discarded – undo
  ********************************************************************************/
 global $current_user;
 $module_name = "Cases";
-$searchFields['Cases'] = array (
+$searchFields['Cases'] = array(
   'name' => 
-  array (
+  array(
     'query_type' => 'default',
   ),
   'account_name' => 
-  array (
+  array(
     'query_type' => 'default',
     'db_field' => 
-    array (
+    array(
       0 => 'accounts.name',
     ),
   ),
   'status' => 
-  array (
+  array(
     'query_type' => 'default',
     'options' => 'case_status_dom',
     'template_var' => 'STATUS_OPTIONS',
   ),
   'priority' => 
-  array (
+  array(
     'query_type' => 'default',
     'options' => 'case_priority_dom',
     'template_var' => 'PRIORITY_OPTIONS',
     'options_add_blank' => true,
   ),
   'case_number' => 
-  array (
+  array(
     'query_type' => 'default',
     'operator' => 'in',
   ),
   'current_user_only' => 
-  array (
+  array(
     'query_type' => 'default',
     'db_field' => 
-    array (
+    array(
       0 => 'assigned_user_id',
     ),
     'my_items' => true,
@@ -82,19 +82,19 @@  discard block
 block discarded – undo
     'type' => 'bool',
   ),
   'assigned_user_id' => 
-  array (
+  array(
     'query_type' => 'default',
   ),
   'open_only' => 
-  array (
+  array(
     'query_type' => 'default',
     'db_field' => 
-    array (
+    array(
       0 => 'status',
     ),
     'operator' => 'not in',
     'closed_values' => 
-    array (
+    array(
       0 => 'Closed',
       1 => 'Rejected',
       2 => 'Duplicate',
@@ -105,43 +105,43 @@  discard block
 block discarded – undo
     'type' => 'bool',
   ),
   'range_date_entered' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'start_range_date_entered' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'end_range_date_entered' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'range_date_modified' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'start_range_date_modified' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'end_range_date_modified' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'state' => 
-  array (
+  array(
     'query_type' => 'default',
   ),
     'favorites_only' => array(
@@ -150,6 +150,6 @@  discard block
 block discarded – undo
         'subquery' => "SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = '".$module_name."'
-			                        and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
+			                        and favorites.assigned_user_id = '" .$current_user->id."') OR NOT ({0}",
         'db_field'=>array('id')),
 );
\ No newline at end of file

Please login to merge, or discard this patch.

modules/EmailTemplates/EmailTemplate.php 1 patch

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

@@ -121,9 +121,9 @@  discard block
 block discarded – undo
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function EmailTemplate(){
+    public function EmailTemplate() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -368,7 +368,7 @@  discard block
 block discarded – undo
                             }
                             if (!empty($tracker_url) && !empty($template_text) && !empty($matches[0][$i][0]) && !empty($tracked_urls[$matches[0][$i][0]])) {
                                 $template_text = substr_replace($template_text, $tracker_url, $matches[0][$i][1], strlen($matches[0][$i][0]));
-                                $template_text = str_replace($sugar_config['site_url'] . '/' . $sugar_config['site_url'], $sugar_config['site_url'], $template_text);
+                                $template_text = str_replace($sugar_config['site_url'].'/'.$sugar_config['site_url'], $sugar_config['site_url'], $template_text);
                             }
                         }
                     }
@@ -420,10 +420,10 @@  discard block
 block discarded – undo
         if ($beanList[$focus_name] == 'User') {
             $pattern_prefix = '$contact_user_';
         } else {
-            $pattern_prefix = '$' . strtolower($beanList[$focus_name]) . '_';
+            $pattern_prefix = '$'.strtolower($beanList[$focus_name]).'_';
         }
         $pattern_prefix_length = strlen($pattern_prefix);
-        $pattern = '/\\' . $pattern_prefix . '[A-Za-z_0-9]*/';
+        $pattern = '/\\'.$pattern_prefix.'[A-Za-z_0-9]*/';
 
         $return_array = array();
         foreach ($template_text_array as $key => $template_text) {
@@ -521,16 +521,16 @@  discard block
 block discarded – undo
                 $translated = translate($field_def['options'], 'Users', $user->$fieldName);
 
                 if (isset($translated) && !is_array($translated)) {
-                    $repl_arr["contact_user_" . $fieldName] = $translated;
+                    $repl_arr["contact_user_".$fieldName] = $translated;
                 } else { // unset enum field, make sure we have a match string to replace with ""
-                    $repl_arr["contact_user_" . $fieldName] = '';
+                    $repl_arr["contact_user_".$fieldName] = '';
                 }
             } else {
                 if (isset($user->$fieldName)) {
                     // bug 47647 - allow for fields to translate before adding to template
-                    $repl_arr["contact_user_" . $fieldName] = self::_convertToType($field_def['type'], $user->$fieldName);
+                    $repl_arr["contact_user_".$fieldName] = self::_convertToType($field_def['type'], $user->$fieldName);
                 } else {
-                    $repl_arr["contact_user_" . $fieldName] = "";
+                    $repl_arr["contact_user_".$fieldName] = "";
                 }
             }
         }
@@ -556,8 +556,8 @@  discard block
 block discarded – undo
                 continue;
             }
             $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                'contact_' . $field_def['name'] => '',
-                'contact_account_' . $field_def['name'] => '',
+                'contact_'.$field_def['name'] => '',
+                'contact_account_'.$field_def['name'] => '',
             ));
         }
         foreach ($prospect->field_defs as $field_def) {
@@ -565,8 +565,8 @@  discard block
 block discarded – undo
                 continue;
             }
             $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                'contact_' . $field_def['name'] => '',
-                'contact_account_' . $field_def['name'] => '',
+                'contact_'.$field_def['name'] => '',
+                'contact_account_'.$field_def['name'] => '',
             ));
         }
         foreach ($contact->field_defs as $field_def) {
@@ -574,8 +574,8 @@  discard block
 block discarded – undo
                 continue;
             }
             $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                'contact_' . $field_def['name'] => '',
-                'contact_account_' . $field_def['name'] => '',
+                'contact_'.$field_def['name'] => '',
+                'contact_account_'.$field_def['name'] => '',
             ));
         }
         foreach ($acct->field_defs as $field_def) {
@@ -583,8 +583,8 @@  discard block
 block discarded – undo
                 continue;
             }
             $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                'account_' . $field_def['name'] => '',
-                'account_contact_' . $field_def['name'] => '',
+                'account_'.$field_def['name'] => '',
+                'account_contact_'.$field_def['name'] => '',
             ));
         }
         // cn: end bug 9277 fix
@@ -609,21 +609,21 @@  discard block
 block discarded – undo
 
                         if (isset($translated) && !is_array($translated)) {
                             $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                                'account_' . $fieldName => $translated,
-                                'contact_account_' . $fieldName => $translated,
+                                'account_'.$fieldName => $translated,
+                                'contact_account_'.$fieldName => $translated,
                             ));
                         } else { // unset enum field, make sure we have a match string to replace with ""
                             $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                                'account_' . $fieldName => '',
-                                'contact_account_' . $fieldName => '',
+                                'account_'.$fieldName => '',
+                                'contact_account_'.$fieldName => '',
                             ));
                         }
                     } else {
                         // bug 47647 - allow for fields to translate before adding to template
                         $translated = self::_convertToType($field_def['type'], $acct->$fieldName);
                         $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                            'account_' . $fieldName => $translated,
-                            'contact_account_' . $fieldName => $translated,
+                            'account_'.$fieldName => $translated,
+                            'contact_account_'.$fieldName => $translated,
                         ));
                     }
                 }
@@ -654,13 +654,13 @@  discard block
 block discarded – undo
 
                     if (isset($translated) && !is_array($translated)) {
                         $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                            'contact_' . $fieldName => $translated,
-                            'contact_account_' . $fieldName => $translated,
+                            'contact_'.$fieldName => $translated,
+                            'contact_account_'.$fieldName => $translated,
                         ));
                     } else { // unset enum field, make sure we have a match string to replace with ""
                         $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                            'contact_' . $fieldName => '',
-                            'contact_account_' . $fieldName => '',
+                            'contact_'.$fieldName => '',
+                            'contact_account_'.$fieldName => '',
                         ));
                     }
                 } else {
@@ -668,8 +668,8 @@  discard block
 block discarded – undo
                         // bug 47647 - allow for fields to translate before adding to template
                         $translated = self::_convertToType($field_def['type'], $contact->$fieldName);
                         $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                            'contact_' . $fieldName => $translated,
-                            'contact_account_' . $fieldName => $translated,
+                            'contact_'.$fieldName => $translated,
+                            'contact_account_'.$fieldName => $translated,
                         ));
                     } // if
                 }
@@ -690,27 +690,27 @@  discard block
 block discarded – undo
 
                     if (isset($translated) && !is_array($translated)) {
                         $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                            strtolower($beanList[$bean_name]) . "_" . $fieldName => $translated,
+                            strtolower($beanList[$bean_name])."_".$fieldName => $translated,
                         ));
                     } else { // unset enum field, make sure we have a match string to replace with ""
                         $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                            strtolower($beanList[$bean_name]) . "_" . $fieldName => '',
+                            strtolower($beanList[$bean_name])."_".$fieldName => '',
                         ));
                     }
                 } else {
                     // bug 47647 - translate currencies to appropriate values
                     $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                        strtolower($beanList[$bean_name]) . "_" . $fieldName => self::_convertToType($field_def['type'], $focus->$fieldName),
+                        strtolower($beanList[$bean_name])."_".$fieldName => self::_convertToType($field_def['type'], $focus->$fieldName),
                     ));
                 }
             } else {
                 if ($fieldName == 'full_name') {
                     $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                        strtolower($beanList[$bean_name]) . '_full_name' => $focus->get_summary_text(),
+                        strtolower($beanList[$bean_name]).'_full_name' => $focus->get_summary_text(),
                     ));
                 } else {
                     $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                        strtolower($beanList[$bean_name]) . "_" . $fieldName => '',
+                        strtolower($beanList[$bean_name])."_".$fieldName => '',
                     ));
                 }
             }
@@ -761,7 +761,7 @@  discard block
 block discarded – undo
     {
         foreach ($bean_arr as $bean_name => $bean_id) {
 
-            $focus = BeanFactory::getBean($bean_name,$bean_id);
+            $focus = BeanFactory::getBean($bean_name, $bean_id);
 
             if ($bean_name == 'Leads' || $bean_name == 'Prospects') {
                 $bean_name = 'Contacts';
@@ -843,7 +843,7 @@  discard block
 block discarded – undo
         $this->repairMozaikClears();
         $this->imageLinkReplaced = false;
         $this->repairEntryPointImages();
-        if($this->imageLinkReplaced) {
+        if ($this->imageLinkReplaced) {
             $this->save();
         }
         return $ret;
@@ -862,13 +862,13 @@  discard block
 block discarded – undo
         // repair the images url at entry points, change to a public direct link for remote email clients..
 
         $siteUrlQuoted = str_replace(array(':', '/'), array('\:', '\/'), $sugar_config['site_url']);
-        $regex = '/&lt;img src=&quot;(' . $siteUrlQuoted . '\/index\.php\?entryPoint=download&type=Notes&id=([a-f0-9]{8}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{12})&filename=[^&]+)&quot;/';
+        $regex = '/&lt;img src=&quot;('.$siteUrlQuoted.'\/index\.php\?entryPoint=download&type=Notes&id=([a-f0-9]{8}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{12})&filename=[^&]+)&quot;/';
 
-        if(preg_match($regex, $this->body_html, $match)) {
+        if (preg_match($regex, $this->body_html, $match)) {
             $splits = explode('.', $match[1]);
             $fileExtension = end($splits);
             $this->makePublicImage($match[2]);
-            $directLink = '&lt;img src=&quot;' . $sugar_config['site_url'] . '/public/' . $match[2] . '.' . $fileExtension . '&quot;';
+            $directLink = '&lt;img src=&quot;'.$sugar_config['site_url'].'/public/'.$match[2].'.'.$fileExtension.'&quot;';
             $this->body_html = str_replace($match[0], $directLink, $this->body_html);
             $this->imageLinkReplaced = true;
             $this->repairEntryPointImages();
@@ -877,25 +877,25 @@  discard block
 block discarded – undo
     }
 
     private function makePublicImage($id) {
-        $toFile = 'public/' . $id . '.jpg';
-        if(file_exists($toFile)) {
+        $toFile = 'public/'.$id.'.jpg';
+        if (file_exists($toFile)) {
             return;
         }
-        $fromFile = 'upload://' . $id;
-        if(!file_exists($fromFile)) {
+        $fromFile = 'upload://'.$id;
+        if (!file_exists($fromFile)) {
             throw new Exceptin('file not found');
         }
-        if(!file_exists('public')) {
+        if (!file_exists('public')) {
             sugar_mkdir('public', 777);
         }
         $fdata = file_get_contents($fromFile);
-        if(!file_put_contents($toFile, $fdata)) {
+        if (!file_put_contents($toFile, $fdata)) {
             throw new Exception('file write error');
         }
     }
 
     public function getAttachments() {
-        return BeanFactory::getBean('Notes')->get_full_list('', "parent_id = '" . $this->id . "'");
+        return BeanFactory::getBean('Notes')->get_full_list('', "parent_id = '".$this->id."'");
     }
 
 }

Please login to merge, or discard this patch.

modules/EmailTemplates/EmailTemplateData.php 2 patches

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

@@ -2,9 +2,9 @@  discard block
 block discarded – undo
 if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 function handleAttachmentForRemove() {
-    if(!empty($_REQUEST['attachmentsRemove'])) {
-        foreach($_REQUEST['attachmentsRemove'] as $attachmentIdForRemove) {
-            if($bean = BeanFactory::getBean('Notes', $attachmentIdForRemove)) {
+    if (!empty($_REQUEST['attachmentsRemove'])) {
+        foreach ($_REQUEST['attachmentsRemove'] as $attachmentIdForRemove) {
+            if ($bean = BeanFactory::getBean('Notes', $attachmentIdForRemove)) {
                 $bean->mark_deleted($bean->id);
             }
         }
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
 $emailTemplateId = isset($_REQUEST['emailTemplateId']) && $_REQUEST['emailTemplateId'] ? $_REQUEST['emailTemplateId'] : null;
 $_SESSION['campaignWizard'][$_REQUEST['campaignId']]['defaultSelectedTemplateId'] = $emailTemplateId;
 
-if(preg_match('/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/', $emailTemplateId) || !$emailTemplateId) {
+if (preg_match('/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/', $emailTemplateId) || !$emailTemplateId) {
 
     $func = isset($_REQUEST['func']) ? $_REQUEST['func'] : null;
 
@@ -28,18 +28,18 @@  discard block
 block discarded – undo
 
     include_once 'modules/EmailTemplates/EmailTemplateFormBase.php';
 
-    switch($func) {
+    switch ($func) {
 
         case 'update':
             $bean = BeanFactory::getBean('EmailTemplates', $emailTemplateId);
-            foreach($bean as $key => $value) {
-                if(in_array($key, $fields)) {
+            foreach ($bean as $key => $value) {
+                if (in_array($key, $fields)) {
                     $bean->$key = $_POST[$key];
                 }
             }
             $formBase = new EmailTemplateFormBase();
             $bean = $formBase->handleAttachmentsProcessImages($bean, false, true, 'download', true);
-            if($bean->save()) {
+            if ($bean->save()) {
                 $msgs[] = 'LBL_TEMPLATE_SAVED';
             }
             //$formBase = new EmailTemplateFormBase();
@@ -49,14 +49,14 @@  discard block
 block discarded – undo
             handleAttachmentForRemove();
 
             // update marketing->template_id if we have a selected marketing..
-            if(!empty($_SESSION['campaignWizard'][$_REQUEST['campaignId']]['defaultSelectedMarketingId']) && !empty($_REQUEST['campaignId'])) {
+            if (!empty($_SESSION['campaignWizard'][$_REQUEST['campaignId']]['defaultSelectedMarketingId']) && !empty($_REQUEST['campaignId'])) {
                 $marketingId = $_SESSION['campaignWizard'][$_REQUEST['campaignId']]['defaultSelectedMarketingId'];
 
                 $campaign = BeanFactory::getBean('Campaigns', $_REQUEST['campaignId']);
                 $campaign->load_relationship('emailmarketing');
                 $marketings = $campaign->emailmarketing->get();
                 // just a double check for campaign->marketing relation correct is for e.g the user deleted the marketing record or something may could happened..
-                if(in_array($marketingId, $marketings)) {
+                if (in_array($marketingId, $marketings)) {
                     $marketing = BeanFactory::getBean('EmailMarketing', $marketingId);
                     $marketing->template_id = $emailTemplateId;
                     $marketing->save();
@@ -72,15 +72,15 @@  discard block
 block discarded – undo
             $bean = BeanFactory::getBean('EmailTemplates', $emailTemplateId);
             $newBean = new EmailTemplate();
             $fieldsForCopy = array('type', 'description');
-            foreach($bean as $key => $value) {
-                if(in_array($key, $fields)) {
+            foreach ($bean as $key => $value) {
+                if (in_array($key, $fields)) {
                     $newBean->$key = $_POST[$key];
                 }
-                else if(in_array($key, $fieldsForCopy)) {
+                else if (in_array($key, $fieldsForCopy)) {
                     $newBean->$key = $bean->$key;
                 }
             }
-            if($newBean->save()) {
+            if ($newBean->save()) {
                 $msgs[] = 'LBL_TEMPLATE_SAVED';
             }
             //$formBase = new EmailTemplateFormBase();
@@ -94,13 +94,13 @@  discard block
 block discarded – undo
             $focus = BeanFactory::getBean('EmailTemplates', $_REQUEST['attach_to_template_id']);
             //$data = $formBase->handleAttachments($focus, false, null);
             $data = $formBase->handleAttachmentsProcessImages($focus, false, true, 'download', true);
-            $redirectUrl = 'index.php?module=Campaigns&action=WizardMarketing&campaign_id=' . $_REQUEST['campaign_id'] . "&jump=2&template_id=" . $_REQUEST['attach_to_template_id']; // . '&marketing_id=' . $_REQUEST['attach_to_marketing_id'] . '&record=' . $_REQUEST['attach_to_marketing_id'];
-            header('Location: ' . $redirectUrl);
+            $redirectUrl = 'index.php?module=Campaigns&action=WizardMarketing&campaign_id='.$_REQUEST['campaign_id']."&jump=2&template_id=".$_REQUEST['attach_to_template_id']; // . '&marketing_id=' . $_REQUEST['attach_to_marketing_id'] . '&record=' . $_REQUEST['attach_to_marketing_id'];
+            header('Location: '.$redirectUrl);
             die();
             break;
 
         default: case 'get':
-            if($bean = BeanFactory::getBean('EmailTemplates', $emailTemplateId)) {
+            if ($bean = BeanFactory::getBean('EmailTemplates', $emailTemplateId)) {
                 $fields = array('id', 'name', 'body', 'body_html', 'subject');
                 foreach ($bean as $key => $value) {
                     if (in_array($key, $fields)) {
@@ -110,9 +110,9 @@  discard block
 block discarded – undo
 
                 $data['body_from_html'] = from_html($bean->body_html);
                 $attachmentBeans = $bean->getAttachments();
-                if($attachmentBeans) {
+                if ($attachmentBeans) {
                     $attachments = array();
-                    foreach($attachmentBeans as $attachmentBean) {
+                    foreach ($attachmentBeans as $attachmentBean) {
                         $attachments[] = array(
                             'id' => $attachmentBean->id,
                             'name' => $attachmentBean->name,
@@ -145,8 +145,8 @@  discard block
 block discarded – undo
 );
 
 $results = json_encode($results);
-if(!$results) {
-    if(json_last_error()) {
+if (!$results) {
+    if (json_last_error()) {
         $results = array(
             'error' => 'json_encode error: '.json_last_error_msg()
         );

Please login to merge, or discard this patch.

Braces +7 added lines, -9 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@  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');
+}
 
 function handleAttachmentForRemove() {
     if(!empty($_REQUEST['attachmentsRemove'])) {
@@ -60,8 +62,7 @@  discard block
 block discarded – undo
                     $marketing = BeanFactory::getBean('EmailMarketing', $marketingId);
                     $marketing->template_id = $emailTemplateId;
                     $marketing->save();
-                }
-                else {
+                } else {
                     // TODO something is not OK, the selected campaign isn't related to this marketing!!
                     $GLOBALS['log']->debug('Selected marketing not found!');
                 }
@@ -75,8 +76,7 @@  discard block
 block discarded – undo
             foreach($bean as $key => $value) {
                 if(in_array($key, $fields)) {
                     $newBean->$key = $_POST[$key];
-                }
-                else if(in_array($key, $fieldsForCopy)) {
+                } else if(in_array($key, $fieldsForCopy)) {
                     $newBean->$key = $bean->$key;
                 }
             }
@@ -125,16 +125,14 @@  discard block
 block discarded – undo
                     }
                     $data['attachments'] = $attachments;
                 }
-            }
-            else {
+            } else {
                 $error = 'Email Template not found.';
             }
             break;
     }
 
 
-}
-else {
+} else {
     $error = 'Illegal GUID format.';
 }
 

Please login to merge, or discard this patch.

modules/EmailTemplates/EmailTemplateFormBase.php 2 patches

Indentation +301 added lines, -301 removed lines patch added patch discarded remove patch

@@ -54,24 +54,24 @@  discard block
 block discarded – undo
 
     }
 
-	function getFormBody($prefix, $mod='',$formname='', $size='30') {
+    function getFormBody($prefix, $mod='',$formname='', $size='30') {
 
 
-		global $mod_strings;
+        global $mod_strings;
 
-		$temp_strings = $mod_strings;
+        $temp_strings = $mod_strings;
 
-		if(!empty($mod)) {
-			global $current_language;
-			$mod_strings = return_module_language($current_language, $mod);
-		}
-					global $app_strings;
-					global $app_list_strings;
+        if(!empty($mod)) {
+            global $current_language;
+            $mod_strings = return_module_language($current_language, $mod);
+        }
+                    global $app_strings;
+                    global $app_list_strings;
 
-				$lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL'];
-				$lbl_subject = $mod_strings['LBL_NOTE_SUBJECT'];
-				$lbl_description = $mod_strings['LBL_NOTE'];
-				$default_parent_type= $app_list_strings['record_type_default_key'];
+                $lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL'];
+                $lbl_subject = $mod_strings['LBL_NOTE_SUBJECT'];
+                $lbl_description = $mod_strings['LBL_NOTE'];
+                $default_parent_type= $app_list_strings['record_type_default_key'];
 
 $form = <<<EOF
 				<input type="hidden" name="${prefix}record" value="">
@@ -93,325 +93,325 @@  discard block
 block discarded – undo
 				</table></p>
 EOF;
 
-	$javascript = new javascript();
-	$javascript->setFormName($formname);
-	$javascript->setSugarBean(new EmailTemplate());
-	$javascript->addRequiredFields($prefix);
-	$form .=$javascript->getScript();
-	$mod_strings = $temp_strings;
-	return $form;
-	}
-
-	function getForm($prefix, $mod='') {
-		if(!empty($mod)) {
-		global $current_language;
-		$mod_strings = return_module_language($current_language, $mod);
-	}else global $mod_strings;
-		global $app_strings;
-		global $app_list_strings;
-
-		$lbl_save_button_title = $app_strings['LBL_SAVE_BUTTON_TITLE'];
-		$lbl_save_button_key = $app_strings['LBL_SAVE_BUTTON_KEY'];
-		$lbl_save_button_label = $app_strings['LBL_SAVE_BUTTON_LABEL'];
-
-
-		$the_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
+    $javascript = new javascript();
+    $javascript->setFormName($formname);
+    $javascript->setSugarBean(new EmailTemplate());
+    $javascript->addRequiredFields($prefix);
+    $form .=$javascript->getScript();
+    $mod_strings = $temp_strings;
+    return $form;
+    }
+
+    function getForm($prefix, $mod='') {
+        if(!empty($mod)) {
+        global $current_language;
+        $mod_strings = return_module_language($current_language, $mod);
+    }else global $mod_strings;
+        global $app_strings;
+        global $app_list_strings;
+
+        $lbl_save_button_title = $app_strings['LBL_SAVE_BUTTON_TITLE'];
+        $lbl_save_button_key = $app_strings['LBL_SAVE_BUTTON_KEY'];
+        $lbl_save_button_label = $app_strings['LBL_SAVE_BUTTON_LABEL'];
+
+
+        $the_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
 $the_form .= <<<EOQ
 
 				<form name="${prefix}EmailTemplateSave" onSubmit="return check_form('${prefix}EmailTemplateSave')" method="POST" action="index.php">
 					<input type="hidden" name="${prefix}module" value="EmailTemplates">
 					<input type="hidden" name="${prefix}action" value="Save">
 EOQ;
-		$the_form .= $this->getFormBody($prefix, $mod, "${prefix}EmailTemplateSave", "20");
+        $the_form .= $this->getFormBody($prefix, $mod, "${prefix}EmailTemplateSave", "20");
 $the_form .= <<<EOQ
 				<p><input title="$lbl_save_button_title" accessKey="$lbl_save_button_key" class="button" type="submit" name="button" value="  $lbl_save_button_label  " ></p>
 				</form>
 
 EOQ;
 
-		$the_form .= get_left_form_footer();
-		$the_form .= get_validate_record_js();
-
-
-		return $the_form;
-	}
-
-
-	function handleSave($prefix,$redirect=true, $useRequired=false, $useSiteURL = false, $entryPoint = 'download', $useUploadFolder = false)
-	{
-		require_once('include/formbase.php');
-		require_once('include/upload_file.php');
-		global $upload_maxsize;
-		global $mod_strings;
-		global $sugar_config;
-
-		$focus = new EmailTemplate();
-		if ($useRequired && !checkRequired($prefix, array_keys($focus->required_fields))) {
-			return null;
-		}
-		$focus = populateFromPost($prefix, $focus);
-		//process the text only flag
-		if (isset($_POST['text_only']) && ($_POST['text_only'] == '1')) {
-			$focus->text_only = 1;
-		} else {
-			$focus->text_only = 0;
-		}
-		if (!$focus->ACLAccess('Save')) {
-			ACLController::displayNoAccess(true);
-			sugar_cleanup(true);
-		}
-		if (!isset($_REQUEST['published'])) $focus->published = 'off';
-
-		$this->handleAttachmentsProcessImages($focus, $redirect, $useSiteURL, $entryPoint, $useUploadFolder);
-		return $focus;
-	}
-
-	public function handleAttachmentsProcessImages($focus, $redirect, $useSiteURL = false, $entryPoint = 'download', $useUploadFolder = false) {
-		$return_id = $this->processImages($focus, $useSiteURL, $entryPoint, $useUploadFolder);
-		return $this->handleAttachments($focus, $redirect, $return_id);
-	}
-
-	public function processImages(&$focus, $useSiteURL, $entryPoint, $useUploadFolder) {
-		global $sugar_config;
-		$preProcessedImages = array();
-		$emailTemplateBodyHtml = from_html($focus->body_html);
-		if (strpos($emailTemplateBodyHtml, '"cache/images/')) {
-			$matches = array();
-			preg_match_all('#<img[^>]*[\s]+src[^=]*=[\s]*["\']cache/images/(.+?)["\']#si', $emailTemplateBodyHtml, $matches);
-			foreach ($matches[1] as $match) {
-				$filename = urldecode($match);
-				if ($filename != pathinfo($filename, PATHINFO_BASENAME)) {
-					// don't allow paths there
-					$emailTemplateBodyHtml = str_replace("cache/images/$match", "", $emailTemplateBodyHtml);
-					continue;
-				}
-				$file_location = sugar_cached("images/{$filename}");
-				$mime_type = pathinfo($filename, PATHINFO_EXTENSION);
-
-				if (file_exists($file_location)) {
-					//$id = create_guid();
-
-					$note = new Note();
-					$note->save();
-					$id = $note->id;
-
-					$newFileLocation = "upload://$id";
-					if (!copy($file_location, $newFileLocation)) {
-						$GLOBALS['log']->debug("EMAIL Template could not copy attachment to $newFileLocation");
-					} else {
-						if($useUploadFolder) {
-							$secureLink = ($useSiteURL ? $sugar_config['site_url'] . '/' : '') . "public/{$id}";
-							// create a copy with correct extension by mime type
-							if(!file_exists('public')) {
-								sugar_mkdir('public', 777);
-							}
-							if(copy($file_location, "public/{$id}.{$mime_type}")) {
-								$secureLink .= ".{$mime_type}";
-							}
-						}
-						else {
-							$secureLink = ($useSiteURL ? $sugar_config['site_url'] . '/' : '') . "index.php?entryPoint=" . $entryPoint . "&type=Notes&id={$id}&filename=" . $match;
-						}
-
-						$emailTemplateBodyHtml = str_replace("cache/images/$match", $secureLink, $emailTemplateBodyHtml);
-						//unlink($file_location);
-						$preProcessedImages[$filename] = $id;
-					}
-				} // if
-			} // foreach
-		} // if
-		if (isset($GLOBALS['check_notify'])) {
-			$check_notify = $GLOBALS['check_notify'];
-		} else {
-			$check_notify = FALSE;
-		}
-		if($preProcessedImages) {
-			$focus->body_html = $emailTemplateBodyHtml;
-		}
-		$return_id = $focus->save($check_notify);
-		return $return_id;
-	}
-
-	public function handleAttachments($focus, $redirect, $return_id) {
-		///////////////////////////////////////////////////////////////////////////////
-		////	ATTACHMENT HANDLING
-
-		///////////////////////////////////////////////////////////////////////////
-		////	ADDING NEW ATTACHMENTS
-
-		global $mod_strings;
-
-		$max_files_upload = count($_FILES);
-
-		if(!empty($focus->id)) {
-			$note = new Note();
-			$where = "notes.parent_id='{$focus->id}'";
-			if(!empty($_REQUEST['old_id'])) { // to support duplication of email templates
-				$where .= " OR notes.parent_id='".htmlspecialchars($_REQUEST['old_id'], ENT_QUOTES)."'";
-			}
-			$notes_list = $note->get_full_list("", $where, true);
-		}
-
-		if(!isset($notes_list)) {
-			$notes_list = array();
-		}
-
-		if(!is_array($focus->attachments)) { // PHP5 does not auto-create arrays(). Need to initialize it here.
-			$focus->attachments = array();
-		}
-		$focus->attachments = array_merge($focus->attachments, $notes_list);
-
-
-
-		//for($i = 0; $i < $max_files_upload; $i++) {
-
-		foreach ($_FILES as $key => $file)
-		{
-			$note = new Note();
-
-			//Images are presaved above so we need to prevent duplicate files from being created.
-			if( isset($preProcessedImages[$file['name']]) )
-			{
-			    $oldId = $preProcessedImages[$file['name']];
-			    $note->id = $oldId;
-			    $note->new_with_id = TRUE;
-			    $GLOBALS['log']->debug("Image {$file['name']} has already been processed.");
+        $the_form .= get_left_form_footer();
+        $the_form .= get_validate_record_js();
+
+
+        return $the_form;
+    }
+
+
+    function handleSave($prefix,$redirect=true, $useRequired=false, $useSiteURL = false, $entryPoint = 'download', $useUploadFolder = false)
+    {
+        require_once('include/formbase.php');
+        require_once('include/upload_file.php');
+        global $upload_maxsize;
+        global $mod_strings;
+        global $sugar_config;
+
+        $focus = new EmailTemplate();
+        if ($useRequired && !checkRequired($prefix, array_keys($focus->required_fields))) {
+            return null;
+        }
+        $focus = populateFromPost($prefix, $focus);
+        //process the text only flag
+        if (isset($_POST['text_only']) && ($_POST['text_only'] == '1')) {
+            $focus->text_only = 1;
+        } else {
+            $focus->text_only = 0;
+        }
+        if (!$focus->ACLAccess('Save')) {
+            ACLController::displayNoAccess(true);
+            sugar_cleanup(true);
+        }
+        if (!isset($_REQUEST['published'])) $focus->published = 'off';
+
+        $this->handleAttachmentsProcessImages($focus, $redirect, $useSiteURL, $entryPoint, $useUploadFolder);
+        return $focus;
+    }
+
+    public function handleAttachmentsProcessImages($focus, $redirect, $useSiteURL = false, $entryPoint = 'download', $useUploadFolder = false) {
+        $return_id = $this->processImages($focus, $useSiteURL, $entryPoint, $useUploadFolder);
+        return $this->handleAttachments($focus, $redirect, $return_id);
+    }
+
+    public function processImages(&$focus, $useSiteURL, $entryPoint, $useUploadFolder) {
+        global $sugar_config;
+        $preProcessedImages = array();
+        $emailTemplateBodyHtml = from_html($focus->body_html);
+        if (strpos($emailTemplateBodyHtml, '"cache/images/')) {
+            $matches = array();
+            preg_match_all('#<img[^>]*[\s]+src[^=]*=[\s]*["\']cache/images/(.+?)["\']#si', $emailTemplateBodyHtml, $matches);
+            foreach ($matches[1] as $match) {
+                $filename = urldecode($match);
+                if ($filename != pathinfo($filename, PATHINFO_BASENAME)) {
+                    // don't allow paths there
+                    $emailTemplateBodyHtml = str_replace("cache/images/$match", "", $emailTemplateBodyHtml);
+                    continue;
+                }
+                $file_location = sugar_cached("images/{$filename}");
+                $mime_type = pathinfo($filename, PATHINFO_EXTENSION);
+
+                if (file_exists($file_location)) {
+                    //$id = create_guid();
+
+                    $note = new Note();
+                    $note->save();
+                    $id = $note->id;
+
+                    $newFileLocation = "upload://$id";
+                    if (!copy($file_location, $newFileLocation)) {
+                        $GLOBALS['log']->debug("EMAIL Template could not copy attachment to $newFileLocation");
+                    } else {
+                        if($useUploadFolder) {
+                            $secureLink = ($useSiteURL ? $sugar_config['site_url'] . '/' : '') . "public/{$id}";
+                            // create a copy with correct extension by mime type
+                            if(!file_exists('public')) {
+                                sugar_mkdir('public', 777);
+                            }
+                            if(copy($file_location, "public/{$id}.{$mime_type}")) {
+                                $secureLink .= ".{$mime_type}";
+                            }
+                        }
+                        else {
+                            $secureLink = ($useSiteURL ? $sugar_config['site_url'] . '/' : '') . "index.php?entryPoint=" . $entryPoint . "&type=Notes&id={$id}&filename=" . $match;
+                        }
+
+                        $emailTemplateBodyHtml = str_replace("cache/images/$match", $secureLink, $emailTemplateBodyHtml);
+                        //unlink($file_location);
+                        $preProcessedImages[$filename] = $id;
+                    }
+                } // if
+            } // foreach
+        } // if
+        if (isset($GLOBALS['check_notify'])) {
+            $check_notify = $GLOBALS['check_notify'];
+        } else {
+            $check_notify = FALSE;
+        }
+        if($preProcessedImages) {
+            $focus->body_html = $emailTemplateBodyHtml;
+        }
+        $return_id = $focus->save($check_notify);
+        return $return_id;
+    }
+
+    public function handleAttachments($focus, $redirect, $return_id) {
+        ///////////////////////////////////////////////////////////////////////////////
+        ////	ATTACHMENT HANDLING
+
+        ///////////////////////////////////////////////////////////////////////////
+        ////	ADDING NEW ATTACHMENTS
+
+        global $mod_strings;
+
+        $max_files_upload = count($_FILES);
+
+        if(!empty($focus->id)) {
+            $note = new Note();
+            $where = "notes.parent_id='{$focus->id}'";
+            if(!empty($_REQUEST['old_id'])) { // to support duplication of email templates
+                $where .= " OR notes.parent_id='".htmlspecialchars($_REQUEST['old_id'], ENT_QUOTES)."'";
             }
+            $notes_list = $note->get_full_list("", $where, true);
+        }
+
+        if(!isset($notes_list)) {
+            $notes_list = array();
+        }
+
+        if(!is_array($focus->attachments)) { // PHP5 does not auto-create arrays(). Need to initialize it here.
+            $focus->attachments = array();
+        }
+        $focus->attachments = array_merge($focus->attachments, $notes_list);
+
+
+
+        //for($i = 0; $i < $max_files_upload; $i++) {
+
+        foreach ($_FILES as $key => $file)
+        {
+            $note = new Note();
 
-			$i=preg_replace("/email_attachment(.+)/",'$1',$key);
-			$upload_file = new UploadFile($key);
-
-			if(isset($_FILES[$key]) && $upload_file->confirm_upload() && preg_match("/^email_attachment/",$key)) {
-				$note->filename = $upload_file->get_stored_file_name();
-				$note->file = $upload_file;
-				$note->name = $mod_strings['LBL_EMAIL_ATTACHMENT'].': '.$note->file->original_file_name;
-				if(isset($_REQUEST['embedded'.$i]) && !empty($_REQUEST['embedded'.$i])){
-                  if($_REQUEST['embedded'.$i]=='true'){
-				  	$note->embed_flag =true;
-                  }
-                  else{
-                  	$note->embed_flag =false;
-                  }
-				}
-				array_push($focus->attachments, $note);
-			}
-
-		}
-
-		$focus->saved_attachments = array();
-		foreach($focus->attachments as $note)
-		{
-			if( !empty($note->id) && $note->new_with_id === FALSE)
-			{
-				if(empty($_REQUEST['old_id']))
-					array_push($focus->saved_attachments, $note); // to support duplication of email templates
-				else
-				{
-					// we're duplicating a template with attachments
-					// dupe the file, create a new note, assign the note to the new template
-					$newNote = new Note();
-					$newNote->retrieve($note->id);
-					$newNote->id = create_guid();
-					$newNote->parent_id = $focus->id;
-					$newNote->new_with_id = true;
-					$newNote->date_modified = '';
-					$newNote->date_entered = '';
-					/* BEGIN - SECURITY GROUPS */
-					//Need to do this so that attachments show under an EmailTemplate correctly for a normal user
-					global $current_user;
-					$newNote->assigned_user_id = $current_user->id;
-					/* END - SECURITY GROUPS */
-					$newNoteId = $newNote->save();
-
-					UploadFile::duplicate_file($note->id, $newNoteId, $note->filename);
-				}
-				continue;
-			}
-			$note->parent_id = $focus->id;
-			$note->parent_type = 'Emails';
-			$note->file_mime_type = $note->file->mime_type;
-			/* BEGIN - SECURITY GROUPS */
-			//Need to do this so that attachments show under an EmailTemplate correctly for a normal user
-			global $current_user;
-			$note->assigned_user_id = $current_user->id;
-			/* END - SECURITY GROUPS */
-			$note_id = $note->save();
-			array_push($focus->saved_attachments, $note);
-			$note->id = $note_id;
-
-			if($note->new_with_id === FALSE)
-    			$note->file->final_move($note->id);
-    	    else
-    	       $GLOBALS['log']->debug("Not performing final move for note id {$note->id} as it has already been processed");
-		}
-
-		////	END NEW ATTACHMENTS
-		///////////////////////////////////////////////////////////////////////////
-
-	///////////////////////////////////////////////////////////////////////////
-	////	ATTACHMENTS FROM DOCUMENTS
-	$count='';
-	//_pp($_REQUEST);
-	//_ppd(count($_REQUEST['document']));
-	if(!empty($_REQUEST['document'])){
-      $count = count($_REQUEST['document']);
+            //Images are presaved above so we need to prevent duplicate files from being created.
+            if( isset($preProcessedImages[$file['name']]) )
+            {
+                $oldId = $preProcessedImages[$file['name']];
+                $note->id = $oldId;
+                $note->new_with_id = TRUE;
+                $GLOBALS['log']->debug("Image {$file['name']} has already been processed.");
+            }
+
+            $i=preg_replace("/email_attachment(.+)/",'$1',$key);
+            $upload_file = new UploadFile($key);
+
+            if(isset($_FILES[$key]) && $upload_file->confirm_upload() && preg_match("/^email_attachment/",$key)) {
+                $note->filename = $upload_file->get_stored_file_name();
+                $note->file = $upload_file;
+                $note->name = $mod_strings['LBL_EMAIL_ATTACHMENT'].': '.$note->file->original_file_name;
+                if(isset($_REQUEST['embedded'.$i]) && !empty($_REQUEST['embedded'.$i])){
+                    if($_REQUEST['embedded'.$i]=='true'){
+                        $note->embed_flag =true;
+                    }
+                    else{
+                        $note->embed_flag =false;
+                    }
+                }
+                array_push($focus->attachments, $note);
+            }
+
+        }
+
+        $focus->saved_attachments = array();
+        foreach($focus->attachments as $note)
+        {
+            if( !empty($note->id) && $note->new_with_id === FALSE)
+            {
+                if(empty($_REQUEST['old_id']))
+                    array_push($focus->saved_attachments, $note); // to support duplication of email templates
+                else
+                {
+                    // we're duplicating a template with attachments
+                    // dupe the file, create a new note, assign the note to the new template
+                    $newNote = new Note();
+                    $newNote->retrieve($note->id);
+                    $newNote->id = create_guid();
+                    $newNote->parent_id = $focus->id;
+                    $newNote->new_with_id = true;
+                    $newNote->date_modified = '';
+                    $newNote->date_entered = '';
+                    /* BEGIN - SECURITY GROUPS */
+                    //Need to do this so that attachments show under an EmailTemplate correctly for a normal user
+                    global $current_user;
+                    $newNote->assigned_user_id = $current_user->id;
+                    /* END - SECURITY GROUPS */
+                    $newNoteId = $newNote->save();
+
+                    UploadFile::duplicate_file($note->id, $newNoteId, $note->filename);
+                }
+                continue;
+            }
+            $note->parent_id = $focus->id;
+            $note->parent_type = 'Emails';
+            $note->file_mime_type = $note->file->mime_type;
+            /* BEGIN - SECURITY GROUPS */
+            //Need to do this so that attachments show under an EmailTemplate correctly for a normal user
+            global $current_user;
+            $note->assigned_user_id = $current_user->id;
+            /* END - SECURITY GROUPS */
+            $note_id = $note->save();
+            array_push($focus->saved_attachments, $note);
+            $note->id = $note_id;
+
+            if($note->new_with_id === FALSE)
+                $note->file->final_move($note->id);
+            else
+                $GLOBALS['log']->debug("Not performing final move for note id {$note->id} as it has already been processed");
+        }
+
+        ////	END NEW ATTACHMENTS
+        ///////////////////////////////////////////////////////////////////////////
+
+    ///////////////////////////////////////////////////////////////////////////
+    ////	ATTACHMENTS FROM DOCUMENTS
+    $count='';
+    //_pp($_REQUEST);
+    //_ppd(count($_REQUEST['document']));
+    if(!empty($_REQUEST['document'])){
+        $count = count($_REQUEST['document']);
     }
     else{
-    	$count=10;
+        $count=10;
     }
 
-	for($i=0; $i<$count; $i++) {
-		if(isset($_REQUEST['documentId'.$i]) && !empty($_REQUEST['documentId'.$i])) {
-			$doc = new Document();
-			$docRev = new DocumentRevision();
-			$docNote = new Note();
+    for($i=0; $i<$count; $i++) {
+        if(isset($_REQUEST['documentId'.$i]) && !empty($_REQUEST['documentId'.$i])) {
+            $doc = new Document();
+            $docRev = new DocumentRevision();
+            $docNote = new Note();
 
-			$doc->retrieve($_REQUEST['documentId'.$i]);
-			$docRev->retrieve($doc->document_revision_id);
+            $doc->retrieve($_REQUEST['documentId'.$i]);
+            $docRev->retrieve($doc->document_revision_id);
 
-			array_push($focus->saved_attachments, $docRev);
+            array_push($focus->saved_attachments, $docRev);
 
-			$docNote->name = $doc->document_name;
-			$docNote->filename = $docRev->filename;
-			$docNote->description = $doc->description;
-			$docNote->parent_id = $focus->id;
-			$docNote->parent_type = 'Emails';
-			$docNote->file_mime_type = $docRev->file_mime_type;
-			$docId = $docNote = $docNote->save();
+            $docNote->name = $doc->document_name;
+            $docNote->filename = $docRev->filename;
+            $docNote->description = $doc->description;
+            $docNote->parent_id = $focus->id;
+            $docNote->parent_type = 'Emails';
+            $docNote->file_mime_type = $docRev->file_mime_type;
+            $docId = $docNote = $docNote->save();
 
-			UploadFile::duplicate_file($docRev->id, $docId, $docRev->filename);
-		}
+            UploadFile::duplicate_file($docRev->id, $docId, $docRev->filename);
+        }
 
-	}
+    }
 
-	////	END ATTACHMENTS FROM DOCUMENTS
-	///////////////////////////////////////////////////////////////////////////
+    ////	END ATTACHMENTS FROM DOCUMENTS
+    ///////////////////////////////////////////////////////////////////////////
 
-		///////////////////////////////////////////////////////////////////////////
-		////	REMOVE ATTACHMENTS
+        ///////////////////////////////////////////////////////////////////////////
+        ////	REMOVE ATTACHMENTS
 
-		if(isset($_REQUEST['remove_attachment']) && !empty($_REQUEST['remove_attachment'])) {
-			foreach($_REQUEST['remove_attachment'] as $noteId) {
-				$q = 'UPDATE notes SET deleted = 1 WHERE id = \''.$noteId.'\'';
-				$focus->db->query($q);
-			}
+        if(isset($_REQUEST['remove_attachment']) && !empty($_REQUEST['remove_attachment'])) {
+            foreach($_REQUEST['remove_attachment'] as $noteId) {
+                $q = 'UPDATE notes SET deleted = 1 WHERE id = \''.$noteId.'\'';
+                $focus->db->query($q);
+            }
 
-		}
+        }
 
-		////	END REMOVE ATTACHMENTS
-		///////////////////////////////////////////////////////////////////////////
-	////	END ATTACHMENT HANDLING
-	///////////////////////////////////////////////////////////////////////////////
+        ////	END REMOVE ATTACHMENTS
+        ///////////////////////////////////////////////////////////////////////////
+    ////	END ATTACHMENT HANDLING
+    ///////////////////////////////////////////////////////////////////////////////
 
         clear_register_value('select_array', $focus->object_name);
 
-		if($redirect) {
-		$GLOBALS['log']->debug("Saved record with id of ".$return_id);
-			handleRedirect($return_id, "EmailTemplates");
-		}else{
-			return $focus;
-		}
-	}
+        if($redirect) {
+        $GLOBALS['log']->debug("Saved record with id of ".$return_id);
+            handleRedirect($return_id, "EmailTemplates");
+        }else{
+            return $focus;
+        }
+    }
 
 }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +41 added lines, -41 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.
@@ -54,14 +54,14 @@  discard block
 block discarded – undo
 
     }
 
-	function getFormBody($prefix, $mod='',$formname='', $size='30') {
+	function getFormBody($prefix, $mod = '', $formname = '', $size = '30') {
 
 
 		global $mod_strings;
 
 		$temp_strings = $mod_strings;
 
-		if(!empty($mod)) {
+		if (!empty($mod)) {
 			global $current_language;
 			$mod_strings = return_module_language($current_language, $mod);
 		}
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
 				$lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL'];
 				$lbl_subject = $mod_strings['LBL_NOTE_SUBJECT'];
 				$lbl_description = $mod_strings['LBL_NOTE'];
-				$default_parent_type= $app_list_strings['record_type_default_key'];
+				$default_parent_type = $app_list_strings['record_type_default_key'];
 
 $form = <<<EOF
 				<input type="hidden" name="${prefix}record" value="">
@@ -97,16 +97,16 @@  discard block
 block discarded – undo
 	$javascript->setFormName($formname);
 	$javascript->setSugarBean(new EmailTemplate());
 	$javascript->addRequiredFields($prefix);
-	$form .=$javascript->getScript();
+	$form .= $javascript->getScript();
 	$mod_strings = $temp_strings;
 	return $form;
 	}
 
-	function getForm($prefix, $mod='') {
-		if(!empty($mod)) {
+	function getForm($prefix, $mod = '') {
+		if (!empty($mod)) {
 		global $current_language;
 		$mod_strings = return_module_language($current_language, $mod);
-	}else global $mod_strings;
+	} else global $mod_strings;
 		global $app_strings;
 		global $app_list_strings;
 
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
 	}
 
 
-	function handleSave($prefix,$redirect=true, $useRequired=false, $useSiteURL = false, $entryPoint = 'download', $useUploadFolder = false)
+	function handleSave($prefix, $redirect = true, $useRequired = false, $useSiteURL = false, $entryPoint = 'download', $useUploadFolder = false)
 	{
 		require_once('include/formbase.php');
 		require_once('include/upload_file.php');
@@ -199,18 +199,18 @@  discard block
 block discarded – undo
 					if (!copy($file_location, $newFileLocation)) {
 						$GLOBALS['log']->debug("EMAIL Template could not copy attachment to $newFileLocation");
 					} else {
-						if($useUploadFolder) {
-							$secureLink = ($useSiteURL ? $sugar_config['site_url'] . '/' : '') . "public/{$id}";
+						if ($useUploadFolder) {
+							$secureLink = ($useSiteURL ? $sugar_config['site_url'].'/' : '')."public/{$id}";
 							// create a copy with correct extension by mime type
-							if(!file_exists('public')) {
+							if (!file_exists('public')) {
 								sugar_mkdir('public', 777);
 							}
-							if(copy($file_location, "public/{$id}.{$mime_type}")) {
+							if (copy($file_location, "public/{$id}.{$mime_type}")) {
 								$secureLink .= ".{$mime_type}";
 							}
 						}
 						else {
-							$secureLink = ($useSiteURL ? $sugar_config['site_url'] . '/' : '') . "index.php?entryPoint=" . $entryPoint . "&type=Notes&id={$id}&filename=" . $match;
+							$secureLink = ($useSiteURL ? $sugar_config['site_url'].'/' : '')."index.php?entryPoint=".$entryPoint."&type=Notes&id={$id}&filename=".$match;
 						}
 
 						$emailTemplateBodyHtml = str_replace("cache/images/$match", $secureLink, $emailTemplateBodyHtml);
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
 		} else {
 			$check_notify = FALSE;
 		}
-		if($preProcessedImages) {
+		if ($preProcessedImages) {
 			$focus->body_html = $emailTemplateBodyHtml;
 		}
 		$return_id = $focus->save($check_notify);
@@ -243,20 +243,20 @@  discard block
 block discarded – undo
 
 		$max_files_upload = count($_FILES);
 
-		if(!empty($focus->id)) {
+		if (!empty($focus->id)) {
 			$note = new Note();
 			$where = "notes.parent_id='{$focus->id}'";
-			if(!empty($_REQUEST['old_id'])) { // to support duplication of email templates
+			if (!empty($_REQUEST['old_id'])) { // to support duplication of email templates
 				$where .= " OR notes.parent_id='".htmlspecialchars($_REQUEST['old_id'], ENT_QUOTES)."'";
 			}
 			$notes_list = $note->get_full_list("", $where, true);
 		}
 
-		if(!isset($notes_list)) {
+		if (!isset($notes_list)) {
 			$notes_list = array();
 		}
 
-		if(!is_array($focus->attachments)) { // PHP5 does not auto-create arrays(). Need to initialize it here.
+		if (!is_array($focus->attachments)) { // PHP5 does not auto-create arrays(). Need to initialize it here.
 			$focus->attachments = array();
 		}
 		$focus->attachments = array_merge($focus->attachments, $notes_list);
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
 			$note = new Note();
 
 			//Images are presaved above so we need to prevent duplicate files from being created.
-			if( isset($preProcessedImages[$file['name']]) )
+			if (isset($preProcessedImages[$file['name']]))
 			{
 			    $oldId = $preProcessedImages[$file['name']];
 			    $note->id = $oldId;
@@ -278,19 +278,19 @@  discard block
 block discarded – undo
 			    $GLOBALS['log']->debug("Image {$file['name']} has already been processed.");
             }
 
-			$i=preg_replace("/email_attachment(.+)/",'$1',$key);
+			$i = preg_replace("/email_attachment(.+)/", '$1', $key);
 			$upload_file = new UploadFile($key);
 
-			if(isset($_FILES[$key]) && $upload_file->confirm_upload() && preg_match("/^email_attachment/",$key)) {
+			if (isset($_FILES[$key]) && $upload_file->confirm_upload() && preg_match("/^email_attachment/", $key)) {
 				$note->filename = $upload_file->get_stored_file_name();
 				$note->file = $upload_file;
 				$note->name = $mod_strings['LBL_EMAIL_ATTACHMENT'].': '.$note->file->original_file_name;
-				if(isset($_REQUEST['embedded'.$i]) && !empty($_REQUEST['embedded'.$i])){
-                  if($_REQUEST['embedded'.$i]=='true'){
-				  	$note->embed_flag =true;
+				if (isset($_REQUEST['embedded'.$i]) && !empty($_REQUEST['embedded'.$i])) {
+                  if ($_REQUEST['embedded'.$i] == 'true') {
+				  	$note->embed_flag = true;
                   }
-                  else{
-                  	$note->embed_flag =false;
+                  else {
+                  	$note->embed_flag = false;
                   }
 				}
 				array_push($focus->attachments, $note);
@@ -299,11 +299,11 @@  discard block
 block discarded – undo
 		}
 
 		$focus->saved_attachments = array();
-		foreach($focus->attachments as $note)
+		foreach ($focus->attachments as $note)
 		{
-			if( !empty($note->id) && $note->new_with_id === FALSE)
+			if (!empty($note->id) && $note->new_with_id === FALSE)
 			{
-				if(empty($_REQUEST['old_id']))
+				if (empty($_REQUEST['old_id']))
 					array_push($focus->saved_attachments, $note); // to support duplication of email templates
 				else
 				{
@@ -339,7 +339,7 @@  discard block
 block discarded – undo
 			array_push($focus->saved_attachments, $note);
 			$note->id = $note_id;
 
-			if($note->new_with_id === FALSE)
+			if ($note->new_with_id === FALSE)
     			$note->file->final_move($note->id);
     	    else
     	       $GLOBALS['log']->debug("Not performing final move for note id {$note->id} as it has already been processed");
@@ -350,18 +350,18 @@  discard block
 block discarded – undo
 
 	///////////////////////////////////////////////////////////////////////////
 	////	ATTACHMENTS FROM DOCUMENTS
-	$count='';
+	$count = '';
 	//_pp($_REQUEST);
 	//_ppd(count($_REQUEST['document']));
-	if(!empty($_REQUEST['document'])){
+	if (!empty($_REQUEST['document'])) {
       $count = count($_REQUEST['document']);
     }
-    else{
-    	$count=10;
+    else {
+    	$count = 10;
     }
 
-	for($i=0; $i<$count; $i++) {
-		if(isset($_REQUEST['documentId'.$i]) && !empty($_REQUEST['documentId'.$i])) {
+	for ($i = 0; $i < $count; $i++) {
+		if (isset($_REQUEST['documentId'.$i]) && !empty($_REQUEST['documentId'.$i])) {
 			$doc = new Document();
 			$docRev = new DocumentRevision();
 			$docNote = new Note();
@@ -390,8 +390,8 @@  discard block
 block discarded – undo
 		///////////////////////////////////////////////////////////////////////////
 		////	REMOVE ATTACHMENTS
 
-		if(isset($_REQUEST['remove_attachment']) && !empty($_REQUEST['remove_attachment'])) {
-			foreach($_REQUEST['remove_attachment'] as $noteId) {
+		if (isset($_REQUEST['remove_attachment']) && !empty($_REQUEST['remove_attachment'])) {
+			foreach ($_REQUEST['remove_attachment'] as $noteId) {
 				$q = 'UPDATE notes SET deleted = 1 WHERE id = \''.$noteId.'\'';
 				$focus->db->query($q);
 			}
@@ -405,10 +405,10 @@  discard block
 block discarded – undo
 
         clear_register_value('select_array', $focus->object_name);
 
-		if($redirect) {
+		if ($redirect) {
 		$GLOBALS['log']->debug("Saved record with id of ".$return_id);
 			handleRedirect($return_id, "EmailTemplates");
-		}else{
+		} else {
 			return $focus;
 		}
 	}

Please login to merge, or discard this patch.

modules/Contacts/metadata/SearchFields.php 2 patches

Indentation +33 added lines, -33 removed lines patch added patch discarded remove patch

@@ -40,47 +40,47 @@
 block discarded – undo
 global $current_user;
 $module_name = "Contacts";
 $searchFields['Contacts'] = 
-	array (
-		'first_name' => array( 'query_type'=>'default'),
-		'last_name'=> array('query_type'=>'default'),
-		'search_name'=> array('query_type'=>'default','db_field'=>array('first_name','last_name'),'force_unifiedsearch'=>true),
-		'account_name'=> array('query_type'=>'default','db_field'=>array('accounts.name')),
-		'lead_source'=> array('query_type'=>'default','operator'=>'=', 'options' => 'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
-		'do_not_call'=> array('query_type'=>'default', 'input_type' => 'checkbox', 'operator'=>'='),
-		'phone'=> array('query_type'=>'default','db_field'=>array('phone_mobile','phone_work','phone_other','phone_fax','assistant_phone')),
-		'email'=> array(
-			'query_type' => 'default',
-			'operator' => 'subquery',
-			'subquery' => 'SELECT eabr.bean_id FROM email_addr_bean_rel eabr JOIN email_addresses ea ON (ea.id = eabr.email_address_id) WHERE eabr.deleted=0 AND ea.email_address LIKE',
-			'db_field' => array(
-				'id',
-			),
-		),	
+    array (
+        'first_name' => array( 'query_type'=>'default'),
+        'last_name'=> array('query_type'=>'default'),
+        'search_name'=> array('query_type'=>'default','db_field'=>array('first_name','last_name'),'force_unifiedsearch'=>true),
+        'account_name'=> array('query_type'=>'default','db_field'=>array('accounts.name')),
+        'lead_source'=> array('query_type'=>'default','operator'=>'=', 'options' => 'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
+        'do_not_call'=> array('query_type'=>'default', 'input_type' => 'checkbox', 'operator'=>'='),
+        'phone'=> array('query_type'=>'default','db_field'=>array('phone_mobile','phone_work','phone_other','phone_fax','assistant_phone')),
+        'email'=> array(
+            'query_type' => 'default',
+            'operator' => 'subquery',
+            'subquery' => 'SELECT eabr.bean_id FROM email_addr_bean_rel eabr JOIN email_addresses ea ON (ea.id = eabr.email_address_id) WHERE eabr.deleted=0 AND ea.email_address LIKE',
+            'db_field' => array(
+                'id',
+            ),
+        ),	
         'favorites_only' => array(
             'query_type'=>'format',
             'operator' => 'subquery',
-			'subquery' => "SELECT favorites.parent_id FROM favorites
+            'subquery' => "SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = '".$module_name."'
 			                        and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
             'db_field'=>array('id')),
-		'assistant'=> array('query_type'=>'default'),
-		'address_street'=> array('query_type'=>'default','db_field'=>array('primary_address_street','alt_address_street')),
-		'address_city'=> array('query_type'=>'default','db_field'=>array('primary_address_city','alt_address_city')),
-		'address_state'=> array('query_type'=>'default','db_field'=>array('primary_address_state','alt_address_state')),
-		'address_postalcode'=> array('query_type'=>'default','db_field'=>array('primary_address_postalcode','alt_address_postalcode')),
-		'address_country'=> array('query_type'=>'default','db_field'=>array('primary_address_country','alt_address_country')),
-		'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
-		'assigned_user_id'=> array('query_type'=>'default'),
+        'assistant'=> array('query_type'=>'default'),
+        'address_street'=> array('query_type'=>'default','db_field'=>array('primary_address_street','alt_address_street')),
+        'address_city'=> array('query_type'=>'default','db_field'=>array('primary_address_city','alt_address_city')),
+        'address_state'=> array('query_type'=>'default','db_field'=>array('primary_address_state','alt_address_state')),
+        'address_postalcode'=> array('query_type'=>'default','db_field'=>array('primary_address_postalcode','alt_address_postalcode')),
+        'address_country'=> array('query_type'=>'default','db_field'=>array('primary_address_country','alt_address_country')),
+        'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
+        'assigned_user_id'=> array('query_type'=>'default'),
         'account_id'=> array('query_type'=>'default','db_field'=>array('accounts.id')),
         'campaign_name'=> array('query_type'=>'default'),
-		//Range Search Support 
-	    'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        //Range Search Support 
+        'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
         'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
-	    //Range Search Support 			
-	);
+        //Range Search Support 			
+    );
 ?>

Please login to merge, or discard this patch.

Spacing +21 added lines, -21 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.
@@ -40,14 +40,14 @@  discard block
 block discarded – undo
 global $current_user;
 $module_name = "Contacts";
 $searchFields['Contacts'] = 
-	array (
-		'first_name' => array( 'query_type'=>'default'),
+	array(
+		'first_name' => array('query_type'=>'default'),
 		'last_name'=> array('query_type'=>'default'),
-		'search_name'=> array('query_type'=>'default','db_field'=>array('first_name','last_name'),'force_unifiedsearch'=>true),
-		'account_name'=> array('query_type'=>'default','db_field'=>array('accounts.name')),
-		'lead_source'=> array('query_type'=>'default','operator'=>'=', 'options' => 'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
+		'search_name'=> array('query_type'=>'default', 'db_field'=>array('first_name', 'last_name'), 'force_unifiedsearch'=>true),
+		'account_name'=> array('query_type'=>'default', 'db_field'=>array('accounts.name')),
+		'lead_source'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
 		'do_not_call'=> array('query_type'=>'default', 'input_type' => 'checkbox', 'operator'=>'='),
-		'phone'=> array('query_type'=>'default','db_field'=>array('phone_mobile','phone_work','phone_other','phone_fax','assistant_phone')),
+		'phone'=> array('query_type'=>'default', 'db_field'=>array('phone_mobile', 'phone_work', 'phone_other', 'phone_fax', 'assistant_phone')),
 		'email'=> array(
 			'query_type' => 'default',
 			'operator' => 'subquery',
@@ -62,25 +62,25 @@  discard block
 block discarded – undo
 			'subquery' => "SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = '".$module_name."'
-			                        and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
+			                        and favorites.assigned_user_id = '" .$current_user->id."') OR NOT ({0}",
             'db_field'=>array('id')),
 		'assistant'=> array('query_type'=>'default'),
-		'address_street'=> array('query_type'=>'default','db_field'=>array('primary_address_street','alt_address_street')),
-		'address_city'=> array('query_type'=>'default','db_field'=>array('primary_address_city','alt_address_city')),
-		'address_state'=> array('query_type'=>'default','db_field'=>array('primary_address_state','alt_address_state')),
-		'address_postalcode'=> array('query_type'=>'default','db_field'=>array('primary_address_postalcode','alt_address_postalcode')),
-		'address_country'=> array('query_type'=>'default','db_field'=>array('primary_address_country','alt_address_country')),
-		'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
+		'address_street'=> array('query_type'=>'default', 'db_field'=>array('primary_address_street', 'alt_address_street')),
+		'address_city'=> array('query_type'=>'default', 'db_field'=>array('primary_address_city', 'alt_address_city')),
+		'address_state'=> array('query_type'=>'default', 'db_field'=>array('primary_address_state', 'alt_address_state')),
+		'address_postalcode'=> array('query_type'=>'default', 'db_field'=>array('primary_address_postalcode', 'alt_address_postalcode')),
+		'address_country'=> array('query_type'=>'default', 'db_field'=>array('primary_address_country', 'alt_address_country')),
+		'current_user_only'=> array('query_type'=>'default', 'db_field'=>array('assigned_user_id'), 'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
 		'assigned_user_id'=> array('query_type'=>'default'),
-        'account_id'=> array('query_type'=>'default','db_field'=>array('accounts.id')),
+        'account_id'=> array('query_type'=>'default', 'db_field'=>array('accounts.id')),
         'campaign_name'=> array('query_type'=>'default'),
 		//Range Search Support 
-	    'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-        'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+	    'range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	    'start_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	    'end_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	    'range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	    'start_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 	    //Range Search Support 			
 	);
 ?>

Please login to merge, or discard this patch.

modules/Opportunities/metadata/SearchFields.php 2 patches

Indentation +34 added lines, -34 removed lines patch added patch discarded remove patch

@@ -40,48 +40,48 @@
 block discarded – undo
 global $current_user;
 $module_name = "Opportunities";
 $searchFields['Opportunities'] = 
-	array (
-		'name' => array( 'query_type'=>'default'),
-		'account_name'=> array('query_type'=>'default','db_field'=>array('accounts.name')),
-		'amount'=> array('query_type'=>'default'),
-		'next_step'=> array('query_type'=>'default'),
-		'probability'=> array('query_type'=>'default'),
-		'lead_source'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
-		'opportunity_type'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'opportunity_type_dom', 'template_var' => 'TYPE_OPTIONS'),
-		'sales_stage'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'sales_stage_dom', 'template_var' => 'SALES_STAGE_OPTIONS', 'options_add_blank' => true),
-		'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
-		'assigned_user_id'=> array('query_type'=>'default'),
-		'open_only' => array(
-			'query_type'=>'default',
-			'db_field'=>array('sales_stage'),
-			'operator'=>'not in',
-			'closed_values' => array('Closed Won', 'Closed Lost'),
-			'type'=>'bool',
-		),
+    array (
+        'name' => array( 'query_type'=>'default'),
+        'account_name'=> array('query_type'=>'default','db_field'=>array('accounts.name')),
+        'amount'=> array('query_type'=>'default'),
+        'next_step'=> array('query_type'=>'default'),
+        'probability'=> array('query_type'=>'default'),
+        'lead_source'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
+        'opportunity_type'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'opportunity_type_dom', 'template_var' => 'TYPE_OPTIONS'),
+        'sales_stage'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'sales_stage_dom', 'template_var' => 'SALES_STAGE_OPTIONS', 'options_add_blank' => true),
+        'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
+        'assigned_user_id'=> array('query_type'=>'default'),
+        'open_only' => array(
+            'query_type'=>'default',
+            'db_field'=>array('sales_stage'),
+            'operator'=>'not in',
+            'closed_values' => array('Closed Won', 'Closed Lost'),
+            'type'=>'bool',
+        ),
         'favorites_only' => array(
             'query_type'=>'format',
             'operator' => 'subquery',
-			'subquery' => "SELECT favorites.parent_id FROM favorites
+            'subquery' => "SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = '".$module_name."'
 			                        and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
             'db_field'=>array('id')),
 
-		//Range Search Support 
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+        //Range Search Support 
+        'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 	   
-       'range_date_closed' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_closed' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_closed' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+        'range_date_closed' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_closed' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_closed' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 
-       'range_amount' => array ('query_type' => 'default', 'enable_range_search' => true),
-	   'start_range_amount' => array ('query_type' => 'default',  'enable_range_search' => true),
-       'end_range_amount' => array ('query_type' => 'default', 'enable_range_search' => true),
-		//Range Search Support 			
-	);
+        'range_amount' => array ('query_type' => 'default', 'enable_range_search' => true),
+        'start_range_amount' => array ('query_type' => 'default',  'enable_range_search' => true),
+        'end_range_amount' => array ('query_type' => 'default', 'enable_range_search' => true),
+        //Range Search Support 			
+    );
 ?>

Please login to merge, or discard this patch.

Spacing +18 added lines, -18 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.
@@ -40,16 +40,16 @@  discard block
 block discarded – undo
 global $current_user;
 $module_name = "Opportunities";
 $searchFields['Opportunities'] = 
-	array (
-		'name' => array( 'query_type'=>'default'),
-		'account_name'=> array('query_type'=>'default','db_field'=>array('accounts.name')),
+	array(
+		'name' => array('query_type'=>'default'),
+		'account_name'=> array('query_type'=>'default', 'db_field'=>array('accounts.name')),
 		'amount'=> array('query_type'=>'default'),
 		'next_step'=> array('query_type'=>'default'),
 		'probability'=> array('query_type'=>'default'),
 		'lead_source'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
 		'opportunity_type'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'opportunity_type_dom', 'template_var' => 'TYPE_OPTIONS'),
 		'sales_stage'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'sales_stage_dom', 'template_var' => 'SALES_STAGE_OPTIONS', 'options_add_blank' => true),
-		'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
+		'current_user_only'=> array('query_type'=>'default', 'db_field'=>array('assigned_user_id'), 'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
 		'assigned_user_id'=> array('query_type'=>'default'),
 		'open_only' => array(
 			'query_type'=>'default',
@@ -64,24 +64,24 @@  discard block
 block discarded – undo
 			'subquery' => "SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = '".$module_name."'
-			                        and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
+			                        and favorites.assigned_user_id = '" .$current_user->id."') OR NOT ({0}",
             'db_field'=>array('id')),
 
 		//Range Search Support 
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+	   'range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'end_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+       'end_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 	   
-       'range_date_closed' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_closed' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_closed' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+       'range_date_closed' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_closed' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+       'end_range_date_closed' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 
-       'range_amount' => array ('query_type' => 'default', 'enable_range_search' => true),
-	   'start_range_amount' => array ('query_type' => 'default',  'enable_range_search' => true),
-       'end_range_amount' => array ('query_type' => 'default', 'enable_range_search' => true),
+       'range_amount' => array('query_type' => 'default', 'enable_range_search' => true),
+	   'start_range_amount' => array('query_type' => 'default', 'enable_range_search' => true),
+       'end_range_amount' => array('query_type' => 'default', 'enable_range_search' => true),
 		//Range Search Support 			
 	);
 ?>

Please login to merge, or discard this patch.

modules/Campaigns/GenerateWebToLeadForm.php 1 patch

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -107,11 +107,11 @@
 block discarded – undo
 }
 
 $typeOfPerson = !empty($_REQUEST['typeOfPerson']) ? $_REQUEST['typeOfPerson'] : 'Lead';
- $person = new $typeOfPerson();
- $fieldsMetaData = new FieldsMetaData();
- $xtpl=new XTemplate ('modules/Campaigns/WebToLeadForm.html');
- $xtpl->assign("MOD", $mod_strings);
- $xtpl->assign("APP", $app_strings);
+    $person = new $typeOfPerson();
+    $fieldsMetaData = new FieldsMetaData();
+    $xtpl=new XTemplate ('modules/Campaigns/WebToLeadForm.html');
+    $xtpl->assign("MOD", $mod_strings);
+    $xtpl->assign("APP", $app_strings);
 
 include_once 'WebToLeadFormBuilder.php';
 $Web_To_Lead_Form_html = WebToLeadFormBuilder::generate(

Please login to merge, or discard this patch.

modules/Campaigns/WizardNewsletter.php 1 patch

Spacing +140 added lines, -140 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.
@@ -64,10 +64,10 @@  discard block
 block discarded – undo
 /*************** GENERAL SETUP WORK **********/
 
 $focus = new Campaign();
-if(isset($_REQUEST['record'])) {
+if (isset($_REQUEST['record'])) {
     $focus->retrieve($_REQUEST['record']);
 }
-if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
+if (isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
     $focus->id = "";
 }
 global $theme;
@@ -78,9 +78,9 @@  discard block
 block discarded – undo
 
 $GLOBALS['log']->info("Campaign NewsLetter Wizard");
 
-if( (isset($_REQUEST['wizardtype'])  && $_REQUEST['wizardtype']==1)  ||  ($focus->campaign_type=='NewsLetter')){
+if ((isset($_REQUEST['wizardtype']) && $_REQUEST['wizardtype'] == 1) || ($focus->campaign_type == 'NewsLetter')) {
     echo getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_NEWSLETTER WIZARD_TITLE'].$focus->name), true, false);
-}else{
+} else {
     echo getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_CAMPAIGN'].$focus->name), true, false);   
 }
 
@@ -104,26 +104,26 @@  discard block
 block discarded – undo
 $sqs_objects = array('parent_name' => $qsd->getQSParent(), 
                     'assigned_user_name' => $qsd->getQSUser(),
                     //'prospect_list_name' => getProspectListQSObjects(),
-                    'test_name' => getProspectListQSObjects('prospect_list_type_test', 'test_name','wiz_step3_test_name_id'),
-                    'unsubscription_name' => getProspectListQSObjects('prospect_list_type_exempt', 'unsubscription_name','wiz_step3_unsubscription_name_id'),
-                    'subscription_name' => getProspectListQSObjects('prospect_list_type_default', 'subscription_name','wiz_step3_subscription_name_id'),
+                    'test_name' => getProspectListQSObjects('prospect_list_type_test', 'test_name', 'wiz_step3_test_name_id'),
+                    'unsubscription_name' => getProspectListQSObjects('prospect_list_type_exempt', 'unsubscription_name', 'wiz_step3_unsubscription_name_id'),
+                    'subscription_name' => getProspectListQSObjects('prospect_list_type_default', 'subscription_name', 'wiz_step3_subscription_name_id'),
                     );
                     
 
-$quicksearch_js = '<script type="text/javascript" language="javascript">sqs_objects = ' . $json->encode($sqs_objects) . '</script>';
+$quicksearch_js = '<script type="text/javascript" language="javascript">sqs_objects = '.$json->encode($sqs_objects).'</script>';
 
 $ss->assign("JAVASCRIPT", $quicksearch_js);
 
 
 //set the campaign type based on wizardtype value from request object
 $campaign_type = 'newsletter';
-if( (isset($_REQUEST['wizardtype'])  && $_REQUEST['wizardtype']==1)  ||  ($focus->campaign_type=='NewsLetter')){
+if ((isset($_REQUEST['wizardtype']) && $_REQUEST['wizardtype'] == 1) || ($focus->campaign_type == 'NewsLetter')) {
     $campaign_type = 'newsletter';
     $ss->assign("CAMPAIGN_DIAGNOSTIC_LINK", diagnose());    
-}elseif( (isset($_REQUEST['wizardtype'])  && $_REQUEST['wizardtype']==2)  || ($focus->campaign_type=='Email') ){
+}elseif ((isset($_REQUEST['wizardtype']) && $_REQUEST['wizardtype'] == 2) || ($focus->campaign_type == 'Email')) {
     $campaign_type = 'email';
     $ss->assign("CAMPAIGN_DIAGNOSTIC_LINK", diagnose());
-}else{
+} else {
     $campaign_type = 'general';
 }
 
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
 
 //set default values
 $ss->assign("CALENDAR_LANG", "en");
-$ss->assign("USER_DATEFORMAT", '('. $timedate->get_user_date_format().')');
+$ss->assign("USER_DATEFORMAT", '('.$timedate->get_user_date_format().')');
 $ss->assign("CALENDAR_DATEFORMAT", $timedate->get_cal_date_format());
 $ss->assign("CAMP_DATE_ENTERED", $focus->date_entered);
 $ss->assign("CAMP_DATE_MODIFIED", $focus->date_modified);
@@ -170,50 +170,50 @@  discard block
 block discarded – undo
 
 $focus->list_view_parse_additional_sections($ss);
 
-$ss->assign("ASSIGNED_USER_ID", $focus->assigned_user_id );
+$ss->assign("ASSIGNED_USER_ID", $focus->assigned_user_id);
 
-if((!isset($focus->status)) && (!isset($focus->id)))
+if ((!isset($focus->status)) && (!isset($focus->id)))
     $ss->assign("STATUS_OPTIONS", get_select_options_with_id($app_list_strings['campaign_status_dom'], 'Planning'));
 else
     $ss->assign("STATUS_OPTIONS", get_select_options_with_id($app_list_strings['campaign_status_dom'], $focus->status));
 
 //hide frequency options if this is not a newsletter
-if($campaign_type == 'newsletter'){
+if ($campaign_type == 'newsletter') {
     $ss->assign("HIDE_FREQUENCY_IF_NEWSLETTER", "Select");
     $ss->assign("FREQUENCY_LABEL", $mod_strings['LBL_CAMPAIGN_FREQUENCY']);
-    if((!isset($focus->frequency)) && (!isset($focus->id))){
+    if ((!isset($focus->frequency)) && (!isset($focus->id))) {
         $ss->assign("FREQ_OPTIONS", get_select_options_with_id($app_list_strings['newsletter_frequency_dom'], 'Monthly'));
-    }else{
+    } else {
         $ss->assign("FREQ_OPTIONS", get_select_options_with_id($app_list_strings['newsletter_frequency_dom'], $focus->frequency));
     }
-}else{
+} else {
     $ss->assign("HIDE_FREQUENCY_IF_NEWSLETTER", "input type='hidden'");
     $ss->assign("FREQUENCY_LABEL", '&nbsp;');
 }
 global $current_user;
 require_once('modules/Currencies/ListCurrency.php');
 $currency = new ListCurrency();
-if(isset($focus->currency_id) && !empty($focus->currency_id)){
+if (isset($focus->currency_id) && !empty($focus->currency_id)) {
     $selectCurrency = $currency->getSelectOptions($focus->currency_id);
     $ss->assign("CURRENCY", $selectCurrency);
 }
-else if($current_user->getPreference('currency') && !isset($focus->id))
+else if ($current_user->getPreference('currency') && !isset($focus->id))
 {
     $selectCurrency = $currency->getSelectOptions($current_user->getPreference('currency'));
     $ss->assign("CURRENCY", $selectCurrency);
-}else{
+} else {
 
     $selectCurrency = $currency->getSelectOptions();
     $ss->assign("CURRENCY", $selectCurrency);
 
 }
 global $current_user;
-if(is_admin($current_user) && $_REQUEST['module'] != 'DynamicLayout' && !empty($_SESSION['editinplace'])){  
+if (is_admin($current_user) && $_REQUEST['module'] != 'DynamicLayout' && !empty($_SESSION['editinplace'])) {  
     $record = '';
-    if(!empty($_REQUEST['record'])){
-        $record =   $_REQUEST['record'];
+    if (!empty($_REQUEST['record'])) {
+        $record = $_REQUEST['record'];
     }
-    $ss->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>");
+    $ss->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>");
 
 }
 
@@ -226,55 +226,55 @@  discard block
 block discarded – undo
 
 //fill out the campaign type dropdown based on type of campaign being created
 $ss->assign("campaign_type", $campaign_type);
-if($campaign_type == 'general'){
+if ($campaign_type == 'general') {
     //get regular campaign dom object and strip out entries for email and newsletter
     $myTypeOptionsArr = array();
     $OptionsArr = $app_list_strings['campaign_type_dom'];
-    foreach($OptionsArr as $key=>$val){
-        if($val =='Newsletter' || $val =='Email' || $val =='' ){
+    foreach ($OptionsArr as $key=>$val) {
+        if ($val == 'Newsletter' || $val == 'Email' || $val == '') {
             //do not add   
-        }else{
+        } else {
             $myTypeOptionsArr[$key] = $val;
         }
     }
     
     //now create select option html without the newsletter/email, or blank ('') options
-    $type_option_html =' ';
+    $type_option_html = ' ';
     $selected = false;
-    foreach($myTypeOptionsArr as $optionKey=>$optionName){
+    foreach ($myTypeOptionsArr as $optionKey=>$optionName) {
         //if the selected flag is set to true, then just populate
-        if($selected){
-            $type_option_html .="<option value='$optionKey' >$optionName</option>";
-        }else{//if not selected yet, check to see if this option should be selected
+        if ($selected) {
+            $type_option_html .= "<option value='$optionKey' >$optionName</option>";
+        } else {//if not selected yet, check to see if this option should be selected
             //if the campaign type is not empty, then select the retrieved type
-            if(!empty($focus->campaign_type)){
+            if (!empty($focus->campaign_type)) {
                 //check to see if key matches campaign type
-                if($optionKey == $focus->campaign_type){
+                if ($optionKey == $focus->campaign_type) {
                     //mark as selected
-                    $type_option_html .="<option value='$optionKey' selected>$optionName</option>";
+                    $type_option_html .= "<option value='$optionKey' selected>$optionName</option>";
                     //mark as selected for next time
-                    $selected=true;
-                }else{
+                    $selected = true;
+                } else {
                     //key does not match, just populate
-                    $type_option_html .="<option value='$optionKey' >$optionName</option>";
+                    $type_option_html .= "<option value='$optionKey' >$optionName</option>";
                 }
-            }else{
+            } else {
             //since the campaign type is empty, then select first one                
-                $type_option_html .="<option value='$optionKey' selected>$optionName</option>";    
+                $type_option_html .= "<option value='$optionKey' selected>$optionName</option>";    
                 //mark as selected for next time
-                $selected=true;
+                $selected = true;
             }
         }    
     }
     //assign the modified dropdown for general campaign creation
     $ss->assign("CAMPAIGN_TYPE_OPTIONS", $type_option_html);
     $ss->assign("SHOULD_TYPE_BE_DISABLED", "select");    
-}elseif($campaign_type == 'email'){
+}elseif ($campaign_type == 'email') {
     //Assign Email as type of campaign being created an disable the select widget
     $ss->assign("CAMPAIGN_TYPE_OPTIONS", $mod_strings['LBL_EMAIL']);
     $ss->assign("SHOULD_TYPE_BE_DISABLED", "input type='hidden' value='Email'");
     $ss->assign("HIDE_CAMPAIGN_TYPE", true);
-}else{
+} else {
     //Assign NewsLetter as type of campaign being created an disable the select widget
     $ss->assign("CAMPAIGN_TYPE_OPTIONS", $mod_strings['LBL_NEWSLETTER']);
     $ss->assign("SHOULD_TYPE_BE_DISABLED", "input type='hidden' value='NewsLetter'");
@@ -291,33 +291,33 @@  discard block
 block discarded – undo
 $focus->load_relationship('tracked_urls');
 
 $trkr_lists = $focus->tracked_urls->get();
-$trkr_html ='';    
-$ss->assign('TRACKER_COUNT',count($trkr_lists));
-if(count($trkr_lists)>0){
+$trkr_html = '';    
+$ss->assign('TRACKER_COUNT', count($trkr_lists));
+if (count($trkr_lists) > 0) {
 global $odd_bg, $even_bg, $hilite_bg;
     
     $trkr_count = 0;
 //create the html to create tracker table
-    foreach($trkr_lists as $trkr_id){
+    foreach ($trkr_lists as $trkr_id) {
         $ct_focus = new CampaignTracker();
         $ct_focus->retrieve($trkr_id);
-      if(isset($ct_focus->tracker_name) && !empty($ct_focus->tracker_name)){
-            if($ct_focus->is_optout){$opt = 'checked';}else{$opt = '';}
-            $trkr_html .= "<div id='existing_trkr".$trkr_count."'> <table width='100%' border='0' cellspacing='0' cellpadding='0'>" ;
-            $trkr_html .= "<tr class='evenListRowS1'><td width='15%'><input name='wiz_step3_is_optout".$trkr_count."' title='".$mod_strings['LBL_EDIT_OPT_OUT'] . $trkr_count ."' id='existing_is_optout". $trkr_count ."' class='checkbox' type='checkbox' $opt  /><input name='wiz_step3_id".$trkr_count."' value='".$ct_focus->id."' id='existing_tracker_id". $trkr_count ."'type='hidden''/></td>";
-            $trkr_html .= "<td width='40%'> <input id='existing_tracker_name". $trkr_count ."' type='text' size='20' maxlength='255' name='wiz_step3_tracker_name". $trkr_count ."' title='".$mod_strings['LBL_EDIT_TRACKER_NAME']. $trkr_count ."' value='".$ct_focus->tracker_name."' ></td>";
-            $trkr_html .= "<td width='40%'><input type='text' size='60' maxlength='255' name='wiz_step3_tracker_url". $trkr_count ."' title='".$mod_strings['LBL_EDIT_TRACKER_URL']. $trkr_count ."' id='existing_tracker_url". $trkr_count ."' value='".$ct_focus->tracker_url."' ></td>";
+      if (isset($ct_focus->tracker_name) && !empty($ct_focus->tracker_name)) {
+            if ($ct_focus->is_optout) {$opt = 'checked'; } else {$opt = ''; }
+            $trkr_html .= "<div id='existing_trkr".$trkr_count."'> <table width='100%' border='0' cellspacing='0' cellpadding='0'>";
+            $trkr_html .= "<tr class='evenListRowS1'><td width='15%'><input name='wiz_step3_is_optout".$trkr_count."' title='".$mod_strings['LBL_EDIT_OPT_OUT'].$trkr_count."' id='existing_is_optout".$trkr_count."' class='checkbox' type='checkbox' $opt  /><input name='wiz_step3_id".$trkr_count."' value='".$ct_focus->id."' id='existing_tracker_id".$trkr_count."'type='hidden''/></td>";
+            $trkr_html .= "<td width='40%'> <input id='existing_tracker_name".$trkr_count."' type='text' size='20' maxlength='255' name='wiz_step3_tracker_name".$trkr_count."' title='".$mod_strings['LBL_EDIT_TRACKER_NAME'].$trkr_count."' value='".$ct_focus->tracker_name."' ></td>";
+            $trkr_html .= "<td width='40%'><input type='text' size='60' maxlength='255' name='wiz_step3_tracker_url".$trkr_count."' title='".$mod_strings['LBL_EDIT_TRACKER_URL'].$trkr_count."' id='existing_tracker_url".$trkr_count."' value='".$ct_focus->tracker_url."' ></td>";
             $trkr_html .= "<td><a href='#' onclick=\"javascript:remove_existing_tracker('existing_trkr".$trkr_count."','".$ct_focus->id."'); \" >  ";
             $trkr_html .= SugarThemeRegistry::current()->getImage('delete_inline', "border='0'  align='absmiddle'", 12, 12, ".gif", $mod_strings['LBL_DELETE'])."</a></td></tr></table></div>";
 
 
 
       }
-      $trkr_count =$trkr_count+1;
+      $trkr_count = $trkr_count + 1;
     }
     
     $trkr_html .= "<div id='no_trackers'></div>";
-    }else{
+    } else {
         $trkr_html .= "<div id='no_trackers'><table width='100%' border='0' cellspacing='0' cellpadding='0'><tr class='evenListRowS1'><td>".$mod_strings['LBL_NONE']."</td></tr></table></div>";
     }
     $ss->assign('EXISTING_TRACKERS', $trkr_html);
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
 $targetList = BeanFactory::getBean('ProspectLists')->get_full_list();
 
 $targetListData = array();
-foreach($targetList as $prospectLst) {
+foreach ($targetList as $prospectLst) {
     $nxt = array(
         'id' => $prospectLst->id,
         'name' => $prospectLst->name,
@@ -425,29 +425,29 @@  discard block
 block discarded – undo
 
 $prospect_lists = $focus->prospectlists->get();
 
-if((isset($_REQUEST['wizardtype']) && $_REQUEST['wizardtype'] ==1) || ($focus->campaign_type=='NewsLetter')){
+if ((isset($_REQUEST['wizardtype']) && $_REQUEST['wizardtype'] == 1) || ($focus->campaign_type == 'NewsLetter')) {
  //this is a newsletter type campaign, fill in subscription values   
 
 //if prospect lists are returned, then iterate through and populate form values
-if(count($prospect_lists)>0){
+if (count($prospect_lists) > 0) {
     
-    foreach($prospect_lists as $pl_id){
+    foreach ($prospect_lists as $pl_id) {
     //retrieve prospect list
      $pl = new ProspectList();   
      $pl->retrieve($pl_id);
 
-      if(isset($pl->list_type) && !empty($pl->list_type)){
+      if (isset($pl->list_type) && !empty($pl->list_type)) {
          //assign values based on type
-         if(($pl->list_type == 'default') || ($pl->list_type == 'seed')){            
+         if (($pl->list_type == 'default') || ($pl->list_type == 'seed')) {            
             $ss->assign('SUBSCRIPTION_ID', $pl->id);
             $ss->assign('SUBSCRIPTION_NAME', $pl->name);
          };
-         if($pl->list_type == 'exempt'){
+         if ($pl->list_type == 'exempt') {
             $ss->assign('UNSUBSCRIPTION_ID', $pl->id);
             $ss->assign('UNSUBSCRIPTION_NAME', $pl->name);
          
          };
-         if($pl->list_type == 'test'){
+         if ($pl->list_type == 'test') {
             $ss->assign('TEST_ID', $pl->id);
             $ss->assign('TEST_NAME', $pl->name);
          
@@ -459,73 +459,73 @@  discard block
 block discarded – undo
 
 
 
-}else{
+} else {
     //this is not a newlsetter campaign, so fill in target list table
     //create array for javascript, this will help to display the option text, not the value
-    $dom_txt =' ';
-    foreach($app_list_strings['prospect_list_type_dom'] as $key=>$val){
-        $dom_txt .="if(trgt_type_text =='$key'){trgt_type_text='$val';}";
+    $dom_txt = ' ';
+    foreach ($app_list_strings['prospect_list_type_dom'] as $key=>$val) {
+        $dom_txt .= "if(trgt_type_text =='$key'){trgt_type_text='$val';}";
     }
     $ss->assign("PL_DOM_STMT", $dom_txt);
     $trgt_count = 0;
     $trgt_html = ' ';
-    if(count($prospect_lists)>0){
+    if (count($prospect_lists) > 0) {
 
-        foreach($prospect_lists as $pl_id){
+        foreach ($prospect_lists as $pl_id) {
             //retrieve prospect list
             $pl = new ProspectList();
             $pl_focus = $pl->retrieve($pl_id);
-            $trgt_html .= "<div id='existing_trgt".$trgt_count."'> <table class='tabDetailViewDL2' width='100%'>" ;
-            $trgt_html .= "<td width='100' style=\"width:25%\"> <input id='existing_target_name". $trgt_count ."' type='hidden' type='text' size='60' maxlength='255' name='existing_target_name". $trgt_count ."'  value='". $pl_focus->name."' ><a href=\"index.php?module=ProspectLists&action=DetailView&record=" . $pl_focus->id . "\" target=\"_blank\" title=\"" . $mod_strings['LBL_OPEN_IN_NEW_WINDOW'] . "\">". $pl_focus->name."</a></td>";
+            $trgt_html .= "<div id='existing_trgt".$trgt_count."'> <table class='tabDetailViewDL2' width='100%'>";
+            $trgt_html .= "<td width='100' style=\"width:25%\"> <input id='existing_target_name".$trgt_count."' type='hidden' type='text' size='60' maxlength='255' name='existing_target_name".$trgt_count."'  value='".$pl_focus->name."' ><a href=\"index.php?module=ProspectLists&action=DetailView&record=".$pl_focus->id."\" target=\"_blank\" title=\"".$mod_strings['LBL_OPEN_IN_NEW_WINDOW']."\">".$pl_focus->name."</a></td>";
             $trgt_html .= "<td width='100' style=\"width:25%\">".$pl_focus->get_entry_count()."</td>";
-            $trgt_html .= "<td width='100' style=\"width:25%\"><input type='hidden' size='60' maxlength='255' name='existing_tracker_list_type". $trgt_count ."'   id='existing_tracker_list_type". $trgt_count ."' value='".$pl_focus->list_type."' >".$app_list_strings['prospect_list_type_dom'][$pl_focus->list_type];
-            $trgt_html .= "<input type='hidden' name='added_target_id". $trgt_count ."' id='added_target_id". $trgt_count ."' value='". $pl_focus->id ."' ></td>";
+            $trgt_html .= "<td width='100' style=\"width:25%\"><input type='hidden' size='60' maxlength='255' name='existing_tracker_list_type".$trgt_count."'   id='existing_tracker_list_type".$trgt_count."' value='".$pl_focus->list_type."' >".$app_list_strings['prospect_list_type_dom'][$pl_focus->list_type];
+            $trgt_html .= "<input type='hidden' name='added_target_id".$trgt_count."' id='added_target_id".$trgt_count."' value='".$pl_focus->id."' ></td>";
             $trgt_html .= "<td width='100' style=\"width:25%\"><a href='#' onclick=\"javascript:remove_existing_target('existing_trgt".$trgt_count."','".$pl_focus->id."'); \" >  ";
             $trgt_html .= SugarThemeRegistry::current()->getImage('delete_inline', "border='0' align='absmiddle'", 12, 12, ".gif", $mod_strings['LBL_DELETE'])."</a></td></tr></table></div>";
 
-            $trgt_count =$trgt_count +1;
+            $trgt_count = $trgt_count + 1;
         }
 
         $trgt_html  .= "<div id='no_targets'></div>";
-    }else{
+    } else {
         $trgt_html  .= "<div id='no_targets'><table width='100%' border='0' cellspacing='0' cellpadding='0'><tr class='evenListRowS1'><td>".$mod_strings['LBL_NONE']."</td></tr></table></div>";
 
     }
-    $ss->assign('EXISTING_TARGETS', $trgt_html );
+    $ss->assign('EXISTING_TARGETS', $trgt_html);
 
 }
 
     
 /**************************** WIZARD UI DIV Stuff *******************/
 $mrkt_string = $mod_strings['LBL_NAVIGATION_MENU_MARKETING'];
-if(!empty($focus->id)){
+if (!empty($focus->id)) {
     $mrkt_url = "<a  href='index.php?action=WizardMarketing&module=Campaigns&return_module=Campaigns&return_action=WizardHome";
     $mrkt_url .= "&return_id=".$focus->id."&campaign_id=".$focus->id;
-    $mrkt_url .= "'>". $mrkt_string."</a>";
+    $mrkt_url .= "'>".$mrkt_string."</a>";
     $mrkt_string = $mrkt_url;
 }
     $summ_url = $mod_strings['LBL_NAVIGATION_MENU_SUMMARY'];
-    if(!empty($focus->id)){
+    if (!empty($focus->id)) {
         $summ_url = "<a  href='index.php?action=WizardHome&module=Campaigns";
         $summ_url .= "&return_id=".$focus->id."&record=".$focus->id;
-        $summ_url .= "'> ". $mod_strings['LBL_NAVIGATION_MENU_SUMMARY']."</a>";
+        $summ_url .= "'> ".$mod_strings['LBL_NAVIGATION_MENU_SUMMARY']."</a>";
     } 
    
 
 
-$script_to_call ='';
-    if (!empty($focus->id)){
+$script_to_call = '';
+    if (!empty($focus->id)) {
         $maxStep = 2;
         $script_to_call = "link_navs(1, {$maxStep});";
-        if(isset($_REQUEST['direct_step']) and !empty($_REQUEST['direct_step'])){
-            $directStep = (int) $_REQUEST['direct_step'];
-            if($directStep < 1) {
+        if (isset($_REQUEST['direct_step']) and !empty($_REQUEST['direct_step'])) {
+            $directStep = (int)$_REQUEST['direct_step'];
+            if ($directStep < 1) {
                 $directStep = 1;
             }
-            if($directStep > $maxStep) {
+            if ($directStep > $maxStep) {
                 $directStep = $maxStep;
             }
-            $script_to_call .='   direct(' . $directStep . ');';
+            $script_to_call .= '   direct('.$directStep.');';
         }
     } 
     $ss->assign("HILITE_ALL", $script_to_call);
@@ -565,56 +565,56 @@  discard block
 block discarded – undo
 
 //Create the html to fill in the wizard steps
 
-if($campaign_type == 'general'){
+if ($campaign_type == 'general') {
     $steps = create_campaign_steps();
 
-    foreach($steps as $key => $step) {
+    foreach ($steps as $key => $step) {
         $_steps[$key] = false;
     }
-    $ss->assign('NAV_ITEMS',create_wiz_menu_items($_steps,'campaign',$mrkt_string,$summ_url, 'dotlist'));
-    $ss->assign('HIDE_CONTINUE','hidden');
+    $ss->assign('NAV_ITEMS', create_wiz_menu_items($_steps, 'campaign', $mrkt_string, $summ_url, 'dotlist'));
+    $ss->assign('HIDE_CONTINUE', 'hidden');
 
-}elseif($campaign_type == 'email'){
+}elseif ($campaign_type == 'email') {
     $steps = create_email_steps();
-    if($focus->id) {
-        $summ_url = "index.php?action=WizardHome&module=Campaigns&return_id=" . $focus->id . "&record=" . $focus->id;
+    if ($focus->id) {
+        $summ_url = "index.php?action=WizardHome&module=Campaigns&return_id=".$focus->id."&record=".$focus->id;
     }
     else {
         $summ_url = false;
     }
-    foreach($steps as $key => $step) {
+    foreach ($steps as $key => $step) {
         $_steps[$key] = false;
     }
     $campaign_id = $focus->id;
     $marketing_id = isset($_REQUEST['marketing_id']) && $_REQUEST['marketing_id'] ? $_REQUEST['marketing_id'] : null;
     $template_id = isset($_REQUEST['template_id']) && $_REQUEST['template_id'] ? $_REQUEST['template_id'] : null;
-    $ss->assign('NAV_ITEMS',create_wiz_menu_items($_steps,'email',$mrkt_string,$summ_url, 'dotlist', $campaign_id, $marketing_id, $template_id));
-    $ss->assign('HIDE_CONTINUE','submit');
-}else{
+    $ss->assign('NAV_ITEMS', create_wiz_menu_items($_steps, 'email', $mrkt_string, $summ_url, 'dotlist', $campaign_id, $marketing_id, $template_id));
+    $ss->assign('HIDE_CONTINUE', 'submit');
+} else {
     $steps = create_newsletter_steps();
 
-    if($focus->id) {
-        $summ_url = "index.php?action=WizardHome&module=Campaigns&return_id=" . $focus->id . "&record=" . $focus->id;
+    if ($focus->id) {
+        $summ_url = "index.php?action=WizardHome&module=Campaigns&return_id=".$focus->id."&record=".$focus->id;
     }
     else {
         $summ_url = false;
     }
-    foreach($steps as $key => $step) {
+    foreach ($steps as $key => $step) {
         $_steps[$key] = false;
     }
-    $ss->assign('NAV_ITEMS',create_wiz_menu_items($_steps,'newsletter',$mrkt_string,$summ_url, 'dotlist'));
-    $ss->assign('HIDE_CONTINUE','submit');
+    $ss->assign('NAV_ITEMS', create_wiz_menu_items($_steps, 'newsletter', $mrkt_string, $summ_url, 'dotlist'));
+    $ss->assign('HIDE_CONTINUE', 'submit');
 }
 
 $ss->assign('TOTAL_STEPS', count($steps));
-$sshtml = create_wiz_step_divs($steps,$ss);
-$ss->assign('STEPS',$sshtml);
+$sshtml = create_wiz_step_divs($steps, $ss);
+$ss->assign('STEPS', $sshtml);
      	   	
 
 /**************************** FINAL END OF PAGE UI Stuff *******************/
 
-if(isset($_REQUEST['wizardtype'])) {
-    switch($_REQUEST['wizardtype']) {
+if (isset($_REQUEST['wizardtype'])) {
+    switch ($_REQUEST['wizardtype']) {
         case '1':
             $ss->assign('campaign_type', 'NewsLetter');
             break;
@@ -629,12 +629,12 @@  discard block
 block discarded – undo
 
 $ss->display(file_exists('custom/modules/Campaigns/tpls/WizardNewsletter.tpl') ? 'custom/modules/Campaigns/tpls/WizardNewsletter.tpl' : 'modules/Campaigns/tpls/WizardNewsletter.tpl');
 
-if(!$focus->id) {
+if (!$focus->id) {
     unset($_SESSION['campaignWizard'][$campaign_id]['defaultSelectedMarketingId']);
 }
 
 
-function create_newsletter_steps(){
+function create_newsletter_steps() {
     global $mod_strings;
     $steps[$mod_strings['LBL_NAVIGATION_MENU_GEN1']]          = file_exists('custom/modules/Campaigns/tpls/WizardCampaignHeader.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignHeader.tpl' : 'modules/Campaigns/tpls/WizardCampaignHeader.tpl';
     //$steps[$mod_strings['LBL_NAVIGATION_MENU_GEN2']]          = file_exists('custom/modules/Campaigns/tpls/WizardCampaignBudget.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignBudget.tpl' : 'modules/Campaigns/tpls/WizardCampaignBudget.tpl';
@@ -643,54 +643,54 @@  discard block
 block discarded – undo
     return  $steps;
 }
 
-function create_campaign_steps(){
+function create_campaign_steps() {
     global $mod_strings;
     $steps[$mod_strings['LBL_NAVIGATION_MENU_GEN1']]          = file_exists('custom/modules/Campaigns/tpls/WizardCampaignHeader.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignHeader.tpl' : 'modules/Campaigns/tpls/WizardCampaignHeader.tpl';
     $steps[$mod_strings['LBL_NAVIGATION_MENU_GEN2']]          = file_exists('custom/modules/Campaigns/tpls/WizardCampaignBudget.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignBudget.tpl' : 'modules/Campaigns/tpls/WizardCampaignBudget.tpl';
-    $steps[$mod_strings['LBL_TARGET_LISTS']]                   = file_exists('custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl' : 'modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl';
+    $steps[$mod_strings['LBL_TARGET_LISTS']] = file_exists('custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl' : 'modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl';
     return  $steps;
 }
 
-function create_email_steps(){
+function create_email_steps() {
     global $mod_strings;
-    $steps[$mod_strings['LBL_NAVIGATION_MENU_GEN1']]          = file_exists('custom/modules/Campaigns/tpls/WizardCampaignHeader.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignHeader.tpl' : 'modules/Campaigns/tpls/WizardCampaignHeader.tpl';
+    $steps[$mod_strings['LBL_NAVIGATION_MENU_GEN1']] = file_exists('custom/modules/Campaigns/tpls/WizardCampaignHeader.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignHeader.tpl' : 'modules/Campaigns/tpls/WizardCampaignHeader.tpl';
     //$steps[$mod_strings['LBL_NAVIGATION_MENU_GEN2']]          = file_exists('custom/modules/Campaigns/tpls/WizardCampaignBudget.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignBudget.tpl' : 'modules/Campaigns/tpls/WizardCampaignBudget.tpl';
     //$steps[$mod_strings['LBL_NAVIGATION_MENU_TRACKERS']]      = file_exists('custom/modules/Campaigns/tpls/WizardCampaignTracker.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignTracker.tpl' : 'modules/Campaigns/tpls/WizardCampaignTracker.tpl';
-    $steps[$mod_strings['LBL_TARGET_LISTS']]                   = file_exists('custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl' : 'modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl';
+    $steps[$mod_strings['LBL_TARGET_LISTS']] = file_exists('custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl' : 'modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl';
     return  $steps;
 }
 
 
-function create_wiz_step_divs($steps,$ss){
+function create_wiz_step_divs($steps, $ss) {
     $step_html = '';
-    if(isset($steps)  && !empty($steps)){
-        $i=1;
-        foreach($steps as $name=>$step){
-            $step_html .="<p><div id='step$i'>";
+    if (isset($steps) && !empty($steps)) {
+        $i = 1;
+        foreach ($steps as $name=>$step) {
+            $step_html .= "<p><div id='step$i'>";
             $step_html .= $ss->fetch($step);
-            $step_html .="</div></p>";
-            $i = $i+1;
+            $step_html .= "</div></p>";
+            $i = $i + 1;
         }    
     }
     return $step_html;
 }
 
-function create_wiz_menu_items($steps,$type,$mrkt_string,$summ_url, $view = null, $campaign_id = null, $marketing_id = null, $template_id = null){
+function create_wiz_menu_items($steps, $type, $mrkt_string, $summ_url, $view = null, $campaign_id = null, $marketing_id = null, $template_id = null) {
 
     global $mod_strings;
 
 
-    if($view == 'dotlist') {
+    if ($view == 'dotlist') {
 
         include_once 'modules/Campaigns/DotListWizardMenu.php';
 
-        if($type!='campaign') {
+        if ($type != 'campaign') {
             $templateURLForProgressBar = false;
             if ($campaign_id && $marketing_id && $template_id) {
                 $templateURLForProgressBar = "index.php?action=WizardMarketing&module=Campaigns&return_module=Campaigns&return_action=WizardHome&return_id={$campaign_id}&campaign_id={$campaign_id}&jump=2&marketing_id={$marketing_id}&record={$marketing_id}&campaign_type=Email&template_id={$template_id}";
             }
 
-            if(preg_match('/\bhref=\'([^\']*)/', $mrkt_string, $matches)) {
+            if (preg_match('/\bhref=\'([^\']*)/', $mrkt_string, $matches)) {
                 $templateURLForProgressBar = $matches[1];
             }
 
@@ -700,8 +700,8 @@  discard block
 block discarded – undo
         if ($type == 'newsletter' || $type == 'email') {
 
             preg_match('/\bhref=\'([^\']*)/', $mrkt_string, $matches);
-            if(isset($matches[1])) {
-                $marketingLink = $matches[1] . ($matches[1] ? '&jump=2' : false);
+            if (isset($matches[1])) {
+                $marketingLink = $matches[1].($matches[1] ? '&jump=2' : false);
             }
             else {
                 $marketingLink = false;
@@ -719,19 +719,19 @@  discard block
 block discarded – undo
     }
     else {
         $nav_html = '<table border="0" cellspacing="0" cellpadding="0" width="100%" >';
-        if(isset($steps)  && !empty($steps)){
-            $i=1;
-            foreach($steps as $name=>$step){
+        if (isset($steps) && !empty($steps)) {
+            $i = 1;
+            foreach ($steps as $name=>$step) {
                 $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step$i'>$name</div></td></tr>";
-                $i=$i+1;
+                $i = $i + 1;
             }
         }
-        if($type == 'newsletter'  ||  $type == 'email'){
-            $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+1).">$mrkt_string</div></td></tr>";
-            $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+2).">".$mod_strings['LBL_NAVIGATION_MENU_SEND_EMAIL']."</div></li>";
-            $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+3).">".$summ_url."</div></td></tr>";
-        }else{
-            $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+1).">".$summ_url."</div></td></tr>";
+        if ($type == 'newsletter' || $type == 'email') {
+            $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i + 1).">$mrkt_string</div></td></tr>";
+            $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i + 2).">".$mod_strings['LBL_NAVIGATION_MENU_SEND_EMAIL']."</div></li>";
+            $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i + 3).">".$summ_url."</div></td></tr>";
+        } else {
+            $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i + 1).">".$summ_url."</div></td></tr>";
         }
 
         $nav_html .= '</table>';

Please login to merge, or discard this patch.

		@@ -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.
		@@ -39,33 +39,33 @@ discard block
		block discarded – undo
39	39	********************************************************************************/
40	40	global $current_user;
41	41	$module_name = "Calls";
42		-$searchFields['Calls'] = array (
	42	+$searchFields['Calls'] = array(
43	43	'name' =>
44		- array (
	44	+ array(
45	45	'query_type' => 'default',
46	46	),
47	47	'contact_name' =>
48		- array (
	48	+ array(
49	49	'query_type' => 'default',
50	50	'db_field' =>
51		- array (
	51	+ array(
52	52	0 => 'contacts.first_name',
53	53	1 => 'contacts.last_name',
54	54	),
55	55	),
56	56	'date_start' =>
57		- array (
	57	+ array(
58	58	'query_type' => 'default',
59	59	),
60	60	'location' =>
61		- array (
	61	+ array(
62	62	'query_type' => 'default',
63	63	),
64	64	'current_user_only' =>
65		- array (
	65	+ array(
66	66	'query_type' => 'default',
67	67	'db_field' =>
68		- array (
	68	+ array(
69	69	0 => 'assigned_user_id',
70	70	),
71	71	'my_items' => true,
		@@ -73,98 +73,98 @@ discard block
		block discarded – undo
73	73	'type' => 'bool',
74	74	),
75	75	'assigned_user_id' =>
76		- array (
	76	+ array(
77	77	'query_type' => 'default',
78	78	),
79	79	'status' =>
80		- array (
	80	+ array(
81	81	'query_type' => 'default',
82	82	'options' => 'call_status_dom',
83	83	'template_var' => 'STATUS_FILTER',
84	84	),
85	85	'open_only' =>
86		- array (
	86	+ array(
87	87	'query_type' => 'default',
88	88	'db_field' =>
89		- array (
	89	+ array(
90	90	0 => 'status',
91	91	),
92	92	'operator' => 'not in',
93	93	'closed_values' =>
94		- array (
	94	+ array(
95	95	0 => 'Held',
96	96	1 => 'Not Held',
97	97	),
98	98	'type' => 'bool',
99	99	),
100	100	'range_date_entered' =>
101		- array (
	101	+ array(
102	102	'query_type' => 'default',
103	103	'enable_range_search' => true,
104	104	'is_date_field' => true,
105	105	),
106	106	'start_range_date_entered' =>
107		- array (
	107	+ array(
108	108	'query_type' => 'default',
109	109	'enable_range_search' => true,
110	110	'is_date_field' => true,
111	111	),
112	112	'end_range_date_entered' =>
113		- array (
	113	+ array(
114	114	'query_type' => 'default',
115	115	'enable_range_search' => true,
116	116	'is_date_field' => true,
117	117	),
118	118	'range_date_modified' =>
119		- array (
	119	+ array(
120	120	'query_type' => 'default',
121	121	'enable_range_search' => true,
122	122	'is_date_field' => true,
123	123	),
124	124	'start_range_date_modified' =>
125		- array (
	125	+ array(
126	126	'query_type' => 'default',
127	127	'enable_range_search' => true,
128	128	'is_date_field' => true,
129	129	),
130	130	'end_range_date_modified' =>
131		- array (
	131	+ array(
132	132	'query_type' => 'default',
133	133	'enable_range_search' => true,
134	134	'is_date_field' => true,
135	135	),
136	136	'range_date_start' =>
137		- array (
	137	+ array(
138	138	'query_type' => 'default',
139	139	'enable_range_search' => true,
140	140	'is_date_field' => true,
141	141	),
142	142	'start_range_date_start' =>
143		- array (
	143	+ array(
144	144	'query_type' => 'default',
145	145	'enable_range_search' => true,
146	146	'is_date_field' => true,
147	147	),
148	148	'end_range_date_start' =>
149		- array (
	149	+ array(
150	150	'query_type' => 'default',
151	151	'enable_range_search' => true,
152	152	'is_date_field' => true,
153	153	),
154	154	'range_date_end' =>
155		- array (
	155	+ array(
156	156	'query_type' => 'default',
157	157	'enable_range_search' => true,
158	158	'is_date_field' => true,
159	159	),
160	160	'start_range_date_end' =>
161		- array (
	161	+ array(
162	162	'query_type' => 'default',
163	163	'enable_range_search' => true,
164	164	'is_date_field' => true,
165	165	),
166	166	'end_range_date_end' =>
167		- array (
	167	+ array(
168	168	'query_type' => 'default',
169	169	'enable_range_search' => true,
170	170	'is_date_field' => true,
		@@ -175,6 +175,6 @@ discard block
		block discarded – undo
175	175	'subquery' => "SELECT favorites.parent_id FROM favorites
176	176	WHERE favorites.deleted = 0
177	177	and favorites.parent_type = '".$module_name."'
178		- and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
	178	+ and favorites.assigned_user_id = '" .$current_user->id."') OR NOT ({0}",
179	179	'db_field'=>array('id')),
180	180	);
181	181	\ No newline at end of file

		@@ -121,9 +121,9 @@ discard block
		block discarded – undo
121	121	/**
122	122	* @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
123	123	*/
124		- public function EmailTemplate(){
	124	+ public function EmailTemplate() {
125	125	$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
126		- if(isset($GLOBALS['log'])) {
	126	+ if (isset($GLOBALS['log'])) {
127	127	$GLOBALS['log']->deprecated($deprecatedMessage);
128	128	}
129	129	else {
		@@ -368,7 +368,7 @@ discard block
		block discarded – undo
368	368	}
369	369	if (!empty($tracker_url) && !empty($template_text) && !empty($matches[0][$i][0]) && !empty($tracked_urls[$matches[0][$i][0]])) {
370	370	$template_text = substr_replace($template_text, $tracker_url, $matches[0][$i][1], strlen($matches[0][$i][0]));
371		- $template_text = str_replace($sugar_config['site_url'] . '/' . $sugar_config['site_url'], $sugar_config['site_url'], $template_text);
	371	+ $template_text = str_replace($sugar_config['site_url'].'/'.$sugar_config['site_url'], $sugar_config['site_url'], $template_text);
372	372	}
373	373	}
374	374	}
		@@ -420,10 +420,10 @@ discard block
		block discarded – undo
420	420	if ($beanList[$focus_name] == 'User') {
421	421	$pattern_prefix = '$contact_user_';
422	422	} else {
423		- $pattern_prefix = '$' . strtolower($beanList[$focus_name]) . '_';
	423	+ $pattern_prefix = '$'.strtolower($beanList[$focus_name]).'_';
424	424	}
425	425	$pattern_prefix_length = strlen($pattern_prefix);
426		- $pattern = '/\\' . $pattern_prefix . '[A-Za-z_0-9]*/';
	426	+ $pattern = '/\\'.$pattern_prefix.'[A-Za-z_0-9]*/';
427	427
428	428	$return_array = array();
429	429	foreach ($template_text_array as $key => $template_text) {
		@@ -521,16 +521,16 @@ discard block
		block discarded – undo
521	521	$translated = translate($field_def['options'], 'Users', $user->$fieldName);
522	522
523	523	if (isset($translated) && !is_array($translated)) {
524		- $repl_arr["contact_user_" . $fieldName] = $translated;
	524	+ $repl_arr["contact_user_".$fieldName] = $translated;
525	525	} else { // unset enum field, make sure we have a match string to replace with ""
526		- $repl_arr["contact_user_" . $fieldName] = '';
	526	+ $repl_arr["contact_user_".$fieldName] = '';
527	527	}
528	528	} else {
529	529	if (isset($user->$fieldName)) {
530	530	// bug 47647 - allow for fields to translate before adding to template
531		- $repl_arr["contact_user_" . $fieldName] = self::_convertToType($field_def['type'], $user->$fieldName);
	531	+ $repl_arr["contact_user_".$fieldName] = self::_convertToType($field_def['type'], $user->$fieldName);
532	532	} else {
533		- $repl_arr["contact_user_" . $fieldName] = "";
	533	+ $repl_arr["contact_user_".$fieldName] = "";
534	534	}
535	535	}
536	536	}
		@@ -556,8 +556,8 @@ discard block
		block discarded – undo
556	556	continue;
557	557	}
558	558	$repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
559		- 'contact_' . $field_def['name'] => '',
560		- 'contact_account_' . $field_def['name'] => '',
	559	+ 'contact_'.$field_def['name'] => '',
	560	+ 'contact_account_'.$field_def['name'] => '',
561	561	));
562	562	}
563	563	foreach ($prospect->field_defs as $field_def) {
		@@ -565,8 +565,8 @@ discard block
		block discarded – undo
565	565	continue;
566	566	}
567	567	$repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
568		- 'contact_' . $field_def['name'] => '',
569		- 'contact_account_' . $field_def['name'] => '',
	568	+ 'contact_'.$field_def['name'] => '',
	569	+ 'contact_account_'.$field_def['name'] => '',
570	570	));
571	571	}
572	572	foreach ($contact->field_defs as $field_def) {
		@@ -574,8 +574,8 @@ discard block
		block discarded – undo
574	574	continue;
575	575	}
576	576	$repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
577		- 'contact_' . $field_def['name'] => '',
578		- 'contact_account_' . $field_def['name'] => '',
	577	+ 'contact_'.$field_def['name'] => '',
	578	+ 'contact_account_'.$field_def['name'] => '',
579	579	));
580	580	}
581	581	foreach ($acct->field_defs as $field_def) {
		@@ -583,8 +583,8 @@ discard block
		block discarded – undo
583	583	continue;
584	584	}
585	585	$repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
586		- 'account_' . $field_def['name'] => '',
587		- 'account_contact_' . $field_def['name'] => '',
	586	+ 'account_'.$field_def['name'] => '',
	587	+ 'account_contact_'.$field_def['name'] => '',
588	588	));
589	589	}
590	590	// cn: end bug 9277 fix
		@@ -609,21 +609,21 @@ discard block
		block discarded – undo
609	609
610	610	if (isset($translated) && !is_array($translated)) {
611	611	$repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
612		- 'account_' . $fieldName => $translated,
613		- 'contact_account_' . $fieldName => $translated,
	612	+ 'account_'.$fieldName => $translated,
	613	+ 'contact_account_'.$fieldName => $translated,
614	614	));
615	615	} else { // unset enum field, make sure we have a match string to replace with ""
616	616	$repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
617		- 'account_' . $fieldName => '',
618		- 'contact_account_' . $fieldName => '',
	617	+ 'account_'.$fieldName => '',
	618	+ 'contact_account_'.$fieldName => '',
619	619	));
620	620	}
621	621	} else {
622	622	// bug 47647 - allow for fields to translate before adding to template
623	623	$translated = self::_convertToType($field_def['type'], $acct->$fieldName);
624	624	$repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
625		- 'account_' . $fieldName => $translated,
626		- 'contact_account_' . $fieldName => $translated,
	625	+ 'account_'.$fieldName => $translated,
	626	+ 'contact_account_'.$fieldName => $translated,
627	627	));
628	628	}
629	629	}
		@@ -654,13 +654,13 @@ discard block
		block discarded – undo
654	654
655	655	if (isset($translated) && !is_array($translated)) {
656	656	$repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
657		- 'contact_' . $fieldName => $translated,
658		- 'contact_account_' . $fieldName => $translated,
	657	+ 'contact_'.$fieldName => $translated,
	658	+ 'contact_account_'.$fieldName => $translated,
659	659	));
660	660	} else { // unset enum field, make sure we have a match string to replace with ""
661	661	$repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
662		- 'contact_' . $fieldName => '',
663		- 'contact_account_' . $fieldName => '',
	662	+ 'contact_'.$fieldName => '',
	663	+ 'contact_account_'.$fieldName => '',
664	664	));
665	665	}
666	666	} else {
		@@ -668,8 +668,8 @@ discard block
		block discarded – undo
668	668	// bug 47647 - allow for fields to translate before adding to template
669	669	$translated = self::_convertToType($field_def['type'], $contact->$fieldName);
670	670	$repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
671		- 'contact_' . $fieldName => $translated,
672		- 'contact_account_' . $fieldName => $translated,
	671	+ 'contact_'.$fieldName => $translated,
	672	+ 'contact_account_'.$fieldName => $translated,
673	673	));
674	674	} // if
675	675	}
		@@ -690,27 +690,27 @@ discard block
		block discarded – undo
690	690
691	691	if (isset($translated) && !is_array($translated)) {
692	692	$repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
693		- strtolower($beanList[$bean_name]) . "_" . $fieldName => $translated,
	693	+ strtolower($beanList[$bean_name])."_".$fieldName => $translated,
694	694	));
695	695	} else { // unset enum field, make sure we have a match string to replace with ""
696	696	$repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
697		- strtolower($beanList[$bean_name]) . "_" . $fieldName => '',
	697	+ strtolower($beanList[$bean_name])."_".$fieldName => '',
698	698	));
699	699	}
700	700	} else {
701	701	// bug 47647 - translate currencies to appropriate values
702	702	$repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
703		- strtolower($beanList[$bean_name]) . "_" . $fieldName => self::_convertToType($field_def['type'], $focus->$fieldName),
	703	+ strtolower($beanList[$bean_name])."_".$fieldName => self::_convertToType($field_def['type'], $focus->$fieldName),
704	704	));
705	705	}
706	706	} else {
707	707	if ($fieldName == 'full_name') {
708	708	$repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
709		- strtolower($beanList[$bean_name]) . '_full_name' => $focus->get_summary_text(),
	709	+ strtolower($beanList[$bean_name]).'_full_name' => $focus->get_summary_text(),
710	710	));
711	711	} else {
712	712	$repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
713		- strtolower($beanList[$bean_name]) . "_" . $fieldName => '',
	713	+ strtolower($beanList[$bean_name])."_".$fieldName => '',
714	714	));
715	715	}
716	716	}
		@@ -761,7 +761,7 @@ discard block
		block discarded – undo
761	761	{
762	762	foreach ($bean_arr as $bean_name => $bean_id) {
763	763
764		- $focus = BeanFactory::getBean($bean_name,$bean_id);
	764	+ $focus = BeanFactory::getBean($bean_name, $bean_id);
765	765
766	766	if ($bean_name == 'Leads' \|\| $bean_name == 'Prospects') {
767	767	$bean_name = 'Contacts';
		@@ -843,7 +843,7 @@ discard block
		block discarded – undo
843	843	$this->repairMozaikClears();
844	844	$this->imageLinkReplaced = false;
845	845	$this->repairEntryPointImages();
846		- if($this->imageLinkReplaced) {
	846	+ if ($this->imageLinkReplaced) {
847	847	$this->save();
848	848	}
849	849	return $ret;
		@@ -862,13 +862,13 @@ discard block
		block discarded – undo
862	862	// repair the images url at entry points, change to a public direct link for remote email clients..
863	863
864	864	$siteUrlQuoted = str_replace(array(':', '/'), array('\:', '\/'), $sugar_config['site_url']);
865		- $regex = '/<img src="(' . $siteUrlQuoted . '\/index\.php\?entryPoint=download&type=Notes&id=([a-f0-9]{8}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{12})&filename=[^&]+)"/';
	865	+ $regex = '/<img src="('.$siteUrlQuoted.'\/index\.php\?entryPoint=download&type=Notes&id=([a-f0-9]{8}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{12})&filename=[^&]+)"/';
866	866
867		- if(preg_match($regex, $this->body_html, $match)) {
	867	+ if (preg_match($regex, $this->body_html, $match)) {
868	868	$splits = explode('.', $match[1]);
869	869	$fileExtension = end($splits);
870	870	$this->makePublicImage($match[2]);
871		- $directLink = '<img src="' . $sugar_config['site_url'] . '/public/' . $match[2] . '.' . $fileExtension . '"';
	871	+ $directLink = '<img src="'.$sugar_config['site_url'].'/public/'.$match[2].'.'.$fileExtension.'"';
872	872	$this->body_html = str_replace($match[0], $directLink, $this->body_html);
873	873	$this->imageLinkReplaced = true;
874	874	$this->repairEntryPointImages();
		@@ -877,25 +877,25 @@ discard block
		block discarded – undo
877	877	}
878	878
879	879	private function makePublicImage($id) {
880		- $toFile = 'public/' . $id . '.jpg';
881		- if(file_exists($toFile)) {
	880	+ $toFile = 'public/'.$id.'.jpg';
	881	+ if (file_exists($toFile)) {
882	882	return;
883	883	}
884		- $fromFile = 'upload://' . $id;
885		- if(!file_exists($fromFile)) {
	884	+ $fromFile = 'upload://'.$id;
	885	+ if (!file_exists($fromFile)) {
886	886	throw new Exceptin('file not found');
887	887	}
888		- if(!file_exists('public')) {
	888	+ if (!file_exists('public')) {
889	889	sugar_mkdir('public', 777);
890	890	}
891	891	$fdata = file_get_contents($fromFile);
892		- if(!file_put_contents($toFile, $fdata)) {
	892	+ if (!file_put_contents($toFile, $fdata)) {
893	893	throw new Exception('file write error');
894	894	}
895	895	}
896	896
897	897	public function getAttachments() {
898		- return BeanFactory::getBean('Notes')->get_full_list('', "parent_id = '" . $this->id . "'");
	898	+ return BeanFactory::getBean('Notes')->get_full_list('', "parent_id = '".$this->id."'");
899	899	}
900	900
901	901	}

		@@ -2,9 +2,9 @@ discard block
		block discarded – undo
2	2	if (!defined('sugarEntry') \|\| !sugarEntry) die('Not A Valid Entry Point');
3	3
4	4	function handleAttachmentForRemove() {
5		- if(!empty($_REQUEST['attachmentsRemove'])) {
6		- foreach($_REQUEST['attachmentsRemove'] as $attachmentIdForRemove) {
7		- if($bean = BeanFactory::getBean('Notes', $attachmentIdForRemove)) {
	5	+ if (!empty($_REQUEST['attachmentsRemove'])) {
	6	+ foreach ($_REQUEST['attachmentsRemove'] as $attachmentIdForRemove) {
	7	+ if ($bean = BeanFactory::getBean('Notes', $attachmentIdForRemove)) {
8	8	$bean->mark_deleted($bean->id);
9	9	}
10	10	}
		@@ -18,7 +18,7 @@ discard block
		block discarded – undo
18	18	$emailTemplateId = isset($_REQUEST['emailTemplateId']) && $_REQUEST['emailTemplateId'] ? $_REQUEST['emailTemplateId'] : null;
19	19	$_SESSION['campaignWizard'][$_REQUEST['campaignId']]['defaultSelectedTemplateId'] = $emailTemplateId;
20	20
21		-if(preg_match('/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/', $emailTemplateId) \|\| !$emailTemplateId) {
	21	+if (preg_match('/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/', $emailTemplateId) \|\| !$emailTemplateId) {
22	22
23	23	$func = isset($_REQUEST['func']) ? $_REQUEST['func'] : null;
24	24
		@@ -28,18 +28,18 @@ discard block
		block discarded – undo
28	28
29	29	include_once 'modules/EmailTemplates/EmailTemplateFormBase.php';
30	30
31		- switch($func) {
	31	+ switch ($func) {
32	32
33	33	case 'update':
34	34	$bean = BeanFactory::getBean('EmailTemplates', $emailTemplateId);
35		- foreach($bean as $key => $value) {
36		- if(in_array($key, $fields)) {
	35	+ foreach ($bean as $key => $value) {
	36	+ if (in_array($key, $fields)) {
37	37	$bean->$key = $_POST[$key];
38	38	}
39	39	}
40	40	$formBase = new EmailTemplateFormBase();
41	41	$bean = $formBase->handleAttachmentsProcessImages($bean, false, true, 'download', true);
42		- if($bean->save()) {
	42	+ if ($bean->save()) {
43	43	$msgs[] = 'LBL_TEMPLATE_SAVED';
44	44	}
45	45	//$formBase = new EmailTemplateFormBase();
		@@ -49,14 +49,14 @@ discard block
		block discarded – undo
49	49	handleAttachmentForRemove();
50	50
51	51	// update marketing->template_id if we have a selected marketing..
52		- if(!empty($_SESSION['campaignWizard'][$_REQUEST['campaignId']]['defaultSelectedMarketingId']) && !empty($_REQUEST['campaignId'])) {
	52	+ if (!empty($_SESSION['campaignWizard'][$_REQUEST['campaignId']]['defaultSelectedMarketingId']) && !empty($_REQUEST['campaignId'])) {
53	53	$marketingId = $_SESSION['campaignWizard'][$_REQUEST['campaignId']]['defaultSelectedMarketingId'];
54	54
55	55	$campaign = BeanFactory::getBean('Campaigns', $_REQUEST['campaignId']);
56	56	$campaign->load_relationship('emailmarketing');
57	57	$marketings = $campaign->emailmarketing->get();
58	58	// just a double check for campaign->marketing relation correct is for e.g the user deleted the marketing record or something may could happened..
59		- if(in_array($marketingId, $marketings)) {
	59	+ if (in_array($marketingId, $marketings)) {
60	60	$marketing = BeanFactory::getBean('EmailMarketing', $marketingId);
61	61	$marketing->template_id = $emailTemplateId;
62	62	$marketing->save();
		@@ -72,15 +72,15 @@ discard block
		block discarded – undo
72	72	$bean = BeanFactory::getBean('EmailTemplates', $emailTemplateId);
73	73	$newBean = new EmailTemplate();
74	74	$fieldsForCopy = array('type', 'description');
75		- foreach($bean as $key => $value) {
76		- if(in_array($key, $fields)) {
	75	+ foreach ($bean as $key => $value) {
	76	+ if (in_array($key, $fields)) {
77	77	$newBean->$key = $_POST[$key];
78	78	}
79		- else if(in_array($key, $fieldsForCopy)) {
	79	+ else if (in_array($key, $fieldsForCopy)) {
80	80	$newBean->$key = $bean->$key;
81	81	}
82	82	}
83		- if($newBean->save()) {
	83	+ if ($newBean->save()) {
84	84	$msgs[] = 'LBL_TEMPLATE_SAVED';
85	85	}
86	86	//$formBase = new EmailTemplateFormBase();
		@@ -94,13 +94,13 @@ discard block
		block discarded – undo
94	94	$focus = BeanFactory::getBean('EmailTemplates', $_REQUEST['attach_to_template_id']);
95	95	//$data = $formBase->handleAttachments($focus, false, null);
96	96	$data = $formBase->handleAttachmentsProcessImages($focus, false, true, 'download', true);
97		- $redirectUrl = 'index.php?module=Campaigns&action=WizardMarketing&campaign_id=' . $_REQUEST['campaign_id'] . "&jump=2&template_id=" . $_REQUEST['attach_to_template_id']; // . '&marketing_id=' . $_REQUEST['attach_to_marketing_id'] . '&record=' . $_REQUEST['attach_to_marketing_id'];
98		- header('Location: ' . $redirectUrl);
	97	+ $redirectUrl = 'index.php?module=Campaigns&action=WizardMarketing&campaign_id='.$_REQUEST['campaign_id']."&jump=2&template_id=".$_REQUEST['attach_to_template_id']; // . '&marketing_id=' . $_REQUEST['attach_to_marketing_id'] . '&record=' . $_REQUEST['attach_to_marketing_id'];
	98	+ header('Location: '.$redirectUrl);
99	99	die();
100	100	break;
101	101
102	102	default: case 'get':
103		- if($bean = BeanFactory::getBean('EmailTemplates', $emailTemplateId)) {
	103	+ if ($bean = BeanFactory::getBean('EmailTemplates', $emailTemplateId)) {
104	104	$fields = array('id', 'name', 'body', 'body_html', 'subject');
105	105	foreach ($bean as $key => $value) {
106	106	if (in_array($key, $fields)) {
		@@ -110,9 +110,9 @@ discard block
		block discarded – undo
110	110
111	111	$data['body_from_html'] = from_html($bean->body_html);
112	112	$attachmentBeans = $bean->getAttachments();
113		- if($attachmentBeans) {
	113	+ if ($attachmentBeans) {
114	114	$attachments = array();
115		- foreach($attachmentBeans as $attachmentBean) {
	115	+ foreach ($attachmentBeans as $attachmentBean) {
116	116	$attachments[] = array(
117	117	'id' => $attachmentBean->id,
118	118	'name' => $attachmentBean->name,
		@@ -145,8 +145,8 @@ discard block
		block discarded – undo
145	145	);
146	146
147	147	$results = json_encode($results);
148		-if(!$results) {
149		- if(json_last_error()) {
	148	+if (!$results) {
	149	+ if (json_last_error()) {
150	150	$results = array(
151	151	'error' => 'json_encode error: '.json_last_error_msg()
152	152	);

		@@ -1,5 +1,7 @@ discard block
		block discarded – undo
1	1	<?php
2		-if (!defined('sugarEntry') \|\| !sugarEntry) die('Not A Valid Entry Point');
	2	+if (!defined('sugarEntry') \|\| !sugarEntry) {
	3	+ die('Not A Valid Entry Point');
	4	+}
3	5
4	6	function handleAttachmentForRemove() {
5	7	if(!empty($_REQUEST['attachmentsRemove'])) {
		@@ -60,8 +62,7 @@ discard block
		block discarded – undo
60	62	$marketing = BeanFactory::getBean('EmailMarketing', $marketingId);
61	63	$marketing->template_id = $emailTemplateId;
62	64	$marketing->save();
63		- }
64		- else {
	65	+ } else {
65	66	// TODO something is not OK, the selected campaign isn't related to this marketing!!
66	67	$GLOBALS['log']->debug('Selected marketing not found!');
67	68	}
		@@ -75,8 +76,7 @@ discard block
		block discarded – undo
75	76	foreach($bean as $key => $value) {
76	77	if(in_array($key, $fields)) {
77	78	$newBean->$key = $_POST[$key];
78		- }
79		- else if(in_array($key, $fieldsForCopy)) {
	79	+ } else if(in_array($key, $fieldsForCopy)) {
80	80	$newBean->$key = $bean->$key;
81	81	}
82	82	}
		@@ -125,16 +125,14 @@ discard block
		block discarded – undo
125	125	}
126	126	$data['attachments'] = $attachments;
127	127	}
128		- }
129		- else {
	128	+ } else {
130	129	$error = 'Email Template not found.';
131	130	}
132	131	break;
133	132	}
134	133
135	134
136		-}
137		-else {
	135	+} else {
138	136	$error = 'Illegal GUID format.';
139	137	}
140	138

		@@ -40,47 +40,47 @@
		block discarded – undo
40	40	global $current_user;
41	41	$module_name = "Contacts";
42	42	$searchFields['Contacts'] =
43		- array (
44		- 'first_name' => array( 'query_type'=>'default'),
45		- 'last_name'=> array('query_type'=>'default'),
46		- 'search_name'=> array('query_type'=>'default','db_field'=>array('first_name','last_name'),'force_unifiedsearch'=>true),
47		- 'account_name'=> array('query_type'=>'default','db_field'=>array('accounts.name')),
48		- 'lead_source'=> array('query_type'=>'default','operator'=>'=', 'options' => 'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
49		- 'do_not_call'=> array('query_type'=>'default', 'input_type' => 'checkbox', 'operator'=>'='),
50		- 'phone'=> array('query_type'=>'default','db_field'=>array('phone_mobile','phone_work','phone_other','phone_fax','assistant_phone')),
51		- 'email'=> array(
52		- 'query_type' => 'default',
53		- 'operator' => 'subquery',
54		- 'subquery' => 'SELECT eabr.bean_id FROM email_addr_bean_rel eabr JOIN email_addresses ea ON (ea.id = eabr.email_address_id) WHERE eabr.deleted=0 AND ea.email_address LIKE',
55		- 'db_field' => array(
56		- 'id',
57		- ),
58		- ),
	43	+ array (
	44	+ 'first_name' => array( 'query_type'=>'default'),
	45	+ 'last_name'=> array('query_type'=>'default'),
	46	+ 'search_name'=> array('query_type'=>'default','db_field'=>array('first_name','last_name'),'force_unifiedsearch'=>true),
	47	+ 'account_name'=> array('query_type'=>'default','db_field'=>array('accounts.name')),
	48	+ 'lead_source'=> array('query_type'=>'default','operator'=>'=', 'options' => 'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
	49	+ 'do_not_call'=> array('query_type'=>'default', 'input_type' => 'checkbox', 'operator'=>'='),
	50	+ 'phone'=> array('query_type'=>'default','db_field'=>array('phone_mobile','phone_work','phone_other','phone_fax','assistant_phone')),
	51	+ 'email'=> array(
	52	+ 'query_type' => 'default',
	53	+ 'operator' => 'subquery',
	54	+ 'subquery' => 'SELECT eabr.bean_id FROM email_addr_bean_rel eabr JOIN email_addresses ea ON (ea.id = eabr.email_address_id) WHERE eabr.deleted=0 AND ea.email_address LIKE',
	55	+ 'db_field' => array(
	56	+ 'id',
	57	+ ),
	58	+ ),
59	59	'favorites_only' => array(
60	60	'query_type'=>'format',
61	61	'operator' => 'subquery',
62		- 'subquery' => "SELECT favorites.parent_id FROM favorites
	62	+ 'subquery' => "SELECT favorites.parent_id FROM favorites
63	63	WHERE favorites.deleted = 0
64	64	and favorites.parent_type = '".$module_name."'
65	65	and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
66	66	'db_field'=>array('id')),
67		- 'assistant'=> array('query_type'=>'default'),
68		- 'address_street'=> array('query_type'=>'default','db_field'=>array('primary_address_street','alt_address_street')),
69		- 'address_city'=> array('query_type'=>'default','db_field'=>array('primary_address_city','alt_address_city')),
70		- 'address_state'=> array('query_type'=>'default','db_field'=>array('primary_address_state','alt_address_state')),
71		- 'address_postalcode'=> array('query_type'=>'default','db_field'=>array('primary_address_postalcode','alt_address_postalcode')),
72		- 'address_country'=> array('query_type'=>'default','db_field'=>array('primary_address_country','alt_address_country')),
73		- 'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
74		- 'assigned_user_id'=> array('query_type'=>'default'),
	67	+ 'assistant'=> array('query_type'=>'default'),
	68	+ 'address_street'=> array('query_type'=>'default','db_field'=>array('primary_address_street','alt_address_street')),
	69	+ 'address_city'=> array('query_type'=>'default','db_field'=>array('primary_address_city','alt_address_city')),
	70	+ 'address_state'=> array('query_type'=>'default','db_field'=>array('primary_address_state','alt_address_state')),
	71	+ 'address_postalcode'=> array('query_type'=>'default','db_field'=>array('primary_address_postalcode','alt_address_postalcode')),
	72	+ 'address_country'=> array('query_type'=>'default','db_field'=>array('primary_address_country','alt_address_country')),
	73	+ 'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
	74	+ 'assigned_user_id'=> array('query_type'=>'default'),
75	75	'account_id'=> array('query_type'=>'default','db_field'=>array('accounts.id')),
76	76	'campaign_name'=> array('query_type'=>'default'),
77		- //Range Search Support
78		- 'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
79		- 'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
80		- 'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
81		- 'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
82		- 'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
	77	+ //Range Search Support
	78	+ 'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
	79	+ 'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
	80	+ 'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
	81	+ 'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
	82	+ 'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
83	83	'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
84		- //Range Search Support
85		- );
	84	+ //Range Search Support
	85	+ );
86	86	?>

		@@ -40,48 +40,48 @@
		block discarded – undo
40	40	global $current_user;
41	41	$module_name = "Opportunities";
42	42	$searchFields['Opportunities'] =
43		- array (
44		- 'name' => array( 'query_type'=>'default'),
45		- 'account_name'=> array('query_type'=>'default','db_field'=>array('accounts.name')),
46		- 'amount'=> array('query_type'=>'default'),
47		- 'next_step'=> array('query_type'=>'default'),
48		- 'probability'=> array('query_type'=>'default'),
49		- 'lead_source'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
50		- 'opportunity_type'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'opportunity_type_dom', 'template_var' => 'TYPE_OPTIONS'),
51		- 'sales_stage'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'sales_stage_dom', 'template_var' => 'SALES_STAGE_OPTIONS', 'options_add_blank' => true),
52		- 'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
53		- 'assigned_user_id'=> array('query_type'=>'default'),
54		- 'open_only' => array(
55		- 'query_type'=>'default',
56		- 'db_field'=>array('sales_stage'),
57		- 'operator'=>'not in',
58		- 'closed_values' => array('Closed Won', 'Closed Lost'),
59		- 'type'=>'bool',
60		- ),
	43	+ array (
	44	+ 'name' => array( 'query_type'=>'default'),
	45	+ 'account_name'=> array('query_type'=>'default','db_field'=>array('accounts.name')),
	46	+ 'amount'=> array('query_type'=>'default'),
	47	+ 'next_step'=> array('query_type'=>'default'),
	48	+ 'probability'=> array('query_type'=>'default'),
	49	+ 'lead_source'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
	50	+ 'opportunity_type'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'opportunity_type_dom', 'template_var' => 'TYPE_OPTIONS'),
	51	+ 'sales_stage'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'sales_stage_dom', 'template_var' => 'SALES_STAGE_OPTIONS', 'options_add_blank' => true),
	52	+ 'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
	53	+ 'assigned_user_id'=> array('query_type'=>'default'),
	54	+ 'open_only' => array(
	55	+ 'query_type'=>'default',
	56	+ 'db_field'=>array('sales_stage'),
	57	+ 'operator'=>'not in',
	58	+ 'closed_values' => array('Closed Won', 'Closed Lost'),
	59	+ 'type'=>'bool',
	60	+ ),
61	61	'favorites_only' => array(
62	62	'query_type'=>'format',
63	63	'operator' => 'subquery',
64		- 'subquery' => "SELECT favorites.parent_id FROM favorites
	64	+ 'subquery' => "SELECT favorites.parent_id FROM favorites
65	65	WHERE favorites.deleted = 0
66	66	and favorites.parent_type = '".$module_name."'
67	67	and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
68	68	'db_field'=>array('id')),
69	69
70		- //Range Search Support
71		- 'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
72		- 'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
73		- 'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
74		- 'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
75		- 'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
76		- 'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
	70	+ //Range Search Support
	71	+ 'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
	72	+ 'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
	73	+ 'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
	74	+ 'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
	75	+ 'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
	76	+ 'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
77	77
78		- 'range_date_closed' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
79		- 'start_range_date_closed' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
80		- 'end_range_date_closed' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
	78	+ 'range_date_closed' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
	79	+ 'start_range_date_closed' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
	80	+ 'end_range_date_closed' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
81	81
82		- 'range_amount' => array ('query_type' => 'default', 'enable_range_search' => true),
83		- 'start_range_amount' => array ('query_type' => 'default', 'enable_range_search' => true),
84		- 'end_range_amount' => array ('query_type' => 'default', 'enable_range_search' => true),
85		- //Range Search Support
86		- );
	82	+ 'range_amount' => array ('query_type' => 'default', 'enable_range_search' => true),
	83	+ 'start_range_amount' => array ('query_type' => 'default', 'enable_range_search' => true),
	84	+ 'end_range_amount' => array ('query_type' => 'default', 'enable_range_search' => true),
	85	+ //Range Search Support
	86	+ );
87	87	?>

		@@ -107,11 +107,11 @@
		block discarded – undo
107	107	}
108	108
109	109	$typeOfPerson = !empty($_REQUEST['typeOfPerson']) ? $_REQUEST['typeOfPerson'] : 'Lead';
110		- $person = new $typeOfPerson();
111		- $fieldsMetaData = new FieldsMetaData();
112		- $xtpl=new XTemplate ('modules/Campaigns/WebToLeadForm.html');
113		- $xtpl->assign("MOD", $mod_strings);
114		- $xtpl->assign("APP", $app_strings);
	110	+ $person = new $typeOfPerson();
	111	+ $fieldsMetaData = new FieldsMetaData();
	112	+ $xtpl=new XTemplate ('modules/Campaigns/WebToLeadForm.html');
	113	+ $xtpl->assign("MOD", $mod_strings);
	114	+ $xtpl->assign("APP", $app_strings);
115	115
116	116	include_once 'WebToLeadFormBuilder.php';
117	117	$Web_To_Lead_Form_html = WebToLeadFormBuilder::generate(

adamjakab / SuiteCRM

Push — console-installer ( e2b50d...6ce748 )

Status

Category

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

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

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

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

Braces +7 added lines, -9 removed lines patch added patch discarded remove patch

Indentation +301 added lines, -301 removed lines patch added patch discarded remove patch

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

Indentation +33 added lines, -33 removed lines patch added patch discarded remove patch

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

Indentation +34 added lines, -34 removed lines patch added patch discarded remove patch

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

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

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