Merge pull request #71 from iMattPro/fixes

Small fixes

Author: iMattPro

controller/manifest.php

@@ -55,9 +55,9 @@ public function __construct(config $config, language $language, path_helper $pat
 	 */
 	public function handle(): JsonResponse
 	{
-		if ($this->user->data['is_bot'] || $this->user->data['user_type'] == USER_INACTIVE)
+		if ($this->user->data['is_bot'])
 		{
-			throw new http_exception(Response::HTTP_FORBIDDEN, 'Forbidden');
+			throw new http_exception(Response::HTTP_FORBIDDEN, 'NO_AUTH_OPERATION');
 		}
 
 		$board_path = $this->config['force_server_vars'] ? $this->config['script_path'] : $this->path_helper->get_web_root_path();

language/en/webpushnotifications_module_ucp.php

@@ -42,6 +42,7 @@
 	'NOTIFY_WEBPUSH_NOTIFICATIONS'	=> 'Web push notifications',
 	'NOTIFY_WEBPUSH_DISABLE'		=> 'Disable push notifications',
 	'NOTIFY_WEBPUSH_ENABLE'			=> 'Enable push notifications',
+	'NOTIFY_WEBPUSH_ENABLE_SLIDER'	=> 'Enable push notifications',
 	'NOTIFY_WEBPUSH_ENABLE_EXPLAIN'	=> 'Enabling push notifications will activate them on this device only. You can turn off notifications at any time through your browser settings or by clicking the button above. Additionally, if no web push notification types are selected below, you will not receive any web push notifications.',
 	'NOTIFY_WEBPUSH_SUBSCRIBE'		=> 'Enable to subscribe',
 	'NOTIFY_WEBPUSH_UNSUBSCRIBE'	=> 'Disable to unsubscribe',

language/ru/webpushnotifications_module_ucp.php

@@ -42,6 +42,7 @@
 	'NOTIFY_WEBPUSH_NOTIFICATIONS'	=> 'Браузерные push—уведомления',
 	'NOTIFY_WEBPUSH_DISABLE'		=> 'Отключить',
 	'NOTIFY_WEBPUSH_ENABLE'			=> 'Включить',
+	'NOTIFY_WEBPUSH_ENABLE_SLIDER'	=> 'Браузерные уведомления',
 	'NOTIFY_WEBPUSH_ENABLE_EXPLAIN'	=> 'Включение браузерных push—уведомлений активирует их только на данном устройстве. Вы сможете отключить их в любое время через настройки браузера или с помощью кнопки «Отключить» выше, которая появится после включения браузерных push—уведомлений. Если не выбран ни один из типов уведомлений в категории «Браузерные» ниже, вы также не будете получать браузерные push—уведомления.',
 	'NOTIFY_WEBPUSH_SUBSCRIBE'		=> 'Подписаться',
 	'NOTIFY_WEBPUSH_UNSUBSCRIBE'	=> 'Отписаться',

styles/all/template/event/notification_dropdown_footer_after.html

@@ -1,6 +1,6 @@
 {% if NOTIFICATIONS_WEBPUSH_ENABLE and notification_types is not defined %}
 	<div class="wpn-notification-dropdown-footer" title="{{ lang('NOTIFY_WEBPUSH_DROPDOWN_TITLE') }}">
-		<span class="ellipsis-text">{{ lang('NOTIFY_WEBPUSH_ENABLE') ~ lang('COLON') }}</span>
+		<span class="ellipsis-text">{{ lang('NOTIFY_WEBPUSH_ENABLE_SLIDER') ~ lang('COLON') }}</span>
 		<button id="subscribe_webpush" name="subscribe_webpush" data-l-err="{{ lang('INFORMATION') }}" data-l-msg="{{ lang('NOTIFY_WEBPUSH_DENIED') }}">
 			<i class="icon fa-toggle-off fa-fw icon-lightgray" aria-hidden="true" title="{{ lang('NOTIFY_WEBPUSH_SUBSCRIBE') }}"><span class="sr-only">{{ lang('NOTIFY_WEBPUSH_SUBSCRIBE') }}</span></i>
 		</button>

ucp/controller/webpush.php

@@ -100,7 +100,7 @@ public function notification(): JsonResponse
 	{
 		if (!$this->request->is_ajax() || $this->user->data['is_bot'] || $this->user->data['user_type'] == USER_INACTIVE)
 		{
-			throw new http_exception(Response::HTTP_FORBIDDEN, 'Forbidden');
+			throw new http_exception(Response::HTTP_FORBIDDEN, 'NO_AUTH_OPERATION');
 		}
 
 		if ($this->user->id() !== ANONYMOUS)
@@ -129,7 +129,7 @@ private function get_user_notifications(): string
 		// Subscribe should only be available for logged-in "normal" users
 		if ($this->user->data['user_type'] == USER_IGNORE)
 		{
-			throw new http_exception(Response::HTTP_FORBIDDEN, 'Forbidden');
+			throw new http_exception(Response::HTTP_FORBIDDEN, 'NO_AUTH_OPERATION');
 		}
 
 		$item_id = $this->request->variable('item_id', 0);
@@ -189,7 +189,7 @@ private function get_anonymous_notifications(): string
 			}
 		}
 
-		throw new http_exception(Response::HTTP_FORBIDDEN, 'Forbidden');
+		throw new http_exception(Response::HTTP_FORBIDDEN, 'NO_AUTH_OPERATION');
 	}
 
 	/**