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

V1.3.2

Browse Source 
Includes small fixes and enhancements.
This commit is contained in:
Tobias Reich 2013-10-20 13:08:39 +02:00
parent 603d2d5f8d
commit 59a735afdd
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/functions.js
View File

File diff suppressed because one or more lines are too long

2
js/modules/lychee.js
View File

@ -12,7 +12,7 @@ var lychee = {
init: function() { init: function() {
this.version = "1.3.1"; this.version = "1.3.2";
this.api_path = "php/api.php"; this.api_path = "php/api.php";
this.update_path = "http://lychee.electerious.com/version/index.php"; this.update_path = "http://lychee.electerious.com/version/index.php";
this.updateURL = "https://github.com/electerious/Lychee"; this.updateURL = "https://github.com/electerious/Lychee";

12
php/functions.php
View File

@ -66,7 +66,7 @@ function createTables($database) {
`aperture` varchar(10) NOT NULL, `aperture` varchar(10) NOT NULL,
`make` varchar(20) NOT NULL, `make` varchar(20) NOT NULL,
`model` varchar(50) NOT NULL, `model` varchar(50) NOT NULL,
`shutter` varchar(10) NOT NULL, `shutter` varchar(20) NOT NULL,
`focal` varchar(10) NOT NULL, `focal` varchar(10) NOT NULL,
`takedate` varchar(10) NOT NULL, `takedate` varchar(10) NOT NULL,
`taketime` varchar(8) NOT NULL, `taketime` varchar(8) NOT NULL,
@ -117,7 +117,7 @@ function upload($files, $albumID) {
$data = $data[0]; $data = $data[0];
// Import if not uploaded via web // Import if not uploaded via web
if (!is_uploaded_file($tmp_name)) { if (!is_uploaded_file($file)) {
if (copy($tmp_name, "../uploads/big/" . md5($id) . ".$data")) { if (copy($tmp_name, "../uploads/big/" . md5($id) . ".$data")) {
unlink($tmp_name); unlink($tmp_name);
$import_name = $tmp_name; $import_name = $tmp_name;
@ -147,8 +147,8 @@ function upload($files, $albumID) {
if (isset($info['focal'])){$focal=$info['focal'];} else {$focal="";} if (isset($info['focal'])){$focal=$info['focal'];} else {$focal="";}
if (isset($info['takeDate'])){$takeDate=$info['takeDate'];} else {$takeDate="";} if (isset($info['takeDate'])){$takeDate=$info['takeDate'];} else {$takeDate="";}
if (isset($info['takeTime'])){$takeTime=$info['takeTime'];} else {$takeTime="";} if (isset($info['takeTime'])){$takeTime=$info['takeTime'];} else {$takeTime="";}
$query = "INSERT INTO lychee_photos (id, title, url, type, width, height, size, sysdate, systime, iso, aperture, make, model, shutter, focal, takedate, taketime, thumbUrl, album, public, star, import_name) $query = "INSERT INTO lychee_photos (id, title, description, url, type, width, height, size, sysdate, systime, iso, aperture, make, model, shutter, focal, takedate, taketime, thumbUrl, album, public, star, import_name)
VALUES ('$id', '$title', '" . md5($id) . ".$data', '$type', '$width', '$height', '$size', '$sysdate', '$systime', '$iso', '$aperture', '$make', '$model', '$shutter', '$focal', '$takeDate', '$takeTime', '" . md5($id) . ".$data', '$albumID', '$public', '$star', '$import_name');"; VALUES ('$id', '$title', '" . md5($id) . ".$data', '', '$type', '$width', '$height', '$size', '$sysdate', '$systime', '$iso', '$aperture', '$make', '$model', '$shutter', '$focal', '$takeDate', '$takeTime', '" . md5($id) . ".$data', '$albumID', '$public', '$star', '$import_name');";
$result = $database->query($query); $result = $database->query($query);
} }
@ -729,12 +729,12 @@ function facebookHeader($photoID) {
$return = '<meta name="title" content="'.$row->title.'" />'; $return = '<meta name="title" content="'.$row->title.'" />';
$return .= '<meta name="description" content="'.$row->description.' - via Lychee" />'; $return .= '<meta name="description" content="'.$row->description.' - via Lychee" />';
$return .= '<link rel="image_src" type="image/jpeg" href="'.$thumb.'" />'; $return .= '<link rel="image_src" type="image/jpeg" href="'.$thumb.'" />';
$return .= '<!-- Twitter Meta Data -->'; $return .= '<!-- Twitter Meta Data -->';
$return .= '<meta name="twitter:card" content="photo">'; $return .= '<meta name="twitter:card" content="photo">';
$return .= '<meta name="twitter:title" content="'.$row->title.'">'; $return .= '<meta name="twitter:title" content="'.$row->title.'">';
$return .= '<meta name="twitter:image:src" content="'.$thumb.'">'; $return .= '<meta name="twitter:image:src" content="'.$thumb.'">';
$return .= '<!-- Facebook Meta Data -->'; $return .= '<!-- Facebook Meta Data -->';
$return .= '<meta property="og:title" content="'.$row->title.'">'; $return .= '<meta property="og:title" content="'.$row->title.'">';
$return .= '<meta property="og:image" content="'.$thumb.'">'; $return .= '<meta property="og:image" content="'.$thumb.'">';