Webasyst Framework v.2.3.1

webasyst · Sep 20, 2021 · 4015115 · 4015115
1 parent 0f46728
commit 4015115
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 11 deletions.
diff --git a/wa-apps/installer/lib/classes/installerHelper.class.php b/wa-apps/installer/lib/classes/installerHelper.class.php
@@ -96,7 +96,7 @@ public static function flushCache()
             if ($errors) {
                 return $errors;
             } else {
-                return array(_ws('Unable to delete certain files'));
+                return array(_ws('Unable to delete certain files.'));
             }
         } else {
             return array(); // went fine the second time

diff --git a/wa-apps/installer/lib/config/app.php b/wa-apps/installer/lib/config/app.php
@@ -4,8 +4,8 @@
     'description' => 'Install new apps from the Webasyst Store',
     'icon'        => 'img/installer.svg',
     'mobile'      => false,
-    'version'     => '2.3.0',
-    'critical'    => '2.3.0',
+    'version'     => '2.3.1',
+    'critical'    => '2.3.1',
     'system'      => true,
     'vendor'      => 'webasyst',
     'csrf'        => true,

diff --git a/wa-apps/installer/templates/actions/settings/Settings.html b/wa-apps/installer/templates/actions/settings/Settings.html
@@ -65,8 +65,8 @@ <h1>[`System settings`]</h1>
 
 {$_locale = [
     'confirm_disconnect' => _w('Confirm disconnection from the beta testing of this product'),
-    'disconnect' => _w('[`Disconnect`]'),
-    'cancel' => _w('[`Cancel`]')
+    'disconnect' => _w('Disconnect'),
+    'cancel' => _w('Cancel')
 ]}
 
 <script type="text/javascript">

diff --git a/wa-system/api/waAPIController.class.php b/wa-system/api/waAPIController.class.php
@@ -157,8 +157,8 @@ protected function checkToken()
         $token = waRequest::request('access_token', null, 'string');
         if (!$token) {
             if (function_exists('getallheaders')) {
-                $headers = getallheaders();
-                $token = ifset($headers, 'Authorization', null);
+                $headers = array_change_key_case(getallheaders(), CASE_LOWER);
+                $token = ifset($headers, 'authorization', null);
             }
             if (!$token) {
                 $token = waRequest::server('HTTP_AUTHORIZATION', null, 'string');

diff --git a/wa-system/webasyst/lib/actions/api/webasystApiTokenHeadless.controller.php b/wa-system/webasyst/lib/actions/api/webasystApiTokenHeadless.controller.php
@@ -12,10 +12,12 @@ class webasystApiTokenHeadlessController extends waController
      * @var waWebasystIDClientManager
      */
     protected $client_manager;
+    protected $url_provider;
 
     public function __construct()
     {
         $this->client_manager = new waWebasystIDClientManager();
+        $this->url_provider = new waWebasystIDUrlsProvider();
     }
 
     public function execute()
@@ -140,7 +142,7 @@ protected function corsWorkaround()
 
     protected function getAccessToken($code, $apps)
     {
-        $url = $this->client_manager->getWebasystIDConfig()->getAuthCenterUrl('auth/token');
+        $url = $this->url_provider->getAuthCenterUrl('auth/token');
         $credentials = $this->client_manager->getCredentials();
 
         if (empty($credentials)) {

diff --git a/wa-system/webasyst/lib/config/app.php b/wa-system/webasyst/lib/config/app.php
@@ -3,8 +3,8 @@
 return array(
     'name'         => 'Webasyst',
     'prefix'       => 'webasyst',
-    'version'      => '2.3.0',
-    'critical'     => '2.3.0',
+    'version'      => '2.3.1',
+    'critical'     => '2.3.1',
     'vendor'       => 'webasyst',
     'csrf'         => true,
     'header_items' => array(

diff --git a/wa-system/webasyst/locale/ru_RU/LC_MESSAGES/webasyst.mo b/wa-system/webasyst/locale/ru_RU/LC_MESSAGES/webasyst.mo
diff --git a/wa-system/webasyst/locale/ru_RU/LC_MESSAGES/webasyst.po b/wa-system/webasyst/locale/ru_RU/LC_MESSAGES/webasyst.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WebAsyst\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2021-09-15 12:13+0300\n"
+"PO-Revision-Date: 2021-09-17 18:46+0300\n"
 "Last-Translator: Webasyst\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -6522,3 +6522,6 @@ msgstr "Перетащите сюда файл или загрузите его
 
 msgid "Choose file"
 msgstr "Выберите файл"
+
+msgid "Unable to delete certain files."
+msgstr "Не удалось удалить некоторые файлы."