mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 00:55:19 +00:00
make default profile photo configurable - should be functional but needs admin ui
This commit is contained in:
parent
f8042cc467
commit
7c81889b33
12 changed files with 31 additions and 120 deletions
BIN
images/default_profile_photos/blank/175.jpg
Normal file
BIN
images/default_profile_photos/blank/175.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 910 B |
BIN
images/default_profile_photos/blank/48.jpg
Normal file
BIN
images/default_profile_photos/blank/48.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 566 B |
BIN
images/default_profile_photos/blank/80.jpg
Normal file
BIN
images/default_profile_photos/blank/80.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 614 B |
BIN
images/default_profile_photos/red_koala/175.jpg
Normal file
BIN
images/default_profile_photos/red_koala/175.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 22 KiB |
BIN
images/default_profile_photos/red_koala/48.jpg
Normal file
BIN
images/default_profile_photos/red_koala/48.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 4.7 KiB |
BIN
images/default_profile_photos/red_koala/80.jpg
Normal file
BIN
images/default_profile_photos/red_koala/80.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 8.9 KiB |
|
@ -1109,3 +1109,24 @@ function get_theme_uid() {
|
||||||
}
|
}
|
||||||
return $uid;
|
return $uid;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @function get_default_profile_photo($size = 175)
|
||||||
|
* Retrieves the path of the default_profile_photo for this system
|
||||||
|
* with the specified size.
|
||||||
|
* @param int $size
|
||||||
|
* one of (175, 80, 48)
|
||||||
|
* @returns string
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
function get_default_profile_photo($size = 175) {
|
||||||
|
$scheme = get_config('system','default_profile_photo');
|
||||||
|
if(! $scheme)
|
||||||
|
$scheme = 'rainbow_man';
|
||||||
|
return 'images/default_profile_photos/' . $scheme . '/' . $size . 'jpg';
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -548,7 +548,7 @@ function avatar_img($email) {
|
||||||
call_hooks('avatar_lookup', $avatar);
|
call_hooks('avatar_lookup', $avatar);
|
||||||
|
|
||||||
if(! $avatar['success'])
|
if(! $avatar['success'])
|
||||||
$avatar['url'] = $a->get_baseurl() . '/images/default_profile_photos/rainbow_man/175.jpg';
|
$avatar['url'] = $a->get_baseurl() . '/' . get_default_profile_photo();
|
||||||
|
|
||||||
logger('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], LOGGER_DEBUG);
|
logger('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], LOGGER_DEBUG);
|
||||||
return $avatar['url'];
|
return $avatar['url'];
|
||||||
|
|
|
@ -576,9 +576,9 @@ function import_profile_photo($photo,$xchan) {
|
||||||
$photo_failure = true;
|
$photo_failure = true;
|
||||||
}
|
}
|
||||||
if($photo_failure) {
|
if($photo_failure) {
|
||||||
$photo = $a->get_baseurl() . '/images/default_profile_photos/rainbow_man/175.jpg';
|
$photo = $a->get_baseurl() . '/' . get_default_profile_photo();
|
||||||
$thumb = $a->get_baseurl() . '/images/default_profile_photos/rainbow_man/80.jpg';
|
$thumb = $a->get_baseurl() . '/' . get_default_profile_photo(80);
|
||||||
$micro = $a->get_baseurl() . '/images/default_profile_photos/rainbow_man/48.jpg';
|
$micro = $a->get_baseurl() . '/' . get_default_profile_photo(48);
|
||||||
$type = 'image/jpeg';
|
$type = 'image/jpeg';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ function photo_init(&$a) {
|
||||||
|
|
||||||
$observer_xchan = get_observer_hash();
|
$observer_xchan = get_observer_hash();
|
||||||
|
|
||||||
$default = 'images/default_profile_photos/rainbow_man/175.jpg';
|
$default = get_default_profile_photo();
|
||||||
|
|
||||||
if(isset($type)) {
|
if(isset($type)) {
|
||||||
|
|
||||||
|
@ -38,11 +38,11 @@ function photo_init(&$a) {
|
||||||
|
|
||||||
case 'm':
|
case 'm':
|
||||||
$resolution = 5;
|
$resolution = 5;
|
||||||
$default = 'images/default_profile_photos/rainbow_man/80.jpg';
|
$default = get_default_profile_photo(80);
|
||||||
break;
|
break;
|
||||||
case 's':
|
case 's':
|
||||||
$resolution = 6;
|
$resolution = 6;
|
||||||
$default = 'images/default_profile_photos/rainbow_man/48.jpg';
|
$default = get_default_profile_photo(48);
|
||||||
break;
|
break;
|
||||||
case 'l':
|
case 'l':
|
||||||
default:
|
default:
|
||||||
|
@ -135,15 +135,15 @@ function photo_init(&$a) {
|
||||||
switch($resolution) {
|
switch($resolution) {
|
||||||
|
|
||||||
case 4:
|
case 4:
|
||||||
$data = file_get_contents('images/default_profile_photos/rainbow_man/175.jpg');
|
$data = file_get_contents(get_default_profile_photo());
|
||||||
$mimetype = 'image/jpeg';
|
$mimetype = 'image/jpeg';
|
||||||
break;
|
break;
|
||||||
case 5:
|
case 5:
|
||||||
$data = file_get_contents('images/default_profile_photos/rainbow_man/80.jpg');
|
$data = file_get_contents(get_default_profile_photo(80));
|
||||||
$mimetype = 'image/jpeg';
|
$mimetype = 'image/jpeg';
|
||||||
break;
|
break;
|
||||||
case 6:
|
case 6:
|
||||||
$data = file_get_contents('images/default_profile_photos/rainbow_man/48.jpg');
|
$data = file_get_contents(get_default_profile_photo(48));
|
||||||
$mimetype = 'image/jpeg';
|
$mimetype = 'image/jpeg';
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -1,50 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
function qsearch_init(&$a) {
|
|
||||||
|
|
||||||
if(! local_user())
|
|
||||||
killme();
|
|
||||||
|
|
||||||
$limit = (get_config('system','qsearch_limit') ? intval(get_config('system','qsearch_limit')) : 100);
|
|
||||||
|
|
||||||
$search = ((x($_GET,'s')) ? notags(trim(urldecode($_GET['s']))) : '');
|
|
||||||
|
|
||||||
if(! strlen($search))
|
|
||||||
killme();
|
|
||||||
|
|
||||||
|
|
||||||
if($search)
|
|
||||||
$search = dbesc($search);
|
|
||||||
|
|
||||||
$results = array();
|
|
||||||
|
|
||||||
$r = q("SELECT * FROM `group` WHERE `name` REGEXP '$search' AND `deleted` = 0 AND `uid` = %d LIMIT 0, %d ",
|
|
||||||
intval(local_user()),
|
|
||||||
intval($limit)
|
|
||||||
);
|
|
||||||
|
|
||||||
if(count($r)) {
|
|
||||||
|
|
||||||
foreach($r as $rr)
|
|
||||||
$results[] = array( 0, (int) $rr['id'], $rr['name'], '', '');
|
|
||||||
}
|
|
||||||
|
|
||||||
$sql_extra = ((strlen($search)) ? " AND (`name` REGEXP '$search' OR `nick` REGEXP '$search') " : "");
|
|
||||||
|
|
||||||
|
|
||||||
$r = q("SELECT * FROM `contact` WHERE `uid` = %d $sql_extra ORDER BY `name` ASC LIMIT 0, %d ",
|
|
||||||
intval(local_user()),
|
|
||||||
intval($limit)
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
if(count($r)) {
|
|
||||||
|
|
||||||
foreach($r as $rr)
|
|
||||||
$results[] = array( (int) $rr['id'], 0, $rr['name'],$rr['url'],$rr['photo']);
|
|
||||||
}
|
|
||||||
|
|
||||||
echo json_encode((object) $results);
|
|
||||||
killme();
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,60 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
function redir_init(&$a) {
|
|
||||||
|
|
||||||
$url = ((x($_GET,'url')) ? $_GET['url'] : '');
|
|
||||||
|
|
||||||
// traditional DFRN
|
|
||||||
|
|
||||||
if(local_user() && $a->argc > 1 && intval($a->argv[1])) {
|
|
||||||
|
|
||||||
$cid = $a->argv[1];
|
|
||||||
|
|
||||||
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
|
||||||
intval($cid),
|
|
||||||
intval(local_user())
|
|
||||||
);
|
|
||||||
|
|
||||||
if((! count($r)) || ($r[0]['network'] !== NETWORK_DFRN))
|
|
||||||
goaway(z_root());
|
|
||||||
|
|
||||||
$dfrn_id = $orig_id = (($r[0]['issued_id']) ? $r[0]['issued_id'] : $r[0]['dfrn_id']);
|
|
||||||
|
|
||||||
if($r[0]['duplex'] && $r[0]['issued_id']) {
|
|
||||||
$orig_id = $r[0]['issued_id'];
|
|
||||||
$dfrn_id = '1:' . $orig_id;
|
|
||||||
}
|
|
||||||
if($r[0]['duplex'] && $r[0]['dfrn_id']) {
|
|
||||||
$orig_id = $r[0]['dfrn_id'];
|
|
||||||
$dfrn_id = '0:' . $orig_id;
|
|
||||||
}
|
|
||||||
|
|
||||||
$sec = random_string();
|
|
||||||
|
|
||||||
q("INSERT INTO `profile_check` ( `uid`, `cid`, `dfrn_id`, `sec`, `expire`)
|
|
||||||
VALUES( %d, %s, '%s', '%s', %d )",
|
|
||||||
intval(local_user()),
|
|
||||||
intval($cid),
|
|
||||||
dbesc($dfrn_id),
|
|
||||||
dbesc($sec),
|
|
||||||
intval(time() + 45)
|
|
||||||
);
|
|
||||||
|
|
||||||
logger('mod_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG);
|
|
||||||
$dest = (($url) ? '&destination_url=' . $url : '');
|
|
||||||
goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id
|
|
||||||
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest );
|
|
||||||
}
|
|
||||||
|
|
||||||
if(local_user())
|
|
||||||
$handle = $a->user['nickname'] . '@' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')+3);
|
|
||||||
if(remote_user())
|
|
||||||
$handle = $_SESSION['handle'];
|
|
||||||
|
|
||||||
if($url) {
|
|
||||||
$url = str_replace('{zid}','&zid=' . $handle,$url);
|
|
||||||
goaway($url);
|
|
||||||
}
|
|
||||||
|
|
||||||
goaway(z_root());
|
|
||||||
}
|
|
Loading…
Reference in a new issue