mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix growl issues.

Browse Source 
Ticket #518
Ticket #519

Submibtted-by: Blake Skinner
This commit is contained in:
Scott Ullrich 2010-04-17 21:56:11 -04:00
parent 1467b79f55
commit addbcae775
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
etc/inc/notices.inc
View File

@ -346,9 +346,12 @@ function notify_via_growl($message) {
global $config;
$growl_ip = $config['notifications']['growl']['ipaddress'];
$growl_password = $config['notifications']['growl']['password'];
$growl_name = $config['notifications']['growl']['name'];
$growl_notification = $config['notifications']['growl']['notification_name'];
if(!empty($growl_ip)) {
$growl = new Growl($growl_ip, $growl_password);
$growl->notify("pfSense growl alert", "pfSense", "{$message}");
$growl = new Growl($growl_ip, $growl_password, $growl_name);
$growl->notify("{$growl_notification}", "pfSense", "{$message}");
}
}
@ -365,8 +368,12 @@ function register_via_growl() {
global $config;
$growl_ip = $config['notifications']['growl']['ipaddress'];
$growl_password = $config['notifications']['growl']['password'];
$growl_name = $config['notifications']['growl']['name'];
$growl_notification = $config['notifications']['growl']['notification_name'];
if($growl_ip) {
$growl = new Growl($growl_ip, $growl_password);
$growl = new Growl($growl_ip, $growl_password, $growl_name);
$growl->addNotification($growl_notification);
$growl->register();
}
}

27
usr/local/www/system_advanced_notifications.php
View File

@ -46,6 +46,17 @@ if($config['notifications']['growl']['password'])
if($config['notifications']['growl']['ipaddress'])
$pconfig['ipaddress'] = $config['notifications']['growl']['ipaddress'];
if($config['notifications']['growl']['notification_name'])
$pconfig['notification_name'] = $config['notifications']['growl']['notification_name'];
else
$pconfig['notification_name'] = 'pfSense growl alert';
if($config['notifications']['growl']['name'])
$pconfig['name'] = $config['notifications']['growl']['name'];
else
$pconfig['name'] = 'PHP-Growl';
// SMTP
if($config['notifications']['smtp']['ipaddress'])
$pconfig['smtpipaddress'] = $config['notifications']['smtp']['ipaddress'];
@ -81,6 +92,8 @@ if ($_POST) {
// Growl
$config['notifications']['growl']['ipaddress'] = $_POST['ipaddress'];
$config['notifications']['growl']['password'] = $_POST['password'];
$config['notifications']['growl']['name'] = $_POST['name'];
$config['notifications']['growl']['notification_name'] = $_POST['notification_name'];
// SMTP
$config['notifications']['smtp']['ipaddress'] = $_POST['smtpipaddress'];
@ -147,6 +160,20 @@ include("head.inc");
<tr>
<td colspan="2" valign="top" class="listtopic">Growl</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Registration Name</td>
<td width="78%" class="vtable">
<input name='name' value='<?php echo $pconfig['name']; ?>'><br/>
Enter the name to register with the Growl server (default: PHP-Growl).
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Notification Name</td>
<td width="78%" class="vtable">
<input name='notification_name' value='<?php echo $pconfig['notification_name']; ?>'><br/>
Enter a name for the Growl notifications (default: pfSense growl alert).
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">IP Address</td>
<td width="78%" class="vtable">