summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--actions/avatarsettings.php18
-rw-r--r--actions/grouplogo.php8
-rw-r--r--actions/noticesearch.php12
-rw-r--r--actions/tagrss.php16
-rw-r--r--js/facebookapp.js10
-rw-r--r--lib/imagefile.php57
-rw-r--r--lib/util.php2
7 files changed, 64 insertions, 59 deletions
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 0f8122c07..3f50ca24c 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -75,7 +75,7 @@ class AvatarsettingsAction extends AccountSettingsAction
function getInstructions()
{
- return _('You can upload your personal avatar. The maximum file size is '.ImageFile::maxFileSize().'.');
+ return sprintf(_('You can upload your personal avatar. The maximum file size is %s.'), ImageFile::maxFileSize());
}
/**
@@ -155,7 +155,7 @@ class AvatarsettingsAction extends AccountSettingsAction
$this->element('input', array('name' => 'MAX_FILE_SIZE',
'type' => 'hidden',
'id' => 'MAX_FILE_SIZE',
- 'value' => ImageFile::maxFileSize(true)));
+ 'value' => ImageFile::maxFileSizeInt()));
$this->elementEnd('li');
$this->elementEnd('ul');
@@ -373,12 +373,14 @@ class AvatarsettingsAction extends AccountSettingsAction
{
parent::showScripts();
- $jcropPack = common_path('js/jcrop/jquery.Jcrop.pack.js');
- $jcropGo = common_path('js/jcrop/jquery.Jcrop.go.js');
+ if ($this->mode == 'crop') {
+ $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));
+ $this->element('script', array('type' => 'text/javascript',
+ 'src' => $jcropPack));
+ $this->element('script', array('type' => 'text/javascript',
+ 'src' => $jcropGo));
+ }
}
}
diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index 473303373..7cf198dc7 100644
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -152,7 +152,7 @@ class GrouplogoAction extends Action
function getInstructions()
{
- return _('You can upload a logo image for your group. The maximum file size is '.ImageFile::maxFileSize().'.');
+ return sprintf(_('You can upload a logo image for your group. The maximum file size is %s.'), ImageFile::maxFileSize());
}
/**
@@ -229,7 +229,7 @@ class GrouplogoAction extends Action
$this->element('input', array('name' => 'MAX_FILE_SIZE',
'type' => 'hidden',
'id' => 'MAX_FILE_SIZE',
- 'value' => ImageFile::maxFileSize(true)));
+ 'value' => ImageFile::maxFileSizeInt()));
$this->elementEnd('li');
$this->elementEnd('ul');
@@ -382,7 +382,7 @@ class GrouplogoAction extends Action
$this->serverError(_('Lost our file data.'));
return;
}
-
+
// If image is not being cropped assume pos & dimentions of original
$dest_x = $this->arg('avatar_crop_x') ? $this->arg('avatar_crop_x'):0;
$dest_y = $this->arg('avatar_crop_y') ? $this->arg('avatar_crop_y'):0;
@@ -390,7 +390,7 @@ class GrouplogoAction extends Action
$dest_h = $this->arg('avatar_crop_h') ? $this->arg('avatar_crop_h'):$filedata['height'];
$size = min($dest_w, $dest_h);
$size = ($size > MAX_ORIGINAL) ? MAX_ORIGINAL:$size;
-
+
$imagefile = new ImageFile($this->group->id, $filedata['filepath']);
$filename = $imagefile->resize($size, $dest_x, $dest_y, $dest_w, $dest_h);
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index a0d723b12..630fb8857 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -154,7 +154,8 @@ class NoticesearchAction extends SearchAction
$this->elementStart('div', 'entry-title');
$this->elementStart('span', 'vcard author');
$avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
- $this->elementStart('a', array('href' => $profile->profileurl));
+ $this->elementStart('a', array('href' => $profile->profileurl,
+ 'class' => 'url'));
$this->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
'class' => 'avatar photo',
'width' => AVATAR_STREAM_SIZE,
@@ -223,15 +224,6 @@ class NoticesearchAction extends SearchAction
$this->elementEnd('a');
$this->elementEnd('dd');
$this->elementEnd('dl');
-
- $this->elementStart('a',
- array('href' => common_local_url('newnotice',
- array('replyto' => $profile->nickname)),
- 'onclick' => 'doreply("'.$profile->nickname.'"); return false',
- 'title' => _('reply'),
- 'class' => 'replybutton'));
- $this->hidden('posttoken', common_session_token());
- $this->elementEnd('a');
$this->elementEnd('div');
$this->elementEnd('li');
}
diff --git a/actions/tagrss.php b/actions/tagrss.php
index b4c2dcdff..a77fa12c9 100644
--- a/actions/tagrss.php
+++ b/actions/tagrss.php
@@ -25,12 +25,12 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
class TagrssAction extends Rss10Action
{
+ var $tag;
- function init()
- {
- $tag = $this->trimmed('tag');
+ function prepare($args) {
+ parent::prepare($args);
+ $tag = common_canonical_tag($this->trimmed('tag'));
$this->tag = Notice_tag::staticGet('tag', $tag);
-
if (!$this->tag) {
$this->clientError(_('No such tag.'));
return false;
@@ -39,7 +39,7 @@ class TagrssAction extends Rss10Action
}
}
- function get_notices($limit=0)
+ function getNotices($limit=0)
{
$tag = $this->tag;
@@ -48,7 +48,6 @@ class TagrssAction extends Rss10Action
}
$notice = Notice_tag::getStream($tag->tag, 0, ($limit == 0) ? NOTICES_PER_PAGE : $limit);
-
while ($notice->fetch()) {
$notices[] = clone($notice);
}
@@ -56,10 +55,9 @@ class TagrssAction extends Rss10Action
return $notices;
}
- function get_channel()
+ function getChannel()
{
- $tag = $this->tag->tag;
-
+ $tagname = $this->tag->tag;
$c = array('url' => common_local_url('tagrss', array('tag' => $tagname)),
'title' => $tagname,
'link' => common_local_url('tagrss', array('tag' => $tagname)),
diff --git a/js/facebookapp.js b/js/facebookapp.js
index 8ef9aa532..f0696c19e 100644
--- a/js/facebookapp.js
+++ b/js/facebookapp.js
@@ -19,10 +19,12 @@
var max = 140;
var noticeBox = document.getElementById('notice_data-text');
-noticeBox.addEventListener('keyup', keypress);
-noticeBox.addEventListener('keydown', keypress);
-noticeBox.addEventListener('keypress', keypress);
-noticeBox.addEventListener('change', keypress);
+if (noticeBox) {
+ noticeBox.addEventListener('keyup', keypress);
+ noticeBox.addEventListener('keydown', keypress);
+ noticeBox.addEventListener('keypress', keypress);
+ noticeBox.addEventListener('change', keypress);
+}
// Do our the countdown
function keypress(evt) {
diff --git a/lib/imagefile.php b/lib/imagefile.php
index 74c3d14f0..fa0581dd0 100644
--- a/lib/imagefile.php
+++ b/lib/imagefile.php
@@ -58,7 +58,7 @@ class ImageFile
{
$this->id = $id;
$this->filepath = $filepath;
-
+
$info = @getimagesize($this->filepath);
$this->type = ($info) ? $info[2]:$type;
$this->width = ($info) ? $info[0]:$width;
@@ -72,7 +72,7 @@ class ImageFile
break;
case UPLOAD_ERR_INI_SIZE:
case UPLOAD_ERR_FORM_SIZE:
- throw new Exception(_('That file is too big. The maximum file size is '.$this->maxFileSize().'.'));
+ throw new Exception(sprintf(_('That file is too big. The maximum file size is %d.'), $this->maxFileSize()));
return;
case UPLOAD_ERR_PARTIAL:
@unlink($_FILES[$param]['tmp_name']);
@@ -82,19 +82,19 @@ class ImageFile
throw new Exception(_('System error uploading file.'));
return;
}
-
+
$info = @getimagesize($_FILES[$param]['tmp_name']);
-
+
if (!$info) {
@unlink($_FILES[$param]['tmp_name']);
throw new Exception(_('Not an image or corrupt file.'));
return;
}
-
+
if ($info[2] !== IMAGETYPE_GIF &&
$info[2] !== IMAGETYPE_JPEG &&
$info[2] !== IMAGETYPE_PNG) {
-
+
@unlink($_FILES[$param]['tmp_name']);
throw new Exception(_('Unsupported image file format.'));
return;
@@ -102,7 +102,7 @@ class ImageFile
return new ImageFile(null, $_FILES[$param]['tmp_name']);
}
-
+
function resize($size, $x = 0, $y = 0, $w = null, $h = null)
{
$w = ($w === null) ? $this->width:$w;
@@ -129,25 +129,25 @@ class ImageFile
}
$image_dest = imagecreatetruecolor($size, $size);
-
+
if ($this->type == IMAGETYPE_GIF || $this->type == IMAGETYPE_PNG) {
$transparent_idx = imagecolortransparent($image_src);
-
+
if ($transparent_idx >= 0) {
-
+
$transparent_color = imagecolorsforindex($image_src, $transparent_idx);
$transparent_idx = imagecolorallocate($image_dest, $transparent_color['red'], $transparent_color['green'], $transparent_color['blue']);
imagefill($image_dest, 0, 0, $transparent_idx);
imagecolortransparent($image_dest, $transparent_idx);
-
+
} elseif ($this->type == IMAGETYPE_PNG) {
-
+
imagealphablending($image_dest, false);
$transparent = imagecolorallocatealpha($image_dest, 0, 0, 0, 127);
imagefill($image_dest, 0, 0, $transparent);
imagesavealpha($image_dest, true);
-
+
}
}
@@ -182,23 +182,32 @@ class ImageFile
{
@unlink($this->filename);
}
-
- static function maxFileSize($return_bytes = false)
+
+ static function maxFileSize()
{
- $limit = min(ImageFile::strToInt(ini_get('post_max_size')), ImageFile::strToInt(ini_get('upload_max_filesize')), ImageFile::strToInt(ini_get('memory_limit')));
-
- if ($return_bytes) {
- return $limit;
+ $value = ImageFile::maxFileSizeInt();
+
+ if ($value > 1024 * 1024) {
+ return ($value/(1024*1024)).'Mb';
+ } else if ($value > 1024) {
+ return ($value/(1024)).'kB';
+ } else {
+ return $value;
}
-
- return ($limit/(1024*1024)).'MB';
}
-
+
+ static function maxFileSizeInt()
+ {
+ return min(ImageFile::strToInt(ini_get('post_max_size')),
+ ImageFile::strToInt(ini_get('upload_max_filesize')),
+ ImageFile::strToInt(ini_get('memory_limit')));
+ }
+
static function strToInt($str)
{
$unit = substr($str, -1);
$num = substr($str, 0, -1);
-
+
switch(strtoupper($unit)){
case 'G':
$num *= 1024;
@@ -207,7 +216,7 @@ class ImageFile
case 'K':
$num *= 1024;
}
-
+
return $num;
}
} \ No newline at end of file
diff --git a/lib/util.php b/lib/util.php
index 330e5d12d..5275ad6b6 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -736,6 +736,8 @@ function common_fancy_url($action, $args=null)
return common_path("api/statuses/public_timeline.atom");
case 'publicxrds':
return common_path('xrds');
+ case 'tagrss':
+ return common_path('tag/' . $args['tag'] . '/rss');
case 'featuredrss':
return common_path('featuredrss');
case 'favoritedrss':
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-01 14:21:22 +0000