" . file_get_contents("view/theme/$theme/README") . "";
}
- $admin_form = "";
+ $admin_form = '';
if (is_file("view/theme/$theme/config.php")) {
+ $orig_theme = $a->theme;
+ $orig_page = $a->page;
+ $orig_session_theme = $_SESSION['theme'];
+ require_once "view/theme/$theme/theme.php";
+ require_once "view/theme/$theme/config.php";
+ $_SESSION['theme'] = $theme;
- function __get_theme_admin_form(App $a, $theme)
- {
- $orig_theme = $a->theme;
- $orig_page = $a->page;
- $orig_session_theme = $_SESSION['theme'];
- require_once("view/theme/$theme/theme.php");
- require_once("view/theme/$theme/config.php");
- $_SESSION['theme'] = $theme;
-
-
- $init = $theme . "_init";
- if (function_exists($init)) {
- $init($a);
- }
- if (function_exists("theme_admin")) {
- $admin_form = theme_admin($a);
- }
-
- $_SESSION['theme'] = $orig_session_theme;
- $a->theme = $orig_theme;
- $a->page = $orig_page;
- return $admin_form;
+ $init = $theme . "_init";
+ if (function_exists($init)) {
+ $init($a);
}
- $admin_form = __get_theme_admin_form($a, $theme);
+
+ if (function_exists('theme_admin')) {
+ $admin_form = theme_admin($a);
+ }
+
+ $_SESSION['theme'] = $orig_session_theme;
+ $a->theme = $orig_theme;
+ $a->page = $orig_page;
}
$screenshot = array(get_theme_screenshot($theme), t('Screenshot'));
@@ -2123,12 +2092,10 @@ function admin_page_themes(App $a)
// reload active themes
if (x($_GET, "a") && $_GET['a'] == "r") {
check_form_security_token_redirectOnErr(System::baseUrl() . '/admin/themes', 'admin_themes', 't');
- if ($themes) {
- foreach ($themes as $th) {
- if ($th['allowed']) {
- uninstall_theme($th['name']);
- install_theme($th['name']);
- }
+ foreach ($themes as $th) {
+ if ($th['allowed']) {
+ uninstall_theme($th['name']);
+ install_theme($th['name']);
}
}
info("Themes reloaded");
@@ -2139,11 +2106,9 @@ function admin_page_themes(App $a)
* List themes
*/
- $xthemes = array();
- if ($themes) {
- foreach ($themes as $th) {
- $xthemes[] = array($th['name'], (($th['allowed']) ? "on" : "off"), get_theme_info($th['name']));
- }
+ $plugins = array();
+ foreach ($themes as $th) {
+ $plugins[] = array($th['name'], (($th['allowed']) ? "on" : "off"), get_theme_info($th['name']));
}
$t = get_markup_template('admin/plugins.tpl');
@@ -2154,7 +2119,7 @@ function admin_page_themes(App $a)
'$reload' => t('Reload active themes'),
'$baseurl' => System::baseUrl(true),
'$function' => 'themes',
- '$plugins' => $xthemes,
+ '$plugins' => $plugins,
'$pcount' => count($themes),
'$noplugshint' => sprintf(t('No themes found on the system. They should be paced in %1$s'),'/view/themes'),
'$experimental' => t('[Experimental]'),
@@ -2307,12 +2272,11 @@ function admin_page_features_post(App $a)
logger('postvars: ' . print_r($_POST, true), LOGGER_DATA);
- $arr = array();
$features = Feature::get(false);
foreach ($features as $fname => $fdata) {
foreach (array_slice($fdata, 1) as $f) {
- $feature = $f[0];
+ $f eature = $f[0];
$feature_state = 'feature_' . $feature;
$featurelock = 'featurelock_' . $feature;
@@ -2368,7 +2332,7 @@ function admin_page_features(App $a)
}
$tpl = get_markup_template('admin/settings_features.tpl');
- $o .= replace_macros($tpl, array(
+ $o = replace_macros($tpl, array(
'$form_security_token' => get_form_security_token("admin_manage_features"),
'$title' => t('Manage Additional Features'),
'$features' => $arr,
diff --git a/mod/allfriends.php b/mod/allfriends.php
index 1456661253..9d6a6b0c7b 100644
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -1,4 +1,5 @@
argc > 1) {
$cid = intval($a->argv[1]);
}
- if (! $cid) {
+ if (!$cid) {
return;
}
@@ -34,7 +36,7 @@ function allfriends_content(App $a) {
intval(local_user())
);
- if (! DBM::is_result($c)) {
+ if (!DBM::is_result($c)) {
return;
}
@@ -43,32 +45,30 @@ function allfriends_content(App $a) {
$total = GContact::countAllFriends(local_user(), $cid);
- if(count($total))
- $a->set_pager_total($total);
+ $a->set_pager_total($total);
$r = GContact::allFriends(local_user(), $cid, $a->pager['start'], $a->pager['itemspage']);
-
- if (! DBM::is_result($r)) {
+ if (!DBM::is_result($r)) {
$o .= t('No friends to display.');
return $o;
}
$id = 0;
+ $entries = [];
foreach ($r as $rr) {
-
//get further details of the contact
$contact_details = Contact::getDetailsByURL($rr['url'], $uid, $rr);
$photo_menu = '';
+ $connlnk = '';
// $rr[cid] is only available for common contacts. So if the contact is a common one, use contact_photo_menu to generate the photo_menu
// If the contact is not common to the user, Connect/Follow' will be added to the photo menu
- if ($rr[cid]) {
- $rr[id] = $rr[cid];
- $photo_menu = Contact::photoMenu ($rr);
- }
- else {
+ if ($rr['cid']) {
+ $rr['id'] = $rr['cid'];
+ $photo_menu = Contact::photoMenu($rr);
+ } else {
$connlnk = System::baseUrl() . '/follow/?url=' . $rr['url'];
$photo_menu = array(
'profile' => array(t("View Profile"), zrl($rr['url'])),
@@ -78,7 +78,7 @@ function allfriends_content(App $a) {
$entry = array(
'url' => $rr['url'],
- 'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
+ 'itemurl' => defaults($contact_details, 'addr', $rr['url']),
'name' => htmlentities($contact_details['name']),
'thumb' => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
'img_hover' => htmlentities($contact_details['name']),
@@ -99,7 +99,7 @@ function allfriends_content(App $a) {
$tpl = get_markup_template('viewcontact_template.tpl');
- $o .= replace_macros($tpl,array(
+ $o .= replace_macros($tpl, array(
//'$title' => sprintf( t('Friends of %s'), htmlentities($c[0]['name'])),
'$tab_str' => $tab_str,
'$contacts' => $entries,
diff --git a/mod/amcd.php b/mod/amcd.php
index 0eb295a816..c6013b942d 100644
--- a/mod/amcd.php
+++ b/mod/amcd.php
@@ -2,7 +2,8 @@
use Friendica\App;
-function amcd_content(App $a) {
+function amcd_content()
+{
echo <<< JSON
{
"version":1,
@@ -47,4 +48,4 @@ function amcd_content(App $a) {
}
JSON;
killme();
-}
\ No newline at end of file
+}
diff --git a/mod/babel.php b/mod/babel.php
index 0e38dc5750..9866628d87 100644
--- a/mod/babel.php
+++ b/mod/babel.php
@@ -7,69 +7,71 @@ require_once 'library/markdown.php';
require_once 'include/bb2diaspora.php';
require_once 'include/html2bbcode.php';
-function visible_lf($s) {
+function visible_lf($s)
+{
return str_replace("\n", '' . $d2bbtext . '' . EOL. EOL; + $o .= '
' . $d2bbtext . '' . EOL . EOL; $bb = diaspora2bb($d2bbtext); - $o .= '
' . $bb . '' . EOL. EOL; + $o .= '
' . $bb . '' . EOL . EOL; } return $o; diff --git a/mod/bookmarklet.php b/mod/bookmarklet.php index 2e0d449711..e809d3baac 100644 --- a/mod/bookmarklet.php +++ b/mod/bookmarklet.php @@ -7,7 +7,7 @@ use Friendica\Module\Login; require_once('include/conversation.php'); require_once('include/items.php'); -function bookmarklet_init(App $a) +function bookmarklet_init() { $_GET["mode"] = "minimal"; } diff --git a/mod/cal.php b/mod/cal.php index 312489ef72..01fcaf4f7e 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -1,9 +1,10 @@ argc > 1) +function cal_init(App $a) +{ + if ($a->argc > 1) { auto_redir($a, $a->argv[1]); + } - if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) { + if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) { return; } nav_set_selected('events'); - $o = ''; - - if($a->argc > 1) { + if ($a->argc > 1) { $nick = $a->argv[1]; $user = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1", dbesc($nick) ); - if(! count($user)) + if (!count($user)) { return; + } $a->data['user'] = $user[0]; $a->profile_uid = $user[0]['uid']; // if it's a json request abort here becaus we don't // need the widget data - if ($a->argv[2] === 'json') + if ($a->argv[2] === 'json') { return; + } $profile = get_profiledata_by_nick($nick, $a->profile_uid); @@ -52,7 +55,7 @@ function cal_init(App $a) { $tpl = get_markup_template("vcard-widget.tpl"); - $vcard_widget .= replace_macros($tpl, array( + $vcard_widget = replace_macros($tpl, array( '$name' => $profile['name'], '$photo' => $profile['photo'], '$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""), @@ -62,8 +65,9 @@ function cal_init(App $a) { $cal_widget = widget_events(); - if(! x($a->page,'aside')) + if (!x($a->page, 'aside')) { $a->page['aside'] = ''; + } $a->page['aside'] .= $vcard_widget; $a->page['aside'] .= $cal_widget; @@ -72,17 +76,15 @@ function cal_init(App $a) { return; } -function cal_content(App $a) { +function cal_content(App $a) +{ nav_set_selected('events'); - // First day of the week (0 = Sunday) - $firstDay = PConfig::get(local_user(),'system','first_day_of_week', 0); - // get the translation strings for the callendar $i18n = get_event_strings(); $htpl = get_markup_template('event_head.tpl'); - $a->page['htmlhead'] .= replace_macros($htpl,array( + $a->page['htmlhead'] .= replace_macros($htpl, array( '$baseurl' => System::baseUrl(), '$module_url' => '/cal/' . $a->data['user']['nickname'], '$modparams' => 2, @@ -90,128 +92,128 @@ function cal_content(App $a) { )); $etpl = get_markup_template('event_end.tpl'); - $a->page['end'] .= replace_macros($etpl,array( + $a->page['end'] .= replace_macros($etpl, array( '$baseurl' => System::baseUrl(), )); - $o =""; + $o = ""; $mode = 'view'; $y = 0; $m = 0; - $ignored = ((x($_REQUEST,'ignored')) ? intval($_REQUEST['ignored']) : 0); + $ignored = ((x($_REQUEST, 'ignored')) ? intval($_REQUEST['ignored']) : 0); - if($a->argc == 4) { - if($a->argv[2] == 'export') { - $mode = 'export'; - $format = $a->argv[3]; - } + $format = 'ical'; + if ($a->argc == 4 && $a->argv[2] == 'export') { + $mode = 'export'; + $format = $a->argv[3]; } - // // Setup permissions structures - // - - $contact = null; $remote_contact = false; $contact_id = 0; $owner_uid = $a->data['user']['uid']; $nick = $a->data['user']['nickname']; - if(is_array($_SESSION['remote'])) { - foreach($_SESSION['remote'] as $v) { - if($v['uid'] == $a->profile['profile_uid']) { + if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) { + foreach ($_SESSION['remote'] as $v) { + if ($v['uid'] == $a->profile['profile_uid']) { $contact_id = $v['cid']; break; } } } - if($contact_id) { + + $groups = []; + if ($contact_id) { $groups = Group::getIdsByContactId($contact_id); $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($contact_id), intval($a->profile['profile_uid']) ); if (DBM::is_result($r)) { - $contact = $r[0]; $remote_contact = true; } } - if(! $remote_contact) { - if(local_user()) { - $contact_id = $_SESSION['cid']; - $contact = $a->contact; - } - } - $is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false); - if($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) { - notice( t('Access to this profile has been restricted.') . EOL); + $is_owner = local_user() == $a->profile['profile_uid']; + + if ($a->profile['hidewall'] && (!$is_owner) && (!$remote_contact)) { + notice(t('Access to this profile has been restricted.') . EOL); return; } // get the permissions - $sql_perms = item_permissions_sql($owner_uid,$remote_contact,$groups); + $sql_perms = item_permissions_sql($owner_uid, $remote_contact, $groups); // we only want to have the events of the profile owner $sql_extra = " AND `event`.`cid` = 0 " . $sql_perms; // get the tab navigation bar - $tabs .= profile_tabs($a,false, $a->data['user']['nickname']); + $tabs = profile_tabs($a, false, $a->data['user']['nickname']); // The view mode part is similiar to /mod/events.php - if($mode == 'view') { - - - $thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y'); - $thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m'); - if(! $y) + if ($mode == 'view') { + $thisyear = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y'); + $thismonth = datetime_convert('UTC', date_default_timezone_get(), 'now', 'm'); + if (!$y) { $y = intval($thisyear); - if(! $m) + } + + if (!$m) { $m = intval($thismonth); + } // Put some limits on dates. The PHP date functions don't seem to do so well before 1900. // An upper limit was chosen to keep search engines from exploring links millions of years in the future. - if($y < 1901) + if ($y < 1901) { $y = 1900; - if($y > 2099) + } + + if ($y > 2099) { $y = 2100; + } $nextyear = $y; $nextmonth = $m + 1; - if($nextmonth > 12) { - $nextmonth = 1; + if ($nextmonth > 12) { + $nextmonth = 1; $nextyear ++; } $prevyear = $y; - if($m > 1) + if ($m > 1) { $prevmonth = $m - 1; - else { + } else { $prevmonth = 12; $prevyear --; } - $dim = get_dim($y,$m); - $start = sprintf('%d-%d-%d %d:%d:%d',$y,$m,1,0,0,0); - $finish = sprintf('%d-%d-%d %d:%d:%d',$y,$m,$dim,23,59,59); + $dim = get_dim($y, $m); + $start = sprintf('%d-%d-%d %d:%d:%d', $y, $m, 1, 0, 0, 0); + $finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59); - if ($a->argv[2] === 'json'){ - if (x($_GET,'start')) $start = $_GET['start']; - if (x($_GET,'end')) $finish = $_GET['end']; + if ($a->argv[2] === 'json') { + if (x($_GET, 'start')) { + $start = $_GET['start']; + } + + if (x($_GET, 'end')) { + $finish = $_GET['end']; + } } - $start = datetime_convert('UTC','UTC',$start); - $finish = datetime_convert('UTC','UTC',$finish); + $start = datetime_convert('UTC', 'UTC', $start); + $finish = datetime_convert('UTC', 'UTC', $finish); $adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start); $adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish); // put the event parametes in an array so we can better transmit them $event_params = array( - 'event_id' => (x($_GET,'id') ? $_GET["id"] : 0), + 'event_id' => (x($_GET, 'id') ? $_GET["id"] : 0), 'start' => $start, 'finish' => $finish, 'adjust_start' => $adjust_start, @@ -220,7 +222,7 @@ function cal_content(App $a) { ); // get events by id or by date - if (x($_GET,'id')){ + if (x($_GET, 'id')) { $r = event_by_id($owner_uid, $event_params, $sql_extra); } else { $r = events_by_date($owner_uid, $event_params, $sql_extra); @@ -231,57 +233,51 @@ function cal_content(App $a) { if (DBM::is_result($r)) { $r = sort_by_date($r); foreach ($r as $rr) { - $j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j')); - if (! x($links,$j)) { + $j = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['start'], 'j') : datetime_convert('UTC', 'UTC', $rr['start'], 'j')); + if (!x($links, $j)) { $links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j; } } } - - $events=array(); - // transform the event in a usable array - if (DBM::is_result($r)) - $r = sort_by_date($r); - $events = process_events($r); + $events = process_events($r); - if ($a->argv[2] === 'json'){ - echo json_encode($events); killme(); + if ($a->argv[2] === 'json') { + echo json_encode($events); + killme(); } // links: array('href', 'text', 'extra css classes', 'title') - if (x($_GET,'id')){ - $tpl = get_markup_template("event.tpl"); + if (x($_GET, 'id')) { + $tpl = get_markup_template("event.tpl"); } else { // if (Config::get('experimentals','new_calendar')==1){ - $tpl = get_markup_template("events_js.tpl"); + $tpl = get_markup_template("events_js.tpl"); // } else { // $tpl = get_markup_template("events.tpl"); // } } // Get rid of dashes in key names, Smarty3 can't handle them - foreach($events as $key => $event) { + foreach ($events as $key => $event) { $event_item = array(); - foreach($event['item'] as $k => $v) { - $k = str_replace('-','_',$k); + foreach ($event['item'] as $k => $v) { + $k = str_replace('-', '_', $k); $event_item[$k] = $v; } $events[$key]['item'] = $event_item; } $o = replace_macros($tpl, array( - '$baseurl' => System::baseUrl(), - '$tabs' => $tabs, - '$title' => t('Events'), - '$view' => t('View'), - '$previous' => array(System::baseUrl()."/events/$prevyear/$prevmonth", t('Previous'),'',''), - '$next' => array(System::baseUrl()."/events/$nextyear/$nextmonth", t('Next'),'',''), - '$calendar' => cal($y,$m,$links, ' eventcal'), - - '$events' => $events, - + '$baseurl' => System::baseUrl(), + '$tabs' => $tabs, + '$title' => t('Events'), + '$view' => t('View'), + '$previous' => array(System::baseUrl() . "/events/$prevyear/$prevmonth", t('Previous'), '', ''), + '$next' => array(System::baseUrl() . "/events/$nextyear/$nextmonth", t('Next'), '', ''), + '$calendar' => cal($y, $m, $links, ' eventcal'), + '$events' => $events, "today" => t("today"), "month" => t("month"), "week" => t("week"), @@ -289,21 +285,24 @@ function cal_content(App $a) { "list" => t("list"), )); - if (x($_GET,'id')){ echo $o; killme(); } + if (x($_GET, 'id')) { + echo $o; + killme(); + } return $o; } - if($mode == 'export') { - if(! (intval($owner_uid))) { - notice( t('User not found')); + if ($mode == 'export') { + if (!(intval($owner_uid))) { + notice(t('User not found')); return; } // Test permissions // Respect the export feature setting for all other /cal pages if it's not the own profile - if( ((local_user() !== intval($owner_uid))) && ! Feature::isEnabled($owner_uid, "export_calendar")) { - notice( t('Permission denied.') . EOL); + if (((local_user() !== intval($owner_uid))) && !Feature::isEnabled($owner_uid, "export_calendar")) { + notice(t('Permission denied.') . EOL); goaway('cal/' . $nick); } @@ -311,17 +310,19 @@ function cal_content(App $a) { $evexport = event_export($owner_uid, $format); if (!$evexport["success"]) { - if($evexport["content"]) - notice( t('This calendar format is not supported') ); - else - notice( t('No exportable data found')); + if ($evexport["content"]) { + notice(t('This calendar format is not supported')); + } else { + notice(t('No exportable data found')); + } // If it the own calendar return to the events page // otherwise to the profile calendar page - if (local_user() === intval($owner_uid)) + if (local_user() === intval($owner_uid)) { $return_path = "events"; - else - $returnpath = "cal/".$nick; + } else { + $return_path = "cal/" . $nick; + } goaway($return_path); } @@ -329,7 +330,7 @@ function cal_content(App $a) { // If nothing went wrong we can echo the export content if ($evexport["success"]) { header('Content-type: text/calendar'); - header('content-disposition: attachment; filename="' . t('calendar') . '-' . $nick . '.' . $evexport["extension"] . '"' ); + header('content-disposition: attachment; filename="' . t('calendar') . '-' . $nick . '.' . $evexport["extension"] . '"'); echo $evexport["content"]; killme(); } diff --git a/mod/common.php b/mod/common.php index 74b4dec7c6..fc8829aa51 100644 --- a/mod/common.php +++ b/mod/common.php @@ -1,4 +1,5 @@ argv[1]; @@ -19,8 +20,8 @@ function common_content(App $a) { $cid = intval($a->argv[3]); $zcid = 0; - if (! local_user()) { - notice( t('Permission denied.') . EOL); + if (!local_user()) { + notice(t('Permission denied.') . EOL); return; } @@ -28,7 +29,7 @@ function common_content(App $a) { return; } - if (! $uid) { + if (!$uid) { return; } @@ -45,37 +46,36 @@ function common_content(App $a) { intval($uid) ); /// @TODO Handle $c with DBM::is_result() - - $vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array( + $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), array( '$name' => htmlentities($c[0]['name']), '$photo' => $c[0]['photo'], 'url' => 'contacts/' . $cid )); - if (! x($a->page,'aside')) { + if (!x($a->page, 'aside')) { $a->page['aside'] = ''; } $a->page['aside'] .= $vcard_widget; } - if (! DBM::is_result($c)) { + if (!DBM::is_result($c)) { return; } - if(! $cid) { - if(get_my_url()) { - $r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1", - dbesc(normalise_link(get_my_url())), - intval($profile_uid) + if (!$cid && get_my_url()) { + /// @todo : Initialize $profile_uid + $r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1", + dbesc(normalise_link(get_my_url())), + intval($profile_uid) + ); + if (DBM::is_result($r)) { + $cid = $r[0]['id']; + } else { + $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", + dbesc(normalise_link(get_my_url())) ); - if (DBM::is_result($r)) - $cid = $r[0]['id']; - else { - $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", - dbesc(normalise_link(get_my_url())) - ); - if (DBM::is_result($r)) - $zcid = $r[0]['id']; + if (DBM::is_result($r)) { + $zcid = $r[0]['id']; } } } @@ -90,29 +90,27 @@ function common_content(App $a) { $t = GContact::countCommonFriendsZcid($uid, $zcid); } - if (count($t)) { + if ($t > 0) { $a->set_pager_total($t); } else { notice(t('No contacts in common.') . EOL); return $o; } - if ($cid) { $r = GContact::commonFriends($uid, $cid, $a->pager['start'], $a->pager['itemspage']); } else { $r = GContact::commonFriendsZcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']); } - - if (! DBM::is_result($r)) { + if (!DBM::is_result($r)) { return $o; } $id = 0; + $entries = []; foreach ($r as $rr) { - //get further details of the contact $contact_details = Contact::getDetailsByURL($rr['url'], $uid); @@ -120,12 +118,11 @@ function common_content(App $a) { /// @TODO Adding '/" here avoids E_NOTICE on missing constants $rr['id'] = $rr['cid']; - $photo_menu = ''; $photo_menu = Contact::photoMenu($rr); $entry = array( 'url' => $rr['url'], - 'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']), + 'itemurl' => defaults($contact_details, 'addr', $rr['url']), 'name' => $contact_details['name'], 'thumb' => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB), 'img_hover' => htmlentities($contact_details['name']), @@ -140,7 +137,9 @@ function common_content(App $a) { $entries[] = $entry; } - if ($cmd === 'loc' && $cid && $uid == local_user()) { + $title = ''; + $tab_str = ''; + if ($cmd === 'loc' && $cid && local_user() == $uid) { $tab_str = contacts_tab($a, $cid, 4); } else { $title = t('Common Friends'); @@ -148,7 +147,7 @@ function common_content(App $a) { $tpl = get_markup_template('viewcontact_template.tpl'); - $o .= replace_macros($tpl,array( + $o .= replace_macros($tpl, array( '$title' => $title, '$tab_str' => $tab_str, '$contacts' => $entries, diff --git a/mod/community.php b/mod/community.php index a75a3cf7dd..1f5f848cc0 100644 --- a/mod/community.php +++ b/mod/community.php @@ -5,22 +5,24 @@ use Friendica\Core\Config; use Friendica\Core\PConfig; use Friendica\Database\DBM; -function community_init(App $a) { +function community_init(App $a) +{ if (!local_user()) { unset($_SESSION['theme']); unset($_SESSION['mobile-theme']); } } -function community_content(App $a, $update = 0) { +function community_content(App $a, $update = 0) +{ $o = ''; - if (Config::get('system','block_public') && !local_user() && !remote_user()) { + if (Config::get('system', 'block_public') && !local_user() && !remote_user()) { notice(t('Public access denied.') . EOL); return; } - $page_style = Config::get('system','community_page_style'); + $page_style = Config::get('system', 'community_page_style'); if ($a->argc > 1) { $content = $a->argv[1]; @@ -60,21 +62,25 @@ function community_content(App $a, $update = 0) { $tabs = []; if (local_user() || in_array($page_style, [CP_USERS_AND_GLOBAL, CP_USERS_ON_SERVER])) { - $tabs[] = array('label'=>t('Community'), - 'url' => 'community/local', - 'sel' => $content == 'local' ? 'active' : '', - 'title' => t('Posts from local users on this server'), - 'id' => 'community-local-tab', - 'accesskey' => 'l'); + $tabs[] = array( + 'label' => t('Community'), + 'url' => 'community/local', + 'sel' => $content == 'local' ? 'active' : '', + 'title' => t('Posts from local users on this server'), + 'id' => 'community-local-tab', + 'accesskey' => 'l' + ); } if (local_user() || in_array($page_style, [CP_USERS_AND_GLOBAL, CP_GLOBAL_COMMUNITY])) { - $tabs[] = array('label' => t('Global Timeline'), - 'url' => 'community/global', - 'sel' => $content == 'global' ? 'active' : '', - 'title' => t('Posts from users of the federated network'), - 'id' => 'community-global-tab', - 'accesskey' => 'g'); + $tabs[] = array( + 'label' => t('Global Timeline'), + 'url' => 'community/global', + 'sel' => $content == 'global' ? 'active' : '', + 'title' => t('Posts from users of the federated network'), + 'id' => 'community-global-tab', + 'accesskey' => 'g' + ); } $tab_tpl = get_markup_template('common_tabs.tpl'); @@ -87,9 +93,9 @@ function community_content(App $a, $update = 0) { // check if we serve a mobile device and get the user settings // accordingly if ($a->is_mobile) { - $itemspage_network = PConfig::get(local_user(),'system','itemspage_mobile_network', 20); + $itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_mobile_network', 20); } else { - $itemspage_network = PConfig::get(local_user(),'system','itemspage_network', 40); + $itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_network', 40); } // now that we have the user settings, see if the theme forces @@ -108,7 +114,7 @@ function community_content(App $a, $update = 0) { return $o; } - $maxpostperauthor = Config::get('system','max_author_posts_community_page'); + $maxpostperauthor = (int) Config::get('system', 'max_author_posts_community_page'); if (($maxpostperauthor != 0) && ($content == 'local')) { $count = 1; @@ -117,7 +123,7 @@ function community_content(App $a, $update = 0) { $s = array(); do { - foreach ($r AS $row=>$item) { + foreach ($r as $item) { if ($previousauthor == $item["author-link"]) { ++$numposts; } else { @@ -125,14 +131,14 @@ function community_content(App $a, $update = 0) { } $previousauthor = $item["author-link"]; - if (($numposts < $maxpostperauthor) && (sizeof($s) < $a->pager['itemspage'])) { + if (($numposts < $maxpostperauthor) && (count($s) < $a->pager['itemspage'])) { $s[] = $item; } } - if (sizeof($s) < $a->pager['itemspage']) { + if (count($s) < $a->pager['itemspage']) { $r = community_getitems($a->pager['start'] + ($count * $a->pager['itemspage']), $a->pager['itemspage'], $content); } - } while ((sizeof($s) < $a->pager['itemspage']) && (++$count < 50) && (sizeof($r) > 0)); + } while ((count($s) < $a->pager['itemspage']) && ( ++$count < 50) && (count($r) > 0)); } else { $s = $r; } @@ -152,24 +158,25 @@ function community_content(App $a, $update = 0) { )); } -function community_getitems($start, $itemspage, $content) { +function community_getitems($start, $itemspage, $content) +{ if ($content == 'local') { - $r = dba::p("SELECT ".item_fieldlists()." FROM `thread` + $r = dba::p("SELECT " . item_fieldlists() . " FROM `thread` INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall` INNER JOIN `item` ON `item`.`id` = `thread`.`iid` AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' - AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''". - item_joins()." AND `contact`.`self` + AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''" . + item_joins() . " AND `contact`.`self` WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated` AND NOT `thread`.`private` AND `thread`.`wall` - ORDER BY `thread`.`received` DESC LIMIT ".intval($start).", ".intval($itemspage) + ORDER BY `thread`.`received` DESC LIMIT " . intval($start) . ", " . intval($itemspage) ); return dba::inArray($r); } elseif ($content == 'global') { - $r = dba::p("SELECT ".item_fieldlists()." FROM `thread` - INNER JOIN `item` ON `item`.`id` = `thread`.`iid` ".item_joins(). - "WHERE `thread`.`uid` = 0 AND `verb` = ? - ORDER BY `thread`.`created` DESC LIMIT ".intval($start).", ".intval($itemspage), + $r = dba::p("SELECT " . item_fieldlists() . " FROM `thread` + INNER JOIN `item` ON `item`.`id` = `thread`.`iid` " . item_joins() . + "WHERE `thread`.`uid` = 0 AND `verb` = ? + ORDER BY `thread`.`created` DESC LIMIT " . intval($start) . ", " . intval($itemspage), ACTIVITY_POST ); return dba::inArray($r); diff --git a/mod/contactgroup.php b/mod/contactgroup.php index 96b65fd403..42aa9422fc 100644 --- a/mod/contactgroup.php +++ b/mod/contactgroup.php @@ -11,6 +11,7 @@ function contactgroup_content(App $a) killme(); } + $change = null; if (($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) { $r = q("SELECT `id` FROM `contact` WHERE `id` = %d AND `uid` = %d and `self` = 0 and `blocked` = 0 AND `pending` = 0 LIMIT 1", intval($a->argv[2]), diff --git a/src/App.php b/src/App.php index f9f4434490..cd39604789 100644 --- a/src/App.php +++ b/src/App.php @@ -60,6 +60,7 @@ class App { public $timezone; public $interactive = true; public $plugins; + public $plugins_admin = array(); public $apps = array(); public $identities; public $is_mobile = false; diff --git a/src/Core/Config.php b/src/Core/Config.php index 2515116a9b..9a270511c5 100644 --- a/src/Core/Config.php +++ b/src/Core/Config.php @@ -130,7 +130,7 @@ class Config * * @param string $family The category of the configuration value * @param string $key The configuration key to set - * @param string $value The value to store + * @param mixed $value The value to store * * @return mixed Stored $value or false if the database update failed */ diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php index aac0eeed76..c7bdeabe3d 100644 --- a/src/Database/DBStructure.php +++ b/src/Database/DBStructure.php @@ -186,13 +186,22 @@ class DBStructure { return t('Errors encountered performing database changes: ').$message.EOL; } - public static function update($verbose, $action, $tables = null, $definition = null) { + /** + * Updates DB structure and returns eventual errors messages + * + * @param bool $verbose + * @param bool $action Whether to actually apply the update + * @param array $tables An array of the database tables + * @param array $definition An array of the definition tables + * @return string Empty string if the update is successful, error messages otherwise + */ + public static function update($verbose, $action, array $tables = null, array $definition = null) { if ($action) { Config::set('system', 'maintenance', 1); Config::set('system', 'maintenance_reason', sprintf(t(': Database update'), DBM::date().' '.date('e'))); } - $errors = false; + $errors = ''; logger('updating structure', LOGGER_DEBUG); diff --git a/src/Model/GContact.php b/src/Model/GContact.php index 6c13c03b1e..830f80e921 100644 --- a/src/Model/GContact.php +++ b/src/Model/GContact.php @@ -327,8 +327,8 @@ class GContact } /** - * @param object $uid user - * @param object $cid cid + * @param integer $uid user + * @param integer $cid cid * @param integer $start optional, default 0 * @param integer $limit optional, default 9999 * @param boolean $shuffle optional, default false @@ -365,8 +365,8 @@ class GContact } /** - * @param object $uid user - * @param object $zcid zcid + * @param integer $uid user + * @param integer $zcid zcid * @param integer $start optional, default 0 * @param integer $limit optional, default 9999 * @param boolean $shuffle optional, default false @@ -397,8 +397,8 @@ class GContact } /** - * @param object $uid user - * @param object $cid cid + * @param integer $uid user + * @param integer $cid cid * @return integer */ public static function countAllFriends($uid, $cid) @@ -420,11 +420,11 @@ class GContact } /** - * @param object $uid user - * @param object $cid cid + * @param integer $uid user + * @param integer $cid cid * @param integer $start optional, default 0 * @param integer $limit optional, default 80 - * @return object + * @return array */ public static function allFriends($uid, $cid, $start = 0, $limit = 80) {