From e8594eef2b201656ef451d0c25bcd1ac8a3fb690 Mon Sep 17 00:00:00 2001 From: Rogier Lankhorst Date: Sun, 26 Feb 2017 16:54:44 +0100 Subject: [PATCH] multisite tweaks --- class-admin.php | 143 +++++---- languages/really-simple-ssl-fr_FR.mo | Bin 13778 -> 0 bytes languages/really-simple-ssl-fr_FR.po | 420 --------------------------- 3 files changed, 91 insertions(+), 472 deletions(-) delete mode 100644 languages/really-simple-ssl-fr_FR.mo delete mode 100644 languages/really-simple-ssl-fr_FR.po diff --git a/class-admin.php b/class-admin.php index 078ebaf0f..32489007d 100644 --- a/class-admin.php +++ b/class-admin.php @@ -90,7 +90,6 @@ public function init() { //when configuration should run again if ($this->clicked_activate_ssl() || !$this->ssl_enabled || !$this->site_has_ssl || $is_on_settings_page) { - $this->trace_log("** Really Simple SSL debug mode **"); if (is_multisite()) $this->build_domain_list();//has to come after clicked_activate_ssl, otherwise this domain won't get counted. $this->detect_configuration(); @@ -187,18 +186,18 @@ private function clicked_activate_ssl() { } if (is_multisite() && isset($_POST['rsssl_do_activate_ssl_networkwide'])) { + $this->selected_networkwide_or_per_site = true; + $this->ssl_enabled_networkwide = true; + $this->save_options(); + + //set all sites as enabled $sites = $this->get_sites_bw_compatible(); foreach ( $sites as $site ) { $this->switch_to_blog_bw_compatible($site); $this->ssl_enabled = true; - $this->set_siteurl_to_ssl(); $this->save_options(); restore_current_blog(); //switches back to previous blog, not current, so we have to do it each loop } - - $this->selected_networkwide_or_per_site = true; - $this->ssl_enabled_networkwide = true; - $this->save_options(); return true; } @@ -281,6 +280,7 @@ public function show_notice_activate_ssl(){ //for multisite, show no ssl message only on main blog. if (is_multisite() && !is_main_site(get_current_blog_id()) && !$this->site_has_ssl) return; + if (!$this->wpconfig_ok()) return; if (!current_user_can($this->capability)) return; @@ -399,14 +399,10 @@ public function get_admin_options(){ } if (is_multisite()) { - //migrate options to networkwide option - $this->migrate_options_to_network(); - //set rewrite_rule_per_site is deprecated, moving to the ssl_enabled_networkwide property. $network_options = get_site_option('rlrsssl_network_options'); if (isset($network_options) ) { - $set_rewriterule_per_site = isset($network_options['set_rewriterule_per_site']) ? $network_options['set_rewriterule_per_site'] : FALSE; - $this->ssl_enabled_networkwide = isset($network_options['ssl_enabled_networkwide']) ? $network_options['ssl_enabled_networkwide'] : !$set_rewriterule_per_site; + $this->ssl_enabled_networkwide = isset($network_options['ssl_enabled_networkwide']) ? $network_options['ssl_enabled_networkwide'] : FALSE; $this->selected_networkwide_or_per_site = isset($network_options['selected_networkwide_or_per_site']) ? $network_options['selected_networkwide_or_per_site'] : FALSE; } //if ssl is enabled, the choice was already made: you can't have a site with ssl, without choosing for networkwide or not. @@ -414,27 +410,6 @@ public function get_admin_options(){ } } - - /** - * @since 2.13 - * - * Fixes a multisite bug where networkwide options were saved in each blog locally. - * - **/ - - private function migrate_options_to_network() { - //for upgrade purposes, check if rewrite_rule_per_site exists for the main blog, and load that as the default one. - $main_blog_options = get_blog_option(BLOG_ID_CURRENT_SITE, "rlrsssl_options"); - if (isset($main_blog_options) && isset($main_blog_options['set_rewriterule_per_site'])) { - $this->ssl_enabled_networkwide = !$main_blog_options['set_rewriterule_per_site']; - //now, remove this option from the array - unset($main_blog_options["set_rewriterule_per_site"]); - //save it back into the main site, so we on next check, this function won't run - update_blog_option(BLOG_ID_CURRENT_SITE, 'rlrsssl_options',$main_blog_options); - $this->save_options(); - } - } - /** * Creates an array of all domains where the plugin is active AND ssl is active, only used for multisite. * @@ -546,17 +521,36 @@ public function configure_ssl() { if ($this->htaccess_redirect && $this->htaccess_test_success) { $this->editHtaccess(); } elseif (!$safe_mode && $this->clicked_activate_ssl()) { - //set wp redirect, but only when just activated. $this->wp_redirect = TRUE; $this->save_options(); + if (is_multisite() && $this->ssl_enabled_networkwide) { + $this->set_wp_redirect_networkwide(); + } } if (!$safe_mode && $this->wpconfig_siteurl_not_fixed) $this->fix_siteurl_defines_in_wpconfig(); - if (!$safe_mode) + if (!$safe_mode) { $this->set_siteurl_to_ssl(); + if (is_multisite() && $this->ssl_enabled_networkwide) { + $this->set_siteurl_to_ssl_networkwide(); + } + } + } + } + + + public function set_wp_redirect_networkwide(){ + + $sites = $this->get_sites_bw_compatible(); + foreach ( $sites as $site ) { + $this->switch_to_blog_bw_compatible($site); + $this->wp_redirect = TRUE; + $this->save_options(); + restore_current_blog(); //switches back to previous blog, not current, so we have to do it each loop } + } /** @@ -975,12 +969,28 @@ public function remove_wpconfig_edit() { public function set_siteurl_to_ssl() { if ($this->debug) {$this->trace_log("converting siteurl and homeurl to https");} + $siteurl_ssl = str_replace ( "http://" , "https://" , get_option('siteurl')); $homeurl_ssl = str_replace ( "http://" , "https://" , get_option('home')); update_option('siteurl',$siteurl_ssl); update_option('home',$homeurl_ssl); } + + + public function set_siteurl_to_ssl_networkwide(){ + + $sites = $this->get_sites_bw_compatible(); + foreach ( $sites as $site ) { + $this->switch_to_blog_bw_compatible($site); + $this->ssl_enabled = true; + $this->set_siteurl_to_ssl(); + $this->save_options(); + restore_current_blog(); //switches back to previous blog, not current, so we have to do it each loop + } + + } + /** * On de-activation, siteurl and homeurl are reset to http * @@ -1088,6 +1098,7 @@ public function deactivate($networkwide) { $this->switch_to_blog_bw_compatible($site); $this->remove_ssl_from_siteurl(); $this->ssl_enabled = false; + $this->wp_redirect = false; $this->save_options(); restore_current_blog(); //switches back to previous blog, not current, so we have to do it each loop } @@ -1200,11 +1211,13 @@ public function detect_configuration() { } //check for is_ssl() - if (((strpos($filecontents, "#SERVER-HTTPS-ON#") === false) && - (strpos($filecontents, "#SERVER-HTTPS-1#") === false) && - (strpos($filecontents, "#SERVERPORT443#") === false)) || (!is_ssl() && $this->is_ssl_extended())) { + if ( (!$this->is_ssl_extended() && + (strpos($filecontents, "#SERVER-HTTPS-ON#") === false) && + (strpos($filecontents, "#SERVER-HTTPS-1#") === false) && + (strpos($filecontents, "#SERVERPORT443#") === false)) || (!is_ssl() && $this->is_ssl_extended())) { //when is_ssl would return false, we should add some code to wp-config.php if (!$this->wpconfig_has_fixes()) { + $this->trace_log("is_ssl() will return false: wp-config fix needed"); $this->do_wpconfig_loadbalancer_fix = TRUE; } } @@ -1377,14 +1390,17 @@ public function get_htaccess_version() { } + /* deprecated */ + function htaccess_redirect_allowed(){ - if (is_multisite() && !$this->ssl_enabled_networkwide && $this->is_multisite_subfolder_install()) { + if ($this->is_per_site_activated_multisite_subfolder_install()) { return false; } else { return true; } } + /* Checks if the htaccess contains redirect rules, either actual redirect or a rsssl marker. */ @@ -1504,7 +1520,7 @@ public function editHtaccess(){ } //if subfolder multisite, per site activated - if (is_multisite() && !$this->ssl_enabled_networkwide && $this->is_multisite_subfolder_install()) { + if ($this->is_per_site_activated_multisite_subfolder_install()) { $this->trace_log("per site activation on subfolder install"); if ($this->clicked_activate_ssl()) $this->wp_redirect = true; $this->save_options(); @@ -1592,6 +1608,15 @@ public function mixed_content_fixer_detected(){ } } + + public function is_per_site_activated_multisite_subfolder_install() { + if (is_multisite() && $this->is_multisite_subfolder_install() && !$this->ssl_enabled_networkwide){ + return true; + } + + return false; + } + /** * Test if a domain has a subfolder structure * @@ -1784,12 +1809,12 @@ public function show_notices() */ global $rsssl_server; - if ($rsssl_server->uses_htaccess() && !$this->wp_redirect && $this->ssl_enabled && !$this->htaccess_warning_shown && !$this->htaccess_contains_redirect_rules() && $this->htaccess_redirect_allowed()) { + if (!$this->wp_redirect && $this->ssl_enabled && !$this->htaccess_warning_shown && !$this->htaccess_contains_redirect_rules()) { add_action('admin_print_footer_scripts', array($this, 'insert_dismiss_htaccess')); ?>

- +

@@ -2186,7 +2211,19 @@ public function settings_page() { echo "

".__("Log for debugging purposes","really-simple-ssl")."

"; echo "

".__("Send me a copy of these lines if you have any issues. The log will be erased when debug is set to false","really-simple-ssl")."

"; echo "
"; + if (defined('RSSSL_SAFE_MODE') && RSSSL_SAFE_MODE) echo "SAFE MODE
"; + echo "Options:
"; + if ($this->htaccess_redirect) echo "* htaccess redirect
"; + if ($this->wp_redirect) echo "* WordPress redirect
"; + if ($this->autoreplace_insecure_links) echo "* Mixed content fixer
"; + echo "SERVER: ".$rsssl_server->get_server() . "
"; + if (is_multisite()) { + echo "MULTISITE
"; + echo (!$this->ssl_enabled_networkwide) ? "SSL is being activated per site
" : "SSL is activated network wide"; + } + + echo ($this->ssl_enabled) ? "SSL is enabled for this site" : "SSL is not yet enabled for this site
"; echo $this->debug_log; echo "
"; //$this->debug_log.="
-----------------------"; @@ -2318,21 +2355,23 @@ public function configuration_page_more(){ public function create_form(){ global $rsssl_server; - register_setting( 'rlrsssl_options', 'rlrsssl_options', array($this,'options_validate') ); - add_settings_section('rlrsssl_settings', __("Settings","really-simple-ssl"), array($this,'section_text'), 'rlrsssl'); - add_settings_field('id_autoreplace_insecure_links', __("Auto replace mixed content","really-simple-ssl"), array($this,'get_option_autoreplace_insecure_links'), 'rlrsssl', 'rlrsssl_settings'); - - //only show option to enable or disable mixed content and redirect when ssl is detected - if($this->site_has_ssl || $this->force_ssl_without_detection) { - add_settings_field('id_wp_redirect', __("Enable WordPress 301 redirection to SSL","really-simple-ssl"), array($this,'get_option_wp_redirect'), 'rlrsssl', 'rlrsssl_settings'); + register_setting( 'rlrsssl_options', 'rlrsssl_options', array($this,'options_validate') ); + add_settings_section('rlrsssl_settings', __("Settings","really-simple-ssl"), array($this,'section_text'), 'rlrsssl'); + add_settings_field('id_autoreplace_insecure_links', __("Auto replace mixed content","really-simple-ssl"), array($this,'get_option_autoreplace_insecure_links'), 'rlrsssl', 'rlrsssl_settings'); + + //only show option to enable or disable mixed content and redirect when ssl is detected + if($this->site_has_ssl || $this->force_ssl_without_detection) { + add_settings_field('id_wp_redirect', __("Enable WordPress 301 redirection to SSL","really-simple-ssl"), array($this,'get_option_wp_redirect'), 'rlrsssl', 'rlrsssl_settings'); + if ($rsssl_server->uses_htaccess() && !is_multisite()) { add_settings_field('id_htaccess_redirect', __("Enable 301 .htaccess redirect","really-simple-ssl"), array($this,'get_option_htaccess_redirect'), 'rlrsssl', 'rlrsssl_settings'); - add_settings_field('id_javascript_redirect', __("Enable javascript redirection to ssl","really-simple-ssl"), array($this,'get_option_javascript_redirect'), 'rlrsssl', 'rlrsssl_settings'); } + add_settings_field('id_javascript_redirect', __("Enable javascript redirection to ssl","really-simple-ssl"), array($this,'get_option_javascript_redirect'), 'rlrsssl', 'rlrsssl_settings'); + } - add_settings_field('id_debug', __("Debug","really-simple-ssl"), array($this,'get_option_debug'), 'rlrsssl', 'rlrsssl_settings'); + add_settings_field('id_debug', __("Debug","really-simple-ssl"), array($this,'get_option_debug'), 'rlrsssl', 'rlrsssl_settings'); - if ($rsssl_server->uses_htaccess()) - add_settings_field('id_do_not_edit_htaccess', __("Stop editing the .htaccess file","really-simple-ssl"), array($this,'get_option_do_not_edit_htaccess'), 'rlrsssl', 'rlrsssl_settings'); + if ($rsssl_server->uses_htaccess()) + add_settings_field('id_do_not_edit_htaccess', __("Stop editing the .htaccess file","really-simple-ssl"), array($this,'get_option_do_not_edit_htaccess'), 'rlrsssl', 'rlrsssl_settings'); } diff --git a/languages/really-simple-ssl-fr_FR.mo b/languages/really-simple-ssl-fr_FR.mo deleted file mode 100644 index 9b4ece7d9668b10e8bc74a7c676b1e0844028851..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13778 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 YB)l$5YAu`LmZo$^4EtIGcAVk<9|7gNP5=M^ diff --git a/languages/really-simple-ssl-fr_FR.po b/languages/really-simple-ssl-fr_FR.po deleted file mode 100644 index 268205373..000000000 --- a/languages/really-simple-ssl-fr_FR.po +++ /dev/null @@ -1,420 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: Really Simple SSL v2.2.2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: \n" -"PO-Revision-Date: 2015-11-21 19:31:58+0000\n" -"Last-Translator: Cédric TAMBOISE \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n>1;\n" -"X-Generator: Loco - https://localise.biz/\n" -"X-Poedit-Language: French\n" -"X-Poedit-Country: FRANCE\n" -"X-Poedit-SourceCharset: utf-8\n" -"X-Poedit-KeywordsList: __;_e;__ngettext:1,2;_n:1,2;__ngettext_noop:1,2;_n_noop:1,2;_c,_nc:4c,1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;_nx_noop:4c,1,2;\n" -"X-Poedit-Basepath: ../\n" -"X-Poedit-Bookmarks: \n" -"X-Poedit-SearchPath-0: .\n" -"X-Textdomain-Support: yes" - -#: class-admin.php:1998 -#@ really-simple-ssl -msgid "Force SSL without detection" -msgstr "Forcer le mode SSL sans détection" - -#: class-admin.php:1727 -#@ really-simple-ssl -msgid "Configuration" -msgstr "Configuration" - -#: class-admin.php:1727 -#: class-admin.php:1984 -#: class-admin.php:2176 -#@ really-simple-ssl -msgid "Settings" -msgstr "Paramètres" - -#: class-admin.php:1727 -#@ really-simple-ssl -msgid "Detected mixed content" -msgstr "Contenu mixte détecté" - -#: class-admin.php:1727 -#: class-admin.php:2001 -#@ really-simple-ssl -msgid "Debug" -msgstr "Débogage" - -#: class-admin.php:1772 -#@ really-simple-ssl -msgid "No SSL detected." -msgstr "Pas de SSL détecté." - -#: class-admin.php:1774 -#@ really-simple-ssl -msgid "No SSL detected, but SSL is forced." -msgstr "Pas de SSL détecté, mais le mode SSL est forcé." - -#: class-admin.php:1778 -#@ really-simple-ssl -msgid "An SSL certificate was detected on your site. " -msgstr "Un certificat SSL a été détecté sur votre site." - -#: class-admin.php:1791 -#@ really-simple-ssl -msgid "https redirect set in .htaccess" -msgstr "Redirections HTTPS mises en place dans le fichier .htaccess" - -#: class-admin.php:1793 -#@ really-simple-ssl -msgid "Editing of .htaccess is blocked in Really Simple ssl settings, so you're in control of the .htaccess file." -msgstr "L'édition du fichier .htaccess est bloqué dans les paramètres du plugin Really Simple SSL, vous êtes donc en contrôle total du fichier .htaccess." - -#: class-admin.php:1800 -#@ really-simple-ssl -msgid "Https redirect was set in javascript because the htaccess redirect rule could not be verified. Set manually if you want to redirect in .htaccess." -msgstr "La redirection HTTPS a été mise en place en javascript car la règle du fichier htaccess n'a pas fonctionné. Vous pouvez l'y insérer manuellement si vous préférez ce mode." - -#: class-admin.php:1809 -#@ really-simple-ssl -msgid "Try to add these rules at the bottom of your .htaccess. If it doesn't work, just remove them again." -msgstr "Essayez d'ajouter ces règles à la fin du fichier .htaccess. Si cela ne fonctionne pas, supprimez-les de nouveau." - -#: class-admin.php:1832 -#@ really-simple-ssl -msgid "HTTP Strict Transport Security was set in the .htaccess" -msgstr "HTTP STS a été mis en place dans le .htaccess" - -#: class-admin.php:1834 -#@ really-simple-ssl -msgid "HTTP Strict Transport Security was not set in your .htaccess. Do this only if your setup is fully working, and only when you do not plan to revert to http." -msgstr "HTTP STS n'a pas été mis en place dans le .htaccess. N'activez ce mode qu'une fois que la mise en place du SSL fonctionne pleinement et que vous ne prévoyez pas de revenir en arrière." - -#: class-admin.php:1841 -#: class-scan.php:81 -#: class-scan.php:90 -#@ really-simple-ssl -msgid "Manage settings" -msgstr "Gestion des paramètres" - -#: class-admin.php:1863 -#@ really-simple-ssl -msgid "Save" -msgstr "Enregistrer" - -#: class-admin.php:1889 -#@ really-simple-ssl -msgid "Log for debugging purposes" -msgstr "Journaliser (log) dans une optique de débogage" - -#: class-admin.php:1890 -#@ really-simple-ssl -msgid "Send me a copy of these lines if you have any issues. The log will be erased when debug is set to false" -msgstr "Envoyez-moi une copie de ces lignes si vous avez le moindre problème. Ce journal sera écrasé quand le mode Debug est désactivé." - -#: class-admin.php:1898 -#@ really-simple-ssl -msgid "To view results here, enable the debug option in the settings tab." -msgstr "Pour voir les résultats ici, activez le mode debut dans l'onglet Paramètres" - -#: class-admin.php:1985 -#@ really-simple-ssl -msgid "Stop editing the .htaccess file" -msgstr "Arrêter d'éditer le fichier .htaccess" - -#: class-admin.php:1989 -#@ really-simple-ssl -msgid "Auto replace mixed content" -msgstr "Remplacer automatiquement le contenu mixte" - -#: class-admin.php:1993 -#@ really-simple-ssl -msgid "Turn HTTP Strict Transport Security on" -msgstr "Activez le mode HTTP Strict Transport Security (STS)" - -#: class-admin.php:2018 -#@ really-simple-ssl -msgid "By unchecking the 'auto replace mixed content' checkbox you can test if your site can run without this extra functionality. Uncheck, empty your cache when you use one, and go to the front end of your site. You should then check if you have mixed content errors, by clicking on the lock icon in the addres bar." -msgstr "En décochant la case 'Remplacer automatiquement le contenu mixte', vous pouvez tester si votre site fonctionne correctement dans cette fonctionnalité. Décochez, videz votre cache si vous en utilisez un, et accédez à votre site en mode public. Vous pouvez ensuite vérifier si vous avez des erreurs de contenu mixte, en cliquant sur le cadenas dans la barre d'adresse." - -#: class-admin.php:2020 -#@ really-simple-ssl -msgid "The force ssl without detection option can be used when the ssl was not detected, but you are sure you have ssl." -msgstr "L'option \"Forcer le SSL sans détection\" peut être u tilisée lorsque le certificat SSL n'a pas été détecté, mais seulement si vous êtes certain d'avoir un certificat SSL correctement en place." - -#: class-admin.php:2120 -#@ really-simple-ssl -msgid "Are you sure? Your visitors will keep going to a https site for a year after you turn this off." -msgstr "Êtes-vous sûr ? Vos visiteurs continueront à voir votre site en HTTPS pendant un an après avoir désactivé cette option." - -#: class-admin.php:2136 -#@ really-simple-ssl -msgid "Are you sure you have an SSL certifcate? Forcing ssl on a non-ssl site can break your site." -msgstr "Êtes-vous sûr d'avoir un certificat SSL ? Forcer le mode SSL sur un site non sécurisé peut endommager votre site." - -#: class-scan.php:37 -#: class-scan.php:38 -#@ really-simple-ssl -msgid "Scanning..." -msgstr "Analyse..." - -#: class-scan.php:78 -#@ really-simple-ssl -msgid "Mixed content detected " -msgstr "Contenu mixte détecté" - -#: class-scan.php:79 -#@ really-simple-ssl -msgid "but that's ok, because the mixed content fixer is active." -msgstr "mais ça ne pose pas de problème, car le paramètre pour corriger le contenu mixte est actif." - -#: class-scan.php:79 -#@ really-simple-ssl -msgid "but the mixed content fix is not active." -msgstr "mais le paramètre pour corriger le contenu mixte n'est pas actif." - -#: class-scan.php:84 -#@ really-simple-ssl -msgid "In the tab \"detected mixed content\" you can find a list of items with mixed content." -msgstr "Dans l'onglet \"Contenu mixte détecté\", vous retrouverez la liste des contenus mixtes." - -#: class-scan.php:89 -#@ really-simple-ssl -msgid "No mixed content was detected. You could try to run your site without using the auto replace of insecure links, but check carefully. " -msgstr "Aucun contenu mixte n'a été détecté. Vous pouvez essayer de faire fonctionner votre site sans le paramètre de remplacement automatique, mais faites attention tout de même." - -#: class-scan.php:98 -#, php-format -#@ really-simple-ssl -msgid "The scan searched for the following insecure links: %s" -msgstr "L'analyse a détecté les liens non sécurisés suivants : %s" - -#: class-scan.php:100 -#@ really-simple-ssl -msgid "List of detected items with mixed content" -msgstr "Liste des contenus détectés avec du contenu mixte" - -#: class-scan.php:101 -#@ really-simple-ssl -msgid "Because really simple ssl includes a mixed content fixer you do not have to worry about this list, but if you want to disable the mixed content fixer, you can find a list of possible issues here." -msgstr "Du fait de l'option \"corriger le contenu mixte\" du plugin Really Simple SSL, vous n'avez pas à vous inquiéter à propos de cette liste. Mais si vous désactivez l'option, voici la liste des problèmes potentiels ci-dessous :" - -#: class-scan.php:108 -#@ really-simple-ssl -msgid "edit" -msgstr "Editer" - -#: class-scan.php:126 -#@ really-simple-ssl -msgid "Scan again" -msgstr "Analyser de nouveau" - -#. translators: plugin header field 'Name' -#: really-simple-ssl.php:0 -#@ really-simple-ssl -msgid "Really Simple SSL" -msgstr "Really Simple SSL" - -#. translators: plugin header field 'Description' -#: really-simple-ssl.php:0 -#@ really-simple-ssl -msgid "Lightweight plugin without any setup to make your site ssl proof" -msgstr "Plugin léger sans paramétrage complexe pour faire fonctionner votre site en SSL" - -#. translators: plugin header field 'Author' -#: really-simple-ssl.php:0 -#@ really-simple-ssl -msgid "Rogier Lankhorst" -msgstr "Rogier Lankhorst" - -#: class-admin.php:1412 -#@ really-simple-ssl -msgid "No SSL was detected. If you are just waiting for your ssl certificate to kick in you can dismiss this warning." -msgstr "Aucun certificat SSL détecté. Si vous êtes simplement entrain d'attendre votre certificat, vous pouvez simplement fermer cette notification." - -#: class-admin.php:1414 -#@ really-simple-ssl -msgid "Scan SSL setup again" -msgstr "Rechercher un certificat de nouveau" - -#: class-admin.php:1470 -#: class-admin.php:1480 -#@ really-simple-ssl -msgid "Really Simple SSL has a conflict with another plugin." -msgstr "Le plugin Really Simple SSL est en conflit avec un autre plugin." - -#: class-admin.php:1471 -#@ really-simple-ssl -msgid "The force rewrite titles option in Yoast SEO prevents Really Simple SSL plugin from fixing mixed content." -msgstr "L'option \"Forcer la réécriture des titres\" du plugin Yoast SEO empêche Really Simple SSL de corriger le contenu mixte." - -#: class-admin.php:1472 -#: class-admin.php:1482 -#@ really-simple-ssl -msgid "Show me this setting" -msgstr "Afficher cette option" - -#: class-admin.php:1481 -#@ really-simple-ssl -msgid "The force http after leaving checkout in Woocommerce will create a redirect loop." -msgstr "Forcer le http après la transaction sur Woocommerce créera une boucle infinie." - -#: class-admin.php:1492 -#@ really-simple-ssl -msgid "We detected a definition of siteurl or homeurl in your wp-config.php, but the file is not writable. Because of this, we cannot set the siteurl to https." -msgstr "Nous avons détecté que votre \"siteurl\" ou votre \"homeurl\" dans votre fichier wp-config.php, mais le fichier n'est pas accessible en écriture. De ce fait, nous ne pouvons pas passer l'adresse du site en https." - -#: class-admin.php:1502 -#@ really-simple-ssl -msgid "Because your site is behind a loadbalancer and is_ssl() returns false, you should add the following line of code to your wp-config.php. Your wp-config.php could not be written automatically." -msgstr "Du fait que votre site est derrière un répartiteur de charge (load balancer) et que la fonction is_ssl() renvoie \"faux\", vous devez ajouter la ligne de code suivante dans votre fucguer wp-config.php. Ce fichier ne peut être écrit automatiquement." - -#: class-admin.php:1520 -#@ really-simple-ssl -msgid "Because your server does not pass the $_SERVER[\"HTTPS\"] variable, Wordpress cannot function on SSL. You should add the following line of code to your wp-config.php. Your wp-config.php could not be written automatically." -msgstr "Du fait que votre serveur ne renvoie pas la variable $_SERVER[\"HTTPS\"] , WordPress ne peut pas fonctionner en SSL. Vous devez ajouter la ligne de code suivante dans votre fucguer wp-config.php. Ce fichier ne peut être écrit automatiquement." - -#: class-admin.php:1662 -#@ really-simple-ssl -msgid "SSL settings" -msgstr "Réglages SSL" - -#: class-admin.php:1663 -#@ really-simple-ssl -msgid "SSL" -msgstr "SSL" - -#: class-admin.php:1687 -#: class-admin.php:1765 -#@ really-simple-ssl -msgid "Detected setup" -msgstr "Paramétrage détecté" - -#: class-admin.php:1688 -#@ really-simple-ssl -msgid "In the detected setup section you can see what we detected for your site.

SSL detection: if it is possible to open a page on your site with https, it is assumed you have a valid ssl certificate. No guarantees can be given.

SSL redirect in .htaccess: (Only show when ssl is detected) If possible, the redirect will take place in the .htaccess file. If this file is not available or not writable, javascript is used to enforce ssl." -msgstr "Dans la section \"Paramétrage détecté, vous pouvez voir ce que nous avons détecté sur votre site.

Détection SSL : S'il est possible d'ouvrir une page de votre site en https, nous en déduisons que vous avez un certificat SSL valide. Ceci est bien sûr sans garantie.

Redirection SSL dans le .htaccess: (Ne s'afiche que quand le SSL est détecté) Si possible, la redirection sera faite dans le fichier .htaccess. Si ce fichier n'est pas disponible ou accessible en écriture, le javascript sera utilisé pour forcer le mode SSL." - -#: class-admin.php:1693 -#@ really-simple-ssl -msgid "Mixed content fixer" -msgstr "Corriger le contenu mixte" - -#: class-admin.php:1694 -#@ really-simple-ssl -msgid "In most sites, a lot of links are saved into the content, pluginoptions or even worse, in the theme. When you switch to ssl , these are still http, instead of https. To ensure a smooth transition, this plugin auto replaces all these links. If you see in the scan results that you have fixed most of these links, you can try to run your site without this replace script, which will give you a small performance advantage. If you do not have a lot of reported insecure links, you can try this. If you encounter mixed content warnings, just switch it back on.

How to check for mixed content?
Go to the the front end of your website, and click on the lock in your browser's address bar. When you have mixed content, this lock is not closed, or has a red cross over it." -msgstr "Dans la plupart des sites, de nombreux liens sont insérés dans le contenu, dans des options du plugin, ou pire encore : dans le thème. Quand vous passez en SSL, ces liens restent en HTTP au lien d'HTTPS. Pour assurer une transition en douceur, ce plugin va remplacer tous ces liens. Si vous voyez dans l'analyse des résultats que vous avez corrigé la majorité de ces liens, vous pouvez essayer de faire fonctionner votre site sans ce script de remplacement, ce qui améliorera légèrement les performances. Si vous n'avez pas beaucoup de lien \"non sécurisés\" remontés, vous pouvez essayer cela. Si vous rencontrez des alertes de contenu mixte, réactivez simplement cette option.

Comment vérifier s'il y a du contenu mixte ?
Accédez à la partie publique de votre site et cliquez sur le cadenas dans la barre d'adresse de votre navigateur. Quand vous avez du contenu mixte, le cadenas n'est pas fermé, ou une croix rouge est dessinée au dessus." - -#: class-admin.php:1699 -#@ really-simple-ssl -msgid "HTTP Strict Transport Security (HSTS)" -msgstr "HTTP Strict Transport Security (HSTS)" - -#: class-admin.php:1700 -#@ really-simple-ssl -msgid "Using this option will prevent users from visiting your website over http for one year, so use this option with caution! HTTP Strict Transport Security (HSTS) is an opt-in security enhancement that is specified by a web application through the use of a special response header. Once a supported browser receives this header that browser will prevent any communications from being sent over HTTP to the specified domain and will instead send all communications over HTTPS. It also prevents HTTPS click through prompts on browsers. " -msgstr "Utiliser cette option évitera aux visiteurs de consulter votre site en http pour un an, donc à utiliser avec précaution. HTTP Strict Transport Security (HSTS) est une amélioration de la sécurité de la part d'une application web par l'envoi d'une entête particulière. Une fois qu'un navigateur compatible reçoit cette entête, ce navigateur ne communiquera plus avec le domaine concerné en HTTP mais enverra à la place toutes ses comminications en HTTPS. Cela évite également les alertes HTTPS dans les navigateurs." - -#: class-admin.php:1705 -#@ really-simple-ssl -msgid "How to get an SSL certificate" -msgstr "Comment obtenir un certificat SSL ?" - -#: class-admin.php:1706 -#@ really-simple-ssl -msgid "To secure your site with ssl, you need an SSL certificate. How you can get a certificate depends on your hosting provider, but can often be requested on the control panel of your website. If you are not sure what to do, you can contact your hosting provider." -msgstr "Pour sécuriser votre site en SSL, vous avez besoin d'un certificat SSL. La manière de l'obtenir dépend de de votre hébergeur, mais en général cela se trouve dans le panneau d'administration de votre site. Si vous n'êtes pas sur, vous pouvez contacter votre hébergeur à ce sujet." - -#: class-admin.php:1423 -#@ really-simple-ssl -msgid "Major security issue!" -msgstr "" - -#: class-admin.php:1426 -#@ really-simple-ssl -msgid "The 'force-deactivate.php' file has to be renamed to .txt. Otherwise your ssl can be deactived by anyone on the internet." -msgstr "" - -#: class-admin.php:1428 -#: class-admin.php:1494 -#: class-admin.php:1512 -#: class-admin.php:1530 -#@ really-simple-ssl -msgid "Check again" -msgstr "" - -#: class-admin.php:1440 -#@ really-simple-ssl -msgid "You run a Multisite installation with subfolders, which prevents this plugin from handling the .htaccess." -msgstr "" - -#: class-admin.php:1441 -#@ really-simple-ssl -msgid "Because the domain is the same on all sites. You can just as easily activate ssl on all your sites." -msgstr "" - -#: class-admin.php:1442 -#@ really-simple-ssl -msgid "So to get rid of this annoying message, just activate networkwide." -msgstr "" - -#: class-admin.php:1457 -#@ really-simple-ssl -msgid "SSL was detected and successfully activated!" -msgstr "Le certificat SSL a été détecté et activé avec succès !" - -#: class-admin.php:1796 -#@ really-simple-ssl -msgid "Https redirect was set in javascript because the .htaccess was not writable. Set manually if you want to redirect in .htaccess." -msgstr "" - -#: class-admin.php:1798 -#@ really-simple-ssl -msgid "Https redirect was set in javascript because you have activated per site on a multiste subfolder install. Install networkwide to set the .htaccess redirect." -msgstr "" - -#: class-admin.php:1837 -#@ really-simple-ssl -msgid "More info about HSTS" -msgstr "" - -#: class-admin.php:1877 -#@ really-simple-ssl -msgid "The mixed content scan is available when SSL is detected or forced." -msgstr "" - -#: class-admin.php:2024 -#@ really-simple-ssl -msgid "The HSTS option is not available for per site activated ssl, as it would force other sites over ssl as well." -msgstr "" - -#: class-admin.php:2121 -#@ really-simple-ssl -msgid "On multisite with per site activation, activating HSTS is not possible" -msgstr "" - -#: class-admin.php:2122 -#@ really-simple-ssl -msgid "You have to enable htaccess editing to use this option." -msgstr "" - -#. translators: plugin header field 'PluginURI' -#: really-simple-ssl.php:0 -#@ really-simple-ssl -msgid "https://www.really-simple-ssl.com" -msgstr "" - -#. translators: plugin header field 'AuthorURI' -#: really-simple-ssl.php:0 -#@ really-simple-ssl -msgid "https://www.rogierlankhorst.com" -msgstr "" - -#. translators: plugin header field 'Version' -#: really-simple-ssl.php:0 -#@ really-simple-ssl -msgid "2.2.2" -msgstr ""