arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #8 from electerious/develop

Browse Source 
Develop
This commit is contained in:
Quentin Ligier 2016-04-27 09:07:18 +02:00
commit a27a4f96f0
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/FAQ.md
View File

@ -2,10 +2,10 @@
If Lychee is not working properly, try to open `plugins/Diagnostics/index.php`. This script will display all errors it can find. If Lychee is not working properly, try to open `plugins/Diagnostics/index.php`. This script will display all errors it can find.
#### What do I need to run Lychee on my server? #### What do I need to run Lychee on my server?
To run Lychee, everything you need is a web-server with PHP 5.3 or later and a MySQL-Database. To run Lychee, everything you need is a web-server with PHP 5.5 or later and a MySQL-Database.
#### I can't upload photos #### I can't upload photos
If you experience problems uploading large photos, you might want to change the PHP parameters in `.htaccess` (if you are using the PHP Apache module) or in `.user.ini` (if you are using PHP >= 5.3 with CGI or FastCGI). If you experience problems uploading large photos, you might want to change the PHP parameters in `.htaccess` (if you are using the PHP Apache module) or in `.user.ini` (if you are using PHP >= 5.5 with CGI or FastCGI).
If possible, change these settings directly in your `php.ini`. We recommend to increase the values of the following properties: If possible, change these settings directly in your `php.ini`. We recommend to increase the values of the following properties:

11
php/Modules/Database.php
View File

@ -56,7 +56,7 @@ final class Database {
$connection = self::connect($host, $user, $password); $connection = self::connect($host, $user, $password);
// Check if the connection was successful // Check if the connection was successful
if ($connection===false) Response::error($connection->connect_error); if ($connection===false) Response::error(self::connect_error());
if (self::setCharset($connection)===false) Response::error('Could not set database charset!'); if (self::setCharset($connection)===false) Response::error('Could not set database charset!');
@ -90,6 +90,15 @@ final class Database {
} }
/**
* @return string Returns the string description of the last connect error
*/
private static function connect_error() {
return mysqli_connect_error();
}
/** /**
* @return boolean Returns true when successful. * @return boolean Returns true when successful.
*/ */

4
php/Modules/Photo.php
View File

@ -741,7 +741,7 @@ final class Photo {
$return['focal'] = ''; $return['focal'] = '';
$return['takestamp'] = 0; $return['takestamp'] = 0;
$return['lens'] = ''; $return['lens'] = '';
$return['tags'] = array(); $return['tags'] = '';
$return['position'] = ''; $return['position'] = '';
$return['latitude'] = ''; $return['latitude'] = '';
$return['longitude'] = ''; $return['longitude'] = '';
@ -783,7 +783,7 @@ final class Photo {
} }
// Read EXIF // Read EXIF
if ($info['mime']=='image/jpeg') $exif = exif_read_data($url, 'EXIF', 0); if ($info['mime']=='image/jpeg') $exif = @exif_read_data($url, 'EXIF', false, false);
else $exif = false; else $exif = false;
// EXIF Metadata // EXIF Metadata