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

added curly braces + fixed indenting according to code review by Hypolite

Browse source 
Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Haeder 2016-12-30 21:48:09 +01:00
parent d2280d4120
commit d2df464d8c
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
5 changed files with 42 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/follow.php
View file

@ -110,12 +110,10 @@ function new_contact($uid,$url,$interactive = false) {
// NOTREACHED // NOTREACHED
} }
} else { } elseif (get_config('system','dfrn_only')) {
if (get_config('system','dfrn_only')) { $result['message'] = t('This site is not configured to allow communications with other networks.') . EOL;
$result['message'] = t('This site is not configured to allow communications with other networks.') . EOL; $result['message'] != t('No compatible communication protocols or feeds were discovered.') . EOL;
$result['message'] != t('No compatible communication protocols or feeds were discovered.') . EOL; return $result;
return $result;
}
} }
// This extra param just confuses things, remove it // This extra param just confuses things, remove it

11
include/items.php
View file

@ -955,12 +955,14 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
$r = q('SELECT * FROM `item` WHERE `id` = %d', intval($current_post)); $r = q('SELECT * FROM `item` WHERE `id` = %d', intval($current_post));
if ((dbm::is_result($r)) && (count($r) == 1)) { if ((dbm::is_result($r)) && (count($r) == 1)) {
if ($notify) if ($notify) {
call_hooks('post_local_end', $r[0]); call_hooks('post_local_end', $r[0]);
else } else {
call_hooks('post_remote_end', $r[0]); call_hooks('post_remote_end', $r[0]);
} else }
} else {
logger('item_store: new item not found in DB, id ' . $current_post); logger('item_store: new item not found in DB, id ' . $current_post);
}
} }
if ($arr['parent-uri'] === $arr['uri']) { if ($arr['parent-uri'] === $arr['uri']) {
@ -994,8 +996,9 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
check_item_notification($current_post, $uid); check_item_notification($current_post, $uid);
if ($notify) if ($notify) {
proc_run(PRIORITY_HIGH, "include/notifier.php", $notify_type, $current_post); proc_run(PRIORITY_HIGH, "include/notifier.php", $notify_type, $current_post);
}
return $current_post; return $current_post;
} }

46
mod/contacts.php
View file

@ -37,34 +37,36 @@ function contacts_init(App &$a) {
} }
if ($contact_id) { if ($contact_id) {
$a->data['contact'] = $r[0]; $a->data['contact'] = $r[0];
if (($a->data['contact']['network'] != "") AND ($a->data['contact']['network'] != NETWORK_DFRN)) { if (($a->data['contact']['network'] != "") AND ($a->data['contact']['network'] != NETWORK_DFRN)) {
$networkname = format_network_name($a->data['contact']['network'],$a->data['contact']['url']); $networkname = format_network_name($a->data['contact']['network'],$a->data['contact']['url']);
} else { } else {
$networkname = ''; $networkname = '';
} }
$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array( /// @TODO Add nice spaces
'$name' => htmlentities($a->data['contact']['name']), $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
'$photo' => $a->data['contact']['photo'], '$name' => htmlentities($a->data['contact']['name']),
'$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? "redir/".$a->data['contact']['id'] : $a->data['contact']['url'], '$photo' => $a->data['contact']['photo'],
'$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""), '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? "redir/".$a->data['contact']['id'] : $a->data['contact']['url'],
'$network_name' => $networkname, '$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""),
'$network' => t('Network:'), '$network_name' => $networkname,
'$account_type' => account_type($a->data['contact']) '$network' => t('Network:'),
)); '$account_type' => account_type($a->data['contact'])
$finpeople_widget = ''; ));
$follow_widget = '';
$networks_widget = ''; $finpeople_widget = '';
} $follow_widget = '';
else { $networks_widget = '';
} else {
$vcard_widget = ''; $vcard_widget = '';
$networks_widget .= networks_widget('contacts',$_GET['nets']); $networks_widget .= networks_widget('contacts',$_GET['nets']);
if (isset($_GET['add'])) if (isset($_GET['add'])) {
$follow_widget = follow_widget($_GET['add']); $follow_widget = follow_widget($_GET['add']);
else } else {
$follow_widget = follow_widget(); $follow_widget = follow_widget();
}
$findpeople_widget .= findpeople_widget(); $findpeople_widget .= findpeople_widget();
} }

12
mod/profile.php
View file

@ -111,10 +111,8 @@ function profile_content(&$a, $update = 0) {
if ($update) { if ($update) {
// Ensure we've got a profile owner if updating. // Ensure we've got a profile owner if updating.
$a->profile['profile_uid'] = $update; $a->profile['profile_uid'] = $update;
} else { } elseif ($a->profile['profile_uid'] == local_user()) {
if ($a->profile['profile_uid'] == local_user()) { nav_set_selected('home');
nav_set_selected('home');
}
} }
$contact = null; $contact = null;
@ -158,12 +156,12 @@ function profile_content(&$a, $update = 0) {
} }
if (! $update) { if (! $update) {
if (x($_GET,'tab')) if (x($_GET,'tab')) {
$tab = notags(trim($_GET['tab'])); $tab = notags(trim($_GET['tab']));
}
$o.=profile_tabs($a, $is_owner, $a->profile['nickname']); $o.=profile_tabs($a, $is_owner, $a->profile['nickname']);
if ($tab === 'profile') { if ($tab === 'profile') {
$o .= advanced_profile($a); $o .= advanced_profile($a);
call_hooks('profile_advanced',$o); call_hooks('profile_advanced',$o);
@ -201,14 +199,12 @@ function profile_content(&$a, $update = 0) {
$o .= status_editor($a,$x); $o .= status_editor($a,$x);
} }
} }
/** /**
* Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups * Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
*/ */
$sql_extra = item_permissions_sql($a->profile['profile_uid'],$remote_contact,$groups); $sql_extra = item_permissions_sql($a->profile['profile_uid'],$remote_contact,$groups);

6
view/theme/quattro/config.php
View file

@ -33,7 +33,7 @@ function theme_admin(App &$a){
$align = get_config('quattro', 'align' ); $align = get_config('quattro', 'align' );
$color = get_config('quattro', 'color' ); $color = get_config('quattro', 'color' );
$tfs = get_config("quattro","tfs"); $tfs = get_config("quattro","tfs");
$pfs = get_config("quattro","pfs"); $pfs = get_config("quattro","pfs");
return quattro_form($a,$align, $color, $tfs, $pfs); return quattro_form($a,$align, $color, $tfs, $pfs);
} }
@ -69,8 +69,8 @@ function quattro_form(App &$a, $align, $color, $tfs, $pfs){
'$title' => t("Theme settings"), '$title' => t("Theme settings"),
'$align' => array('quattro_align', t('Alignment'), $align, '', array('left'=>t('Left'), 'center'=>t('Center'))), '$align' => array('quattro_align', t('Alignment'), $align, '', array('left'=>t('Left'), 'center'=>t('Center'))),
'$color' => array('quattro_color', t('Color scheme'), $color, '', $colors), '$color' => array('quattro_color', t('Color scheme'), $color, '', $colors),
'$pfs' => array('quattro_pfs', t('Posts font size'), $pfs), '$pfs' => array('quattro_pfs', t('Posts font size'), $pfs),
'$tfs' => array('quattro_tfs',t('Textareas font size'), $tfs), '$tfs' => array('quattro_tfs',t('Textareas font size'), $tfs),
)); ));
return $o; return $o;
} }