wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '0.9.x' into pluginize-twitter-bridge

Browse Source 
* 0.9.x:
  Include long-form attachment URL in notice if URL shortening is disabled.
  Updated default theme to use the CSS Sprites method for common icons
  Added a new plugin that requires a user to have a validated email address before being allowed to post notices
  Don't trigger E_NOTICE when looking for commands in the notice input
This commit is contained in:
Zach Copley 2009-10-13 11:05:39 -07:00
commit 39bcd514b4
3 changed files with 83 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/newnotice.php
View File

@ -240,6 +240,10 @@ class NewnoticeAction extends Action
$this->maybeAddRedir($fileRecord->id, $fileurl); $this->maybeAddRedir($fileRecord->id, $fileurl);
$short_fileurl = common_shorten_url($fileurl); $short_fileurl = common_shorten_url($fileurl);
if (!$short_fileurl) {
// todo -- Consider forcing default shortener if none selected?
$short_fileurl = $fileurl;
}
$content_shortened .= ' ' . $short_fileurl; $content_shortened .= ' ' . $short_fileurl;
if (Notice::contentTooLong($content_shortened)) { if (Notice::contentTooLong($content_shortened)) {

52
plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php Normal file
View File

@ -0,0 +1,52 @@
<?php
/**
* StatusNet, the distributed open-source microblogging tool
*
* Plugin that requires the user to have a validated email address before they can post notices
*
* 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 Plugin
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
* @copyright 2009 Craig Andrews http://candrews.integralblue.com
* @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') && !defined('LACONICA')) {
exit(1);
}
class RequireValidatedEmailPlugin extends Plugin
{
function __construct()
{
parent::__construct();
}
function onStartNoticeSave($notice)
{
$user = User::staticGet('id', $notice->profile_id);
if (!empty($user)) { // it's a remote notice
if (empty($user->email)) {
throw new ClientException(_("You must validate your email address before posting."));
}
}
return true;
}
}

48
theme/default/css/display.css
View File

@ -88,7 +88,7 @@ color:#333333;
color:#000000; color:#000000;
} }
#form_notice label[for=notice_data-attach] { #form_notice label[for=notice_data-attach] {
background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%; background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px;
} }
#form_notice #notice_data-attach { #form_notice #notice_data-attach {
opacity:0; opacity:0;
@ -150,16 +150,18 @@ background-color:#9BB43E;
#export_data li a { #export_data li a {
background-repeat:no-repeat; background-repeat:no-repeat;
background-position:0 45%;
} }
#export_data li a.rss { #export_data li a.rss {
background-image:url(../../base/images/icons/icon_rss.png); background-image:url(../../base/images/icons/icons-01.png);
background-position:0 -130px;
} }
#export_data li a.atom { #export_data li a.atom {
background-image:url(../../base/images/icons/icon_atom.png); background-image:url(../../base/images/icons/icons-01.png);
background-position:0 -64px;
} }
#export_data li a.foaf { #export_data li a.foaf {
background-image:url(../../base/images/icons/icon_foaf.gif); background-image:url(../../base/images/icons/icons-01.png);
background-position:0 1px;
} }
.entity_edit a, .entity_edit a,
@ -171,7 +173,6 @@ background-image:url(../../base/images/icons/icon_foaf.gif);
.form_group_unblock input.submit, .form_group_unblock input.submit,
.entity_nudge p, .entity_nudge p,
.form_make_admin input.submit { .form_make_admin input.submit {
background-position: 0 40%;
background-repeat: no-repeat; background-repeat: no-repeat;
background-color:transparent; background-color:transparent;
} }
@ -189,43 +190,48 @@ background-color:#87B4C8;
} }
.entity_edit a { .entity_edit a {
background-image:url(../../base/images/icons/twotone/green/edit.gif); background-image:url(../../base/images/icons/icons-01.png);
background-position: 0 -718px;
} }
.entity_send-a-message a { .entity_send-a-message a {
background-image:url(../../base/images/icons/twotone/green/quote.gif); background-image:url(../../base/images/icons/icons-01.png);
background-position: 0 -849px;
} }
.entity_nudge p, .entity_nudge p,
.form_user_nudge input.submit { .form_user_nudge input.submit {
background-image:url(../../base/images/icons/twotone/green/mail.gif); background-image:url(../../base/images/icons/icons-01.png);
background-position: 0 -785px;
} }
.form_user_block input.submit, .form_user_block input.submit,
.form_user_unblock input.submit, .form_user_unblock input.submit,
.form_group_block input.submit, .form_group_block input.submit,
.form_group_unblock input.submit { .form_group_unblock input.submit {
background-image:url(../../base/images/icons/twotone/green/shield.gif); background-image:url(../../base/images/icons/icons-01.png);
background-position: 0 -918px;
} }
.form_make_admin input.submit { .form_make_admin input.submit {
background-image:url(../../base/images/icons/twotone/green/admin.gif); background-image:url(../../base/images/icons/icons-01.png);
background-position: 0 -983px;
} }
/* NOTICES */ /* NOTICES */
.notice .attachment { .notice .attachment {
background:transparent url(../../base/images/icons/twotone/green/clip-02.gif) no-repeat 0 45%; background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -394px;
} }
#attachments .attachment { #attachments .attachment {
background:none; background:none;
} }
.notice-options .notice_reply { .notice-options .notice_reply {
background:transparent url(../../base/images/icons/twotone/green/reply.gif) no-repeat 0 45%; background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -589px;
} }
.notice-options form.form_favor input.submit { .notice-options form.form_favor input.submit {
background:transparent url(../../base/images/icons/twotone/green/favourite.gif) no-repeat 0 45%; background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -457px;
} }
.notice-options form.form_disfavor input.submit { .notice-options form.form_disfavor input.submit {
background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%; background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -523px;
} }
.notice-options .notice_delete { .notice-options .notice_delete {
background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%; background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -655px;
} }
.notices div.entry-content, .notices div.entry-content,
@ -262,7 +268,7 @@ background-color:rgba(200, 200, 200, 0.300);
/*END: NOTICES */ /*END: NOTICES */
#new_group a { #new_group a {
background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%; background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -1054px;
} }
.pagination .nav_prev a, .pagination .nav_prev a,
@ -271,10 +277,10 @@ background-repeat:no-repeat;
border-color:#C8D1D5; border-color:#C8D1D5;
} }
.pagination .nav_prev a { .pagination .nav_prev a {
background-image:url(../../base/images/icons/twotone/green/arrow-left.gif); background-image:url(../../base/images/icons/icons-01.png);
background-position:10% 45%; background-position:10% -187px;
} }
.pagination .nav_next a { .pagination .nav_next a {
background-image:url(../../base/images/icons/twotone/green/arrow-right.gif); background-image:url(../../base/images/icons/icons-01.png);
background-position:90% 45%; background-position:105% -252px;
} }