Commit cf484f1b authored by Nigel Kukard's avatar Nigel Kukard
Browse files

Cosmetic fixes and code cleanup

parent 8a6e8bb3
Installing Policyd v2. Installing PolicyD v2.
* *
* Requirements for Policyd v2 * Requirements for PolicyD v2
* *
Note: For CentOS you will need to use RPMForge repositories. Note: For CentOS you will need to use RPMForge repositories.
......
...@@ -37,7 +37,7 @@ use cbp::protocols; ...@@ -37,7 +37,7 @@ use cbp::protocols;
# User plugin info # User plugin info
our $pluginInfo = { our $pluginInfo = {
name => "Bizanga Protocol Support Module", name => "Bizanga Protocol Support Module",
init => \&init, ini => \&init,
priority => 50, priority => 50,
protocol_init => \&protocol_init, protocol_init => \&protocol_init,
protocol_check => \&protocol_check, protocol_check => \&protocol_check,
...@@ -253,7 +253,7 @@ sub protocol_getresponse ...@@ -253,7 +253,7 @@ sub protocol_getresponse
Date: $timestamp Date: $timestamp
Content-Length: 0 Content-Length: 0
Content-Type: text/plain Content-Type: text/plain
Server: Policyd/".VERSION." (Cluebringer) Server: PolicyD/".VERSION." (Cluebringer)
Connection: close Connection: close
"; ";
...@@ -289,6 +289,5 @@ sub protocol_validate { ...@@ -289,6 +289,5 @@ sub protocol_validate {
1; 1;
# vim: ts=4 # vim: ts=4
...@@ -32,7 +32,7 @@ use cbp::logging; ...@@ -32,7 +32,7 @@ use cbp::logging;
use cbp::version; use cbp::version;
print("Policyd Admin Tool (ClueBringer) v".VERSION." - Copyright (c) 2007-2010 AllWorldIT\n"); print("PolicyD Admin Tool (Cluebringer) v".VERSION." - Copyright (c) 2009-2014 AllWorldIT\n");
# Fire up commandline processing... # Fire up commandline processing...
my %opts; my %opts;
...@@ -258,18 +258,4 @@ sub log ...@@ -258,18 +258,4 @@ sub log
# Load modules we need and run cleanup() function
# Cleanup session_tracking older than 24hr
# Cleanup quotas_tracking
# - check last update, if its older than now - period, remove
# CheckHelo
# - Remove checkhelo_tracking older than specified period, default to 1 month
# vim: ts=4 # vim: ts=4
...@@ -239,7 +239,7 @@ sub post_configure_hook { ...@@ -239,7 +239,7 @@ sub post_configure_hook {
my $log_mail = $self->{'config'}{'log_mail'}; my $log_mail = $self->{'config'}{'log_mail'};
$self->log(LOG_NOTICE,"[CBPOLICYD] Policyd v2 / Cluebringer - v".VERSION); $self->log(LOG_NOTICE,"[CBPOLICYD] PolicyD v2 / Cluebringer - v".VERSION);
$self->log(LOG_NOTICE,"[CBPOLICYD] Initializing system modules."); $self->log(LOG_NOTICE,"[CBPOLICYD] Initializing system modules.");
# Init config # Init config
...@@ -761,7 +761,7 @@ sub protocol_getresponse ...@@ -761,7 +761,7 @@ sub protocol_getresponse
# Display help # Display help
sub displayHelp { sub displayHelp {
print(STDERR "Policyd (ClueBringer) v".VERSION." - Copyright (c) 2007-2009 AllWorldIT\n"); print(STDERR "PolicyD (Cluebringer) v".VERSION." - Copyright (c) 2007-2014 AllWorldIT\n");
print(STDERR<<EOF); print(STDERR<<EOF);
...@@ -775,9 +775,9 @@ EOF ...@@ -775,9 +775,9 @@ EOF
__PACKAGE__->run; __PACKAGE__->run;
1; 1;
# vim: ts=4 # vim: ts=4
...@@ -37,13 +37,13 @@ AutoProv: no ...@@ -37,13 +37,13 @@ AutoProv: no
%description %description
Policyd v2 (codenamed "cluebringer") is a multi-platform policy server PolicyD v2 (codenamed "cluebringer") is a multi-platform policy server
for popular MTAs. This policy daemon is designed mostly for large for popular MTAs. This policy daemon is designed mostly for large
scale mail hosting environments. The main goal is to implement as many scale mail hosting environments. The main goal is to implement as many
spam combating and email compliance features as possible while at the spam combating and email compliance features as possible while at the
same time maintaining the portability, stability and performance same time maintaining the portability, stability and performance
required for mission critical email hosting of today. Most of the required for mission critical email hosting of today. Most of the
ideas and methods implemented in Policyd v2 stem from Policyd v1 ideas and methods implemented in PolicyD v2 stem from PolicyD v1
as well as the authors' long time involvement in large scale mail as well as the authors' long time involvement in large scale mail
hosting industry. hosting industry.
......
# Policyd v2 (codenamed "cluebringer") is a multi-platform policy server # PolicyD v2 (codenamed "cluebringer") is a multi-platform policy server
# for popular MTAs. This policy daemon is designed mostly for large # for popular MTAs. This policy daemon is designed mostly for large
# scale mail hosting environments. The main goal is to implement as many # scale mail hosting environments. The main goal is to implement as many
# spam combating and email compliance features as possible while at the # spam combating and email compliance features as possible while at the
# same time maintaining the portability, stability and performance # same time maintaining the portability, stability and performance
# required for mission critical email hosting of today. Most of the # required for mission critical email hosting of today. Most of the
# ideas and methods implemented in Policyd v2 stem from Policyd v1 # ideas and methods implemented in PolicyD v2 stem from PolicyD v1
# as well as the authors' long time involvement in large scale mail # as well as the authors' long time involvement in large scale mail
# hosting industry. # hosting industry.
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# with this program; if not, write to the Free Software Foundation, Inc., # with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
/* Amavisd-new integration for Policyd */ /* Amavisd-new integration for PolicyD */
CREATE TABLE @PREFIX@amavis_rules ( CREATE TABLE @PREFIX@amavis_rules (
ID @SERIAL_TYPE@, ID @SERIAL_TYPE@,
......
...@@ -22,13 +22,13 @@ Breaks: ...@@ -22,13 +22,13 @@ Breaks:
Recommends: cluebringer-webui Recommends: cluebringer-webui
Suggests: mysql-server Suggests: mysql-server
Description: Postfix Policy Daemon Description: Postfix Policy Daemon
Policyd v2 (codenamed "cluebringer") is a multi-platform policy server PolicyD v2 (codenamed "cluebringer") is a multi-platform policy server
for popular MTAs. This policy daemon is designed mostly for large for popular MTAs. This policy daemon is designed mostly for large
scale mail hosting environments. The main goal is to implement as many scale mail hosting environments. The main goal is to implement as many
spam combating and email compliance features as possible while at the spam combating and email compliance features as possible while at the
same time maintaining the portability, stability and performance same time maintaining the portability, stability and performance
required for mission critical email hosting of today. Most of the required for mission critical email hosting of today. Most of the
ideas and methods implemented in Policyd v2 stem from Policyd v1 ideas and methods implemented in PolicyD v2 stem from PolicyD v1
as well as the authors' long time involvement in large scale mail as well as the authors' long time involvement in large scale mail
hosting industry. hosting industry.
...@@ -37,14 +37,14 @@ Architecture: all ...@@ -37,14 +37,14 @@ Architecture: all
Depends: ${misc:Depends} Depends: ${misc:Depends}
Suggests: apache2, php5, php5-mysql Suggests: apache2, php5, php5-mysql
Description: Postfix Policy Daemon (webui) Description: Postfix Policy Daemon (webui)
Policyd v2 (codenamed "cluebringer") is a multi-platform policy server PolicyD v2 (codenamed "cluebringer") is a multi-platform policy server
for popular MTAs. This policy daemon is designed mostly for large for popular MTAs. This policy daemon is designed mostly for large
scale mail hosting environments. The main goal is to implement as many scale mail hosting environments. The main goal is to implement as many
spam combating and email compliance features as possible while at the spam combating and email compliance features as possible while at the
same time maintaining the portability, stability and performance same time maintaining the portability, stability and performance
required for mission critical email hosting of today. Most of the required for mission critical email hosting of today. Most of the
ideas and methods implemented in Policyd v2 stem from Policyd v1 ideas and methods implemented in PolicyD v2 stem from PolicyD v1
as well as the authors' long time involvement in large scale mail as well as the authors' long time involvement in large scale mail
hosting industry. hosting industry.
. .
This package contains the webui for Policyd. This package contains the webui for PolicyD.
...@@ -35,7 +35,7 @@ function connect_db() ...@@ -35,7 +35,7 @@ function connect_db()
$dbh->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER); $dbh->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
} catch (PDOException $e) { } catch (PDOException $e) {
die("Error connecting to Policyd v2 DB: " . $e->getMessage()); die("Error connecting to the database: " . $e->getMessage());
} }
return $dbh; return $dbh;
...@@ -64,5 +64,4 @@ function connect_postfix_db() ...@@ -64,5 +64,4 @@ function connect_postfix_db()
} }
# vim: ts=4
?>
...@@ -32,11 +32,10 @@ function printFooter() ...@@ -32,11 +32,10 @@ function printFooter()
</tr> </tr>
<tr> <tr>
<td id="footer">Policyd - Copyright &copy; 2008, LinuxRulz - <a href="http://www.policyd.org/v2/">http://www.policyd.org/v2/</a></td> <td id="footer">PolicyD - Copyright &copy; 2008-2015, AllWorldIT - <a href="http://www.policyd.org/v2/">http://www.policyd.org/v2/</a></td>
</tr> </tr>
</table> </table>
</body> </body>
</html> </html>
<?php <?php
} }
?>
...@@ -44,7 +44,7 @@ function printHeader($params = NULL) ...@@ -44,7 +44,7 @@ function printHeader($params = NULL)
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head> <head>
<title>Policyd Web Administration</title> <title>PolicyD Web Administration</title>
<link rel="stylesheet" type="text/css" href="stylesheet.css" /> <link rel="stylesheet" type="text/css" href="stylesheet.css" />
<script type="text/javascript" src="tooltips/BubbleTooltips.js"></script> <script type="text/javascript" src="tooltips/BubbleTooltips.js"></script>
...@@ -59,7 +59,7 @@ function printHeader($params = NULL) ...@@ -59,7 +59,7 @@ function printHeader($params = NULL)
<table id="maintable"> <table id="maintable">
<tr> <tr>
<td id="header">Policyd Web Administration</td> <td id="header">PolicyD Web Administration</td>
</tr> </tr>
<tr> <tr>
...@@ -141,8 +141,7 @@ function printHeader($params = NULL) ...@@ -141,8 +141,7 @@ function printHeader($params = NULL)
<?php <?php
foreach ($tabs as $key => $value) { foreach ($tabs as $key => $value) {
?> <li> ?> <li>
<a href="<?php echo $value ?>" <a href="<?php echo $value ?>" title="<?php echo $key ?>">
title="<?php echo $key ?>">
<span><?php echo $key ?></span></a> <span><?php echo $key ?></span></a>
</li> </li>
<?php <?php
...@@ -158,5 +157,5 @@ function printHeader($params = NULL) ...@@ -158,5 +157,5 @@ function printHeader($params = NULL)
} }
# vim: ts=4 # vim: ts=4
?>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment