$o .= "<select id=\"contact-profile-selector\" class=\"form-control\" $disabled name=\"profile-assign\" />\r\n";
- $r = q("SELECT `id`, `profile-name` FROM `profile` WHERE `uid` = %d",
+ $r = q("SELECT `id`, `profile-name`, `is-default` FROM `profile` WHERE `uid` = %d",
intval($_SESSION['uid']));
if (dbm::is_result($r)) {
foreach ($r as $rr) {
- $selected = (($rr['id'] == $current) ? " selected=\"selected\" " : "");
+ $selected = (($rr['id'] == $current || ($current == 0 && $rr['is-default'] == 1)) ? " selected=\"selected\" " : "");
$o .= "<option value=\"{$rr['id']}\" $selected >{$rr['profile-name']}</option>\r\n";
}
}
5 => t('Reputable, has my trust')
);
- foreach($rep as $k => $v) {
+ foreach ($rep as $k => $v) {
$selected = (($k == $current) ? " selected=\"selected\" " : "");
$o .= "<option value=\"$k\" $selected >$v</option>\r\n";
}
5 => t('Monthly')
);
- foreach($rep as $k => $v) {
+ foreach ($rep as $k => $v) {
$selected = (($k == $current) ? " selected=\"selected\" " : "");
$o .= "<option value=\"$k\" $selected >$v</option>\r\n";
}
$networkname = str_replace($search, $replace, $s);
- if ((in_array($s, array(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)));
+ WHERE `gcontact`.`nurl` = ? AND `platform` != ''", normalise_link($profile));
+
if (dbm::is_result($r)) {
- $networkname = $r[0]["platform"];
+ $networkname = $r['platform'];
}
}