Class file relocations

[friendica.git] / src / Network / Probe.php

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 8ea7d660aeb688dcfdc6b1268b10e8321e88126e..84a0344f32b9978faa1c09e395f88ef2267d8250 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -11,9 +11,9 @@ namespace Friendica\Network;
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 use dba;
-use dbm;
 use Cache;
 use xml;
 
@@ -309,7 +309,7 @@ class Probe {
        public static function uri($uri, $network = "", $uid = -1, $cache = true) {
 
                if ($cache) {
-                       $result = Cache::get("probe_url:".$network.":".$uri);
+                       $result = Cache::get("Probe::uri:".$network.":".$uri);
                        if (!is_null($result)) {
                                return $result;
                        }
@@ -361,7 +361,7 @@ class Probe {
 
                // Only store into the cache if the value seems to be valid
                if (!in_array($data['network'], array(NETWORK_PHANTOM, NETWORK_MAIL))) {
-                       Cache::set("probe_url:".$network.":".$uri, $data, CACHE_DAY);
+                       Cache::set("Probe::uri:".$network.":".$uri, $data, CACHE_DAY);
 
                        /// @todo temporary fix - we need a real contact update function that updates only changing fields
                        /// The biggest problem is the avatar picture that could have a reduced image size.
@@ -397,7 +397,7 @@ class Probe {
                                        }
                                }
 
-                               $fields['updated'] = dbm::date();
+                               $fields['updated'] = DBM::date();
 
                                $condition = array('nurl' => normalise_link($data["url"]));
 
@@ -420,7 +420,7 @@ class Probe {
                                                'confirm' => $data['confirm'],
                                                'poco' => $data['poco'],
                                                'network' => $data['network'],
-                                               'success_update' => dbm::date());
+                                               'success_update' => DBM::date());
 
                                $fieldnames = array();
 
@@ -1501,7 +1501,7 @@ class Probe {
 
                        $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval($uid));
 
-                       if (dbm::is_result($x) && dbm::is_result($r)) {
+                       if (DBM::is_result($x) && DBM::is_result($r)) {
                                $mailbox = construct_mailbox_name($r[0]);
                                $password = '';
                                openssl_private_decrypt(hex2bin($r[0]['pass']), $password, $x[0]['prvkey']);