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

backend support for alternate profile photos for private profiles

Browse Source
This commit is contained in:
friendica 2012-07-17 16:02:16 -07:00
parent 359c74d320
commit 073eb1b845
3 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/iquery.php
View File

@ -7,7 +7,7 @@ function network_query($a,$arr) {
$parent_options = ''; $parent_options = '';
$child_options = ''; $child_options = '';
$ordering = (($arr['order'] === 'post') ? "`created`" ? "`commented`") . " DESC"; $ordering = (($arr['order'] === 'post') ? "`created`" : "`commented`") . " DESC ";
$itemspage = get_pconfig($arr['uid'],'system','itemspage_network'); $itemspage = get_pconfig($arr['uid'],'system','itemspage_network');
$a->set_pager_itemspage(((intval($itemspage_network)) ? $itemspage_network : 40)); $a->set_pager_itemspage(((intval($itemspage_network)) ? $itemspage_network : 40));
@ -137,4 +137,3 @@ function network_query($a,$arr) {
}

35
mod/profile_photo.php
View File

@ -24,6 +24,20 @@ function profile_photo_post(&$a) {
if((x($_POST,'cropfinal')) && ($_POST['cropfinal'] == 1)) { if((x($_POST,'cropfinal')) && ($_POST['cropfinal'] == 1)) {
// unless proven otherwise
$is_default_profile = 1;
if($_REQUEST['profile']) {
$r = q("select id, `is-default` from profile where id = %d and uid = %d limit 1",
intval($_REQUEST['profile']),
intval(local_user())
);
if(count($r) && (! intval($r[0]['is-default'])))
$is_default_profile = 0;
}
// phase 2 - we have finished cropping // phase 2 - we have finished cropping
if($a->argc != 2) { if($a->argc != 2) {
@ -57,31 +71,44 @@ function profile_photo_post(&$a) {
if($im->is_valid()) { if($im->is_valid()) {
$im->cropImage(175,$srcX,$srcY,$srcW,$srcH); $im->cropImage(175,$srcX,$srcY,$srcW,$srcH);
$r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 4, 1); $r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 4, $is_default_profile);
if($r === false) if($r === false)
notice ( sprintf(t('Image size reduction [%s] failed.'),"175") . EOL ); notice ( sprintf(t('Image size reduction [%s] failed.'),"175") . EOL );
$im->scaleImage(80); $im->scaleImage(80);
$r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 5, 1); $r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 5, $is_default_profile);
if($r === false) if($r === false)
notice( sprintf(t('Image size reduction [%s] failed.'),"80") . EOL ); notice( sprintf(t('Image size reduction [%s] failed.'),"80") . EOL );
$im->scaleImage(48); $im->scaleImage(48);
$r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 6, 1); $r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 6, $is_default_profile);
if($r === false) if($r === false)
notice( sprintf(t('Image size reduction [%s] failed.'),"48") . EOL ); notice( sprintf(t('Image size reduction [%s] failed.'),"48") . EOL );
// Unset the profile photo flag from any other photos I own // If setting for the default profile, unset the profile photo flag from any other photos I own
if($is_default_profile) {
$r = q("UPDATE `photo` SET `profile` = 0 WHERE `profile` = 1 AND `resource-id` != '%s' AND `uid` = %d", $r = q("UPDATE `photo` SET `profile` = 0 WHERE `profile` = 1 AND `resource-id` != '%s' AND `uid` = %d",
dbesc($base_image['resource-id']), dbesc($base_image['resource-id']),
intval(local_user()) intval(local_user())
); );
}
else {
$r = q("update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d limit 1",
dbesc($a->get_baseurl() . '/photo/' . $base_image['resource-id'] . '-4'),
dbesc($a->get_baseurl() . '/photo/' . $base_image['resource-id'] . '-5'),
intval($_REQUEST['profile']),
intval(local_user())
);
}
// we'll set the updated profile-photo timestamp even if it isn't the default profile,
// so that browsers will do a cache update unconditionally
$r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d LIMIT 1", $r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d LIMIT 1",
dbesc(datetime_convert()), dbesc(datetime_convert()),

2
version.inc
View File

@ -1 +1 @@
2012-07-16.17 2012-07-17.18