Merge branch 'remastering' of https://git.steelants.cz/SImple-Home/PHP_SMART_HOME_V3 into remastering
This commit is contained in:
commit
5ee1af2571
@ -16,15 +16,7 @@ class Log extends Template
|
||||
$template->prepare('title', 'Log');
|
||||
|
||||
$result = array();
|
||||
$cdir = scandir('../logs/');
|
||||
foreach ($cdir as $key => $value)
|
||||
{
|
||||
if (!in_array($value,array(".","..", ".gitkeep")))
|
||||
{
|
||||
|
||||
$result[$value] = $value;
|
||||
}
|
||||
}
|
||||
$result = $this->logFinder ('../logs/', $result);
|
||||
|
||||
$template->prepare('baseDir', BASEDIR);
|
||||
$template->prepare('debugMod', DEBUGMOD);
|
||||
@ -35,4 +27,20 @@ class Log extends Template
|
||||
|
||||
$template->render();
|
||||
}
|
||||
|
||||
private function logFinder ($dir, $result) {
|
||||
$logFiles = scandir ($dir);
|
||||
foreach ($logFiles as $key => $file) {
|
||||
if (in_array ($file,array (".", "..", ".gitkeep")))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
if (!is_dir($dir . $file)) {
|
||||
$result[$dir][] = $file;
|
||||
} else {
|
||||
$result = $this->logFinder ($dir . $file . "/", $result);
|
||||
}
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
}
|
||||
|
@ -29,7 +29,11 @@
|
||||
<div class="field">
|
||||
<select class="input" name="LogFile">
|
||||
<?php foreach ($LOGSFILES as $key => $value) { ?>
|
||||
<option value="<?php echo $value; ?>"><?php echo $value; ?></option>
|
||||
<optgroup label="<?php echo str_replace("../", "", $key); ?>">
|
||||
<?php foreach ($value as $valueSub) { ?>
|
||||
<option value="<?php echo $key . $valueSub; ?>"><?php echo $valueSub; ?></option>
|
||||
<?php } ?>
|
||||
</optgroup>
|
||||
<?php } ?>
|
||||
</select>
|
||||
</div>
|
||||
@ -39,7 +43,7 @@
|
||||
</form>
|
||||
<?php
|
||||
if (isset($_POST['LogFile'])) {
|
||||
$file_lines = file('../logs/' . $_POST['LogFile']);
|
||||
$file_lines = file($_POST['LogFile']);
|
||||
echo '<pre style="overflow: auto;">';
|
||||
foreach ($file_lines as $line) {
|
||||
echo $line;
|
||||
|
Loading…
Reference in New Issue
Block a user