mirror of
https://github.com/friendica/friendica
synced 2024-12-22 23:20:16 +00:00
cleanup
This commit is contained in:
parent
aa3a14ec36
commit
48ffa880f0
22 changed files with 2871 additions and 2432 deletions
|
@ -214,7 +214,7 @@ function fb_get_friends($uid) {
|
|||
dbesc(($jp->nickname) ? $jp->nickname : strtolower($jp->first_name)),
|
||||
dbesc('https://graph.facebook.com/' . $jp->id . '/picture'),
|
||||
dbesc(NETWORK_FACEBOOK),
|
||||
intval(REL_BUD),
|
||||
intval(CONTACT_IS_FRIEND),
|
||||
intval(1),
|
||||
intval(1)
|
||||
);
|
||||
|
|
26
boot.php
26
boot.php
|
@ -7,9 +7,9 @@ require_once('include/text.php');
|
|||
require_once("include/pgettext.php");
|
||||
|
||||
|
||||
define ( 'FRIENDIKA_VERSION', '2.2.1063' );
|
||||
define ( 'FRIENDIKA_VERSION', '2.2.1065' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
|
||||
define ( 'DB_UPDATE_VERSION', 1077 );
|
||||
define ( 'DB_UPDATE_VERSION', 1078 );
|
||||
|
||||
define ( 'EOL', "<br />\r\n" );
|
||||
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
|
||||
|
@ -55,13 +55,12 @@ define ( 'REGISTER_OPEN', 2 );
|
|||
|
||||
/**
|
||||
* relationship types
|
||||
* When used in contact records, this indicates that 'uid' has
|
||||
* this relationship with contact['name']
|
||||
*/
|
||||
|
||||
define ( 'REL_VIP', 1); // other person is 'following' us
|
||||
define ( 'REL_FAN', 2); // we are 'following' other person
|
||||
define ( 'REL_BUD', 3); // mutual relationship
|
||||
define ( 'CONTACT_IS_FOLLOWER', 1);
|
||||
define ( 'CONTACT_IS_SHARING', 2);
|
||||
define ( 'CONTACT_IS_FRIEND', 3);
|
||||
|
||||
|
||||
/**
|
||||
* Hook array order
|
||||
|
@ -76,10 +75,10 @@ define ( 'HOOK_FUNCTION', 2);
|
|||
* page/profile types
|
||||
*
|
||||
* PAGE_NORMAL is a typical personal profile account
|
||||
* PAGE_SOAPBOX automatically approves all friend requests as REL_FAN, (readonly)
|
||||
* PAGE_COMMUNITY automatically approves all friend requests as REL_FAN, but with
|
||||
* PAGE_SOAPBOX automatically approves all friend requests as CONTACT_IS_SHARING, (readonly)
|
||||
* PAGE_COMMUNITY automatically approves all friend requests as CONTACT_IS_SHARING, but with
|
||||
* write access to wall and comments (no email and not included in page owner's ACL lists)
|
||||
* PAGE_FREELOVE automatically approves all friend requests as full friends (REL_BUD).
|
||||
* PAGE_FREELOVE automatically approves all friend requests as full friends (CONTACT_IS_FRIEND).
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -283,7 +282,12 @@ class App {
|
|||
$this->path = $path;
|
||||
}
|
||||
|
||||
set_include_path("include/$this->hostname" . PATH_SEPARATOR . 'include' . PATH_SEPARATOR . '.' );
|
||||
set_include_path(
|
||||
"include/$this->hostname" . PATH_SEPARATOR
|
||||
. 'include' . PATH_SEPARATOR
|
||||
. 'library' . PATH_SEPARATOR
|
||||
. 'library/phpsec' . PATH_SEPARATOR
|
||||
. '.' );
|
||||
|
||||
if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=")
|
||||
$this->query_string = substr($_SERVER['QUERY_STRING'],2);
|
||||
|
|
|
@ -96,7 +96,7 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
|
|||
$sql_extra = '';
|
||||
|
||||
if($x['mutual']) {
|
||||
$sql_extra .= sprintf(" AND `rel` = %d ", intval(REL_BUD));
|
||||
$sql_extra .= sprintf(" AND `rel` = %d ", intval(CONTACT_IS_FRIEND));
|
||||
}
|
||||
|
||||
if(intval($x['exclude']))
|
||||
|
@ -163,7 +163,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
|
|||
$sql_extra = '';
|
||||
|
||||
if($privmail || $celeb) {
|
||||
$sql_extra .= sprintf(" AND `rel` = %d ", intval(REL_BUD));
|
||||
$sql_extra .= sprintf(" AND `rel` = %d ", intval(CONTACT_IS_FRIEND));
|
||||
}
|
||||
|
||||
if($privmail) {
|
||||
|
|
|
@ -273,8 +273,8 @@
|
|||
WHERE `uid` = %d AND `rel` IN ( %d, %d )
|
||||
AND `self`=0 AND `blocked`=0",
|
||||
intval($uinfo[0]['uid']),
|
||||
intval(REL_FAN),
|
||||
intval(REL_BUD)
|
||||
intval(CONTACT_IS_SHARING),
|
||||
intval(CONTACT_IS_FRIEND)
|
||||
);
|
||||
$countfriends = $r[0]['count'];
|
||||
|
||||
|
@ -282,8 +282,8 @@
|
|||
WHERE `uid` = %d AND `rel` IN ( %d, %d )
|
||||
AND `self`=0 AND `blocked`=0",
|
||||
intval($uinfo[0]['uid']),
|
||||
intval(REL_VIP),
|
||||
intval(REL_BUD)
|
||||
intval(CONTACT_IS_FOLLOWER),
|
||||
intval(CONTACT_IS_FRIEND)
|
||||
);
|
||||
$countfollowers = $r[0]['count'];
|
||||
|
||||
|
@ -832,9 +832,9 @@
|
|||
return false;
|
||||
|
||||
if($qtype == 'friends')
|
||||
$sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(REL_FAN), intval(REL_BUD));
|
||||
$sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_SHARING), intval(CONTACT_IS_FRIEND));
|
||||
if($qtype == 'followers')
|
||||
$sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(REL_VIP), intval(REL_BUD));
|
||||
$sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_FOLLOWER), intval(CONTACT_IS_FRIEND));
|
||||
|
||||
|
||||
$r = q("SELECT id FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 $sql_extra",
|
||||
|
|
|
@ -37,8 +37,6 @@ function DerToRsa($Der)
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
function pkcs8_encode($Modulus,$PublicExponent) {
|
||||
//Encode key sequence
|
||||
$modulus = new ASNValue(ASNValue::TAG_INTEGER);
|
||||
|
@ -75,17 +73,6 @@ function pkcs1_encode($Modulus,$PublicExponent) {
|
|||
//Encode bit string
|
||||
$bitStringValue = $keySequence->Encode();
|
||||
return $bitStringValue;
|
||||
|
||||
// $bitStringValue = chr(0x00) . $bitStringValue; //Add unused bits byte
|
||||
// $bitString = new ASNValue(ASNValue::TAG_BITSTRING);
|
||||
// $bitString->Value = $bitStringValue;
|
||||
//Encode body
|
||||
// $bodyValue = "\x30\x0d\x06\x09\x2a\x86\x48\x86\xf7\x0d\x01\x01\x01\x05\x00" . $bitString->Encode();
|
||||
// $body = new ASNValue(ASNValue::TAG_SEQUENCE);
|
||||
// $body->Value = $bodyValue;
|
||||
//Get DER encoded public key:
|
||||
// $PublicDER = $body->Encode();
|
||||
// return $PublicDER;
|
||||
}
|
||||
|
||||
|
||||
|
@ -107,12 +94,8 @@ function pubrsatome($key,&$m,&$e) {
|
|||
|
||||
$r = ASN_BASE::parseASNString($x);
|
||||
|
||||
// print_r($r);
|
||||
|
||||
$m = base64url_decode($r[0]->asnData[0]->asnData);
|
||||
$e = base64url_decode($r[0]->asnData[1]->asnData);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -915,7 +915,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
|
|||
$postvars['dissolve'] = '1';
|
||||
|
||||
|
||||
if((($contact['rel']) && ($contact['rel'] != REL_FAN) && (! $contact['blocked'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
|
||||
if((($contact['rel']) && ($contact['rel'] != CONTACT_IS_SHARING) && (! $contact['blocked'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
|
||||
$postvars['data'] = $atom;
|
||||
$postvars['perm'] = 'rw';
|
||||
}
|
||||
|
@ -1448,9 +1448,9 @@ function new_follower($importer,$contact,$datarray,$item) {
|
|||
$nick = $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'];
|
||||
|
||||
if(is_array($contact)) {
|
||||
if($contact['network'] == 'stat' && $contact['rel'] == REL_FAN) {
|
||||
if($contact['network'] == 'stat' && $contact['rel'] == CONTACT_IS_SHARING) {
|
||||
$r = q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
intval(REL_BUD),
|
||||
intval(CONTACT_IS_FRIEND),
|
||||
intval($contact['id']),
|
||||
intval($importer['uid'])
|
||||
);
|
||||
|
@ -1472,12 +1472,12 @@ function new_follower($importer,$contact,$datarray,$item) {
|
|||
dbesc($nick),
|
||||
dbesc($photo),
|
||||
dbesc('stat'),
|
||||
intval(REL_VIP)
|
||||
intval(CONTACT_IS_FOLLOWER)
|
||||
);
|
||||
$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `pending` = 1 AND `rel` = %d LIMIT 1",
|
||||
intval($importer['uid']),
|
||||
dbesc($url),
|
||||
intval(REL_VIP)
|
||||
intval(CONTACT_IS_FOLLOWER)
|
||||
);
|
||||
if(count($r))
|
||||
$contact_record = $r[0];
|
||||
|
@ -1522,9 +1522,9 @@ function new_follower($importer,$contact,$datarray,$item) {
|
|||
|
||||
function lose_follower($importer,$contact,$datarray,$item) {
|
||||
|
||||
if(($contact['rel'] == REL_BUD) || ($contact['rel'] == REL_FAN)) {
|
||||
if(($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_SHARING)) {
|
||||
q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d LIMIT 1",
|
||||
intval(REL_FAN),
|
||||
intval(CONTACT_IS_SHARING),
|
||||
intval($contact['id'])
|
||||
);
|
||||
}
|
||||
|
|
|
@ -555,7 +555,7 @@ function notifier_run($argv, $argc){
|
|||
WHERE `network` = 'dfrn' AND `uid` = %d AND `blocked` = 0 AND `pending` = 0
|
||||
AND `rel` != %d ",
|
||||
intval($owner['uid']),
|
||||
intval(REL_FAN)
|
||||
intval(CONTACT_IS_SHARING)
|
||||
);
|
||||
|
||||
if((count($r)) && (($max_allowed == 0) || (count($r) < $max_allowed))) {
|
||||
|
|
|
@ -87,8 +87,8 @@ function poller_run($argv, $argc){
|
|||
WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
|
||||
$sql_extra
|
||||
AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()",
|
||||
intval(REL_FAN),
|
||||
intval(REL_BUD)
|
||||
intval(CONTACT_IS_SHARING),
|
||||
intval(CONTACT_IS_FRIEND)
|
||||
);
|
||||
|
||||
if(! count($contacts)) {
|
||||
|
@ -312,7 +312,7 @@ function poller_run($argv, $argc){
|
|||
// Will only do this once per notify-enabled OStatus contact
|
||||
// or if relationship changes
|
||||
|
||||
$stat_writeable = ((($contact['notify']) && ($contact['rel'] == REL_VIP || $contact['rel'] == REL_BUD)) ? 1 : 0);
|
||||
$stat_writeable = ((($contact['notify']) && ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['rel'] == CONTACT_IS_FRIEND)) ? 1 : 0);
|
||||
|
||||
if($stat_writeable != $contact['writable']) {
|
||||
q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d LIMIT 1",
|
||||
|
@ -323,7 +323,7 @@ function poller_run($argv, $argc){
|
|||
|
||||
// Are we allowed to import from this person?
|
||||
|
||||
if($contact['rel'] == REL_VIP || $contact['blocked'] || $contact['readonly'])
|
||||
if($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked'] || $contact['readonly'])
|
||||
continue;
|
||||
|
||||
$xml = fetch_url($contact['poll']);
|
||||
|
@ -463,7 +463,7 @@ function poller_run($argv, $argc){
|
|||
consume_feed($xml,$importer,$contact,$hub,1);
|
||||
|
||||
|
||||
if((strlen($hub)) && ($hub_update) && (($contact['rel'] == REL_BUD) || (($contact['network'] === NETWORK_OSTATUS) && (! $contact['readonly'])))) {
|
||||
if((strlen($hub)) && ($hub_update) && (($contact['rel'] == CONTACT_IS_FRIEND) || (($contact['network'] === NETWORK_OSTATUS) && (! $contact['readonly'])))) {
|
||||
logger('poller: subscribing to hub(s) : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
|
||||
$hubs = explode(',', $hub);
|
||||
if(count($hubs)) {
|
||||
|
|
|
@ -114,8 +114,6 @@ EOT;
|
|||
|
||||
// Setup RSA stuff to PKCS#1 sign the data
|
||||
|
||||
set_include_path(get_include_path() . PATH_SEPARATOR . 'library/phpsec');
|
||||
|
||||
require_once('library/phpsec/Crypt/RSA.php');
|
||||
|
||||
$rsa = new CRYPT_RSA();
|
||||
|
|
|
@ -28,8 +28,8 @@ function can_write_wall(&$a,$owner) {
|
|||
AND `user`.`blockwall` = 0 AND `readonly` = 0 AND ( `contact`.`rel` IN ( %d , %d ) OR `user`.`page-flags` = %d ) LIMIT 1",
|
||||
intval($owner),
|
||||
intval(remote_user()),
|
||||
intval(REL_VIP),
|
||||
intval(REL_BUD),
|
||||
intval(CONTACT_IS_FOLLOWER),
|
||||
intval(CONTACT_IS_FRIEND),
|
||||
intval(PAGE_COMMUNITY)
|
||||
);
|
||||
if(count($r)) {
|
||||
|
|
|
@ -167,6 +167,3 @@ class ASNValue
|
|||
return $result;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
?>
|
||||
|
|
|
@ -187,7 +187,6 @@ class ASN_BASE {
|
|||
return new ASN_BOOLEAN((bool)$data);
|
||||
case ASN_INTEGER:
|
||||
return new ASN_INTEGER(strtr(base64_encode($data),'+/','-_'));
|
||||
// return new ASN_INTEGER(ord($data));
|
||||
case ASN_BIT_STR:
|
||||
return new ASN_BIT_STR(self::parseASNString($data, $level+1, $maxLevels));
|
||||
case ASN_OCTET_STR:
|
||||
|
@ -290,9 +289,3 @@ class ASN_BASE {
|
|||
|
||||
}
|
||||
|
||||
|
||||
function accum($s) {
|
||||
$result = strtr(base64_encode($s),'+/=','-_,');
|
||||
return $result;
|
||||
}
|
||||
|
||||
|
|
|
@ -249,16 +249,16 @@ function contacts_content(&$a) {
|
|||
$tpl = get_markup_template("contact_edit.tpl");
|
||||
|
||||
switch($r[0]['rel']) {
|
||||
case REL_BUD:
|
||||
case CONTACT_IS_FRIEND:
|
||||
$dir_icon = 'images/lrarrow.gif';
|
||||
$alt_text = t('Mutual Friendship');
|
||||
break;
|
||||
case REL_VIP;
|
||||
case CONTACT_IS_FOLLOWER;
|
||||
$dir_icon = 'images/larrow.gif';
|
||||
$alt_text = t('is a fan of yours');
|
||||
break;
|
||||
|
||||
case REL_FAN;
|
||||
case CONTACT_IS_SHARING;
|
||||
$dir_icon = 'images/rarrow.gif';
|
||||
$alt_text = t('you are a fan of');
|
||||
break;
|
||||
|
@ -368,7 +368,7 @@ function contacts_content(&$a) {
|
|||
$search = dbesc($search.'*');
|
||||
$sql_extra .= ((strlen($search)) ? " AND MATCH `name` AGAINST ('$search' IN BOOLEAN MODE) " : "");
|
||||
|
||||
$sql_extra2 = ((($sort_type > 0) && ($sort_type <= REL_BUD)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : '');
|
||||
$sql_extra2 = ((($sort_type > 0) && ($sort_type <= CONTACT_IS_FRIEND)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : '');
|
||||
|
||||
|
||||
$r = q("SELECT COUNT(*) AS `total` FROM `contact`
|
||||
|
@ -392,15 +392,15 @@ function contacts_content(&$a) {
|
|||
continue;
|
||||
|
||||
switch($rr['rel']) {
|
||||
case REL_BUD:
|
||||
case CONTACT_IS_FRIEND:
|
||||
$dir_icon = 'images/lrarrow.gif';
|
||||
$alt_text = t('Mutual Friendship');
|
||||
break;
|
||||
case REL_VIP;
|
||||
case CONTACT_IS_FOLLOWER;
|
||||
$dir_icon = 'images/larrow.gif';
|
||||
$alt_text = t('is a fan of yours');
|
||||
break;
|
||||
case REL_FAN;
|
||||
case CONTACT_IS_SHARING;
|
||||
$dir_icon = 'images/rarrow.gif';
|
||||
$alt_text = t('you are a fan of');
|
||||
break;
|
||||
|
|
|
@ -306,11 +306,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
|||
|
||||
if($network === 'dfrn') {
|
||||
|
||||
$new_relation = REL_VIP;
|
||||
if(($relation == REL_FAN) || ($duplex))
|
||||
$new_relation = REL_BUD;
|
||||
$new_relation = CONTACT_IS_FOLLOWER;
|
||||
if(($relation == CONTACT_IS_SHARING) || ($duplex))
|
||||
$new_relation = CONTACT_IS_FRIEND;
|
||||
|
||||
if(($relation == REL_FAN) && ($duplex))
|
||||
if(($relation == CONTACT_IS_SHARING) && ($duplex))
|
||||
$duplex = 0;
|
||||
|
||||
$r = q("UPDATE `contact` SET `photo` = '%s',
|
||||
|
@ -401,7 +401,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
|||
$r = q("SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
|
||||
intval($uid)
|
||||
);
|
||||
if((count($r)) && ($r[0]['hide-friends'] == 0) && (is_array($contact)) && isset($new_relation) && ($new_relation == REL_BUD)) {
|
||||
if((count($r)) && ($r[0]['hide-friends'] == 0) && (is_array($contact)) && isset($new_relation) && ($new_relation == CONTACT_IS_FRIEND)) {
|
||||
|
||||
require_once('include/items.php');
|
||||
|
||||
|
@ -592,11 +592,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
|||
|
||||
logger('dfrn_confirm: request - photos imported');
|
||||
|
||||
$new_relation = REL_FAN;
|
||||
if(($relation == REL_VIP) || ($duplex))
|
||||
$new_relation = REL_BUD;
|
||||
$new_relation = CONTACT_IS_SHARING;
|
||||
if(($relation == CONTACT_IS_FOLLOWER) || ($duplex))
|
||||
$new_relation = CONTACT_IS_FRIEND;
|
||||
|
||||
if(($relation == REL_VIP) && ($duplex))
|
||||
if(($relation == CONTACT_IS_FOLLOWER) && ($duplex))
|
||||
$duplex = 0;
|
||||
|
||||
$r = q("UPDATE `contact` SET
|
||||
|
@ -639,7 +639,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
|||
if((count($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) {
|
||||
|
||||
push_lang($r[0]['language']);
|
||||
$tpl = (($new_relation == REL_BUD)
|
||||
$tpl = (($new_relation == CONTACT_IS_FRIEND)
|
||||
? get_intltext_template('friend_complete_eml.tpl')
|
||||
: get_intltext_template('intro_complete_eml.tpl'));
|
||||
|
||||
|
|
|
@ -309,7 +309,7 @@ function dfrn_request_post(&$a) {
|
|||
notice( t('You have already introduced yourself here.') . EOL );
|
||||
return;
|
||||
}
|
||||
elseif($ret[0]['rel'] == REL_BUD) {
|
||||
elseif($ret[0]['rel'] == CONTACT_IS_FRIEND) {
|
||||
notice( sprintf( t('Apparently you are already friends with %s.'), $a->profile['name']) . EOL);
|
||||
return;
|
||||
}
|
||||
|
@ -445,7 +445,7 @@ function dfrn_request_post(&$a) {
|
|||
*
|
||||
* OStatus network
|
||||
* Check contact existence
|
||||
* Try and scrape together enough information to create a contact record, with us as REL_VIP
|
||||
* Try and scrape together enough information to create a contact record, with us as CONTACT_IS_FOLLOWER
|
||||
* Substitute our user's feed URL into $url template
|
||||
* Send the subscriber home to subscribe
|
||||
*
|
||||
|
|
|
@ -82,9 +82,9 @@ function follow_post(&$a) {
|
|||
|
||||
if(count($r)) {
|
||||
// update contact
|
||||
if($r[0]['rel'] == REL_VIP) {
|
||||
if($r[0]['rel'] == CONTACT_IS_FOLLOWER) {
|
||||
q("UPDATE `contact` SET `rel` = %d , `readonly` = 0 WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
intval(REL_BUD),
|
||||
intval(CONTACT_IS_FRIEND),
|
||||
intval($r[0]['id']),
|
||||
intval(local_user())
|
||||
);
|
||||
|
@ -106,7 +106,7 @@ function follow_post(&$a) {
|
|||
dbesc($ret['nick']),
|
||||
dbesc($ret['photo']),
|
||||
dbesc($ret['network']),
|
||||
intval(($ret['network'] === NETWORK_MAIL) ? REL_BUD : REL_FAN),
|
||||
intval(($ret['network'] === NETWORK_MAIL) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING),
|
||||
intval($ret['priority']),
|
||||
intval($writeable)
|
||||
);
|
||||
|
|
|
@ -111,8 +111,8 @@ function pubsub_post(&$a) {
|
|||
AND ( `rel` = %d OR `rel` = %d ) AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
|
||||
intval($contact_id),
|
||||
intval($importer['uid']),
|
||||
intval(REL_FAN),
|
||||
intval(REL_BUD)
|
||||
intval(CONTACT_IS_SHARING),
|
||||
intval(CONTACT_IS_FRIEND)
|
||||
);
|
||||
|
||||
if(! count($r)) {
|
||||
|
|
|
@ -238,7 +238,7 @@ function receive_post(&$a) {
|
|||
// is this a follower? Or have we ignored the person?
|
||||
// If so we can not accept this post.
|
||||
|
||||
if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == REL_VIP) || ($r[0]['blocked']))) {
|
||||
if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
|
||||
logger('mod-diaspora: Ignoring this author.');
|
||||
receive_return(202);
|
||||
// NOTREACHED
|
||||
|
|
|
@ -134,7 +134,14 @@ function salmon_post(&$a) {
|
|||
|
||||
// Setup RSA stuff to verify the signature
|
||||
|
||||
set_include_path(get_include_path() . PATH_SEPARATOR . 'library/phpsec');
|
||||
require_once('library/phpsec/Crypt/RSA.php');
|
||||
|
||||
$rsa = new CRYPT_RSA();
|
||||
$rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1;
|
||||
$rsa->setHash('sha256');
|
||||
$rsa->loadKey($prvkey);
|
||||
|
||||
$sig = $rsa->sign($data);
|
||||
|
||||
require_once('library/phpsec/Crypt/RSA.php');
|
||||
|
||||
|
@ -194,7 +201,7 @@ function salmon_post(&$a) {
|
|||
// is this a follower? Or have we ignored the person?
|
||||
// If so we can not accept this post.
|
||||
|
||||
if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == REL_VIP) || ($r[0]['blocked']))) {
|
||||
if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
|
||||
logger('mod-salmon: Ignoring this author.');
|
||||
salmon_return(202);
|
||||
// NOTREACHED
|
||||
|
|
12
update.php
12
update.php
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
define( 'UPDATE_VERSION' , 1077 );
|
||||
define( 'UPDATE_VERSION' , 1078 );
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -626,7 +626,15 @@ function update_1075() {
|
|||
}
|
||||
|
||||
function update_1076() {
|
||||
q("CREATE TABLE ``guid` ( `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
|
||||
q("CREATE TABLE `guid` ( `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
|
||||
`guid` CHAR( 16 ) NOT NULL , INDEX ( `guid` ) ) ENGINE = MYISAM ");
|
||||
|
||||
}
|
||||
|
||||
// There was a typo in 1076 so we'll try again in 1077 to make sure
|
||||
|
||||
function update_1077() {
|
||||
q("CREATE TABLE IF NOT EXISTS `guid` ( `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
|
||||
`guid` CHAR( 16 ) NOT NULL , INDEX ( `guid` ) ) ENGINE = MYISAM ");
|
||||
|
||||
}
|
||||
|
|
2720
util/messages.po
2720
util/messages.po
File diff suppressed because it is too large
Load diff
2407
util/strings.php
2407
util/strings.php
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue