Now browser notifications are disabled by default. Issue #156.
This commit is contained in:
parent
ddc5cd6a25
commit
84b2fefd19
|
@ -39,6 +39,8 @@ php-censor:
|
||||||
log:
|
log:
|
||||||
rotate: true
|
rotate: true
|
||||||
max_files: 10
|
max_files: 10
|
||||||
|
notifications:
|
||||||
|
enabled: false # notify.js notifications to browser
|
||||||
ssh:
|
ssh:
|
||||||
strength: 4096 # SSH keys strength (default: 2048)
|
strength: 4096 # SSH keys strength (default: 2048)
|
||||||
comment: admin@php-censor.info # SSH keys comment (default: admin@php-censor)
|
comment: admin@php-censor.info # SSH keys comment (default: admin@php-censor)
|
||||||
|
|
|
@ -164,13 +164,15 @@ var PHPCensor = {
|
||||||
error: PHPCensor.handleFailedAjax
|
error: PHPCensor.handleFailedAjax
|
||||||
});
|
});
|
||||||
|
|
||||||
$.ajax({
|
if (NOTIFICATIONS) {
|
||||||
url: APP_URL + 'web-notifications/builds-updated',
|
$.ajax({
|
||||||
success: function (data) {
|
url: APP_URL + 'web-notifications/builds-updated',
|
||||||
PHPCensor.showWebNotification(data);
|
success: function (data) {
|
||||||
},
|
PHPCensor.showWebNotification(data);
|
||||||
error: PHPCensor.handleFailedAjax
|
},
|
||||||
});
|
error: PHPCensor.handleFailedAjax
|
||||||
|
});
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
getProjectBuilds: function () {
|
getProjectBuilds: function () {
|
||||||
|
|
|
@ -34,15 +34,17 @@ PHPCensor.widgets.allProjects = {
|
||||||
error: PHPCensor.handleFailedAjax
|
error: PHPCensor.handleFailedAjax
|
||||||
});
|
});
|
||||||
|
|
||||||
$.ajax({
|
if (NOTIFICATIONS) {
|
||||||
url: APP_URL +
|
$.ajax({
|
||||||
|
url: APP_URL +
|
||||||
'web-notifications/widgets-all-projects-update/' +
|
'web-notifications/widgets-all-projects-update/' +
|
||||||
projectId,
|
projectId,
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
PHPCensor.showWebNotification(data);
|
PHPCensor.showWebNotification(data);
|
||||||
},
|
},
|
||||||
error: PHPCensor.handleFailedAjax
|
error: PHPCensor.handleFailedAjax
|
||||||
});
|
});
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -258,13 +258,16 @@ class InstallCommand extends Command
|
||||||
'rotate' => false,
|
'rotate' => false,
|
||||||
'max_files' => 0,
|
'max_files' => 0,
|
||||||
],
|
],
|
||||||
|
'notifications' => [
|
||||||
|
'enabled' => false,
|
||||||
|
],
|
||||||
'email_settings' => [
|
'email_settings' => [
|
||||||
'from_address' => 'PHP Censor <no-reply@php-censor.local>',
|
'from_address' => 'PHP Censor <no-reply@php-censor.local>',
|
||||||
'smtp_address' => null,
|
'smtp_address' => null,
|
||||||
'smtp_port' => null,
|
'smtp_port' => null,
|
||||||
'smtp_username' => null,
|
'smtp_username' => null,
|
||||||
'smtp_password' => null,
|
'smtp_password' => null,
|
||||||
'smtp_encryption' => false,
|
'smtp_encryption' => false,
|
||||||
],
|
],
|
||||||
'ssh' => [
|
'ssh' => [
|
||||||
'strength' => 2048,
|
'strength' => 2048,
|
||||||
|
|
|
@ -2,8 +2,20 @@
|
||||||
|
|
||||||
use PHPCensor\Helper\Lang;
|
use PHPCensor\Helper\Lang;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \PHPCensor\Model\User $user
|
||||||
|
*/
|
||||||
$user = $this->getUser();
|
$user = $this->getUser();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string $title
|
||||||
|
* @var string $subtitle
|
||||||
|
* @var string $version
|
||||||
|
* @var string $content
|
||||||
|
* @var string $skin
|
||||||
|
* @var bool $notifications
|
||||||
|
*/
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
|
@ -35,7 +47,8 @@ $user = $this->getUser();
|
||||||
<script src="<?= APP_URL; ?>assets/vendor/notifyjs/dist/notify.js" type="text/javascript"></script>
|
<script src="<?= APP_URL; ?>assets/vendor/notifyjs/dist/notify.js" type="text/javascript"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
var APP_URL = '<?= APP_URL; ?>';
|
var APP_URL = '<?= APP_URL; ?>';
|
||||||
|
var NOTIFICATIONS = <?= ($notifications ? 'true' : 'false'); ?>;
|
||||||
var LANGUAGE = '<?= Lang::getLanguage(); ?>';
|
var LANGUAGE = '<?= Lang::getLanguage(); ?>';
|
||||||
|
|
||||||
<?php if (defined('JSON_UNESCAPED_UNICODE')): ?>
|
<?php if (defined('JSON_UNESCAPED_UNICODE')): ?>
|
||||||
|
|
|
@ -48,9 +48,12 @@ abstract class WebController extends Controller
|
||||||
if (!empty($this->layoutName)) {
|
if (!empty($this->layoutName)) {
|
||||||
$this->layout = new View($this->layoutName);
|
$this->layout = new View($this->layoutName);
|
||||||
|
|
||||||
$this->layout->title = 'PHP Censor';
|
$notifications = (bool)Config::getInstance()->get('php-censor.notifications.enabled', false);
|
||||||
$this->layout->breadcrumb = [];
|
|
||||||
$this->layout->version = trim(file_get_contents(ROOT_DIR . 'VERSION.md'));
|
$this->layout->title = 'PHP Censor';
|
||||||
|
$this->layout->breadcrumb = [];
|
||||||
|
$this->layout->version = trim(file_get_contents(ROOT_DIR . 'VERSION.md'));
|
||||||
|
$this->layout->notifications = $notifications;
|
||||||
|
|
||||||
$groups = [];
|
$groups = [];
|
||||||
$groupStore = Factory::getStore('ProjectGroup');
|
$groupStore = Factory::getStore('ProjectGroup');
|
||||||
|
|
Loading…
Reference in a new issue