aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-01-25 18:13:15 -0800
committerfriendica <info@friendica.com>2013-01-25 18:13:15 -0800
commitb43b6c3549370f82afe989bfb1482254523bbc1b (patch)
tree405087cf2f1a046ab87872e11d9196aef1c232dd
parentc96eb6dc971dc74724a2c20fccf02d34dd08d156 (diff)
downloadvolse-hubzilla-b43b6c3549370f82afe989bfb1482254523bbc1b.tar.gz
volse-hubzilla-b43b6c3549370f82afe989bfb1482254523bbc1b.tar.bz2
volse-hubzilla-b43b6c3549370f82afe989bfb1482254523bbc1b.zip
start on photos rework
-rw-r--r--include/photos.php226
-rw-r--r--mod/photos.php28
-rw-r--r--view/js/mod_photos.js16
3 files changed, 246 insertions, 24 deletions
diff --git a/include/photos.php b/include/photos.php
new file mode 100644
index 000000000..84352ed32
--- /dev/null
+++ b/include/photos.php
@@ -0,0 +1,226 @@
+<?php
+
+require_once('include/permissions.php');
+
+function photo_upload($channel, $observer, $args) {
+
+ $ret = array('success' => false);
+ $channel_id = $channel['channel_id'];
+ $account_id = $channel['channel_account_id'];
+
+ if(! perm_is_allowed($channel_id, $observer['xchan_hash'], 'post_photos')) {
+ $ret['message'] = t('Permission denied.');
+ return $ret;
+ }
+
+ call_hooks('photo_upload_begin', $args);
+
+ /**
+ * Determine the album to use
+ */
+
+ $album = $args['album'];
+ $newalbum = $args['newalbum'];
+
+ logger('photo_upload: album= ' . $album . ' newalbum= ' . $newalbum , LOGGER_DEBUG);
+
+ if(! $album) {
+ if($newalbum)
+ $album = $newalbum;
+ else
+ $album = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
+ }
+
+ /**
+ *
+ * We create a wall item for every photo, but we don't want to
+ * overwhelm the data stream with a hundred newly uploaded photos.
+ * So we will make the first photo uploaded to this album in the last several hours
+ * visible by default, the rest will become visible over time when and if
+ * they acquire comments, likes, dislikes, and/or tags
+ *
+ */
+
+ $r = q("SELECT * FROM photo WHERE album = '%s' AND uid = %d AND created > UTC_TIMESTAMP() - INTERVAL 3 HOUR ",
+ dbesc($album),
+ intval($channel_id)
+ );
+ if((! $r) || ($album == t('Profile Photos')))
+ $visible = 1;
+ else
+ $visible = 0;
+
+ if(intval($args['not_visible']) || $args['not_visible'] === 'true')
+ $visible = 0;
+
+ $str_group_allow = perms2str(((is_array($args['group_allow'])) ? $args['group_allow'] : explode(',',$args['group_allow'])));
+ $str_contact_allow = perms2str(((is_array($args['contact_allow'])) ? $args['contact_allow'] : explode(',',$args['contact_allow'])));
+ $str_group_deny = perms2str(((is_array($args['group_deny'])) ? $args['group_deny'] : explode(',',$args['group_deny'])));
+ $str_contact_deny = perms2str(((is_array($args['contact_deny'])) ? $args['contact_deny'] : explode(',',$args['contact_deny'])));
+
+ $f = array('src' => '', 'filename' => '', 'filesize' => 0, 'type' => '');
+
+ call_hooks('photo_upload_file',$f);
+
+ if(x($f,'src') && x($f,'filesize')) {
+ $src = $f['src'];
+ $filename = $f['filename'];
+ $filesize = $f['filesize'];
+ $type = $f['type'];
+ }
+ else {
+ $src = $_FILES['userfile']['tmp_name'];
+ $filename = basename($_FILES['userfile']['name']);
+ $filesize = intval($_FILES['userfile']['size']);
+ $type = $_FILES['userfile']['type'];
+ }
+ if (! $type)
+ $type=guess_image_type($filename);
+
+ logger('photo_upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes', LOGGER_DEBUG);
+
+ $maximagesize = get_config('system','maximagesize');
+
+ if(($maximagesize) && ($filesize > $maximagesize)) {
+ $ret['message'] = sprintf ( t('Image exceeds website size limit of %lu bytes'), $maximagesize);
+ @unlink($src);
+ call_hooks('photo_upload_end',$ret);
+ return $ret;
+ }
+
+ if(! $filesize) {
+ $ret['message'] = t('Image file is empty.');
+ @unlink($src);
+ call_hooks('photo_post_end',$ret);
+ return $ret;
+ }
+
+ logger('photo_upload: loading the contents of ' . $src , LOGGER_DEBUG);
+
+ $imagedata = @file_get_contents($src);
+
+ $r = q("select sum(size) as total from photo where uid = %d and scale = 0 ",
+ intval($channel_id)
+ );
+
+// FIXME service class limits should probably apply to accounts and not channels
+
+ $limit = service_class_fetch($channel_id,'photo_upload_limit');
+
+ if(($r) && ($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
+ $ret['message'] = upgrade_message();
+ @unlink($src);
+ call_hooks('photo_post_end',$ret);
+ return $ret;
+ }
+
+
+ $ph = new Photo($imagedata, $type);
+
+ if(! $ph->is_valid()) {
+ $ret['message'] = t('Unable to process image');
+ logger('photo_upload: unable to process image');
+ @unlink($src);
+ call_hooks('photo_post_end',$ret);
+ return $ret;
+ }
+
+ $ph->orient($src);
+ @unlink($src);
+
+ $max_length = get_config('system','max_image_length');
+ if(! $max_length)
+ $max_length = MAX_IMAGE_LENGTH;
+ if($max_length > 0)
+ $ph->scaleImage($max_length);
+
+ $width = $ph->getWidth();
+ $height = $ph->getHeight();
+
+ $smallest = 0;
+
+ $photo_hash = photo_new_resource();
+
+ $visitor = '';
+ if($channel['channel_hash'] !== $observer['xchan_hash'])
+ $visitor = $observer['xchan_hash'];
+
+ $errors = false;
+
+ $r1 = $ph->store($account_id, $channel_id, $visitor, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+ if(! $r1)
+ $errors = true;
+
+ if(($width > 640 || $height > 640) && (! $errors)) {
+ $ph->scaleImage(640);
+ $r2 = $ph->store($account_id, $channel_id, $visitor, $photo_hash, $filename, $album, 1, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+ $smallest = 1;
+ if(! $r2)
+ $errors = true;
+ }
+
+ if(($width > 320 || $height > 320) && (! $errors)) {
+ $ph->scaleImage(320);
+ $r3 = $ph->store($account_id, $channel_id, $visitor, $photo_hash, $filename, $album, 2, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+ $smallest = 2;
+ if(! $r3)
+ $errors = true;
+ }
+
+ if($errors) {
+ q("delete from photo where resource_id = '%s' and uid = %d",
+ dbesc($photo_hash),
+ intval($channel_id)
+ );
+ $ret['message'] = t('Photo storage failed.');
+ logger('photo_upload: photo store failed.');
+ call_hooks('photo_post_end',$ret);
+ return $ret;
+ }
+
+ $basename = basename($filename);
+ $uri = item_message_id();
+
+
+ // Create item container
+
+ $item_flags = ITEM_WALL|ITEM_ORIGIN|ITEM_THREAD_TOP;
+ $item_restrict = (($visibility) ? ITEM_HIDDEN : ITEM_VISIBLE);
+ $title = '';
+ $uri = item_message_id();
+
+ $arr = array();
+
+ $arr['aid'] = $account_id;
+ $arr['uid'] = $channel_id;
+ $arr['uri'] = $uri;
+ $arr['parent_uri'] = $uri;
+ $arr['item_flags'] = $item_flags;
+ $arr['item_restrict'] = $item_restrict;
+ $arr['resource_type'] = 'photo';
+ $arr['resource_id'] = $photo_hash;
+ $arr['owner_xchan'] = $channel['channel_hash'];
+ $arr['author_xchan'] = $observer['xchan_hash'];
+ $arr['title'] = $title;
+ $arr['allow_cid'] = $str_contact_allow;
+ $arr['allow_gid'] = $str_group_allow;
+ $arr['deny_cid'] = $str_contact_deny;
+ $arr['deny_gid'] = $str_group_deny;
+
+
+ $arr['body'] = '[url=' . $a->get_baseurl() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']'
+ . '[img]' . $a->get_baseurl() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/img]'
+ . '[/url]';
+
+ $item_id = item_store($arr);
+
+ if($visible)
+ proc_run('php', "include/notifier.php", 'wall-new', $item_id);
+
+ $ret['success'] = true;
+ $ret['photoitem_id'] = $item_id;
+
+ call_hooks('photo_post_end',$ret);
+
+ return $ret;
+} \ No newline at end of file
diff --git a/mod/photos.php b/mod/photos.php
index eaf35cc20..848d3cebd 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1,5 +1,6 @@
<?php
require_once('include/Photo.php');
+require_once('include/photos.php');
require_once('include/items.php');
require_once('include/acl_selectors.php');
require_once('include/bbcode.php');
@@ -75,28 +76,7 @@ function photos_init(&$a) {
$a->page['htmlhead'] .= "<script> var ispublic = '" . t('everybody') . "';" ;
- $a->page['htmlhead'] .= <<< EOT
- $(document).ready(function() {
-
- $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
- var selstr;
- $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
- selstr = $(this).text();
- $('#jot-perms-icon').removeClass('unlock').addClass('lock');
- $('#jot-public').hide();
- });
- if(selstr == null) {
- $('#jot-perms-icon').removeClass('lock').addClass('unlock');
- $('#jot-public').show();
- }
-
- }).trigger('change');
-
- });
-
- </script>
-EOT;
}
return;
@@ -748,7 +728,7 @@ function photos_post(&$a) {
- $r = q("select sum(octet_length(data)) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ",
+ $r = q("select sum(size) as total from photo where uid = %d and scale = 0 ",
intval($a->data['channel']['channel_id'])
);
@@ -832,7 +812,7 @@ function photos_post(&$a) {
$arr['item_flags'] = $item_flags;
$arr['item_restrict'] = $item_restrict;
$arr['resource_type'] = 'photo';
- $arr['resource_id'] = $hoto_hash;
+ $arr['resource_id'] = $photo_hash;
$arr['owner_xchan'] = $a->data['channel']['channel_hash'];
$arr['author_xchan'] = $a->data['channel']['channel_hash']; // FIXME for AUTH guests
$arr['title'] = $title;
@@ -1052,7 +1032,7 @@ function photos_content(&$a) {
<input type="submit" name="submit" value="' . t('Submit') . '" id="photos-upload-submit" /> </div>';
- $r = q("select sum(octet_length(data)) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ",
+ $r = q("select sum(size) as total from photo where uid = %d and scale = 0 ",
intval($a->data['channel']['channel_id'])
);
diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js
new file mode 100644
index 000000000..82957ae44
--- /dev/null
+++ b/view/js/mod_photos.js
@@ -0,0 +1,16 @@
+$(document).ready(function() {
+
+ $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+ var selstr;
+ $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+ selstr = $(this).text();
+ $('#jot-perms-icon').removeClass('unlock').addClass('lock');
+ $('#jot-public').hide();
+ });
+ if(selstr == null) {
+ $('#jot-perms-icon').removeClass('lock').addClass('unlock');
+ $('#jot-public').show();
+ }
+
+ }).trigger('change');
+});