Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop support for htmlArea. #416

Merged
merged 1 commit into from
Sep 21, 2018
Merged

Drop support for htmlArea. #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion default/web_tt2/main.tt2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
[% END -%]
</head>

<body onload="[% IF use_htmlarea %] HTMLArea.replaceAll();[% END %][% IF back_to_mom %] setTimeout('refresh_mom_and_die()',1000);[% END %]">
<body onload="[% IF back_to_mom %] setTimeout('refresh_mom_and_die()',1000);[% END %]">

[% top_menu = 1 %]

Expand Down
8 changes: 0 additions & 8 deletions src/cgi/wwsympa.fcgi.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1497,8 +1497,6 @@ while ($query = CGI::Fast->new) {
$param->{'remote_addr'} = $ENV{'REMOTE_ADDR'};
$param->{'remote_host'} = $ENV{'REMOTE_HOST'};
$param->{'http_user_agent'} = $ENV{'HTTP_USER_AGENT'};
$param->{'htmlarea_url'} = $Conf::Conf{'htmlarea_url'};
# if ($Conf::Conf{'export_topics'} =~ /all/i);

$session->confirm_action($action, 'init');

Expand Down Expand Up @@ -12187,12 +12185,6 @@ sub do_d_editfile {
} else {
$param->{'textfile'} = 0;
}
$param->{'use_htmlarea'} = '1'
if $Conf::Conf{'htmlarea_url'}
and $param->{'textfile'}
and $path =~ /\.html?/;

#XXX$allow_absolute_path = 1;

web_db_log(
{ 'parameters' => $in{'path'},
Expand Down
12 changes: 6 additions & 6 deletions src/lib/Sympa/ConfDef.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1611,12 +1611,6 @@ our @params = (
},
##{ html_editor_hide: not yet implemented. },
##{ html_editor_show: not yet implemented. },
{ 'name' => 'htmlarea_url', #FIXME:Let's deprecate it.
'gettext_id' => '',
'default' => undef,
'file' => 'wwsympa.conf',
'optional' => 1,
},

# Password

Expand Down Expand Up @@ -2079,6 +2073,12 @@ our @params = (
'gettext_comment' =>
'Is FastCGI module for HTTP server installed? This module provides a much faster web interface.',
},
{ 'name' => 'htmlarea_url', # Deprecated on 6.2.36
'gettext_id' => '',
'default' => undef,
'file' => 'wwsympa.conf',
'optional' => 1,
},

## Not implemented yet.
## {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Sympa/Upgrade.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,7 +919,6 @@ sub upgrade {
'custom_archiver' => 'yes',
'default_home' => 'NO',
'export_topics' => 'yes',
'htmlarea_url' => 'yes',
'html_editor_file' => 'NO', # 6.2a
'html_editor_init' => 'NO',
'ldap_force_canonical_email' => 'NO',
Expand All @@ -945,6 +944,7 @@ sub upgrade {
'archived_pidfile' => 'No more used',
'bounced_pidfile' => 'No more used',
'use_fast_cgi' => 'No longer used', # 6.2.25b deprecated
'htmlarea_url' => 'No longer used', # 6.2.36 deprecated
);

## Set language of new file content
Expand Down