From 3a85318bd09e867f5ff764d6408e428e9b2ce19a Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 10 Aug 2010 16:55:03 -0700 Subject: First stab redoing argument loading for TinyMCE (to avoid hacking checks for all notice saves everywhere) --- actions/newnotice.php | 1 + 1 file changed, 1 insertion(+) (limited to 'actions/newnotice.php') diff --git a/actions/newnotice.php b/actions/newnotice.php index 748d104ff..5e682ffd0 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -203,6 +203,7 @@ class NewnoticeAction extends Action $options = array_merge($options, $locOptions); } + Event::handle('SaveNewNoticeWeb', array($this, $user, &$content_shortened, &$options)); $notice = Notice::saveNew($user->id, $content_shortened, 'web', $options); if (isset($upload)) { -- cgit v1.2.3-54-g00ecf From 527561cd93b69ddaba660f272462aadfaef0c511 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 11 Aug 2010 14:39:39 -0700 Subject: TinyMCE: core tweak; switching order of input processing so length limit is applied to stripped version of the text --- actions/newnotice.php | 14 ++++++-------- plugins/TinyMCE/TinyMCEPlugin.php | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'actions/newnotice.php') diff --git a/actions/newnotice.php b/actions/newnotice.php index 5e682ffd0..8263198f7 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -131,6 +131,8 @@ class NewnoticeAction extends Action $user = common_current_user(); assert($user); // XXX: maybe an error instead... $content = $this->trimmed('status_textarea'); + $options = array(); + Event::handle('StartSaveNewNoticeWeb', array($this, $user, &$content, &$options)); if (!$content) { $this->clientError(_('No content!')); @@ -157,11 +159,9 @@ class NewnoticeAction extends Action Notice::maxContent())); } - $replyto = $this->trimmed('inreplyto'); - #If an ID of 0 is wrongly passed here, it will cause a database error, - #so override it... - if ($replyto == 0) { - $replyto = 'false'; + $replyto = intval($this->trimmed('inreplyto')); + if ($replyto) { + $options['replyto'] = $replyto; } $upload = null; @@ -182,8 +182,6 @@ class NewnoticeAction extends Action } } - $options = array('reply_to' => ($replyto == 'false') ? null : $replyto); - if ($user->shareLocation()) { // use browser data if checked; otherwise profile data if ($this->arg('notice_data-geo')) { @@ -203,12 +201,12 @@ class NewnoticeAction extends Action $options = array_merge($options, $locOptions); } - Event::handle('SaveNewNoticeWeb', array($this, $user, &$content_shortened, &$options)); $notice = Notice::saveNew($user->id, $content_shortened, 'web', $options); if (isset($upload)) { $upload->attachToNotice($notice); } + Event::handle('EndSaveNewNoticeWeb', array($this, $user, &$content_shortened, &$options)); if ($this->boolean('ajax')) { header('Content-Type: text/xml;charset=utf-8'); diff --git a/plugins/TinyMCE/TinyMCEPlugin.php b/plugins/TinyMCE/TinyMCEPlugin.php index 9408e20c9..d9e189375 100644 --- a/plugins/TinyMCE/TinyMCEPlugin.php +++ b/plugins/TinyMCE/TinyMCEPlugin.php @@ -115,7 +115,7 @@ class TinyMCEPlugin extends Plugin * @param array $options * @return boolean hook return */ - function onSaveNewNoticeWeb($action, $user, &$content, &$options) + function onStartSaveNewNoticeWeb($action, $user, &$content, &$options) { $html = $this->sanitizeHtml($action->arg('status_textarea')); $options['rendered'] = $html; -- cgit v1.2.3-54-g00ecf From 6ee3f35302d739a5be1287839bfbb13ec86c1800 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 11 Aug 2010 15:56:40 -0700 Subject: work in progress: prettier attachment mode for tinymce? --- actions/newnotice.php | 5 +- plugins/TinyMCE/TinyMCEPlugin.php | 103 ++++++++++++++++++++++++++++++++++---- 2 files changed, 97 insertions(+), 11 deletions(-) (limited to 'actions/newnotice.php') diff --git a/actions/newnotice.php b/actions/newnotice.php index 8263198f7..8f1fb1c40 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -169,7 +169,10 @@ class NewnoticeAction extends Action if (isset($upload)) { - $content_shortened .= ' ' . $upload->shortUrl(); + if (Event::handle('StartSaveNewNoticeAppendAttachment', array($this, $upload, &$content_shortened, &$options))) { + $content_shortened .= ' ' . $upload->shortUrl(); + } + Event::handle('EndSaveNewNoticeAppendAttachment', array($this, $upload, &$content_shortened, &$options)); if (Notice::contentTooLong($content_shortened)) { $upload->delete(); diff --git a/plugins/TinyMCE/TinyMCEPlugin.php b/plugins/TinyMCE/TinyMCEPlugin.php index 8112b7dbb..e482ab320 100644 --- a/plugins/TinyMCE/TinyMCEPlugin.php +++ b/plugins/TinyMCE/TinyMCEPlugin.php @@ -1,4 +1,5 @@ script(common_path('plugins/TinyMCE/js/jquery.tinymce.js')); $action->inlineScript($this->_inlineScript()); } @@ -70,11 +70,11 @@ class TinyMCEPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'TinyMCE', - 'version' => STATUSNET_VERSION, - 'author' => 'Evan Prodromou', - 'homepage' => 'http://status.net/wiki/Plugin:TinyMCE', - 'rawdescription' => - _m('Use TinyMCE library to allow rich text editing in the browser')); + 'version' => STATUSNET_VERSION, + 'author' => 'Evan Prodromou', + 'homepage' => 'http://status.net/wiki/Plugin:TinyMCE', + 'rawdescription' => + _m('Use TinyMCE library to allow rich text editing in the browser')); return true; } @@ -86,10 +86,10 @@ class TinyMCEPlugin extends Plugin */ private function sanitizeHtml($raw) { - require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php'; + require_once INSTALLDIR . '/extlib/htmLawed/htmLawed.php'; $config = array('safe' => 1, - 'deny_attribute' => 'id,style,on*'); + 'deny_attribute' => 'id,style,on*'); return htmLawed($raw, $config); } @@ -125,6 +125,75 @@ class TinyMCEPlugin extends Plugin return true; } + /** + * Hook for new-notice form processing to process file upload appending... + * + * @param NewNoticeAction $action + * @param MediaFile $media + * @param string $content + * @param array $options + * @return boolean hook return + */ + function onStartSaveNewNoticeAppendAttachment($action, $media, &$content, &$options) + { + if ($action->arg('richedit')) { + // See if we've got a placeholder inline image; if so, fill it! + $dom = new DOMDocument(); + common_log(LOG_INFO, 'QQQQQQQQQQQQQQQQQQQQQQQQ'); + if ($dom->loadHTML($options['rendered'])) { + $imgs = $dom->getElementsByTagName('img'); + foreach ($imgs as $img) { + common_log(LOG_INFO, 'img: ' . var_export($img, true)); + if (preg_match('/(^| )placeholder( |$)/', $img->getAttribute('class'))) { + common_log(LOG_INFO, 'QQQQQQ: img src: ' . $media->fileRecord->url); + $img->setAttribute('src', $media->fileRecord->url); + $holderWidth = intval($img->getAttribute('width')); + $holderHeight = intval($img->getAttribute('height')); + $holderAspect = $holderWidth / $holderHeight; + + $path = File::path($media->filename); + $imgInfo = getimagesize($path); + common_log(LOG_INFO, 'QQQQQQ: ' . $path . ' : ' . var_export($imgInfo, true)); + + $origWidth = $imgInfo[0]; + $origHeight = $imgInfo[1]; + $origAspect = $origWidth / $origHeight; + if ($origAspect >= 1.0) { + // wide image + if ($origWidth > $holderWidth) { + $width = $holderWidth; + $height = intval($holderWidth / $origAspect); + } else { + $width = $origWidth; + $height = $origHeight; + } + } else { + if ($origHeight > $holderHeight) { + $height = $holderHeight; + $width = ($holderWidth * $origAspect); + } else { + $width = $origWidth; + $height = $origHeight; + } + } + + $img->setAttribute('width', $width); + $img->setAttribute('height', $height); + + common_log(LOG_INFO, 'QQQQQ: ' . $width . ' ' . $height); + } + } + $html = $dom->saveHTML(); + common_log(LOG_INFO, 'QQQQQQ: out: ' . $html); + $options['rendered'] = $html; + } + + // The regular code will append the short URL to the plaintext content. + // Carry on and let it through... + } + return true; + } + function _inlineScript() { $path = common_path('plugins/TinyMCE/js/tiny_mce.js'); @@ -153,10 +222,24 @@ class TinyMCEPlugin extends Plugin tinymce.triggerSave(); } }); + $('#'+SN.C.S.NoticeDataAttach).change(function() { + /* + S = '
'+$(this).val()+'
'; + NDAS = $('#'+SN.C.S.NoticeDataAttachSelected); + if (NDAS.length > 0) { + NDAS.replaceWith(S); + } + */ + //alert('yay'); + var img = ''; + var html = tinyMCE.activeEditor.getContent(); + tinyMCE.activeEditor.setContent(html + img); + }); }); END_OF_SCRIPT; return $scr; } + } -- cgit v1.2.3-54-g00ecf From d9942a558a7dfd14980788399ca6aa578039a324 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 12 Aug 2010 15:18:16 -0700 Subject: Fix regression in replies made from web (was saving reply_to value in wrong array key) --- actions/newnotice.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actions/newnotice.php') diff --git a/actions/newnotice.php b/actions/newnotice.php index 8f1fb1c40..61b38786b 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -161,7 +161,7 @@ class NewnoticeAction extends Action $replyto = intval($this->trimmed('inreplyto')); if ($replyto) { - $options['replyto'] = $replyto; + $options['reply_to'] = $replyto; } $upload = null; -- cgit v1.2.3-54-g00ecf