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

more work related to attach/photo and os_path, display_path and general code cleanup

Browse Source
This commit is contained in:
zotlabs 2017-03-15 01:20:21 -07:00
parent fa89b8f66d
commit 6078d02c3a
2 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Zotlabs/Module/Cover_photo.php
View File

@ -23,19 +23,17 @@ require_once('include/channel.php');
class Cover_photo extends \Zotlabs\Web\Controller { class Cover_photo extends \Zotlabs\Web\Controller {
function init() { function init() {
if(! local_channel()) { if(! local_channel()) {
return; return;
} }
$channel = \App::get_channel(); $channel = \App::get_channel();
profile_load($channel['channel_address']); profile_load($channel['channel_address']);
} }
/* @brief Evaluate posted values /**
* @brief Evaluate posted values
* *
* @param $a Current application
* @return void * @return void
* *
*/ */
@ -130,8 +128,15 @@ class Cover_photo extends \Zotlabs\Web\Controller {
$aid = get_account_id(); $aid = get_account_id();
$p = array('aid' => $aid, 'uid' => local_channel(), 'resource_id' => $base_image['resource_id'], $p = [
'filename' => $base_image['filename'], 'album' => t('Cover Photos')); 'aid' => $aid,
'uid' => local_channel(),
'resource_id' => $base_image['resource_id'],
'filename' => $base_image['filename'],
'album' => t('Cover Photos'),
'os_path' => $base_image['os_path'],
'display_path' => $base_image['display_path']
];
$p['imgscale'] = 7; $p['imgscale'] = 7;
$p['photo_usage'] = PHOTO_COVER; $p['photo_usage'] = PHOTO_COVER;
@ -199,7 +204,6 @@ class Cover_photo extends \Zotlabs\Web\Controller {
$os_storage = intval($ii['os_storage']); $os_storage = intval($ii['os_storage']);
$imagedata = $ii['content']; $imagedata = $ii['content'];
$filetype = $ii['mimetype']; $filetype = $ii['mimetype'];
} }
} }
@ -263,10 +267,10 @@ class Cover_photo extends \Zotlabs\Web\Controller {
} }
/* @brief Generate content of profile-photo view /**
* @brief Generate content of profile-photo view
* *
* @param $a Current application * @return string
* @return void
* *
*/ */
@ -357,7 +361,7 @@ class Cover_photo extends \Zotlabs\Web\Controller {
'$submit' => t('Upload'), '$submit' => t('Upload'),
'$profiles' => $profiles, '$profiles' => $profiles,
'$form_security_token' => get_form_security_token("cover_photo"), '$form_security_token' => get_form_security_token("cover_photo"),
// FIXME - yuk /// @FIXME - yuk
'$select' => sprintf('%s %s', t('or'), ($newuser) ? '<a href="' . z_root() . '">' . t('skip this step') . '</a>' : '<a href="'. z_root() . '/photos/' . \App::$channel['channel_address'] . '">' . t('select a photo from your photo albums') . '</a>') '$select' => sprintf('%s %s', t('or'), ($newuser) ? '<a href="' . z_root() . '">' . t('skip this step') . '</a>' : '<a href="'. z_root() . '/photos/' . \App::$channel['channel_address'] . '">' . t('select a photo from your photo albums') . '</a>')
)); ));
@ -393,8 +397,6 @@ class Cover_photo extends \Zotlabs\Web\Controller {
* *
*/ */
function cover_photo_crop_ui_head(&$a, $ph, $hash, $smallest){ function cover_photo_crop_ui_head(&$a, $ph, $hash, $smallest){
$max_length = get_config('system','max_image_length'); $max_length = get_config('system','max_image_length');

4
Zotlabs/Module/Profile_photo.php
View File

@ -112,7 +112,9 @@ class Profile_photo extends \Zotlabs\Web\Controller {
'uid' => local_channel(), 'uid' => local_channel(),
'resource_id' => $base_image['resource_id'], 'resource_id' => $base_image['resource_id'],
'filename' => $base_image['filename'], 'filename' => $base_image['filename'],
'album' => t('Profile Photos') 'album' => t('Profile Photos'),
'os_path' => $base_image['os_path'],
'display_path' => $base_image['display_path']
]; ];
$p['imgscale'] = PHOTO_RES_PROFILE_300; $p['imgscale'] = PHOTO_RES_PROFILE_300;