Skip to content

Commit fd04089

Browse files
authored
Merge pull request #671 from IONOS-WordPress/develop
Release 1.4.3
2 parents 3bbfb71 + d44b4cf commit fd04089

File tree

28 files changed

+419
-135
lines changed

28 files changed

+419
-135
lines changed

.github/workflows/integration.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,14 @@ jobs:
5959
- uses: './.github/shared/actions/devcontainer-shell-run'
6060
id: gather_workflow_artifacts
6161
name: gather_workflow_artifacts
62+
if: always()
6263
with:
6364
runCmd: |
6465
pnpm exec ./scripts/_get-workflow-artefacts.sh
6566
6667
- name: attach workflow artifacts
6768
uses: actions/upload-artifact@v4
69+
if: always()
6870
with:
6971
include-hidden-files: true
7072
# see https://github.com/actions/upload-artifact/issues/424

packages/wp-plugin/ionos-essentials/ionos-essentials.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ function () {
143143
require_once __DIR__ . '/ionos-essentials/inc/maintenance_mode/index.php';
144144
require_once __DIR__ . '/ionos-essentials/inc/wpscan/index.php';
145145
require_once __DIR__ . '/ionos-essentials/inc/loop/index.php';
146+
require_once __DIR__ . '/ionos-essentials/inc/adminbar/index.php';
146147

147148
require_once __DIR__ . '/ionos-essentials/inc/extendify/index.php';
148149
require_once __DIR__ . '/ionos-essentials/inc/mcp/index.php';
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?php
2+
3+
namespace ionos\essentials\adminbar;
4+
5+
use function ionos\essentials\tenant\get_tenant_config;
6+
7+
function add_admin_bar_menu()
8+
{
9+
global $wp_admin_bar;
10+
11+
if (! is_admin_bar_showing() || ! current_user_can('manage_options')) {
12+
return;
13+
}
14+
15+
$data = get_tenant_config();
16+
17+
if (! isset($data['domain'], $data['banner_links']['managehosting'])) {
18+
return;
19+
}
20+
21+
$parent = ($wp_admin_bar->get_node('appearance') ? 'appearance' : 'site-name');
22+
23+
$args = [
24+
'id' => 'ionos-essentials',
25+
'title' => \esc_html__('Manage Hosting', 'ionos-essentials'),
26+
'href' => $data['domain'] . $data['banner_links']['managehosting'],
27+
'parent' => $parent,
28+
'meta' => [
29+
'target' => '_blank',
30+
],
31+
];
32+
$wp_admin_bar->add_node($args);
33+
}
34+
35+
add_action('admin_bar_menu', __NAMESPACE__ . '\add_admin_bar_menu', 100);

packages/wp-plugin/ionos-essentials/ionos-essentials/inc/dashboard/blocks/banner/index.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,17 @@
77
use ionos\essentials\Tenant;
88
use const ionos\essentials\PLUGIN_FILE;
99

10-
const BUTTON_TEMPLATE = '<a href="%s" class="button %s" title="%s">%s</a>';
10+
const BUTTON_TEMPLATE = '<a href="%s" class="button %s" title="%s" target="%s">%s</a>';
1111
function render_callback(): void
1212
{
1313
$button_list = [];
1414

1515
$view_site = [
1616
[
17-
'link' => \home_url(),
18-
'text' => \__('View Site', 'ionos-essentials'),
19-
'css-class' => 'button--primary',
17+
'link' => \home_url(),
18+
'text' => \__('View Site', 'ionos-essentials'),
19+
'title' => \__('View Site', 'ionos-essentials'),
20+
'css-class' => 'button--primary',
2021
],
2122
];
2223

@@ -29,6 +30,7 @@ function render_callback(): void
2930
\esc_url($button['link'] ?? '#'),
3031
$button['css-class'] ?? 'button--secondary',
3132
$button['title'] ?? '',
33+
$button['target'] ?? '_self',
3234
\esc_html($button['text'] ?? '')
3335
), $button_list));
3436

@@ -82,8 +84,8 @@ function get_ai_button(): array
8284
[
8385
'link' => \admin_url('admin.php?page=extendify-launch'),
8486
'text' => \__('Start AI Sitebuilder', 'ionos-essentials'),
87+
'title' => \__('Start AI Sitebuilder', 'ionos-essentials'),
8588
'css-class' => 'button--promoting',
86-
'target' => '_blank',
8789
], ];
8890
}
8991

packages/wp-plugin/ionos-essentials/ionos-essentials/inc/dashboard/blocks/my-account/index.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ function render_callback(): void
6060
'link' => $data['domain'] . $managehosting,
6161
'target' => '_blank',
6262
'text' => \esc_html__('Manage Hosting', 'ionos-essentials'),
63+
'title' => \esc_html__('Manage Hosting', 'ionos-essentials'),
6364
'css-attributes' => 'deeplink',
6465
];
6566
return $button_list;

