Update file existence checks for 'conf.php' to use __DIR__

mailwatch · Sep 7, 2024 · 1bee4e8 · 1bee4e8
1 parent 3272c67
commit 1bee4e8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/mailscanner/auto-release.php b/mailscanner/auto-release.php
@@ -26,7 +26,7 @@
  */
 
 require_once __DIR__ . '/functions.php';
-if (file_exists('conf.php')) {
+if (file_exists(__DIR__ . '/conf.php')) {
     $output = [];
     if (isset($_GET['mid']) && (isset($_GET['r']) || isset($_GET['amp;r']))) {
         dbconn();

diff --git a/mailscanner/functions.php b/mailscanner/functions.php
@@ -43,7 +43,7 @@
 }
 
 // Read in MailWatch configuration file
-if (!is_readable(__DIR__ . '/conf.php')) {
+if (!file_exists(__DIR__ . '/conf.php') || !is_readable(__DIR__ . '/conf.php')) {
     exit(__('cannot_read_conf'));
 }
 require_once __DIR__ . '/conf.php';

diff --git a/mailscanner/login.php b/mailscanner/login.php
@@ -32,7 +32,7 @@
 
 $_SESSION['token'] = generateToken();
 
-if (file_exists('conf.php') && isset($_GET['error'])) {
+if (file_exists(__DIR__ . '/conf.php') && isset($_GET['error'])) {
     $loginerror = deepSanitizeInput($_GET['error'], 'url');
     if (false === validateInput($loginerror, 'loginerror')) {
         header('Location: login.php');
@@ -84,7 +84,7 @@ function enableTimeoutNotice (timeout){
     <div class="center"><img src=".' . IMAGES_DIR . MW_LOGO . '" alt="' . __('mwlogo99') . '"></div>
     <h1>' . __('mwlogin01') . '</h1>
     <div class="inner-container">';
-if (file_exists('conf.php')) {
+if (file_exists(__DIR__ . '/conf.php')) {
     echo '
         <form name="loginform" class="loginform" method="post" action="checklogin.php" autocomplete="off">
             <fieldset class="hidden" id="sessiontimeout">

diff --git a/mailscanner/password_reset.php b/mailscanner/password_reset.php
@@ -294,7 +294,7 @@
             </div>
             <div class="border-rounded">
                 <h1><?php echo __('title63'); ?></h1>
-                <?php if (file_exists('conf.php')) {
+                <?php if (file_exists(__DIR__ . '/conf.php')) {
                     if ('' !== $fields) {
                         ?>
                         <form name="pwdresetform" class="pwdresetform" method="post" action="<?php echo sanitizeInput($_SERVER['PHP_SELF']); ?>" autocomplete="off">