From 0f8b902004dc7245a56307ed69c766d949f06dc3 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 8 Jan 2009 16:15:08 -0500 Subject: Revert "Twitter-compatible API - update verify_credentials to return profile" This reverts commit b801f73b1f4706f15783f91fd07508a03175592d. Twhirl assumes we return the old kind of results, so we have to do that. --- actions/api.php | 12 +++++--- actions/twitapiaccount.php | 13 +++++---- actions/twitapiusers.php | 70 ++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 84 insertions(+), 11 deletions(-) (limited to 'actions') diff --git a/actions/api.php b/actions/api.php index 919a515ce..ccebcd89e 100644 --- a/actions/api.php +++ b/actions/api.php @@ -47,7 +47,7 @@ class ApiAction extends Action { $this->content_type = strtolower($cmdext[1]); } - if ($this->requires_auth()) { + if($this->requires_auth()) { if (!isset($_SERVER['PHP_AUTH_USER'])) { # This header makes basic auth go @@ -70,9 +70,13 @@ class ApiAction extends Action { } } else { - # Look for the user in the session - if (common_logged_in()) { - $this->user = common_current_user(); + # Caller might give us a username even if not required + if (isset($_SERVER['PHP_AUTH_USER'])) { + $user = User::staticGet('nickname', $_SERVER['PHP_AUTH_USER']); + if ($user) { + $this->user = $user; + } + # Twitter doesn't throw an error if the user isn't found } $this->process_command(); diff --git a/actions/twitapiaccount.php b/actions/twitapiaccount.php index f6e955828..c1960561e 100644 --- a/actions/twitapiaccount.php +++ b/actions/twitapiaccount.php @@ -24,14 +24,17 @@ require_once(INSTALLDIR.'/lib/twitterapi.php'); class TwitapiaccountAction extends TwitterapiAction { function verify_credentials($args, $apidata) { - parent::handle($args); - if (!in_array($apidata['content-type'], array('xml', 'json'))) { - common_user_error(_('API method not found!'), $code = 404); - return; + if ($apidata['content-type'] == 'xml') { + header('Content-Type: application/xml; charset=utf-8'); + print 'true'; + } elseif ($apidata['content-type'] == 'json') { + header('Content-Type: application/json; charset=utf-8'); + print '{"authorized":true}'; + } else { + common_user_error(_('API method not found!'), $code=404); } - $this->show_extended_profile($apidata['user'], $apidata); } function end_session($args, $apidata) { diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php index 9e06efa64..337ec91d1 100644 --- a/actions/twitapiusers.php +++ b/actions/twitapiusers.php @@ -31,6 +31,7 @@ class TwitapiusersAction extends TwitterapiAction { return; } + $this->auth_user = $apidata['user']; $user = null; $email = $this->arg('email'); @@ -46,7 +47,72 @@ class TwitapiusersAction extends TwitterapiAction { return; } - $this->show_extended_profile($user, $apidata); - } + $profile = $user->getProfile(); + + if (!$profile) { + common_server_error(_('User has no profile.')); + return; + } + + $twitter_user = $this->twitter_user_array($profile, true); + + // Add in extended user fields offered up by this method + $twitter_user['created_at'] = $this->date_twitter($profile->created); + + $subbed = DB_DataObject::factory('subscription'); + $subbed->subscriber = $profile->id; + $subbed_count = (int) $subbed->count() - 1; + + $notices = DB_DataObject::factory('notice'); + $notices->profile_id = $profile->id; + $notice_count = (int) $notices->count(); + + $twitter_user['friends_count'] = (is_int($subbed_count)) ? $subbed_count : 0; + $twitter_user['statuses_count'] = (is_int($notice_count)) ? $notice_count : 0; + + // Other fields Twitter sends... + $twitter_user['profile_background_color'] = ''; + $twitter_user['profile_text_color'] = ''; + $twitter_user['profile_link_color'] = ''; + $twitter_user['profile_sidebar_fill_color'] = ''; + + $faves = DB_DataObject::factory('fave'); + $faves->user_id = $user->id; + $faves_count = (int) $faves->count(); + $twitter_user['favourites_count'] = $faves_count; + $timezone = 'UTC'; + + if ($user->timezone) { + $timezone = $user->timezone; + } + + $t = new DateTime; + $t->setTimezone(new DateTimeZone($timezone)); + $twitter_user['utc_offset'] = $t->format('Z'); + $twitter_user['time_zone'] = $timezone; + + if (isset($this->auth_user)) { + + if ($this->auth_user->isSubscribed($profile)) { + $twitter_user['following'] = 'true'; + } else { + $twitter_user['following'] = 'false'; + } + + // Not implemented yet + $twitter_user['notifications'] = 'false'; + } + + if ($apidata['content-type'] == 'xml') { + $this->init_document('xml'); + $this->show_twitter_xml_user($twitter_user); + $this->end_document('xml'); + } elseif ($apidata['content-type'] == 'json') { + $this->init_document('json'); + $this->show_json_objects($twitter_user); + $this->end_document('json'); + } + + } } -- cgit v1.2.3-54-g00ecf From 01d1c3bd5f7d394d7b5ea7d3763aedcc5c8e223c Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 10 Jan 2009 14:53:14 -0500 Subject: Corrected links to tagrss and add fancy URL for tag rss --- actions/tag.php | 2 +- lib/util.php | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'actions') diff --git a/actions/tag.php b/actions/tag.php index 25cc853c4..ffb393ae8 100644 --- a/actions/tag.php +++ b/actions/tag.php @@ -69,7 +69,7 @@ class TagAction extends StreamAction { $this->public_views_menu(); } else { - $this->show_feeds_list(array(0=>array('href'=>common_local_url('tagrss'), + $this->show_feeds_list(array(0=>array('href'=>common_local_url('tagrss', array('tag' => $tag)), 'type' => 'rss', 'version' => 'RSS 1.0', 'item' => 'tagrss'))); diff --git a/lib/util.php b/lib/util.php index 7518fbf55..fc45311fc 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1206,6 +1206,10 @@ function common_fancy_url($action, $args=NULL) { $path = 'tags'; } return common_path($path . (($args) ? ('?' . http_build_query($args)) : '')); + case 'tagrss': + $path = 'tag/' . $args['tag'] . '/rss'; + unset($args['tag']); + return common_path($path . (($args) ? ('?' . http_build_query($args)) : '')); case 'peopletag': $path = 'peopletag/' . $args['tag']; unset($args['tag']); @@ -1499,7 +1503,7 @@ function common_twitter_broadcast($notice, $flink) { CURLOPT_USERAGENT => "Laconica", CURLOPT_CONNECTTIMEOUT => 120, // XXX: Scary!!!! How long should this be? CURLOPT_TIMEOUT => 120, - + # Twitter is strict about accepting invalid "Expect" headers CURLOPT_HTTPHEADER => array('Expect:') ); -- cgit v1.2.3-54-g00ecf From 7c54239fc07ce441b79abee3fe227429225980d9 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 10 Jan 2009 14:55:53 -0500 Subject: Return an error in tagrss if no tag is provided --- actions/tagrss.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'actions') diff --git a/actions/tagrss.php b/actions/tagrss.php index 9187bdc87..00e549281 100644 --- a/actions/tagrss.php +++ b/actions/tagrss.php @@ -27,6 +27,12 @@ class TagrssAction extends Rss10Action { function init() { $tag = $this->trimmed('tag'); + + if (!$tag) { + common_user_error(_('No tag.')); + return false; + } + $this->tag = Notice_tag::staticGet('tag', $tag); if (!$this->tag) { -- cgit v1.2.3-54-g00ecf From a3b72d9e3be5177936c650603114f364b453318c Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 10 Jan 2009 14:57:37 -0500 Subject: Better check on blank tag --- actions/tagrss.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actions') diff --git a/actions/tagrss.php b/actions/tagrss.php index 00e549281..8a1461569 100644 --- a/actions/tagrss.php +++ b/actions/tagrss.php @@ -28,7 +28,7 @@ class TagrssAction extends Rss10Action { function init() { $tag = $this->trimmed('tag'); - if (!$tag) { + if (!isset($tag) || mb_strlen($tag) == 0) { common_user_error(_('No tag.')); return false; } -- cgit v1.2.3-54-g00ecf From 44ec22c0f29c7571669a57ecdf6c97132f5f3abd Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 10 Jan 2009 15:05:16 -0500 Subject: Fix database fetch and bad var name in tagrss --- actions/tagrss.php | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) (limited to 'actions') diff --git a/actions/tagrss.php b/actions/tagrss.php index 8a1461569..737ac113d 100644 --- a/actions/tagrss.php +++ b/actions/tagrss.php @@ -33,24 +33,14 @@ class TagrssAction extends Rss10Action { return false; } - $this->tag = Notice_tag::staticGet('tag', $tag); - - if (!$this->tag) { - common_user_error(_('No such tag.')); - return false; - } else { - return true; - } + $this->tag = $tag; + return true; } function get_notices($limit=0) { $tag = $this->tag; - if (is_null($tag)) { - return NULL; - } - - $notice = Notice_tag::getStream($tag->tag, 0, ($limit == 0) ? NOTICES_PER_PAGE : $limit); + $notice = Notice_tag::getStream($tag, 0, ($limit == 0) ? NOTICES_PER_PAGE : $limit); while ($notice->fetch()) { $notices[] = clone($notice); @@ -60,12 +50,12 @@ class TagrssAction extends Rss10Action { } function get_channel() { - $tag = $this->tag->tag; + $tag = $this->tag; - $c = array('url' => common_local_url('tagrss', array('tag' => $tagname)), - 'title' => $tagname, - 'link' => common_local_url('tagrss', array('tag' => $tagname)), - 'description' => sprintf(_('Microblog tagged with %s'), $tagname)); + $c = array('url' => common_local_url('tagrss', array('tag' => $tag)), + 'title' => $tag, + 'link' => common_local_url('tagrss', array('tag' => $tag)), + 'description' => sprintf(_('Microblog tagged with %s'), $tag)); return $c; } } -- cgit v1.2.3-54-g00ecf From 1636da829c9caa801f95dd9e8e658f938012a5fa Mon Sep 17 00:00:00 2001 From: Ori Avtalion Date: Mon, 12 Jan 2009 23:07:51 +0200 Subject: Removed double spaces from strings --- actions/deletenotice.php | 2 +- actions/recoverpassword.php | 2 +- actions/remotesubscribe.php | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'actions') diff --git a/actions/deletenotice.php b/actions/deletenotice.php index 64746283a..9a5261eed 100644 --- a/actions/deletenotice.php +++ b/actions/deletenotice.php @@ -34,7 +34,7 @@ class DeletenoticeAction extends DeleteAction { } function get_instructions() { - return _('You are about to permanently delete a notice. Once this is done, it cannot be undone.'); + return _('You are about to permanently delete a notice. Once this is done, it cannot be undone.'); } function get_title() { diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php index 38c42f41d..54a0f2ae3 100644 --- a/actions/recoverpassword.php +++ b/actions/recoverpassword.php @@ -140,7 +140,7 @@ class RecoverpasswordAction extends Action { common_element('p', NULL, _('If you\'ve forgotten or lost your' . ' password, you can get a new one sent to' . - ' the email address you have stored ' . + ' the email address you have stored' . ' in your account.')); common_element_end('div'); } diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php index c3a09bcfc..624497af7 100644 --- a/actions/remotesubscribe.php +++ b/actions/remotesubscribe.php @@ -49,9 +49,9 @@ class RemotesubscribeAction extends Action { function get_instructions() { return _('To subscribe, you can [login](%%action.login%%),' . - ' or [register](%%action.register%%) a new ' . - ' account. If you already have an account ' . - ' on a [compatible microblogging site](%%doc.openmublog%%), ' . + ' or [register](%%action.register%%) a new' . + ' account. If you already have an account' . + ' on a [compatible microblogging site](%%doc.openmublog%%),' . ' enter your profile URL below.'); } -- cgit v1.2.3-54-g00ecf From 50ec1cc26ec1c27a2d80dcab27214aa6e7a6416f Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 23 Jan 2009 08:15:29 +0100 Subject: Upload logos for groups --- actions/grouplogo.php | 511 +++++++++++++++++++++++++++++++++++++++++++++++++ classes/User_group.php | 78 ++++++++ htaccess.sample | 15 +- lib/groupnav.php | 6 + lib/util.php | 2 + 5 files changed, 605 insertions(+), 7 deletions(-) create mode 100644 actions/grouplogo.php (limited to 'actions') diff --git a/actions/grouplogo.php b/actions/grouplogo.php new file mode 100644 index 000000000..393070d5d --- /dev/null +++ b/actions/grouplogo.php @@ -0,0 +1,511 @@ +. + * + * @category Settings + * @package Laconica + * @author Evan Prodromou + * @author Zach Copley + * @copyright 2008-2009 Control Yourself, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://laconi.ca/ + */ + +if (!defined('LACONICA')) { + exit(1); +} + +require_once INSTALLDIR.'/lib/accountsettingsaction.php'; + +/** + * Upload an avatar + * + * We use jCrop plugin for jQuery to crop the image after upload. + * + * @category Settings + * @package Laconica + * @author Evan Prodromou + * @author Zach Copley + * @author Sarven Capadisli + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://laconi.ca/ + */ + +class GrouplogoAction extends Action +{ + var $mode = null; + var $imagefile = null; + var $filename = null; + + /** + * Prepare to run + */ + + function prepare($args) + { + parent::prepare($args); + + if (!common_config('inboxes','enabled')) { + $this->serverError(_('Inboxes must be enabled for groups to work')); + return false; + } + + if (!common_logged_in()) { + $this->clientError(_('You must be logged in to create a group.')); + return false; + } + + $nickname_arg = $this->trimmed('nickname'); + $nickname = common_canonical_nickname($nickname_arg); + + // Permanent redirect on non-canonical nickname + + if ($nickname_arg != $nickname) { + $args = array('nickname' => $nickname); + common_redirect(common_local_url('editgroup', $args), 301); + return false; + } + + if (!$nickname) { + $this->clientError(_('No nickname'), 404); + return false; + } + + $groupid = $this->trimmed('groupid'); + + if ($groupid) { + $this->group = User_group::staticGet('id', $groupid); + } else { + $this->group = User_group::staticGet('nickname', $nickname); + } + + if (!$this->group) { + $this->clientError(_('No such group'), 404); + return false; + } + + $cur = common_current_user(); + + if (!$cur->isAdmin($this->group)) { + $this->clientError(_('You must be an admin to edit the group'), 403); + return false; + } + + return true; + } + + function handle($args) + { + parent::handle($args); + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + $this->handlePost(); + } else { + $this->showForm(); + } + } + + function showForm($msg = null) + { + $this->msg = $msg; + $this->showPage(); + } + + /** + * Title of the page + * + * @return string Title of the page + */ + + function title() + { + return _('Group logo'); + } + + /** + * Instructions for use + * + * @return instructions for use + */ + + function getInstructions() + { + return _('You can upload a logo image for your group.'); + } + + /** + * Content area of the page + * + * Shows a form for uploading an avatar. + * + * @return void + */ + + function showContent() + { + if ($this->mode == 'crop') { + $this->showCropForm(); + } else { + $this->showUploadForm(); + } + } + + function showUploadForm() + { + $user = common_current_user(); + + $profile = $user->getProfile(); + + if (!$profile) { + common_log_db_error($user, 'SELECT', __FILE__); + $this->serverError(_('User without matching profile')); + return; + } + + $original = $this->group->original_logo; + + $this->elementStart('form', array('enctype' => 'multipart/form-data', + 'method' => 'post', + 'id' => 'form_settings_logo', + 'class' => 'form_settings', + 'action' => + common_local_url('grouplogo', + array('nickname' => $this->group->nickname)))); + $this->elementStart('fieldset'); + $this->element('legend', null, _('Group logo')); + $this->hidden('token', common_session_token()); + + $this->elementStart('ul', 'form_data'); + if ($original) { + $this->elementStart('li', array('id' => 'avatar_original', + 'class' => 'avatar_view')); + $this->element('h2', null, _("Original")); + $this->elementStart('div', array('id'=>'avatar_original_view')); + $this->element('img', array('src' => $this->group->original_logo, + 'alt' => $this->group->nickname)); + $this->elementEnd('div'); + $this->elementEnd('li'); + } + + if ($this->group->homepage_logo) { + $this->elementStart('li', array('id' => 'avatar_preview', + 'class' => 'avatar_view')); + $this->element('h2', null, _("Preview")); + $this->elementStart('div', array('id'=>'avatar_preview_view')); + $this->element('img', array('src' => $this->group->homepage_logo, + 'width' => AVATAR_PROFILE_SIZE, + 'height' => AVATAR_PROFILE_SIZE, + 'alt' => $this->group->nickname)); + $this->elementEnd('div'); + $this->elementEnd('li'); + } + + $this->elementStart('li', array ('id' => 'settings_attach')); + $this->element('input', array('name' => 'avatarfile', + 'type' => 'file', + 'id' => 'avatarfile')); + $this->element('input', array('name' => 'MAX_FILE_SIZE', + 'type' => 'hidden', + 'id' => 'MAX_FILE_SIZE', + 'value' => MAX_AVATAR_SIZE)); + $this->elementEnd('li'); + $this->elementEnd('ul'); + + $this->elementStart('ul', 'form_actions'); + $this->elementStart('li'); + $this->submit('upload', _('Upload')); + $this->elementEnd('li'); + $this->elementEnd('ul'); + + $this->elementEnd('fieldset'); + $this->elementEnd('form'); + + } + + function showCropForm() + { + $this->elementStart('form', array('method' => 'post', + 'id' => 'form_settings_avatar', + 'class' => 'form_settings', + 'action' => + common_local_url('grouplogo', + array('nickname' => $this->group->nickname)))); + $this->elementStart('fieldset'); + $this->element('legend', null, _('Avatar settings')); + $this->hidden('token', common_session_token()); + + $this->elementStart('ul', 'form_data'); + + $this->elementStart('li', + array('id' => 'avatar_original', + 'class' => 'avatar_view')); + $this->element('h2', null, _("Original")); + $this->elementStart('div', array('id'=>'avatar_original_view')); + $this->element('img', array('src' => common_avatar_url($this->filedata['filename']), + 'width' => $this->filedata['width'], + 'height' => $this->filedata['height'], + 'alt' => $this->group->nickname)); + $this->elementEnd('div'); + $this->elementEnd('li'); + + $this->elementStart('li', + array('id' => 'avatar_preview', + 'class' => 'avatar_view')); + $this->element('h2', null, _("Preview")); + $this->elementStart('div', array('id'=>'avatar_preview_view')); + $this->element('img', array('src' => common_avatar_url($this->filedata['filename']), + 'width' => AVATAR_PROFILE_SIZE, + 'height' => AVATAR_PROFILE_SIZE, + 'alt' => $this->group->nickname)); + $this->elementEnd('div'); + + foreach (array('avatar_crop_x', 'avatar_crop_y', + 'avatar_crop_w', 'avatar_crop_h') as $crop_info) { + $this->element('input', array('name' => $crop_info, + 'type' => 'hidden', + 'id' => $crop_info)); + } + $this->submit('crop', _('Crop')); + + $this->elementEnd('li'); + $this->elementEnd('ul'); + $this->elementEnd('fieldset'); + $this->elementEnd('form'); + + } + + /** + * Handle a post + * + * We mux on the button name to figure out what the user actually wanted. + * + * @return void + */ + + function handlePost() + { + // CSRF protection + + $token = $this->trimmed('token'); + if (!$token || $token != common_session_token()) { + $this->show_form(_('There was a problem with your session token. '. + 'Try again, please.')); + return; + } + + if ($this->arg('upload')) { + $this->uploadAvatar(); + } else if ($this->arg('crop')) { + $this->cropAvatar(); + } else { + $this->showForm(_('Unexpected form submission.')); + } + } + + /** + * Handle an image upload + * + * Does all the magic for handling an image upload, and crops the + * image by default. + * + * @return void + */ + + function uploadAvatar() + { + try { + $imagefile = ImageFile::fromUpload('avatarfile'); + } catch (Exception $e) { + $this->showForm($e->getMessage()); + return; + } + + $filename = common_avatar_filename($this->group->id, + image_type_to_extension($imagefile->type), + null, + 'group-temp-'.common_timestamp()); + + $filepath = common_avatar_path($filename); + + move_uploaded_file($imagefile->filename, $filepath); + + $filedata = array('filename' => $filename, + 'filepath' => $filepath, + 'width' => $imagefile->width, + 'height' => $imagefile->height, + 'type' => $imagefile->type); + + $_SESSION['FILEDATA'] = $filedata; + + $this->filedata = $filedata; + + $this->mode = 'crop'; + + $this->showForm(_('Pick a square area of the image to be your avatar'), + true); + } + + /** + * Handle the results of jcrop. + * + * @return void + */ + + function cropAvatar() + { + $user = common_current_user(); + + $profile = $user->getProfile(); + + $x = $this->arg('avatar_crop_x'); + $y = $this->arg('avatar_crop_y'); + $w = $this->arg('avatar_crop_w'); + $h = $this->arg('avatar_crop_h'); + + $filedata = $_SESSION['FILEDATA']; + + if (!$filedata) { + $this->serverError(_('Lost our file data.')); + return; + } + + $filepath = common_avatar_path($filedata['filename']); + + if (!file_exists($filepath)) { + $this->serverError(_('Lost our file.')); + return; + } + + switch ($filedata['type']) { + case IMAGETYPE_GIF: + $image_src = imagecreatefromgif($filepath); + break; + case IMAGETYPE_JPEG: + $image_src = imagecreatefromjpeg($filepath); + break; + case IMAGETYPE_PNG: + $image_src = imagecreatefrompng($filepath); + break; + default: + $this->serverError(_('Unknown file type')); + return; + } + + common_debug("W = $w, H = $h, X = $x, Y = $y"); + + $image_dest = imagecreatetruecolor($w, $h); + + $background = imagecolorallocate($image_dest, 0, 0, 0); + ImageColorTransparent($image_dest, $background); + imagealphablending($image_dest, false); + + imagecopyresized($image_dest, $image_src, 0, 0, $x, $y, $w, $h, $w, $h); + + $cur = common_current_user(); + + $filename = common_avatar_filename($this->group->id, + image_type_to_extension($imagefile->type), + null, + 'group-'.common_timestamp()); + + $filepath = common_avatar_path($filename); + + switch ($filedata['type']) { + case IMAGETYPE_GIF: + imagegif($image_dest, $filepath); + break; + case IMAGETYPE_JPEG: + imagejpeg($image_dest, $filepath); + break; + case IMAGETYPE_PNG: + imagepng($image_dest, $filepath); + break; + default: + $this->serverError(_('Unknown file type')); + return; + } + + if ($this->group->setOriginal($filename, $filedata['type'])) { + @unlink(common_avatar_path($filedata['filename'])); + unset($_SESSION['FILEDATA']); + $this->mode = 'upload'; + $this->showForm(_('Logo updated.'), true); + } else { + $this->showForm(_('Failed updating logo.')); + } + } + + function showPageNotice() + { + if ($this->msg) { + $this->element('div', ($this->success) ? 'success' : 'error', + $this->msg); + } else { + $inst = $this->getInstructions(); + $output = common_markup_to_html($inst); + + $this->elementStart('div', 'instructions'); + $this->raw($output); + $this->elementEnd('div'); + } + } + + /** + * Add the jCrop stylesheet + * + * @return void + */ + + function showStylesheets() + { + parent::showStylesheets(); + $jcropStyle = + common_path('theme/base/css/jquery.Jcrop.css?version='.LACONICA_VERSION); + + $this->element('link', array('rel' => 'stylesheet', + 'type' => 'text/css', + 'href' => $jcropStyle, + 'media' => 'screen, projection, tv')); + } + + /** + * Add the jCrop scripts + * + * @return void + */ + + function showScripts() + { + parent::showScripts(); + + $jcropPack = common_path('js/jcrop/jquery.Jcrop.pack.js'); + $jcropGo = common_path('js/jcrop/jquery.Jcrop.go.js'); + + $this->element('script', array('type' => 'text/javascript', + 'src' => $jcropPack)); + $this->element('script', array('type' => 'text/javascript', + 'src' => $jcropGo)); + } + + function showLocalNav() + { + $nav = new GroupNav($this, $this->group); + $nav->show(); + } +} diff --git a/classes/User_group.php b/classes/User_group.php index 484b2fe0a..98ad77cc0 100755 --- a/classes/User_group.php +++ b/classes/User_group.php @@ -86,4 +86,82 @@ class User_group extends Memcached_DataObject return $members; } + + function setOriginal($filename, $type) + { + $orig = clone($this); + $this->original_logo = common_avatar_url($filename); + $this->homepage_logo = common_avatar_url($this->scale($filename, + AVATAR_PROFILE_SIZE, + $type)); + $this->stream_logo = common_avatar_url($this->scale($filename, + AVATAR_STREAM_SIZE, + $type)); + $this->mini_logo = common_avatar_url($this->scale($filename, + AVATAR_MINI_SIZE, + $type)); + common_debug(common_log_objstring($this)); + return $this->update($orig); + } + + function scale($filename, $size, $type) + { + $filepath = common_avatar_path($filename); + + if (!file_exists($filepath)) { + $this->serverError(_('Lost our file.')); + return; + } + + $info = @getimagesize($filepath); + + switch ($type) { + case IMAGETYPE_GIF: + $image_src = imagecreatefromgif($filepath); + break; + case IMAGETYPE_JPEG: + $image_src = imagecreatefromjpeg($filepath); + break; + case IMAGETYPE_PNG: + $image_src = imagecreatefrompng($filepath); + break; + default: + $this->serverError(_('Unknown file type')); + return; + } + + $image_dest = imagecreatetruecolor($size, $size); + + $background = imagecolorallocate($image_dest, 0, 0, 0); + ImageColorTransparent($image_dest, $background); + imagealphablending($image_dest, false); + + imagecopyresized($image_dest, $image_src, 0, 0, $x, $y, $size, $size, $info[0], $info[1]); + + $cur = common_current_user(); + + $outname = common_avatar_filename($cur->id, + image_type_to_extension($type), + null, + common_timestamp()); + + $outpath = common_avatar_path($outname); + + switch ($type) { + case IMAGETYPE_GIF: + imagegif($image_dest, $outpath); + break; + case IMAGETYPE_JPEG: + imagejpeg($image_dest, $outpath); + break; + case IMAGETYPE_PNG: + imagepng($image_dest, $outpath); + break; + default: + $this->serverError(_('Unknown file type')); + return; + } + + return $outname; + } } diff --git a/htaccess.sample b/htaccess.sample index b80dd88fe..73b52c55e 100644 --- a/htaccess.sample +++ b/htaccess.sample @@ -88,13 +88,14 @@ RewriteRule ^peopletag/([a-zA-Z0-9]+)$ index.php?action=peopletag&tag=$1 [L,QSA] RewriteRule ^featured/?$ index.php?action=featured [L,QSA] RewriteRule ^favorited/?$ index.php?action=favorited [L,QSA] -RewriteRule ^group/new index.php?action=newgroup [L,QSA] -RewriteRule ^group/([a-zA-Z0-9]+)/edit index.php?action=editgroup&nickname=$1 [L,QSA] -RewriteRule ^group/([a-zA-Z0-9]+)/join index.php?action=joingroup&nickname=$1 [L,QSA] -RewriteRule ^group/([a-zA-Z0-9]+)/leave index.php?action=leavegroup&nickname=$1 [L,QSA] -RewriteRule ^group/([a-zA-Z0-9]+)/members index.php?action=groupmembers&nickname=$1 [L,QSA] -RewriteRule ^group/([0-9]+)/id index.php?action=groupbyid&id=$1 [L,QSA] -RewriteRule ^group/([a-zA-Z0-9]+)/rss index.php?action=grouprss&nickname=$1 [L,QSA] +RewriteRule ^group/new$ index.php?action=newgroup [L,QSA] +RewriteRule ^group/([a-zA-Z0-9]+)/edit$ index.php?action=editgroup&nickname=$1 [L,QSA] +RewriteRule ^group/([a-zA-Z0-9]+)/join$ index.php?action=joingroup&nickname=$1 [L,QSA] +RewriteRule ^group/([a-zA-Z0-9]+)/leave$ index.php?action=leavegroup&nickname=$1 [L,QSA] +RewriteRule ^group/([a-zA-Z0-9]+)/members$ index.php?action=groupmembers&nickname=$1 [L,QSA] +RewriteRule ^group/([a-zA-Z0-9]+)/logo$ index.php?action=grouplogo&nickname=$1 [L,QSA] +RewriteRule ^group/([0-9]+)/id$ index.php?action=groupbyid&id=$1 [L,QSA] +RewriteRule ^group/([a-zA-Z0-9]+)/rss$ index.php?action=grouprss&nickname=$1 [L,QSA] RewriteRule ^group/([a-zA-Z0-9]+)$ index.php?action=showgroup&nickname=$1 [L,QSA] RewriteRule ^group$ index.php?action=groups [L,QSA] diff --git a/lib/groupnav.php b/lib/groupnav.php index 32803fd42..90bdc1014 100644 --- a/lib/groupnav.php +++ b/lib/groupnav.php @@ -101,6 +101,12 @@ class GroupNav extends Widget sprintf(_('Edit %s group properties'), $nickname), $action_name == 'editgroup', 'nav_group_admin'); + $this->out->menuItem(common_local_url('grouplogo', array('nickname' => + $nickname)), + _('Logo'), + sprintf(_('Add or edit %s logo'), $nickname), + $action_name == 'grouplogo', + 'nav_group_logo'); } $this->out->elementEnd('ul'); } diff --git a/lib/util.php b/lib/util.php index 0b5abfa48..03d6b6199 100644 --- a/lib/util.php +++ b/lib/util.php @@ -898,6 +898,8 @@ function common_fancy_url($action, $args=null) return common_path('group/'.$args['nickname'].'/rss'); case 'groupmembers': return common_path('group/'.$args['nickname'].'/members'); + case 'grouplogo': + return common_path('group/'.$args['nickname'].'/logo'); case 'usergroups': return common_path($args['nickname'].'/groups'); case 'groups': -- cgit v1.2.3-54-g00ecf From ad929011a322349d4ef8e84b79f42e23c7ffc691 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 23 Jan 2009 09:42:23 +0100 Subject: public is readonly --- actions/public.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'actions') diff --git a/actions/public.php b/actions/public.php index f5380589a..47b8e16cd 100644 --- a/actions/public.php +++ b/actions/public.php @@ -56,6 +56,11 @@ class PublicAction extends Action var $page = null; + function isReadOnly() + { + return true; + } + /** * Read and validate arguments * -- cgit v1.2.3-54-g00ecf From 76cf3cc3d0046e1d94c8a7dcb7c2fff21e145ee5 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 23 Jan 2009 08:42:40 +0000 Subject: trac750 Fixed bad url that made the 'skip' step when adding status_update permission fail --- actions/facebookhome.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actions') diff --git a/actions/facebookhome.php b/actions/facebookhome.php index 9510e7f08..3558cf671 100644 --- a/actions/facebookhome.php +++ b/actions/facebookhome.php @@ -202,7 +202,7 @@ class FacebookhomeAction extends FacebookAction $this->elementEnd('p'); $this->elementStart('form', array('method' => 'post', - 'action' => "$app_url/index.php", + 'action' => "index.php", 'id' => 'facebook-skip-permissions')); $this->elementStart('ul', array('id' => 'fb-permissions-list')); -- cgit v1.2.3-54-g00ecf From 5f89b8865056baea5e4f89aadf28541dbd0993ee Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 23 Jan 2009 09:45:48 +0100 Subject: showstream is readonly --- actions/showstream.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'actions') diff --git a/actions/showstream.php b/actions/showstream.php index 2fd56ad2e..c1ef8ba52 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -60,6 +60,11 @@ class ShowstreamAction extends Action var $page = null; var $profile = null; + function isReadOnly() + { + return true; + } + function title() { if ($this->page == 1) { -- cgit v1.2.3-54-g00ecf From cdd2032540b0433c9a483a480bd0e6f8a655dddc Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 23 Jan 2009 09:49:38 +0100 Subject: groups are readonly --- actions/groups.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'actions') diff --git a/actions/groups.php b/actions/groups.php index 261f9b3aa..39dc2232b 100644 --- a/actions/groups.php +++ b/actions/groups.php @@ -51,6 +51,11 @@ class GroupsAction extends Action var $page = null; var $profile = null; + function isReadOnly() + { + return true; + } + function title() { if ($this->page == 1) { -- cgit v1.2.3-54-g00ecf From daf32e43cd100a6097bc5eaa55f5bf396d374dc5 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 23 Jan 2009 09:51:10 +0100 Subject: usergroups is read only --- actions/usergroups.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'actions') diff --git a/actions/usergroups.php b/actions/usergroups.php index 20f2e5a75..748585e1d 100644 --- a/actions/usergroups.php +++ b/actions/usergroups.php @@ -52,6 +52,11 @@ class UsergroupsAction extends Action var $page = null; var $profile = null; + function isReadOnly() + { + return true; + } + function title() { if ($this->page == 1) { -- cgit v1.2.3-54-g00ecf From 6c9bbdb56174f106ceeebab9a4b6f0ee452ee17f Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 23 Jan 2009 08:52:04 +0000 Subject: openid markup and style --- actions/openidlogin.php | 13 ++++++++++++- theme/base/css/display.css | 6 ++++-- 2 files changed, 16 insertions(+), 3 deletions(-) (limited to 'actions') diff --git a/actions/openidlogin.php b/actions/openidlogin.php index ec5361c8b..7a267a2bd 100644 --- a/actions/openidlogin.php +++ b/actions/openidlogin.php @@ -90,16 +90,27 @@ class OpenidloginAction extends Action function showContent() { $formaction = common_local_url('openidlogin'); $this->elementStart('form', array('method' => 'post', - 'id' => 'openidlogin', + 'id' => 'form_openid_login', + 'class' => 'form_settings', 'action' => $formaction)); + $this->elementStart('fieldset'); + $this->element('legend', null, _('OpenID login')); $this->hidden('token', common_session_token()); + + $this->elementStart('ul', 'form_data'); + $this->elementStart('li'); $this->input('openid_url', _('OpenID URL'), $this->openid_url, _('Your OpenID URL')); + $this->elementEnd('li'); + $this->elementStart('li', array('id' => 'settings_rememberme')); $this->checkbox('rememberme', _('Remember me'), false, _('Automatically login in the future; ' . 'not for shared computers!')); + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->submit('submit', _('Login')); + $this->elementEnd('fieldset'); $this->elementEnd('form'); } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 24f5cc865..f8dbd7941 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -145,7 +145,8 @@ font-weight:bold; #newgroup legend, #editgroup legend, #form_tag_user legend, -#form_remote_subscribe legend { +#form_remote_subscribe legend, +#form_openid_login legend { display:none; } @@ -173,7 +174,8 @@ width:90%; } #form_login p.form_guide, -#form_register #settings_rememberme p.form_guide { +#form_register #settings_rememberme p.form_guide, +#form_openid_login #settings_rememberme p.form_guide { margin-left:0; } -- cgit v1.2.3-54-g00ecf From 0f6bc2190a8d6c5d086cac190c964390ab2c5c0d Mon Sep 17 00:00:00 2001 From: Robin Millette Date: Fri, 23 Jan 2009 09:15:15 +0000 Subject: mark a bunch of actions read-only --- actions/accesstoken.php | 5 +++++ actions/allrss.php | 5 +++++ actions/avatarbynickname.php | 5 +++++ actions/doc.php | 5 +++++ actions/favoritesrss.php | 5 +++++ actions/grouplogo.php | 5 +++++ actions/groupsearch.php | 5 +++++ actions/logout.php | 2 +- actions/microsummary.php | 5 +++++ actions/noticesearch.php | 5 +++++ actions/noticesearchrss.php | 5 +++++ actions/opensearch.php | 5 +++++ actions/peoplesearch.php | 5 +++++ actions/publicrss.php | 5 +++++ actions/replies.php | 5 +++++ actions/repliesrss.php | 5 +++++ actions/showmessage.php | 7 ++++++- actions/subscribers.php | 5 +++++ actions/tagrss.php | 5 +++++ actions/userrss.php | 5 +++++ 20 files changed, 97 insertions(+), 2 deletions(-) (limited to 'actions') diff --git a/actions/accesstoken.php b/actions/accesstoken.php index 65c67c64e..6e91e6c18 100644 --- a/actions/accesstoken.php +++ b/actions/accesstoken.php @@ -71,4 +71,9 @@ class AccesstokenAction extends Action $this->serverError($e->getMessage()); } } + + function isReadOnly() + { + return true; + } } diff --git a/actions/allrss.php b/actions/allrss.php index 248f59f43..05787f3f7 100644 --- a/actions/allrss.php +++ b/actions/allrss.php @@ -123,5 +123,10 @@ class AllrssAction extends Rss10Action $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); return $avatar ? $avatar->url : null; } + + function isReadOnly() + { + return true; + } } diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php index fec202016..9bbdecefa 100644 --- a/actions/avatarbynickname.php +++ b/actions/avatarbynickname.php @@ -97,5 +97,10 @@ class AvatarbynicknameAction extends Action } common_redirect($url, 302); } + + function isReadOnly() + { + return true; + } } diff --git a/actions/doc.php b/actions/doc.php index 3755bb051..6957659ad 100644 --- a/actions/doc.php +++ b/actions/doc.php @@ -107,4 +107,9 @@ class DocAction extends Action { return ucfirst($this->title); } + + function isReadOnly() + { + return true; + } } diff --git a/actions/favoritesrss.php b/actions/favoritesrss.php index 19339325c..ad72dce9e 100644 --- a/actions/favoritesrss.php +++ b/actions/favoritesrss.php @@ -114,5 +114,10 @@ class FavoritesrssAction extends Rss10Action { return null; } + + function isReadOnly() + { + return true; + } } diff --git a/actions/grouplogo.php b/actions/grouplogo.php index 393070d5d..496b5d260 100644 --- a/actions/grouplogo.php +++ b/actions/grouplogo.php @@ -508,4 +508,9 @@ class GrouplogoAction extends Action $nav = new GroupNav($this, $this->group); $nav->show(); } + + function isReadOnly() + { + return true; + } } diff --git a/actions/groupsearch.php b/actions/groupsearch.php index 66f5c87b3..9b0026db9 100644 --- a/actions/groupsearch.php +++ b/actions/groupsearch.php @@ -103,5 +103,10 @@ class GroupSearchResults extends GroupList { return preg_replace($this->pattern, '\\1', htmlspecialchars($text)); } + + function isReadOnly() + { + return true; + } } diff --git a/actions/logout.php b/actions/logout.php index 0ff8dc754..3977f90a0 100644 --- a/actions/logout.php +++ b/actions/logout.php @@ -54,7 +54,7 @@ class LogoutAction extends Action */ function isReadOnly() { - return true; + return false; } /** diff --git a/actions/microsummary.php b/actions/microsummary.php index 196dd5de8..065a2e0eb 100644 --- a/actions/microsummary.php +++ b/actions/microsummary.php @@ -73,4 +73,9 @@ class MicrosummaryAction extends Action print $user->nickname . ': ' . $notice->content; } + + function isReadOnly() + { + return true; + } } diff --git a/actions/noticesearch.php b/actions/noticesearch.php index 8c5128de1..3c3fdca9f 100644 --- a/actions/noticesearch.php +++ b/actions/noticesearch.php @@ -222,5 +222,10 @@ class NoticesearchAction extends SearchAction } while ($count); return $result; } + + function isReadOnly() + { + return true; + } } diff --git a/actions/noticesearchrss.php b/actions/noticesearchrss.php index c1a1c2c67..7172977ee 100644 --- a/actions/noticesearchrss.php +++ b/actions/noticesearchrss.php @@ -95,4 +95,9 @@ class NoticesearchrssAction extends Rss10Action { return null; } + + function isReadOnly() + { + return true; + } } diff --git a/actions/opensearch.php b/actions/opensearch.php index d7705972f..7709249bb 100644 --- a/actions/opensearch.php +++ b/actions/opensearch.php @@ -83,5 +83,10 @@ class OpensearchAction extends Action $this->elementEnd('OpenSearchDescription'); common_end_xml(); } + + function isReadOnly() + { + return true; + } } diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php index 3c672c940..615201c46 100644 --- a/actions/peoplesearch.php +++ b/actions/peoplesearch.php @@ -109,5 +109,10 @@ class PeopleSearchResults extends ProfileList { return preg_replace($this->pattern, '\\1', htmlspecialchars($text)); } + + function isReadOnly() + { + return true; + } } diff --git a/actions/publicrss.php b/actions/publicrss.php index 844c334be..c35877997 100644 --- a/actions/publicrss.php +++ b/actions/publicrss.php @@ -102,5 +102,10 @@ class PublicrssAction extends Rss10Action { // nop } + + function isReadOnly() + { + return true; + } } diff --git a/actions/replies.php b/actions/replies.php index ea8ef4764..5777d17fd 100644 --- a/actions/replies.php +++ b/actions/replies.php @@ -191,4 +191,9 @@ class RepliesAction extends Action $this->page, 'replies', array('nickname' => $this->user->nickname)); } + + function isReadOnly() + { + return true; + } } diff --git a/actions/repliesrss.php b/actions/repliesrss.php index 48c4fa255..985318bf1 100644 --- a/actions/repliesrss.php +++ b/actions/repliesrss.php @@ -82,4 +82,9 @@ class RepliesrssAction extends Rss10Action $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); return ($avatar) ? $avatar->url : null; } + + function isReadOnly() + { + return true; + } } diff --git a/actions/showmessage.php b/actions/showmessage.php index 289414153..572a71739 100644 --- a/actions/showmessage.php +++ b/actions/showmessage.php @@ -176,4 +176,9 @@ class ShowmessageAction extends MailboxAction { return ''; } -} \ No newline at end of file + + function isReadOnly() + { + return true; + } +} diff --git a/actions/subscribers.php b/actions/subscribers.php index be9df2b12..fb8733c77 100644 --- a/actions/subscribers.php +++ b/actions/subscribers.php @@ -103,4 +103,9 @@ class SubscribersList extends ProfileList 'nickname' => $this->owner->nickname)); $bf->show(); } + + function isReadOnly() + { + return true; + } } diff --git a/actions/tagrss.php b/actions/tagrss.php index b0227ab39..b4c2dcdff 100644 --- a/actions/tagrss.php +++ b/actions/tagrss.php @@ -66,4 +66,9 @@ class TagrssAction extends Rss10Action 'description' => sprintf(_('Microblog tagged with %s'), $tagname)); return $c; } + + function isReadOnly() + { + return true; + } } diff --git a/actions/userrss.php b/actions/userrss.php index c1f2321ee..04855ccca 100644 --- a/actions/userrss.php +++ b/actions/userrss.php @@ -94,5 +94,10 @@ class UserrssAction extends Rss10Action header('X-SUP-ID: '.$url); parent::initRss($limit); } + + function isReadOnly() + { + return true; + } } -- cgit v1.2.3-54-g00ecf From 4c7f3faf92503de788496ba3254f1e46bf16a27d Mon Sep 17 00:00:00 2001 From: Robin Millette Date: Fri, 23 Jan 2009 09:15:57 +0000 Subject: mark nudge action read-only --- actions/nudge.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'actions') diff --git a/actions/nudge.php b/actions/nudge.php index ca6fd3761..ca7947f5a 100644 --- a/actions/nudge.php +++ b/actions/nudge.php @@ -122,5 +122,10 @@ class NudgeAction extends Action // XXX: notify by SMS } } + + function isReadOnly() + { + return true; + } } -- cgit v1.2.3-54-g00ecf