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

Merge branch 'v2.5' of https://github.com/electerious/Lychee into uploader

Browse Source
This commit is contained in:
Tobias Reich 2014-05-16 23:24:28 +02:00
commit 0a7dce8b09
3 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
php/modules/Import.php
View File

@ -58,11 +58,7 @@ class Import extends Module {
} }
static function server($albumID = 0, $path) { static function move($database, $path) {
global $database, $plugins, $settings;
if (!isset($path)) $path = LYCHEE_UPLOADS_IMPORT;
# Determine OS type and set move cmd (Windows untested!) # Determine OS type and set move cmd (Windows untested!)
$myos = substr(PHP_OS,0,3); $myos = substr(PHP_OS,0,3);
@ -75,7 +71,7 @@ class Import extends Module {
$tmpdirname = md5(time() . rand()); $tmpdirname = md5(time() . rand());
# Make temporary directory # Make temporary directory
if (@mkdir(LYCHEE_DATA . $tmpdirname)===false) { if (@mkdir(LYCHEE_DATA . $tmpdirname)===false) {
Log::error($database, __METHOD__, __LINE__, 'Failed to create temporary directory'); Log::error($database, __METHOD__, __LINE__, 'Failed to create temporary directory');
return false; return false;
} }
@ -107,11 +103,26 @@ class Import extends Module {
return false; return false;
} }
# Set new path
$path = LYCHEE_DATA . $tmpdirname;
return $path;
}
static function server($albumID = 0, $path, $useTemp = false) {
global $database, $plugins, $settings;
if (!isset($path)) $path = LYCHEE_UPLOADS_IMPORT;
if ($useTemp===true) $path = Import::move($database, $path);
$error = false; $error = false;
$contains['photos'] = false; $contains['photos'] = false;
$contains['albums'] = false; $contains['albums'] = false;
$path = LYCHEE_DATA . $tmpdirname; # Get all files
$files = glob($path . '/*'); $files = glob($path . '/*');
foreach ($files as $file) { foreach ($files as $file) {
@ -149,7 +160,11 @@ class Import extends Module {
continue; continue;
} }
Import::server($newAlbumID, $file . '/'); if (Import::server($newAlbumID, $file . '/', false)==='Warning: Folder empty or no readable files to process!') {
$error = true;
Log::error($database, __METHOD__, __LINE__, 'Could not import folder. Function returned error');
continue;
}
$contains['albums'] = true; $contains['albums'] = true;
@ -158,7 +173,9 @@ class Import extends Module {
} }
# Delete tmpdir if import was successful # Delete tmpdir if import was successful
if ($error===false) rmdir(LYCHEE_DATA . $tmpdirname); if ($error===false&&$useTemp===true&&file_exists(LYCHEE_DATA . $tmpdirname)) {
if (@rmdir(LYCHEE_DATA . $tmpdirname)===false) Log::error($database, __METHOD__, __LINE__, 'Could not delete temp-folder (' . LYCHEE_DATA . $tmpdirname . ') after successful import');
}
if ($contains['photos']===false&&$contains['albums']===false) return 'Warning: Folder empty or no readable files to process!'; if ($contains['photos']===false&&$contains['albums']===false) return 'Warning: Folder empty or no readable files to process!';
if ($contains['photos']===false&&$contains['albums']===true) return 'Notice: Import only contains albums!'; if ($contains['photos']===false&&$contains['albums']===true) return 'Notice: Import only contains albums!';

6
php/modules/Photo.php
View File

@ -43,6 +43,12 @@ class Photo extends Module {
# Check dependencies # Check dependencies
$this->dependencies(isset($this->database)); $this->dependencies(isset($this->database));
# Check permissions
if (hasPermissions(LYCHEE_UPLOADS_BIG)===false||hasPermissions(LYCHEE_UPLOADS_THUMB)===false) {
Log::error($this->database, __METHOD__, __LINE__, 'Wrong permissions in uploads/');
exit('Error: Wrong permissions in uploads-folder!');
}
# Call plugins # Call plugins
$this->plugins(__METHOD__, 0, func_get_args()); $this->plugins(__METHOD__, 0, func_get_args());

7
php/modules/misc.php
View File

@ -108,6 +108,13 @@ function get_hashed_password($password) {
} }
function hasPermissions($path, $permissions = '0777') {
if (substr(sprintf('%o', @fileperms($path)), -4)!=$permissions) return false;
else return true;
}
function fastimagecopyresampled(&$dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h, $quality = 4) { function fastimagecopyresampled(&$dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h, $quality = 4) {
### ###