summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--actions/designadminpanel.php19
-rw-r--r--actions/licenseadminpanel.php303
-rw-r--r--actions/pathsadminpanel.php2
-rw-r--r--actions/sessionsadminpanel.php2
-rw-r--r--actions/useradminpanel.php7
-rw-r--r--classes/Status_network.php5
-rw-r--r--lib/action.php8
-rw-r--r--lib/activityobject.php11
-rw-r--r--lib/adminpanelaction.php8
-rw-r--r--lib/default.php2
-rw-r--r--lib/feedlist.php2
-rw-r--r--lib/router.php2
-rw-r--r--plugins/Disqus/DisqusPlugin.php3
-rw-r--r--plugins/SubMirror/lib/mirrorqueuehandler.php8
-rwxr-xr-xplugins/TwitterBridge/daemons/twitterstatusfetcher.php22
15 files changed, 384 insertions, 20 deletions
diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php
index 763737175..4285f7d73 100644
--- a/actions/designadminpanel.php
+++ b/actions/designadminpanel.php
@@ -71,7 +71,7 @@ class DesignadminpanelAction extends AdminPanelAction
function getInstructions()
{
- return _('Design settings for this StatusNet site.');
+ return _('Design settings for this StatusNet site');
}
/**
@@ -154,9 +154,22 @@ class DesignadminpanelAction extends AdminPanelAction
$config->query('BEGIN');
- // Only update colors if the theme has not changed.
+ if ($themeChanged) {
+ // If the theme has changed, reset custom colors and let them pick
+ // up the new theme's defaults.
+ $colors = array('background', 'content', 'sidebar', 'text', 'link');
+ foreach ($colors as $colorKey) {
+ // Clear from global config so we see defaults on this page...
+ $GLOBALS['config']['design'][$colorKey . 'color'] = false;
- if (!$themeChanged) {
+ // And remove old settings from DB...
+ $this->deleteSetting('design', $colorKey . 'color');
+ }
+ } else {
+ // Only save colors from the form if the theme has not changed.
+ //
+ // @fixme a future more ajaxy form should allow theme switch
+ // and color customization in one step.
$bgcolor = new WebColor($this->trimmed('design_background'));
$ccolor = new WebColor($this->trimmed('design_content'));
diff --git a/actions/licenseadminpanel.php b/actions/licenseadminpanel.php
new file mode 100644
index 000000000..c9aad5c4f
--- /dev/null
+++ b/actions/licenseadminpanel.php
@@ -0,0 +1,303 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * 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
+ * @package StatusNet
+ * @author Zach Copley <zach@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+ exit(1);
+}
+
+/**
+ * License settings
+ *
+ * @category Admin
+ * @package StatusNet
+ * @author Zach Copley <zach@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class LicenseadminpanelAction extends AdminPanelAction
+{
+
+ /**
+ * Returns the page title
+ *
+ * @return string page title
+ */
+
+ function title()
+ {
+ // TRANS: User admin panel title
+ return _m('TITLE', 'License');
+ }
+
+ /**
+ * Instructions for using this form.
+ *
+ * @return string instructions
+ */
+
+ function getInstructions()
+ {
+ return _('License for this StatusNet site');
+ }
+
+ /**
+ * Show the site admin panel form
+ *
+ * @return void
+ */
+
+ function showForm()
+ {
+ $form = new LicenseAdminPanelForm($this);
+ $form->show();
+ return;
+ }
+
+ /**
+ * Save settings from the form
+ *
+ * @return void
+ */
+
+ function saveSettings()
+ {
+ static $settings = array(
+ 'license' => array('type', 'owner', 'url', 'title', 'image')
+ );
+
+ $values = array();
+
+ foreach ($settings as $section => $parts) {
+ foreach ($parts as $setting) {
+ $values[$section][$setting] = $this->trimmed($setting);
+ }
+ }
+
+ // This throws an exception on validation errors
+
+ $this->validate($values);
+
+ // assert(all values are valid);
+
+ $config = new Config();
+
+ $config->query('BEGIN');
+
+ foreach ($settings as $section => $parts) {
+ foreach ($parts as $setting) {
+ Config::save($section, $setting, $values[$section][$setting]);
+ }
+ }
+
+ $config->query('COMMIT');
+
+ return;
+ }
+
+ /**
+ * Validate License admin form values
+ *
+ * @param array &$values from the form
+ *
+ * @return nothing
+ */
+
+ function validate(&$values)
+ {
+ // Validate license type (shouldn't have to do it, but just in case)
+
+ $types = array('private', 'allrightsreserved', 'cc');
+
+ if (!in_array($values['license']['type'], $types)) {
+ $this->clientError(_("Invalid license selection."));
+ }
+
+ // Make sure the user has set an owner if the site has a private
+ // license
+
+ if ($values['license']['type'] == 'allrightsreserved'
+ && empty($values['license']['owner'])
+ ) {
+ $this->clientError(
+ _("You must specify the owner of the content when using the All Rights Reserved license.")
+ );
+ }
+
+ // Make sure the license title is not too long
+ if (mb_strlen($values['license']['type']) > 255) {
+ $this->clientError(
+ _("Invalid license title. Max length is 255 characters.")
+ );
+ }
+
+ // make sure the license URL and license image URL are valid URLs
+
+ $options = array('allowed_schemes' => array('http', 'https'));
+
+ if (!Validate::uri($values['license']['url'], $options)) {
+ $this->clientError(_("Invalid license URL."));
+ }
+
+ if (!Validate::uri($values['license']['image'], $options)) {
+ $this->clientError(_("Invalid license image URL."));
+ }
+ }
+}
+
+class LicenseAdminPanelForm extends AdminForm
+{
+ /**
+ * ID of the form
+ *
+ * @return int ID of the form
+ */
+
+ function id()
+ {
+ return 'licenseadminpanel';
+ }
+
+ /**
+ * class of the form
+ *
+ * @return string class of the form
+ */
+
+ function formClass()
+ {
+ return 'form_settings';
+ }
+
+ /**
+ * Action of the form
+ *
+ * @return string URL of the action
+ */
+
+ function action()
+ {
+ return common_local_url('licenseadminpanel');
+ }
+
+ /**
+ * Data elements of the form
+ *
+ * @return void
+ */
+
+ function formData()
+ {
+ $this->out->elementStart(
+ 'fieldset', array('id' => 'settings_license-selection')
+ );
+ $this->out->element('legend', null, _('License selection'));
+ $this->out->elementStart('ul', 'form_data');
+
+ $this->li();
+
+ $types = array(
+ 'private' => _('Private'),
+ 'allrightsreserved' => _('All Rights Reserved'),
+ 'cc' => _('Creative Commons')
+ );
+
+ $this->out->dropdown(
+ 'type',
+ _('Type'),
+ $types,
+ _('Select license'),
+ false,
+ $this->value('type', 'license')
+ );
+
+ $this->unli();
+
+ $this->out->elementEnd('ul');
+ $this->out->elementEnd('fieldset');
+
+ $this->out->elementStart(
+ 'fieldset',
+ array('id' => 'settings_license-details')
+ );
+ $this->out->element('legend', null, _('License details'));
+ $this->out->elementStart('ul', 'form_data');
+
+ $this->li();
+ $this->input(
+ 'owner',
+ _('Owner'),
+ _('Name of the owner of the site\'s content (if applicable).'),
+ 'license'
+ );
+ $this->unli();
+
+ $this->li();
+ $this->input(
+ 'title',
+ _('License Title'),
+ _('The title of the license.'),
+ 'license'
+ );
+ $this->unli();
+
+ $this->li();
+ $this->input(
+ 'url',
+ _('License URL'),
+ _('URL for more information about the license.'),
+ 'license'
+ );
+ $this->unli();
+
+ $this->li();
+ $this->input(
+ 'image', _('License Image URL'),
+ _('URL for an image to display with the license.'),
+ 'license'
+ );
+ $this->unli();
+
+ $this->out->elementEnd('ul');
+ $this->out->elementEnd('fieldset');
+ }
+
+ /**
+ * Action elements
+ *
+ * @return void
+ */
+
+ function formActions()
+ {
+ $this->out->submit(
+ 'submit', _('Save'), 'submit', null, _('Save license settings')
+ );
+ }
+}
diff --git a/actions/pathsadminpanel.php b/actions/pathsadminpanel.php
index 7ff3c2583..0c83aa29e 100644
--- a/actions/pathsadminpanel.php
+++ b/actions/pathsadminpanel.php
@@ -67,7 +67,7 @@ class PathsadminpanelAction extends AdminPanelAction
function getInstructions()
{
- return _('Path and server settings for this StatusNet site.');
+ return _('Path and server settings for this StatusNet site');
}
/**
diff --git a/actions/sessionsadminpanel.php b/actions/sessionsadminpanel.php
index 4386ef844..e9bd1719f 100644
--- a/actions/sessionsadminpanel.php
+++ b/actions/sessionsadminpanel.php
@@ -62,7 +62,7 @@ class SessionsadminpanelAction extends AdminPanelAction
function getInstructions()
{
- return _('Session settings for this StatusNet site.');
+ return _('Session settings for this StatusNet site');
}
/**
diff --git a/actions/useradminpanel.php b/actions/useradminpanel.php
index ee9c23076..04e0ca3e7 100644
--- a/actions/useradminpanel.php
+++ b/actions/useradminpanel.php
@@ -12,6 +12,7 @@
* (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.
@@ -24,7 +25,7 @@
* @author Evan Prodromou <evan@status.net>
* @author Zach Copley <zach@status.net>
* @author Sarven Capadisli <csarven@status.net>
- * @copyright 2008-2009 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
* @link http://status.net/
*/
@@ -67,7 +68,7 @@ class UseradminpanelAction extends AdminPanelAction
function getInstructions()
{
- return _('User settings for this StatusNet site.');
+ return _('User settings for this StatusNet site');
}
/**
@@ -291,6 +292,6 @@ class UserAdminPanelForm extends AdminForm
function formActions()
{
- $this->out->submit('submit', _('Save'), 'submit', null, _('Save site settings'));
+ $this->out->submit('submit', _('Save'), 'submit', null, _('Save user settings'));
}
}
diff --git a/classes/Status_network.php b/classes/Status_network.php
index c4f37ce1c..70c7a58eb 100644
--- a/classes/Status_network.php
+++ b/classes/Status_network.php
@@ -167,9 +167,8 @@ class Status_network extends Safe_DataObject
' WHERE nickname = ' . $this->_quote($this->nickname);
$orig->decache();
$result = $this->query($qry);
- if ($result) {
- $this->encache();
- }
+ $this->decache();
+
return $result;
}
diff --git a/lib/action.php b/lib/action.php
index 5dcf78dcc..5482ac377 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -715,14 +715,14 @@ class Action extends HTMLOutputter // lawsuit
{
$this->elementStart('div', array('id' => 'aside_primary',
'class' => 'aside'));
- if (Event::handle('StartShowExportData', array($this))) {
- $this->showExportData();
- Event::handle('EndShowExportData', array($this));
- }
if (Event::handle('StartShowSections', array($this))) {
$this->showSections();
Event::handle('EndShowSections', array($this));
}
+ if (Event::handle('StartShowExportData', array($this))) {
+ $this->showExportData();
+ Event::handle('EndShowExportData', array($this));
+ }
$this->elementEnd('div');
}
diff --git a/lib/activityobject.php b/lib/activityobject.php
index 0fc06948b..95615d581 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -428,6 +428,17 @@ class ActivityObject
$alink->height = $size;
$alink->width = $size;
$alink->url = Avatar::defaultImage($size);
+
+ if ($size == AVATAR_PROFILE_SIZE) {
+ // Hack for Twitter import: we don't have a 96x96 image,
+ // but we do have a 73x73 image. For now, fake it with that.
+ $avatar = $profile->getAvatar(73);
+ if ($avatar) {
+ $alink = AvatarLink::fromAvatar($avatar);
+ $alink->height= $size;
+ $alink->width = $size;
+ }
+ }
}
$object->avatarLinks[] = $alink;
diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php
index 5c414bbd7..fae9f4fa5 100644
--- a/lib/adminpanelaction.php
+++ b/lib/adminpanelaction.php
@@ -396,6 +396,14 @@ class AdminPanelNav extends Widget
$menu_title, $action_name == 'snapshotadminpanel', 'nav_snapshot_admin_panel');
}
+ if (AdminPanelAction::canAdmin('license')) {
+ // TRANS: Menu item title/tooltip
+ $menu_title = _('Set site license');
+ // TRANS: Menu item for site administration
+ $this->out->menuItem(common_local_url('licenseadminpanel'), _('License'),
+ $menu_title, $action_name == 'licenseadminpanel', 'nav_license_admin_panel');
+ }
+
Event::handle('EndAdminPanelNav', array($this));
}
$this->action->elementEnd('ul');
diff --git a/lib/default.php b/lib/default.php
index 45a4560ff..6200abada 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -300,7 +300,7 @@ $default =
'OpenID' => null),
),
'admin' =>
- array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice')),
+ array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license')),
'singleuser' =>
array('enabled' => false,
'nickname' => null),
diff --git a/lib/feedlist.php b/lib/feedlist.php
index 9ae83f5e8..7493e3575 100644
--- a/lib/feedlist.php
+++ b/lib/feedlist.php
@@ -61,7 +61,7 @@ class FeedList extends Widget
{
$this->out->elementStart('div', array('id' => 'export_data',
'class' => 'section'));
- $this->out->element('h2', null, _('Export data'));
+ $this->out->element('h2', null, _('Feeds'));
$this->out->elementStart('ul', array('class' => 'xoxo'));
foreach ($feeds as $feed) {
diff --git a/lib/router.php b/lib/router.php
index 7e1e6a2a4..fb5a3c7c3 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -690,6 +690,8 @@ class Router
$m->connect('admin/sessions', array('action' => 'sessionsadminpanel'));
$m->connect('admin/sitenotice', array('action' => 'sitenoticeadminpanel'));
$m->connect('admin/snapshot', array('action' => 'snapshotadminpanel'));
+ $m->connect('admin/license', array('action' => 'licenseadminpanel'));
+
$m->connect('getfile/:filename',
array('action' => 'getfile'),
diff --git a/plugins/Disqus/DisqusPlugin.php b/plugins/Disqus/DisqusPlugin.php
index 681be19dc..3901562f9 100644
--- a/plugins/Disqus/DisqusPlugin.php
+++ b/plugins/Disqus/DisqusPlugin.php
@@ -70,6 +70,9 @@ if (!defined('STATUSNET')) {
*/
class DisqusPlugin extends Plugin
{
+ public $shortname; // Required 'shortname' for actually triggering Disqus.
+ public $div_style; // Optional CSS chunk for the main <div>
+
function onEndShowContentBlock($action)
{
if (get_class($action) == 'ShownoticeAction') {
diff --git a/plugins/SubMirror/lib/mirrorqueuehandler.php b/plugins/SubMirror/lib/mirrorqueuehandler.php
index dae9c0889..550986b44 100644
--- a/plugins/SubMirror/lib/mirrorqueuehandler.php
+++ b/plugins/SubMirror/lib/mirrorqueuehandler.php
@@ -36,7 +36,13 @@ class MirrorQueueHandler extends QueueHandler
$mirror->subscribed = $notice->profile_id;
if ($mirror->find()) {
while ($mirror->fetch()) {
- $mirror->mirrorNotice($notice);
+ try {
+ $mirror->mirrorNotice($notice);
+ } catch (Exception $e) {
+ common_log(LOG_ERR, "Exception trying to mirror notice $notice->id " .
+ "for subscriber $mirror->subscriber ($mirror->style): " .
+ $e->getMessage());
+ }
}
}
return true;
diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
index 31129b96d..590fa2954 100755
--- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
+++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
@@ -692,6 +692,10 @@ class TwitterStatusFetcher extends ParallelizingDaemon
$text = $status->text;
if (empty($status->entities)) {
+ common_log(LOG_WARNING, "No entities data for {$status->id}; trying to fake up links ourselves.");
+ $text = common_replace_urls_callback($text, 'common_linkify');
+ $text = preg_replace('/(^|\&quot\;|\'|\(|\[|\{|\s+)#([\pL\pN_\-\.]{1,64})/e', "'\\1#'.TwitterStatusFetcher::tagLink('\\2')", $text);
+ $text = preg_replace('/(^|\s+)@([a-z0-9A-Z_]{1,64})/e', "'\\1@'.TwitterStatusFetcher::atLink('\\2')", $text);
return $text;
}
@@ -750,12 +754,26 @@ class TwitterStatusFetcher extends ParallelizingDaemon
function makeHashtagLink($object)
{
- return "#<a href='https://twitter.com/search?q=%23{$object->text}' class='hashtag'>{$object->text}</a>";
+ return "#" . self::tagLink($object->text);
}
function makeMentionLink($object)
{
- return "@<a href='http://twitter.com/{$object->screen_name}' title='{$object->name}'>{$object->screen_name}</a>";
+ return "@".self::atLink($object->screen_name, $object->name);
+ }
+
+ static function tagLink($tag)
+ {
+ return "<a href='https://twitter.com/search?q=%23{$tag}' class='hashtag'>{$tag}</a>";
+ }
+
+ static function atLink($screenName, $fullName=null)
+ {
+ if (!empty($fullName)) {
+ return "<a href='http://twitter.com/{$screenName}' title='{$fullName}'>{$screenName}</a>";
+ } else {
+ return "<a href='http://twitter.com/{$screenName}'>{$screenName}</a>";
+ }
}
function saveStatusMentions($notice, $status)
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-12 02:59:40 +0000