Skip to content

Commit 4015115

Browse files
author
Leonix
committed
Webasyst Framework v.2.3.1
1 parent 0f46728 commit 4015115

File tree

8 files changed

+16
-11
lines changed

8 files changed

+16
-11
lines changed

wa-apps/installer/lib/classes/installerHelper.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public static function flushCache()
9696
if ($errors) {
9797
return $errors;
9898
} else {
99-
return array(_ws('Unable to delete certain files'));
99+
return array(_ws('Unable to delete certain files.'));
100100
}
101101
} else {
102102
return array(); // went fine the second time

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
'description' => 'Install new apps from the Webasyst Store',
55
'icon' => 'img/installer.svg',
66
'mobile' => false,
7-
'version' => '2.3.0',
8-
'critical' => '2.3.0',
7+
'version' => '2.3.1',
8+
'critical' => '2.3.1',
99
'system' => true,
1010
'vendor' => 'webasyst',
1111
'csrf' => true,

wa-apps/installer/templates/actions/settings/Settings.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ <h1>[`System settings`]</h1>
6565

6666
{$_locale = [
6767
'confirm_disconnect' => _w('Confirm disconnection from the beta testing of this product'),
68-
'disconnect' => _w('[`Disconnect`]'),
69-
'cancel' => _w('[`Cancel`]')
68+
'disconnect' => _w('Disconnect'),
69+
'cancel' => _w('Cancel')
7070
]}
7171

7272
<script type="text/javascript">

wa-system/api/waAPIController.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ protected function checkToken()
157157
$token = waRequest::request('access_token', null, 'string');
158158
if (!$token) {
159159
if (function_exists('getallheaders')) {
160-
$headers = getallheaders();
161-
$token = ifset($headers, 'Authorization', null);
160+
$headers = array_change_key_case(getallheaders(), CASE_LOWER);
161+
$token = ifset($headers, 'authorization', null);
162162
}
163163
if (!$token) {
164164
$token = waRequest::server('HTTP_AUTHORIZATION', null, 'string');

wa-system/webasyst/lib/actions/api/webasystApiTokenHeadless.controller.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@ class webasystApiTokenHeadlessController extends waController
1212
* @var waWebasystIDClientManager
1313
*/
1414
protected $client_manager;
15+
protected $url_provider;
1516

1617
public function __construct()
1718
{
1819
$this->client_manager = new waWebasystIDClientManager();
20+
$this->url_provider = new waWebasystIDUrlsProvider();
1921
}
2022

2123
public function execute()
@@ -140,7 +142,7 @@ protected function corsWorkaround()
140142

141143
protected function getAccessToken($code, $apps)
142144
{
143-
$url = $this->client_manager->getWebasystIDConfig()->getAuthCenterUrl('auth/token');
145+
$url = $this->url_provider->getAuthCenterUrl('auth/token');
144146
$credentials = $this->client_manager->getCredentials();
145147

146148
if (empty($credentials)) {

wa-system/webasyst/lib/config/app.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
return array(
44
'name' => 'Webasyst',
55
'prefix' => 'webasyst',
6-
'version' => '2.3.0',
7-
'critical' => '2.3.0',
6+
'version' => '2.3.1',
7+
'critical' => '2.3.1',
88
'vendor' => 'webasyst',
99
'csrf' => true,
1010
'header_items' => array(
114 Bytes
Binary file not shown.

wa-system/webasyst/locale/ru_RU/LC_MESSAGES/webasyst.po

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: WebAsyst\n"
44
"POT-Creation-Date: \n"
5-
"PO-Revision-Date: 2021-09-15 12:13+0300\n"
5+
"PO-Revision-Date: 2021-09-17 18:46+0300\n"
66
"Last-Translator: Webasyst\n"
77
"Language-Team: \n"
88
"MIME-Version: 1.0\n"
@@ -6522,3 +6522,6 @@ msgstr "Перетащите сюда файл или загрузите его
65226522

65236523
msgid "Choose file"
65246524
msgstr "Выберите файл"
6525+
6526+
msgid "Unable to delete certain files."
6527+
msgstr "Не удалось удалить некоторые файлы."

0 commit comments

Comments
 (0)