harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issue #526

Browse Source
This commit is contained in:
redmatrix 2016-09-22 17:08:16 -07:00
parent 24ddc8e026
commit 7b90b0dfd9
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/import.php
View File

@ -1217,6 +1217,9 @@ function sync_files($channel,$files) {
$p['content'] = base64_decode($p['content']); $p['content'] = base64_decode($p['content']);
if(!isset($p['display_path']))
$p['display_path'] = '';
$exists = q("select * from photo where resource_id = '%s' and imgscale = %d and uid = %d limit 1", $exists = q("select * from photo where resource_id = '%s' and imgscale = %d and uid = %d limit 1",
dbesc($p['resource_id']), dbesc($p['resource_id']),
intval($p['imgscale']), intval($p['imgscale']),

11
include/photo/photo_driver.php
View File

@ -328,6 +328,7 @@ abstract class photo_driver {
$p['photo_usage'] = intval($arr['photo_usage']); $p['photo_usage'] = intval($arr['photo_usage']);
$p['os_storage'] = intval($arr['os_storage']); $p['os_storage'] = intval($arr['os_storage']);
$p['os_path'] = $arr['os_path']; $p['os_path'] = $arr['os_path'];
$p['display_path'] = (($arr['display_path']) ? $arr['display_path'] : '');
if(! intval($p['imgscale'])) if(! intval($p['imgscale']))
logger('save: ' . print_r($arr,true), LOGGER_DATA); logger('save: ' . print_r($arr,true), LOGGER_DATA);
@ -359,6 +360,7 @@ abstract class photo_driver {
`title` = '%s', `title` = '%s',
`description` = '%s', `description` = '%s',
`os_path` = '%s', `os_path` = '%s',
`display_path` = '%s',
`allow_cid` = '%s', `allow_cid` = '%s',
`allow_gid` = '%s', `allow_gid` = '%s',
`deny_cid` = '%s', `deny_cid` = '%s',
@ -384,6 +386,7 @@ abstract class photo_driver {
dbesc($p['title']), dbesc($p['title']),
dbesc($p['description']), dbesc($p['description']),
dbesc($p['os_path']), dbesc($p['os_path']),
dbesc($p['display_path']),
dbesc($p['allow_cid']), dbesc($p['allow_cid']),
dbesc($p['allow_gid']), dbesc($p['allow_gid']),
dbesc($p['deny_cid']), dbesc($p['deny_cid']),
@ -393,8 +396,8 @@ abstract class photo_driver {
} }
else { else {
$r = q("INSERT INTO `photo` $r = q("INSERT INTO `photo`
( `aid`, `uid`, `xchan`, `resource_id`, `created`, `edited`, `filename`, mimetype, `album`, `height`, `width`, `content`, `os_storage`, `filesize`, `imgscale`, `photo_usage`, `title`, `description`, `os_path`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` ) ( `aid`, `uid`, `xchan`, `resource_id`, `created`, `edited`, `filename`, mimetype, `album`, `height`, `width`, `content`, `os_storage`, `filesize`, `imgscale`, `photo_usage`, `title`, `description`, `os_path`, `display_path`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` )
VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s' )", VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
intval($p['aid']), intval($p['aid']),
intval($p['uid']), intval($p['uid']),
dbesc($p['xchan']), dbesc($p['xchan']),
@ -414,6 +417,7 @@ abstract class photo_driver {
dbesc($p['title']), dbesc($p['title']),
dbesc($p['description']), dbesc($p['description']),
dbesc($p['os_path']), dbesc($p['os_path']),
dbesc($p['display_path']),
dbesc($p['allow_cid']), dbesc($p['allow_cid']),
dbesc($p['allow_gid']), dbesc($p['allow_gid']),
dbesc($p['deny_cid']), dbesc($p['deny_cid']),
@ -423,6 +427,9 @@ abstract class photo_driver {
return $r; return $r;
} }
// should be obsolete now
public function store($aid, $uid, $xchan, $rid, $filename, $album, $scale, $usage = PHOTO_NORMAL, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '') { public function store($aid, $uid, $xchan, $rid, $filename, $album, $scale, $usage = PHOTO_NORMAL, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '') {
$x = q("select id from photo where `resource_id` = '%s' and uid = %d and `xchan` = '%s' and `imgscale` = %d limit 1", $x = q("select id from photo where `resource_id` = '%s' and uid = %d and `xchan` = '%s' and `imgscale` = %d limit 1",