fixing ssl bugs: chain is not mandatory, use _private_ key terminology, fix tab+default values not showing when coming back from errorneous import

debian/changelog

@@ -2,6 +2,8 @@ alternc (3.1.6) oldstable; urgency=low
 
   * add SSL and API alternc packages (Beta)
   * fix french translation misunderstanding
+  * fix translation not working for strings that disappeared in the past
+  * fix browseForFolder not working on domaines_type having a - in their name
 
  -- Benjamin Sonntag <benjamin@sonntag.fr>  Thu,  7 May 2015 17:44:12 +0200
 

ssl/panel/admin/ssl_new.php

@@ -127,24 +127,24 @@ if (isset($error) && $error) {
 
 
         <div id="tabsssl-import">
-            <h3><?php __("Import existing Key Certificate and Chain files"); ?></h3>
+            <h3><?php __("Import existing Private Key, Certificate and Chain files"); ?></h3>
 
-            <p><?php __("If you already have a RSA Key file, a Certificate for this key and (maybe) a Chained certificate, please paste their content here."); ?></p>
+            <p><?php __("If you already have a RSA Private Key file, a Certificate for this key and (maybe) a Chained certificate, please paste their content here."); ?></p>
             <p><?php __("We will verify the content of those files and add them in your certificate repository"); ?></p>
 
             <form method="post" action="ssl_doimport.php" name="main" id="main">
                 <table border="1" cellspacing="0" cellpadding="4" class="tedit">
                     <tr>
-                        <th><label for="key"><?php __("RSA Key"); ?></label></th>
+                        <th><label for="key"><?php __("RSA Private Key"); ?></label></th>
-                        <td><textarea class="int" name="key" id="key" style="width: 420px; height: 120px;"></textarea></td>
+                        <td><textarea class="int" name="key" id="key" style="width: 420px; height: 120px;"><?php echo htmlentities($key); ?></textarea></td>
                     </tr>
                     <tr>
                         <th><label for="crt"><?php __("SSL Certificate"); ?></label></th>
-                        <td><textarea class="int" name="crt" id="crt" style="width: 420px; height: 120px;"></textarea></td>
+                        <td><textarea class="int" name="crt" id="crt" style="width: 420px; height: 120px;"><?php echo htmlentities($crt); ?></textarea></td>
                     </tr>
                     <tr>
                         <th><label for="chain"><?php __("Chained Certificate<br />(not mandatory)"); ?></label></th>
-                        <td><textarea class="int" name="chain" id="chain" style="width: 420px; height: 120px;"></textarea></td>
+                        <td><textarea class="int" name="chain" id="chain" style="width: 420px; height: 120px;"><?php echo htmlentities($chain); ?></textarea></td>
                     </tr>
                 </table>
                 <p>
@@ -157,7 +157,9 @@ if (isset($error) && $error) {
     </div>
 </div>
 <script type="text/javascript">
-    $("#tabsssl").tabs(<?php if ($crt != "" and $key != "") echo "{ active: 'tabsssl-import' }"; ?>);
+		  $(function() {
+		      $("#tabsssl").tabs(<?php if ($crt != "" and $key != "") echo "{ active: 1 }"; ?>);
+		    });
 </script>
 <?php
 include_once("foot.php");

ssl/panel/class/m_ssl.php

@@ -682,7 +682,7 @@ class m_ssl {
                 substr($crt, -26, 26) != "-----END CERTIFICATE-----\n") {
             $this->error.=_("The certificate must begin by BEGIN CERTIFICATE and end by END CERTIFICATE lines. Please check you pasted it in PEM form.") . "<br>\n";
         }
-        if ($chain &&
+        if (trim($chain) &&
                 (substr($chain, 0, 28) != "-----BEGIN CERTIFICATE-----\n" ||
                 substr($chain, -26, 26) != "-----END CERTIFICATE-----\n")) {
             $this->error.=_("The chained certificate must begin by BEGIN CERTIFICATE and end by END CERTIFICATE lines. Please check you pasted it in PEM form.") . "<br>\n";

ssl/panel/locales/fr_FR/LC_MESSAGES/ssl.po

@@ -250,15 +250,15 @@ msgstr ""
 "www.example.com</code> !"
 
 #: ../admin/ssl_new.php:130
-msgid "Import existing Key Certificate and Chain files"
+msgid "Import existing Private Key, Certificate and Chain files"
-msgstr "Importer une Clé, un Certificat et une Chaîne existants"
+msgstr "Importer une Clé Privée, un Certificat et une Chaîne existants"
 
 #: ../admin/ssl_new.php:132
 msgid ""
-"If you already have a RSA Key file, a Certificate for this key and (maybe) a "
+"If you already have a RSA Private Key file, a Certificate for this key and (maybe) a "
 "Chained certificate, please paste their content here."
 msgstr ""
-"Si vous disposez déjà d'une clé RSA, d'un Certificat et (peut-être) d'un "
+"Si vous disposez déjà d'une Clé Privée RSA, d'un Certificat et (peut-être) d'un "
 "Certificat Chaîné, collez leur contenu ici."
 
 #: ../admin/ssl_new.php:133
@@ -270,8 +270,8 @@ msgstr ""
 "certificats"
 
 #: ../admin/ssl_new.php:138
-msgid "RSA Key"
+msgid "RSA Private Key"
-msgstr "Clé RSA"
+msgstr "Clé Privée RSA"
 
 #: ../admin/ssl_new.php:142 ../admin/ssl_view.php:73 ../admin/ssl_view.php:159
 msgid "SSL Certificate"
@@ -498,7 +498,7 @@ msgid ""
 "The certificate must begin by BEGIN CERTIFICATE and end by END CERTIFICATE "
 "lines. Please check you pasted it in PEM form."
 msgstr ""
-"Ce certificat doit commencer par BEGIN CERTIFICATE et terminer par END "
+"Le certificat doit commencer par BEGIN CERTIFICATE et terminer par END "
 "CERTIFICATE. Merci de vérifier que vous avez bien collé un fichier PEM"
 
 #: ../class/m_ssl.php:680
@@ -506,7 +506,7 @@ msgid ""
 "The chained certificate must begin by BEGIN CERTIFICATE and end by END "
 "CERTIFICATE lines. Please check you pasted it in PEM form."
 msgstr ""
-"Ce certificat Chaîné doit commencer par BEGIN CERTIFICATE et terminer par "
+"Le certificat Chaîné doit commencer par BEGIN CERTIFICATE et terminer par "
 "END CERTIFICATE. Merci de vérifier que vous avez bien collé un fichier PEM"
 
 #: ../class/m_ssl.php:686