Webasyst Framework v.2.9.5

  * Fixed display of plugin icons within apps when Webasyst is installed in a domain subdirectory.
  * Enhanced support for web push notifications by mobile apps.

Author: Leonix

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

wa-system/config/waAppConfig.class.php

@@ -868,7 +868,7 @@ public function getWidgets()
                         if ($this->application == 'webasyst') {
                             $widget_info['img'] = 'wa-widgets/' . $widget_id . '/' . $widget_info['img'];
                         } else {
-                            $widget_info['img'] = ltrim(wa()->getAppStaticUrl($this->application).'widgets/' . $widget_id . '/' . $widget_info['img'], '/');
+                            $widget_info['img'] = ltrim(wa()->getAppPathRelativeToFrameworkRoot($this->application).'widgets/' . $widget_id . '/' . $widget_info['img'], '/');
                         }
                     }
                     $this->widgets[$widget_id] = $widget_info;
@@ -932,7 +932,7 @@ public function getPlugins()
                         $plugin_info['id'] = $plugin_id;
                         $plugin_info['app_id'] = $this->application;
                         if (isset($plugin_info['img'])) {
-                            $plugin_info['img'] = ltrim(wa()->getAppStaticUrl($this->application).'plugins/'.$plugin_id.'/'.$plugin_info['img'], '/');
+                            $plugin_info['img'] = ltrim(wa()->getAppPathRelativeToFrameworkRoot($this->application).'plugins/'.$plugin_id.'/'.$plugin_info['img'], '/');
                         }
                         if (isset($plugin_info['rights']) && $plugin_info['rights']) {
                             if (!isset($plugin_info['handlers']['rights.config'])) {

wa-system/waSystem.class.php

@@ -1199,8 +1199,16 @@ public function getAppStaticUrl($app = null, $absolute = false)
         return $url.$this->getAppPathRelativeToFrameworkRoot($app);
     }
 
-    protected function getAppPathRelativeToFrameworkRoot($app)
+    /**
+     * @param string|null $app Optional app id. If not specified, then current app's id is used by default.
+     * @return string
+     * @since 2.9.5
+     */
+    public function getAppPathRelativeToFrameworkRoot($app=null)
     {
+        if (!$app) {
+            $app = $this->getApp();
+        }
         $app_path = $this->getAppPath(null, $app);
 
         $base = waConfig::get('wa_path_root');

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

@@ -3,8 +3,8 @@
 return array(
     'name'         => 'Webasyst',
     'prefix'       => 'webasyst',
-    'version'      => '2.9.4',
-    'critical'     => '2.9.4',
+    'version'      => '2.9.5',
+    'critical'     => '2.9.5',
     'vendor'       => 'webasyst',
     'csrf'         => true,
     'header_items' => array(

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

@@ -30,6 +30,7 @@
         'create_datetime' => array('datetime', 'null' => 0),
         'contact_id' => array('int', 11), // optional (eg. for frontend users)
         'subscriber_data' => array('text', 'null' => 0),
+        'scope' => array('varchar', 255, 'null' => 1),
         ':keys' => array(
             'PRIMARY' => 'id',
             'provider_id' => 'provider_id',

wa-system/webasyst/lib/updates/2.9/1694611769.php renamed to wa-system/webasyst/lib/updates/2.9/1698249421.php

@@ -239,7 +239,7 @@ <h3 class="popup-notification-new__title">
         {if $_force_set_wa_backend_ui_version == '2.0'}
 
             <div style="position: fixed; z-index: 9999; bottom: 20px; right: 20px; border-radius: 4px; background: #eee; padding: 25px; box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.05), 0 0.5rem 0.5rem -0.5rem rgba(0, 0, 0, 0.13); max-width: 500px;{if $wa->cookie('force_hide_wa2ui_teaser') && $app_info.id != 'ui'} display: none;{/if}">
-                <a href="#" onClick="_setCookie('force_hide_wa2ui_teaser', 1, 180); $(this).parent().hide();
+                <a href="javascript:void(0)" onClick="_setCookie('force_hide_wa2ui_teaser', 1, 180); $(this).parent().hide();
     " style="padding: 6px; float: right; font-size: 24px; color: rgba(0,0,0,0.5); position: relative; top: -10px; right: -6px;">&times;</a>
                 <h3 style="font-size: 20px; margin-bottom: 12px; color: #777; margin-top: -7px;">
                     {if $app_info.id != 'webasyst'}<img src="{$root_url}{$app_info.icon.48}" style="width: 24px; height: 24px; position: relative; top: 4px;">{/if}