Skip to content

Commit 21449eb

Browse files
aristatharistath
committed
remaining tweaks
1 parent b29ecd0 commit 21449eb

4 files changed

Lines changed: 49 additions & 23 deletions

File tree

‎classes/admin/class-page.php‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@
1212
*/
1313
class Page {
1414

15+
/**
16+
* Whether the branding inline styles have been added.
17+
*
18+
* @var boolean
19+
*/
20+
protected static $branding_inline_styles_added = false;
21+
1522
/**
1623
* Constructor.
1724
*/
@@ -93,12 +100,21 @@ public function add_page() {
93100
$page_identifier = 'progress-planner';
94101

95102
\add_menu_page(
96-
'Progress Planner',
97-
'Progress Planner' . $this->get_notification_counter(),
103+
\progress_planner()->get_ui__branding()->get_admin_submenu_name(),
104+
\progress_planner()->get_ui__branding()->get_admin_menu_name() . $this->get_notification_counter(),
105+
'manage_options',
106+
$page_identifier,
107+
'__return_empty_string',
108+
\progress_planner()->get_ui__branding()->get_admin_menu_icon()
109+
);
110+
111+
\add_submenu_page(
112+
$page_identifier,
113+
\progress_planner()->get_ui__branding()->get_admin_submenu_name(),
114+
\progress_planner()->get_ui__branding()->get_admin_submenu_name() . $this->get_notification_counter(),
98115
'manage_options',
99116
$page_identifier,
100117
[ $this, 'render_page' ],
101-
'data:image/svg+xml;base64,PHN2ZyByb2xlPSJpbWciIGFyaWEtaGlkZGVuPSJ0cnVlIiBmb2N1c2FibGU9ImZhbHNlIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzNjggNTAwIj48cGF0aCBmaWxsPSIjMzgyOTZkIiBkPSJNMjE3LjQ2IDE3Mi45YzMuMjEuMTIgNS45NyAxLjc0IDcuNzMgNC4xNS0xLjg3LTEwLjI0LTEwLjY0LTE4LjE3LTIxLjQ4LTE4LjU2LTEyLjUyLS40NS0yMy4wMyA5LjMzLTIzLjQ4IDIxLjg1LS40NSAxMi41MiA5LjMzIDIzLjAzIDIxLjg1IDIzLjQ4IDkuNC4zNCAxNy42Ny01LjEgMjEuNC0xMy4xMy0xLjgzIDEuNTEtNC4xOCAyLjQyLTYuNzQgMi4zMy01LjU1LS4yLTkuODktNC44Ni05LjY5LTEwLjQxLjItNS41NSA0Ljg2LTkuODkgMTAuNDEtOS42OVpNMjQxLjUxIDMwNS44NGMuNTggMS45MiAxLjEzIDMuODYgMS43MyA1Ljc3IDE0LjA0IDQ0Ljk3IDMzLjk0IDg4Ljc1IDU2LjQyIDEyNC4yN2w2Ny43NS0xMzAuMDRoLTEyNS45Wk0yOTcuOTYgMjA1Ljk3YzEyLjEyLTQuNSAyMy41NC03LjE4IDMzLjY0LTguOTYtMjIuNTEtMjIuMjctNjEuMjQtMjcuMDYtNjEuNDctMjcuMDkgMS4yNyA2LjE3LjU4IDE1LjgtMi40NCAyNi40Ni0zLjMgMTEuNjYtOS4zOCAyNC41NC0xOC43IDM1LjQ4LTMuNDUgNC4wNi03LjM2IDcuODMtMTEuNzMgMTEuMTloLjA3di0uMDFjLjE2LjYyLjM4IDEuMi41OCAxLjc5IDIuNzQgOC4yNyA4LjYxIDEzLjc0IDE0LjkzIDE3LjE0IDYuNDggMy40OSAxMy4zNyA0LjgzIDE3LjY4IDQuODMgNi40IDAgMTEuODgtMy43OSAxNC40My05LjIyLjk3LTIuMDYgMS41NS00LjMzIDEuNTUtNi43NiAwLTMuODUtMS40Mi03LjM0LTMuNjktMTAuMS0xLjkyLTIuMzMtNC40Ni00LjA4LTcuMzktNS4wM2w0NC44Mi04LjY1Yy02LjYzLTYuMTItMTQuNzItMTEuNTktMjIuNzMtMTYuMjMtMS45Ny0xLjE0LTEuNjktNC4wNS40NS00Ljg0WiIvPjxwYXRoIGZpbGw9IiNmYWEzMTAiIGQ9Ik0yODEuMzcgNDU4LjM3Yy0yNS43OS0zOC44NC00OC42OC04OC4wNC02NC40NS0xMzguNTQtMS40NS00LjYzLTIuODMtOS4zMS00LjE3LTEzLjk5LTEuMTItMy45NC0yLjIyLTcuODgtMy4yNS0xMS44LTIuMDktNy45Mi05LjI4LTEzLjQ2LTE3LjQ4LTEzLjQ2aC0yNy45NWMtOC4yIDAtMTUuMzkgNS41My0xNy40OCAxMy40NS0yLjI4IDguNjUtNC43OCAxNy4zMi03LjQyIDI1Ljc5LTE1Ljc3IDUwLjUtMzguNjUgOTkuNy02NC40NSAxMzguNTQtNC4wMSA2LjAzLTEuNzggMTEuNjMtLjY0IDEzLjc2IDIuNCA0LjQ3IDYuODYgNy4xNCAxMS45NCA3LjE0aDY2LjAxbDMuOTcgNi45MmM0LjU0IDcuOSAxMi45OSAxMi44MSAyMi4wNSAxMi44MXMxNy41MS00LjkxIDIyLjA2LTEyLjgxbDMuOTgtNi45Mmg2NmMzLjIyIDAgNi4xOS0xLjA4IDguNTUtMy4wMiAxLjM1LTEuMTEgMi41MS0yLjQ5IDMuMzgtNC4xMy41Ny0xLjA3IDEuNDItMy4wMiAxLjYxLTUuNDYuMTktMi40MS0uMjYtNS4zMS0yLjI1LTguMzFaIi8+PHBhdGggZmlsbD0iIzM4Mjk2ZCIgZD0iTTI5NS43IDc2LjA2Yy03LjU0LTEyLjA1LTMyLjM4IDEtNTkuNTQgMi44Ni0xNS4wNCAxLjAzLTM3LjA1LTExMC42My03MS43Ny01Ni45OS0zOS41NiA2MS4xLTc5LjEyLTQ0LjY4LTg4LjY2LTE1LjgzLTIxLjExIDQzLjI3IDI1LjE1IDg0LjYxIDI1LjE1IDg0LjYxcy0xMi44NCA3LjkyLTIwLjYzIDEzLjkzYy01LjQ3IDQuMTctMTAuODIgOC42NS0xNi4wMyAxMy41MS0yMC40NSAxOS4wMy0zNi4wNCA0MC4zMi00Ni43NyA2My44NkM2LjcyIDIwNS41NSAxLjExIDIyOS41OS42MiAyNTQuMTVjLS40OSAyNC41NiA0LjAxIDQ5LjEgMTMuNTQgNzMuNjMgOS41MiAyNC41MyAyNC4xNyA0Ny40MiA0My45NSA2OC42OCA0LjAyIDQuMzIgOC4xMiA4LjQxIDEyLjMxIDEyLjMgNC4xLTYuMzEgNy45Ny0xMi43NCAxMS42NC0xOS4yNiA0LjM5LTcuOCA4LjUtMTUuNzIgMTIuMjUtMjMuNzgtLjMzLS4zNS0uNjYtLjY5LS45OS0xLjAzLS4xNy0uMTgtLjM0LS4zNS0uNTEtLjUzLTE1LjUzLTE2LjY5LTI3LjE3LTM0LjU5LTM0LjkzLTUzLjcyLTcuNzctMTkuMTMtMTEuNS0zOC4yNS0xMS4yLTU3LjM2LjI5LTE5LjEgNC40Ny0zNy42OCAxMi41My01NS43MiA4LjA2LTE4LjA1IDIwLjAyLTM0LjQ1IDM1LjktNDkuMjIgMTMuOTktMTMuMDIgMjguODQtMjIuODMgNDQuNTUtMjkuNDEgMTUuNy02LjU5IDMxLjYzLTkuOTggNDcuNzYtMTAuMTggOS4wNS0uMTEgMTkuMTEgMS4xNSAyOS41MSA0LjUgMTAuMzIgNC4yNyAxOS4yMiA5LjQ0IDI2LjYzIDE1LjM1IDEwLjE5IDguMTMgMTcuNjEgMTcuNjUgMjIuMjIgMjguMSAxLjkxIDQuMzIgMy4zNyA4LjggNC4zMiAxMy40MSAxNi4yNy0yOC4yNyAzNi43NS03NS45NiAyNS41Ny05My44M1oiLz48L3N2Zz4='
102118
);
103119

104120
// Wipe notification bits from hooks.
@@ -279,6 +295,10 @@ public function enqueue_styles() {
279295
}
280296

281297
\progress_planner()->get_admin__enqueue()->enqueue_style( 'progress-planner/admin' );
298+
if ( ! static::$branding_inline_styles_added ) {
299+
\wp_add_inline_style( 'progress-planner/admin', \progress_planner()->get_ui__branding()->get_custom_css() );
300+
static::$branding_inline_styles_added = true;
301+
}
282302
\progress_planner()->get_admin__enqueue()->enqueue_style( 'progress-planner/web-components/prpl-tooltip' );
283303
\progress_planner()->get_admin__enqueue()->enqueue_style( 'progress-planner/web-components/prpl-install-plugin' );
284304

‎classes/admin/widgets/class-whats-new.php‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@
1414
*/
1515
final class Whats_New extends Widget {
1616

17-
/**
18-
* The cache key.
19-
*
20-
* @var string
21-
*/
22-
const CACHE_KEY = 'blog_feed';
23-
2417
/**
2518
* The widget ID.
2619
*
@@ -34,13 +27,13 @@ final class Whats_New extends Widget {
3427
* @return array
3528
*/
3629
public function get_blog_feed() {
37-
$feed_data = \progress_planner()->get_utils__cache()->get( self::CACHE_KEY );
30+
$feed_data = \progress_planner()->get_utils__cache()->get( $this->get_cache_key() );
3831

3932
// Migrate old feed to new format.
4033
if ( \is_array( $feed_data ) && ! isset( $feed_data['expires'] ) && ! isset( $feed_data['feed'] ) ) {
4134
$feed_data = [
4235
'feed' => $feed_data,
43-
'expires' => \get_option( '_transient_timeout_' . Cache::CACHE_PREFIX . self::CACHE_KEY, 0 ),
36+
'expires' => \get_option( '_transient_timeout_' . Cache::CACHE_PREFIX . $this->get_cache_key(), 0 ),
4437
];
4538
}
4639

@@ -55,7 +48,7 @@ public function get_blog_feed() {
5548
// Transient expired, fetch new feed.
5649
if ( $feed_data['expires'] < \time() ) {
5750
// Get the feed using the REST API.
58-
$response = \wp_remote_get( \progress_planner()->get_remote_server_root_url() . '/wp-json/wp/v2/posts/?per_page=2' );
51+
$response = \wp_remote_get( \progress_planner()->get_ui__branding()->get_blog_feed_url() . '/wp-json/wp/v2/posts/?per_page=2' );
5952

6053
if ( 200 !== \wp_remote_retrieve_response_code( $response ) ) {
6154
// If we cant fetch the feed, we will try again later.
@@ -82,9 +75,18 @@ public function get_blog_feed() {
8275
}
8376

8477
// Transient uses 'expires' key to determine if it's expired.
85-
\progress_planner()->get_utils__cache()->set( self::CACHE_KEY, $feed_data, 0 );
78+
\progress_planner()->get_utils__cache()->set( $this->get_cache_key(), $feed_data, 0 );
8679
}
8780

8881
return $feed_data['feed'];
8982
}
83+
84+
/**
85+
* Get the cache key.
86+
*
87+
* @return string
88+
*/
89+
public function get_cache_key() {
90+
return 'blog_feed_' . md5( \progress_planner()->get_ui__branding()->get_blog_feed_url() );
91+
}
9092
}

‎classes/suggested-tasks/providers/class-email-sending.php‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,6 @@ class Email_Sending extends Tasks_Interactive {
9696
*/
9797
protected $is_wp_mail_overridden = false;
9898

99-
/**
100-
* The troubleshooting guide URL.
101-
*
102-
* @var string
103-
*/
104-
protected $troubleshooting_guide_url = 'https://prpl.fyi/troubleshoot-smtp';
105-
10699
/**
107100
* Initialize the task provider.
108101
*
@@ -131,6 +124,15 @@ public function init() {
131124
);
132125
}
133126

127+
/**
128+
* Get the troubleshooting guide URL.
129+
*
130+
* @return string
131+
*/
132+
protected function get_troubleshooting_guide_url() {
133+
return \esc_url( \progress_planner()->get_ui__branding()->get_url( 'https://prpl.fyi/troubleshoot-smtp' ) );
134+
}
135+
134136
/**
135137
* We want task to be added always.
136138
*
@@ -208,7 +210,7 @@ public function enqueue_scripts( $hook ) {
208210
'ajax_url' => \admin_url( 'admin-ajax.php' ),
209211
'nonce' => \wp_create_nonce( 'progress_planner' ),
210212
'unknown_error' => \esc_html__( 'Unknown error', 'progress-planner' ),
211-
'troubleshooting_guide_url' => \progress_planner()->get_ui__branding()->get_url( $this->troubleshooting_guide_url ),
213+
'troubleshooting_guide_url' => $this->get_troubleshooting_guide_url(),
212214
],
213215
]
214216
);
@@ -300,7 +302,7 @@ public function the_popover_content() {
300302
'prpl_provider_id' => $this->get_provider_id(),
301303
'prpl_email_subject' => $this->email_subject,
302304
'prpl_email_error' => $this->email_error,
303-
'prpl_troubleshooting_guide_url' => \progress_planner()->get_ui__branding()->get_url( $this->troubleshooting_guide_url ),
305+
'prpl_troubleshooting_guide_url' => $this->get_troubleshooting_guide_url(),
304306
'prpl_is_there_sending_email_override' => $this->is_there_sending_email_override(),
305307
'prpl_task_actions' => $this->get_task_actions(),
306308
]

‎classes/utils/class-system-status.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@ public function get_system_status() {
140140
];
141141
}
142142

143+
$data['branding_id'] = (int) \progress_planner()->get_ui__branding()->get_branding_id();
144+
143145
return $data;
144146
}
145147
}

0 commit comments

Comments
 (0)