Linked and formatted user names #527

Klap-in · 2014-02-03T23:42:11Z

Implements an event which can modify the link below usernames, and the
displayed user name.

When no name supplied, the name of currently logged-in user is used.

Fixes:

FS#1558 - Link to user page in function tpl_userinfo
FS#2151 - more options for showuseras -- actually the suggested fix is using interwiki links...

2 question left:

Howto combine current behavior and a new option for own userlink
Howto easily configure the userprofile link?

Implemented as:

Add 4th 'showuseras' select option: 'username with interwikilink'
FS#2151 interwiki links for configurable links
FS#2713 'use existing internal link color for internal interwiki links' is implemented for interwiki links as local wiki links.
check usage of <bdi> tags

Implements an event which can modify the link below usernames, and the displayed user name. When no name supplied, the name of currently logged-in user is used.

splitbrain · 2014-02-14T13:13:37Z

inc/common.php

+ *
+ * @triggers COMMON_USER_LINK
+ */
+function userinfo($username = false) {


I think null or maybe an empty string would make slightly more sense as a default.

splitbrain · 2014-02-14T14:14:05Z

One way to deal with the rewriting problem could be handling the user shortcut in a special way, and treating the result as a wiki page. So we would provide user wiki:user:{URL} as default.

Hmm thinking about it, we could always do that when the link does not contain a slash (eg. is not an URL or path). When this is the case we put the resolved link through wl(). This should give us enough flexibility.

* allowed urlparams * added `wiki:users:` as default user profile link

uses the user interwiki link as profile link

Klap-in · 2014-02-14T23:53:21Z

summary sofar:

added showuseras option 'username_link' which uses interwiki resolving for link to profile
added wrap up with COMMON_USER_LINK event trigger, to replace/extend default user name&link building.

todo's:

check <bdi>
fix FS#2713 as well? or other PR?
check {PATH} placeholder in unit tests.

Added DOKU_BASE for local target

splitbrain · 2014-02-15T10:44:32Z

conf/interwiki.conf

@@ -24,12 +24,13 @@ amazon.de http://www.amazon.de/exec/obidos/ASIN/{URL}/splitbrain-21/
 amazon.uk http://www.amazon.co.uk/exec/obidos/ASIN/
 paypal    https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&amp;business=
 phpfn     http://www.php.net/{NAME}
-coral     http://{HOST}.{PORT}.nyud.net:8090/{PATH}?{QUERY}
+coral     http://{HOST}.{PORT}.nyud.net:8090{PATH}?{QUERY}
 freecache http://freecache.org/{NAME}
 sb        http://www.splitbrain.org/go/
 skype     skype:{NAME}


Damn. I forgot about this usecase. this will break with your change. You no longer can create a shortcut to have special protocol links like skype:, mailto: or javascript:

Maybe we could use a (pseudo) full link syntax instead?

user [[wiki:user:{NAME}]]

But users would expect these to work too then:

user [[wiki:user:{NAME}|Profile for {name}]] user [[wiki:user:{NAME}|{{some:img.png|Profile}}]] user [[wiki:user:{NAME}|{{http://example.com|some:img.png|Profile}}]]

which doesn't really make sense. Maybe we can do something like in mime.conf and prefix things that should be resolved as page name with a !

FS#2713 suggests using _shortcut or .shortcut for internal links, you added !shortcut as well.

Which variant do we like?

Klap-in · 2014-02-15T13:41:42Z

@selfthinker can you have a look at my usage of the <bdi> stuff?

michitux · 2014-02-15T15:37:50Z

inc/parser/renderer.php

-            $url = $url.rawurlencode($reference);
+            $url = $url . rawurlencode($reference);
+        }
+        //url without slashes is handled as a pageid


This is not the current behavior anymore.

selfthinker · 2014-02-16T19:24:27Z

conf/interwiki.conf

 freecache http://freecache.org/{NAME}
 sb        http://www.splitbrain.org/go/
 skype     skype:{NAME}
 google.de http://www.google.de/search?q=
 go        http://www.google.com/search?q={URL}&amp;btnI=lucky
+user      :wiki:users:{NAME}


I would use singular here, so :wiki:user:{NAME}.
Also not sure if the wiki namespace is a good and/or essential place for it. :user:{NAME} would be easiest and is more universal.

agreed. :user:{NAME} seems to be a good default.

selfthinker · 2014-02-16T19:40:04Z

The "Logged in as" username link needs to be blue to match the design. I will add that in a bit.

…l (to fit design)

selfthinker · 2014-02-16T19:55:59Z

The use of <bdi> is fine.

selfthinker · 2014-02-16T19:59:18Z

I'm wondering if there should be an option to remove the link from the user at "Logged in as"? Always adding it will otherwise essentially force every wiki to have user pages...!

splitbrain · 2014-02-16T20:03:51Z

huh? there is only a link when you select the appropriate displayas option or is there?

selfthinker · 2014-02-16T20:07:40Z

Ah, yes, true. Sorry, my bad.
Because the showuseras option otherwise does not affect "Logged in as", I assumed it would also not affect if it's a link or not. That behaviour is a bit odd and less predictable, but sort of makes sense.

Conflicts: inc/parser/renderer.php inc/template.php

splitbrain · 2014-03-14T16:01:55Z

What's the state here? I think it's good to merge?

Klap-in · 2014-03-14T16:09:44Z

It is ready so far i know.

The user icon is a colored image lib/images/interwiki/user.png. This is nice for the normal wikilinks, but i can image that some prefer a gray image for the times it is used in the header.

An idea is to reuse the profile image of the 'edit profile' link via css, only for user interwikilinks in the header.

this shows the profile image twice in some cases.

What do you think?

splitbrain · 2014-03-15T19:10:57Z

I updated the CSS to override the icon in the header. good to merge in my opinion

👍

selfthinker · 2014-03-16T19:26:46Z

inc/common.php

+    if($evt->advise_before(true)) {
+        if(empty($data['name'])) {
+            if($conf['showuseras'] == 'loginname') {
+                $data['name'] = $textonly ? $data['username'] : hsc($data['username']);


Why does one have hsc() and not the other?

textonly shouldn't require html escaping.

Chris--S · 2014-03-16T20:03:09Z

I don't like the name of the function userinfo() -- too similar to $USERINFO. How about userlink() ?

Klap-in · 2014-03-16T20:14:17Z

The naming is improved as indicated.

Linked and formatted user names

Klap-in added 2 commits February 4, 2014 00:34

wrap userlink building with event.

60a396c

Implements an event which can modify the link below usernames, and the displayed user name. When no name supplied, the name of currently logged-in user is used.

update $username as well, when read from _SERVER

8a7e0ee

splitbrain reviewed Feb 14, 2014
View reviewed changes

change default arg value of userinfo in null instead false

62c8004

Klap-in added 4 commits February 14, 2014 23:54

handle interwiki without slashes as pageids. Added user interwiki

7c2f8ee

* allowed urlparams * added `wiki:users:` as default user profile link

wikilink needs wiki target as well

b3d353e

Extend showuseras config with username_link

7f08182

uses the user interwiki link as profile link

added tests for Doku_Renderer::_resolveInterWiki

2d6df79

Klap-in added 4 commits February 15, 2014 11:11

wikilink creating refactored to _resolveinterwiki().

2345e87

Added DOKU_BASE for local target

code reformatting

5a9ce44

Fix double slash in coral interwikilink

4485a89

Use DOKU_BASE in resolveinterwiki unittest

ddb55c7

splitbrain reviewed Feb 15, 2014
View reviewed changes

interwiki : prefixed configurls handled as wikilinks

6496c33

michitux reviewed Feb 15, 2014
View reviewed changes

fix comment in _resolveInterWiki

f379edc

selfthinker reviewed Feb 16, 2014
View reviewed changes

generalised link colour in header, making interwiki links blue as wel…

6198904

…l (to fit design)

Klap-in added 2 commits February 17, 2014 00:37

change default userspace to :user:<username> and add interwiki class

2a2a43c

update unittest with interwiki.conf change as well

118e005

michitux mentioned this pull request Mar 6, 2014

User pages #592

Closed

Klap-in added 4 commits March 10, 2014 22:29

added user.png for interwiki links

6384941

Merge remote-tracking branch 'origin/master' into userlink

f97db66

Conflicts: inc/parser/renderer.php inc/template.php

update usage in userlink

30f6ec4

declare more clear, before used as ref

533772e

Klap-in mentioned this pull request Mar 14, 2014

Added diff navigation #169

Merged

Klap-in and others added 2 commits March 14, 2014 18:42

enable editorinfo and userinfo to return plain text names

15f3bc4

override user link icon in header

c18baa7

selfthinker reviewed Mar 16, 2014
View reviewed changes

Klap-in added 2 commits March 16, 2014 21:00

improve phpdocs editorinfo()

c095302

Merge remote-tracking branch 'origin/userlink' into userlink

898f93a

Klap-in added 2 commits March 16, 2014 21:10

Rename userinfo() to userlink()

cd4635e

use more consistent names

4d5fc92

Klap-in added a commit that referenced this pull request Mar 16, 2014

Merge pull request #527 from splitbrain/userlink

02fdb91

Linked and formatted user names

Klap-in merged commit 02fdb91 into master Mar 16, 2014

Klap-in deleted the userlink branch March 16, 2014 20:52

Klap-in added needDocUpdate and removed needDocUpdate labels Mar 19, 2014

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Linked and formatted user names #527

Linked and formatted user names #527

Klap-in commented Feb 3, 2014

splitbrain Feb 14, 2014

splitbrain commented Feb 14, 2014

Klap-in commented Feb 14, 2014

splitbrain Feb 15, 2014

splitbrain Feb 15, 2014

Klap-in Feb 15, 2014

Klap-in commented Feb 15, 2014

michitux Feb 15, 2014

selfthinker Feb 16, 2014

splitbrain Feb 16, 2014

selfthinker commented Feb 16, 2014

selfthinker commented Feb 16, 2014

selfthinker commented Feb 16, 2014

splitbrain commented Feb 16, 2014

selfthinker commented Feb 16, 2014

splitbrain commented Mar 14, 2014

Klap-in commented Mar 14, 2014

splitbrain commented Mar 15, 2014

selfthinker Mar 16, 2014

Chris--S Mar 16, 2014

Chris--S commented Mar 16, 2014

Klap-in commented Mar 16, 2014

Linked and formatted user names #527

Linked and formatted user names #527

Conversation

Klap-in commented Feb 3, 2014

Choose a reason for hiding this comment

splitbrain commented Feb 14, 2014

Klap-in commented Feb 14, 2014

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Klap-in commented Feb 15, 2014

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

selfthinker commented Feb 16, 2014

selfthinker commented Feb 16, 2014

selfthinker commented Feb 16, 2014

splitbrain commented Feb 16, 2014

selfthinker commented Feb 16, 2014

splitbrain commented Mar 14, 2014

Klap-in commented Mar 14, 2014

splitbrain commented Mar 15, 2014

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Chris--S commented Mar 16, 2014

Klap-in commented Mar 16, 2014