Merge branch 'Bramas-master' into develop

plugins/check/index.php

@@ -103,27 +103,41 @@ else				echo $error;
 echo(PHP_EOL . PHP_EOL . 'System Information' . PHP_EOL);
 echo('------------------' . PHP_EOL);
 
-# Load json
-$json = file_get_contents(LYCHEE_SRC . 'package.json');
-$json = json_decode($json, true);
-
-# About imagick
-$imagick = extension_loaded('imagick');
-if ($imagick===true)	$imagickVersion = @Imagick::getVersion();
-else					$imagick = '-';
-if (!isset($imagickVersion, $imagickVersion['versionNumber'])||$imagickVersion==='')	$imagickVersion = '-';
-else																					$imagickVersion = $imagickVersion['versionNumber'];
-
-# Output system information
-echo('Lychee Version:  ' . $json['version'] . PHP_EOL);
-echo('DB Version:      ' . $settings['version'] . PHP_EOL);
-echo('System:          ' . PHP_OS . 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);
+# Ensure that user is logged in
+session_start();
+
+if ((isset($_SESSION['login'])&&$_SESSION['login']===true)&&
+	(isset($_SESSION['identifier'])&&$_SESSION['identifier']===$settings['identifier'])) {
+
+	# Load json
+	$json = file_get_contents(LYCHEE_SRC . 'package.json');
+	$json = json_decode($json, true);
+
+	# About imagick
+	$imagick = extension_loaded('imagick');
+	if ($imagick===true)	$imagickVersion = @Imagick::getVersion();
+	else					$imagick = '-';
+	if (!isset($imagickVersion, $imagickVersion['versionNumber'])||$imagickVersion==='')	$imagickVersion = '-';
+	else																					$imagickVersion = $imagickVersion['versionNumber'];
+
+	# Output system information
+	echo('Lychee Version:  ' . $json['version'] . PHP_EOL);
+	echo('DB Version:      ' . $settings['version'] . PHP_EOL);
+	echo('System:          ' . PHP_OS . 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();
+
+}
 
 ?>

plugins/displaylog/index.php

@@ -37,27 +37,45 @@ if (mysqli_connect_errno()!=0) {
 	exit();
 }
 
-# Result
-$query	= Database::prepare($database, "SELECT FROM_UNIXTIME(time), type, function, line, text FROM ?", array(LYCHEE_TABLE_LOG));
-$result	= $database->query($query);
+# Load settings
+$settings = new Settings($database);
+$settings = $settings->get();
 
-# Output
-if ($result->num_rows===0) {
+# Ensure that user is logged in
+session_start();
 
-	echo('Everything looks fine, Lychee has not reported any problems!' . PHP_EOL . PHP_EOL);
+if ((isset($_SESSION['login'])&&$_SESSION['login']===true)&&
+	(isset($_SESSION['identifier'])&&$_SESSION['identifier']===$settings['identifier'])) {
 
-} else {
+	# Result
+	$query	= Database::prepare($database, "SELECT FROM_UNIXTIME(time), type, function, line, text FROM ?", array(LYCHEE_TABLE_LOG));
+	$result	= $database->query($query);
+
+	# Output
+	if ($result->num_rows===0) {
+
+		echo('Everything looks fine, Lychee has not reported any problems!');
+
+	} else {
+
+		while($row = $result->fetch_row()) {
 
-	while($row = $result->fetch_row()) {
+			# Encode result before printing
+			$row = array_map('htmlentities', $row);
 
-		# Encode result before printing
-		$row = array_map("htmlentities", $row);
+			# Format: time TZ - type - function(line) - text
+			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();
+
 }
 
 ?>