fixing travis error

andrewwshka · Jul 30, 2019 · a205b4f · a205b4f
1 parent c058136
commit a205b4f
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 19 deletions.
diff --git a/Api/Core/Config/ApiConfig.php b/Api/Core/Config/ApiConfig.php
@@ -18,7 +18,7 @@ class ApiConfig
 
     const OAUTH2_PRIVATE_KEY = 'Api/V8/OAuth2/private.key';
     const OAUTH2_PUBLIC_KEY = 'Api/V8/OAuth2/public.key';
-    const OAUTH2_ENCRYPTION_KEY = '';
+    const OAUTH2_ENCRYPTION_KEY = 'YDYMf29FrB1KlDUIC5ZKpJEARIomtRLBxew5WpLVo4w=';
 
     /**
      *

diff --git a/include/Dashlets/DashletGenericChart.php b/include/Dashlets/DashletGenericChart.php
@@ -172,7 +172,11 @@ public function displayScript()
     {
         require_once('include/SugarCharts/SugarChartFactory.php');
         $sugarChart = SugarChartFactory::getInstance();
-        return $sugarChart->getDashletScript($this->id);
+        if ($sugarChart) {
+            return $sugarChart->getDashletScript($this->id);
+        } else {
+            return null;
+        }
     }
 
     /**

diff --git a/include/MySugar/retrieve_dash_page.php b/include/MySugar/retrieve_dash_page.php
@@ -330,15 +330,18 @@
 //custom chart code
 require_once('include/SugarCharts/SugarChartFactory.php');
 $sugarChart = SugarChartFactory::getInstance();
-$resources = $sugarChart->getChartResources();
-$mySugarResources = $sugarChart->getMySugarChartResources();
-$sugar_smarty->assign('chartResources', $resources);
-$sugar_smarty->assign('mySugarChartResources', $mySugarResources);
+if ($sugarChart) {
+    $resources = $sugarChart->getChartResources();
+    $mySugarResources = $sugarChart->getMySugarChartResources();
+    $sugar_smarty->assign('chartResources', $resources);
+    $sugar_smarty->assign('mySugarChartResources', $mySugarResources);
+}
 if (file_exists("custom/include/MySugar/tpls/MySugar2.tpl")) {
     echo $sugar_smarty->fetch('custom/include/MySugar/tpls/MySugar2.tpl');
 } else {
     echo $sugar_smarty->fetch('include/MySugar/tpls/MySugar2.tpl');
 }
 
+
 //init the quickEdit listeners after the dashlets have loaded on home page the first time
 echo"<script>if(typeof(qe_init) != 'undefined'){qe_init();}</script>";
diff --git a/include/SugarCharts/SugarChartFactory.php b/include/SugarCharts/SugarChartFactory.php
@@ -78,13 +78,21 @@ public static function getInstance(
             if (file_exists($file)) {
                 require_once($file);
             } else {
-                $GLOBALS['log']->debug("using default engine include/SugarCharts/".$defaultEngine."/".$defaultEngine.$module.".php");
-                require_once("include/SugarCharts/".$defaultEngine."/".$defaultEngine.$module.".php");
-                $chartEngine = $defaultEngine;
+                $defaultFile = "include/SugarCharts/".$defaultEngine."/".$defaultEngine.$module.".php";
+                $GLOBALS['log']->debug("using default engine $defaultFile");
+                if (file_exists($defaultFile)) {
+                    require_once($defaultFile);
+                    $chartEngine = $defaultEngine;
+                }
             }
         }
 
         $className = $chartEngine.$module;
-        return new $className();
+        if (class_exists($className)) {
+            return new $className();
+        } else {
+            LoggerManager::getLogger()->fatal('Chart class not found.');
+            return null;
+        }
     }
 }
diff --git a/modules/Campaigns/Charts.php b/modules/Campaigns/Charts.php
@@ -69,6 +69,9 @@ public function campaign_response_by_activity_type($datay= array(), $targets=arr
 
         if ($campaign_id) {
             $sugarChart = SugarChartFactory::getInstance('', 'Reports');
+            if (!$sugarChart) {
+                return false;
+            }
             $xmlFile = $sugarChart->getXMLFileName($campaign_id);
 
             if (!file_exists($xmlFile) || $refresh == true) {
@@ -332,6 +335,9 @@ public function campaign_response_by_activity_type($datay= array(), $targets=arr
 
 
         $sugarChart = SugarChartFactory::getInstance();
+        if (!$sugarChart) {
+            return false;
+        }
         $sugarChart->is_currency = true;
         $sugarChart->currency_symbol = $currency_symbol;
 
@@ -485,6 +491,9 @@ public function campaign_response_roi_data($datay= array(), $targets=array(), $c
 
 
         $sugarChart = SugarChartFactory::getInstance();
+        if (!$sugarChart) {
+            return false;
+        }
         $sugarChart->is_currency = true;
         $sugarChart->currency_symbol = $currency_symbol;
 

diff --git a/modules/Campaigns/RoiDetailView.php b/modules/Campaigns/RoiDetailView.php
@@ -212,7 +212,9 @@
     //custom chart code
     require_once('include/SugarCharts/SugarChartFactory.php');
     $sugarChart = SugarChartFactory::getInstance();
-    $resources = $sugarChart->getChartResources();
-    $smarty->assign('chartResources', $resources);
+    if ($sugarChart) {
+        $resources = $sugarChart->getChartResources();
+        $smarty->assign('chartResources', $resources);
+    }
 
 echo $smarty->fetch('modules/Campaigns/RoiDetailView.tpl');
diff --git a/modules/Campaigns/TrackDetailView.php b/modules/Campaigns/TrackDetailView.php
@@ -227,8 +227,10 @@
 //custom chart code
     require_once('include/SugarCharts/SugarChartFactory.php');
     $sugarChart = SugarChartFactory::getInstance();
-    $resources = $sugarChart->getChartResources();
-    $smarty->assign('chartResources', $resources);
+    if ($sugarChart) {
+        $resources = $sugarChart->getChartResources();
+        $smarty->assign('chartResources', $resources);
+    }
 
 echo $smarty->fetch('modules/Campaigns/TrackDetailView.tpl');
 

diff --git a/modules/Home/Dashlets/ChartsDashlet/ChartsDashlet.php b/modules/Home/Dashlets/ChartsDashlet/ChartsDashlet.php
@@ -159,7 +159,7 @@ public function displayScript()
             $reporter->saved_report_id = $chartReport->id;
             $xmlFile = get_cache_file_name($reporter);
 
-            $str = $sugarChart->getDashletScript($this->id, $xmlFile);
+            $str = $sugarChart ? $sugarChart->getDashletScript($this->id, $xmlFile) : '';
             return $str;
         }
     }

diff --git a/modules/Home/index.php b/modules/Home/index.php
@@ -313,10 +313,12 @@
 
 require_once('include/SugarCharts/SugarChartFactory.php');
 $sugarChart = SugarChartFactory::getInstance();
-$resources = $sugarChart->getChartResources();
-$mySugarResources = $sugarChart->getMySugarChartResources();
-$sugar_smarty->assign('chartResources', $resources);
-$sugar_smarty->assign('mySugarChartResources', $mySugarResources);
+if ($sugarChart) {
+    $resources = $sugarChart->getChartResources();
+    $mySugarResources = $sugarChart->getMySugarChartResources();
+    $sugar_smarty->assign('chartResources', $resources);
+    $sugar_smarty->assign('mySugarChartResources', $mySugarResources);
+}
 
 if (file_exists('custom/themes/' . $theme . '/tpls/MySugar.tpl')) {
     echo $sugar_smarty->fetch('custom/themes/' . $theme . '/tpls/MySugar.tpl');