Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement nginx PHP settings detector

Browse Source
This commit is contained in:
phl0
2024-07-25 14:51:20 +02:00
parent c7121b4cf2
commit 035136f4e6
2 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
install/includes/install_config/install_lib.php
View File

@@ -105,4 +105,20 @@ function log_message($level, $message) {
function customError($errno, $errstr, $errfile, $errline) {
$message = "[$errno] $errstr in $errfile on line $errline";
log_message('error', $message);
}
}
// Detect webserver and version
function detect_webserver() {
return $_SERVER['SERVER_SOFTWARE'] ?? __("not detected");
}
// Detect nginx setting for PHP file processing
function detect_nginx_php_setting() {
$ch = curl_init($http_scheme.'://'.$_SERVER['HTTP_HOST'].'/install/nginx.php/test');
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_HEADER, 0);
$data = curl_exec($ch);
$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
curl_close($ch);
return $code;
}

24
install/index.php
View File

@@ -274,8 +274,28 @@ if (!file_exists('.lock')) {
<td><span class="badge text-bg-info"><?php echo $mariadb_version; ?></span></td>
</tr>
</table>
<p style="margin-top: 10px; margin-bottom: 100px;"><?= __("You can test your MySQL/MariaDB Version in Step 4"); ?></p>
<p style="margin-top: 10px;"><?= __("You can test your MySQL/MariaDB Version in Step 4"); ?></p>
<p class="border-bottom mb-2" style="margin-top: 2rem;"><b><?= __("Web Server"); ?></b></p>
<table width="100%" style="margin-bottom: 25px;">
<tr>
<td><?= __("Version:"); ?> </td>
<td><span class="badge text-bg-info"><?php echo detect_webserver(); ?></span></td>
</tr>
</table>
<?php if (strpos(strtolower($webserver_version), 'nginx') !== false) {
if (detect_nginx_php_setting() != 200) { ?>
<div class="alert alert-warning d-flex flex-column align-items-center" role="alert">
<p class="mb-2 border-bottom"><?= __("Important note for nginx users!"); ?></p>
<p class="mb-0"><?= __("Since you are using nginx as web server please make sure that you have made the changes described in the Wiki before continuing."); ?></p>
<p class="mb-0"><a target="_blank" href="https://github.com/wavelog/Wavelog/wiki/Installation#nginx-configuration">https://github.com/wavelog/Wavelog/wiki/Installation#nginx-configuration</a></p>
</div>
<?php } ?>
<?php } ?>
</div>
</div>
<div class="row justify-content-center" style="margin-top: 3rem;">
<div class="col-md-9 mb-4 mx-auto"> <!-- MySQL / MariaDB -->
<?php if ($prechecks_passed == 'failed') {
$prechecks_icon = "fa-times-circle";
$prechecks_color = "red"; ?>
@@ -1790,4 +1810,4 @@ if (!file_exists('.lock')) {
header("Location: $websiteurl");
} ?>
</html>
</html>