Merge pull request #4638 from gymad/hotfix-7.8.x_fix_some_php_error

Hotfix 7.8.x - fixing some php error
salesagility · Dec 8, 2017 · 4195c5d · 4195c5d
2 parents 48c67f0 + e1867df
commit 4195c5d
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 22 deletions.
diff --git a/include/SugarFields/Fields/Text/SugarFieldText.php b/include/SugarFields/Fields/Text/SugarFieldText.php
@@ -83,20 +83,20 @@ function getClassicEditView($field_id='description', $value='', $prefix='', $ric
 		return $this->ss->fetch($this->findTemplate('ClassicEditView'));
     }
 
-    function setup($parentFieldArray, $vardef, $displayParams, $tabindex, $twopass=true) {
-       parent::setup($parentFieldArray, $vardef, $displayParams, $tabindex, $twopass);
+    function setup($parentFieldArray, $vardef, $displayParams, $tabindex, $twopass = true) {
+        parent::setup($parentFieldArray, $vardef, $displayParams, $tabindex, $twopass);
         $editor = "";
-        if($vardef['editor'] == "html"){
-            if(!isset($displayParams['htmlescape'])) {
+        if (isset($vardef['editor']) && $vardef['editor'] == "html") {
+            if (!isset($displayParams['htmlescape'])) {
                 $displayParams['htmlescape'] = false;
             }
-            if($_REQUEST['action'] == "EditView") {
+            if ($_REQUEST['action'] == "EditView") {
                 require_once ("include/SugarTinyMCE.php");
                 $tiny = new SugarTinyMCE();
                 $editor = $tiny->getInstance($vardef['name'], 'email_compose_light');
             }
             $this->ss->assign("tinymce", $editor);
-        }else{
+        } else {
             $this->ss->assign("tinymce", $editor);
         }
     }

diff --git a/modules/Campaigns/WizardNewsletter.php b/modules/Campaigns/WizardNewsletter.php
@@ -395,18 +395,23 @@
 
 $targetList = BeanFactory::getBean('ProspectLists')->get_full_list();
 
-$targetListData = array();
-foreach($targetList as $prospectLst) {
-    $nxt = array(
-        'id' => $prospectLst->id,
-        'name' => $prospectLst->name,
-        //'type' => $prospectLst->type,
-        'description' => $prospectLst->description,
-        'type' => $prospectLst->list_type,
-        'count' => $prospectLst->get_entry_count(),
-    );
-    $targetListDataArray[] = $nxt;
-    $targetListDataAssoc[$prospectLst->id] = $nxt;
+$targetListDataArray = array();
+$targetListDataAssoc = array();
+if (isset($targetList) && $targetList) {
+    foreach ($targetList as $prospectLst) {
+        $nxt = array(
+            'id' => $prospectLst->id,
+            'name' => $prospectLst->name,
+            //'type' => $prospectLst->type,
+            'description' => $prospectLst->description,
+            'type' => $prospectLst->list_type,
+            'count' => $prospectLst->get_entry_count(),
+        );
+        $targetListDataArray[] = $nxt;
+        $targetListDataAssoc[$prospectLst->id] = $nxt;
+    }
+} else {
+    $GLOBALS['log']->warn('No target list is created');
 }
 
 

diff --git a/modules/EmailMarketing/EditView.php b/modules/EmailMarketing/EditView.php
@@ -52,9 +52,10 @@
 // global $cal_codes;
 
 $focus = new EmailMarketing();
-if(isset($_REQUEST['record'])) {
-	SugarApplication::redirect('index.php?action=WizardMarketing&module=Campaigns&return_module=Campaigns&return_action=WizardHome&return_id=' . $_REQUEST['parent_id'] . '&campaign_id=' . $_REQUEST['parent_id'] . '&marketing_id=' . $_REQUEST['record'] . '&func=editEmailMarketing');
-	return;
+if (isset($_REQUEST['record']) && $_REQUEST['record'] && isset($_REQUEST['parent_id']) && $_REQUEST['parent_id']) {
+    SugarApplication::redirect('index.php?action=WizardMarketing&module=Campaigns&return_module=Campaigns&return_action=WizardHome&return_id=' . $_REQUEST['parent_id'] . '&campaign_id=' . $_REQUEST['parent_id'] . '&marketing_id=' . $_REQUEST['record'] . '&func=editEmailMarketing');
+    return;
+} else if (isset($_REQUEST['record']) && $_REQUEST['record']) {
     $focus->retrieve($_REQUEST['record']);
 }
 

diff --git a/modules/InboundEmail/Save.php b/modules/InboundEmail/Save.php
@@ -270,7 +270,9 @@
 
     $GLOBALS['log']->debug("Saved record with id of ".$return_id);
 
-
+    if (!isset($error)) {
+        $error = '';
+    }
     header("Location: index.php?module=$return_module&action=$return_action&record=$return_id$edit$error");
 }