Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
This commit is contained in:
commit
8e06b932af
63
EVENTS.txt
63
EVENTS.txt
@ -729,3 +729,66 @@ StartGetProfileUri: When determining the canonical URI for a given profile
|
|||||||
EndGetProfileUri: After determining the canonical URI for a given profile
|
EndGetProfileUri: After determining the canonical URI for a given profile
|
||||||
- $profile: the current profile
|
- $profile: the current profile
|
||||||
- &$uri: the URI
|
- &$uri: the URI
|
||||||
|
|
||||||
|
StartFavorNotice: Saving a notice as a favorite
|
||||||
|
- $profile: profile of the person faving (can be remote!)
|
||||||
|
- $notice: notice being faved
|
||||||
|
- &$fave: Favor object; null to start off with, but feel free to override.
|
||||||
|
|
||||||
|
EndFavorNotice: After saving a notice as a favorite
|
||||||
|
- $profile: profile of the person faving (can be remote!)
|
||||||
|
- $notice: notice being faved
|
||||||
|
|
||||||
|
StartDisfavorNotice: Saving a notice as a favorite
|
||||||
|
- $profile: profile of the person faving (can be remote!)
|
||||||
|
- $notice: notice being faved
|
||||||
|
- &$result: result of the disfavoring (if you override)
|
||||||
|
|
||||||
|
EndDisfavorNotice: After saving a notice as a favorite
|
||||||
|
- $profile: profile of the person faving (can be remote!)
|
||||||
|
- $notice: notice being faved
|
||||||
|
|
||||||
|
StartFindMentions: start finding mentions in a block of text
|
||||||
|
- $sender: sender profile
|
||||||
|
- $text: plain text version of the notice
|
||||||
|
- &$mentions: mentions found so far. Array of arrays; each array
|
||||||
|
has 'mentioned' (array of mentioned profiles), 'url' (url to link as),
|
||||||
|
'title' (title of the link), 'position' (position of the text to
|
||||||
|
replace), 'text' (text to replace)
|
||||||
|
|
||||||
|
EndFindMentions: end finding mentions in a block of text
|
||||||
|
- $sender: sender profile
|
||||||
|
- $text: plain text version of the notice
|
||||||
|
- &$mentions: mentions found so far. Array of arrays; each array
|
||||||
|
has 'mentioned' (array of mentioned profiles), 'url' (url to link as),
|
||||||
|
'title' (title of the link), 'position' (position of the text to
|
||||||
|
replace), 'text' (text to replace)
|
||||||
|
|
||||||
|
StartShowSubscriptionsContent: before showing the subscriptions content
|
||||||
|
- $action: the current action
|
||||||
|
|
||||||
|
EndShowSubscriptionsContent: after showing the subscriptions content
|
||||||
|
- $action: the current action
|
||||||
|
|
||||||
|
StartShowAllContent: before showing the all (you and friends) content
|
||||||
|
- $action: the current action
|
||||||
|
|
||||||
|
EndShowAllContent: after showing the all (you and friends) content
|
||||||
|
- $action: the current action
|
||||||
|
|
||||||
|
StartDeleteUserForm: starting the data in the form for deleting a user
|
||||||
|
- $action: action being shown
|
||||||
|
- $user: user being deleted
|
||||||
|
|
||||||
|
EndDeleteUserForm: Ending the data in the form for deleting a user
|
||||||
|
- $action: action being shown
|
||||||
|
- $user: user being deleted
|
||||||
|
|
||||||
|
StartDeleteUser: handling the post for deleting a user
|
||||||
|
- $action: action being shown
|
||||||
|
- $user: user being deleted
|
||||||
|
|
||||||
|
EndDeleteUser: handling the post for deleting a user
|
||||||
|
- $action: action being shown
|
||||||
|
- $user: user being deleted
|
||||||
|
|
||||||
|
@ -51,6 +51,7 @@ class AccessadminpanelAction extends AdminPanelAction
|
|||||||
|
|
||||||
function title()
|
function title()
|
||||||
{
|
{
|
||||||
|
// TRANS: Page title
|
||||||
return _('Access');
|
return _('Access');
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -62,6 +63,7 @@ class AccessadminpanelAction extends AdminPanelAction
|
|||||||
|
|
||||||
function getInstructions()
|
function getInstructions()
|
||||||
{
|
{
|
||||||
|
// TRANS: Page notice
|
||||||
return _('Site access settings');
|
return _('Site access settings');
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -155,24 +157,34 @@ class AccessAdminPanelForm extends AdminForm
|
|||||||
function formData()
|
function formData()
|
||||||
{
|
{
|
||||||
$this->out->elementStart('fieldset', array('id' => 'settings_admin_access'));
|
$this->out->elementStart('fieldset', array('id' => 'settings_admin_access'));
|
||||||
|
// TRANS: Form legend for registration form.
|
||||||
$this->out->element('legend', null, _('Registration'));
|
$this->out->element('legend', null, _('Registration'));
|
||||||
$this->out->elementStart('ul', 'form_data');
|
$this->out->elementStart('ul', 'form_data');
|
||||||
$this->li();
|
$this->li();
|
||||||
$this->out->checkbox('private', _('Private'),
|
// TRANS: Checkbox instructions for admin setting "Private"
|
||||||
|
$instructions = _('Prohibit anonymous users (not logged in) from viewing site?');
|
||||||
|
// TRANS: Checkbox label for prohibiting anonymous users from viewing site.
|
||||||
|
$this->out->checkbox('private', _m('LABEL', 'Private'),
|
||||||
(bool) $this->value('private'),
|
(bool) $this->value('private'),
|
||||||
_('Prohibit anonymous users (not logged in) from viewing site?'));
|
$instructions);
|
||||||
$this->unli();
|
$this->unli();
|
||||||
|
|
||||||
$this->li();
|
$this->li();
|
||||||
|
// TRANS: Checkbox instructions for admin setting "Invite only"
|
||||||
|
$instructions = _('Make registration invitation only.');
|
||||||
|
// TRANS: Checkbox label for configuring site as invite only.
|
||||||
$this->out->checkbox('inviteonly', _('Invite only'),
|
$this->out->checkbox('inviteonly', _('Invite only'),
|
||||||
(bool) $this->value('inviteonly'),
|
(bool) $this->value('inviteonly'),
|
||||||
_('Make registration invitation only.'));
|
$instructions);
|
||||||
$this->unli();
|
$this->unli();
|
||||||
|
|
||||||
$this->li();
|
$this->li();
|
||||||
|
// TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
|
||||||
|
$instructions = _('Disable new registrations.');
|
||||||
|
// TRANS: Checkbox label for disabling new user registrations.
|
||||||
$this->out->checkbox('closed', _('Closed'),
|
$this->out->checkbox('closed', _('Closed'),
|
||||||
(bool) $this->value('closed'),
|
(bool) $this->value('closed'),
|
||||||
_('Disable new registrations.'));
|
$instructions);
|
||||||
$this->unli();
|
$this->unli();
|
||||||
$this->out->elementEnd('ul');
|
$this->out->elementEnd('ul');
|
||||||
$this->out->elementEnd('fieldset');
|
$this->out->elementEnd('fieldset');
|
||||||
@ -186,7 +198,9 @@ class AccessAdminPanelForm extends AdminForm
|
|||||||
|
|
||||||
function formActions()
|
function formActions()
|
||||||
{
|
{
|
||||||
$this->out->submit('submit', _('Save'), 'submit', null, _('Save access settings'));
|
// TRANS: Title / tooltip for button to save access settings in site admin panel
|
||||||
|
$title = _('Save access settings');
|
||||||
|
$this->out->submit('submit', _m('BUTTON', 'Save'), 'submit', null, $title);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -60,6 +60,7 @@ class AllAction extends ProfileAction
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($this->page > 1 && $this->notice->N == 0) {
|
if ($this->page > 1 && $this->notice->N == 0) {
|
||||||
|
// TRANS: Server error when page not found (404)
|
||||||
$this->serverError(_('No such page'), $code = 404);
|
$this->serverError(_('No such page'), $code = 404);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -81,8 +82,10 @@ class AllAction extends ProfileAction
|
|||||||
function title()
|
function title()
|
||||||
{
|
{
|
||||||
if ($this->page > 1) {
|
if ($this->page > 1) {
|
||||||
|
// TRANS: Page title. %1$s is user nickname, %2$d is page number
|
||||||
return sprintf(_('%1$s and friends, page %2$d'), $this->user->nickname, $this->page);
|
return sprintf(_('%1$s and friends, page %2$d'), $this->user->nickname, $this->page);
|
||||||
} else {
|
} else {
|
||||||
|
// TRANS: Page title. %1$s is user nickname
|
||||||
return sprintf(_("%s and friends"), $this->user->nickname);
|
return sprintf(_("%s and friends"), $this->user->nickname);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -96,6 +99,7 @@ class AllAction extends ProfileAction
|
|||||||
'nickname' =>
|
'nickname' =>
|
||||||
$this->user->nickname)
|
$this->user->nickname)
|
||||||
),
|
),
|
||||||
|
// TRANS: %1$s is user nickname
|
||||||
sprintf(_('Feed for friends of %s (RSS 1.0)'), $this->user->nickname)),
|
sprintf(_('Feed for friends of %s (RSS 1.0)'), $this->user->nickname)),
|
||||||
new Feed(Feed::RSS2,
|
new Feed(Feed::RSS2,
|
||||||
common_local_url(
|
common_local_url(
|
||||||
@ -104,6 +108,7 @@ class AllAction extends ProfileAction
|
|||||||
'id' => $this->user->nickname
|
'id' => $this->user->nickname
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
|
// TRANS: %1$s is user nickname
|
||||||
sprintf(_('Feed for friends of %s (RSS 2.0)'), $this->user->nickname)),
|
sprintf(_('Feed for friends of %s (RSS 2.0)'), $this->user->nickname)),
|
||||||
new Feed(Feed::ATOM,
|
new Feed(Feed::ATOM,
|
||||||
common_local_url(
|
common_local_url(
|
||||||
@ -112,6 +117,7 @@ class AllAction extends ProfileAction
|
|||||||
'id' => $this->user->nickname
|
'id' => $this->user->nickname
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
|
// TRANS: %1$s is user nickname
|
||||||
sprintf(_('Feed for friends of %s (Atom)'), $this->user->nickname))
|
sprintf(_('Feed for friends of %s (Atom)'), $this->user->nickname))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -124,6 +130,7 @@ class AllAction extends ProfileAction
|
|||||||
|
|
||||||
function showEmptyListMessage()
|
function showEmptyListMessage()
|
||||||
{
|
{
|
||||||
|
// TRANS: %1$s is user nickname
|
||||||
$message = sprintf(_('This is the timeline for %s and friends but no one has posted anything yet.'), $this->user->nickname) . ' ';
|
$message = sprintf(_('This is the timeline for %s and friends but no one has posted anything yet.'), $this->user->nickname) . ' ';
|
||||||
|
|
||||||
if (common_logged_in()) {
|
if (common_logged_in()) {
|
||||||
@ -131,6 +138,7 @@ class AllAction extends ProfileAction
|
|||||||
if ($this->user->id === $current_user->id) {
|
if ($this->user->id === $current_user->id) {
|
||||||
$message .= _('Try subscribing to more people, [join a group](%%action.groups%%) or post something yourself.');
|
$message .= _('Try subscribing to more people, [join a group](%%action.groups%%) or post something yourself.');
|
||||||
} else {
|
} else {
|
||||||
|
// TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
|
||||||
$message .= sprintf(_('You can try to [nudge %1$s](../%2$s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
|
$message .= sprintf(_('You can try to [nudge %1$s](../%2$s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -144,6 +152,7 @@ class AllAction extends ProfileAction
|
|||||||
|
|
||||||
function showContent()
|
function showContent()
|
||||||
{
|
{
|
||||||
|
if (Event::handle('StartShowAllContent', array($this))) {
|
||||||
$nl = new NoticeList($this->notice, $this);
|
$nl = new NoticeList($this->notice, $this);
|
||||||
|
|
||||||
$cnt = $nl->show();
|
$cnt = $nl->show();
|
||||||
@ -156,14 +165,19 @@ class AllAction extends ProfileAction
|
|||||||
$this->page > 1, $cnt > NOTICES_PER_PAGE,
|
$this->page > 1, $cnt > NOTICES_PER_PAGE,
|
||||||
$this->page, 'all', array('nickname' => $this->user->nickname)
|
$this->page, 'all', array('nickname' => $this->user->nickname)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
Event::handle('EndShowAllContent', array($this));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function showPageTitle()
|
function showPageTitle()
|
||||||
{
|
{
|
||||||
$user = common_current_user();
|
$user = common_current_user();
|
||||||
if ($user && ($user->id == $this->user->id)) {
|
if ($user && ($user->id == $this->user->id)) {
|
||||||
|
// TRANS: H1 text
|
||||||
$this->element('h1', null, _("You and friends"));
|
$this->element('h1', null, _("You and friends"));
|
||||||
} else {
|
} else {
|
||||||
|
// TRANS: H1 text. %1$s is user nickname
|
||||||
$this->element('h1', null, sprintf(_('%s and friends'), $this->user->nickname));
|
$this->element('h1', null, sprintf(_('%s and friends'), $this->user->nickname));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -79,7 +79,7 @@ class ApiDirectMessageAction extends ApiAuthAction
|
|||||||
}
|
}
|
||||||
|
|
||||||
$server = common_root_url();
|
$server = common_root_url();
|
||||||
$taguribase = common_config('integration', 'taguri');
|
$taguribase = TagURI::base();
|
||||||
|
|
||||||
if ($this->arg('sent')) {
|
if ($this->arg('sent')) {
|
||||||
|
|
||||||
@ -182,11 +182,6 @@ class ApiDirectMessageAction extends ApiAuthAction
|
|||||||
$message->whereAdd('id > ' . $this->since_id);
|
$message->whereAdd('id > ' . $this->since_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($since)) {
|
|
||||||
$d = date('Y-m-d H:i:s', $this->since);
|
|
||||||
$message->whereAdd("created > '$d'");
|
|
||||||
}
|
|
||||||
|
|
||||||
$message->orderBy('created DESC, id DESC');
|
$message->orderBy('created DESC, id DESC');
|
||||||
$message->limit((($this->page - 1) * $this->count), $this->count);
|
$message->limit((($this->page - 1) * $this->count), $this->count);
|
||||||
$message->find();
|
$message->find();
|
||||||
|
@ -124,12 +124,9 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$result = subs_unsubscribe_user($this->user, $this->other->nickname);
|
// throws an exception on error
|
||||||
|
Subscription::cancel($this->user->getProfile(),
|
||||||
if (is_string($result)) {
|
$this->other->getProfile());
|
||||||
$this->clientError($result, 403, $this->format);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->initDocument($this->format);
|
$this->initDocument($this->format);
|
||||||
$this->showProfile($this->other, $this->format);
|
$this->showProfile($this->other, $this->format);
|
||||||
|
@ -123,7 +123,9 @@ class ApiGroupCreateAction extends ApiAuthAction
|
|||||||
'description' => $this->description,
|
'description' => $this->description,
|
||||||
'location' => $this->location,
|
'location' => $this->location,
|
||||||
'aliases' => $this->aliases,
|
'aliases' => $this->aliases,
|
||||||
'userid' => $this->user->id));
|
'userid' => $this->user->id,
|
||||||
|
'local' => true));
|
||||||
|
|
||||||
switch($this->format) {
|
switch($this->format) {
|
||||||
case 'xml':
|
case 'xml':
|
||||||
$this->showSingleXmlGroup($group);
|
$this->showSingleXmlGroup($group);
|
||||||
@ -306,9 +308,9 @@ class ApiGroupCreateAction extends ApiAuthAction
|
|||||||
|
|
||||||
function groupNicknameExists($nickname)
|
function groupNicknameExists($nickname)
|
||||||
{
|
{
|
||||||
$group = User_group::staticGet('nickname', $nickname);
|
$local = Local_group::staticGet('nickname', $nickname);
|
||||||
|
|
||||||
if (!empty($group)) {
|
if (!empty($local)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -93,7 +93,7 @@ class ApiGroupListAction extends ApiBareAuthAction
|
|||||||
|
|
||||||
$sitename = common_config('site', 'name');
|
$sitename = common_config('site', 'name');
|
||||||
$title = sprintf(_("%s's groups"), $this->user->nickname);
|
$title = sprintf(_("%s's groups"), $this->user->nickname);
|
||||||
$taguribase = common_config('integration', 'taguri');
|
$taguribase = TagURI::base();
|
||||||
$id = "tag:$taguribase:Groups";
|
$id = "tag:$taguribase:Groups";
|
||||||
$link = common_local_url(
|
$link = common_local_url(
|
||||||
'usergroups',
|
'usergroups',
|
||||||
@ -152,8 +152,7 @@ class ApiGroupListAction extends ApiBareAuthAction
|
|||||||
($this->page - 1) * $this->count,
|
($this->page - 1) * $this->count,
|
||||||
$this->count,
|
$this->count,
|
||||||
$this->since_id,
|
$this->since_id,
|
||||||
$this->max_id,
|
$this->max_id
|
||||||
$this->since
|
|
||||||
);
|
);
|
||||||
|
|
||||||
while ($group->fetch()) {
|
while ($group->fetch()) {
|
||||||
|
@ -88,7 +88,7 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction
|
|||||||
|
|
||||||
$sitename = common_config('site', 'name');
|
$sitename = common_config('site', 'name');
|
||||||
$title = sprintf(_("%s groups"), $sitename);
|
$title = sprintf(_("%s groups"), $sitename);
|
||||||
$taguribase = common_config('integration', 'taguri');
|
$taguribase = TagURI::base();
|
||||||
$id = "tag:$taguribase:Groups";
|
$id = "tag:$taguribase:Groups";
|
||||||
$link = common_local_url('groups');
|
$link = common_local_url('groups');
|
||||||
$subtitle = sprintf(_("groups on %s"), $sitename);
|
$subtitle = sprintf(_("groups on %s"), $sitename);
|
||||||
@ -134,13 +134,13 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction
|
|||||||
|
|
||||||
function getGroups()
|
function getGroups()
|
||||||
{
|
{
|
||||||
$groups = array();
|
$qry = 'SELECT user_group.* '.
|
||||||
|
'from user_group join local_group on user_group.id = local_group.group_id '.
|
||||||
// XXX: Use the $page, $count, $max_id, $since_id, and $since parameters
|
'order by created desc ';
|
||||||
|
|
||||||
$group = new User_group();
|
$group = new User_group();
|
||||||
$group->orderBy('created DESC');
|
|
||||||
$group->find();
|
$group->query($qry);
|
||||||
|
|
||||||
while ($group->fetch()) {
|
while ($group->fetch()) {
|
||||||
$groups[] = clone($group);
|
$groups[] = clone($group);
|
||||||
|
@ -125,8 +125,7 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction
|
|||||||
($this->page - 1) * $this->count,
|
($this->page - 1) * $this->count,
|
||||||
$this->count,
|
$this->count,
|
||||||
$this->since_id,
|
$this->since_id,
|
||||||
$this->max_id,
|
$this->max_id
|
||||||
$this->since
|
|
||||||
);
|
);
|
||||||
|
|
||||||
while ($profile->fetch()) {
|
while ($profile->fetch()) {
|
||||||
|
@ -32,8 +32,6 @@ if (!defined('STATUSNET')) {
|
|||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
require_once INSTALLDIR . '/lib/api.php';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gives a full dump of configuration variables for this instance
|
* Gives a full dump of configuration variables for this instance
|
||||||
* of StatusNet, minus variables that may be security-sensitive (like
|
* of StatusNet, minus variables that may be security-sensitive (like
|
||||||
|
@ -110,7 +110,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
|
|||||||
$this->user->nickname
|
$this->user->nickname
|
||||||
);
|
);
|
||||||
|
|
||||||
$taguribase = common_config('integration', 'taguri');
|
$taguribase = TagURI::base();
|
||||||
$id = "tag:$taguribase:Favorites:" . $this->user->id;
|
$id = "tag:$taguribase:Favorites:" . $this->user->id;
|
||||||
|
|
||||||
$subtitle = sprintf(
|
$subtitle = sprintf(
|
||||||
|
@ -112,7 +112,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
|
|||||||
$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
|
$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
|
||||||
$sitename = common_config('site', 'name');
|
$sitename = common_config('site', 'name');
|
||||||
$title = sprintf(_("%s and friends"), $this->user->nickname);
|
$title = sprintf(_("%s and friends"), $this->user->nickname);
|
||||||
$taguribase = common_config('integration', 'taguri');
|
$taguribase = TagURI::base();
|
||||||
$id = "tag:$taguribase:FriendsTimeline:" . $this->user->id;
|
$id = "tag:$taguribase:FriendsTimeline:" . $this->user->id;
|
||||||
|
|
||||||
$subtitle = sprintf(
|
$subtitle = sprintf(
|
||||||
@ -202,11 +202,11 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
|
|||||||
if (!empty($this->auth_user) && $this->auth_user->id == $this->user->id) {
|
if (!empty($this->auth_user) && $this->auth_user->id == $this->user->id) {
|
||||||
$notice = $this->user->ownFriendsTimeline(($this->page-1) * $this->count,
|
$notice = $this->user->ownFriendsTimeline(($this->page-1) * $this->count,
|
||||||
$this->count, $this->since_id,
|
$this->count, $this->since_id,
|
||||||
$this->max_id, $this->since);
|
$this->max_id);
|
||||||
} else {
|
} else {
|
||||||
$notice = $this->user->friendsTimeline(($this->page-1) * $this->count,
|
$notice = $this->user->friendsTimeline(($this->page-1) * $this->count,
|
||||||
$this->count, $this->since_id,
|
$this->count, $this->since_id,
|
||||||
$this->max_id, $this->since);
|
$this->max_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
while ($notice->fetch()) {
|
while ($notice->fetch()) {
|
||||||
|
@ -107,8 +107,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
|
|||||||
$sitename = common_config('site', 'name');
|
$sitename = common_config('site', 'name');
|
||||||
$avatar = $this->group->homepage_logo;
|
$avatar = $this->group->homepage_logo;
|
||||||
$title = sprintf(_("%s timeline"), $this->group->nickname);
|
$title = sprintf(_("%s timeline"), $this->group->nickname);
|
||||||
$taguribase = common_config('integration', 'taguri');
|
|
||||||
$id = "tag:$taguribase:GroupTimeline:" . $this->group->id;
|
|
||||||
|
|
||||||
$subtitle = sprintf(
|
$subtitle = sprintf(
|
||||||
_('Updates from %1$s on %2$s!'),
|
_('Updates from %1$s on %2$s!'),
|
||||||
@ -138,19 +136,9 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
||||||
// If this was called using an integer ID, i.e.: using the canonical
|
|
||||||
// URL for this group's feed, then pass the Group object into the feed,
|
|
||||||
// so the OStatus plugin, and possibly other plugins, can access it.
|
|
||||||
// Feels sorta hacky. -- Z
|
|
||||||
|
|
||||||
$atom = null;
|
|
||||||
$id = $this->arg('id');
|
|
||||||
|
|
||||||
if (strval(intval($id)) === strval($id)) {
|
|
||||||
$atom = new AtomGroupNoticeFeed($this->group);
|
$atom = new AtomGroupNoticeFeed($this->group);
|
||||||
} else {
|
|
||||||
$atom = new AtomGroupNoticeFeed();
|
// @todo set all this Atom junk up inside the feed class
|
||||||
}
|
|
||||||
|
|
||||||
$atom->setId($id);
|
$atom->setId($id);
|
||||||
$atom->setTitle($title);
|
$atom->setTitle($title);
|
||||||
@ -169,6 +157,8 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
|
|||||||
$aargs['id'] = $id;
|
$aargs['id'] = $id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$atom->setId($this->getSelfUri('ApiTimelineGroup', $aargs));
|
||||||
|
|
||||||
$atom->addLink(
|
$atom->addLink(
|
||||||
$this->getSelfUri('ApiTimelineGroup', $aargs),
|
$this->getSelfUri('ApiTimelineGroup', $aargs),
|
||||||
array('rel' => 'self', 'type' => 'application/atom+xml')
|
array('rel' => 'self', 'type' => 'application/atom+xml')
|
||||||
@ -176,7 +166,8 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
|
|||||||
|
|
||||||
$atom->addEntryFromNotices($this->notices);
|
$atom->addEntryFromNotices($this->notices);
|
||||||
|
|
||||||
$this->raw($atom->getString());
|
//$this->raw($atom->getString());
|
||||||
|
print $atom->getString(); // temp hack until PuSH feeds are redone cleanly
|
||||||
|
|
||||||
} catch (Atom10FeedException $e) {
|
} catch (Atom10FeedException $e) {
|
||||||
$this->serverError(
|
$this->serverError(
|
||||||
@ -213,8 +204,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
|
|||||||
($this->page-1) * $this->count,
|
($this->page-1) * $this->count,
|
||||||
$this->count,
|
$this->count,
|
||||||
$this->since_id,
|
$this->since_id,
|
||||||
$this->max_id,
|
$this->max_id
|
||||||
$this->since
|
|
||||||
);
|
);
|
||||||
|
|
||||||
while ($notice->fetch()) {
|
while ($notice->fetch()) {
|
||||||
|
@ -113,7 +113,7 @@ class ApiTimelineHomeAction extends ApiBareAuthAction
|
|||||||
$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
|
$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
|
||||||
$sitename = common_config('site', 'name');
|
$sitename = common_config('site', 'name');
|
||||||
$title = sprintf(_("%s and friends"), $this->user->nickname);
|
$title = sprintf(_("%s and friends"), $this->user->nickname);
|
||||||
$taguribase = common_config('integration', 'taguri');
|
$taguribase = TagURI::base();
|
||||||
$id = "tag:$taguribase:HomeTimeline:" . $this->user->id;
|
$id = "tag:$taguribase:HomeTimeline:" . $this->user->id;
|
||||||
|
|
||||||
$subtitle = sprintf(
|
$subtitle = sprintf(
|
||||||
@ -200,13 +200,13 @@ class ApiTimelineHomeAction extends ApiBareAuthAction
|
|||||||
$notice = $this->user->noticeInbox(
|
$notice = $this->user->noticeInbox(
|
||||||
($this->page-1) * $this->count,
|
($this->page-1) * $this->count,
|
||||||
$this->count, $this->since_id,
|
$this->count, $this->since_id,
|
||||||
$this->max_id, $this->since
|
$this->max_id
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
$notice = $this->user->noticesWithFriends(
|
$notice = $this->user->noticesWithFriends(
|
||||||
($this->page-1) * $this->count,
|
($this->page-1) * $this->count,
|
||||||
$this->count, $this->since_id,
|
$this->count, $this->since_id,
|
||||||
$this->max_id, $this->since
|
$this->max_id
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -117,7 +117,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
|
|||||||
_('%1$s / Updates mentioning %2$s'),
|
_('%1$s / Updates mentioning %2$s'),
|
||||||
$sitename, $this->user->nickname
|
$sitename, $this->user->nickname
|
||||||
);
|
);
|
||||||
$taguribase = common_config('integration', 'taguri');
|
$taguribase = TagURI::base();
|
||||||
$id = "tag:$taguribase:Mentions:" . $this->user->id;
|
$id = "tag:$taguribase:Mentions:" . $this->user->id;
|
||||||
$link = common_local_url(
|
$link = common_local_url(
|
||||||
'replies',
|
'replies',
|
||||||
@ -189,7 +189,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
|
|||||||
|
|
||||||
$notice = $this->user->getReplies(
|
$notice = $this->user->getReplies(
|
||||||
($this->page - 1) * $this->count, $this->count,
|
($this->page - 1) * $this->count, $this->count,
|
||||||
$this->since_id, $this->max_id, $this->since
|
$this->since_id, $this->max_id
|
||||||
);
|
);
|
||||||
|
|
||||||
while ($notice->fetch()) {
|
while ($notice->fetch()) {
|
||||||
|
@ -75,10 +75,6 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction
|
|||||||
|
|
||||||
$this->notices = $this->getNotices();
|
$this->notices = $this->getNotices();
|
||||||
|
|
||||||
if ($this->since) {
|
|
||||||
throw new ServerException("since parameter is disabled for performance; use since_id", 403);
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -109,7 +105,7 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction
|
|||||||
$sitename = common_config('site', 'name');
|
$sitename = common_config('site', 'name');
|
||||||
$sitelogo = (common_config('site', 'logo')) ? common_config('site', 'logo') : Theme::path('logo.png');
|
$sitelogo = (common_config('site', 'logo')) ? common_config('site', 'logo') : Theme::path('logo.png');
|
||||||
$title = sprintf(_("%s public timeline"), $sitename);
|
$title = sprintf(_("%s public timeline"), $sitename);
|
||||||
$taguribase = common_config('integration', 'taguri');
|
$taguribase = TagURI::base();
|
||||||
$id = "tag:$taguribase:PublicTimeline";
|
$id = "tag:$taguribase:PublicTimeline";
|
||||||
$link = common_root_url();
|
$link = common_root_url();
|
||||||
$subtitle = sprintf(_("%s updates from everyone!"), $sitename);
|
$subtitle = sprintf(_("%s updates from everyone!"), $sitename);
|
||||||
|
@ -109,7 +109,7 @@ class ApiTimelineRetweetedToMeAction extends ApiAuthAction
|
|||||||
$profile = $this->auth_user->getProfile();
|
$profile = $this->auth_user->getProfile();
|
||||||
|
|
||||||
$title = sprintf(_("Repeated to %s"), $this->auth_user->nickname);
|
$title = sprintf(_("Repeated to %s"), $this->auth_user->nickname);
|
||||||
$taguribase = common_config('integration', 'taguri');
|
$taguribase = TagURI::base();
|
||||||
$id = "tag:$taguribase:RepeatedToMe:" . $this->auth_user->id;
|
$id = "tag:$taguribase:RepeatedToMe:" . $this->auth_user->id;
|
||||||
$link = common_local_url('all',
|
$link = common_local_url('all',
|
||||||
array('nickname' => $this->auth_user->nickname));
|
array('nickname' => $this->auth_user->nickname));
|
||||||
|
@ -112,7 +112,7 @@ class ApiTimelineRetweetsOfMeAction extends ApiAuthAction
|
|||||||
$profile = $this->auth_user->getProfile();
|
$profile = $this->auth_user->getProfile();
|
||||||
|
|
||||||
$title = sprintf(_("Repeats of %s"), $this->auth_user->nickname);
|
$title = sprintf(_("Repeats of %s"), $this->auth_user->nickname);
|
||||||
$taguribase = common_config('integration', 'taguri');
|
$taguribase = TagURI::base();
|
||||||
$id = "tag:$taguribase:RepeatsOfMe:" . $this->auth_user->id;
|
$id = "tag:$taguribase:RepeatsOfMe:" . $this->auth_user->id;
|
||||||
|
|
||||||
header('Content-Type: application/atom+xml; charset=utf-8');
|
header('Content-Type: application/atom+xml; charset=utf-8');
|
||||||
|
@ -105,7 +105,7 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction
|
|||||||
$this->tag,
|
$this->tag,
|
||||||
$sitename
|
$sitename
|
||||||
);
|
);
|
||||||
$taguribase = common_config('integration', 'taguri');
|
$taguribase = TagURI::base();
|
||||||
$id = "tag:$taguribase:TagTimeline:".$tag;
|
$id = "tag:$taguribase:TagTimeline:".$tag;
|
||||||
|
|
||||||
switch($this->format) {
|
switch($this->format) {
|
||||||
|
@ -116,8 +116,6 @@ class ApiTimelineUserAction extends ApiBareAuthAction
|
|||||||
|
|
||||||
$sitename = common_config('site', 'name');
|
$sitename = common_config('site', 'name');
|
||||||
$title = sprintf(_("%s timeline"), $this->user->nickname);
|
$title = sprintf(_("%s timeline"), $this->user->nickname);
|
||||||
$taguribase = common_config('integration', 'taguri');
|
|
||||||
$id = "tag:$taguribase:UserTimeline:" . $this->user->id;
|
|
||||||
$link = common_local_url(
|
$link = common_local_url(
|
||||||
'showstream',
|
'showstream',
|
||||||
array('nickname' => $this->user->nickname)
|
array('nickname' => $this->user->nickname)
|
||||||
@ -148,21 +146,10 @@ class ApiTimelineUserAction extends ApiBareAuthAction
|
|||||||
|
|
||||||
header('Content-Type: application/atom+xml; charset=utf-8');
|
header('Content-Type: application/atom+xml; charset=utf-8');
|
||||||
|
|
||||||
// If this was called using an integer ID, i.e.: using the canonical
|
// @todo set all this Atom junk up inside the feed class
|
||||||
// URL for this user's feed, then pass the User object into the feed,
|
|
||||||
// so the OStatus plugin, and possibly other plugins, can access it.
|
|
||||||
// Feels sorta hacky. -- Z
|
|
||||||
|
|
||||||
$atom = null;
|
|
||||||
$id = $this->arg('id');
|
|
||||||
|
|
||||||
if (strval(intval($id)) === strval($id)) {
|
|
||||||
$atom = new AtomUserNoticeFeed($this->user);
|
$atom = new AtomUserNoticeFeed($this->user);
|
||||||
} else {
|
|
||||||
$atom = new AtomUserNoticeFeed();
|
|
||||||
}
|
|
||||||
|
|
||||||
$atom->setId($id);
|
|
||||||
$atom->setTitle($title);
|
$atom->setTitle($title);
|
||||||
$atom->setSubtitle($subtitle);
|
$atom->setSubtitle($subtitle);
|
||||||
$atom->setLogo($logo);
|
$atom->setLogo($logo);
|
||||||
@ -181,6 +168,8 @@ class ApiTimelineUserAction extends ApiBareAuthAction
|
|||||||
$aargs['id'] = $id;
|
$aargs['id'] = $id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$atom->setId($this->getSelfUri('ApiTimelineUser', $aargs));
|
||||||
|
|
||||||
$atom->addLink(
|
$atom->addLink(
|
||||||
$this->getSelfUri('ApiTimelineUser', $aargs),
|
$this->getSelfUri('ApiTimelineUser', $aargs),
|
||||||
array('rel' => 'self', 'type' => 'application/atom+xml')
|
array('rel' => 'self', 'type' => 'application/atom+xml')
|
||||||
@ -222,7 +211,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
|
|||||||
|
|
||||||
$notice = $this->user->getNotices(
|
$notice = $this->user->getNotices(
|
||||||
($this->page-1) * $this->count, $this->count,
|
($this->page-1) * $this->count, $this->count,
|
||||||
$this->since_id, $this->max_id, $this->since
|
$this->since_id, $this->max_id
|
||||||
);
|
);
|
||||||
|
|
||||||
while ($notice->fetch()) {
|
while ($notice->fetch()) {
|
||||||
|
@ -74,7 +74,14 @@ class BlockedfromgroupAction extends GroupDesignAction
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->group = User_group::staticGet('nickname', $nickname);
|
$local = Local_group::staticGet('nickname', $nickname);
|
||||||
|
|
||||||
|
if (!$local) {
|
||||||
|
$this->clientError(_('No such group.'), 404);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->group = User_group::staticGet('id', $local->group_id);
|
||||||
|
|
||||||
if (!$this->group) {
|
if (!$this->group) {
|
||||||
$this->clientError(_('No such group.'), 404);
|
$this->clientError(_('No such group.'), 404);
|
||||||
|
@ -131,6 +131,7 @@ class DeleteuserAction extends ProfileFormAction
|
|||||||
$this->elementStart('fieldset');
|
$this->elementStart('fieldset');
|
||||||
$this->hidden('token', common_session_token());
|
$this->hidden('token', common_session_token());
|
||||||
$this->element('legend', _('Delete user'));
|
$this->element('legend', _('Delete user'));
|
||||||
|
if (Event::handle('StartDeleteUserForm', array($this, $this->user))) {
|
||||||
$this->element('p', null,
|
$this->element('p', null,
|
||||||
_('Are you sure you want to delete this user? '.
|
_('Are you sure you want to delete this user? '.
|
||||||
'This will clear all data about the user from the '.
|
'This will clear all data about the user from the '.
|
||||||
@ -144,6 +145,8 @@ class DeleteuserAction extends ProfileFormAction
|
|||||||
$this->hidden($k, $v);
|
$this->hidden($k, $v);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Event::handle('EndDeleteUserForm', array($this, $this->user));
|
||||||
|
}
|
||||||
$this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not block this user"));
|
$this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not block this user"));
|
||||||
$this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Delete this user'));
|
$this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Delete this user'));
|
||||||
$this->elementEnd('fieldset');
|
$this->elementEnd('fieldset');
|
||||||
@ -158,7 +161,9 @@ class DeleteuserAction extends ProfileFormAction
|
|||||||
|
|
||||||
function handlePost()
|
function handlePost()
|
||||||
{
|
{
|
||||||
|
if (Event::handle('StartDeleteUser', array($this, $this->user))) {
|
||||||
$this->user->delete();
|
$this->user->delete();
|
||||||
|
Event::handle('EndDeleteUser', array($this, $this->user));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -173,6 +173,10 @@ class DocAction extends Action
|
|||||||
}
|
}
|
||||||
|
|
||||||
$local = glob(INSTALLDIR.'/local/doc-src/'.$this->title.'.*');
|
$local = glob(INSTALLDIR.'/local/doc-src/'.$this->title.'.*');
|
||||||
|
if ($local === false) {
|
||||||
|
// Some systems return false, others array(), if dir didn't exist.
|
||||||
|
$local = array();
|
||||||
|
}
|
||||||
|
|
||||||
if (count($local) || isset($localDef)) {
|
if (count($local) || isset($localDef)) {
|
||||||
return $this->negotiateLanguage($local, $localDef);
|
return $this->negotiateLanguage($local, $localDef);
|
||||||
@ -183,6 +187,9 @@ class DocAction extends Action
|
|||||||
}
|
}
|
||||||
|
|
||||||
$dist = glob(INSTALLDIR.'/doc-src/'.$this->title.'.*');
|
$dist = glob(INSTALLDIR.'/doc-src/'.$this->title.'.*');
|
||||||
|
if ($dist === false) {
|
||||||
|
$dist = array();
|
||||||
|
}
|
||||||
|
|
||||||
if (count($dist) || isset($distDef)) {
|
if (count($dist) || isset($distDef)) {
|
||||||
return $this->negotiateLanguage($dist, $distDef);
|
return $this->negotiateLanguage($dist, $distDef);
|
||||||
|
@ -86,10 +86,14 @@ class EditgroupAction extends GroupDesignAction
|
|||||||
}
|
}
|
||||||
|
|
||||||
$groupid = $this->trimmed('groupid');
|
$groupid = $this->trimmed('groupid');
|
||||||
|
|
||||||
if ($groupid) {
|
if ($groupid) {
|
||||||
$this->group = User_group::staticGet('id', $groupid);
|
$this->group = User_group::staticGet('id', $groupid);
|
||||||
} else {
|
} else {
|
||||||
$this->group = User_group::staticGet('nickname', $nickname);
|
$local = Local_group::staticGet('nickname', $nickname);
|
||||||
|
if ($local) {
|
||||||
|
$this->group = User_group::staticGet('id', $local->group_id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$this->group) {
|
if (!$this->group) {
|
||||||
@ -245,6 +249,7 @@ class EditgroupAction extends GroupDesignAction
|
|||||||
$this->group->homepage = $homepage;
|
$this->group->homepage = $homepage;
|
||||||
$this->group->description = $description;
|
$this->group->description = $description;
|
||||||
$this->group->location = $location;
|
$this->group->location = $location;
|
||||||
|
$this->group->mainpage = common_local_url('showgroup', array('nickname' => $nickname));
|
||||||
|
|
||||||
$result = $this->group->update($orig);
|
$result = $this->group->update($orig);
|
||||||
|
|
||||||
@ -259,6 +264,12 @@ class EditgroupAction extends GroupDesignAction
|
|||||||
$this->serverError(_('Could not create aliases.'));
|
$this->serverError(_('Could not create aliases.'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($nickname != $orig->nickname) {
|
||||||
|
common_log(LOG_INFO, "Saving local group info.");
|
||||||
|
$local = Local_group::staticGet('group_id', $this->group->id);
|
||||||
|
$local->setNickname($nickname);
|
||||||
|
}
|
||||||
|
|
||||||
$this->group->query('COMMIT');
|
$this->group->query('COMMIT');
|
||||||
|
|
||||||
if ($this->group->nickname != $orig->nickname) {
|
if ($this->group->nickname != $orig->nickname) {
|
||||||
@ -272,10 +283,10 @@ class EditgroupAction extends GroupDesignAction
|
|||||||
|
|
||||||
function nicknameExists($nickname)
|
function nicknameExists($nickname)
|
||||||
{
|
{
|
||||||
$group = User_group::staticGet('nickname', $nickname);
|
$group = Local_group::staticGet('nickname', $nickname);
|
||||||
|
|
||||||
if (!empty($group) &&
|
if (!empty($group) &&
|
||||||
$group->id != $this->group->id) {
|
$group->group_id != $this->group->id) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -79,7 +79,7 @@ class FavorAction extends Action
|
|||||||
$this->clientError(_('This notice is already a favorite!'));
|
$this->clientError(_('This notice is already a favorite!'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$fave = Fave::addNew($user, $notice);
|
$fave = Fave::addNew($user->getProfile(), $notice);
|
||||||
if (!$fave) {
|
if (!$fave) {
|
||||||
$this->serverError(_('Could not create favorite.'));
|
$this->serverError(_('Could not create favorite.'));
|
||||||
return;
|
return;
|
||||||
|
@ -56,7 +56,14 @@ class FoafGroupAction extends Action
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->group = User_group::staticGet('nickname', $this->nickname);
|
$local = Local_group::staticGet('nickname', $nickname);
|
||||||
|
|
||||||
|
if (!$local) {
|
||||||
|
$this->clientError(_('No such group.'), 404);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->group = User_group::staticGet('id', $local->group_id);
|
||||||
|
|
||||||
if (!$this->group) {
|
if (!$this->group) {
|
||||||
$this->clientError(_('No such group.'), 404);
|
$this->clientError(_('No such group.'), 404);
|
||||||
|
@ -90,7 +90,10 @@ class GroupDesignSettingsAction extends DesignSettingsAction
|
|||||||
if ($groupid) {
|
if ($groupid) {
|
||||||
$this->group = User_group::staticGet('id', $groupid);
|
$this->group = User_group::staticGet('id', $groupid);
|
||||||
} else {
|
} else {
|
||||||
$this->group = User_group::staticGet('nickname', $nickname);
|
$local = Local_group::staticGet('nickname', $nickname);
|
||||||
|
if ($local) {
|
||||||
|
$this->group = User_group::staticGet('id', $local->group_id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$this->group) {
|
if (!$this->group) {
|
||||||
|
@ -92,7 +92,10 @@ class GrouplogoAction extends GroupDesignAction
|
|||||||
if ($groupid) {
|
if ($groupid) {
|
||||||
$this->group = User_group::staticGet('id', $groupid);
|
$this->group = User_group::staticGet('id', $groupid);
|
||||||
} else {
|
} else {
|
||||||
$this->group = User_group::staticGet('nickname', $nickname);
|
$local = Local_group::staticGet('nickname', $nickname);
|
||||||
|
if ($local) {
|
||||||
|
$this->group = User_group::staticGet('id', $local->group_id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$this->group) {
|
if (!$this->group) {
|
||||||
|
@ -77,7 +77,14 @@ class GroupmembersAction extends GroupDesignAction
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->group = User_group::staticGet('nickname', $nickname);
|
$local = Local_group::staticGet('nickname', $nickname);
|
||||||
|
|
||||||
|
if (!$local) {
|
||||||
|
$this->clientError(_('No such group.'), 404);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->group = User_group::staticGet('id', $local->group_id);
|
||||||
|
|
||||||
if (!$this->group) {
|
if (!$this->group) {
|
||||||
$this->clientError(_('No such group.'), 404);
|
$this->clientError(_('No such group.'), 404);
|
||||||
|
@ -92,7 +92,14 @@ class groupRssAction extends Rss10Action
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->group = User_group::staticGet('nickname', $nickname);
|
$local = Local_group::staticGet('nickname', $nickname);
|
||||||
|
|
||||||
|
if (!$local) {
|
||||||
|
$this->clientError(_('No such group.'), 404);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->group = User_group::staticGet('id', $local->group_id);
|
||||||
|
|
||||||
if (!$this->group) {
|
if (!$this->group) {
|
||||||
$this->clientError(_('No such group.'), 404);
|
$this->clientError(_('No such group.'), 404);
|
||||||
|
@ -111,15 +111,19 @@ class GroupsAction extends Action
|
|||||||
$offset = ($this->page-1) * GROUPS_PER_PAGE;
|
$offset = ($this->page-1) * GROUPS_PER_PAGE;
|
||||||
$limit = GROUPS_PER_PAGE + 1;
|
$limit = GROUPS_PER_PAGE + 1;
|
||||||
|
|
||||||
|
$qry = 'SELECT user_group.* '.
|
||||||
|
'from user_group join local_group on user_group.id = local_group.group_id '.
|
||||||
|
'order by user_group.created desc '.
|
||||||
|
'limit ' . $limit . ' offset ' . $offset;
|
||||||
|
|
||||||
$groups = new User_group();
|
$groups = new User_group();
|
||||||
$groups->orderBy('created DESC');
|
|
||||||
$groups->limit($offset, $limit);
|
|
||||||
|
|
||||||
$cnt = 0;
|
$cnt = 0;
|
||||||
if ($groups->find()) {
|
|
||||||
|
$groups->query($qry);
|
||||||
|
|
||||||
$gl = new GroupList($groups, null, $this);
|
$gl = new GroupList($groups, null, $this);
|
||||||
$cnt = $gl->show();
|
$cnt = $gl->show();
|
||||||
}
|
|
||||||
|
|
||||||
$this->pagination($this->page > 1, $cnt > GROUPS_PER_PAGE,
|
$this->pagination($this->page > 1, $cnt > GROUPS_PER_PAGE,
|
||||||
$this->page, 'groups');
|
$this->page, 'groups');
|
||||||
|
120
actions/hcard.php
Normal file
120
actions/hcard.php
Normal file
@ -0,0 +1,120 @@
|
|||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* StatusNet, the distributed open-source microblogging tool
|
||||||
|
*
|
||||||
|
* Show the user's hcard
|
||||||
|
*
|
||||||
|
* PHP version 5
|
||||||
|
*
|
||||||
|
* LICENCE: This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
* @category Personal
|
||||||
|
* @package StatusNet
|
||||||
|
* @author Evan Prodromou <evan@status.net>
|
||||||
|
* @copyright 2010 StatusNet, Inc.
|
||||||
|
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
|
||||||
|
* @link http://status.net/
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (!defined('STATUSNET')) {
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* User profile page
|
||||||
|
*
|
||||||
|
* @category Personal
|
||||||
|
* @package StatusNet
|
||||||
|
* @author Evan Prodromou <evan@status.net>
|
||||||
|
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
|
||||||
|
* @link http://status.net/
|
||||||
|
*/
|
||||||
|
|
||||||
|
class HcardAction extends Action
|
||||||
|
{
|
||||||
|
var $user;
|
||||||
|
var $profile;
|
||||||
|
|
||||||
|
function prepare($args)
|
||||||
|
{
|
||||||
|
parent::prepare($args);
|
||||||
|
|
||||||
|
$nickname_arg = $this->arg('nickname');
|
||||||
|
$nickname = common_canonical_nickname($nickname_arg);
|
||||||
|
|
||||||
|
// Permanent redirect on non-canonical nickname
|
||||||
|
|
||||||
|
if ($nickname_arg != $nickname) {
|
||||||
|
$args = array('nickname' => $nickname);
|
||||||
|
common_redirect(common_local_url('hcard', $args), 301);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->user = User::staticGet('nickname', $nickname);
|
||||||
|
|
||||||
|
if (!$this->user) {
|
||||||
|
$this->clientError(_('No such user.'), 404);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->profile = $this->user->getProfile();
|
||||||
|
|
||||||
|
if (!$this->profile) {
|
||||||
|
$this->serverError(_('User has no profile.'));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function handle($args)
|
||||||
|
{
|
||||||
|
parent::handle($args);
|
||||||
|
$this->showPage();
|
||||||
|
}
|
||||||
|
|
||||||
|
function title()
|
||||||
|
{
|
||||||
|
return $this->profile->getBestName();
|
||||||
|
}
|
||||||
|
|
||||||
|
function showContent()
|
||||||
|
{
|
||||||
|
$up = new ShortUserProfile($this, $this->user, $this->profile);
|
||||||
|
$up->show();
|
||||||
|
}
|
||||||
|
|
||||||
|
function showHeader()
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
function showAside()
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
function showSecondaryNav()
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class ShortUserProfile extends UserProfile
|
||||||
|
{
|
||||||
|
function showEntityActions()
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
@ -194,7 +194,8 @@ class InviteAction extends CurrentUserDesignAction
|
|||||||
_('Optionally add a personal message to the invitation.'));
|
_('Optionally add a personal message to the invitation.'));
|
||||||
$this->elementEnd('li');
|
$this->elementEnd('li');
|
||||||
$this->elementEnd('ul');
|
$this->elementEnd('ul');
|
||||||
$this->submit('send', _('Send'));
|
// TRANS: Send button for inviting friends
|
||||||
|
$this->submit('send', _m('BUTTON', 'Send'));
|
||||||
$this->elementEnd('fieldset');
|
$this->elementEnd('fieldset');
|
||||||
$this->elementEnd('form');
|
$this->elementEnd('form');
|
||||||
}
|
}
|
||||||
|
@ -62,22 +62,32 @@ class JoingroupAction extends Action
|
|||||||
}
|
}
|
||||||
|
|
||||||
$nickname_arg = $this->trimmed('nickname');
|
$nickname_arg = $this->trimmed('nickname');
|
||||||
|
$id = intval($this->arg('id'));
|
||||||
|
if ($id) {
|
||||||
|
$this->group = User_group::staticGet('id', $id);
|
||||||
|
} else if ($nickname_arg) {
|
||||||
$nickname = common_canonical_nickname($nickname_arg);
|
$nickname = common_canonical_nickname($nickname_arg);
|
||||||
|
|
||||||
// Permanent redirect on non-canonical nickname
|
// Permanent redirect on non-canonical nickname
|
||||||
|
|
||||||
if ($nickname_arg != $nickname) {
|
if ($nickname_arg != $nickname) {
|
||||||
$args = array('nickname' => $nickname);
|
$args = array('nickname' => $nickname);
|
||||||
common_redirect(common_local_url('joingroup', $args), 301);
|
common_redirect(common_local_url('leavegroup', $args), 301);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$nickname) {
|
$local = Local_group::staticGet('nickname', $nickname);
|
||||||
$this->clientError(_('No nickname.'), 404);
|
|
||||||
|
if (!$local) {
|
||||||
|
$this->clientError(_('No such group.'), 404);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->group = User_group::staticGet('nickname', $nickname);
|
$this->group = User_group::staticGet('id', $local->group_id);
|
||||||
|
} else {
|
||||||
|
$this->clientError(_('No nickname or ID.'), 404);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if (!$this->group) {
|
if (!$this->group) {
|
||||||
$this->clientError(_('No such group.'), 404);
|
$this->clientError(_('No such group.'), 404);
|
||||||
|
@ -62,6 +62,10 @@ class LeavegroupAction extends Action
|
|||||||
}
|
}
|
||||||
|
|
||||||
$nickname_arg = $this->trimmed('nickname');
|
$nickname_arg = $this->trimmed('nickname');
|
||||||
|
$id = intval($this->arg('id'));
|
||||||
|
if ($id) {
|
||||||
|
$this->group = User_group::staticGet('id', $id);
|
||||||
|
} else if ($nickname_arg) {
|
||||||
$nickname = common_canonical_nickname($nickname_arg);
|
$nickname = common_canonical_nickname($nickname_arg);
|
||||||
|
|
||||||
// Permanent redirect on non-canonical nickname
|
// Permanent redirect on non-canonical nickname
|
||||||
@ -72,12 +76,18 @@ class LeavegroupAction extends Action
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$nickname) {
|
$local = Local_group::staticGet('nickname', $nickname);
|
||||||
$this->clientError(_('No nickname.'), 404);
|
|
||||||
|
if (!$local) {
|
||||||
|
$this->clientError(_('No such group.'), 404);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->group = User_group::staticGet('nickname', $nickname);
|
$this->group = User_group::staticGet('id', $local->group_id);
|
||||||
|
} else {
|
||||||
|
$this->clientError(_('No nickname or ID.'), 404);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if (!$this->group) {
|
if (!$this->group) {
|
||||||
$this->clientError(_('No such group.'), 404);
|
$this->clientError(_('No such group.'), 404);
|
||||||
|
@ -180,6 +180,8 @@ class NewgroupAction extends Action
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$mainpage = common_local_url('showgroup', array('nickname' => $nickname));
|
||||||
|
|
||||||
$cur = common_current_user();
|
$cur = common_current_user();
|
||||||
|
|
||||||
// Checked in prepare() above
|
// Checked in prepare() above
|
||||||
@ -192,16 +194,18 @@ class NewgroupAction extends Action
|
|||||||
'description' => $description,
|
'description' => $description,
|
||||||
'location' => $location,
|
'location' => $location,
|
||||||
'aliases' => $aliases,
|
'aliases' => $aliases,
|
||||||
'userid' => $cur->id));
|
'userid' => $cur->id,
|
||||||
|
'mainpage' => $mainpage,
|
||||||
|
'local' => true));
|
||||||
|
|
||||||
common_redirect($group->homeUrl(), 303);
|
common_redirect($group->homeUrl(), 303);
|
||||||
}
|
}
|
||||||
|
|
||||||
function nicknameExists($nickname)
|
function nicknameExists($nickname)
|
||||||
{
|
{
|
||||||
$group = User_group::staticGet('nickname', $nickname);
|
$local = Local_group::staticGet('nickname', $nickname);
|
||||||
|
|
||||||
if (!empty($group)) {
|
if (!empty($local)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -294,6 +294,9 @@ class NewnoticeAction extends Action
|
|||||||
if ($profile) {
|
if ($profile) {
|
||||||
$content = '@' . $profile->nickname . ' ';
|
$content = '@' . $profile->nickname . ' ';
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
// @fixme most of these bits above aren't being passed on above
|
||||||
|
$inreplyto = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$notice_form = new NoticeForm($this, '', $content, null, $inreplyto);
|
$notice_form = new NoticeForm($this, '', $content, null, $inreplyto);
|
||||||
|
@ -54,7 +54,10 @@ class PostnoticeAction extends Action
|
|||||||
*/
|
*/
|
||||||
function prepare($argarray)
|
function prepare($argarray)
|
||||||
{
|
{
|
||||||
|
StatusNet::setApi(true); // Send smaller error pages
|
||||||
|
|
||||||
parent::prepare($argarray);
|
parent::prepare($argarray);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$this->checkNotice();
|
$this->checkNotice();
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
@ -71,6 +74,14 @@ class PostnoticeAction extends Action
|
|||||||
$srv = new OMB_Service_Provider(null, omb_oauth_datastore(),
|
$srv = new OMB_Service_Provider(null, omb_oauth_datastore(),
|
||||||
omb_oauth_server());
|
omb_oauth_server());
|
||||||
$srv->handlePostNotice();
|
$srv->handlePostNotice();
|
||||||
|
} catch (OMB_RemoteServiceException $rse) {
|
||||||
|
$msg = $rse->getMessage();
|
||||||
|
if (preg_match('/Revoked accesstoken/', $msg) ||
|
||||||
|
preg_match('/No subscriber/', $msg)) {
|
||||||
|
$this->clientError($msg, 403);
|
||||||
|
} else {
|
||||||
|
$this->clientError($msg);
|
||||||
|
}
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
$this->serverError($e->getMessage());
|
$this->serverError($e->getMessage());
|
||||||
return;
|
return;
|
||||||
|
@ -285,6 +285,10 @@ class ProfilesettingsAction extends AccountSettingsAction
|
|||||||
} else {
|
} else {
|
||||||
// Re-initialize language environment if it changed
|
// Re-initialize language environment if it changed
|
||||||
common_init_language();
|
common_init_language();
|
||||||
|
// Clear the site owner, in case nickname changed
|
||||||
|
if ($user->hasRole(Profile_role::OWNER)) {
|
||||||
|
User::blow('user:site_owner');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -94,6 +94,7 @@ class PublicAction extends Action
|
|||||||
}
|
}
|
||||||
|
|
||||||
if($this->page > 1 && $this->notice->N == 0){
|
if($this->page > 1 && $this->notice->N == 0){
|
||||||
|
// TRANS: Server error when page not found (404)
|
||||||
$this->serverError(_('No such page'),$code=404);
|
$this->serverError(_('No such page'),$code=404);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -89,6 +89,7 @@ class RepliesAction extends OwnerDesignAction
|
|||||||
NOTICES_PER_PAGE + 1);
|
NOTICES_PER_PAGE + 1);
|
||||||
|
|
||||||
if($this->page > 1 && $this->notice->N == 0){
|
if($this->page > 1 && $this->notice->N == 0){
|
||||||
|
// TRANS: Server error when page not found (404)
|
||||||
$this->serverError(_('No such page'),$code=404);
|
$this->serverError(_('No such page'),$code=404);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -134,6 +134,7 @@ class ShowfavoritesAction extends OwnerDesignAction
|
|||||||
}
|
}
|
||||||
|
|
||||||
if($this->page > 1 && $this->notice->N == 0){
|
if($this->page > 1 && $this->notice->N == 0){
|
||||||
|
// TRANS: Server error when page not found (404)
|
||||||
$this->serverError(_('No such page'),$code=404);
|
$this->serverError(_('No such page'),$code=404);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -122,9 +122,9 @@ class ShowgroupAction extends GroupDesignAction
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->group = User_group::staticGet('nickname', $nickname);
|
$local = Local_group::staticGet('nickname', $nickname);
|
||||||
|
|
||||||
if (!$this->group) {
|
if (!$local) {
|
||||||
$alias = Group_alias::staticGet('alias', $nickname);
|
$alias = Group_alias::staticGet('alias', $nickname);
|
||||||
if ($alias) {
|
if ($alias) {
|
||||||
$args = array('id' => $alias->group_id);
|
$args = array('id' => $alias->group_id);
|
||||||
@ -134,11 +134,19 @@ class ShowgroupAction extends GroupDesignAction
|
|||||||
common_redirect(common_local_url('groupbyid', $args), 301);
|
common_redirect(common_local_url('groupbyid', $args), 301);
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
|
common_log(LOG_NOTICE, "Couldn't find local group for nickname '$nickname'");
|
||||||
$this->clientError(_('No such group.'), 404);
|
$this->clientError(_('No such group.'), 404);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$this->group = User_group::staticGet('id', $local->group_id);
|
||||||
|
|
||||||
|
if (!$this->group) {
|
||||||
|
$this->clientError(_('No such group.'), 404);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
common_set_returnto($this->selfUrl());
|
common_set_returnto($this->selfUrl());
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -1,7 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
/*
|
/**
|
||||||
* StatusNet - the distributed open-source microblogging tool
|
* StatusNet - the distributed open-source microblogging tool
|
||||||
* Copyright (C) 2008, 2009, StatusNet, Inc.
|
* Copyright (C) 2008-2010, StatusNet, Inc.
|
||||||
|
*
|
||||||
|
* Subscription action.
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
@ -15,68 +17,142 @@
|
|||||||
*
|
*
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
* PHP version 5
|
||||||
|
*
|
||||||
|
* @category Action
|
||||||
|
* @package StatusNet
|
||||||
|
* @author Evan Prodromou <evan@status.net>
|
||||||
|
* @copyright 2008-2010 StatusNet, Inc.
|
||||||
|
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
|
||||||
|
* @link http://status.net/
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
|
if (!defined('STATUSNET')) {
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Subscription action
|
||||||
|
*
|
||||||
|
* Subscribing to a profile. Does not work for OMB 0.1 remote subscriptions,
|
||||||
|
* but may work for other remote subscription protocols, like OStatus.
|
||||||
|
*
|
||||||
|
* Takes parameters:
|
||||||
|
*
|
||||||
|
* - subscribeto: a profile ID
|
||||||
|
* - token: session token to prevent CSRF attacks
|
||||||
|
* - ajax: boolean; whether to return Ajax or full-browser results
|
||||||
|
*
|
||||||
|
* Only works if the current user is logged in.
|
||||||
|
*
|
||||||
|
* @category Action
|
||||||
|
* @package StatusNet
|
||||||
|
* @author Evan Prodromou <evan@status.net>
|
||||||
|
* @copyright 2008-2010 StatusNet, Inc.
|
||||||
|
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
|
||||||
|
* @link http://status.net/
|
||||||
|
*/
|
||||||
|
|
||||||
class SubscribeAction extends Action
|
class SubscribeAction extends Action
|
||||||
{
|
{
|
||||||
|
var $user;
|
||||||
|
var $other;
|
||||||
|
|
||||||
function handle($args)
|
/**
|
||||||
|
* Check pre-requisites and instantiate attributes
|
||||||
|
*
|
||||||
|
* @param Array $args array of arguments (URL, GET, POST)
|
||||||
|
*
|
||||||
|
* @return boolean success flag
|
||||||
|
*/
|
||||||
|
|
||||||
|
function prepare($args)
|
||||||
{
|
{
|
||||||
parent::handle($args);
|
parent::prepare($args);
|
||||||
|
|
||||||
if (!common_logged_in()) {
|
// Only allow POST requests
|
||||||
$this->clientError(_('Not logged in.'));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$user = common_current_user();
|
|
||||||
|
|
||||||
if ($_SERVER['REQUEST_METHOD'] != 'POST') {
|
if ($_SERVER['REQUEST_METHOD'] != 'POST') {
|
||||||
common_redirect(common_local_url('subscriptions', array('nickname' => $user->nickname)));
|
$this->clientError(_('This action only accepts POST requests.'));
|
||||||
return;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
# CSRF protection
|
// CSRF protection
|
||||||
|
|
||||||
$token = $this->trimmed('token');
|
$token = $this->trimmed('token');
|
||||||
|
|
||||||
if (!$token || $token != common_session_token()) {
|
if (!$token || $token != common_session_token()) {
|
||||||
$this->clientError(_('There was a problem with your session token. Try again, please.'));
|
$this->clientError(_('There was a problem with your session token.'.
|
||||||
return;
|
' Try again, please.'));
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Only for logged-in users
|
||||||
|
|
||||||
|
$this->user = common_current_user();
|
||||||
|
|
||||||
|
if (empty($this->user)) {
|
||||||
|
$this->clientError(_('Not logged in.'));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Profile to subscribe to
|
||||||
|
|
||||||
$other_id = $this->arg('subscribeto');
|
$other_id = $this->arg('subscribeto');
|
||||||
|
|
||||||
$other = User::staticGet('id', $other_id);
|
$this->other = Profile::staticGet('id', $other_id);
|
||||||
|
|
||||||
if (!$other) {
|
if (empty($this->other)) {
|
||||||
$this->clientError(_('Not a local user.'));
|
$this->clientError(_('No such profile.'));
|
||||||
return;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$result = subs_subscribe_to($user, $other);
|
// OMB 0.1 doesn't have a mechanism for local-server-
|
||||||
|
// originated subscription.
|
||||||
|
|
||||||
if (is_string($result)) {
|
$omb01 = Remote_profile::staticGet('id', $other_id);
|
||||||
$this->clientError($result);
|
|
||||||
return;
|
if (!empty($omb01)) {
|
||||||
|
$this->clientError(_('You cannot subscribe to an OMB 0.1'.
|
||||||
|
' remote profile with this action.'));
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle request
|
||||||
|
*
|
||||||
|
* Does the subscription and returns results.
|
||||||
|
*
|
||||||
|
* @param Array $args unused.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
|
||||||
|
function handle($args)
|
||||||
|
{
|
||||||
|
// Throws exception on error
|
||||||
|
|
||||||
|
Subscription::start($this->user->getProfile(),
|
||||||
|
$this->other);
|
||||||
|
|
||||||
if ($this->boolean('ajax')) {
|
if ($this->boolean('ajax')) {
|
||||||
$this->startHTML('text/xml;charset=utf-8');
|
$this->startHTML('text/xml;charset=utf-8');
|
||||||
$this->elementStart('head');
|
$this->elementStart('head');
|
||||||
$this->element('title', null, _('Subscribed'));
|
$this->element('title', null, _('Subscribed'));
|
||||||
$this->elementEnd('head');
|
$this->elementEnd('head');
|
||||||
$this->elementStart('body');
|
$this->elementStart('body');
|
||||||
$unsubscribe = new UnsubscribeForm($this, $other->getProfile());
|
$unsubscribe = new UnsubscribeForm($this, $this->other);
|
||||||
$unsubscribe->show();
|
$unsubscribe->show();
|
||||||
$this->elementEnd('body');
|
$this->elementEnd('body');
|
||||||
$this->elementEnd('html');
|
$this->elementEnd('html');
|
||||||
} else {
|
} else {
|
||||||
common_redirect(common_local_url('subscriptions', array('nickname' =>
|
$url = common_local_url('subscriptions',
|
||||||
$user->nickname)),
|
array('nickname' => $this->user->nickname));
|
||||||
303);
|
common_redirect($url, 303);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -79,6 +79,7 @@ class SubscriptionsAction extends GalleryAction
|
|||||||
|
|
||||||
function showContent()
|
function showContent()
|
||||||
{
|
{
|
||||||
|
if (Event::handle('StartShowSubscriptionsContent', array($this))) {
|
||||||
parent::showContent();
|
parent::showContent();
|
||||||
|
|
||||||
$offset = ($this->page-1) * PROFILES_PER_PAGE;
|
$offset = ($this->page-1) * PROFILES_PER_PAGE;
|
||||||
@ -105,6 +106,10 @@ class SubscriptionsAction extends GalleryAction
|
|||||||
$this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
|
$this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
|
||||||
$this->page, 'subscriptions',
|
$this->page, 'subscriptions',
|
||||||
array('nickname' => $this->user->nickname));
|
array('nickname' => $this->user->nickname));
|
||||||
|
|
||||||
|
|
||||||
|
Event::handle('EndShowSubscriptionsContent', array($this));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function showScripts()
|
function showScripts()
|
||||||
|
@ -66,10 +66,12 @@ class SupAction extends Action
|
|||||||
$divider = common_sql_date(time() - $seconds);
|
$divider = common_sql_date(time() - $seconds);
|
||||||
|
|
||||||
$notice->query('SELECT profile_id, max(id) AS max_id ' .
|
$notice->query('SELECT profile_id, max(id) AS max_id ' .
|
||||||
'FROM notice ' .
|
'FROM ( ' .
|
||||||
|
'SELECT profile_id, id FROM notice ' .
|
||||||
((common_config('db','type') == 'pgsql') ?
|
((common_config('db','type') == 'pgsql') ?
|
||||||
'WHERE extract(epoch from created) > (extract(epoch from now()) - ' . $seconds . ') ' :
|
'WHERE extract(epoch from created) > (extract(epoch from now()) - ' . $seconds . ') ' :
|
||||||
'WHERE created > "'.$divider.'" ' ) .
|
'WHERE created > "'.$divider.'" ' ) .
|
||||||
|
') AS latest ' .
|
||||||
'GROUP BY profile_id');
|
'GROUP BY profile_id');
|
||||||
|
|
||||||
$updates = array();
|
$updates = array();
|
||||||
|
@ -48,6 +48,7 @@ class TagAction extends Action
|
|||||||
$this->notice = Notice_tag::getStream($this->tag, (($this->page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
|
$this->notice = Notice_tag::getStream($this->tag, (($this->page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
|
||||||
|
|
||||||
if($this->page > 1 && $this->notice->N == 0){
|
if($this->page > 1 && $this->notice->N == 0){
|
||||||
|
// TRANS: Server error when page not found (404)
|
||||||
$this->serverError(_('No such page'),$code=404);
|
$this->serverError(_('No such page'),$code=404);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
|
|||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
require_once INSTALLDIR.'/lib/api.php';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Action for outputting search results in Twitter compatible Atom
|
* Action for outputting search results in Twitter compatible Atom
|
||||||
* format.
|
* format.
|
||||||
@ -245,7 +243,7 @@ class TwitapisearchatomAction extends ApiAction
|
|||||||
'xmlns:twitter' => 'http://api.twitter.com/',
|
'xmlns:twitter' => 'http://api.twitter.com/',
|
||||||
'xml:lang' => 'en-US')); // XXX Other locales ?
|
'xml:lang' => 'en-US')); // XXX Other locales ?
|
||||||
|
|
||||||
$taguribase = common_config('integration', 'taguri');
|
$taguribase = TagURI::base();
|
||||||
$this->element('id', null, "tag:$taguribase:search/$server");
|
$this->element('id', null, "tag:$taguribase:search/$server");
|
||||||
|
|
||||||
$site_uri = common_path(false);
|
$site_uri = common_path(false);
|
||||||
@ -329,7 +327,7 @@ class TwitapisearchatomAction extends ApiAction
|
|||||||
|
|
||||||
$this->elementStart('entry');
|
$this->elementStart('entry');
|
||||||
|
|
||||||
$taguribase = common_config('integration', 'taguri');
|
$taguribase = TagURI::base();
|
||||||
|
|
||||||
$this->element('id', null, "tag:$taguribase:$notice->id");
|
$this->element('id', null, "tag:$taguribase:$notice->id");
|
||||||
$this->element('published', null, common_date_w3dtf($notice->created));
|
$this->element('published', null, common_date_w3dtf($notice->created));
|
||||||
|
@ -31,7 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
|
|||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
require_once INSTALLDIR.'/lib/api.php';
|
|
||||||
require_once INSTALLDIR.'/lib/jsonsearchresultslist.php';
|
require_once INSTALLDIR.'/lib/jsonsearchresultslist.php';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
|
|||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
require_once INSTALLDIR.'/lib/api.php';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the top ten queries that are currently trending
|
* Returns the top ten queries that are currently trending
|
||||||
*
|
*
|
||||||
|
@ -55,6 +55,8 @@ class UpdateprofileAction extends Action
|
|||||||
*/
|
*/
|
||||||
function prepare($argarray)
|
function prepare($argarray)
|
||||||
{
|
{
|
||||||
|
StatusNet::setApi(true); // Send smaller error pages
|
||||||
|
|
||||||
parent::prepare($argarray);
|
parent::prepare($argarray);
|
||||||
$license = $_POST['omb_listenee_license'];
|
$license = $_POST['omb_listenee_license'];
|
||||||
$site_license = common_config('license', 'url');
|
$site_license = common_config('license', 'url');
|
||||||
@ -75,6 +77,14 @@ class UpdateprofileAction extends Action
|
|||||||
$srv = new OMB_Service_Provider(null, omb_oauth_datastore(),
|
$srv = new OMB_Service_Provider(null, omb_oauth_datastore(),
|
||||||
omb_oauth_server());
|
omb_oauth_server());
|
||||||
$srv->handleUpdateProfile();
|
$srv->handleUpdateProfile();
|
||||||
|
} catch (OMB_RemoteServiceException $rse) {
|
||||||
|
$msg = $rse->getMessage();
|
||||||
|
if (preg_match('/Revoked accesstoken/', $msg) ||
|
||||||
|
preg_match('/No subscriber/', $msg)) {
|
||||||
|
$this->clientError($msg, 403);
|
||||||
|
} else {
|
||||||
|
$this->clientError($msg);
|
||||||
|
}
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
$this->serverError($e->getMessage());
|
$this->serverError($e->getMessage());
|
||||||
return;
|
return;
|
||||||
|
@ -55,7 +55,8 @@ class UseradminpanelAction extends AdminPanelAction
|
|||||||
|
|
||||||
function title()
|
function title()
|
||||||
{
|
{
|
||||||
return _('User');
|
// TRANS: User admin panel title
|
||||||
|
return _m('TITLE', 'User');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -21,17 +21,47 @@ class Fave extends Memcached_DataObject
|
|||||||
/* the code above is auto generated do not remove the tag below */
|
/* the code above is auto generated do not remove the tag below */
|
||||||
###END_AUTOCODE
|
###END_AUTOCODE
|
||||||
|
|
||||||
static function addNew($user, $notice) {
|
static function addNew($profile, $notice) {
|
||||||
|
|
||||||
|
$fave = null;
|
||||||
|
|
||||||
|
if (Event::handle('StartFavorNotice', array($profile, $notice, &$fave))) {
|
||||||
|
|
||||||
$fave = new Fave();
|
$fave = new Fave();
|
||||||
$fave->user_id = $user->id;
|
|
||||||
|
$fave->user_id = $profile->id;
|
||||||
$fave->notice_id = $notice->id;
|
$fave->notice_id = $notice->id;
|
||||||
|
|
||||||
if (!$fave->insert()) {
|
if (!$fave->insert()) {
|
||||||
common_log_db_error($fave, 'INSERT', __FILE__);
|
common_log_db_error($fave, 'INSERT', __FILE__);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Event::handle('EndFavorNotice', array($profile, $notice));
|
||||||
|
}
|
||||||
|
|
||||||
return $fave;
|
return $fave;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function delete()
|
||||||
|
{
|
||||||
|
$profile = Profile::staticGet('id', $this->user_id);
|
||||||
|
$notice = Notice::staticGet('id', $this->notice_id);
|
||||||
|
|
||||||
|
$result = null;
|
||||||
|
|
||||||
|
if (Event::handle('StartDisfavorNotice', array($profile, $notice, &$result))) {
|
||||||
|
|
||||||
|
$result = parent::delete();
|
||||||
|
|
||||||
|
if ($result) {
|
||||||
|
Event::handle('EndDisfavorNotice', array($profile, $notice));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
function pkeyGet($kv)
|
function pkeyGet($kv)
|
||||||
{
|
{
|
||||||
return Memcached_DataObject::pkeyGet('Fave', $kv);
|
return Memcached_DataObject::pkeyGet('Fave', $kv);
|
||||||
@ -47,7 +77,7 @@ class Fave extends Memcached_DataObject
|
|||||||
return $ids;
|
return $ids;
|
||||||
}
|
}
|
||||||
|
|
||||||
function _streamDirect($user_id, $own, $offset, $limit, $since_id, $max_id, $since)
|
function _streamDirect($user_id, $own, $offset, $limit, $since_id, $max_id)
|
||||||
{
|
{
|
||||||
$fav = new Fave();
|
$fav = new Fave();
|
||||||
$qry = null;
|
$qry = null;
|
||||||
@ -70,10 +100,6 @@ class Fave extends Memcached_DataObject
|
|||||||
$qry .= 'AND notice_id <= ' . $max_id . ' ';
|
$qry .= 'AND notice_id <= ' . $max_id . ' ';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_null($since)) {
|
|
||||||
$qry .= 'AND modified > \'' . date('Y-m-d H:i:s', $since) . '\' ';
|
|
||||||
}
|
|
||||||
|
|
||||||
// NOTE: we sort by fave time, not by notice time!
|
// NOTE: we sort by fave time, not by notice time!
|
||||||
|
|
||||||
$qry .= 'ORDER BY modified DESC ';
|
$qry .= 'ORDER BY modified DESC ';
|
||||||
|
@ -169,7 +169,11 @@ class File extends Memcached_DataObject
|
|||||||
{
|
{
|
||||||
require_once 'MIME/Type/Extension.php';
|
require_once 'MIME/Type/Extension.php';
|
||||||
$mte = new MIME_Type_Extension();
|
$mte = new MIME_Type_Extension();
|
||||||
|
try {
|
||||||
$ext = $mte->getExtension($mimetype);
|
$ext = $mte->getExtension($mimetype);
|
||||||
|
} catch ( Exception $e) {
|
||||||
|
$ext = strtolower(preg_replace('/\W/', '', $mimetype));
|
||||||
|
}
|
||||||
$nickname = $profile->nickname;
|
$nickname = $profile->nickname;
|
||||||
$datestamp = strftime('%Y%m%dT%H%M%S', time());
|
$datestamp = strftime('%Y%m%dT%H%M%S', time());
|
||||||
$random = strtolower(common_confirmation_code(32));
|
$random = strtolower(common_confirmation_code(32));
|
||||||
|
@ -137,7 +137,7 @@ class Inbox extends Memcached_DataObject
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function stream($user_id, $offset, $limit, $since_id, $max_id, $since, $own=false)
|
function stream($user_id, $offset, $limit, $since_id, $max_id, $own=false)
|
||||||
{
|
{
|
||||||
$inbox = Inbox::staticGet('user_id', $user_id);
|
$inbox = Inbox::staticGet('user_id', $user_id);
|
||||||
|
|
||||||
@ -195,15 +195,15 @@ class Inbox extends Memcached_DataObject
|
|||||||
* @param int $limit
|
* @param int $limit
|
||||||
* @param mixed $since_id return only notices after but not including this id
|
* @param mixed $since_id return only notices after but not including this id
|
||||||
* @param mixed $max_id return only notices up to and including this id
|
* @param mixed $max_id return only notices up to and including this id
|
||||||
* @param mixed $since obsolete/ignored
|
|
||||||
* @param mixed $own ignored?
|
* @param mixed $own ignored?
|
||||||
* @return array of Notice objects
|
* @return array of Notice objects
|
||||||
*
|
*
|
||||||
* @todo consider repacking the inbox when this happens?
|
* @todo consider repacking the inbox when this happens?
|
||||||
|
* @fixme reimplement $own if we need it?
|
||||||
*/
|
*/
|
||||||
function streamNotices($user_id, $offset, $limit, $since_id, $max_id, $since, $own=false)
|
function streamNotices($user_id, $offset, $limit, $since_id, $max_id, $own=false)
|
||||||
{
|
{
|
||||||
$ids = self::stream($user_id, $offset, self::MAX_NOTICES, $since_id, $max_id, $since, $own);
|
$ids = self::stream($user_id, $offset, self::MAX_NOTICES, $since_id, $max_id, $own);
|
||||||
|
|
||||||
// Do a bulk lookup for the first $limit items
|
// Do a bulk lookup for the first $limit items
|
||||||
// Fast path when nothing's deleted.
|
// Fast path when nothing's deleted.
|
||||||
|
46
classes/Local_group.php
Normal file
46
classes/Local_group.php
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Table Definition for local_group
|
||||||
|
*/
|
||||||
|
|
||||||
|
class Local_group extends Memcached_DataObject
|
||||||
|
{
|
||||||
|
###START_AUTOCODE
|
||||||
|
/* the code below is auto generated do not remove the above tag */
|
||||||
|
|
||||||
|
public $__table = 'local_group'; // table name
|
||||||
|
public $group_id; // int(4) primary_key not_null
|
||||||
|
public $nickname; // varchar(64) unique_key
|
||||||
|
public $created; // datetime not_null default_0000-00-00%2000%3A00%3A00
|
||||||
|
public $modified; // timestamp not_null default_CURRENT_TIMESTAMP
|
||||||
|
|
||||||
|
/* Static get */
|
||||||
|
function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Local_group',$k,$v); }
|
||||||
|
|
||||||
|
/* the code above is auto generated do not remove the tag below */
|
||||||
|
###END_AUTOCODE
|
||||||
|
|
||||||
|
function sequenceKey()
|
||||||
|
{
|
||||||
|
return array(false, false, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
function setNickname($nickname)
|
||||||
|
{
|
||||||
|
$this->decache();
|
||||||
|
$qry = 'UPDATE local_group set nickname = "'.$nickname.'" where group_id = ' . $this->group_id;
|
||||||
|
|
||||||
|
$result = $this->query($qry);
|
||||||
|
|
||||||
|
if ($result) {
|
||||||
|
$this->nickname = $nickname;
|
||||||
|
$this->fixupTimestamps();
|
||||||
|
$this->encache();
|
||||||
|
} else {
|
||||||
|
common_log_db_error($local, 'UPDATE', __FILE__);
|
||||||
|
throw new ServerException(_('Could not update local group.'));
|
||||||
|
}
|
||||||
|
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
}
|
@ -501,7 +501,11 @@ class Memcached_DataObject extends Safe_DataObject
|
|||||||
|
|
||||||
function raiseError($message, $type = null, $behaviour = null)
|
function raiseError($message, $type = null, $behaviour = null)
|
||||||
{
|
{
|
||||||
throw new ServerException("DB_DataObject error [$type]: $message");
|
$id = get_class($this);
|
||||||
|
if ($this->id) {
|
||||||
|
$id .= ':' . $this->id;
|
||||||
|
}
|
||||||
|
throw new ServerException("[$id] DB_DataObject error [$type]: $message");
|
||||||
}
|
}
|
||||||
|
|
||||||
static function cacheGet($keyPart)
|
static function cacheGet($keyPart)
|
||||||
|
@ -121,6 +121,9 @@ class Notice extends Memcached_DataObject
|
|||||||
$result = parent::delete();
|
$result = parent::delete();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extract #hashtags from this notice's content and save them to the database.
|
||||||
|
*/
|
||||||
function saveTags()
|
function saveTags()
|
||||||
{
|
{
|
||||||
/* extract all #hastags */
|
/* extract all #hastags */
|
||||||
@ -129,14 +132,22 @@ class Notice extends Memcached_DataObject
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
//turn each into their canonical tag
|
/* Add them to the database */
|
||||||
//this is needed to remove dupes before saving e.g. #hash.tag = #hashtag
|
return $this->saveKnownTags($match[1]);
|
||||||
$hashtags = array();
|
}
|
||||||
for($i=0; $i<count($match[1]); $i++) {
|
|
||||||
$hashtags[] = common_canonical_tag($match[1][$i]);
|
/**
|
||||||
|
* Record the given set of hash tags in the db for this notice.
|
||||||
|
* Given tag strings will be normalized and checked for dupes.
|
||||||
|
*/
|
||||||
|
function saveKnownTags($hashtags)
|
||||||
|
{
|
||||||
|
//turn each into their canonical tag
|
||||||
|
//this is needed to remove dupes before saving e.g. #hash.tag = #hashtag
|
||||||
|
for($i=0; $i<count($hashtags); $i++) {
|
||||||
|
$hashtags[$i] = common_canonical_tag($hashtags[$i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Add them to the database */
|
|
||||||
foreach(array_unique($hashtags) as $hashtag) {
|
foreach(array_unique($hashtags) as $hashtag) {
|
||||||
/* elide characters we don't want in the tag */
|
/* elide characters we don't want in the tag */
|
||||||
$this->saveTag($hashtag);
|
$this->saveTag($hashtag);
|
||||||
@ -145,6 +156,10 @@ class Notice extends Memcached_DataObject
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Record a single hash tag as associated with this notice.
|
||||||
|
* Tag format and uniqueness must be validated by caller.
|
||||||
|
*/
|
||||||
function saveTag($hashtag)
|
function saveTag($hashtag)
|
||||||
{
|
{
|
||||||
$tag = new Notice_tag();
|
$tag = new Notice_tag();
|
||||||
@ -187,13 +202,23 @@ class Notice extends Memcached_DataObject
|
|||||||
* int 'location_ns' geoname namespace to interpret location_id
|
* int 'location_ns' geoname namespace to interpret location_id
|
||||||
* int 'reply_to'; notice ID this is a reply to
|
* int 'reply_to'; notice ID this is a reply to
|
||||||
* int 'repeat_of'; notice ID this is a repeat of
|
* int 'repeat_of'; notice ID this is a repeat of
|
||||||
* string 'uri' permalink to notice; defaults to local notice URL
|
* string 'uri' unique ID for notice; defaults to local notice URL
|
||||||
|
* string 'url' permalink to notice; defaults to local notice URL
|
||||||
|
* string 'rendered' rendered HTML version of content
|
||||||
|
* array 'replies' list of profile URIs for reply delivery in
|
||||||
|
* place of extracting @-replies from content.
|
||||||
|
* array 'groups' list of group IDs to deliver to, in place of
|
||||||
|
* extracting ! tags from content
|
||||||
|
* array 'tags' list of hashtag strings to save with the notice
|
||||||
|
* in place of extracting # tags from content
|
||||||
|
* @fixme tag override
|
||||||
*
|
*
|
||||||
* @return Notice
|
* @return Notice
|
||||||
* @throws ClientException
|
* @throws ClientException
|
||||||
*/
|
*/
|
||||||
static function saveNew($profile_id, $content, $source, $options=null) {
|
static function saveNew($profile_id, $content, $source, $options=null) {
|
||||||
$defaults = array('uri' => null,
|
$defaults = array('uri' => null,
|
||||||
|
'url' => null,
|
||||||
'reply_to' => null,
|
'reply_to' => null,
|
||||||
'repeat_of' => null);
|
'repeat_of' => null);
|
||||||
|
|
||||||
@ -256,9 +281,10 @@ class Notice extends Memcached_DataObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
$notice->content = $final;
|
$notice->content = $final;
|
||||||
$notice->rendered = common_render_content($final, $notice);
|
|
||||||
$notice->source = $source;
|
$notice->source = $source;
|
||||||
$notice->uri = $uri;
|
$notice->uri = $uri;
|
||||||
|
$notice->url = $url;
|
||||||
|
|
||||||
// Handle repeat case
|
// Handle repeat case
|
||||||
|
|
||||||
@ -283,6 +309,12 @@ class Notice extends Memcached_DataObject
|
|||||||
$notice->location_ns = $location_ns;
|
$notice->location_ns = $location_ns;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!empty($rendered)) {
|
||||||
|
$notice->rendered = $rendered;
|
||||||
|
} else {
|
||||||
|
$notice->rendered = common_render_content($final, $notice);
|
||||||
|
}
|
||||||
|
|
||||||
if (Event::handle('StartNoticeSave', array(&$notice))) {
|
if (Event::handle('StartNoticeSave', array(&$notice))) {
|
||||||
|
|
||||||
// XXX: some of these functions write to the DB
|
// XXX: some of these functions write to the DB
|
||||||
@ -325,8 +357,33 @@ class Notice extends Memcached_DataObject
|
|||||||
|
|
||||||
# Clear the cache for subscribed users, so they'll update at next request
|
# Clear the cache for subscribed users, so they'll update at next request
|
||||||
# XXX: someone clever could prepend instead of clearing the cache
|
# XXX: someone clever could prepend instead of clearing the cache
|
||||||
|
|
||||||
$notice->blowOnInsert();
|
$notice->blowOnInsert();
|
||||||
|
|
||||||
|
// Save per-notice metadata...
|
||||||
|
|
||||||
|
if (isset($replies)) {
|
||||||
|
$notice->saveKnownReplies($replies);
|
||||||
|
} else {
|
||||||
|
$notice->saveReplies();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($groups)) {
|
||||||
|
$notice->saveKnownGroups($groups);
|
||||||
|
} else {
|
||||||
|
$notice->saveGroups();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($tags)) {
|
||||||
|
$notice->saveKnownTags($tags);
|
||||||
|
} else {
|
||||||
|
$notice->saveTags();
|
||||||
|
}
|
||||||
|
|
||||||
|
// @fixme pass in data for URLs too?
|
||||||
|
$notice->saveUrls();
|
||||||
|
|
||||||
|
// Prepare inbox delivery, may be queued to background.
|
||||||
$notice->distribute();
|
$notice->distribute();
|
||||||
|
|
||||||
return $notice;
|
return $notice;
|
||||||
@ -502,17 +559,17 @@ class Notice extends Memcached_DataObject
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function publicStream($offset=0, $limit=20, $since_id=0, $max_id=0, $since=null)
|
function publicStream($offset=0, $limit=20, $since_id=0, $max_id=0)
|
||||||
{
|
{
|
||||||
$ids = Notice::stream(array('Notice', '_publicStreamDirect'),
|
$ids = Notice::stream(array('Notice', '_publicStreamDirect'),
|
||||||
array(),
|
array(),
|
||||||
'public',
|
'public',
|
||||||
$offset, $limit, $since_id, $max_id, $since);
|
$offset, $limit, $since_id, $max_id);
|
||||||
|
|
||||||
return Notice::getStreamByIds($ids);
|
return Notice::getStreamByIds($ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
function _publicStreamDirect($offset=0, $limit=20, $since_id=0, $max_id=0, $since=null)
|
function _publicStreamDirect($offset=0, $limit=20, $since_id=0, $max_id=0)
|
||||||
{
|
{
|
||||||
$notice = new Notice();
|
$notice = new Notice();
|
||||||
|
|
||||||
@ -541,10 +598,6 @@ class Notice extends Memcached_DataObject
|
|||||||
$notice->whereAdd('id <= ' . $max_id);
|
$notice->whereAdd('id <= ' . $max_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_null($since)) {
|
|
||||||
$notice->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\'');
|
|
||||||
}
|
|
||||||
|
|
||||||
$ids = array();
|
$ids = array();
|
||||||
|
|
||||||
if ($notice->find()) {
|
if ($notice->find()) {
|
||||||
@ -559,17 +612,17 @@ class Notice extends Memcached_DataObject
|
|||||||
return $ids;
|
return $ids;
|
||||||
}
|
}
|
||||||
|
|
||||||
function conversationStream($id, $offset=0, $limit=20, $since_id=0, $max_id=0, $since=null)
|
function conversationStream($id, $offset=0, $limit=20, $since_id=0, $max_id=0)
|
||||||
{
|
{
|
||||||
$ids = Notice::stream(array('Notice', '_conversationStreamDirect'),
|
$ids = Notice::stream(array('Notice', '_conversationStreamDirect'),
|
||||||
array($id),
|
array($id),
|
||||||
'notice:conversation_ids:'.$id,
|
'notice:conversation_ids:'.$id,
|
||||||
$offset, $limit, $since_id, $max_id, $since);
|
$offset, $limit, $since_id, $max_id);
|
||||||
|
|
||||||
return Notice::getStreamByIds($ids);
|
return Notice::getStreamByIds($ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
function _conversationStreamDirect($id, $offset=0, $limit=20, $since_id=0, $max_id=0, $since=null)
|
function _conversationStreamDirect($id, $offset=0, $limit=20, $since_id=0, $max_id=0)
|
||||||
{
|
{
|
||||||
$notice = new Notice();
|
$notice = new Notice();
|
||||||
|
|
||||||
@ -592,10 +645,6 @@ class Notice extends Memcached_DataObject
|
|||||||
$notice->whereAdd('id <= ' . $max_id);
|
$notice->whereAdd('id <= ' . $max_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_null($since)) {
|
|
||||||
$notice->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\'');
|
|
||||||
}
|
|
||||||
|
|
||||||
$ids = array();
|
$ids = array();
|
||||||
|
|
||||||
if ($notice->find()) {
|
if ($notice->find()) {
|
||||||
@ -677,11 +726,39 @@ class Notice extends Memcached_DataObject
|
|||||||
return $ni;
|
return $ni;
|
||||||
}
|
}
|
||||||
|
|
||||||
function addToInboxes($groups, $recipients)
|
/**
|
||||||
|
* Adds this notice to the inboxes of each local user who should receive
|
||||||
|
* it, based on author subscriptions, group memberships, and @-replies.
|
||||||
|
*
|
||||||
|
* Warning: running a second time currently will make items appear
|
||||||
|
* multiple times in users' inboxes.
|
||||||
|
*
|
||||||
|
* @fixme make more robust against errors
|
||||||
|
* @fixme break up massive deliveries to smaller background tasks
|
||||||
|
*
|
||||||
|
* @param array $groups optional list of Group objects;
|
||||||
|
* if left empty, will be loaded from group_inbox records
|
||||||
|
* @param array $recipient optional list of reply profile ids
|
||||||
|
* if left empty, will be loaded from reply records
|
||||||
|
*/
|
||||||
|
function addToInboxes($groups=null, $recipients=null)
|
||||||
{
|
{
|
||||||
$ni = $this->whoGets($groups, $recipients);
|
$ni = $this->whoGets($groups, $recipients);
|
||||||
|
|
||||||
Inbox::bulkInsert($this->id, array_keys($ni));
|
$ids = array_keys($ni);
|
||||||
|
|
||||||
|
// We remove the author (if they're a local user),
|
||||||
|
// since we'll have already done this in distribute()
|
||||||
|
|
||||||
|
$i = array_search($this->profile_id, $ids);
|
||||||
|
|
||||||
|
if ($i !== false) {
|
||||||
|
unset($ids[$i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Bulk insert
|
||||||
|
|
||||||
|
Inbox::bulkInsert($this->id, $ids);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -714,6 +791,42 @@ class Notice extends Memcached_DataObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Record this notice to the given group inboxes for delivery.
|
||||||
|
* Overrides the regular parsing of !group markup.
|
||||||
|
*
|
||||||
|
* @param string $group_ids
|
||||||
|
* @fixme might prefer URIs as identifiers, as for replies?
|
||||||
|
* best with generalizations on user_group to support
|
||||||
|
* remote groups better.
|
||||||
|
*/
|
||||||
|
function saveKnownGroups($group_ids)
|
||||||
|
{
|
||||||
|
if (!is_array($group_ids)) {
|
||||||
|
throw new ServerException("Bad type provided to saveKnownGroups");
|
||||||
|
}
|
||||||
|
|
||||||
|
$groups = array();
|
||||||
|
foreach ($group_ids as $id) {
|
||||||
|
$group = User_group::staticGet('id', $id);
|
||||||
|
if ($group) {
|
||||||
|
common_log(LOG_ERR, "Local delivery to group id $id, $group->nickname");
|
||||||
|
$result = $this->addToGroupInbox($group);
|
||||||
|
if (!$result) {
|
||||||
|
common_log_db_error($gi, 'INSERT', __FILE__);
|
||||||
|
}
|
||||||
|
|
||||||
|
// @fixme should we save the tags here or not?
|
||||||
|
$groups[] = clone($group);
|
||||||
|
} else {
|
||||||
|
common_log(LOG_ERR, "Local delivery to group id $id skipped, doesn't exist");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $groups;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parse !group delivery and record targets into group_inbox.
|
||||||
* @return array of Group objects
|
* @return array of Group objects
|
||||||
*/
|
*/
|
||||||
function saveGroups()
|
function saveGroups()
|
||||||
@ -797,8 +910,51 @@ class Notice extends Memcached_DataObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Save reply records indicating that this notice needs to be
|
||||||
|
* delivered to the local users with the given URIs.
|
||||||
|
*
|
||||||
|
* Since this is expected to be used when saving foreign-sourced
|
||||||
|
* messages, we won't deliver to any remote targets as that's the
|
||||||
|
* source service's responsibility.
|
||||||
|
*
|
||||||
|
* @fixme Unlike saveReplies() there's no mail notification here.
|
||||||
|
* Move that to distrib queue handler?
|
||||||
|
*
|
||||||
|
* @param array of unique identifier URIs for recipients
|
||||||
|
*/
|
||||||
|
function saveKnownReplies($uris)
|
||||||
|
{
|
||||||
|
foreach ($uris as $uri) {
|
||||||
|
|
||||||
|
$user = User::staticGet('uri', $uri);
|
||||||
|
|
||||||
|
if (!empty($user)) {
|
||||||
|
|
||||||
|
$reply = new Reply();
|
||||||
|
|
||||||
|
$reply->notice_id = $this->id;
|
||||||
|
$reply->profile_id = $user->id;
|
||||||
|
|
||||||
|
$id = $reply->insert();
|
||||||
|
|
||||||
|
self::blow('reply:stream:%d', $user->id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pull @-replies from this message's content in StatusNet markup format
|
||||||
|
* and save reply records indicating that this message needs to be
|
||||||
|
* delivered to those users.
|
||||||
|
*
|
||||||
|
* Side effect: local recipients get e-mail notifications here.
|
||||||
|
* @fixme move mail notifications to distrib?
|
||||||
|
*
|
||||||
* @return array of integer profile IDs
|
* @return array of integer profile IDs
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function saveReplies()
|
function saveReplies()
|
||||||
{
|
{
|
||||||
// Don't save reply data for repeats
|
// Don't save reply data for repeats
|
||||||
@ -807,76 +963,47 @@ class Notice extends Memcached_DataObject
|
|||||||
return array();
|
return array();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Alternative reply format
|
|
||||||
$tname = false;
|
|
||||||
if (preg_match('/^T ([A-Z0-9]{1,64}) /', $this->content, $match)) {
|
|
||||||
$tname = $match[1];
|
|
||||||
}
|
|
||||||
// extract all @messages
|
|
||||||
$cnt = preg_match_all('/(?:^|\s)@([a-z0-9]{1,64})/', $this->content, $match);
|
|
||||||
|
|
||||||
$names = array();
|
|
||||||
|
|
||||||
if ($cnt || $tname) {
|
|
||||||
// XXX: is there another way to make an array copy?
|
|
||||||
$names = ($tname) ? array_unique(array_merge(array(strtolower($tname)), $match[1])) : array_unique($match[1]);
|
|
||||||
}
|
|
||||||
|
|
||||||
$sender = Profile::staticGet($this->profile_id);
|
$sender = Profile::staticGet($this->profile_id);
|
||||||
|
|
||||||
|
// @todo ideally this parser information would only
|
||||||
|
// be calculated once.
|
||||||
|
|
||||||
|
$mentions = common_find_mentions($this->content, $this);
|
||||||
|
|
||||||
$replied = array();
|
$replied = array();
|
||||||
|
|
||||||
// store replied only for first @ (what user/notice what the reply directed,
|
// store replied only for first @ (what user/notice what the reply directed,
|
||||||
// we assume first @ is it)
|
// we assume first @ is it)
|
||||||
|
|
||||||
for ($i=0; $i<count($names); $i++) {
|
foreach ($mentions as $mention) {
|
||||||
$nickname = $names[$i];
|
|
||||||
$recipient = common_relative_profile($sender, $nickname, $this->created);
|
foreach ($mention['mentioned'] as $mentioned) {
|
||||||
if (empty($recipient)) {
|
|
||||||
|
// skip if they're already covered
|
||||||
|
|
||||||
|
if (!empty($replied[$mentioned->id])) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
// Don't save replies from blocked profile to local user
|
|
||||||
$recipient_user = User::staticGet('id', $recipient->id);
|
|
||||||
if (!empty($recipient_user) && $recipient_user->hasBlocked($sender)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
$reply = new Reply();
|
|
||||||
$reply->notice_id = $this->id;
|
|
||||||
$reply->profile_id = $recipient->id;
|
|
||||||
$id = $reply->insert();
|
|
||||||
if (!$id) {
|
|
||||||
$last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
|
|
||||||
common_log(LOG_ERR, 'DB error inserting reply: ' . $last_error->message);
|
|
||||||
common_server_error(sprintf(_('DB error inserting reply: %s'), $last_error->message));
|
|
||||||
return array();
|
|
||||||
} else {
|
|
||||||
$replied[$recipient->id] = 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Hash format replies, too
|
|
||||||
$cnt = preg_match_all('/(?:^|\s)@#([a-z0-9]{1,64})/', $this->content, $match);
|
|
||||||
if ($cnt) {
|
|
||||||
foreach ($match[1] as $tag) {
|
|
||||||
$tagged = Profile_tag::getTagged($sender->id, $tag);
|
|
||||||
foreach ($tagged as $t) {
|
|
||||||
if (!$replied[$t->id]) {
|
|
||||||
// Don't save replies from blocked profile to local user
|
// Don't save replies from blocked profile to local user
|
||||||
$t_user = User::staticGet('id', $t->id);
|
|
||||||
if ($t_user && $t_user->hasBlocked($sender)) {
|
$mentioned_user = User::staticGet('id', $mentioned->id);
|
||||||
|
if (!empty($mentioned_user) && $mentioned_user->hasBlocked($sender)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
$reply = new Reply();
|
$reply = new Reply();
|
||||||
|
|
||||||
$reply->notice_id = $this->id;
|
$reply->notice_id = $this->id;
|
||||||
$reply->profile_id = $t->id;
|
$reply->profile_id = $mentioned->id;
|
||||||
|
|
||||||
$id = $reply->insert();
|
$id = $reply->insert();
|
||||||
|
|
||||||
if (!$id) {
|
if (!$id) {
|
||||||
common_log_db_error($reply, 'INSERT', __FILE__);
|
common_log_db_error($reply, 'INSERT', __FILE__);
|
||||||
return array();
|
throw new ServerException("Couldn't save reply for {$this->id}, {$mentioned->id}");
|
||||||
} else {
|
} else {
|
||||||
$replied[$recipient->id] = 1;
|
$replied[$mentioned->id] = 1;
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -917,9 +1044,10 @@ class Notice extends Memcached_DataObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Same calculation as saveGroups but without the saving
|
* Pull list of groups this notice needs to be delivered to,
|
||||||
* @fixme merge the functions
|
* as previously recorded by saveGroups() or saveKnownGroups().
|
||||||
* @return array of Group_inbox objects
|
*
|
||||||
|
* @return array of Group objects
|
||||||
*/
|
*/
|
||||||
function getGroups()
|
function getGroups()
|
||||||
{
|
{
|
||||||
@ -942,7 +1070,10 @@ class Notice extends Memcached_DataObject
|
|||||||
|
|
||||||
if ($gi->find()) {
|
if ($gi->find()) {
|
||||||
while ($gi->fetch()) {
|
while ($gi->fetch()) {
|
||||||
$groups[] = clone($gi);
|
$group = User_group::staticGet('id', $gi->group_id);
|
||||||
|
if ($group) {
|
||||||
|
$groups[] = $group;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -962,6 +1093,8 @@ class Notice extends Memcached_DataObject
|
|||||||
'xmlns:thr' => 'http://purl.org/syndication/thread/1.0',
|
'xmlns:thr' => 'http://purl.org/syndication/thread/1.0',
|
||||||
'xmlns:georss' => 'http://www.georss.org/georss',
|
'xmlns:georss' => 'http://www.georss.org/georss',
|
||||||
'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/',
|
'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/',
|
||||||
|
'xmlns:media' => 'http://purl.org/syndication/atommedia',
|
||||||
|
'xmlns:poco' => 'http://portablecontacts.net/spec/1.0',
|
||||||
'xmlns:ostatus' => 'http://ostatus.org/schema/1.0');
|
'xmlns:ostatus' => 'http://ostatus.org/schema/1.0');
|
||||||
} else {
|
} else {
|
||||||
$attrs = array();
|
$attrs = array();
|
||||||
@ -993,12 +1126,12 @@ class Notice extends Memcached_DataObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
$xs->element('title', null, $this->content);
|
$xs->element('title', null, $this->content);
|
||||||
$xs->element('summary', null, $this->content);
|
|
||||||
|
|
||||||
$xs->raw($profile->asAtomAuthor());
|
$xs->raw($profile->asAtomAuthor());
|
||||||
$xs->raw($profile->asActivityActor());
|
$xs->raw($profile->asActivityActor());
|
||||||
|
|
||||||
$xs->element('link', array('rel' => 'alternate',
|
$xs->element('link', array('rel' => 'alternate',
|
||||||
|
'type' => 'text/html',
|
||||||
'href' => $this->bestUrl()));
|
'href' => $this->bestUrl()));
|
||||||
|
|
||||||
$xs->element('id', null, $this->uri);
|
$xs->element('id', null, $this->uri);
|
||||||
@ -1045,6 +1178,17 @@ class Notice extends Memcached_DataObject
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$groups = $this->getGroups();
|
||||||
|
|
||||||
|
foreach ($groups as $group) {
|
||||||
|
$xs->element(
|
||||||
|
'link', array(
|
||||||
|
'rel' => 'ostatus:attention',
|
||||||
|
'href' => $group->permalink()
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if (!empty($this->repeat_of)) {
|
if (!empty($this->repeat_of)) {
|
||||||
$repeat = Notice::staticGet('id', $this->repeat_of);
|
$repeat = Notice::staticGet('id', $this->repeat_of);
|
||||||
if (!empty($repeat)) {
|
if (!empty($repeat)) {
|
||||||
@ -1090,6 +1234,21 @@ class Notice extends Memcached_DataObject
|
|||||||
return $xs->getString();
|
return $xs->getString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns an XML string fragment with a reference to a notice as an
|
||||||
|
* Activity Streams noun object with the given element type.
|
||||||
|
*
|
||||||
|
* Assumes that 'activity' namespace has been previously defined.
|
||||||
|
*
|
||||||
|
* @param string $element one of 'subject', 'object', 'target'
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
function asActivityNoun($element)
|
||||||
|
{
|
||||||
|
$noun = ActivityObject::fromNotice($this);
|
||||||
|
return $noun->asString('activity:' . $element);
|
||||||
|
}
|
||||||
|
|
||||||
function bestUrl()
|
function bestUrl()
|
||||||
{
|
{
|
||||||
if (!empty($this->url)) {
|
if (!empty($this->url)) {
|
||||||
@ -1102,16 +1261,16 @@ class Notice extends Memcached_DataObject
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function stream($fn, $args, $cachekey, $offset=0, $limit=20, $since_id=0, $max_id=0, $since=null)
|
function stream($fn, $args, $cachekey, $offset=0, $limit=20, $since_id=0, $max_id=0)
|
||||||
{
|
{
|
||||||
$cache = common_memcache();
|
$cache = common_memcache();
|
||||||
|
|
||||||
if (empty($cache) ||
|
if (empty($cache) ||
|
||||||
$since_id != 0 || $max_id != 0 || (!is_null($since) && $since > 0) ||
|
$since_id != 0 || $max_id != 0 ||
|
||||||
is_null($limit) ||
|
is_null($limit) ||
|
||||||
($offset + $limit) > NOTICE_CACHE_WINDOW) {
|
($offset + $limit) > NOTICE_CACHE_WINDOW) {
|
||||||
return call_user_func_array($fn, array_merge($args, array($offset, $limit, $since_id,
|
return call_user_func_array($fn, array_merge($args, array($offset, $limit, $since_id,
|
||||||
$max_id, $since)));
|
$max_id)));
|
||||||
}
|
}
|
||||||
|
|
||||||
$idkey = common_cache_key($cachekey);
|
$idkey = common_cache_key($cachekey);
|
||||||
@ -1487,6 +1646,14 @@ class Notice extends Memcached_DataObject
|
|||||||
|
|
||||||
function distribute()
|
function distribute()
|
||||||
{
|
{
|
||||||
|
// We always insert for the author so they don't
|
||||||
|
// have to wait
|
||||||
|
|
||||||
|
$user = User::staticGet('id', $this->profile_id);
|
||||||
|
if (!empty($user)) {
|
||||||
|
Inbox::insertNotice($user->id, $this->id);
|
||||||
|
}
|
||||||
|
|
||||||
if (common_config('queue', 'inboxes')) {
|
if (common_config('queue', 'inboxes')) {
|
||||||
// If there's a failure, we want to _force_
|
// If there's a failure, we want to _force_
|
||||||
// distribution at this point.
|
// distribution at this point.
|
||||||
|
@ -49,12 +49,12 @@ class Notice_inbox extends Memcached_DataObject
|
|||||||
/* the code above is auto generated do not remove the tag below */
|
/* the code above is auto generated do not remove the tag below */
|
||||||
###END_AUTOCODE
|
###END_AUTOCODE
|
||||||
|
|
||||||
function stream($user_id, $offset, $limit, $since_id, $max_id, $since, $own=false)
|
function stream($user_id, $offset, $limit, $since_id, $max_id, $own=false)
|
||||||
{
|
{
|
||||||
throw new Exception('Notice_inbox no longer used; use Inbox');
|
throw new Exception('Notice_inbox no longer used; use Inbox');
|
||||||
}
|
}
|
||||||
|
|
||||||
function _streamDirect($user_id, $own, $offset, $limit, $since_id, $max_id, $since)
|
function _streamDirect($user_id, $own, $offset, $limit, $since_id, $max_id)
|
||||||
{
|
{
|
||||||
throw new Exception('Notice_inbox no longer used; use Inbox');
|
throw new Exception('Notice_inbox no longer used; use Inbox');
|
||||||
}
|
}
|
||||||
|
@ -46,7 +46,7 @@ class Notice_tag extends Memcached_DataObject
|
|||||||
return Notice::getStreamByIds($ids);
|
return Notice::getStreamByIds($ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
function _streamDirect($tag, $offset, $limit, $since_id, $max_id, $since)
|
function _streamDirect($tag, $offset, $limit, $since_id, $max_id)
|
||||||
{
|
{
|
||||||
$nt = new Notice_tag();
|
$nt = new Notice_tag();
|
||||||
|
|
||||||
@ -63,10 +63,6 @@ class Notice_tag extends Memcached_DataObject
|
|||||||
$nt->whereAdd('notice_id < ' . $max_id);
|
$nt->whereAdd('notice_id < ' . $max_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_null($since)) {
|
|
||||||
$nt->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\'');
|
|
||||||
}
|
|
||||||
|
|
||||||
$nt->orderBy('notice_id DESC');
|
$nt->orderBy('notice_id DESC');
|
||||||
|
|
||||||
if (!is_null($offset)) {
|
if (!is_null($offset)) {
|
||||||
|
@ -163,27 +163,27 @@ class Profile extends Memcached_DataObject
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getTaggedNotices($tag, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0, $since=null)
|
function getTaggedNotices($tag, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0)
|
||||||
{
|
{
|
||||||
$ids = Notice::stream(array($this, '_streamTaggedDirect'),
|
$ids = Notice::stream(array($this, '_streamTaggedDirect'),
|
||||||
array($tag),
|
array($tag),
|
||||||
'profile:notice_ids_tagged:' . $this->id . ':' . $tag,
|
'profile:notice_ids_tagged:' . $this->id . ':' . $tag,
|
||||||
$offset, $limit, $since_id, $max_id, $since);
|
$offset, $limit, $since_id, $max_id);
|
||||||
return Notice::getStreamByIds($ids);
|
return Notice::getStreamByIds($ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0, $since=null)
|
function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0)
|
||||||
{
|
{
|
||||||
// XXX: I'm not sure this is going to be any faster. It probably isn't.
|
// XXX: I'm not sure this is going to be any faster. It probably isn't.
|
||||||
$ids = Notice::stream(array($this, '_streamDirect'),
|
$ids = Notice::stream(array($this, '_streamDirect'),
|
||||||
array(),
|
array(),
|
||||||
'profile:notice_ids:' . $this->id,
|
'profile:notice_ids:' . $this->id,
|
||||||
$offset, $limit, $since_id, $max_id, $since);
|
$offset, $limit, $since_id, $max_id);
|
||||||
|
|
||||||
return Notice::getStreamByIds($ids);
|
return Notice::getStreamByIds($ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
function _streamTaggedDirect($tag, $offset, $limit, $since_id, $max_id, $since)
|
function _streamTaggedDirect($tag, $offset, $limit, $since_id, $max_id)
|
||||||
{
|
{
|
||||||
// XXX It would be nice to do this without a join
|
// XXX It would be nice to do this without a join
|
||||||
|
|
||||||
@ -202,10 +202,6 @@ class Profile extends Memcached_DataObject
|
|||||||
$query .= " and id < $max_id";
|
$query .= " and id < $max_id";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_null($since)) {
|
|
||||||
$query .= " and created > '" . date('Y-m-d H:i:s', $since) . "'";
|
|
||||||
}
|
|
||||||
|
|
||||||
$query .= ' order by id DESC';
|
$query .= ' order by id DESC';
|
||||||
|
|
||||||
if (!is_null($offset)) {
|
if (!is_null($offset)) {
|
||||||
@ -223,7 +219,7 @@ class Profile extends Memcached_DataObject
|
|||||||
return $ids;
|
return $ids;
|
||||||
}
|
}
|
||||||
|
|
||||||
function _streamDirect($offset, $limit, $since_id, $max_id, $since = null)
|
function _streamDirect($offset, $limit, $since_id, $max_id)
|
||||||
{
|
{
|
||||||
$notice = new Notice();
|
$notice = new Notice();
|
||||||
|
|
||||||
@ -240,10 +236,6 @@ class Profile extends Memcached_DataObject
|
|||||||
$notice->whereAdd('id <= ' . $max_id);
|
$notice->whereAdd('id <= ' . $max_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_null($since)) {
|
|
||||||
$notice->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\'');
|
|
||||||
}
|
|
||||||
|
|
||||||
$notice->orderBy('id DESC');
|
$notice->orderBy('id DESC');
|
||||||
|
|
||||||
if (!is_null($offset)) {
|
if (!is_null($offset)) {
|
||||||
@ -792,44 +784,17 @@ class Profile extends Memcached_DataObject
|
|||||||
* Returns an XML string fragment with profile information as an
|
* Returns an XML string fragment with profile information as an
|
||||||
* Activity Streams noun object with the given element type.
|
* Activity Streams noun object with the given element type.
|
||||||
*
|
*
|
||||||
* Assumes that 'activity' namespace has been previously defined.
|
* Assumes that 'activity', 'georss', and 'poco' namespace has been
|
||||||
|
* previously defined.
|
||||||
*
|
*
|
||||||
* @param string $element one of 'actor', 'subject', 'object', 'target'
|
* @param string $element one of 'actor', 'subject', 'object', 'target'
|
||||||
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function asActivityNoun($element)
|
function asActivityNoun($element)
|
||||||
{
|
{
|
||||||
$xs = new XMLStringer(true);
|
$noun = ActivityObject::fromProfile($this);
|
||||||
|
return $noun->asString('activity:' . $element);
|
||||||
$xs->elementStart('activity:' . $element);
|
|
||||||
$xs->element(
|
|
||||||
'activity:object-type',
|
|
||||||
null,
|
|
||||||
'http://activitystrea.ms/schema/1.0/person'
|
|
||||||
);
|
|
||||||
$xs->element(
|
|
||||||
'id',
|
|
||||||
null,
|
|
||||||
$this->getUri()
|
|
||||||
);
|
|
||||||
$xs->element('title', null, $this->getBestName());
|
|
||||||
|
|
||||||
$avatar = $this->getAvatar(AVATAR_PROFILE_SIZE);
|
|
||||||
|
|
||||||
$xs->element(
|
|
||||||
'link', array(
|
|
||||||
'type' => empty($avatar) ? 'image/png' : $avatar->mediatype,
|
|
||||||
'rel' => 'avatar',
|
|
||||||
'href' => empty($avatar)
|
|
||||||
? Avatar::defaultImage(AVATAR_PROFILE_SIZE)
|
|
||||||
: $avatar->displayUrl()
|
|
||||||
),
|
|
||||||
''
|
|
||||||
);
|
|
||||||
|
|
||||||
$xs->elementEnd('activity:' . $element);
|
|
||||||
|
|
||||||
return $xs->getString();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -841,31 +806,37 @@ class Profile extends Memcached_DataObject
|
|||||||
{
|
{
|
||||||
$uri = null;
|
$uri = null;
|
||||||
|
|
||||||
|
// give plugins a chance to set the URI
|
||||||
|
if (Event::handle('StartGetProfileUri', array($this, &$uri))) {
|
||||||
|
|
||||||
// check for a local user first
|
// check for a local user first
|
||||||
$user = User::staticGet('id', $this->id);
|
$user = User::staticGet('id', $this->id);
|
||||||
|
|
||||||
if (!empty($user)) {
|
if (!empty($user)) {
|
||||||
$uri = common_local_url(
|
$uri = $user->uri;
|
||||||
'userbyid',
|
|
||||||
array('id' => $user->id)
|
|
||||||
);
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
// give plugins a chance to set the URI
|
|
||||||
if (Event::handle('StartGetProfileUri', array($this, &$uri))) {
|
|
||||||
|
|
||||||
// return OMB profile if any
|
// return OMB profile if any
|
||||||
$remote = Remote_profile::staticGet('id', $this->id);
|
$remote = Remote_profile::staticGet('id', $this->id);
|
||||||
|
|
||||||
if (!empty($remote)) {
|
if (!empty($remote)) {
|
||||||
$uri = $remote->uri;
|
$uri = $remote->uri;
|
||||||
}
|
}
|
||||||
|
|
||||||
Event::handle('EndGetProfileUri', array($this, &$uri));
|
|
||||||
}
|
}
|
||||||
|
Event::handle('EndGetProfileUri', array($this, &$uri));
|
||||||
}
|
}
|
||||||
|
|
||||||
return $uri;
|
return $uri;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function hasBlocked($other)
|
||||||
|
{
|
||||||
|
$block = Profile_block::get($this->id, $other->id);
|
||||||
|
|
||||||
|
if (empty($block)) {
|
||||||
|
$result = false;
|
||||||
|
} else {
|
||||||
|
$result = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -22,16 +22,16 @@ class Reply extends Memcached_DataObject
|
|||||||
/* the code above is auto generated do not remove the tag below */
|
/* the code above is auto generated do not remove the tag below */
|
||||||
###END_AUTOCODE
|
###END_AUTOCODE
|
||||||
|
|
||||||
function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0, $since=null)
|
function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0)
|
||||||
{
|
{
|
||||||
$ids = Notice::stream(array('Reply', '_streamDirect'),
|
$ids = Notice::stream(array('Reply', '_streamDirect'),
|
||||||
array($user_id),
|
array($user_id),
|
||||||
'reply:stream:' . $user_id,
|
'reply:stream:' . $user_id,
|
||||||
$offset, $limit, $since_id, $max_id, $since);
|
$offset, $limit, $since_id, $max_id);
|
||||||
return $ids;
|
return $ids;
|
||||||
}
|
}
|
||||||
|
|
||||||
function _streamDirect($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0, $since=null)
|
function _streamDirect($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0)
|
||||||
{
|
{
|
||||||
$reply = new Reply();
|
$reply = new Reply();
|
||||||
$reply->profile_id = $user_id;
|
$reply->profile_id = $user_id;
|
||||||
@ -44,10 +44,6 @@ class Reply extends Memcached_DataObject
|
|||||||
$reply->whereAdd('notice_id < ' . $max_id);
|
$reply->whereAdd('notice_id < ' . $max_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_null($since)) {
|
|
||||||
$reply->whereAdd('modified > \'' . date('Y-m-d H:i:s', $since) . '\'');
|
|
||||||
}
|
|
||||||
|
|
||||||
$reply->orderBy('notice_id DESC');
|
$reply->orderBy('notice_id DESC');
|
||||||
|
|
||||||
if (!is_null($offset)) {
|
if (!is_null($offset)) {
|
||||||
|
@ -50,4 +50,172 @@ class Subscription extends Memcached_DataObject
|
|||||||
{
|
{
|
||||||
return Memcached_DataObject::pkeyGet('Subscription', $kv);
|
return Memcached_DataObject::pkeyGet('Subscription', $kv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Make a new subscription
|
||||||
|
*
|
||||||
|
* @param Profile $subscriber party to receive new notices
|
||||||
|
* @param Profile $other party sending notices; publisher
|
||||||
|
*
|
||||||
|
* @return Subscription new subscription
|
||||||
|
*/
|
||||||
|
|
||||||
|
static function start($subscriber, $other)
|
||||||
|
{
|
||||||
|
if (!$subscriber->hasRight(Right::SUBSCRIBE)) {
|
||||||
|
throw new Exception(_('You have been banned from subscribing.'));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (self::exists($subscriber, $other)) {
|
||||||
|
throw new Exception(_('Already subscribed!'));
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($other->hasBlocked($subscriber)) {
|
||||||
|
throw new Exception(_('User has blocked you.'));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Event::handle('StartSubscribe', array($subscriber, $other))) {
|
||||||
|
|
||||||
|
$sub = new Subscription();
|
||||||
|
|
||||||
|
$sub->subscriber = $subscriber->id;
|
||||||
|
$sub->subscribed = $other->id;
|
||||||
|
$sub->created = common_sql_now();
|
||||||
|
|
||||||
|
$result = $sub->insert();
|
||||||
|
|
||||||
|
if (!$result) {
|
||||||
|
common_log_db_error($sub, 'INSERT', __FILE__);
|
||||||
|
throw new Exception(_('Could not save subscription.'));
|
||||||
|
}
|
||||||
|
|
||||||
|
$sub->notify();
|
||||||
|
|
||||||
|
self::blow('user:notices_with_friends:%d', $subscriber->id);
|
||||||
|
|
||||||
|
$subscriber->blowSubscriptionsCount();
|
||||||
|
$other->blowSubscribersCount();
|
||||||
|
|
||||||
|
$otherUser = User::staticGet('id', $other->id);
|
||||||
|
|
||||||
|
if (!empty($otherUser) &&
|
||||||
|
$otherUser->autosubscribe &&
|
||||||
|
!self::exists($other, $subscriber) &&
|
||||||
|
!$subscriber->hasBlocked($other)) {
|
||||||
|
|
||||||
|
$auto = new Subscription();
|
||||||
|
|
||||||
|
$auto->subscriber = $subscriber->id;
|
||||||
|
$auto->subscribed = $other->id;
|
||||||
|
$auto->created = common_sql_now();
|
||||||
|
|
||||||
|
$result = $auto->insert();
|
||||||
|
|
||||||
|
if (!$result) {
|
||||||
|
common_log_db_error($auto, 'INSERT', __FILE__);
|
||||||
|
throw new Exception(_('Could not save subscription.'));
|
||||||
|
}
|
||||||
|
|
||||||
|
$auto->notify();
|
||||||
|
}
|
||||||
|
|
||||||
|
Event::handle('EndSubscribe', array($subscriber, $other));
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function notify()
|
||||||
|
{
|
||||||
|
# XXX: add other notifications (Jabber, SMS) here
|
||||||
|
# XXX: queue this and handle it offline
|
||||||
|
# XXX: Whatever happens, do it in Twitter-like API, too
|
||||||
|
|
||||||
|
$this->notifyEmail();
|
||||||
|
}
|
||||||
|
|
||||||
|
function notifyEmail()
|
||||||
|
{
|
||||||
|
$subscribedUser = User::staticGet('id', $this->subscribed);
|
||||||
|
|
||||||
|
if (!empty($subscribedUser)) {
|
||||||
|
|
||||||
|
$subscriber = Profile::staticGet('id', $this->subscriber);
|
||||||
|
|
||||||
|
mail_subscribe_notify_profile($subscribedUser, $subscriber);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Cancel a subscription
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
function cancel($subscriber, $other)
|
||||||
|
{
|
||||||
|
if (!self::exists($subscriber, $other)) {
|
||||||
|
throw new Exception(_('Not subscribed!'));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Don't allow deleting self subs
|
||||||
|
|
||||||
|
if ($subscriber->id == $other->id) {
|
||||||
|
throw new Exception(_('Couldn\'t delete self-subscription.'));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Event::handle('StartUnsubscribe', array($subscriber, $other))) {
|
||||||
|
|
||||||
|
$sub = Subscription::pkeyGet(array('subscriber' => $subscriber->id,
|
||||||
|
'subscribed' => $other->id));
|
||||||
|
|
||||||
|
// note we checked for existence above
|
||||||
|
|
||||||
|
assert(!empty($sub));
|
||||||
|
|
||||||
|
// @todo: move this block to EndSubscribe handler for
|
||||||
|
// OMB plugin when it exists.
|
||||||
|
|
||||||
|
if (!empty($sub->token)) {
|
||||||
|
|
||||||
|
$token = new Token();
|
||||||
|
|
||||||
|
$token->tok = $sub->token;
|
||||||
|
|
||||||
|
if ($token->find(true)) {
|
||||||
|
|
||||||
|
$result = $token->delete();
|
||||||
|
|
||||||
|
if (!$result) {
|
||||||
|
common_log_db_error($token, 'DELETE', __FILE__);
|
||||||
|
throw new Exception(_('Couldn\'t delete subscription OMB token.'));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
common_log(LOG_ERR, "Couldn't find credentials with token {$token->tok}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$result = $sub->delete();
|
||||||
|
|
||||||
|
if (!$result) {
|
||||||
|
common_log_db_error($sub, 'DELETE', __FILE__);
|
||||||
|
throw new Exception(_('Couldn\'t delete subscription.'));
|
||||||
|
}
|
||||||
|
|
||||||
|
self::blow('user:notices_with_friends:%d', $subscriber->id);
|
||||||
|
|
||||||
|
$subscriber->blowSubscriptionsCount();
|
||||||
|
$other->blowSubscribersCount();
|
||||||
|
|
||||||
|
Event::handle('EndUnsubscribe', array($subscriber, $other));
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
function exists($subscriber, $other)
|
||||||
|
{
|
||||||
|
$sub = Subscription::pkeyGet(array('subscriber' => $subscriber->id,
|
||||||
|
'subscribed' => $other->id));
|
||||||
|
return (empty($sub)) ? false : true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -80,11 +80,7 @@ class User extends Memcached_DataObject
|
|||||||
|
|
||||||
function isSubscribed($other)
|
function isSubscribed($other)
|
||||||
{
|
{
|
||||||
assert(!is_null($other));
|
return Subscription::exists($this->getProfile(), $other);
|
||||||
// XXX: cache results of this query
|
|
||||||
$sub = Subscription::pkeyGet(array('subscriber' => $this->id,
|
|
||||||
'subscribed' => $other->id));
|
|
||||||
return (is_null($sub)) ? false : true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 'update' won't write key columns, so we have to do it ourselves.
|
// 'update' won't write key columns, so we have to do it ourselves.
|
||||||
@ -167,17 +163,8 @@ class User extends Memcached_DataObject
|
|||||||
|
|
||||||
function hasBlocked($other)
|
function hasBlocked($other)
|
||||||
{
|
{
|
||||||
|
$profile = $this->getProfile();
|
||||||
$block = Profile_block::get($this->id, $other->id);
|
return $profile->hasBlocked($other);
|
||||||
|
|
||||||
if (is_null($block)) {
|
|
||||||
$result = false;
|
|
||||||
} else {
|
|
||||||
$result = true;
|
|
||||||
$block->free();
|
|
||||||
}
|
|
||||||
|
|
||||||
return $result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -219,6 +206,7 @@ class User extends Memcached_DataObject
|
|||||||
if(! User::allowed_nickname($nickname)){
|
if(! User::allowed_nickname($nickname)){
|
||||||
common_log(LOG_WARNING, sprintf("Attempted to register a nickname that is not allowed: %s", $profile->nickname),
|
common_log(LOG_WARNING, sprintf("Attempted to register a nickname that is not allowed: %s", $profile->nickname),
|
||||||
__FILE__);
|
__FILE__);
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
$profile->profileurl = common_profile_url($nickname);
|
$profile->profileurl = common_profile_url($nickname);
|
||||||
|
|
||||||
@ -469,28 +457,28 @@ class User extends Memcached_DataObject
|
|||||||
return $user;
|
return $user;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getReplies($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null)
|
function getReplies($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
|
||||||
{
|
{
|
||||||
$ids = Reply::stream($this->id, $offset, $limit, $since_id, $before_id, $since);
|
$ids = Reply::stream($this->id, $offset, $limit, $since_id, $before_id);
|
||||||
return Notice::getStreamByIds($ids);
|
return Notice::getStreamByIds($ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
function getTaggedNotices($tag, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null) {
|
function getTaggedNotices($tag, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0) {
|
||||||
$profile = $this->getProfile();
|
$profile = $this->getProfile();
|
||||||
if (!$profile) {
|
if (!$profile) {
|
||||||
return null;
|
return null;
|
||||||
} else {
|
} else {
|
||||||
return $profile->getTaggedNotices($tag, $offset, $limit, $since_id, $before_id, $since);
|
return $profile->getTaggedNotices($tag, $offset, $limit, $since_id, $before_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null)
|
function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
|
||||||
{
|
{
|
||||||
$profile = $this->getProfile();
|
$profile = $this->getProfile();
|
||||||
if (!$profile) {
|
if (!$profile) {
|
||||||
return null;
|
return null;
|
||||||
} else {
|
} else {
|
||||||
return $profile->getNotices($offset, $limit, $since_id, $before_id, $since);
|
return $profile->getNotices($offset, $limit, $since_id, $before_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -500,24 +488,24 @@ class User extends Memcached_DataObject
|
|||||||
return Notice::getStreamByIds($ids);
|
return Notice::getStreamByIds($ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
function noticesWithFriends($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null)
|
function noticesWithFriends($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
|
||||||
{
|
{
|
||||||
return Inbox::streamNotices($this->id, $offset, $limit, $since_id, $before_id, $since, false);
|
return Inbox::streamNotices($this->id, $offset, $limit, $since_id, $before_id, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
function noticeInbox($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null)
|
function noticeInbox($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
|
||||||
{
|
{
|
||||||
return Inbox::streamNotices($this->id, $offset, $limit, $since_id, $before_id, $since, true);
|
return Inbox::streamNotices($this->id, $offset, $limit, $since_id, $before_id, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
function friendsTimeline($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null)
|
function friendsTimeline($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
|
||||||
{
|
{
|
||||||
return Inbox::streamNotices($this->id, $offset, $limit, $since_id, $before_id, $since, false);
|
return Inbox::streamNotices($this->id, $offset, $limit, $since_id, $before_id, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
function ownFriendsTimeline($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null)
|
function ownFriendsTimeline($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
|
||||||
{
|
{
|
||||||
return Inbox::streamNotices($this->id, $offset, $limit, $since_id, $before_id, $since, true);
|
return Inbox::streamNotices($this->id, $offset, $limit, $since_id, $before_id, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
function blowFavesCache()
|
function blowFavesCache()
|
||||||
@ -802,7 +790,7 @@ class User extends Memcached_DataObject
|
|||||||
return Notice::getStreamByIds($ids);
|
return Notice::getStreamByIds($ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
function _repeatedByMeDirect($offset, $limit, $since_id, $max_id, $since)
|
function _repeatedByMeDirect($offset, $limit, $since_id, $max_id)
|
||||||
{
|
{
|
||||||
$notice = new Notice();
|
$notice = new Notice();
|
||||||
|
|
||||||
@ -826,10 +814,6 @@ class User extends Memcached_DataObject
|
|||||||
$notice->whereAdd('id <= ' . $max_id);
|
$notice->whereAdd('id <= ' . $max_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_null($since)) {
|
|
||||||
$notice->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\'');
|
|
||||||
}
|
|
||||||
|
|
||||||
$ids = array();
|
$ids = array();
|
||||||
|
|
||||||
if ($notice->find()) {
|
if ($notice->find()) {
|
||||||
@ -849,12 +833,12 @@ class User extends Memcached_DataObject
|
|||||||
$ids = Notice::stream(array($this, '_repeatsOfMeDirect'),
|
$ids = Notice::stream(array($this, '_repeatsOfMeDirect'),
|
||||||
array(),
|
array(),
|
||||||
'user:repeats_of_me:'.$this->id,
|
'user:repeats_of_me:'.$this->id,
|
||||||
$offset, $limit, $since_id, $max_id, null);
|
$offset, $limit, $since_id, $max_id);
|
||||||
|
|
||||||
return Notice::getStreamByIds($ids);
|
return Notice::getStreamByIds($ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
function _repeatsOfMeDirect($offset, $limit, $since_id, $max_id, $since)
|
function _repeatsOfMeDirect($offset, $limit, $since_id, $max_id)
|
||||||
{
|
{
|
||||||
$qry =
|
$qry =
|
||||||
'SELECT DISTINCT original.id AS id ' .
|
'SELECT DISTINCT original.id AS id ' .
|
||||||
@ -869,10 +853,6 @@ class User extends Memcached_DataObject
|
|||||||
$qry .= 'AND original.id <= ' . $max_id . ' ';
|
$qry .= 'AND original.id <= ' . $max_id . ' ';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_null($since)) {
|
|
||||||
$qry .= 'AND original.modified > \'' . date('Y-m-d H:i:s', $since) . '\' ';
|
|
||||||
}
|
|
||||||
|
|
||||||
// NOTE: we sort by fave time, not by notice time!
|
// NOTE: we sort by fave time, not by notice time!
|
||||||
|
|
||||||
$qry .= 'ORDER BY original.id DESC ';
|
$qry .= 'ORDER BY original.id DESC ';
|
||||||
|
@ -10,21 +10,23 @@ class User_group extends Memcached_DataObject
|
|||||||
|
|
||||||
public $__table = 'user_group'; // table name
|
public $__table = 'user_group'; // table name
|
||||||
public $id; // int(4) primary_key not_null
|
public $id; // int(4) primary_key not_null
|
||||||
public $nickname; // varchar(64) unique_key
|
public $nickname; // varchar(64)
|
||||||
public $fullname; // varchar(255)
|
public $fullname; // varchar(255)
|
||||||
public $homepage; // varchar(255)
|
public $homepage; // varchar(255)
|
||||||
public $description; // text()
|
public $description; // text
|
||||||
public $location; // varchar(255)
|
public $location; // varchar(255)
|
||||||
public $original_logo; // varchar(255)
|
public $original_logo; // varchar(255)
|
||||||
public $homepage_logo; // varchar(255)
|
public $homepage_logo; // varchar(255)
|
||||||
public $stream_logo; // varchar(255)
|
public $stream_logo; // varchar(255)
|
||||||
public $mini_logo; // varchar(255)
|
public $mini_logo; // varchar(255)
|
||||||
public $design_id; // int(4)
|
public $design_id; // int(4)
|
||||||
public $created; // datetime() not_null
|
public $created; // datetime not_null default_0000-00-00%2000%3A00%3A00
|
||||||
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
|
public $modified; // timestamp not_null default_CURRENT_TIMESTAMP
|
||||||
|
public $uri; // varchar(255) unique_key
|
||||||
|
public $mainpage; // varchar(255)
|
||||||
|
|
||||||
/* Static get */
|
/* Static get */
|
||||||
function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('User_group',$k,$v); }
|
function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('User_group',$k,$v); }
|
||||||
|
|
||||||
/* the code above is auto generated do not remove the tag below */
|
/* the code above is auto generated do not remove the tag below */
|
||||||
###END_AUTOCODE
|
###END_AUTOCODE
|
||||||
@ -39,15 +41,45 @@ class User_group extends Memcached_DataObject
|
|||||||
|
|
||||||
function homeUrl()
|
function homeUrl()
|
||||||
{
|
{
|
||||||
return common_local_url('showgroup',
|
$url = null;
|
||||||
|
if (Event::handle('StartUserGroupHomeUrl', array($this, &$url))) {
|
||||||
|
// normally stored in mainpage, but older ones may be null
|
||||||
|
if (!empty($this->mainpage)) {
|
||||||
|
$url = $this->mainpage;
|
||||||
|
} else {
|
||||||
|
$url = common_local_url('showgroup',
|
||||||
array('nickname' => $this->nickname));
|
array('nickname' => $this->nickname));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
Event::handle('EndUserGroupHomeUrl', array($this, &$url));
|
||||||
|
return $url;
|
||||||
|
}
|
||||||
|
|
||||||
|
function getUri()
|
||||||
|
{
|
||||||
|
$uri = null;
|
||||||
|
if (Event::handle('StartUserGroupGetUri', array($this, &$uri))) {
|
||||||
|
if (!empty($this->uri)) {
|
||||||
|
$uri = $this->uri;
|
||||||
|
} else {
|
||||||
|
$uri = common_local_url('groupbyid',
|
||||||
|
array('id' => $this->id));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Event::handle('EndUserGroupGetUri', array($this, &$uri));
|
||||||
|
return $uri;
|
||||||
|
}
|
||||||
|
|
||||||
function permalink()
|
function permalink()
|
||||||
{
|
{
|
||||||
return common_local_url('groupbyid',
|
$url = null;
|
||||||
|
if (Event::handle('StartUserGroupPermalink', array($this, &$url))) {
|
||||||
|
$url = common_local_url('groupbyid',
|
||||||
array('id' => $this->id));
|
array('id' => $this->id));
|
||||||
}
|
}
|
||||||
|
Event::handle('EndUserGroupPermalink', array($this, &$url));
|
||||||
|
return $url;
|
||||||
|
}
|
||||||
|
|
||||||
function getNotices($offset, $limit, $since_id=null, $max_id=null)
|
function getNotices($offset, $limit, $since_id=null, $max_id=null)
|
||||||
{
|
{
|
||||||
@ -59,7 +91,7 @@ class User_group extends Memcached_DataObject
|
|||||||
return Notice::getStreamByIds($ids);
|
return Notice::getStreamByIds($ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
function _streamDirect($offset, $limit, $since_id, $max_id, $since)
|
function _streamDirect($offset, $limit, $since_id, $max_id)
|
||||||
{
|
{
|
||||||
$inbox = new Group_inbox();
|
$inbox = new Group_inbox();
|
||||||
|
|
||||||
@ -76,10 +108,6 @@ class User_group extends Memcached_DataObject
|
|||||||
$inbox->whereAdd('notice_id <= ' . $max_id);
|
$inbox->whereAdd('notice_id <= ' . $max_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_null($since)) {
|
|
||||||
$inbox->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\'');
|
|
||||||
}
|
|
||||||
|
|
||||||
$inbox->orderBy('notice_id DESC');
|
$inbox->orderBy('notice_id DESC');
|
||||||
|
|
||||||
if (!is_null($offset)) {
|
if (!is_null($offset)) {
|
||||||
@ -367,25 +395,41 @@ class User_group extends Memcached_DataObject
|
|||||||
return $xs->getString();
|
return $xs->getString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns an XML string fragment with group information as an
|
||||||
|
* Activity Streams <activity:subject> element.
|
||||||
|
*
|
||||||
|
* Assumes that 'activity' namespace has been previously defined.
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
function asActivitySubject()
|
function asActivitySubject()
|
||||||
{
|
{
|
||||||
$xs = new XMLStringer(true);
|
return $this->asActivityNoun('subject');
|
||||||
|
}
|
||||||
|
|
||||||
$xs->elementStart('activity:subject');
|
/**
|
||||||
$xs->element('activity:object', null, 'http://activitystrea.ms/schema/1.0/group');
|
* Returns an XML string fragment with group information as an
|
||||||
$xs->element('id', null, $this->permalink());
|
* Activity Streams noun object with the given element type.
|
||||||
$xs->element('title', null, $this->getBestName());
|
*
|
||||||
$xs->element(
|
* Assumes that 'activity', 'georss', and 'poco' namespace has been
|
||||||
'link', array(
|
* previously defined.
|
||||||
'rel' => 'avatar',
|
*
|
||||||
'href' => empty($this->homepage_logo)
|
* @param string $element one of 'actor', 'subject', 'object', 'target'
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
function asActivityNoun($element)
|
||||||
|
{
|
||||||
|
$noun = ActivityObject::fromGroup($this);
|
||||||
|
return $noun->asString('activity:' . $element);
|
||||||
|
}
|
||||||
|
|
||||||
|
function getAvatar()
|
||||||
|
{
|
||||||
|
return empty($this->homepage_logo)
|
||||||
? User_group::defaultLogo(AVATAR_PROFILE_SIZE)
|
? User_group::defaultLogo(AVATAR_PROFILE_SIZE)
|
||||||
: $this->homepage_logo
|
: $this->homepage_logo;
|
||||||
)
|
|
||||||
);
|
|
||||||
$xs->elementEnd('activity:subject');
|
|
||||||
|
|
||||||
return $xs->getString();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static function register($fields) {
|
static function register($fields) {
|
||||||
@ -403,28 +447,31 @@ class User_group extends Memcached_DataObject
|
|||||||
$group->homepage = $homepage;
|
$group->homepage = $homepage;
|
||||||
$group->description = $description;
|
$group->description = $description;
|
||||||
$group->location = $location;
|
$group->location = $location;
|
||||||
|
$group->uri = $uri;
|
||||||
|
$group->mainpage = $mainpage;
|
||||||
$group->created = common_sql_now();
|
$group->created = common_sql_now();
|
||||||
|
|
||||||
$result = $group->insert();
|
$result = $group->insert();
|
||||||
|
|
||||||
if (!$result) {
|
if (!$result) {
|
||||||
common_log_db_error($group, 'INSERT', __FILE__);
|
common_log_db_error($group, 'INSERT', __FILE__);
|
||||||
$this->serverError(
|
throw new ServerException(_('Could not create group.'));
|
||||||
_('Could not create group.'),
|
|
||||||
500,
|
|
||||||
$this->format
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!isset($uri) || empty($uri)) {
|
||||||
|
$orig = clone($group);
|
||||||
|
$group->uri = common_local_url('groupbyid', array('id' => $group->id));
|
||||||
|
$result = $group->update($orig);
|
||||||
|
if (!$result) {
|
||||||
|
common_log_db_error($group, 'UPDATE', __FILE__);
|
||||||
|
throw new ServerException(_('Could not set group URI.'));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$result = $group->setAliases($aliases);
|
$result = $group->setAliases($aliases);
|
||||||
|
|
||||||
if (!$result) {
|
if (!$result) {
|
||||||
$this->serverError(
|
throw new ServerException(_('Could not create aliases.'));
|
||||||
_('Could not create aliases.'),
|
|
||||||
500,
|
|
||||||
$this->format
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$member = new Group_member();
|
$member = new Group_member();
|
||||||
@ -438,12 +485,22 @@ class User_group extends Memcached_DataObject
|
|||||||
|
|
||||||
if (!$result) {
|
if (!$result) {
|
||||||
common_log_db_error($member, 'INSERT', __FILE__);
|
common_log_db_error($member, 'INSERT', __FILE__);
|
||||||
$this->serverError(
|
throw new ServerException(_('Could not set group membership.'));
|
||||||
_('Could not set group membership.'),
|
}
|
||||||
500,
|
|
||||||
$this->format
|
if ($local) {
|
||||||
);
|
$local_group = new Local_group();
|
||||||
return;
|
|
||||||
|
$local_group->group_id = $group->id;
|
||||||
|
$local_group->nickname = $nickname;
|
||||||
|
$local_group->created = common_sql_now();
|
||||||
|
|
||||||
|
$result = $local_group->insert();
|
||||||
|
|
||||||
|
if (!$result) {
|
||||||
|
common_log_db_error($local_group, 'INSERT', __FILE__);
|
||||||
|
throw new ServerException(_('Could not save local group info.'));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$group->query('COMMIT');
|
$group->query('COMMIT');
|
||||||
|
@ -245,13 +245,6 @@ modified = 384
|
|||||||
group_id = K
|
group_id = K
|
||||||
profile_id = K
|
profile_id = K
|
||||||
|
|
||||||
[invitation]
|
|
||||||
code = 130
|
|
||||||
user_id = 129
|
|
||||||
address = 130
|
|
||||||
address_type = 130
|
|
||||||
created = 142
|
|
||||||
|
|
||||||
[inbox]
|
[inbox]
|
||||||
user_id = 129
|
user_id = 129
|
||||||
notice_ids = 66
|
notice_ids = 66
|
||||||
@ -259,9 +252,26 @@ notice_ids = 66
|
|||||||
[inbox__keys]
|
[inbox__keys]
|
||||||
user_id = K
|
user_id = K
|
||||||
|
|
||||||
|
[invitation]
|
||||||
|
code = 130
|
||||||
|
user_id = 129
|
||||||
|
address = 130
|
||||||
|
address_type = 130
|
||||||
|
created = 142
|
||||||
|
|
||||||
[invitation__keys]
|
[invitation__keys]
|
||||||
code = K
|
code = K
|
||||||
|
|
||||||
|
[local_group]
|
||||||
|
group_id = 129
|
||||||
|
nickname = 2
|
||||||
|
created = 142
|
||||||
|
modified = 384
|
||||||
|
|
||||||
|
[local_group__keys]
|
||||||
|
group_id = K
|
||||||
|
nickname = U
|
||||||
|
|
||||||
[location_namespace]
|
[location_namespace]
|
||||||
id = 129
|
id = 129
|
||||||
description = 2
|
description = 2
|
||||||
@ -369,7 +379,7 @@ icon = 130
|
|||||||
source_url = 2
|
source_url = 2
|
||||||
organization = 2
|
organization = 2
|
||||||
homepage = 2
|
homepage = 2
|
||||||
callback_url = 130
|
callback_url = 2
|
||||||
type = 17
|
type = 17
|
||||||
access_type = 17
|
access_type = 17
|
||||||
created = 142
|
created = 142
|
||||||
@ -440,13 +450,13 @@ tag = K
|
|||||||
|
|
||||||
[queue_item]
|
[queue_item]
|
||||||
id = 129
|
id = 129
|
||||||
frame = 66
|
frame = 194
|
||||||
transport = 130
|
transport = 130
|
||||||
created = 142
|
created = 142
|
||||||
claimed = 14
|
claimed = 14
|
||||||
|
|
||||||
[queue_item__keys]
|
[queue_item__keys]
|
||||||
id = K
|
id = N
|
||||||
|
|
||||||
[related_group]
|
[related_group]
|
||||||
group_id = 129
|
group_id = 129
|
||||||
@ -593,10 +603,11 @@ mini_logo = 2
|
|||||||
design_id = 1
|
design_id = 1
|
||||||
created = 142
|
created = 142
|
||||||
modified = 384
|
modified = 384
|
||||||
|
uri = 2
|
||||||
|
mainpage = 2
|
||||||
|
|
||||||
[user_group__keys]
|
[user_group__keys]
|
||||||
id = N
|
id = N
|
||||||
nickname = U
|
|
||||||
|
|
||||||
[user_openid]
|
[user_openid]
|
||||||
canonical = 130
|
canonical = 130
|
||||||
@ -627,4 +638,3 @@ modified = 384
|
|||||||
|
|
||||||
[user_location_prefs__keys]
|
[user_location_prefs__keys]
|
||||||
user_id = K
|
user_id = K
|
||||||
|
|
||||||
|
@ -275,6 +275,8 @@ $config['sphinx']['port'] = 3312;
|
|||||||
// Support for file uploads (attachments),
|
// Support for file uploads (attachments),
|
||||||
// select supported mimetypes and quotas (in bytes)
|
// select supported mimetypes and quotas (in bytes)
|
||||||
// $config['attachments']['supported'] = array('image/png', 'application/ogg');
|
// $config['attachments']['supported'] = array('image/png', 'application/ogg');
|
||||||
|
// $config['attachments']['supported'] = true; //allow all file types to be uploaded
|
||||||
|
|
||||||
// $config['attachments']['file_quota'] = 5000000;
|
// $config['attachments']['file_quota'] = 5000000;
|
||||||
// $config['attachments']['user_quota'] = 50000000;
|
// $config['attachments']['user_quota'] = 50000000;
|
||||||
// $config['attachments']['monthly_quota'] = 15000000;
|
// $config['attachments']['monthly_quota'] = 15000000;
|
||||||
|
@ -140,4 +140,8 @@ create table oauth_application_user (
|
|||||||
constraint primary key (profile_id, application_id)
|
constraint primary key (profile_id, application_id)
|
||||||
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
|
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
|
||||||
|
|
||||||
|
alter table file_to_post
|
||||||
|
add index post_id_idx (post_id);
|
||||||
|
|
||||||
|
alter table group_inbox
|
||||||
|
add index group_inbox_notice_id_idx (notice_id);
|
||||||
|
28
db/beta5tobeta6.sql
Normal file
28
db/beta5tobeta6.sql
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
alter table oauth_application
|
||||||
|
modify column name varchar(255) not null unique key comment 'name of the application',
|
||||||
|
modify column access_type tinyint default 0 comment 'access type, bit 1 = read, bit 2 = write';
|
||||||
|
|
||||||
|
alter table user_group
|
||||||
|
add column uri varchar(255) unique key comment 'universal identifier',
|
||||||
|
add column mainpage varchar(255) comment 'page for group info to link to',
|
||||||
|
drop index nickname;
|
||||||
|
|
||||||
|
create table conversation (
|
||||||
|
id integer auto_increment primary key comment 'unique identifier',
|
||||||
|
uri varchar(225) unique comment 'URI of the conversation',
|
||||||
|
created datetime not null comment 'date this record was created',
|
||||||
|
modified timestamp comment 'date this record was modified'
|
||||||
|
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
|
||||||
|
|
||||||
|
create table local_group (
|
||||||
|
group_id integer primary key comment 'group represented' references user_group (id),
|
||||||
|
nickname varchar(64) unique key comment 'group represented',
|
||||||
|
|
||||||
|
created datetime not null comment 'date this record was created',
|
||||||
|
modified timestamp comment 'date this record was modified'
|
||||||
|
|
||||||
|
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
|
||||||
|
|
||||||
|
insert into local_group (group_id, nickname, created)
|
||||||
|
select id, nickname, created from user_group;
|
||||||
|
|
@ -406,7 +406,7 @@ create table profile_block (
|
|||||||
create table user_group (
|
create table user_group (
|
||||||
id integer auto_increment primary key comment 'unique identifier',
|
id integer auto_increment primary key comment 'unique identifier',
|
||||||
|
|
||||||
nickname varchar(64) unique key comment 'nickname for addressing',
|
nickname varchar(64) comment 'nickname for addressing',
|
||||||
fullname varchar(255) comment 'display name',
|
fullname varchar(255) comment 'display name',
|
||||||
homepage varchar(255) comment 'URL, cached so we dont regenerate',
|
homepage varchar(255) comment 'URL, cached so we dont regenerate',
|
||||||
description text comment 'group description',
|
description text comment 'group description',
|
||||||
@ -421,6 +421,9 @@ create table user_group (
|
|||||||
created datetime not null comment 'date this record was created',
|
created datetime not null comment 'date this record was created',
|
||||||
modified timestamp comment 'date this record was modified',
|
modified timestamp comment 'date this record was modified',
|
||||||
|
|
||||||
|
uri varchar(255) unique key comment 'universal identifier',
|
||||||
|
mainpage varchar(255) comment 'page for group info to link to',
|
||||||
|
|
||||||
index user_group_nickname_idx (nickname)
|
index user_group_nickname_idx (nickname)
|
||||||
|
|
||||||
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;
|
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;
|
||||||
@ -455,7 +458,8 @@ create table group_inbox (
|
|||||||
created datetime not null comment 'date the notice was created',
|
created datetime not null comment 'date the notice was created',
|
||||||
|
|
||||||
constraint primary key (group_id, notice_id),
|
constraint primary key (group_id, notice_id),
|
||||||
index group_inbox_created_idx (created)
|
index group_inbox_created_idx (created),
|
||||||
|
index group_inbox_notice_id_idx (notice_id)
|
||||||
|
|
||||||
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
|
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
|
||||||
|
|
||||||
@ -520,7 +524,8 @@ create table file_to_post (
|
|||||||
post_id integer comment 'id of the notice it belongs to' references notice (id),
|
post_id integer comment 'id of the notice it belongs to' references notice (id),
|
||||||
modified timestamp comment 'date this record was modified',
|
modified timestamp comment 'date this record was modified',
|
||||||
|
|
||||||
constraint primary key (file_id, post_id)
|
constraint primary key (file_id, post_id),
|
||||||
|
index post_id_idx (post_id)
|
||||||
|
|
||||||
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
|
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
|
||||||
|
|
||||||
@ -641,3 +646,13 @@ create table conversation (
|
|||||||
modified timestamp comment 'date this record was modified'
|
modified timestamp comment 'date this record was modified'
|
||||||
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
|
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
|
||||||
|
|
||||||
|
create table local_group (
|
||||||
|
|
||||||
|
group_id integer primary key comment 'group represented' references user_group (id),
|
||||||
|
nickname varchar(64) unique key comment 'group represented',
|
||||||
|
|
||||||
|
created datetime not null comment 'date this record was created',
|
||||||
|
modified timestamp comment 'date this record was modified'
|
||||||
|
|
||||||
|
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
|
||||||
|
|
||||||
|
29
index.php
29
index.php
@ -37,8 +37,6 @@ define('INSTALLDIR', dirname(__FILE__));
|
|||||||
define('STATUSNET', true);
|
define('STATUSNET', true);
|
||||||
define('LACONICA', true); // compatibility
|
define('LACONICA', true); // compatibility
|
||||||
|
|
||||||
require_once INSTALLDIR . '/lib/common.php';
|
|
||||||
|
|
||||||
$user = null;
|
$user = null;
|
||||||
$action = null;
|
$action = null;
|
||||||
|
|
||||||
@ -68,13 +66,15 @@ function getPath($req)
|
|||||||
*/
|
*/
|
||||||
function handleError($error)
|
function handleError($error)
|
||||||
{
|
{
|
||||||
|
try {
|
||||||
|
|
||||||
if ($error->getCode() == DB_DATAOBJECT_ERROR_NODATA) {
|
if ($error->getCode() == DB_DATAOBJECT_ERROR_NODATA) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$logmsg = "PEAR error: " . $error->getMessage();
|
$logmsg = "PEAR error: " . $error->getMessage();
|
||||||
if (common_config('site', 'logdebug')) {
|
if ($error instanceof PEAR_Exception && common_config('site', 'logdebug')) {
|
||||||
$logmsg .= " : ". $error->getDebugInfo();
|
$logmsg .= " : ". $error->toText();
|
||||||
}
|
}
|
||||||
// DB queries often end up with a lot of newlines; merge to a single line
|
// DB queries often end up with a lot of newlines; merge to a single line
|
||||||
// for easier grepability...
|
// for easier grepability...
|
||||||
@ -83,14 +83,21 @@ function handleError($error)
|
|||||||
|
|
||||||
// @fixme backtrace output should be consistent with exception handling
|
// @fixme backtrace output should be consistent with exception handling
|
||||||
if (common_config('site', 'logdebug')) {
|
if (common_config('site', 'logdebug')) {
|
||||||
$bt = $error->getBacktrace();
|
$bt = $error->getTrace();
|
||||||
foreach ($bt as $n => $line) {
|
foreach ($bt as $n => $line) {
|
||||||
common_log(LOG_ERR, formatBacktraceLine($n, $line));
|
common_log(LOG_ERR, formatBacktraceLine($n, $line));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($error instanceof DB_DataObject_Error
|
if ($error instanceof DB_DataObject_Error
|
||||||
|| $error instanceof DB_Error
|
|| $error instanceof DB_Error
|
||||||
|
|| ($error instanceof PEAR_Exception && $error->getCode() == -24)
|
||||||
) {
|
) {
|
||||||
|
//If we run into a DB error, assume we can't connect to the DB at all
|
||||||
|
//so set the current user to null, so we don't try to access the DB
|
||||||
|
//while rendering the error page.
|
||||||
|
global $_cur;
|
||||||
|
$_cur = null;
|
||||||
|
|
||||||
$msg = sprintf(
|
$msg = sprintf(
|
||||||
_(
|
_(
|
||||||
'The database for %s isn\'t responding correctly, '.
|
'The database for %s isn\'t responding correctly, '.
|
||||||
@ -111,9 +118,17 @@ function handleError($error)
|
|||||||
|
|
||||||
$dac = new DBErrorAction($msg, 500);
|
$dac = new DBErrorAction($msg, 500);
|
||||||
$dac->showPage();
|
$dac->showPage();
|
||||||
|
|
||||||
|
} catch (Exception $e) {
|
||||||
|
echo _('An error occurred.');
|
||||||
|
}
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
set_exception_handler('handleError');
|
||||||
|
|
||||||
|
require_once INSTALLDIR . '/lib/common.php';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Format a backtrace line for debug output roughly like debug_print_backtrace() does.
|
* Format a backtrace line for debug output roughly like debug_print_backtrace() does.
|
||||||
* Exceptions already have this built in, but PEAR error objects just give us the array.
|
* Exceptions already have this built in, but PEAR error objects just give us the array.
|
||||||
@ -238,10 +253,6 @@ function main()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// For database errors
|
|
||||||
|
|
||||||
PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError');
|
|
||||||
|
|
||||||
// Make sure RW database is setup
|
// Make sure RW database is setup
|
||||||
|
|
||||||
setupRW();
|
setupRW();
|
||||||
|
@ -1,12 +1,14 @@
|
|||||||
/*
|
/*
|
||||||
* jQuery Form Plugin
|
* jQuery Form Plugin
|
||||||
* version: 2.36 (07-NOV-2009)
|
* version: 2.17 (06-NOV-2008)
|
||||||
* @requires jQuery v1.2.6 or later
|
* @requires jQuery v1.2.2 or later
|
||||||
*
|
*
|
||||||
* Examples and documentation at: http://malsup.com/jquery/form/
|
* Examples and documentation at: http://malsup.com/jquery/form/
|
||||||
* Dual licensed under the MIT and GPL licenses:
|
* Dual licensed under the MIT and GPL licenses:
|
||||||
* http://www.opensource.org/licenses/mit-license.php
|
* http://www.opensource.org/licenses/mit-license.php
|
||||||
* http://www.gnu.org/licenses/gpl.html
|
* http://www.gnu.org/licenses/gpl.html
|
||||||
|
*
|
||||||
|
* Revision: $Id$
|
||||||
*/
|
*/
|
||||||
;(function($) {
|
;(function($) {
|
||||||
|
|
||||||
@ -53,17 +55,9 @@ $.fn.ajaxSubmit = function(options) {
|
|||||||
if (typeof options == 'function')
|
if (typeof options == 'function')
|
||||||
options = { success: options };
|
options = { success: options };
|
||||||
|
|
||||||
var url = $.trim(this.attr('action'));
|
|
||||||
if (url) {
|
|
||||||
// clean url (don't include hash vaue)
|
|
||||||
url = (url.match(/^([^#]+)/)||[])[1];
|
|
||||||
}
|
|
||||||
url = url || window.location.href || '';
|
|
||||||
|
|
||||||
options = $.extend({
|
options = $.extend({
|
||||||
url: url,
|
url: this.attr('action') || window.location.toString(),
|
||||||
type: this.attr('method') || 'GET',
|
type: this.attr('method') || 'GET'
|
||||||
iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
|
|
||||||
}, options || {});
|
}, options || {});
|
||||||
|
|
||||||
// hook for manipulating the form data before it is extracted;
|
// hook for manipulating the form data before it is extracted;
|
||||||
@ -87,7 +81,7 @@ $.fn.ajaxSubmit = function(options) {
|
|||||||
for (var n in options.data) {
|
for (var n in options.data) {
|
||||||
if(options.data[n] instanceof Array) {
|
if(options.data[n] instanceof Array) {
|
||||||
for (var k in options.data[n])
|
for (var k in options.data[n])
|
||||||
a.push( { name: n, value: options.data[n][k] } );
|
a.push( { name: n, value: options.data[n][k] } )
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
a.push( { name: n, value: options.data[n] } );
|
a.push( { name: n, value: options.data[n] } );
|
||||||
@ -142,16 +136,11 @@ $.fn.ajaxSubmit = function(options) {
|
|||||||
if (files[j])
|
if (files[j])
|
||||||
found = true;
|
found = true;
|
||||||
|
|
||||||
var multipart = false;
|
|
||||||
// var mp = 'multipart/form-data';
|
|
||||||
// multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
|
|
||||||
|
|
||||||
// options.iframe allows user to force iframe mode
|
// options.iframe allows user to force iframe mode
|
||||||
// 06-NOV-09: now defaulting to iframe mode if file input is detected
|
if (options.iframe || found) {
|
||||||
if ((files.length && options.iframe !== false) || options.iframe || found || multipart) {
|
|
||||||
// hack to fix Safari hang (thanks to Tim Molendijk for this)
|
// hack to fix Safari hang (thanks to Tim Molendijk for this)
|
||||||
// see: http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
|
// see: http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
|
||||||
if (options.closeKeepAlive)
|
if ($.browser.safari && options.closeKeepAlive)
|
||||||
$.get(options.closeKeepAlive, fileUpload);
|
$.get(options.closeKeepAlive, fileUpload);
|
||||||
else
|
else
|
||||||
fileUpload();
|
fileUpload();
|
||||||
@ -174,12 +163,14 @@ $.fn.ajaxSubmit = function(options) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var opts = $.extend({}, $.ajaxSettings, options);
|
var opts = $.extend({}, $.ajaxSettings, options);
|
||||||
var s = $.extend(true, {}, $.extend(true, {}, $.ajaxSettings), opts);
|
var s = jQuery.extend(true, {}, $.extend(true, {}, $.ajaxSettings), opts);
|
||||||
|
|
||||||
var id = 'jqFormIO' + (new Date().getTime());
|
var id = 'jqFormIO' + (new Date().getTime());
|
||||||
var $io = $('<iframe id="' + id + '" name="' + id + '" src="'+ opts.iframeSrc +'" />');
|
var $io = $('<iframe id="' + id + '" name="' + id + '" />');
|
||||||
var io = $io[0];
|
var io = $io[0];
|
||||||
|
|
||||||
|
if ($.browser.msie || $.browser.opera)
|
||||||
|
io.src = 'javascript:false;document.write("");';
|
||||||
$io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
|
$io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
|
||||||
|
|
||||||
var xhr = { // mock object
|
var xhr = { // mock object
|
||||||
@ -193,7 +184,7 @@ $.fn.ajaxSubmit = function(options) {
|
|||||||
setRequestHeader: function() {},
|
setRequestHeader: function() {},
|
||||||
abort: function() {
|
abort: function() {
|
||||||
this.aborted = 1;
|
this.aborted = 1;
|
||||||
$io.attr('src', opts.iframeSrc); // abort op in progress
|
$io.attr('src','about:blank'); // abort op in progress
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -203,7 +194,7 @@ $.fn.ajaxSubmit = function(options) {
|
|||||||
if (g) $.event.trigger("ajaxSend", [xhr, opts]);
|
if (g) $.event.trigger("ajaxSend", [xhr, opts]);
|
||||||
|
|
||||||
if (s.beforeSend && s.beforeSend(xhr, s) === false) {
|
if (s.beforeSend && s.beforeSend(xhr, s) === false) {
|
||||||
s.global && $.active--;
|
s.global && jQuery.active--;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (xhr.aborted)
|
if (xhr.aborted)
|
||||||
@ -230,13 +221,11 @@ $.fn.ajaxSubmit = function(options) {
|
|||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
// make sure form attrs are set
|
// make sure form attrs are set
|
||||||
var t = $form.attr('target'), a = $form.attr('action');
|
var t = $form.attr('target'), a = $form.attr('action');
|
||||||
|
$form.attr({
|
||||||
// update form attrs in IE friendly way
|
target: id,
|
||||||
form.setAttribute('target',id);
|
method: 'POST',
|
||||||
if (form.getAttribute('method') != 'POST')
|
action: opts.url
|
||||||
form.setAttribute('method', 'POST');
|
});
|
||||||
if (form.getAttribute('action') != opts.url)
|
|
||||||
form.setAttribute('action', opts.url);
|
|
||||||
|
|
||||||
// ie borks in some cases when setting encoding
|
// ie borks in some cases when setting encoding
|
||||||
if (! options.skipEncodingOverride) {
|
if (! options.skipEncodingOverride) {
|
||||||
@ -266,19 +255,18 @@ $.fn.ajaxSubmit = function(options) {
|
|||||||
}
|
}
|
||||||
finally {
|
finally {
|
||||||
// reset attrs and remove "extra" input elements
|
// reset attrs and remove "extra" input elements
|
||||||
form.setAttribute('action',a);
|
$form.attr('action', a);
|
||||||
t ? form.setAttribute('target', t) : $form.removeAttr('target');
|
t ? $form.attr('target', t) : $form.removeAttr('target');
|
||||||
$(extraInputs).remove();
|
$(extraInputs).remove();
|
||||||
}
|
}
|
||||||
}, 10);
|
}, 10);
|
||||||
|
|
||||||
var domCheckCount = 50;
|
|
||||||
|
|
||||||
function cb() {
|
function cb() {
|
||||||
if (cbInvoked++) return;
|
if (cbInvoked++) return;
|
||||||
|
|
||||||
io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
|
io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
|
||||||
|
|
||||||
|
var operaHack = 0;
|
||||||
var ok = true;
|
var ok = true;
|
||||||
try {
|
try {
|
||||||
if (timedOut) throw 'timeout';
|
if (timedOut) throw 'timeout';
|
||||||
@ -287,19 +275,14 @@ $.fn.ajaxSubmit = function(options) {
|
|||||||
|
|
||||||
doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
|
doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
|
||||||
|
|
||||||
var isXml = opts.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
|
if (doc.body == null && !operaHack && $.browser.opera) {
|
||||||
log('isXml='+isXml);
|
// In Opera 9.2.x the iframe DOM is not always traversable when
|
||||||
if (!isXml && (doc.body == null || doc.body.innerHTML == '')) {
|
// the onload callback fires so we give Opera 100ms to right itself
|
||||||
if (--domCheckCount) {
|
operaHack = 1;
|
||||||
// in some browsers (Opera) the iframe DOM is not always traversable when
|
cbInvoked--;
|
||||||
// the onload callback fires, so we loop a bit to accommodate
|
|
||||||
cbInvoked = 0;
|
|
||||||
setTimeout(cb, 100);
|
setTimeout(cb, 100);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
log('Could not access iframe DOM after 50 tries.');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
xhr.responseText = doc.body ? doc.body.innerHTML : null;
|
xhr.responseText = doc.body ? doc.body.innerHTML : null;
|
||||||
xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
|
xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
|
||||||
@ -309,16 +292,8 @@ $.fn.ajaxSubmit = function(options) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
if (opts.dataType == 'json' || opts.dataType == 'script') {
|
if (opts.dataType == 'json' || opts.dataType == 'script') {
|
||||||
// see if user embedded response in textarea
|
|
||||||
var ta = doc.getElementsByTagName('textarea')[0];
|
var ta = doc.getElementsByTagName('textarea')[0];
|
||||||
if (ta)
|
xhr.responseText = ta ? ta.value : xhr.responseText;
|
||||||
xhr.responseText = ta.value;
|
|
||||||
else {
|
|
||||||
// account for browsers injecting pre around json response
|
|
||||||
var pre = doc.getElementsByTagName('pre')[0];
|
|
||||||
if (pre)
|
|
||||||
xhr.responseText = pre.innerHTML;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else if (opts.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
|
else if (opts.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
|
||||||
xhr.responseXML = toXml(xhr.responseText);
|
xhr.responseXML = toXml(xhr.responseText);
|
||||||
@ -378,39 +353,37 @@ $.fn.ajaxForm = function(options) {
|
|||||||
return this.ajaxFormUnbind().bind('submit.form-plugin',function() {
|
return this.ajaxFormUnbind().bind('submit.form-plugin',function() {
|
||||||
$(this).ajaxSubmit(options);
|
$(this).ajaxSubmit(options);
|
||||||
return false;
|
return false;
|
||||||
}).bind('click.form-plugin', function(e) {
|
}).each(function() {
|
||||||
var target = e.target;
|
// store options in hash
|
||||||
var $el = $(target);
|
$(":submit,input:image", this).bind('click.form-plugin',function(e) {
|
||||||
if (!($el.is(":submit,input:image"))) {
|
var form = this.form;
|
||||||
// is this a child element of the submit el? (ex: a span within a button)
|
form.clk = this;
|
||||||
var t = $el.closest(':submit');
|
if (this.type == 'image') {
|
||||||
if (t.length == 0)
|
|
||||||
return;
|
|
||||||
target = t[0];
|
|
||||||
}
|
|
||||||
var form = this;
|
|
||||||
form.clk = target;
|
|
||||||
if (target.type == 'image') {
|
|
||||||
if (e.offsetX != undefined) {
|
if (e.offsetX != undefined) {
|
||||||
form.clk_x = e.offsetX;
|
form.clk_x = e.offsetX;
|
||||||
form.clk_y = e.offsetY;
|
form.clk_y = e.offsetY;
|
||||||
} else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
|
} else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
|
||||||
var offset = $el.offset();
|
var offset = $(this).offset();
|
||||||
form.clk_x = e.pageX - offset.left;
|
form.clk_x = e.pageX - offset.left;
|
||||||
form.clk_y = e.pageY - offset.top;
|
form.clk_y = e.pageY - offset.top;
|
||||||
} else {
|
} else {
|
||||||
form.clk_x = e.pageX - target.offsetLeft;
|
form.clk_x = e.pageX - this.offsetLeft;
|
||||||
form.clk_y = e.pageY - target.offsetTop;
|
form.clk_y = e.pageY - this.offsetTop;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// clear form vars
|
// clear form vars
|
||||||
setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 100);
|
setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 10);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
// ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
|
// ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
|
||||||
$.fn.ajaxFormUnbind = function() {
|
$.fn.ajaxFormUnbind = function() {
|
||||||
return this.unbind('submit.form-plugin click.form-plugin');
|
this.unbind('submit.form-plugin');
|
||||||
|
return this.each(function() {
|
||||||
|
$(":submit,input:image", this).unbind('click.form-plugin');
|
||||||
|
});
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -438,10 +411,8 @@ $.fn.formToArray = function(semantic) {
|
|||||||
|
|
||||||
if (semantic && form.clk && el.type == "image") {
|
if (semantic && form.clk && el.type == "image") {
|
||||||
// handle image inputs on the fly when semantic == true
|
// handle image inputs on the fly when semantic == true
|
||||||
if(!el.disabled && form.clk == el) {
|
if(!el.disabled && form.clk == el)
|
||||||
a.push({name: n, value: $(el).val()});
|
|
||||||
a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
|
a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
|
||||||
}
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -455,10 +426,12 @@ $.fn.formToArray = function(semantic) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!semantic && form.clk) {
|
if (!semantic && form.clk) {
|
||||||
// input type=='image' are not found in elements array! handle it here
|
// input type=='image' are not found in elements array! handle them here
|
||||||
var $input = $(form.clk), input = $input[0], n = input.name;
|
var inputs = form.getElementsByTagName("input");
|
||||||
if (n && !input.disabled && input.type == 'image') {
|
for(var i=0, max=inputs.length; i < max; i++) {
|
||||||
a.push({name: n, value: $input.val()});
|
var input = inputs[i];
|
||||||
|
var n = input.name;
|
||||||
|
if(n && !input.disabled && input.type == "image" && form.clk == input)
|
||||||
a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
|
a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -566,9 +539,8 @@ $.fieldValue = function(el, successful) {
|
|||||||
for(var i=(one ? index : 0); i < max; i++) {
|
for(var i=(one ? index : 0); i < max; i++) {
|
||||||
var op = ops[i];
|
var op = ops[i];
|
||||||
if (op.selected) {
|
if (op.selected) {
|
||||||
var v = op.value;
|
// extra pain for IE...
|
||||||
if (!v) // extra pain for IE...
|
var v = $.browser.msie && !(op.attributes['value'].specified) ? op.text : op.value;
|
||||||
v = (op.attributes && op.attributes['value'] && !(op.attributes['value'].specified)) ? op.text : op.value;
|
|
||||||
if (one) return v;
|
if (one) return v;
|
||||||
a.push(v);
|
a.push(v);
|
||||||
}
|
}
|
||||||
@ -598,7 +570,7 @@ $.fn.clearForm = function() {
|
|||||||
$.fn.clearFields = $.fn.clearInputs = function() {
|
$.fn.clearFields = $.fn.clearInputs = function() {
|
||||||
return this.each(function() {
|
return this.each(function() {
|
||||||
var t = this.type, tag = this.tagName.toLowerCase();
|
var t = this.type, tag = this.tagName.toLowerCase();
|
||||||
if (t == 'text' || t == 'password' || tag == 'textarea')
|
if (t == 'file' || t == 'text' || t == 'password' || tag == 'textarea')
|
||||||
this.value = '';
|
this.value = '';
|
||||||
else if (t == 'checkbox' || t == 'radio')
|
else if (t == 'checkbox' || t == 'radio')
|
||||||
this.checked = false;
|
this.checked = false;
|
||||||
@ -625,7 +597,7 @@ $.fn.resetForm = function() {
|
|||||||
$.fn.enable = function(b) {
|
$.fn.enable = function(b) {
|
||||||
if (b == undefined) b = true;
|
if (b == undefined) b = true;
|
||||||
return this.each(function() {
|
return this.each(function() {
|
||||||
this.disabled = !b;
|
this.disabled = !b
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
804
js/jquery.js
vendored
804
js/jquery.js
vendored
File diff suppressed because it is too large
Load Diff
280
js/jquery.min.js
vendored
280
js/jquery.min.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/*!
|
/*!
|
||||||
* jQuery JavaScript Library v1.4.1
|
* jQuery JavaScript Library v1.4.2
|
||||||
* http://jquery.com/
|
* http://jquery.com/
|
||||||
*
|
*
|
||||||
* Copyright 2010, John Resig
|
* Copyright 2010, John Resig
|
||||||
@ -11,143 +11,145 @@
|
|||||||
* Copyright 2010, The Dojo Foundation
|
* Copyright 2010, The Dojo Foundation
|
||||||
* Released under the MIT, BSD, and GPL Licenses.
|
* Released under the MIT, BSD, and GPL Licenses.
|
||||||
*
|
*
|
||||||
* Date: Mon Jan 25 19:43:33 2010 -0500
|
* Date: Sat Feb 13 22:33:48 2010 -0500
|
||||||
*/
|
*/
|
||||||
(function(z,v){function la(){if(!c.isReady){try{r.documentElement.doScroll("left")}catch(a){setTimeout(la,1);return}c.ready()}}function Ma(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,i){var j=a.length;if(typeof b==="object"){for(var n in b)X(a,n,b[n],f,e,d);return a}if(d!==v){f=!i&&f&&c.isFunction(d);for(n=0;n<j;n++)e(a[n],b,f?d.call(a[n],n,e(a[n],b)):d,i);return a}return j?
|
(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o<i;o++)e(a[o],b,f?d.call(a[o],o,e(a[o],b)):d,j);return a}return i?
|
||||||
e(a[0],b):null}function J(){return(new Date).getTime()}function Y(){return false}function Z(){return true}function ma(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function na(a){var b,d=[],f=[],e=arguments,i,j,n,o,m,s,x=c.extend({},c.data(this,"events").live);if(!(a.button&&a.type==="click")){for(o in x){j=x[o];if(j.live===a.type||j.altLive&&c.inArray(a.type,j.altLive)>-1){i=j.data;i.beforeFilter&&i.beforeFilter[a.type]&&!i.beforeFilter[a.type](a)||f.push(j.selector)}else delete x[o]}i=c(a.target).closest(f,
|
e(a[0],b):w}function J(){return(new Date).getTime()}function Y(){return false}function Z(){return true}function na(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function oa(a){var b,d=[],f=[],e=arguments,j,i,o,k,n,r;i=c.data(this,"events");if(!(a.liveFired===this||!i||!i.live||a.button&&a.type==="click")){a.liveFired=this;var u=i.live.slice(0);for(k=0;k<u.length;k++){i=u[k];i.origType.replace(O,"")===a.type?f.push(i.selector):u.splice(k--,1)}j=c(a.target).closest(f,a.currentTarget);n=0;for(r=
|
||||||
a.currentTarget);m=0;for(s=i.length;m<s;m++)for(o in x){j=x[o];n=i[m].elem;f=null;if(i[m].selector===j.selector){if(j.live==="mouseenter"||j.live==="mouseleave")f=c(a.relatedTarget).closest(j.selector)[0];if(!f||f!==n)d.push({elem:n,fn:j})}}m=0;for(s=d.length;m<s;m++){i=d[m];a.currentTarget=i.elem;a.data=i.fn.data;if(i.fn.apply(i.elem,e)===false){b=false;break}}return b}}function oa(a,b){return"live."+(a?a+".":"")+b.replace(/\./g,"`").replace(/ /g,"&")}function pa(a){return!a||!a.parentNode||a.parentNode.nodeType===
|
j.length;n<r;n++)for(k=0;k<u.length;k++){i=u[k];if(j[n].selector===i.selector){o=j[n].elem;f=null;if(i.preType==="mouseenter"||i.preType==="mouseleave")f=c(a.relatedTarget).closest(i.selector)[0];if(!f||f!==o)d.push({elem:o,handleObj:i})}}n=0;for(r=d.length;n<r;n++){j=d[n];a.currentTarget=j.elem;a.data=j.handleObj.data;a.handleObj=j.handleObj;if(j.handleObj.origHandler.apply(j.elem,e)===false){b=false;break}}return b}}function pa(a,b){return"live."+(a&&a!=="*"?a+".":"")+b.replace(/\./g,"`").replace(/ /g,
|
||||||
11}function qa(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var f=c.data(a[d++]),e=c.data(this,f);if(f=f&&f.events){delete e.handle;e.events={};for(var i in f)for(var j in f[i])c.event.add(this,i,f[i][j],f[i][j].data)}}})}function ra(a,b,d){var f,e,i;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&a[0].indexOf("<option")<0&&(c.support.checkClone||!sa.test(a[0]))){e=true;if(i=c.fragments[a[0]])if(i!==1)f=i}if(!f){b=b&&b[0]?b[0].ownerDocument||b[0]:r;f=b.createDocumentFragment();
|
"&")}function qa(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function ra(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var f=c.data(a[d++]),e=c.data(this,f);if(f=f&&f.events){delete e.handle;e.events={};for(var j in f)for(var i in f[j])c.event.add(this,j,f[j][i],f[j][i].data)}}})}function sa(a,b,d){var f,e,j;b=b&&b[0]?b[0].ownerDocument||b[0]:s;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===s&&!ta.test(a[0])&&(c.support.checkClone||!ua.test(a[0]))){e=
|
||||||
c.clean(a,b,f,d)}if(e)c.fragments[a[0]]=i?f:1;return{fragment:f,cacheable:e}}function K(a,b){var d={};c.each(ta.concat.apply([],ta.slice(0,b)),function(){d[this]=a});return d}function ua(a){return"scrollTo"in a&&a.document?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var c=function(a,b){return new c.fn.init(a,b)},Na=z.jQuery,Oa=z.$,r=z.document,S,Pa=/^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,Qa=/^.[^:#\[\.,]*$/,Ra=/\S/,Sa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Ta=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,O=navigator.userAgent,
|
true;if(j=c.fragments[a[0]])if(j!==1)f=j}if(!f){f=b.createDocumentFragment();c.clean(a,b,f,d)}if(e)c.fragments[a[0]]=j?f:1;return{fragment:f,cacheable:e}}function K(a,b){var d={};c.each(va.concat.apply([],va.slice(0,b)),function(){d[this]=a});return d}function wa(a){return"scrollTo"in a&&a.document?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var c=function(a,b){return new c.fn.init(a,b)},Ra=A.jQuery,Sa=A.$,s=A.document,T,Ta=/^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/,
|
||||||
va=false,P=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,Q=Array.prototype.slice,wa=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(typeof a==="string")if((d=Pa.exec(a))&&(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:r;if(a=Ta.exec(a))if(c.isPlainObject(b)){a=[r.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=ra([d[1]],
|
Wa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&&
|
||||||
[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}}else{if(b=r.getElementById(d[2])){if(b.id!==d[2])return S.find(a);this.length=1;this[0]=b}this.context=r;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=r;a=r.getElementsByTagName(a)}else return!b||b.jquery?(b||S).find(a):c(b).find(a);else if(c.isFunction(a))return S.ready(a);if(a.selector!==v){this.selector=a.selector;this.context=a.context}return c.isArray(a)?this.setArray(a):c.makeArray(a,
|
(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this,
|
||||||
this)},selector:"",jquery:"1.4.1",length:0,size:function(){return this.length},toArray:function(){return Q.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){a=c(a||null);a.prevObject=this;a.context=this.context;if(b==="find")a.selector=this.selector+(this.selector?" ":"")+d;else if(b)a.selector=this.selector+"."+b+"("+d+")";return a},setArray:function(a){this.length=0;ba.apply(this,a);return this},each:function(a,b){return c.each(this,
|
a)}else return!b||b.jquery?(b||T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b===
|
||||||
a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(r,c);else P&&P.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(Q.apply(this,arguments),"slice",Q.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};
|
"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,
|
||||||
c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,i,j,n;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b<d;b++)if((e=arguments[b])!=null)for(i in e){j=a[i];n=e[i];if(a!==n)if(f&&n&&(c.isPlainObject(n)||c.isArray(n))){j=j&&(c.isPlainObject(j)||c.isArray(j))?j:c.isArray(n)?[]:{};a[i]=c.extend(f,j,n)}else if(n!==v)a[i]=n}return a};c.extend({noConflict:function(a){z.$=
|
function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b<d;b++)if((e=arguments[b])!=null)for(j in e){i=a[j];o=e[j];if(a!==o)if(f&&o&&(c.isPlainObject(o)||c.isArray(o))){i=i&&(c.isPlainObject(i)||
|
||||||
Oa;if(a)z.jQuery=Na;return c},isReady:false,ready:function(){if(!c.isReady){if(!r.body)return setTimeout(c.ready,13);c.isReady=true;if(P){for(var a,b=0;a=P[b++];)a.call(r,c);P=null}c.fn.triggerHandler&&c(r).triggerHandler("ready")}},bindReady:function(){if(!va){va=true;if(r.readyState==="complete")return c.ready();if(r.addEventListener){r.addEventListener("DOMContentLoaded",L,false);z.addEventListener("load",c.ready,false)}else if(r.attachEvent){r.attachEvent("onreadystatechange",L);z.attachEvent("onload",
|
c.isArray(i))?i:c.isArray(o)?[]:{};a[j]=c.extend(f,i,o)}else if(o!==w)a[j]=o}return a};c.extend({noConflict:function(a){A.$=Sa;if(a)A.jQuery=Ra;return c},isReady:false,ready:function(){if(!c.isReady){if(!s.body)return setTimeout(c.ready,13);c.isReady=true;if(Q){for(var a,b=0;a=Q[b++];)a.call(s,c);Q=null}c.fn.triggerHandler&&c(s).triggerHandler("ready")}},bindReady:function(){if(!xa){xa=true;if(s.readyState==="complete")return c.ready();if(s.addEventListener){s.addEventListener("DOMContentLoaded",
|
||||||
c.ready);var a=false;try{a=z.frameElement==null}catch(b){}r.documentElement.doScroll&&a&&la()}}},isFunction:function(a){return $.call(a)==="[object Function]"},isArray:function(a){return $.call(a)==="[object Array]"},isPlainObject:function(a){if(!a||$.call(a)!=="[object Object]"||a.nodeType||a.setInterval)return false;if(a.constructor&&!aa.call(a,"constructor")&&!aa.call(a.constructor.prototype,"isPrototypeOf"))return false;var b;for(b in a);return b===v||aa.call(a,b)},isEmptyObject:function(a){for(var b in a)return false;
|
L,false);A.addEventListener("load",c.ready,false)}else if(s.attachEvent){s.attachEvent("onreadystatechange",L);A.attachEvent("onload",c.ready);var a=false;try{a=A.frameElement==null}catch(b){}s.documentElement.doScroll&&a&&ma()}}},isFunction:function(a){return $.call(a)==="[object Function]"},isArray:function(a){return $.call(a)==="[object Array]"},isPlainObject:function(a){if(!a||$.call(a)!=="[object Object]"||a.nodeType||a.setInterval)return false;if(a.constructor&&!aa.call(a,"constructor")&&!aa.call(a.constructor.prototype,
|
||||||
return true},error:function(a){throw a;},parseJSON:function(a){if(typeof a!=="string"||!a)return null;if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return z.JSON&&z.JSON.parse?z.JSON.parse(a):(new Function("return "+a))();else c.error("Invalid JSON: "+a)},noop:function(){},globalEval:function(a){if(a&&Ra.test(a)){var b=r.getElementsByTagName("head")[0]||
|
"isPrototypeOf"))return false;var b;for(b in a);return b===w||aa.call(a,b)},isEmptyObject:function(a){for(var b in a)return false;return true},error:function(a){throw a;},parseJSON:function(a){if(typeof a!=="string"||!a)return null;a=c.trim(a);if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return A.JSON&&A.JSON.parse?A.JSON.parse(a):(new Function("return "+
|
||||||
r.documentElement,d=r.createElement("script");d.type="text/javascript";if(c.support.scriptEval)d.appendChild(r.createTextNode(a));else d.text=a;b.insertBefore(d,b.firstChild);b.removeChild(d)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,b,d){var f,e=0,i=a.length,j=i===v||c.isFunction(a);if(d)if(j)for(f in a){if(b.apply(a[f],d)===false)break}else for(;e<i;){if(b.apply(a[e++],d)===false)break}else if(j)for(f in a){if(b.call(a[f],f,a[f])===false)break}else for(d=
|
a))();else c.error("Invalid JSON: "+a)},noop:function(){},globalEval:function(a){if(a&&Va.test(a)){var b=s.getElementsByTagName("head")[0]||s.documentElement,d=s.createElement("script");d.type="text/javascript";if(c.support.scriptEval)d.appendChild(s.createTextNode(a));else d.text=a;b.insertBefore(d,b.firstChild);b.removeChild(d)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,b,d){var f,e=0,j=a.length,i=j===w||c.isFunction(a);if(d)if(i)for(f in a){if(b.apply(a[f],
|
||||||
a[0];e<i&&b.call(d,e,d)!==false;d=a[++e]);return a},trim:function(a){return(a||"").replace(Sa,"")},makeArray:function(a,b){b=b||[];if(a!=null)a.length==null||typeof a==="string"||c.isFunction(a)||typeof a!=="function"&&a.setInterval?ba.call(b,a):c.merge(b,a);return b},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var d=0,f=b.length;d<f;d++)if(b[d]===a)return d;return-1},merge:function(a,b){var d=a.length,f=0;if(typeof b.length==="number")for(var e=b.length;f<e;f++)a[d++]=b[f];else for(;b[f]!==
|
d)===false)break}else for(;e<j;){if(b.apply(a[e++],d)===false)break}else if(i)for(f in a){if(b.call(a[f],f,a[f])===false)break}else for(d=a[0];e<j&&b.call(d,e,d)!==false;d=a[++e]);return a},trim:function(a){return(a||"").replace(Wa,"")},makeArray:function(a,b){b=b||[];if(a!=null)a.length==null||typeof a==="string"||c.isFunction(a)||typeof a!=="function"&&a.setInterval?ba.call(b,a):c.merge(b,a);return b},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var d=0,f=b.length;d<f;d++)if(b[d]===
|
||||||
v;)a[d++]=b[f++];a.length=d;return a},grep:function(a,b,d){for(var f=[],e=0,i=a.length;e<i;e++)!d!==!b(a[e],e)&&f.push(a[e]);return f},map:function(a,b,d){for(var f=[],e,i=0,j=a.length;i<j;i++){e=b(a[i],i,d);if(e!=null)f[f.length]=e}return f.concat.apply([],f)},guid:1,proxy:function(a,b,d){if(arguments.length===2)if(typeof b==="string"){d=a;a=d[b];b=v}else if(b&&!c.isFunction(b)){d=b;b=v}if(!b&&a)b=function(){return a.apply(d||this,arguments)};if(a)b.guid=a.guid=a.guid||b.guid||c.guid++;return b},
|
a)return d;return-1},merge:function(a,b){var d=a.length,f=0;if(typeof b.length==="number")for(var e=b.length;f<e;f++)a[d++]=b[f];else for(;b[f]!==w;)a[d++]=b[f++];a.length=d;return a},grep:function(a,b,d){for(var f=[],e=0,j=a.length;e<j;e++)!d!==!b(a[e],e)&&f.push(a[e]);return f},map:function(a,b,d){for(var f=[],e,j=0,i=a.length;j<i;j++){e=b(a[j],j,d);if(e!=null)f[f.length]=e}return f.concat.apply([],f)},guid:1,proxy:function(a,b,d){if(arguments.length===2)if(typeof b==="string"){d=a;a=d[b];b=w}else if(b&&
|
||||||
uaMatch:function(a){a=a.toLowerCase();a=/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version)?[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||!/compatible/.test(a)&&/(mozilla)(?:.*? rv:([\w.]+))?/.exec(a)||[];return{browser:a[1]||"",version:a[2]||"0"}},browser:{}});O=c.uaMatch(O);if(O.browser){c.browser[O.browser]=true;c.browser.version=O.version}if(c.browser.webkit)c.browser.safari=true;if(wa)c.inArray=function(a,b){return wa.call(b,a)};S=c(r);if(r.addEventListener)L=function(){r.removeEventListener("DOMContentLoaded",
|
!c.isFunction(b)){d=b;b=w}if(!b&&a)b=function(){return a.apply(d||this,arguments)};if(a)b.guid=a.guid=a.guid||b.guid||c.guid++;return b},uaMatch:function(a){a=a.toLowerCase();a=/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version)?[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||!/compatible/.test(a)&&/(mozilla)(?:.*? rv:([\w.]+))?/.exec(a)||[];return{browser:a[1]||"",version:a[2]||"0"}},browser:{}});P=c.uaMatch(P);if(P.browser){c.browser[P.browser]=true;c.browser.version=P.version}if(c.browser.webkit)c.browser.safari=
|
||||||
L,false);c.ready()};else if(r.attachEvent)L=function(){if(r.readyState==="complete"){r.detachEvent("onreadystatechange",L);c.ready()}};(function(){c.support={};var a=r.documentElement,b=r.createElement("script"),d=r.createElement("div"),f="script"+J();d.style.display="none";d.innerHTML=" <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";var e=d.getElementsByTagName("*"),i=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!i)){c.support=
|
true;if(ya)c.inArray=function(a,b){return ya.call(b,a)};T=c(s);if(s.addEventListener)L=function(){s.removeEventListener("DOMContentLoaded",L,false);c.ready()};else if(s.attachEvent)L=function(){if(s.readyState==="complete"){s.detachEvent("onreadystatechange",L);c.ready()}};(function(){c.support={};var a=s.documentElement,b=s.createElement("script"),d=s.createElement("div"),f="script"+J();d.style.display="none";d.innerHTML=" <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
|
||||||
{leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(i.getAttribute("style")),hrefNormalized:i.getAttribute("href")==="/a",opacity:/^0.55$/.test(i.style.opacity),cssFloat:!!i.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:r.createElement("select").appendChild(r.createElement("option")).selected,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};
|
var e=d.getElementsByTagName("*"),j=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!j)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(j.getAttribute("style")),hrefNormalized:j.getAttribute("href")==="/a",opacity:/^0.55$/.test(j.style.opacity),cssFloat:!!j.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:s.createElement("select").appendChild(s.createElement("option")).selected,
|
||||||
b.type="text/javascript";try{b.appendChild(r.createTextNode("window."+f+"=1;"))}catch(j){}a.insertBefore(b,a.firstChild);if(z[f]){c.support.scriptEval=true;delete z[f]}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function n(){c.support.noCloneEvent=false;d.detachEvent("onclick",n)});d.cloneNode(true).fireEvent("onclick")}d=r.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=r.createDocumentFragment();a.appendChild(d.firstChild);
|
parentNode:d.removeChild(d.appendChild(s.createElement("div"))).parentNode===null,deleteExpando:true,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};b.type="text/javascript";try{b.appendChild(s.createTextNode("window."+f+"=1;"))}catch(i){}a.insertBefore(b,a.firstChild);if(A[f]){c.support.scriptEval=true;delete A[f]}try{delete b.test}catch(o){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function k(){c.support.noCloneEvent=
|
||||||
c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var n=r.createElement("div");n.style.width=n.style.paddingLeft="1px";r.body.appendChild(n);c.boxModel=c.support.boxModel=n.offsetWidth===2;r.body.removeChild(n).style.display="none"});a=function(n){var o=r.createElement("div");n="on"+n;var m=n in o;if(!m){o.setAttribute(n,"return;");m=typeof o[n]==="function"}return m};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=i=null}})();c.props=
|
false;d.detachEvent("onclick",k)});d.cloneNode(true).fireEvent("onclick")}d=s.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=s.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var k=s.createElement("div");k.style.width=k.style.paddingLeft="1px";s.body.appendChild(k);c.boxModel=c.support.boxModel=k.offsetWidth===2;s.body.removeChild(k).style.display="none"});a=function(k){var n=
|
||||||
{"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ua=0,xa={},Va={};c.extend({cache:{},expando:G,noData:{embed:true,object:true,applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==z?xa:a;var f=a[G],e=c.cache;if(!b&&!f)return null;f||(f=++Ua);if(typeof b==="object"){a[G]=f;e=e[f]=c.extend(true,
|
s.createElement("div");k="on"+k;var r=k in n;if(!r){n.setAttribute(k,"return;");r=typeof n[k]==="function"}return r};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=j=null}})();c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ya=0,za={};c.extend({cache:{},expando:G,noData:{embed:true,object:true,
|
||||||
{},b)}else e=e[f]?e[f]:typeof d==="undefined"?Va:(e[f]={});if(d!==v){a[G]=f;e[b]=d}return typeof b==="string"?e[b]:e}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==z?xa:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{try{delete a[G]}catch(i){a.removeAttribute&&a.removeAttribute(G)}delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,
|
applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var f=a[G],e=c.cache;if(!f&&typeof b==="string"&&d===w)return null;f||(f=++Ya);if(typeof b==="object"){a[G]=f;e[f]=c.extend(true,{},b)}else if(!e[f]){a[G]=f;e[f]={}}a=e[f];if(d!==w)a[b]=d;return typeof b==="string"?a[b]:a}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{if(c.support.deleteExpando)delete a[c.expando];
|
||||||
a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===v){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===v&&this.length)f=c.data(this[0],a);return f===v&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this,a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);
|
else a.removeAttribute&&a.removeAttribute(c.expando);delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===w){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===w&&this.length)f=c.data(this[0],a);return f===w&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this,
|
||||||
return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===v)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||
|
a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===
|
||||||
a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var ya=/[\n\t]/g,ca=/\s+/,Wa=/\r/g,Xa=/href|src|style/,Ya=/(button|input)/i,Za=/(button|input|object|select|textarea)/i,$a=/^(a|area)$/i,za=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(o){var m=
|
w)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var Aa=/[\n\t]/g,ca=/\s+/,Za=/\r/g,$a=/href|src|style/,ab=/(button|input)/i,bb=/(button|input|object|select|textarea)/i,
|
||||||
c(this);m.addClass(a.call(this,o,m.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1)if(e.className)for(var i=" "+e.className+" ",j=0,n=b.length;j<n;j++){if(i.indexOf(" "+b[j]+" ")<0)e.className+=" "+b[j]}else e.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(o){var m=c(this);m.removeClass(a.call(this,o,m.attr("class")))});if(a&&typeof a==="string"||a===v)for(var b=(a||"").split(ca),
|
cb=/^(a|area)$/i,Ba=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(n){var r=c(this);r.addClass(a.call(this,n,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1)if(e.className){for(var j=" "+e.className+" ",
|
||||||
d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1&&e.className)if(a){for(var i=(" "+e.className+" ").replace(ya," "),j=0,n=b.length;j<n;j++)i=i.replace(" "+b[j]+" "," ");e.className=i.substring(1,i.length-1)}else e.className=""}return this},toggleClass:function(a,b){var d=typeof a,f=typeof b==="boolean";if(c.isFunction(a))return this.each(function(e){var i=c(this);i.toggleClass(a.call(this,e,i.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var e,i=0,j=c(this),n=b,o=
|
i=e.className,o=0,k=b.length;o<k;o++)if(j.indexOf(" "+b[o]+" ")<0)i+=" "+b[o];e.className=c.trim(i)}else e.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(k){var n=c(this);n.removeClass(a.call(this,k,n.attr("class")))});if(a&&typeof a==="string"||a===w)for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1&&e.className)if(a){for(var j=(" "+e.className+" ").replace(Aa," "),i=0,o=b.length;i<o;i++)j=j.replace(" "+b[i]+" ",
|
||||||
a.split(ca);e=o[i++];){n=f?n:!j.hasClass(e);j[n?"addClass":"removeClass"](e)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,"__className__",this.className);this.className=this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(ya," ").indexOf(a)>-1)return true;return false},val:function(a){if(a===v){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||
|
" ");e.className=c.trim(j)}else e.className=""}return this},toggleClass:function(a,b){var d=typeof a,f=typeof b==="boolean";if(c.isFunction(a))return this.each(function(e){var j=c(this);j.toggleClass(a.call(this,e,j.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var e,j=0,i=c(this),o=b,k=a.split(ca);e=k[j++];){o=f?o:!i.hasClass(e);i[o?"addClass":"removeClass"](e)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,"__className__",this.className);this.className=
|
||||||
{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var i=b?d:0;for(d=b?d+1:e.length;i<d;i++){var j=e[i];if(j.selected){a=c(j).val();if(b)return a;f.push(a)}}return f}if(za.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Wa,"")}return v}var n=c.isFunction(a);return this.each(function(o){var m=c(this),s=a;if(this.nodeType===1){if(n)s=a.call(this,o,m.val());
|
this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(Aa," ").indexOf(a)>-1)return true;return false},val:function(a){if(a===w){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var j=b?d:0;for(d=b?d+1:e.length;j<d;j++){var i=
|
||||||
if(typeof s==="number")s+="";if(c.isArray(s)&&za.test(this.type))this.checked=c.inArray(m.val(),s)>=0;else if(c.nodeName(this,"select")){var x=c.makeArray(s);c("option",this).each(function(){this.selected=c.inArray(c(this).val(),x)>=0});if(!x.length)this.selectedIndex=-1}else this.value=s}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return v;if(f&&b in c.attrFn)return c(a)[b](d);
|
e[j];if(i.selected){a=c(i).val();if(b)return a;f.push(a)}}return f}if(Ba.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Za,"")}return w}var o=c.isFunction(a);return this.each(function(k){var n=c(this),r=a;if(this.nodeType===1){if(o)r=a.call(this,k,n.val());if(typeof r==="number")r+="";if(c.isArray(r)&&Ba.test(this.type))this.checked=c.inArray(n.val(),r)>=0;else if(c.nodeName(this,"select")){var u=c.makeArray(r);c("option",this).each(function(){this.selected=
|
||||||
f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==v;b=f&&c.props[b]||b;if(a.nodeType===1){var i=Xa.test(b);if(b in a&&f&&!i){if(e){b==="type"&&Ya.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:Za.test(a.nodeName)||$a.test(a.nodeName)&&a.href?0:v;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=
|
c.inArray(c(this).val(),u)>=0});if(!u.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return w;if(f&&b in c.attrFn)return c(a)[b](d);f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==w;b=f&&c.props[b]||b;if(a.nodeType===1){var j=$a.test(b);if(b in a&&f&&!j){if(e){b==="type"&&ab.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");
|
||||||
""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&i?a.getAttribute(b,2):a.getAttribute(b);return a===null?v:a}return c.style(a,b,d)}});var ab=function(a){return a.replace(/[^\w\s\.\|`]/g,function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==z&&!a.frameElement)a=z;if(!d.guid)d.guid=c.guid++;if(f!==v){d=c.proxy(d);d.data=f}var e=c.data(a,"events")||c.data(a,"events",{}),i=c.data(a,"handle"),j;if(!i){j=
|
a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:bb.test(a.nodeName)||cb.test(a.nodeName)&&a.href?0:w;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&j?a.getAttribute(b,2):a.getAttribute(b);return a===null?w:a}return c.style(a,b,d)}});var O=/\.(.*)$/,db=function(a){return a.replace(/[^\w\s\.\|`]/g,
|
||||||
function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(j.elem,arguments):v};i=c.data(a,"handle",j)}if(i){i.elem=a;b=b.split(/\s+/);for(var n,o=0;n=b[o++];){var m=n.split(".");n=m.shift();if(o>1){d=c.proxy(d);if(f!==v)d.data=f}d.type=m.slice(0).sort().join(".");var s=e[n],x=this.special[n]||{};if(!s){s=e[n]={};if(!x.setup||x.setup.call(a,f,m,d)===false)if(a.addEventListener)a.addEventListener(n,i,false);else a.attachEvent&&a.attachEvent("on"+n,i)}if(x.add)if((m=x.add.call(a,
|
function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==A&&!a.frameElement)a=A;var e,j;if(d.handler){e=d;d=e.handler}if(!d.guid)d.guid=c.guid++;if(j=c.data(a)){var i=j.events=j.events||{},o=j.handle;if(!o)j.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,arguments):w};o.elem=a;b=b.split(" ");for(var k,n=0,r;k=b[n++];){j=e?c.extend({},e):{handler:d,data:f};if(k.indexOf(".")>-1){r=k.split(".");
|
||||||
d,f,m,s))&&c.isFunction(m)){m.guid=m.guid||d.guid;m.data=m.data||d.data;m.type=m.type||d.type;d=m}s[d.guid]=d;this.global[n]=true}a=null}}},global:{},remove:function(a,b,d){if(!(a.nodeType===3||a.nodeType===8)){var f=c.data(a,"events"),e,i,j;if(f){if(b===v||typeof b==="string"&&b.charAt(0)===".")for(i in f)this.remove(a,i+(b||""));else{if(b.type){d=b.handler;b=b.type}b=b.split(/\s+/);for(var n=0;i=b[n++];){var o=i.split(".");i=o.shift();var m=!o.length,s=c.map(o.slice(0).sort(),ab);s=new RegExp("(^|\\.)"+
|
k=r.shift();j.namespace=r.slice(0).sort().join(".")}else{r=[];j.namespace=""}j.type=k;j.guid=d.guid;var u=i[k],z=c.event.special[k]||{};if(!u){u=i[k]=[];if(!z.setup||z.setup.call(a,f,r,o)===false)if(a.addEventListener)a.addEventListener(k,o,false);else a.attachEvent&&a.attachEvent("on"+k,o)}if(z.add){z.add.call(a,j);if(!j.handler.guid)j.handler.guid=d.guid}u.push(j);c.event.global[k]=true}a=null}}},global:{},remove:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){var e,j=0,i,o,k,n,r,u,z=c.data(a),
|
||||||
s.join("\\.(?:.*\\.)?")+"(\\.|$)");var x=this.special[i]||{};if(f[i]){if(d){j=f[i][d.guid];delete f[i][d.guid]}else for(var A in f[i])if(m||s.test(f[i][A].type))delete f[i][A];x.remove&&x.remove.call(a,o,j);for(e in f[i])break;if(!e){if(!x.teardown||x.teardown.call(a,o)===false)if(a.removeEventListener)a.removeEventListener(i,c.data(a,"handle"),false);else a.detachEvent&&a.detachEvent("on"+i,c.data(a,"handle"));e=null;delete f[i]}}}}for(e in f)break;if(!e){if(A=c.data(a,"handle"))A.elem=null;c.removeData(a,
|
C=z&&z.events;if(z&&C){if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(e in C)c.event.remove(a,e+b)}else{for(b=b.split(" ");e=b[j++];){n=e;i=e.indexOf(".")<0;o=[];if(!i){o=e.split(".");e=o.shift();k=new RegExp("(^|\\.)"+c.map(o.slice(0).sort(),db).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(r=C[e])if(d){n=c.event.special[e]||{};for(B=f||0;B<r.length;B++){u=r[B];if(d.guid===u.guid){if(i||k.test(u.namespace)){f==null&&r.splice(B--,1);n.remove&&n.remove.call(a,u)}if(f!=
|
||||||
"events");c.removeData(a,"handle")}}}},trigger:function(a,b,d,f){var e=a.type||a;if(!f){a=typeof a==="object"?a[G]?a:c.extend(c.Event(e),a):c.Event(e);if(e.indexOf("!")>=0){a.type=e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();this.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return v;a.result=v;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,
|
null)break}}if(r.length===0||f!=null&&r.length===1){if(!n.teardown||n.teardown.call(a,o)===false)Ca(a,e,z.handle);delete C[e]}}else for(var B=0;B<r.length;B++){u=r[B];if(i||k.test(u.namespace)){c.event.remove(a,n,u.handler,B);r.splice(B--,1)}}}if(c.isEmptyObject(C)){if(b=z.handle)b.elem=null;delete z.events;delete z.handle;c.isEmptyObject(z)&&c.removeData(a)}}}}},trigger:function(a,b,d,f){var e=a.type||a;if(!f){a=typeof a==="object"?a[G]?a:c.extend(c.Event(e),a):c.Event(e);if(e.indexOf("!")>=0){a.type=
|
||||||
b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(i){}if(!a.isPropagationStopped()&&f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){d=a.target;var j;if(!(c.nodeName(d,"a")&&e==="click")&&!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()])){try{if(d[e]){if(j=d["on"+e])d["on"+e]=null;this.triggered=true;d[e]()}}catch(n){}if(j)d["on"+e]=j;this.triggered=false}}},handle:function(a){var b,
|
e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return w;a.result=w;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(j){}if(!a.isPropagationStopped()&&
|
||||||
d;a=arguments[0]=c.event.fix(a||z.event);a.currentTarget=this;d=a.type.split(".");a.type=d.shift();b=!d.length&&!a.exclusive;var f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)");d=(c.data(this,"events")||{})[a.type];for(var e in d){var i=d[e];if(b||f.test(i.type)){a.handler=i;a.data=i.data;i=i.apply(this,arguments);if(i!==v){a.result=i;if(i===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
|
f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){f=a.target;var i,o=c.nodeName(f,"a")&&e==="click",k=c.event.special[e]||{};if((!k._default||k._default.call(d,a)===false)&&!o&&!(f&&f.nodeName&&c.noData[f.nodeName.toLowerCase()])){try{if(f[e]){if(i=f["on"+e])f["on"+e]=null;c.event.triggered=true;f[e]()}}catch(n){}if(i)f["on"+e]=i;c.event.triggered=false}}},handle:function(a){var b,d,f,e;a=arguments[0]=c.event.fix(a||A.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;
|
||||||
fix:function(a){if(a[G])return a;var b=a;a=c.Event(b);for(var d=this.props.length,f;d;){f=this.props[--d];a[f]=b[f]}if(!a.target)a.target=a.srcElement||r;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=r.documentElement;d=r.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
|
if(!b){d=a.type.split(".");a.type=d.shift();f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)")}e=c.data(this,"events");d=e[a.type];if(e&&d){d=d.slice(0);e=0;for(var j=d.length;e<j;e++){var i=d[e];if(b||f.test(i.namespace)){a.handler=i.handler;a.data=i.data;a.handleObj=i;i=i.handler.apply(this,arguments);if(i!==w){a.result=i;if(i===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
|
||||||
d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(!a.which&&(a.charCode||a.charCode===0?a.charCode:a.keyCode))a.which=a.charCode||a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==v)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a,b){c.extend(a,b||{});a.guid+=b.selector+b.live;b.liveProxy=a;c.event.add(this,b.live,na,b)},remove:function(a){if(a.length){var b=
|
fix:function(a){if(a[G])return a;var b=a;a=c.Event(b);for(var d=this.props.length,f;d;){f=this.props[--d];a[f]=b[f]}if(!a.target)a.target=a.srcElement||s;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=s.documentElement;d=s.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
|
||||||
0,d=new RegExp("(^|\\.)"+a[0]+"(\\.|$)");c.each(c.data(this,"events").live||{},function(){d.test(this.type)&&b++});b<1&&c.event.remove(this,a[0],na)}},special:{}},beforeunload:{setup:function(a,b,d){if(this.setInterval)this.onbeforeunload=d;return false},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=a;this.type=a.type}else this.type=a;this.timeStamp=J();this[G]=true};
|
d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(!a.which&&(a.charCode||a.charCode===0?a.charCode:a.keyCode))a.which=a.charCode||a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==w)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a){c.event.add(this,a.origType,c.extend({},a,{handler:oa}))},remove:function(a){var b=true,d=a.origType.replace(O,"");c.each(c.data(this,
|
||||||
c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=Z;var a=this.originalEvent;if(a){a.preventDefault&&a.preventDefault();a.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=Z;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z;this.stopPropagation()},isDefaultPrevented:Y,isPropagationStopped:Y,isImmediatePropagationStopped:Y};var Aa=function(a){for(var b=
|
"events").live||[],function(){if(d===this.origType.replace(O,""))return b=false});b&&c.event.remove(this,a.origType,oa)}},beforeunload:{setup:function(a,b,d){if(this.setInterval)this.onbeforeunload=d;return false},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};var Ca=s.removeEventListener?function(a,b,d){a.removeEventListener(b,d,false)}:function(a,b,d){a.detachEvent("on"+b,d)};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=
|
||||||
a.relatedTarget;b&&b!==this;)try{b=b.parentNode}catch(d){break}if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}},Ba=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?Ba:Aa,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?Ba:Aa)}}});if(!c.support.submitBubbles)c.event.special.submit={setup:function(a,b,d){if(this.nodeName.toLowerCase()!==
|
a;this.type=a.type}else this.type=a;this.timeStamp=J();this[G]=true};c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=Z;var a=this.originalEvent;if(a){a.preventDefault&&a.preventDefault();a.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=Z;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z;this.stopPropagation()},isDefaultPrevented:Y,isPropagationStopped:Y,
|
||||||
"form"){c.event.add(this,"click.specialSubmit."+d.guid,function(f){var e=f.target,i=e.type;if((i==="submit"||i==="image")&&c(e).closest("form").length)return ma("submit",this,arguments)});c.event.add(this,"keypress.specialSubmit."+d.guid,function(f){var e=f.target,i=e.type;if((i==="text"||i==="password")&&c(e).closest("form").length&&f.keyCode===13)return ma("submit",this,arguments)})}else return false},remove:function(a,b){c.event.remove(this,"click.specialSubmit"+(b?"."+b.guid:""));c.event.remove(this,
|
isImmediatePropagationStopped:Y};var Da=function(a){var b=a.relatedTarget;try{for(;b&&b!==this;)b=b.parentNode;if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}}catch(d){}},Ea=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?Ea:Da,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?Ea:Da)}}});if(!c.support.submitBubbles)c.event.special.submit=
|
||||||
"keypress.specialSubmit"+(b?"."+b.guid:""))}};if(!c.support.changeBubbles){var da=/textarea|input|select/i;function Ca(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d}function ea(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Ca(d);if(a.type!=="focusout"||
|
{setup:function(){if(this.nodeName.toLowerCase()!=="form"){c.event.add(this,"click.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="submit"||d==="image")&&c(b).closest("form").length)return na("submit",this,arguments)});c.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="text"||d==="password")&&c(b).closest("form").length&&a.keyCode===13)return na("submit",this,arguments)})}else return false},teardown:function(){c.event.remove(this,".specialSubmit")}};
|
||||||
d.type!=="radio")c.data(d,"_change_data",e);if(!(f===v||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}}c.event.special.change={filters:{focusout:ea,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return ea.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return ea.call(this,a)},beforeactivate:function(a){a=
|
if(!c.support.changeBubbles){var da=/textarea|input|select/i,ea,Fa=function(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},fa=function(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Fa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",
|
||||||
a.target;a.nodeName.toLowerCase()==="input"&&a.type==="radio"&&c.data(a,"_change_data",Ca(a))}},setup:function(a,b,d){for(var f in T)c.event.add(this,f+".specialChange."+d.guid,T[f]);return da.test(this.nodeName)},remove:function(a,b){for(var d in T)c.event.remove(this,d+".specialChange"+(b?"."+b.guid:""),T[d]);return da.test(this.nodeName)}};var T=c.event.special.change.filters}r.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,
|
e);if(!(f===w||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:fa,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return fa.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return fa.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,
|
||||||
f)}c.event.special[b]={setup:function(){this.addEventListener(a,d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var i in d)this[b](i,f,d[i],e);return this}if(c.isFunction(f)){e=f;f=v}var j=b==="one"?c.proxy(e,function(n){c(this).unbind(n,j);return e.apply(this,arguments)}):e;return d==="unload"&&b!=="one"?this.one(d,f,e):this.each(function(){c.event.add(this,d,j,f)})}});c.fn.extend({unbind:function(a,
|
"_change_data",Fa(a))}},setup:function(){if(this.type==="file")return false;for(var a in ea)c.event.add(this,a+".specialChange",ea[a]);return da.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return da.test(this.nodeName)}};ea=c.event.special.change.filters}s.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,f)}c.event.special[b]={setup:function(){this.addEventListener(a,
|
||||||
b){if(typeof a==="object"&&!a.preventDefault){for(var d in a)this.unbind(d,a[d]);return this}return this.each(function(){c.event.remove(this,a,b)})},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){a=c.Event(a);a.preventDefault();a.stopPropagation();c.event.trigger(a,b,this[0]);return a.result}},toggle:function(a){for(var b=arguments,d=1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(f){var e=(c.data(this,"lastToggle"+
|
d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var j in d)this[b](j,f,d[j],e);return this}if(c.isFunction(f)){e=f;f=w}var i=b==="one"?c.proxy(e,function(k){c(this).unbind(k,i);return e.apply(this,arguments)}):e;if(d==="unload"&&b!=="one")this.one(d,f,e);else{j=0;for(var o=this.length;j<o;j++)c.event.add(this[j],d,i,f)}return this}});c.fn.extend({unbind:function(a,b){if(typeof a==="object"&&
|
||||||
a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,e+1);f.preventDefault();return b[e].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});c.each(["live","die"],function(a,b){c.fn[b]=function(d,f,e){var i,j=0;if(c.isFunction(f)){e=f;f=v}for(d=(d||"").split(/\s+/);(i=d[j++])!=null;){i=i==="focus"?"focusin":i==="blur"?"focusout":i==="hover"?d.push("mouseleave")&&"mouseenter":i;b==="live"?c(this.context).bind(oa(i,this.selector),{data:f,selector:this.selector,
|
!a.preventDefault)for(var d in a)this.unbind(d,a[d]);else{d=0;for(var f=this.length;d<f;d++)c.event.remove(this[d],a,b)}return this},delegate:function(a,b,d,f){return this.live(b,d,f,a)},undelegate:function(a,b,d){return arguments.length===0?this.unbind("live"):this.die(b,null,d,a)},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){a=c.Event(a);a.preventDefault();a.stopPropagation();c.event.trigger(a,b,this[0]);return a.result}},
|
||||||
live:i},e):c(this.context).unbind(oa(i,this.selector),e?{guid:e.guid+this.selector+i}:null)}return this}});c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){c.fn[b]=function(d){return d?this.bind(b,d):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});z.attachEvent&&!z.addEventListener&&z.attachEvent("onunload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});
|
toggle:function(a){for(var b=arguments,d=1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(f){var e=(c.data(this,"lastToggle"+a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,e+1);f.preventDefault();return b[e].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var Ga={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};c.each(["live","die"],function(a,b){c.fn[b]=function(d,f,e,j){var i,o=0,k,n,r=j||this.selector,
|
||||||
(function(){function a(g){for(var h="",k,l=0;g[l];l++){k=g[l];if(k.nodeType===3||k.nodeType===4)h+=k.nodeValue;else if(k.nodeType!==8)h+=a(k.childNodes)}return h}function b(g,h,k,l,q,p){q=0;for(var u=l.length;q<u;q++){var t=l[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===k){y=l[t.sizset];break}if(t.nodeType===1&&!p){t.sizcache=k;t.sizset=q}if(t.nodeName.toLowerCase()===h){y=t;break}t=t[g]}l[q]=y}}}function d(g,h,k,l,q,p){q=0;for(var u=l.length;q<u;q++){var t=l[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===
|
u=j?this:c(this.context);if(c.isFunction(f)){e=f;f=w}for(d=(d||"").split(" ");(i=d[o++])!=null;){j=O.exec(i);k="";if(j){k=j[0];i=i.replace(O,"")}if(i==="hover")d.push("mouseenter"+k,"mouseleave"+k);else{n=i;if(i==="focus"||i==="blur"){d.push(Ga[i]+k);i+=k}else i=(Ga[i]||i)+k;b==="live"?u.each(function(){c.event.add(this,pa(i,r),{data:f,selector:r,handler:e,origType:i,origHandler:e,preType:n})}):u.unbind(pa(i,r),e)}}return this}});c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),
|
||||||
k){y=l[t.sizset];break}if(t.nodeType===1){if(!p){t.sizcache=k;t.sizset=q}if(typeof h!=="string"){if(t===h){y=true;break}}else if(o.filter(h,[t]).length>0){y=t;break}}t=t[g]}l[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,i=Object.prototype.toString,j=false,n=true;[0,0].sort(function(){n=false;return 0});var o=function(g,h,k,l){k=k||[];var q=h=h||r;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||
|
function(a,b){c.fn[b]=function(d){return d?this.bind(b,d):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});A.attachEvent&&!A.addEventListener&&A.attachEvent("onunload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});(function(){function a(g){for(var h="",l,m=0;g[m];m++){l=g[m];if(l.nodeType===3||l.nodeType===4)h+=l.nodeValue;else if(l.nodeType!==8)h+=a(l.childNodes)}return h}function b(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];
|
||||||
typeof g!=="string")return k;for(var p=[],u,t,y,R,H=true,M=w(h),I=g;(f.exec(""),u=f.exec(I))!==null;){I=u[3];p.push(u[1]);if(u[2]){R=u[3];break}}if(p.length>1&&s.exec(g))if(p.length===2&&m.relative[p[0]])t=fa(p[0]+p[1],h);else for(t=m.relative[p[0]]?[h]:o(p.shift(),h);p.length;){g=p.shift();if(m.relative[g])g+=p.shift();t=fa(g,t)}else{if(!l&&p.length>1&&h.nodeType===9&&!M&&m.match.ID.test(p[0])&&!m.match.ID.test(p[p.length-1])){u=o.find(p.shift(),h,M);h=u.expr?o.filter(u.expr,u.set)[0]:u.set[0]}if(h){u=
|
if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1&&!p){t.sizcache=l;t.sizset=q}if(t.nodeName.toLowerCase()===h){y=t;break}t=t[g]}m[q]=y}}}function d(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1){if(!p){t.sizcache=l;t.sizset=q}if(typeof h!=="string"){if(t===h){y=true;break}}else if(k.filter(h,[t]).length>0){y=t;break}}t=t[g]}m[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
|
||||||
l?{expr:p.pop(),set:A(l)}:o.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=u.expr?o.filter(u.expr,u.set):u.set;if(p.length>0)y=A(t);else H=false;for(;p.length;){var D=p.pop();u=D;if(m.relative[D])u=p.pop();else D="";if(u==null)u=h;m.relative[D](y,u,M)}}else y=[]}y||(y=t);y||o.error(D||g);if(i.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))k.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&
|
e=0,j=Object.prototype.toString,i=false,o=true;[0,0].sort(function(){o=false;return 0});var k=function(g,h,l,m){l=l||[];var q=h=h||s;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||typeof g!=="string")return l;for(var p=[],v,t,y,S,H=true,M=x(h),I=g;(f.exec(""),v=f.exec(I))!==null;){I=v[3];p.push(v[1]);if(v[2]){S=v[3];break}}if(p.length>1&&r.exec(g))if(p.length===2&&n.relative[p[0]])t=ga(p[0]+p[1],h);else for(t=n.relative[p[0]]?[h]:k(p.shift(),h);p.length;){g=p.shift();if(n.relative[g])g+=p.shift();
|
||||||
y[g].nodeType===1&&k.push(t[g]);else k.push.apply(k,y);else A(y,k);if(R){o(R,q,k,l);o.uniqueSort(k)}return k};o.uniqueSort=function(g){if(C){j=n;g.sort(C);if(j)for(var h=1;h<g.length;h++)g[h]===g[h-1]&&g.splice(h--,1)}return g};o.matches=function(g,h){return o(g,null,null,h)};o.find=function(g,h,k){var l,q;if(!g)return[];for(var p=0,u=m.order.length;p<u;p++){var t=m.order[p];if(q=m.leftMatch[t].exec(g)){var y=q[1];q.splice(1,1);if(y.substr(y.length-1)!=="\\"){q[1]=(q[1]||"").replace(/\\/g,"");l=m.find[t](q,
|
t=ga(g,t)}else{if(!m&&p.length>1&&h.nodeType===9&&!M&&n.match.ID.test(p[0])&&!n.match.ID.test(p[p.length-1])){v=k.find(p.shift(),h,M);h=v.expr?k.filter(v.expr,v.set)[0]:v.set[0]}if(h){v=m?{expr:p.pop(),set:z(m)}:k.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=v.expr?k.filter(v.expr,v.set):v.set;if(p.length>0)y=z(t);else H=false;for(;p.length;){var D=p.pop();v=D;if(n.relative[D])v=p.pop();else D="";if(v==null)v=h;n.relative[D](y,v,M)}}else y=[]}y||(y=t);y||k.error(D||
|
||||||
h,k);if(l!=null){g=g.replace(m.match[t],"");break}}}}l||(l=h.getElementsByTagName("*"));return{set:l,expr:g}};o.filter=function(g,h,k,l){for(var q=g,p=[],u=h,t,y,R=h&&h[0]&&w(h[0]);g&&h.length;){for(var H in m.filter)if((t=m.leftMatch[H].exec(g))!=null&&t[2]){var M=m.filter[H],I,D;D=t[1];y=false;t.splice(1,1);if(D.substr(D.length-1)!=="\\"){if(u===p)p=[];if(m.preFilter[H])if(t=m.preFilter[H](t,u,k,p,l,R)){if(t===true)continue}else y=I=true;if(t)for(var U=0;(D=u[U])!=null;U++)if(D){I=M(D,t,U,u);var Da=
|
g);if(j.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))l.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&l.push(t[g]);else l.push.apply(l,y);else z(y,l);if(S){k(S,q,l,m);k.uniqueSort(l)}return l};k.uniqueSort=function(g){if(B){i=o;g.sort(B);if(i)for(var h=1;h<g.length;h++)g[h]===g[h-1]&&g.splice(h--,1)}return g};k.matches=function(g,h){return k(g,null,null,h)};k.find=function(g,h,l){var m,q;if(!g)return[];
|
||||||
l^!!I;if(k&&I!=null)if(Da)y=true;else u[U]=false;else if(Da){p.push(D);y=true}}if(I!==v){k||(u=p);g=g.replace(m.match[H],"");if(!y)return[];break}}}if(g===q)if(y==null)o.error(g);else break;q=g}return u};o.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var m=o.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,
|
for(var p=0,v=n.order.length;p<v;p++){var t=n.order[p];if(q=n.leftMatch[t].exec(g)){var y=q[1];q.splice(1,1);if(y.substr(y.length-1)!=="\\"){q[1]=(q[1]||"").replace(/\\/g,"");m=n.find[t](q,h,l);if(m!=null){g=g.replace(n.match[t],"");break}}}}m||(m=h.getElementsByTagName("*"));return{set:m,expr:g}};k.filter=function(g,h,l,m){for(var q=g,p=[],v=h,t,y,S=h&&h[0]&&x(h[0]);g&&h.length;){for(var H in n.filter)if((t=n.leftMatch[H].exec(g))!=null&&t[2]){var M=n.filter[H],I,D;D=t[1];y=false;t.splice(1,1);if(D.substr(D.length-
|
||||||
TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},relative:{"+":function(g,h){var k=typeof h==="string",l=k&&!/\W/.test(h);k=k&&!l;if(l)h=h.toLowerCase();l=0;for(var q=g.length,
|
1)!=="\\"){if(v===p)p=[];if(n.preFilter[H])if(t=n.preFilter[H](t,v,l,p,m,S)){if(t===true)continue}else y=I=true;if(t)for(var U=0;(D=v[U])!=null;U++)if(D){I=M(D,t,U,v);var Ha=m^!!I;if(l&&I!=null)if(Ha)y=true;else v[U]=false;else if(Ha){p.push(D);y=true}}if(I!==w){l||(v=p);g=g.replace(n.match[H],"");if(!y)return[];break}}}if(g===q)if(y==null)k.error(g);else break;q=g}return v};k.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var n=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
|
||||||
p;l<q;l++)if(p=g[l]){for(;(p=p.previousSibling)&&p.nodeType!==1;);g[l]=k||p&&p.nodeName.toLowerCase()===h?p||false:p===h}k&&o.filter(h,g,true)},">":function(g,h){var k=typeof h==="string";if(k&&!/\W/.test(h)){h=h.toLowerCase();for(var l=0,q=g.length;l<q;l++){var p=g[l];if(p){k=p.parentNode;g[l]=k.nodeName.toLowerCase()===h?k:false}}}else{l=0;for(q=g.length;l<q;l++)if(p=g[l])g[l]=k?p.parentNode:p.parentNode===h;k&&o.filter(h,g,true)}},"":function(g,h,k){var l=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=
|
CLASS:/\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},
|
||||||
h=h.toLowerCase();q=b}q("parentNode",h,l,g,p,k)},"~":function(g,h,k){var l=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("previousSibling",h,l,g,p,k)}},find:{ID:function(g,h,k){if(typeof h.getElementById!=="undefined"&&!k)return(g=h.getElementById(g[1]))?[g]:[]},NAME:function(g,h){if(typeof h.getElementsByName!=="undefined"){var k=[];h=h.getElementsByName(g[1]);for(var l=0,q=h.length;l<q;l++)h[l].getAttribute("name")===g[1]&&k.push(h[l]);return k.length===0?null:k}},
|
relative:{"+":function(g,h){var l=typeof h==="string",m=l&&!/\W/.test(h);l=l&&!m;if(m)h=h.toLowerCase();m=0;for(var q=g.length,p;m<q;m++)if(p=g[m]){for(;(p=p.previousSibling)&&p.nodeType!==1;);g[m]=l||p&&p.nodeName.toLowerCase()===h?p||false:p===h}l&&k.filter(h,g,true)},">":function(g,h){var l=typeof h==="string";if(l&&!/\W/.test(h)){h=h.toLowerCase();for(var m=0,q=g.length;m<q;m++){var p=g[m];if(p){l=p.parentNode;g[m]=l.nodeName.toLowerCase()===h?l:false}}}else{m=0;for(q=g.length;m<q;m++)if(p=g[m])g[m]=
|
||||||
TAG:function(g,h){return h.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,h,k,l,q,p){g=" "+g[1].replace(/\\/g,"")+" ";if(p)return g;p=0;for(var u;(u=h[p])!=null;p++)if(u)if(q^(u.className&&(" "+u.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))k||l.push(u);else if(k)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&
|
l?p.parentNode:p.parentNode===h;l&&k.filter(h,g,true)}},"":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("parentNode",h,m,g,p,l)},"~":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("previousSibling",h,m,g,p,l)}},find:{ID:function(g,h,l){if(typeof h.getElementById!=="undefined"&&!l)return(g=h.getElementById(g[1]))?[g]:[]},NAME:function(g,h){if(typeof h.getElementsByName!=="undefined"){var l=[];
|
||||||
"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,k,l,q,p){h=g[1].replace(/\\/g,"");if(!p&&m.attrMap[h])g[1]=m.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,k,l,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=o(g[3],null,null,h);else{g=o.filter(g[3],h,k,true^q);k||l.push.apply(l,g);return false}else if(m.match.POS.test(g[0])||m.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);
|
h=h.getElementsByName(g[1]);for(var m=0,q=h.length;m<q;m++)h[m].getAttribute("name")===g[1]&&l.push(h[m]);return l.length===0?null:l}},TAG:function(g,h){return h.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,h,l,m,q,p){g=" "+g[1].replace(/\\/g,"")+" ";if(p)return g;p=0;for(var v;(v=h[p])!=null;p++)if(v)if(q^(v.className&&(" "+v.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))l||m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},
|
||||||
return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,k){return!!o(k[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===
|
CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l||m.push.apply(m,
|
||||||
g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},setFilters:{first:function(g,h){return h===0},last:function(g,h,k,l){return h===l.length-1},even:function(g,h){return h%2===
|
g);return false}else if(n.match.POS.test(g[0])||n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},
|
||||||
0},odd:function(g,h){return h%2===1},lt:function(g,h,k){return h<k[3]-0},gt:function(g,h,k){return h>k[3]-0},nth:function(g,h,k){return k[3]-0===h},eq:function(g,h,k){return k[3]-0===h}},filter:{PSEUDO:function(g,h,k,l){var q=h[1],p=m.filters[q];if(p)return p(g,k,h,l);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h=h[3];k=0;for(l=h.length;k<l;k++)if(h[k]===g)return false;return true}else o.error("Syntax error, unrecognized expression: "+
|
text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},
|
||||||
q)},CHILD:function(g,h){var k=h[1],l=g;switch(k){case "only":case "first":for(;l=l.previousSibling;)if(l.nodeType===1)return false;if(k==="first")return true;l=g;case "last":for(;l=l.nextSibling;)if(l.nodeType===1)return false;return true;case "nth":k=h[2];var q=h[3];if(k===1&&q===0)return true;h=h[0];var p=g.parentNode;if(p&&(p.sizcache!==h||!g.nodeIndex)){var u=0;for(l=p.firstChild;l;l=l.nextSibling)if(l.nodeType===1)l.nodeIndex=++u;p.sizcache=h}g=g.nodeIndex-q;return k===0?g===0:g%k===0&&g/k>=
|
setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return h<l[3]-0},gt:function(g,h,l){return h>l[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h=
|
||||||
0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var k=h[1];g=m.attrHandle[k]?m.attrHandle[k](g):g[k]!=null?g[k]:g.getAttribute(k);k=g+"";var l=h[2];h=h[4];return g==null?l==="!=":l==="="?k===h:l==="*="?k.indexOf(h)>=0:l==="~="?(" "+k+" ").indexOf(h)>=0:!h?k&&g!==false:l==="!="?k!==h:l==="^="?
|
h[3];l=0;for(m=h.length;l<m;l++)if(h[l]===g)return false;return true}else k.error("Syntax error, unrecognized expression: "+q)},CHILD:function(g,h){var l=h[1],m=g;switch(l){case "only":case "first":for(;m=m.previousSibling;)if(m.nodeType===1)return false;if(l==="first")return true;m=g;case "last":for(;m=m.nextSibling;)if(m.nodeType===1)return false;return true;case "nth":l=h[2];var q=h[3];if(l===1&&q===0)return true;h=h[0];var p=g.parentNode;if(p&&(p.sizcache!==h||!g.nodeIndex)){var v=0;for(m=p.firstChild;m;m=
|
||||||
k.indexOf(h)===0:l==="$="?k.substr(k.length-h.length)===h:l==="|="?k===h||k.substr(0,h.length+1)===h+"-":false},POS:function(g,h,k,l){var q=m.setFilters[h[2]];if(q)return q(g,k,h,l)}}},s=m.match.POS;for(var x in m.match){m.match[x]=new RegExp(m.match[x].source+/(?![^\[]*\])(?![^\(]*\))/.source);m.leftMatch[x]=new RegExp(/(^(?:.|\r|\n)*?)/.source+m.match[x].source.replace(/\\(\d+)/g,function(g,h){return"\\"+(h-0+1)}))}var A=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};
|
m.nextSibling)if(m.nodeType===1)m.nodeIndex=++v;p.sizcache=h}g=g.nodeIndex-q;return l===0?g===0:g%l===0&&g/l>=0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m===
|
||||||
try{Array.prototype.slice.call(r.documentElement.childNodes,0)}catch(B){A=function(g,h){h=h||[];if(i.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var k=0,l=g.length;k<l;k++)h.push(g[k]);else for(k=0;g[k];k++)h.push(g[k]);return h}}var C;if(r.documentElement.compareDocumentPosition)C=function(g,h){if(!g.compareDocumentPosition||!h.compareDocumentPosition){if(g==h)j=true;return g.compareDocumentPosition?-1:1}g=g.compareDocumentPosition(h)&4?-1:g===
|
"="?l===h:m==="*="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="|="?l===h||l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]*\])(?![^\(]*\))/.source);n.leftMatch[u]=new RegExp(/(^(?:.|\r|\n)*?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g,
|
||||||
h?0:1;if(g===0)j=true;return g};else if("sourceIndex"in r.documentElement)C=function(g,h){if(!g.sourceIndex||!h.sourceIndex){if(g==h)j=true;return g.sourceIndex?-1:1}g=g.sourceIndex-h.sourceIndex;if(g===0)j=true;return g};else if(r.createRange)C=function(g,h){if(!g.ownerDocument||!h.ownerDocument){if(g==h)j=true;return g.ownerDocument?-1:1}var k=g.ownerDocument.createRange(),l=h.ownerDocument.createRange();k.setStart(g,0);k.setEnd(g,0);l.setStart(h,0);l.setEnd(h,0);g=k.compareBoundaryPoints(Range.START_TO_END,
|
h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h||[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l<m;l++)h.push(g[l]);else for(l=0;g[l];l++)h.push(g[l]);return h}}var B;if(s.documentElement.compareDocumentPosition)B=function(g,h){if(!g.compareDocumentPosition||
|
||||||
l);if(g===0)j=true;return g};(function(){var g=r.createElement("div"),h="script"+(new Date).getTime();g.innerHTML="<a name='"+h+"'/>";var k=r.documentElement;k.insertBefore(g,k.firstChild);if(r.getElementById(h)){m.find.ID=function(l,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(l[1]))?q.id===l[1]||typeof q.getAttributeNode!=="undefined"&&q.getAttributeNode("id").nodeValue===l[1]?[q]:v:[]};m.filter.ID=function(l,q){var p=typeof l.getAttributeNode!=="undefined"&&l.getAttributeNode("id");
|
!h.compareDocumentPosition){if(g==h)i=true;return g.compareDocumentPosition?-1:1}g=g.compareDocumentPosition(h)&4?-1:g===h?0:1;if(g===0)i=true;return g};else if("sourceIndex"in s.documentElement)B=function(g,h){if(!g.sourceIndex||!h.sourceIndex){if(g==h)i=true;return g.sourceIndex?-1:1}g=g.sourceIndex-h.sourceIndex;if(g===0)i=true;return g};else if(s.createRange)B=function(g,h){if(!g.ownerDocument||!h.ownerDocument){if(g==h)i=true;return g.ownerDocument?-1:1}var l=g.ownerDocument.createRange(),m=
|
||||||
return l.nodeType===1&&p&&p.nodeValue===q}}k.removeChild(g);k=g=null})();(function(){var g=r.createElement("div");g.appendChild(r.createComment(""));if(g.getElementsByTagName("*").length>0)m.find.TAG=function(h,k){k=k.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var l=0;k[l];l++)k[l].nodeType===1&&h.push(k[l]);k=h}return k};g.innerHTML="<a href='#'></a>";if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")m.attrHandle.href=function(h){return h.getAttribute("href",
|
h.ownerDocument.createRange();l.setStart(g,0);l.setEnd(g,0);m.setStart(h,0);m.setEnd(h,0);g=l.compareBoundaryPoints(Range.START_TO_END,m);if(g===0)i=true;return g};(function(){var g=s.createElement("div"),h="script"+(new Date).getTime();g.innerHTML="<a name='"+h+"'/>";var l=s.documentElement;l.insertBefore(g,l.firstChild);if(s.getElementById(h)){n.find.ID=function(m,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(m[1]))?q.id===m[1]||typeof q.getAttributeNode!=="undefined"&&
|
||||||
2)};g=null})();r.querySelectorAll&&function(){var g=o,h=r.createElement("div");h.innerHTML="<p class='TEST'></p>";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){o=function(l,q,p,u){q=q||r;if(!u&&q.nodeType===9&&!w(q))try{return A(q.querySelectorAll(l),p)}catch(t){}return g(l,q,p,u)};for(var k in g)o[k]=g[k];h=null}}();(function(){var g=r.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===
|
q.getAttributeNode("id").nodeValue===m[1]?[q]:w:[]};n.filter.ID=function(m,q){var p=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&p&&p.nodeValue===q}}l.removeChild(g);l=g=null})();(function(){var g=s.createElement("div");g.appendChild(s.createComment(""));if(g.getElementsByTagName("*").length>0)n.find.TAG=function(h,l){l=l.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var m=0;l[m];m++)l[m].nodeType===1&&h.push(l[m]);l=h}return l};g.innerHTML="<a href='#'></a>";
|
||||||
0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){m.order.splice(1,0,"CLASS");m.find.CLASS=function(h,k,l){if(typeof k.getElementsByClassName!=="undefined"&&!l)return k.getElementsByClassName(h[1])};g=null}}})();var E=r.compareDocumentPosition?function(g,h){return g.compareDocumentPosition(h)&16}:function(g,h){return g!==h&&(g.contains?g.contains(h):true)},w=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},fa=function(g,h){var k=[],
|
if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")n.attrHandle.href=function(h){return h.getAttribute("href",2)};g=null})();s.querySelectorAll&&function(){var g=k,h=s.createElement("div");h.innerHTML="<p class='TEST'></p>";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q||s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}();
|
||||||
l="",q;for(h=h.nodeType?[h]:h;q=m.match.PSEUDO.exec(g);){l+=q[0];g=g.replace(m.match.PSEUDO,"")}g=m.relative[g]?g+"*":g;q=0;for(var p=h.length;q<p;q++)o(g,h[q],k);return o.filter(l,k)};c.find=o;c.expr=o.selectors;c.expr[":"]=c.expr.filters;c.unique=o.uniqueSort;c.getText=a;c.isXMLDoc=w;c.contains=E})();var bb=/Until$/,cb=/^(?:parents|prevUntil|prevAll)/,db=/,/;Q=Array.prototype.slice;var Ea=function(a,b,d){if(c.isFunction(b))return c.grep(a,function(e,i){return!!b.call(e,i,e)===d});else if(b.nodeType)return c.grep(a,
|
(function(){var g=s.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}:
|
||||||
function(e){return e===b===d});else if(typeof b==="string"){var f=c.grep(a,function(e){return e.nodeType===1});if(Qa.test(b))return c.filter(b,f,!d);else b=c.filter(b,f)}return c.grep(a,function(e){return c.inArray(e,b)>=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f<e;f++){d=b.length;c.find(a,this[f],b);if(f>0)for(var i=d;i<b.length;i++)for(var j=0;j<d;j++)if(b[j]===b[i]){b.splice(i--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=
|
function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q<p;q++)k(g,h[q],l);return k.filter(m,l)};c.find=k;c.expr=k.selectors;c.expr[":"]=c.expr.filters;c.unique=k.uniqueSort;c.text=a;c.isXMLDoc=x;c.contains=E})();var eb=/Until$/,fb=/^(?:parents|prevUntil|prevAll)/,
|
||||||
0,f=b.length;d<f;d++)if(c.contains(this,b[d]))return true})},not:function(a){return this.pushStack(Ea(this,a,false),"not",a)},filter:function(a){return this.pushStack(Ea(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,i={},j;if(f&&a.length){e=0;for(var n=a.length;e<n;e++){j=a[e];i[j]||(i[j]=c.expr.match.POS.test(j)?c(j,b||this.context):j)}for(;f&&f.ownerDocument&&f!==b;){for(j in i){e=i[j];if(e.jquery?e.index(f)>
|
gb=/,/;R=Array.prototype.slice;var Ia=function(a,b,d){if(c.isFunction(b))return c.grep(a,function(e,j){return!!b.call(e,j,e)===d});else if(b.nodeType)return c.grep(a,function(e){return e===b===d});else if(typeof b==="string"){var f=c.grep(a,function(e){return e.nodeType===1});if(Ua.test(b))return c.filter(b,f,!d);else b=c.filter(b,f)}return c.grep(a,function(e){return c.inArray(e,b)>=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f<e;f++){d=b.length;
|
||||||
-1:c(f).is(e)){d.push({selector:j,elem:f});delete i[j]}}f=f.parentNode}}return d}var o=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(m,s){for(;s&&s.ownerDocument&&s!==b;){if(o?o.index(s)>-1:c(s).is(a))return s;s=s.parentNode}return null})},index:function(a){if(!a||typeof a==="string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),
|
c.find(a,this[f],b);if(f>0)for(var j=d;j<b.length;j++)for(var i=0;i<d;i++)if(b[i]===b[j]){b.splice(j--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=0,f=b.length;d<f;d++)if(c.contains(this,b[d]))return true})},not:function(a){return this.pushStack(Ia(this,a,false),"not",a)},filter:function(a){return this.pushStack(Ia(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j=
|
||||||
a);return this.pushStack(pa(a[0])||pa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},
|
{},i;if(f&&a.length){e=0;for(var o=a.length;e<o;e++){i=a[e];j[i]||(j[i]=c.expr.match.POS.test(i)?c(i,b||this.context):i)}for(;f&&f.ownerDocument&&f!==b;){for(i in j){e=j[i];if(e.jquery?e.index(f)>-1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a||typeof a===
|
||||||
nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);bb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):
|
"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])||qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",
|
||||||
e;if((this.length>1||db.test(f))&&cb.test(a))e=e.reverse();return this.pushStack(e,a,Q.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===v||a.nodeType!==1||!c(a).is(d));){a.nodeType===1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==
|
d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?
|
||||||
b&&d.push(a);return d}});var Fa=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ga=/(<([\w:]+)[^>]*?)\/>/g,eb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,Ha=/<([\w:]+)/,fb=/<tbody/i,gb=/<|&\w+;/,sa=/checked\s*(?:[^=]|=\s*.checked.)/i,Ia=function(a,b,d){return eb.test(d)?a:b+"></"+d+">"},F={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],
|
a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1||gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w||a.nodeType!==1||!c(a).is(d));){a.nodeType===
|
||||||
col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==v)return this.empty().append((this[0]&&this[0].ownerDocument||r).createTextNode(a));return c.getText(this)},
|
1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]*?)\/>/g,hb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,La=/<([\w:]+)/,ib=/<tbody/i,jb=/<|&#?\w+;/,ta=/<script|<object|<embed|<option|<style/i,ua=/checked\s*(?:[^=]|=\s*.checked.)/i,Ma=function(a,b,d){return hb.test(d)?
|
||||||
wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?
|
a:b+"></"+d+">"},F={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=
|
||||||
d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,
|
c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument||s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},
|
||||||
false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&
|
wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},
|
||||||
!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Fa,"").replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){qa(this,b);qa(this.find("*"),b.find("*"))}return b},html:function(a){if(a===v)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Fa,""):null;else if(typeof a==="string"&&!/<script/i.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(Ha.exec(a)||
|
prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,
|
||||||
["",""])[1].toLowerCase()]){a=a.replace(Ga,Ia);try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(f){this.empty().append(a)}}else c.isFunction(a)?this.each(function(e){var i=c(this),j=i.html();i.empty().append(function(){return a.call(this,e,j)})}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=c(this),f=d.html();d.replaceWith(a.call(this,
|
this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a||c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName("*"));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild);
|
||||||
b,f))});else a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){function f(s){return c.nodeName(s,"table")?s.getElementsByTagName("tbody")[0]||s.appendChild(s.ownerDocument.createElement("tbody")):s}var e,i,j=a[0],n=[];if(!c.support.checkClone&&arguments.length===3&&typeof j===
|
return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find("*"),b.find("*"))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja,
|
||||||
"string"&&sa.test(j))return this.each(function(){c(this).domManip(a,b,d,true)});if(c.isFunction(j))return this.each(function(s){var x=c(this);a[0]=j.call(this,s,b?x.html():v);x.domManip(a,b,d)});if(this[0]){e=a[0]&&a[0].parentNode&&a[0].parentNode.nodeType===11?{fragment:a[0].parentNode}:ra(a,this,n);if(i=e.fragment.firstChild){b=b&&c.nodeName(i,"tr");for(var o=0,m=this.length;o<m;o++)d.call(b?f(this[o],i):this[o],e.cacheable||this.length>1||o>0?e.fragment.cloneNode(true):e.fragment)}n&&c.each(n,
|
""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(La.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(f){this.empty().append(a)}}else c.isFunction(a)?this.each(function(e){var j=c(this),i=j.html();j.empty().append(function(){return a.call(this,e,i)})}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&
|
||||||
Ma)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);for(var e=0,i=d.length;e<i;e++){var j=(e>0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),j);f=f.concat(j)}return this.pushStack(f,a,d.selector)}});c.each({remove:function(a,b){if(!a||c.filter(a,[this]).length){if(!b&&this.nodeType===1){c.cleanData(this.getElementsByTagName("*"));c.cleanData([this])}this.parentNode&&
|
this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=c(this),f=d.html();d.replaceWith(a.call(this,b,f))});if(typeof a!=="string")a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){function f(u){return c.nodeName(u,"table")?u.getElementsByTagName("tbody")[0]||
|
||||||
this.parentNode.removeChild(this)}},empty:function(){for(this.nodeType===1&&c.cleanData(this.getElementsByTagName("*"));this.firstChild;)this.removeChild(this.firstChild)}},function(a,b){c.fn[a]=function(){return this.each(b,arguments)}});c.extend({clean:function(a,b,d,f){b=b||r;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||r;var e=[];c.each(a,function(i,j){if(typeof j==="number")j+="";if(j){if(typeof j==="string"&&!gb.test(j))j=b.createTextNode(j);else if(typeof j===
|
u.appendChild(u.ownerDocument.createElement("tbody")):u}var e,j,i=a[0],o=[],k;if(!c.support.checkClone&&arguments.length===3&&typeof i==="string"&&ua.test(i))return this.each(function(){c(this).domManip(a,b,d,true)});if(c.isFunction(i))return this.each(function(u){var z=c(this);a[0]=i.call(this,u,b?z.html():w);z.domManip(a,b,d)});if(this[0]){e=i&&i.parentNode;e=c.support.parentNode&&e&&e.nodeType===11&&e.childNodes.length===this.length?{fragment:e}:sa(a,this,o);k=e.fragment;if(j=k.childNodes.length===
|
||||||
"string"){j=j.replace(Ga,Ia);var n=(Ha.exec(j)||["",""])[1].toLowerCase(),o=F[n]||F._default,m=o[0];i=b.createElement("div");for(i.innerHTML=o[1]+j+o[2];m--;)i=i.lastChild;if(!c.support.tbody){m=fb.test(j);n=n==="table"&&!m?i.firstChild&&i.firstChild.childNodes:o[1]==="<table>"&&!m?i.childNodes:[];for(o=n.length-1;o>=0;--o)c.nodeName(n[o],"tbody")&&!n[o].childNodes.length&&n[o].parentNode.removeChild(n[o])}!c.support.leadingWhitespace&&V.test(j)&&i.insertBefore(b.createTextNode(V.exec(j)[0]),i.firstChild);
|
1?(k=k.firstChild):k.firstChild){b=b&&c.nodeName(j,"tr");for(var n=0,r=this.length;n<r;n++)d.call(b?f(this[n],j):this[n],n>0||e.cacheable||this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]);
|
||||||
j=c.makeArray(i.childNodes)}if(j.nodeType)e.push(j);else e=c.merge(e,j)}});if(d)for(a=0;e[a];a++)if(f&&c.nodeName(e[a],"script")&&(!e[a].type||e[a].type.toLowerCase()==="text/javascript"))f.push(e[a].parentNode?e[a].parentNode.removeChild(e[a]):e[a]);else{e[a].nodeType===1&&e.splice.apply(e,[a+1,0].concat(c.makeArray(e[a].getElementsByTagName("script"))));d.appendChild(e[a])}return e},cleanData:function(a){for(var b=0,d;(d=a[b])!=null;b++){c.event.remove(d);c.removeData(d)}}});var hb=/z-?index|font-?weight|opacity|zoom|line-?height/i,
|
return this}else{e=0;for(var j=d.length;e<j;e++){var i=(e>0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b||s;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)||["",
|
||||||
Ja=/alpha\([^)]*\)/,Ka=/opacity=([^)]*)/,ga=/float/i,ha=/-([a-z])/ig,ib=/([A-Z])/g,jb=/^-?\d+(?:px)?$/i,kb=/^-?\d/,lb={position:"absolute",visibility:"hidden",display:"block"},mb=["Left","Right"],nb=["Top","Bottom"],ob=r.defaultView&&r.defaultView.getComputedStyle,La=c.support.cssFloat?"cssFloat":"styleFloat",ia=function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===v)return c.curCSS(d,f);if(typeof e==="number"&&!hb.test(f))e+="px";c.style(d,f,e)})};
|
""])[1].toLowerCase(),k=F[o]||F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]==="<table>"&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e=
|
||||||
c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return v;if((b==="width"||b==="height")&&parseFloat(d)<0)d=v;var f=a.style||a,e=d!==v;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter=Ja.test(a)?a.replace(Ja,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Ka.exec(f.filter)[1])/100+"":""}if(ga.test(b))b=La;b=b.replace(ha,ia);if(e)f[b]=d;return f[b]},css:function(a,
|
c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type||e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]?
|
||||||
b,d,f){if(b==="width"||b==="height"){var e,i=b==="width"?mb:nb;function j(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(i,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a,"border"+this+"Width",true))||0})}a.offsetWidth!==0?j():c.swap(a,lb,j);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&
|
c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index|font-?weight|opacity|zoom|line-?height/i,Na=/alpha\([^)]*\)/,Oa=/opacity=([^)]*)/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja=
|
||||||
a.currentStyle){f=Ka.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ga.test(b))b=La;if(!d&&e&&e[b])f=e[b];else if(ob){if(ga.test(b))b="float";b=b.replace(ib,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f=a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ha,ia);f=a.currentStyle[b]||a.currentStyle[d];if(!jb.test(f)&&kb.test(f)){b=e.left;var i=a.runtimeStyle.left;a.runtimeStyle.left=
|
function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return w;if((b==="width"||b==="height")&&parseFloat(d)<0)d=w;var f=a.style||a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter=
|
||||||
a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=i}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var pb=
|
Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"||b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a,
|
||||||
J(),qb=/<script(.|\s)*?\/script>/gi,rb=/select|textarea/i,sb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ja=/\?/,tb=/(\?|&)_=.*?(&|$)/,ub=/^(\w+:)?\/\/([^\/?#]+)/,vb=/%20/g;c.fn.extend({_load:c.fn.load,load:function(a,b,d){if(typeof a!=="string")return this._load(a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=
|
"border"+this+"Width",true))||0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f=
|
||||||
c.param(b,c.ajaxSettings.traditional);f="POST"}var i=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(j,n){if(n==="success"||n==="notmodified")i.html(e?c("<div />").append(j.responseText.replace(qb,"")).find(e):j.responseText);d&&i.each(d,[j.responseText,n,j])}});return this},serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&
|
a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]||a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=
|
||||||
(this.checked||rb.test(this.nodeName)||sb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,
|
a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=/<script(.|\s)*?\/script>/gi,ub=/select|textarea/i,vb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ka=/\?/,wb=/(\?|&)_=.*?(&|$)/,xb=/^(\w+:)?\/\/([^\/?#]+)/,yb=/%20/g,zb=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!==
|
||||||
b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:z.XMLHttpRequest&&(z.location.protocol!=="file:"||!z.ActiveXObject)?function(){return new z.XMLHttpRequest}:
|
"string")return zb.call(this,a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=c.param(b,c.ajaxSettings.traditional);f="POST"}var j=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(i,o){if(o==="success"||o==="notmodified")j.html(e?c("<div />").append(i.responseText.replace(tb,"")).find(e):i.responseText);d&&j.each(d,[i.responseText,o,i])}});return this},
|
||||||
function(){try{return new z.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&&e.success.call(o,n,j,w);e.global&&f("ajaxSuccess",[w,e])}function d(){e.complete&&e.complete.call(o,w,j);e.global&&f("ajaxComplete",[w,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}
|
serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ub.test(this.nodeName)||vb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),
|
||||||
function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),i,j,n,o=a&&a.context||e,m=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(m==="GET")N.test(e.url)||(e.url+=(ja.test(e.url)?"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||
|
function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,
|
||||||
N.test(e.url))){i=e.jsonpCallback||"jsonp"+pb++;if(e.data)e.data=(e.data+"").replace(N,"="+i+"$1");e.url=e.url.replace(N,"="+i+"$1");e.dataType="script";z[i]=z[i]||function(q){n=q;b();d();z[i]=v;try{delete z[i]}catch(p){}A&&A.removeChild(B)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache===false&&m==="GET"){var s=J(),x=e.url.replace(tb,"$1_="+s+"$2");e.url=x+(x===e.url?(ja.test(e.url)?"&":"?")+"_="+s:"")}if(e.data&&m==="GET")e.url+=(ja.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&
|
global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:A.XMLHttpRequest&&(A.location.protocol!=="file:"||!A.ActiveXObject)?function(){return new A.XMLHttpRequest}:function(){try{return new A.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&&
|
||||||
c.event.trigger("ajaxStart");s=(s=ub.exec(e.url))&&(s[1]&&s[1]!==location.protocol||s[2]!==location.host);if(e.dataType==="script"&&m==="GET"&&s){var A=r.getElementsByTagName("head")[0]||r.documentElement,B=r.createElement("script");B.src=e.url;if(e.scriptCharset)B.charset=e.scriptCharset;if(!i){var C=false;B.onload=B.onreadystatechange=function(){if(!C&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){C=true;b();d();B.onload=B.onreadystatechange=null;A&&B.parentNode&&
|
e.success.call(k,o,i,x);e.global&&f("ajaxSuccess",[x,e])}function d(){e.complete&&e.complete.call(k,x,i);e.global&&f("ajaxComplete",[x,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),j,i,o,k=a&&a.context||e,n=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(n==="GET")N.test(e.url)||(e.url+=(ka.test(e.url)?
|
||||||
A.removeChild(B)}}}A.insertBefore(B,A.firstChild);return v}var E=false,w=e.xhr();if(w){e.username?w.open(m,e.url,e.async,e.username,e.password):w.open(m,e.url,e.async);try{if(e.data||a&&a.contentType)w.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&w.setRequestHeader("If-Modified-Since",c.lastModified[e.url]);c.etag[e.url]&&w.setRequestHeader("If-None-Match",c.etag[e.url])}s||w.setRequestHeader("X-Requested-With","XMLHttpRequest");w.setRequestHeader("Accept",
|
"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||N.test(e.url))){j=e.jsonpCallback||"jsonp"+sb++;if(e.data)e.data=(e.data+"").replace(N,"="+j+"$1");e.url=e.url.replace(N,"="+j+"$1");e.dataType="script";A[j]=A[j]||function(q){o=q;b();d();A[j]=w;try{delete A[j]}catch(p){}z&&z.removeChild(C)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache===
|
||||||
e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(fa){}if(e.beforeSend&&e.beforeSend.call(o,w,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");w.abort();return false}e.global&&f("ajaxSend",[w,e]);var g=w.onreadystatechange=function(q){if(!w||w.readyState===0||q==="abort"){E||d();E=true;if(w)w.onreadystatechange=c.noop}else if(!E&&w&&(w.readyState===4||q==="timeout")){E=true;w.onreadystatechange=c.noop;j=q==="timeout"?"timeout":!c.httpSuccess(w)?
|
false&&n==="GET"){var r=J(),u=e.url.replace(wb,"$1_="+r+"$2");e.url=u+(u===e.url?(ka.test(e.url)?"&":"?")+"_="+r:"")}if(e.data&&n==="GET")e.url+=(ka.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&c.event.trigger("ajaxStart");r=(r=xb.exec(e.url))&&(r[1]&&r[1]!==location.protocol||r[2]!==location.host);if(e.dataType==="script"&&n==="GET"&&r){var z=s.getElementsByTagName("head")[0]||s.documentElement,C=s.createElement("script");C.src=e.url;if(e.scriptCharset)C.charset=e.scriptCharset;if(!j){var B=
|
||||||
"error":e.ifModified&&c.httpNotModified(w,e.url)?"notmodified":"success";var p;if(j==="success")try{n=c.httpData(w,e.dataType,e)}catch(u){j="parsererror";p=u}if(j==="success"||j==="notmodified")i||b();else c.handleError(e,w,j,p);d();q==="timeout"&&w.abort();if(e.async)w=null}};try{var h=w.abort;w.abort=function(){w&&h.call(w);g("abort")}}catch(k){}e.async&&e.timeout>0&&setTimeout(function(){w&&!E&&g("timeout")},e.timeout);try{w.send(m==="POST"||m==="PUT"||m==="DELETE"?e.data:null)}catch(l){c.handleError(e,
|
false;C.onload=C.onreadystatechange=function(){if(!B&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){B=true;b();d();C.onload=C.onreadystatechange=null;z&&C.parentNode&&z.removeChild(C)}}}z.insertBefore(C,z.firstChild);return w}var E=false,x=e.xhr();if(x){e.username?x.open(n,e.url,e.async,e.username,e.password):x.open(n,e.url,e.async);try{if(e.data||a&&a.contentType)x.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&x.setRequestHeader("If-Modified-Since",
|
||||||
w,null,l);d()}e.async||g();return w}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=
|
c.lastModified[e.url]);c.etag[e.url]&&x.setRequestHeader("If-None-Match",c.etag[e.url])}r||x.setRequestHeader("X-Requested-With","XMLHttpRequest");x.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(ga){}if(e.beforeSend&&e.beforeSend.call(k,x,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");x.abort();return false}e.global&&f("ajaxSend",[x,e]);var g=x.onreadystatechange=function(q){if(!x||x.readyState===0||q==="abort"){E||
|
||||||
f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b==="json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(j,n){if(c.isArray(n))c.each(n,
|
d();E=true;if(x)x.onreadystatechange=c.noop}else if(!E&&x&&(x.readyState===4||q==="timeout")){E=true;x.onreadystatechange=c.noop;i=q==="timeout"?"timeout":!c.httpSuccess(x)?"error":e.ifModified&&c.httpNotModified(x,e.url)?"notmodified":"success";var p;if(i==="success")try{o=c.httpData(x,e.dataType,e)}catch(v){i="parsererror";p=v}if(i==="success"||i==="notmodified")j||b();else c.handleError(e,x,i,p);d();q==="timeout"&&x.abort();if(e.async)x=null}};try{var h=x.abort;x.abort=function(){x&&h.call(x);
|
||||||
function(o,m){b?f(j,m):d(j+"["+(typeof m==="object"||c.isArray(m)?o:"")+"]",m)});else!b&&n!=null&&typeof n==="object"?c.each(n,function(o,m){d(j+"["+o+"]",m)}):f(j,n)}function f(j,n){n=c.isFunction(n)?n():n;e[e.length]=encodeURIComponent(j)+"="+encodeURIComponent(n)}var e=[];if(b===v)b=c.ajaxSettings.traditional;if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var i in a)d(i,a[i]);return e.join("&").replace(vb,"+")}});var ka={},wb=/toggle|show|hide/,xb=/^([+-]=)?([\d+-.]+)(.*)$/,
|
g("abort")}}catch(l){}e.async&&e.timeout>0&&setTimeout(function(){x&&!E&&g("timeout")},e.timeout);try{x.send(n==="POST"||n==="PUT"||n==="DELETE"?e.data:null)}catch(m){c.handleError(e,x,null,m);d()}e.async||g();return x}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===
|
||||||
W,ta=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");this[a].style.display=d||"";if(c.css(this[a],"display")==="none"){d=this[a].nodeName;var f;if(ka[d])f=ka[d];else{var e=c("<"+d+" />").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();
|
1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b===
|
||||||
ka[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a<b;a++)this[a].style.display=c.data(this[a],"olddisplay")||"";return this}},hide:function(a,b){if(a||a===0)return this.animate(K("hide",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");!d&&d!=="none"&&c.data(this[a],"olddisplay",c.css(this[a],"display"))}a=0;for(b=this.length;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b){var d=typeof a==="boolean";if(c.isFunction(a)&&
|
"json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(i,o){if(c.isArray(o))c.each(o,function(k,n){b||/\[\]$/.test(i)?f(i,n):d(i+"["+(typeof n==="object"||c.isArray(n)?k:"")+"]",n)});else!b&&o!=null&&typeof o==="object"?c.each(o,function(k,n){d(i+"["+k+"]",n)}):f(i,o)}function f(i,o){o=c.isFunction(o)?o():o;e[e.length]=encodeURIComponent(i)+"="+encodeURIComponent(o)}var e=[];if(b===w)b=c.ajaxSettings.traditional;
|
||||||
c.isFunction(b))this._toggle.apply(this,arguments);else a==null||d?this.each(function(){var f=d?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(K("toggle",3),a,b);return this},fadeTo:function(a,b,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d)},animate:function(a,b,d,f){var e=c.speed(b,d,f);if(c.isEmptyObject(a))return this.each(e.complete);return this[e.queue===false?"each":"queue"](function(){var i=c.extend({},e),j,n=this.nodeType===1&&c(this).is(":hidden"),
|
if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var j in a)d(j,a[j]);return e.join("&").replace(yb,"+")}});var la={},Ab=/toggle|show|hide/,Bb=/^([+-]=)?([\d+-.]+)(.*)$/,W,va=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");
|
||||||
o=this;for(j in a){var m=j.replace(ha,ia);if(j!==m){a[m]=a[j];delete a[j];j=m}if(a[j]==="hide"&&n||a[j]==="show"&&!n)return i.complete.call(this);if((j==="height"||j==="width")&&this.style){i.display=c.css(this,"display");i.overflow=this.style.overflow}if(c.isArray(a[j])){(i.specialEasing=i.specialEasing||{})[j]=a[j][1];a[j]=a[j][0]}}if(i.overflow!=null)this.style.overflow="hidden";i.curAnim=c.extend({},a);c.each(a,function(s,x){var A=new c.fx(o,i,s);if(wb.test(x))A[x==="toggle"?n?"show":"hide":x](a);
|
this[a].style.display=d||"";if(c.css(this[a],"display")==="none"){d=this[a].nodeName;var f;if(la[d])f=la[d];else{var e=c("<"+d+" />").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();la[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a<b;a++)this[a].style.display=c.data(this[a],"olddisplay")||"";return this}},hide:function(a,b){if(a||a===0)return this.animate(K("hide",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");!d&&d!=="none"&&c.data(this[a],
|
||||||
else{var B=xb.exec(x),C=A.cur(true)||0;if(B){x=parseFloat(B[2]);var E=B[3]||"px";if(E!=="px"){o.style[s]=(x||1)+E;C=(x||1)/A.cur(true)*C;o.style[s]=C+E}if(B[1])x=(B[1]==="-="?-1:1)*x+C;A.custom(C,x,E)}else A.custom(C,x,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);this.each(function(){for(var f=d.length-1;f>=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",
|
"olddisplay",c.css(this[a],"display"))}a=0;for(b=this.length;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b){var d=typeof a==="boolean";if(c.isFunction(a)&&c.isFunction(b))this._toggle.apply(this,arguments);else a==null||d?this.each(function(){var f=d?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(K("toggle",3),a,b);return this},fadeTo:function(a,b,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d)},
|
||||||
1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration==="number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,
|
animate:function(a,b,d,f){var e=c.speed(b,d,f);if(c.isEmptyObject(a))return this.each(e.complete);return this[e.queue===false?"each":"queue"](function(){var j=c.extend({},e),i,o=this.nodeType===1&&c(this).is(":hidden"),k=this;for(i in a){var n=i.replace(ia,ja);if(i!==n){a[n]=a[i];delete a[i];i=n}if(a[i]==="hide"&&o||a[i]==="show"&&!o)return j.complete.call(this);if((i==="height"||i==="width")&&this.style){j.display=c.css(this,"display");j.overflow=this.style.overflow}if(c.isArray(a[i])){(j.specialEasing=
|
||||||
b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==
|
j.specialEasing||{})[i]=a[i][1];a[i]=a[i][0]}}if(j.overflow!=null)this.style.overflow="hidden";j.curAnim=c.extend({},a);c.each(a,function(r,u){var z=new c.fx(k,j,r);if(Ab.test(u))z[u==="toggle"?o?"show":"hide":u](a);else{var C=Bb.exec(u),B=z.cur(true)||0;if(C){u=parseFloat(C[2]);var E=C[3]||"px";if(E!=="px"){k.style[r]=(u||1)+E;B=(u||1)/z.cur(true)*B;k.style[r]=B+E}if(C[1])u=(C[1]==="-="?-1:1)*u+B;z.custom(B,u,E)}else z.custom(B,u,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);
|
||||||
null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(i){return e.step(i)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop===
|
this.each(function(){for(var f=d.length-1;f>=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration===
|
||||||
"width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=
|
"number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||
|
||||||
this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem,e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=
|
c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(j){return e.step(j)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;
|
||||||
c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||c.fx.stop()},stop:function(){clearInterval(W);W=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=
|
this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=
|
||||||
null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===b.elem}).length};c.fn.offset="getBoundingClientRect"in r.documentElement?function(a){var b=this[0];if(a)return this.each(function(e){c.offset.setOffset(this,a,e)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);var d=b.getBoundingClientRect(),
|
this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem,
|
||||||
f=b.ownerDocument;b=f.body;f=f.documentElement;return{top:d.top+(self.pageYOffset||c.support.boxModel&&f.scrollTop||b.scrollTop)-(f.clientTop||b.clientTop||0),left:d.left+(self.pageXOffset||c.support.boxModel&&f.scrollLeft||b.scrollLeft)-(f.clientLeft||b.clientLeft||0)}}:function(a){var b=this[0];if(a)return this.each(function(s){c.offset.setOffset(this,a,s)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d=b.offsetParent,f=
|
e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||
|
||||||
b,e=b.ownerDocument,i,j=e.documentElement,n=e.body;f=(e=e.defaultView)?e.getComputedStyle(b,null):b.currentStyle;for(var o=b.offsetTop,m=b.offsetLeft;(b=b.parentNode)&&b!==n&&b!==j;){if(c.offset.supportsFixedPosition&&f.position==="fixed")break;i=e?e.getComputedStyle(b,null):b.currentStyle;o-=b.scrollTop;m-=b.scrollLeft;if(b===d){o+=b.offsetTop;m+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(b.nodeName))){o+=parseFloat(i.borderTopWidth)||
|
c.fx.stop()},stop:function(){clearInterval(W);W=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===b.elem}).length};c.fn.offset="getBoundingClientRect"in s.documentElement?
|
||||||
0;m+=parseFloat(i.borderLeftWidth)||0}f=d;d=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&i.overflow!=="visible"){o+=parseFloat(i.borderTopWidth)||0;m+=parseFloat(i.borderLeftWidth)||0}f=i}if(f.position==="relative"||f.position==="static"){o+=n.offsetTop;m+=n.offsetLeft}if(c.offset.supportsFixedPosition&&f.position==="fixed"){o+=Math.max(j.scrollTop,n.scrollTop);m+=Math.max(j.scrollLeft,n.scrollLeft)}return{top:o,left:m}};c.offset={initialize:function(){var a=r.body,b=r.createElement("div"),
|
function(a){var b=this[0];if(a)return this.each(function(e){c.offset.setOffset(this,a,e)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);var d=b.getBoundingClientRect(),f=b.ownerDocument;b=f.body;f=f.documentElement;return{top:d.top+(self.pageYOffset||c.support.boxModel&&f.scrollTop||b.scrollTop)-(f.clientTop||b.clientTop||0),left:d.left+(self.pageXOffset||c.support.boxModel&&f.scrollLeft||b.scrollLeft)-(f.clientLeft||b.clientLeft||0)}}:function(a){var b=
|
||||||
d,f,e,i=parseFloat(c.curCSS(a,"marginTop",true))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";a.insertBefore(b,a.firstChild);
|
this[0];if(a)return this.each(function(r){c.offset.setOffset(this,a,r)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d=b.offsetParent,f=b,e=b.ownerDocument,j,i=e.documentElement,o=e.body;f=(e=e.defaultView)?e.getComputedStyle(b,null):b.currentStyle;for(var k=b.offsetTop,n=b.offsetLeft;(b=b.parentNode)&&b!==o&&b!==i;){if(c.offset.supportsFixedPosition&&f.position==="fixed")break;j=e?e.getComputedStyle(b,null):b.currentStyle;
|
||||||
d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i;a.removeChild(b);c.offset.initialize=c.noop},
|
k-=b.scrollTop;n-=b.scrollLeft;if(b===d){k+=b.offsetTop;n+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(b.nodeName))){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=d;d=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&j.overflow!=="visible"){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=j}if(f.position==="relative"||f.position==="static"){k+=o.offsetTop;n+=o.offsetLeft}if(c.offset.supportsFixedPosition&&
|
||||||
bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),i=parseInt(c.curCSS(a,"top",true),10)||0,j=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a,d,e);d={top:b.top-e.top+i,left:b.left-
|
f.position==="fixed"){k+=Math.max(i.scrollTop,o.scrollTop);n+=Math.max(i.scrollLeft,o.scrollLeft)}return{top:k,left:n}};c.offset={initialize:function(){var a=s.body,b=s.createElement("div"),d,f,e,j=parseFloat(c.curCSS(a,"marginTop",true))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
|
||||||
e.left+j};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top-f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=
|
a.insertBefore(b,a.firstChild);d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==j;a.removeChild(b);
|
||||||
this.offsetParent||r.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],i;if(!e)return null;if(f!==v)return this.each(function(){if(i=ua(this))i.scrollTo(!a?f:c(i).scrollLeft(),a?f:c(i).scrollTop());else this[d]=f});else return(i=ua(e))?"pageXOffset"in i?i[a?"pageYOffset":"pageXOffset"]:c.support.boxModel&&i.document.documentElement[d]||i.document.body[d]:e[d]}});
|
c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),j=parseInt(c.curCSS(a,"top",true),10)||0,i=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a,
|
||||||
c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(i){var j=c(this);j[d](f.call(this,i,j[d]()))});return"scrollTo"in e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||
|
d,e);d={top:b.top-e.top+j,left:b.left-e.left+i};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top-
|
||||||
e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===v?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});z.jQuery=z.$=c})(window);
|
f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||s.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],j;if(!e)return null;if(f!==w)return this.each(function(){if(j=wa(this))j.scrollTo(!a?f:c(j).scrollLeft(),a?f:c(j).scrollTop());else this[d]=f});else return(j=wa(e))?"pageXOffset"in j?j[a?"pageYOffset":
|
||||||
|
"pageXOffset"]:c.support.boxModel&&j.document.documentElement[d]||j.document.body[d]:e[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(j){var i=c(this);i[d](f.call(this,j,i[d]()))});return"scrollTo"in
|
||||||
|
e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===w?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});A.jQuery=A.$=c})(window);
|
||||||
|
|
||||||
|
59
js/util.js
59
js/util.js
@ -54,7 +54,8 @@ var SN = { // StatusNet
|
|||||||
NoticeGeoName: 'notice_data-geo_name',
|
NoticeGeoName: 'notice_data-geo_name',
|
||||||
NoticeDataGeo: 'notice_data-geo',
|
NoticeDataGeo: 'notice_data-geo',
|
||||||
NoticeDataGeoCookie: 'notice_data-geo_cookie',
|
NoticeDataGeoCookie: 'notice_data-geo_cookie',
|
||||||
NoticeDataGeoSelected: 'notice_data-geo_selected'
|
NoticeDataGeoSelected: 'notice_data-geo_selected',
|
||||||
|
StatusNetInstance:'StatusNetInstance'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -319,18 +320,12 @@ var SN = { // StatusNet
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
NoticeReplyTo: function(notice_item) {
|
NoticeReplyTo: function(notice) {
|
||||||
var notice = notice_item[0];
|
notice.find('.notice_reply').live('click', function() {
|
||||||
var notice_reply = $('.notice_reply', notice)[0];
|
|
||||||
|
|
||||||
if (jQuery.data(notice_reply, "ElementData") === undefined) {
|
|
||||||
jQuery.data(notice_reply, "ElementData", {Bind:'submit'});
|
|
||||||
$(notice_reply).bind('click', function() {
|
|
||||||
var nickname = ($('.author .nickname', notice).length > 0) ? $($('.author .nickname', notice)[0]) : $('.author .nickname.uid');
|
var nickname = ($('.author .nickname', notice).length > 0) ? $($('.author .nickname', notice)[0]) : $('.author .nickname.uid');
|
||||||
SN.U.NoticeReplySet(nickname.text(), $($('.notice_id', notice)[0]).text());
|
SN.U.NoticeReplySet(nickname.text(), $($('.notice_id', notice)[0]).text());
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
}
|
|
||||||
},
|
},
|
||||||
|
|
||||||
NoticeReplySet: function(nick,id) {
|
NoticeReplySet: function(nick,id) {
|
||||||
@ -670,6 +665,35 @@ var SN = { // StatusNet
|
|||||||
date.setFullYear(year, month, day);
|
date.setFullYear(year, month, day);
|
||||||
|
|
||||||
return date;
|
return date;
|
||||||
|
},
|
||||||
|
|
||||||
|
StatusNetInstance: {
|
||||||
|
Set: function(value) {
|
||||||
|
var SNI = SN.U.StatusNetInstance.Get();
|
||||||
|
if (SNI !== null) {
|
||||||
|
value = $.extend(SNI, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
$.cookie(
|
||||||
|
SN.C.S.StatusNetInstance,
|
||||||
|
JSON.stringify(value),
|
||||||
|
{
|
||||||
|
path: '/',
|
||||||
|
expires: SN.U.GetFullYear(2029, 0, 1)
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
Get: function() {
|
||||||
|
var cookieValue = $.cookie(SN.C.S.StatusNetInstance);
|
||||||
|
if (cookieValue !== null) {
|
||||||
|
return JSON.parse(cookieValue);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
},
|
||||||
|
|
||||||
|
Delete: function() {
|
||||||
|
$.cookie(SN.C.S.StatusNetInstance, null);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -707,6 +731,20 @@ var SN = { // StatusNet
|
|||||||
|
|
||||||
SN.U.NewDirectMessage();
|
SN.U.NewDirectMessage();
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
Login: function() {
|
||||||
|
if (SN.U.StatusNetInstance.Get() !== null) {
|
||||||
|
var nickname = SN.U.StatusNetInstance.Get().Nickname;
|
||||||
|
if (nickname !== null) {
|
||||||
|
$('#form_login #nickname').val(nickname);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$('#form_login').bind('submit', function() {
|
||||||
|
SN.U.StatusNetInstance.Set({Nickname: $('#form_login #nickname').val()});
|
||||||
|
return true;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -721,5 +759,8 @@ $(document).ready(function(){
|
|||||||
if ($('#content .entity_actions').length > 0) {
|
if ($('#content .entity_actions').length > 0) {
|
||||||
SN.Init.EntityActions();
|
SN.Init.EntityActions();
|
||||||
}
|
}
|
||||||
|
if ($('#form_login').length > 0) {
|
||||||
|
SN.Init.Login();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -249,7 +249,7 @@ class Action extends HTMLOutputter // lawsuit
|
|||||||
$this->script('jquery.min.js');
|
$this->script('jquery.min.js');
|
||||||
$this->script('jquery.form.js');
|
$this->script('jquery.form.js');
|
||||||
$this->script('jquery.cookie.js');
|
$this->script('jquery.cookie.js');
|
||||||
$this->script('json2.js');
|
$this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.js').'"); }');
|
||||||
$this->script('jquery.joverlay.min.js');
|
$this->script('jquery.joverlay.min.js');
|
||||||
Event::handle('EndShowJQueryScripts', array($this));
|
Event::handle('EndShowJQueryScripts', array($this));
|
||||||
}
|
}
|
||||||
@ -259,8 +259,7 @@ class Action extends HTMLOutputter // lawsuit
|
|||||||
$this->script('util.js');
|
$this->script('util.js');
|
||||||
$this->script('geometa.js');
|
$this->script('geometa.js');
|
||||||
// Frame-busting code to avoid clickjacking attacks.
|
// Frame-busting code to avoid clickjacking attacks.
|
||||||
$this->element('script', array('type' => 'text/javascript'),
|
$this->inlineScript('if (window.top !== window.self) { window.top.location.href = window.self.location.href; }');
|
||||||
'if (window.top !== window.self) { window.top.location.href = window.self.location.href; }');
|
|
||||||
Event::handle('EndShowStatusNetScripts', array($this));
|
Event::handle('EndShowStatusNetScripts', array($this));
|
||||||
Event::handle('EndShowLaconicaScripts', array($this));
|
Event::handle('EndShowLaconicaScripts', array($this));
|
||||||
}
|
}
|
||||||
@ -426,8 +425,6 @@ class Action extends HTMLOutputter // lawsuit
|
|||||||
$connect = 'imsettings';
|
$connect = 'imsettings';
|
||||||
} else if (common_config('sms', 'enabled')) {
|
} else if (common_config('sms', 'enabled')) {
|
||||||
$connect = 'smssettings';
|
$connect = 'smssettings';
|
||||||
} else if (common_config('twitter', 'enabled')) {
|
|
||||||
$connect = 'twittersettings';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->elementStart('dl', array('id' => 'site_nav_global_primary'));
|
$this->elementStart('dl', array('id' => 'site_nav_global_primary'));
|
||||||
@ -436,41 +433,71 @@ class Action extends HTMLOutputter // lawsuit
|
|||||||
$this->elementStart('ul', array('class' => 'nav'));
|
$this->elementStart('ul', array('class' => 'nav'));
|
||||||
if (Event::handle('StartPrimaryNav', array($this))) {
|
if (Event::handle('StartPrimaryNav', array($this))) {
|
||||||
if ($user) {
|
if ($user) {
|
||||||
|
// TRANS: Tooltip for main menu option "Personal"
|
||||||
|
$tooltip = _m('TOOLTIP', 'Personal profile and friends timeline');
|
||||||
|
// TRANS: Main menu option when logged in for access to personal profile and friends timeline
|
||||||
$this->menuItem(common_local_url('all', array('nickname' => $user->nickname)),
|
$this->menuItem(common_local_url('all', array('nickname' => $user->nickname)),
|
||||||
_('Home'), _('Personal profile and friends timeline'), false, 'nav_home');
|
_m('MENU', 'Personal'), $tooltip, false, 'nav_home');
|
||||||
|
// TRANS: Tooltip for main menu option "Account"
|
||||||
|
$tooltip = _m('TOOLTIP', 'Change your email, avatar, password, profile');
|
||||||
|
// TRANS: Main menu option when logged in for access to user settings
|
||||||
$this->menuItem(common_local_url('profilesettings'),
|
$this->menuItem(common_local_url('profilesettings'),
|
||||||
_('Account'), _('Change your email, avatar, password, profile'), false, 'nav_account');
|
_m('MENU', 'Account'), $tooltip, false, 'nav_account');
|
||||||
if ($connect) {
|
if ($connect) {
|
||||||
|
// TRANS: Tooltip for main menu option "Services"
|
||||||
|
$tooltip = _m('TOOLTIP', 'Connect to services');
|
||||||
|
// TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
|
||||||
$this->menuItem(common_local_url($connect),
|
$this->menuItem(common_local_url($connect),
|
||||||
_('Connect'), _('Connect to services'), false, 'nav_connect');
|
_m('MENU', 'Connect'), $tooltip, false, 'nav_connect');
|
||||||
}
|
}
|
||||||
if ($user->hasRight(Right::CONFIGURESITE)) {
|
if ($user->hasRight(Right::CONFIGURESITE)) {
|
||||||
|
// TRANS: Tooltip for menu option "Admin"
|
||||||
|
$tooltip = _m('TOOLTIP', 'Change site configuration');
|
||||||
|
// TRANS: Main menu option when logged in and site admin for access to site configuration
|
||||||
$this->menuItem(common_local_url('siteadminpanel'),
|
$this->menuItem(common_local_url('siteadminpanel'),
|
||||||
_('Admin'), _('Change site configuration'), false, 'nav_admin');
|
_m('MENU', 'Admin'), $tooltip, false, 'nav_admin');
|
||||||
}
|
}
|
||||||
if (common_config('invite', 'enabled')) {
|
if (common_config('invite', 'enabled')) {
|
||||||
|
// TRANS: Tooltip for main menu option "Invite"
|
||||||
|
$tooltip = _m('TOOLTIP', 'Invite friends and colleagues to join you on %s');
|
||||||
|
// TRANS: Main menu option when logged in and invitations are allowed for inviting new users
|
||||||
$this->menuItem(common_local_url('invite'),
|
$this->menuItem(common_local_url('invite'),
|
||||||
_('Invite'),
|
_m('MENU', 'Invite'),
|
||||||
sprintf(_('Invite friends and colleagues to join you on %s'),
|
sprintf($tooltip,
|
||||||
common_config('site', 'name')),
|
common_config('site', 'name')),
|
||||||
false, 'nav_invitecontact');
|
false, 'nav_invitecontact');
|
||||||
}
|
}
|
||||||
|
// TRANS: Tooltip for main menu option "Logout"
|
||||||
|
$tooltip = _m('TOOLTIP', 'Logout from the site');
|
||||||
|
// TRANS: Main menu option when logged in to log out the current user
|
||||||
$this->menuItem(common_local_url('logout'),
|
$this->menuItem(common_local_url('logout'),
|
||||||
_('Logout'), _('Logout from the site'), false, 'nav_logout');
|
_m('MENU', 'Logout'), $tooltip, false, 'nav_logout');
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (!common_config('site', 'closed')) {
|
if (!common_config('site', 'closed')) {
|
||||||
|
// TRANS: Tooltip for main menu option "Register"
|
||||||
|
$tooltip = _m('TOOLTIP', 'Create an account');
|
||||||
|
// TRANS: Main menu option when not logged in to register a new account
|
||||||
$this->menuItem(common_local_url('register'),
|
$this->menuItem(common_local_url('register'),
|
||||||
_('Register'), _('Create an account'), false, 'nav_register');
|
_m('MENU', 'Register'), $tooltip, false, 'nav_register');
|
||||||
}
|
}
|
||||||
|
// TRANS: Tooltip for main menu option "Login"
|
||||||
|
$tooltip = _m('TOOLTIP', 'Login to the site');
|
||||||
|
// TRANS: Main menu option when not logged in to log in
|
||||||
$this->menuItem(common_local_url('login'),
|
$this->menuItem(common_local_url('login'),
|
||||||
_('Login'), _('Login to the site'), false, 'nav_login');
|
_m('MENU', 'Login'), $tooltip, false, 'nav_login');
|
||||||
}
|
}
|
||||||
|
// TRANS: Tooltip for main menu option "Help"
|
||||||
|
$tooltip = _m('TOOLTIP', 'Help me!');
|
||||||
|
// TRANS: Main menu option for help on the StatusNet site
|
||||||
$this->menuItem(common_local_url('doc', array('title' => 'help')),
|
$this->menuItem(common_local_url('doc', array('title' => 'help')),
|
||||||
_('Help'), _('Help me!'), false, 'nav_help');
|
_m('MENU', 'Help'), $tooltip, false, 'nav_help');
|
||||||
if ($user || !common_config('site', 'private')) {
|
if ($user || !common_config('site', 'private')) {
|
||||||
|
// TRANS: Tooltip for main menu option "Search"
|
||||||
|
$tooltip = _m('TOOLTIP', 'Search for people or text');
|
||||||
|
// TRANS: Main menu option when logged in or when the StatusNet instance is not private
|
||||||
$this->menuItem(common_local_url('peoplesearch'),
|
$this->menuItem(common_local_url('peoplesearch'),
|
||||||
_('Search'), _('Search for people or text'), false, 'nav_search');
|
_m('MENU', 'Search'), $tooltip, false, 'nav_search');
|
||||||
}
|
}
|
||||||
Event::handle('EndPrimaryNav', array($this));
|
Event::handle('EndPrimaryNav', array($this));
|
||||||
}
|
}
|
||||||
@ -491,6 +518,7 @@ class Action extends HTMLOutputter // lawsuit
|
|||||||
if ($text) {
|
if ($text) {
|
||||||
$this->elementStart('dl', array('id' => 'site_notice',
|
$this->elementStart('dl', array('id' => 'site_notice',
|
||||||
'class' => 'system_notice'));
|
'class' => 'system_notice'));
|
||||||
|
// TRANS: DT element for site notice. String is hidden in default CSS.
|
||||||
$this->element('dt', null, _('Site notice'));
|
$this->element('dt', null, _('Site notice'));
|
||||||
$this->elementStart('dd', null);
|
$this->elementStart('dd', null);
|
||||||
$this->raw($text);
|
$this->raw($text);
|
||||||
@ -977,7 +1005,7 @@ class Action extends HTMLOutputter // lawsuit
|
|||||||
|
|
||||||
if (is_null($arg)) {
|
if (is_null($arg)) {
|
||||||
return $def;
|
return $def;
|
||||||
} else if (in_array($arg, array('true', 'yes', '1'))) {
|
} else if (in_array($arg, array('true', 'yes', '1', 'on'))) {
|
||||||
return true;
|
return true;
|
||||||
} else if (in_array($arg, array('false', 'no', '0'))) {
|
} else if (in_array($arg, array('false', 'no', '0'))) {
|
||||||
return false;
|
return false;
|
||||||
|
1267
lib/activity.php
Normal file
1267
lib/activity.php
Normal file
File diff suppressed because it is too large
Load Diff
@ -69,6 +69,7 @@ class AdminPanelAction extends Action
|
|||||||
// User must be logged in.
|
// User must be logged in.
|
||||||
|
|
||||||
if (!common_logged_in()) {
|
if (!common_logged_in()) {
|
||||||
|
// TRANS: Client error message
|
||||||
$this->clientError(_('Not logged in.'));
|
$this->clientError(_('Not logged in.'));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -93,6 +94,7 @@ class AdminPanelAction extends Action
|
|||||||
// User must have the right to change admin settings
|
// User must have the right to change admin settings
|
||||||
|
|
||||||
if (!$user->hasRight(Right::CONFIGURESITE)) {
|
if (!$user->hasRight(Right::CONFIGURESITE)) {
|
||||||
|
// TRANS: Client error message
|
||||||
$this->clientError(_('You cannot make changes to this site.'));
|
$this->clientError(_('You cannot make changes to this site.'));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -103,7 +105,8 @@ class AdminPanelAction extends Action
|
|||||||
|
|
||||||
$name = mb_substr($name, 0, -10);
|
$name = mb_substr($name, 0, -10);
|
||||||
|
|
||||||
if (!in_array($name, common_config('admin', 'panels'))) {
|
if (!self::canAdmin($name)) {
|
||||||
|
// TRANS: Client error message
|
||||||
$this->clientError(_('Changes to that panel are not allowed.'), 403);
|
$this->clientError(_('Changes to that panel are not allowed.'), 403);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -134,6 +137,7 @@ class AdminPanelAction extends Action
|
|||||||
Config::loadSettings();
|
Config::loadSettings();
|
||||||
|
|
||||||
$this->success = true;
|
$this->success = true;
|
||||||
|
// TRANS: Message after successful saving of administrative settings.
|
||||||
$this->msg = _('Settings saved.');
|
$this->msg = _('Settings saved.');
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
$this->success = false;
|
$this->success = false;
|
||||||
@ -203,6 +207,7 @@ class AdminPanelAction extends Action
|
|||||||
|
|
||||||
function showForm()
|
function showForm()
|
||||||
{
|
{
|
||||||
|
// TRANS: Client error message
|
||||||
$this->clientError(_('showForm() not implemented.'));
|
$this->clientError(_('showForm() not implemented.'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -232,6 +237,7 @@ class AdminPanelAction extends Action
|
|||||||
|
|
||||||
function saveSettings()
|
function saveSettings()
|
||||||
{
|
{
|
||||||
|
// TRANS: Client error message
|
||||||
$this->clientError(_('saveSettings() not implemented.'));
|
$this->clientError(_('saveSettings() not implemented.'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -255,6 +261,7 @@ class AdminPanelAction extends Action
|
|||||||
$result = $config->delete();
|
$result = $config->delete();
|
||||||
if (!$result) {
|
if (!$result) {
|
||||||
common_log_db_error($config, 'DELETE', __FILE__);
|
common_log_db_error($config, 'DELETE', __FILE__);
|
||||||
|
// TRANS: Client error message
|
||||||
$this->clientError(_("Unable to delete design setting."));
|
$this->clientError(_("Unable to delete design setting."));
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@ -262,6 +269,17 @@ class AdminPanelAction extends Action
|
|||||||
|
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function canAdmin($name)
|
||||||
|
{
|
||||||
|
$isOK = false;
|
||||||
|
|
||||||
|
if (Event::handle('AdminPanelCheck', array($name, &$isOK))) {
|
||||||
|
$isOK = in_array($name, common_config('admin', 'panels'));
|
||||||
|
}
|
||||||
|
|
||||||
|
return $isOK;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -307,34 +325,52 @@ class AdminPanelNav extends Widget
|
|||||||
|
|
||||||
if (Event::handle('StartAdminPanelNav', array($this))) {
|
if (Event::handle('StartAdminPanelNav', array($this))) {
|
||||||
|
|
||||||
if ($this->canAdmin('site')) {
|
if (AdminPanelAction::canAdmin('site')) {
|
||||||
$this->out->menuItem(common_local_url('siteadminpanel'), _('Site'),
|
// TRANS: Menu item title/tooltip
|
||||||
_('Basic site configuration'), $action_name == 'siteadminpanel', 'nav_site_admin_panel');
|
$menu_title = _('Basic site configuration');
|
||||||
|
// TRANS: Menu item for site administration
|
||||||
|
$this->out->menuItem(common_local_url('siteadminpanel'), _m('MENU', 'Site'),
|
||||||
|
$menu_title, $action_name == 'siteadminpanel', 'nav_site_admin_panel');
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->canAdmin('design')) {
|
if (AdminPanelAction::canAdmin('design')) {
|
||||||
$this->out->menuItem(common_local_url('designadminpanel'), _('Design'),
|
// TRANS: Menu item title/tooltip
|
||||||
_('Design configuration'), $action_name == 'designadminpanel', 'nav_design_admin_panel');
|
$menu_title = _('Design configuration');
|
||||||
|
// TRANS: Menu item for site administration
|
||||||
|
$this->out->menuItem(common_local_url('designadminpanel'), _m('MENU', 'Design'),
|
||||||
|
$menu_title, $action_name == 'designadminpanel', 'nav_design_admin_panel');
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->canAdmin('user')) {
|
if (AdminPanelAction::canAdmin('user')) {
|
||||||
$this->out->menuItem(common_local_url('useradminpanel'), _('User'),
|
// TRANS: Menu item title/tooltip
|
||||||
_('User configuration'), $action_name == 'useradminpanel', 'nav_design_admin_panel');
|
$menu_title = _('User configuration');
|
||||||
|
// TRANS: Menu item for site administration
|
||||||
|
$this->out->menuItem(common_local_url('useradminpanel'), _m('MENU', 'User'),
|
||||||
|
$menu_title, $action_name == 'useradminpanel', 'nav_design_admin_panel');
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->canAdmin('access')) {
|
if (AdminPanelAction::canAdmin('access')) {
|
||||||
$this->out->menuItem(common_local_url('accessadminpanel'), _('Access'),
|
// TRANS: Menu item title/tooltip
|
||||||
_('Access configuration'), $action_name == 'accessadminpanel', 'nav_design_admin_panel');
|
$menu_title = _('Access configuration');
|
||||||
|
// TRANS: Menu item for site administration
|
||||||
|
$this->out->menuItem(common_local_url('accessadminpanel'), _m('MENU', 'Access'),
|
||||||
|
$menu_title, $action_name == 'accessadminpanel', 'nav_design_admin_panel');
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->canAdmin('paths')) {
|
if (AdminPanelAction::canAdmin('paths')) {
|
||||||
$this->out->menuItem(common_local_url('pathsadminpanel'), _('Paths'),
|
// TRANS: Menu item title/tooltip
|
||||||
_('Paths configuration'), $action_name == 'pathsadminpanel', 'nav_design_admin_panel');
|
$menu_title = _('Paths configuration');
|
||||||
|
// TRANS: Menu item for site administration
|
||||||
|
$this->out->menuItem(common_local_url('pathsadminpanel'), _m('MENU', 'Paths'),
|
||||||
|
$menu_title, $action_name == 'pathsadminpanel', 'nav_design_admin_panel');
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->canAdmin('sessions')) {
|
if (AdminPanelAction::canAdmin('sessions')) {
|
||||||
$this->out->menuItem(common_local_url('sessionsadminpanel'), _('Sessions'),
|
// TRANS: Menu item title/tooltip
|
||||||
_('Sessions configuration'), $action_name == 'sessionsadminpanel', 'nav_design_admin_panel');
|
$menu_title = _('Sessions configuration');
|
||||||
|
// TRANS: Menu item for site administration
|
||||||
|
$this->out->menuItem(common_local_url('sessionsadminpanel'), _m('MENU', 'Sessions'),
|
||||||
|
$menu_title, $action_name == 'sessionsadminpanel', 'nav_design_admin_panel');
|
||||||
}
|
}
|
||||||
|
|
||||||
Event::handle('EndAdminPanelNav', array($this));
|
Event::handle('EndAdminPanelNav', array($this));
|
||||||
@ -342,8 +378,4 @@ class AdminPanelNav extends Widget
|
|||||||
$this->action->elementEnd('ul');
|
$this->action->elementEnd('ul');
|
||||||
}
|
}
|
||||||
|
|
||||||
function canAdmin($name)
|
|
||||||
{
|
|
||||||
return in_array($name, common_config('admin', 'panels'));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,6 @@ class ApiAction extends Action
|
|||||||
var $count = null;
|
var $count = null;
|
||||||
var $max_id = null;
|
var $max_id = null;
|
||||||
var $since_id = null;
|
var $since_id = null;
|
||||||
var $since = null;
|
|
||||||
|
|
||||||
var $access = self::READ_ONLY; // read (default) or read-write
|
var $access = self::READ_ONLY; // read (default) or read-write
|
||||||
|
|
||||||
@ -85,7 +84,10 @@ class ApiAction extends Action
|
|||||||
$this->count = (int)$this->arg('count', 20);
|
$this->count = (int)$this->arg('count', 20);
|
||||||
$this->max_id = (int)$this->arg('max_id', 0);
|
$this->max_id = (int)$this->arg('max_id', 0);
|
||||||
$this->since_id = (int)$this->arg('since_id', 0);
|
$this->since_id = (int)$this->arg('since_id', 0);
|
||||||
$this->since = $this->arg('since');
|
|
||||||
|
if ($this->arg('since')) {
|
||||||
|
$this->clientError(_("since parameter is disabled for performance; use since_id"), 403);
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -359,7 +361,7 @@ class ApiAction extends Action
|
|||||||
$entry['link'] = common_local_url('shownotice', array('notice' => $notice->id));
|
$entry['link'] = common_local_url('shownotice', array('notice' => $notice->id));
|
||||||
$entry['published'] = common_date_iso8601($notice->created);
|
$entry['published'] = common_date_iso8601($notice->created);
|
||||||
|
|
||||||
$taguribase = common_config('integration', 'taguri');
|
$taguribase = TagURI::base();
|
||||||
$entry['id'] = "tag:$taguribase:$entry[link]";
|
$entry['id'] = "tag:$taguribase:$entry[link]";
|
||||||
|
|
||||||
$entry['updated'] = $entry['published'];
|
$entry['updated'] = $entry['published'];
|
||||||
@ -803,7 +805,7 @@ class ApiAction extends Action
|
|||||||
$entry['link'] = common_local_url('showmessage', array('message' => $message->id));
|
$entry['link'] = common_local_url('showmessage', array('message' => $message->id));
|
||||||
$entry['published'] = common_date_iso8601($message->created);
|
$entry['published'] = common_date_iso8601($message->created);
|
||||||
|
|
||||||
$taguribase = common_config('integration', 'taguri');
|
$taguribase = TagURI::base();
|
||||||
|
|
||||||
$entry['id'] = "tag:$taguribase:$entry[link]";
|
$entry['id'] = "tag:$taguribase:$entry[link]";
|
||||||
$entry['updated'] = $entry['published'];
|
$entry['updated'] = $entry['published'];
|
||||||
@ -1219,7 +1221,12 @@ class ApiAction extends Action
|
|||||||
return User_group::staticGet($this->arg('id'));
|
return User_group::staticGet($this->arg('id'));
|
||||||
} else if ($this->arg('id')) {
|
} else if ($this->arg('id')) {
|
||||||
$nickname = common_canonical_nickname($this->arg('id'));
|
$nickname = common_canonical_nickname($this->arg('id'));
|
||||||
return User_group::staticGet('nickname', $nickname);
|
$local = Local_group::staticGet('nickname', $nickname);
|
||||||
|
if (empty($local)) {
|
||||||
|
return null;
|
||||||
|
} else {
|
||||||
|
return User_group::staticGet('id', $local->id);
|
||||||
|
}
|
||||||
} else if ($this->arg('group_id')) {
|
} else if ($this->arg('group_id')) {
|
||||||
// This is to ensure that a non-numeric user_id still
|
// This is to ensure that a non-numeric user_id still
|
||||||
// overrides screen_name even if it doesn't get used
|
// overrides screen_name even if it doesn't get used
|
||||||
@ -1228,14 +1235,24 @@ class ApiAction extends Action
|
|||||||
}
|
}
|
||||||
} else if ($this->arg('group_name')) {
|
} else if ($this->arg('group_name')) {
|
||||||
$nickname = common_canonical_nickname($this->arg('group_name'));
|
$nickname = common_canonical_nickname($this->arg('group_name'));
|
||||||
return User_group::staticGet('nickname', $nickname);
|
$local = Local_group::staticGet('nickname', $nickname);
|
||||||
|
if (empty($local)) {
|
||||||
|
return null;
|
||||||
|
} else {
|
||||||
|
return User_group::staticGet('id', $local->id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
} else if (is_numeric($id)) {
|
} else if (is_numeric($id)) {
|
||||||
return User_group::staticGet($id);
|
return User_group::staticGet($id);
|
||||||
} else {
|
} else {
|
||||||
$nickname = common_canonical_nickname($id);
|
$nickname = common_canonical_nickname($id);
|
||||||
return User_group::staticGet('nickname', $nickname);
|
$local = Local_group::staticGet('nickname', $nickname);
|
||||||
|
if (empty($local)) {
|
||||||
|
return null;
|
||||||
|
} else {
|
||||||
|
return User_group::staticGet('id', $local->group_id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1311,8 +1328,6 @@ class ApiAction extends Action
|
|||||||
case 'max_id':
|
case 'max_id':
|
||||||
$max_id = (int)$this->args['max_id'];
|
$max_id = (int)$this->args['max_id'];
|
||||||
return ($max_id < 1) ? 0 : $max_id;
|
return ($max_id < 1) ? 0 : $max_id;
|
||||||
case 'since':
|
|
||||||
return strtotime($this->args['since']);
|
|
||||||
default:
|
default:
|
||||||
return parent::arg($key, $def);
|
return parent::arg($key, $def);
|
||||||
}
|
}
|
@ -38,7 +38,6 @@ if (!defined('STATUSNET')) {
|
|||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
require_once INSTALLDIR . '/lib/api.php';
|
|
||||||
require_once INSTALLDIR . '/lib/apioauth.php';
|
require_once INSTALLDIR . '/lib/apioauth.php';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -27,8 +27,7 @@
|
|||||||
* @link http://status.net/
|
* @link http://status.net/
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (!defined('STATUSNET')
|
if (!defined('STATUSNET')) {
|
||||||
{
|
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -87,7 +86,7 @@ class Atom10Entry extends XMLStringer
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
function validate
|
function validate()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -78,7 +78,7 @@ class Atom10Feed extends XMLStringer
|
|||||||
$this->authors = array();
|
$this->authors = array();
|
||||||
$this->links = array();
|
$this->links = array();
|
||||||
$this->entries = array();
|
$this->entries = array();
|
||||||
$this->addNamespace('xmlns', 'http://www.w3.org/2005/Atom');
|
$this->addNamespace('', 'http://www.w3.org/2005/Atom');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -109,11 +109,11 @@ class Atom10Feed extends XMLStringer
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_null($uri)) {
|
if (isset($uri)) {
|
||||||
$xs->element('uri', null, $uri);
|
$xs->element('uri', null, $uri);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_null(email)) {
|
if (isset($email)) {
|
||||||
$xs->element('email', null, $email);
|
$xs->element('email', null, $email);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -162,7 +162,14 @@ class Atom10Feed extends XMLStringer
|
|||||||
{
|
{
|
||||||
$this->xw->startDocument('1.0', 'UTF-8');
|
$this->xw->startDocument('1.0', 'UTF-8');
|
||||||
$commonAttrs = array('xml:lang' => 'en-US');
|
$commonAttrs = array('xml:lang' => 'en-US');
|
||||||
$commonAttrs = array_merge($commonAttrs, $this->namespaces);
|
foreach ($this->namespaces as $prefix => $uri) {
|
||||||
|
if ($prefix == '') {
|
||||||
|
$attr = 'xmlns';
|
||||||
|
} else {
|
||||||
|
$attr = 'xmlns:' . $prefix;
|
||||||
|
}
|
||||||
|
$commonAttrs[$attr] = $uri;
|
||||||
|
}
|
||||||
$this->elementStart('feed', $commonAttrs);
|
$this->elementStart('feed', $commonAttrs);
|
||||||
|
|
||||||
$this->element('id', null, $this->id);
|
$this->element('id', null, $this->id);
|
||||||
|
@ -50,23 +50,33 @@ class AtomNoticeFeed extends Atom10Feed
|
|||||||
// Feeds containing notice info use these namespaces
|
// Feeds containing notice info use these namespaces
|
||||||
|
|
||||||
$this->addNamespace(
|
$this->addNamespace(
|
||||||
'xmlns:thr',
|
'thr',
|
||||||
'http://purl.org/syndication/thread/1.0'
|
'http://purl.org/syndication/thread/1.0'
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->addNamespace(
|
$this->addNamespace(
|
||||||
'xmlns:georss',
|
'georss',
|
||||||
'http://www.georss.org/georss'
|
'http://www.georss.org/georss'
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->addNamespace(
|
$this->addNamespace(
|
||||||
'xmlns:activity',
|
'activity',
|
||||||
'http://activitystrea.ms/spec/1.0/'
|
'http://activitystrea.ms/spec/1.0/'
|
||||||
);
|
);
|
||||||
|
|
||||||
|
$this->addNamespace(
|
||||||
|
'media',
|
||||||
|
'http://purl.org/syndication/atommedia'
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->addNamespace(
|
||||||
|
'poco',
|
||||||
|
'http://portablecontacts.net/spec/1.0'
|
||||||
|
);
|
||||||
|
|
||||||
// XXX: What should the uri be?
|
// XXX: What should the uri be?
|
||||||
$this->addNamespace(
|
$this->addNamespace(
|
||||||
'xmlns:ostatus',
|
'ostatus',
|
||||||
'http://ostatus.org/schema/1.0'
|
'http://ostatus.org/schema/1.0'
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -54,9 +54,14 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function __construct($user = null, $indent = true) {
|
function __construct($user = null, $indent = true) {
|
||||||
parent::__construct($indent);
|
parent::__construct($indent);
|
||||||
$this->user = $user;
|
$this->user = $user;
|
||||||
|
if (!empty($user)) {
|
||||||
|
$profile = $user->getProfile();
|
||||||
|
$this->addAuthor($profile->nickname, $user->uri);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function getUser()
|
function getUser()
|
||||||
|
@ -101,12 +101,14 @@ abstract class AuthenticationPlugin extends Plugin
|
|||||||
* Used during autoregistration
|
* Used during autoregistration
|
||||||
* Useful if your usernames are ugly, and you want to suggest
|
* Useful if your usernames are ugly, and you want to suggest
|
||||||
* nice looking nicknames when users initially sign on
|
* nice looking nicknames when users initially sign on
|
||||||
|
* All nicknames returned by this function should be valid
|
||||||
|
* implementations may want to use common_nicknamize() to ensure validity
|
||||||
* @param username
|
* @param username
|
||||||
* @return string nickname
|
* @return string nickname
|
||||||
*/
|
*/
|
||||||
function suggestNicknameForUsername($username)
|
function suggestNicknameForUsername($username)
|
||||||
{
|
{
|
||||||
return $username;
|
return common_nicknamize($username);
|
||||||
}
|
}
|
||||||
|
|
||||||
//------------Below are the methods that connect StatusNet to the implementing Auth plugin------------\\
|
//------------Below are the methods that connect StatusNet to the implementing Auth plugin------------\\
|
||||||
@ -129,7 +131,7 @@ abstract class AuthenticationPlugin extends Plugin
|
|||||||
$test_user = User::staticGet('nickname', $suggested_nickname);
|
$test_user = User::staticGet('nickname', $suggested_nickname);
|
||||||
if($test_user) {
|
if($test_user) {
|
||||||
//someone already exists with the suggested nickname, so used the passed nickname
|
//someone already exists with the suggested nickname, so used the passed nickname
|
||||||
$suggested_nickname = $nickname;
|
$suggested_nickname = common_nicknamize($nickname);
|
||||||
}
|
}
|
||||||
$test_user = User::staticGet('nickname', $suggested_nickname);
|
$test_user = User::staticGet('nickname', $suggested_nickname);
|
||||||
if($test_user) {
|
if($test_user) {
|
||||||
|
@ -85,7 +85,7 @@ abstract class AuthorizationPlugin extends Plugin
|
|||||||
}
|
}
|
||||||
|
|
||||||
function onStartSetApiUser(&$user) {
|
function onStartSetApiUser(&$user) {
|
||||||
return $this->onStartSetUser(&$user);
|
return $this->onStartSetUser($user);
|
||||||
}
|
}
|
||||||
|
|
||||||
function onStartHasRole($profile, $name, &$has_role) {
|
function onStartHasRole($profile, $name, &$has_role) {
|
||||||
|
@ -548,12 +548,19 @@ class SubCommand extends Command
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$result = subs_subscribe_user($this->user, $this->other);
|
$otherUser = User::staticGet('nickname', $this->other);
|
||||||
|
|
||||||
if ($result == 'true') {
|
if (empty($otherUser)) {
|
||||||
|
$channel->error($this->user, _('No such user'));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
Subscription::start($this->user->getProfile(),
|
||||||
|
$otherUser->getProfile());
|
||||||
$channel->output($this->user, sprintf(_('Subscribed to %s'), $this->other));
|
$channel->output($this->user, sprintf(_('Subscribed to %s'), $this->other));
|
||||||
} else {
|
} catch (Exception $e) {
|
||||||
$channel->error($this->user, $result);
|
$channel->error($this->user, $e->getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -576,12 +583,18 @@ class UnsubCommand extends Command
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$result=subs_unsubscribe_user($this->user, $this->other);
|
$otherUser = User::staticGet('nickname', $this->other);
|
||||||
|
|
||||||
if ($result) {
|
if (empty($otherUser)) {
|
||||||
|
$channel->error($this->user, _('No such user'));
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
Subscription::cancel($this->user->getProfile(),
|
||||||
|
$otherUser->getProfile());
|
||||||
$channel->output($this->user, sprintf(_('Unsubscribed from %s'), $this->other));
|
$channel->output($this->user, sprintf(_('Unsubscribed from %s'), $this->other));
|
||||||
} else {
|
} catch (Exception $e) {
|
||||||
$channel->error($this->user, $result);
|
$channel->error($this->user, $e->getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -655,6 +668,34 @@ class LoginCommand extends Command
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class LoseCommand extends Command
|
||||||
|
{
|
||||||
|
|
||||||
|
var $other = null;
|
||||||
|
|
||||||
|
function __construct($user, $other)
|
||||||
|
{
|
||||||
|
parent::__construct($user);
|
||||||
|
$this->other = $other;
|
||||||
|
}
|
||||||
|
|
||||||
|
function execute($channel)
|
||||||
|
{
|
||||||
|
if(!$this->other) {
|
||||||
|
$channel->error($this->user, _('Specify the name of the user to unsubscribe from'));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$result=subs_unsubscribe_from($this->user, $this->other);
|
||||||
|
|
||||||
|
if ($result) {
|
||||||
|
$channel->output($this->user, sprintf(_('Unsubscribed %s'), $this->other));
|
||||||
|
} else {
|
||||||
|
$channel->error($this->user, $result);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
class SubscriptionsCommand extends Command
|
class SubscriptionsCommand extends Command
|
||||||
{
|
{
|
||||||
function execute($channel)
|
function execute($channel)
|
||||||
@ -737,6 +778,7 @@ class HelpCommand extends Command
|
|||||||
"d <nickname> <text> - direct message to user\n".
|
"d <nickname> <text> - direct message to user\n".
|
||||||
"get <nickname> - get last notice from user\n".
|
"get <nickname> - get last notice from user\n".
|
||||||
"whois <nickname> - get profile info on user\n".
|
"whois <nickname> - get profile info on user\n".
|
||||||
|
"lose <nickname> - force user to stop following you\n".
|
||||||
"fav <nickname> - add user's last notice as a 'fave'\n".
|
"fav <nickname> - add user's last notice as a 'fave'\n".
|
||||||
"fav #<notice_id> - add notice with the given id as a 'fave'\n".
|
"fav #<notice_id> - add notice with the given id as a 'fave'\n".
|
||||||
"repeat #<notice_id> - repeat a notice with a given id\n".
|
"repeat #<notice_id> - repeat a notice with a given id\n".
|
||||||
|
@ -47,6 +47,17 @@ class CommandInterpreter
|
|||||||
} else {
|
} else {
|
||||||
return new LoginCommand($user);
|
return new LoginCommand($user);
|
||||||
}
|
}
|
||||||
|
case 'lose':
|
||||||
|
if ($arg) {
|
||||||
|
list($other, $extra) = $this->split_arg($arg);
|
||||||
|
if ($extra) {
|
||||||
|
return null;
|
||||||
|
} else {
|
||||||
|
return new LoseCommand($user, $other);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
case 'subscribers':
|
case 'subscribers':
|
||||||
if ($arg) {
|
if ($arg) {
|
||||||
return null;
|
return null;
|
||||||
|
@ -22,7 +22,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
|
|||||||
//exit with 200 response, if this is checking fancy from the installer
|
//exit with 200 response, if this is checking fancy from the installer
|
||||||
if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; }
|
if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; }
|
||||||
|
|
||||||
define('STATUSNET_VERSION', '0.9.0beta5');
|
define('STATUSNET_VERSION', '0.9.0beta6+bugfix1');
|
||||||
define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
|
define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
|
||||||
|
|
||||||
define('STATUSNET_CODENAME', 'Stand');
|
define('STATUSNET_CODENAME', 'Stand');
|
||||||
@ -71,6 +71,7 @@ if (!function_exists('dl')) {
|
|||||||
# global configuration object
|
# global configuration object
|
||||||
|
|
||||||
require_once('PEAR.php');
|
require_once('PEAR.php');
|
||||||
|
require_once('PEAR/Exception.php');
|
||||||
require_once('DB/DataObject.php');
|
require_once('DB/DataObject.php');
|
||||||
require_once('DB/DataObject/Cast.php'); # for dates
|
require_once('DB/DataObject/Cast.php'); # for dates
|
||||||
|
|
||||||
@ -123,10 +124,22 @@ require_once INSTALLDIR.'/lib/util.php';
|
|||||||
require_once INSTALLDIR.'/lib/action.php';
|
require_once INSTALLDIR.'/lib/action.php';
|
||||||
require_once INSTALLDIR.'/lib/mail.php';
|
require_once INSTALLDIR.'/lib/mail.php';
|
||||||
require_once INSTALLDIR.'/lib/subs.php';
|
require_once INSTALLDIR.'/lib/subs.php';
|
||||||
|
require_once INSTALLDIR.'/lib/activity.php';
|
||||||
|
|
||||||
require_once INSTALLDIR.'/lib/clientexception.php';
|
require_once INSTALLDIR.'/lib/clientexception.php';
|
||||||
require_once INSTALLDIR.'/lib/serverexception.php';
|
require_once INSTALLDIR.'/lib/serverexception.php';
|
||||||
|
|
||||||
|
|
||||||
|
//set PEAR error handling to use regular PHP exceptions
|
||||||
|
function PEAR_ErrorToPEAR_Exception($err)
|
||||||
|
{
|
||||||
|
if ($err->getCode()) {
|
||||||
|
throw new PEAR_Exception($err->getMessage(), $err->getCode());
|
||||||
|
}
|
||||||
|
throw new PEAR_Exception($err->getMessage());
|
||||||
|
}
|
||||||
|
PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'PEAR_ErrorToPEAR_Exception');
|
||||||
|
|
||||||
try {
|
try {
|
||||||
StatusNet::init(@$server, @$path, @$conffile);
|
StatusNet::init(@$server, @$path, @$conffile);
|
||||||
} catch (NoConfigException $e) {
|
} catch (NoConfigException $e) {
|
||||||
|
@ -175,9 +175,9 @@ $default =
|
|||||||
array('enabled' => false),
|
array('enabled' => false),
|
||||||
'integration' =>
|
'integration' =>
|
||||||
array('source' => 'StatusNet', # source attribute for Twitter
|
array('source' => 'StatusNet', # source attribute for Twitter
|
||||||
'taguri' => $_server.',2009'), # base for tag URIs
|
'taguri' => null), # base for tag URIs
|
||||||
'twitter' =>
|
'twitter' =>
|
||||||
array('enabled' => true,
|
array('signin' => true,
|
||||||
'consumer_key' => null,
|
'consumer_key' => null,
|
||||||
'consumer_secret' => null),
|
'consumer_secret' => null),
|
||||||
'cache' =>
|
'cache' =>
|
||||||
@ -278,9 +278,7 @@ $default =
|
|||||||
'TightUrl' => array('shortenerName' => '2tu.us', 'freeService' => true,'serviceUrl'=>'http://2tu.us/?save=y&url=%1$s'),
|
'TightUrl' => array('shortenerName' => '2tu.us', 'freeService' => true,'serviceUrl'=>'http://2tu.us/?save=y&url=%1$s'),
|
||||||
'Geonames' => null,
|
'Geonames' => null,
|
||||||
'Mapstraction' => null,
|
'Mapstraction' => null,
|
||||||
'Linkback' => null,
|
|
||||||
'WikiHashtags' => null,
|
'WikiHashtags' => null,
|
||||||
'PubSubHubBub' => null,
|
|
||||||
'RSSCloud' => null,
|
'RSSCloud' => null,
|
||||||
'OpenID' => null),
|
'OpenID' => null),
|
||||||
),
|
),
|
||||||
|
@ -63,31 +63,7 @@ class DistribQueueHandler
|
|||||||
// XXX: do we need to change this for remote users?
|
// XXX: do we need to change this for remote users?
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$notice->saveTags();
|
$notice->addToInboxes();
|
||||||
} catch (Exception $e) {
|
|
||||||
$this->logit($notice, $e);
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
$groups = $notice->saveGroups();
|
|
||||||
} catch (Exception $e) {
|
|
||||||
$this->logit($notice, $e);
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
$recipients = $notice->saveReplies();
|
|
||||||
} catch (Exception $e) {
|
|
||||||
$this->logit($notice, $e);
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
$notice->addToInboxes($groups, $recipients);
|
|
||||||
} catch (Exception $e) {
|
|
||||||
$this->logit($notice, $e);
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
$notice->saveUrls();
|
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
$this->logit($notice, $e);
|
$this->logit($notice, $e);
|
||||||
}
|
}
|
||||||
|
@ -99,6 +99,10 @@ class ImageFile
|
|||||||
|
|
||||||
if ($info[2] !== IMAGETYPE_GIF &&
|
if ($info[2] !== IMAGETYPE_GIF &&
|
||||||
$info[2] !== IMAGETYPE_JPEG &&
|
$info[2] !== IMAGETYPE_JPEG &&
|
||||||
|
$info[2] !== IMAGETYPE_BMP &&
|
||||||
|
$info[2] !== IMAGETYPE_WBMP &&
|
||||||
|
$info[2] !== IMAGETYPE_XBM &&
|
||||||
|
$info[2] !== IMAGETYPE_XPM &&
|
||||||
$info[2] !== IMAGETYPE_PNG) {
|
$info[2] !== IMAGETYPE_PNG) {
|
||||||
|
|
||||||
@unlink($_FILES[$param]['tmp_name']);
|
@unlink($_FILES[$param]['tmp_name']);
|
||||||
@ -146,6 +150,18 @@ class ImageFile
|
|||||||
case IMAGETYPE_PNG:
|
case IMAGETYPE_PNG:
|
||||||
$image_src = imagecreatefrompng($this->filepath);
|
$image_src = imagecreatefrompng($this->filepath);
|
||||||
break;
|
break;
|
||||||
|
case IMAGETYPE_BMP:
|
||||||
|
$image_src = imagecreatefrombmp($this->filepath);
|
||||||
|
break;
|
||||||
|
case IMAGETYPE_WBMP:
|
||||||
|
$image_src = imagecreatefromwbmp($this->filepath);
|
||||||
|
break;
|
||||||
|
case IMAGETYPE_XBM:
|
||||||
|
$image_src = imagecreatefromxbm($this->filepath);
|
||||||
|
break;
|
||||||
|
case IMAGETYPE_XPM:
|
||||||
|
$image_src = imagecreatefromxpm($this->filepath);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
throw new Exception(_('Unknown file type'));
|
throw new Exception(_('Unknown file type'));
|
||||||
return;
|
return;
|
||||||
@ -153,7 +169,7 @@ class ImageFile
|
|||||||
|
|
||||||
$image_dest = imagecreatetruecolor($size, $size);
|
$image_dest = imagecreatetruecolor($size, $size);
|
||||||
|
|
||||||
if ($this->type == IMAGETYPE_GIF || $this->type == IMAGETYPE_PNG) {
|
if ($this->type == IMAGETYPE_GIF || $this->type == IMAGETYPE_PNG || $this->type == IMAGETYPE_BMP) {
|
||||||
|
|
||||||
$transparent_idx = imagecolortransparent($image_src);
|
$transparent_idx = imagecolortransparent($image_src);
|
||||||
|
|
||||||
@ -176,6 +192,24 @@ class ImageFile
|
|||||||
|
|
||||||
imagecopyresampled($image_dest, $image_src, 0, 0, $x, $y, $size, $size, $w, $h);
|
imagecopyresampled($image_dest, $image_src, 0, 0, $x, $y, $size, $size, $w, $h);
|
||||||
|
|
||||||
|
if($this->type == IMAGETYPE_BMP) {
|
||||||
|
//we don't want to save BMP... it's an inefficient, rare, antiquated format
|
||||||
|
//save png instead
|
||||||
|
$this->type = IMAGETYPE_PNG;
|
||||||
|
} else if($this->type == IMAGETYPE_WBMP) {
|
||||||
|
//we don't want to save WBMP... it's a rare format that we can't guarantee clients will support
|
||||||
|
//save png instead
|
||||||
|
$this->type = IMAGETYPE_PNG;
|
||||||
|
} else if($this->type == IMAGETYPE_XBM) {
|
||||||
|
//we don't want to save XBM... it's a rare format that we can't guarantee clients will support
|
||||||
|
//save png instead
|
||||||
|
$this->type = IMAGETYPE_PNG;
|
||||||
|
} else if($this->type == IMAGETYPE_XPM) {
|
||||||
|
//we don't want to save XPM... it's a rare format that we can't guarantee clients will support
|
||||||
|
//save png instead
|
||||||
|
$this->type = IMAGETYPE_PNG;
|
||||||
|
}
|
||||||
|
|
||||||
$outname = Avatar::filename($this->id,
|
$outname = Avatar::filename($this->id,
|
||||||
image_type_to_extension($this->type),
|
image_type_to_extension($this->type),
|
||||||
$size,
|
$size,
|
||||||
@ -246,3 +280,100 @@ class ImageFile
|
|||||||
return $num;
|
return $num;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//PHP doesn't (as of 2/24/2010) have an imagecreatefrombmp so conditionally define one
|
||||||
|
if(!function_exists('imagecreatefrombmp')){
|
||||||
|
//taken shamelessly from http://www.php.net/manual/en/function.imagecreatefromwbmp.php#86214
|
||||||
|
function imagecreatefrombmp($p_sFile)
|
||||||
|
{
|
||||||
|
// Load the image into a string
|
||||||
|
$file = fopen($p_sFile,"rb");
|
||||||
|
$read = fread($file,10);
|
||||||
|
while(!feof($file)&&($read<>""))
|
||||||
|
$read .= fread($file,1024);
|
||||||
|
|
||||||
|
$temp = unpack("H*",$read);
|
||||||
|
$hex = $temp[1];
|
||||||
|
$header = substr($hex,0,108);
|
||||||
|
|
||||||
|
// Process the header
|
||||||
|
// Structure: http://www.fastgraph.com/help/bmp_header_format.html
|
||||||
|
if (substr($header,0,4)=="424d")
|
||||||
|
{
|
||||||
|
// Cut it in parts of 2 bytes
|
||||||
|
$header_parts = str_split($header,2);
|
||||||
|
|
||||||
|
// Get the width 4 bytes
|
||||||
|
$width = hexdec($header_parts[19].$header_parts[18]);
|
||||||
|
|
||||||
|
// Get the height 4 bytes
|
||||||
|
$height = hexdec($header_parts[23].$header_parts[22]);
|
||||||
|
|
||||||
|
// Unset the header params
|
||||||
|
unset($header_parts);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Define starting X and Y
|
||||||
|
$x = 0;
|
||||||
|
$y = 1;
|
||||||
|
|
||||||
|
// Create newimage
|
||||||
|
$image = imagecreatetruecolor($width,$height);
|
||||||
|
|
||||||
|
// Grab the body from the image
|
||||||
|
$body = substr($hex,108);
|
||||||
|
|
||||||
|
// Calculate if padding at the end-line is needed
|
||||||
|
// Divided by two to keep overview.
|
||||||
|
// 1 byte = 2 HEX-chars
|
||||||
|
$body_size = (strlen($body)/2);
|
||||||
|
$header_size = ($width*$height);
|
||||||
|
|
||||||
|
// Use end-line padding? Only when needed
|
||||||
|
$usePadding = ($body_size>($header_size*3)+4);
|
||||||
|
|
||||||
|
// Using a for-loop with index-calculation instaid of str_split to avoid large memory consumption
|
||||||
|
// Calculate the next DWORD-position in the body
|
||||||
|
for ($i=0;$i<$body_size;$i+=3)
|
||||||
|
{
|
||||||
|
// Calculate line-ending and padding
|
||||||
|
if ($x>=$width)
|
||||||
|
{
|
||||||
|
// If padding needed, ignore image-padding
|
||||||
|
// Shift i to the ending of the current 32-bit-block
|
||||||
|
if ($usePadding)
|
||||||
|
$i += $width%4;
|
||||||
|
|
||||||
|
// Reset horizontal position
|
||||||
|
$x = 0;
|
||||||
|
|
||||||
|
// Raise the height-position (bottom-up)
|
||||||
|
$y++;
|
||||||
|
|
||||||
|
// Reached the image-height? Break the for-loop
|
||||||
|
if ($y>$height)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calculation of the RGB-pixel (defined as BGR in image-data)
|
||||||
|
// Define $i_pos as absolute position in the body
|
||||||
|
$i_pos = $i*2;
|
||||||
|
$r = hexdec($body[$i_pos+4].$body[$i_pos+5]);
|
||||||
|
$g = hexdec($body[$i_pos+2].$body[$i_pos+3]);
|
||||||
|
$b = hexdec($body[$i_pos].$body[$i_pos+1]);
|
||||||
|
|
||||||
|
// Calculate and draw the pixel
|
||||||
|
$color = imagecolorallocate($image,$r,$g,$b);
|
||||||
|
imagesetpixel($image,$x,$height-$y,$color);
|
||||||
|
|
||||||
|
// Raise the horizontal position
|
||||||
|
$x++;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Unset the body / free the memory
|
||||||
|
unset($body);
|
||||||
|
|
||||||
|
// Return image-object
|
||||||
|
return $image;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -100,7 +100,7 @@ class JoinForm extends Form
|
|||||||
function action()
|
function action()
|
||||||
{
|
{
|
||||||
return common_local_url('joingroup',
|
return common_local_url('joingroup',
|
||||||
array('nickname' => $this->group->nickname));
|
array('id' => $this->group->id));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -100,7 +100,7 @@ class LeaveForm extends Form
|
|||||||
function action()
|
function action()
|
||||||
{
|
{
|
||||||
return common_local_url('leavegroup',
|
return common_local_url('leavegroup',
|
||||||
array('nickname' => $this->group->nickname));
|
array('id' => $this->group->id));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -262,7 +262,7 @@ class MediaFile
|
|||||||
$filetype = MIME_Type::autoDetect($stream['uri']);
|
$filetype = MIME_Type::autoDetect($stream['uri']);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (in_array($filetype, common_config('attachments', 'supported'))) {
|
if (common_config('attachments', 'supported') === true || in_array($filetype, common_config('attachments', 'supported'))) {
|
||||||
return $filetype;
|
return $filetype;
|
||||||
}
|
}
|
||||||
$media = MIME_Type::getMedia($filetype);
|
$media = MIME_Type::getMedia($filetype);
|
||||||
|
@ -175,6 +175,6 @@ class MessageForm extends Form
|
|||||||
'class' => 'submit',
|
'class' => 'submit',
|
||||||
'name' => 'message_send',
|
'name' => 'message_send',
|
||||||
'type' => 'submit',
|
'type' => 'submit',
|
||||||
'value' => _('Send')));
|
'value' => _m('Send button for sending notice', 'Send')));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -233,6 +233,6 @@ class NoticeForm extends Form
|
|||||||
'class' => 'submit',
|
'class' => 'submit',
|
||||||
'name' => 'status_submit',
|
'name' => 'status_submit',
|
||||||
'type' => 'submit',
|
'type' => 'submit',
|
||||||
'value' => _('Send')));
|
'value' => _m('Send button for sending notice', 'Send')));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -380,12 +380,12 @@ class NoticeListItem extends Widget
|
|||||||
|
|
||||||
function showNoticeLink()
|
function showNoticeLink()
|
||||||
{
|
{
|
||||||
if($this->notice->is_local == Notice::LOCAL_PUBLIC || $this->notice->is_local == Notice::LOCAL_NONPUBLIC){
|
$noticeurl = $this->notice->bestUrl();
|
||||||
$noticeurl = common_local_url('shownotice',
|
|
||||||
array('notice' => $this->notice->id));
|
// above should always return an URL
|
||||||
}else{
|
|
||||||
$noticeurl = $this->notice->uri;
|
assert(!empty($noticeurl));
|
||||||
}
|
|
||||||
$this->out->elementStart('a', array('rel' => 'bookmark',
|
$this->out->elementStart('a', array('rel' => 'bookmark',
|
||||||
'class' => 'timestamp',
|
'class' => 'timestamp',
|
||||||
'href' => $noticeurl));
|
'href' => $noticeurl));
|
||||||
@ -438,14 +438,15 @@ class NoticeListItem extends Widget
|
|||||||
$this->out->text(_('at'));
|
$this->out->text(_('at'));
|
||||||
$this->out->text(' ');
|
$this->out->text(' ');
|
||||||
if (empty($url)) {
|
if (empty($url)) {
|
||||||
$this->out->element('span', array('class' => 'geo',
|
$this->out->element('abbr', array('class' => 'geo',
|
||||||
'title' => $latlon),
|
'title' => $latlon),
|
||||||
$name);
|
$name);
|
||||||
} else {
|
} else {
|
||||||
$this->out->element('a', array('class' => 'geo',
|
$this->out->elementStart('a', array('href' => $url));
|
||||||
'title' => $latlon,
|
$this->out->element('abbr', array('class' => 'geo',
|
||||||
'href' => $url),
|
'title' => $latlon),
|
||||||
$name);
|
$name);
|
||||||
|
$this->out->elementEnd('a');
|
||||||
}
|
}
|
||||||
$this->out->elementEnd('span');
|
$this->out->elementEnd('span');
|
||||||
}
|
}
|
||||||
@ -539,22 +540,40 @@ class NoticeListItem extends Widget
|
|||||||
function showContext()
|
function showContext()
|
||||||
{
|
{
|
||||||
$hasConversation = false;
|
$hasConversation = false;
|
||||||
if( !empty($this->notice->conversation)
|
if (!empty($this->notice->conversation)) {
|
||||||
&& $this->notice->conversation != $this->notice->id){
|
$conversation = Notice::conversationStream(
|
||||||
$hasConversation = true;
|
$this->notice->conversation,
|
||||||
}else{
|
1,
|
||||||
$conversation = Notice::conversationStream($this->notice->id, 1, 1);
|
1
|
||||||
|
);
|
||||||
if ($conversation->N > 0) {
|
if ($conversation->N > 0) {
|
||||||
$hasConversation = true;
|
$hasConversation = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($hasConversation) {
|
if ($hasConversation) {
|
||||||
|
$conv = Conversation::staticGet(
|
||||||
|
'id',
|
||||||
|
$this->notice->conversation
|
||||||
|
);
|
||||||
|
$convurl = $conv->uri;
|
||||||
|
if (!empty($convurl)) {
|
||||||
$this->out->text(' ');
|
$this->out->text(' ');
|
||||||
$convurl = common_local_url('conversation',
|
$this->out->element(
|
||||||
array('id' => $this->notice->conversation));
|
'a',
|
||||||
$this->out->element('a', array('href' => $convurl.'#notice-'.$this->notice->id,
|
array(
|
||||||
|
'href' => $convurl.'#notice-'.$this->notice->id,
|
||||||
'class' => 'response'),
|
'class' => 'response'),
|
||||||
_('in context'));
|
_('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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -390,7 +390,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore
|
|||||||
$sub->subscribed = $user->id;
|
$sub->subscribed = $user->id;
|
||||||
|
|
||||||
if (!$sub->find(true)) {
|
if (!$sub->find(true)) {
|
||||||
return 0;
|
return array();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Since we do not use OMB_Service_Provider’s action methods, there
|
/* Since we do not use OMB_Service_Provider’s action methods, there
|
||||||
|
21
lib/omb.php
21
lib/omb.php
@ -29,11 +29,9 @@ require_once 'Auth/Yadis/Yadis.php';
|
|||||||
|
|
||||||
function omb_oauth_consumer()
|
function omb_oauth_consumer()
|
||||||
{
|
{
|
||||||
static $con = null;
|
// Don't try to make this static. Leads to issues in
|
||||||
if (is_null($con)) {
|
// multi-site setups - Z
|
||||||
$con = new OAuthConsumer(common_root_url(), '');
|
return new OAuthConsumer(common_root_url(), '');
|
||||||
}
|
|
||||||
return $con;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function omb_oauth_server()
|
function omb_oauth_server()
|
||||||
@ -79,7 +77,7 @@ function omb_broadcast_notice($notice)
|
|||||||
/* Get remote users subscribed to this profile. */
|
/* Get remote users subscribed to this profile. */
|
||||||
$rp = new Remote_profile();
|
$rp = new Remote_profile();
|
||||||
|
|
||||||
$rp->query('SELECT postnoticeurl, token, secret ' .
|
$rp->query('SELECT remote_profile.*, secret, token ' .
|
||||||
'FROM subscription JOIN remote_profile ' .
|
'FROM subscription JOIN remote_profile ' .
|
||||||
'ON subscription.subscriber = remote_profile.id ' .
|
'ON subscription.subscriber = remote_profile.id ' .
|
||||||
'WHERE subscription.subscribed = ' . $notice->profile_id . ' ');
|
'WHERE subscription.subscribed = ' . $notice->profile_id . ' ');
|
||||||
@ -95,7 +93,8 @@ function omb_broadcast_notice($notice)
|
|||||||
|
|
||||||
/* Post notice. */
|
/* Post notice. */
|
||||||
$service = new StatusNet_OMB_Service_Consumer(
|
$service = new StatusNet_OMB_Service_Consumer(
|
||||||
array(OMB_ENDPOINT_POSTNOTICE => $rp->postnoticeurl));
|
array(OMB_ENDPOINT_POSTNOTICE => $rp->postnoticeurl),
|
||||||
|
$rp->uri);
|
||||||
try {
|
try {
|
||||||
$service->setToken($rp->token, $rp->secret);
|
$service->setToken($rp->token, $rp->secret);
|
||||||
$service->postNotice($omb_notice);
|
$service->postNotice($omb_notice);
|
||||||
@ -127,7 +126,7 @@ function omb_broadcast_profile($profile)
|
|||||||
/* Get remote users subscribed to this profile. */
|
/* Get remote users subscribed to this profile. */
|
||||||
$rp = new Remote_profile();
|
$rp = new Remote_profile();
|
||||||
|
|
||||||
$rp->query('SELECT updateprofileurl, token, secret ' .
|
$rp->query('SELECT remote_profile.*, secret, token ' .
|
||||||
'FROM subscription JOIN remote_profile ' .
|
'FROM subscription JOIN remote_profile ' .
|
||||||
'ON subscription.subscriber = remote_profile.id ' .
|
'ON subscription.subscriber = remote_profile.id ' .
|
||||||
'WHERE subscription.subscribed = ' . $profile->id . ' ');
|
'WHERE subscription.subscribed = ' . $profile->id . ' ');
|
||||||
@ -143,7 +142,8 @@ function omb_broadcast_profile($profile)
|
|||||||
|
|
||||||
/* Update profile. */
|
/* Update profile. */
|
||||||
$service = new StatusNet_OMB_Service_Consumer(
|
$service = new StatusNet_OMB_Service_Consumer(
|
||||||
array(OMB_ENDPOINT_UPDATEPROFILE => $rp->updateprofileurl));
|
array(OMB_ENDPOINT_UPDATEPROFILE => $rp->updateprofileurl),
|
||||||
|
$rp->uri);
|
||||||
try {
|
try {
|
||||||
$service->setToken($rp->token, $rp->secret);
|
$service->setToken($rp->token, $rp->secret);
|
||||||
$service->updateProfile($omb_profile);
|
$service->updateProfile($omb_profile);
|
||||||
@ -161,13 +161,14 @@ function omb_broadcast_profile($profile)
|
|||||||
}
|
}
|
||||||
|
|
||||||
class StatusNet_OMB_Service_Consumer extends OMB_Service_Consumer {
|
class StatusNet_OMB_Service_Consumer extends OMB_Service_Consumer {
|
||||||
public function __construct($urls)
|
public function __construct($urls, $listener_uri=null)
|
||||||
{
|
{
|
||||||
$this->services = $urls;
|
$this->services = $urls;
|
||||||
$this->datastore = omb_oauth_datastore();
|
$this->datastore = omb_oauth_datastore();
|
||||||
$this->oauth_consumer = omb_oauth_consumer();
|
$this->oauth_consumer = omb_oauth_consumer();
|
||||||
$this->fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
|
$this->fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
|
||||||
$this->fetcher->timeout = intval(common_config('omb', 'timeout'));
|
$this->fetcher->timeout = intval(common_config('omb', 'timeout'));
|
||||||
|
$this->listener_uri = $listener_uri;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user