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

[DATABASE] Start transactions with START TRANSACTION

Browse Source 
"BEGIN" is non-standard and unnecessary.
This commit is contained in:
Alexei Sorokin 2020-06-08 12:25:01 +03:00
parent 97bddc4537
commit 6c035d01d4
36 changed files with 1588 additions and 1397 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
actions/accessadminpanel.php
View File

@ -1,42 +1,38 @@
<?php <?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
/** /**
* StatusNet, the distributed open-source microblogging tool
*
* Site access administration panel * Site access administration panel
* *
* 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 Settings * @category Settings
* @package StatusNet * @package GNUsocial
* @author Zach Copley <zach@status.net> * @author Zach Copley <zach@status.net>
* @copyright 2010 StatusNet, Inc. * @copyright 2010 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
if (!defined('GNUSOCIAL')) { exit(1); } defined('GNUSOCIAL') || die();
/** /**
* Administer site access settings * Administer site access settings
* *
* @category Admin * @category Admin
* @package StatusNet * @package GNUsocial
* @author Zach Copley <zach@status.net> * @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 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
class AccessadminpanelAction extends AdminPanelAction class AccessadminpanelAction extends AdminPanelAction
{ {
@ -45,7 +41,7 @@ class AccessadminpanelAction extends AdminPanelAction
* *
* @return string page title * @return string page title
*/ */
function title() public function title()
{ {
// TRANS: Page title for Access admin panel that allows configuring site access. // TRANS: Page title for Access admin panel that allows configuring site access.
return _('Access'); return _('Access');
@ -56,7 +52,7 @@ class AccessadminpanelAction extends AdminPanelAction
* *
* @return string instructions * @return string instructions
*/ */
function getInstructions() public function getInstructions()
{ {
// TRANS: Page notice. // TRANS: Page notice.
return _('Site access settings'); return _('Site access settings');
@ -67,7 +63,7 @@ class AccessadminpanelAction extends AdminPanelAction
* *
* @return void * @return void
*/ */
function showForm() public function showForm()
{ {
$form = new AccessAdminPanelForm($this); $form = new AccessAdminPanelForm($this);
$form->show(); $form->show();
@ -79,7 +75,7 @@ class AccessadminpanelAction extends AdminPanelAction
* *
* @return void * @return void
*/ */
function saveSettings() public function saveSettings()
{ {
static $booleans = array('site' => array('private', 'inviteonly', 'closed'), static $booleans = array('site' => array('private', 'inviteonly', 'closed'),
'public' => array('localonly')); 'public' => array('localonly'));
@ -92,7 +88,7 @@ class AccessadminpanelAction extends AdminPanelAction
$config = new Config(); $config = new Config();
$config->query('BEGIN'); $config->query('START TRANSACTION');
foreach ($booleans as $section => $parts) { foreach ($booleans as $section => $parts) {
foreach ($parts as $setting) { foreach ($parts as $setting) {
@ -113,7 +109,7 @@ class AccessAdminPanelForm extends AdminForm
* *
* @return int ID of the form * @return int ID of the form
*/ */
function id() public function id()
{ {
return 'form_site_admin_panel'; return 'form_site_admin_panel';
} }
@ -123,7 +119,7 @@ class AccessAdminPanelForm extends AdminForm
* *
* @return string class of the form * @return string class of the form
*/ */
function formClass() public function formClass()
{ {
return 'form_settings'; return 'form_settings';
} }
@ -133,7 +129,7 @@ class AccessAdminPanelForm extends AdminForm
* *
* @return string URL of the action * @return string URL of the action
*/ */
function action() public function action()
{ {
return common_local_url('accessadminpanel'); return common_local_url('accessadminpanel');
} }
@ -143,7 +139,7 @@ class AccessAdminPanelForm extends AdminForm
* *
* @return void * @return void
*/ */
function formData() public function formData()
{ {
$this->out->elementStart('fieldset', array('id' => 'settings_admin_account_access')); $this->out->elementStart('fieldset', array('id' => 'settings_admin_account_access'));
// TRANS: Form legend for registration form. // TRANS: Form legend for registration form.
@ -154,18 +150,24 @@ class AccessAdminPanelForm extends AdminForm
// TRANS: Checkbox instructions for admin setting "Invite only". // TRANS: Checkbox instructions for admin setting "Invite only".
$instructions = _('Make registration invitation only.'); $instructions = _('Make registration invitation only.');
// TRANS: Checkbox label for configuring site as invite 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'),
$instructions); $instructions
);
$this->unli(); $this->unli();
$this->li(); $this->li();
// TRANS: Checkbox instructions for admin setting "Closed" (no new registrations). // TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
$instructions = _('Disable new registrations.'); $instructions = _('Disable new registrations.');
// TRANS: Checkbox label for disabling new user 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'),
$instructions); $instructions
);
$this->unli(); $this->unli();
$this->out->elementEnd('ul'); $this->out->elementEnd('ul');
@ -173,7 +175,7 @@ class AccessAdminPanelForm extends AdminForm
// Public access settings (login requirements for feeds etc.) // Public access settings (login requirements for feeds etc.)
$this->out->elementStart('fieldset', array('id' => 'settings_admin_public_access')); $this->out->elementStart('fieldset', ['id' => 'settings_admin_public_access']);
// TRANS: Form legend for registration form. // TRANS: Form legend for registration form.
$this->out->element('legend', null, _('Feed access')); $this->out->element('legend', null, _('Feed access'));
$this->out->elementStart('ul', 'form_data'); $this->out->elementStart('ul', 'form_data');
@ -181,18 +183,24 @@ class AccessAdminPanelForm extends AdminForm
// TRANS: Checkbox instructions for admin setting "Private". // TRANS: Checkbox instructions for admin setting "Private".
$instructions = _('Prohibit anonymous users (not logged in) from viewing site?'); $instructions = _('Prohibit anonymous users (not logged in) from viewing site?');
// TRANS: Checkbox label for prohibiting anonymous users from viewing site. // TRANS: Checkbox label for prohibiting anonymous users from viewing site.
$this->out->checkbox('private', _m('LABEL', 'Private'), $this->out->checkbox(
'private',
_m('LABEL', 'Private'),
(bool) $this->value('private'), (bool) $this->value('private'),
$instructions); $instructions
);
$this->unli(); $this->unli();
$this->li(); $this->li();
// TRANS: Description of the full network notice stream views.. // TRANS: Description of the full network notice stream views..
$instructions = _('The full network view includes (public) remote notices which may be unrelated to local conversations.'); $instructions = _('The full network view includes (public) remote notices which may be unrelated to local conversations.');
// TRANS: Checkbox label for hiding remote network posts if they have not been interacted with locally. // TRANS: Checkbox label for hiding remote network posts if they have not been interacted with locally.
$this->out->checkbox('localonly', _('Restrict full network view to accounts'), $this->out->checkbox(
'localonly',
_('Restrict full network view to accounts'),
(bool) $this->value('localonly', 'public'), (bool) $this->value('localonly', 'public'),
$instructions); $instructions
);
$this->unli(); $this->unli();
$this->out->elementEnd('ul'); $this->out->elementEnd('ul');
@ -204,7 +212,7 @@ class AccessAdminPanelForm extends AdminForm
* *
* @return void * @return void
*/ */
function formActions() public function formActions()
{ {
// TRANS: Button title to save access settings in site admin panel. // TRANS: Button title to save access settings in site admin panel.
$title = _('Save access settings.'); $title = _('Save access settings.');

84
actions/apigroupprofileupdate.php
View File

@ -1,44 +1,38 @@
<?php <?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
/** /**
* StatusNet, the distributed open-source microblogging tool
*
* Update a group's profile * Update a group's profile
* *
* 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 * @category API
* @package StatusNet * @package GNUsocial
* @author Zach Copley <zach@status.net> * @author Zach Copley <zach@status.net>
* @copyright 2010 StatusNet, Inc. * @copyright 2010 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
if (!defined('STATUSNET')) { defined('GNUSOCIAL') || die();
exit(1);
}
/** /**
* API analog to the group edit page * API analog to the group edit page
* *
* @category API * @category API
* @package StatusNet * @package GNUsocial
* @author Zach Copley <zach@status.net> * @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 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
class ApiGroupProfileUpdateAction extends ApiAuthAction class ApiGroupProfileUpdateAction extends ApiAuthAction
{ {
@ -100,20 +94,21 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
$this->clientError(_('You must be an admin to edit the group.'), 403); $this->clientError(_('You must be an admin to edit the group.'), 403);
} }
$this->group->query('BEGIN'); $this->group->query('START TRANSACTION');
$orig = clone($this->group); $orig = clone($this->group);
try { try {
if (common_config('profile', 'changenick') == true && $this->group->nickname !== $this->nickname) { if (common_config('profile', 'changenick') == true && $this->group->nickname !== $this->nickname) {
try { try {
$this->group->nickname = Nickname::normalize($this->nickname, true); $this->group->nickname = Nickname::normalize($this->nickname, true);
} catch (NicknameException $e) { } catch (NicknameException $e) {
throw new ApiValidationException($e->getMessage()); throw new ApiValidationException($e->getMessage());
} }
$this->group->mainpage = common_local_url('showgroup', $this->group->mainpage = common_local_url(
array('nickname' => $this->group->nickname)); 'showgroup',
['nickname' => $this->group->nickname]
);
} }
if (!empty($this->fullname)) { if (!empty($this->fullname)) {
@ -135,7 +130,6 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
$this->validateLocation(); $this->validateLocation();
$this->group->location = $this->location; $this->group->location = $this->location;
} }
} catch (ApiValidationException $ave) { } catch (ApiValidationException $ave) {
$this->clientError($ave->getMessage(), 400); $this->clientError($ave->getMessage(), 400);
} }
@ -180,7 +174,7 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
} }
} }
function validateHomepage() public function validateHomepage()
{ {
if (!is_null($this->homepage) if (!is_null($this->homepage)
&& (strlen($this->homepage) > 0) && (strlen($this->homepage) > 0)
@ -192,7 +186,7 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
} }
} }
function validateFullname() public function validateFullname()
{ {
if (!is_null($this->fullname) && mb_strlen($this->fullname) > 255) { if (!is_null($this->fullname) && mb_strlen($this->fullname) > 255) {
throw new ApiValidationException( throw new ApiValidationException(
@ -202,19 +196,21 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
} }
} }
function validateDescription() public function validateDescription()
{ {
if (User_group::descriptionTooLong($this->description)) { if (User_group::descriptionTooLong($this->description)) {
// TRANS: API validation exception thrown when description does not validate. // TRANS: API validation exception thrown when description does not validate.
// TRANS: %d is the maximum description length and used for plural. // TRANS: %d is the maximum description length and used for plural.
throw new ApiValidationException(sprintf(_m('Description is too long (maximum %d character).', throw new ApiValidationException(sprintf(
_m('Description is too long (maximum %d character).',
'Description is too long (maximum %d characters).', 'Description is too long (maximum %d characters).',
User_group::maxDescription()), User_group::maxDescription()),
User_group::maxDescription())); User_group::maxDescription()
));
} }
} }
function validateLocation() public function validateLocation()
{ {
if (!is_null($this->location) && mb_strlen($this->location) > 255) { if (!is_null($this->location) && mb_strlen($this->location) > 255) {
throw new ApiValidationException( throw new ApiValidationException(
@ -224,11 +220,13 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
} }
} }
function validateAliases() public function validateAliases()
{ {
try { try {
$aliases = array_map(array('Nickname', 'normalize'), $aliases = array_map(
array_unique(preg_split('/[\s,]+/', $this->aliasstring))); ['Nickname', 'normalize'],
array_unique(preg_split('/[\s,]+/', $this->aliasstring))
);
} catch (NicknameException $e) { } catch (NicknameException $e) {
throw new ApiValidationException(sprintf('Error processing aliases: %s', $e->getMessage())); throw new ApiValidationException(sprintf('Error processing aliases: %s', $e->getMessage()));
} }
@ -236,10 +234,12 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
if (count($aliases) > common_config('group', 'maxaliases')) { if (count($aliases) > common_config('group', 'maxaliases')) {
// TRANS: API validation exception thrown when aliases do not validate. // TRANS: API validation exception thrown when aliases do not validate.
// TRANS: %d is the maximum number of aliases and used for plural. // TRANS: %d is the maximum number of aliases and used for plural.
throw new ApiValidationException(sprintf(_m('Too many aliases! Maximum %d allowed.', throw new ApiValidationException(sprintf(
_m('Too many aliases! Maximum %d allowed.',
'Too many aliases! Maximum %d allowed.', 'Too many aliases! Maximum %d allowed.',
common_config('group', 'maxaliases')), common_config('group', 'maxaliases')),
common_config('group', 'maxaliases'))); common_config('group', 'maxaliases')
));
} }
return $aliases; return $aliases;

67
actions/confirmaddress.php
View File

@ -1,33 +1,30 @@
<?php <?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
/** /**
* StatusNet, the distributed open-source microblogging tool
*
* Confirm an address * Confirm an address
* *
* 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 Confirm * @category Confirm
* @package StatusNet * @package GNUsocial
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @copyright 2008-2009 StatusNet, Inc. * @copyright 2008-2009 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
if (!defined('GNUSOCIAL')) { exit(1); } defined('GNUSOCIAL') || die();
/** /**
* Confirm an address * Confirm an address
@ -37,10 +34,9 @@ if (!defined('GNUSOCIAL')) { exit(1); }
* accepts those codes. * accepts those codes.
* *
* @category Confirm * @category Confirm
* @package StatusNet * @package GNUsocial
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
class ConfirmaddressAction extends ManagedAction class ConfirmaddressAction extends ManagedAction
{ {
@ -88,7 +84,7 @@ class ConfirmaddressAction extends ManagedAction
$cur = $this->scoped->getUser(); $cur = $this->scoped->getUser();
$cur->query('BEGIN'); $cur->query('START TRANSACTION');
if (in_array($type, array('email', 'sms'))) { if (in_array($type, array('email', 'sms'))) {
common_debug("Confirming {$type} address for user {$this->scoped->getID()}"); common_debug("Confirming {$type} address for user {$this->scoped->getID()}");
if ($cur->$type == $confirm->address) { if ($cur->$type == $confirm->address) {
@ -114,14 +110,12 @@ class ConfirmaddressAction extends ManagedAction
if ($type == 'email') { if ($type == 'email') {
$cur->emailChanged(); $cur->emailChanged();
} }
} else { } else {
$user_im_prefs = new User_im_prefs(); $user_im_prefs = new User_im_prefs();
$user_im_prefs->transport = $confirm->address_type; $user_im_prefs->transport = $confirm->address_type;
$user_im_prefs->user_id = $cur->id; $user_im_prefs->user_id = $cur->id;
if ($user_im_prefs->find() && $user_im_prefs->fetch()) { if ($user_im_prefs->find() && $user_im_prefs->fetch()) {
if($user_im_prefs->screenname == $confirm->address){ if ($user_im_prefs->screenname === $confirm->address) {
// Already verified, so delete the confirm_address entry // Already verified, so delete the confirm_address entry
$confirm->delete(); $confirm->delete();
// TRANS: Client error for an already confirmed IM address. // TRANS: Client error for an already confirmed IM address.
@ -149,7 +143,6 @@ class ConfirmaddressAction extends ManagedAction
throw new ServerException(_('Could not insert user IM preferences.')); throw new ServerException(_('Could not insert user IM preferences.'));
} }
} }
} }
$confirm->delete(); $confirm->delete();
@ -162,7 +155,7 @@ class ConfirmaddressAction extends ManagedAction
* *
* @return string title * @return string title
*/ */
function title() public function title()
{ {
// TRANS: Title for the contact address confirmation action. // TRANS: Title for the contact address confirmation action.
return _('Confirm address'); return _('Confirm address');
@ -173,13 +166,17 @@ class ConfirmaddressAction extends ManagedAction
* *
* @return void * @return void
*/ */
function showContent() public function showContent()
{ {
$this->element('p', null, $this->element(
'p',
null,
// TRANS: Success message for the contact address confirmation action. // TRANS: Success message for the contact address confirmation action.
// TRANS: %s can be 'email', 'jabber', or 'sms'. // TRANS: %s can be 'email', 'jabber', or 'sms'.
sprintf(_('The address "%s" has been '. sprintf(
'confirmed for your account.'), _('The address "%s" has been confirmed for your account.'),
$this->address)); $this->address
)
);
} }
} }

48
actions/editgroup.php
View File

@ -1,37 +1,32 @@
<?php <?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
/** /**
* StatusNet, the distributed open-source microblogging tool
*
* Edit an existing group * Edit an existing group
* *
* 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 Group * @category Group
* @package StatusNet * @package GNUsocial
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @author Sarven Capadisli <csarven@status.net> * @author Sarven Capadisli <csarven@status.net>
* @author Zach Copley <zach@status.net> * @author Zach Copley <zach@status.net>
* @copyright 2008-2011 StatusNet, Inc. * @copyright 2008-2011 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
if (!defined('STATUSNET') && !defined('LACONICA') && !defined('GNUSOCIAL')) { defined('GNUSOCIAL') || die();
exit(1);
}
/** /**
* Add a new group * Add a new group
@ -39,12 +34,11 @@ if (!defined('STATUSNET') && !defined('LACONICA') && !defined('GNUSOCIAL')) {
* This is the form for adding a new group * This is the form for adding a new group
* *
* @category Group * @category Group
* @package StatusNet * @package GNUsocial
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @author Zach Copley <zach@status.net> * @author Zach Copley <zach@status.net>
* @author Alexei Sorokin <sor.alexei@meowr.ru> * @author Alexei Sorokin <sor.alexei@meowr.ru>
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
class EditgroupAction extends GroupAction class EditgroupAction extends GroupAction
{ {
@ -242,7 +236,7 @@ class EditgroupAction extends GroupAction
return; return;
} }
$this->group->query('BEGIN'); $this->group->query('START TRANSACTION');
$orig = clone($this->group); $orig = clone($this->group);

129
actions/editpeopletag.php
View File

@ -1,33 +1,28 @@
<?php <?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
/** /**
* StatusNet, the distributed open-source microblogging tool
*
* Edit an existing group * Edit an existing group
* *
* 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 Group * @category Group
* @package StatusNet * @package GNUsocial
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
if (!defined('STATUSNET') && !defined('LACONICA')) { defined('GNUSOCIAL') || die();
exit(1);
}
/** /**
* Add a new group * Add a new group
@ -35,16 +30,17 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
* This is the form for adding a new group * This is the form for adding a new group
* *
* @category Group * @category Group
* @package StatusNet * @package GNUsocial
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
class EditpeopletagAction extends Action class EditpeopletagAction extends Action
{ {
var $msg, $confirm, $confirm_args=array(); public $msg;
public $confirm;
public $confirm_args = [];
function title() public function title()
{ {
if ($_SERVER['REQUEST_METHOD'] == 'POST' && $this->boolean('delete')) { if ($_SERVER['REQUEST_METHOD'] == 'POST' && $this->boolean('delete')) {
// TRANS: Title for edit list page after deleting a tag. // TRANS: Title for edit list page after deleting a tag.
@ -60,7 +56,7 @@ class EditpeopletagAction extends Action
* Prepare to run * Prepare to run
*/ */
function prepare(array $args = array()) public function prepare(array $args = [])
{ {
parent::prepare($args); parent::prepare($args);
@ -135,7 +131,7 @@ class EditpeopletagAction extends Action
* *
* @return void * @return void
*/ */
function handle() public function handle()
{ {
parent::handle(); parent::handle();
if ($_SERVER['REQUEST_METHOD'] == 'POST') { if ($_SERVER['REQUEST_METHOD'] == 'POST') {
@ -145,21 +141,30 @@ class EditpeopletagAction extends Action
} }
} }
function showConfirm($msg=null, $fwd=null) public function showConfirm($msg = null, $fwd = null)
{ {
$this->confirm = $msg; $this->confirm = $msg;
$this->confirm_args = $fwd; $this->confirm_args = $fwd;
$this->showPage(); $this->showPage();
} }
function showConfirmForm() public function showConfirmForm()
{ {
$this->elementStart('form', array('id' => 'form_peopletag_edit_confirm', $this->elementStart(
'form',
[
'id' => 'form_peopletag_edit_confirm',
'class' => 'form_settings', 'class' => 'form_settings',
'method' => 'post', 'method' => 'post',
'action' => common_local_url('editpeopletag', 'action' => common_local_url(
array('tagger' => $this->tagger->nickname, 'editpeopletag',
'tag' => $this->peopletag->tag)))); [
'tagger' => $this->tagger->nickname,
'tag' => $this->peopletag->tag,
]
),
]
);
$this->elementStart('fieldset'); $this->elementStart('fieldset');
$this->hidden('token', common_session_token()); $this->hidden('token', common_session_token());
$this->hidden('id', $this->arg('id')); $this->hidden('id', $this->arg('id'));
@ -168,31 +173,35 @@ class EditpeopletagAction extends Action
$this->hidden($key, $val); $this->hidden($key, $val);
} }
$this->submit('form_action-no', $this->submit(
'form_action-no',
_m('BUTTON', 'No'), _m('BUTTON', 'No'),
'submit form_action-primary', 'submit form_action-primary',
'cancel'); 'cancel'
$this->submit('form_action-yes', );
$this->submit(
'form_action-yes',
_m('BUTTON', 'Yes'), _m('BUTTON', 'Yes'),
'submit form_action-secondary', 'submit form_action-secondary',
'confirm'); 'confirm'
);
$this->elementEnd('fieldset'); $this->elementEnd('fieldset');
$this->elementEnd('form'); $this->elementEnd('form');
} }
function showForm($msg=null) public function showForm($msg = null)
{ {
$this->msg = $msg; $this->msg = $msg;
$this->showPage(); $this->showPage();
} }
function showObjectNav() public function showObjectNav()
{ {
$nav = new PeopletagGroupNav($this, $this->peopletag); $nav = new PeopletagGroupNav($this, $this->peopletag);
$nav->show(); $nav->show();
} }
function showContent() public function showContent()
{ {
if ($this->confirm) { if ($this->confirm) {
$this->showConfirmForm(); $this->showConfirmForm();
@ -205,26 +214,29 @@ class EditpeopletagAction extends Action
$form->showProfileList(); $form->showProfileList();
} }
function showPageNotice() public function showPageNotice()
{ {
if ($this->msg) { if ($this->msg) {
$this->element('p', 'error', $this->msg); $this->element('p', 'error', $this->msg);
} elseif ($this->confirm) { } elseif ($this->confirm) {
$this->element('p', 'instructions', $this->confirm); $this->element('p', 'instructions', $this->confirm);
} else { } else {
$this->element('p', 'instructions', $this->element(
'p',
'instructions',
// TRANS: Form instruction for edit list form. // TRANS: Form instruction for edit list form.
_('Use this form to edit the list.')); _('Use this form to edit the list.')
);
} }
} }
function showScripts() public function showScripts()
{ {
parent::showScripts(); parent::showScripts();
$this->autofocus('tag'); $this->autofocus('tag');
} }
function trySave() public function trySave()
{ {
$tag = common_canonical_tag($this->trimmed('tag')); $tag = common_canonical_tag($this->trimmed('tag'));
$description = $this->trimmed('description'); $description = $this->trimmed('description');
@ -263,7 +275,8 @@ class EditpeopletagAction extends Action
_m('Description is too long (maximum %d character).', _m('Description is too long (maximum %d character).',
'Description is too long (maximum %d characters).', 'Description is too long (maximum %d characters).',
Profile_list::maxDescription()), Profile_list::maxDescription()),
Profile_list::maxDescription())); Profile_list::maxDescription()
));
return; return;
} elseif ($set_private && !$confirm && !$cancel) { } elseif ($set_private && !$confirm && !$cancel) {
$fwd = array('tag' => $tag, $fwd = array('tag' => $tag,
@ -285,7 +298,7 @@ class EditpeopletagAction extends Action
common_redirect(common_local_url('all', array('nickname' => $this->tagger->getNickname())), 303); common_redirect(common_local_url('all', array('nickname' => $this->tagger->getNickname())), 303);
} }
$this->peopletag->query('BEGIN'); $this->peopletag->query('START TRANSACTION');
$orig = clone($this->peopletag); $orig = clone($this->peopletag);
@ -310,17 +323,23 @@ class EditpeopletagAction extends Action
} }
if ($tag != $orig->tag) { if ($tag != $orig->tag) {
common_redirect(common_local_url('editpeopletag', common_redirect(
array('tagger' => $this->tagger->nickname, common_local_url(
'tag' => $tag)), 'editpeopletag',
303); [
'tagger' => $this->tagger->nickname,
'tag' => $tag,
]
),
303
);
} else { } else {
// TRANS: Edit list form success message. // TRANS: Edit list form success message.
$this->showForm(_('Options saved.')); $this->showForm(_('Options saved.'));
} }
} }
function tagExists($tag) public function tagExists($tag)
{ {
$args = array('tagger' => $this->tagger->id, 'tag' => $tag); $args = array('tagger' => $this->tagger->id, 'tag' => $tag);
$ptag = Profile_list::pkeyGet($args); $ptag = Profile_list::pkeyGet($args);

2
actions/emailsettings.php
View File

@ -302,7 +302,7 @@ class EmailsettingsAction extends SettingsAction
$emailpost = $this->boolean('emailpost'); $emailpost = $this->boolean('emailpost');
$user = $this->scoped->getUser(); $user = $this->scoped->getUser();
$user->query('BEGIN'); $user->query('START TRANSACTION');
$original = clone($user); $original = clone($user);
$user->emailnotifysub = $emailnotifysub; $user->emailnotifysub = $emailnotifysub;

140
actions/imsettings.php
View File

@ -1,42 +1,23 @@
<?php <?php
/** /**
* StatusNet, the distributed open-source microblogging tool
*
* Settings for Jabber/XMPP integration * Settings for Jabber/XMPP integration
* *
* 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 Settings * @category Settings
* @package StatusNet * @package GNUsocial
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @copyright 2008-2009 StatusNet, Inc. * @copyright 2008-2009 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
if (!defined('GNUSOCIAL')) { exit(1); } defined('GNUSOCIAL') || die();
/** /**
* Settings for Jabber/XMPP integration * Settings for Jabber/XMPP integration
* *
* @category Settings * @category Settings
* @package StatusNet * @package GNUsocial
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
* *
* @see SettingsAction * @see SettingsAction
*/ */
@ -48,7 +29,7 @@ class ImsettingsAction extends SettingsAction
* *
* @return string Title of the page * @return string Title of the page
*/ */
function title() public function title()
{ {
// TRANS: Title for Instant Messaging settings. // TRANS: Title for Instant Messaging settings.
return _('IM settings'); return _('IM settings');
@ -59,7 +40,7 @@ class ImsettingsAction extends SettingsAction
* *
* @return instructions for use * @return instructions for use
*/ */
function getInstructions() public function getInstructions()
{ {
// TRANS: Instant messaging settings page instructions. // TRANS: Instant messaging settings page instructions.
// TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. // TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
@ -78,14 +59,17 @@ class ImsettingsAction extends SettingsAction
* *
* @return void * @return void
*/ */
function showContent() public function showContent()
{ {
$transports = array(); $transports = array();
Event::handle('GetImTransports', array(&$transports)); Event::handle('GetImTransports', array(&$transports));
if (! $transports) { if (! $transports) {
$this->element('div', array('class' => 'error'), $this->element(
'div',
['class' => 'error'],
// TRANS: Message given in the IM settings if IM is not enabled on the site. // TRANS: Message given in the IM settings if IM is not enabled on the site.
_('IM is not available.')); _('IM is not available.')
);
return; return;
} }
@ -93,25 +77,31 @@ class ImsettingsAction extends SettingsAction
$user_im_prefs_by_transport = array(); $user_im_prefs_by_transport = array();
foreach($transports as $transport=>$transport_info) foreach ($transports as $transport => $transport_info) {
{ $this->elementStart(
$this->elementStart('form', array('method' => 'post', 'form',
[
'method' => 'post',
'id' => 'form_settings_im', 'id' => 'form_settings_im',
'class' => 'form_settings', 'class' => 'form_settings',
'action' => 'action' => common_local_url('imsettings'),
common_local_url('imsettings'))); ]
);
$this->elementStart('fieldset', array('id' => 'settings_im_address')); $this->elementStart('fieldset', array('id' => 'settings_im_address'));
// TRANS: Form legend for IM settings form. // TRANS: Form legend for IM settings form.
$this->element('legend', null, $transport_info['display']); $this->element('legend', null, $transport_info['display']);
$this->hidden('token', common_session_token()); $this->hidden('token', common_session_token());
$this->hidden('transport', $transport); $this->hidden('transport', $transport);
if ($user_im_prefs = User_im_prefs::pkeyGet( array('transport' => $transport, 'user_id' => $user->id) )) { if ($user_im_prefs = User_im_prefs::pkeyGet(['transport' => $transport, 'user_id' => $user->id])) {
$user_im_prefs_by_transport[$transport] = $user_im_prefs; $user_im_prefs_by_transport[$transport] = $user_im_prefs;
$this->element('p', 'form_confirmed', $user_im_prefs->screenname); $this->element('p', 'form_confirmed', $user_im_prefs->screenname);
$this->element('p', 'form_note', $this->element(
'p',
'form_note',
// TRANS: Form note in IM settings form. %s is the type of IM address that was confirmed. // TRANS: Form note in IM settings form. %s is the type of IM address that was confirmed.
sprintf(_('Current confirmed %s address.'),$transport_info['display'])); sprintf(_('Current confirmed %s address.'), $transport_info['display'])
);
$this->hidden('screenname', $user_im_prefs->screenname); $this->hidden('screenname', $user_im_prefs->screenname);
// TRANS: Button label to remove a confirmed IM address. // TRANS: Button label to remove a confirmed IM address.
$this->submit('remove', _m('BUTTON', 'Remove')); $this->submit('remove', _m('BUTTON', 'Remove'));
@ -120,15 +110,20 @@ class ImsettingsAction extends SettingsAction
$confirm = $this->getConfirmation($transport); $confirm = $this->getConfirmation($transport);
$this->element('p', 'form_unconfirmed', $confirm->address); $this->element('p', 'form_unconfirmed', $confirm->address);
// TRANS: Form note in IM settings form. // TRANS: Form note in IM settings form.
$this->element('p', 'form_note', $this->element(
'p',
'form_note',
// TRANS: Form note in IM settings form. // TRANS: Form note in IM settings form.
// TRANS: %s is the IM service name, %2$s is the IM address set. // TRANS: %s is the IM service name, %2$s is the IM address set.
sprintf(_('Awaiting confirmation on this address. '. sprintf(
'Check your %1$s account for a '. _('Awaiting confirmation on this address. '
'message with further instructions. '. . 'Check your %1$s account for a '
'(Did you add %2$s to your buddy list?)'), . 'message with further instructions. '
. '(Did you add %2$s to your buddy list?)'),
$transport_info['display'], $transport_info['display'],
$transport_info['daemonScreenname'])); $transport_info['daemonScreenname']
)
);
$this->hidden('screenname', $confirm->address); $this->hidden('screenname', $confirm->address);
// TRANS: Button label to cancel an IM address confirmation procedure. // TRANS: Button label to cancel an IM address confirmation procedure.
$this->submit('cancel', _m('BUTTON', 'Cancel')); $this->submit('cancel', _m('BUTTON', 'Cancel'));
@ -136,11 +131,13 @@ class ImsettingsAction extends SettingsAction
$this->elementStart('ul', 'form_data'); $this->elementStart('ul', 'form_data');
$this->elementStart('li'); $this->elementStart('li');
// TRANS: Field label for IM address. // TRANS: Field label for IM address.
$this->input('screenname', _('IM address'), $this->input(
'screenname',
_('IM address'),
($this->arg('screenname')) ? $this->arg('screenname') : null, ($this->arg('screenname')) ? $this->arg('screenname') : null,
// TRANS: Field title for IM address. %s is the IM service name. // TRANS: Field title for IM address. %s is the IM service name.
sprintf(_('%s screenname.'), sprintf(_('%s screenname.'), $transport_info['display'])
$transport_info['display'])); );
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementEnd('ul'); $this->elementEnd('ul');
// TRANS: Button label for adding an IM address in IM settings form. // TRANS: Button label for adding an IM address in IM settings form.
@ -151,21 +148,23 @@ class ImsettingsAction extends SettingsAction
$this->elementEnd('form'); $this->elementEnd('form');
} }
if($user_im_prefs_by_transport) if ($user_im_prefs_by_transport) {
{ $this->elementStart(
$this->elementStart('form', array('method' => 'post', 'form',
[
'method' => 'post',
'id' => 'form_settings_im', 'id' => 'form_settings_im',
'class' => 'form_settings', 'class' => 'form_settings',
'action' => 'action' => common_local_url('imsettings'),
common_local_url('imsettings'))); ]
);
$this->elementStart('fieldset', array('id' => 'settings_im_preferences')); $this->elementStart('fieldset', array('id' => 'settings_im_preferences'));
// TRANS: Header for IM preferences form. // TRANS: Header for IM preferences form.
$this->element('legend', null, _('IM Preferences')); $this->element('legend', null, _('IM Preferences'));
$this->hidden('token', common_session_token()); $this->hidden('token', common_session_token());
$this->elementStart('table'); $this->elementStart('table');
$this->elementStart('tr'); $this->elementStart('tr');
foreach($user_im_prefs_by_transport as $transport=>$user_im_prefs) foreach ($user_im_prefs_by_transport as $transport => $user_im_prefs) {
{
$this->element('th', null, $transports[$transport]['display']); $this->element('th', null, $transports[$transport]['display']);
} }
$this->elementEnd('tr'); $this->elementEnd('tr');
@ -178,16 +177,16 @@ class ImsettingsAction extends SettingsAction
array('name'=>'replies', 'description'=>_('Send me replies '. array('name'=>'replies', 'description'=>_('Send me replies '.
'from people I\'m not subscribed to.')), 'from people I\'m not subscribed to.')),
); );
foreach($preferences as $preference) foreach ($preferences as $preference) {
{
$this->elementStart('tr'); $this->elementStart('tr');
foreach($user_im_prefs_by_transport as $transport=>$user_im_prefs) foreach ($user_im_prefs_by_transport as $transport => $user_im_prefs) {
{
$preference_name = $preference['name']; $preference_name = $preference['name'];
$this->elementStart('td'); $this->elementStart('td');
$this->checkbox($transport . '_' . $preference['name'], $this->checkbox(
$transport . '_' . $preference['name'],
$preference['description'], $preference['description'],
$user_im_prefs->$preference_name); $user_im_prefs->$preference_name
);
$this->elementEnd('td'); $this->elementEnd('td');
} }
$this->elementEnd('tr'); $this->elementEnd('tr');
@ -205,7 +204,7 @@ class ImsettingsAction extends SettingsAction
* *
* @return Confirm_address address object for this user * @return Confirm_address address object for this user
*/ */
function getConfirmation($transport) public function getConfirmation($transport)
{ {
$confirm = new Confirm_address(); $confirm = new Confirm_address();
@ -242,20 +241,17 @@ class ImsettingsAction extends SettingsAction
* *
* @return void * @return void
*/ */
function savePreferences() public function savePreferences()
{ {
$user_im_prefs = new User_im_prefs(); $user_im_prefs = new User_im_prefs();
$user_im_prefs->query('BEGIN'); $user_im_prefs->query('START TRANSACTION');
$user_im_prefs->user_id = $this->scoped->getID(); $user_im_prefs->user_id = $this->scoped->getID();
if($user_im_prefs->find() && $user_im_prefs->fetch()) if ($user_im_prefs->find() && $user_im_prefs->fetch()) {
{
$preferences = array('notify', 'updatefrompresence', 'replies'); $preferences = array('notify', 'updatefrompresence', 'replies');
do do {
{
$original = clone($user_im_prefs); $original = clone($user_im_prefs);
$new = clone($user_im_prefs); $new = clone($user_im_prefs);
foreach($preferences as $preference) foreach ($preferences as $preference) {
{
$new->$preference = $this->boolean($new->transport . '_' . $preference); $new->$preference = $this->boolean($new->transport . '_' . $preference);
} }
$result = $new->update($original); $result = $new->update($original);
@ -280,7 +276,7 @@ class ImsettingsAction extends SettingsAction
* *
* @return void * @return void
*/ */
function addAddress() public function addAddress()
{ {
$screenname = $this->trimmed('screenname'); $screenname = $this->trimmed('screenname');
$transport = $this->trimmed('transport'); $transport = $this->trimmed('transport');
@ -343,7 +339,7 @@ class ImsettingsAction extends SettingsAction
* *
* @return void * @return void
*/ */
function cancelConfirmation() public function cancelConfirmation()
{ {
$screenname = $this->trimmed('screenname'); $screenname = $this->trimmed('screenname');
$transport = $this->trimmed('transport'); $transport = $this->trimmed('transport');
@ -372,7 +368,7 @@ class ImsettingsAction extends SettingsAction
* *
* @return void * @return void
*/ */
function removeAddress() public function removeAddress()
{ {
$screenname = $this->trimmed('screenname'); $screenname = $this->trimmed('screenname');
$transport = $this->trimmed('transport'); $transport = $this->trimmed('transport');
@ -413,7 +409,7 @@ class ImsettingsAction extends SettingsAction
* @return boolean whether the screenname exists * @return boolean whether the screenname exists
*/ */
function screennameExists($transport, $screenname) public function screennameExists($transport, $screenname)
{ {
$user_im_prefs = new User_im_prefs(); $user_im_prefs = new User_im_prefs();
$user_im_prefs->transport = $transport; $user_im_prefs->transport = $transport;

74
actions/licenseadminpanel.php
View File

@ -1,44 +1,38 @@
<?php <?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
/** /**
* StatusNet, the distributed open-source microblogging tool
*
* License administration panel * License administration panel
* *
* 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 Settings * @category Settings
* @package StatusNet * @package GNUsocial
* @author Zach Copley <zach@status.net> * @author Zach Copley <zach@status.net>
* @copyright 2010 StatusNet, Inc. * @copyright 2010 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
if (!defined('STATUSNET')) { defined('GNUSOCIAL') || die();
exit(1);
}
/** /**
* License settings * License settings
* *
* @category Admin * @category Admin
* @package StatusNet * @package GNUsocial
* @author Zach Copley <zach@status.net> * @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 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
class LicenseadminpanelAction extends AdminPanelAction class LicenseadminpanelAction extends AdminPanelAction
{ {
@ -48,7 +42,7 @@ class LicenseadminpanelAction extends AdminPanelAction
* @return string page title * @return string page title
*/ */
function title() public function title()
{ {
// TRANS: User admin panel title // TRANS: User admin panel title
return _m('TITLE', 'License'); return _m('TITLE', 'License');
@ -59,7 +53,7 @@ class LicenseadminpanelAction extends AdminPanelAction
* *
* @return string instructions * @return string instructions
*/ */
function getInstructions() public function getInstructions()
{ {
// TRANS: Form instructions for the site license admin panel. // TRANS: Form instructions for the site license admin panel.
return _('License for this StatusNet site'); return _('License for this StatusNet site');
@ -70,7 +64,7 @@ class LicenseadminpanelAction extends AdminPanelAction
* *
* @return void * @return void
*/ */
function showForm() public function showForm()
{ {
$form = new LicenseAdminPanelForm($this); $form = new LicenseAdminPanelForm($this);
$form->show(); $form->show();
@ -82,7 +76,7 @@ class LicenseadminpanelAction extends AdminPanelAction
* *
* @return void * @return void
*/ */
function saveSettings() public function saveSettings()
{ {
static $settings = array( static $settings = array(
'license' => array('type', 'owner', 'url', 'title', 'image') 'license' => array('type', 'owner', 'url', 'title', 'image')
@ -104,7 +98,7 @@ class LicenseadminpanelAction extends AdminPanelAction
$config = new Config(); $config = new Config();
$config->query('BEGIN'); $config->query('START TRANSACTION');
foreach ($settings as $section => $parts) { foreach ($settings as $section => $parts) {
foreach ($parts as $setting) { foreach ($parts as $setting) {
@ -124,7 +118,7 @@ class LicenseadminpanelAction extends AdminPanelAction
* *
* @return nothing * @return nothing
*/ */
function validate(&$values) public function validate(&$values)
{ {
// Validate license type (shouldn't have to do it, but just in case) // Validate license type (shouldn't have to do it, but just in case)
@ -195,7 +189,7 @@ class LicenseAdminPanelForm extends AdminForm
* *
* @return int ID of the form * @return int ID of the form
*/ */
function id() public function id()
{ {
return 'licenseadminpanel'; return 'licenseadminpanel';
} }
@ -205,7 +199,7 @@ class LicenseAdminPanelForm extends AdminForm
* *
* @return string class of the form * @return string class of the form
*/ */
function formClass() public function formClass()
{ {
return 'form_settings'; return 'form_settings';
} }
@ -216,7 +210,7 @@ class LicenseAdminPanelForm extends AdminForm
* @return string URL of the action * @return string URL of the action
*/ */
function action() public function action()
{ {
return common_local_url('licenseadminpanel'); return common_local_url('licenseadminpanel');
} }
@ -227,10 +221,11 @@ class LicenseAdminPanelForm extends AdminForm
* @return void * @return void
*/ */
function formData() public function formData()
{ {
$this->out->elementStart( $this->out->elementStart(
'fieldset', array('id' => 'settings_license-selection') 'fieldset',
['id' => 'settings_license-selection']
); );
// TRANS: Form legend in the license admin panel. // TRANS: Form legend in the license admin panel.
$this->out->element('legend', null, _('License selection')); $this->out->element('legend', null, _('License selection'));
@ -307,7 +302,8 @@ class LicenseAdminPanelForm extends AdminForm
$this->li(); $this->li();
$this->input( $this->input(
// TRANS: Field label in the license admin panel. // TRANS: Field label in the license admin panel.
'image', _('License Image URL'), 'image',
_('License Image URL'),
// TRANS: Field title in the license admin panel. // TRANS: Field title in the license admin panel.
_('URL for an image to display with the license.'), _('URL for an image to display with the license.'),
'license' 'license'
@ -323,7 +319,7 @@ class LicenseAdminPanelForm extends AdminForm
* *
* @return void * @return void
*/ */
function formActions() public function formActions()
{ {
$this->out->submit( $this->out->submit(
'submit', 'submit',

55
actions/newapplication.php
View File

@ -1,34 +1,31 @@
<?php <?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
/** /**
* StatusNet, the distributed open-source microblogging tool
*
* Register a new OAuth Application * Register a new OAuth Application
* *
* 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 Applications * @category Applications
* @package StatusNet * @package GNUsocial
* @author Zach Copley <zach@status.net> * @author Zach Copley <zach@status.net>
* @copyright 2008-2011 StatusNet, Inc. * @copyright 2008-2011 StatusNet, Inc.
* @copyright 2013 Free Software Foundation, Inc. * @copyright 2013 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
if (!defined('GNUSOCIAL')) { exit(1); } defined('GNUSOCIAL') || die();
/** /**
* Add a new application * Add a new application
@ -36,14 +33,13 @@ if (!defined('GNUSOCIAL')) { exit(1); }
* This is the form for adding a new application * This is the form for adding a new application
* *
* @category Application * @category Application
* @package StatusNet * @package GNUsocial
* @author Zach Copley <zach@status.net> * @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 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
class NewApplicationAction extends SettingsAction class NewApplicationAction extends SettingsAction
{ {
function title() public function title()
{ {
// TRANS: This is the title of the form for adding a new application. // TRANS: This is the title of the form for adding a new application.
return _('New application'); return _('New application');
@ -103,7 +99,8 @@ class NewApplicationAction extends SettingsAction
_m('Description is too long (maximum %d character).', _m('Description is too long (maximum %d character).',
'Description is too long (maximum %d characters).', 'Description is too long (maximum %d characters).',
Oauth_application::maxDesc()), Oauth_application::maxDesc()),
Oauth_application::maxDesc())); Oauth_application::maxDesc()
));
} elseif (empty($source_url)) { } elseif (empty($source_url)) {
// TRANS: Validation error shown when not providing a source URL in the "New application" form. // TRANS: Validation error shown when not providing a source URL in the "New application" form.
$this->clientError(_('Source URL is required.')); $this->clientError(_('Source URL is required.'));
@ -135,7 +132,7 @@ class NewApplicationAction extends SettingsAction
$app = new Oauth_application(); $app = new Oauth_application();
$app->query('BEGIN'); $app->query('START TRANSACTION');
$app->name = $name; $app->name = $name;
$app->owner = $this->scoped->getID(); $app->owner = $this->scoped->getID();
@ -205,7 +202,7 @@ class NewApplicationAction extends SettingsAction
* *
* @return boolean true if the name already exists * @return boolean true if the name already exists
*/ */
function nameExists($name) public function nameExists($name)
{ {
$app = Oauth_application::getKV('name', $name); $app = Oauth_application::getKV('name', $name);
return !empty($app); return !empty($app);

225
actions/pathsadminpanel.php
View File

@ -1,48 +1,42 @@
<?php <?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
/** /**
* StatusNet, the distributed open-source microblogging tool
*
* Paths administration panel * Paths administration panel
* *
* 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 Settings * @category Settings
* @package StatusNet * @package GNUsocial
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @author Zach Copley <zach@status.net> * @author Zach Copley <zach@status.net>
* @author Sarven Capadisli <csarven@status.net> * @author Sarven Capadisli <csarven@status.net>
* @copyright 2008-2011 StatusNet, Inc. * @copyright 2008-2011 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
if (!defined('STATUSNET')) { defined('GNUSOCIAL') || die();
exit(1);
}
/** /**
* Paths settings * Paths settings
* *
* @category Admin * @category Admin
* @package StatusNet * @package GNUsocial
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @author Zach Copley <zach@status.net> * @author Zach Copley <zach@status.net>
* @author Sarven Capadisli <csarven@status.net> * @author Sarven Capadisli <csarven@status.net>
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
class PathsadminpanelAction extends AdminPanelAction class PathsadminpanelAction extends AdminPanelAction
{ {
@ -52,7 +46,7 @@ class PathsadminpanelAction extends AdminPanelAction
* @return string page title * @return string page title
*/ */
function title() public function title()
{ {
// TRANS: Title for Paths admin panel. // TRANS: Title for Paths admin panel.
return _('Paths'); return _('Paths');
@ -63,7 +57,7 @@ class PathsadminpanelAction extends AdminPanelAction
* *
* @return string instructions * @return string instructions
*/ */
function getInstructions() public function getInstructions()
{ {
// TRANS: Form instructions for Path admin panel. // TRANS: Form instructions for Path admin panel.
return _('Path and server settings for this StatusNet site'); return _('Path and server settings for this StatusNet site');
@ -74,7 +68,7 @@ class PathsadminpanelAction extends AdminPanelAction
* *
* @return void * @return void
*/ */
function showForm() public function showForm()
{ {
$form = new PathsAdminPanelForm($this); $form = new PathsAdminPanelForm($this);
$form->show(); $form->show();
@ -86,14 +80,14 @@ class PathsadminpanelAction extends AdminPanelAction
* *
* @return void * @return void
*/ */
function saveSettings() public function saveSettings()
{ {
static $settings = array( static $settings = [
'site' => array('path', 'locale_path', 'ssl', 'sslserver'), 'site' => ['path', 'locale_path', 'ssl', 'sslserver'],
'theme' => array('server', 'dir', 'path', 'sslserver', 'sslpath'), 'theme' => ['server', 'dir', 'path', 'sslserver', 'sslpath'],
'avatar' => array('server', 'dir', 'path'), 'avatar' => ['server', 'dir', 'path'],
'attachments' => array('server', 'dir', 'path', 'sslserver', 'sslpath') 'attachments' => ['server', 'dir', 'path', 'sslserver', 'sslpath'],
); ];
// XXX: If we're only going to have one boolean on thi page we // XXX: If we're only going to have one boolean on thi page we
// can remove some of the boolean processing code --Z // can remove some of the boolean processing code --Z
@ -120,7 +114,7 @@ class PathsadminpanelAction extends AdminPanelAction
$config = new Config(); $config = new Config();
$config->query('BEGIN'); $config->query('START TRANSACTION');
foreach ($settings as $section => $parts) { foreach ($settings as $section => $parts) {
foreach ($parts as $setting) { foreach ($parts as $setting) {
@ -144,7 +138,7 @@ class PathsadminpanelAction extends AdminPanelAction
* *
* @return void * @return void
*/ */
function validate(&$values) public function validate(&$values)
{ {
// Validate theme dir // Validate theme dir
@ -189,7 +183,7 @@ class PathsAdminPanelForm extends AdminForm
* *
* @return int ID of the form * @return int ID of the form
*/ */
function id() public function id()
{ {
return 'form_paths_admin_panel'; return 'form_paths_admin_panel';
} }
@ -199,7 +193,7 @@ class PathsAdminPanelForm extends AdminForm
* *
* @return string class of the form * @return string class of the form
*/ */
function formClass() public function formClass()
{ {
return 'form_settings'; return 'form_settings';
} }
@ -209,7 +203,7 @@ class PathsAdminPanelForm extends AdminForm
* *
* @return string URL of the action * @return string URL of the action
*/ */
function action() public function action()
{ {
return common_local_url('pathsadminpanel'); return common_local_url('pathsadminpanel');
} }
@ -219,7 +213,7 @@ class PathsAdminPanelForm extends AdminForm
* *
* @return void * @return void
*/ */
function formData() public function formData()
{ {
$this->out->elementStart('fieldset', array('id' => 'settings_paths_locale')); $this->out->elementStart('fieldset', array('id' => 'settings_paths_locale'));
// TRANS: Fieldset legend in Paths admin panel. // TRANS: Fieldset legend in Paths admin panel.
@ -227,37 +221,45 @@ class PathsAdminPanelForm extends AdminForm
$this->out->elementStart('ul', 'form_data'); $this->out->elementStart('ul', 'form_data');
$this->li(); $this->li();
$this->input('server', $this->input(
'server',
// TRANS: Field label in Paths admin panel. // TRANS: Field label in Paths admin panel.
_('Server'), _('Server'),
// TRANS: Field title in Paths admin panel. // TRANS: Field title in Paths admin panel.
_('Site\'s server hostname.')); _('Site\'s server hostname.')
);
$this->unli(); $this->unli();
$this->li(); $this->li();
$this->input('path', $this->input(
'path',
// TRANS: Field label in Paths admin panel. // TRANS: Field label in Paths admin panel.
_('Path'), _('Path'),
// TRANS: Field title in Paths admin panel. // TRANS: Field title in Paths admin panel.
_('Site path.')); _('Site path.')
);
$this->unli(); $this->unli();
$this->li(); $this->li();
$this->input('locale_path', $this->input(
'locale_path',
// TRANS: Field label in Paths admin panel. // TRANS: Field label in Paths admin panel.
_('Locale directory'), _('Locale directory'),
// TRANS: Field title in Paths admin panel. // TRANS: Field title in Paths admin panel.
_('Directory path to locales.'), _('Directory path to locales.'),
'site'); 'site'
);
$this->unli(); $this->unli();
$this->li(); $this->li();
$this->out->checkbox('fancy', $this->out->checkbox(
'fancy',
// TRANS: Checkbox label in Paths admin panel. // TRANS: Checkbox label in Paths admin panel.
_('Fancy URLs'), _('Fancy URLs'),
(bool) $this->value('fancy'), (bool) $this->value('fancy'),
// TRANS: Field title in Paths admin panel. // TRANS: Field title in Paths admin panel.
_('Use fancy URLs (more readable and memorable)?')); _('Use fancy URLs (more readable and memorable)?')
);
$this->unli(); $this->unli();
$this->out->elementEnd('ul'); $this->out->elementEnd('ul');
@ -270,140 +272,171 @@ class PathsAdminPanelForm extends AdminForm
$this->out->elementStart('ul', 'form_data'); $this->out->elementStart('ul', 'form_data');
$this->li(); $this->li();
$this->input('server', $this->input(
'server',
// TRANS: Field label in Paths admin panel. // TRANS: Field label in Paths admin panel.
_('Server'), _('Server'),
// TRANS: Tooltip for field label in Paths admin panel. // TRANS: Tooltip for field label in Paths admin panel.
_('Server for themes.'), _('Server for themes.'),
'theme'); 'theme'
);
$this->unli(); $this->unli();
$this->li(); $this->li();
$this->input('path', $this->input(
'path',
// TRANS: Field label in Paths admin panel. // TRANS: Field label in Paths admin panel.
_('Path'), _('Path'),
// TRANS: Tooltip for field label in Paths admin panel. // TRANS: Tooltip for field label in Paths admin panel.
_('Web path to themes.'), _('Web path to themes.'),
'theme'); 'theme'
);
$this->unli(); $this->unli();
$this->li(); $this->li();
$this->input('sslserver', $this->input(
'sslserver',
// TRANS: Field label in Paths admin panel. // TRANS: Field label in Paths admin panel.
_('SSL server'), _('SSL server'),
// TRANS: Tooltip for field label in Paths admin panel. // TRANS: Tooltip for field label in Paths admin panel.
_('SSL server for themes (default: SSL server).'), _('SSL server for themes (default: SSL server).'),
'theme'); 'theme'
);
$this->unli(); $this->unli();
$this->li(); $this->li();
$this->input('sslpath', $this->input(
'sslpath',
// TRANS: Field label in Paths admin panel. // TRANS: Field label in Paths admin panel.
_('SSL path'), _('SSL path'),
// TRANS: Tooltip for field label in Paths admin panel. // TRANS: Tooltip for field label in Paths admin panel.
_('SSL path to themes (default: /theme/).'), _('SSL path to themes (default: /theme/).'),
'theme'); 'theme'
);
$this->unli(); $this->unli();
$this->li(); $this->li();
$this->input('dir', $this->input(
'dir',
// TRANS: Field label in Paths admin panel. // TRANS: Field label in Paths admin panel.
_('Directory'), _('Directory'),
// TRANS: Tooltip for field label in Paths admin panel. // TRANS: Tooltip for field label in Paths admin panel.
_('Directory where themes are located.'), _('Directory where themes are located.'),
'theme'); 'theme'
);
$this->unli(); $this->unli();
$this->out->elementEnd('ul'); $this->out->elementEnd('ul');
$this->out->elementEnd('fieldset'); $this->out->elementEnd('fieldset');
$this->out->elementStart('fieldset', array('id' => 'settings_avatar-paths')); $this->out->elementStart(
'fieldset',
['id' => 'settings_avatar-paths']
);
// TRANS: Fieldset legend in Paths admin panel. // TRANS: Fieldset legend in Paths admin panel.
$this->out->element('legend', null, _('Avatars')); $this->out->element('legend', null, _('Avatars'));
$this->out->elementStart('ul', 'form_data'); $this->out->elementStart('ul', 'form_data');
$this->li(); $this->li();
$this->input('server', $this->input(
'server',
// TRANS: Field label in Paths admin panel. // TRANS: Field label in Paths admin panel.
_('Avatar server'), _('Avatar server'),
// TRANS: Tooltip for field label in Paths admin panel. // TRANS: Tooltip for field label in Paths admin panel.
_('Server for avatars.'), _('Server for avatars.'),
'avatar'); 'avatar'
);
$this->unli(); $this->unli();
$this->li(); $this->li();
$this->input('path', $this->input(
'path',
// TRANS: Field label in Paths admin panel. // TRANS: Field label in Paths admin panel.
_('Avatar path'), _('Avatar path'),
// TRANS: Tooltip for field label in Paths admin panel. // TRANS: Tooltip for field label in Paths admin panel.
_('Web path to avatars.'), _('Web path to avatars.'),
'avatar'); 'avatar'
);
$this->unli(); $this->unli();
$this->li(); $this->li();
$this->input('dir', $this->input(
'dir',
// TRANS: Field label in Paths admin panel. // TRANS: Field label in Paths admin panel.
_('Avatar directory'), _('Avatar directory'),
// TRANS: Tooltip for field label in Paths admin panel. // TRANS: Tooltip for field label in Paths admin panel.
_('Directory where avatars are located.'), _('Directory where avatars are located.'),
'avatar'); 'avatar'
);
$this->unli(); $this->unli();
$this->out->elementEnd('ul'); $this->out->elementEnd('ul');
$this->out->elementEnd('fieldset'); $this->out->elementEnd('fieldset');
$this->out->elementStart('fieldset', array('id' => $this->out->elementStart(
'settings_attachments-paths')); 'fieldset',
['id' => 'settings_attachments-paths']
);
// TRANS: Fieldset legens in Paths admin panel. // TRANS: Fieldset legens in Paths admin panel.
$this->out->element('legend', null, _('Attachments')); $this->out->element('legend', null, _('Attachments'));
$this->out->elementStart('ul', 'form_data'); $this->out->elementStart('ul', 'form_data');
$this->li(); $this->li();
$this->input('server', $this->input(
'server',
// TRANS: Field label in Paths admin panel. // TRANS: Field label in Paths admin panel.
_('Server'), _('Server'),
// TRANS: Tooltip for field label in Paths admin panel. // TRANS: Tooltip for field label in Paths admin panel.
_('Server for attachments.'), _('Server for attachments.'),
'attachments'); 'attachments'
);
$this->unli(); $this->unli();
$this->li(); $this->li();
$this->input('path', $this->input(
'path',
// TRANS: Field label in Paths admin panel. // TRANS: Field label in Paths admin panel.
_('Path'), _('Path'),
// TRANS: Tooltip for field label in Paths admin panel. // TRANS: Tooltip for field label in Paths admin panel.
_('Web path to attachments.'), _('Web path to attachments.'),
'attachments'); 'attachments'
);
$this->unli(); $this->unli();
$this->li(); $this->li();
$this->input('sslserver', $this->input(
'sslserver',
// TRANS: Field label in Paths admin panel. // TRANS: Field label in Paths admin panel.
_('SSL server'), _('SSL server'),
// TRANS: Tooltip for field label in Paths admin panel. // TRANS: Tooltip for field label in Paths admin panel.
_('Server for attachments on SSL pages.'), _('Server for attachments on SSL pages.'),
'attachments'); 'attachments'
);
$this->unli(); $this->unli();
$this->li(); $this->li();
$this->input('sslpath', $this->input(
'sslpath',
// TRANS: Field label in Paths admin panel. // TRANS: Field label in Paths admin panel.
_('SSL path'), _('SSL path'),
// TRANS: Tooltip for field label in Paths admin panel. // TRANS: Tooltip for field label in Paths admin panel.
_('Web path to attachments on SSL pages.'), _('Web path to attachments on SSL pages.'),
'attachments'); 'attachments'
);
$this->unli(); $this->unli();
$this->li(); $this->li();
$this->input('dir', $this->input(
'dir',
// TRANS: Field label in Paths admin panel. // TRANS: Field label in Paths admin panel.
_('Directory'), _('Directory'),
// TRANS: Tooltip for field label in Paths admin panel. // TRANS: Tooltip for field label in Paths admin panel.
_('Directory where attachments are located.'), _('Directory where attachments are located.'),
'attachments'); 'attachments'
);
$this->unli(); $this->unli();
$this->out->elementEnd('ul'); $this->out->elementEnd('ul');
@ -416,26 +449,33 @@ class PathsAdminPanelForm extends AdminForm
$this->li(); $this->li();
// TRANS: Drop down option in Paths admin panel (option for "When to use SSL"). // TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
$ssl = array('never' => _('Never'), $ssl = [
'never' => _('Never'),
// TRANS: Drop down option in Paths admin panel (option for "When to use SSL"). // TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
'always' => _('Always')); 'always' => _('Always'),
];
$this->out->dropdown('site-ssl', $this->out->dropdown(
'site-ssl',
// TRANS: Drop down label in Paths admin panel. // TRANS: Drop down label in Paths admin panel.
_('Use SSL'), _('Use SSL'),
// TRANS: Tooltip for field label in Paths admin panel. // TRANS: Tooltip for field label in Paths admin panel.
$ssl, _('When to use SSL.'), $ssl,
_('When to use SSL.'),
false, false,
$this->value('ssl', 'site')); $this->value('ssl', 'site')
);
$this->unli(); $this->unli();
$this->li(); $this->li();
$this->input('sslserver', $this->input(
'sslserver',
// TRANS: Field label in Paths admin panel. // TRANS: Field label in Paths admin panel.
_('SSL server'), _('SSL server'),
// TRANS: Tooltip for field label in Paths admin panel. // TRANS: Tooltip for field label in Paths admin panel.
_('Server to direct SSL requests to.'), _('Server to direct SSL requests to.'),
'site'); 'site'
);
$this->unli(); $this->unli();
$this->out->elementEnd('ul'); $this->out->elementEnd('ul');
$this->out->elementEnd('fieldset'); $this->out->elementEnd('fieldset');
@ -446,12 +486,17 @@ class PathsAdminPanelForm extends AdminForm
* *
* @return void * @return void
*/ */
function formActions() public function formActions()
{ {
// TRANS: Button text to store form data in the Paths admin panel. // TRANS: Button text to store form data in the Paths admin panel.
$this->out->submit('save', _m('BUTTON','Save'), 'submit', $this->out->submit(
'save',
_m('BUTTON', 'Save'),
'submit',
// TRANS: Button title text to store form data in the Paths admin panel. // TRANS: Button title text to store form data in the Paths admin panel.
'save', _('Save path settings.')); 'save',
_('Save path settings.')
);
} }
/** /**
@ -467,7 +512,7 @@ class PathsAdminPanelForm extends AdminForm
* *
* @return void * @return void
*/ */
function input($setting, $title, $instructions, $section='site') public function input($setting, $title, $instructions, $section='site')
{ {
$this->out->input("$section-$setting", $title, $this->value($setting, $section), $instructions); $this->out->input("$section-$setting", $title, $this->value($setting, $section), $instructions);
} }

2
actions/profilesettings.php
View File

@ -345,7 +345,7 @@ class ProfilesettingsAction extends SettingsAction
} }
$user = $this->scoped->getUser(); $user = $this->scoped->getUser();
$user->query('BEGIN'); $user->query('START TRANSACTION');
// Only allow setting private_stream if site policy allows it // Only allow setting private_stream if site policy allows it
// (or user already _has_ a private stream, then you can unset it) // (or user already _has_ a private stream, then you can unset it)

88
actions/sessionsadminpanel.php
View File

@ -1,44 +1,38 @@
<?php <?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
/** /**
* StatusNet, the distributed open-source microblogging tool
*
* Sessions administration panel * Sessions administration panel
* *
* 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 Settings * @category Settings
* @package StatusNet * @package GNUsocial
* @author Zach Copley <zach@status.net> * @author Zach Copley <zach@status.net>
* @copyright 2010 StatusNet, Inc. * @copyright 2010 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
if (!defined('STATUSNET')) { defined('GNUSOCIAL') || die();
exit(1);
}
/** /**
* Admin site sessions * Admin site sessions
* *
* @category Admin * @category Admin
* @package StatusNet * @package GNUsocial
* @author Zach Copley <zach@status.net> * @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 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
class SessionsadminpanelAction extends AdminPanelAction class SessionsadminpanelAction extends AdminPanelAction
{ {
@ -47,7 +41,7 @@ class SessionsadminpanelAction extends AdminPanelAction
* *
* @return string page title * @return string page title
*/ */
function title() public function title()
{ {
// TRANS: Title for the sessions administration panel. // TRANS: Title for the sessions administration panel.
return _m('TITLE', 'Sessions'); return _m('TITLE', 'Sessions');
@ -58,7 +52,7 @@ class SessionsadminpanelAction extends AdminPanelAction
* *
* @return string instructions * @return string instructions
*/ */
function getInstructions() public function getInstructions()
{ {
// TRANS: Instructions for the sessions administration panel. // TRANS: Instructions for the sessions administration panel.
return _('Session settings for this StatusNet site'); return _('Session settings for this StatusNet site');
@ -69,7 +63,7 @@ class SessionsadminpanelAction extends AdminPanelAction
* *
* @return void * @return void
*/ */
function showForm() public function showForm()
{ {
$form = new SessionsAdminPanelForm($this); $form = new SessionsAdminPanelForm($this);
$form->show(); $form->show();
@ -81,7 +75,7 @@ class SessionsadminpanelAction extends AdminPanelAction
* *
* @return void * @return void
*/ */
function saveSettings() public function saveSettings()
{ {
static $booleans = array('sessions' => array('handle', 'debug')); static $booleans = array('sessions' => array('handle', 'debug'));
@ -101,7 +95,7 @@ class SessionsadminpanelAction extends AdminPanelAction
$config = new Config(); $config = new Config();
$config->query('BEGIN'); $config->query('START TRANSACTION');
foreach ($booleans as $section => $parts) { foreach ($booleans as $section => $parts) {
foreach ($parts as $setting) { foreach ($parts as $setting) {
@ -114,7 +108,7 @@ class SessionsadminpanelAction extends AdminPanelAction
return; return;
} }
function validate(&$values) public function validate(&$values)
{ {
// stub // stub
} }
@ -128,7 +122,7 @@ class SessionsAdminPanelForm extends AdminForm
* *
* @return int ID of the form * @return int ID of the form
*/ */
function id() public function id()
{ {
return 'sessionsadminpanel'; return 'sessionsadminpanel';
} }
@ -138,7 +132,7 @@ class SessionsAdminPanelForm extends AdminForm
* *
* @return string class of the form * @return string class of the form
*/ */
function formClass() public function formClass()
{ {
return 'form_settings'; return 'form_settings';
} }
@ -148,7 +142,7 @@ class SessionsAdminPanelForm extends AdminForm
* *
* @return string URL of the action * @return string URL of the action
*/ */
function action() public function action()
{ {
return common_local_url('sessionsadminpanel'); return common_local_url('sessionsadminpanel');
} }
@ -158,7 +152,7 @@ class SessionsAdminPanelForm extends AdminForm
* *
* @return void * @return void
*/ */
function formData() public function formData()
{ {
$this->out->elementStart('fieldset', array('id' => 'settings_user_sessions')); $this->out->elementStart('fieldset', array('id' => 'settings_user_sessions'));
// TRANS: Fieldset legend on the sessions administration panel. // TRANS: Fieldset legend on the sessions administration panel.
@ -169,20 +163,26 @@ class SessionsAdminPanelForm extends AdminForm
$this->li(); $this->li();
// TRANS: Checkbox title on the sessions administration panel. // TRANS: Checkbox title on the sessions administration panel.
// TRANS: Indicates if StatusNet should handle session administration. // TRANS: Indicates if StatusNet should handle session administration.
$this->out->checkbox('handle', _('Handle sessions'), $this->out->checkbox(
'handle',
_('Handle sessions'),
(bool) $this->value('handle', 'sessions'), (bool) $this->value('handle', 'sessions'),
// TRANS: Checkbox title on the sessions administration panel. // TRANS: Checkbox title on the sessions administration panel.
// TRANS: Indicates if StatusNet should handle session administration. // TRANS: Indicates if StatusNet should handle session administration.
_('Handle sessions ourselves.')); _('Handle sessions ourselves.')
);
$this->unli(); $this->unli();
$this->li(); $this->li();
// TRANS: Checkbox label on the sessions administration panel. // TRANS: Checkbox label on the sessions administration panel.
// TRANS: Indicates if StatusNet should write session debugging output. // TRANS: Indicates if StatusNet should write session debugging output.
$this->out->checkbox('debug', _('Session debugging'), $this->out->checkbox(
'debug',
_('Session debugging'),
(bool) $this->value('debug', 'sessions'), (bool) $this->value('debug', 'sessions'),
// TRANS: Checkbox title on the sessions administration panel. // TRANS: Checkbox title on the sessions administration panel.
_('Enable debugging output for sessions.')); _('Enable debugging output for sessions.')
);
$this->unli(); $this->unli();
$this->out->elementEnd('ul'); $this->out->elementEnd('ul');
@ -195,14 +195,16 @@ class SessionsAdminPanelForm extends AdminForm
* *
* @return void * @return void
*/ */
function formActions() public function formActions()
{ {
$this->out->submit('submit', $this->out->submit(
'submit',
// TRANS: Submit button text on the sessions administration panel. // TRANS: Submit button text on the sessions administration panel.
_m('BUTTON', 'Save'), _m('BUTTON', 'Save'),
'submit', 'submit',
null, null,
// TRANS: Title for submit button on the sessions administration panel. // TRANS: Title for submit button on the sessions administration panel.
_('Save session settings')); _('Save session settings')
);
} }
} }

173
actions/showapplication.php
View File

@ -1,60 +1,54 @@
<?php <?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
/** /**
* StatusNet, the distributed open-source microblogging tool
*
* Show an OAuth application * Show an OAuth application
* *
* 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 Application * @category Application
* @package StatusNet * @package GNUsocial
* @author Zach Copley <zach@status.net> * @author Zach Copley <zach@status.net>
* @copyright 2008-2011 StatusNet, Inc. * @copyright 2008-2011 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
if (!defined('STATUSNET') && !defined('LACONICA')) { defined('GNUSOCIAL') || die();
exit(1);
}
/** /**
* Show an OAuth application * Show an OAuth application
* *
* @category Application * @category Application
* @package StatusNet * @package GNUsocial
* @author Zach Copley <zach@status.net> * @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 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
class ShowApplicationAction extends Action class ShowApplicationAction extends Action
{ {
/** /**
* Application to show * Application to show
*/ */
var $application = null; public $application = null;
/** /**
* User who owns the app * User who owns the app
*/ */
var $owner = null; public $owner = null;
var $msg = null; public $msg = null;
var $success = null; public $success = null;
/** /**
* Load attributes based on database arguments * Load attributes based on database arguments
@ -65,7 +59,7 @@ class ShowApplicationAction extends Action
* *
* @return success flag * @return success flag
*/ */
function prepare(array $args = array()) public function prepare(array $args = [])
{ {
parent::prepare($args); parent::prepare($args);
@ -101,7 +95,7 @@ class ShowApplicationAction extends Action
* *
* @return void * @return void
*/ */
function handle() public function handle()
{ {
parent::handle(); parent::handle();
@ -127,21 +121,21 @@ class ShowApplicationAction extends Action
* *
* @return string title of the page * @return string title of the page
*/ */
function title() public function title()
{ {
if (!empty($this->application->name)) { if (!empty($this->application->name)) {
return 'Application: ' . $this->application->name; return 'Application: ' . $this->application->name;
} }
} }
function showPageNotice() public function showPageNotice()
{ {
if (!empty($this->msg)) { if (!empty($this->msg)) {
$this->element('div', ($this->success) ? 'success' : 'error', $this->msg); $this->element('div', ($this->success) ? 'success' : 'error', $this->msg);
} }
} }
function showContent() public function showContent()
{ {
$cur = common_current_user(); $cur = common_current_user();
@ -151,21 +145,38 @@ class ShowApplicationAction extends Action
// TRANS: Header on the OAuth application page. // TRANS: Header on the OAuth application page.
$this->element('h2', null, _('Application profile')); $this->element('h2', null, _('Application profile'));
if (!empty($this->application->icon)) { if (!empty($this->application->icon)) {
$this->element('img', array('src' => $this->application->icon, $this->element(
'class' => 'u-photo logo entity_depiction')); 'img',
[
'src' => $this->application->icon,
'class' => 'u-photo logo entity_depiction',
]
);
} }
$this->element('a', array('href' => $this->application->source_url, $this->element(
'class' => 'u-url p-name entity_fn'), 'a',
$this->application->name); [
'href' => $this->application->source_url,
'class' => 'u-url p-name entity_fn',
],
$this->application->name
);
$this->element('a', array('href' => $this->application->homepage, $this->element(
'class' => 'u-url entity_org'), 'a',
$this->application->organization); [
'href' => $this->application->homepage,
'class' => 'u-url entity_org',
],
$this->application->organization
);
$this->element('div', $this->element(
'div',
'note entity_note', 'note entity_note',
$this->application->description); $this->application->description
);
$this->elementStart('div', 'entity_statistics'); $this->elementStart('div', 'entity_statistics');
$defaultAccess = ($this->application->access_type & Oauth_application::$writeAccess) $defaultAccess = ($this->application->access_type & Oauth_application::$writeAccess)
@ -196,42 +207,65 @@ class ShowApplicationAction extends Action
$this->element('h2', null, _('Application actions')); $this->element('h2', null, _('Application actions'));
$this->elementStart('ul'); $this->elementStart('ul');
$this->elementStart('li', 'entity_edit'); $this->elementStart('li', 'entity_edit');
$this->element('a', $this->element(
array('href' => common_local_url('editapplication', 'a',
array('id' => $this->application->id))), [
'href' => common_local_url(
'editapplication',
['id' => $this->application->id]
)
],
// TRANS: Link text to edit application on the OAuth application page. // TRANS: Link text to edit application on the OAuth application page.
_m('EDITAPP','Edit')); _m('EDITAPP', 'Edit')
);
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementStart('li', 'entity_reset_keysecret'); $this->elementStart('li', 'entity_reset_keysecret');
$this->elementStart('form', array( $this->elementStart(
'form',
[
'id' => 'form_reset_key', 'id' => 'form_reset_key',
'class' => 'form_reset_key', 'class' => 'form_reset_key',
'method' => 'POST', 'method' => 'POST',
'action' => common_local_url('showapplication', 'action' => common_local_url(
array('id' => $this->application->id)))); 'showapplication',
['id' => $this->application->id]
),
]
);
$this->elementStart('fieldset'); $this->elementStart('fieldset');
$this->hidden('token', common_session_token()); $this->hidden('token', common_session_token());
$this->element('input', array('type' => 'submit', $this->element(
'input',
[
'type' => 'submit',
'id' => 'reset', 'id' => 'reset',
'name' => 'reset', 'name' => 'reset',
'class' => 'submit', 'class' => 'submit',
// TRANS: Button text on the OAuth application page. // TRANS: Button text on the OAuth application page.
// TRANS: Resets the OAuth consumer key and secret. // TRANS: Resets the OAuth consumer key and secret.
'value' => _('Reset key & secret'), 'value' => _('Reset key & secret'),
'onClick' => 'return confirmReset()')); 'onClick' => 'return confirmReset()',
]
);
$this->elementEnd('fieldset'); $this->elementEnd('fieldset');
$this->elementEnd('form'); $this->elementEnd('form');
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementStart('li', 'entity_delete'); $this->elementStart('li', 'entity_delete');
$this->elementStart('form', array( $this->elementStart(
'form',
[
'id' => 'form_delete_application', 'id' => 'form_delete_application',
'class' => 'form_delete_application', 'class' => 'form_delete_application',
'method' => 'POST', 'method' => 'POST',
'action' => common_local_url('deleteapplication', 'action' => common_local_url(
array('id' => $this->application->id)))); 'deleteapplication',
['id' => $this->application->id]
),
]
);
$this->elementStart('fieldset'); $this->elementStart('fieldset');
$this->hidden('token', common_session_token()); $this->hidden('token', common_session_token());
@ -266,16 +300,23 @@ class ShowApplicationAction extends Action
$this->element('dd', null, common_local_url('ApiOAuthAuthorize')); $this->element('dd', null, common_local_url('ApiOAuthAuthorize'));
$this->elementEnd('dl'); $this->elementEnd('dl');
$this->element('p', 'note', $this->element(
'p',
'note',
// TRANS: Note on the OAuth application page about signature support. // TRANS: Note on the OAuth application page about signature support.
_('Note: HMAC-SHA1 signatures are supported. The plaintext signature method is not supported.')); _('Note: HMAC-SHA1 signatures are supported. The plaintext signature method is not supported.')
);
$this->elementEnd('div'); $this->elementEnd('div');
$this->elementStart('p', array('id' => 'application_action')); $this->elementStart('p', array('id' => 'application_action'));
$this->element('a', $this->element(
array('href' => common_local_url('oauthappssettings'), 'a',
'class' => 'more'), [
'View your applications'); 'href' => common_local_url('oauthappssettings'),
'class' => 'more',
],
'View your applications'
);
$this->elementEnd('p'); $this->elementEnd('p');
} }
@ -284,7 +325,7 @@ class ShowApplicationAction extends Action
* *
* @return void * @return void
*/ */
function showScripts() public function showScripts()
{ {
parent::showScripts(); parent::showScripts();
@ -305,9 +346,9 @@ class ShowApplicationAction extends Action
* XXX: Should this be moved to its own page with a confirm? * XXX: Should this be moved to its own page with a confirm?
* *
*/ */
function resetKey() public function resetKey()
{ {
$this->application->query('BEGIN'); $this->application->query('START TRANSACTION');
$oauser = new Oauth_application_user(); $oauser = new Oauth_application_user();
$oauser->application_id = $this->application->id; $oauser->application_id = $this->application->id;

146
actions/siteadminpanel.php
View File

@ -1,48 +1,42 @@
<?php <?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
/** /**
* StatusNet, the distributed open-source microblogging tool
*
* Site administration panel * Site administration panel
* *
* 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 Settings * @category Settings
* @package StatusNet * @package GNUsocial
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @author Zach Copley <zach@status.net> * @author Zach Copley <zach@status.net>
* @author Sarven Capadisli <csarven@status.net> * @author Sarven Capadisli <csarven@status.net>
* @copyright 2008-2011 StatusNet, Inc. * @copyright 2008-2011 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
if (!defined('STATUSNET')) { defined('GNUSOCIAL') || die();
exit(1);
}
/** /**
* Administer site settings * Administer site settings
* *
* @category Admin * @category Admin
* @package StatusNet * @package GNUsocial
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @author Zach Copley <zach@status.net> * @author Zach Copley <zach@status.net>
* @author Sarven Capadisli <csarven@status.net> * @author Sarven Capadisli <csarven@status.net>
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
class SiteadminpanelAction extends AdminPanelAction class SiteadminpanelAction extends AdminPanelAction
{ {
@ -51,7 +45,7 @@ class SiteadminpanelAction extends AdminPanelAction
* *
* @return string page title * @return string page title
*/ */
function title() public function title()
{ {
// TRANS: Title for site administration panel. // TRANS: Title for site administration panel.
return _m('TITLE', 'Site'); return _m('TITLE', 'Site');
@ -62,7 +56,7 @@ class SiteadminpanelAction extends AdminPanelAction
* *
* @return string instructions * @return string instructions
*/ */
function getInstructions() public function getInstructions()
{ {
// TRANS: Instructions for site administration panel. // TRANS: Instructions for site administration panel.
return _m('Basic settings for this StatusNet site'); return _m('Basic settings for this StatusNet site');
@ -73,7 +67,7 @@ class SiteadminpanelAction extends AdminPanelAction
* *
* @return void * @return void
*/ */
function showForm() public function showForm()
{ {
$form = new SiteAdminPanelForm($this); $form = new SiteAdminPanelForm($this);
$form->show(); $form->show();
@ -85,7 +79,7 @@ class SiteadminpanelAction extends AdminPanelAction
* *
* @return void * @return void
*/ */
function saveSettings() public function saveSettings()
{ {
static $settings = array( static $settings = array(
'site' => array( 'site' => array(
@ -119,7 +113,7 @@ class SiteadminpanelAction extends AdminPanelAction
$config = new Config(); $config = new Config();
$config->query('BEGIN'); $config->query('START TRANSACTION');
foreach ($settings as $section => $parts) { foreach ($settings as $section => $parts) {
foreach ($parts as $setting) { foreach ($parts as $setting) {
@ -132,7 +126,7 @@ class SiteadminpanelAction extends AdminPanelAction
return; return;
} }
function validate(&$values) public function validate(&$values)
{ {
// Validate site name // Validate site name
@ -208,7 +202,7 @@ class SiteAdminPanelForm extends AdminForm
* *
* @return int ID of the form * @return int ID of the form
*/ */
function id() public function id()
{ {
return 'form_site_admin_panel'; return 'form_site_admin_panel';
} }
@ -218,7 +212,7 @@ class SiteAdminPanelForm extends AdminForm
* *
* @return string class of the form * @return string class of the form
*/ */
function formClass() public function formClass()
{ {
return 'form_settings'; return 'form_settings';
} }
@ -228,7 +222,7 @@ class SiteAdminPanelForm extends AdminForm
* *
* @return string URL of the action * @return string URL of the action
*/ */
function action() public function action()
{ {
return common_local_url('siteadminpanel'); return common_local_url('siteadminpanel');
} }
@ -238,7 +232,7 @@ class SiteAdminPanelForm extends AdminForm
* *
* @return void * @return void
*/ */
function formData() public function formData()
{ {
$this->out->elementStart('fieldset', array('id' => 'settings_admin_general')); $this->out->elementStart('fieldset', array('id' => 'settings_admin_general'));
// TRANS: Fieldset legend on site settings panel. // TRANS: Fieldset legend on site settings panel.
@ -246,29 +240,41 @@ class SiteAdminPanelForm extends AdminForm
$this->out->elementStart('ul', 'form_data'); $this->out->elementStart('ul', 'form_data');
$this->li(); $this->li();
// TRANS: Field label on site settings panel. // TRANS: Field label on site settings panel.
$this->input('name', _m('LABEL','Site name'), $this->input(
'name',
_m('LABEL', 'Site name'),
// TRANS: Field title on site settings panel. // TRANS: Field title on site settings panel.
_m('The name of your site, like "Yourcompany Microblog".')); _m('The name of your site, like "Yourcompany Microblog".')
);
$this->unli(); $this->unli();
$this->li(); $this->li();
// TRANS: Field label on site settings panel. // TRANS: Field label on site settings panel.
$this->input('broughtby', _m('Brought by'), $this->input(
'broughtby',
_m('Brought by'),
// TRANS: Field title on site settings panel. // TRANS: Field title on site settings panel.
_m('Text used for credits link in footer of each page.')); _m('Text used for credits link in footer of each page.')
);
$this->unli(); $this->unli();
$this->li(); $this->li();
// TRANS: Field label on site settings panel. // TRANS: Field label on site settings panel.
$this->input('broughtbyurl', _m('Brought by URL'), $this->input(
'broughtbyurl',
_m('Brought by URL'),
// TRANS: Field title on site settings panel. // TRANS: Field title on site settings panel.
_m('URL used for credits link in footer of each page.')); _m('URL used for credits link in footer of each page.')
);
$this->unli(); $this->unli();
$this->li(); $this->li();
// TRANS: Field label on site settings panel. // TRANS: Field label on site settings panel.
$this->input('email', _m('Email'), $this->input(
'email',
_m('Email'),
// TRANS: Field title on site settings panel. // TRANS: Field title on site settings panel.
_m('Contact email address for your site.')); _m('Contact email address for your site.')
);
$this->unli(); $this->unli();
$this->out->elementEnd('ul'); $this->out->elementEnd('ul');
$this->out->elementEnd('fieldset'); $this->out->elementEnd('fieldset');
@ -289,20 +295,28 @@ class SiteAdminPanelForm extends AdminForm
$this->li(); $this->li();
// TRANS: Dropdown label on site settings panel. // TRANS: Dropdown label on site settings panel.
$this->out->dropdown('timezone', _m('Default timezone'), $this->out->dropdown(
'timezone',
_m('Default timezone'),
// TRANS: Dropdown title on site settings panel. // TRANS: Dropdown title on site settings panel.
$timezones, _m('Default timezone for the site; usually UTC.'), $timezones,
true, $this->value('timezone')); _m('Default timezone for the site; usually UTC.'),
true,
$this->value('timezone')
);
$this->unli(); $this->unli();
$this->li(); $this->li();
$this->out->dropdown('language', $this->out->dropdown(
'language',
// TRANS: Dropdown label on site settings panel. // TRANS: Dropdown label on site settings panel.
_m('Default language'), _m('Default language'),
get_nice_language_list(), get_nice_language_list(),
// TRANS: Dropdown title on site settings panel. // TRANS: Dropdown title on site settings panel.
_m('The site language when autodetection from browser settings is not available.'), _m('The site language when autodetection from browser settings is not available.'),
false, $this->value('language')); false,
$this->value('language')
);
$this->unli(); $this->unli();
$this->out->elementEnd('ul'); $this->out->elementEnd('ul');
@ -313,25 +327,29 @@ class SiteAdminPanelForm extends AdminForm
$this->out->element('legend', null, _m('LEGEND', 'Limits')); $this->out->element('legend', null, _m('LEGEND', 'Limits'));
$this->out->elementStart('ul', 'form_data'); $this->out->elementStart('ul', 'form_data');
$this->li(); $this->li();
$this->input('textlimit', $this->input(
'textlimit',
// TRANS: Field label on site settings panel. // TRANS: Field label on site settings panel.
_m('Text limit'), _m('Text limit'),
// TRANS: Field title on site settings panel. // TRANS: Field title on site settings panel.
_m('Maximum number of characters for notices.')); _m('Maximum number of characters for notices.')
);
$this->unli(); $this->unli();
$this->li(); $this->li();
$this->input('dupelimit', $this->input(
'dupelimit',
// TRANS: Field label on site settings panel. // TRANS: Field label on site settings panel.
_m('Dupe limit'), _m('Dupe limit'),
// TRANS: Field title on site settings panel. // TRANS: Field title on site settings panel.
_m('How long users must wait (in seconds) to post the same thing again.')); _m('How long users must wait (in seconds) to post the same thing again.')
);
$this->unli(); $this->unli();
$this->out->elementEnd('ul'); $this->out->elementEnd('ul');
$this->out->elementEnd('fieldset'); $this->out->elementEnd('fieldset');
} }
function showLogo() public function showLogo()
{ {
$this->out->elementStart('fieldset', ['id' => 'settings_site_logo']); $this->out->elementStart('fieldset', ['id' => 'settings_site_logo']);
// TRANS: Fieldset legend for form to change logo. // TRANS: Fieldset legend for form to change logo.
@ -340,19 +358,23 @@ class SiteAdminPanelForm extends AdminForm
$this->out->elementStart('ul', 'form_data'); $this->out->elementStart('ul', 'form_data');
$this->li(); $this->li();
$this->input('logo', $this->input(
'logo',
// TRANS: Field label for GNU social site logo. // TRANS: Field label for GNU social site logo.
_m('Site logo'), _m('Site logo'),
// TRANS: Title for field label for GNU social site logo. // TRANS: Title for field label for GNU social site logo.
'Logo for the site (full URL).'); 'Logo for the site (full URL).'
);
$this->unli(); $this->unli();
$this->li(); $this->li();
$this->input('ssllogo', $this->input(
'ssllogo',
// TRANS: Field label for SSL GNU social site logo. // TRANS: Field label for SSL GNU social site logo.
_m('SSL logo'), _m('SSL logo'),
// TRANS: Title for field label for SSL GNU social site logo. // TRANS: Title for field label for SSL GNU social site logo.
'Logo to show on SSL pages (full URL).'); 'Logo to show on SSL pages (full URL).'
);
$this->unli(); $this->unli();
$this->out->elementEnd('ul'); $this->out->elementEnd('ul');
@ -365,14 +387,16 @@ class SiteAdminPanelForm extends AdminForm
* *
* @return void * @return void
*/ */
function formActions() public function formActions()
{ {
$this->out->submit('submit', $this->out->submit(
'submit',
// TRANS: Button text for saving site settings. // TRANS: Button text for saving site settings.
_m('BUTTON', 'Save'), _m('BUTTON', 'Save'),
'submit', 'submit',
null, null,
// TRANS: Button title for saving site settings. // TRANS: Button title for saving site settings.
_m('Save the site settings.')); _m('Save the site settings.')
);
} }
} }

2
actions/smssettings.php
View File

@ -279,7 +279,7 @@ class SmssettingsAction extends SettingsAction
{ {
$user = $this->scoped->getUser(); $user = $this->scoped->getUser();
$user->query('BEGIN'); $user->query('START TRANSACTION');
$original = clone($user); $original = clone($user);

86
actions/urlsettings.php
View File

@ -1,34 +1,31 @@
<?php <?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
/** /**
* StatusNet, the distributed open-source microblogging tool
*
* Miscellaneous settings * Miscellaneous settings
* *
* 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 Settings * @category Settings
* @package StatusNet * @package GNUsocial
* @author Robin Millette <millette@status.net> * @author Robin Millette <millette@status.net>
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @copyright 2008-2009 StatusNet, Inc. * @copyright 2008-2009 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
if (!defined('GNUSOCIAL')) { exit(1); } defined('GNUSOCIAL') || die();
/** /**
* Miscellaneous settings actions * Miscellaneous settings actions
@ -36,11 +33,10 @@ if (!defined('GNUSOCIAL')) { exit(1); }
* Currently this just manages URL shortening. * Currently this just manages URL shortening.
* *
* @category Settings * @category Settings
* @package StatusNet * @package GNUsocial
* @author Robin Millette <millette@status.net> * @author Robin Millette <millette@status.net>
* @author Zach Copley <zach@status.net> * @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 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
class UrlsettingsAction extends SettingsAction class UrlsettingsAction extends SettingsAction
{ {
@ -49,7 +45,7 @@ class UrlsettingsAction extends SettingsAction
* *
* @return string Title of the page * @return string Title of the page
*/ */
function title() public function title()
{ {
// TRANS: Title of URL settings tab in profile settings. // TRANS: Title of URL settings tab in profile settings.
return _('URL settings'); return _('URL settings');
@ -60,13 +56,13 @@ class UrlsettingsAction extends SettingsAction
* *
* @return instructions for use * @return instructions for use
*/ */
function getInstructions() public function getInstructions()
{ {
// TRANS: Instructions for tab "Other" in user profile settings. // TRANS: Instructions for tab "Other" in user profile settings.
return _('Manage various other options.'); return _('Manage various other options.');
} }
function showScripts() public function showScripts()
{ {
parent::showScripts(); parent::showScripts();
$this->autofocus('urlshorteningservice'); $this->autofocus('urlshorteningservice');
@ -79,7 +75,7 @@ class UrlsettingsAction extends SettingsAction
* *
* @return void * @return void
*/ */
function showContent() public function showContent()
{ {
$user = $this->scoped->getUser(); $user = $this->scoped->getUser();
@ -98,8 +94,7 @@ class UrlsettingsAction extends SettingsAction
$services = array(); $services = array();
foreach ($shorteners as $name => $value) foreach ($shorteners as $name => $value) {
{
$services[$name] = $name; $services[$name] = $name;
if ($value['freeService']) { if ($value['freeService']) {
// TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a // TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
@ -121,29 +116,36 @@ class UrlsettingsAction extends SettingsAction
$this->elementStart('li'); $this->elementStart('li');
// TRANS: Label for dropdown with URL shortener services. // TRANS: Label for dropdown with URL shortener services.
$this->dropdown('urlshorteningservice', _('Shorten URLs with'), $this->dropdown(
'urlshorteningservice',
_('Shorten URLs with'),
// TRANS: Tooltip for for dropdown with URL shortener services. // TRANS: Tooltip for for dropdown with URL shortener services.
$services, _('Automatic shortening service to use.'), $services,
false, $user->urlshorteningservice); _('Automatic shortening service to use.'),
false,
$user->urlshorteningservice
);
$this->elementEnd('li'); $this->elementEnd('li');
} }
$this->elementStart('li'); $this->elementStart('li');
$this->input('maxurllength', $this->input(
'maxurllength',
// TRANS: Field label in URL settings in profile. // TRANS: Field label in URL settings in profile.
_('URL longer than'), _('URL longer than'),
(!is_null($this->arg('maxurllength'))) ? ($this->arg('maxurllength') ?? User_urlshortener_prefs::maxUrlLength($user)),
$this->arg('maxurllength') : User_urlshortener_prefs::maxUrlLength($user),
// TRANS: Field title in URL settings in profile. // TRANS: Field title in URL settings in profile.
_('URLs longer than this will be shortened, -1 means never shorten because a URL is long.')); _('URLs longer than this will be shortened, -1 means never shorten because a URL is long.')
);
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementStart('li'); $this->elementStart('li');
$this->input('maxnoticelength', $this->input(
'maxnoticelength',
// TRANS: Field label in URL settings in profile. // TRANS: Field label in URL settings in profile.
_('Text longer than'), _('Text longer than'),
(!is_null($this->arg('maxnoticelength'))) ? ($this->arg('maxnoticelength') ?? User_urlshortener_prefs::maxNoticeLength($user)),
$this->arg('maxnoticelength') : User_urlshortener_prefs::maxNoticeLength($user),
// TRANS: Field title in URL settings in profile. // TRANS: Field title in URL settings in profile.
_('URLs in notices longer than this will always be shortened, -1 means only shorten if the full post exceeds maximum length.')); _('URLs in notices longer than this will always be shortened, -1 means only shorten if the full post exceeds maximum length.')
);
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementEnd('ul'); $this->elementEnd('ul');
// TRANS: Button text for saving "Other settings" in profile. // TRANS: Button text for saving "Other settings" in profile.
@ -177,7 +179,7 @@ class UrlsettingsAction extends SettingsAction
$user = $this->scoped->getUser(); $user = $this->scoped->getUser();
$user->query('BEGIN'); $user->query('START TRANSACTION');
$original = clone($user); $original = clone($user);

105
actions/useradminpanel.php
View File

@ -1,49 +1,42 @@
<?php <?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
/** /**
* StatusNet, the distributed open-source microblogging tool
*
* User administration panel * User administration panel
* *
* 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 Settings * @category Settings
* @package StatusNet * @package GNUsocial
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @author Zach Copley <zach@status.net> * @author Zach Copley <zach@status.net>
* @author Sarven Capadisli <csarven@status.net> * @author Sarven Capadisli <csarven@status.net>
* @copyright 2008-2010 StatusNet, Inc. * @copyright 2008-2010 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
if (!defined('STATUSNET')) { defined('GNUSOCIAL') || die();
exit(1);
}
/** /**
* Administer user settings * Administer user settings
* *
* @category Admin * @category Admin
* @package StatusNet * @package GNUsocial
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @author Zach Copley <zach@status.net> * @author Zach Copley <zach@status.net>
* @author Sarven Capadisli <csarven@status.net> * @author Sarven Capadisli <csarven@status.net>
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
class UseradminpanelAction extends AdminPanelAction class UseradminpanelAction extends AdminPanelAction
{ {
@ -52,7 +45,7 @@ class UseradminpanelAction extends AdminPanelAction
* *
* @return string page title * @return string page title
*/ */
function title() public function title()
{ {
// TRANS: User admin panel title. // TRANS: User admin panel title.
return _m('TITLE', 'User'); return _m('TITLE', 'User');
@ -63,7 +56,7 @@ class UseradminpanelAction extends AdminPanelAction
* *
* @return string instructions * @return string instructions
*/ */
function getInstructions() public function getInstructions()
{ {
// TRANS: Instruction for user admin panel. // TRANS: Instruction for user admin panel.
return _('User settings for this StatusNet site'); return _('User settings for this StatusNet site');
@ -74,7 +67,7 @@ class UseradminpanelAction extends AdminPanelAction
* *
* @return void * @return void
*/ */
function showForm() public function showForm()
{ {
$form = new UserAdminPanelForm($this); $form = new UserAdminPanelForm($this);
$form->show(); $form->show();
@ -86,7 +79,7 @@ class UseradminpanelAction extends AdminPanelAction
* *
* @return void * @return void
*/ */
function saveSettings() public function saveSettings()
{ {
static $settings = array( static $settings = array(
'profile' => array('biolimit'), 'profile' => array('biolimit'),
@ -119,7 +112,7 @@ class UseradminpanelAction extends AdminPanelAction
$config = new Config(); $config = new Config();
$config->query('BEGIN'); $config->query('START TRANSACTION');
foreach ($settings as $section => $parts) { foreach ($settings as $section => $parts) {
foreach ($parts as $setting) { foreach ($parts as $setting) {
@ -138,7 +131,7 @@ class UseradminpanelAction extends AdminPanelAction
return; return;
} }
function validate(&$values) public function validate(&$values)
{ {
// Validate biolimit // Validate biolimit
@ -180,7 +173,7 @@ class UserAdminPanelForm extends AdminForm
* *
* @return int ID of the form * @return int ID of the form
*/ */
function id() public function id()
{ {
return 'useradminpanel'; return 'useradminpanel';
} }
@ -190,7 +183,7 @@ class UserAdminPanelForm extends AdminForm
* *
* @return string class of the form * @return string class of the form
*/ */
function formClass() public function formClass()
{ {
return 'form_settings'; return 'form_settings';
} }
@ -200,7 +193,7 @@ class UserAdminPanelForm extends AdminForm
* *
* @return string URL of the action * @return string URL of the action
*/ */
function action() public function action()
{ {
return common_local_url('useradminpanel'); return common_local_url('useradminpanel');
} }
@ -210,7 +203,7 @@ class UserAdminPanelForm extends AdminForm
* *
* @return void * @return void
*/ */
function formData() public function formData()
{ {
$this->out->elementStart('fieldset', array('id' => 'settings_user-profile')); $this->out->elementStart('fieldset', array('id' => 'settings_user-profile'));
// TRANS: Fieldset legend in user administration panel. // TRANS: Fieldset legend in user administration panel.
@ -219,10 +212,13 @@ class UserAdminPanelForm extends AdminForm
$this->li(); $this->li();
// TRANS: Field label in user admin panel for setting the character limit for the bio field. // TRANS: Field label in user admin panel for setting the character limit for the bio field.
$this->input('biolimit', _('Bio Limit'), $this->input(
'biolimit',
_('Bio Limit'),
// TRANS: Tooltip in user admin panel for setting the character limit for the bio field. // TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
_('Maximum length of a profile bio in characters.'), _('Maximum length of a profile bio in characters.'),
'profile'); 'profile'
);
$this->unli(); $this->unli();
$this->out->elementEnd('ul'); $this->out->elementEnd('ul');
@ -235,18 +231,24 @@ class UserAdminPanelForm extends AdminForm
$this->li(); $this->li();
// TRANS: Field label in user admin panel for setting new user welcome text. // TRANS: Field label in user admin panel for setting new user welcome text.
$this->input('welcome', _('New user welcome'), $this->input(
'welcome',
_('New user welcome'),
// TRANS: Tooltip in user admin panel for setting new user welcome text. // TRANS: Tooltip in user admin panel for setting new user welcome text.
_('Welcome text for new users (maximum 255 characters).'), _('Welcome text for new users (maximum 255 characters).'),
'newuser'); 'newuser'
);
$this->unli(); $this->unli();
$this->li(); $this->li();
// TRANS: Field label in user admin panel for setting default subscription for new users. // TRANS: Field label in user admin panel for setting default subscription for new users.
$this->input('default', _('Default subscription'), $this->input(
'default',
_('Default subscription'),
// TRANS: Tooltip in user admin panel for setting default subscription for new users. // TRANS: Tooltip in user admin panel for setting default subscription for new users.
_('Automatically subscribe new users to this user.'), _('Automatically subscribe new users to this user.'),
'newuser'); 'newuser'
);
$this->unli(); $this->unli();
$this->out->elementEnd('ul'); $this->out->elementEnd('ul');
@ -261,10 +263,13 @@ class UserAdminPanelForm extends AdminForm
$this->li(); $this->li();
// TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail. // TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
$this->out->checkbox('invite-enabled', _('Invitations enabled'), $this->out->checkbox(
'invite-enabled',
_('Invitations enabled'),
(bool) $this->value('enabled', 'invite'), (bool) $this->value('enabled', 'invite'),
// TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail. // TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
_('Whether to allow users to invite new users.')); _('Whether to allow users to invite new users.')
);
$this->unli(); $this->unli();
$this->out->elementEnd('ul'); $this->out->elementEnd('ul');
@ -283,7 +288,7 @@ class UserAdminPanelForm extends AdminForm
* *
* @return void * @return void
*/ */
function input($setting, $title, $instructions, $section='site') public function input($setting, $title, $instructions, $section='site')
{ {
$this->out->input("$section-$setting", $title, $this->value($setting, $section), $instructions); $this->out->input("$section-$setting", $title, $this->value($setting, $section), $instructions);
} }
@ -293,14 +298,16 @@ class UserAdminPanelForm extends AdminForm
* *
* @return void * @return void
*/ */
function formActions() public function formActions()
{ {
$this->out->submit('submit', $this->out->submit(
'submit',
// TRANS: Button text to save user settings in user admin panel. // TRANS: Button text to save user settings in user admin panel.
_m('BUTTON', 'Save'), _m('BUTTON', 'Save'),
'submit', 'submit',
null, null,
// TRANS: Button title to save user settings in user admin panel. // TRANS: Button title to save user settings in user admin panel.
_('Save user settings.')); _('Save user settings.')
);
} }
} }

50
classes/Group_block.php
View File

@ -1,25 +1,29 @@
<?php <?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
/** /**
* Table Definition for group_block * Table Definition for group_block
* *
* StatusNet - the distributed open-source microblogging tool * @package GNUsocial
* Copyright (C) 2008, 2009, StatusNet, Inc. * @author Evan Prodromou <evan@status.net>
* * @copyright 2008, 2009 StatusNet, Inc.
* This program is free software: you can redistribute it and/or modify * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* 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/>.
*/ */
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } defined('GNUSOCIAL') || die();
require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
@ -55,20 +59,22 @@ class Group_block extends Managed_DataObject
); );
} }
static function isBlocked($group, $profile) public static function isBlocked($group, $profile)
{ {
$block = Group_block::pkeyGet(array('group_id' => $group->id, $block = Group_block::pkeyGet([
'blocked' => $profile->id)); 'group_id' => $group->id,
'blocked' => $profile->id,
]);
return !empty($block); return !empty($block);
} }
static function blockProfile($group, $profile, $blocker) public static function blockProfile($group, $profile, $blocker)
{ {
// Insert the block // Insert the block
$block = new Group_block(); $block = new Group_block();
$block->query('BEGIN'); $block->query('START TRANSACTION');
$block->group_id = $group->id; $block->group_id = $group->id;
$block->blocked = $profile->id; $block->blocked = $profile->id;
@ -103,7 +109,7 @@ class Group_block extends Managed_DataObject
return $block; return $block;
} }
static function unblockProfile($group, $profile) public static function unblockProfile($group, $profile)
{ {
$block = Group_block::pkeyGet(array('group_id' => $group->id, $block = Group_block::pkeyGet(array('group_id' => $group->id,
'blocked' => $profile->id)); 'blocked' => $profile->id));

2
classes/Managed_DataObject.php
View File

@ -546,7 +546,7 @@ abstract class Managed_DataObject extends Memcached_DataObject
$this->onUpdateKeys($orig); $this->onUpdateKeys($orig);
// do it in a transaction // do it in a transaction
$this->query('BEGIN'); $this->query('START TRANSACTION');
$parts = []; $parts = [];
foreach ($this->keys() as $k) { foreach ($this->keys() as $k) {

2
classes/Profile_list.php
View File

@ -609,7 +609,7 @@ class Profile_list extends Managed_DataObject
$ptag = new Profile_list(); $ptag = new Profile_list();
$ptag->query('BEGIN'); $ptag->query('START TRANSACTION');
if (empty($tagger)) { if (empty($tagger)) {
// TRANS: Server exception saving new tag without having a tagger specified. // TRANS: Server exception saving new tag without having a tagger specified.

2
classes/Profile_tag.php
View File

@ -197,7 +197,7 @@ class Profile_tag extends Managed_DataObject
} }
$plist = new Profile_list(); $plist = new Profile_list();
$plist->query('BEGIN'); $plist->query('START TRANSACTION');
$profile_list = Profile_list::ensureTag($tagger, $tag, $desc, $private); $profile_list = Profile_list::ensureTag($tagger, $tag, $desc, $private);

8
classes/User.php
View File

@ -275,7 +275,7 @@ class User extends Managed_DataObject
$user->created = common_sql_now(); $user->created = common_sql_now();
if (Event::handle('StartUserRegister', array($profile))) { if (Event::handle('StartUserRegister', array($profile))) {
$profile->query('BEGIN'); $profile->query('START TRANSACTION');
$id = $profile->insert(); $id = $profile->insert();
if ($id === false) { if ($id === false) {
@ -504,9 +504,7 @@ class User extends Managed_DataObject
$block = new Profile_block(); $block = new Profile_block();
// Begin a transaction $block->query('START TRANSACTION');
$block->query('BEGIN');
$block->blocker = $this->id; $block->blocker = $this->id;
$block->blocked = $other->id; $block->blocked = $other->id;
@ -842,7 +840,7 @@ class User extends Managed_DataObject
{ {
$qry = $qry =
'SELECT u.* ' . 'SELECT u.* ' .
'FROM oauth_application_user u, oauth_application a ' . 'FROM oauth_application_user AS u, oauth_application AS a ' .
'WHERE u.profile_id = %d ' . 'WHERE u.profile_id = %d ' .
'AND a.id = u.application_id ' . 'AND a.id = u.application_id ' .
'AND u.access_type > 0 ' . 'AND u.access_type > 0 ' .

2
classes/User_group.php
View File

@ -639,7 +639,7 @@ class User_group extends Managed_DataObject
$group->mainpage = $profile->profileurl; $group->mainpage = $profile->profileurl;
$group->created = $profile->created; $group->created = $profile->created;
$profile->query('BEGIN'); $profile->query('START TRANSACTION');
$id = $profile->insert(); $id = $profile->insert();
if ($id === false) { if ($id === false) {
$profile->query('ROLLBACK'); $profile->query('ROLLBACK');

42
lib/database/schemaupdater.php
View File

@ -1,34 +1,30 @@
<?php <?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
/** /**
* StatusNet, the distributed open-source microblogging tool
*
* Database schema utilities * Database schema utilities
* *
* 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 Database * @category Database
* @package StatusNet * @package GNUsocial
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @copyright 2009 StatusNet, Inc. * @copyright 2009 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
if (!defined('GNUSOCIAL')) { exit(1); } defined('GNUSOCIAL') || die();
class SchemaUpdater class SchemaUpdater
{ {
@ -64,13 +60,13 @@ class SchemaUpdater
$checksum = $this->checksum($def); $checksum = $this->checksum($def);
if (empty($checksums[$table])) { if (empty($checksums[$table])) {
common_log(LOG_DEBUG, "No previous schema_version for $table: updating to $checksum"); common_log(LOG_DEBUG, "No previous schema_version for $table: updating to $checksum");
} else if ($checksums[$table] == $checksum) { } elseif ($checksums[$table] === $checksum) {
common_log(LOG_DEBUG, "Last schema_version for $table up to date: $checksum"); common_log(LOG_DEBUG, "Last schema_version for $table up to date: $checksum");
continue; continue;
} else { } else {
common_log(LOG_DEBUG, "Last schema_version for $table is {$checksums[$table]}: updating to $checksum"); common_log(LOG_DEBUG, "Last schema_version for $table is {$checksums[$table]}: updating to $checksum");
} }
//$this->conn->query('BEGIN'); //$this->conn->query('START TRANSACTION');
$this->schema->ensureTable($table, $def); $this->schema->ensureTable($table, $def);
$this->saveChecksum($table, $checksum); $this->saveChecksum($table, $checksum);
//$this->conn->commit(); //$this->conn->commit();

2
lib/util/util.php
View File

@ -386,7 +386,7 @@ function common_rememberme($user=null)
// Wrap the insert in some good ol' fashioned transaction code // Wrap the insert in some good ol' fashioned transaction code
$rm->query('BEGIN'); $rm->query('START TRANSACTION');
$result = $rm->insert(); $result = $rm->insert();

88
plugins/BitlyUrl/actions/bitlyadminpanel.php
View File

@ -1,44 +1,38 @@
<?php <?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
/** /**
* StatusNet, the distributed open-source microblogging tool
*
* Admin panel for plugin to use bit.ly URL shortening services. * Admin panel for plugin to use bit.ly URL shortening services.
* *
* 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 Settings * @category Settings
* @package StatusNet * @package GNUsocial
* @author Brion Vibber <brion@status.net> * @author Brion Vibber <brion@status.net>
* @copyright 2010 StatusNet, Inc. * @copyright 2010 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
if (!defined('STATUSNET')) { defined('GNUSOCIAL') || die();
exit(1);
}
/** /**
* Administer global bit.ly URL shortener settings * Administer global bit.ly URL shortener settings
* *
* @category Admin * @category Admin
* @package StatusNet * @package GNUsocial
* @author Brion Vibber <brion@status.net> * @author Brion Vibber <brion@status.net>
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
class BitlyadminpanelAction extends AdminPanelAction class BitlyadminpanelAction extends AdminPanelAction
{ {
@ -47,7 +41,7 @@ class BitlyadminpanelAction extends AdminPanelAction
* *
* @return string page title * @return string page title
*/ */
function title() public function title()
{ {
// TRANS: Title of administration panel. // TRANS: Title of administration panel.
return _m('bit.ly URL shortening'); return _m('bit.ly URL shortening');
@ -58,7 +52,7 @@ class BitlyadminpanelAction extends AdminPanelAction
* *
* @return string instructions * @return string instructions
*/ */
function getInstructions() public function getInstructions()
{ {
// TRANS: Instructions for administration panel. // TRANS: Instructions for administration panel.
// TRANS: This message contains Markdown links in the form [decsription](link). // TRANS: This message contains Markdown links in the form [decsription](link).
@ -73,7 +67,7 @@ class BitlyadminpanelAction extends AdminPanelAction
* *
* @return void * @return void
*/ */
function showForm() public function showForm()
{ {
$form = new BitlyAdminPanelForm($this); $form = new BitlyAdminPanelForm($this);
$form->show(); $form->show();
@ -85,7 +79,7 @@ class BitlyadminpanelAction extends AdminPanelAction
* *
* @return void * @return void
*/ */
function saveSettings() public function saveSettings()
{ {
static $settings = array( static $settings = array(
'bitly' => array('default_login', 'default_apikey') 'bitly' => array('default_login', 'default_apikey')
@ -108,7 +102,7 @@ class BitlyadminpanelAction extends AdminPanelAction
$config = new Config(); $config = new Config();
$config->query('BEGIN'); $config->query('START TRANSACTION');
foreach ($settings as $section => $parts) { foreach ($settings as $section => $parts) {
foreach ($parts as $setting) { foreach ($parts as $setting) {
@ -121,7 +115,7 @@ class BitlyadminpanelAction extends AdminPanelAction
return; return;
} }
function validate(&$values) public function validate(&$values)
{ {
// Validate consumer key and secret (can't be too long) // Validate consumer key and secret (can't be too long)
@ -148,7 +142,7 @@ class BitlyAdminPanelForm extends AdminForm
* *
* @return int ID of the form * @return int ID of the form
*/ */
function id() public function id()
{ {
return 'bitlyadminpanel'; return 'bitlyadminpanel';
} }
@ -158,7 +152,7 @@ class BitlyAdminPanelForm extends AdminForm
* *
* @return string class of the form * @return string class of the form
*/ */
function formClass() public function formClass()
{ {
return 'form_settings'; return 'form_settings';
} }
@ -168,7 +162,7 @@ class BitlyAdminPanelForm extends AdminForm
* *
* @return string URL of the action * @return string URL of the action
*/ */
function action() public function action()
{ {
return common_local_url('bitlyadminpanel'); return common_local_url('bitlyadminpanel');
} }
@ -178,7 +172,7 @@ class BitlyAdminPanelForm extends AdminForm
* *
* @return void * @return void
*/ */
function formData() public function formData()
{ {
$this->out->elementStart( $this->out->elementStart(
'fieldset', 'fieldset',
@ -192,13 +186,19 @@ class BitlyAdminPanelForm extends AdminForm
Event::handle('BitlyDefaultCredentials', array(&$login, &$apiKey)); Event::handle('BitlyDefaultCredentials', array(&$login, &$apiKey));
$haveGlobalDefaults = ($login && $apiKey); $haveGlobalDefaults = ($login && $apiKey);
if ($login && $apiKey) { if ($login && $apiKey) {
$this->out->element('p', 'form_guide', $this->out->element(
'p',
'form_guide',
// TRANS: Form guide in administration panel for bit.ly URL shortening. // TRANS: Form guide in administration panel for bit.ly URL shortening.
_m('Leave these empty to use global default credentials.')); _m('Leave these empty to use global default credentials.')
);
} else { } else {
$this->out->element('p', 'form_guide', $this->out->element(
'p',
'form_guide',
// TRANS: Form guide in administration panel for bit.ly URL shortening. // TRANS: Form guide in administration panel for bit.ly URL shortening.
_m('If you leave these empty, bit.ly will be unavailable to users.')); _m('If you leave these empty, bit.ly will be unavailable to users.')
);
} }
$this->out->elementStart('ul', 'form_data'); $this->out->elementStart('ul', 'form_data');
@ -231,14 +231,16 @@ class BitlyAdminPanelForm extends AdminForm
* *
* @return void * @return void
*/ */
function formActions() public function formActions()
{ {
$this->out->submit('submit', $this->out->submit(
'submit',
// TRANS: Button text to save setting in administration panel for bit.ly URL shortening. // TRANS: Button text to save setting in administration panel for bit.ly URL shortening.
_m('BUTTON', 'Save'), _m('BUTTON', 'Save'),
'submit', 'submit',
null, null,
// TRANS: Button title to save setting in administration panel for bit.ly URL shortening. // TRANS: Button title to save setting in administration panel for bit.ly URL shortening.
_m('Save bit.ly settings')); _m('Save bit.ly settings')
);
} }
} }

49
plugins/MentionURL/classes/Mention_url_profile.php
View File

@ -1,20 +1,20 @@
<?php <?php
/* // This file is part of GNU social - https://www.gnu.org/software/social
* 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 // GNU social is free software: you can redistribute it and/or modify
* the Free Software Foundation, either version 3 of the License, or // it under the terms of the GNU Affero General Public License as published by
* (at your option) any later version. // 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 // GNU social is distributed in the hope that it will be useful,
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // but WITHOUT ANY WARRANTY; without even the implied warranty of
* GNU Affero General Public License for more details. // 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/>. // You should have received a copy of the GNU Affero General Public License
*/ // along with GNU social. If not, see <http://www.gnu.org/licenses/>.
if (!defined('GNUSOCIAL')) { exit(1); } defined('GNUSOCIAL') || die();
/** /**
* Table Definition for mention_url_profile * Table Definition for mention_url_profile
@ -40,7 +40,8 @@ class Mention_url_profile extends Managed_DataObject
); );
} }
public static function fromUrl($url, $depth=0) { public static function fromUrl($url, $depth = 0)
{
common_debug('MentionURL: trying to find a profile for ' . $url); common_debug('MentionURL: trying to find a profile for ' . $url);
$url = preg_replace('#https?://#', 'https://', $url); $url = preg_replace('#https?://#', 'https://', $url);
@ -65,16 +66,20 @@ class Mention_url_profile extends Managed_DataObject
if (!($profile instanceof Profile)) { if (!($profile instanceof Profile)) {
$hcard = mention_url_representative_hcard($url); $hcard = mention_url_representative_hcard($url);
if(!$hcard) return null; if (!$hcard) {
return null;
}
$mention_profile = new Mention_url_profile(); $mention_profile = new Mention_url_profile();
$mention_profile->query('BEGIN'); $mention_profile->query('START TRANSACTION');
$profile = new Profile(); $profile = new Profile();
$profile->profileurl = $hcard['url'][0]; $profile->profileurl = $hcard['url'][0];
$profile->fullname = $hcard['name'][0]; $profile->fullname = $hcard['name'][0];
preg_match('/\/([^\/]+)\/*$/', $profile->profileurl, $matches); preg_match('/\/([^\/]+)\/*$/', $profile->profileurl, $matches);
if(!$hcard['nickname']) $hcard['nickname'] = array($matches[1]); if (!$hcard['nickname']) {
$hcard['nickname'] = [$matches[1]];
}
$profile->nickname = $hcard['nickname'][0]; $profile->nickname = $hcard['nickname'][0];
$profile->created = common_sql_now(); $profile->created = common_sql_now();
@ -100,7 +105,8 @@ class Mention_url_profile extends Managed_DataObject
return $profile; return $profile;
} }
protected static function findProfileByProfileURL($url) { protected static function findProfileByProfileURL($url)
{
$profile = Profile::getKV('profileurl', $url); $profile = Profile::getKV('profileurl', $url);
if ($profile instanceof Profile) { if ($profile instanceof Profile) {
$mention_profile = new Mention_url_profile(); $mention_profile = new Mention_url_profile();
@ -112,7 +118,8 @@ class Mention_url_profile extends Managed_DataObject
return $profile; return $profile;
} }
public function getProfile() { public function getProfile()
{
return Profile::getKV('id', $this->profile_id); return Profile::getKV('id', $this->profile_id);
} }
} }

152
plugins/OStatus/classes/Ostatus_profile.php
View File

@ -1,28 +1,34 @@
<?php <?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
/* /*
* StatusNet - the distributed open-source microblogging tool * @package GNUsocial
* Copyright (C) 2009-2010, StatusNet, Inc. * @author Brion Vibber <brion@status.net>
* * @author Mikael Nordfeldth <mmn@hethane.se>
* This program is free software: you can redistribute it and/or modify * @copyright 2009-2010 StatusNet, Inc.
* it under the terms of the GNU Affero General Public License as published by * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* 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/>.
*/ */
if (!defined('GNUSOCIAL')) { exit(1); } defined('GNUSOCIAL') || die();
/** /**
* @package OStatusPlugin * @package OStatusPlugin
* @author Brion Vibber <brion@status.net> * @author Brion Vibber <brion@status.net>
* @maintainer Mikael Nordfeldth <mmn@hethane.se> * @author Mikael Nordfeldth <mmn@hethane.se>
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/ */
class Ostatus_profile extends Managed_DataObject class Ostatus_profile extends Managed_DataObject
{ {
@ -46,7 +52,7 @@ class Ostatus_profile extends Managed_DataObject
* *
* @return array array of column definitions * @return array array of column definitions
*/ */
static function schemaDef() public static function schemaDef()
{ {
return array( return array(
'fields' => array( 'fields' => array(
@ -96,7 +102,7 @@ class Ostatus_profile extends Managed_DataObject
return FeedSub::getByUri($this->feeduri); return FeedSub::getByUri($this->feeduri);
} }
static function fromProfile(Profile $profile) public static function fromProfile(Profile $profile)
{ {
$oprofile = Ostatus_profile::getKV('profile_id', $profile->getID()); $oprofile = Ostatus_profile::getKV('profile_id', $profile->getID());
if (!$oprofile instanceof Ostatus_profile) { if (!$oprofile instanceof Ostatus_profile) {
@ -156,7 +162,7 @@ class Ostatus_profile extends Managed_DataObject
* *
* @return ActivityObject * @return ActivityObject
*/ */
function asActivityObject() public function asActivityObject()
{ {
if ($this->isGroup()) { if ($this->isGroup()) {
return ActivityObject::fromGroup($this->localGroup()); return ActivityObject::fromGroup($this->localGroup());
@ -178,7 +184,7 @@ class Ostatus_profile extends Managed_DataObject
* @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) public function asActivityNoun($element)
{ {
if ($this->isGroup()) { if ($this->isGroup()) {
$noun = ActivityObject::fromGroup($this->localGroup()); $noun = ActivityObject::fromGroup($this->localGroup());
@ -195,7 +201,7 @@ class Ostatus_profile extends Managed_DataObject
/** /**
* @return boolean true if this is a remote group * @return boolean true if this is a remote group
*/ */
function isGroup() public function isGroup()
{ {
if ($this->profile_id || $this->peopletag_id && !$this->group_id) { if ($this->profile_id || $this->peopletag_id && !$this->group_id) {
return false; return false;
@ -218,7 +224,7 @@ class Ostatus_profile extends Managed_DataObject
/** /**
* @return boolean true if this is a remote peopletag * @return boolean true if this is a remote peopletag
*/ */
function isPeopletag() public function isPeopletag()
{ {
if ($this->profile_id || $this->group_id && !$this->peopletag_id) { if ($this->profile_id || $this->group_id && !$this->peopletag_id) {
return false; return false;
@ -260,7 +266,8 @@ class Ostatus_profile extends Managed_DataObject
* @return boolean true if subscription is removed, false if there are still subscribers to the feed * @return boolean true if subscription is removed, false if there are still subscribers to the feed
* @throws Exception of various kinds on failure. * @throws Exception of various kinds on failure.
*/ */
public function unsubscribe() { public function unsubscribe()
{
return $this->garbageCollect(); return $this->garbageCollect();
} }
@ -334,10 +341,12 @@ class Ostatus_profile extends Managed_DataObject
return false; return false;
} }
$text = 'update'; $text = 'update';
$id = TagURI::mint('%s:%s:%s', $id = TagURI::mint(
'%s:%s:%s',
$verb, $verb,
$actor->getURI(), $actor->getURI(),
common_date_iso8601(time())); common_date_iso8601(time())
);
// @todo FIXME: Consolidate all these NS settings somewhere. // @todo FIXME: Consolidate all these NS settings somewhere.
$attributes = array('xmlns' => Activity::ATOM, $attributes = array('xmlns' => Activity::ATOM,
@ -431,7 +440,7 @@ class Ostatus_profile extends Managed_DataObject
} }
} }
function getBestName() public function getBestName()
{ {
if ($this->isGroup()) { if ($this->isGroup()) {
return $this->localGroup()->getBestName(); return $this->localGroup()->getBestName();
@ -456,7 +465,8 @@ class Ostatus_profile extends Managed_DataObject
if ($feed->localName == 'feed' && $feed->namespaceURI == Activity::ATOM) { if ($feed->localName == 'feed' && $feed->namespaceURI == Activity::ATOM) {
$this->processAtomFeed($feed, $source); $this->processAtomFeed($feed, $source);
} else if ($feed->localName == 'rss') { // @todo FIXME: Check namespace. } elseif ($feed->localName == 'rss') {
// @todo FIXME: Check namespace.
$this->processRssFeed($feed, $source); $this->processRssFeed($feed, $source);
} else { } else {
// TRANS: Exception. // TRANS: Exception.
@ -532,7 +542,6 @@ class Ostatus_profile extends Managed_DataObject
if (Event::handle('StartHandleFeedEntryWithProfile', array($activity, $this->localProfile(), &$notice)) && if (Event::handle('StartHandleFeedEntryWithProfile', array($activity, $this->localProfile(), &$notice)) &&
Event::handle('StartHandleFeedEntry', array($activity))) { Event::handle('StartHandleFeedEntry', array($activity))) {
common_log(LOG_INFO, "Ignoring activity with unrecognized verb $activity->verb"); common_log(LOG_INFO, "Ignoring activity with unrecognized verb $activity->verb");
Event::handle('EndHandleFeedEntry', array($activity)); Event::handle('EndHandleFeedEntry', array($activity));
@ -569,7 +578,7 @@ class Ostatus_profile extends Managed_DataObject
* @param array in/out &$attention_uris set of URIs, will be pruned on output * @param array in/out &$attention_uris set of URIs, will be pruned on output
* @return array of group IDs * @return array of group IDs
*/ */
static public function filterAttention(Profile $sender, array $attention) public static function filterAttention(Profile $sender, array $attention)
{ {
common_log(LOG_DEBUG, "Original reply recipients: " . implode(', ', array_keys($attention))); common_log(LOG_DEBUG, "Original reply recipients: " . implode(', ', array_keys($attention)));
$groups = array(); $groups = array();
@ -617,7 +626,6 @@ class Ostatus_profile extends Managed_DataObject
// Neither a recognizable local nor remote user! // Neither a recognizable local nor remote user!
common_log(LOG_DEBUG, "Skipping reply to unrecognized profile $recipient: " . $e->getMessage()); common_log(LOG_DEBUG, "Skipping reply to unrecognized profile $recipient: " . $e->getMessage());
} }
} }
common_log(LOG_DEBUG, "Local reply recipients: " . implode(', ', $replies)); common_log(LOG_DEBUG, "Local reply recipients: " . implode(', ', $replies));
common_log(LOG_DEBUG, "Local group recipients: " . implode(', ', $groups)); common_log(LOG_DEBUG, "Local group recipients: " . implode(', ', $groups));
@ -661,7 +669,6 @@ class Ostatus_profile extends Managed_DataObject
$finalUrl = $response->getEffectiveUrl(); $finalUrl = $response->getEffectiveUrl();
if ($finalUrl != $profile_url) { if ($finalUrl != $profile_url) {
$hints['profileurl'] = $finalUrl; $hints['profileurl'] = $finalUrl;
$oprofile = self::getFromProfileURL($finalUrl); $oprofile = self::getFromProfileURL($finalUrl);
@ -673,8 +680,13 @@ class Ostatus_profile extends Managed_DataObject
if (in_array( if (in_array(
preg_replace('/\s*;.*$/', '', $response->getHeader('Content-Type')), preg_replace('/\s*;.*$/', '', $response->getHeader('Content-Type')),
array('application/rss+xml', 'application/atom+xml', 'application/xml', 'text/xml')) [
) { 'application/rss+xml',
'application/atom+xml',
'application/xml',
'text/xml',
]
)) {
$hints['feedurl'] = $response->getEffectiveUrl(); $hints['feedurl'] = $response->getEffectiveUrl();
} else { } else {
// Try to get some hCard data // Try to get some hCard data
@ -729,7 +741,7 @@ class Ostatus_profile extends Managed_DataObject
* @return mixed Ostatus_profile or null * @return mixed Ostatus_profile or null
* @throws OStatusShadowException for local profiles * @throws OStatusShadowException for local profiles
*/ */
static function getFromProfileURL($profile_url) public static function getFromProfileURL($profile_url)
{ {
$profile = Profile::getKV('profileurl', $profile_url); $profile = Profile::getKV('profileurl', $profile_url);
if (!$profile instanceof Profile) { if (!$profile instanceof Profile) {
@ -756,7 +768,7 @@ class Ostatus_profile extends Managed_DataObject
return null; return null;
} }
static function getFromProfile(Profile $profile) public static function getFromProfile(Profile $profile)
{ {
$oprofile = new Ostatus_profile(); $oprofile = new Ostatus_profile();
$oprofile->profile_id = $profile->id; $oprofile->profile_id = $profile->id;
@ -877,7 +889,9 @@ class Ostatus_profile extends Managed_DataObject
// with different <author> or <dc:creator> elements, and... I dunno. // with different <author> or <dc:creator> elements, and... I dunno.
// Do something about that. // Do something about that.
if(empty($obj)) { $obj = ActivityObject::fromRssChannel($feedEl); } if (empty($obj)) {
$obj = ActivityObject::fromRssChannel($feedEl);
}
return self::ensureActivityObjectProfile($obj, $hints); return self::ensureActivityObjectProfile($obj, $hints);
} }
@ -927,10 +941,12 @@ class Ostatus_profile extends Managed_DataObject
$id = $this->profile_id; $id = $this->profile_id;
} }
$imagefile = new ImageFile(null, $temp_filename); $imagefile = new ImageFile(null, $temp_filename);
$filename = Avatar::filename($id, $filename = Avatar::filename(
$id,
image_type_to_extension($imagefile->type), image_type_to_extension($imagefile->type),
null, null,
common_timestamp()); common_timestamp()
);
rename($temp_filename, Avatar::path($filename)); rename($temp_filename, Avatar::path($filename));
} catch (Exception $e) { } catch (Exception $e) {
unlink($temp_filename); unlink($temp_filename);
@ -960,7 +976,7 @@ class Ostatus_profile extends Managed_DataObject
* @param array $hints * @param array $hints
* @return mixed URL string or false * @return mixed URL string or false
*/ */
public static function getActivityObjectAvatar(ActivityObject $object, array $hints=array()) public static function getActivityObjectAvatar(ActivityObject $object, array $hints = [])
{ {
if ($object->avatarLinks) { if ($object->avatarLinks) {
$best = false; $best = false;
@ -1243,7 +1259,7 @@ class Ostatus_profile extends Managed_DataObject
} }
} elseif ($object->type == ActivityObject::GROUP) { } elseif ($object->type == ActivityObject::GROUP) {
$profile = new Profile(); $profile = new Profile();
$profile->query('BEGIN'); $profile->query('START TRANSACTION');
$group = new User_group(); $group = new User_group();
$group->uri = $homeuri; $group->uri = $homeuri;
@ -1446,7 +1462,8 @@ class Ostatus_profile extends Managed_DataObject
} }
} }
protected static function updatePeopletag($tag, ActivityObject $object, array $hints=array()) { protected static function updatePeopletag($tag, ActivityObject $object, array $hints=array())
{
$orig = clone($tag); $orig = clone($tag);
$tag->tag = $object->title; $tag->tag = $object->title;
@ -1659,8 +1676,10 @@ class Ostatus_profile extends Managed_DataObject
throw new Exception(_m('Not a valid webfinger address.')); throw new Exception(_m('Not a valid webfinger address.'));
} }
$hints = array_merge(array('webfinger' => $addr), $hints = array_merge(
DiscoveryHints::fromXRD($xrd)); ['webfinger' => $addr],
DiscoveryHints::fromXRD($xrd)
);
// If there's an Hcard, let's grab its info // If there's an Hcard, let's grab its info
if (array_key_exists('hcard', $hints)) { if (array_key_exists('hcard', $hints)) {
@ -1774,20 +1793,26 @@ class Ostatus_profile extends Managed_DataObject
* @param string $rendered HTML fragment for HTML page's body * @param string $rendered HTML fragment for HTML page's body
* @return File * @return File
*/ */
function saveHTMLFile($title, $rendered) public function saveHTMLFile($title, $rendered)
{ {
$final = sprintf("<!DOCTYPE html>\n" . $final = sprintf(
'<html><head>' . <<<'END'
'<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">' . <!DOCTYPE html>
'<title>%s</title>' . <html><head>
'</head>' . <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
'<body>%s</body></html>', <title>%s</title>
</head>
<body>%s</body></html>
END,
htmlspecialchars($title), htmlspecialchars($title),
$rendered); $rendered
);
$filename = File::filename($this->localProfile(), $filename = File::filename(
$this->localProfile(),
'ostatus', // ignored? 'ostatus', // ignored?
'text/html'); 'text/html'
);
$filepath = File::path($filename); $filepath = File::path($filename);
$fileurl = File::url($filename); $fileurl = File::url($filename);
@ -1814,7 +1839,7 @@ class Ostatus_profile extends Managed_DataObject
return $file; return $file;
} }
static function ensureProfileURI($uri) public static function ensureProfileURI($uri)
{ {
$oprofile = null; $oprofile = null;
@ -1842,9 +1867,11 @@ class Ostatus_profile extends Managed_DataObject
default: default:
// TRANS: Server exception. // TRANS: Server exception.
// TRANS: %1$s is a protocol, %2$s is a URI. // TRANS: %1$s is a protocol, %2$s is a URI.
throw new ServerException(sprintf(_m('Unrecognized URI protocol for profile: %1$s (%2$s).'), throw new ServerException(sprintf(
_m('Unrecognized URI protocol for profile: %1$s (%2$s).'),
$protocol, $protocol,
$uri)); $uri
));
} }
} else { } else {
// TRANS: Server exception. %s is a URI. // TRANS: Server exception. %s is a URI.
@ -1861,9 +1888,11 @@ class Ostatus_profile extends Managed_DataObject
$oprofile = self::ensureActorProfile($activity); $oprofile = self::ensureActorProfile($activity);
if ($oprofile->isGroup() || $oprofile->isPeopletag()) { if ($oprofile->isGroup() || $oprofile->isPeopletag()) {
// Groups can't post notices in StatusNet. // Groups can't post notices in StatusNet.
common_log(LOG_WARNING, common_log(
"OStatus: skipping post with group listed ". LOG_WARNING,
"as author: " . $oprofile->getUri() . " in feed from " . $this->getUri()); 'OStatus: skipping post with group listed as author: '
. "{$oprofile->getUri()} in feed from {$this->getUri()}"
);
throw new ServerException('Activity author is a non-actor'); throw new ServerException('Activity author is a non-actor');
} }
} else { } else {
@ -1871,7 +1900,8 @@ class Ostatus_profile extends Managed_DataObject
if (empty($actor)) { if (empty($actor)) {
// OK here! assume the default // OK here! assume the default
} else if ($actor->id == $this->getUri() || $actor->link == $this->getUri()) { } elseif ($actor->id == $this->getUri()
|| $actor->link == $this->getUri()) {
$this->updateFromActivityObject($actor); $this->updateFromActivityObject($actor);
} elseif ($actor->id) { } elseif ($actor->id) {
// We have an ActivityStreams actor with an explicit ID that doesn't match the feed owner. // We have an ActivityStreams actor with an explicit ID that doesn't match the feed owner.

48
plugins/OpenID/actions/finishaddopenid.php
View File

@ -1,35 +1,30 @@
<?php <?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
/** /**
* StatusNet, the distributed open-source microblogging tool
*
* Complete adding an OpenID * Complete adding an OpenID
* *
* 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 Settings * @category Settings
* @package StatusNet * @package GNUsocial
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @copyright 2008-2009 StatusNet, Inc. * @copyright 2008-2009 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
if (!defined('STATUSNET')) { defined('GNUSOCIAL') || die();
exit(1);
}
require_once INSTALLDIR.'/plugins/OpenID/openid.php'; require_once INSTALLDIR.'/plugins/OpenID/openid.php';
@ -39,10 +34,9 @@ require_once INSTALLDIR.'/plugins/OpenID/openid.php';
* Handle the return from an OpenID verification * Handle the return from an OpenID verification
* *
* @category Settings * @category Settings
* @package StatusNet * @package GNUsocial
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
class FinishaddopenidAction extends Action class FinishaddopenidAction extends Action
{ {
@ -128,7 +122,7 @@ class FinishaddopenidAction extends Action
// start a transaction // start a transaction
$cur->query('BEGIN'); $cur->query('START TRANSACTION');
$result = oid_link_user($cur->id, $canonical, $display); $result = oid_link_user($cur->id, $canonical, $display);

2
plugins/OpenID/actions/finishsynchopenid.php
View File

@ -104,7 +104,7 @@ class FinishsynchopenidAction extends Action
// start a transaction // start a transaction
$cur->query('BEGIN'); $cur->query('START TRANSACTION');
if (Event::handle('StartOpenIDUpdateUser', [$cur, $canonical, &$sreg])) { if (Event::handle('StartOpenIDUpdateUser', [$cur, $canonical, &$sreg])) {
if (!oid_update_user($cur, $sreg)) { if (!oid_update_user($cur, $sreg)) {

90
plugins/OpenID/actions/openidadminpanel.php
View File

@ -1,44 +1,38 @@
<?php <?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
/** /**
* StatusNet, the distributed open-source microblogging tool
*
* OpenID bridge administration panel * OpenID bridge administration panel
* *
* 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 Settings * @category Settings
* @package StatusNet * @package GNUsocial
* @author Zach Copley <zach@status.net> * @author Zach Copley <zach@status.net>
* @copyright 2010 StatusNet, Inc. * @copyright 2010 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
if (!defined('STATUSNET')) { defined('GNUSOCIAL') || die();
exit(1);
}
/** /**
* Administer global OpenID settings * Administer global OpenID settings
* *
* @category Admin * @category Admin
* @package StatusNet * @package GNUsocial
* @author Zach Copley <zach@status.net> * @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 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
class OpenidadminpanelAction extends AdminPanelAction class OpenidadminpanelAction extends AdminPanelAction
{ {
@ -47,7 +41,7 @@ class OpenidadminpanelAction extends AdminPanelAction
* *
* @return string page title * @return string page title
*/ */
function title() public function title()
{ {
// TRANS: Title for OpenID bridge administration page. // TRANS: Title for OpenID bridge administration page.
return _m('TITLE', 'OpenID Settings'); return _m('TITLE', 'OpenID Settings');
@ -58,7 +52,7 @@ class OpenidadminpanelAction extends AdminPanelAction
* *
* @return string instructions * @return string instructions
*/ */
function getInstructions() public function getInstructions()
{ {
// TRANS: Page instructions. // TRANS: Page instructions.
return _m('OpenID settings'); return _m('OpenID settings');
@ -69,7 +63,7 @@ class OpenidadminpanelAction extends AdminPanelAction
* *
* @return void * @return void
*/ */
function showForm() public function showForm()
{ {
$form = new OpenIDAdminPanelForm($this); $form = new OpenIDAdminPanelForm($this);
$form->show(); $form->show();
@ -81,7 +75,7 @@ class OpenidadminpanelAction extends AdminPanelAction
* *
* @return void * @return void
*/ */
function saveSettings() public function saveSettings()
{ {
static $settings = array( static $settings = array(
'openid' => array('trusted_provider', 'required_team') 'openid' => array('trusted_provider', 'required_team')
@ -116,7 +110,7 @@ class OpenidadminpanelAction extends AdminPanelAction
$config = new Config(); $config = new Config();
$config->query('BEGIN'); $config->query('START TRANSACTION');
foreach ($settings as $section => $parts) { foreach ($settings as $section => $parts) {
foreach ($parts as $setting) { foreach ($parts as $setting) {
@ -135,7 +129,7 @@ class OpenidadminpanelAction extends AdminPanelAction
return; return;
} }
function validate(&$values) public function validate(&$values)
{ {
// Validate consumer key and secret (can't be too long) // Validate consumer key and secret (can't be too long)
@ -162,7 +156,7 @@ class OpenIDAdminPanelForm extends AdminForm
* *
* @return int ID of the form * @return int ID of the form
*/ */
function id() public function id()
{ {
return 'openidadminpanel'; return 'openidadminpanel';
} }
@ -172,7 +166,7 @@ class OpenIDAdminPanelForm extends AdminForm
* *
* @return string class of the form * @return string class of the form
*/ */
function formClass() public function formClass()
{ {
return 'form_settings'; return 'form_settings';
} }
@ -182,7 +176,7 @@ class OpenIDAdminPanelForm extends AdminForm
* *
* @return string URL of the action * @return string URL of the action
*/ */
function action() public function action()
{ {
return common_local_url('openidadminpanel'); return common_local_url('openidadminpanel');
} }
@ -196,7 +190,7 @@ class OpenIDAdminPanelForm extends AdminForm
* Make sure that the acting administrator has a valid OpenID matching, * Make sure that the acting administrator has a valid OpenID matching,
* or more carefully warn folks. * or more carefully warn folks.
*/ */
function formData() public function formData()
{ {
$this->out->elementStart( $this->out->elementStart(
'fieldset', 'fieldset',
@ -204,11 +198,14 @@ class OpenIDAdminPanelForm extends AdminForm
); );
// TRANS: Fieldset legend. // TRANS: Fieldset legend.
$this->out->element('legend', null, _m('LEGEND', 'Trusted provider')); $this->out->element('legend', null, _m('LEGEND', 'Trusted provider'));
$this->out->element('p', 'form_guide', $this->out->element(
'p',
'form_guide',
// TRANS: Form guide. // TRANS: Form guide.
_m('By default, users are allowed to authenticate with any OpenID provider. ' . _m('By default, users are allowed to authenticate with any OpenID provider. ' .
'If you are using your own OpenID service for shared sign-in, ' . 'If you are using your own OpenID service for shared sign-in, ' .
'you can restrict access to only your own users here.')); 'you can restrict access to only your own users here.')
);
$this->out->elementStart('ul', 'form_data'); $this->out->elementStart('ul', 'form_data');
$this->li(); $this->li();
@ -225,7 +222,8 @@ class OpenIDAdminPanelForm extends AdminForm
$this->li(); $this->li();
$this->out->checkbox( $this->out->checkbox(
// TRANS: Checkbox label. // TRANS: Checkbox label.
'append_username', _m('Append a username to base URL'), 'append_username',
_m('Append a username to base URL'),
(bool) $this->value('append_username', 'openid'), (bool) $this->value('append_username', 'openid'),
// TRANS: Checkbox title. // TRANS: Checkbox title.
_m('Login form will show the base URL and prompt for a username to add at the end. Use when OpenID provider URL should be the profile page for individual users.'), _m('Login form will show the base URL and prompt for a username to add at the end. Use when OpenID provider URL should be the profile page for individual users.'),
@ -260,7 +258,8 @@ class OpenIDAdminPanelForm extends AdminForm
$this->out->checkbox( $this->out->checkbox(
// TRANS: Checkbox label. // TRANS: Checkbox label.
'openidonly', _m('Enable OpenID-only mode'), 'openidonly',
_m('Enable OpenID-only mode'),
(bool) $this->value('openidonly', 'site'), (bool) $this->value('openidonly', 'site'),
// TRANS: Checkbox title. // TRANS: Checkbox title.
_m('Require all users to login via OpenID. Warning: disables password authentication for all users!'), _m('Require all users to login via OpenID. Warning: disables password authentication for all users!'),
@ -278,11 +277,16 @@ class OpenIDAdminPanelForm extends AdminForm
* *
* @return void * @return void
*/ */
function formActions() public function formActions()
{ {
// TRANS: Button text to save OpenID settings. // TRANS: Button text to save OpenID settings.
$this->out->submit('submit', _m('BUTTON','Save'), 'submit', null, $this->out->submit(
'submit',
_m('BUTTON', 'Save'),
'submit',
null,
// TRANS: Button title to save OpenID settings. // TRANS: Button title to save OpenID settings.
_m('Save OpenID settings.')); _m('Save OpenID settings.')
);
} }
} }

75
plugins/OverwriteThemeBackground/actions/overwritethemebackgroundadminpanel.php
View File

@ -59,7 +59,7 @@ class OverwriteThemeBackgroundAdminPanelAction extends AdminPanelAction
* *
* @return void * @return void
*/ */
function showForm() public function showForm()
{ {
$form = new OverwriteThemeBackgroundAdminPanelForm($this); $form = new OverwriteThemeBackgroundAdminPanelForm($this);
$form->show(); $form->show();
@ -71,7 +71,7 @@ class OverwriteThemeBackgroundAdminPanelAction extends AdminPanelAction
* *
* @return void * @return void
*/ */
function saveSettings() public function saveSettings()
{ {
static $settings = [ static $settings = [
'overwritethemebackground' => [ 'overwritethemebackground' => [
@ -100,7 +100,7 @@ class OverwriteThemeBackgroundAdminPanelAction extends AdminPanelAction
$config = new Config(); $config = new Config();
$config->query('BEGIN'); $config->query('START TRANSACTION');
foreach ($settings as $section => $parts) { foreach ($settings as $section => $parts) {
foreach ($parts as $setting) { foreach ($parts as $setting) {
@ -119,7 +119,7 @@ class OverwriteThemeBackgroundAdminPanelAction extends AdminPanelAction
* @param $values * @param $values
* @throws ClientException * @throws ClientException
*/ */
function validate(&$values) public function validate(&$values)
{ {
// Validate background // Validate background
if (!empty($values['overwritethemebackground']['background-image']) && if (!empty($values['overwritethemebackground']['background-image']) &&
@ -149,7 +149,7 @@ class OverwriteThemeBackgroundAdminPanelForm extends AdminForm
* *
* @return int ID of the form * @return int ID of the form
*/ */
function id() public function id()
{ {
return 'form_site_admin_panel'; return 'form_site_admin_panel';
} }
@ -159,7 +159,7 @@ class OverwriteThemeBackgroundAdminPanelForm extends AdminForm
* *
* @return string class of the form * @return string class of the form
*/ */
function formClass() public function formClass()
{ {
return 'form_settings'; return 'form_settings';
} }
@ -169,7 +169,7 @@ class OverwriteThemeBackgroundAdminPanelForm extends AdminForm
* *
* @return string URL of the action * @return string URL of the action
*/ */
function action() public function action()
{ {
return common_local_url('overwritethemebackgroundAdminPanel'); return common_local_url('overwritethemebackgroundAdminPanel');
} }
@ -179,7 +179,7 @@ class OverwriteThemeBackgroundAdminPanelForm extends AdminForm
* *
* @return void * @return void
*/ */
function formData() public function formData()
{ {
$this->out->elementStart('fieldset', ['id' => 'settings_site_background']); $this->out->elementStart('fieldset', ['id' => 'settings_site_background']);
// TRANS: Fieldset legend for form to change background. // TRANS: Fieldset legend for form to change background.
@ -189,52 +189,68 @@ class OverwriteThemeBackgroundAdminPanelForm extends AdminForm
/* Background colour */ /* Background colour */
$this->li(); $this->li();
$this->input('background-color', $this->input(
'background-color',
// TRANS: Field label for GNU social site background. // TRANS: Field label for GNU social site background.
_m('Site background color'), _m('Site background color'),
// TRANS: Title for field label for GNU social site background. // TRANS: Title for field label for GNU social site background.
'Background color for the site (hexadecimal with #).', 'Background color for the site (hexadecimal with #).',
'overwritethemebackground'); 'overwritethemebackground'
);
$this->unli(); $this->unli();
/* Background image */ /* Background image */
$this->li(); $this->li();
$this->input('background-image', $this->input(
'background-image',
// TRANS: Field label for GNU social site background. // TRANS: Field label for GNU social site background.
_m('Site background'), _m('Site background'),
// TRANS: Title for field label for GNU social site background. // TRANS: Title for field label for GNU social site background.
'Background for the site (full URL).', 'Background for the site (full URL).',
'overwritethemebackground'); 'overwritethemebackground'
);
$this->unli(); $this->unli();
$this->li(); $this->li();
$this->input('sslbackground-image', $this->input(
'sslbackground-image',
// TRANS: Field label for SSL GNU social site background. // TRANS: Field label for SSL GNU social site background.
_m('SSL background'), _m('SSL background'),
// TRANS: Title for field label for SSL GNU social site background. // TRANS: Title for field label for SSL GNU social site background.
'Background to show on SSL pages (full URL).', 'Background to show on SSL pages (full URL).',
'overwritethemebackground'); 'overwritethemebackground'
);
$this->unli(); $this->unli();
/* Background repeat */ /* Background repeat */
$this->li(); $this->li();
// TRANS: Dropdown label on site settings panel. // TRANS: Dropdown label on site settings panel.
$this->out->dropdown('background-repeat', _m('Background repeat'), $this->out->dropdown(
'background-repeat',
_m('Background repeat'),
// TRANS: Dropdown title on site settings panel. // TRANS: Dropdown title on site settings panel.
['Repeat horizontally and vertically', 'Repeat Horizontally', 'Repeat Vertically', 'Don\'t repeat'], _m('repeat horizontally and/or vertically'), ['Repeat horizontally and vertically', 'Repeat Horizontally', 'Repeat Vertically', 'Don\'t repeat'],
false, common_config('overwritethemebackground', 'background-repeat') ?? 'repeat'); _m('repeat horizontally and/or vertically'),
false,
common_config('overwritethemebackground', 'background-repeat') ?? 'repeat'
);
$this->unli(); $this->unli();
/* Background attachment */ /* Background attachment */
$this->li(); $this->li();
// TRANS: Dropdown label on site settings panel. // TRANS: Dropdown label on site settings panel.
$this->out->dropdown('background-attachment', _m('Background attachment'), $this->out->dropdown(
'background-attachment',
_m('Background attachment'),
// TRANS: Dropdown title on site settings panel. // TRANS: Dropdown title on site settings panel.
['Scroll with page', 'Stay fixed'], _m('Whether the background image should scroll or be fixed (will not scroll with the rest of the page)'), ['Scroll with page', 'Stay fixed'],
false, common_config('overwritethemebackground', 'background-attachment') ?? 'scroll'); _m('Whether the background image should scroll or be fixed (will not scroll with the rest of the page)'),
false,
common_config('overwritethemebackground', 'background-attachment') ?? 'scroll'
);
$this->unli(); $this->unli();
/* Background position */ /* Background position */
@ -253,10 +269,15 @@ class OverwriteThemeBackgroundAdminPanelForm extends AdminForm
]; ];
$this->li(); $this->li();
// TRANS: Dropdown label on site settings panel. // TRANS: Dropdown label on site settings panel.
$this->out->dropdown('background-position', _m('Background position'), $this->out->dropdown(
'background-position',
_m('Background position'),
// TRANS: Dropdown title on site settings panel. // TRANS: Dropdown title on site settings panel.
$background_position_options, _m('Sets the starting position of a background image'), $background_position_options,
false, common_config('overwritethemebackground', 'background-attachment') ?? 'initial'); _m('Sets the starting position of a background image'),
false,
common_config('overwritethemebackground', 'background-attachment') ?? 'initial'
);
$this->unli(); $this->unli();
$this->out->elementEnd('ul'); $this->out->elementEnd('ul');
@ -268,14 +289,16 @@ class OverwriteThemeBackgroundAdminPanelForm extends AdminForm
* *
* @return void * @return void
*/ */
function formActions() public function formActions()
{ {
$this->out->submit('submit', $this->out->submit(
'submit',
// TRANS: Button text for saving site settings. // TRANS: Button text for saving site settings.
_m('BUTTON', 'Save'), _m('BUTTON', 'Save'),
'submit', 'submit',
null, null,
// TRANS: Button title for saving site settings. // TRANS: Button title for saving site settings.
_m('Save the site settings.')); _m('Save the site settings.')
);
} }
} }

86
plugins/Sitemap/actions/sitemapadminpanel.php
View File

@ -1,44 +1,38 @@
<?php <?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
/** /**
* StatusNet, the distributed open-source microblogging tool
*
* Sitemap administration panel * Sitemap administration panel
* *
* 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 Sitemap * @category Sitemap
* @package StatusNet * @package GNUsocial
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @copyright 2010 StatusNet, Inc. * @copyright 2010 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
if (!defined('STATUSNET')) { defined('GNUSOCIAL') || die();
exit(1);
}
/** /**
* Administer sitemap settings * Administer sitemap settings
* *
* @category Sitemap * @category Sitemap
* @package StatusNet * @package GNUsocial
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
class SitemapadminpanelAction extends AdminPanelAction class SitemapadminpanelAction extends AdminPanelAction
{ {
@ -47,7 +41,7 @@ class SitemapadminpanelAction extends AdminPanelAction
* *
* @return string page title * @return string page title
*/ */
function title() public function title()
{ {
// TRANS: Title for sitemap. // TRANS: Title for sitemap.
return _m('Sitemap'); return _m('Sitemap');
@ -58,7 +52,7 @@ class SitemapadminpanelAction extends AdminPanelAction
* *
* @return string instructions * @return string instructions
*/ */
function getInstructions() public function getInstructions()
{ {
// TRANS: Instructions for sitemap. // TRANS: Instructions for sitemap.
return _m('Sitemap settings for this StatusNet site'); return _m('Sitemap settings for this StatusNet site');
@ -69,7 +63,7 @@ class SitemapadminpanelAction extends AdminPanelAction
* *
* @return void * @return void
*/ */
function showForm() public function showForm()
{ {
$form = new SitemapAdminPanelForm($this); $form = new SitemapAdminPanelForm($this);
$form->show(); $form->show();
@ -81,7 +75,7 @@ class SitemapadminpanelAction extends AdminPanelAction
* *
* @return void * @return void
*/ */
function saveSettings() public function saveSettings()
{ {
static $settings = array('sitemap' => array('yahookey', 'bingkey')); static $settings = array('sitemap' => array('yahookey', 'bingkey'));
@ -100,7 +94,7 @@ class SitemapadminpanelAction extends AdminPanelAction
$config = new Config(); $config = new Config();
$config->query('BEGIN'); $config->query('START TRANSACTION');
foreach ($settings as $section => $parts) { foreach ($settings as $section => $parts) {
foreach ($parts as $setting) { foreach ($parts as $setting) {
@ -113,7 +107,7 @@ class SitemapadminpanelAction extends AdminPanelAction
return; return;
} }
function validate(&$values) public function validate(&$values)
{ {
} }
} }
@ -128,7 +122,7 @@ class SitemapAdminPanelForm extends AdminForm
* *
* @return int ID of the form * @return int ID of the form
*/ */
function id() public function id()
{ {
return 'form_sitemap_admin_panel'; return 'form_sitemap_admin_panel';
} }
@ -138,7 +132,7 @@ class SitemapAdminPanelForm extends AdminForm
* *
* @return string class of the form * @return string class of the form
*/ */
function formClass() public function formClass()
{ {
return 'form_sitemap'; return 'form_sitemap';
} }
@ -148,7 +142,7 @@ class SitemapAdminPanelForm extends AdminForm
* *
* @return string URL of the action * @return string URL of the action
*/ */
function action() public function action()
{ {
return common_local_url('sitemapadminpanel'); return common_local_url('sitemapadminpanel');
} }
@ -158,24 +152,28 @@ class SitemapAdminPanelForm extends AdminForm
* *
* @return void * @return void
*/ */
function formData() public function formData()
{ {
$this->out->elementStart('ul', 'form_data'); $this->out->elementStart('ul', 'form_data');
$this->li(); $this->li();
$this->input('yahookey', $this->input(
'yahookey',
// TRANS: Field label. // TRANS: Field label.
_m('Yahoo key'), _m('Yahoo key'),
// TRANS: Title for field label. // TRANS: Title for field label.
_m('Yahoo! Site Explorer verification key.'), _m('Yahoo! Site Explorer verification key.'),
'sitemap'); 'sitemap'
);
$this->unli(); $this->unli();
$this->li(); $this->li();
$this->input('bingkey', $this->input(
'bingkey',
// TRANS: Field label. // TRANS: Field label.
_m('Bing key'), _m('Bing key'),
// TRANS: Title for field label. // TRANS: Title for field label.
_m('Bing Webmaster Tools verification key.'), _m('Bing Webmaster Tools verification key.'),
'sitemap'); 'sitemap'
);
$this->unli(); $this->unli();
$this->out->elementEnd('ul'); $this->out->elementEnd('ul');
} }
@ -185,14 +183,16 @@ class SitemapAdminPanelForm extends AdminForm
* *
* @return void * @return void
*/ */
function formActions() public function formActions()
{ {
$this->out->submit('submit', $this->out->submit(
'submit',
// TRANS: Submit button text to save sitemap settings. // TRANS: Submit button text to save sitemap settings.
_m('BUTTON', 'Save'), _m('BUTTON', 'Save'),
'submit', 'submit',
null, null,
// TRANS: Submit button title to save sitemap settings. // TRANS: Submit button title to save sitemap settings.
_m('Save sitemap settings.')); _m('Save sitemap settings.')
);
} }
} }

82
plugins/TwitterBridge/actions/twitteradminpanel.php
View File

@ -1,44 +1,41 @@
<?php <?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
/** /**
* StatusNet, the distributed open-source microblogging tool
*
* Twitter bridge administration panel * Twitter bridge administration panel
* *
* 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 * 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/>.
* *
* @category Settings * @category Settings
* @package StatusNet * @package GNUsocial
* @author Zach Copley <zach@status.net> * @author Zach Copley <zach@status.net>
* @copyright 2010 StatusNet, Inc. * @copyright 2010 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
if (!defined('STATUSNET')) { defined('GNUSOCIAL') || die();
exit(1);
}
/** /**
* Administer global Twitter bridge settings * Administer global Twitter bridge settings
* *
* @category Admin * @category Admin
* @package StatusNet * @package GNUsocial
* @author Zach Copley <zach@status.net> * @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 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
class TwitteradminpanelAction extends AdminPanelAction class TwitteradminpanelAction extends AdminPanelAction
{ {
@ -47,7 +44,7 @@ class TwitteradminpanelAction extends AdminPanelAction
* *
* @return string page title * @return string page title
*/ */
function title() public function title()
{ {
// TRANS: Page title for Twitter administration panel. // TRANS: Page title for Twitter administration panel.
return _m('TITLE', 'Twitter'); return _m('TITLE', 'Twitter');
@ -58,7 +55,7 @@ class TwitteradminpanelAction extends AdminPanelAction
* *
* @return string instructions * @return string instructions
*/ */
function getInstructions() public function getInstructions()
{ {
// TRANS: Instructions for Twitter bridge administration page. // TRANS: Instructions for Twitter bridge administration page.
return _m('Twitter bridge settings'); return _m('Twitter bridge settings');
@ -69,7 +66,7 @@ class TwitteradminpanelAction extends AdminPanelAction
* *
* @return void * @return void
*/ */
function showForm() public function showForm()
{ {
$form = new TwitterAdminPanelForm($this); $form = new TwitterAdminPanelForm($this);
$form->show(); $form->show();
@ -81,7 +78,7 @@ class TwitteradminpanelAction extends AdminPanelAction
* *
* @return void * @return void
*/ */
function saveSettings() public function saveSettings()
{ {
static $settings = array( static $settings = array(
'twitter' => array('consumer_key', 'consumer_secret'), 'twitter' => array('consumer_key', 'consumer_secret'),
@ -119,7 +116,7 @@ class TwitteradminpanelAction extends AdminPanelAction
$config = new Config(); $config = new Config();
$config->query('BEGIN'); $config->query('START TRANSACTION');
foreach ($settings as $section => $parts) { foreach ($settings as $section => $parts) {
foreach ($parts as $setting) { foreach ($parts as $setting) {
@ -143,7 +140,7 @@ class TwitteradminpanelAction extends AdminPanelAction
return; return;
} }
function validate(&$values) public function validate(&$values)
{ {
// Validate consumer key and secret (can't be too long) // Validate consumer key and secret (can't be too long)
@ -162,7 +159,7 @@ class TwitteradminpanelAction extends AdminPanelAction
} }
} }
function isImportEnabled() public function isImportEnabled()
{ {
// Since daemon setup isn't automated yet... // Since daemon setup isn't automated yet...
// @todo: if merged into main queues, detect presence of daemon config // @todo: if merged into main queues, detect presence of daemon config
@ -177,7 +174,7 @@ class TwitterAdminPanelForm extends AdminForm
* *
* @return int ID of the form * @return int ID of the form
*/ */
function id() public function id()
{ {
return 'twitteradminpanel'; return 'twitteradminpanel';
} }
@ -187,7 +184,7 @@ class TwitterAdminPanelForm extends AdminForm
* *
* @return string class of the form * @return string class of the form
*/ */
function formClass() public function formClass()
{ {
return 'form_settings'; return 'form_settings';
} }
@ -197,7 +194,7 @@ class TwitterAdminPanelForm extends AdminForm
* *
* @return string URL of the action * @return string URL of the action
*/ */
function action() public function action()
{ {
return common_local_url('twitteradminpanel'); return common_local_url('twitteradminpanel');
} }
@ -207,7 +204,7 @@ class TwitterAdminPanelForm extends AdminForm
* *
* @return void * @return void
*/ */
function formData() public function formData()
{ {
$this->out->elementStart( $this->out->elementStart(
'fieldset', 'fieldset',
@ -276,7 +273,8 @@ class TwitterAdminPanelForm extends AdminForm
$this->out->checkbox( $this->out->checkbox(
// TRANS: Checkbox label for global setting. // TRANS: Checkbox label for global setting.
'signin', _m('Enable "Sign-in with Twitter"'), 'signin',
_m('Enable "Sign-in with Twitter"'),
(bool) $this->value('signin', 'twitter'), (bool) $this->value('signin', 'twitter'),
// TRANS: Checkbox title. // TRANS: Checkbox title.
_m('This allow users to login with their Twitter credentials.') _m('This allow users to login with their Twitter credentials.')
@ -287,7 +285,8 @@ class TwitterAdminPanelForm extends AdminForm
$this->li(); $this->li();
$this->out->checkbox( $this->out->checkbox(
// TRANS: Checkbox label for global setting. // TRANS: Checkbox label for global setting.
'enabled', _m('Enable Twitter import'), 'enabled',
_m('Enable Twitter import'),
(bool) $this->value('enabled', 'twitterimport'), (bool) $this->value('enabled', 'twitterimport'),
// TRANS: Checkbox title for global setting. // TRANS: Checkbox title for global setting.
_m('Allow users to import their Twitter friends\' timelines. Requires daemons to be manually configured.') _m('Allow users to import their Twitter friends\' timelines. Requires daemons to be manually configured.')
@ -305,11 +304,16 @@ class TwitterAdminPanelForm extends AdminForm
* *
* @return void * @return void
*/ */
function formActions() public function formActions()
{ {
// TRANS: Button text for saving the administrative Twitter bridge settings. // TRANS: Button text for saving the administrative Twitter bridge settings.
$this->out->submit('submit', _m('BUTTON','Save'), 'submit', null, $this->out->submit(
'submit',
_m('BUTTON', 'Save'),
'submit',
null,
// TRANS: Button title for saving the administrative Twitter bridge settings. // TRANS: Button title for saving the administrative Twitter bridge settings.
_m('Save the Twitter bridge settings.')); _m('Save the Twitter bridge settings.')
);
} }
} }

2
plugins/TwitterBridge/lib/twitterimport.php
View File

@ -262,7 +262,7 @@ class TwitterImport
} }
$profile = new Profile(); $profile = new Profile();
$profile->query("BEGIN"); $profile->query('START TRANSACTION');
$profile->nickname = $twuser->screen_name; $profile->nickname = $twuser->screen_name;
$profile->fullname = $twuser->name; $profile->fullname = $twuser->name;
$profile->homepage = $twuser->url; $profile->homepage = $twuser->url;

3
scripts/upgrade.php
View File

@ -65,7 +65,6 @@ function main()
fixupUserBadNulls(); fixupUserBadNulls();
fixupGroupURI(); fixupGroupURI();
if ($iterate_files) { if ($iterate_files) {
printfnq("Running file iterations:\n");
printfnq("* "); fixupFileGeometry(); printfnq("* "); fixupFileGeometry();
printfnq("* "); deleteLocalFileThumbnailsWithoutFilename(); printfnq("* "); deleteLocalFileThumbnailsWithoutFilename();
printfnq("* "); deleteMissingLocalFileThumbnails(); printfnq("* "); deleteMissingLocalFileThumbnails();
@ -305,7 +304,7 @@ function initGroupProfileId()
$profile->created = $group->created; $profile->created = $group->created;
$profile->modified = $group->modified; $profile->modified = $group->modified;
$profile->query('BEGIN'); $profile->query('START TRANSACTION');
$id = $profile->insert(); $id = $profile->insert();
if (empty($id)) { if (empty($id)) {
$profile->query('ROLLBACK'); $profile->query('ROLLBACK');