push.js removed from cache

This commit is contained in:
Dro1d.Ru 2019-12-10 23:05:08 +05:00
parent ada09cd8fa
commit 7b84991453

View file

@ -12,9 +12,9 @@ use Zira;
class Push { class Push {
const ROUTE = 'subscribe'; const ROUTE = 'subscribe';
const PHP_MIN_VERSION = '7.1.0'; const PHP_MIN_VERSION = '7.1.0';
const TRASH_TIME = 2592000; // 30 days const TRASH_TIME = 2592000; // 30 days
private static $_instance; private static $_instance;
private static $_web_push_instance; private static $_web_push_instance;
@ -28,19 +28,19 @@ class Push {
public function onActivate() { public function onActivate() {
Zira\Assets::registerCSSAsset('push/push.css'); Zira\Assets::registerCSSAsset('push/push.css');
Zira\Assets::registerJSAsset('push/push.js'); //Zira\Assets::registerJSAsset('push/push.js');
} }
public function onDeactivate() { public function onDeactivate() {
Zira\Assets::unregisterCSSAsset('push/push.css'); Zira\Assets::unregisterCSSAsset('push/push.css');
Zira\Assets::unregisterJSAsset('push/push.js'); //Zira\Assets::unregisterJSAsset('push/push.js');
} }
public function beforeDispatch() { public function beforeDispatch() {
Zira\Router::addRoute(self::ROUTE,'push/index/index'); Zira\Router::addRoute(self::ROUTE,'push/index/index');
Zira\Assets::registerCSSAsset('push/push.css'); Zira\Assets::registerCSSAsset('push/push.css');
Zira\Assets::registerJSAsset('push/push.js'); //Zira\Assets::registerJSAsset('push/push.js');
} }
public function bootstrap() { public function bootstrap() {
@ -52,7 +52,7 @@ class Push {
'Subscribe to notifications' => Zira\Locale::tm('Subscribe to notifications', 'push'), 'Subscribe to notifications' => Zira\Locale::tm('Subscribe to notifications', 'push'),
'Unsubscribe from notifications' => Zira\Locale::tm('Unsubscribe from notifications', 'push') 'Unsubscribe from notifications' => Zira\Locale::tm('Unsubscribe from notifications', 'push')
)); ));
if (ENABLE_CONFIG_DATABASE && \Dash\Dash::getInstance()->isPanelEnabled() && Zira\Permission::check(Zira\Permission::TO_ACCESS_DASHBOARD) && Zira\Permission::check(Zira\Permission::TO_EXECUTE_TASKS)) { if (ENABLE_CONFIG_DATABASE && \Dash\Dash::getInstance()->isPanelEnabled() && Zira\Permission::check(Zira\Permission::TO_ACCESS_DASHBOARD) && Zira\Permission::check(Zira\Permission::TO_EXECUTE_TASKS)) {
\Dash\Dash::loadDashLanguage(); \Dash\Dash::loadDashLanguage();
\Dash\Dash::getInstance()->addPanelModulesGroupItem('glyphicon glyphicon-cloud-upload', Zira\Locale::tm('Push notifications', 'push', null, \Dash\Dash::getDashLanguage()), null, 'pushSettingsWindow()'); \Dash\Dash::getInstance()->addPanelModulesGroupItem('glyphicon glyphicon-cloud-upload', Zira\Locale::tm('Push notifications', 'push', null, \Dash\Dash::getDashLanguage()), null, 'pushSettingsWindow()');
@ -85,7 +85,7 @@ class Push {
$window->createMenuDropdownItem(Zira\Locale::tm('Send notifications', 'push'), 'glyphicon glyphicon-cloud-upload', 'desk_call(dash_push_record_open, this);', 'edit', true, array('typo'=>'push')) $window->createMenuDropdownItem(Zira\Locale::tm('Send notifications', 'push'), 'glyphicon glyphicon-cloud-upload', 'desk_call(dash_push_record_open, this);', 'edit', true, array('typo'=>'push'))
); );
} }
public static function dashRecordsContextMenuHook($window) { public static function dashRecordsContextMenuHook($window) {
return $window->createContextMenuItem(Zira\Locale::tm('Send notifications', 'push'), 'glyphicon glyphicon-cloud-upload', 'desk_call(dash_push_record_open, this);', 'edit', true, array('typo'=>'push')); return $window->createContextMenuItem(Zira\Locale::tm('Send notifications', 'push'), 'glyphicon glyphicon-cloud-upload', 'desk_call(dash_push_record_open, this);', 'edit', true, array('typo'=>'push'));
} }
@ -100,7 +100,7 @@ class Push {
self::$_web_push_instance = new \Minishlink\WebPush\WebPush($auth, $defaultOptions, $timeout, $clientOptions); self::$_web_push_instance = new \Minishlink\WebPush\WebPush($auth, $defaultOptions, $timeout, $clientOptions);
} }
return self::$_web_push_instance; return self::$_web_push_instance;
} }
public static function createSubscription(array $associativeArray) { public static function createSubscription(array $associativeArray) {
@ -133,7 +133,7 @@ class Push {
'url' => Zira\Helper::urlencode($url, true) 'url' => Zira\Helper::urlencode($url, true)
)) ))
]; ];
$auth = array( $auth = array(
'VAPID' => array( 'VAPID' => array(
'subject' => Zira\Helper::url('', true, true), 'subject' => Zira\Helper::url('', true, true),
@ -141,9 +141,9 @@ class Push {
'privateKey' => $push_priv_key 'privateKey' => $push_priv_key
) )
); );
$webPush = self::getWebPushInstance($auth); $webPush = self::getWebPushInstance($auth);
$sent = $webPush->sendNotification( $sent = $webPush->sendNotification(
$notification['subscription'], $notification['subscription'],
$notification['payload'], $notification['payload'],
@ -154,7 +154,7 @@ class Push {
if (!$sent->current()->isSuccess()) { if (!$sent->current()->isSuccess()) {
Zira\Log::write($sent->current()->getReason()); Zira\Log::write($sent->current()->getReason());
} }
return $sent->current()->isSuccess(); return $sent->current()->isSuccess();
} }
} }