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

minor tweak to utf8 usernames after some testing of the underlying encode/decode funations. This probably isn't critical and I do not have a failure case but just trying to cover all bases.

Browse Source
This commit is contained in:
zotlabs 2018-04-23 19:10:35 -07:00
parent 59ac3d04eb
commit b688dc3995
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/channel.php
View File

@ -2240,6 +2240,11 @@ function get_zcard_embed($channel, $observer_hash = '', $args = array()) {
* - false if no channel with $nick was found * - false if no channel with $nick was found
*/ */
function channelx_by_nick($nick) { function channelx_by_nick($nick) {
// If we are provided a Unicode nickname convert to IDN
$nick = punify($nick);
$r = q("SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_address = '%s' and channel_removed = 0 LIMIT 1", $r = q("SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_address = '%s' and channel_removed = 0 LIMIT 1",
dbesc($nick) dbesc($nick)
); );

5
include/text.php
View File

@ -3344,6 +3344,9 @@ function featured_sort($a,$b) {
} }
// Be aware that punify will convert domain names and pathnames
function punify($s) { function punify($s) {
require_once('vendor/simplepie/simplepie/idn/idna_convert.class.php'); require_once('vendor/simplepie/simplepie/idn/idna_convert.class.php');
$x = new idna_convert(['encoding' => 'utf8']); $x = new idna_convert(['encoding' => 'utf8']);
@ -3351,6 +3354,8 @@ function punify($s) {
} }
// Be aware that unpunify will only convert domain names and not pathnames
function unpunify($s) { function unpunify($s) {
require_once('vendor/simplepie/simplepie/idn/idna_convert.class.php'); require_once('vendor/simplepie/simplepie/idn/idna_convert.class.php');
$x = new idna_convert(['encoding' => 'utf8']); $x = new idna_convert(['encoding' => 'utf8']);