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

support title and description (and dates which were done earlier) for friendica photo import

Browse Source
This commit is contained in:
friendica 2014-08-13 16:34:36 -07:00
parent 041aff36b7
commit eb38f3f474
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/photo/photo_driver.php
View File

@ -289,6 +289,8 @@ abstract class photo_driver {
$p['deny_gid'] = (($arr['deny_gid']) ? $arr['deny_gid'] : ''); $p['deny_gid'] = (($arr['deny_gid']) ? $arr['deny_gid'] : '');
$p['created'] = (($arr['created']) ? $arr['created'] : datetime_convert()); $p['created'] = (($arr['created']) ? $arr['created'] : datetime_convert());
$p['edited'] = (($arr['edited']) ? $arr['edited'] : $p['created']); $p['edited'] = (($arr['edited']) ? $arr['edited'] : $p['created']);
$p['title'] = (($arr['title']) ? $arr['title'] : '');
$p['description'] = (($arr['description']) ? $arr['description'] : '');
// temporary until we get rid of photo['profile'] and just use photo['photo_flags'] // temporary until we get rid of photo['profile'] and just use photo['photo_flags']
// but this will require updating all existing photos in the DB. // but this will require updating all existing photos in the DB.
@ -320,6 +322,8 @@ abstract class photo_driver {
`scale` = %d, `scale` = %d,
`profile` = %d, `profile` = %d,
`photo_flags` = %d, `photo_flags` = %d,
`title` = '%s',
`description` = '%s',
`allow_cid` = '%s', `allow_cid` = '%s',
`allow_gid` = '%s', `allow_gid` = '%s',
`deny_cid` = '%s', `deny_cid` = '%s',
@ -342,6 +346,8 @@ abstract class photo_driver {
intval($p['scale']), intval($p['scale']),
intval($p['profile']), intval($p['profile']),
intval($p['photo_flags']), intval($p['photo_flags']),
dbesc($p['title']),
dbesc($p['description']),
dbesc($p['allow_cid']), dbesc($p['allow_cid']),
dbesc($p['allow_gid']), dbesc($p['allow_gid']),
dbesc($p['deny_cid']), dbesc($p['deny_cid']),
@ -351,8 +357,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`, type, `album`, `height`, `width`, `data`, `size`, `scale`, `profile`, `photo_flags`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` ) ( `aid`, `uid`, `xchan`, `resource_id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `data`, `size`, `scale`, `profile`, `photo_flags`, `title`, `description`, `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' )", VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s' )",
intval($p['aid']), intval($p['aid']),
intval($p['uid']), intval($p['uid']),
dbesc($p['xchan']), dbesc($p['xchan']),
@ -369,6 +375,8 @@ abstract class photo_driver {
intval($p['scale']), intval($p['scale']),
intval($p['profile']), intval($p['profile']),
intval($p['photo_flags']), intval($p['photo_flags']),
dbesc($p['title']),
dbesc($p['description']),
dbesc($p['allow_cid']), dbesc($p['allow_cid']),
dbesc($p['allow_gid']), dbesc($p['allow_gid']),
dbesc($p['deny_cid']), dbesc($p['deny_cid']),

4
include/photos.php
View File

@ -175,6 +175,10 @@ function photo_upload($channel, $observer, $args) {
$p['created'] = $args['created']; $p['created'] = $args['created'];
if($args['edited']) if($args['edited'])
$p['edited'] = $args['edited']; $p['edited'] = $args['edited'];
if($args['title'])
$p['title'] = $args['title'];
if($args['description'])
$p['desciprion'] = $args['description'];
$r1 = $ph->save($p); $r1 = $ph->save($p);

2
util/frphotohelper.php
View File

@ -49,6 +49,8 @@ $cookies = 'store/[data]/frphoto_cookie_' . $channel_address;
$args['not_visible'] = 1; $args['not_visible'] = 1;
$args['created'] = $j['created']; $args['created'] = $j['created'];
$args['edited'] = $j['edited']; $args['edited'] = $j['edited'];
$args['title'] = $j['title'];
$args['description'] = $j['desc'];
if($j['allow_cid'] || $j['allow_gid'] || $j['deny_cid'] || $j['deny_gid']) if($j['allow_cid'] || $j['allow_gid'] || $j['deny_cid'] || $j['deny_gid'])
$args['contact_allow'] = $channel['channel_hash']; $args['contact_allow'] = $channel['channel_hash'];

2
version.inc
View File

@ -1 +1 @@
2014-08-12.765 2014-08-13.766