WordPress.org
Get WordPress

Plugin Directory

Changeset 2868890


Ignore:
Timestamp:
02/21/2023 04:36:50 PM (3 years ago)
Author:
speedify
Message:

Releasing version 3.3.1

Location:
auto-install-free-ssl
Files:
276 added
14 edited

Legend:

Unmodified
Added
Removed

  • auto-install-free-ssl/trunk/FreeSSLAuto/src/Acme/AcmeV2.php

    r2852521 r2868890  
    176176            if ( 'valid' === $response2['status'] ) {
    177177                //Domain ownership already verified. Skip the verification process
    178                 $this->logger->log( sprintf( __( "Domain (%s) already verified. Skip the verification process...", 'auto-install-free-ssl' ), $domain ) );
     178                $this->logger->log( sprintf( __( "Domain (%s) already verified. Skip the verification process.", 'auto-install-free-ssl' ), $domain ) );
    179179                $return_array_step1['domain_data'][$domain]['verified'] = true;
    180180                //++$number_of_validated_domains;
    … …  
    224224                   
    225225                    //"dns-01" is available
    226                     $this->logger->log( __( "'HTTP-01' challenge was NOT found, but 'DNS-01' challenge has been found.", 'auto-install-free-ssl' ) );
     226                    $this->logger->log( __( "The 'HTTP-01' challenge was NOT found, but the 'DNS-01' challenge has been found.", 'auto-install-free-ssl' ) );
    227227                    if ( !aifs_is_free_version() ) {
    228228                        $this->logger->log( " " . sprintf( __( "So, using the 'DNS-01' challenge for %s.", 'auto-install-free-ssl' ), $domain ) );
    … …  
    241241               
    242242                $return_array_step1['domain_data'][$domain]['challenge'] = $challenge;
    243                 $this->logger->log( __( "We got the challenge token for", 'auto-install-free-ssl' ) . " " . $domain );
     243                $this->logger->log( sprintf( __( "We got the challenge token for %s.", 'auto-install-free-ssl' ), $domain ) );
    244244                $location = $this->client->getLastLocation();
    245245                $header = [
    … …  
    304304           
    305305            if ( !$this->factory->verify_internally_http_wp( $payload, $uri ) ) {
    306                 $this->logger->log( __( "2nd Internal Validation: Payload content does not match with content of the challenge URI.", 'auto-install-free-ssl' ) );
     306                $this->logger->log( __( "2nd Internal Validation: Payload content does not match the challenge URI's content.", 'auto-install-free-ssl' ) );
    307307                if ( !aifs_is_free_version() ) {
    308308                   
    … …  
    316316            } else {
    317317                //Put success log text here
    318                 $this->logger->log( sprintf( __( "Final Internal Validation: the Payload content (%s) successfully matched with the content of %s.", 'auto-install-free-ssl' ), $payload, $uri ) );
     318                $this->logger->log( sprintf( __( "Final Internal Validation: the Payload content (%s) successfully matched the content of %s.", 'auto-install-free-ssl' ), $payload, $uri ) );
    319319                return true;
    320320            }
    … …  
    322322        } else {
    323323            //Put success log text here
    324             $this->logger->log( sprintf( __( "Final Internal Validation: the Payload content (%s) successfully matched with the content of %s.", 'auto-install-free-ssl' ), $payload, $uri ) );
     324            $this->logger->log( sprintf( __( "Final Internal Validation: the Payload content (%s) successfully matched the content of %s.", 'auto-install-free-ssl' ), $payload, $uri ) );
    325325            return true;
    326326        }
    … …  
    352352        if ( $sleep_execution ) {
    353353            //DNS TXT record needs time to propagate. So, delay the execution for 5 minutes
    354             $this->logger->log( __( 'Execution sleeping for 2 minutes.', 'auto-install-free-ssl' ) );
     354            $this->logger->log( __( "Execution sleeping for 2 minutes.", 'auto-install-free-ssl' ) );
    355355            sleep( 120 );
    356             $this->logger->log( __( 'Execution resumed after 2 minutes of sleep.', 'auto-install-free-ssl' ) );
     356            $this->logger->log( __( "Execution resumed after 2 minutes of sleep.", 'auto-install-free-ssl' ) );
    357357        }
    358358       
    … …  
    360360       
    361361        if ( $dns_provider['dns_provider_takes_longer_to_propagate'] ) {
    362             $this->logger->log( __( 'Now check whether the TXT record has been propagated.', 'auto-install-free-ssl' ) );
     362            $this->logger->log( __( "Now check whether the TXT record has been propagated.", 'auto-install-free-ssl' ) );
    363363            $propagated = false;
    364364            //actual value is false
    … …  
    440440        $payload = $value['http-01']['payload'];
    441441        $response2 = $value['response2'];
    442         $this->logger->log( __( 'Sending request to challenge', 'auto-install-free-ssl' ) );
     442        $this->logger->log( __( "Sending request to challenge", 'auto-install-free-ssl' ) );
    443443        $result['status'] = $response2['status'];
    444444        $ended = !('pending' === $result['status']);
    … …  
    466466               
    467467                $this->logger->log_v2( 'error', $msg );
    468                 $msg = __( "Verification ended with error", 'auto-install-free-ssl' ) . ": <br />\n";
     468                $msg = __( "Verification ended with an error", 'auto-install-free-ssl' ) . ": <br />\n";
    469469               
    470470                if ( $this->logger->is_cli() ) {
    … …  
    501501                   
    502502                    if ( @unlink( $tokenPath ) ) {
    503                         $this->logger->log( __( "Deleted challenge file:", 'auto-install-free-ssl' ) . " " . $tokenPath );
     503                        $this->logger->log( __( "Deleted challenge file", 'auto-install-free-ssl' ) . ": " . $tokenPath );
    504504                    } else {
    505                         $this->logger->log( __( "Challenge file was not deleted due to an error. You may delete it manually.", 'auto-install-free-ssl' ) . " : " . $tokenPath );
     505                        $this->logger->log( __( "The challenge file was not deleted due to an error. You may delete it manually.", 'auto-install-free-ssl' ) . " : " . $tokenPath );
    506506                    }
    507507               
    … …  
    513513           
    514514            if ( !$ended ) {
    515                 $this->logger->log( sprintf( __( "Verification pending, sleeping %d second.", 'auto-install-free-ssl' ), 2 ) );
     515                $this->logger->log( sprintf( __( "Verification pending, sleeping %d seconds.", 'auto-install-free-ssl' ), 2 ) );
    516516                //sleep(1);
    517517                sleep( 2 );
    … …  
    569569            //$this->client->getLastLinks();
    570570            $result = $this->client->get( $location, null, true );
    571             $this->logger->log( __( "Location value", 'auto-install-free-ssl' ) . ': ' . $location );
     571            $this->logger->log( __( "Location value", 'auto-install-free-ssl' ) . ": " . $location );
    572572           
    573573            if ( 202 === $this->client->getLastCode() ) {
    … …  
    575575                sleep( 1 );
    576576            } elseif ( 200 === $this->client->getLastCode() ) {
    577                 $this->logger->log( __( 'Got certificate! YAY!', 'auto-install-free-ssl' ) );
     577                $this->logger->log( __( "We have got a certificate! YAY!", 'auto-install-free-ssl' ) );
    578578                $certificates = explode( "\n\n", $result );
    579579                break;
    580580            } else {
    581581                //throw new \RuntimeException("Can't get certificate: HTTP code ".$this->client->getLastCode());
    582                 $this->logger->exception_sse_friendly( __( "Can't get certificate: HTTP code", 'auto-install-free-ssl' ) . ": " . $this->client->getLastCode(), __FILE__, __LINE__ );
     582                $this->logger->exception_sse_friendly( __( "Can't get a certificate: HTTP code", 'auto-install-free-ssl' ) . ": " . $this->client->getLastCode(), __FILE__, __LINE__ );
    583583            }
    584584       
    … …  
    635635    private function postNewReg( $key_path )
    636636    {
    637         $this->logger->log( __( "Sending registration to Let's Encrypt server", 'auto-install-free-ssl' ) );
     637        $this->logger->log( __( "Sending registration to the Let's Encrypt server", 'auto-install-free-ssl' ) );
    638638        $data = [
    639639            'termsOfServiceAgreed' => true,
    … …  
    776776               
    777777                if ( file_put_contents( \dirname( $this->accountKeyPath ) . DS . 'kid.txt', $this->kid ) !== false ) {
    778                     $this->logger->log( __( "Congrats! New account registered successfully.", 'auto-install-free-ssl' ) );
     778                    $this->logger->log( __( "Congrats! A new account has been registered successfully.", 'auto-install-free-ssl' ) );
    779779                    $return_array['proceed'] = true;
    780780                    if ( get_option( 'aifs_is_admin_email_invalid' ) ) {
    … …  
    783783                } else {
    784784                    $error_text = sprintf( __( "Error creating kid.txt file. Please create a text file with filename 'kid.txt' in this path %s and paste this text in it (without quotation mark) \"%s\". Then try again.", 'auto-install-free-ssl' ), "<pre>" . \dirname( $this->accountKeyPath ) . "</pre>", $this->kid );
    785                     $this->logger->log_v2( 'error', $error_text . " " . __( "Closing the connection.", 'auto-install-free-ssl' ), [
     785                    $this->logger->log_v2( 'error', $error_text . " " . __( "Closing the connection", 'auto-install-free-ssl' ), [
    786786                        'event' => 'exit',
    787787                    ] );
    … …  
    791791           
    792792            } else {
    793                 $this->logger->log_v2( 'debug', __( "Sorry, there was a problem registering the account. Let's Encrypt server response given below. Please try again.", 'auto-install-free-ssl' ) );
     793                $this->logger->log_v2( 'debug', __( "Sorry, there was a problem registering the account. Please try again. Let's Encrypt server response given below.", 'auto-install-free-ssl' ) );
    794794                //Delete the key files as the registration failed
    795795               
    … …  
    830830       
    831831        } else {
    832             $this->logger->log( __( "Account already registered. Continuing...", 'auto-install-free-ssl' ) );
     832            $this->logger->log( __( "The account is already registered. Continuing...", 'auto-install-free-ssl' ) );
    833833            $return_array['proceed'] = true;
    834834            if ( get_option( 'aifs_is_admin_email_invalid' ) ) {

  • auto-install-free-ssl/trunk/FreeSSLAuto/src/Acme/Client.php

    r2817268 r2868890  
    104104        if ( !\in_array( $this->lastCode, $expected_status_codes, true ) ) {
    105105            //Failed
    106             $this->logger->log_v2( 'error', sprintf( __( "Sorry, Let’s Encrypt server response (%d) is unexpected. Complete server response is given below.", 'auto-install-free-ssl' ), $this->lastCode ) );
     106            $this->logger->log_v2( 'error', sprintf( __( "Sorry, the Let’s Encrypt server response (%d) is unexpected. The complete server response is given below.", 'auto-install-free-ssl' ), $this->lastCode ) );
    107107           
    108108            if ( $this->logger->is_cli() ) {
    109109                $this->logger->log_v2( 'error', print_r( $result, true ) );
    110                 die( __( 'Closing the connection', 'auto-install-free-ssl' ) );
     110                die( __( "Closing the connection", 'auto-install-free-ssl' ) );
    111111            } else {
    112112                $this->logger->log_v2( 'error', '<pre>' . print_r( $result, true ) . '</pre>' );
    113                 $this->logger->log_v2( 'error', __( 'Closing the connection', 'auto-install-free-ssl' ), [
     113                $this->logger->log_v2( 'error', __( "Closing the connection", 'auto-install-free-ssl' ), [
    114114                    'event' => 'exit',
    115115                ] );

  • auto-install-free-ssl/trunk/FreeSSLAuto/src/Acme/Factory.php

    r2782493 r2868890  
    179179       
    180180        if ( $res === false ) {
    181             $error = __( "Could not generate key pair! Check your OpenSSL configuration. OpenSSL Error: ", 'auto-install-free-ssl' ) . PHP_EOL;
     181            $error = __( "Could not generate key pair! Check your OpenSSL configuration. Got this OpenSSL Error: ", 'auto-install-free-ssl' ) . PHP_EOL;
    182182            while ( $message = openssl_error_string() ) {
    183183                $error .= $message . PHP_EOL;
    … …  
    208208        if ( !is_dir( $outputDirectory ) ) {
    209209            //throw new \RuntimeException("Can't create directory ${outputDirectory}. Please manually create the directory in your certificate directory and set permission 0700 and try again.");
    210             $this->logger->exception_sse_friendly( sprintf( __( "Can't create directory %s . Please manually create the directory in your certificate directory and set permission 0700 and try again.", 'auto-install-free-ssl' ), $outputDirectory ), __FILE__, __LINE__ );
     210            $this->logger->exception_sse_friendly( sprintf( __( "Can't create directory %s. Please manually create the directory in your certificate directory, set permission 0700, and try again.", 'auto-install-free-ssl' ), $outputDirectory ), __FILE__, __LINE__ );
    211211        }
    212212        file_put_contents( $outputDirectory . DS . 'private.pem', $privateKey );

  • auto-install-free-ssl/trunk/FreeSSLAuto/src/Admin/AdminNotice.php

    r2850591 r2868890  
    128128            $counter = (int) get_option( 'aifs_admin_notice_display_counter' );
    129129            /*if(aifs_is_free_version()) {
    130                aifs_is_existing_user(); //Calling to detect existing users and send their information to FreeSSL.tech server
    131               }*/
     130                        aifs_is_existing_user(); //Calling to detect existing users and send their information to FreeSSL.tech server
     131                    }*/
    132132           
    133133            if ( aifs_is_free_version() ) {
    … …  
    160160               
    161161                /*if ( $counter % 2 == 0 ) {
    162                    $this->aifs_display_review_request( true );
    163                   } else {
    164                    if ( aifssl_fs()->can_use_premium_code__premium_only() ) {
    165                     $this->aifs_encryption_key_change_notification__premium_only( $cpanel_password_missing, $dns_api_credential_missing );
    166                    }
    167                   }*/
     162                            $this->aifs_display_review_request( true );
     163                        } else {
     164                            if ( aifssl_fs()->can_use_premium_code__premium_only() ) {
     165                                $this->aifs_encryption_key_change_notification__premium_only( $cpanel_password_missing, $dns_api_credential_missing );
     166                            }
     167                        }*/
    168168            }
    169169           
    … …  
    208208                $remind_later = wp_nonce_url( get_site_url() . $_SERVER['REQUEST_URI'], 'aifs_renew_ssl_later', 'aifsrenewssllater' );
    209209                $generate_ssl = new GenerateSSLmanually();
    210                 $renew_button_text = __( 'Renew SSL Now', 'auto-install-free-ssl' );
     210                $renew_button_text = __( "Renew SSL Now", 'auto-install-free-ssl' );
    211211                $html = '<div class="notice notice-error aifs-review">
    212212                            <div class="aifs-review-box">
    213213                              <img class="aifs-notice-img-left" src="' . AIFS_URL . 'assets/img/ssl-error.jpg" />
    214                               <p style="text-align: justify;">' . __( 'Hello', 'auto-install-free-ssl' ) . ' ' . aifs_admin_first_name() . ', <span style="color: red;">' . __( "your visitors will see a security warning in red and may leave your website if you don't renew the SSL certificate before the expiry date", 'auto-install-free-ssl' ) . " " . $expiry_date . '.</span> <span style="font-size: small;">(' . sprintf( __( "Validity of %s free SSL is 90 days. They recommend renewing 30 days prior to expiry.", 'auto-install-free-ssl' ), $issuerShort ) . ')</span><!-- <br /><strong>~' . AIFS_NAME . '</strong>--></p>
     214                              <p style="text-align: justify;">' . __( "Hello", 'auto-install-free-ssl' ) . ' ' . aifs_admin_first_name() . ', <span style="color: red;">' . __( "your visitors will see a security warning in red and may leave your website if you don't renew the SSL certificate before the expiry date", 'auto-install-free-ssl' ) . " " . $expiry_date . '.</span> <span style="font-size: small;">(' . sprintf( __( "The validity of %s free SSL is 90 days. They recommend renewing 30 days before expiry.", 'auto-install-free-ssl' ), $issuerShort ) . ')</span><!-- <br /><strong>~' . AIFS_NAME . '</strong>--></p>
    215215                            </div>
    216216                            <div style="margin-left: 8%; margin-top: -1%; margin-bottom: -2%;">
    217217                                ' . $generate_ssl->regenerate_ssl_form( $renew_button_text, true ) . '
    218218                                <!-- <a class="aifs-review-now aifs-review-button" href="' . $renew_url . '">' . __( 'Renew SSL Now', 'auto-install-free-ssl' ) . '</a> -->
    219                                 <span style="margin-left: 35%; position: relative; top: -25px;"><a class="aifs-review-button" href="' . $remind_later . '" rel="nofollow" onclick="return confirm(\'Are you sure you want to be reminded later to renew your SSL certificate?\')">' . __( 'Remind later', 'auto-install-free-ssl' ) . '</a></span>
     219                                <span style="margin-left: 35%; position: relative; top: -25px;"><a class="aifs-review-button" href="' . $remind_later . '" rel="nofollow" onclick="return confirm(\'' . __( "Do you want to be reminded later to renew your SSL certificate?", 'auto-install-free-ssl' ) . '\')">' . __( "Remind later", 'auto-install-free-ssl' ) . '</a></span>
    220220                            </div>
    221221                          </div>';
    … …  
    247247                        <div class="aifs-review-box">
    248248                          <img class="aifs-notice-img-left" src="' . AIFS_URL . 'assets/img/icon.jpg" />
    249                           <p>' . __( 'Hey', 'auto-install-free-ssl' ) . ' ' . aifs_admin_first_name() . ', <strong>' . AIFS_NAME . '</strong> ' . __( 'has saved your $$$ by providing Free SSL Certificates and will save more. Could you please do me a BIG favor and give it a 5-star rating on WordPress? To help me spread the word and boost my motivation.', 'auto-install-free-ssl' ) . ' <br />~Anindya</p>
     249                          <p>' . __( "Hey", 'auto-install-free-ssl' ) . ' ' . aifs_admin_first_name() . ', <strong>' . AIFS_NAME . '</strong> ' . __( "has saved you \$\$\$ by providing Free SSL Certificates and will save more. Please share your experience with us on WordPress (probably with a five-star rating). That will help boost our motivation and spread the word.", 'auto-install-free-ssl' ) . ' <br />~Anindya</p>
    250250                        </div>
    251                         <a class="aifs-review-now aifs-review-button" href="https://wordpress.org/support/plugin/auto-install-free-ssl/reviews/#new-post" target="_blank">' . __( 'Sure! You Deserve It.', 'auto-install-free-ssl' ) . '</a>
    252                         <a class="aifs-review-button" href="' . $already_done . '" rel="nofollow" onclick="return confirm(\'Are you sure you have reviewed ' . AIFS_NAME . ' plugin?\')">' . __( 'I have done', 'auto-install-free-ssl' ) . '</a>
     251                        <a class="aifs-review-now aifs-review-button" href="https://wordpress.org/support/plugin/auto-install-free-ssl/reviews/#new-post" target="_blank">' . __( "Click here to Review", 'auto-install-free-ssl' ) . '</a>
     252                        <a class="aifs-review-button" href="' . $already_done . '" rel="nofollow" onclick="return confirm(\'Are you sure you have reviewed ' . AIFS_NAME . ' plugin?\')">' . __( "I have done", 'auto-install-free-ssl' ) . '</a>
    253253                        <a class="aifs-review-button" href="' . $already_done . '" rel="nofollow" onclick="return confirm(\'Are you sure you do NOT want to review ' . AIFS_NAME . ' plugin?\')">' . __( "I don't want to", 'auto-install-free-ssl' ) . '</a>
    254                         <a class="aifs-review-button" href="' . $remind_later . '" rel="nofollow" onclick="return confirm(\'Are you sure you need ' . AIFS_NAME . ' to remind you later?\')">' . __( 'Remind me later', 'auto-install-free-ssl' ) . '</a>
     254                        <a class="aifs-review-button" href="' . $remind_later . '" rel="nofollow" onclick="return confirm(\'Are you sure you need ' . AIFS_NAME . ' to remind you later?\')">' . __( "Remind me later", 'auto-install-free-ssl' ) . '</a>
    255255                      </div>';
    256256            echo  $html ;
    … …  
    303303            if ( aifs_is_existing_user() ) {
    304304                $link = menu_page_url( 'auto_install_free_ssl', false );
    305                 $link_text = __( 'Claim for FREE', 'auto-install-free-ssl' );
    306                 $already_done_text = __( 'I have already claimed', 'auto-install-free-ssl' );
     305                $link_text = __( "Claim for FREE", 'auto-install-free-ssl' );
     306                $already_done_text = __( "I have already claimed", 'auto-install-free-ssl' );
    307307                $dont_want_text = __( "I don't want it", 'auto-install-free-ssl' );
    308                 $already_done_confirmation_text = __( 'Are you sure you have already claimed the Premium Version of', 'auto-install-free-ssl' ) . ' ' . AIFS_NAME . ' ' . __( 'for FREE?', 'auto-install-free-ssl' );
    309                 $dont_want_confirmation_text = __( "Are you sure you do NOT want the Premium Version of", 'auto-install-free-ssl' ) . ' ' . AIFS_NAME . ' ' . __( 'for FREE?', 'auto-install-free-ssl' );
     308                $already_done_confirmation_text = sprintf( __( "Are you sure you have already claimed the Premium Version of %s for FREE?", 'auto-install-free-ssl' ), AIFS_NAME );
     309                $dont_want_confirmation_text = sprintf( __( "Are you sure you do NOT want the Premium Version of %s for FREE?", 'auto-install-free-ssl' ), AIFS_NAME );
    310310            } else {
    311311                $link = menu_page_url( 'auto_install_free_ssl', false ) . "&comparison=yes";
    312                 $link_text = __( 'Comparison Table', 'auto-install-free-ssl' );
    313                 $already_done_text = __( 'Got it', 'auto-install-free-ssl' );
     312                $link_text = __( "Comparison Table", 'auto-install-free-ssl' );
     313                $already_done_text = __( "Got it", 'auto-install-free-ssl' );
    314314                $dont_want_text = __( "I don't want to", 'auto-install-free-ssl' );
    315                 $already_done_confirmation_text = __( 'Are you sure you know the benefits of the Premium Version of', 'auto-install-free-ssl' ) . ' ' . AIFS_NAME . ' ' . __( 'compared to the free version?', 'auto-install-free-ssl' );
    316                 $dont_want_confirmation_text = __( "Are you sure you do NOT want to learn the benefits of the Premium Version of", 'auto-install-free-ssl' ) . ' ' . AIFS_NAME . ' ' . __( 'compared to the free version?', 'auto-install-free-ssl' );
     315                $already_done_confirmation_text = sprintf( __( "Are you sure you know the benefits of the Premium Version of %s compared to the free version?", 'auto-install-free-ssl' ), AIFS_NAME );
     316                $dont_want_confirmation_text = sprintf( __( "Are you sure you do NOT want to learn the benefits of the Premium Version of %s compared to the free version?", 'auto-install-free-ssl' ), AIFS_NAME );
    317317            }
    318318           
    319319            $html = '<div class="notice notice-success aifs-review">
    320320                    <div class="aifs-review-box">                     
    321                       <p style="line-height: 1.9em;">' . __( 'Hello', 'auto-install-free-ssl' ) . ' ' . aifs_admin_first_name() . ', ';
     321                      <p style="line-height: 1.9em;">' . __( "Hello", 'auto-install-free-ssl' ) . ' ' . aifs_admin_first_name() . ', ';
    322322            if ( aifs_is_existing_user() ) {
    323                 $html .= '<a href="' . $link . '">' . __( 'click here', 'auto-install-free-ssl' ) . '</a> ' . __( 'and claim a Premium License of', 'auto-install-free-ssl' ) . ' <strong>' . AIFS_NAME . '</strong> ' . __( 'for FREE!', 'auto-install-free-ssl' ) . '<br />';
     323                //$html .= '<a href="' . $link . '">' . __( "click here", 'auto-install-free-ssl' ) . '</a> ' . __( 'and claim a Premium License of', 'auto-install-free-ssl' ) . ' <strong>' . AIFS_NAME . '</strong> ' . __( 'for FREE!', 'auto-install-free-ssl' ) . '<br />';
     324                $html .= sprintf(
     325                    __( "%s click here%s and claim a Premium License of %s for FREE!", 'auto-install-free-ssl' ),
     326                    '<a href="' . $link . '">',
     327                    '</a>',
     328                    '<strong>' . AIFS_NAME . '</strong>'
     329                );
    324330            }
    325331            $html .= sprintf( __( "As we mentioned in our %sannouncement%s dated November 3, 2020, we released the premium version", 'auto-install-free-ssl' ), '<a href="https://freessl.tech/blog/auto-install-free-ssl-needs-your-help-to-survive" target="_blank">', '</a>' );
    326332            if ( !aifs_is_existing_user() ) {
    327                 $html .= ' ' . __( 'of', 'auto-install-free-ssl' ) . ' <strong>' . AIFS_NAME . '</strong>';
     333                $html .= ' ' . __( "of", 'auto-install-free-ssl' ) . " <strong>" . AIFS_NAME . "</strong>";
    328334            }
    329335            $html .= ' ' . __( "on June 30, 2022, which is fully automated, and this free version doesn't have any automation feature.", 'auto-install-free-ssl' ) . '</p>';
    … …  
    333339                    <a class="aifs-review-button" href="' . $already_done . '" rel="nofollow" onclick="return confirm(\'' . $already_done_confirmation_text . '\')">' . $already_done_text . '</a>
    334340                    <a class="aifs-review-button" href="' . $already_done . '" rel="nofollow" onclick="return confirm(\'' . $dont_want_confirmation_text . '\')">' . $dont_want_text . '</a>
    335                     <a class="aifs-review-button" href="' . $remind_later . '" rel="nofollow" onclick="return confirm(\'Are you sure you need ' . AIFS_NAME . ' to remind you later?\')">' . __( 'Remind me later', 'auto-install-free-ssl' ) . '</a>                                     
     341                    <a class="aifs-review-button" href="' . $remind_later . '" rel="nofollow" onclick="return confirm(\'' . sprintf( __( "Do you need %s to remind you later?", 'auto-install-free-ssl' ), AIFS_NAME ) . '\')">' . __( "Remind me later", 'auto-install-free-ssl' ) . '</a>                                     
    336342                    </div>';
    337343            echo  $html ;
    … …  
    362368                $already_done_text = __( "I have already purchased", 'auto-install-free-ssl' );
    363369                $dont_want_text = __( "I don't want it", 'auto-install-free-ssl' );
    364                 $already_done_confirmation_text = __( "Are you sure you have already purchased the Premium license of", 'auto-install-free-ssl' ) . ' ' . AIFS_NAME . ' ' . __( "?", 'auto-install-free-ssl' );
     370                $already_done_confirmation_text = sprintf( __( "Are you sure you have already purchased the Premium license of %s?", 'auto-install-free-ssl' ), AIFS_NAME );
    365371               
    366372                if ( aifs_is_free_version() ) {
    367                     $dont_want_confirmation_text = sprintf( __( "If you do not purchase a premium license, you will need to renew your SSL certificate manually every 60 days. Are you sure you do not want the Premium Version of", 'auto-install-free-ssl' ) ) . ' ' . AIFS_NAME . ' ' . __( "?", 'auto-install-free-ssl' );
     373                    $dont_want_confirmation_text = sprintf( __( "If you do not purchase a premium license, you will need to renew your SSL certificate manually every 60 days. Are you sure you do not want the Premium Version of %s?", 'auto-install-free-ssl' ), AIFS_NAME );
    368374                } else {
    369                     $dont_want_confirmation_text = sprintf( __( "If you do not purchase a premium license, your installation will be downgraded to the free plan from January 1, 2023, and you will need to renew your SSL certificate manually every 60 days. Are you sure you do not want the Premium Version of", 'auto-install-free-ssl' ) ) . ' ' . AIFS_NAME . ' ' . __( "?", 'auto-install-free-ssl' );
     375                    $dont_want_confirmation_text = sprintf( __( "Are you sure you do not want the Premium Version of %s? Suppose you do not purchase a premium license. In that case, your installation will be downgraded to the free plan from January 1, 2023, and you will need to renew your SSL certificate manually every 60 days.", 'auto-install-free-ssl' ), AIFS_NAME );
    370376                }
    371377               
    … …  
    387393                    //Text for premium version
    388394                    $html .= '<span style="color: red;">' . sprintf(
    389                         __( "the current free premium %sunlimited sites%s license of '%s' expires on Dec 31, 2022.", 'auto-install-free-ssl' ),
     395                        __( "the current free premium %sunlimited sites%s license of '%s' expires on December 31, 2022.", 'auto-install-free-ssl' ),
    390396                        '<strong>',
    391397                        '</strong>',
    … …  
    407413                $html .= '<a class="aifs-review-button" href="' . $already_done . '" rel="nofollow" onclick="return confirm(\'' . $already_done_confirmation_text . '\')">' . $already_done_text . '</a>
    408414                            <a class="aifs-review-button" href="' . $already_done . '" rel="nofollow" onclick="return confirm(\'' . $dont_want_confirmation_text . '\')">' . $dont_want_text . '</a>
    409                             <a class="aifs-review-button" href="' . $remind_later . '" rel="nofollow" onclick="return confirm(\'Are you sure you need ' . AIFS_NAME . ' to remind you later?\')">' . __( 'Remind me later', 'auto-install-free-ssl' ) . '</a>                                     
     415                            <a class="aifs-review-button" href="' . $remind_later . '" rel="nofollow" onclick="return confirm(\'' . sprintf( __( "Do you need %s to remind you later?", 'auto-install-free-ssl' ), AIFS_NAME ) . '\')">' . __( "Remind me later", 'auto-install-free-ssl' ) . '</a>                                     
    410416                            </div>';
    411417                echo  $html ;

  • auto-install-free-ssl/trunk/FreeSSLAuto/src/Admin/Factory.php

    r2852521 r2868890  
    9191            $domain = basename( $dir );
    9292            if ( '_account' !== $domain ) {
     93                //@todo add ->  && is_file($dir . DS . 'certificate.pem')
    9394                $ssl_domains[] = $domain;
    9495            }
    … …  
    695696        if ( !is_dir( AIFS_UPLOAD_DIR ) ) {
    696697            //throw new \RuntimeException("Can't create directory '".AIFS_UPLOAD_DIR."'. Please manually create it, set permission 0755 and try again.");
    697             $this->logger->exception_sse_friendly( sprintf( __( "Can't create directory '%s'. Please manually create it, set permission %s and try again.", 'auto-install-free-ssl' ), AIFS_UPLOAD_DIR, '0700' ), __FILE__, __LINE__ );
     698            $this->logger->exception_sse_friendly( sprintf( __( "Can't create the directory '%s'. Please manually create it, set permission %s, and try again.", 'auto-install-free-ssl' ), AIFS_UPLOAD_DIR, '0700' ), __FILE__, __LINE__ );
    698699        }
    699700       
    … …  
    714715            if ( !is_writable( AIFS_UPLOAD_DIR ) ) {
    715716                //throw new \RuntimeException("The directory '".AIFS_UPLOAD_DIR."' is not writable. Please manually set permission 0755 or 0777 to this directory and try again.");
    716                 $this->logger->exception_sse_friendly( sprintf( __( "The directory '%s' is not writable. Please manually set permission 0755 or 0777 to this directory and try again.", 'auto-install-free-ssl' ), AIFS_UPLOAD_DIR ), __FILE__, __LINE__ );
     717                $this->logger->exception_sse_friendly( sprintf( __( "The directory '%s' is not writable. Please manually set the permission 0755 or 0777 to this directory and try again.", 'auto-install-free-ssl' ), AIFS_UPLOAD_DIR ), __FILE__, __LINE__ );
    717718            }
    718719        }
    … …  
    774775                //throw new \RuntimeException("Can't create .htaccess file in the directory '".$dir_path."'. Please manually create it, and paste the above code in it.");
    775776                $this->logger->exception_sse_friendly( sprintf(
    776                     __( "Can't create '%s' file in the directory '%s'. Please manually create it, and paste this code in it: %s", 'auto-install-free-ssl' ),
     777                    __( "Can't create the '%s' file in the directory '%s'. Please manually create it, and paste this code into it: %s", 'auto-install-free-ssl' ),
    777778                    $file,
    778779                    $dir_path,
    … …  
    797798                //throw new \RuntimeException("Can't create .htaccess file in the directory '".$dir_path."'. Please manually create it, and paste the above code in it.");
    798799                $this->logger->exception_sse_friendly( sprintf(
    799                     __( "Can't create '%s' file in the directory '%s'. Please manually create it, and paste this code in it: %s", 'auto-install-free-ssl' ),
     800                    __( "Can't create the '%s' file in the directory '%s'. Please manually create it, and paste this code into it: %s", 'auto-install-free-ssl' ),
    800801                    $file,
    801802                    $dir_path,
    … …  
    903904        if ( count( $domain_online ) < 2 ) {
    904905            $link = "https://www.whatsmydns.net/#A/" . $offline_domain;
    905             $html .= "<p style='font-size: 1em; color: red;'><em>{$offline_domain}</em> " . __( "is offline", 'auto-install-free-ssl' ) . ".";
    906             $html .= " " . __( "Please point it to this hosting, if you need SSL for it too.", 'auto-install-free-ssl' ) . "<br /><br />";
    907             $html .= __( "After you do so, wait to propagate the DNS record. Please", 'auto-install-free-ssl' ) . " <a href='{$link}' target='_blank'>" . __( "click here", 'auto-install-free-ssl' ) . "</a> " . __( "to check the DNS record propagation status. Proceed if you see a green tick mark for almost all locations in the list and map.", 'auto-install-free-ssl' ) . "</p>";
     906            $html .= "<p style='font-size: 1em; color: red;'>" . sprintf( __( "%s is offline.", 'auto-install-free-ssl' ), "<em>{$offline_domain}</em>" );
     907            $html .= " " . __( "Please point it to this hosting if you need SSL for it too.", 'auto-install-free-ssl' ) . "<br /><br />";
     908            $html .= sprintf( __( "After you do so, wait to propagate the DNS record. Please%s click here%s to check the DNS record propagation status. Proceed if you see green tick marks for almost all locations in the list and map.", 'auto-install-free-ssl' ), "<a href='{$link}' target='_blank'>", "</a>" ) . "</p>";
    908909        }
    909910       

  • auto-install-free-ssl/trunk/FreeSSLAuto/src/Admin/ForceSSL.php

    r2835481 r2868890  
    9595                update_option( 'siteurl', str_ireplace( 'https:', 'http:', get_option( 'siteurl' ) ) );
    9696                update_option( 'home', str_ireplace( 'https:', 'http:', get_option( 'home' ) ) );
    97                 exit( __( 'Reverted back to HTTP successfully. Now you can access your website over http://', 'auto-install-free-ssl' ) );
     97                exit( __( "Your website reverted to HTTP successfully. Now you can access your website over http://", 'auto-install-free-ssl' ) );
    9898            } else {
    99                 wp_die( __( "Access denied due to invalid secret code. Please use the link provided in the latest email (when you activated force HTTPS last time).", 'auto-install-free-ssl' ) );
     99                wp_die( __( "Access was denied due to an invalid secret code. Please use the link in the latest email (when you activated force HTTPS last time).", 'auto-install-free-ssl' ) );
    100100            }
    101101       
    … …  
    262262        if ( $aifs_force_ssl ) {
    263263            $confirmation_text = __( "Are you sure you want to activate force HTTPS?", 'auto-install-free-ssl' );
    264             $button_text = __( 'Activate Force HTTPS', 'auto-install-free-ssl' );
     264            $button_text = __( "Activate Force HTTPS", 'auto-install-free-ssl' );
    265265            $css_class = "button button-primary button-hero";
    266266        } else {
    267             $confirmation_text = __( "Are you sure you want to Deactivate force HTTPS and revert to HTTP?", 'auto-install-free-ssl' );
    268             $button_text = __( 'Revert to HTTP', 'auto-install-free-ssl' );
     267            $confirmation_text = __( "Do you want to Deactivate force HTTPS and revert to HTTP?", 'auto-install-free-ssl' );
     268            $button_text = __( "Revert to HTTP", 'auto-install-free-ssl' );
    269269            $css_class = "button page-title-action";
    270270        }
    … …  
    307307                    $html .= '<p style="color: red; font-weight: bold;">' . __( "Do this only if an SSL certificate has been installed on this website.", 'auto-install-free-ssl' ) . '</p>';
    308308                }
    309                 $html .= '<p>' . __( "To remove the mixed content warning and see a padlock in the browser's address bar, you need to click the button below (only once). This will activate force SSL and all your website resources will load over HTTPS.", 'auto-install-free-ssl' ) . '</p>';
     309                $html .= '<p>' . __( "To remove the mixed content warning and see a padlock in the browser's address bar, you need to click the button below (only once). This click will activate force SSL, and all your website resources will load over HTTPS.", 'auto-install-free-ssl' ) . '</p>';
    310310               
    311311                if ( !is_ssl() ) {
    312                     $html .= '<p>' . __( "Clicking this button will immediately force your website to load over HTTPS and may prompt you to login again.", 'auto-install-free-ssl' ) . '</p>';
    313                     $html .= '<p><strong>' . __( "WARNING", 'auto-install-free-ssl' ) . ':</strong> ' . __( "If the SSL certificate has not been installed properly, clicking this button may cause issues accessing the website. So, please click this link first", 'auto-install-free-ssl' ) . ': <a href="https://' . $site_url . '" target="_blank">https://' . $site_url . '</a> ' . __( " and check for HTTPS in the address bar.", 'auto-install-free-ssl' ) . '</p>';
     312                    $html .= '<p>' . __( "Clicking this button will immediately force your website to load over HTTPS and may prompt you to log in again.", 'auto-install-free-ssl' ) . '</p>';
     313                    $html .= '<p><strong>' . __( "WARNING", 'auto-install-free-ssl' ) . ':</strong> ' . sprintf( __( "If the SSL certificate is not installed correctly, clicking this button may cause issues accessing the website. So, please click this link first: %s and check for HTTPS in the address bar.", 'auto-install-free-ssl' ), '<a href="https://' . $site_url . '" target="_blank">https://' . $site_url . '</a>' ) . '</p>';
    314314                }
    315315               
    316                 $html .= '<p>' . __( "If you face issues after clicking this button, please revert to HTTP.", 'auto-install-free-ssl' ) . '<strong> ' . __( "Please don't worry, as soon as you click the button, we'll send you an automated email with a link. If you need to revert to HTTP, simply click that link.", 'auto-install-free-ssl' ) . '</strong> ' . __( "If you don't find that email in your inbox, please don't forget to check your spam folder.", 'auto-install-free-ssl' ) . '</p>' . '<p>' . __( "But if the issue persists,", 'auto-install-free-ssl' ) . ' <a href="https://freessl.tech/free-ssl-certificate-for-wordpress-website/#reverthttp" target="_blank">' . __( "click here", 'auto-install-free-ssl' ) . '</a> ' . __( "for documentation on more options on how to revert to HTTP.", 'auto-install-free-ssl' ) . '</p>';
    317                
    318                 if ( isset( $all_domains ) && is_array( $all_domains ) && count( $all_domains ) > 1 ) {
    319                     $html .= "<span style='color: #46b450;'>" . __( "NOTE: Clicking this button activates force HTTPS on this website only", 'auto-install-free-ssl' ) . ". </span>";
    320                     $html .= __( "You have generated SSL certificates for other websites using this installation. But for force HTTPS you need to install this plugin in other websites too (if they are made with WordPress) and click the same button. No need to do basic settings etc other configuration there.", 'auto-install-free-ssl' );
    321                 }
    322                
     316                $html .= '<p>' . __( "If you face issues after clicking this button, please revert to HTTP.", 'auto-install-free-ssl' ) . '<strong> ' . __( "Please don't worry; as soon as you click the button, we'll send you an automated email with a link. If you need to revert to HTTP, click that link.", 'auto-install-free-ssl' ) . '</strong> ' . __( "Please check your spam folder if you don't find that email in your inbox.", 'auto-install-free-ssl' ) . '</p>' . '<p>' . sprintf( __( "But if the issue persists even after you click that link, please %sclick here%s for documentation on more options on how to revert to HTTP.", 'auto-install-free-ssl' ), '<a href="https://freessl.tech/free-ssl-certificate-for-wordpress-website/#reverthttp" target="_blank">', '</a>' ) . '</p>';
    323317                $html .= $this->force_ssl_form( 1 );
    324318            } else {
    325319                $html .= '<h3 class="block-title">' . __( "Optional: Deactivate Force HTTPS", 'auto-install-free-ssl' ) . '</h3>';
    326                 $html .= '<p>' . __( "If force HTTPS is causing issues with your website, you may click the button below to Deactivate the force HTTPS feature and revert to HTTP. After you fix the SSL issues, you may activate force HTTPS again.", 'auto-install-free-ssl' ) . '</p>';
     320                $html .= '<p>' . __( "If force HTTPS is causing issues with your website, click the button below to Deactivate the force HTTPS feature and revert to HTTP. After you fix the SSL issues, you may activate force HTTPS again.", 'auto-install-free-ssl' ) . '</p>';
    327321                /* Display revert button */
    328322                $html .= $this->force_ssl_form( 0 );
    … …  
    331325            $html .= '</td>';
    332326        } else {
    333             $html .= '<td class="card block-body"><h3 style="line-height: 2em;">' . __( "No SSL is installed on this website. Please install an SSL, and then you'll get the option to Activate Force HTTPS.", 'auto-install-free-ssl' ) . '</h3></td>';
     327            $html .= '<td class="card block-body"><h3 style="line-height: 2em;">' . __( "No SSL is installed on this website. Please install an SSL, and you'll get the option to Activate Force HTTPS.", 'auto-install-free-ssl' ) . '</h3></td>';
    334328        }
    335329       
    … …  
    362356                       
    363357                        if ( !$ssl_details['domain_other_version']['ssl_installed'] ) {
    364                             $text_display = __( "No", 'auto-install-free-ssl' ) . " <strong>" . __( "VALID", 'auto-install-free-ssl' ) . "</strong> " . __( "SSL installed on ", 'auto-install-free-ssl' ) . $ssl_details['domain_site']['url'] . " " . __( "and", 'auto-install-free-ssl' ) . " " . $ssl_details['domain_other_version']['url'] . ". <strong>" . __( "Please install an SSL certificate on this website and try again", 'auto-install-free-ssl' ) . ".</strong> ";
     358                            $text_display = sprintf(
     359                                __( "No %svalid%s SSL is installed on %s and %s. %sPlease install an SSL certificate on this website and try again.%s", 'auto-install-free-ssl' ),
     360                                '<strong>',
     361                                '</strong>',
     362                                $ssl_details['domain_site']['url'],
     363                                $ssl_details['domain_other_version']['url'],
     364                                '<strong>',
     365                                '</strong>'
     366                            );
    365367                           
    366368                            if ( strcmp( $ssl_details['domain_site']['error_cause'], $ssl_details['domain_other_version']['error_cause'] ) == 0 ) {
    … …  
    372374                        } else {
    373375                            $general_settings = admin_url( 'options-general.php' );
    374                             $link_title = __( "Click here to change", 'auto-install-free-ssl' );
    375                             $text_display = __( "The installed SSL covers only", 'auto-install-free-ssl' ) . " " . $ssl_details['domain_other_version']['url'] . ". " . __( "But it doesn't cover", 'auto-install-free-ssl' ) . " " . $ssl_details['domain_site']['url'] . ". <strong>" . __( "Please either change your", 'auto-install-free-ssl' ) . " <a href='{$general_settings}' title='{$link_title}'>" . __( "WordPress Address (URL) & Site Address (URL)", 'auto-install-free-ssl' ) . "</a> " . __( "or install an SSL certificate that covers", 'auto-install-free-ssl' ) . " " . $ssl_details['domain_site']['url'] . ".</strong> ";
     376                            $link_title = __( "Click here to change WordPress Address (URL) & Site Address (URL)", 'auto-install-free-ssl' );
     377                            $text_display = sprintf(
     378                                __( "The installed SSL covers only %s. But it doesn't cover %s. %sPlease either change your %sWordPress Address (URL) & Site Address (URL)%s or install an SSL certificate that covers %s", 'auto-install-free-ssl' ),
     379                                $ssl_details['domain_other_version']['url'],
     380                                $ssl_details['domain_site']['url'],
     381                                '<strong>',
     382                                '<a href="' . $general_settings . '" title="' . $link_title . '">',
     383                                '</a>',
     384                                $ssl_details['domain_site']['url'] . '.</strong>'
     385                            );
    376386                            $text_display .= __( "Error cause", 'auto-install-free-ssl' ) . ": " . $ssl_details['domain_site']['error_cause'] . ".";
    377387                        }
    … …  
    431441                update_option( 'home', str_ireplace( 'https:', 'http:', get_option( 'home' ) ) );
    432442                //Display success message (Deactivated)
    433                 aifs_add_flash_notice( __( "Force HTTPS has been Deactivated successfully and you have reverted to HTTP.", 'auto-install-free-ssl' ) );
     443                aifs_add_flash_notice( __( "Force HTTPS has been Deactivated successfully, and you have reverted to HTTP.", 'auto-install-free-ssl' ) );
    434444            }
    435445       
    … …  
    459469       
    460470        $revert_url = str_replace( 'https:', 'http:', site_url() ) . "/?aifs_revert_http_nonce=" . $revert_nonce;
    461         $subject = "'" . AIFS_NAME . "' " . __( 'has activated Force HTTPS on your website', 'auto-install-free-ssl' ) . " " . aifs_get_domain( false );
     471        $subject = sprintf( __( "'%s' has activated Force HTTPS on your website %s.", 'auto-install-free-ssl' ), AIFS_NAME, aifs_get_domain( false ) );
    462472        $headers[] = 'MIME-Version: 1.0';
    463473        $headers[] = 'Content-type: text/html; charset=UTF-8';
    … …  
    466476        $body = "<html><body>";
    467477        $body .= __( "Hello", 'auto-install-free-ssl' ) . " " . aifs_admin_first_name() . ",<br /><br />";
    468         $body .= __( "We have successfully activated Force HTTPS on your website", 'auto-install-free-ssl' ) . " " . aifs_get_domain( false ) . ".<br /><br />";
    469         $body .= __( "Please refresh your website to get the padlock. Still don't see it? If your theme has an option to", 'auto-install-free-ssl' ) . " ";
    470         $body .= "<strong>" . __( "regenerate CSS files", 'auto-install-free-ssl' ) . "</strong>, ";
    471         $body .= __( "please do it. Otherwise, search the theme and/or plugins for", 'auto-install-free-ssl' ) . " ";
    472         $body .= "<strong>" . __( "hardcoded URL", 'auto-install-free-ssl' ) . ", </strong> ";
    473         $body .= __( "if any, and fix it. Please contact us at", 'auto-install-free-ssl' ) . " <em>[email protected]</em> ";
    474         $body .= __( "for any help", 'auto-install-free-ssl' ) . ".<br /><br />";
    475         $body .= __( "If the SSL certificate has not been installed properly, or if an invalid SSL certificate installed on your website, you may face issues. Your WordPress website may be inaccessible too. In that case please click the link given below to deactivate force HTTPS and revert to HTTP.", 'auto-install-free-ssl' ) . "<br />";
     478        $body .= sprintf( __( "We have successfully activated Force HTTPS on your website, %s.", 'auto-install-free-ssl' ), aifs_get_domain( false ) ) . "<br /><br />";
     479        $body .= sprintf(
     480            __( "Please refresh your website to get the padlock. Don't you see it? If your theme can %sregenerate CSS files%s, please do it. Otherwise, search the theme and plugins for %shardcoded URLs%s, if any, and fix them. Don't hesitate to contact us at %s for any help.", 'auto-install-free-ssl' ),
     481            '<strong>',
     482            '</strong>',
     483            '<strong>',
     484            '</strong>',
     485            '<em>[email protected]</em>'
     486        ) . '<br /><br />';
     487        $body .= __( "You may face issues if the SSL certificate is not installed correctly or an invalid SSL certificate is installed on your website. Your WordPress website may be inaccessible too. In that case, please click the link given below to deactivate force HTTPS and revert to HTTP.", 'auto-install-free-ssl' ) . "<br />";
    476488        $body .= "<a href='{$revert_url}'>{$revert_url}</a><br /><br />";
    477         $body .= __( "Clicking the above link will instantly deactivate force HTTPS and revert your website to HTTP", 'auto-install-free-ssl' ) . ".<br /><br />";
    478         $body .= __( "But if the issue persists", 'auto-install-free-ssl' ) . ", ";
    479         $body .= '<a href="https://freessl.tech/free-ssl-certificate-for-wordpress-website/#reverthttp">' . __( "click here", 'auto-install-free-ssl' ) . "</a> ";
    480         $body .= __( "for documentation on more options on how to revert to HTTP", 'auto-install-free-ssl' ) . ".<br /><br />";
     489        $body .= __( "Clicking the above link will instantly deactivate force HTTPS and revert your website to HTTP.", 'auto-install-free-ssl' ) . "<br /><br />";
     490        $body .= sprintf( __( "But if the issue persists, %sclick here%s for documentation on more options on how to revert to HTTP.", 'auto-install-free-ssl' ), '<a href="https://freessl.tech/free-ssl-certificate-for-wordpress-website/#reverthttp" target="_blank">', '</a>' );
    481491        $email = new Email();
    482492        $body .= $email->add_review_request_in_email();

  • auto-install-free-ssl/trunk/FreeSSLAuto/src/Admin/GenerateSSLmanually.php

    r2852521 r2868890  
    179179
    180180                    echo '<h1 style="color: #076507; text-align: center;">' . $heading . '</h1>';
    181                     echo '<h3 style="color: #076507; text-align: center;">for ' . aifs_get_domain() . '</h3>';
     181                    echo '<h3 style="color: #076507; text-align: center;">' . __( "for", 'auto-install-free-ssl' ) . " " . aifs_get_domain() . '</h3>';
    182182
    183183                    $aifs_current_step_number = 0;
    … …  
    248248                            <?php if($this->factory->control_panel_is_unknown()){ ?>
    249249                                <h3 style="line-height: 2em;"><?= __( "Please log in to your web hosting control panel to install the SSL certificate", 'auto-install-free-ssl' ) ?></h3>
    250                                 <p><?= __( "Most web hosting companies provide an option to install SSL certificates. Please contact your web hosting provider if you are not aware of this option.", 'auto-install-free-ssl' ) ?></p>
     250                                <p><?= __( "Most web hosting companies provide an option to install SSL certificates. Please contact your web hosting provider if you are unaware of this option.", 'auto-install-free-ssl' ) ?></p>
    251251                            <?php } ?>
    252252
    253                             <p><?= __( "Did you know automated SSL Certificate installation is possible with our Premium Version?" ) ?></p>
     253                            <p><?= __( "Did you know that automated SSL Certificate installation is possible with our Premium Version?" ) ?></p>
    254254                            <p><?= sprintf(__( "Do you need automation for all the steps? %sUpgrade to the %sPremium Version%s.", 'auto-install-free-ssl' ), '<br />', '<a href="'. aifssl_fs()->get_upgrade_url(WP_FS__PERIOD_ANNUALLY) .'">', '</a>') ?></p>
    255255
    … …  
    295295                <tr>
    296296                    <td class="card block-body" style="width: 100%; padding: 0.5% 1.5% 0.5% 1.5%; background-color: #adff2f;" colspan="2">
    297                         <p style="color: black; font-size: 1.2em;"><?= sprintf(__("Hello %s! Why waste your valuable time with manual SSL renewal every 60 days? Enjoy %s automation with our PRO version.", 'auto-install-free-ssl'), aifs_admin_first_name(), ($this->factory->is_cpanel()? "100%" : "")) ?></p>
     297                        <p style="color: black; font-size: 1.2em;"><?= sprintf(__("Hello %s! Enjoy %s automation with our PRO version. Why waste your valuable time with manual SSL renewal every 60 days?", 'auto-install-free-ssl'), aifs_admin_first_name(), ($this->factory->is_cpanel()? "100%" : "")) ?></p>
    298298                    </td>
    299299                </tr>
    300300                <tr>
    301301                    <td class="card block-body" style="width: 50%; padding-left: 1.5%;">
    302                         <h3><?= __( "Comparison of Free vs Pro Version", 'auto-install-free-ssl' ) ?></h3>
     302                        <h3><?= __( "Comparison of Free vs. Pro Version", 'auto-install-free-ssl' ) ?></h3>
    303303                        <p style="color: green;">&nbsp;</p>
    304304                        <table style="width: 100%; margin-top: 2%;" border="1" cellspacing="0">
    … …  
    376376                                    <td><?= __( "Support", 'auto-install-free-ssl' ) ?></td>
    377377                                    <td><?= __( "Forum", 'auto-install-free-ssl' ) ?></td>
    378                                     <td class="pro-version"><?= __( "E-mail", 'auto-install-free-ssl' ) ?></td>
    379                                     <td class="pro-version"><?= __( "E-mail/Phone", 'auto-install-free-ssl' ) ?></td>
     378                                    <td class="pro-version"><?= __( "Email", 'auto-install-free-ssl' ) ?></td>
     379                                    <td class="pro-version"><?= __( "Email/Phone", 'auto-install-free-ssl' ) ?></td>
    380380                                </tr>
    381381                            </tbody>
    … …  
    590590                //Start the process to generate SSL
    591591                $this->logger->log( sprintf(__("Generating SSL for %s", 'auto-install-free-ssl'), $domains_array[0]) );
    592                 $this->logger->log( __( "Domains array given below: ", 'auto-install-free-ssl' ));
     592                $this->logger->log( __( "The domains array is given below: ", 'auto-install-free-ssl' ));
    593593
    594594                if ( $this->logger->is_cli() ) {
    … …  
    673673            <hr /><br />
    674674
    675             <p><strong><?= __( "1.", 'auto-install-free-ssl' ) ?></strong> <?= __( "Please open an FTP client (e.g. FileZilla) or File Manager of your web hosting control panel.", 'auto-install-free-ssl' ) ?></p>
    676 
    677             <p><strong><?= __( "2.", 'auto-install-free-ssl' ) ?></strong> <?= sprintf(__("Browse to the document root of %s. Create a directory %s and create another directory %s inside the %s directory.", 'auto-install-free-ssl'), ('<em>' . key($return_array_step1['domain_data']) . '</em>'), '<strong>.well-known</strong>', '<strong>acme-challenge</strong>', '<strong>.well-known</strong>') ?><?= aifs_server_software() == 'ms-iis' ? " " . __( "If you face any issues (e.g., 'Invalid path specified') creating directories, create 'Virtual Directory' instead.", 'auto-install-free-ssl' ) : "" ?></p>
     675            <p><strong><?= __( "1.", 'auto-install-free-ssl' ) ?></strong> <?= __( "Please open an FTP client (e.g., FileZilla) or File Manager of your web hosting control panel.", 'auto-install-free-ssl' ) ?></p>
     676
     677            <p><strong><?= __( "2.", 'auto-install-free-ssl' ) ?></strong> <?= sprintf(__("Browse to the document root of %s. Create a directory %s and another directory %s inside the %s directory.", 'auto-install-free-ssl'), ('<em>' . key($return_array_step1['domain_data']) . '</em>'), '<strong>.well-known</strong>', '<strong>acme-challenge</strong>', '<strong>.well-known</strong>') ?><?= aifs_server_software() == 'ms-iis' ? " " . __( "If you face any issues (e.g., 'Invalid path specified') creating directories, create 'Virtual Directory' instead.", 'auto-install-free-ssl' ) : "" ?></p>
    678678
    679679            <p><strong><?= __( "3.", 'auto-install-free-ssl' ) ?></strong> <?= __( "Download the following HTTP-01 challenge files:", 'auto-install-free-ssl' ) ?></p>
    … …  
    708708            </div>
    709709
    710             <p><strong><?= __( "4.", 'auto-install-free-ssl' ) ?></strong> <?= __( "Upload the above-downloaded challenge files into the 'acme-challenge' directory (mentioned in serial number 2).", 'auto-install-free-ssl' ) ?><?= aifs_server_software() == 'ms-iis' ? " " . __( "If you face any issues uploading files, create files with the same file name and content.", 'auto-install-free-ssl' ) : "" ?></p>
     710            <p><strong><?= __( "4.", 'auto-install-free-ssl' ) ?></strong> <?= sprintf(__( "Upload the above-downloaded challenge files into the %s directory (mentioned in serial number 2).", 'auto-install-free-ssl' ), "'acme-challenge'") ?><?= aifs_server_software() == 'ms-iis' ? " " . __( "If you face any issues uploading files, create files with the same file name and content.", 'auto-install-free-ssl' ) : "" ?></p>
    711711
    712712            <!-- Use foreach to avoid blank link -->
    … …  
    757757            ?>
    758758            <span style="font-size: large; font-weight: bold;"><?= __( "DNS-01", 'auto-install-free-ssl' ) ?></span><hr /><br />
    759             <p><strong><?= __( "1.", 'auto-install-free-ssl' ) ?></strong> <?= __( "Please log in to your DNS service provider's account for", 'auto-install-free-ssl' ) ?> <strong><em><?= $registeredDomain ?></em></strong> <?= __( "and add the TXT records given below:", 'auto-install-free-ssl' ) ?></p>
     759            <p><strong><?= __( "1.", 'auto-install-free-ssl' ) ?></strong> <?= sprintf(__( "Please log in to your DNS service provider's account, for %s, and add the TXT records given below:", 'auto-install-free-ssl' ), "<strong><em>$registeredDomain</em></strong>") ?></p>
    760760            <?php
    761761            $set_no = "A";
    … …  
    770770            ?>
    771771
    772             <p><br /><?= sprintf(__("TTL (Time to Live) for both: %s1 second%s recommended. Otherwise, the minimum value supported by your DNS service provider.", 'auto-install-free-ssl'), '<strong>', '</strong>') ?></p>
    773 
    774             <p><br /><strong><?= __( "2.", 'auto-install-free-ssl' ) ?></strong> <?= sprintf(__("Please wait %sat least%s 15 minutes for the above-mentioned DNS records to propagate and then %sclick the button below.", 'auto-install-free-ssl'), '<strong>', '</strong>', '<em>') ?></em></p>
     772            <p><br /><?= sprintf(__("TTL (Time to Live) for both: %s1 minute%s recommended. Otherwise, the minimum value supported by your DNS service provider.", 'auto-install-free-ssl'), '<strong>', '</strong>') ?></p>
     773
     774            <p><br /><strong><?= __( "2.", 'auto-install-free-ssl' ) ?></strong> <?= sprintf(__("Please wait %sat least%s 15 minutes for the above DNS records to propagate and %sclick the button below%s.", 'auto-install-free-ssl'), '<strong>', '</strong>', '<em>', '</em>') ?></p>
    775775
    776776
    … …  
    806806                wp_nonce_field('aifsverifydomain', 'aifs_verify_domain', false, false);
    807807
    808         $confirmation_text = sprintf(__("Are you sure you have completed %s challenges?", 'auto-install-free-ssl'), strtoupper($challenge_type));
     808        $confirmation_text = sprintf(__("Are you sure you have completed the %s challenges?", 'auto-install-free-ssl'), strtoupper($challenge_type));
    809809
    810810        //$button_text = __( 'Verify Domain &amp; Get SSL', 'auto-install-free-ssl' );
    811         $button_text = sprintf( __( "Verify Domain %s &amp; Generate Free SSL", 'auto-install-free-ssl' ), "(".strtoupper($challenge_type).")");
     811        $button_text = sprintf( __( "Verify Domain %s Generate Free SSL", 'auto-install-free-ssl' ), "(".strtoupper($challenge_type).") &amp;");
    812812        $css_class = "button button-primary button-hero";
    813813
    … …  
    916916                                }
    917917                                $error_text .= "<span style='color: red;'>";
    918                                 $error_text .= __("Domain: ", 'auto-install-free-ssl') . $domain . "    ";
    919                                 $error_text .= __("Oops! We could not verify HTTP-01 challenges. Please check whether the uploaded HTTP challenge files are publicly accessible. Some hosts purposefully block BOT access to the acme-challenge folder, then please try DNS-based verification. ", 'auto-install-free-ssl');
     918                                $error_text .= __("Domain", 'auto-install-free-ssl') . ": " . $domain . "    ";
     919                                $error_text .= __("Oops! We could not verify HTTP-01 challenges. Please check whether the uploaded HTTP challenge files are publicly accessible. Some hosts purposefully block BOT access to the acme-challenge folder, then please try DNS-based verification.", 'auto-install-free-ssl') . " ";
    920920                                $error_text .= "</span>";
    921921                                /*$error_text .= "<span style='color: green;'>";
    … …  
    935935                                }
    936936                                $error_text .= "<span style='color: red;'>";
    937                                 $error_text .= __("Domain: ", 'auto-install-free-ssl') . $domain . "    ";
    938                                 $error_text .= __("Oops! We could not verify DNS records. Please check whether you have added the DNS records perfectly. Did you add DNS records just now? Please try again after 15 minutes. ", 'auto-install-free-ssl');
     937                                $error_text .= __("Domain", 'auto-install-free-ssl') . ": " . $domain . "    ";
     938                                $error_text .= __("Oops! We could not verify DNS records. Please check whether you have added the DNS records correctly. Did you add DNS records just now? Please try again after 15 minutes.", 'auto-install-free-ssl') . " ";
    939939                                $error_text .= "</span>";
    940940                                /*$error_text .= "<span style='color: green;'>";
    … …  
    10101010                        echo $this->progress_bar(3);
    10111011                        //return false;
    1012                         echo "<h3 style='color: red'>". sprintf(__("Sorry, SSL certificate was NOT issued to %s due to an error. Please check the log for details.", 'auto-install-free-ssl'), ("<em>" . $this->return_array_step1['domains_array'][0] . "</em>")) ."</h3>";
     1012                        echo "<h3 style='color: red'>". sprintf(__("Sorry, the SSL certificate was NOT issued to %s due to an error. Please check the log for details.", 'auto-install-free-ssl'), ("<em>" . $this->return_array_step1['domains_array'][0] . "</em>")) ."</h3>";
    10131013                    }
    10141014
    … …  
    10161016                    //SSL certificate can't be issued
    10171017                    echo $this->progress_bar(3);
    1018                     $text = "Number of authorizations: " .count( $this->return_array_step1['response']['authorizations'] ) .". But number of validated domains: ".$number_of_validated_domains .". ";
    1019                     $text .= __( "Sorry, SSL certificate can't be issued to", 'auto-install-free-ssl' ) . " " . $this->return_array_step1['domains_array'][0] . '. ' . ( \count( $this->return_array_step1['response']['authorizations'] ) - $number_of_validated_domains ) . " " . __( "domains was not validated.", 'auto-install-free-ssl' );
     1018                    $text = sprintf(__("The number of authorizations: %s. But the number of validated domains: %s. Sorry, the SSL certificate can't be issued to %s. %s domain was not validated.", 'auto-install-free-ssl'), count( $this->return_array_step1['response']['authorizations'] ), $number_of_validated_domains, $this->return_array_step1['domains_array'][0], ( \count( $this->return_array_step1['response']['authorizations'] ) - $number_of_validated_domains ));
     1019
    10201020                    $this->logger->log_v2( 'error', $text );
    10211021
    … …  
    10671067        $initiate = __( "Initiate", 'auto-install-free-ssl' );
    10681068        $verify = __( "Verify Domain", 'auto-install-free-ssl' );
    1069         $download = __( "Download &amp; Install SSL", 'auto-install-free-ssl' );
     1069        $download = __( "Download & Install SSL", 'auto-install-free-ssl' );
    10701070
    10711071        $html = ' <div class="prcontainer">
    … …  
    11051105                wp_nonce_field('aifsregeneratessl', 'aifs_regenerate_ssl', false, false);
    11061106
    1107         $confirmation_text = __("You need to manually complete every steps again. Will you proceed?", 'auto-install-free-ssl');
    1108 
    1109         $button_text = is_null($button_text) ? __( 'Re-generate (renew) SSL', 'auto-install-free-ssl' ) : $button_text;
     1107        $confirmation_text = __("You need to complete every step again manually. Will you proceed?", 'auto-install-free-ssl');
     1108
     1109        $button_text = is_null($button_text) ? __( "Re-generate (renew) SSL", 'auto-install-free-ssl' ) : $button_text;
    11101110
    11111111        if($button_small) {

  • auto-install-free-ssl/trunk/FreeSSLAuto/src/Admin/HomeOptions.php

    r2835481 r2868890  
    120120              $expiry_date = $date->format('Y-m-d H:i:s') . ' ' . date_default_timezone_get();*/
    121121            $exp = ( function_exists( 'wp_date' ) ? wp_date( 'F j, Y - h:i:s A', $cert_array['validTo_time_t'] ) : date( 'F j, Y - h:i:s A', $cert_array['validTo_time_t'] ) . " " . __( "UTC", 'auto-install-free-ssl' ) );
    122             $expiry_date = str_replace( '-', 'at', $exp );
     122            $expiry_date = str_replace( '-', __( "at", 'auto-install-free-ssl' ), $exp );
    123123            $issuerShort = $cert_array['issuer']['O'];
    124124            //$subjectAltName = str_replace('DNS:', '', $cert_array['extensions']['subjectAltName']);
    … …  
    131131            if ( aifs_is_free_version() ) {
    132132                $text_display .= '<br /><strong><s>' . sprintf( __( "This plugin will renew & install the SSL automatically %s days before the expiry.", 'auto-install-free-ssl' ), 30 ) . '</s></strong>';
    133                 $text_display .= '<br /><div class="aifs-premium"><span class="dashicons dashicons-arrow-up-alt"></span> ' . sprintf( __( "Upgrade to %sPremium Version%s to avail this.", 'auto-install-free-ssl' ), '<a href="' . admin_url( 'admin.php?page=auto_install_free_ssl-pricing' ) . '">', '</a>' ) . ' <span class="dashicons dashicons-arrow-up-alt"></span></div>';
     133                $text_display .= '<br /><div class="aifs-premium"><span class="dashicons dashicons-arrow-up-alt"></span> ' . sprintf( __( "Upgrade to %sPremium Version%s to avail of this.", 'auto-install-free-ssl' ), '<a href="' . admin_url( 'admin.php?page=auto_install_free_ssl-pricing' ) . '">', '</a>' ) . ' <span class="dashicons dashicons-arrow-up-alt"></span></div>';
    134134            }
    135135           
    … …  
    148148           
    149149            if ( aifs_is_free_version() && !get_option( 'aifs_force_ssl' ) ) {
    150                 $text_display .= __( "After installing the SSL certificate, don't forget to", 'auto-install-free-ssl' ) . " ";
    151                 $text_display .= "<a href='#force-https'>" . __( "Activate Force HTTPS", 'auto-install-free-ssl' ) . "</a>";
     150                $text_display .= sprintf( __( "After installing the SSL certificate, don't forget to %sActivate Force HTTPS%s", 'auto-install-free-ssl' ), '<a href="#force-https">', '</a>' );
    152151                $text_display .= "<hr />";
    153152            }
    … …  
    244243       
    245244        if ( !isset( $response['response']['code'] ) || $response['response']['code'] != 200 ) {
    246             $tos_text = __( "By clicking the '%s' button you acknowledge that you agree with FreeSSL.tech %s & %s.", 'auto-install-free-ssl' );
     245            $tos_text = __( "By clicking the '%s' button, you acknowledge that you agree with FreeSSL.tech %s & %s.", 'auto-install-free-ssl' );
    247246            $fs_tos = '<a href="https://freessl.tech/terms-of-service" target="_blank">' . __( "Terms of Service", 'auto-install-free-ssl' ) . '</a>';
    248247            $fs_pp = '<a href="https://freessl.tech/privacy-policy" target="_blank">' . __( "Privacy Policy", 'auto-install-free-ssl' ) . '</a>';
    … …  
    359358            $multisite_support_single_domain = __( "Yes", 'auto-install-free-ssl' );
    360359        } else {
    361             $intro_text .= sprintf( __( "you have cPanel! %s automation is possible with premium!!", 'auto-install-free-ssl' ), '100%' ) . " ";
     360            $intro_text .= __( "you have cPanel! 100% automation is possible with premium!!", 'auto-install-free-ssl' ) . " ";
    362361            $intro_text .= '<span style="color: #77c401;">' . __( "Otherwise, we'll issue you a full refund.", 'auto-install-free-ssl' ) . '</span>';
    363362            $time_required = __( "1 Min (once)", 'auto-install-free-ssl' );
    364363            $time_required_unlimited_license = __( "1 Min (once)", 'auto-install-free-ssl' );
    365             $time_required_more_info_unlimited_license = sprintf( __( "If you need the plugin to work on all websites in the same %s, you need %s minutes (once).", 'auto-install-free-ssl' ), ( isset( $app_settings['is_cpanel'] ) && $app_settings['is_cpanel'] ? 'cPanel' : 'hosting' ), ( isset( $app_settings['is_cpanel'] ) && $app_settings['is_cpanel'] ? '9' : '10' ) );
     364            $time_required_more_info_unlimited_license = sprintf( __( "If you need the plugin to work on all websites in the same %s, you need %s minutes (once).", 'auto-install-free-ssl' ), ( isset( $app_settings['is_cpanel'] ) && $app_settings['is_cpanel'] ? __( "cPanel", 'auto-install-free-ssl' ) : __( "hosting", 'auto-install-free-ssl' ) ), ( isset( $app_settings['is_cpanel'] ) && $app_settings['is_cpanel'] ? __( "9", 'auto-install-free-ssl' ) : __( "10", 'auto-install-free-ssl' ) ) );
    366365            $wildcard_ssl_single_domain = __( "No", 'auto-install-free-ssl' );
    367366            $multisite_support_single_domain = __( "No", 'auto-install-free-ssl' );
    … …  
    549548            echo  __( "Yes", 'auto-install-free-ssl' ) ;
    550549            ?> <a title="<?php
    551             echo  __( "Please contact us after purchase. After reviewing your web hosting environment, we'll choose the best option (Bash script or Cloudflare CDN) and implement the automation.", 'auto-install-free-ssl' ) ;
     550            echo  __( "Please get in touch with us after purchase. After reviewing your web hosting environment, we'll choose the best option (Bash script or Cloudflare CDN) and implement the automation.", 'auto-install-free-ssl' ) ;
    552551            ?>">[?]</a>
    553552                      </td>
    … …  
    556555            echo  __( "Yes", 'auto-install-free-ssl' ) ;
    557556            ?> <a title="<?php
    558             echo  __( "Please contact us after purchase. After reviewing your web hosting environment, we'll choose the best option (Bash script or Cloudflare CDN) and implement the automation.", 'auto-install-free-ssl' ) ;
     557            echo  __( "Please get in touch with us after purchase. After reviewing your web hosting environment, we'll choose the best option (Bash script or Cloudflare CDN) and implement the automation.", 'auto-install-free-ssl' ) ;
    559558            ?>">[?]</a>
    560559                      </td>
    … …  
    635634        echo  __( "High", 'auto-install-free-ssl' ) ;
    636635        ?> <a title="<?php
    637         echo  __( "Manually renewing SSL every 60 days is a tiresome job and difficult to remember", 'auto-install-free-ssl' ) ;
     636        echo  __( "Manually renewing SSL every 60 days is tiresome and challenging to remember", 'auto-install-free-ssl' ) ;
    638637        ?>">[?]</a>
    639638                  </td>
    … …  
    642641        echo  __( "No", 'auto-install-free-ssl' ) ;
    643642        ?> <!-- <a title="<?php
    644         echo  __( "Because renewal is automated", 'auto-install-free-ssl' ) ;
     643        echo  __( "Because the renewal is automated", 'auto-install-free-ssl' ) ;
    645644        ?>">[?]</a> -->
    646645                  </td>
    … …  
    649648        echo  __( "No", 'auto-install-free-ssl' ) ;
    650649        ?> <!-- <a title="<?php
    651         echo  __( "Because renewal is automated", 'auto-install-free-ssl' ) ;
     650        echo  __( "Because the renewal is automated", 'auto-install-free-ssl' ) ;
    652651        ?>">[?]</a> -->
    653652                  </td>
    … …  
    660659                    <tr>
    661660                      <td><span class="ptable-title"><?php
    662             echo  sprintf( __( "One installation works on all websites of a %s", 'auto-install-free-ssl' ), ( isset( $app_settings['is_cpanel'] ) && $app_settings['is_cpanel'] ? "cPanel" : "hosting" ) ) ;
     661            echo  sprintf( __( "One installation works on all websites of a %s", 'auto-install-free-ssl' ), ( isset( $app_settings['is_cpanel'] ) && $app_settings['is_cpanel'] ? __( "cPanel", 'auto-install-free-ssl' ) : __( "hosting", 'auto-install-free-ssl' ) ) ) ;
    663662            ?></span></td>
    664663                      <td>
    … …  
    825824        echo  '<p>' . __( "If you missed downloading the Pro version of this plugin, you could download it using any of the following options", 'auto-install-free-ssl' ) . ':</p>' ;
    826825        echo  '<ol>' ;
    827         echo  '<li><a href="' . $premium_download_link . '">' . __( "Download from this link", 'auto-install-free-ssl' ) . '</a>.</li>' ;
     826        echo  '<li><a href="' . $premium_download_link . '">' . __( "Download from this link.", 'auto-install-free-ssl' ) . '</a></li>' ;
    828827        echo  '<li>' . sprintf( __( "Download from the %s Account page%s.", 'auto-install-free-ssl' ), '<a href="' . admin_url( 'admin.php?page=auto_install_free_ssl-account' ) . '">', '</a>' ) . '</li>' ;
    829828        echo  '<li>' . __( "Download from the email we sent you after the purchase.", 'auto-install-free-ssl' ) . '</li>' ;

  • auto-install-free-ssl/trunk/FreeSSLAuto/src/Admin/Log.php

    r2805084 r2868890  
    143143                                    }
    144144                                    else{
    145                                         echo "<br /><em>" . __( "No log available.", 'auto-install-free-ssl' ) . "</em>";
     145                                        echo "<br /><em>" . __( "No log is available.", 'auto-install-free-ssl' ) . "</em>";
    146146                                    }
    147147                                ?>

  • auto-install-free-ssl/trunk/FreeSSLAuto/src/Controller.php

    r2852521 r2868890  
    6262                $domains_array[] = $domain;
    6363            } else {
    64                 $this->logger->log( $domain . " is in your exclusion list, skipping it." );
     64                $this->logger->log( sprintf( __( "%s is in your exclusion list; skip it.", 'auto-install-free-ssl' ), $domain ) );
    6565            }
    6666       
    … …  
    8989                            $domains_online[] = $domain;
    9090                        } else {
    91                             $this->logger->log( "This server's IP is " . $_SERVER['SERVER_ADDR'] . ". But " . $domain . " points to different IP (" . $dns[0]['ip'] . "). So, skipping it." );
     91                            $this->logger->log( sprintf(
     92                                __( "This server's IP is %s. But %s points to different IP (%s). So, skipping it.", 'auto-install-free-ssl' ),
     93                                $_SERVER['SERVER_ADDR'],
     94                                $domain,
     95                                $dns[0]['ip']
     96                            ) );
    9297                        }
    9398                   
    … …  
    98103                } else {
    99104                    //domain offline
    100                     $this->logger->log( $domain . ' is offline. Skipping it.' );
     105                    $this->logger->log( sprintf( __( "%s is offline. Skipping it.", 'auto-install-free-ssl' ), $domain ) );
    101106                }
    102107           

  • auto-install-free-ssl/trunk/FreeSSLAuto/src/Email.php

    r2850591 r2868890  
    3636    private  $logger ;
    3737    public  $admin_email ;
     38    private  $factory ;
    3839    public function __construct()
    3940    {
    … …  
    4344        $this->logger = new Logger();
    4445        $this->admin_email = get_option( 'admin_email' );
     46        $this->factory = new Factory();
    4547    }
    4648   
    … …  
    6163        if ( $display_review != false && $display_review != 0 ) {
    6264            //If aifs_display_review is set to 1, add the review request
    63             $html = "<div style='background-color: #000000; padding: 15px; margin-bottom: 18px;'>\n                            <div style='color: #FFFF00; font-size: 1.25em; margin-bottom: 16px;'>\n                                " . __( 'Hey', 'auto-install-free-ssl' ) . ' ' . (( is_null( $admin_first_name ) ? aifs_admin_first_name() : $admin_first_name )) . ', <strong>' . AIFS_NAME . '</strong> ' . __( 'has saved your $$$ by providing Free SSL Certificates and will save more. Could you please do me a BIG favor and give it a 5-star rating on WordPress? To help me spread the word and boost my motivation.', 'auto-install-free-ssl' ) . " <br />~Anindya\n                            </div>\n                            <a style='background: #399642; color: #ffffff; text-decoration: none; padding: 7px 15px; border-radius: 5px;' href='https://wordpress.org/support/plugin/auto-install-free-ssl/reviews/#new-post' target='_blank'>Sure! You Deserve It.</a>\n                      </div>";
     65            $html = "<div style='background-color: #000000; padding: 15px; margin-bottom: 18px;'>\n                            <div style='color: #FFFF00; font-size: 1.25em; margin-bottom: 16px;'>\n                                " . __( "Hey", 'auto-install-free-ssl' ) . " " . (( is_null( $admin_first_name ) ? aifs_admin_first_name() : $admin_first_name )) . ", " . sprintf( __( "%s has saved you \$\$\$ by providing Free SSL Certificates and will save more. Please share your experience with us on WordPress (probably with a five-star rating). That will help spread the word and boost our motivation.", 'auto-install-free-ssl' ), '<strong>' . AIFS_NAME . '</strong>' ) . " <br />~Anindya\n                            </div>\n                            <a style='background: #399642; color: #ffffff; text-decoration: none; padding: 7px 15px; border-radius: 5px;' href='https://wordpress.org/support/plugin/auto-install-free-ssl/reviews/#new-post' target='_blank'>" . __( "Sure! You Deserve It.", 'auto-install-free-ssl' ) . "</a>\n                      </div>";
    6466        } else {
    6567            $html = "";
    … …  
    99101            if ( $interval <= 30 && $interval >= -12 && (!$last_reminder_timestamp || $interval_from_last_reminder >= 15) ) {
    100102                $exp = ( function_exists( 'wp_date' ) ? wp_date( 'F j, Y - h:i:s A', $expiry_timestamp ) : date( 'F j, Y - h:i:s A', $expiry_timestamp ) . " " . __( "UTC", 'auto-install-free-ssl' ) );
    101                 $expiry_date = str_replace( '-', 'at', $exp );
     103                $expiry_date = str_replace( '-', __( "at", 'auto-install-free-ssl' ), $exp );
    102104                $issuerShort = $cert_array['issuer']['O'];
    103105                $renew_url = admin_url( "admin.php?page=aifs_generate_ssl_manually" );
    104106                $renew_url = ( strpos( $renew_url, get_site_url() ) !== false ? $renew_url . "#ssl_renewal_form" : get_site_url() . "/wp-admin/admin.php?page=aifs_generate_ssl_manually#ssl_renewal_form" );
    105                 $discount_percentage = "10%";
     107                $discount_percentage = __( "10%", 'auto-install-free-ssl' );
    106108                $coupon_code = "10AutoInstallSSL";
    107109                if ( aifs_is_existing_user() ) {
    108110                   
    109111                    if ( time() < strtotime( "February 1, 2023" ) ) {
    110                         $discount_percentage = "30%";
     112                        $discount_percentage = __( "30%", 'auto-install-free-ssl' );
    111113                        $coupon_code = "30ThankYou";
    112114                    } elseif ( time() < strtotime( "February 1, 2024" ) ) {
    113                         $discount_percentage = "20%";
     115                        $discount_percentage = __( "20%", 'auto-install-free-ssl' );
    114116                        $coupon_code = "20ThankYou";
    115117                    }
    116118               
    117119                }
    118                 $subject = "Your SSL certificate for " . $cert_array['subject']['CN'] . " ";
    119120               
    120121                if ( $interval > 0 ) {
    121                     $subject .= sprintf( __( "is expiring in %s days", 'auto-install-free-ssl' ), $interval );
    122                 } else {
    123                     $subject .= "is EXPIRED! Renew urgently.";
     122                    $subject = sprintf( __( "Your SSL certificate, for %s, is expiring in %s days", 'auto-install-free-ssl' ), $cert_array['subject']['CN'], $interval );
     123                } else {
     124                    $subject = sprintf( __( "Your SSL certificate, for %s, is EXPIRED! Renew urgently.", 'auto-install-free-ssl' ), $cert_array['subject']['CN'] );
    124125                }
    125126               
    126127                //Email body
    127                 $body = "<html><body><p>Hello " . aifs_admin_first_name() . ",</p>";
     128                $body = "<html><body><p>" . __( "Hello", 'auto-install-free-ssl' ) . " " . aifs_admin_first_name() . ",</p>";
    128129               
    129130                if ( $interval > 0 ) {
    130                     $body .= "<p>" . sprintf( __( "Your SSL certificate for %s will expire in %s days.", 'auto-install-free-ssl' ), str_replace( 'DNS:', '', $cert_array['extensions']['subjectAltName'] ), $interval );
    131                 } else {
    132                     $body .= "<p>" . sprintf( __( "Your SSL certificate for %s is EXPIRED!", 'auto-install-free-ssl' ), str_replace( 'DNS:', '', $cert_array['extensions']['subjectAltName'] ) );
     131                    $body .= "<p>" . sprintf( __( "Your SSL certificate, for %s, will expire in %s days.", 'auto-install-free-ssl' ), str_replace( 'DNS:', '', $cert_array['extensions']['subjectAltName'] ), $interval );
     132                } else {
     133                    $body .= "<p>" . sprintf( __( "Your SSL certificate, for %s, is EXPIRED!", 'auto-install-free-ssl' ), str_replace( 'DNS:', '', $cert_array['extensions']['subjectAltName'] ) );
    133134                }
    134135               
    135136                $body .= " " . sprintf( __( "The expiry date is %s.", 'auto-install-free-ssl' ), $expiry_date ) . "</p>";
    136                 $body .= "<p style='color: red; font-size: 1.3em;'>" . sprintf( __( "If you don't renew the SSL certificate %s, your visitors will see a security warning in red and leave your website.", 'auto-install-free-ssl' ), ( $interval > 0 ? "before the expiry date" : "URGENTLY" ) ) . "</p>";
    137                 $body .= "<p>" . sprintf( __( "Validity of %s free SSL is 90 days. They recommend renewing 30 days before expiry.", 'auto-install-free-ssl' ), $issuerShort ) . "</p>";
     137                $body .= "<p style='color: red; font-size: 1.3em;'>" . sprintf( __( "If you don't renew the SSL certificate %s, your visitors will see a security warning in red and leave your website.", 'auto-install-free-ssl' ), ( $interval > 0 ? __( "before the expiry date", 'auto-install-free-ssl' ) : __( "URGENTLY", 'auto-install-free-ssl' ) ) ) . "</p>";
     138                $body .= "<p>" . sprintf( __( "The validity of %s free SSL is 90 days. They recommend renewing 30 days before expiry.", 'auto-install-free-ssl' ), $issuerShort ) . "</p>";
    138139                $body .= "<p>" . sprintf( __( "%sClick here%s to Renew your SSL today.", 'auto-install-free-ssl' ), '<a href="' . $renew_url . '">', '</a>' ) . "</p>";
    139140                $body .= "<p>" . sprintf(
    … …  
    173174                    //$email_db[$cert_array['subject']['CN']]['last_sent_timestamp'] = time();
    174175                    update_option( 'aifs_ssl_renewal_reminder_email_last_sent_timestamp', time() );
    175                     $this->logger->log( __( "SSL renewal reminder email has been sent successfully.", 'auto-install-free-ssl' ) );
     176                    $this->logger->log( __( "The SSL renewal reminder email has been sent successfully.", 'auto-install-free-ssl' ) );
    176177                } else {
    177178                    $this->logger->log( __( "Sorry, there was an issue sending the SSL renewal reminder email.", 'auto-install-free-ssl' ) );
    … …  
    194195    public function add_email_signature()
    195196    {
    196         $html = "This is a system generated email from your website.<br />\n        Do not reply to this automated email.<br /><br />\n        --------------<br />\n        Regards,<br />\n        Team <a href='https://freessl.tech/free-ssl-certificate-for-wordpress-website' target='_blank' style='font-weight: bold;'>" . AIFS_NAME . "</a><br />";
     197        $html = __( "This is a system-generated email from your website.", 'auto-install-free-ssl' ) . "<br />";
     198        $html .= __( "Do not reply to this automated email.", 'auto-install-free-ssl' ) . "<br /><br />";
     199        $html .= "--------------<br />";
     200        $html .= __( "Regards", 'auto-install-free-ssl' ) . ",<br />";
     201        $html .= __( "Team", 'auto-install-free-ssl' ) . " <a href='https://freessl.tech/free-ssl-certificate-for-wordpress-website' target='_blank' style='font-weight: bold;'>" . AIFS_NAME . "</a><br />";
    197202        //$html .= "Powered by <a href='https://getwww.me'>GetWWW.me</a> (Beautiful WordPress website design service) and <a href='https://speedify.tech/wordpress-website-speed-optimization-service'>SpeedUpWebsite.info</a> (WordPress website speed optimization service)<br />";
    198203        return $html;

  • auto-install-free-ssl/trunk/FreeSSLAuto/src/Logger.php

    r2803941 r2868890  
    8989            //throw new \RuntimeException("Can't create directory '$log_directory'. Please manually create this directory, set permission 0755 and try again.");
    9090            $this->exception_sse_friendly(
    91                 "Can't create directory '{$log_directory}'. Please manually create this directory, set permission 0755 and try again.",
     91                sprintf( __( "Can't create directory '%s'. Please manually create this directory, set permission 0755, and try again.", 'auto-install-free-ssl' ), $log_directory ),
    9292                __FILE__,
    9393                __LINE__,
    … …  
    131131    )
    132132    {
    133         $exp_text .= "\n\nFile: " . $file_name . "\nLine number: " . $line_number . "\n\n";
     133        $exp_text .= "\n\n" . __( "File:", 'auto-install-free-ssl' ) . " " . $file_name . "\n" . __( "Line number:", 'auto-install-free-ssl' ) . " " . $line_number . "\n\n";
    134134       
    135135        if ( $this->is_cli() ) {
    136136            if ( $write_in_log_file ) {
    137                 $this->write_log( 'error', current_time( 'mysql' ) . " [error] " . $exp_text . "\n\nConnection closed\n", [
     137                $this->write_log( 'error', current_time( 'mysql' ) . " [error] " . $exp_text . "\n\n" . __( "Connection closed", 'auto-install-free-ssl' ) . "\n", [
    138138                    'event' => 'exit',
    139139                ] );

  • auto-install-free-ssl/trunk/auto-install-free-ssl.php

    r2852521 r2868890  
    66 * Plugin Name: Auto-Install Free SSL
    77 * Plugin URI:  https://freessl.tech
    8  * Description: Generate & install Free SSL Certificate, activate force HTTPS redirect with one click, fix insecure links & mixed content warning and get the PADLOCK in the browser’s address bar.
    9  * Version:     3.3.0
     8 * Description: Generate & install Free SSL Certificates, activate force HTTPS redirect with one click to fix insecure links & mixed content warnings, and get automatic Renewal Reminders.
     9 * Version:     3.3.1
    1010 * Requires at least: 4.1
    1111 * Requires PHP:      5.6

  • auto-install-free-ssl/trunk/readme.txt

    r2852521 r2868890  
    1 === One-Click Free SSL Certificate Plugin for WordPress, HTTPS Redirect - Auto-Install Free SSL ===
     1=== Free SSL Certificate Plugin, HTTPS Redirect, Renewal Reminder – Auto-Install Free SSL ===
    22Contributors: speedify, freessl, freemius
    33Donate link: https://www.paypal.me/site4author
    44License: GPLv3
    55License URI: http://www.gnu.org/licenses/gpl-3.0.html
    6 Tags: free ssl,ssl certificate,free ssl certificate,https,force ssl
     6Tags: free ssl,free ssl certificate,ssl certificate,https,force ssl
    77Requires at least: 4.1
    88Tested up to: 6.1
    9 Stable tag: 3.3.0
     9Stable tag: 3.3.1
    1010Requires PHP: 5.6
    1111Development location: https://freessl.tech
    1212
    13 Generate & install Free SSL Certificate, one-click force HTTPS redirect, get the PADLOCK in the browser.
     13Generate & install Free SSL Certificates for WordPress, get the PADLOCK in the browser, and automatic Renewal Reminder.
    1414
    1515
    … …  
    2727
    2828
    29 `    280,500+ DOWNLOADS!!`
     29`    288,500+ DOWNLOADS!!`
    3030
    3131
    … …  
    335335== Changelog ==
    336336
     337= 3.3.1 =
     338* Fixed the issues with translation compatibility and made all the texts translation ready.
     339
    337340= 3.3.0 =
    338341* Refactored to fix a bug where a fatal error would be thrown in combination with plugin that uses usrflo/registered-domain-libs library.
Note: See TracChangeset for help on using the changeset viewer.