Merge pull request #416 from ikedas/drop_htmlarea by ikedas

Drop support for htmlArea.

Merge pull request #416 from ikedas/drop_htmlarea by ikedas
Drop support for htmlArea.
ba45c27f · IKEDA Soji · GitHub · 4baf87ff · a3c05a21 · ba45c27f
Unverified Commit ba45c27f authored Sep 21, 2018 by IKEDA Soji Committed by GitHub Sep 21, 2018
--- a/default/web_tt2/main.tt2
+++ b/default/web_tt2/main.tt2
@@ -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 %]


--- a/src/cgi/wwsympa.fcgi.in
+++ b/src/cgi/wwsympa.fcgi.in
@@ -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');
  
@@ -12215,12 +12213,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'},

--- a/src/lib/Sympa/ConfDef.pm
+++ b/src/lib/Sympa/ConfDef.pm
@@ -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

@@ -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.
 ##    {

--- a/src/lib/Sympa/Upgrade.pm
+++ b/src/lib/Sympa/Upgrade.pm
@@ -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',
@@ -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