|
|
@@ -16,19 +16,19 @@ function upload($files, $albumID) {
|
|
|
switch($albumID) {
|
|
|
// s for public (share)
|
|
|
case 's':
|
|
|
- $public = 1;
|
|
|
- $star = 0;
|
|
|
- $albumID = 0;
|
|
|
+ $public = 1;
|
|
|
+ $star = 0;
|
|
|
+ $albumID = 0;
|
|
|
break;
|
|
|
// f for starred (fav)
|
|
|
case 'f':
|
|
|
- $star = 1;
|
|
|
- $public = 0;
|
|
|
- $albumID = 0;
|
|
|
+ $star = 1;
|
|
|
+ $public = 0;
|
|
|
+ $albumID = 0;
|
|
|
break;
|
|
|
default:
|
|
|
- $star = 0;
|
|
|
- $public = 0;
|
|
|
+ $star = 0;
|
|
|
+ $public = 0;
|
|
|
}
|
|
|
|
|
|
foreach ($files as $file) {
|
|
|
@@ -41,15 +41,15 @@ function upload($files, $albumID) {
|
|
|
$id = str_replace('.', '', microtime(true));
|
|
|
while(strlen($id)<14) $id .= 0;
|
|
|
|
|
|
- $tmp_name = $file['tmp_name'];
|
|
|
- $extension = array_reverse(explode('.', $file['name']));
|
|
|
- $extension = $extension[0];
|
|
|
- $photo_name = md5($id) . ".$extension";
|
|
|
+ $tmp_name = $file['tmp_name'];
|
|
|
+ $extension = array_reverse(explode('.', $file['name']));
|
|
|
+ $extension = $extension[0];
|
|
|
+ $photo_name = md5($id) . ".$extension";
|
|
|
|
|
|
// Import if not uploaded via web
|
|
|
if (!is_uploaded_file($tmp_name)) {
|
|
|
if (copy($tmp_name, '../uploads/big/' . $photo_name)) {
|
|
|
- unlink($tmp_name);
|
|
|
+ @unlink($tmp_name);
|
|
|
$import_name = $tmp_name;
|
|
|
}
|
|
|
} else {
|
|
|
@@ -63,7 +63,7 @@ function upload($files, $albumID) {
|
|
|
// Use title of file if IPTC title missing
|
|
|
if ($info['title']===''&&
|
|
|
$settings['importFilename']==='1')
|
|
|
- $info['title'] = mysqli_real_escape_string($database, substr(str_replace(".$extension", '', $file['name']), 0, 30));
|
|
|
+ $info['title'] = mysqli_real_escape_string($database, substr(basename($file['name'], ".$extension"), 0, 30));
|
|
|
|
|
|
// Set orientation based on EXIF data
|
|
|
if ($file['type']==='image/jpeg'&&isset($info['orientation'])&&isset($info['width'])&&isset($info['height'])) {
|
|
|
@@ -167,16 +167,16 @@ function getInfo($filename) {
|
|
|
|
|
|
global $database;
|
|
|
|
|
|
- $url = '../uploads/big/' . $filename;
|
|
|
- $iptcArray = array();
|
|
|
- $info = getimagesize($url, $iptcArray);
|
|
|
+ $url = '../uploads/big/' . $filename;
|
|
|
+ $iptcArray = array();
|
|
|
+ $info = getimagesize($url, $iptcArray);
|
|
|
|
|
|
// General information
|
|
|
- $return['type'] = $info['mime'];
|
|
|
- $return['width'] = $info[0];
|
|
|
- $return['height'] = $info[1];
|
|
|
- $return['date'] = date('d.m.Y', filectime($url));
|
|
|
- $return['time'] = date('H:i:s', filectime($url));
|
|
|
+ $return['type'] = $info['mime'];
|
|
|
+ $return['width'] = $info[0];
|
|
|
+ $return['height'] = $info[1];
|
|
|
+ $return['date'] = date('d.m.Y', filectime($url));
|
|
|
+ $return['time'] = date('H:i:s', filectime($url));
|
|
|
|
|
|
// Size
|
|
|
$size = filesize($url)/1024;
|
|
|
@@ -184,8 +184,8 @@ function getInfo($filename) {
|
|
|
else $return['size'] = round($size, 1) . ' KB';
|
|
|
|
|
|
// IPTC Metadata Fallback
|
|
|
- $return['title'] = '';
|
|
|
- $return['description'] = '';
|
|
|
+ $return['title'] = '';
|
|
|
+ $return['description'] = '';
|
|
|
|
|
|
// IPTC Metadata
|
|
|
if(isset($iptcArray['APP13'])) {
|
|
|
@@ -193,10 +193,10 @@ function getInfo($filename) {
|
|
|
$iptcInfo = iptcparse($iptcArray['APP13']);
|
|
|
if (is_array($iptcInfo)) {
|
|
|
|
|
|
- $temp = $iptcInfo['2#105'][0];
|
|
|
+ $temp = @$iptcInfo['2#105'][0];
|
|
|
if (isset($temp)&&strlen($temp)>0) $return['title'] = $temp;
|
|
|
|
|
|
- $temp = $iptcInfo['2#120'][0];
|
|
|
+ $temp = @$iptcInfo['2#120'][0];
|
|
|
if (isset($temp)&&strlen($temp)>0) $return['description'] = $temp;
|
|
|
|
|
|
}
|
|
|
@@ -204,46 +204,48 @@ function getInfo($filename) {
|
|
|
}
|
|
|
|
|
|
// EXIF Metadata Fallback
|
|
|
- $return['orientation'] = '';
|
|
|
- $return['iso'] = '';
|
|
|
- $return['aperture'] = '';
|
|
|
- $return['make'] = '';
|
|
|
- $return['model'] = '';
|
|
|
- $return['shutter'] = '';
|
|
|
- $return['focal'] = '';
|
|
|
- $return['takeDate'] = '';
|
|
|
- $return['takeTime'] = '';
|
|
|
+ $return['orientation'] = '';
|
|
|
+ $return['iso'] = '';
|
|
|
+ $return['aperture'] = '';
|
|
|
+ $return['make'] = '';
|
|
|
+ $return['model'] = '';
|
|
|
+ $return['shutter'] = '';
|
|
|
+ $return['focal'] = '';
|
|
|
+ $return['takeDate'] = '';
|
|
|
+ $return['takeTime'] = '';
|
|
|
+
|
|
|
+ // Read EXIF
|
|
|
+ if ($info['mime']=='image/jpeg') $exif = exif_read_data($url, 'EXIF', 0);
|
|
|
+ else $exif = false;
|
|
|
|
|
|
// EXIF Metadata
|
|
|
- if ($info['mime']=='image/jpeg'&&function_exists('exif_read_data')&&@exif_read_data($url, 'EXIF', 0)) {
|
|
|
-
|
|
|
- $exif = exif_read_data($url, 'EXIF', 0);
|
|
|
+ if ($exif!==false) {
|
|
|
|
|
|
- $temp = $exif['Orientation'];
|
|
|
+ $temp = @$exif['Orientation'];
|
|
|
if (isset($temp)) $return['orientation'] = $temp;
|
|
|
|
|
|
- $temp = $exif['ISOSpeedRatings'];
|
|
|
+ $temp = @$exif['ISOSpeedRatings'];
|
|
|
if (isset($temp)) $return['iso'] = $temp;
|
|
|
|
|
|
- $temp = $exif['COMPUTED']['ApertureFNumber'];
|
|
|
+ $temp = @$exif['COMPUTED']['ApertureFNumber'];
|
|
|
if (isset($temp)) $return['aperture'] = $temp;
|
|
|
|
|
|
- $temp = $exif['Make'];
|
|
|
+ $temp = @$exif['Make'];
|
|
|
if (isset($temp)) $return['make'] = $exif['Make'];
|
|
|
|
|
|
- $temp = $exif['Model'];
|
|
|
+ $temp = @$exif['Model'];
|
|
|
if (isset($temp)) $return['model'] = $temp;
|
|
|
|
|
|
- $temp = $exif['ExposureTime'];
|
|
|
+ $temp = @$exif['ExposureTime'];
|
|
|
if (isset($temp)) $return['shutter'] = $exif['ExposureTime'] . ' Sec.';
|
|
|
|
|
|
- $temp = $exif['FocalLength'];
|
|
|
+ $temp = @$exif['FocalLength'];
|
|
|
if (isset($temp)) $return['focal'] = ($temp/1) . ' mm';
|
|
|
|
|
|
- $temp = $exif['DateTimeOriginal'];
|
|
|
+ $temp = @$exif['DateTimeOriginal'];
|
|
|
if (isset($temp)) {
|
|
|
- $exifDate = explode(' ', $temp);
|
|
|
- $date = explode(':', $exifDate[0]);
|
|
|
+ $exifDate = explode(' ', $temp);
|
|
|
+ $date = explode(':', $exifDate[0]);
|
|
|
$return['takeDate'] = $date[2].'.'.$date[1].'.'.$date[0];
|
|
|
$return['takeTime'] = $exifDate[1];
|
|
|
}
|
|
|
@@ -261,24 +263,24 @@ function createThumb($filename, $width = 200, $height = 200) {
|
|
|
|
|
|
global $settings;
|
|
|
|
|
|
- $url = "../uploads/big/$filename";
|
|
|
- $info = getimagesize($url);
|
|
|
+ $url = "../uploads/big/$filename";
|
|
|
+ $info = getimagesize($url);
|
|
|
|
|
|
- $photoName = explode(".", $filename);
|
|
|
- $newUrl = "../uploads/thumb/$photoName[0].jpeg";
|
|
|
- $newUrl2x = "../uploads/thumb/$photoName[0]@2x.jpeg";
|
|
|
+ $photoName = explode(".", $filename);
|
|
|
+ $newUrl = "../uploads/thumb/$photoName[0].jpeg";
|
|
|
+ $newUrl2x = "../uploads/thumb/$photoName[0]@2x.jpeg";
|
|
|
|
|
|
// Set position and size
|
|
|
$thumb = imagecreatetruecolor($width, $height);
|
|
|
$thumb2x = imagecreatetruecolor($width*2, $height*2);
|
|
|
if ($info[0]<$info[1]) {
|
|
|
- $newSize = $info[0];
|
|
|
- $startWidth = 0;
|
|
|
- $startHeight = $info[1]/2 - $info[0]/2;
|
|
|
+ $newSize = $info[0];
|
|
|
+ $startWidth = 0;
|
|
|
+ $startHeight = $info[1]/2 - $info[0]/2;
|
|
|
} else {
|
|
|
- $newSize = $info[1];
|
|
|
- $startWidth = $info[0]/2 - $info[1]/2;
|
|
|
- $startHeight = 0;
|
|
|
+ $newSize = $info[1];
|
|
|
+ $startWidth = $info[0]/2 - $info[1]/2;
|
|
|
+ $startHeight = 0;
|
|
|
}
|
|
|
|
|
|
// Fallback for older version
|
|
|
@@ -286,10 +288,10 @@ function createThumb($filename, $width = 200, $height = 200) {
|
|
|
|
|
|
// Create new image
|
|
|
switch($info['mime']) {
|
|
|
- case 'image/jpeg': $sourceImg = imagecreatefromjpeg($url); break;
|
|
|
- case 'image/png': $sourceImg = imagecreatefrompng($url); break;
|
|
|
- case 'image/gif': $sourceImg = imagecreatefromgif($url); break;
|
|
|
- case 'image/webp': $sourceImg = imagecreatefromwebp($url); break;
|
|
|
+ case 'image/jpeg': $sourceImg = imagecreatefromjpeg($url); break;
|
|
|
+ case 'image/png': $sourceImg = imagecreatefrompng($url); break;
|
|
|
+ case 'image/gif': $sourceImg = imagecreatefromgif($url); break;
|
|
|
+ case 'image/webp': $sourceImg = imagecreatefromwebp($url); break;
|
|
|
default: return false;
|
|
|
}
|
|
|
|
|
|
@@ -303,21 +305,19 @@ function createThumb($filename, $width = 200, $height = 200) {
|
|
|
|
|
|
}
|
|
|
|
|
|
-function importPhoto($name, $albumID = 0) {
|
|
|
+function importPhoto($path, $albumID = 0) {
|
|
|
|
|
|
- $tmp_name = "../uploads/import/$name";
|
|
|
- $info = getimagesize($tmp_name);
|
|
|
- $size = filesize($tmp_name);
|
|
|
- $nameFile = array(array());
|
|
|
- $nameFile[0]['name'] = $name;
|
|
|
- $nameFile[0]['type'] = $info['mime'];
|
|
|
- $nameFile[0]['tmp_name'] = $tmp_name;
|
|
|
- $nameFile[0]['error'] = 0;
|
|
|
- $nameFile[0]['size'] = $size;
|
|
|
-
|
|
|
- if (upload($nameFile, $albumID)) return true;
|
|
|
+ $info = getimagesize($path);
|
|
|
+ $size = filesize($path);
|
|
|
+
|
|
|
+ $nameFile = array(array());
|
|
|
+ $nameFile[0]['name'] = $path;
|
|
|
+ $nameFile[0]['type'] = $info['mime'];
|
|
|
+ $nameFile[0]['tmp_name'] = $path;
|
|
|
+ $nameFile[0]['error'] = 0;
|
|
|
+ $nameFile[0]['size'] = $size;
|
|
|
|
|
|
- return false;
|
|
|
+ return upload($nameFile, $albumID);
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -338,6 +338,7 @@ function importUrl($url, $albumID = 0) {
|
|
|
$pathinfo = pathinfo($key);
|
|
|
$filename = $pathinfo['filename'].".".$pathinfo['extension'];
|
|
|
$tmp_name = "../uploads/import/$filename";
|
|
|
+
|
|
|
copy($key, $tmp_name);
|
|
|
|
|
|
}
|
|
|
@@ -357,7 +358,9 @@ function importUrl($url, $albumID = 0) {
|
|
|
$pathinfo = pathinfo($url);
|
|
|
$filename = $pathinfo['filename'].".".$pathinfo['extension'];
|
|
|
$tmp_name = "../uploads/import/$filename";
|
|
|
+
|
|
|
copy($url, $tmp_name);
|
|
|
+
|
|
|
return importPhoto($filename, $albumID);
|
|
|
|
|
|
}
|
|
|
@@ -368,23 +371,36 @@ function importUrl($url, $albumID = 0) {
|
|
|
|
|
|
}
|
|
|
|
|
|
-function importServer($albumID = 0) {
|
|
|
+function importServer($albumID = 0, $path = '../uploads/import/') {
|
|
|
|
|
|
global $database;
|
|
|
|
|
|
- $i = 0;
|
|
|
- $files = glob('../uploads/import/*');
|
|
|
+ $files = glob($path . '*');
|
|
|
+ $contains['photos'] = false;
|
|
|
+ $contains['albums'] = false;
|
|
|
|
|
|
foreach ($files as $file) {
|
|
|
|
|
|
if (@getimagesize($file)) {
|
|
|
- if (!importPhoto(basename($file), $albumID)) return false;
|
|
|
- $i++;
|
|
|
+
|
|
|
+ // Photo
|
|
|
+ if (!importPhoto($file, $albumID)) return false;
|
|
|
+ $contains['photos'] = true;
|
|
|
+
|
|
|
+ } else if (is_dir($file)) {
|
|
|
+
|
|
|
+ $name = mysqli_real_escape_string($database, basename($file));
|
|
|
+ $newAlbumID = addAlbum('[Import] ' . $name);
|
|
|
+
|
|
|
+ if ($newAlbumID!==false) importServer($newAlbumID, $file . '/');
|
|
|
+ $contains['albums'] = true;
|
|
|
+
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
- if ($i===0) return "Warning: Folder empty!";
|
|
|
+ if ($contains['photos']===false&&$contains['albums']===false) return "Warning: Folder empty!";
|
|
|
+ if ($contains['photos']===false&&$contains['albums']===true) return "Notice: Import only contains albums!";
|
|
|
return true;
|
|
|
|
|
|
}
|
Tobias Reich