Merge branch 'beta' into detailview

This commit is contained in:
Andre Lorbach 2008-04-30 11:07:45 +02:00
commit 810fa4b83b
3 changed files with 22 additions and 0 deletions

View File

@ -1,4 +1,8 @@
---------------------------------------------------------------------------
Version 2.1.4 (devel), 2008-04-30
- Added missing facility 10 to 15 from RFC3164 into phhlogcon
Version 2.1.3 (devel), 2008-04-29
- Fixed a bug in the installer, the table type was not written into the configuration.

View File

@ -77,6 +77,12 @@ $content['filter_facility_list'][] = array( "ID" => SYSLOG_LPR, "DisplayName" =>
$content['filter_facility_list'][] = array( "ID" => SYSLOG_NEWS, "DisplayName" => "NEWS", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_UUCP, "DisplayName" => "UUCP", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_CRON, "DisplayName" => "CRON", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_SECURITY, "DisplayName" => "SECURITY", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_FTP, "DisplayName" => "FTP", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_NTP, "DisplayName" => "NTP", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_LOGAUDIT, "DisplayName" => "LOGAUDIT", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_LOGALERT, "DisplayName" => "LOGALERT", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_CLOCK, "DisplayName" => "CLOCK", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_LOCAL0, "DisplayName" => "LOCAL0", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_LOCAL1, "DisplayName" => "LOCAL1", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_LOCAL2, "DisplayName" => "LOCAL2", "selected" => "" );

View File

@ -77,6 +77,12 @@ define('SYSLOG_LPR', 6);
define('SYSLOG_NEWS', 7);
define('SYSLOG_UUCP', 8);
define('SYSLOG_CRON', 9);
define('SYSLOG_SECURITY', 10);
define('SYSLOG_FTP', 11);
define('SYSLOG_NTP', 12);
define('SYSLOG_LOGAUDIT', 13);
define('SYSLOG_LOGALERT', 14);
define('SYSLOG_CLOCK', 15);
define('SYSLOG_LOCAL0', 16);
define('SYSLOG_LOCAL1', 17);
define('SYSLOG_LOCAL2', 18);
@ -95,6 +101,12 @@ $facility_colors[SYSLOG_LPR] = "#A7F1D6";
$facility_colors[SYSLOG_NEWS] = "#A7F1E8";
$facility_colors[SYSLOG_UUCP] = "#A7E1F1";
$facility_colors[SYSLOG_CRON] = "#A7C8F1";
$facility_colors[SYSLOG_SECURITY] = "#F2ECD8";
$facility_colors[SYSLOG_FTP] = "#ECE3C4";
$facility_colors[SYSLOG_NTP] = "#E7DAB1";
$facility_colors[SYSLOG_LOGAUDIT] = "#F2D8E2";
$facility_colors[SYSLOG_LOGALERT] = "#ECC4D3";
$facility_colors[SYSLOG_CLOCK] = "#E7B1C5";
$facility_colors[SYSLOG_LOCAL0] = "#F2F2F2";
$facility_colors[SYSLOG_LOCAL1] = "#E4E5E6";
$facility_colors[SYSLOG_LOCAL2] = "#D6D9DA";