Merge branch 'sympa-6.2' into issue-461-addition-trial5

NEWS.md

@@ -1,5 +1,36 @@
 # Change Log
 
+## [6.2.41b.2](https://github.com/sympa-community/sympa/tree/6.2.41b.2) (2019-03-09)
+
+[Full Changelog](https://github.com/sympa-community/sympa/compare/6.2.41b.1...6.2.41b.2)
+
+**Changes:**
+
+- Built-in authantication: RC4 reversible encryption of password storage in database was dropped [\#87](https://github.com/sympa-community/sympa/issues/87).
+- Format of session cookie was changed [\#87](https://github.com/sympa-community/sympa/issues/87). Session cookies generated with earlier releases will be invalidated.
+
+**Implemented enhancements:**
+
+- Password encryption: Dropping Crypt::CipherSaber [\#87](https://github.com/sympa-community/sympa/issues/87)
+- WWSympa: Features of archives and shared repository should be able to be disabled [\#555](https://github.com/sympa-community/sympa/pull/555) ([ikedas](https://github.com/ikedas))
+
+**Fixed bugs:**
+
+- S/MIME: 'setPublicKey' dies on broken cert, causes spindle to resend mails indefinitely [\#565](https://github.com/sympa-community/sympa/issues/565)
+- import.tt2: non-working line break in tooltip [\#562](https://github.com/sympa-community/sympa/issues/562)
+- Upgrade: Exclusion robot could not be guessed for user [\#546](https://github.com/sympa-community/sympa/issues/546)
+- Scenario: Confusion between parameter name and function name [\#520](https://github.com/sympa-community/sympa/issues/520)
+- Password has to be reset after logging out [\#167](https://github.com/sympa-community/sympa/issues/167)
+- `sympa_test_ldap.pl` misses bind password [\#558](https://github.com/sympa-community/sympa/pull/558) ([ikedas](https://github.com/ikedas))
+- `bounce_email_prefix` parameter was not considered to prevent reserved addrresses for list name \(PR\#455\) [\#552](https://github.com/sympa-community/sympa/pull/552) ([ikedas](https://github.com/ikedas))
+
+**Merged pull requests:**
+
+- Additional removal of code to kill VOOT support. [\#553](https://github.com/sympa-community/sympa/pull/553) ([ikedas](https://github.com/ikedas))
+- Kill VOOT support [\#550](https://github.com/sympa-community/sympa/pull/550) ([xavierba](https://github.com/xavierba))
+- Prepare minimal `sympa.conf` at install time \(cf. \#508\) [\#547](https://github.com/sympa-community/sympa/pull/547) ([ikedas](https://github.com/ikedas))
+- Maintenance support scripts \(2\) [\#544](https://github.com/sympa-community/sympa/pull/544) ([ikedas](https://github.com/ikedas))
+
 ## [6.2.41b.1](https://github.com/sympa-community/sympa/tree/6.2.41b.1) (2019-02-02)
 
 [Full Changelog](https://github.com/sympa-community/sympa/compare/6.2.40...6.2.41b.1)

configure.ac

@@ -25,7 +25,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.60)
-AC_INIT(sympa, 6.2.41b.1, [email protected])
+AC_INIT(sympa, 6.2.41b.2, [email protected])
 AM_INIT_AUTOMAKE([foreign -Wall -Werror 1.9 tar-pax])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AM_PO_SUBDIRS

cpanfile

@@ -295,7 +295,7 @@ feature 'Unicode::Normalize', 'Normalizes file names represented by Unicode.' =>
 
 on 'develop' => sub {
     requires 'Test::Fixme';
-    requires 'Test::PerlTidy';
+    requires 'Test::PerlTidy', '== 20130104';
     requires 'Perl::Tidy', '== 20180220';
     requires 'Code::TidyAll';
 };

default/mail_tt2/listmaster_notification.tt2

@@ -65,6 +65,11 @@ Subject: [% FILTER qencode %][%|loc%]Upgrade procedures failed[%END%][%END%]
 
 [%|loc%]Check log file for further details.[%END%]
 
+[% ELSIF type == 'password_encrypted' -%]
+Subject: [% FILTER qencode %][%|loc%]Password should be rehashed[%END%][%END%]
+
+[%|loc%]Password in database seems encrypted. Run upgrade_sympa_password.pl to rehash passwords.[%END%]
+
 [% ELSIF type == 'db_struct_updated' -%]
 Subject: [% FILTER qencode %][%|loc%]Database structure updated[%END%][%END%]
 X-Sympa-NoWrap: yes

default/web_tt2/admin.tt2

@@ -62,7 +62,7 @@
   [%~ END ~%]
 [% END %]
 
-[% IF is_listmaster || is_owner %]
+[% IF is_shared_allowed && (is_listmaster || is_owner) %]
 <form name="manage_shared_status" action="[% path_cgi %]" method="post">
 <div>
 [% IF shared == 'none' %]

default/web_tt2/config_common.tt2

@@ -17,7 +17,7 @@
 
   [% IF pitem.scenario && is_listmaster ~%]
     &nbsp;<a class="input"
-     href="[% 'dump_scenario' | url_rel([list,pitem.name]) %]"
+     href="[% 'dump_scenario' | url_rel([list,pitem.scenario]) %]"
      title="[%|loc%]scenario source[%END%]">[%|loc%]scenario source[%END~%]
     </a>
   [%~ END %]

default/web_tt2/confirm_action.tt2

@@ -101,7 +101,7 @@
   <p><strong>
     [%|loc%]Do you really want to unsubscribe you from all your lists, remove your ownership of your lists and permanently delete your account?[%END%]
     <br />
-    [%|loc%]Please note that you will not be able to delete your account if you are the only owner of one or more list.[%END%]
+    [%|loc%]Please, note that you will not be able to delete your account if you are the only owner of one or more lists.[%END%]
   </strong></p>
 [%~ ELSIF confirm_action == 'auth_add' ~%]
   <h2><i class="fa fa-check-circle"></i>

default/web_tt2/d_control.tt2

@@ -83,14 +83,18 @@
   <label for="read_access">[%|loc%]Read access[%END%]</label>
   <select id="read_access" name="read_access">
   [% FOREACH s = scenari_read %]
-    <option value='[% s.key %]' [% s.value.selected %]>[% s.value.web_title %]</option>
+    <option value="[% s.key %]"
+    [%~ IF s.value.selected %] selected="selected"[% END ~%]
+    >[% s.value.title %]</option>
   [% END %]
   </select>
 
   <label for="edit_access">[%|loc%]Edit access[%END%]</label>
   <select id="edit_access" name="edit_access">
   [% FOREACH s = scenari_edit %]
-    <option value='[% s.key %]' [% s.value.selected %]>[% s.value.web_title %]</option>
+    <option value="[% s.key %]"
+    [%~ IF s.value.selected %] selected="selected"[% END ~%]
+    >[% s.value.title %]</option>
   [% END %]
   </select>
    <input type="hidden" name="list" value="[% list %]" />

default/web_tt2/dump_scenario.tt2

@@ -13,7 +13,7 @@
 [% ELSE %]
 
 <div id="ActionHeader">
-  <h2 class='block'>[% pname %] [% scenario_name %] </h2>
+  <h2 class='block'>[% scenario_function %].[% scenario_name %] </h2>
   <span class="text_center">([%|loc%]path:[%END%] [% scenario_path %])</span>
 </div>
 <font size="-2">
@@ -22,7 +22,7 @@
 <fieldset>
 <textarea cols="80" rows="10" name="new_scenario_content">[% dumped_scenario %]</textarea><br />
 <input type="hidden" name="list" value="[% list %]" />
-<input type="hidden" name="pname" value="[% pname %]" />
+<input type="hidden" name="scenario_function" value="[% scenario_function %]" />
 
 <!-- template is ready for saving scenario with scope limited to the current list or to the current robot but wwsympa 
 [% IF is_listmaster %]

default/web_tt2/import.tt2

@@ -5,7 +5,7 @@
 <div>
   <textarea name="dump" id="dump" cols="80" rows="25"
    data-tooltip aria-haspopup="true"
-   title="[%|loc%]email1@dom1 Name1[%END%]<br/>[%|loc%]email2@dom2 Name2[%END%]<br/>[%|loc%]...[%END%]">
+   title="[% "email1@dom1 Name1\nemail2@dom2 Name2\n..." | loc | replace("\n",'&#13;&#10;') %]">
     [%~ dump ~%]
   </textarea>
 </div>

default/web_tt2/list_menu.tt2

@@ -79,7 +79,7 @@
       [% IF action == 'modindex' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
       <li  class="[% class %]"><a href="[% 'modindex' | url_rel([list]) %]">[%|loc%]Message[%END%] ([% mod_message %]) </a></li>
       [% IF action == 'docindex' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
-      [% IF shared == 'exist' ~%]
+      [% IF is_shared_allowed && shared == 'exist' ~%]
       <li class="[% class %]"><a href="[% 'docindex' | url_rel([list]) %]">[%|loc%]Document[%END%] ([% mod_total_shared %])</a></li>
       [%~ END %]
     [% END %]
@@ -143,7 +143,7 @@
   <li class="[% class %]"><a href="[% 'rss_request' | url_rel([list]) %]" >[%|loc%]RSS[%END%]</a></li>
 [% END %]
 
-[% IF shared == 'exist' %]
+[% IF is_shared_allowed && shared == 'exist' %]
   [% IF may_d_read %]
     [% IF action == 'd_read' || action == 'd_edit' || action == 'd_properties' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
     <li class="[% class %]"><a href="[% 'd_read' | url_rel([list,'']) %]" >[%|loc%]Shared documents[%END%]</a></li>

default/web_tt2/my.tt2

@@ -44,7 +44,7 @@
               <li><a href="[% 'review' | url_rel([l.key]) %]"><i class="fa fa-users"></i> [%|loc%]Review members[%END%]</a></li>
             [% END %]
 
-            [% IF is_user_allowed_to('archive.web_access', l.key) %]
+            [% IF is_user_allowed_to('archive_web_access', l.key) %]
               <li><a href="[% 'arc' | url_rel([l.key]) %]"><i class="fa fa-archive"></i> [%|loc%]Archives[%END%]</a></li>
             [% END %]
           </ul>

default/web_tt2/pref.tt2

@@ -75,7 +75,7 @@
 <p>
   [%|loc%]Deleting your account will unsubscribe you from all your lists, remove your ownership of your lists and permanently delete your account.[%END%]
   <br />
-  [%|loc%]Please note that you will not be able to delete your account if you are the only owner of one or more list.[%END%]
+  [%|loc%]Please, note that you will not be able to delete your account if you are the only owner of one or more lists.[%END%]
 </p>
 <form action="[% path_cgi %]" method="post">
   <fieldset>

default/web_tt2/suspend_request.tt2

@@ -63,7 +63,7 @@
               <li><a href="[% 'review' | url_rel([l.key]) %]">[%|loc%]Review members[%END%]</a></li>
             [% END %]
 
-            [% IF is_user_allowed_to('archive.web_access', l.key) %]
+            [% IF is_user_allowed_to('archive_web_access', l.key) %]
               <li><a href="[% 'arc' | url_rel([l.key]) %]">[%|loc%]Archives[%END%]</a></li>
             [% END %]
           </ul>

po/sympa/Makefile.in.in

@@ -151,9 +151,7 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
 	  default/mhonarc-ressources.tt2 default/topics.conf \
 	  default/scenari/* \
 	  default/tasks/* \
-	  default/create_list_templates/*/* \
-	  ext/*/lib/Sympa/*.pm \
-	  ext/*/lib/Sympa/*/tt2/*.tt2 ext/*/lib/Sympa/*/*/tt2/*.tt2;\
+	  default/create_list_templates/*/*; \
 	cd po/sympa; \
 	test ! -f $(DOMAIN).po || { \
 	  if test -f $(srcdir)/$(DOMAIN).pot; then \