aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/acl_selectors.php12
-rw-r--r--view/contact_edit.tpl1
-rw-r--r--view/contact_selectors.php7
-rw-r--r--view/magicsig.tpl2
-rw-r--r--view/theme/default/style.css11
5 files changed, 24 insertions, 9 deletions
diff --git a/view/acl_selectors.php b/view/acl_selectors.php
index b5f2dcfea..32a3fff22 100644
--- a/view/acl_selectors.php
+++ b/view/acl_selectors.php
@@ -49,11 +49,11 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
$o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" >\r\n";
- $r = q("SELECT `id`, `name`, `url` FROM `contact`
- WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `network` = 'dfrn'
+ $r = q("SELECT `id`, `name`, `url`, `network` FROM `contact`
+ WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0
$sql_extra
ORDER BY `name` ASC ",
- $_SESSION['uid']
+ intval(local_user())
);
if(count($r)) {
@@ -62,7 +62,11 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
$selected = " selected=\"selected\" ";
else
$selected = '';
- $o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['url']}\" >{$rr['name']}</option>\r\n";
+ if($rr['network'] === 'stat')
+ $disabled = ' disabled="true" ' ;
+ else
+ $disabled = '';
+ $o .= "<option value=\"{$rr['id']}\" $selected $disabled title=\"{$rr['url']}\" >{$rr['name']}</option>\r\n";
}
}
diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl
index acea1da4e..96abf0028 100644
--- a/view/contact_edit.tpl
+++ b/view/contact_edit.tpl
@@ -31,6 +31,7 @@
</div>
<div id="contact-edit-end" ></div>
+$insecure
$blocked
$ignored
diff --git a/view/contact_selectors.php b/view/contact_selectors.php
index 7c7abfc7c..ac1e38e4f 100644
--- a/view/contact_selectors.php
+++ b/view/contact_selectors.php
@@ -1,10 +1,13 @@
<?php
-function contact_profile_assign($current) {
+function contact_profile_assign($current,$foreign_net) {
$o = '';
- $o .= "<select id=\"contact-profile-selector\" name=\"profile-assign\" />\r\n";
+
+ $disabled = (($foreign_net) ? ' disabled="true" ' : '');
+
+ $o .= "<select id=\"contact-profile-selector\" $disabled name=\"profile-assign\" />\r\n";
$r = q("SELECT `id`, `profile-name` FROM `profile` WHERE `uid` = %d",
intval($_SESSION['uid']));
diff --git a/view/magicsig.tpl b/view/magicsig.tpl
index 6707493ca..622e7c5a2 100644
--- a/view/magicsig.tpl
+++ b/view/magicsig.tpl
@@ -5,5 +5,5 @@ $data
</me:data>
<me:encoding>$encoding</me:encoding>
<me:alg>$algorithm</me:alg>
-<me:sig keyash="$keyhash">$signature</me:sig>
+<me:sig keyhash="$keyhash">$signature</me:sig>
</me:env>
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index 191f2d50f..17e619dea 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -1288,9 +1288,8 @@ input#dfrn-url {
margin-left: 50px;
}
-#block-message, #ignore-message {
+#block-message, #ignore-message, #profile-edit-insecure {
margin-top: 20px;
- width: 180px;
color: #FF0000;
font-size: 1.1em;
border: 1px solid #FF8888;
@@ -1298,6 +1297,14 @@ input#dfrn-url {
padding: 10px;
}
+#block-message, #ignore-message {
+ width: 180px;
+}
+
+#profile-edit-insecure {
+ width: 600px;
+}
+
.profile-tabs {
float: left;
padding: 4px;