nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

space to the rescue ... ;-) CR request

Browse source 
Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2017-03-30 20:33:38 +02:00
parent 9c056d0bf0
commit d091759888
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/dfrn.php
View file

@ -955,7 +955,7 @@ class dfrn {
$idtosend = '1:' . $orig_id; $idtosend = '1:' . $orig_id;
} }
$rino = get_config('system','rino_encrypt'); $rino = get_config('system', 'rino_encrypt');
$rino = intval($rino); $rino = intval($rino);
// use RINO1 if mcrypt isn't installed and RINO2 was selected // use RINO1 if mcrypt isn't installed and RINO2 was selected

2
mod/dfrn_notify.php
View file

@ -314,7 +314,7 @@ function dfrn_notify_content(App $a) {
$encrypted_id = bin2hex($encrypted_id); $encrypted_id = bin2hex($encrypted_id);
$rino = get_config('system','rino_encrypt'); $rino = get_config('system', 'rino_encrypt');
$rino = intval($rino); $rino = intval($rino);
// use RINO1 if mcrypt isn't installed and RINO2 was selected // use RINO1 if mcrypt isn't installed and RINO2 was selected
if ($rino == 2 && !function_exists('mcrypt_create_iv')) { if ($rino == 2 && !function_exists('mcrypt_create_iv')) {

20
mod/photos.php
View file

@ -18,7 +18,7 @@ function photos_init(App $a) {
auto_redir($a, $a->argv[1]); auto_redir($a, $a->argv[1]);
} }
if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { if ((get_config('system', 'block_public')) && (! local_user()) && (! remote_user())) {
return; return;
} }
@ -562,9 +562,9 @@ function photos_post(App $a) {
if (isset($profile)) { if (isset($profile)) {
unset($profile); unset($profile);
} }
if (strpos($tag,'@') === 0) { if (strpos($tag, '@') === 0) {
$name = substr($tag,1); $name = substr($tag,1);
if ((strpos($name,'@')) || (strpos($name,'http://'))) { if ((strpos($name, '@')) || (strpos($name, 'http://'))) {
$newname = $name; $newname = $name;
$links = @Probe::lrdd($name); $links = @Probe::lrdd($name);
if (count($links)) { if (count($links)) {
@ -573,7 +573,7 @@ function photos_post(App $a) {
$profile = $link['@attributes']['href']; $profile = $link['@attributes']['href'];
} }
if ($link['@attributes']['rel'] === 'salmon') { if ($link['@attributes']['rel'] === 'salmon') {
$salmon = '$url:' . str_replace(',','%sc',$link['@attributes']['href']); $salmon = '$url:' . str_replace(',', '%sc', $link['@attributes']['href']);
if (strlen($inform)) { if (strlen($inform)) {
$inform .= ','; $inform .= ',';
} }
@ -581,13 +581,13 @@ function photos_post(App $a) {
} }
} }
} }
$taginfo[] = array($newname,$profile,$salmon); $taginfo[] = array($newname, $profile, $salmon);
} else { } else {
$newname = $name; $newname = $name;
$alias = ''; $alias = '';
$tagcid = 0; $tagcid = 0;
if (strrpos($newname,'+')) { if (strrpos($newname, '+')) {
$tagcid = intval(substr($newname,strrpos($newname, '+') + 1)); $tagcid = intval(substr($newname, strrpos($newname, '+') + 1));
} }
if ($tagcid) { if ($tagcid) {
@ -649,9 +649,9 @@ function photos_post(App $a) {
$profile = str_replace(',', '%2c', $profile); $profile = str_replace(',', '%2c', $profile);
$str_tags .= '@[url='.$profile.']'.$newname.'[/url]'; $str_tags .= '@[url='.$profile.']'.$newname.'[/url]';
} }
} elseif (strpos($tag,'#') === 0) { } elseif (strpos($tag, '#') === 0) {
$tagname = substr($tag, 1); $tagname = substr($tag, 1);
$str_tags .= '#[url='.App::get_baseurl()."/search?tag=".$tagname.']'.$tagname.'[/url]'; $str_tags .= '#[url=' . App::get_baseurl() . "/search?tag=" . $tagname . ']' . $tagname . '[/url]';
} }
} }
} }
@ -988,7 +988,7 @@ function photos_content(App $a) {
// photos/name/image/xxxxx/edit // photos/name/image/xxxxx/edit
if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { if ((get_config('system', 'block_public')) && (! local_user()) && (! remote_user())) {
notice( t('Public access denied.') . EOL); notice( t('Public access denied.') . EOL);
return; return;
} }