Webasyst Framework v.2.9.6

* Improved support for the latest PHP versions. * Improved Webasyst 2 user interface.
webasyst · Nov 13, 2023 · 0360582 · 0360582
1 parent dc497e3
commit 0360582
Show file tree

Hide file tree

Showing 18 changed files with 69 additions and 46 deletions.
diff --git a/wa-apps/installer/css/app.installer.css b/wa-apps/installer/css/app.installer.css
diff --git a/wa-apps/installer/js/installer.js b/wa-apps/installer/js/installer.js
@@ -570,7 +570,7 @@ String.prototype.translate = function () {
                 $itemClone.find('img').removeClass('userpic userpic-48 custom-mr-8');
                 $itemClone.addClass('-added');
 
-                const targetPosition = $itemClone.offset();
+                const targetPosition = $app_menu.find('li:first').offset();
                 const startPosition = $this.offset();
 
                 const target_params = {

diff --git a/wa-apps/installer/lib/classes/installerItemsAction.class.php b/wa-apps/installer/lib/classes/installerItemsAction.class.php
@@ -16,7 +16,7 @@ public function execute()
         $tag = $this->getFilters('tag');
 
         // System plugins
-        if (preg_match('~^wa-plugins/~', $slug)) {
+        if (preg_match('~^wa-plugins/~', (string) $slug)) {
             $filters['type'] = 'plugin';
             $filters['category'] = 'plugins:' . preg_replace('~^wa-plugins/~', '', $slug);
         } else {
@@ -42,7 +42,7 @@ public function execute()
 
         // Set ui version from current app
         // For system plugins get UI from request param with 1.3 as default
-        $ui = (strpos($slug, 'wa-plugins/') === 0) ? waRequest::get('ui', '1.3', waRequest::TYPE_STRING_TRIM) : wa()->whichUI($slug);
+        $ui = (strpos((string) $slug, 'wa-plugins/') === 0) ? waRequest::get('ui', '1.3', waRequest::TYPE_STRING_TRIM) : wa()->whichUI($slug);
         waRequest::setParam('force_ui_version', $ui);
     }
 

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.9.5',
-    'critical'    => '2.9.5',
+    'version'     => '2.9.6',
+    'critical'    => '2.9.6',
     'system'      => true,
     'vendor'      => 'webasyst',
     'csrf'        => true,

diff --git a/wa-content/css/wa/wa-2.0.css b/wa-content/css/wa/wa-2.0.css
@@ -1322,8 +1322,8 @@ button.webasyst-magic-wand:hover,
 button.webasyst-magic-wand .icon,
 .button.webasyst-magic-wand .icon { width: 1.25em; height: 1.25em; background-image: url('../../img/webasyst-wand-bold.svg'); background-size: 100%; vertical-align: -0.25em; margin-right: 0.25em; }
 
-input[type="button"] { background-color: var(--background-color-btn-light-gray); color: var(--text-color-input); box-shadow: none; border-radius: 1.5em; } /* fallback for unstyled old-fashioned <input type="button"> */
-input[type="button"]:hover { box-shadow: none; background-color: var(--background-color-btn-light-gray-hover); }
+input[type="button"]:not(.blue, .green, .yellow, .orange, .red, .purple, .pink, .brown, .gray, .dark-gray, .black, .white) { background-color: var(--background-color-btn-light-gray); color: var(--text-color-input); box-shadow: none; } /* fallback for unstyled old-fashioned <input type="button"> */
+input[type="button"]:not(.blue, .green, .yellow, .orange, .red, .purple, .pink, .brown, .gray, .dark-gray, .black, .white):hover { box-shadow: none; background-color: var(--background-color-btn-light-gray-hover); }
 
 /* Userpic
 ---------- */
@@ -1914,7 +1914,7 @@ ul.breadcrumbs > li * > a { color: inherit; }
 
 .fields .field:not(:first-child) { margin-top: 1rem; }
 .fields .field > .name { line-height: 1.25rem; font-size: 0.875em; color: var(--text-color-hint-strong); }
-.fields:not(.vertical) .field > .name { width: 9rem; padding-right: 1rem; padding-top: 0.1875rem; }
+.fields:not(.vertical) .field > .name { width: 9rem; padding-right: 1rem; padding-top: 0.1875rem; word-break: break-word; }
 .fields .field > .name.for-input { padding-top: 0.5625em; }
 .fields .field > .name.for-button { padding-top: 0.5em; }
 .fields .field > .name.for-switch { padding-top: 0.05em; }

diff --git a/wa-content/js/jquery-wa/dashboard-mobile.js b/wa-content/js/jquery-wa/dashboard-mobile.js
@@ -618,13 +618,9 @@ const Page = ( function($, backend_url) {
                 $deferred.done( function(response) {
                     if ( $.trim(response).length && !response.includes('activity-empty-today')) {
                         // Render
-                        $wrapper.find(".empty-activity-text").remove();
-                        let $today = $wrapper.find(".today");
-                        if($today.length) {
-                            $today.after(response).remove();
-                        }else{
-                            $wrapper.prepend(response);
-                        }
+                        $widgetActivity.find(".empty-activity-text").remove();
+                        $widgetActivity.find(".activity-item.activity-empty-today").remove();
+                        $wrapper.prepend(response);
                     }
 
                     that.storage.isTopLazyLoadLocked = false;
@@ -652,4 +648,4 @@ const Page = ( function($, backend_url) {
 
 
     }
-})(jQuery, backend_url);
+})(jQuery, backend_url);
diff --git a/wa-content/js/jquery-wa/dashboard.js b/wa-content/js/jquery-wa/dashboard.js
@@ -1635,14 +1635,9 @@ const Page = ( function($, backend_url) {
                 $deferred.done( function(response) {
                     if ( $.trim(response).length && !response.includes('activity-empty-today')) {
                         // Render
-                        $wrapper.find(".empty-activity-text").remove();
-                        $wrapper.find(".activity-empty-today").remove();
-                        let $today = $wrapper.find(".today");
-                        if($today.length) {
-                            $today.after(response).remove();
-                        }else{
-                            $wrapper.prepend(response);
-                        }
+                        $widgetActivity.find(".empty-activity-text").remove();
+                        $widgetActivity.find(".activity-item.activity-empty-today").remove();
+                        $wrapper.prepend(response);
                     }
 
                     that.storage.isTopLazyLoadLocked = false;

diff --git a/wa-content/js/qrcode/LICENSE b/wa-content/js/qrcode/LICENSE
@@ -1,15 +1,21 @@
-The MIT License (MIT)
----------------------
-Copyright (c) 2012 davidshimjs
-https://github.com/davidshimjs/qrcodejs
+MIT License
 
-Permission is hereby granted, free of charge,
-to any person obtaining a copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+Copyright (c) 2017 Ray
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/wa-content/js/qrcode/qrcode.min.js b/wa-content/js/qrcode/qrcode.min.js
diff --git a/wa-system/api/waAPIException.class.php b/wa-system/api/waAPIException.class.php
@@ -21,6 +21,9 @@ public function __construct($error, $error_description = null, $status_code = nu
         if ($this->error_description) {
             $this->response['error_description'] = $this->error_description;
         }
+        if (defined('WA_API_EXCEPTION_STACK_TRACE') && WA_API_EXCEPTION_STACK_TRACE) {
+            $this->response['trace'] = $this->getTraceAsString();
+        }
     }
 
     public function __toString()

diff --git a/wa-system/captcha/phpcaptcha/waPHPCaptcha.class.php b/wa-system/captcha/phpcaptcha/waPHPCaptcha.class.php
@@ -90,7 +90,7 @@ public function isValid($code = null, &$error = '')
                 $code = wa()->getRequest()->post('captcha');
             }
         }
-        $code = strtolower(trim($code));
+        $code = strtolower(trim((string) $code));
         $captcha = wa()->getStorage()->get('captcha');
         $app_id = $this->getAppId();
         if (isset($captcha[$app_id]) && $captcha[$app_id] === $code) {

diff --git a/wa-system/contact/waContactCompositeField.class.php b/wa-system/contact/waContactCompositeField.class.php
@@ -274,7 +274,7 @@ public function getFields($subfield_name = null)
     {
         $fields = array();
         foreach($this->options['fields'] as $f) {
-            if ($f->getId() === $subfield_name) {
+            if ($f->getId() === (string) $subfield_name) {
                 return $f;
             }
             $fields[$f->getId()] = $f;

diff --git a/wa-system/validator/waUrlValidator.class.php b/wa-system/validator/waUrlValidator.class.php
@@ -18,7 +18,7 @@ class waUrlValidator extends waRegexValidator
 
     protected function init()
     {
-        $this->setMessage('not_match', 'Invalid URL');
+        $this->setMessage('not_match', _ws('Invalid URL'));
         $this->setPattern(self::REGEX_URL);
     }
 

diff --git a/wa-system/view/waAppViewHelper.class.php b/wa-system/view/waAppViewHelper.class.php
@@ -97,7 +97,7 @@ public function pages($parent_id = 0, $with_params = true)
                     }
                     foreach ($page as $k => $v) {
                         if ($k != 'content') {
-                            $page[$k] = htmlspecialchars($v);
+                            $page[$k] = htmlspecialchars((string) $v);
                         }
                     }
                 }

diff --git a/wa-system/view/waSmarty3View.class.php b/wa-system/view/waSmarty3View.class.php
@@ -99,7 +99,7 @@ public function assign($name, $value = null, $escape = false)
             if (is_array($value)) {
                 $value = array_map('htmlspecialchars', $value);
             } else {
-                $value = htmlspecialchars($value);
+                $value = htmlspecialchars((string) $value);
             }
         }
         $this->smarty->assign($name, $value);

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.9.5',
-    'critical'     => '2.9.5',
+    'version'      => '2.9.6',
+    'critical'     => '2.9.6',
     'vendor'       => 'webasyst',
     'csrf'         => true,
     'header_items' => array(

diff --git a/wa-system/webasyst/locale/ru_RU/LC_MESSAGES/webasyst.po b/wa-system/webasyst/locale/ru_RU/LC_MESSAGES/webasyst.po
@@ -1882,6 +1882,9 @@ msgstr "Email-адрес введен неправильно"
 msgid "Invalid captcha"
 msgstr "Капча введена неверно"
 
+msgid "Invalid URL"
+msgstr "URL введен неправильно"
+
 msgid "Template settings"
 msgstr "Настройки шаблона"
 

diff --git a/wa-system/webasyst/templates/actions/backend/BackendDashboard.html b/wa-system/webasyst/templates/actions/backend/BackendDashboard.html
@@ -54,7 +54,7 @@
                             [s`<strong>Enable secure sign-in with 2-factor authentication (2FA).</strong> Your account will be connected to Webasyst ID, and any sign-in attempts from new devices will be protected with an SMS confirmation code.`]
                         </p>
                         <form class="flexbox middle space-16">
-                            <input type="tel" placeholder="[s`+1`]" class="solid bold" value="{$webasyst_id_auth_banner.phone|default:'[s`+1`]'}" style="background-color: var(--background-color-blank);">
+                            <input type="tel" placeholder="[s`+1`]" class="solid bold" value="{$webasyst_id_auth_banner.phone|default:'[s`+1`]'|escape}" style="background-color: var(--background-color-blank);">
                             <button type="submit" class="button green">[s`Connect`]</button>
                             <a href="javascript:void(0);" class="js-webasyst-id-helplink small">[s`How does it work?`]</a>
                             <script>