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

Revert "Changed album list to array instead of an associative array"

Browse Source 
This reverts commit 67788790b2.
This commit is contained in:
Tobias Reich 2014-04-02 17:32:49 +02:00
parent 67788790b2
commit 48e7e0a911
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
php/modules/album.php
View File

@ -38,16 +38,15 @@ function getAlbums($public) {
while ($row = $result->fetch_object()) { while ($row = $result->fetch_object()) {
$album = array();
// Info // Info
$album['id'] = $row->id; $return['content'][$row->id]['id'] = $row->id;
$album['title'] = $row->title; $return['content'][$row->id]['title'] = $row->title;
$album['public'] = $row->public; $return['content'][$row->id]['public'] = $row->public;
$album['sysdate'] = date('F Y', strtotime($row->sysdate)); $return['content'][$row->id]['sysdate'] = date('F Y', strtotime($row->sysdate));
// Password // Password
$album['password'] = ($row->password != ''); $return['content'][$row->id]['password'] = false;
if ($row->password!='') $return['content'][$row->id]['password'] = true;
// Thumbs // Thumbs
if (($public&&$row->password=='')||(!$public)) { if (($public&&$row->password=='')||(!$public)) {
@ -56,17 +55,15 @@ function getAlbums($public) {
$result2 = $database->query("SELECT thumbUrl FROM lychee_photos WHERE album = '$albumID' ORDER BY star DESC, " . substr($settings['sorting'], 9) . " LIMIT 0, 3"); $result2 = $database->query("SELECT thumbUrl FROM lychee_photos WHERE album = '$albumID' ORDER BY star DESC, " . substr($settings['sorting'], 9) . " LIMIT 0, 3");
$k = 0; $k = 0;
while ($row2 = $result2->fetch_object()) { while ($row2 = $result2->fetch_object()) {
$album['thumb'.$k] = $row2->thumbUrl; $return['content'][$row->id]["thumb$k"] = $row2->thumbUrl;
$k++; $k++;
} }
} }
$return['content'][] = $album;
} }
$return['num'] = $result->num_rows; $return["num"] = $result->num_rows;
return $return; return $return;