added spaces + curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
parent
f3529e7dbc
commit
fc9dbc0899
5 changed files with 27 additions and 13 deletions
|
@ -324,12 +324,14 @@ function localize_item(&$item){
|
||||||
// add sparkle links to appropriate permalinks
|
// add sparkle links to appropriate permalinks
|
||||||
|
|
||||||
$x = stristr($item['plink'],'/display/');
|
$x = stristr($item['plink'],'/display/');
|
||||||
if($x) {
|
if ($x) {
|
||||||
$sparkle = false;
|
$sparkle = false;
|
||||||
$y = best_link_url($item,$sparkle,true);
|
$y = best_link_url($item,$sparkle,true);
|
||||||
if(strstr($y,'/redir/'))
|
|
||||||
|
if (strstr($y,'/redir/')) {
|
||||||
$item['plink'] = $y . '?f=&url=' . $item['plink'];
|
$item['plink'] = $y . '?f=&url=' . $item['plink'];
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -96,24 +96,30 @@ function email_get_msg($mbox,$uid, $reply) {
|
||||||
$html = '';
|
$html = '';
|
||||||
foreach($struc->parts as $ptop => $p) {
|
foreach($struc->parts as $ptop => $p) {
|
||||||
$x = email_get_part($mbox,$uid,$p,$ptop + 1, 'plain');
|
$x = email_get_part($mbox,$uid,$p,$ptop + 1, 'plain');
|
||||||
if($x) $text .= $x;
|
if ($x) {
|
||||||
|
$text .= $x;
|
||||||
|
}
|
||||||
|
|
||||||
$x = email_get_part($mbox,$uid,$p,$ptop + 1, 'html');
|
$x = email_get_part($mbox,$uid,$p,$ptop + 1, 'html');
|
||||||
if($x) $html .= $x;
|
if ($x) {
|
||||||
|
$html .= $x;
|
||||||
}
|
}
|
||||||
if (trim($html) != '')
|
}
|
||||||
|
if (trim($html) != '') {
|
||||||
$ret['body'] = html2bbcode($html);
|
$ret['body'] = html2bbcode($html);
|
||||||
else
|
} else {
|
||||||
$ret['body'] = $text;
|
$ret['body'] = $text;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$ret['body'] = removegpg($ret['body']);
|
$ret['body'] = removegpg($ret['body']);
|
||||||
$msg = removesig($ret['body']);
|
$msg = removesig($ret['body']);
|
||||||
$ret['body'] = $msg['body'];
|
$ret['body'] = $msg['body'];
|
||||||
$ret['body'] = convertquote($ret['body'], $reply);
|
$ret['body'] = convertquote($ret['body'], $reply);
|
||||||
|
|
||||||
if (trim($html) != '')
|
if (trim($html) != '') {
|
||||||
$ret['body'] = removelinebreak($ret['body']);
|
$ret['body'] = removelinebreak($ret['body']);
|
||||||
|
}
|
||||||
|
|
||||||
$ret['body'] = unifyattributionline($ret['body']);
|
$ret['body'] = unifyattributionline($ret['body']);
|
||||||
|
|
||||||
|
@ -189,8 +195,9 @@ function email_get_part($mbox,$uid,$p,$partno, $subtype) {
|
||||||
$x = "";
|
$x = "";
|
||||||
foreach ($p->parts as $partno0=>$p2) {
|
foreach ($p->parts as $partno0=>$p2) {
|
||||||
$x .= email_get_part($mbox,$uid,$p2,$partno . '.' . ($partno0+1), $subtype); // 1.2, 1.2.1, etc.
|
$x .= email_get_part($mbox,$uid,$p2,$partno . '.' . ($partno0+1), $subtype); // 1.2, 1.2.1, etc.
|
||||||
//if($x)
|
//if ($x) {
|
||||||
// return $x;
|
// return $x;
|
||||||
|
//}
|
||||||
}
|
}
|
||||||
return $x;
|
return $x;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1188,20 +1188,21 @@ function update_suggestions() {
|
||||||
|
|
||||||
if(strlen(get_config('system','directory'))) {
|
if(strlen(get_config('system','directory'))) {
|
||||||
$x = fetch_url(get_server()."/pubsites");
|
$x = fetch_url(get_server()."/pubsites");
|
||||||
if($x) {
|
if ($x) {
|
||||||
$j = json_decode($x);
|
$j = json_decode($x);
|
||||||
if($j->entries) {
|
if ($j->entries) {
|
||||||
foreach($j->entries as $entry) {
|
foreach($j->entries as $entry) {
|
||||||
|
|
||||||
poco_check_server($entry->url);
|
poco_check_server($entry->url);
|
||||||
|
|
||||||
$url = $entry->url . '/poco';
|
$url = $entry->url . '/poco';
|
||||||
if(! in_array($url,$done))
|
if (! in_array($url,$done)) {
|
||||||
poco_load(0,0,0,$entry->url . '/poco');
|
poco_load(0,0,0,$entry->url . '/poco');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Query your contacts from Friendica and Redmatrix/Hubzilla for their contacts
|
// Query your contacts from Friendica and Redmatrix/Hubzilla for their contacts
|
||||||
$r = q("SELECT DISTINCT(`poco`) AS `poco` FROM `contact` WHERE `network` IN ('%s', '%s')",
|
$r = q("SELECT DISTINCT(`poco`) AS `poco` FROM `contact` WHERE `network` IN ('%s', '%s')",
|
||||||
|
|
|
@ -1367,7 +1367,7 @@ function prepare_body(&$item,$attach = false, $preview = false) {
|
||||||
// map
|
// map
|
||||||
if(strpos($s,'<div class="map">') !== false && $item['coord']) {
|
if(strpos($s,'<div class="map">') !== false && $item['coord']) {
|
||||||
$x = generate_map(trim($item['coord']));
|
$x = generate_map(trim($item['coord']));
|
||||||
if($x) {
|
if ($x) {
|
||||||
$s = preg_replace('/\<div class\=\"map\"\>/','$0' . $x,$s);
|
$s = preg_replace('/\<div class\=\"map\"\>/','$0' . $x,$s);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,8 +3,12 @@
|
||||||
|
|
||||||
function randprof_init(&$a) {
|
function randprof_init(&$a) {
|
||||||
require_once('include/Contact.php');
|
require_once('include/Contact.php');
|
||||||
|
|
||||||
$x = random_profile();
|
$x = random_profile();
|
||||||
if($x)
|
|
||||||
|
if ($x) {
|
||||||
goaway(zrl($x));
|
goaway(zrl($x));
|
||||||
|
}
|
||||||
|
|
||||||
goaway(App::get_baseurl() . '/profile');
|
goaway(App::get_baseurl() . '/profile');
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue