M_Viper/ts-website
M_Viper
/
ts-website
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added tip about chmod, when file permission fail

This commit is contained in:
Wruczek 2018-12-30 03:01:01 +01:00
parent 8e606ad331
commit e1e95639ad
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/installer/pages/2.php
View File

@ -11,6 +11,11 @@ if(!empty($_POST["allow-metrics-checkbox"])) {
<div class="card-body"> <div class="card-body">
<h4 class="card-title text-center">Requirements check</h4> <h4 class="card-title text-center">Requirements check</h4>
<div class="alert alert-dark text-center mb-3" id="filePermError" style="display: none">
Looks like you have failed file permission checks. Try running:<br>
<code>sudo chown -R www-data:www-data "<?= realpath(__BASE_DIR) ?>"</code>
</div>
<div class="text-center mb-2"> <div class="text-center mb-2">
<button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#requirementsTableCollapse"> <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#requirementsTableCollapse">
Show details Show details
@ -38,6 +43,11 @@ if(!empty($_POST["allow-metrics-checkbox"])) {
<script> <script>
// Show requirements table on error // Show requirements table on error
$("#requirementsTableCollapse").collapse("show") $("#requirementsTableCollapse").collapse("show")
<?php if(defined("FILE_PERM_ERROR")) { ?>
// Show file permission fix tip
$("#filePermError").show()
<?php } ?>
</script> </script>
<?php } else { ?> <?php } else { ?>
<div class="text-center"> <div class="text-center">
@ -131,13 +141,13 @@ function checkRequirements() {
// file / directory writable checks // file / directory writable checks
{ {
// path => true if file, false if directory // path => true if file, false if directory
$paths = [ $paths = array(
__CONFIG_FILE => true, __CONFIG_FILE => true,
__INSTALLER_LOCK_FILE => true, __INSTALLER_LOCK_FILE => true,
__CACHE_DIR => false, __CACHE_DIR => false,
__CACHE_DIR . "/templates" => false, __CACHE_DIR . "/templates" => false,
__CACHE_DIR . "/servericons" => false, __CACHE_DIR . "/servericons" => false,
]; );
foreach ($paths as $path => $isFile) { foreach ($paths as $path => $isFile) {
$exists = file_exists($path); $exists = file_exists($path);
@ -161,7 +171,13 @@ function checkRequirements() {
if(!$exists) if(!$exists)
$msg = ($isFile ? "File" : "Directory") . " <code>$realpath</code> does not exists, please create it"; $msg = ($isFile ? "File" : "Directory") . " <code>$realpath</code> does not exists, please create it";
showCheckResult("Is <code>$basename</code> writable?", $exists && $writable ? 0 : 2, $msg); $success = $exists && $writable;
if (!$success && !defined("FILE_PERM_ERROR")) {
define("FILE_PERM_ERROR", true);
}
showCheckResult("Is <code>$basename</code> writable?", $success ? 0 : 2, $msg);
} }
} }
@ -232,9 +248,10 @@ function showCheckResult($name, $state, $resulttext) {
} else { } else {
$attr = "fa-times-circle color-danger"; $attr = "fa-times-circle color-danger";
if(!defined("CANNOT_INSTALL")) if(!defined("CANNOT_INSTALL")) {
define("CANNOT_INSTALL", true); define("CANNOT_INSTALL", true);
} }
}
?> ?>
<tr> <tr>