mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Fix formatting and PHP notices in events

Browse source 
- Initialized variables in include/event
- Check for argc before retrieving argv in mod/events
This commit is contained in:
Hypolite Petovan 2018-01-01 15:30:35 -05:00
parent 3069f3b59d
commit a964129085
2 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/event.php
View file

@ -13,7 +13,7 @@ use Friendica\Util\Map;
require_once 'include/bbcode.php'; require_once 'include/bbcode.php';
require_once 'include/datetime.php'; require_once 'include/datetime.php';
require_once "include/conversation.php"; require_once 'include/conversation.php';
function format_event_html($ev, $simple = false) { function format_event_html($ev, $simple = false) {
if (! ((is_array($ev)) && count($ev))) { if (! ((is_array($ev)) && count($ev))) {
@ -626,6 +626,9 @@ function process_events($arr) {
// Show edit and drop actions only if the user is the owner of the event and the event // Show edit and drop actions only if the user is the owner of the event and the event
// is a real event (no bithdays). // is a real event (no bithdays).
$edit = null;
$copy = null;
$drop = null;
if (local_user() && local_user() == $rr['uid'] && $rr['type'] == 'event') { if (local_user() && local_user() == $rr['uid'] && $rr['type'] == 'event') {
$edit = ((! $rr['cid']) ? array(System::baseUrl() . '/events/event/' . $rr['id'], t('Edit event'), '', '') : null); $edit = ((! $rr['cid']) ? array(System::baseUrl() . '/events/event/' . $rr['id'], t('Edit event'), '', '') : null);
$copy = ((! $rr['cid']) ? array(System::baseUrl() . '/events/copy/' . $rr['id'], t('Duplicate event'), '', '') : null); $copy = ((! $rr['cid']) ? array(System::baseUrl() . '/events/copy/' . $rr['id'], t('Duplicate event'), '', '') : null);

16
mod/events.php
View file

@ -20,7 +20,7 @@ function events_init(App $a) {
return; return;
} }
if ($a->argc == 1) { if ($a->argc > 1) {
// If it's a json request abort here because we don't // If it's a json request abort here because we don't
// need the widget data // need the widget data
if ($a->argv[1] === 'json') { if ($a->argv[1] === 'json') {
@ -234,6 +234,7 @@ function events_content(App $a) {
)); ));
$o = ''; $o = '';
$tabs = '';
// tabs // tabs
if ($a->theme_events_in_profile) { if ($a->theme_events_in_profile) {
$tabs = profile_tabs($a, true); $tabs = profile_tabs($a, true);
@ -309,10 +310,13 @@ function events_content(App $a) {
$start = sprintf('%d-%d-%d %d:%d:%d', $y, $m, 1, 0, 0, 0); $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); $finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59);
if ($a->argc > 1 && $a->argv[1] === 'json') {
if ($a->argv[1] === 'json') { if (x($_GET, 'start')) {
if (x($_GET, 'start')) {$start = $_GET['start'];} $start = $_GET['start'];
if (x($_GET, 'end')) {$finish = $_GET['end'];} }
if (x($_GET, 'end')) {
$finish = $_GET['end'];
}
} }
$start = datetime_convert('UTC', 'UTC', $start); $start = datetime_convert('UTC', 'UTC', $start);
@ -358,7 +362,7 @@ function events_content(App $a) {
$events = process_events($r); $events = process_events($r);
} }
if ($a->argv[1] === 'json'){ if ($a->argc > 1 && $a->argv[1] === 'json'){
echo json_encode($events); echo json_encode($events);
killme(); killme();
} }