aboutsummaryrefslogtreecommitdiffstats
path: root/include/photos.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-10-24 21:44:25 +0200
committerMario Vavti <mario@mariovavti.com>2015-10-24 21:44:25 +0200
commitab8b4d5c3669543a6166390d433569656692f9b8 (patch)
tree3c6f2606d3830ec7692c430fa270c56eb24f9675 /include/photos.php
parent3432771150c03c72d468e5840177b769812a9758 (diff)
downloadvolse-hubzilla-ab8b4d5c3669543a6166390d433569656692f9b8.tar.gz
volse-hubzilla-ab8b4d5c3669543a6166390d433569656692f9b8.tar.bz2
volse-hubzilla-ab8b4d5c3669543a6166390d433569656692f9b8.zip
another try to avoid dubble photo deletion. allow to set a photo caption and simple status body (if create status post is enabled) on upload
Diffstat (limited to 'include/photos.php')
-rw-r--r--include/photos.php25
1 files changed, 15 insertions, 10 deletions
diff --git a/include/photos.php b/include/photos.php
index a203b9b6a..d89c0fca1 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -7,6 +7,7 @@
require_once('include/permissions.php');
require_once('include/items.php');
require_once('include/photo/photo_driver.php');
+require_once('include/text.php');
/**
* @brief
@@ -18,6 +19,8 @@ require_once('include/photo/photo_driver.php');
*/
function photo_upload($channel, $observer, $args) {
+ $a = get_app();
+
$ret = array('success' => false);
$channel_id = $channel['channel_id'];
$account_id = $channel['channel_account_id'];
@@ -186,8 +189,8 @@ function photo_upload($channel, $observer, $args) {
$p['description'] = $args['description'];
$r0 = $ph->save($p);
- $r0width = $ph->getWidth();
- $r0height = $ph->getHeight();
+ $r0width = $ph->getWidth();
+ $r0height = $ph->getHeight();
if(! $r0)
$errors = true;
@@ -199,8 +202,8 @@ function photo_upload($channel, $observer, $args) {
$p['scale'] = 1;
$r1 = $ph->save($p);
- $r1width = $ph->getWidth();
- $r1height = $ph->getHeight();
+ $r1width = $ph->getWidth();
+ $r1height = $ph->getHeight();
if(! $r1)
$errors = true;
@@ -209,8 +212,8 @@ function photo_upload($channel, $observer, $args) {
$p['scale'] = 2;
$r2 = $ph->save($p);
- $r2width = $ph->getWidth();
- $r2height = $ph->getHeight();
+ $r2width = $ph->getWidth();
+ $r2height = $ph->getHeight();
if(! $r2)
$errors = true;
@@ -219,8 +222,8 @@ function photo_upload($channel, $observer, $args) {
$p['scale'] = 3;
$r3 = $ph->save($p);
- $r3width = $ph->getWidth();
- $r3height = $ph->getHeight();
+ $r3width = $ph->getWidth();
+ $r3height = $ph->getHeight();
if(! $r3)
$errors = true;
@@ -246,10 +249,12 @@ function photo_upload($channel, $observer, $args) {
}
}
- $title = (($args['filename']) ? $args['filename'] : '');
+ $title = (($args['description']) ? $args['description'] : $args['filename']);
$large_photos = feature_enabled($channel['channel_id'], 'large_photos');
+ linkify_tags($a, $args['body'], $channel_id);
+
if($large_photos) {
$scale = 1;
$width = $r1width;
@@ -360,7 +365,7 @@ function photo_upload($channel, $observer, $args) {
$arr['item_thread_top'] = 1;
$arr['item_private'] = intval($acl->is_private());
$arr['plink'] = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . $arr['mid'];
- $arr['body'] = (($object) ? '' : $body);
+ $arr['body'] = (($object) ? $args['body'] : $body . $args['body']);
$result = item_store($arr);
$item_id = $result['item_id'];