summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
Diffstat (limited to 'actions')
-rw-r--r--actions/apidirectmessagenew.php2
-rw-r--r--actions/apistatusesretweet.php6
-rw-r--r--actions/apistatusesretweets.php2
-rw-r--r--actions/apitimelinefriends.php54
-rw-r--r--actions/apitimelinehome.php249
-rw-r--r--actions/featured.php2
-rw-r--r--actions/file.php8
-rw-r--r--actions/grouprss.php4
-rw-r--r--actions/newmessage.php8
-rw-r--r--actions/newnotice.php8
-rw-r--r--actions/pathsadminpanel.php31
-rw-r--r--actions/profilesettings.php30
-rw-r--r--actions/repeat.php6
-rw-r--r--actions/siteadminpanel.php35
-rw-r--r--actions/tagother.php4
-rw-r--r--actions/userbyid.php9
16 files changed, 351 insertions, 107 deletions
diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php
index e6c39ce4a..b9ac92d77 100644
--- a/actions/apidirectmessagenew.php
+++ b/actions/apidirectmessagenew.php
@@ -175,7 +175,7 @@ class ApiDirectMessageNewAction extends ApiAuthAction
return;
}
- mail_notify_message($message, $this->user, $this->other);
+ $message->notify();
if ($this->format == 'xml') {
$this->showSingleXmlDirectMessage($message);
diff --git a/actions/apistatusesretweet.php b/actions/apistatusesretweet.php
index fc71d2274..d9d4820c0 100644
--- a/actions/apistatusesretweet.php
+++ b/actions/apistatusesretweet.php
@@ -72,7 +72,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction
$this->original = Notice::staticGet('id', $id);
if (empty($this->original)) {
- $this->clientError(_('No such notice'),
+ $this->clientError(_('No such notice.'),
400, $this->format);
return false;
}
@@ -80,7 +80,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction
$this->user = $this->auth_user;
if ($this->user->id == $notice->profile_id) {
- $this->clientError(_('Cannot repeat your own notice'));
+ $this->clientError(_('Cannot repeat your own notice.'),
400, $this->format);
return false;
}
@@ -88,7 +88,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction
$profile = $this->user->getProfile();
if ($profile->hasRepeated($id)) {
- $this->clientError(_('Already repeated that notice'),
+ $this->clientError(_('Already repeated that notice.'),
400, $this->format);
return false;
}
diff --git a/actions/apistatusesretweets.php b/actions/apistatusesretweets.php
index c54a374e2..2efd59b37 100644
--- a/actions/apistatusesretweets.php
+++ b/actions/apistatusesretweets.php
@@ -69,7 +69,7 @@ class ApiStatusesRetweetsAction extends ApiAuthAction
$this->original = Notice::staticGet('id', $id);
if (empty($this->original)) {
- $this->clientError(_('No such notice'),
+ $this->clientError(_('No such notice.'),
400, $this->format);
return false;
}
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 09ba7a969..9ec7447e6 100644
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -116,12 +116,12 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
$taguribase = common_config('integration', 'taguri');
$id = "tag:$taguribase:FriendsTimeline:" . $this->user->id;
$link = common_local_url(
- 'all', array('nickname' => $this->user->nickname)
- );
+ 'all', array('nickname' => $this->user->nickname)
+ );
$subtitle = sprintf(
- _('Updates from %1$s and friends on %2$s!'),
- $this->user->nickname, $sitename
- );
+ _('Updates from %1$s and friends on %2$s!'),
+ $this->user->nickname, $sitename
+ );
$logo = ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE);
switch($this->format) {
@@ -137,17 +137,17 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
if (isset($target_id)) {
$selfuri = common_root_url() .
- 'api/statuses/friends_timeline/' .
- $target_id . '.atom';
+ 'api/statuses/friends_timeline/' .
+ $target_id . '.atom';
} else {
$selfuri = common_root_url() .
- 'api/statuses/friends_timeline.atom';
+ 'api/statuses/friends_timeline.atom';
}
$this->showAtomTimeline(
- $this->notices, $title, $id, $link,
- $subtitle, null, $selfuri, $logo
- );
+ $this->notices, $title, $id, $link,
+ $subtitle, null, $selfuri, $logo
+ );
break;
case 'json':
$this->showJsonTimeline($this->notices);
@@ -169,17 +169,13 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
$notices = array();
if (!empty($this->auth_user) && $this->auth_user->id == $this->user->id) {
- $notice = $this->user->noticeInbox(
- ($this->page-1) * $this->count,
- $this->count, $this->since_id,
- $this->max_id, $this->since
- );
+ $notice = $this->user->ownFriendsTimeline(($this->page-1) * $this->count,
+ $this->count, $this->since_id,
+ $this->max_id, $this->since);
} else {
- $notice = $this->user->noticesWithFriends(
- ($this->page-1) * $this->count,
- $this->count, $this->since_id,
- $this->max_id, $this->since
- );
+ $notice = $this->user->friendsTimeline(($this->page-1) * $this->count,
+ $this->count, $this->since_id,
+ $this->max_id, $this->since);
}
while ($notice->fetch()) {
@@ -233,14 +229,14 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
$last = count($this->notices) - 1;
return '"' . implode(
- ':',
- array($this->arg('action'),
- common_language(),
- $this->user->id,
- strtotime($this->notices[0]->created),
- strtotime($this->notices[$last]->created))
- )
- . '"';
+ ':',
+ array($this->arg('action'),
+ common_language(),
+ $this->user->id,
+ strtotime($this->notices[0]->created),
+ strtotime($this->notices[$last]->created))
+ )
+ . '"';
}
return null;
diff --git a/actions/apitimelinehome.php b/actions/apitimelinehome.php
new file mode 100644
index 000000000..5f5ea37b1
--- /dev/null
+++ b/actions/apitimelinehome.php
@@ -0,0 +1,249 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show the home timeline
+ *
+ * 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 API
+ * @package StatusNet
+ * @author Craig Andrews <candrews@integralblue.com>
+ * @author Evan Prodromou <evan@status.net>
+ * @author Jeffery To <jeffery.to@gmail.com>
+ * @author mac65 <mac65@mac65.com>
+ * @author Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author Robin Millette <robin@millette.info>
+ * @author Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+ exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apibareauth.php';
+
+/**
+ * Returns the most recent notices (default 20) posted by the target user.
+ * This is the equivalent of 'You and friends' page accessed via Web.
+ *
+ * @category API
+ * @package StatusNet
+ * @author Craig Andrews <candrews@integralblue.com>
+ * @author Evan Prodromou <evan@status.net>
+ * @author Jeffery To <jeffery.to@gmail.com>
+ * @author mac65 <mac65@mac65.com>
+ * @author Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author Robin Millette <robin@millette.info>
+ * @author Zach Copley <zach@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class ApiTimelineHomeAction extends ApiBareAuthAction
+{
+ var $notices = null;
+
+ /**
+ * Take arguments for running
+ *
+ * @param array $args $_REQUEST args
+ *
+ * @return boolean success flag
+ *
+ */
+
+ function prepare($args)
+ {
+ parent::prepare($args);
+ common_debug("api home_timeline");
+ $this->user = $this->getTargetUser($this->arg('id'));
+
+ if (empty($this->user)) {
+ $this->clientError(_('No such user.'), 404, $this->format);
+ return;
+ }
+
+ $this->notices = $this->getNotices();
+
+ return true;
+ }
+
+ /**
+ * Handle the request
+ *
+ * Just show the notices
+ *
+ * @param array $args $_REQUEST data (unused)
+ *
+ * @return void
+ */
+
+ function handle($args)
+ {
+ parent::handle($args);
+ $this->showTimeline();
+ }
+
+ /**
+ * Show the timeline of notices
+ *
+ * @return void
+ */
+
+ function showTimeline()
+ {
+ $profile = $this->user->getProfile();
+ $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
+ $sitename = common_config('site', 'name');
+ $title = sprintf(_("%s and friends"), $this->user->nickname);
+ $taguribase = common_config('integration', 'taguri');
+ $id = "tag:$taguribase:HomeTimeline:" . $this->user->id;
+ $link = common_local_url(
+ 'all', array('nickname' => $this->user->nickname)
+ );
+ $subtitle = sprintf(
+ _('Updates from %1$s and friends on %2$s!'),
+ $this->user->nickname, $sitename
+ );
+ $logo = ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE);
+
+ switch($this->format) {
+ case 'xml':
+ $this->showXmlTimeline($this->notices);
+ break;
+ case 'rss':
+ $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $logo);
+ break;
+ case 'atom':
+
+ $target_id = $this->arg('id');
+
+ if (isset($target_id)) {
+ $selfuri = common_root_url() .
+ 'api/statuses/home_timeline/' .
+ $target_id . '.atom';
+ } else {
+ $selfuri = common_root_url() .
+ 'api/statuses/home_timeline.atom';
+ }
+
+ $this->showAtomTimeline(
+ $this->notices, $title, $id, $link,
+ $subtitle, null, $selfuri, $logo
+ );
+ break;
+ case 'json':
+ $this->showJsonTimeline($this->notices);
+ break;
+ default:
+ $this->clientError(_('API method not found!'), $code = 404);
+ break;
+ }
+ }
+
+ /**
+ * Get notices
+ *
+ * @return array notices
+ */
+
+ function getNotices()
+ {
+ $notices = array();
+
+ if (!empty($this->auth_user) && $this->auth_user->id == $this->user->id) {
+ $notice = $this->user->noticeInbox(
+ ($this->page-1) * $this->count,
+ $this->count, $this->since_id,
+ $this->max_id, $this->since
+ );
+ } else {
+ $notice = $this->user->noticesWithFriends(
+ ($this->page-1) * $this->count,
+ $this->count, $this->since_id,
+ $this->max_id, $this->since
+ );
+ }
+
+ while ($notice->fetch()) {
+ $notices[] = clone($notice);
+ }
+
+ return $notices;
+ }
+
+ /**
+ * Is this action read only?
+ *
+ * @param array $args other arguments
+ *
+ * @return boolean true
+ */
+
+ function isReadOnly($args)
+ {
+ return true;
+ }
+
+ /**
+ * When was this feed last modified?
+ *
+ * @return string datestamp of the latest notice in the stream
+ */
+
+ function lastModified()
+ {
+ if (!empty($this->notices) && (count($this->notices) > 0)) {
+ return strtotime($this->notices[0]->created);
+ }
+
+ return null;
+ }
+
+ /**
+ * An entity tag for this stream
+ *
+ * Returns an Etag based on the action name, language, user ID, and
+ * timestamps of the first and last notice in the timeline
+ *
+ * @return string etag
+ */
+
+ function etag()
+ {
+ if (!empty($this->notices) && (count($this->notices) > 0)) {
+
+ $last = count($this->notices) - 1;
+
+ return '"' . implode(
+ ':',
+ array($this->arg('action'),
+ common_language(),
+ $this->user->id,
+ strtotime($this->notices[0]->created),
+ strtotime($this->notices[$last]->created))
+ )
+ . '"';
+ }
+
+ return null;
+ }
+
+}
diff --git a/actions/featured.php b/actions/featured.php
index 39bf09d8f..dd1056dd5 100644
--- a/actions/featured.php
+++ b/actions/featured.php
@@ -96,7 +96,7 @@ class FeaturedAction extends Action
function getInstructions()
{
- return sprintf(_('A selection of some of the great users on %s'),
+ return sprintf(_('A selection of some great users on %s'),
common_config('site', 'name'));
}
diff --git a/actions/file.php b/actions/file.php
index 10c59a961..c6f7b998a 100644
--- a/actions/file.php
+++ b/actions/file.php
@@ -31,15 +31,15 @@ class FileAction extends Action
parent::prepare($args);
$this->id = $this->trimmed('notice');
if (empty($this->id)) {
- $this->clientError(_('No notice id'));
+ $this->clientError(_('No notice ID.'));
}
$notice = Notice::staticGet('id', $this->id);
if (empty($notice)) {
- $this->clientError(_('No notice'));
+ $this->clientError(_('No notice.'));
}
$atts = $notice->attachments();
if (empty($atts)) {
- $this->clientError(_('No attachments'));
+ $this->clientError(_('No attachments.'));
}
foreach ($atts as $att) {
if (!empty($att->filename)) {
@@ -48,7 +48,7 @@ class FileAction extends Action
}
}
if (empty($this->filerec)) {
- $this->clientError(_('No uploaded attachments'));
+ $this->clientError(_('No uploaded attachments.'));
}
return true;
}
diff --git a/actions/grouprss.php b/actions/grouprss.php
index 50e48a67e..866fc66eb 100644
--- a/actions/grouprss.php
+++ b/actions/grouprss.php
@@ -88,14 +88,14 @@ class groupRssAction extends Rss10Action
}
if (!$nickname) {
- $this->clientError(_('No nickname'), 404);
+ $this->clientError(_('No nickname.'), 404);
return false;
}
$this->group = User_group::staticGet('nickname', $nickname);
if (!$this->group) {
- $this->clientError(_('No such group'), 404);
+ $this->clientError(_('No such group.'), 404);
return false;
}
diff --git a/actions/newmessage.php b/actions/newmessage.php
index 0db2e7181..350452091 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -173,7 +173,7 @@ class NewmessageAction extends Action
return;
}
- $this->notify($user, $this->other, $message);
+ $message->notify();
if ($this->boolean('ajax')) {
$this->startHTML('text/xml;charset=utf-8');
@@ -247,12 +247,6 @@ class NewmessageAction extends Action
}
}
- function notify($from, $to, $message)
- {
- mail_notify_message($message, $from, $to);
- // XXX: Jabber, SMS notifications... probably queued
- }
-
// Do nothing (override)
function showNoticeForm()
diff --git a/actions/newnotice.php b/actions/newnotice.php
index c6c70e326..c014f1781 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -169,6 +169,14 @@ class NewnoticeAction extends Action
$location_id = $this->trimmed('location_id');
$location_ns = $this->trimmed('location_ns');
+ if (!empty($lat) && !empty($lon) && empty($location_id)) {
+ $location = Location::fromLatLon($lat, $lon);
+ if (!empty($location)) {
+ $location_id = $location->location_id;
+ $location_ns = $location->location_ns;
+ }
+ }
+
$upload = null;
$upload = MediaFile::fromUpload('attach');
diff --git a/actions/pathsadminpanel.php b/actions/pathsadminpanel.php
index f1a2b1b8a..d39c7c449 100644
--- a/actions/pathsadminpanel.php
+++ b/actions/pathsadminpanel.php
@@ -92,7 +92,7 @@ class PathsadminpanelAction extends AdminPanelAction
function saveSettings()
{
static $settings = array(
- 'site' => array('path', 'locale_path'),
+ 'site' => array('path', 'locale_path', 'ssl', 'sslserver'),
'theme' => array('server', 'dir', 'path'),
'avatar' => array('server', 'dir', 'path'),
'background' => array('server', 'dir', 'path')
@@ -160,6 +160,11 @@ class PathsadminpanelAction extends AdminPanelAction
$this->clientError(sprintf(_("Locales directory not readable: %s"), $values['site']['locale_path']));
}
+ // Validate SSL setup
+
+ if (mb_strlen($values['site']['sslserver']) > 255) {
+ $this->clientError(_("Invalid SSL server. The maximum length is 255 characters."));
+ }
}
}
@@ -283,6 +288,29 @@ class PathsAdminPanelForm extends AdminForm
$this->out->elementEnd('ul');
$this->out->elementEnd('fieldset');
+
+ $this->out->elementStart('fieldset', array('id' => 'settings_admin_ssl'));
+ $this->out->element('legend', null, _('SSL'));
+ $this->out->elementStart('ul', 'form_data');
+ $this->li();
+ $ssl = array('never' => _('Never'),
+ 'sometimes' => _('Sometimes'),
+ 'always' => _('Always'));
+
+ common_debug("site ssl = " . $this->value('site', 'ssl'));
+
+ $this->out->dropdown('site-ssl', _('Use SSL'),
+ $ssl, _('When to use SSL'),
+ false, $this->value('ssl', 'site'));
+ $this->unli();
+
+ $this->li();
+ $this->input('sslserver', _('SSL Server'),
+ _('Server to direct SSL requests to'), 'site');
+ $this->unli();
+ $this->out->elementEnd('ul');
+ $this->out->elementEnd('fieldset');
+
}
/**
@@ -297,7 +325,6 @@ class PathsAdminPanelForm extends AdminForm
'save', _('Save paths'));
}
-
/**
* Utility to simplify some of the duplicated code around
* params and settings. Overriding the input() in the base class
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 359664096..acfcbcd00 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -69,7 +69,7 @@ class ProfilesettingsAction extends AccountSettingsAction
function getInstructions()
{
return _('You can update your personal profile info here '.
- 'so people know more about you.');
+ 'so people know more about you.');
}
function showScripts()
@@ -92,9 +92,9 @@ class ProfilesettingsAction extends AccountSettingsAction
$profile = $user->getProfile();
$this->elementStart('form', array('method' => 'post',
- 'id' => 'form_settings_profile',
- 'class' => 'form_settings',
- 'action' => common_local_url('profilesettings')));
+ 'id' => 'form_settings_profile',
+ 'class' => 'form_settings',
+ 'action' => common_local_url('profilesettings')));
$this->elementStart('fieldset');
$this->element('legend', null, _('Profile information'));
$this->hidden('token', common_session_token());
@@ -185,7 +185,7 @@ class ProfilesettingsAction extends AccountSettingsAction
$token = $this->trimmed('token');
if (!$token || $token != common_session_token()) {
$this->showForm(_('There was a problem with your session token. '.
- 'Try again, please.'));
+ 'Try again, please.'));
return;
}
@@ -203,15 +203,15 @@ class ProfilesettingsAction extends AccountSettingsAction
// Some validation
if (!Validate::string($nickname, array('min_length' => 1,
- 'max_length' => 64,
- 'format' => NICKNAME_FMT))) {
+ 'max_length' => 64,
+ 'format' => NICKNAME_FMT))) {
$this->showForm(_('Nickname must have only lowercase letters and numbers and no spaces.'));
return;
} else if (!User::allowed_nickname($nickname)) {
$this->showForm(_('Not a valid nickname.'));
return;
} else if (!is_null($homepage) && (strlen($homepage) > 0) &&
- !Validate::uri($homepage, array('allowed_schemes' => array('http', 'https')))) {
+ !Validate::uri($homepage, array('allowed_schemes' => array('http', 'https')))) {
$this->showForm(_('Homepage is not a valid URL.'));
return;
} else if (!is_null($fullname) && mb_strlen($fullname) > 255) {
@@ -253,15 +253,15 @@ class ProfilesettingsAction extends AccountSettingsAction
$user->query('BEGIN');
if ($user->nickname != $nickname ||
- $user->language != $language ||
- $user->timezone != $timezone) {
+ $user->language != $language ||
+ $user->timezone != $timezone) {
common_debug('Updating user nickname from ' . $user->nickname . ' to ' . $nickname,
- __FILE__);
+ __FILE__);
common_debug('Updating user language from ' . $user->language . ' to ' . $language,
- __FILE__);
+ __FILE__);
common_debug('Updating user timezone from ' . $user->timezone . ' to ' . $timezone,
- __FILE__);
+ __FILE__);
$original = clone($user);
@@ -281,7 +281,7 @@ class ProfilesettingsAction extends AccountSettingsAction
}
}
-// XXX: XOR
+ // XXX: XOR
if ($user->autosubscribe ^ $autosubscribe) {
$original = clone($user);
@@ -351,7 +351,7 @@ class ProfilesettingsAction extends AccountSettingsAction
$user = common_current_user();
$other = User::staticGet('nickname', $nickname);
if (!$other) {
- return false;
+ return false;
} else {
return $other->id != $user->id;
}
diff --git a/actions/repeat.php b/actions/repeat.php
index a1c5f443f..b75523498 100644
--- a/actions/repeat.php
+++ b/actions/repeat.php
@@ -106,13 +106,17 @@ class RepeatAction extends Action
{
$repeat = $this->notice->repeat($this->user->id, 'web');
+ common_broadcast_notice($repeat);
+
if ($this->boolean('ajax')) {
$this->startHTML('text/xml;charset=utf-8');
$this->elementStart('head');
$this->element('title', null, _('Repeated'));
$this->elementEnd('head');
$this->elementStart('body');
- $this->element('p', array('id' => 'repeat_response'), _('Repeated!'));
+ $this->element('p', array('id' => 'repeat_response',
+ 'class' => 'repeated'),
+ _('Repeated!'));
$this->elementEnd('body');
$this->elementEnd('html');
} else {
diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php
index b963336e6..5e29f4c19 100644
--- a/actions/siteadminpanel.php
+++ b/actions/siteadminpanel.php
@@ -92,8 +92,7 @@ class SiteadminpanelAction extends AdminPanelAction
{
static $settings = array('site' => array('name', 'broughtby', 'broughtbyurl',
'email', 'timezone', 'language',
- 'ssl', 'sslserver', 'site',
- 'textlimit', 'dupelimit'),
+ 'site', 'textlimit', 'dupelimit'),
'snapshot' => array('run', 'reporturl', 'frequency'));
static $booleans = array('site' => array('private', 'inviteonly', 'closed', 'fancy'));
@@ -192,18 +191,6 @@ class SiteadminpanelAction extends AdminPanelAction
$this->clientError(_("Snapshot frequency must be a number."));
}
- // Validate SSL setup
-
- if (in_array($values['site']['ssl'], array('sometimes', 'always'))) {
- if (empty($values['site']['sslserver'])) {
- $this->clientError(_("You must set an SSL server when enabling SSL."));
- }
- }
-
- if (mb_strlen($values['site']['sslserver']) > 255) {
- $this->clientError(_("Invalid SSL server. The maximum length is 255 characters."));
- }
-
// Validate text limit
if (!Validate::number($values['site']['textlimit'], array('min' => 140))) {
@@ -376,26 +363,6 @@ class SiteAdminPanelForm extends AdminForm
$this->out->elementEnd('ul');
$this->out->elementEnd('fieldset');
- $this->out->elementStart('fieldset', array('id' => 'settings_admin_ssl'));
- $this->out->element('legend', null, _('SSL'));
- $this->out->elementStart('ul', 'form_data');
- $this->li();
- $ssl = array('never' => _('Never'),
- 'sometimes' => _('Sometimes'),
- 'always' => _('Always'));
-
- $this->out->dropdown('ssl', _('Use SSL'),
- $ssl, _('When to use SSL'),
- false, $this->value('ssl', 'site'));
- $this->unli();
-
- $this->li();
- $this->input('sslserver', _('SSL Server'),
- _('Server to direct SSL requests to'));
- $this->unli();
- $this->out->elementEnd('ul');
- $this->out->elementEnd('fieldset');
-
$this->out->elementStart('fieldset', array('id' => 'settings_admin_limits'));
$this->out->element('legend', null, _('Limits'));
$this->out->elementStart('ul', 'form_data');
diff --git a/actions/tagother.php b/actions/tagother.php
index c3f43be8b..e9e13b939 100644
--- a/actions/tagother.php
+++ b/actions/tagother.php
@@ -30,13 +30,13 @@ class TagotherAction extends Action
{
parent::prepare($args);
if (!common_logged_in()) {
- $this->clientError(_('Not logged in'), 403);
+ $this->clientError(_('Not logged in.'), 403);
return false;
}
$id = $this->trimmed('id');
if (!$id) {
- $this->clientError(_('No id argument.'));
+ $this->clientError(_('No ID argument.'));
return false;
}
diff --git a/actions/userbyid.php b/actions/userbyid.php
index ebff7e4a7..f3e1556f3 100644
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -47,17 +47,17 @@ class UserbyidAction extends Action
{
/**
* Is read only?
- *
+ *
* @return boolean true
*/
function isReadOnly($args)
- {
+ {
return true;
}
/**
* Class handler.
- *
+ *
* @param array $args array of arguments
*
* @return nothing
@@ -67,7 +67,7 @@ class UserbyidAction extends Action
parent::handle($args);
$id = $this->trimmed('id');
if (!$id) {
- $this->clientError(_('No id.'));
+ $this->clientError(_('No ID.'));
}
$user = User::staticGet($id);
if (!$user) {
@@ -88,4 +88,3 @@ class UserbyidAction extends Action
common_redirect($url, 303);
}
}
-
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-11 01:56:22 +0000