Skip to content

Commit 3e4ed83

Browse files
committed
REST-API response was modified
1 parent eee7dd1 commit 3e4ed83

1 file changed

Lines changed: 18 additions & 18 deletions

File tree

classes/ui/class-branding.php

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ public function get_api_data(): array {
8484
public function the_logo(): void {
8585
// Get the logo ID from the API data.
8686
if ( ! empty( $this->get_api_data() )
87-
&& isset( $this->get_api_data()['acf']['logo'] )
88-
&& ! empty( $this->get_api_data()['acf']['logo'] )
87+
&& isset( $this->get_api_data()['logo'] )
88+
&& ! empty( $this->get_api_data()['logo'] )
8989
) {
90-
$logo_id = $this->get_api_data()['acf']['logo'];
90+
$logo_id = $this->get_api_data()['logo'];
9191
// Get the logo URL.
9292
$response = $this->get_remote_data( \progress_planner()->get_remote_server_root_url() . '/wp-json/wp/v2/media/' . $logo_id );
9393
if ( $response ) {
@@ -108,7 +108,7 @@ public function the_logo(): void {
108108
* @return string
109109
*/
110110
public function get_custom_css(): string {
111-
return empty( $this->get_api_data() ) ? '' : $this->get_api_data()['acf']['custom_css'];
111+
return empty( $this->get_api_data() ) ? '' : $this->get_api_data()['custom_css'];
112112
}
113113

114114
/**
@@ -119,7 +119,7 @@ public function get_custom_css(): string {
119119
public function get_admin_menu_icon(): string {
120120
$icon = 'data:image/svg+xml;base64,PHN2ZyByb2xlPSJpbWciIGFyaWEtaGlkZGVuPSJ0cnVlIiBmb2N1c2FibGU9ImZhbHNlIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzNjggNTAwIj48cGF0aCBmaWxsPSIjMzgyOTZkIiBkPSJNMjE3LjQ2IDE3Mi45YzMuMjEuMTIgNS45NyAxLjc0IDcuNzMgNC4xNS0xLjg3LTEwLjI0LTEwLjY0LTE4LjE3LTIxLjQ4LTE4LjU2LTEyLjUyLS40NS0yMy4wMyA5LjMzLTIzLjQ4IDIxLjg1LS40NSAxMi41MiA5LjMzIDIzLjAzIDIxLjg1IDIzLjQ4IDkuNC4zNCAxNy42Ny01LjEgMjEuNC0xMy4xMy0xLjgzIDEuNTEtNC4xOCAyLjQyLTYuNzQgMi4zMy01LjU1LS4yLTkuODktNC44Ni05LjY5LTEwLjQxLjItNS41NSA0Ljg2LTkuODkgMTAuNDEtOS42OVpNMjQxLjUxIDMwNS44NGMuNTggMS45MiAxLjEzIDMuODYgMS43MyA1Ljc3IDE0LjA0IDQ0Ljk3IDMzLjk0IDg4Ljc1IDU2LjQyIDEyNC4yN2w2Ny43NS0xMzAuMDRoLTEyNS45Wk0yOTcuOTYgMjA1Ljk3YzEyLjEyLTQuNSAyMy41NC03LjE4IDMzLjY0LTguOTYtMjIuNTEtMjIuMjctNjEuMjQtMjcuMDYtNjEuNDctMjcuMDkgMS4yNyA2LjE3LjU4IDE1LjgtMi40NCAyNi40Ni0zLjMgMTEuNjYtOS4zOCAyNC41NC0xOC43IDM1LjQ4LTMuNDUgNC4wNi03LjM2IDcuODMtMTEuNzMgMTEuMTloLjA3di0uMDFjLjE2LjYyLjM4IDEuMi41OCAxLjc5IDIuNzQgOC4yNyA4LjYxIDEzLjc0IDE0LjkzIDE3LjE0IDYuNDggMy40OSAxMy4zNyA0LjgzIDE3LjY4IDQuODMgNi40IDAgMTEuODgtMy43OSAxNC40My05LjIyLjk3LTIuMDYgMS41NS00LjMzIDEuNTUtNi43NiAwLTMuODUtMS40Mi03LjM0LTMuNjktMTAuMS0xLjkyLTIuMzMtNC40Ni00LjA4LTcuMzktNS4wM2w0NC44Mi04LjY1Yy02LjYzLTYuMTItMTQuNzItMTEuNTktMjIuNzMtMTYuMjMtMS45Ny0xLjE0LTEuNjktNC4wNS40NS00Ljg0WiIvPjxwYXRoIGZpbGw9IiNmYWEzMTAiIGQ9Ik0yODEuMzcgNDU4LjM3Yy0yNS43OS0zOC44NC00OC42OC04OC4wNC02NC40NS0xMzguNTQtMS40NS00LjYzLTIuODMtOS4zMS00LjE3LTEzLjk5LTEuMTItMy45NC0yLjIyLTcuODgtMy4yNS0xMS44LTIuMDktNy45Mi05LjI4LTEzLjQ2LTE3LjQ4LTEzLjQ2aC0yNy45NWMtOC4yIDAtMTUuMzkgNS41My0xNy40OCAxMy40NS0yLjI4IDguNjUtNC43OCAxNy4zMi03LjQyIDI1Ljc5LTE1Ljc3IDUwLjUtMzguNjUgOTkuNy02NC40NSAxMzguNTQtNC4wMSA2LjAzLTEuNzggMTEuNjMtLjY0IDEzLjc2IDIuNCA0LjQ3IDYuODYgNy4xNCAxMS45NCA3LjE0aDY2LjAxbDMuOTcgNi45MmM0LjU0IDcuOSAxMi45OSAxMi44MSAyMi4wNSAxMi44MXMxNy41MS00LjkxIDIyLjA2LTEyLjgxbDMuOTgtNi45Mmg2NmMzLjIyIDAgNi4xOS0xLjA4IDguNTUtMy4wMiAxLjM1LTEuMTEgMi41MS0yLjQ5IDMuMzgtNC4xMy41Ny0xLjA3IDEuNDItMy4wMiAxLjYxLTUuNDYuMTktMi40MS0uMjYtNS4zMS0yLjI1LTguMzFaIi8+PHBhdGggZmlsbD0iIzM4Mjk2ZCIgZD0iTTI5NS43IDc2LjA2Yy03LjU0LTEyLjA1LTMyLjM4IDEtNTkuNTQgMi44Ni0xNS4wNCAxLjAzLTM3LjA1LTExMC42My03MS43Ny01Ni45OS0zOS41NiA2MS4xLTc5LjEyLTQ0LjY4LTg4LjY2LTE1LjgzLTIxLjExIDQzLjI3IDI1LjE1IDg0LjYxIDI1LjE1IDg0LjYxcy0xMi44NCA3LjkyLTIwLjYzIDEzLjkzYy01LjQ3IDQuMTctMTAuODIgOC42NS0xNi4wMyAxMy41MS0yMC40NSAxOS4wMy0zNi4wNCA0MC4zMi00Ni43NyA2My44NkM2LjcyIDIwNS41NSAxLjExIDIyOS41OS42MiAyNTQuMTVjLS40OSAyNC41NiA0LjAxIDQ5LjEgMTMuNTQgNzMuNjMgOS41MiAyNC41MyAyNC4xNyA0Ny40MiA0My45NSA2OC42OCA0LjAyIDQuMzIgOC4xMiA4LjQxIDEyLjMxIDEyLjMgNC4xLTYuMzEgNy45Ny0xMi43NCAxMS42NC0xOS4yNiA0LjM5LTcuOCA4LjUtMTUuNzIgMTIuMjUtMjMuNzgtLjMzLS4zNS0uNjYtLjY5LS45OS0xLjAzLS4xNy0uMTgtLjM0LS4zNS0uNTEtLjUzLTE1LjUzLTE2LjY5LTI3LjE3LTM0LjU5LTM0LjkzLTUzLjcyLTcuNzctMTkuMTMtMTEuNS0zOC4yNS0xMS4yLTU3LjM2LjI5LTE5LjEgNC40Ny0zNy42OCAxMi41My01NS43MiA4LjA2LTE4LjA1IDIwLjAyLTM0LjQ1IDM1LjktNDkuMjIgMTMuOTktMTMuMDIgMjguODQtMjIuODMgNDQuNTUtMjkuNDEgMTUuNy02LjU5IDMxLjYzLTkuOTggNDcuNzYtMTAuMTggOS4wNS0uMTEgMTkuMTEgMS4xNSAyOS41MSA0LjUgMTAuMzIgNC4yNyAxOS4yMiA5LjQ0IDI2LjYzIDE1LjM1IDEwLjE5IDguMTMgMTcuNjEgMTcuNjUgMjIuMjIgMjguMSAxLjkxIDQuMzIgMy4zNyA4LjggNC4zMiAxMy40MSAxNi4yNy0yOC4yNyAzNi43NS03NS45NiAyNS41Ny05My44M1oiLz48L3N2Zz4=';
121121

122-
$admin_menu_icon_id = empty( $this->get_api_data() ) ? '' : $this->get_api_data()['acf']['admin_menu_icon'];
122+
$admin_menu_icon_id = empty( $this->get_api_data() ) ? '' : $this->get_api_data()['admin_menu_icon'];
123123

124124
if ( $admin_menu_icon_id ) {
125125
// Get the logo URL.
@@ -145,9 +145,9 @@ public function get_admin_menu_icon(): string {
145145
* @return string
146146
*/
147147
public function get_admin_menu_name(): string {
148-
return empty( $this->get_api_data() ) || ! isset( $this->get_api_data()['acf']['admin_menu_name'] )
148+
return empty( $this->get_api_data() ) || ! isset( $this->get_api_data()['admin_menu_name'] )
149149
? 'Progress Planner'
150-
: $this->get_api_data()['acf']['admin_menu_name'];
150+
: $this->get_api_data()['admin_menu_name'];
151151
}
152152

153153
/**
@@ -156,9 +156,9 @@ public function get_admin_menu_name(): string {
156156
* @return string
157157
*/
158158
public function get_admin_submenu_name(): string {
159-
return empty( $this->get_api_data() ) || ! isset( $this->get_api_data()['acf']['admin_submenu_name'] )
159+
return empty( $this->get_api_data() ) || ! isset( $this->get_api_data()['admin_submenu_name'] )
160160
? $this->get_admin_menu_name()
161-
: $this->get_api_data()['acf']['admin_submenu_name'];
161+
: $this->get_api_data()['admin_submenu_name'];
162162
}
163163

164164
/**
@@ -169,7 +169,7 @@ public function get_admin_submenu_name(): string {
169169
public function get_ravi_name(): string {
170170
return empty( $this->get_api_data() )
171171
? 'Ravi'
172-
: $this->get_api_data()['acf']['ravis_name'];
172+
: $this->get_api_data()['ravis_name'];
173173
}
174174

175175
/**
@@ -211,11 +211,11 @@ public function get_remote_data( $url ) {
211211
* @return array<\Progress_Planner\Admin\Widgets\Widget>
212212
*/
213213
public function filter_widgets( $widgets ) {
214-
if ( empty( $this->get_api_data() ) || ! isset( $this->get_api_data()['acf']['papers'] ) ) {
214+
if ( empty( $this->get_api_data() ) || ! isset( $this->get_api_data()['papers'] ) ) {
215215
return $widgets;
216216
}
217217

218-
$show_papers = $this->get_api_data()['acf']['papers'];
218+
$show_papers = $this->get_api_data()['papers'];
219219
if ( ! $show_papers ) {
220220
return $widgets;
221221
}
@@ -237,11 +237,11 @@ function ( $widget ) use ( $show_papers ) {
237237
* @return string
238238
*/
239239
public function get_widget_title( $widget_id, $default_value = '' ) {
240-
if ( empty( $this->get_api_data() ) || ! isset( $this->get_api_data()['acf']['widget_titles'] ) ) {
240+
if ( empty( $this->get_api_data() ) || ! isset( $this->get_api_data()['widget_titles'] ) ) {
241241
return $default_value;
242242
}
243243

244-
foreach ( $this->get_api_data()['acf']['widget_titles'] as $widget ) {
244+
foreach ( $this->get_api_data()['widget_titles'] as $widget ) {
245245
if ( $widget['widget_id'] === $widget_id && isset( $widget['title'] ) ) {
246246
return $widget['title'];
247247
}
@@ -256,9 +256,9 @@ public function get_widget_title( $widget_id, $default_value = '' ) {
256256
* @return string
257257
*/
258258
public function get_blog_feed_url(): string {
259-
return empty( $this->get_api_data() ) || ! isset( $this->get_api_data()['acf']['blog_feed_url'] )
259+
return empty( $this->get_api_data() ) || ! isset( $this->get_api_data()['blog_feed_url'] )
260260
? \progress_planner()->get_remote_server_root_url()
261-
: $this->get_api_data()['acf']['blog_feed_url'];
261+
: $this->get_api_data()['blog_feed_url'];
262262
}
263263

264264
/**
@@ -270,11 +270,11 @@ public function get_blog_feed_url(): string {
270270
*/
271271
public function get_url( $default_url = '' ) {
272272
$api_data = $this->get_api_data();
273-
if ( empty( $api_data ) || ! isset( $api_data['acf']['links'] ) ) {
273+
if ( empty( $api_data ) || ! isset( $api_data['links'] ) ) {
274274
return $default_url;
275275
}
276276

277-
foreach ( $api_data['acf']['links'] as $link ) {
277+
foreach ( $api_data['links'] as $link ) {
278278
if ( $link['original_url'] === $default_url ) {
279279
return $link['url'];
280280
}

0 commit comments

Comments
 (0)