keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added spaces + curly braces

Browse source 
Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2016-12-20 11:38:16 +01:00
parent c86f09a894
commit 5588472f6d
5 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/conversation.php
View file

@ -327,9 +327,11 @@ function localize_item(&$item){
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'];
} }
}

19
include/email.php
View file

@ -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;
} }

3
include/socgraph.php
View file

@ -1196,12 +1196,13 @@ function update_suggestions() {
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')",

6
mod/randprof.php
View file

@ -3,8 +3,12 @@
function randprof_init(App &$a) { function randprof_init(App &$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');
} }