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

Changed album list to array instead of an associative array

Browse Source 
It solves the issue of album sorting: json_encode now creates a list
instead of an object which can't be sorted.
This commit is contained in:
dixy 2014-04-02 09:31:37 +02:00
parent c339116a7f
commit 67788790b2
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
php/modules/album.php
View File

@ -38,32 +38,35 @@ function getAlbums($public) {
while ($row = $result->fetch_object()) { while ($row = $result->fetch_object()) {
$album = array();
// Info // Info
$return['content'][$row->id]['id'] = $row->id; $album['id'] = $row->id;
$return['content'][$row->id]['title'] = $row->title; $album['title'] = $row->title;
$return['content'][$row->id]['public'] = $row->public; $album['public'] = $row->public;
$return['content'][$row->id]['sysdate'] = date('F Y', strtotime($row->sysdate)); $album['sysdate'] = date('F Y', strtotime($row->sysdate));
// Password // Password
$return['content'][$row->id]['password'] = false; $album['password'] = ($row->password != '');
if ($row->password!='') $return['content'][$row->id]['password'] = true;
// Thumbs // Thumbs
if (($public&&$row->password=='')||(!$public)) { if (($public && $row->password=='') || (!$public)) {
$albumID = $row->id; $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"); $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()) {
$return['content'][$row->id]["thumb$k"] = $row2->thumbUrl; $album['thumb'.$k] = $row2->thumbUrl;
$k++; $k++;
} }
} }
$return['content'][] = $album;
} }
$return["num"] = $result->num_rows; $return['num'] = $result->num_rows;
return $return; return $return;