GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '1.0.x' into testing

This commit is contained in:
Evan Prodromou 2011-05-31 17:16:45 -04:00
parent 412adfb587 506958f2c8
commit f4e17c1bdf
8 changed files with 69 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/mail.php
View File

@ -240,14 +240,13 @@ function mail_subscribe_notify_profile($listenee, $other)
$headers['To'] = $name . ' <' . $listenee->email . '>';
// TRANS: Subject of new-subscriber notification e-mail.
// TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
$headers['Subject'] = sprintf(_('%1$s is now listening to '.
'your notices on %2$s.'),
$headers['Subject'] = sprintf(_('%1$s is now following you on %2$s.'),
$other->getBestName(),
common_config('site', 'name'));
// TRANS: Main body of new-subscriber notification e-mail.
// TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
$body = sprintf(_('%1$s is now listening to your notices on %2$s.'),
$body = sprintf(_('%1$s is now following you on %2$s.'),
$long_name,
common_config('site', 'name')) .
mail_profile_block($other) .

64
lib/noticelistitem.php
View File

@ -229,31 +229,44 @@ class NoticeListItem extends Widget
function showAddressees()
{
$this->out->elementStart('span', 'addressees');
$ga = $this->getGroupAddressees();
$pa = $this->getProfileAddressees();
$cnt = $this->showGroupAddressees(true);
$cnt = $this->showProfileAddressees($cnt == 0);
$a = array_merge($ga, $pa);
$this->out->elementEnd('span', 'addressees');
if (!empty($a)) {
$this->out->elementStart('span', 'addressees');
$first = true;
foreach ($a as $addr) {
if (!$first) {
// TRANS: Separator in profile addressees list.
$this->out->text(_m('SEPARATOR',', '));
} else {
// TRANS: Start of profile addressees list.
$first = false;
}
$text = $addr['text'];
unset($addr['text']);
$this->out->element('a', $addr, $text);
}
$this->out->elementEnd('span', 'addressees');
}
}
function showGroupAddressees($first)
function getGroupAddressees()
{
$ga = array();
$groups = $this->getGroups();
foreach ($groups as $group) {
if (!$first) {
$this->out->text( _m('SEPARATOR',', '));
} else {
$first = false;
}
$this->out->element('a', array('href' => $group->homeUrl(),
'title' => $group->nickname,
'class' => 'addressee group'),
$group->getBestName());
$ga[] = array('href' => $group->homeUrl(),
'title' => $group->nickname,
'class' => 'addressee group',
'text' => $group->getBestName());
}
return count($groups);
return $ga;
}
function getGroups()
@ -261,25 +274,20 @@ class NoticeListItem extends Widget
return $this->notice->getGroups();
}
function showProfileAddressees($first)
function getProfileAddressees()
{
$pa = array();
$replies = $this->getReplyProfiles();
foreach ($replies as $reply) {
if (!$first) {
// TRANS: Separator in profile addressees list.
$this->out->text(_m('SEPARATOR',', '));
} else {
// TRANS: Start of profile addressees list.
$first = false;
}
$this->out->element('a', array('href' => $reply->profileurl,
'title' => $reply->nickname,
'class' => 'addressee account'),
$reply->getBestName());
$pa[] = array('href' => $reply->profileurl,
'title' => $reply->nickname,
'class' => 'addressee account',
'text' => $reply->getBestName());
}
return count($replies);
return $pa;
}
function getReplyProfiles()

31
plugins/MobileProfile/MobileProfilePlugin.php
View File

@ -49,6 +49,7 @@ class MobileProfilePlugin extends WAP20Plugin
{
public $DTD = null;
public $serveMobile = false;
public $reallyMobile = false;
public $mobileFeatures = array();
function __construct($DTD='http://www.wapforum.org/DTD/xhtml-mobile10.dtd')
@ -160,6 +161,7 @@ class MobileProfilePlugin extends WAP20Plugin
$this->setMobileFeatures($httpuseragent);
$this->serveMobile = true;
$this->reallyMobile = true;
break;
}
}
@ -201,21 +203,28 @@ class MobileProfilePlugin extends WAP20Plugin
header('Content-Type: '.$type);
$action->extraHeaders();
if (preg_match("/.*\/.*xml/", $type)) {
// Required for XML documents
$action->xw->startDocument('1.0', 'UTF-8');
}
$action->xw->writeDTD('html',
'-//WAPFORUM//DTD XHTML Mobile 1.0//EN',
$this->DTD);
if ($this->reallyMobile) {
$language = $action->getLanguage();
$action->extraHeaders();
if (preg_match("/.*\/.*xml/", $type)) {
// Required for XML documents
$action->xw->startDocument('1.0', 'UTF-8');
}
$action->xw->writeDTD('html',
'-//WAPFORUM//DTD XHTML Mobile 1.0//EN',
$this->DTD);
$action->elementStart('html', array('xmlns' => 'http://www.w3.org/1999/xhtml',
$language = $action->getLanguage();
$action->elementStart('html', array('xmlns' => 'http://www.w3.org/1999/xhtml',
'xml:lang' => $language));
return false;
return false;
} else {
return true;
}
}
function setMobileFeatures($useragent)

4
plugins/Msn/extlib/phpmsnclass/msn.class.php
View File

@ -2973,7 +2973,7 @@ X-OIM-Sequence-Num: 1
// <wsse:BinarySecurityToken Id="Compact1">t=tick&p=</wsse:BinarySecurityToken>
// <wst:BinarySecret>binary secret</wst:BinarySecret>
// RST2: messenger.msn.com
// <wsse:BinarySecurityToken Id="PPToken2">t=tick</wsse:BinarySecurityToken>
// <wsse:BinarySecurityToken Id="Compact2">t=tick</wsse:BinarySecurityToken>
// RST3: contacts.msn.com
// <wsse:BinarySecurityToken Id="Compact3">t=tick&p=</wsse:BinarySecurityToken>
// RST4: messengersecure.live.com
@ -2985,7 +2985,7 @@ X-OIM-Sequence-Num: 1
preg_match("#".
"<wsse\:BinarySecurityToken Id=\"Compact1\">(.*)</wsse\:BinarySecurityToken>(.*)".
"<wst\:BinarySecret>(.*)</wst\:BinarySecret>(.*)".
"<wsse\:BinarySecurityToken Id=\"PPToken2\">(.*)</wsse\:BinarySecurityToken>(.*)".
"<wsse\:BinarySecurityToken Id=\"Compact2\">(.*)</wsse\:BinarySecurityToken>(.*)".
"<wsse\:BinarySecurityToken Id=\"Compact3\">(.*)</wsse\:BinarySecurityToken>(.*)".
"<wsse\:BinarySecurityToken Id=\"Compact4\">(.*)</wsse\:BinarySecurityToken>(.*)".
"<wsse\:BinarySecurityToken Id=\"Compact5\">(.*)</wsse\:BinarySecurityToken>(.*)".

4
theme/base/css/display.css
View File

@ -418,10 +418,6 @@ address .poweredby {
content: '\25B8';
}
.notice .addressees:empty:before {
content: none;
}
.fn {
overflow: hidden;
}

9
theme/base/css/ie.css
View File

@ -99,12 +99,21 @@ line-height:auto;
filter: alpha(opacity=0);
}
.notice .addressees:before {
content: '\003E';
}
/* IE7 */
*+html .input_forms {
margin-bottom: -20px;
}
*+html .notice .addressees {
background: url(../images/icons/arrow_right.png) no-repeat top left;
padding-left: 16px;
}
/* IE6 */
#content {

BIN
theme/base/images/icons/arrow_right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 182 B

4
theme/neo/css/mp-screen.css
View File

@ -427,10 +427,6 @@ margin-left:0 !important;
content: '\003E';
}
.notice .addressees:empty {
display: none;
}
.user_in .notice div.entry-content {
max-width: 150px;
}