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

default photo issue, and connections page showing deleted accounts. Also show last updated on connedit page

Browse Source
This commit is contained in:
friendica 2013-12-19 19:16:46 -08:00
parent 648a7a5735
commit bccc20f38c
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/bbcode.html
View File

@ -6,7 +6,7 @@
<li>[i]italic[/i] - <em>italic</em><br /> <li>[i]italic[/i] - <em>italic</em><br />
<li>[u]underlined[/u] - <u>underlined</u><br /> <li>[u]underlined[/u] - <u>underlined</u><br />
<li>[s]strike[/s] - <strike>strike</strike><br /> <li>[s]strike[/s] - <strike>strike</strike><br />
<li>[color= red]red[/color] - <span style="color: red;">red</span><br /> <li>[color=red]red[/color] - <span style="color: red;">red</span><br />
<li>[url=https://www.redmatrix.me]Red Matrix[/url] <a href="https://redmatrix.me">Red Matrix</a><br /> <li>[url=https://www.redmatrix.me]Red Matrix[/url] <a href="https://redmatrix.me">Red Matrix</a><br />
<li>[img]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg" alt="Image/photo" /><br /> <li>[img]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg" alt="Image/photo" /><br />
<li>[code]code[/code] <code>code</code><br /> <li>[code]code[/code] <code>code</code><br />

2
include/identity.php
View File

@ -1124,7 +1124,7 @@ function get_default_profile_photo($size = 175) {
$scheme = get_config('system','default_profile_photo'); $scheme = get_config('system','default_profile_photo');
if(! $scheme) if(! $scheme)
$scheme = 'rainbow_man'; $scheme = 'rainbow_man';
return 'images/default_profile_photos/' . $scheme . '/' . $size . 'jpg'; return 'images/default_profile_photos/' . $scheme . '/' . $size . '.jpg';
} }

8
mod/connections.php
View File

@ -300,9 +300,10 @@ function connections_content(&$a) {
$r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash $r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash
where abook_channel = %d and not (abook_flags & %d) $sql_extra $sql_extra2 ", where abook_channel = %d and not (abook_flags & %d) and not (xchan_flags & %d ) $sql_extra $sql_extra2 ",
intval(local_user()), intval(local_user()),
intval(ABOOK_FLAG_SELF) intval(ABOOK_FLAG_SELF),
intval(XCHAN_FLAGS_DELETED)
); );
if(count($r)) { if(count($r)) {
$a->set_pager_total($r[0]['total']); $a->set_pager_total($r[0]['total']);
@ -310,9 +311,10 @@ function connections_content(&$a) {
} }
$r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash
WHERE abook_channel = %d and not (abook_flags & %d) $sql_extra $sql_extra2 ORDER BY xchan_name LIMIT %d , %d ", WHERE abook_channel = %d and not (abook_flags & %d) and not ( xchan_flags & %d) $sql_extra $sql_extra2 ORDER BY xchan_name LIMIT %d , %d ",
intval(local_user()), intval(local_user()),
intval(ABOOK_FLAG_SELF), intval(ABOOK_FLAG_SELF),
intval(XCHAN_FLAGS_DELETED),
intval($a->pager['start']), intval($a->pager['start']),
intval($a->pager['itemspage']) intval($a->pager['itemspage'])
); );

2
mod/connedit.php
View File

@ -482,7 +482,7 @@ function connedit_content(&$a) {
'$lastupdtext' => t('Last update:'), '$lastupdtext' => t('Last update:'),
'$lost_contact' => $lost_contact, '$lost_contact' => $lost_contact,
'$updpub' => t('Update public posts'), '$updpub' => t('Update public posts'),
'$last_update' => $last_update, '$last_update' => relative_date($contact['abook_connected']),
'$udnow' => t('Update now'), '$udnow' => t('Update now'),
'$profile_select' => contact_profile_assign($contact['abook_profile']), '$profile_select' => contact_profile_assign($contact['abook_profile']),
'$multiprofs' => feature_enabled(local_user(),'multi_profiles'), '$multiprofs' => feature_enabled(local_user(),'multi_profiles'),

4
view/tpl/abook_edit.tpl
View File

@ -16,6 +16,10 @@
<div id="contact-edit-wrapper"> <div id="contact-edit-wrapper">
{{if $last_update}}
{{$lastupdtext}} {{$last_update}}
{{/if}}
{{if $notself}} {{if $notself}}
{{if $slide}} {{if $slide}}
<h3>{{$lbl_slider}}</h3> <h3>{{$lbl_slider}}</h3>