bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

App::get_baseurl is now replaced with System::baseUrl

Browse source
This commit is contained in:
Michael 2017-08-26 07:32:10 +00:00
commit 5adfeb0bd5
134 changed files with 603 additions and 624 deletions
Download patch file Download diff file Expand all files Collapse all files

22
mod/events.php
View file

@ -91,7 +91,7 @@ function events_post(App $a) {
$type = 'event';
$action = ($event_id == '') ? 'new' : "event/" . $event_id;
$onerror_url = App::get_baseurl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish";
$onerror_url = System::baseUrl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish";
if (strcmp($finish, $start) < 0 && !$nofinish) {
notice(t('Event can not end before it has started.') . EOL);
@ -191,7 +191,7 @@ function events_content(App $a) {
}
if ($a->argc == 1) {
$_SESSION['return_url'] = App::get_baseurl() . '/' . $a->cmd;
$_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd;
}
if (($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) {
@ -219,7 +219,7 @@ function events_content(App $a) {
$htpl = get_markup_template('event_head.tpl');
$a->page['htmlhead'] .= replace_macros($htpl, array(
'$baseurl' => App::get_baseurl(),
'$baseurl' => System::baseUrl(),
'$module_url' => '/events',
'$modparams' => 1,
'$i18n' => $i18n,
@ -227,7 +227,7 @@ function events_content(App $a) {
$etpl = get_markup_template('event_end.tpl');
$a->page['end'] .= replace_macros($etpl, array(
'$baseurl' => App::get_baseurl(),
'$baseurl' => System::baseUrl(),
));
$o = '';
@ -338,7 +338,7 @@ function events_content(App $a) {
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)) {
$links[$j] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;
$links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j;
}
}
}
@ -373,13 +373,13 @@ function events_content(App $a) {
}
$o = replace_macros($tpl, array(
'$baseurl' => App::get_baseurl(),
'$baseurl' => System::baseUrl(),
'$tabs' => $tabs,
'$title' => t('Events'),
'$view' => t('View'),
'$new_event' => array(App::get_baseurl() . '/events/new', t('Create New Event'), '', ''),
'$previous' => array(App::get_baseurl() . '/events/$prevyear/$prevmonth', t('Previous'), '', ''),
'$next' => array(App::get_baseurl() . '/events/$nextyear/$nextmonth', t('Next'), '', ''),
'$new_event' => array(System::baseUrl() . '/events/new', t('Create New Event'), '', ''),
'$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,
@ -477,7 +477,7 @@ function events_content(App $a) {
$tpl = get_markup_template('event_form.tpl');
$o .= replace_macros($tpl,array(
'$post' => App::get_baseurl() . '/events',
'$post' => System::baseUrl() . '/events',
'$eid' => $eid,
'$cid' => $cid,
'$uri' => $uri,
@ -534,6 +534,6 @@ function events_content(App $a) {
info(t('Event removed') . EOL);
}
goaway(App::get_baseurl() . '/events');
goaway(System::baseUrl() . '/events');
}
}