Skip to content

Commit e800dad

Browse files
author
Leonix
committed
Site app v.2.5.32
* Improved support for the latest PHP versions. * For plugin developers: the backend_settings hook has been made available in website aliases’ settings.
1 parent c7a074e commit e800dad

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

wa-apps/site/lib/actions/routing/siteRoutingEdit.action.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ protected function getParams($route_id, $config, $values)
144144
$result[$id] = array(
145145
'name' => ifset($info['name']),
146146
'type' => $info['type'],
147-
'value' => $this->getHTML($route_id, $info, isset($values[$id]) ? $values[$id] : null)
147+
'value' => $this->getHTML($route_id, $info, isset($values[$id]) ? $values[$id] : '')
148148
);
149149
} else {
150150
$result[] = $info;

wa-apps/site/lib/actions/settings/siteSettings.action.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,20 @@ public function execute()
5353
$domain_alias = wa()->getRouting()->isAlias($domain);
5454
$this->getRobots($domain, $domain_alias);
5555

56+
/**
57+
* Backend settings page
58+
* UI hook allow extends backend settings page
59+
* @event backend_settings
60+
* @param array $domain
61+
* @return array[string][string]string $return[%plugin_id%]['action_button_li'] html output
62+
* @return array[string][string]string $return[%plugin_id%]['section'] html output
63+
*/
64+
$domain_info = siteHelper::getDomainInfo();
65+
$this->view->assign('backend_settings', wa()->event('backend_settings', $domain_info, array(
66+
'action_button_li',
67+
'section'
68+
)));
69+
5670
if ($domain_alias) {
5771
$this->view->assign('domain_alias', $domain_alias);
5872
return;
@@ -139,20 +153,6 @@ public function execute()
139153
'domains' => $domains,
140154
'latter_apps_names' => $latter_apps_names,
141155
));
142-
143-
/**
144-
* Backend settings page
145-
* UI hook allow extends backend settings page
146-
* @event backend_settings
147-
* @param array $domain
148-
* @return array[string][string]string $return[%plugin_id%]['action_button_li'] html output
149-
* @return array[string][string]string $return[%plugin_id%]['section'] html output
150-
*/
151-
$domain_info = siteHelper::getDomainInfo();
152-
$this->view->assign('backend_settings', wa()->event('backend_settings', $domain_info, array(
153-
'action_button_li',
154-
'section'
155-
)));
156156
}
157157

158158
protected function getDomainUrl($domain)

wa-apps/site/lib/config/app.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'icon' => 'img/site512.png',
66
'sash_color' => '#49a2e0',
77
'frontend' => true,
8-
'version' => '2.5.31',
8+
'version' => '2.5.32',
99
'critical' => '2.5.0',
1010
'vendor' => 'webasyst',
1111
'system' => true,

wa-apps/site/templates/actions-legacy/settings/Settings.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@
2222
<div class="block s-grey-toolbar">
2323
<div class="float-right">
2424
<ul class="menu-h">
25-
{if empty($domain_alias)}
2625
<!-- plugin hook: 'backend_settings.action_button_li' -->
2726
{* @event backend_settings.%plugin_id%.action_button_li *}
2827
{foreach $backend_settings as $_}{ifset($_.action_button_li)}{/foreach}
29-
{/if}
3028
<li><a id="s-delete" href="#"><i class="icon16 delete"></i>[`Delete entire website`]</a></li>
3129
</ul>
3230
</div>
@@ -249,11 +247,13 @@ <h4 style="margin-left: 4px; margin-top:2px;">[`Site settings`]</h4>
249247
</div>
250248
</div>
251249
</div>
250+
{/if}
252251

253252
<!-- plugin hook: 'backend_settings.section' -->
254253
{* @event backend_settings.%plugin_id%.section *}
255254
{foreach $backend_settings as $_}{ifset($_.section)}{/foreach}
256255

256+
{if empty($domain_alias)}
257257
<div class="field-group">
258258
<div class="field">
259259
<div class="name">[`Authorization`]</div>

0 commit comments

Comments
 (0)