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

add account_level, is_foreigner and is_member functions; convert all e2ee user input and prompts to hex to avoid javascipt's lame handling of quotes. !!This breaks all prior encrypted posts.!!

Browse Source
This commit is contained in:
friendica
2013-12-23 15:13:09 -08:00
parent 4517bdcff1
commit 63a42480c7
9 changed files with 80 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/bbcode.php
View File

@@ -105,21 +105,24 @@ function bb_parse_crypt($match) {
$attributes = $match[1];
$algorithm = "";
preg_match("/alg='(.*?)'/ism", $attributes, $matches);
if ($matches[1] != "")
$algorithm = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
$algorithm = $matches[1];
preg_match("/alg=\&quot\;(.*?)\&quot\;/ism", $attributes, $matches);
if ($matches[1] != "")
$algorithm = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
$algorithm = $matches[1];
$hint = "";
preg_match("/hint='(.*?)'/ism", $attributes, $matches);
if ($matches[1] != "")
$hint = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
$hint = $matches[1];
preg_match("/hint=\&quot\;(.*?)\&quot\;/ism", $attributes, $matches);
if ($matches[1] != "")
$hint = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
$hint = $matches[1];
$x = random_string();

32
include/identity.php
View File

@@ -1138,3 +1138,35 @@ function get_default_profile_photo($size = 175) {
$scheme = 'rainbow_man';
return 'images/default_profile_photos/' . $scheme . '/' . $size . '.jpg';
}
/**
*
* @function is_foreigner($s)
* Test whether a given identity is NOT a member of the Red Matrix
* @param string $s;
* xchan_hash of the identity in question
*
* @returns boolean true or false
*
*/
function is_foreigner($s) {
return((strpbrk($s,':@')) ? true : false);
}
/**
*
* @function is_member($s)
* Test whether a given identity is a member of the Red Matrix
* @param string $s;
* xchan_hash of the identity in question
*
* @returns boolean true or false
*
*/
function is_member($s) {
return((is_foreigner($s)) ? false : true);
}