a few more fsw tweaks

This commit is contained in:
Mike Macgirvin 2010-10-26 19:01:16 -07:00
parent d453560be9
commit eb5e6aae72
11 changed files with 48 additions and 21 deletions

View file

@ -935,8 +935,12 @@ function consume_feed($xml,$importer,$contact, &$hub) {
if(! is_array($contact)) if(! is_array($contact))
return; return;
if($contact['network'] === 'stat' && strlen($datarray['title'])) if($contact['network'] === 'stat') {
if(strlen($datarray['title']))
unset($datarray['title']); unset($datarray['title']);
if(($contact['rel'] == REL_VIP) || ($contact['rel'] == REL_BUD))
$datarray['last-child'] = 1;
}
$datarray['parent-uri'] = $item_id; $datarray['parent-uri'] = $item_id;
$datarray['uid'] = $importer['uid']; $datarray['uid'] = $importer['uid'];
$datarray['contact-id'] = $contact['id']; $datarray['contact-id'] = $contact['id'];
@ -960,7 +964,7 @@ function new_follower($importer,$contact,$datarray,$item) {
if(is_array($contact)) { if(is_array($contact)) {
if($contact['network'] == 'stat' && $contact['rel'] == REL_FAN) { if($contact['network'] == 'stat' && $contact['rel'] == REL_FAN) {
$q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1", $r = q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval(REL_BUD), intval(REL_BUD),
intval($contact['id']), intval($contact['id']),
intval($importer['uid']) intval($importer['uid'])
@ -1010,7 +1014,7 @@ function new_follower($importer,$contact,$datarray,$item) {
function lose_follower($importer,$contact,$datarray,$item) { function lose_follower($importer,$contact,$datarray,$item) {
if($contact['rel'] == REL_BUD) { if(($contact['rel'] == REL_BUD) || ($contact['rel'] == REL_FAN)) {
q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d LIMIT 1", q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d LIMIT 1",
intval(REL_FAN), intval(REL_FAN),
intval($contact['id']) intval($contact['id'])

View file

@ -72,7 +72,7 @@
killme(); killme();
} }
$r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`page-flags` $r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, `user`.`page-flags`
FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid`
WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1", WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
intval($uid) intval($uid)

View file

@ -14,7 +14,6 @@
require_once('datetime.php'); require_once('datetime.php');
require_once('simplepie/simplepie.inc'); require_once('simplepie/simplepie.inc');
require_once('include/items.php'); require_once('include/items.php');
require_once('include/Contact.php'); require_once('include/Contact.php');
$debugging = get_config('system','debugging'); $debugging = get_config('system','debugging');

View file

@ -154,7 +154,7 @@ EOT;
)); ));
$a = get_app(); $a = get_app();
$return_code = trim($a->get_curl_code); $return_code = trim($a->get_curl_code());
// check for success, e.g. 2xx // check for success, e.g. 2xx
@ -177,7 +177,8 @@ EOT;
'Content-type: application/magic-envelope+xml', 'Content-type: application/magic-envelope+xml',
'Content-length: ' . strlen($salmon) 'Content-length: ' . strlen($salmon)
)); ));
$return_code = trim($a->get_curl_code); $return_code = trim($a->get_curl_code());
} }
return; return;

View file

@ -196,10 +196,11 @@ function contacts_content(&$a) {
'$last_update' => (($r[0]['last-update'] == '0000-00-00 00:00:00') '$last_update' => (($r[0]['last-update'] == '0000-00-00 00:00:00')
? t('Never') ? t('Never')
: datetime_convert('UTC',date_default_timezone_get(),$r[0]['last-update'],'D, j M Y, g:i A')), : datetime_convert('UTC',date_default_timezone_get(),$r[0]['last-update'],'D, j M Y, g:i A')),
'$profile_select' => contact_profile_assign($r[0]['profile-id']), '$profile_select' => contact_profile_assign($r[0]['profile-id'],(($r[0]['network'] !== 'dfrn') ? true : false)),
'$contact_id' => $r[0]['id'], '$contact_id' => $r[0]['id'],
'$block_text' => (($r[0]['blocked']) ? t('Unblock this contact') : t('Block this contact') ), '$block_text' => (($r[0]['blocked']) ? t('Unblock this contact') : t('Block this contact') ),
'$ignore_text' => (($r[0]['readonly']) ? t('Unignore this contact') : t('Ignore this contact') ), '$ignore_text' => (($r[0]['readonly']) ? t('Unignore this contact') : t('Ignore this contact') ),
'$insecure' => (($r[0]['network'] === 'dfrn') ? '' : load_view_file('view/insecure_net.tpl')),
'$blocked' => (($r[0]['blocked']) ? '<div id="block-message">' . t('Currently blocked') . '</div>' : ''), '$blocked' => (($r[0]['blocked']) ? '<div id="block-message">' . t('Currently blocked') . '</div>' : ''),
'$ignored' => (($r[0]['readonly']) ? '<div id="ignore-message">' . t('Currently ignored') . '</div>' : ''), '$ignored' => (($r[0]['readonly']) ? '<div id="ignore-message">' . t('Currently ignored') . '</div>' : ''),
'$rating' => contact_reputation($r[0]['rating']), '$rating' => contact_reputation($r[0]['rating']),

View file

@ -195,8 +195,8 @@ function salmon_post(&$a) {
* *
*/ */
$r = q("SELECT * FROM `contact` WHERE `network` = 'stat' AND ( `url` = '%s' OR `lrdd` = '%s') AND `uid` = %d $r = q("SELECT * FROM `contact` WHERE `network` = 'stat' AND ( `url` = '%s' OR `lrdd` = '%s')
AND `readonly` = 0 LIMIT 1", AND `uid` = %d LIMIT 1",
dbesc($author_link), dbesc($author_link),
dbesc($author_link), dbesc($author_link),
intval($importer['uid']) intval($importer['uid'])
@ -206,6 +206,13 @@ function salmon_post(&$a) {
file_put_contents('salmon.out',"\n" . 'Author unknown to us.' . "\n", FILE_APPEND); file_put_contents('salmon.out',"\n" . 'Author unknown to us.' . "\n", FILE_APPEND);
} }
if((count($r)) && ($r[0]['readonly'])) {
if($debugging)
file_put_contents('salmon.out',"\n" . 'Ignoring this author.' . "\n", FILE_APPEND);
salmon_return(200);
// NOTREACHED
}
require_once('include/items.php'); require_once('include/items.php');

View file

@ -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"; $o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" >\r\n";
$r = q("SELECT `id`, `name`, `url` FROM `contact` $r = q("SELECT `id`, `name`, `url`, `network` FROM `contact`
WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `network` = 'dfrn' WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0
$sql_extra $sql_extra
ORDER BY `name` ASC ", ORDER BY `name` ASC ",
$_SESSION['uid'] intval(local_user())
); );
if(count($r)) { if(count($r)) {
@ -62,7 +62,11 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
$selected = " selected=\"selected\" "; $selected = " selected=\"selected\" ";
else else
$selected = ''; $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";
} }
} }

View file

@ -31,6 +31,7 @@
</div> </div>
<div id="contact-edit-end" ></div> <div id="contact-edit-end" ></div>
$insecure
$blocked $blocked
$ignored $ignored

View file

@ -1,10 +1,13 @@
<?php <?php
function contact_profile_assign($current) { function contact_profile_assign($current,$foreign_net) {
$o = ''; $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", $r = q("SELECT `id`, `profile-name` FROM `profile` WHERE `uid` = %d",
intval($_SESSION['uid'])); intval($_SESSION['uid']));

View file

@ -5,5 +5,5 @@ $data
</me:data> </me:data>
<me:encoding>$encoding</me:encoding> <me:encoding>$encoding</me:encoding>
<me:alg>$algorithm</me:alg> <me:alg>$algorithm</me:alg>
<me:sig keyash="$keyhash">$signature</me:sig> <me:sig keyhash="$keyhash">$signature</me:sig>
</me:env> </me:env>

View file

@ -1288,9 +1288,8 @@ input#dfrn-url {
margin-left: 50px; margin-left: 50px;
} }
#block-message, #ignore-message { #block-message, #ignore-message, #profile-edit-insecure {
margin-top: 20px; margin-top: 20px;
width: 180px;
color: #FF0000; color: #FF0000;
font-size: 1.1em; font-size: 1.1em;
border: 1px solid #FF8888; border: 1px solid #FF8888;
@ -1298,6 +1297,14 @@ input#dfrn-url {
padding: 10px; padding: 10px;
} }
#block-message, #ignore-message {
width: 180px;
}
#profile-edit-insecure {
width: 600px;
}
.profile-tabs { .profile-tabs {
float: left; float: left;
padding: 4px; padding: 4px;