summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-01-23 08:43:34 +0000
committerZach Copley <zach@controlyourself.ca>2009-01-23 08:43:34 +0000
commit1305ecf4bd58b8651fd8648d65263a24ed47bbc6 (patch)
treef4437adc6e405e1c3e1118c8f7e38d5802d0f55a /actions
parent76cf3cc3d0046e1d94c8a7dcb7c2fff21e145ee5 (diff)
parentbe21ed13b5160646cc4feb7c572d878bc0ee464d (diff)
Merge branch 'master' of /var/www/trunk
Diffstat (limited to 'actions')
-rw-r--r--actions/api.php12
-rw-r--r--actions/grouplogo.php511
-rw-r--r--actions/twitapiaccount.php21
-rw-r--r--actions/twitapiusers.php94
-rw-r--r--actions/twittersettings.php2
5 files changed, 612 insertions, 28 deletions
diff --git a/actions/api.php b/actions/api.php
index 47c119605..dfe2c8857 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -72,10 +72,14 @@ 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/grouplogo.php b/actions/grouplogo.php
new file mode 100644
index 000000000..393070d5d
--- /dev/null
+++ b/actions/grouplogo.php
@@ -0,0 +1,511 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Upload an avatar
+ *
+ * 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 Laconica
+ * @author Evan Prodromou <evan@controlyourself.ca>
+ * @author Zach Copley <zach@controlyourself.ca>
+ * @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 <evan@controlyourself.ca>
+ * @author Zach Copley <zach@controlyourself.ca>
+ * @author Sarven Capadisli <csarven@controlyourself.ca>
+ * @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/actions/twitapiaccount.php b/actions/twitapiaccount.php
index e51a29a2d..dc8e2e798 100644
--- a/actions/twitapiaccount.php
+++ b/actions/twitapiaccount.php
@@ -24,17 +24,20 @@ require_once(INSTALLDIR.'/lib/twitterapi.php');
class TwitapiaccountAction extends TwitterapiAction
{
- function verify_credentials($args, $apidata)
+ function verify_credentials($args, $apidata)
{
- parent::handle($args);
- if (!in_array($apidata['content-type'], array('xml', 'json'))) {
- $this->clientError(_('API method not found!'), $code = 404);
- return;
- }
+ if ($apidata['content-type'] == 'xml') {
+ header('Content-Type: application/xml; charset=utf-8');
+ print '<authorized>true</authorized>';
+ } 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)
{
@@ -99,4 +102,4 @@ class TwitapiaccountAction extends TwitterapiAction
parent::handle($args);
$this->serverError(_('API method under construction.'), $code=501);
}
-} \ No newline at end of file
+}
diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index ed2417561..8f16e5613 100644
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -33,22 +33,88 @@ class TwitapiusersAction extends TwitterapiAction
return;
}
- $user = null;
- $email = $this->arg('email');
+ $this->auth_user = $apidata['user'];
+ $user = null;
+ $email = $this->arg('email');
- if ($email) {
- $user = User::staticGet('email', $email);
- } elseif (isset($apidata['api_arg'])) {
- $user = $this->get_user($apidata['api_arg']);
- }
+ if ($email) {
+ $user = User::staticGet('email', $email);
+ } elseif (isset($apidata['api_arg'])) {
+ $user = $this->get_user($apidata['api_arg']);
+ }
- if (!$user) {
- // XXX: Twitter returns a random(?) user instead of throwing and err! -- Zach
- $this->clientError(_('Not found.'), 404, $apidata['content-type']);
- return;
- }
+ if (!$user) {
+ // XXX: Twitter returns a random(?) user instead of throwing and err! -- Zach
+ $this->client_error(_('Not found.'), 404, $apidata['content-type']);
+ return;
+ }
+
+ $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';
+ }
- $this->show_extended_profile($user, $apidata);
- }
+ 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');
+ }
+ }
}
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index efc8215cd..0c109ab53 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -472,7 +472,7 @@ class TwittersettingsAction extends ConnectSettingsAction
function verifyCredentials($screen_name, $password)
{
- $uri = 'http://twitter.com/account/verifyCredentials.json';
+ $uri = 'http://twitter.com/account/verify_credentials.json';
$data = get_twitter_data($uri, $screen_name, $password);