Updated #421 syntax

pull/444/head
Tobias Reich 9 years ago
parent 68e992bb18
commit 2a0212e33a

@ -99,43 +99,45 @@ if (!$gdVersion['GIF Read Support'] || !$gdVersion['GIF Create Support']) $error
if ($error==='') echo('No critical problems found. Lychee should work without problems!' . PHP_EOL); if ($error==='') echo('No critical problems found. Lychee should work without problems!' . PHP_EOL);
else echo $error; else echo $error;
# Don't go further if the user is not connected
session_start();
$isAdmin = ((isset($_SESSION['login'])&&$_SESSION['login']===true)&&
(isset($_SESSION['identifier'])&&$_SESSION['identifier']===$settings['identifier']));
if(!$isAdmin)
{
echo(PHP_EOL . PHP_EOL . 'You have to be logged in to see more information.');
exit();
}
# Show separator # Show separator
echo(PHP_EOL . PHP_EOL . 'System Information' . PHP_EOL); echo(PHP_EOL . PHP_EOL . 'System Information' . PHP_EOL);
echo('------------------' . PHP_EOL); echo('------------------' . PHP_EOL);
# Load json # Ensure that user is logged in
$json = file_get_contents(LYCHEE_SRC . 'package.json'); session_start();
$json = json_decode($json, true);
if ((isset($_SESSION['login'])&&$_SESSION['login']===true)&&
# About imagick (isset($_SESSION['identifier'])&&$_SESSION['identifier']===$settings['identifier'])) {
$imagick = extension_loaded('imagick');
if ($imagick===true) $imagickVersion = @Imagick::getVersion(); # Load json
else $imagick = '-'; $json = file_get_contents(LYCHEE_SRC . 'package.json');
if (!isset($imagickVersion, $imagickVersion['versionNumber'])||$imagickVersion==='') $imagickVersion = '-'; $json = json_decode($json, true);
else $imagickVersion = $imagickVersion['versionNumber'];
# About imagick
# Output system information $imagick = extension_loaded('imagick');
echo('Lychee Version: ' . $json['version'] . PHP_EOL); if ($imagick===true) $imagickVersion = @Imagick::getVersion();
echo('DB Version: ' . $settings['version'] . PHP_EOL); else $imagick = '-';
echo('System: ' . PHP_OS . PHP_EOL); if (!isset($imagickVersion, $imagickVersion['versionNumber'])||$imagickVersion==='') $imagickVersion = '-';
echo('PHP Version: ' . floatval(phpversion()) . PHP_EOL); else $imagickVersion = $imagickVersion['versionNumber'];
echo('MySQL Version: ' . $database->server_version . PHP_EOL);
echo('Imagick: ' . $imagick . PHP_EOL); # Output system information
echo('Imagick Active: ' . $settings['imagick'] . PHP_EOL); echo('Lychee Version: ' . $json['version'] . PHP_EOL);
echo('Imagick Version: ' . $imagickVersion . PHP_EOL); echo('DB Version: ' . $settings['version'] . PHP_EOL);
echo('GD Version: ' . $gdVersion['GD Version'] . PHP_EOL); echo('System: ' . PHP_OS . PHP_EOL);
echo('Plugins: ' . $settings['plugins'] . PHP_EOL); echo('PHP Version: ' . floatval(phpversion()) . PHP_EOL);
echo('MySQL Version: ' . $database->server_version . PHP_EOL);
echo('Imagick: ' . $imagick . PHP_EOL);
echo('Imagick Active: ' . $settings['imagick'] . PHP_EOL);
echo('Imagick Version: ' . $imagickVersion . PHP_EOL);
echo('GD Version: ' . $gdVersion['GD Version'] . PHP_EOL);
echo('Plugins: ' . $settings['plugins'] . PHP_EOL);
} else {
# Don't go further if the user is not logged in
echo('You have to be logged in to see more information.');
exit();
}
?> ?>

@ -41,38 +41,41 @@ if (mysqli_connect_errno()!=0) {
$settings = new Settings($database); $settings = new Settings($database);
$settings = $settings->get(); $settings = $settings->get();
# Check if the user is connected # Ensure that user is logged in
session_start(); session_start();
$isAdmin = ((isset($_SESSION['login'])&&$_SESSION['login']===true)&&
(isset($_SESSION['identifier'])&&$_SESSION['identifier']===$settings['identifier']));
if(!$isAdmin) if ((isset($_SESSION['login'])&&$_SESSION['login']===true)&&
{ (isset($_SESSION['identifier'])&&$_SESSION['identifier']===$settings['identifier'])) {
exit('You have to be logged in to see the log.');
}
# Result
$query = Database::prepare($database, "SELECT FROM_UNIXTIME(time), type, function, line, text FROM ?", array(LYCHEE_TABLE_LOG));
$result = $database->query($query);
# Result # Output
$query = Database::prepare($database, "SELECT FROM_UNIXTIME(time), type, function, line, text FROM ?", array(LYCHEE_TABLE_LOG)); if ($result->num_rows===0) {
$result = $database->query($query);
# Output echo('Everything looks fine, Lychee has not reported any problems!');
if ($result->num_rows===0) {
echo('Everything looks fine, Lychee has not reported any problems!' . PHP_EOL . PHP_EOL); } else {
} else { while($row = $result->fetch_row()) {
while($row = $result->fetch_row()) { # Encode result before printing
$row = array_map('htmlentities', $row);
# Encode result before printing # Format: time TZ - type - function(line) - text
$row = array_map("htmlentities", $row); printf ("%s - %s - %s (%s) \t- %s\n", $row[0], $row[1], $row[2], $row[3], $row[4]);
# Format: time TZ - type - function(line) - text }
printf ("%s %s - %s - %s (%s) \t- %s\n", $row[0], date_default_timezone_get(), $row[1], $row[2], $row[3], $row[4]);
} }
} else {
# Don't go further if the user is not logged in
echo('You have to be logged in to see the log.');
exit();
} }
?> ?>

Loading…
Cancel
Save