From 5edd13c6bb89c7434d8437f8cc74c038371fdbf8 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 21 Oct 2022 11:20:23 +0200 Subject: fix various issues --- Zotlabs/Module/Cover_photo.php | 218 ++++++++++++++++++++--------------------- 1 file changed, 108 insertions(+), 110 deletions(-) (limited to 'Zotlabs/Module/Cover_photo.php') diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php index dff645f2b..1ecbfce3e 100644 --- a/Zotlabs/Module/Cover_photo.php +++ b/Zotlabs/Module/Cover_photo.php @@ -3,7 +3,7 @@ namespace Zotlabs\Module; use Zotlabs\Lib\Libsync; -/* +/* @file cover_photo.php @brief Module-file with functions for handling of cover-photos @@ -29,43 +29,43 @@ class Cover_photo extends \Zotlabs\Web\Controller { if(! local_channel()) { return; } - + $channel = \App::get_channel(); - profile_load($channel['channel_address']); + profile_load($channel['channel_address']); } - + /** * @brief Evaluate posted values * * @return void * */ - + function post() { - + if(! local_channel()) { return; } - + $channel = \App::get_channel(); - + check_form_security_token_redirectOnErr('/cover_photo', 'cover_photo'); // Remove cover photo if(isset($_POST['remove'])) { - + $r = q("SELECT resource_id FROM photo WHERE photo_usage = %d AND uid = %d LIMIT 1", intval(PHOTO_COVER), intval(local_channel()) ); - + if($r) { q("update photo set photo_usage = %d where photo_usage = %d and uid = %d", intval(PHOTO_NORMAL), intval(PHOTO_COVER), intval(local_channel()) ); - + $sync = attach_export_data($channel,$r[0]['resource_id']); if($sync) Libsync::build_sync_packet($channel['channel_id'],array('file' => array($sync))); @@ -76,47 +76,47 @@ class Cover_photo extends \Zotlabs\Web\Controller { goaway(z_root() . '/cover_photo'); } - + if((array_key_exists('cropfinal',$_POST)) && ($_POST['cropfinal'] == 1)) { - + // phase 2 - we have finished cropping - + if(argc() != 2) { notice( t('Image uploaded but image cropping failed.') . EOL ); return; } - + $image_id = argv(1); - + if(substr($image_id,-2,1) == '-') { $scale = substr($image_id,-1,1); $image_id = substr($image_id,0,-2); } - + $srcX = intval($_POST['xstart']); $srcY = intval($_POST['ystart']); $srcW = intval($_POST['xfinal']) - $srcX; $srcH = intval($_POST['yfinal']) - $srcY; - + $r = q("select gender from profile where uid = %d and is_default = 1 limit 1", intval(local_channel()) ); if($r) { $profile = $r[0]; } - + $r = q("SELECT * FROM photo WHERE resource_id = '%s' AND uid = %d AND imgscale = 0 LIMIT 1", dbesc($image_id), intval(local_channel()) ); - + if($r) { $max_thumb = intval(get_config('system','max_thumbnail',1600)); $iscaled = false; - if(intval($r[0]['height']) > $max_thumb || intval($r[0]['width']) > $max_thumb) { + if(intval($r[0]['height']) > $max_thumb || intval($r[0]['width']) > $max_thumb) { $imagick_path = get_config('system','imagick_convert_path'); if($imagick_path && @file_exists($imagick_path) && intval($r[0]['os_storage'])) { @@ -150,63 +150,63 @@ class Cover_photo extends \Zotlabs\Web\Controller { $im = photo_factory($base_image['content'], $base_image['mimetype']); if($im->is_valid()) { - - // We are scaling and cropping the relative pixel locations to the original photo instead of the + + // We are scaling and cropping the relative pixel locations to the original photo instead of the // scaled photo we operated on. - + // First load the scaled photo to check its size. (Should probably pass this in the post form and save // a query.) - + $g = q("select width, height from photo where resource_id = '%s' and uid = %d and imgscale = 3", dbesc($image_id), intval(local_channel()) ); - - + + $scaled_width = $g[0]['width']; $scaled_height = $g[0]['height']; - + if((! $scaled_width) || (! $scaled_height)) { logger('potential divide by zero scaling cover photo'); return; } - + // unset all other cover photos - + q("update photo set photo_usage = %d where photo_usage = %d and uid = %d", intval(PHOTO_NORMAL), intval(PHOTO_COVER), intval(local_channel()) ); - + $orig_srcx = ( $base_image['width'] / $scaled_width ) * $srcX; $orig_srcy = ( $base_image['height'] / $scaled_height ) * $srcY; $orig_srcw = ( $srcW / $scaled_width ) * $base_image['width']; $orig_srch = ( $srcH / $scaled_height ) * $base_image['height']; - + $im->cropImageRect(1200,435,$orig_srcx, $orig_srcy, $orig_srcw, $orig_srch); - + $aid = get_account_id(); - - $p = [ - 'aid' => $aid, - 'uid' => local_channel(), + + $p = [ + 'aid' => $aid, + 'uid' => local_channel(), 'resource_id' => $base_image['resource_id'], - 'filename' => $base_image['filename'], + 'filename' => $base_image['filename'], 'album' => t('Cover Photos'), 'os_path' => $base_image['os_path'], 'display_path' => $base_image['display_path'], 'photo_usage' => PHOTO_COVER ]; - + $r1 = $im->storeThumbnail($p, PHOTO_RES_COVER_1200); - + $im->doScaleImage(850,310); $r2 = $im->storeThumbnail($p, PHOTO_RES_COVER_850); - + $im->doScaleImage(425,160); $r3 = $im->storeThumbnail($p, PHOTO_RES_COVER_425); - + if($r1 === false || $r2 === false || $r3 === false) { // if one failed, delete them all so we can start over. notice( t('Image resize failed.') . EOL ); @@ -214,7 +214,7 @@ class Cover_photo extends \Zotlabs\Web\Controller { dbesc($base_image['resource_id']), local_channel() ); - + $x = q("SELECT content FROM photo WHERE resource_id = '%s' AND uid = %d AND os_storage = 1 AND imgscale >= 7", dbesc($base_image['resource_id']), local_channel() @@ -229,7 +229,7 @@ class Cover_photo extends \Zotlabs\Web\Controller { } $this->send_cover_photo_activity($channel,$base_image,$profile); - + $sync = attach_export_data($channel,$base_image['resource_id']); if($sync) Libsync::build_sync_packet($channel['channel_id'],array('file' => array($sync))); @@ -240,33 +240,33 @@ class Cover_photo extends \Zotlabs\Web\Controller { else notice( t('Unable to process image') . EOL); } - + goaway(z_root() . '/channel/' . $channel['channel_address']); - + } - - + + $hash = photo_new_resource(); $smallest = 0; - + require_once('include/attach.php'); - + $res = attach_store(\App::get_channel(), get_observer_hash(), '', array('album' => t('Cover Photos'), 'hash' => $hash, 'nosync' => true)); - + logger('attach_store: ' . print_r($res,true)); - + if($res && intval($res['data']['is_photo'])) { $i = q("select * from photo where resource_id = '%s' and uid = %d and imgscale = 0", dbesc($hash), intval(local_channel()) ); - + if(! $i) { notice( t('Image upload failed.') . EOL ); return; } $os_storage = false; - + foreach($i as $ii) { $smallest = intval($ii['imgscale']); $os_storage = intval($ii['os_storage']); @@ -274,91 +274,91 @@ class Cover_photo extends \Zotlabs\Web\Controller { $filetype = $ii['mimetype']; } } - + $imagedata = (($os_storage) ? @file_get_contents(dbunescbin($imagedata)) : dbunescbin($imagedata)); $ph = photo_factory($imagedata, $filetype); - + if(! $ph->is_valid()) { notice( t('Unable to process image.') . EOL ); return; } - + return $this->cover_photo_crop_ui_head($a, $ph, $hash, $smallest); - + } - + function send_cover_photo_activity($channel,$photo,$profile) { - + $arr = array(); $arr['item_thread_top'] = 1; $arr['item_origin'] = 1; $arr['item_wall'] = 1; - + if($profile && stripos($profile['gender'],t('female')) !== false) $t = t('%1$s updated her %2$s'); elseif($profile && stripos($profile['gender'],t('male')) !== false) $t = t('%1$s updated his %2$s'); else $t = t('%1$s updated their %2$s'); - + $ptext = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo['resource_id'] . ']' . t('cover photo') . '[/zrl]'; - - $ltext = '[zrl=' . z_root() . '/profile/' . $channel['channel_address'] . ']' . '[zmg]' . z_root() . '/photo/' . $photo['resource_id'] . '-8[/zmg][/zrl]'; - + + $ltext = '[zrl=' . z_root() . '/profile/' . $channel['channel_address'] . ']' . '[zmg]' . z_root() . '/photo/' . $photo['resource_id'] . '-8[/zmg][/zrl]'; + $arr['body'] = sprintf($t,$channel['channel_name'],$ptext) . "\n\n" . $ltext; - + $acl = new \Zotlabs\Access\AccessList($channel); $x = $acl->get(); $arr['allow_cid'] = $x['allow_cid']; - + $arr['allow_gid'] = $x['allow_gid']; $arr['deny_cid'] = $x['deny_cid']; $arr['deny_gid'] = $x['deny_gid']; - + $arr['uid'] = $channel['channel_id']; $arr['aid'] = $channel['channel_account_id']; - + $arr['owner_xchan'] = $channel['channel_hash']; $arr['author_xchan'] = $channel['channel_hash']; - + post_activity_item($arr); - - + + } - - + + /** * @brief Generate content of profile-photo view * * @return string * */ - - + + function get() { - + if(! local_channel()) { notice( t('Permission denied.') . EOL ); return; } - + $channel = \App::get_channel(); - + $newuser = false; - + if(argc() == 2 && argv(1) === 'new') $newuser = true; - + if(argv(1) === 'use') { if (argc() < 3) { notice( t('Permission denied.') . EOL ); return; }; - + // check_form_security_token_redirectOnErr('/cover_photo', 'cover_photo'); - + $resource_id = argv(2); - + $r = q("SELECT id, album, imgscale FROM photo WHERE uid = %d AND resource_id = '%s' ORDER BY imgscale ASC", intval(local_channel()), dbesc($resource_id) @@ -372,22 +372,22 @@ class Cover_photo extends \Zotlabs\Web\Controller { if($rr['imgscale'] == 7) $havescale = true; } - + $r = q("SELECT content, mimetype, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1", intval($r[0]['id']), intval(local_channel()) - + ); if(! $r) { notice( t('Photo not available.') . EOL ); return; } - + if(intval($r[0]['os_storage'])) $data = @file_get_contents(dbunescbin($r[0]['content'])); else - $data = dbunescbin($r[0]['content']); - + $data = dbunescbin($r[0]['content']); + $ph = photo_factory($data, $r[0]['mimetype']); $smallest = 0; if($ph->is_valid()) { @@ -396,7 +396,7 @@ class Cover_photo extends \Zotlabs\Web\Controller { dbesc($r[0]['resource_id']), intval(local_channel()) ); - + if($i) { $hash = $i[0]['resource_id']; foreach($i as $ii) { @@ -404,15 +404,15 @@ class Cover_photo extends \Zotlabs\Web\Controller { } } } - + $this->cover_photo_crop_ui_head($a, $ph, $hash, $smallest); } - - + + if(! x(\App::$data,'imagecrop')) { - + $tpl = get_markup_template('cover_photo.tpl'); - + $o .= replace_macros($tpl,array( '$user' => \App::$channel['channel_address'], '$info' => t('Your cover photo may be visible to anybody on the internet'), @@ -422,7 +422,7 @@ class Cover_photo extends \Zotlabs\Web\Controller { '$title' => t('Change Cover Photo'), '$submit' => t('Upload'), '$remove' => t('Remove'), - '$profiles' => $profiles, + '$profiles' => false, '$embedPhotos' => t('Use a photo from your albums'), '$embedPhotosModalTitle' => t('Use a photo from your albums'), '$embedPhotosModalCancel' => t('Cancel'), @@ -434,13 +434,13 @@ class Cover_photo extends \Zotlabs\Web\Controller { '$modalerrorlink' => t('Error getting photo link'), '$modalerroralbum' => t('Error getting album'), '$form_security_token' => get_form_security_token("cover_photo"), - /// @FIXME - yuk + /// @FIXME - yuk '$select' => t('Select existing photo'), )); - + call_hooks('cover_photo_content_end', $o); - + return $o; } else { @@ -459,10 +459,8 @@ class Cover_photo extends \Zotlabs\Web\Controller { )); return $o; } - - return; // NOTREACHED } - + /* @brief Generate the UI for photo-cropping * * @param $a Current application @@ -470,30 +468,30 @@ class Cover_photo extends \Zotlabs\Web\Controller { * @return void * */ - + function cover_photo_crop_ui_head(&$a, $ph, $hash, $smallest){ - + $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(); - + if($width < 300 || $height < 300) { $ph->scaleImageUp(240); $width = $ph->getWidth(); $height = $ph->getHeight(); } - - + + \App::$data['imagecrop'] = $hash; \App::$data['imagecrop_resolution'] = $smallest; \App::$page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), array()); return; } - - + + } -- cgit v1.2.3