packages/wp-plugin/ionos-essentials/ionos-essentials/inc/dashboard/blocks/next-best-actions/config.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,9 @@
107107
),
108108
link: $data['domain'] . $connectdomain,
109109
anchor: \__('Connect Domain', 'ionos-essentials'),
110-
completed: false === strpos(home_url(), 'live-website.com'),
110+
completed: false === strpos(home_url(), 'live-website.com') &&
111+
false === strpos(home_url(), 'stretch.love') &&
112+
false === strpos(home_url(), 'stretch.monster'),
111113
categories: ['setup-ai', 'setup-noai']
112114
);
113115

packages/wp-plugin/ionos-essentials/ionos-essentials/inc/dashboard/blocks/site-health/index.php

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,19 @@ function render_callback(): void
3232
<div class="ionos-site-health-overview__info">
3333
<span class="badge badge--warning-solid ionos-maintenance-only" style="width: fit-content; margin-bottom: 10px;"><?php \esc_html_e('Maintenance page active', 'ionos-essentials'); ?></span>
3434
<div class="ionos-site-health-overview__info-homeurl">
35-
<?php if (\is_ssl()) { ?>
36-
<i class="exos-icon exos-icon-nav-lock-close-16"></i>
37-
<?php } else { ?>
38-
<i class="exos-icon exos-icon-nav-lock-16" style="color: #c90a00;"></i>
39-
<?php } ?>
35+
<?php
36+
$title = \esc_attr__('Current SSL-Status', 'ionos-essentials');
37+
$status = \esc_attr__('Secure', 'ionos-essentials');
38+
$icon = 'exos-icon exos-icon-nav-lock-close-16';
39+
$style = '';
40+
if (! \is_ssl()) {
41+
$status = \esc_attr__('Insecure', 'ionos-essentials');
42+
$icon = 'exos-icon exos-icon-nav-lock-16';
43+
$style = 'color: #c90a00;';
44+
}
45+
46+
printf('<i class="%s" style="%s" title="%s: %s"></i>', $icon, $style, $title, $status);
47+
?>
4048
<h2 class="headline headline--sub"><?php echo \esc_url(parse_url(\get_option('siteurl', ''), PHP_URL_HOST)); ?></h2>
4149
</div>
4250
<div class="ionos-site-health-overview__info-items">

packages/wp-plugin/ionos-essentials/ionos-essentials/inc/loop/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## rest endpoint
44

55
The provided data can be locally found at
6-
http://localhost:8888/index.php?rest*route=/ionos/essentials/loop/v1/loop-data
6+
http://localhost:8888/index.php?rest_route=/ionos/essentials/loop/v1/loop-data
77
Permission to this endpoint is always granted local due to \_return true\* in \_rest-permission-callback.php*
88

99
## validate json against json schema

packages/wp-plugin/ionos-essentials/ionos-essentials/inc/mcp/index.php

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,14 @@
6565
}
6666

6767
$snippet = [
68-
'servers' => [
69-
'wordpress' => [
70-
'command' => 'npx',
71-
'args' => "['-y', '@automattic/mcp-wordpress-remote@latest'],",
72-
'env' => [
73-
'WP_API_URL' => get_site_url(),
74-
'WP_API_USERNAME' => wp_get_current_user()
75-
->user_login,
76-
'WP_API_PASSWORD' => get_new_application_password(),
77-
],
68+
'wordpress' => [
69+
'command' => 'npx',
70+
'args' => ['-y', '@automattic/mcp-wordpress-remote@latest'],
71+
'env' => [
72+
'WP_API_URL' => get_site_url(),
73+
'WP_API_USERNAME' => wp_get_current_user()
74+
->user_login,
75+
'WP_API_PASSWORD' => get_new_application_password(),
7876
],
7977
],
8078
];

packages/wp-plugin/ionos-essentials/ionos-essentials/inc/mcp/view.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@
5252

5353
<div class="code snippet hidden">
5454
<p class="paragraph paragraph--bold">
55-
<?php \esc_html_e('Enter the following JSON into your preferred AI Clients settings file', 'ionos-essentials'); ?>
55+
<?php \esc_html_e(
56+
'Enter the following JSON into your preferred AI Clients settings file (under \'mcpServers\' / \'servers\')',
57+
'ionos-essentials'
58+
); ?>
5659
</p>
5760
<p class="paragraph paragraph--minor">
5861
<i class="exos-icon exos-icon-warningmessage-32"></i>

0 commit comments

Comments
 (0)