mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

adjusting to new db "api", merge with master

This commit is contained in:
Bartek Przybylski 2011-10-27 21:16:04 +02:00
parent 0d022de0f4
commit 865be6064a
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.htaccess
View File

@ -2,6 +2,7 @@ ErrorDocument 404 /core/templates/404.php
<IfModule mod_php5.c> <IfModule mod_php5.c>
php_value upload_max_filesize 512M php_value upload_max_filesize 512M
php_value post_max_size 512M php_value post_max_size 512M
php_value memory_limit 512M
SetEnv htaccessWorking true SetEnv htaccessWorking true
</IfModule> </IfModule>
<IfModule !mod_php5.c> <IfModule !mod_php5.c>

4
apps/gallery/ajax/getAlbums.php
View File

@ -4,12 +4,12 @@ OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('gallery'); OC_JSON::checkAppEnabled('gallery');
$a = array(); $a = array();
$stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE `uid_owner` = ?'); $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE uid_owner LIKE ?');
$result = $stmt->execute(array(OC_User::getUser())); $result = $stmt->execute(array(OC_User::getUser()));
while ($r = $result->fetchRow()) { while ($r = $result->fetchRow()) {
$album_name = $r['album_name']; $album_name = $r['album_name'];
$stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_photos WHERE `album_id` = ?'); $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_photos WHERE album_id = ?');
$tmp_res = $stmt->execute(array($r['album_id'])); $tmp_res = $stmt->execute(array($r['album_id']));
$a[] = array('name' => $album_name, 'numOfItems' => min($tmp_res->numRows(), 10), 'bgPath' => OC::$WEBROOT.'/data/'.OC_User::getUser().'/gallery/'.$album_name.'.png'); $a[] = array('name' => $album_name, 'numOfItems' => min($tmp_res->numRows(), 10), 'bgPath' => OC::$WEBROOT.'/data/'.OC_User::getUser().'/gallery/'.$album_name.'.png');
} }

14
apps/gallery/lib_scanner.php
View File

@ -36,21 +36,21 @@ class OC_GALLERY_SCANNER {
} }
$current_album['imagesCount'] = count($current_album['images']); $current_album['imagesCount'] = count($current_album['images']);
$albums[] = $current_album; $albums[] = $current_album;
$stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE `uid_owner` = ? AND `album_name` = ?'); $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE uid_owner LIKE ? AND album_name LIKE ?');
$result = $stmt->execute(array(OC_User::getUser(), $current_album['name'])); $result = $stmt->execute(array(OC_User::getUser(), $current_album['name']));
if ($result->numRows() == 0 && count($current_album['images'])) { if ($result->numRows() == 0 && count($current_album['images'])) {
$stmt = OC_DB::prepare('INSERT INTO *PREFIX*gallery_albums (`uid_owner`, `album_name`) VALUES (?, ?)'); $stmt = OC_DB::prepare('INSERT INTO *PREFIX*gallery_albums (uid_owner, album_name) VALUES (?, ?)');
$stmt->execute(array(OC_User::getUser(), $current_album['name'])); $stmt->execute(array(OC_User::getUser(), $current_album['name']));
} }
$stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE `uid_owner` = ? AND `album_name` = ?'); $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE uid_owner LIKE ? AND album_name LIKE ?');
$result = $stmt->execute(array(OC_User::getUser(), $current_album['name'])); $result = $stmt->execute(array(OC_User::getUser(), $current_album['name']));
$albumId = $result->fetchRow(); $albumId = $result->fetchAll();
$albumId = $albumId['album_id']; $albumId = $albumId[0]['album_id'];
foreach ($current_album['images'] as $img) { foreach ($current_album['images'] as $img) {
$stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_photos WHERE `album_id` = ? AND `file_path` = ?'); $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_photos WHERE album_id = ? AND file_path LIKE ?');
$result = $stmt->execute(array($albumId, $img)); $result = $stmt->execute(array($albumId, $img));
if ($result->numRows() == 0) { if ($result->numRows() == 0) {
$stmt = OC_DB::prepare('INSERT INTO *PREFIX*gallery_photos (`album_id`, `file_path`) VALUES (?, ?)'); $stmt = OC_DB::prepare('INSERT INTO *PREFIX*gallery_photos (album_id, file_path) VALUES (?, ?)');
$stmt->execute(array($albumId, $img)); $stmt->execute(array($albumId, $img));
} }
} }