WordPress.org
Get WordPress

Plugin Directory

Changeset 3146091


Ignore:
Timestamp:
09/03/2024 05:07:14 PM (18 months ago)
Author:
dashamail
Message:

Update to v.1.0.6

Location:
dashamail/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • dashamail/trunk/README.txt

    r3146083 r3146091  
    77Tested up to: 6.6.1
    88Requires PHP: 7.4
    9 Stable tag: 1.0.6
     9Stable tag: 1.0.5
    1010License: GPLv2 or later
    1111License URI: https://www.gnu.org/licenses/gpl-2.0.html

  • dashamail/trunk/dashamail.php

    r3146083 r3146091  
    33 * Plugin Name:       DashaMail
    44 * Description:       Плагин интеграции с DashaMail
    5  * Version:           1.0.6
     5 * Version:           1.0.5
    66 * Requires at least: 6.2.2
    77 * Requires PHP:      7.4

  • dashamail/trunk/dshm_app/Infrastructure/dshm_SettingsPage.php

    r3146083 r3146091  
    6060    public function __construct() {
    6161        $apiKey = \get_option('dashamail_api_key');
    62 
    63         $url = ((!empty($_SERVER['HTTPS'])) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
    64         if (str_contains($url, 'wp-admin') && str_contains($url, 'dashamail_settings')) {
    65             $this->isApiKeyCorrect = dshm_DashaMailAPI::dshm_isApiKeyCorrect($apiKey);
    66         }
     62        $this->isApiKeyCorrect = dshm_DashaMailAPI::dshm_isApiKeyCorrect($apiKey);
    6763    }
    6864
    … …  
    161157    function dshm_TemplateApiKey( $args ){
    162158        $value = \get_option( $args[ 'name' ] );
    163         if (!$this->isApiKeyCorrect) {
    164             $this->isApiKeyCorrect = dshm_DashaMailAPI::dshm_isApiKeyCorrect($value);
    165         }
     159        $this->isApiKeyCorrect = dshm_DashaMailAPI::dshm_isApiKeyCorrect($value);
    166160        $isApiKeyCorrect = $this->isApiKeyCorrect?'valid':'invalid';
    167161
    … …  
    194188
    195189        $apiKey = \get_option('dashamail_api_key');
    196         if (!$this->isApiKeyCorrect) {
    197             $this->isApiKeyCorrect = dshm_DashaMailAPI::dshm_isApiKeyCorrect($apiKey);
    198         }
     190        $this->isApiKeyCorrect = dshm_DashaMailAPI::dshm_isApiKeyCorrect($apiKey);
    199191
    200192        $lists[] = ['name' => '-', 'id' => '0'];
    … …  
    284276
    285277    public function dshm_DashamailValidateAPI($input){
    286         if (!$this->isApiKeyCorrect) {
    287             $this->isApiKeyCorrect = dshm_DashaMailAPI::dshm_isApiKeyCorrect($input);
    288         }
    289         if (!$this->isApiKeyCorrect) {
     278        if (!dshm_DashaMailAPI::dshm_isApiKeyCorrect($input)) {
    290279            \add_settings_error(
    291280                self::$DSHM_ERROR_SLUG,
Note: See TracChangeset for help on using the changeset viewer.