GNUsocial/gnu-social
4
0
Fork 1
Code Issues 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-26 22:52:49 +00:00
commit dccc995446
5 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Notice.php
View File

@ -944,6 +944,8 @@ class Notice extends Memcached_DataObject
$reply->profile_id = $user->id;
$id = $reply->insert();
self::blow('reply:stream:%d', $user->id);
}
}

20
lib/util.php
View File

@ -856,7 +856,7 @@ function common_relative_profile($sender, $nickname, $dt=null)
return null;
}
function common_local_url($action, $args=null, $params=null, $fragment=null)
function common_local_url($action, $args=null, $params=null, $fragment=null, $addSession=true)
{
$r = Router::get();
$path = $r->build($action, $args, $params, $fragment);
@ -864,12 +864,12 @@ function common_local_url($action, $args=null, $params=null, $fragment=null)
$ssl = common_is_sensitive($action);
if (common_config('site','fancy')) {
$url = common_path(mb_substr($path, 1), $ssl);
$url = common_path(mb_substr($path, 1), $ssl, $addSession);
} else {
if (mb_strpos($path, '/index.php') === 0) {
$url = common_path(mb_substr($path, 1), $ssl);
$url = common_path(mb_substr($path, 1), $ssl, $addSession);
} else {
$url = common_path('index.php'.$path, $ssl);
$url = common_path('index.php'.$path, $ssl, $addSession);
}
}
return $url;
@ -888,7 +888,7 @@ function common_is_sensitive($action)
return $ssl;
}
function common_path($relative, $ssl=false)
function common_path($relative, $ssl=false, $addSession=true)
{
$pathpart = (common_config('site', 'path')) ? common_config('site', 'path')."/" : '';
@ -912,7 +912,9 @@ function common_path($relative, $ssl=false)
}
}
if ($addSession) {
$relative = common_inject_session($relative, $serverpart);
}
return $proto.'://'.$serverpart.'/'.$pathpart.$relative;
}
@ -1134,14 +1136,15 @@ function common_broadcast_profile(Profile $profile)
function common_profile_url($nickname)
{
return common_local_url('showstream', array('nickname' => $nickname));
return common_local_url('showstream', array('nickname' => $nickname),
null, null, false);
}
// Should make up a reasonable root URL
function common_root_url($ssl=false)
{
$url = common_path('', $ssl);
$url = common_path('', $ssl, false);
$i = strpos($url, '?');
if ($i !== false) {
$url = substr($url, 0, $i);
@ -1426,7 +1429,8 @@ function common_remove_magic_from_request()
function common_user_uri(&$user)
{
return common_local_url('userbyid', array('id' => $user->id));
return common_local_url('userbyid', array('id' => $user->id),
null, null, false);
}
function common_notice_uri(&$notice)

2
plugins/OStatus/classes/HubSub.php
View File

@ -99,7 +99,7 @@ class HubSub extends Memcached_DataObject
return array_keys($this->keyTypes());
}
function sequenceKeys()
function sequenceKey()
{
return array(false, false, false);
}

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

@ -84,6 +84,10 @@ class Magicsig extends Memcached_DataObject
return array('user_id' => 'K');
}
function sequenceKey() {
return array(false, false, false);
}
function insert()
{
$this->keypair = $this->toString();

5
plugins/OStatus/lib/salmonaction.php
View File

@ -54,8 +54,9 @@ class SalmonAction extends Action
common_log(LOG_DEBUG, "Salmon signature verification failed.");
$this->clientError(_m('Salmon signature verification failed.'));
} else {
$env = MagicEnvelope::parse($xml);
$xml = MagicEnvelope::unfold($env);
$magic_env = new MagicEnvelope();
$env = $magic_env->parse($xml);
$xml = $magic_env->unfold($env);
}