From b7c314a198c60a6f9236950994113aa422aa77ff Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 24 May 2010 23:54:58 +0000 Subject: RT#8224: allow user to disable HTML editor --- httemplate/edit/cust_main_note.cgi | 12 ++++++++---- httemplate/edit/process/cust_main_note.cgi | 7 ++++++- 2 files changed, 14 insertions(+), 5 deletions(-) (limited to 'httemplate/edit') diff --git a/httemplate/edit/cust_main_note.cgi b/httemplate/edit/cust_main_note.cgi index e2501cb54..439c84414 100755 --- a/httemplate/edit/cust_main_note.cgi +++ b/httemplate/edit/cust_main_note.cgi @@ -6,11 +6,15 @@ -<% include('/elements/htmlarea.html', 'field' => 'comment', +% if( $FS::CurrentUser::CurrentUser->option('disable_html_editor') ) { + +% } +% else { +<% include('/elements/htmlarea.html', 'field' => 'comment_html', 'curr_value' => $comment) %> -% # +% }

"> diff --git a/httemplate/edit/process/cust_main_note.cgi b/httemplate/edit/process/cust_main_note.cgi index f09189aa9..f904c5968 100755 --- a/httemplate/edit/process/cust_main_note.cgi +++ b/httemplate/edit/process/cust_main_note.cgi @@ -18,12 +18,17 @@ $cgi->param('notenum') =~ /^(\d*)$/ or die "Illegal notenum: ". $cgi->param('notenum'); my $notenum = $1; +my $comment = $cgi->param('comment_html') || + join("
\n", + split "(?:\r|\n)+", $cgi->param('comment_plain') + ); + my $new = new FS::cust_main_note ( { notenum => $notenum, custnum => $custnum, _date => time, usernum => $FS::CurrentUser::CurrentUser->usernum, - comments => scalar($cgi->param('comment')), + comments => $comment, } ); my $error; -- cgit v1.2.1