|
@@ -65,27 +65,27 @@ class Album extends Module {
|
|
|
switch ($this->albumIDs) {
|
|
|
|
|
|
case 'f': $return['public'] = false;
|
|
|
- $query = Database::prepare($this->database, "SELECT id, title, tags, public, star, album, thumbUrl, takestamp FROM ? WHERE star = 1 " . $this->settings['sorting'], array(LYCHEE_TABLE_PHOTOS));
|
|
|
+ $query = Database::prepare($this->database, "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE star = 1 " . $this->settings['sorting'], array(LYCHEE_TABLE_PHOTOS));
|
|
|
break;
|
|
|
|
|
|
case 's': $return['public'] = false;
|
|
|
- $query = Database::prepare($this->database, "SELECT id, title, tags, public, star, album, thumbUrl, takestamp FROM ? WHERE public = 1 " . $this->settings['sorting'], array(LYCHEE_TABLE_PHOTOS));
|
|
|
+ $query = Database::prepare($this->database, "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE public = 1 " . $this->settings['sorting'], array(LYCHEE_TABLE_PHOTOS));
|
|
|
break;
|
|
|
|
|
|
case 'r': $return['public'] = false;
|
|
|
- $query = Database::prepare($this->database, "SELECT id, title, tags, public, star, album, thumbUrl, takestamp FROM ? WHERE LEFT(id, 10) >= unix_timestamp(DATE_SUB(NOW(), INTERVAL 1 DAY)) " . $this->settings['sorting'], array(LYCHEE_TABLE_PHOTOS));
|
|
|
+ $query = Database::prepare($this->database, "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE LEFT(id, 10) >= unix_timestamp(DATE_SUB(NOW(), INTERVAL 1 DAY)) " . $this->settings['sorting'], array(LYCHEE_TABLE_PHOTOS));
|
|
|
break;
|
|
|
|
|
|
case '0': $return['public'] = false;
|
|
|
- $query = Database::prepare($this->database, "SELECT id, title, tags, public, star, album, thumbUrl, takestamp FROM ? WHERE album = 0 " . $this->settings['sorting'], array(LYCHEE_TABLE_PHOTOS));
|
|
|
+ $query = Database::prepare($this->database, "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE album = 0 " . $this->settings['sorting'], array(LYCHEE_TABLE_PHOTOS));
|
|
|
break;
|
|
|
|
|
|
default: $query = Database::prepare($this->database, "SELECT * FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
|
|
|
$albums = $this->database->query($query);
|
|
|
$return = $albums->fetch_assoc();
|
|
|
- $return['sysdate'] = date('d M. Y', $return['sysstamp']);
|
|
|
- $return['password'] = ($return['password']=='' ? false : true);
|
|
|
- $query = Database::prepare($this->database, "SELECT id, title, tags, public, star, album, thumbUrl, takestamp FROM ? WHERE album = '?' " . $this->settings['sorting'], array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
|
|
|
+ $return['sysdate'] = date('d M. Y', $return['sysstamp']);
|
|
|
+ $return['password'] = ($return['password']=='' ? false : true);
|
|
|
+ $query = Database::prepare($this->database, "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE album = '?' " . $this->settings['sorting'], array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
|
|
|
break;
|
|
|
|
|
|
}
|
|
@@ -101,6 +101,9 @@ class Album extends Module {
|
|
|
$photo['nextPhoto'] = '';
|
|
|
$photo['thumbUrl'] = LYCHEE_URL_UPLOADS_THUMB . $photo['thumbUrl'];
|
|
|
|
|
|
+ # Parse url
|
|
|
+ $photo['url'] = LYCHEE_URL_UPLOADS_BIG . $photo['url'];
|
|
|
+
|
|
|
if (isset($photo['takestamp'])&&$photo['takestamp']!=='0') {
|
|
|
$photo['cameraDate'] = 1;
|
|
|
$photo['sysdate'] = date('d F Y', $photo['takestamp']);
|