Update function calls

update function calls and remove require_once

diff --git a/mod/cal.php b/mod/cal.php
index 51a66613ee107221552cfd0ebae6964f1ac386f7..dece5ac188be2ac0266730e26e787247d0d107b0 100644 (file)
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file mod/cal.php
  * @brief The calendar module
@@ -14,14 +13,14 @@ use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
+use Friendica\Protocol\DFRN;
 
 require_once 'include/event.php';
-require_once 'include/redir.php';
 
 function cal_init(App $a)
 {
        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())) {

diff --git a/mod/photos.php b/mod/photos.php
index ab0ad75013c24f03678dc2e63730f2725b1cd48a..bc8734798630d8d9ca25b86f9812e16fe9ac6b3c 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -13,19 +13,19 @@ use Friendica\Model\Group;
 use Friendica\Model\Photo;
 use Friendica\Network\Probe;
 use Friendica\Object\Image;
+use Friendica\Protocol\DFRN;
 
 require_once 'include/items.php';
 require_once 'include/acl_selectors.php';
 require_once 'include/bbcode.php';
 require_once 'include/security.php';
-require_once 'include/redir.php';
 require_once 'include/tags.php';
 require_once 'include/threads.php';
 
 function photos_init(App $a) {
 
        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()) {

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

diff --git a/mod/videos.php b/mod/videos.php
index a7759f7419eb288a0ff8a1ae498ac091bb843e54..640c2a3b5592b165a163596e4e6ba31bad8a1881 100644 (file)
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -1,5 +1,7 @@
 <?php
-
+/**
+ * @file mod/videos.php
+ */
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
@@ -7,17 +9,17 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
+use Friendica\Protocol\DFRN;
 
 require_once 'include/items.php';
 require_once 'include/acl_selectors.php';
 require_once 'include/bbcode.php';
 require_once 'include/security.php';
-require_once 'include/redir.php';
 
 function videos_init(App $a) {
 
        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())) {
                return;