bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

added spaces + some curly braces

Browse source 
Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2017-01-26 16:01:56 +01:00 committed by Roland Haeder
parent d529125c8e
commit ed0d858f98
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
6 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/contact_widgets.php
View file

@ -173,6 +173,7 @@ function categories_widget($baseurl,$selected = '') {
$matches = false;
$terms = array();
$cnt = preg_match_all('/<(.*?)>/',$saved,$matches,PREG_SET_ORDER);
if ($cnt) {
foreach ($matches as $mtch) {
$unescaped = xmlify(file_tag_decode($mtch[1]));

20
include/conversation.php
View file

@ -309,10 +309,11 @@ function localize_item(&$item){
$matches = null;
if (preg_match_all('/@\[url=(.*?)\]/is',$item['body'],$matches,PREG_SET_ORDER)) {
foreach ($matches as $mtch) {
if (! strpos($mtch[1],'zrl='))
if (! strpos($mtch[1],'zrl=')) {
$item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']);
}
}
}
// add zrl's to public images
$photo_pattern = "/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is";
@ -1360,18 +1361,23 @@ function conv_sort($arr,$order) {
$arr = $newarr;
foreach ($arr as $x)
if ($x['id'] == $x['parent'])
foreach ($arr as $x) {
if ($x['id'] == $x['parent']) {
$parents[] = $x;
}
}
if (stristr($order,'created'))
if (stristr($order,'created')) {
usort($parents,'sort_thr_created');
elseif (stristr($order,'commented'))
} elseif (stristr($order,'commented')) {
usort($parents,'sort_thr_commented');
}
if (count($parents))
foreach ($parents as $i=>$_x)
if (count($parents)) {
foreach($parents as $i=>$_x) {
$parents[$i]['children'] = get_item_children($arr, $_x);
}
}
/*foreach($arr as $x) {
if ($x['id'] != $x['parent']) {

3
include/security.php
View file

@ -358,9 +358,10 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null)
$gs = '<<>>'; // should be impossible to match
if (is_array($groups) && count($groups)) {
foreach ($groups as $g)
foreach ($groups as $g) {
$gs .= '|<' . intval($g) . '>';
}
}
$sql = sprintf(
/*" AND ( private = 0 OR ( private in (1,2) AND wall = 1 AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' )

3
include/text.php
View file

@ -421,10 +421,11 @@ function expand_acl($s) {
$t = str_replace('<','',$s);
$a = explode('>',$t);
foreach ($a as $aa) {
if (intval($aa))
if (intval($aa)) {
$ret[] = intval($aa);
}
}
}
return $ret;
}}