diff --git a/extension/Source/core/report/SendMail.php b/extension/Source/core/report/SendMail.php index 10d42c9ad64c422547aab6263c7f15805459a136..62698a17053740b8697c5cb65f4ac8b487771ae1 100644 --- a/extension/Source/core/report/SendMail.php +++ b/extension/Source/core/report/SendMail.php @@ -163,7 +163,7 @@ class SendMail { $logFile = $this->store->getVar(SYSTEM_MAIL_LOG, STORE_SYSTEM); if ($logFile != '' && $logFile !== false) { - $args[] = '-l "' . $logFile . '"';; + $args[] = '-l "' . $logFile . '"'; } if (!empty($mailConfig[SENDMAIL_TOKEN_RECEIVER_CC])) { diff --git a/extension/Source/core/store/Store.php b/extension/Source/core/store/Store.php index 8460533faf4e68ec250db29530f796201b390ff9..e663a3780cc2b2a8605ba3bddb5db30c3786246d 100644 --- a/extension/Source/core/store/Store.php +++ b/extension/Source/core/store/Store.php @@ -300,6 +300,14 @@ class Store { $config[SYSTEM_SEND_E_MAIL] = $config[SYSTEM_EXT_PATH] . '/Source/external/sendEmail'; + // Make path absolute + foreach ([SYSTEM_MAIL_LOG, SYSTEM_QFQ_LOG, SYSTEM_SQL_LOG] AS $key) { + if (!empty($config[$key]) && $config[$key][0] != '/') { + $config[$key] = $config[SYSTEM_SITE_PATH] . '/' . $config[$key]; + } + } + + // In case the database credentials are given in the old style: copy them to the new style if (!isset($config[SYSTEM_DB_1_USER]) && isset($config[SYSTEM_DB_USER])) { $config[SYSTEM_DB_1_USER] = $config[SYSTEM_DB_USER]; @@ -685,7 +693,7 @@ class Store { $len = strlen(SIP_PREFIX_BASE64); - while ($useStores !== false && $useStores!=='') { + while ($useStores !== false && $useStores !== '') { $store = $useStores[0]; // current store $finalKey = $key;