Class file relocations

[friendica.git] / include / identity.php

diff --git a/include/identity.php b/include/identity.php
index 3686b23d2d312473a9ffe19cad04f100aee67184..f336891a3cb5cc1f9aead47723f37b4fb697a595 100644 (file)
--- a/include/identity.php
+++ b/include/identity.php
@@ -4,7 +4,11 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 require_once 'include/ForumManager.php';
 require_once 'include/bbcode.php';
@@ -70,12 +74,12 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
        $a->profile = $pdata;
        $a->profile_uid = $pdata['profile_uid'];
 
-       $a->profile['mobile-theme'] = get_pconfig($a->profile['profile_uid'], 'system', 'mobile_theme');
+       $a->profile['mobile-theme'] = PConfig::get($a->profile['profile_uid'], 'system', 'mobile_theme');
        $a->profile['network'] = NETWORK_DFRN;
 
        $a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
 
-               if (!$profiledata  && !get_pconfig(local_user(),'system','always_my_theme'))
+               if (!$profiledata  && !PConfig::get(local_user(),'system','always_my_theme'))
                        $_SESSION['theme'] = $a->profile['theme'];
 
        $_SESSION['mobile-theme'] = $a->profile['mobile-theme'];
@@ -101,7 +105,7 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
                ));
        }
 
-       $block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
+       $block = (((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
 
        /**
         * @todo
@@ -140,7 +144,7 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
                foreach ($_SESSION['remote'] as $visitor) {
                        if ($visitor['uid'] == $uid) {
                                $r = dba::select('contact', array('profile-id'), array('id' => $visitor['cid']), array('limit' => 1));
-                               if (dbm::is_result($r)) {
+                               if (DBM::is_result($r)) {
                                        $profile = $r['profile-id'];
                                }
                                break;
@@ -164,7 +168,7 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
                                $profile_int
                );
        }
-       if (!dbm::is_result($r)) {
+       if (!DBM::is_result($r)) {
                $r = dba::fetch_first("SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` as `contact_photo`,
                                `contact`.`thumb` AS `contact_thumb`, `contact`.`micro` AS `contact_micro`,
                                `profile`.`uid` AS `profile_uid`, `profile`.*,
@@ -300,7 +304,7 @@ function profile_sidebar($profile, $block = 0) {
                        'entries' => array(),
                );
 
-               if (dbm::is_result($r)) {
+               if (DBM::is_result($r)) {
 
                        foreach ($r as $rr) {
                                $profile['menu']['entries'][] = array(
@@ -379,7 +383,7 @@ function profile_sidebar($profile, $block = 0) {
                if (is_array($a->profile) && !$a->profile['hide-friends']) {
                        $r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
                                intval($a->profile['uid']));
-                       if (dbm::is_result($r))
+                       if (DBM::is_result($r))
                                $updated =  date("c", strtotime($r[0]['updated']));
 
                        $r = q("SELECT COUNT(*) AS `total` FROM `contact`
@@ -392,7 +396,7 @@ function profile_sidebar($profile, $block = 0) {
                                dbesc(NETWORK_DIASPORA),
                                dbesc(NETWORK_OSTATUS)
                        );
-                       if (dbm::is_result($r))
+                       if (DBM::is_result($r))
                                $contacts = intval($r[0]['total']);
                }
        }
@@ -476,12 +480,12 @@ function get_birthdays() {
                                datetime_convert('UTC','UTC','now + 6 days'),
                                datetime_convert('UTC','UTC','now')
                );
-               if (dbm::is_result($s)) {
+               if (DBM::is_result($s)) {
                        $r = dba::inArray($s);
                        Cache::set($cachekey, $r, CACHE_HOUR);
                }
        }
-       if (dbm::is_result($r)) {
+       if (DBM::is_result($r)) {
                $total = 0;
                $now = strtotime('now');
                $cids = array();
@@ -566,7 +570,7 @@ function get_events() {
 
        $r = array();
 
-       if (dbm::is_result($s)) {
+       if (DBM::is_result($s)) {
                $now = strtotime('now');
                $istoday = false;
 
@@ -888,7 +892,7 @@ function zrl_init(App $a) {
                        return;
                }
 
-               proc_run(PRIORITY_LOW, 'include/gprobe.php', $tmp_str);
+               Worker::add(PRIORITY_LOW, 'gprobe', $tmp_str);
                $arr = array('zrl' => $tmp_str, 'url' => $a->cmd);
                call_hooks('zrl_init', $arr);
        }
@@ -928,7 +932,7 @@ function zrl($s, $force = false) {
  */
 function get_theme_uid() {
        $uid = ((!empty($_REQUEST['puid'])) ? intval($_REQUEST['puid']) : 0);
-       if ((local_user()) && ((get_pconfig(local_user(), 'system', 'always_my_theme')) || (! $uid))) {
+       if ((local_user()) && ((PConfig::get(local_user(), 'system', 'always_my_theme')) || (! $uid))) {
                return local_user();
        }