Merge branch 'develop' of https://github.com/electerious/Lychee into develop
This commit is contained in:
commit
035c62be76
@ -5,12 +5,6 @@
|
||||
# @copyright 2015 by Tobias Reich
|
||||
###
|
||||
|
||||
@ini_set('max_execution_time', '200');
|
||||
@ini_set('post_max_size', '200M');
|
||||
@ini_set('upload_max_size', '200M');
|
||||
@ini_set('upload_max_filesize', '20M');
|
||||
@ini_set('max_file_uploads', '100');
|
||||
|
||||
if (!empty($_POST['function'])||!empty($_GET['function'])) {
|
||||
|
||||
session_start();
|
||||
@ -96,4 +90,4 @@ if (!empty($_POST['function'])||!empty($_GET['function'])) {
|
||||
|
||||
}
|
||||
|
||||
?>
|
||||
?>
|
||||
|
@ -89,6 +89,12 @@ if (!ini_get('allow_url_fopen')) echo('Warning: You may experience problems with
|
||||
# Check mysql version
|
||||
if ($database->server_version<50500) echo('Warning: Lychee uses the GBK charset to avoid sql injections on your MySQL version. Please update to MySQL 5.5 or higher to enable UTF-8 support.' . PHP_EOL);
|
||||
|
||||
# About GD
|
||||
$gdVersion = gd_info();
|
||||
if (!$gdVersion['JPEG Support']) $error .= ('Error: PHP gd extension without jpeg support' . PHP_EOL);
|
||||
if (!$gdVersion['PNG Support']) $error .= ('Error: PHP gd extension without png support' . PHP_EOL);
|
||||
if (!$gdVersion['GIF Read Support'] || !$gdVersion['GIF Create Support']) $error .= ('Error: PHP gd extension without full gif support' . PHP_EOL);
|
||||
|
||||
# Output
|
||||
if ($error==='') echo('No critical problems found. Lychee should work without problems!' . PHP_EOL);
|
||||
else echo $error;
|
||||
@ -108,9 +114,6 @@ else $imagick = '-';
|
||||
if (!isset($imagickVersion, $imagickVersion['versionNumber'])||$imagickVersion==='') $imagickVersion = '-';
|
||||
else $imagickVersion = $imagickVersion['versionNumber'];
|
||||
|
||||
# About GD
|
||||
$gdVersion = gd_info();
|
||||
|
||||
# Output system information
|
||||
echo('Lychee Version: ' . $json['version'] . PHP_EOL);
|
||||
echo('DB Version: ' . $settings['version'] . PHP_EOL);
|
||||
|
Loading…
Reference in New Issue
Block a user