eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

Browse Source
This commit is contained in:
Zach Copley 2010-02-27 00:23:34 +00:00
commit dbb9957eea
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/noticelist.php
View File

@ -541,18 +541,39 @@ class NoticeListItem extends Widget
{ {
$hasConversation = false; $hasConversation = false;
if (!empty($this->notice->conversation)) { if (!empty($this->notice->conversation)) {
$conversation = Notice::conversationStream($this->notice->conversation, 1, 1); $conversation = Notice::conversationStream(
$this->notice->conversation,
1,
1
);
if ($conversation->N > 0) { if ($conversation->N > 0) {
$hasConversation = true; $hasConversation = true;
} }
} }
if ($hasConversation) { if ($hasConversation) {
$this->out->text(' '); $conv = Conversation::staticGet(
$convurl = common_local_url('conversation', 'id',
array('id' => $this->notice->conversation)); $this->notice->conversation
$this->out->element('a', array('href' => $convurl.'#notice-'.$this->notice->id, );
'class' => 'response'), $convurl = $conv->uri;
_('in context')); if (!empty($convurl)) {
$this->out->text(' ');
$this->out->element(
'a',
array(
'href' => $convurl.'#notice-'.$this->notice->id,
'class' => 'response'),
_('in context')
);
} else {
$msg = sprintf(
"Couldn't find Conversation ID %d to make 'in context'"
. "link for Notice ID %d",
$this->notice->conversation,
$this->notice->id
);
common_log(LOG_WARNING, $msg);
}
} }
} }

10
plugins/OStatus/classes/Magicsig.php
View File

@ -181,14 +181,15 @@ class Magicsig extends Memcached_DataObject
switch ($this->alg) { switch ($this->alg) {
case 'RSA-SHA256': case 'RSA-SHA256':
return 'sha256'; return 'magicsig_sha256';
} }
} }
public function sign($bytes) public function sign($bytes)
{ {
$sig = $this->_rsa->createSign($bytes, null, 'sha256'); $hash = $this->getHash();
$sig = $this->_rsa->createSign($bytes, null, $hash);
if ($this->_rsa->isError()) { if ($this->_rsa->isError()) {
$error = $this->_rsa->getLastError(); $error = $this->_rsa->getLastError();
common_log(LOG_DEBUG, 'RSA Error: '. $error->getMessage()); common_log(LOG_DEBUG, 'RSA Error: '. $error->getMessage());
@ -200,7 +201,8 @@ class Magicsig extends Memcached_DataObject
public function verify($signed_bytes, $signature) public function verify($signed_bytes, $signature)
{ {
$result = $this->_rsa->validateSign($signed_bytes, $signature, null, 'sha256'); $hash = $this->getHash();
$result = $this->_rsa->validateSign($signed_bytes, $signature, null, $hash);
if ($this->_rsa->isError()) { if ($this->_rsa->isError()) {
$error = $this->keypair->getLastError(); $error = $this->keypair->getLastError();
common_log(LOG_DEBUG, 'RSA Error: '. $error->getMessage()); common_log(LOG_DEBUG, 'RSA Error: '. $error->getMessage());
@ -213,7 +215,7 @@ class Magicsig extends Memcached_DataObject
// Define a sha256 function for hashing // Define a sha256 function for hashing
// (Crypt_RSA should really be updated to use hash() ) // (Crypt_RSA should really be updated to use hash() )
function sha256($bytes) function magicsig_sha256($bytes)
{ {
return hash('sha256', $bytes); return hash('sha256', $bytes);
} }