diff --git a/src/base.cls.php b/src/base.cls.php index 590f151a3..8f371f305 100644 --- a/src/base.cls.php +++ b/src/base.cls.php @@ -265,7 +265,7 @@ class Base extends Root const O_CDN_ORI = 'cdn-ori'; const O_CDN_ORI_DIR = 'cdn-ori_dir'; const O_CDN_EXC = 'cdn-exc'; - const O_CDN_QUIC = 'cdn-quic'; + const O_CDN_QUIC = 'cdn-quic'; // No more a visible setting since v7 const O_CDN_CLOUDFLARE = 'cdn-cloudflare'; const O_CDN_CLOUDFLARE_EMAIL = 'cdn-cloudflare_email'; const O_CDN_CLOUDFLARE_KEY = 'cdn-cloudflare_key'; @@ -314,7 +314,6 @@ class Base extends Root self::O_CDN_ORI, self::O_CDN_ORI_DIR, self::O_CDN_EXC, - self::O_CDN_QUIC, self::O_CDN_CLOUDFLARE, self::O_CDN_CLOUDFLARE_EMAIL, self::O_CDN_CLOUDFLARE_KEY, diff --git a/src/lang.cls.php b/src/lang.cls.php index e1aa67359..6c8bf6cba 100644 --- a/src/lang.cls.php +++ b/src/lang.cls.php @@ -236,7 +236,6 @@ public static function title($id) self::O_MISC_HEARTBEAT_EDITOR => __('Editor Heartbeat', 'litespeed-cache'), self::O_MISC_HEARTBEAT_EDITOR_TTL => __('Editor Heartbeat TTL', 'litespeed-cache'), - self::O_CDN_QUIC => __('QUIC.cloud CDN', 'litespeed-cache'), self::O_CDN => __('Use CDN Mapping', 'litespeed-cache'), self::CDN_MAPPING_URL => __('CDN URL', 'litespeed-cache'), self::CDN_MAPPING_INC_IMG => __('Include Images', 'litespeed-cache'), diff --git a/tpl/cdn/qc.tpl.php b/tpl/cdn/qc.tpl.php index 5c4a2ec30..9da378b93 100644 --- a/tpl/cdn/qc.tpl.php +++ b/tpl/cdn/qc.tpl.php @@ -12,25 +12,7 @@ - - - - - - - - - -
- - title($id); ?> - - build_switch($id); ?> -
- - -
-
+

Here will show info html from QC carry-on.

form_end(); @@ -41,156 +23,43 @@ : My QUIC.cloud -maybe_extract_token(); - -$cloud_linked = Cloud::get_summary('is_linked'); -$setup_summary = Cdn_Setup::get_summary(); - -$cdn_setup_done_ts = 0; -if (!empty($setup_summary['cdn_setup_done_ts'])) { - $cdn_setup_done_ts = $setup_summary['cdn_setup_done_ts']; -} - -$has_setup_token = $__cdnsetup->has_cdn_setup_token(); - -if (!empty($setup_summary['cdn_setup_err'])) { - $cdn_setup_err = $setup_summary['cdn_setup_err']; -} - -$nameservers = array(); -$cname = $this->conf(Base::O_QC_CNAME); -if (!empty($setup_summary['cdn_setup_ts'])) { - $cdn_setup_ts = $setup_summary['cdn_setup_ts']; - - if ($this->conf(Base::O_QC_NAMESERVERS)) { - $nameservers = explode(',', $this->conf(Base::O_QC_NAMESERVERS)); - } -} else { - $cdn_setup_ts = 0; -} - -$curr_status = '' . __('Not running', 'litespeed-cache') . ''; -$apply_btn_txt = __('Run CDN Setup', 'litespeed-cache'); -$apply_btn_type = Cdn_Setup::TYPE_RUN; -$disabled = ''; -$dom = parse_url(home_url(), PHP_URL_HOST); - -if ($cdn_setup_done_ts) { - $curr_status = ' ' . __('Done', 'litespeed-cache'); - // wp_date requires WP v5.3+ - if (function_exists('wp_date')) { - $curr_status .= ' ' . sprintf(__('Completed at %s', 'litespeed-cache'), wp_date(get_option('date_format') . ' ' . get_option('time_format'), $cdn_setup_done_ts)) . ''; - } - $disabled = 'disabled'; -} else if (!$has_setup_token) { - $disabled = 'disabled'; -} else if (!empty($cdn_setup_err)) { - $curr_status = ' ' . __('Paused', 'litespeed-cache'); - $curr_status_subline = '

' . $cdn_setup_err . '

'; -} else if ($cdn_setup_ts > 0) { - if ($nameservers) { - $curr_status = ' ' . __('Verifying, waiting for nameservers to be updated.', 'litespeed-cache') . ' ' . __('Click the refresh button below to refresh status.', 'litespeed-cache'); - if (isset($setup_summary['cdn_verify_msg'])) { - $curr_status_subline = '

' . __('Last Verification Result', 'litespeed-cache') . ': ' . $setup_summary['cdn_verify_msg'] . '

'; - } - } elseif ($cname) { - $curr_status = ' ' . __('Verifying, waiting for cname to be updated.', 'litespeed-cache') . ' ' . __('Click the refresh button below to refresh status.', 'litespeed-cache'); - if (isset($setup_summary['cdn_verify_msg'])) { - $curr_status_subline = '

' . __('Last Verification Result', 'litespeed-cache') . ': ' . $setup_summary['cdn_verify_msg'] . '

'; - } - } else { - $curr_status = ' ' . __('In Progress', 'litespeed-cache'); - $curr_status_subline = '

' . __('You will receive an email upon status update.', 'litespeed-cache') . ' ' . __('This process may take several minutes.', 'litespeed-cache') . '

'; - } - $apply_btn_txt = __('Refresh CDN Setup Status', 'litespeed-cache'); - $apply_btn_type = Cdn_Setup::TYPE_STATUS; -} - -?> - + +

+ +

+ + + + + + + + + $cnt) { + echo ''; + } ?> + +
+ + + +
' . wp_kses_post($type) . '' . wp_kses_post($cnt) . '
-

- ' . __('Account is linked!', 'litespeed-cache') . ''; ?> + +

- ', - false, - 'litespeed-link-with-icon' - ); ?> + ', + __('Review DNS records', 'litespeed-cache') . ' ', false, 'litespeed-link-with-icon' ); ?>

+

+

- - ' . __('Ready to run CDN setup.', 'litespeed-cache') . ''; ?> - -

-
- -
- - -

- -

- -

- -

- - - - - - - -

- -

- - - - - - - - - $cnt) { - echo ''; - } ?> - -
- - - -
' . wp_kses_post($type) . '' . wp_kses_post($cnt) . '
- -

- -

-

- - ', - false, - 'litespeed-link-with-icon' - ); ?> -

-

- -

- @@ -220,93 +89,6 @@

- - -

- -

-
-

-

- - - - - -
- - - - - -

-

- - - -
- - - - - -

-
- - - - data-litespeed-cfm="" class="button litespeed-btn-danger "> - - -
-
- - - - - - - - -

- -

-

- -

-
    -
    2. -
    3. -
    4. -
  4. - - - -
    5. -
-

-

- -

- -

- \ No newline at end of file +

\ No newline at end of file