mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-10-09 20:18:08 +02:00
Code Issues Releases Wiki Activity

Reintroduced filters in File Inspector

Browse Source 
Now supports:

* "Show Core Files"
* "Show Missing Core Files"
* "Show Non Core Files"
* "Show Old Core Files"

Removed support for:

* "Exclude Language-Files"
This commit is contained in:
Nick Liu
2020-03-27 11:55:55 -05:00
parent 00d171473e
commit e9e080afec
1 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
e107_admin/fileinspector.php
View File

@@ -133,7 +133,6 @@ class file_inspector {
'type' =>'list', 'type' =>'list',
'missing' => 0, 'missing' => 0,
'noncore' => 9, 'noncore' => 9,
'nolang' => 1,
'oldcore' => 0, 'oldcore' => 0,
'integrity' => 1, 'integrity' => 1,
'regex' => 0, 'regex' => 0,
@@ -229,7 +228,7 @@ class file_inspector {
$this->root_dir = substr($this->root_dir, 0, -1); $this->root_dir = substr($this->root_dir, 0, -1);
} }
if(isset($_POST['core']) && $_POST['core'] == 'fail') if(isset($_POST['core']) && $_POST['core'] == 'integrity_fail_only')
{ {
$_POST['integrity'] = TRUE; $_POST['integrity'] = TRUE;
} }
@@ -320,7 +319,7 @@ class file_inspector {
<td class='fcaption' colspan='2'>".LAN_OPTIONS."</td> <td class='fcaption' colspan='2'>".LAN_OPTIONS."</td>
</tr>";*/ </tr>";*/
$coreOpts = array('full'=>FC_LAN_6, 'all'=>LAN_ALL, 'none'=> LAN_NONE); $coreOpts = array('integrity_fail_only'=>FC_LAN_6, 'all'=>LAN_ALL, 'none'=> LAN_NONE);
$text .= "<tr> $text .= "<tr>
<td style='width: 35%'> <td style='width: 35%'>
@@ -357,7 +356,6 @@ class file_inspector {
<td colspan='2' style='width: 65%'> <td colspan='2' style='width: 65%'>
<input type='radio' name='noncore' value='1'".(($_POST['noncore'] == '1' || !isset($_POST['noncore'])) ? " checked='checked'" : "")." /> ".LAN_YES."&nbsp;&nbsp; <input type='radio' name='noncore' value='1'".(($_POST['noncore'] == '1' || !isset($_POST['noncore'])) ? " checked='checked'" : "")." /> ".LAN_YES."&nbsp;&nbsp;
<input type='radio' name='noncore' value='0'".($_POST['noncore'] == '0' ? " checked='checked'" : "")." /> ".LAN_NO."&nbsp;&nbsp; <input type='radio' name='noncore' value='0'".($_POST['noncore'] == '0' ? " checked='checked'" : "")." /> ".LAN_NO."&nbsp;&nbsp;
<input type='checkbox' name='nolang' value='1'".(($_POST['nolang'] == '1' || !isset($_POST['nolang'])) ? " checked='checked'" : "")." /> ".FC_LAN_23."&nbsp;&nbsp;
</td> </td>
</tr>"; </tr>";
@@ -597,6 +595,7 @@ class file_inspector {
$nestedFiles = []; $nestedFiles = [];
foreach ($this->files as $relativePath => $validation) foreach ($this->files as $relativePath => $validation)
{ {
if ($this->displayAllowed($validation))
self::array_set($nestedFiles, $relativePath, $validation); self::array_set($nestedFiles, $relativePath, $validation);
} }
return $this->generateDirectoryHtml([SITENAME => $nestedFiles]); return $this->generateDirectoryHtml([SITENAME => $nestedFiles]);
@@ -694,9 +693,9 @@ class file_inspector {
{ {
switch ($status) switch ($status)
{ {
case 'uncalc':
return -2;
case 'unknown': case 'unknown':
return -2;
case 'uncalc':
return -1; return -1;
case 'check': case 'check':
return 0; return 0;
@@ -714,7 +713,7 @@ class file_inspector {
private function getWorstGlyphForFolder($treeFolder) private function getWorstGlyphForFolder($treeFolder)
{ {
$worstStatus = 'uncalc'; $worstStatus = 'unknown';
$worstStatusRank = -PHP_INT_MAX; $worstStatusRank = -PHP_INT_MAX;
array_walk_recursive($treeFolder, function ($value) use (&$worstStatus, &$worstStatusRank) array_walk_recursive($treeFolder, function ($value) use (&$worstStatus, &$worstStatusRank)
{ {
@@ -729,6 +728,28 @@ class file_inspector {
return $this->glyph['folder_' . $worstStatus]; return $this->glyph['folder_' . $worstStatus];
} }
private function displayAllowed($validationCode)
{
if ($this->opt('core') == 'integrity_fail_only' &&
$validationCode & e_file_inspector::VALIDATED)
return false;
elseif ($this->opt('core') == 'none' &&
$validationCode & e_file_inspector::VALIDATED_PATH_VERSION)
return false;
$status = $this->getStatusForValidationCode($validationCode);
switch ($status)
{
case 'missing':
return $this->opt('missing');
case 'unknown':
return $this->opt('noncore');
case 'old':
return $this->opt('oldcore');
}
return true;
}
/** /**
* Set an array item to a given value using "slash" notation. * Set an array item to a given value using "slash" notation.
* *