added missing topics to DE FAQ

[friendica.git] / include / contact_selectors.php

diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index 7069af066409164984c824313174e8ae2f16f292..67d05f307bebade9f07a111ae78c3a3b21a9a674 100644 (file)
--- 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) {
 
@@ -7,12 +9,12 @@ function contact_profile_assign($current,$foreign_net) {
 
        $disabled = (($foreign_net) ? ' disabled="true" ' : '');
 
-       $o .= "<select id=\"contact-profile-selector\" class=\"form-control\" $disabled name=\"profile-assign\" />\r\n";
+       $o .= "<select id=\"contact-profile-selector\" class=\"form-control\" $disabled name=\"profile-assign\" >\r\n";
 
        $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'),
@@ -100,13 +101,13 @@ function network_to_name($s, $profile = "") {
 
        $networkname = str_replace($search, $replace, $s);
 
-       if ((in_array($s, array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) AND ($profile != "")) {
-               $r = q("SELECT `gserver`.`platform` FROM `gcontact`
+       if ((in_array($s, array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) && ($profile != "")) {
+               $r = dba::fetch_first("SELECT `gserver`.`platform` FROM `gcontact`
                                INNER JOIN `gserver` ON `gserver`.`nurl` = `gcontact`.`server_url`
-                               WHERE `gcontact`.`nurl` = '%s' AND `platform` != ''",
-                               dbesc(normalise_link($profile)));
-               if (dbm::is_result($r)) {
-                       $networkname = $r[0]["platform"];
+                               WHERE `gcontact`.`nurl` = ? AND `platform` != ''", normalise_link($profile));
+
+               if (DBM::is_result($r)) {
+                       $networkname = $r['platform'];
                }
        }