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
committed by Mario Vavti
parent fa5115b3ed
commit d7aaca6947
2 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
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;
@@ -195,11 +200,10 @@ class Cover_photo extends \Zotlabs\Web\Controller {
$os_storage = false; $os_storage = false;
foreach($i as $ii) { foreach($i as $ii) {
$smallest = intval($ii['imgscale']); $smallest = intval($ii['imgscale']);
$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
* *
*/ */
@@ -350,15 +354,15 @@ class Cover_photo extends \Zotlabs\Web\Controller {
$tpl = get_markup_template('cover_photo.tpl'); $tpl = get_markup_template('cover_photo.tpl');
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$user' => \App::$channel['channel_address'], '$user' => \App::$channel['channel_address'],
'$lbl_upfile' => t('Upload File:'), '$lbl_upfile' => t('Upload File:'),
'$lbl_profiles' => t('Select a profile:'), '$lbl_profiles' => t('Select a profile:'),
'$title' => t('Upload Cover Photo'), '$title' => t('Upload Cover Photo'),
'$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>')
)); ));
call_hooks('cover_photo_content_end', $o); call_hooks('cover_photo_content_end', $o);
@@ -370,14 +374,14 @@ class Cover_photo extends \Zotlabs\Web\Controller {
$resolution = 3; $resolution = 3;
$tpl = get_markup_template("cropcover.tpl"); $tpl = get_markup_template("cropcover.tpl");
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$filename' => $filename, '$filename' => $filename,
'$profile' => intval($_REQUEST['profile']), '$profile' => intval($_REQUEST['profile']),
'$resource' => \App::$data['imagecrop'] . '-3', '$resource' => \App::$data['imagecrop'] . '-3',
'$image_url' => z_root() . '/photo/' . $filename, '$image_url' => z_root() . '/photo/' . $filename,
'$title' => t('Crop Image'), '$title' => t('Crop Image'),
'$desc' => t('Please adjust the image cropping for optimum viewing.'), '$desc' => t('Please adjust the image cropping for optimum viewing.'),
'$form_security_token' => get_form_security_token("cover_photo"), '$form_security_token' => get_form_security_token("cover_photo"),
'$done' => t('Done Editing') '$done' => t('Done Editing')
)); ));
return $o; return $o;
} }
@@ -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');

12
Zotlabs/Module/Profile_photo.php
View File

@@ -108,11 +108,13 @@ class Profile_photo extends \Zotlabs\Web\Controller {
$aid = get_account_id(); $aid = get_account_id();
$p = [ $p = [
'aid' => $aid, 'aid' => $aid,
'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;