X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcontact_selectors.php;h=67d05f307bebade9f07a111ae78c3a3b21a9a674;hb=c8928c4dad2429424db411c97ecdba3490f871e2;hp=48f2fb005ee542b1e8d172043ed9ec7fed886f3f;hpb=f2d51737eb0bb5edc0b70eec8a064aa67d3b1bef;p=friendica.git

diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index 48f2fb005e..67d05f307b 100644
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -1,5 +1,7 @@
 <?php
-require_once('include/diaspora.php');
+
+use Friendica\Database\DBM;
+use Friendica\Protocol\Diaspora;
 
 function contact_profile_assign($current,$foreign_net) {
 
@@ -12,7 +14,7 @@ function contact_profile_assign($current,$foreign_net) {
 	$r = q("SELECT `id`, `profile-name`, `is-default` FROM `profile` WHERE `uid` = %d",
 			intval($_SESSION['uid']));
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			$selected = (($rr['id'] == $current || ($current == 0 && $rr['is-default'] == 1)) ? " selected=\"selected\" " : "");
 			$o .= "<option value=\"{$rr['id']}\" $selected >{$rr['profile-name']}</option>\r\n";
@@ -83,7 +85,6 @@ function network_to_name($s, $profile = "") {
 		NETWORK_LINKEDIN => t('LinkedIn'),
 		NETWORK_XMPP     => t('XMPP/IM'),
 		NETWORK_MYSPACE  => t('MySpace'),
-		NETWORK_MAIL2    => t('Email'),
 		NETWORK_GPLUS    => t('Google+'),
 		NETWORK_PUMPIO   => t('pump.io'),
 		NETWORK_TWITTER  => t('Twitter'),
@@ -105,7 +106,7 @@ function network_to_name($s, $profile = "") {
 				INNER JOIN `gserver` ON `gserver`.`nurl` = `gcontact`.`server_url`
 				WHERE `gcontact`.`nurl` = ? AND `platform` != ''", normalise_link($profile));
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$networkname = $r['platform'];
 		}
 	}