Update function calls

update function calls and remove require_once
This commit is contained in:
Adam Magness 2018-01-13 09:40:34 -05:00
parent 771163e860
commit 7635421d78
4 changed files with 14 additions and 11 deletions

View File

@ -1,5 +1,4 @@
<?php <?php
/** /**
* @file mod/cal.php * @file mod/cal.php
* @brief The calendar module * @brief The calendar module
@ -14,14 +13,14 @@ use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Protocol\DFRN;
require_once 'include/event.php'; require_once 'include/event.php';
require_once 'include/redir.php';
function cal_init(App $a) function cal_init(App $a)
{ {
if ($a->argc > 1) { if ($a->argc > 1) {
auto_redir($a, $a->argv[1]); DFRN::autoRedir($a, $a->argv[1]);
} }
if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) { if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) {

View File

@ -13,19 +13,19 @@ use Friendica\Model\Group;
use Friendica\Model\Photo; use Friendica\Model\Photo;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Object\Image; use Friendica\Object\Image;
use Friendica\Protocol\DFRN;
require_once 'include/items.php'; require_once 'include/items.php';
require_once 'include/acl_selectors.php'; require_once 'include/acl_selectors.php';
require_once 'include/bbcode.php'; require_once 'include/bbcode.php';
require_once 'include/security.php'; require_once 'include/security.php';
require_once 'include/redir.php';
require_once 'include/tags.php'; require_once 'include/tags.php';
require_once 'include/threads.php'; require_once 'include/threads.php';
function photos_init(App $a) { function photos_init(App $a) {
if ($a->argc > 1) { if ($a->argc > 1) {
auto_redir($a, $a->argv[1]); DFRN::autoRedir($a, $a->argv[1]);
} }
if (Config::get('system', 'block_public') && !local_user() && !remote_user()) { if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {

View File

@ -1,5 +1,7 @@
<?php <?php
/**
* @file mod/profile.php
*/
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
@ -7,9 +9,9 @@ use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Module\Login; use Friendica\Module\Login;
use Friendica\Protocol\DFRN;
require_once 'include/contact_widgets.php'; require_once 'include/contact_widgets.php';
require_once 'include/redir.php';
function profile_init(App $a) function profile_init(App $a)
{ {
@ -36,7 +38,7 @@ function profile_init(App $a)
$which = $a->user['nickname']; $which = $a->user['nickname'];
$profile = htmlspecialchars($a->argv[1]); $profile = htmlspecialchars($a->argv[1]);
} else { } else {
auto_redir($a, $which); DFRN::autoRedir($a, $which);
} }
profile_load($a, $which, $profile); profile_load($a, $which, $profile);

View File

@ -1,5 +1,7 @@
<?php <?php
/**
* @file mod/videos.php
*/
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
@ -7,17 +9,17 @@ use Friendica\Core\Worker;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Protocol\DFRN;
require_once 'include/items.php'; require_once 'include/items.php';
require_once 'include/acl_selectors.php'; require_once 'include/acl_selectors.php';
require_once 'include/bbcode.php'; require_once 'include/bbcode.php';
require_once 'include/security.php'; require_once 'include/security.php';
require_once 'include/redir.php';
function videos_init(App $a) { function videos_init(App $a) {
if($a->argc > 1) if($a->argc > 1)
auto_redir($a, $a->argv[1]); DFRN::autoRedir($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; return;