").append(x.parseHTML(e)).find(r):e)}).complete(n&&function(e,t){s.each(n,o||[e.responseText,t,e])}),this},x.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){x.fn[t]=function(e){return this.on(t,e)}}),x.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ut,type:"GET",isLocal:Kt.test(Xt[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":sn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":x.parseJSON,"text xml":x.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?cn(cn(e,x.ajaxSettings),t):cn(x.ajaxSettings,e)},ajaxPrefilter:un(rn),ajaxTransport:un(on),ajax:function(e,t){"object"==typeof e&&(t=e,e=undefined),t=t||{};var n,r,i,o,s,a,u,l,c=x.ajaxSetup({},t),p=c.context||c,f=c.context&&(p.nodeType||p.jquery)?x(p):x.event,h=x.Deferred(),d=x.Callbacks("once memory"),g=c.statusCode||{},m={},y={},v=0,b="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(2===v){if(!o){o={};while(t=Qt.exec(i))o[t[1].toLowerCase()]=t[2]}t=o[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===v?i:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return v||(e=y[n]=y[n]||e,m[e]=t),this},overrideMimeType:function(e){return v||(c.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>v)for(t in e)g[t]=[g[t],e[t]];else T.always(e[T.status]);return this},abort:function(e){var t=e||b;return n&&n.abort(t),k(0,t),this}};if(h.promise(T).complete=d.add,T.success=T.done,T.error=T.fail,c.url=((e||c.url||Ut)+"").replace(Gt,"").replace(en,Xt[1]+"//"),c.type=t.method||t.type||c.method||c.type,c.dataTypes=x.trim(c.dataType||"*").toLowerCase().match(w)||[""],null==c.crossDomain&&(a=tn.exec(c.url.toLowerCase()),c.crossDomain=!(!a||a[1]===Xt[1]&&a[2]===Xt[2]&&(a[3]||("http:"===a[1]?"80":"443"))===(Xt[3]||("http:"===Xt[1]?"80":"443")))),c.data&&c.processData&&"string"!=typeof c.data&&(c.data=x.param(c.data,c.traditional)),ln(rn,c,t,T),2===v)return T;u=c.global,u&&0===x.active++&&x.event.trigger("ajaxStart"),c.type=c.type.toUpperCase(),c.hasContent=!Zt.test(c.type),r=c.url,c.hasContent||(c.data&&(r=c.url+=(Vt.test(r)?"&":"?")+c.data,delete c.data),c.cache===!1&&(c.url=Jt.test(r)?r.replace(Jt,"$1_="+Yt++):r+(Vt.test(r)?"&":"?")+"_="+Yt++)),c.ifModified&&(x.lastModified[r]&&T.setRequestHeader("If-Modified-Since",x.lastModified[r]),x.etag[r]&&T.setRequestHeader("If-None-Match",x.etag[r])),(c.data&&c.hasContent&&c.contentType!==!1||t.contentType)&&T.setRequestHeader("Content-Type",c.contentType),T.setRequestHeader("Accept",c.dataTypes[0]&&c.accepts[c.dataTypes[0]]?c.accepts[c.dataTypes[0]]+("*"!==c.dataTypes[0]?", "+sn+"; q=0.01":""):c.accepts["*"]);for(l in c.headers)T.setRequestHeader(l,c.headers[l]);if(c.beforeSend&&(c.beforeSend.call(p,T,c)===!1||2===v))return T.abort();b="abort";for(l in{success:1,error:1,complete:1})T[l](c[l]);if(n=ln(on,c,t,T)){T.readyState=1,u&&f.trigger("ajaxSend",[T,c]),c.async&&c.timeout>0&&(s=setTimeout(function(){T.abort("timeout")},c.timeout));try{v=1,n.send(m,k)}catch(C){if(!(2>v))throw C;k(-1,C)}}else k(-1,"No Transport");function k(e,t,o,a){var l,m,y,b,w,C=t;2!==v&&(v=2,s&&clearTimeout(s),n=undefined,i=a||"",T.readyState=e>0?4:0,l=e>=200&&300>e||304===e,o&&(b=pn(c,T,o)),b=fn(c,b,T,l),l?(c.ifModified&&(w=T.getResponseHeader("Last-Modified"),w&&(x.lastModified[r]=w),w=T.getResponseHeader("etag"),w&&(x.etag[r]=w)),204===e||"HEAD"===c.type?C="nocontent":304===e?C="notmodified":(C=b.state,m=b.data,y=b.error,l=!y)):(y=C,(e||!C)&&(C="error",0>e&&(e=0))),T.status=e,T.statusText=(t||C)+"",l?h.resolveWith(p,[m,C,T]):h.rejectWith(p,[T,C,y]),T.statusCode(g),g=undefined,u&&f.trigger(l?"ajaxSuccess":"ajaxError",[T,c,l?m:y]),d.fireWith(p,[T,C]),u&&(f.trigger("ajaxComplete",[T,c]),--x.active||x.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return x.get(e,t,n,"json")},getScript:function(e,t){return x.get(e,undefined,t,"script")}}),x.each(["get","post"],function(e,t){x[t]=function(e,n,r,i){return x.isFunction(n)&&(i=i||r,r=n,n=undefined),x.ajax({url:e,type:t,dataType:i,data:n,success:r})}});function pn(e,t,n){var r,i,o,s,a=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),r===undefined&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in a)if(a[i]&&a[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}s||(s=i)}o=o||s}return o?(o!==u[0]&&u.unshift(o),n[o]):undefined}function fn(e,t,n,r){var i,o,s,a,u,l={},c=e.dataTypes.slice();if(c[1])for(s in e.converters)l[s.toLowerCase()]=e.converters[s];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(s=l[u+" "+o]||l["* "+o],!s)for(i in l)if(a=i.split(" "),a[1]===o&&(s=l[u+" "+a[0]]||l["* "+a[0]])){s===!0?s=l[i]:l[i]!==!0&&(o=a[0],c.unshift(a[1]));break}if(s!==!0)if(s&&e["throws"])t=s(t);else try{t=s(t)}catch(p){return{state:"parsererror",error:s?p:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}x.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return x.globalEval(e),e}}}),x.ajaxPrefilter("script",function(e){e.cache===undefined&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),x.ajaxTransport("script",function(e){if(e.crossDomain){var t,n;return{send:function(r,i){t=x("
+
+
\ No newline at end of file
diff --git a/php/access/Access.php b/php/access/Access.php
new file mode 100644
index 0000000..c8b3657
--- /dev/null
+++ b/php/access/Access.php
@@ -0,0 +1,30 @@
+database = $database;
+ $this->plugins = $plugins;
+ $this->settings = $settings;
+
+ return true;
+
+ }
+
+}
+
+?>
\ No newline at end of file
diff --git a/php/access/Admin.php b/php/access/Admin.php
new file mode 100644
index 0000000..2dd1242
--- /dev/null
+++ b/php/access/Admin.php
@@ -0,0 +1,306 @@
+getAlbums(); break;
+ case 'getAlbum': $this->getAlbum(); break;
+ case 'addAlbum': $this->addAlbum(); break;
+ case 'setAlbumTitle': $this->setAlbumTitle(); break;
+ case 'setAlbumDescription': $this->setAlbumDescription(); break;
+ case 'setAlbumPublic': $this->setAlbumPublic(); break;
+ case 'setAlbumPassword': $this->setAlbumPassword(); break;
+ case 'deleteAlbum': $this->deleteAlbum(); break;
+
+ # Photo functions
+ case 'getPhoto': $this->getPhoto(); break;
+ case 'setPhotoTitle': $this->setPhotoTitle(); break;
+ case 'setPhotoDescription': $this->setPhotoDescription(); break;
+ case 'setPhotoStar': $this->setPhotoStar(); break;
+ case 'setPhotoPublic': $this->setPhotoPublic(); break;
+ case 'setPhotoAlbum': $this->setPhotoAlbum(); break;
+ case 'setPhotoTags': $this->setPhotoTags(); break;
+ case 'deletePhoto': $this->deletePhoto(); break;
+
+ # Add functions
+ case 'upload': $this->upload(); break;
+ case 'importUrl': $this->importUrl(); break;
+ case 'importServer': $this->importServer(); break;
+
+ # Search functions
+ case 'search': $this->search(); break;
+
+ # Session functions
+ case 'init': $this->init(); break;
+ case 'login': $this->login(); break;
+ case 'logout': $this->logout(); break;
+
+ # Settings functions
+ case 'setLogin': $this->setLogin(); break;
+ case 'setSorting': $this->setSorting(); break;
+ case 'setDropboxKey': $this->setDropboxKey(); break;
+
+ # $_GET functions
+ case 'getAlbumArchive': $this->getAlbumArchive(); break;
+ case 'getPhotoArchive': $this->getPhotoArchive(); break;
+
+ # Error
+ default: exit('Error: Function not found! Please check the spelling of the called function.');
+ return false; break;
+
+ }
+
+ return true;
+
+ }
+
+ # Album functions
+
+ private function getAlbums() {
+
+ $album = new Album($this->database, $this->plugins, $this->settings, null);
+ echo json_encode($album->getAll(false));
+
+ }
+
+ private function getAlbum() {
+
+ Module::dependencies(isset($_POST['albumID']));
+ $album = new Album($this->database, $this->plugins, $this->settings, $_POST['albumID']);
+ echo json_encode($album->get());
+
+ }
+
+ private function addAlbum() {
+
+ Module::dependencies(isset($_POST['title']));
+ $album = new Album($this->database, $this->plugins, $this->settings, null);
+ echo $album->add($_POST['title']);
+
+ }
+
+ private function setAlbumTitle() {
+
+ Module::dependencies(isset($_POST['albumIDs'], $_POST['title']));
+ $album = new Album($this->database, $this->plugins, $this->settings, $_POST['albumIDs']);
+ echo $album->setTitle($_POST['title']);
+
+ }
+
+ private function setAlbumDescription() {
+
+ Module::dependencies(isset($_POST['albumID'], $_POST['description']));
+ $album = new Album($this->database, $this->plugins, $this->settings, $_POST['albumID']);
+ echo $album->setDescription($_POST['description']);
+
+ }
+
+ private function setAlbumPublic() {
+
+ Module::dependencies(isset($_POST['albumID'], $_POST['password']));
+ $album = new Album($this->database, $this->plugins, $this->settings, $_POST['albumID']);
+ echo $album->setPublic($_POST['password']);
+
+ }
+
+ private function setAlbumPassword() {
+
+ Module::dependencies(isset($_POST['albumID'], $_POST['password']));
+ $album = new Album($this->database, $this->plugins, $this->settings, $_POST['albumID']);
+ echo $album->setPassword($_POST['password']);
+
+ }
+
+ private function deleteAlbum() {
+
+ Module::dependencies(isset($_POST['albumIDs']));
+ $album = new Album($this->database, $this->plugins, $this->settings, $_POST['albumIDs']);
+ echo $album->delete($_POST['albumIDs']);
+
+ }
+
+ # Photo functions
+
+ private function getPhoto() {
+
+ Module::dependencies(isset($_POST['photoID'], $_POST['albumID']));
+ $photo = new Photo($this->database, $this->plugins, null, $_POST['photoID']);
+ echo json_encode($photo->get($_POST['albumID']));
+
+ }
+
+ private function setPhotoTitle() {
+
+ Module::dependencies(isset($_POST['photoIDs'], $_POST['title']));
+ $photo = new Photo($this->database, $this->plugins, null, $_POST['photoIDs']);
+ echo $photo->setTitle($_POST['title']);
+
+ }
+
+ private function setPhotoDescription() {
+
+ Module::dependencies(isset($_POST['photoID'], $_POST['description']));
+ $photo = new Photo($this->database, $this->plugins, null, $_POST['photoID']);
+ echo $photo->setDescription($_POST['description']);
+
+ }
+
+ private function setPhotoStar() {
+
+ Module::dependencies(isset($_POST['photoIDs']));
+ $photo = new Photo($this->database, $this->plugins, null, $_POST['photoIDs']);
+ echo $photo->setStar();
+
+ }
+
+ private function setPhotoPublic() {
+
+ Module::dependencies(isset($_POST['photoID']));
+ $photo = new Photo($this->database, $this->plugins, null, $_POST['photoID']);
+ echo $photo->setPublic();
+
+ }
+
+ private function setPhotoAlbum() {
+
+ Module::dependencies(isset($_POST['photoIDs'], $_POST['albumID']));
+ $photo = new Photo($this->database, $this->plugins, null, $_POST['photoIDs']);
+ echo $photo->setAlbum($_POST['albumID']);
+
+ }
+
+ private function setPhotoTags() {
+
+ Module::dependencies(isset($_POST['photoIDs'], $_POST['tags']));
+ $photo = new Photo($this->database, $this->plugins, null, $_POST['photoIDs']);
+ echo $photo->setTags($_POST['tags']);
+
+ }
+
+ private function deletePhoto() {
+
+ Module::dependencies(isset($_POST['photoIDs']));
+ $photo = new Photo($this->database, $this->plugins, null, $_POST['photoIDs']);
+ echo $photo->delete();
+
+ }
+
+ # Add functions
+
+ private function upload() {
+
+ Module::dependencies(isset($_FILES, $_POST['albumID']));
+ $photo = new Photo($this->database, $this->plugins, $this->settings, null);
+ echo $photo->add($_FILES, $_POST['albumID']);
+
+ }
+
+ private function importUrl() {
+
+ Module::dependencies(isset($_POST['url'], $_POST['albumID']));
+ echo Import::url($_POST['url'], $_POST['albumID']);
+
+ }
+
+ private function importServer() {
+
+ Module::dependencies(isset($_POST['albumID']));
+ echo Import::server($_POST['albumID'], null);
+
+ }
+
+ # Search function
+
+ private function search() {
+
+ Module::dependencies(isset($_POST['term']));
+ echo json_encode(search($this->database, $this->settings, $_POST['term']));
+
+ }
+
+ # Session functions
+
+ private function init() {
+
+ global $dbName;
+
+ Module::dependencies(isset($_POST['version']));
+ $session = new Session($this->plugins, $this->settings);
+ echo json_encode($session->init($this->database, $dbName, false, $_POST['version']));
+
+ }
+
+ private function login() {
+
+ Module::dependencies(isset($_POST['user'], $_POST['password']));
+ $session = new Session($this->plugins, $this->settings);
+ echo $session->login($_POST['user'], $_POST['password']);
+
+ }
+
+ private function logout() {
+
+ $session = new Session($this->plugins, $this->settings);
+ echo $session->logout();
+
+ }
+
+ # Settings functions
+
+ private function setLogin() {
+
+ Module::dependencies(isset($_POST['username'], $_POST['password']));
+ if (!isset($_POST['oldPassword'])) $_POST['oldPassword'] = '';
+ $this->settings = new Settings($this->database);
+ echo $this->settings->setLogin($_POST['oldPassword'], $_POST['username'], $_POST['password']);
+
+ }
+
+ private function setSorting() {
+
+ Module::dependencies(isset($_POST['type'], $_POST['order']));
+ $this->settings = new Settings($this->database);
+ echo $this->settings->setSorting($_POST['type'], $_POST['order']);
+
+ }
+
+ private function setDropboxKey() {
+
+ Module::dependencies(isset($_POST['key']));
+ $this->settings = new Settings($this->database);
+ echo $this->settings->setDropboxKey($_POST['key']);
+
+ }
+
+ # Get functions
+
+ private function getAlbumArchive() {
+
+ Module::dependencies(isset($_GET['albumID']));
+ $album = new Album($this->database, $this->plugins, $this->settings, $_GET['albumID']);
+ $album->getArchive();
+
+ }
+
+ private function getPhotoArchive() {
+
+ Module::dependencies(isset($_GET['photoID']));
+ $photo = new Photo($this->database, $this->plugins, null, $_GET['photoID']);
+ $photo->getArchive();
+
+ }
+
+}
\ No newline at end of file
diff --git a/php/access/Guest.php b/php/access/Guest.php
new file mode 100644
index 0000000..280f304
--- /dev/null
+++ b/php/access/Guest.php
@@ -0,0 +1,176 @@
+getAlbums(); break;
+ case 'getAlbum': $this->getAlbum(); break;
+ case 'checkAlbumAccess': $this->checkAlbumAccess(); break;
+
+ # Photo functions
+ case 'getPhoto': $this->getPhoto(); break;
+
+ # Session functions
+ case 'init': $this->init(); break;
+ case 'login': $this->login(); break;
+ case 'logout': $this->logout(); break;
+
+ # $_GET functions
+ case 'getAlbumArchive': $this->getAlbumArchive(); break;
+ case 'getPhotoArchive': $this->getPhotoArchive(); break;
+
+ # Error
+ default: exit('Error: Function not found! Please check the spelling of the called function.');
+ return false; break;
+
+ }
+
+ return true;
+
+ }
+
+ # Album functions
+
+ private function getAlbums() {
+
+ $album = new Album($this->database, $this->plugins, $this->settings, null);
+ echo json_encode($album->getAll(true));
+
+ }
+
+ private function getAlbum() {
+
+ Module::dependencies(isset($_POST['albumID'], $_POST['password']));
+ $album = new Album($this->database, $this->plugins, $this->settings, $_POST['albumID']);
+
+ if ($album->getPublic()) {
+
+ # Album public
+ if ($album->checkPassword($_POST['password'])) echo json_encode($album->get());
+ else echo 'Warning: Wrong password!';
+
+ } else {
+
+ # Album private
+ echo 'Warning: Album private!';
+
+ }
+
+ }
+
+ private function checkAlbumAccess() {
+
+ Module::dependencies(isset($_POST['albumID'], $_POST['password']));
+ $album = new Album($this->database, $this->plugins, $this->settings, $_POST['albumID']);
+
+ if ($album->getPublic()) {
+
+ # Album public
+ if ($album->checkPassword($_POST['password'])) echo true;
+ else echo false;
+
+ } else {
+
+ # Album private
+ echo false;
+
+ }
+
+ }
+
+ # Photo functions
+
+ private function getPhoto() {
+
+ Module::dependencies(isset($_POST['photoID'], $_POST['albumID'], $_POST['password']));
+ $photo = new Photo($this->database, $this->plugins, null, $_POST['photoID']);
+
+ if ($photo->getPublic($_POST['password'])) echo json_encode($photo->get($_POST['albumID']));
+ else echo 'Warning: Wrong password!';
+
+ }
+
+ # Session functions
+
+ private function init() {
+
+ global $dbName;
+
+ $session = new Session($this->plugins, $this->settings);
+ echo json_encode($session->init($this->database, $dbName, true, $_POST['version']));
+
+ }
+
+ private function login() {
+
+ Module::dependencies(isset($_POST['user'], $_POST['password']));
+ $session = new Session($this->plugins, $this->settings);
+ echo $session->login($_POST['user'], $_POST['password']);
+
+ }
+
+ private function logout() {
+
+ $session = new Session($this->plugins, $this->settings);
+ echo $session->logout();
+
+ }
+
+ # $_GET functions
+
+ private function getAlbumArchive() {
+
+ Module::dependencies(isset($_GET['albumID'], $_GET['password']));
+ $album = new Album($this->database, $this->plugins, $this->settings, $_GET['albumID']);
+
+ if ($album->getPublic()) {
+
+ # Album Public
+ if ($album->checkPassword($_GET['password'])) $album->getArchive();
+ else exit('Warning: Wrong password!');
+
+ } else {
+
+ # Album Private
+ exit('Warning: Album private or not downloadable!');
+
+ }
+
+ }
+
+ private function getPhotoArchive() {
+
+ Module::dependencies(isset($_GET['photoID'], $_GET['password']));
+ $photo = new Photo($this->database, $this->plugins, null, $_GET['photoID']);
+
+ # Photo Download
+ if ($photo->getPublic($_GET['password'])) {
+
+ # Photo Public
+ $photo->getArchive();
+
+ } else {
+
+ # Photo Private
+ exit('Warning: Photo private or not downloadable!');
+
+ }
+
+ }
+
+}
+
+?>
\ No newline at end of file
diff --git a/php/access/Installation.php b/php/access/Installation.php
new file mode 100644
index 0000000..dd03925
--- /dev/null
+++ b/php/access/Installation.php
@@ -0,0 +1,39 @@
+dbCreateConfig(); break;
+
+ # Error
+ default: exit('Warning: No configuration!');
+ return false; break;
+
+ }
+
+ return true;
+
+ }
+
+ private function dbCreateConfig() {
+
+ Module::dependencies(isset($_POST['dbHost'], $_POST['dbUser'], $_POST['dbPassword'], $_POST['dbName']));
+ echo Database::createConfig($_POST['dbHost'], $_POST['dbUser'], $_POST['dbPassword'], $_POST['dbName']);
+
+ }
+
+}
+
+?>
\ No newline at end of file
diff --git a/php/access/admin.php b/php/access/admin.php
deleted file mode 100644
index f6c11dd..0000000
--- a/php/access/admin.php
+++ /dev/null
@@ -1,157 +0,0 @@
-
\ No newline at end of file
diff --git a/php/access/guest.php b/php/access/guest.php
deleted file mode 100644
index 1810c8f..0000000
--- a/php/access/guest.php
+++ /dev/null
@@ -1,126 +0,0 @@
-
\ No newline at end of file
diff --git a/php/access/installation.php b/php/access/installation.php
deleted file mode 100644
index a5d2b22..0000000
--- a/php/access/installation.php
+++ /dev/null
@@ -1,23 +0,0 @@
-
\ No newline at end of file
diff --git a/php/api.php b/php/api.php
index cfdfa08..a8ab85e 100755
--- a/php/api.php
+++ b/php/api.php
@@ -1,10 +1,10 @@
check($_POST['function']);
+
exit();
}
- // Connect and get settings
- $database = dbConnect();
- $settings = getSettings();
+ # Connect to database
+ $database = Database::connect($dbHost, $dbUser, $dbPassword, $dbName);
- // Escape
+ # Load settings
+ $settings = new Settings($database);
+ $settings = $settings->get();
+
+ # Init plugins
+ $plugins = explode(';', $settings['plugins']);
+ $plugins = new Plugins($plugins, $database, $settings);
+
+ # Escape
foreach(array_keys($_POST) as $key) $_POST[$key] = mysqli_real_escape_string($database, urldecode($_POST[$key]));
foreach(array_keys($_GET) as $key) $_GET[$key] = mysqli_real_escape_string($database, urldecode($_GET[$key]));
- // Validate parameters
+ # Validate parameters
if (isset($_POST['albumIDs'])&&preg_match('/^[0-9\,]{1,}$/', $_POST['albumIDs'])!==1) exit('Error: Wrong parameter type for albumIDs!');
if (isset($_POST['photoIDs'])&&preg_match('/^[0-9\,]{1,}$/', $_POST['photoIDs'])!==1) exit('Error: Wrong parameter type for photoIDs!');
if (isset($_POST['albumID'])&&preg_match('/^[0-9sf]{1,}$/', $_POST['albumID'])!==1) exit('Error: Wrong parameter type for albumID!');
if (isset($_POST['photoID'])&&preg_match('/^[0-9]{14}$/', $_POST['photoID'])!==1) exit('Error: Wrong parameter type for photoID!');
- // Fallback for switch statement
- if (!isset($_POST['function'])) $_POST['function'] = '';
- if (!isset($_GET['function'])) $_GET['function'] = '';
+ # Function for switch statement
+ if (isset($_POST['function'])) $fn = $_POST['function'];
+ else $fn = $_GET['function'];
if (isset($_SESSION['login'])&&$_SESSION['login']==true) {
- /**
- * Admin Access
- * Full access to Lychee. Only with correct password/session.
- */
+ ###
+ # Admin Access
+ # Full access to Lychee. Only with correct password/session.
+ ###
define('LYCHEE_ACCESS_ADMIN', true);
- require('access/admin.php');
+
+ $admin = new Admin($database, $plugins, $settings);
+ $admin->check($fn);
} else {
- /**
- * Guest Access
- * Access to view all public folders and photos in Lychee.
- */
+ ###
+ # Guest Access
+ # Access to view all public folders and photos in Lychee.
+ ###
define('LYCHEE_ACCESS_GUEST', true);
- require('access/guest.php');
+
+ $guest = new Guest($database, $plugins, $settings);
+ $guest->check($fn);
}
} else {
- exit('Error: No permission!');
+ exit('Error: Called function not found!');
}
diff --git a/php/autoload.php b/php/autoload.php
new file mode 100644
index 0000000..b2dae0c
--- /dev/null
+++ b/php/autoload.php
@@ -0,0 +1,28 @@
+
\ No newline at end of file
diff --git a/php/database/albums_table.sql b/php/database/albums_table.sql
new file mode 100644
index 0000000..cce7095
--- /dev/null
+++ b/php/database/albums_table.sql
@@ -0,0 +1,14 @@
+# Dump of table lychee_albums
+# Version 2.5
+# ------------------------------------------------------------
+
+CREATE TABLE IF NOT EXISTS `lychee_albums` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `title` varchar(50) NOT NULL,
+ `description` varchar(1000) DEFAULT '',
+ `sysstamp` int(11) NOT NULL,
+ `public` tinyint(1) NOT NULL DEFAULT '0',
+ `visible` tinyint(1) NOT NULL DEFAULT '1',
+ `password` varchar(100) DEFAULT '',
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
\ No newline at end of file
diff --git a/php/database/log_table.sql b/php/database/log_table.sql
new file mode 100644
index 0000000..5538cc2
--- /dev/null
+++ b/php/database/log_table.sql
@@ -0,0 +1,13 @@
+# Dump of table lychee_log
+# Version 2.5
+# ------------------------------------------------------------
+
+CREATE TABLE IF NOT EXISTS `lychee_log` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `time` int(11) NOT NULL,
+ `type` varchar(11) NOT NULL,
+ `function` varchar(100) NOT NULL,
+ `line` int(11) NOT NULL,
+ `text` TEXT,
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
diff --git a/php/database/photos_table.sql b/php/database/photos_table.sql
new file mode 100644
index 0000000..ce12386
--- /dev/null
+++ b/php/database/photos_table.sql
@@ -0,0 +1,27 @@
+# Dump of table lychee_photos
+# Version 2.5
+# ------------------------------------------------------------
+
+CREATE TABLE IF NOT EXISTS `lychee_photos` (
+ `id` bigint(14) NOT NULL,
+ `title` varchar(50) NOT NULL,
+ `description` varchar(1000) DEFAULT '',
+ `url` varchar(100) NOT NULL,
+ `tags` varchar(1000) NOT NULL DEFAULT '',
+ `public` tinyint(1) NOT NULL,
+ `type` varchar(10) NOT NULL,
+ `width` int(11) NOT NULL,
+ `height` int(11) NOT NULL,
+ `size` varchar(20) NOT NULL,
+ `iso` varchar(15) NOT NULL,
+ `aperture` varchar(20) NOT NULL,
+ `make` varchar(50) NOT NULL,
+ `model` varchar(50) NOT NULL,
+ `shutter` varchar(30) NOT NULL,
+ `focal` varchar(20) NOT NULL,
+ `takestamp` int(11) DEFAULT NULL,
+ `star` tinyint(1) NOT NULL,
+ `thumbUrl` varchar(50) NOT NULL,
+ `album` varchar(30) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
\ No newline at end of file
diff --git a/php/database/settings_content.sql b/php/database/settings_content.sql
new file mode 100644
index 0000000..7a7d20f
--- /dev/null
+++ b/php/database/settings_content.sql
@@ -0,0 +1,14 @@
+# Content of table lychee_settings
+# Version 2.5
+# ------------------------------------------------------------
+
+INSERT INTO `lychee_settings` (`key`, `value`)
+VALUES
+ ('version',''),
+ ('username',''),
+ ('password',''),
+ ('thumbQuality','90'),
+ ('checkForUpdates','1'),
+ ('sorting','ORDER BY id DESC'),
+ ('dropboxKey',''),
+ ('plugins','');
\ No newline at end of file
diff --git a/php/database/settings_table.sql b/php/database/settings_table.sql
new file mode 100644
index 0000000..78d4f40
--- /dev/null
+++ b/php/database/settings_table.sql
@@ -0,0 +1,8 @@
+# Dump of table lychee_settings
+# Version 2.5
+# ------------------------------------------------------------
+
+CREATE TABLE IF NOT EXISTS `lychee_settings` (
+ `key` varchar(50) NOT NULL DEFAULT '',
+ `value` varchar(200) DEFAULT ''
+) ENGINE=MyISAM DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
\ No newline at end of file
diff --git a/php/database/update_020100.php b/php/database/update_020100.php
new file mode 100644
index 0000000..ccb6d9d
--- /dev/null
+++ b/php/database/update_020100.php
@@ -0,0 +1,41 @@
+query("SELECT `tags` FROM `lychee_photos` LIMIT 1;")) {
+ $result = $database->query("ALTER TABLE `lychee_photos` ADD `tags` VARCHAR( 1000 ) NULL DEFAULT ''");
+ if (!$result) {
+ Log::error($database, 'update_020100', __LINE__, 'Could not update database (' . $database->error . ')');
+ return false;
+ }
+}
+
+$result = $database->query("SELECT `key` FROM `lychee_settings` WHERE `key` = 'dropboxKey' LIMIT 1;");
+if ($result->num_rows===0) {
+ $result = $database->query("INSERT INTO `lychee_settings` (`key`, `value`) VALUES ('dropboxKey', '')");
+ if (!$result) {
+ Log::error($database, 'update_020100', __LINE__, 'Could not update database (' . $database->error . ')');
+ return false;
+ }
+}
+
+$result = $database->query("SELECT `key` FROM `lychee_settings` WHERE `key` = 'version' LIMIT 1;");
+if ($result->num_rows===0) {
+ $result = $database->query("INSERT INTO `lychee_settings` (`key`, `value`) VALUES ('version', '020100')");
+ if (!$result) {
+ Log::error($database, 'update_020100', __LINE__, 'Could not update database (' . $database->error . ')');
+ return false;
+ }
+} else {
+ $result = $database->query("UPDATE lychee_settings SET value = '020100' WHERE `key` = 'version';");
+ if (!$result) {
+ Log::error($database, 'update_020100', __LINE__, 'Could not update database (' . $database->error . ')');
+ return false;
+ }
+}
+
+?>
\ No newline at end of file
diff --git a/php/database/update_020101.php b/php/database/update_020101.php
new file mode 100644
index 0000000..3522924
--- /dev/null
+++ b/php/database/update_020101.php
@@ -0,0 +1,21 @@
+query("ALTER TABLE `lychee_settings` CHANGE `value` `value` VARCHAR( 200 ) NULL DEFAULT ''");
+if (!$result) {
+ Log::error($database, 'update_020101', __LINE__, 'Could not update database (' . $database->error . ')');
+ return false;
+}
+
+$result = $database->query("UPDATE lychee_settings SET value = '020101' WHERE `key` = 'version';");
+if (!$result) {
+ Log::error($database, 'update_020101', __LINE__, 'Could not update database (' . $database->error . ')');
+ return false;
+}
+
+?>
\ No newline at end of file
diff --git a/php/database/update_020200.php b/php/database/update_020200.php
new file mode 100644
index 0000000..ba44254
--- /dev/null
+++ b/php/database/update_020200.php
@@ -0,0 +1,23 @@
+query("SELECT `visible` FROM `lychee_albums` LIMIT 1;")) {
+ $result = $database->query("ALTER TABLE `lychee_albums` ADD `visible` TINYINT(1) NOT NULL DEFAULT 1");
+ if (!$result) {
+ Log::error($database, 'update_020200', __LINE__, 'Could not update database (' . $database->error . ')');
+ return false;
+ }
+}
+
+$result = $database->query("UPDATE lychee_settings SET value = '020200' WHERE `key` = 'version';");
+if (!$result) {
+ Log::error($database, 'update_020200', __LINE__, 'Could not update database (' . $database->error . ')');
+ return false;
+}
+
+?>
\ No newline at end of file
diff --git a/php/database/update_020500.php b/php/database/update_020500.php
new file mode 100644
index 0000000..7f4af25
--- /dev/null
+++ b/php/database/update_020500.php
@@ -0,0 +1,133 @@
+query("SELECT `key` FROM `lychee_settings` WHERE `key` = 'plugins' LIMIT 1;");
+if ($result->num_rows===0) {
+ $result = $database->query("INSERT INTO `lychee_settings` (`key`, `value`) VALUES ('plugins', '')");
+ if (!$result) {
+ Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
+ return false;
+ }
+}
+
+# Add `takestamp`
+if (!$database->query("SELECT `takestamp` FROM `lychee_photos` LIMIT 1;")) {
+ $result = $database->query("ALTER TABLE `lychee_photos` ADD `takestamp` INT(11) DEFAULT NULL");
+ if (!$result) {
+ Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
+ return false;
+ }
+}
+
+# Convert to `takestamp`
+if ($database->query("SELECT `takedate`, `taketime` FROM `lychee_photos` LIMIT 1;")) {
+ $result = $database->query("SELECT `id`, `takedate`, `taketime` FROM `lychee_photos` WHERE `takedate` <> '' AND `taketime` <> '';");
+ if (!$result) {
+ Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
+ return false;
+ }
+ while ($photo = $result->fetch_object()) {
+ $takestamp = strtotime($photo->takedate . $photo->taketime);
+ $database->query("UPDATE `lychee_photos` SET `takestamp` = '$takestamp' WHERE `id` = '$photo->id';");
+ }
+ $result = $database->query("ALTER TABLE `lychee_photos` DROP COLUMN `takedate`;");
+ $result = $database->query("ALTER TABLE `lychee_photos` DROP COLUMN `taketime`;");
+}
+
+# Remove `import_name`
+if ($database->query("SELECT `import_name` FROM `lychee_photos` LIMIT 1;")) {
+ $result = $database->query("ALTER TABLE `lychee_photos` DROP COLUMN `import_name`;");
+}
+
+# Remove `sysdate` and `systime`
+if ($database->query("SELECT `sysdate`, `systime` FROM `lychee_photos` LIMIT 1;")) {
+ $result = $database->query("ALTER TABLE `lychee_photos` DROP COLUMN `sysdate`;");
+ $result = $database->query("ALTER TABLE `lychee_photos` DROP COLUMN `systime`;");
+}
+
+# Add `sysstamp`
+if (!$database->query("SELECT `sysstamp` FROM `lychee_albums` LIMIT 1;")) {
+ $result = $database->query("ALTER TABLE `lychee_albums` ADD `sysstamp` INT(11) DEFAULT NULL");
+ if (!$result) {
+ Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
+ return false;
+ }
+}
+
+# Convert to `sysstamp`
+if ($database->query("SELECT `sysdate` FROM `lychee_albums` LIMIT 1;")) {
+ $result = $database->query("SELECT `id`, `sysdate` FROM `lychee_albums`;");
+ if (!$result) {
+ Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
+ return false;
+ }
+ while ($album = $result->fetch_object()) {
+ $sysstamp = strtotime($album->sysdate);
+ $database->query("UPDATE `lychee_albums` SET `sysstamp` = '$sysstamp' WHERE `id` = '$album->id';");
+ }
+ $result = $database->query("ALTER TABLE `lychee_albums` DROP COLUMN `sysdate`;");
+}
+
+# Set character of database
+$result = $database->query("ALTER DATABASE $dbName CHARACTER SET utf8 COLLATE utf8_general_ci;");
+if (!$result) {
+ Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
+ return false;
+}
+
+# Set character
+$result = $database->query("ALTER TABLE `lychee_albums` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;");
+if (!$result) {
+ Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
+ return false;
+}
+
+# Set character
+$result = $database->query("ALTER TABLE `lychee_photos` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;");
+if (!$result) {
+ Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
+ return false;
+}
+
+# Set character
+$result = $database->query("ALTER TABLE `lychee_settings` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;");
+if (!$result) {
+ Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
+ return false;
+}
+
+# Set album password length to 100 (for longer hashes)
+$result = $database->query("ALTER TABLE `lychee_albums` CHANGE `password` `password` VARCHAR(100);");
+if (!$result) {
+ Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
+ return false;
+}
+
+# Set make length to 50
+$result = $database->query("ALTER TABLE `lychee_photos` CHANGE `make` `make` VARCHAR(50);");
+if (!$result) {
+ Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
+ return false;
+}
+
+# Reset sorting
+$result = $database->query("UPDATE lychee_settings SET value = 'ORDER BY takestamp DESC' WHERE `key` = 'sorting' AND `value` LIKE '%UNIX_TIMESTAMP%';");
+if (!$result) {
+ Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
+ return false;
+}
+
+# Set version
+$result = $database->query("UPDATE lychee_settings SET value = '020500' WHERE `key` = 'version';");
+if (!$result) {
+ Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
+ return false;
+}
+
+?>
\ No newline at end of file
diff --git a/php/define.php b/php/define.php
new file mode 100644
index 0000000..589e359
--- /dev/null
+++ b/php/define.php
@@ -0,0 +1,24 @@
+
\ No newline at end of file
diff --git a/php/modules/Album.php b/php/modules/Album.php
new file mode 100644
index 0000000..a8cfca6
--- /dev/null
+++ b/php/modules/Album.php
@@ -0,0 +1,557 @@
+database = $database;
+ $this->plugins = $plugins;
+ $this->settings = $settings;
+ $this->albumIDs = $albumIDs;
+
+ return true;
+
+ }
+
+ public function add($title = 'Untitled', $public = 0, $visible = 1) {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ # Parse
+ if (strlen($title)>50) $title = substr($title, 0, 50);
+
+ # Database
+ $sysstamp = time();
+ $result = $this->database->query("INSERT INTO lychee_albums (title, sysstamp, public, visible) VALUES ('$title', '$sysstamp', '$public', '$visible');");
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ if (!$result) {
+ Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+ return false;
+ }
+ return $this->database->insert_id;
+
+ }
+
+ public function get() {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $this->settings, $this->albumIDs));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ # Get album information
+ switch ($this->albumIDs) {
+
+ case 'f': $return['public'] = false;
+ $query = "SELECT id, title, tags, public, star, album, thumbUrl FROM lychee_photos WHERE star = 1 " . $this->settings['sorting'];
+ break;
+
+ case 's': $return['public'] = false;
+ $query = "SELECT id, title, tags, public, star, album, thumbUrl FROM lychee_photos WHERE public = 1 " . $this->settings['sorting'];
+ break;
+
+ case '0': $return['public'] = false;
+ $query = "SELECT id, title, tags, public, star, album, thumbUrl FROM lychee_photos WHERE album = 0 " . $this->settings['sorting'];
+ break;
+
+ default: $albums = $this->database->query("SELECT * FROM lychee_albums WHERE id = '$this->albumIDs' LIMIT 1;");
+ $return = $albums->fetch_assoc();
+ $return['sysdate'] = date('d M. Y', $return['sysstamp']);
+ $return['password'] = ($return['password']=='' ? false : true);
+ $query = "SELECT id, title, tags, public, star, album, thumbUrl FROM lychee_photos WHERE album = '$this->albumIDs' " . $this->settings['sorting'];
+ break;
+
+ }
+
+ # Get photos
+ $photos = $this->database->query($query);
+ $previousPhotoID = '';
+ while ($photo = $photos->fetch_assoc()) {
+
+ # Parse
+ $photo['sysdate'] = date('d F Y', substr($photo['id'], 0, -4));
+ $photo['previousPhoto'] = $previousPhotoID;
+ $photo['nextPhoto'] = '';
+
+ if ($previousPhotoID!=='') $return['content'][$previousPhotoID]['nextPhoto'] = $photo['id'];
+ $previousPhotoID = $photo['id'];
+
+ # Add to return
+ $return['content'][$photo['id']] = $photo;
+
+ }
+
+ if ($photos->num_rows===0) {
+
+ # Album empty
+ $return['content'] = false;
+
+ } else {
+
+ # Enable next and previous for the first and last photo
+ $lastElement = end($return['content']);
+ $lastElementId = $lastElement['id'];
+ $firstElement = reset($return['content']);
+ $firstElementId = $firstElement['id'];
+
+ if ($lastElementId!==$firstElementId) {
+ $return['content'][$lastElementId]['nextPhoto'] = $firstElementId;
+ $return['content'][$firstElementId]['previousPhoto'] = $lastElementId;
+ }
+
+ }
+
+ $return['id'] = $this->albumIDs;
+ $return['num'] = $photos->num_rows;
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ return $return;
+
+ }
+
+ public function getAll($public) {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $this->settings, $public));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ # Get SmartAlbums
+ if ($public===false) $return = $this->getSmartInfo();
+
+ # Albums query
+ $query = 'SELECT id, title, public, sysstamp, password FROM lychee_albums WHERE public = 1 AND visible <> 0';
+ if ($public===false) $query = 'SELECT id, title, public, sysstamp, password FROM lychee_albums';
+
+ # Execute query
+ $albums = $this->database->query($query) OR exit('Error: ' . $this->database->error);
+
+ # For each album
+ while ($album = $albums->fetch_assoc()) {
+
+ # Parse info
+ $album['sysdate'] = date('F Y', $album['sysstamp']);
+ $album['password'] = ($album['password'] != '');
+
+ # Thumbs
+ if (($public===true&&$album['password']===false)||($public===false)) {
+
+ # Execute query
+ $thumbs = $this->database->query("SELECT thumbUrl FROM lychee_photos WHERE album = '" . $album['id'] . "' ORDER BY star DESC, " . substr($this->settings['sorting'], 9) . " LIMIT 3");
+
+ # For each thumb
+ $k = 0;
+ while ($thumb = $thumbs->fetch_object()) {
+ $album["thumb$k"] = $thumb->thumbUrl;
+ $k++;
+ }
+
+ }
+
+ # Add to return
+ $return['content'][$album['id']] = $album;
+
+ }
+
+ # Num of albums
+ $return['num'] = $albums->num_rows;
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ return $return;
+
+ }
+
+ private function getSmartInfo() {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $this->settings));
+
+ # Unsorted
+ $unsorted = $this->database->query("SELECT thumbUrl FROM lychee_photos WHERE album = 0 " . $this->settings['sorting']);
+ $i = 0;
+ while($row = $unsorted->fetch_object()) {
+ if ($i<3) {
+ $return["unsortedThumb$i"] = $row->thumbUrl;
+ $i++;
+ } else break;
+ }
+ $return['unsortedNum'] = $unsorted->num_rows;
+
+ # Public
+ $public = $this->database->query("SELECT thumbUrl FROM lychee_photos WHERE public = 1 " . $this->settings['sorting']);
+ $i = 0;
+ while($row2 = $public->fetch_object()) {
+ if ($i<3) {
+ $return["publicThumb$i"] = $row2->thumbUrl;
+ $i++;
+ } else break;
+ }
+ $return['publicNum'] = $public->num_rows;
+
+ # Starred
+ $starred = $this->database->query("SELECT thumbUrl FROM lychee_photos WHERE star = 1 " . $this->settings['sorting']);
+ $i = 0;
+ while($row3 = $starred->fetch_object()) {
+ if ($i<3) {
+ $return["starredThumb$i"] = $row3->thumbUrl;
+ $i++;
+ } else break;
+ }
+ $return['starredNum'] = $starred->num_rows;
+
+ return $return;
+
+ }
+
+ public function getArchive() {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $this->albumIDs));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ # Illicit chars
+ $badChars = array_merge(
+ array_map('chr', range(0,31)),
+ array("<", ">", ":", '"', "/", "\\", "|", "?", "*")
+ );
+
+ # Photos query
+ switch($this->albumIDs) {
+ case 's':
+ $photos = "SELECT title, url FROM lychee_photos WHERE public = '1';";
+ $zipTitle = 'Public';
+ break;
+ case 'f':
+ $photos = "SELECT title, url FROM lychee_photos WHERE star = '1';";
+ $zipTitle = 'Starred';
+ break;
+ default:
+ $photos = "SELECT title, url FROM lychee_photos WHERE album = '$this->albumIDs';";
+ $zipTitle = 'Unsorted';
+ }
+
+ # Set title
+ $album = $this->database->query("SELECT title FROM lychee_albums WHERE id = '$this->albumIDs' LIMIT 1;");
+ if ($this->albumIDs!=0&&is_numeric($this->albumIDs)) $zipTitle = $album->fetch_object()->title;
+
+ # Parse title
+ $zipTitle = str_replace($badChars, '', $zipTitle);
+
+ $filename = LYCHEE_DATA . $zipTitle . '.zip';
+
+ # Create zip
+ $zip = new ZipArchive();
+ if ($zip->open($filename, ZIPARCHIVE::CREATE)!==TRUE) {
+ Log::error($this->database, __METHOD__, __LINE__, 'Could not create ZipArchive');
+ return false;
+ }
+
+ # Execute query
+ $photos = $this->database->query($photos);
+
+ # Check if album empty
+ if ($photos->num_rows==0) {
+ Log::error($this->database, __METHOD__, __LINE__, 'Could not create ZipArchive without images');
+ return false;
+ }
+
+ # Parse each path
+ $files = array();
+ while ($photo = $photos->fetch_object()) {
+
+ # Parse url
+ $photo->url = LYCHEE_UPLOADS_BIG . $photo->url;
+
+ # Parse title
+ $photo->title = str_replace($badChars, '', $photo->title);
+ if (!isset($photo->title)||$photo->title==='') $photo->title = 'Untitled';
+
+ # Check if readable
+ if (!@is_readable($photo->url)) continue;
+
+ # Get extension of image
+ $extension = getExtension($photo->url);
+
+ # Set title for photo
+ $zipFileName = $zipTitle . '/' . $photo->title . $extension;
+
+ # Check for duplicates
+ if (!empty($files)) {
+ $i = 1;
+ while (in_array($zipFileName, $files)) {
+
+ # Set new title for photo
+ $zipFileName = $zipTitle . '/' . $photo->title . '-' . $i . $extension;
+
+ $i++;
+
+ }
+ }
+
+ # Add to array
+ $files[] = $zipFileName;
+
+ # Add photo to zip
+ $zip->addFile($photo->url, $zipFileName);
+
+ }
+
+ # Finish zip
+ $zip->close();
+
+ # Send zip
+ header("Content-Type: application/zip");
+ header("Content-Disposition: attachment; filename=\"$zipTitle.zip\"");
+ header("Content-Length: " . filesize($filename));
+ readfile($filename);
+
+ # Delete zip
+ unlink($filename);
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ return true;
+
+ }
+
+ public function setTitle($title = 'Untitled') {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $this->albumIDs));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ # Parse
+ if (strlen($title)>50) $title = substr($title, 0, 50);
+
+ # Execute query
+ $result = $this->database->query("UPDATE lychee_albums SET title = '$title' WHERE id IN ($this->albumIDs);");
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ if (!$result) {
+ Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+ return false;
+ }
+ return true;
+
+ }
+
+ public function setDescription($description = '') {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $this->albumIDs));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ # Parse
+ $description = htmlentities($description);
+ if (strlen($description)>1000) $description = substr($description, 0, 1000);
+
+ # Execute query
+ $result = $this->database->query("UPDATE lychee_albums SET description = '$description' WHERE id IN ($this->albumIDs);");
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ if (!$result) {
+ Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+ return false;
+ }
+ return true;
+
+ }
+
+ public function getPublic() {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $this->albumIDs));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ if ($this->albumIDs==='0'||$this->albumIDs==='s'||$this->albumIDs==='f') return false;
+
+ # Execute query
+ $albums = $this->database->query("SELECT public FROM lychee_albums WHERE id = '$this->albumIDs' LIMIT 1;");
+ $album = $albums->fetch_object();
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ if ($album->public==1) return true;
+ return false;
+
+ }
+
+ public function setPublic($password) {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $this->albumIDs));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ # Get public
+ $albums = $this->database->query("SELECT id, public FROM lychee_albums WHERE id IN ('$this->albumIDs');");
+
+ while ($album = $albums->fetch_object()) {
+
+ # Invert public
+ $public = ($album->public=='0' ? 1 : 0);
+
+ # Set public
+ $result = $this->database->query("UPDATE lychee_albums SET public = '$public', visible = 1, password = NULL WHERE id = '$album->id';");
+ if (!$result) {
+ Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+ return false;
+ }
+
+ # Reset permissions for photos
+ if ($public===1) {
+ $result = $this->database->query("UPDATE lychee_photos SET public = 0 WHERE album = '$album->id';");
+ if (!$result) {
+ Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+ return false;
+ }
+ }
+
+ }
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ # Set password
+ if (isset($password)&&strlen($password)>0) return $this->setPassword($password);
+
+ return true;
+
+ }
+
+ public function setPassword($password) {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $this->albumIDs));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ if (strlen($password)>0) {
+
+ # Get hashed password
+ $password = get_hashed_password($password);
+
+ # Set hashed password
+ $result = $this->database->query("UPDATE lychee_albums SET visible = 0, password = '$password' WHERE id IN ('$this->albumIDs');");
+
+ } else {
+
+ # Unset password
+ $result = $this->database->query("UPDATE lychee_albums SET visible = 1, password = NULL WHERE id IN ('$this->albumIDs');");
+
+ }
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ if (!$result) {
+ Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+ return false;
+ }
+ return true;
+
+ }
+
+ public function checkPassword($password) {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $this->albumIDs));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ # Execute query
+ $albums = $this->database->query("SELECT password FROM lychee_albums WHERE id = '$this->albumIDs' LIMIT 1;");
+ $album = $albums->fetch_object();
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ if ($album->password=='') return true;
+ else if ($album->password===$password||$album->password===crypt($password, $album->password)) return true;
+ return false;
+
+ }
+
+ public function delete($albumIDs) {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $this->albumIDs));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ # Init vars
+ $error = false;
+
+ # Execute query
+ $photos = $this->database->query("SELECT id FROM lychee_photos WHERE album IN ($albumIDs);");
+
+ # For each album delete photo
+ while ($row = $photos->fetch_object()) {
+
+ $photo = new Photo($this->database, $this->plugins, null, $row->id);
+ if (!$photo->delete($row->id)) $error = true;
+
+ }
+
+ # Delete albums
+ $result = $this->database->query("DELETE FROM lychee_albums WHERE id IN ($albumIDs);");
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ if ($error) return false;
+ if (!$result) {
+ Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+ return false;
+ }
+ return true;
+
+ }
+
+}
+
+?>
\ No newline at end of file
diff --git a/php/modules/Database.php b/php/modules/Database.php
new file mode 100755
index 0000000..aeebd19
--- /dev/null
+++ b/php/modules/Database.php
@@ -0,0 +1,212 @@
+connect_errno) exit('Error: ' . $database->connect_error);
+
+ # Avoid sql injection on older MySQL versions by using GBK
+ if ($database->server_version<50500) $database->set_charset('GBK');
+ else $database->set_charset("utf8");
+
+ # Check database
+ if (!$database->select_db($name))
+ if (!Database::createDatabase($database, $name)) exit('Error: Could not create database!');
+
+ # Check tables
+ if (!$database->query('SELECT * FROM lychee_photos, lychee_albums, lychee_settings, lychee_log LIMIT 0;'))
+ if (!Database::createTables($database)) exit('Error: Could not create tables!');
+
+ return $database;
+
+ }
+
+ static function update($database, $dbName, $version = 0) {
+
+ # Check dependencies
+ Module::dependencies(isset($database, $dbName));
+
+ # List of updates
+ $updates = array(
+ '020100', #2.1
+ '020101', #2.1.1
+ '020200', #2.2
+ '020500' #2.5
+ );
+
+ # For each update
+ foreach ($updates as $update) {
+
+ if (isset($version)&&$update<=$version) continue;
+
+ # Load update
+ include(__DIR__ . '/../database/update_' . $update . '.php');
+
+ }
+
+ return true;
+
+ }
+
+ static function createConfig($host = 'localhost', $user, $password, $name = 'lychee') {
+
+ # Check dependencies
+ Module::dependencies(isset($host, $user, $password, $name));
+
+ $database = new mysqli($host, $user, $password);
+
+ if ($database->connect_errno) return 'Warning: Connection failed!';
+ else {
+
+$config = "";
+
+ # Save file
+ if (file_put_contents(LYCHEE_CONFIG_FILE, $config)===false) return 'Warning: Could not create file!';
+
+ return true;
+
+ }
+
+ }
+
+ static function createDatabase($database, $name = 'lychee') {
+
+ # Check dependencies
+ Module::dependencies(isset($database, $name));
+
+ # Create database
+ $result = $database->query("CREATE DATABASE IF NOT EXISTS $name;");
+ $database->select_db($name);
+
+ if (!$database->select_db($name)||!$result) return false;
+ return true;
+
+ }
+
+ static function createTables($database) {
+
+ # Check dependencies
+ Module::dependencies(isset($database));
+
+ # Create log
+ if (!$database->query('SELECT * FROM lychee_log LIMIT 0;')) {
+
+ # Read file
+ $file = __DIR__ . '/../database/log_table.sql';
+ $query = @file_get_contents($file);
+
+ # Create table
+ if (!isset($query)||$query===false) return false;
+ if (!$database->query($query)) return false;
+
+ }
+
+ # Create settings
+ if (!$database->query('SELECT * FROM lychee_settings LIMIT 0;')) {
+
+ # Read file
+ $file = __DIR__ . '/../database/settings_table.sql';
+ $query = @file_get_contents($file);
+
+ # Create table
+ if (!isset($query)||$query===false) {
+ Log::error($database, __METHOD__, __LINE__, 'Could not load query for lychee_settings');
+ return false;
+ }
+ if (!$database->query($query)) {
+ Log::error($database, __METHOD__, __LINE__, $database->error);
+ return false;
+ }
+
+ # Read file
+ $file = __DIR__ . '/../database/settings_content.sql';
+ $query = @file_get_contents($file);
+
+ # Add content
+ if (!isset($query)||$query===false) {
+ Log::error($database, __METHOD__, __LINE__, 'Could not load content-query for lychee_settings');
+ return false;
+ }
+ if (!$database->query($query)) {
+ Log::error($database, __METHOD__, __LINE__, $database->error);
+ return false;
+ }
+
+ }
+
+ # Create albums
+ if (!$database->query('SELECT * FROM lychee_albums LIMIT 0;')) {
+
+ # Read file
+ $file = __DIR__ . '/../database/albums_table.sql';
+ $query = @file_get_contents($file);
+
+ # Create table
+ if (!isset($query)||$query===false) {
+ Log::error($database, __METHOD__, __LINE__, 'Could not load query for lychee_albums');
+ return false;
+ }
+ if (!$database->query($query)) {
+ Log::error($database, __METHOD__, __LINE__, $database->error);
+ return false;
+ }
+
+ }
+
+ # Create photos
+ if (!$database->query('SELECT * FROM lychee_photos LIMIT 0;')) {
+
+ # Read file
+ $file = __DIR__ . '/../database/photos_table.sql';
+ $query = @file_get_contents($file);
+
+ # Create table
+ if (!isset($query)||$query===false) {
+ Log::error($database, __METHOD__, __LINE__, 'Could not load query for lychee_photos');
+ return false;
+ }
+ if (!$database->query($query)) {
+ Log::error($database, __METHOD__, __LINE__, $database->error);
+ return false;
+ }
+
+ }
+
+ return true;
+
+ }
+
+}
+
+?>
diff --git a/php/modules/Import.php b/php/modules/Import.php
new file mode 100644
index 0000000..3dfa3c1
--- /dev/null
+++ b/php/modules/Import.php
@@ -0,0 +1,197 @@
+add($nameFile, $albumID, $description, $tags)) return false;
+ return true;
+
+ }
+
+ static function url($urls, $albumID = 0) {
+
+ $error = false;
+
+ # Parse
+ $urls = str_replace(' ', '%20', $urls);
+ $urls = explode(',', $urls);
+
+ foreach ($urls as &$url) {
+
+ if (@exif_imagetype($url)===false) {
+ $error = true;
+ continue;
+ }
+
+ $pathinfo = pathinfo($url);
+ $filename = $pathinfo['filename'] . '.' . $pathinfo['extension'];
+ $tmp_name = LYCHEE_DATA . $filename;
+
+ if (@copy($url, $tmp_name)===false) $error = true;
+
+ }
+
+ $import = Import::server($albumID, LYCHEE_DATA);
+
+ if ($error===false&&$import===true) return true;
+ else return false;
+
+ }
+
+ static function move($database, $path) {
+
+ # Determine OS type and set move cmd (Windows untested!)
+ $myos = substr(PHP_OS,0,3);
+ $myos = strtoupper($myos);
+
+ if ($myos==='WIN') $osmv = 'MOVE';
+ else $osmv = 'mv';
+
+ # Generate tmp dir name by hashing epoch time & random number
+ $tmpdirname = md5(time() . rand());
+
+ # Make temporary directory
+ if (@mkdir(LYCHEE_DATA . $tmpdirname)===false) {
+ Log::error($database, __METHOD__, __LINE__, 'Failed to create temporary directory');
+ return false;
+ }
+
+ # Get list of files and move them to tmpdir
+ $files = glob($path . '*');
+ if (isset($files)) {
+
+ foreach ($files as $file) {
+
+ # Prevent unsupported files from being moved
+ if (is_dir($file)===false&&@exif_imagetype($file)===false) continue;
+
+ $out = '';
+ $ret = '';
+ $file = escapeshellarg($file);
+ $cmd = $osmv . " $file " . LYCHEE_DATA . $tmpdirname;
+
+ @exec($cmd, $out, $ret);
+
+ if (isset($ret)&&($ret>0)) Log::error($database, __METHOD__, __LINE__, "Failed to move directory or file ($ret):" . $file);
+
+ }
+
+ }
+
+ # If no files could be copied to the temp dir, remove
+ $files = glob(LYCHEE_DATA . $tmpdirname . '/*');
+ if (count($files)===0) {
+ rmdir(LYCHEE_DATA . $tmpdirname);
+ Log::error($database, __METHOD__, __LINE__, 'Import failed, because files could not be temporary moved to ' . LYCHEE_DATA);
+ 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);
+ if ($path===false) {
+ Log::error($database, __METHOD__, __LINE__, 'Failed to move import to temporary directory');
+ return false;
+ }
+ }
+
+ $error = false;
+ $contains['photos'] = false;
+ $contains['albums'] = false;
+
+ # Get all files
+ $files = glob($path . '/*');
+
+ foreach ($files as $file) {
+
+ # It is possible to move a file because of directory permissions but
+ # the file may still be unreadable by the user
+ if (!is_readable($file)) {
+ $error = true;
+ Log::error($database, __METHOD__, __LINE__, 'Could not read file or directory: ' . $file);
+ continue;
+ }
+
+ if (@exif_imagetype($file)!==false) {
+
+ # Photo
+
+ if (!Import::photo($database, $plugins, $settings, $file, $albumID)) {
+ $error = true;
+ Log::error($database, __METHOD__, __LINE__, 'Could not import file: ' . $file);
+ continue;
+ }
+ $contains['photos'] = true;
+
+ } else if (is_dir($file)) {
+
+ # Folder
+
+ $name = mysqli_real_escape_string($database, basename($file));
+ $album = new Album($database, null, null, null);
+ $newAlbumID = $album->add('[Import] ' . $name);
+
+ if ($newAlbumID===false) {
+ $error = true;
+ Log::error($database, __METHOD__, __LINE__, 'Could not create album in Lychee (' . $newAlbumID . ')');
+ continue;
+ }
+
+ 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;
+
+ }
+
+ }
+
+ # Delete tmpdir if import was successful
+ 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']===true) return 'Notice: Import only contains albums!';
+ return true;
+
+ }
+
+}
+
+?>
diff --git a/php/modules/Log.php b/php/modules/Log.php
new file mode 100644
index 0000000..00f06b8
--- /dev/null
+++ b/php/modules/Log.php
@@ -0,0 +1,56 @@
+query($query);
+
+ if (!$result) return false;
+ return true;
+
+ }
+
+}
+
+?>
\ No newline at end of file
diff --git a/php/modules/Module.php b/php/modules/Module.php
new file mode 100644
index 0000000..60f43ed
--- /dev/null
+++ b/php/modules/Module.php
@@ -0,0 +1,37 @@
+plugins, $name, $location, $args)) return false;
+
+ # Parse
+ $location = ($location===0 ? 'before' : 'after');
+
+ # Call plugins
+ $this->plugins->activate($name . ":" . $location, $args);
+
+ return true;
+
+ }
+
+ public function dependencies($available = false) {
+
+ if ($available===false) exit('Error: Can not execute function. Missing parameters or variables.');
+
+ }
+
+}
+
+?>
\ No newline at end of file
diff --git a/php/modules/Photo.php b/php/modules/Photo.php
new file mode 100755
index 0000000..b5f6da2
--- /dev/null
+++ b/php/modules/Photo.php
@@ -0,0 +1,796 @@
+database = $database;
+ $this->plugins = $plugins;
+ $this->settings = $settings;
+ $this->photoIDs = $photoIDs;
+
+ return true;
+
+ }
+
+ public function add($files, $albumID, $description = '', $tags = '') {
+
+ # Check dependencies
+ $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
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ switch($albumID) {
+
+ case 's':
+ # s for public (share)
+ $public = 1;
+ $star = 0;
+ $albumID = 0;
+ break;
+
+ case 'f':
+ # f for starred (fav)
+ $star = 1;
+ $public = 0;
+ $albumID = 0;
+ break;
+
+ default:
+ $star = 0;
+ $public = 0;
+ break;
+
+ }
+
+ foreach ($files as $file) {
+
+ # Verify extension
+ $extension = getExtension($file['name']);
+ if (!in_array(strtolower($extension), $this->validExtensions, true)) continue;
+
+ # Verify image
+ $type = @exif_imagetype($file['tmp_name']);
+ if (!in_array($type, $this->allowedTypes, true)) continue;
+
+ # Generate id
+ $id = str_replace('.', '', microtime(true));
+ while(strlen($id)<14) $id .= 0;
+
+ $tmp_name = $file['tmp_name'];
+ $photo_name = md5($id) . $extension;
+ $path = LYCHEE_UPLOADS_BIG . $photo_name;
+
+ # Import if not uploaded via web
+ if (!is_uploaded_file($tmp_name)) {
+ if (!@copy($tmp_name, $path)) {
+ Log::error($this->database, __METHOD__, __LINE__, 'Could not copy photo to uploads');
+ exit('Error: Could not copy photo to uploads!');
+ } else @unlink($tmp_name);
+ } else {
+ if (!@move_uploaded_file($tmp_name, $path)) {
+ Log::error($this->database, __METHOD__, __LINE__, 'Could not move photo to uploads');
+ exit('Error: Could not move photo to uploads!');
+ }
+ }
+
+ # Read infos
+ $info = $this->getInfo($path);
+
+ # Use title of file if IPTC title missing
+ if ($info['title']==='') $info['title'] = mysqli_real_escape_string($this->database, substr(basename($file['name'], $extension), 0, 30));
+
+ # Use description parameter if set
+ if ($description==='') $description = $info['description'];
+
+ # Set orientation based on EXIF data
+ if ($file['type']==='image/jpeg'&&isset($info['orientation'])&&$info['orientation']!==''&&isset($info['width'])&&isset($info['height'])) {
+ if (!$this->adjustFile($path, $info)) Log::notice($this->database, __METHOD__, __LINE__, 'Could not adjust photo (' . $info['title'] . ')');
+ }
+
+ # Set original date
+ if ($info['takestamp']!=='') @touch($path, $info['takestamp']);
+
+ # Create Thumb
+ if (!$this->createThumb($path, $photo_name)) {
+ Log::error($this->database, __METHOD__, __LINE__, 'Could not create thumbnail for photo');
+ exit('Error: Could not create thumbnail for photo!');
+ }
+
+ # Save to DB
+ $query = "INSERT INTO lychee_photos (id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star)
+ VALUES (
+ '" . $id . "',
+ '" . $info['title'] . "',
+ '" . $photo_name . "',
+ '" . $description . "',
+ '" . $tags . "',
+ '" . $info['type'] . "',
+ '" . $info['width'] . "',
+ '" . $info['height'] . "',
+ '" . $info['size'] . "',
+ '" . $info['iso'] . "',
+ '" . $info['aperture'] . "',
+ '" . $info['make'] . "',
+ '" . $info['model'] . "',
+ '" . $info['shutter'] . "',
+ '" . $info['focal'] . "',
+ '" . $info['takestamp'] . "',
+ '" . md5($id) . ".jpeg',
+ '" . $albumID . "',
+ '" . $public . "',
+ '" . $star . "');";
+ $result = $this->database->query($query);
+
+ if (!$result) {
+ Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+ exit('Error: Could not save photo in database!');
+ }
+
+ }
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ return true;
+
+ }
+
+ private function createThumb($url, $filename, $width = 200, $height = 200) {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $this->settings, $url, $filename));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ $info = getimagesize($url);
+ $photoName = explode(".", $filename);
+ $newUrl = LYCHEE_UPLOADS_THUMB . $photoName[0] . '.jpeg';
+ $newUrl2x = LYCHEE_UPLOADS_THUMB . $photoName[0] . '@2x.jpeg';
+
+ # create thumbnails with Imagick
+ if(extension_loaded('imagick')) {
+
+ # Read image
+ $thumb = new Imagick();
+ $thumb->readImage($url);
+ $thumb->setImageCompressionQuality($this->settings['thumbQuality']);
+ $thumb->setImageFormat('jpeg');
+
+ # Copy image for 2nd thumb version
+ $thumb2x = clone $thumb;
+
+ # Create 1st version
+ $thumb->cropThumbnailImage($width, $height);
+ $thumb->writeImage($newUrl);
+ $thumb->clear();
+ $thumb->destroy();
+
+ # Create 2nd version
+ $thumb2x->cropThumbnailImage($width*2, $height*2);
+ $thumb2x->writeImage($newUrl2x);
+ $thumb2x->clear();
+ $thumb2x->destroy();
+
+ } else {
+
+ # 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;
+ } else {
+ $newSize = $info[1];
+ $startWidth = $info[0]/2 - $info[1]/2;
+ $startHeight = 0;
+ }
+
+ # 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;
+ default: Log::error($this->database, __METHOD__, __LINE__, 'Type of photo is not supported');
+ return false;
+ break;
+ }
+
+ # Create thumb
+ fastimagecopyresampled($thumb, $sourceImg, 0, 0, $startWidth, $startHeight, $width, $height, $newSize, $newSize);
+ imagejpeg($thumb, $newUrl, $this->settings['thumbQuality']);
+ imagedestroy($thumb);
+
+ # Create retina thumb
+ fastimagecopyresampled($thumb2x, $sourceImg, 0, 0, $startWidth, $startHeight, $width*2, $height*2, $newSize, $newSize);
+ imagejpeg($thumb2x, $newUrl2x, $this->settings['thumbQuality']);
+ imagedestroy($thumb2x);
+
+ # Free memory
+ imagedestroy($sourceImg);
+
+ }
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ return true;
+
+ }
+
+ private function adjustFile($path, $info) {
+
+ # Check dependencies
+ $this->dependencies(isset($path, $info));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ if (extension_loaded('imagick')) {
+
+ $rotateImage = 0;
+
+ switch ($info['orientation']) {
+
+ case 3:
+ $rotateImage = 180;
+ $imageOrientation = 1;
+ break;
+
+ case 6:
+ $rotateImage = 90;
+ $imageOrientation = 1;
+ break;
+
+ case 8:
+ $rotateImage = 270;
+ $imageOrientation = 1;
+ break;
+
+ }
+
+ if ($rotateImage!==0) {
+ $image = new Imagick();
+ $image->readImage($path);
+ $image->rotateImage(new ImagickPixel(), $rotateImage);
+ $image->setImageOrientation($imageOrientation);
+ $image->writeImage($path);
+ $image->clear();
+ $image->destroy();
+ }
+
+ } else {
+
+ $newWidth = $info['width'];
+ $newHeight = $info['height'];
+ $process = false;
+ $sourceImg = imagecreatefromjpeg($path);
+
+ switch ($info['orientation']) {
+
+ case 2:
+ # mirror
+ # not yet implemented
+ break;
+
+ case 3:
+ $process = true;
+ $sourceImg = imagerotate($sourceImg, -180, 0);
+ break;
+
+ case 4:
+ # rotate 180 and mirror
+ # not yet implemented
+ break;
+
+ case 5:
+ # rotate 90 and mirror
+ # not yet implemented
+ break;
+
+ case 6:
+ $process = true;
+ $sourceImg = imagerotate($sourceImg, -90, 0);
+ $newWidth = $info['height'];
+ $newHeight = $info['width'];
+ break;
+
+ case 7:
+ # rotate -90 and mirror
+ # not yet implemented
+ break;
+
+ case 8:
+ $process = true;
+ $sourceImg = imagerotate($sourceImg, 90, 0);
+ $newWidth = $info['height'];
+ $newHeight = $info['width'];
+ break;
+
+ }
+
+ # Need to adjust photo?
+ if ($process===true) {
+
+ # Recreate photo
+ $newSourceImg = imagecreatetruecolor($newWidth, $newHeight);
+ imagecopyresampled($newSourceImg, $sourceImg, 0, 0, 0, 0, $newWidth, $newHeight, $newWidth, $newHeight);
+ imagejpeg($newSourceImg, $path, 100);
+
+ # Free memory
+ imagedestroy($sourceImg);
+ imagedestroy($newSourceImg);
+
+ }
+
+ }
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ return true;
+
+ }
+
+ public function get($albumID) {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $this->photoIDs));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ # Get photo
+ $photos = $this->database->query("SELECT * FROM lychee_photos WHERE id = '$this->photoIDs' LIMIT 1;");
+ $photo = $photos->fetch_assoc();
+
+ # Parse photo
+ $photo['sysdate'] = date('d M. Y', substr($photo['id'], 0, -4));
+ if (strlen($photo['takestamp'])>1) $photo['takedate'] = date('d M. Y', $photo['takestamp']);
+
+ if ($albumID!='false') {
+
+ if ($photo['album']!=0) {
+
+ # Get album
+ $albums = $this->database->query("SELECT public FROM lychee_albums WHERE id = '" . $photo['album'] . " LIMIT 1';");
+ $album = $albums->fetch_assoc();
+
+ # Parse album
+ $photo['public'] = ($album['public']=='1' ? '2' : $photo['public']);
+
+ }
+
+ $photo['original_album'] = $photo['album'];
+ $photo['album'] = $albumID;
+
+ }
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ return $photo;
+
+ }
+
+ private function getInfo($url) {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $url));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ $iptcArray = array();
+ $info = getimagesize($url, $iptcArray);
+
+ # General information
+ $return['type'] = $info['mime'];
+ $return['width'] = $info[0];
+ $return['height'] = $info[1];
+
+ # Size
+ $size = filesize($url)/1024;
+ if ($size>=1024) $return['size'] = round($size/1024, 1) . ' MB';
+ else $return['size'] = round($size, 1) . ' KB';
+
+ # IPTC Metadata Fallback
+ $return['title'] = '';
+ $return['description'] = '';
+
+ # IPTC Metadata
+ if(isset($iptcArray['APP13'])) {
+
+ $iptcInfo = iptcparse($iptcArray['APP13']);
+ if (is_array($iptcInfo)) {
+
+ $temp = @$iptcInfo['2#105'][0];
+ if (isset($temp)&&strlen($temp)>0) $return['title'] = $temp;
+
+ $temp = @$iptcInfo['2#120'][0];
+ if (isset($temp)&&strlen($temp)>0) $return['description'] = $temp;
+
+ }
+
+ }
+
+ # EXIF Metadata Fallback
+ $return['orientation'] = '';
+ $return['iso'] = '';
+ $return['aperture'] = '';
+ $return['make'] = '';
+ $return['model'] = '';
+ $return['shutter'] = '';
+ $return['focal'] = '';
+ $return['takestamp'] = 0;
+
+ # Read EXIF
+ if ($info['mime']=='image/jpeg') $exif = @exif_read_data($url, 'EXIF', 0);
+ else $exif = false;
+
+ # EXIF Metadata
+ if ($exif!==false) {
+
+ if (isset($exif['Orientation'])) $return['orientation'] = $exif['Orientation'];
+ else if (isset($exif['IFD0']['Orientation'])) $return['orientation'] = $exif['IFD0']['Orientation'];
+
+ $temp = @$exif['ISOSpeedRatings'];
+ if (isset($temp)) $return['iso'] = $temp;
+
+ $temp = @$exif['COMPUTED']['ApertureFNumber'];
+ if (isset($temp)) $return['aperture'] = $temp;
+
+ $temp = @$exif['Make'];
+ if (isset($temp)) $return['make'] = trim($temp);
+
+ $temp = @$exif['Model'];
+ if (isset($temp)) $return['model'] = trim($temp);
+
+ $temp = @$exif['ExposureTime'];
+ if (isset($temp)) $return['shutter'] = $exif['ExposureTime'] . ' Sec.';
+
+ $temp = @$exif['FocalLength'];
+ if (isset($temp)) $return['focal'] = ($temp/1) . ' mm';
+
+ $temp = @$exif['DateTimeOriginal'];
+ if (isset($temp)) $return['takestamp'] = strtotime($temp);
+
+ }
+
+ # Security
+ foreach(array_keys($return) as $key) $return[$key] = mysqli_real_escape_string($this->database, $return[$key]);
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ return $return;
+
+ }
+
+ public function getArchive() {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $this->photoIDs));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ # Get photo
+ $photos = $this->database->query("SELECT title, url FROM lychee_photos WHERE id = '$this->photoIDs' LIMIT 1;");
+ $photo = $photos->fetch_object();
+
+ # Get extension
+ $extension = getExtension($photo->url);
+ if ($extension===false) {
+ Log::error($this->database, __METHOD__, __LINE__, 'Invalid photo extension');
+ return false;
+ }
+
+ # Parse title
+ if ($photo->title=='') $photo->title = 'Untitled';
+
+ # Set headers
+ header("Content-Type: application/octet-stream");
+ header("Content-Disposition: attachment; filename=\"" . $photo->title . $extension . "\"");
+ header("Content-Length: " . filesize(LYCHEE_UPLOADS_BIG . $photo->url));
+
+ # Send file
+ readfile(LYCHEE_UPLOADS_BIG . $photo->url);
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ return true;
+
+ }
+
+ public function setTitle($title) {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $this->photoIDs));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ # Parse
+ if (strlen($title)>50) $title = substr($title, 0, 50);
+
+ # Set title
+ $result = $this->database->query("UPDATE lychee_photos SET title = '$title' WHERE id IN ($this->photoIDs);");
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ if (!$result) {
+ Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+ return false;
+ }
+ return true;
+
+ }
+
+ public function setDescription($description) {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $this->photoIDs));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ # Parse
+ $description = htmlentities($description);
+ if (strlen($description)>1000) $description = substr($description, 0, 1000);
+
+ # Set description
+ $result = $this->database->query("UPDATE lychee_photos SET description = '$description' WHERE id IN ('$this->photoIDs');");
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ if (!$result) {
+ Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+ return false;
+ }
+ return true;
+
+ }
+
+ public function setStar() {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $this->photoIDs));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ # Init vars
+ $error = false;
+
+ # Get photos
+ $photos = $this->database->query("SELECT id, star FROM lychee_photos WHERE id IN ($this->photoIDs);");
+
+ # For each photo
+ while ($photo = $photos->fetch_object()) {
+
+ # Invert star
+ $star = ($photo->star==0 ? 1 : 0);
+
+ # Set star
+ $star = $this->database->query("UPDATE lychee_photos SET star = '$star' WHERE id = '$photo->id';");
+ if (!$star) $error = true;
+
+ }
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ if ($error===true) {
+ Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+ return false;
+ }
+ return true;
+
+ }
+
+ public function getPublic($password) {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $this->photoIDs));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ # Get photo
+ $photos = $this->database->query("SELECT public, album FROM lychee_photos WHERE id = '$this->photoIDs' LIMIT 1;");
+ $photo = $photos->fetch_object();
+
+ # Check if public
+ if ($photo->public==1) return true;
+ else {
+ $album = new Album($this->database, null, null, $photo->album);
+ $acP = $album->checkPassword($password);
+ $agP = $album->getPublic();
+ if ($acP===true&&$agP===true) return true;
+ }
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ return false;
+
+ }
+
+ public function setPublic() {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $this->photoIDs));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ # Get public
+ $photos = $this->database->query("SELECT public FROM lychee_photos WHERE id = '$this->photoIDs' LIMIT 1;");
+ $photo = $photos->fetch_object();
+
+ # Invert public
+ $public = ($photo->public==0 ? 1 : 0);
+
+ # Set public
+ $result = $this->database->query("UPDATE lychee_photos SET public = '$public' WHERE id = '$this->photoIDs';");
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ if (!$result) {
+ Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+ return false;
+ }
+ return true;
+
+ }
+
+ function setAlbum($albumID) {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $this->photoIDs));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ # Set album
+ $result = $this->database->query("UPDATE lychee_photos SET album = '$albumID' WHERE id IN ($this->photoIDs);");
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ if (!$result) {
+ Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+ return false;
+ }
+ return true;
+
+ }
+
+ public function setTags($tags) {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $this->photoIDs));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ # Parse tags
+ $tags = preg_replace('/(\ ,\ )|(\ ,)|(,\ )|(,{1,}\ {0,})|(,$|^,)/', ',', $tags);
+ $tags = preg_replace('/,$|^,|(\ ){0,}$/', '', $tags);
+ if (strlen($tags)>1000) {
+ Log::notice($this->database, __METHOD__, __LINE__, 'Length of tags higher than 1000');
+ return false;
+ }
+
+ # Set tags
+ $result = $this->database->query("UPDATE lychee_photos SET tags = '$tags' WHERE id IN ($this->photoIDs);");
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ if (!$result) {
+ Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+ return false;
+ }
+ return true;
+
+ }
+
+ public function delete() {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $this->photoIDs));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ # Get photos
+ $photos = $this->database->query("SELECT id, url, thumbUrl FROM lychee_photos WHERE id IN ($this->photoIDs);");
+ if (!$photos) {
+ Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+ return false;
+ }
+
+ # For each photo
+ while ($photo = $photos->fetch_object()) {
+
+ # Get retina thumb url
+ $thumbUrl2x = explode(".", $photo->thumbUrl);
+ $thumbUrl2x = $thumbUrl2x[0] . '@2x.' . $thumbUrl2x[1];
+
+ # Delete big
+ if (file_exists(LYCHEE_UPLOADS_BIG . $photo->url)&&!unlink(LYCHEE_UPLOADS_BIG . $photo->url)) {
+ Log::error($this->database, __METHOD__, __LINE__, 'Could not delete photo in uploads/big/');
+ return false;
+ }
+
+ # Delete thumb
+ if (file_exists(LYCHEE_UPLOADS_THUMB . $photo->thumbUrl)&&!unlink(LYCHEE_UPLOADS_THUMB . $photo->thumbUrl)) {
+ Log::error($this->database, __METHOD__, __LINE__, 'Could not delete photo in uploads/thumb/');
+ return false;
+ }
+
+ # Delete thumb@2x
+ if (file_exists(LYCHEE_UPLOADS_THUMB . $thumbUrl2x)&&!unlink(LYCHEE_UPLOADS_THUMB . $thumbUrl2x)) {
+ Log::error($this->database, __METHOD__, __LINE__, 'Could not delete high-res photo in uploads/thumb/');
+ return false;
+ }
+
+ # Delete db entry
+ $delete = $this->database->query("DELETE FROM lychee_photos WHERE id = '$photo->id';");
+ if (!$delete) {
+ Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+ return false;
+ }
+
+ }
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ return true;
+
+ }
+
+}
+
+?>
\ No newline at end of file
diff --git a/php/modules/Plugins.php b/php/modules/Plugins.php
new file mode 100644
index 0000000..2603c04
--- /dev/null
+++ b/php/modules/Plugins.php
@@ -0,0 +1,96 @@
+files = $files;
+
+ # Load plugins
+ foreach ($this->files as $file) {
+
+ if ($file==='') continue;
+
+ $file = LYCHEE_PLUGINS . $file;
+
+ if (file_exists($file)===false) {
+ Log::warning($database, __METHOD__, __LINE__, 'Could not include plugin. File does not exist (' . $file . ').');
+ continue;
+ }
+
+ include($file);
+
+ }
+
+ return true;
+
+ }
+
+ public function attach(\SplObserver $observer) {
+
+ if (!isset($observer)) return false;
+
+ # Add observer
+ $this->observers[] = $observer;
+
+ return true;
+
+ }
+
+ public function detach(\SplObserver $observer) {
+
+ if (!isset($observer)) return false;
+
+ # Remove observer
+ $key = array_search($observer, $this->observers, true);
+ if ($key) unset($this->observers[$key]);
+
+ return true;
+
+ }
+
+ public function notify() {
+
+ # Notify each observer
+ foreach ($this->observers as $value) $value->update($this);
+
+ return true;
+
+ }
+
+ public function activate($action, $args) {
+
+ if (!isset($action, $args)) return false;
+
+ # Save vars
+ $this->action = $action;
+ $this->args = $args;
+
+ # Notify observers
+ $this->notify();
+
+ return true;
+
+ }
+
+}
+
+?>
\ No newline at end of file
diff --git a/php/modules/Session.php b/php/modules/Session.php
new file mode 100755
index 0000000..137c098
--- /dev/null
+++ b/php/modules/Session.php
@@ -0,0 +1,124 @@
+plugins = $plugins;
+ $this->settings = $settings;
+
+ return true;
+
+ }
+
+ public function init($database, $dbName, $public, $version) {
+
+ # Check dependencies
+ $this->dependencies(isset($this->settings, $public, $version));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ # Update
+ if (!isset($this->settings['version'])||$this->settings['version']!==$version) {
+ if (!Database::update($database, $dbName, @$this->settings['version'])) {
+ Log::error($database, __METHOD__, __LINE__, 'Updating the database failed');
+ exit('Error: Updating the database failed!');
+ }
+ }
+
+ # Return settings
+ $return['config'] = $this->settings;
+ unset($return['config']['password']);
+
+ # No login
+ if ($this->settings['username']===''&&$this->settings['password']==='') $return['config']['login'] = false;
+ else $return['config']['login'] = true;
+
+ if ($public===false) {
+
+ # Logged in
+ $return['loggedIn'] = true;
+
+ } else {
+
+ # Unset unused vars
+ unset($return['config']['username']);
+ unset($return['config']['thumbQuality']);
+ unset($return['config']['sorting']);
+ unset($return['config']['dropboxKey']);
+ unset($return['config']['login']);
+
+ # Logged out
+ $return['loggedIn'] = false;
+
+ }
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ return $return;
+
+ }
+
+ public function login($username, $password) {
+
+ # Check dependencies
+ $this->dependencies(isset($this->settings, $username, $password));
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ # Check login with MD5 hash
+ if ($username===$this->settings['username']&&$password===$this->settings['password']) {
+ $_SESSION['login'] = true;
+ return true;
+ }
+
+ # Check login with crypted hash
+ if ($username===$this->settings['username']&&$this->settings['password']===crypt($password, $this->settings['password'])) {
+ $_SESSION['login'] = true;
+ return true;
+ }
+
+ # No login
+ if ($this->settings['username']===''&&$this->settings['password']==='') {
+ $_SESSION['login'] = true;
+ return true;
+ }
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ return false;
+
+ }
+
+ public function logout() {
+
+ # Call plugins
+ $this->plugins(__METHOD__, 0, func_get_args());
+
+ session_destroy();
+
+ # Call plugins
+ $this->plugins(__METHOD__, 1, func_get_args());
+
+ return true;
+
+ }
+
+}
+
+?>
\ No newline at end of file
diff --git a/php/modules/Settings.php b/php/modules/Settings.php
new file mode 100755
index 0000000..46253cb
--- /dev/null
+++ b/php/modules/Settings.php
@@ -0,0 +1,191 @@
+database = $database;
+
+ return true;
+
+ }
+
+ public function get() {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database));
+
+ # Execute query
+ $settings = $this->database->query('SELECT * FROM lychee_settings;');
+
+ # Add each to return
+ while ($setting = $settings->fetch_object()) $return[$setting->key] = $setting->value;
+
+ # Fallback for versions below v2.5
+ if (!isset($return['plugins'])) $return['plugins'] = '';
+
+ return $return;
+
+ }
+
+ public function setLogin($oldPassword = '', $username, $password) {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database));
+
+ # Load settings
+ $settings = $this->get();
+
+ if ($oldPassword===$settings['password']||$settings['password']===crypt($oldPassword, $settings['password'])) {
+
+ # Save username
+ if (!$this->setUsername($username)) exit('Error: Updating username failed!');
+
+ # Save password
+ if (!$this->setPassword($password)) exit('Error: Updating password failed!');
+
+ return true;
+
+ }
+
+ exit('Error: Current password entered incorrectly!');
+
+ }
+
+ private function setUsername($username) {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database));
+
+ # Parse
+ $username = htmlentities($username);
+ if (strlen($username)>50) {
+ Log::notice($this->database, __METHOD__, __LINE__, 'Username is longer than 50 chars');
+ return false;
+ }
+
+ # Execute query
+ $result = $this->database->query("UPDATE lychee_settings SET value = '$username' WHERE `key` = 'username';");
+
+ if (!$result) {
+ Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+ return false;
+ }
+ return true;
+
+ }
+
+ private function setPassword($password) {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database));
+
+ $password = get_hashed_password($password);
+
+ # Execute query
+ $result = $this->database->query("UPDATE lychee_settings SET value = '$password' WHERE `key` = 'password';");
+
+ if (!$result) {
+ Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+ return false;
+ }
+ return true;
+
+ }
+
+ public function setDropboxKey($key) {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $key));
+
+ if (strlen($key)<1||strlen($key)>50) {
+ Log::notice($this->database, __METHOD__, __LINE__, 'Dropbox key is either too short or too long');
+ return false;
+ }
+
+ # Execute query
+ $result = $this->database->query("UPDATE lychee_settings SET value = '$key' WHERE `key` = 'dropboxKey';");
+
+ if (!$result) {
+ Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+ return false;
+ }
+ return true;
+
+ }
+
+ public function setSorting($type, $order) {
+
+ # Check dependencies
+ $this->dependencies(isset($this->database, $type, $order));
+
+ $sorting = 'ORDER BY ';
+
+ # Set row
+ switch ($type) {
+
+ case 'id': $sorting .= 'id';
+ break;
+
+ case 'title': $sorting .= 'title';
+ break;
+
+ case 'description': $sorting .= 'description';
+ break;
+
+ case 'public': $sorting .= 'public';
+ break;
+
+ case 'type': $sorting .= 'type';
+ break;
+
+ case 'star': $sorting .= 'star';
+ break;
+
+ case 'takestamp': $sorting .= 'takestamp';
+ break;
+
+ default: exit('Error: Unknown type for sorting!');
+
+ }
+
+ $sorting .= ' ';
+
+ # Set order
+ switch ($order) {
+
+ case 'ASC': $sorting .= 'ASC';
+ break;
+
+ case 'DESC': $sorting .= 'DESC';
+ break;
+
+ default: exit('Error: Unknown order for sorting!');
+
+ }
+
+ # Execute query
+ $result = $this->database->query("UPDATE lychee_settings SET value = '$sorting' WHERE `key` = 'sorting';");
+
+ if (!$result) {
+ Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+ return false;
+ }
+ return true;
+
+ }
+
+}
+
+?>
\ No newline at end of file
diff --git a/php/modules/album.php b/php/modules/album.php
deleted file mode 100755
index 7c077d2..0000000
--- a/php/modules/album.php
+++ /dev/null
@@ -1,353 +0,0 @@
-50) return false;
-
- $sysdate = date("d.m.Y");
- $result = $database->query("INSERT INTO lychee_albums (title, sysdate, public) VALUES ('$title', '$sysdate', '$public');");
-
- if (!$result) return false;
- return $database->insert_id;
-
-}
-
-function getAlbums($public) {
-
- global $database, $settings;
-
- // Smart Albums
- if (!$public) $return = getSmartInfo();
-
- // Albums
- if ($public) $query = "SELECT id, title, public, sysdate, password FROM lychee_albums WHERE public = 1";
- else $query = "SELECT id, title, public, sysdate, password FROM lychee_albums";
-
- $result = $database->query($query) OR exit("Error: $result
".$database->error);
- $i = 0;
-
- while($row = $result->fetch_object()) {
-
- // Info
- $return["content"][$row->id]['id'] = $row->id;
- $return["content"][$row->id]['title'] = $row->title;
- $return["content"][$row->id]['public'] = $row->public;
- $return["content"][$row->id]['sysdate'] = date('F Y', strtotime($row->sysdate));
-
- // Password
- if ($row->password=="") $return["content"][$row->id]['password'] = false;
- else $return["content"][$row->id]['password'] = true;
-
- // Thumbs
- if (($public&&$row->password=="")||(!$public)) {
-
- $albumID = $row->id;
- $result2 = $database->query("SELECT thumbUrl FROM lychee_photos WHERE album = '$albumID' ORDER BY star DESC, " . substr($settings['sorting'], 9) . " LIMIT 0, 3");
- $k = 0;
- while($row2 = $result2->fetch_object()){
- $return["content"][$row->id]["thumb$k"] = $row2->thumbUrl;
- $k++;
- }
- if (!isset($return["content"][$row->id]["thumb0"])) $return["content"][$row->id]["thumb0"] = "";
- if (!isset($return["content"][$row->id]["thumb1"])) $return["content"][$row->id]["thumb1"] = "";
- if (!isset($return["content"][$row->id]["thumb2"])) $return["content"][$row->id]["thumb2"] = "";
-
- }
-
- // Album count
- $i++;
-
- }
-
- $return["num"] = $i;
-
- return $return;
-
-}
-
-function getSmartInfo() {
-
- global $database, $settings;
-
- // Unsorted
- $result = $database->query("SELECT thumbUrl FROM lychee_photos WHERE album = 0 " . $settings['sorting']);
- $i = 0;
- while($row = $result->fetch_object()) {
- if ($i<3) $return["unsortedThumb$i"] = $row->thumbUrl;
- $i++;
- }
- $return['unsortedNum'] = $i;
-
- // Public
- $result2 = $database->query("SELECT thumbUrl FROM lychee_photos WHERE public = 1 " . $settings['sorting']);
- $i = 0;
- while($row2 = $result2->fetch_object()) {
- if ($i<3) $return["publicThumb$i"] = $row2->thumbUrl;
- $i++;
- }
- $return['publicNum'] = $i;
-
- // Starred
- $result3 = $database->query("SELECT thumbUrl FROM lychee_photos WHERE star = 1 " . $settings['sorting']);
- $i = 0;
- while($row3 = $result3->fetch_object()) {
- if ($i<3) $return["starredThumb$i"] = $row3->thumbUrl;
- $i++;
- }
- $return['starredNum'] = $i;
-
- return $return;
-
-}
-
-function getAlbum($albumID) {
-
- global $database, $settings;
-
- // Get album information
- switch($albumID) {
-
- case "f": $return['public'] = false;
- $query = "SELECT id, title, tags, sysdate, public, star, album, thumbUrl FROM lychee_photos WHERE star = 1 " . $settings['sorting'];
- break;
-
- case "s": $return['public'] = false;
- $query = "SELECT id, title, tags, sysdate, public, star, album, thumbUrl FROM lychee_photos WHERE public = 1 " . $settings['sorting'];
- break;
-
- case "0": $return['public'] = false;
- $query = "SELECT id, title, tags, sysdate, public, star, album, thumbUrl FROM lychee_photos WHERE album = 0 " . $settings['sorting'];
- break;
-
- default: $result = $database->query("SELECT * FROM lychee_albums WHERE id = '$albumID';");
- $row = $result->fetch_object();
- $return['title'] = $row->title;
- $return['description'] = $row->description;
- $return['sysdate'] = date('d M. Y', strtotime($row->sysdate));
- $return['public'] = $row->public;
- $return['password'] = ($row->password=="" ? false : true);
- $query = "SELECT id, title, tags, sysdate, public, star, album, thumbUrl FROM lychee_photos WHERE album = '$albumID' " . $settings['sorting'];
- break;
-
- }
-
- // Get photos
- $result = $database->query($query);
- $previousPhotoID = "";
- $i = 0;
- while($row = $result->fetch_assoc()) {
-
- $return['content'][$row['id']]['id'] = $row['id'];
- $return['content'][$row['id']]['title'] = $row['title'];
- $return['content'][$row['id']]['sysdate'] = date('d F Y', strtotime($row['sysdate']));
- $return['content'][$row['id']]['public'] = $row['public'];
- $return['content'][$row['id']]['star'] = $row['star'];
- $return['content'][$row['id']]['tags'] = $row['tags'];
- $return['content'][$row['id']]['album'] = $row['album'];
- $return['content'][$row['id']]['thumbUrl'] = $row['thumbUrl'];
-
- $return['content'][$row['id']]['previousPhoto'] = $previousPhotoID;
- $return['content'][$row['id']]['nextPhoto'] = "";
- if ($previousPhotoID!="") $return['content'][$previousPhotoID]['nextPhoto'] = $row['id'];
-
- $previousPhotoID = $row['id'];
- $i++;
-
- }
-
- if ($i==0) {
-
- // Empty album
- $return['content'] = false;
-
- } else {
-
- // Enable next and previous for the first and last photo
- $lastElement = end($return['content']);
- $lastElementId = $lastElement['id'];
- $firstElement = reset($return['content']);
- $firstElementId = $firstElement['id'];
-
- if ($lastElementId!==$firstElementId) {
- $return['content'][$lastElementId]['nextPhoto'] = $firstElementId;
- $return['content'][$firstElementId]['previousPhoto'] = $lastElementId;
- }
-
- }
-
- $return['id'] = $albumID;
- $return['num'] = $i;
-
- return $return;
-
-}
-
-function setAlbumTitle($albumIDs, $title) {
-
- global $database;
-
- if (strlen($title)<1||strlen($title)>50) return false;
- $result = $database->query("UPDATE lychee_albums SET title = '$title' WHERE id IN ($albumIDs);");
-
- if (!$result) return false;
- return true;
-
-}
-
-function setAlbumDescription($albumID, $description) {
-
- global $database;
-
- $description = htmlentities($description);
- if (strlen($description)>1000) return false;
- $result = $database->query("UPDATE lychee_albums SET description = '$description' WHERE id = '$albumID';");
-
- if (!$result) return false;
- return true;
-
-}
-
-function deleteAlbum($albumIDs) {
-
- global $database;
-
- $error = false;
- $result = $database->query("SELECT id FROM lychee_photos WHERE album IN ($albumIDs);");
-
- // Delete photos
- while ($row = $result->fetch_object())
- if (!deletePhoto($row->id)) $error = true;
-
- // Delete album
- $result = $database->query("DELETE FROM lychee_albums WHERE id IN ($albumIDs);");
-
- if ($error||!$result) return false;
- return true;
-
-}
-
-function getAlbumArchive($albumID) {
-
- global $database;
-
- switch($albumID) {
- case 's':
- $query = "SELECT url FROM lychee_photos WHERE public = '1';";
- $zipTitle = "Public";
- break;
- case 'f':
- $query = "SELECT url FROM lychee_photos WHERE star = '1';";
- $zipTitle = "Starred";
- break;
- default:
- $query = "SELECT url FROM lychee_photos WHERE album = '$albumID';";
- $zipTitle = "Unsorted";
- }
-
- $zip = new ZipArchive();
- $result = $database->query($query);
- $files = array();
- $i = 0;
-
- while($row = $result->fetch_object()) {
- $files[$i] = "../uploads/big/".$row->url;
- $i++;
- }
-
- $result = $database->query("SELECT title FROM lychee_albums WHERE id = '$albumID' LIMIT 1;");
- $row = $result->fetch_object();
- if ($albumID!=0&&is_numeric($albumID)) $zipTitle = $row->title;
- $filename = "../data/$zipTitle.zip";
-
- if ($zip->open($filename, ZIPARCHIVE::CREATE)!==TRUE) {
- return false;
- }
-
- foreach($files AS $zipFile) {
- $newFile = explode("/",$zipFile);
- $newFile = array_reverse($newFile);
- $zip->addFile($zipFile, $zipTitle."/".$newFile[0]);
- }
-
- $zip->close();
-
- header("Content-Type: application/zip");
- header("Content-Disposition: attachment; filename=\"$zipTitle.zip\"");
- header("Content-Length: ".filesize($filename));
- readfile($filename);
- unlink($filename);
-
- return true;
-
-}
-
-function setAlbumPublic($albumID, $password) {
-
- global $database;
-
- $result = $database->query("SELECT public FROM lychee_albums WHERE id = '$albumID';");
- $row = $result->fetch_object();
- $public = ($row->public=='0' ? 1 : 0);
-
- $result = $database->query("UPDATE lychee_albums SET public = '$public', password = NULL WHERE id = '$albumID';");
- if (!$result) return false;
-
- if ($public==1) {
- $result = $database->query("UPDATE lychee_photos SET public = 0 WHERE album = '$albumID';");
- if (!$result) return false;
- }
-
- if (strlen($password)>0) return setAlbumPassword($albumID, $password);
- return true;
-
-}
-
-function setAlbumPassword($albumID, $password) {
-
- global $database;
-
- $result = $database->query("UPDATE lychee_albums SET password = '$password' WHERE id = '$albumID';");
-
- if (!$result) return false;
- return true;
-
-}
-
-function checkAlbumPassword($albumID, $password) {
-
- global $database;
-
- $result = $database->query("SELECT password FROM lychee_albums WHERE id = '$albumID';");
- $row = $result->fetch_object();
-
- if ($row->password=="") return true;
- else if ($row->password==$password) return true;
- return false;
-
-}
-
-function isAlbumPublic($albumID) {
-
- global $database;
-
- $result = $database->query("SELECT public FROM lychee_albums WHERE id = '$albumID';");
- $row = $result->fetch_object();
-
- if ($albumID==='0'||$albumID==='s'||$albumID==='f') return false;
- if ($row->public==1) return true;
- return false;
-
-}
-
-?>
\ No newline at end of file
diff --git a/php/modules/db.php b/php/modules/db.php
deleted file mode 100755
index 12ffb40..0000000
--- a/php/modules/db.php
+++ /dev/null
@@ -1,185 +0,0 @@
-connect_errno) exit('Error: ' . $database->connect_error);
-
- // Avoid sql injection on older MySQL versions
- if ($database->server_version<50500) $database->set_charset('GBK');
-
- if (!$database->select_db($dbName))
- if (!dbCreate($dbName, $database)) exit('Error: Could not create database!');
-
- if (!$database->query('SELECT * FROM lychee_photos, lychee_albums, lychee_settings LIMIT 0;'))
- if (!dbCreateTables($database)) exit('Error: Could not create tables!');
-
- return $database;
-
-}
-
-function dbCreateConfig($dbHost = 'localhost', $dbUser, $dbPassword, $dbName = 'lychee', $version) {
-
- $dbPassword = urldecode($dbPassword);
- $database = new mysqli($dbHost, $dbUser, $dbPassword);
-
- if ($database->connect_errno) return 'Warning: Connection failed!';
- else {
-
-$config = "";
-
- if (file_put_contents('../data/config.php', $config)===false) return 'Warning: Could not create file!';
-
- $_SESSION['login'] = true;
- return true;
-
- }
-
-}
-
-function dbCreate($dbName, $database) {
-
- $result = $database->query("CREATE DATABASE IF NOT EXISTS $dbName;");
- $database->select_db($dbName);
-
- if (!$database->select_db($dbName)||!$result) return false;
- return true;
-
-}
-
-function dbCreateTables($database) {
-
- if (!$database->query('SELECT * FROM lychee_settings LIMIT 0;')) {
-
- $query = "
-
- CREATE TABLE `lychee_settings` (
- `key` varchar(50) NOT NULL DEFAULT '',
- `value` varchar(50) DEFAULT ''
- ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
- ";
-
- if (!$database->query($query)) return false;
-
- $query = "
-
- INSERT INTO `lychee_settings` (`key`, `value`)
- VALUES
- ('username',''),
- ('password',''),
- ('thumbQuality','90'),
- ('checkForUpdates','1'),
- ('sorting','ORDER BY id DESC'),
- ('dropboxKey','');
-
- ";
-
- if (!$database->query($query)) return false;
-
- }
-
- if (!$database->query('SELECT * FROM lychee_albums LIMIT 0;')) {
-
- $query = "
-
- CREATE TABLE `lychee_albums` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
- `title` varchar(50) NOT NULL,
- `description` varchar(1000) DEFAULT '',
- `sysdate` varchar(10) NOT NULL,
- `public` tinyint(1) DEFAULT '0',
- `password` varchar(100) DEFAULT '',
- PRIMARY KEY (`id`)
- ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
- ";
-
- if (!$database->query($query)) return false;
-
- }
-
- if (!$database->query('SELECT * FROM lychee_photos LIMIT 0;')) {
-
- $query = "
-
- CREATE TABLE `lychee_photos` (
- `id` bigint(14) NOT NULL,
- `title` varchar(50) NOT NULL,
- `description` varchar(1000) NOT NULL DEFAULT '',
- `url` varchar(100) NOT NULL,
- `tags` varchar(1000) NOT NULL DEFAULT '',
- `public` tinyint(1) NOT NULL,
- `type` varchar(10) NOT NULL,
- `width` int(11) NOT NULL,
- `height` int(11) NOT NULL,
- `size` varchar(20) NOT NULL,
- `sysdate` varchar(10) NOT NULL,
- `systime` varchar(8) NOT NULL,
- `iso` varchar(15) NOT NULL,
- `aperture` varchar(20) NOT NULL,
- `make` varchar(20) NOT NULL,
- `model` varchar(50) NOT NULL,
- `shutter` varchar(30) NOT NULL,
- `focal` varchar(20) NOT NULL,
- `takedate` varchar(20) NOT NULL,
- `taketime` varchar(8) NOT NULL,
- `star` tinyint(1) NOT NULL,
- `thumbUrl` varchar(50) NOT NULL,
- `album` varchar(30) NOT NULL DEFAULT '0',
- `import_name` varchar(100) DEFAULT '',
- PRIMARY KEY (`id`)
- ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
- ";
-
- if (!$database->query($query)) return false;
-
- }
-
- return true;
-
-}
-
-function dbClose() {
-
- global $database;
-
- if (!$database->close()) exit('Error: Closing the connection failed!');
-
- return true;
-
-}
-
-?>
diff --git a/php/modules/misc.php b/php/modules/misc.php
index cd6bea7..2b5afb3 100755
--- a/php/modules/misc.php
+++ b/php/modules/misc.php
@@ -9,9 +9,50 @@
if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
-function openGraphHeader($photoID) {
+function search($database, $settings, $term) {
- global $database;
+ if (!isset($database, $settings, $term)) return false;
+
+ $return['albums'] = '';
+
+ // Photos
+ $result = $database->query("SELECT id, title, tags, public, star, album, thumbUrl FROM lychee_photos WHERE title like '%$term%' OR description like '%$term%' OR tags like '%$term%';");
+ while($row = $result->fetch_assoc()) {
+ $return['photos'][$row['id']] = $row;
+ $return['photos'][$row['id']]['sysdate'] = date('d M. Y', substr($row['id'], 0, -4));
+ }
+
+ // Albums
+ $result = $database->query("SELECT id, title, public, sysstamp, password FROM lychee_albums WHERE title like '%$term%' OR description like '%$term%';");
+ $i = 0;
+ while($row = $result->fetch_object()) {
+
+ // Info
+ $return['albums'][$row->id]['id'] = $row->id;
+ $return['albums'][$row->id]['title'] = $row->title;
+ $return['albums'][$row->id]['public'] = $row->public;
+ $return['albums'][$row->id]['sysdate'] = date('F Y', $row->sysstamp);
+ $return['albums'][$row->id]['password'] = ($row->password=='' ? false : true);
+
+ // Thumbs
+ $result2 = $database->query("SELECT thumbUrl FROM lychee_photos WHERE album = '" . $row->id . "' " . $settings['sorting'] . " LIMIT 0, 3;");
+ $k = 0;
+ while($row2 = $result2->fetch_object()){
+ $return['albums'][$row->id]["thumb$k"] = $row2->thumbUrl;
+ $k++;
+ }
+
+ $i++;
+
+ }
+
+ return $return;
+
+}
+
+function getGraphHeader($database, $photoID) {
+
+ if (!isset($database, $photoID)) return false;
$photoID = mysqli_real_escape_string($database, $photoID);
@@ -39,74 +80,81 @@ function openGraphHeader($photoID) {
}
-function search($term) {
+function getExtension($filename) {
- global $database, $settings;
+ $extension = strpos($filename, '.') !== false
+ ? strrchr($filename, '.')
+ : '';
- $return['albums'] = '';
-
- // Photos
- $result = $database->query("SELECT id, title, tags, sysdate, public, star, album, thumbUrl FROM lychee_photos WHERE title like '%$term%' OR description like '%$term%' OR tags like '%$term%';");
- while($row = $result->fetch_assoc()) {
- $return['photos'][$row['id']] = $row;
- $return['photos'][$row['id']]['sysdate'] = date('d F Y', strtotime($row['sysdate']));
- }
-
- // Albums
- $result = $database->query("SELECT id, title, public, sysdate, password FROM lychee_albums WHERE title like '%$term%' OR description like '%$term%';");
- $i = 0;
- while($row = $result->fetch_object()) {
-
- // Info
- $return['albums'][$row->id]['id'] = $row->id;
- $return['albums'][$row->id]['title'] = $row->title;
- $return['albums'][$row->id]['public'] = $row->public;
- $return['albums'][$row->id]['sysdate'] = date('F Y', strtotime($row->sysdate));
- $return['albums'][$row->id]['password'] = ($row->password=='' ? false : true);
-
- // Thumbs
- $result2 = $database->query("SELECT thumbUrl FROM lychee_photos WHERE album = '" . $row->id . "' " . $settings['sorting'] . " LIMIT 0, 3;");
- $k = 0;
- while($row2 = $result2->fetch_object()){
- $return['albums'][$row->id]["thumb$k"] = $row2->thumbUrl;
- $k++;
- }
-
- $i++;
-
- }
-
- return $return;
+ return $extension;
}
-function update($version = '') {
+function get_hashed_password($password) {
- global $database, $configVersion;
+ # Inspired by http://alias.io/2010/01/store-passwords-safely-with-php-and-mysql/
- // Albums
- if(!$database->query("SELECT `description` FROM `lychee_albums` LIMIT 1;")) $database->query("ALTER TABLE `lychee_albums` ADD `description` VARCHAR( 1000 ) NULL DEFAULT ''"); // v2.0
- if($database->query("SELECT `password` FROM `lychee_albums` LIMIT 1;")) $database->query("ALTER TABLE `lychee_albums` CHANGE `password` `password` VARCHAR( 100 ) NULL DEFAULT ''"); // v2.0
+ # A higher $cost is more secure but consumes more processing power
+ $cost = 10;
- // Photos
- if($database->query("SELECT `description` FROM `lychee_photos` LIMIT 1;")) $database->query("ALTER TABLE `lychee_photos` CHANGE `description` `description` VARCHAR( 1000 ) NULL DEFAULT ''"); // v2.0
- if(!$database->query("SELECT `tags` FROM `lychee_photos` LIMIT 1;")) $database->query("ALTER TABLE `lychee_photos` ADD `tags` VARCHAR( 1000 ) NULL DEFAULT ''"); // v2.1
- $database->query("UPDATE `lychee_photos` SET url = replace(url, 'uploads/big/', ''), thumbUrl = replace(thumbUrl, 'uploads/thumb/', '')");
-
- // Settings
- $database->query("ALTER TABLE `lychee_settings` CHANGE `value` `value` VARCHAR( 200 ) NULL DEFAULT ''"); // v2.1.1
- $result = $database->query("SELECT `key` FROM `lychee_settings` WHERE `key` = 'dropboxKey' LIMIT 1;");
- if ($result->num_rows===0) $database->query("INSERT INTO `lychee_settings` (`key`, `value`) VALUES ('dropboxKey', '')"); // v2.1
-
- // Config
- if ($version!==''&&$configVersion!==$version) {
- $data = file_get_contents('../data/config.php');
- $data = preg_replace('/\$configVersion = \'[\w. ]*\';/', "\$configVersion = '$version';", $data);
- if (file_put_contents('../data/config.php', $data)===false) return 'Error: Could not save updated config!';
+ # Create a random salt
+ if (extension_loaded('openssl')) {
+ $salt = strtr(substr(base64_encode(openssl_random_pseudo_bytes(17)),0,22), '+', '.');
+ } elseif (extension_loaded('mcrypt')) {
+ $salt = strtr(substr(base64_encode(mcrypt_create_iv(17, MCRYPT_DEV_URANDOM)),0,22), '+', '.');
+ } else {
+ $salt = "";
+ for ($i = 0; $i < 22; $i++) {
+ $salt .= substr("./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", mt_rand(0, 63), 1);
+ }
}
+ # Prefix information about the hash so PHP knows how to verify it later.
+ # "$2a$" Means we're using the Blowfish algorithm. The following two digits are the cost parameter.
+ $salt = sprintf("$2a$%02d$", $cost) . $salt;
+
+ # Hash the password with the salt
+ return crypt($password, $salt);
+
+}
+
+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) {
+
+ ###
+ # Plug-and-Play fastimagecopyresampled function replaces much slower imagecopyresampled.
+ # Just include this function and change all "imagecopyresampled" references to "fastimagecopyresampled".
+ # Typically from 30 to 60 times faster when reducing high resolution images down to thumbnail size using the default quality setting.
+ # Author: Tim Eckel - Date: 09/07/07 - Version: 1.1 - Project: FreeRingers.net - Freely distributable - These comments must remain.
+ #
+ # Optional "quality" parameter (defaults is 3). Fractional values are allowed, for example 1.5. Must be greater than zero.
+ # Between 0 and 1 = Fast, but mosaic results, closer to 0 increases the mosaic effect.
+ # 1 = Up to 350 times faster. Poor results, looks very similar to imagecopyresized.
+ # 2 = Up to 95 times faster. Images appear a little sharp, some prefer this over a quality of 3.
+ # 3 = Up to 60 times faster. Will give high quality smooth results very close to imagecopyresampled, just faster.
+ # 4 = Up to 25 times faster. Almost identical to imagecopyresampled for most images.
+ # 5 = No speedup. Just uses imagecopyresampled, no advantage over imagecopyresampled.
+ ###
+
+ if (empty($src_image) || empty($dst_image) || $quality <= 0) { return false; }
+
+ if ($quality < 5 && (($dst_w * $quality) < $src_w || ($dst_h * $quality) < $src_h)) {
+
+ $temp = imagecreatetruecolor($dst_w * $quality + 1, $dst_h * $quality + 1);
+ imagecopyresized($temp, $src_image, 0, 0, $src_x, $src_y, $dst_w * $quality + 1, $dst_h * $quality + 1, $src_w, $src_h);
+ imagecopyresampled($dst_image, $temp, $dst_x, $dst_y, 0, 0, $dst_w, $dst_h, $dst_w * $quality, $dst_h * $quality);
+ imagedestroy($temp);
+
+ } else imagecopyresampled($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
+
return true;
}
-?>
+?>
\ No newline at end of file
diff --git a/php/modules/photo.php b/php/modules/photo.php
deleted file mode 100755
index f000c53..0000000
--- a/php/modules/photo.php
+++ /dev/null
@@ -1,199 +0,0 @@
-query($query);
- $return = $result->fetch_assoc();
-
- if ($albumID!='false') {
-
- if ($return['album']!=0) {
-
- $result = $database->query("SELECT public FROM lychee_albums WHERE id = '" . $return['album'] . "';");
- $return_album = $result->fetch_assoc();
- if ($return_album['public']=="1") $return['public'] = "2";
-
- }
-
- $return['original_album'] = $return['album'];
- $return['album'] = $albumID;
- $return['sysdate'] = date('d M. Y', strtotime($return['sysdate']));
- if (strlen($return['takedate'])>0) $return['takedate'] = date('d M. Y', strtotime($return['takedate']));
-
- }
-
- unset($return['album_public']);
-
- return $return;
-
-}
-
-function setPhotoPublic($photoID, $url) {
-
- global $database;
-
- $result = $database->query("SELECT public FROM lychee_photos WHERE id = '$photoID';");
- $row = $result->fetch_object();
- $public = ($row->public==0 ? 1 : 0);
- $result = $database->query("UPDATE lychee_photos SET public = '$public' WHERE id = '$photoID';");
-
- if (!$result) return false;
- return true;
-
-}
-
-function setPhotoStar($photoIDs) {
-
- global $database;
-
- $error = false;
- $result = $database->query("SELECT id, star FROM lychee_photos WHERE id IN ($photoIDs);");
-
- while ($row = $result->fetch_object()) {
-
- $star = ($row->star==0 ? 1 : 0);
- $star = $database->query("UPDATE lychee_photos SET star = '$star' WHERE id = '$row->id';");
- if (!$star) $error = true;
-
- }
-
- if ($error) return false;
- return true;
-
-}
-
-function setPhotoAlbum($photoIDs, $albumID) {
-
- global $database;
-
- $result = $database->query("UPDATE lychee_photos SET album = '$albumID' WHERE id IN ($photoIDs);");
-
- if (!$result) return false;
- return true;
-
-}
-
-function setPhotoTitle($photoIDs, $title) {
-
- global $database;
-
- if (strlen($title)>50) return false;
- $result = $database->query("UPDATE lychee_photos SET title = '$title' WHERE id IN ($photoIDs);");
-
- if (!$result) return false;
- return true;
-
-}
-
-function setPhotoDescription($photoID, $description) {
-
- global $database;
-
- $description = htmlentities($description);
- if (strlen($description)>1000) return false;
-
- $result = $database->query("UPDATE lychee_photos SET description = '$description' WHERE id = '$photoID';");
-
- if (!$result) return false;
- return true;
-
-}
-
-function setPhotoTags($photoIDs, $tags) {
-
- global $database;
-
- // Parse tags
- $tags = preg_replace('/(\ ,\ )|(\ ,)|(,\ )|(,{1,}\ {0,})|(,$|^,)/', ',', $tags);
- $tags = preg_replace('/,$|^,/', ',', $tags);
-
- if (strlen($tags)>1000) return false;
-
- $result = $database->query("UPDATE lychee_photos SET tags = '$tags' WHERE id IN ($photoIDs);");
-
- if (!$result) return false;
- return true;
-
-}
-
-function deletePhoto($photoIDs) {
-
- global $database;
-
- $result = $database->query("SELECT id, url, thumbUrl FROM lychee_photos WHERE id IN ($photoIDs);");
-
- while ($row = $result->fetch_object()) {
-
- // Get retina thumb url
- $thumbUrl2x = explode(".", $row->thumbUrl);
- $thumbUrl2x = $thumbUrl2x[0] . '@2x.' . $thumbUrl2x[1];
-
- // Delete files
- if (!unlink('../uploads/big/' . $row->url)) return false;
- if (!unlink('../uploads/thumb/' . $row->thumbUrl)) return false;
- if (!unlink('../uploads/thumb/' . $thumbUrl2x)) return false;
-
- // Delete db entry
- $delete = $database->query("DELETE FROM lychee_photos WHERE id = $row->id;");
- if (!$delete) return false;
-
- }
-
- if (!$result) return false;
- return true;
-
-}
-
-function isPhotoPublic($photoID, $password) {
-
- global $database;
-
- $query = "SELECT public, album FROM lychee_photos WHERE id = '$photoID';";
-
- $result = $database->query($query);
- $row = $result->fetch_object();
-
- if ($row->public==1) return true;
- else {
- $cAP = checkAlbumPassword($row->album, $password);
- $iAP = isAlbumPublic($row->album);
- if ($iAP&&$cAP) return true;
- return false;
- }
-
-}
-
-function getPhotoArchive($photoID) {
-
- global $database;
-
- $result = $database->query("SELECT title, url FROM lychee_photos WHERE id = '$photoID';");
- $row = $result->fetch_object();
-
- $extension = array_reverse(explode('.', $row->url));
-
- if ($row->title=='') $row->title = 'Untitled';
-
- header("Content-Type: application/octet-stream");
- header("Content-Disposition: attachment; filename=\"$row->title.$extension[0]\"");
- header("Content-Length: " . filesize("../uploads/big/$row->url"));
-
- readfile("../uploads/big/$row->url");
-
- return true;
-
-}
-
-?>
\ No newline at end of file
diff --git a/php/modules/session.php b/php/modules/session.php
deleted file mode 100755
index fecd555..0000000
--- a/php/modules/session.php
+++ /dev/null
@@ -1,69 +0,0 @@
-
\ No newline at end of file
diff --git a/php/modules/settings.php b/php/modules/settings.php
deleted file mode 100755
index 94da29c..0000000
--- a/php/modules/settings.php
+++ /dev/null
@@ -1,136 +0,0 @@
-query('SELECT * FROM lychee_settings;');
-
- while($row = $result->fetch_object()) {
- $return[$row->key] = $row->value;
- }
-
- return $return;
-
-}
-
-function setLogin($oldPassword = '', $username, $password) {
-
- global $settings;
-
- if ($oldPassword==$settings['password']) {
-
- if (!setUsername($username)) exit('Error: Updating username failed!');
- if (!setPassword($password)) exit('Error: Updating password failed!');
-
- return true;
-
- }
-
- exit('Error: Current password entered incorrectly!');
-
-}
-
-function setUsername($username) {
-
- global $database;
-
- $username = htmlentities($username);
- if (strlen($username)>50) return false;
-
- $result = $database->query("UPDATE lychee_settings SET value = '$username' WHERE `key` = 'username';");
-
- if (!$result) return false;
- return true;
-
-}
-
-function setPassword($password) {
-
- global $database;
-
- if (strlen($password)<1||strlen($password)>50) return false;
-
- $result = $database->query("UPDATE lychee_settings SET value = '$password' WHERE `key` = 'password';");
-
- if (!$result) return false;
- return true;
-
-}
-
-function setDropboxKey($key) {
-
- global $database;
-
- if (strlen($key)<1||strlen($key)>50) return false;
-
- $result = $database->query("UPDATE lychee_settings SET value = '$key' WHERE `key` = 'dropboxKey';");
-
- if (!$result) return false;
- return true;
-
-}
-
-function setSorting($type, $order) {
-
- global $database;
-
- $sorting = 'ORDER BY ';
-
- switch ($type) {
-
- case 'id': $sorting .= 'id';
- break;
-
- case 'title': $sorting .= 'title';
- break;
-
- case 'description': $sorting .= 'description';
- break;
-
- case 'public': $sorting .= 'public';
- break;
-
- case 'type': $sorting .= 'type';
- break;
-
- case 'star': $sorting .= 'star';
- break;
-
- case 'take': $sorting .= 'UNIX_TIMESTAMP(STR_TO_DATE(CONCAT(takedate,"-",taketime),"%d.%m.%Y-%H:%i:%S"))';
- break;
-
- default: exit('Error: Unknown type for sorting!');
-
- }
-
- $sorting .= ' ';
-
- switch ($order) {
-
- case 'ASC': $sorting .= 'ASC';
- break;
-
- case 'DESC': $sorting .= 'DESC';
- break;
-
- default: exit('Error: Unknown order for sorting!');
-
- }
-
- $result = $database->query("UPDATE lychee_settings SET value = '$sorting' WHERE `key` = 'sorting';");
-
- if (!$result) return false;
- return true;
-
-}
-
-?>
\ No newline at end of file
diff --git a/php/modules/upload.php b/php/modules/upload.php
deleted file mode 100755
index 4aae792..0000000
--- a/php/modules/upload.php
+++ /dev/null
@@ -1,407 +0,0 @@
-query($query);
-
- if (!$result) return false;
-
- }
-
- return true;
-
-}
-
-function getInfo($filename) {
-
- global $database;
-
- $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));
-
- // Size
- $size = filesize($url)/1024;
- if ($size>=1024) $return['size'] = round($size/1024, 1) . ' MB';
- else $return['size'] = round($size, 1) . ' KB';
-
- // IPTC Metadata Fallback
- $return['title'] = '';
- $return['description'] = '';
-
- // IPTC Metadata
- if(isset($iptcArray['APP13'])) {
-
- $iptcInfo = iptcparse($iptcArray['APP13']);
- if (is_array($iptcInfo)) {
-
- $temp = @$iptcInfo['2#105'][0];
- if (isset($temp)&&strlen($temp)>0) $return['title'] = $temp;
-
- $temp = @$iptcInfo['2#120'][0];
- if (isset($temp)&&strlen($temp)>0) $return['description'] = $temp;
-
- }
-
- }
-
- // EXIF Metadata Fallback
- $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 ($exif!==false) {
-
- $temp = @$exif['Orientation'];
- if (isset($temp)) $return['orientation'] = $temp;
-
- $temp = @$exif['ISOSpeedRatings'];
- if (isset($temp)) $return['iso'] = $temp;
-
- $temp = @$exif['COMPUTED']['ApertureFNumber'];
- if (isset($temp)) $return['aperture'] = $temp;
-
- $temp = @$exif['Make'];
- if (isset($temp)) $return['make'] = $exif['Make'];
-
- $temp = @$exif['Model'];
- if (isset($temp)) $return['model'] = $temp;
-
- $temp = @$exif['ExposureTime'];
- if (isset($temp)) $return['shutter'] = $exif['ExposureTime'] . ' Sec.';
-
- $temp = @$exif['FocalLength'];
- if (isset($temp)) $return['focal'] = ($temp/1) . ' mm';
-
- $temp = @$exif['DateTimeOriginal'];
- if (isset($temp)) {
- $exifDate = explode(' ', $temp);
- $date = explode(':', $exifDate[0]);
- $return['takeDate'] = $date[2].'.'.$date[1].'.'.$date[0];
- $return['takeTime'] = $exifDate[1];
- }
-
- }
-
- // Security
- foreach(array_keys($return) as $key) $return[$key] = mysqli_real_escape_string($database, $return[$key]);
-
- return $return;
-
-}
-
-function createThumb($filename, $width = 200, $height = 200) {
-
- global $settings;
-
- $url = "../uploads/big/$filename";
- $info = getimagesize($url);
-
- $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;
- } else {
- $newSize = $info[1];
- $startWidth = $info[0]/2 - $info[1]/2;
- $startHeight = 0;
- }
-
- // Fallback for older version
- if ($info['mime']==='image/webp'&&floatval(phpversion())<5.5) return false;
-
- // 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;
- default: return false;
- }
-
- imagecopyresampled($thumb,$sourceImg,0,0,$startWidth,$startHeight,$width,$height,$newSize,$newSize);
- imagecopyresampled($thumb2x,$sourceImg,0,0,$startWidth,$startHeight,$width*2,$height*2,$newSize,$newSize);
-
- imagejpeg($thumb,$newUrl,$settings['thumbQuality']);
- imagejpeg($thumb2x,$newUrl2x,$settings['thumbQuality']);
-
- return true;
-
-}
-
-function importPhoto($path, $albumID = 0) {
-
- $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 upload($nameFile, $albumID);
-
-}
-
-function importUrl($url, $albumID = 0) {
-
- if (strpos($url, ',')!==false) {
-
- // Multiple photos
-
- $url = explode(',', $url);
-
- foreach ($url as &$key) {
-
- $key = str_replace(' ', '%20', $key);
-
- if (@getimagesize($key)) {
-
- $pathinfo = pathinfo($key);
- $filename = $pathinfo['filename'].".".$pathinfo['extension'];
- $tmp_name = "../uploads/import/$filename";
-
- copy($key, $tmp_name);
-
- }
-
- }
-
- return importServer($albumID);
-
- } else {
-
- // One photo
-
- $url = str_replace(' ', '%20', $url);
-
- if (@getimagesize($url)) {
-
- $pathinfo = pathinfo($url);
- $filename = $pathinfo['filename'].".".$pathinfo['extension'];
- $tmp_name = "../uploads/import/$filename";
-
- copy($url, $tmp_name);
-
- return importPhoto($tmp_name, $albumID);
-
- }
-
- }
-
- return false;
-
-}
-
-function importServer($albumID = 0, $path = '../uploads/import/') {
-
- global $database;
-
- $files = glob($path . '*');
- $contains['photos'] = false;
- $contains['albums'] = false;
-
- foreach ($files as $file) {
-
- if (@getimagesize($file)) {
-
- // 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 ($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;
-
-}
-
-?>
\ No newline at end of file
diff --git a/plugins/check.php b/plugins/check.php
deleted file mode 100644
index 51f6eb3..0000000
--- a/plugins/check.php
+++ /dev/null
@@ -1,70 +0,0 @@
-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);
-
-?>
\ No newline at end of file
diff --git a/plugins/check/index.php b/plugins/check/index.php
new file mode 100644
index 0000000..674ad9c
--- /dev/null
+++ b/plugins/check/index.php
@@ -0,0 +1,81 @@
+get();
+
+# PHP Version
+if (floatval(phpversion())<5.2) $error .= ('Error 200: Please upgrade to PHP 5.2 or higher!' . PHP_EOL);
+
+# Extensions
+if (!extension_loaded('exif')) $error .= ('Error 300: PHP exif extension not activated' . PHP_EOL);
+if (!extension_loaded('mbstring')) $error .= ('Error 301: PHP mbstring extension not activated' . PHP_EOL);
+if (!extension_loaded('gd')) $error .= ('Error 302: PHP gd extension not activated' . PHP_EOL);
+if (!extension_loaded('mysqli')) $error .= ('Error 303: PHP mysqli extension not activated' . PHP_EOL);
+if (!extension_loaded('json')) $error .= ('Error 304: PHP json extension not activated' . PHP_EOL);
+if (!extension_loaded('zip')) $error .= ('Error 305: PHP zip extension not activated' . PHP_EOL);
+
+# Config
+if (!isset($dbName)||$dbName==='') $error .= ('Error 400: No property for $dbName in config.php' . PHP_EOL);
+if (!isset($dbUser)||$dbUser==='') $error .= ('Error 401: No property for $dbUser in config.php' . PHP_EOL);
+if (!isset($dbPassword)) $error .= ('Error 402: No property for $dbPassword in config.php' . PHP_EOL);
+if (!isset($dbHost)||$dbHost==='') $error .= ('Error 403: No property for $dbHost in config.php' . PHP_EOL);
+
+# Settings
+if (!isset($settings['username'])||$settings['username']=='') $error .= ('Error 404: Username empty or not set in database' . PHP_EOL);
+if (!isset($settings['password'])||$settings['password']=='') $error .= ('Error 405: Password empty or not set in database' . PHP_EOL);
+if (!isset($settings['thumbQuality'])||$settings['thumbQuality']=='') $error .= ('Error 406: No or wrong property for thumbQuality in database' . PHP_EOL);
+if (!isset($settings['sorting'])||$settings['sorting']=='') $error .= ('Error 407: Wrong property for sorting in database' . PHP_EOL);
+if (!isset($settings['plugins'])) $error .= ('Error 408: No property for plugins in database' . PHP_EOL);
+if (!isset($settings['checkForUpdates'])||($settings['checkForUpdates']!='0'&&$settings['checkForUpdates']!='1')) $error .= ('Error 409: No or wrong property for checkForUpdates in database' . PHP_EOL);
+
+# Permissions
+if (hasPermissions(LYCHEE_UPLOADS_BIG)===false) $error .= ('Error 500: Wrong permissions for \'uploads/big\' (777 required)' . PHP_EOL);
+if (hasPermissions(LYCHEE_UPLOADS_THUMB)===false) $error .= ('Error 501: Wrong permissions for \'uploads/thumb\' (777 required)' . PHP_EOL);
+if (hasPermissions(LYCHEE_UPLOADS_IMPORT)===false) $error .= ('Error 502: Wrong permissions for \'uploads/import\' (777 required)' . PHP_EOL);
+if (hasPermissions(LYCHEE_UPLOADS)===false) $error .= ('Error 503: Wrong permissions for \'uploads/\' (777 required)' . PHP_EOL);
+if (hasPermissions(LYCHEE_DATA)===false) $error .= ('Error 504: Wrong permissions for \'data/\' (777 required)' . PHP_EOL);
+
+# Output
+if ($error=='') echo('Everything is fine. Lychee should work without problems!' . PHP_EOL . PHP_EOL);
+else echo $error;
+
+# Check dropboxKey
+if (!$settings['dropboxKey']) echo('Warning: Dropbox import not working. No property for dropboxKey.' . PHP_EOL);
+
+# Check php.ini Settings
+if (ini_get('max_execution_time')<200&&ini_set('upload_max_filesize', '20M')===false) echo('Warning: You may experience problems when uploading a large amount of photos. Take a look in the FAQ for details.' . PHP_EOL);
+
+# 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);
+
+?>
\ No newline at end of file
diff --git a/plugins/displaylog/index.php b/plugins/displaylog/index.php
new file mode 100644
index 0000000..632c07f
--- /dev/null
+++ b/plugins/displaylog/index.php
@@ -0,0 +1,54 @@
+query('SELECT FROM_UNIXTIME(time), type, function, line, text FROM lychee_log;');
+
+# Output
+if ($result === FALSE) {
+ echo('Everything looks fine, Lychee has not reported any problems!' . PHP_EOL . PHP_EOL);
+} else {
+ while ( $row = $result->fetch_row() ) {
+
+ # Encode result before printing
+ $row = array_map("htmlentities", $row);
+
+ # Format: time TZ - type - function(line) - text
+ printf ("%s %s - %s - %s (%s) \t- %s\n", $row[0], date_default_timezone_get(), $row[1], $row[2], $row[3], $row[4]);
+ }
+
+}
+
+?>
diff --git a/readme.md b/readme.md
index 122dc6d..df38b49 100644
--- a/readme.md
+++ b/readme.md
@@ -39,11 +39,13 @@ In order to use the Dropbox import from your server, you need a valid drop-ins a
Lychee supports [Twitter Cards](https://dev.twitter.com/docs/cards) and [Open Graph](http://opengraphprotocol.org) for shared images (not albums). In order to use Twitter Cards you need to request an approval for your domain. Simply share an image with Lychee, copy its link and paste it in [Twitters Card Validator](https://dev.twitter.com/docs/cards/validation/validator).
-## Troubleshooting
+### Plugins and Extensions
-Take a look at the [FAQ](docs/FAQ.md) if you have problems. Discovered a bug? Please create an issue here on GitHub!
+The plugin-system of Lychee allows you to execute scripts, when a certain action fires. Plugins are hooks, which are injected directly into Lychee. [Plugin documentation »](docs/)
-## Extensions
+It's also possible to build extensions upon Lychee. The way to do so isn't documented and can change every time. We recommend to use the plugin-system, when possible.
+
+Here's a list of all available Plugins and Extensions:
| Name | Description | |
|:-----------|:------------|:------------|
@@ -51,6 +53,10 @@ Take a look at the [FAQ](docs/FAQ.md) if you have problems. Discovered a bug? Pl
| Jekyll | Liquid tag for Jekyll sites that allows embedding Lychee albums | [More »](https://gist.github.com/tobru/9171700) |
| lychee-redirect | Redirect from an album-name to a Lychee-album | [More »](https://github.com/electerious/lychee-redirect) |
+## Troubleshooting
+
+Take a look at the [FAQ](docs/FAQ.md) if you have problems. Discovered a bug? Please create an issue here on GitHub!
+
## Developer
| Version | Name |
|:-----------|:------------|
diff --git a/etc/assets/thumbs.sketch/fonts b/uploads/medium/index.html
old mode 100644
new mode 100755
similarity index 100%
rename from etc/assets/thumbs.sketch/fonts
rename to uploads/medium/index.html
diff --git a/view.php b/view.php
index a091fa9..c610dd7 100644
--- a/view.php
+++ b/view.php
@@ -3,33 +3,35 @@
-
+
Lychee
-
+
-
+
+
+
+
-
-
+
+
0) {
- define("LYCHEE", true);
+ require(__DIR__ . "/php/define.php");
+ require(LYCHEE_CONFIG_FILE);
+ require(LYCHEE . "php/autoload.php");
+ require(LYCHEE . "php/modules/misc.php");
- require("data/config.php");
- require("php/modules/db.php");
- require("php/modules/misc.php");
+ $database = Database::connect($dbHost, $dbUser, $dbPassword, $dbName);
- $database = dbConnect();
-
- echo openGraphHeader($_GET['p']);
+ echo getGraphHeader($database, $_GET['p']);
}
@@ -56,9 +58,7 @@
-
-
-
+