13 files changed, 953 insertions, 885 deletions

diff --git a/debian/control b/debian/control
index 881052dd6..88e5071b6 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Description: Configuration management client
 
 Package: bcfg2-server
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-lxml (>= 0.9), libxml2-utils (>= 2.6.23), lsb-base (>= 3.1-9), ucf, bcfg2 (= ${binary:Version}), openssl, python-ssl | python2.6 | python3.0 | python3.1 | python3.2, gamin | fam, python-gamin | python-fam, python-gamin | fam, gamin | python-fam
+Depends: ${python:Depends}, ${misc:Depends}, python-lxml (>= 0.9), libxml2-utils (>= 2.6.23), lsb-base (>= 3.1-9), ucf, bcfg2 (= ${binary:Version}), openssl, python-ssl | python2.6 | python3.0 | python3.1 | python3.2, python-gamin
 XB-Python-Version: >= 2.4
 Recommends: graphviz
 Suggests: python-cheetah, python-genshi (>= 0.4.4), python-profiler, sqlalchemy (>= 0.5.0), python-django, mail-transport-agent
diff --git a/doc/help/troubleshooting.txt b/doc/help/troubleshooting.txt
index 0892587aa..17bc391bd 100644
--- a/doc/help/troubleshooting.txt
+++ b/doc/help/troubleshooting.txt
@@ -139,6 +139,12 @@ be taken to remedy them.
 |                              |          | associated with a   |              |
 |                              |          | non-profile group.  |              |
 +------------------------------+----------+---------------------+--------------+
+| Failed to decode <filename>  | Server   | The encoding being  | [10]_        |
+| Please verify you are using  |          | used is unable to   |              |
+| the proper encoding          |          | decode the          |              |
+|                              |          | character present   |              |
+|                              |          | in this file.       |              |
++------------------------------+----------+---------------------+--------------+
 
 
 .. [1] This entry is not being bound. Ensure that a version of this
@@ -158,6 +164,8 @@ be taken to remedy them.
 .. [8] Ensure that the file is properly formed XML.
 .. [9] Fix hostname resolution for the client or ensure that the profile
        group is properly setup.
+.. [10] Ensure the correct encoding is specified in the [components]
+        section of ``bcfg2.conf``.
 
 FAQs
 ====
@@ -172,10 +180,12 @@ why.
 Why am I getting a traceback?
 -----------------------------
 
-If you get a traceback, please let us know by :ref:`reporting it
-<report-a-bug>` on Trac, via the mailing list, or on IRC. Your best bet
+If you get a traceback, please let us know by reporting it
+on `Trac ticket tracker`_, via the mailing list, or on IRC. Your best bet
 to get a quick response will be to jump on IRC during the daytime (CST).
 
+.. _Trac ticket tracker: http://bcfg2.org
+
 What is the most common cause of "The following entries are not handled by any tool"?
 -------------------------------------------------------------------------------------
 
diff --git a/doc/server/plugins/generators/cfg.txt b/doc/server/plugins/generators/cfg.txt
index 8b40eec67..612b14bec 100644
--- a/doc/server/plugins/generators/cfg.txt
+++ b/doc/server/plugins/generators/cfg.txt
@@ -24,12 +24,13 @@ the files on your clients, starting at the root level. For example::
     bin/  boot/  etc/  opt/  root/  usr/  var/
 
 Specific config files go in like-named directories in this
-heirarchy. For example the password file, ``/etc/passwd``, goes in
-``Cfg/etc/passwd/passwd``, while the ssh pam module config file,
-``/etc/pam.d/sshd``, goes in ``Cfg/etc/pam.d/sshd/sshd``. The reason
-for the like-name directory is to allow multiple versions of each file
-to exist, as described below. Note that these files are exact copies of
-what will appear on the client machine - no templates, XML wrappers, etc.
+heirarchy.  For example the password file, ``/etc/passwd``, goes
+in ``Cfg/etc/passwd/passwd``, while the ssh pam module config file,
+``/etc/pam.d/sshd``, goes in ``Cfg/etc/pam.d/sshd/sshd``. The reason for
+the like-name directory is to allow multiple versions of each file to
+exist, as described below. Note that these files are exact copies of what
+will appear on the client machine (except when using genshi templating --
+see below).
 
 Group-Specific Files
 ====================
@@ -157,6 +158,17 @@ will be processed using the new template style (like .newtxt in the TGenshi
 plugin).  Templates can be host and group specific as well.  Deltas will not
 be processed for any genshi base file.
 
+.. note::
+
+    If you are using genshi templating in combination with host-specific
+    or group-specific files, you will need to ensure that the ``.genshi``
+    extensions is at the **end** of the filename. Using the examples
+    from above for *host.example.com* and group *server* you would have
+    the following::
+
+        Cfg/etc/fstab/fstab.H_host.example.com.genshi
+        Cfg/etc/fstab/fstab.G50_server.genshi
+
 File permissions
 ================
 
diff --git a/man/bcfg2-ping-sweep.8 b/man/bcfg2-ping-sweep.8
new file mode 100644
index 000000000..54eaa8e76
--- /dev/null
+++ b/man/bcfg2-ping-sweep.8
@@ -0,0 +1,20 @@
+.TH "bcfg2-ping-sweep" 8
+.SH NAME
+bcfg2-ping-sweep \- Update pingable and pingtime attributes in
+clients.xml
+.SH SYNOPSIS
+.B bcfg2-ping-sweep
+.SH "DESCRIPTION"
+.PP
+\fBbcfg2-ping-sweep\fR traverses the list of clients in
+Metadata/clients.xml and updates their pingable/pingtime attributes. The
+pingtime value is set to the last time the client was pinged (not the
+RTT value).
+.SH OPTIONS
+.PP
+.B None
+.SH "SEE ALSO"
+.BR bcfg(1),
+.BR bcfg2-server(8)
+.SH "BUGS"
+None currently known
diff --git a/man/bcfg2-reports.8 b/man/bcfg2-reports.8
index b8b4cccee..bc4c9344b 100644
--- a/man/bcfg2-reports.8
+++ b/man/bcfg2-reports.8
@@ -1,82 +1,81 @@
-.TH "bcfg2-reports" 8

-.SH NAME

-bcfg2-reports \- Query reporting system for client status

-.SH SYNOPSIS

-.B bcfg2-reports

-.I [-v] 

-.SH DESCRIPTION

-.PP

-.B bcfg2-reports

-bcfg2-reports allows you to retrieve data from the database about

-clients, and the states of their current interactions. It also allows

-you to change the expired/unexpired states.

-The utility runs as a standalone application. It does, however, use

-the models from /src/lib/Server/Reports/reports/models.py.

-.SH OPTIONS

-.PP

-.B "\-a"

-.RS

-Shows all hosts, including expired hosts.

-.RE

-.B "\-b NAME"

-.RS

-Single-host mode \- shows bad entries from the current interaction of

-NAME. NAME is the name of the entry.

-.RE

-.B "-c\"

-.RS

-Shows only clean hosts.

-.RE

-.B "\-d"

-.RS

-Shows only dirty hosts.

-.RE

-.B "\-e NAME"

-.RS

-Single host mode \- shows extra entries from the current interaction

-of NAME. NAME is the name of the entry.

-.RE

-.B "\-h"

-.RS

-Shows help and usage info about bcfg2-reports.

-.RE

-.B "\-s NAME"

-.RS

-Single host mode \- shows bad and extra entries from the current

-interaction of NAME. NAME is the name of the entry.

-.RE

-.B "\-x NAME"

-.RS

-Toggles expired/unexpired state of NAME. NAME is the name of the entry.

-.RE

-.B "\-\-badentry=KIND,NAME"

-.RS

-Shows only hosts whose current interaction has bad entries in of KIND

-kind and NAME name; if a single argument ARG1 is given, then KIND,NAME

-pairs will be read from a file of name ARG1. KIND is the type of entry

-(Package, Path, Service, etc). NAME is the name of the entry. 

-.RE

-.B "\-\-extraentry=KIND,NAME"

-.RS

-Shows only hosts whose current interaction has extra entries in of KIND

-kind and NAME name; if a single argument ARG1 is given, then KIND,NAME

-pairs will be read from a file of name ARG1. KIND is the type of entry

-(Package, Path, Service, etc). NAME is the name of the entry. 

-.RE

-.B "\-\-fields=ARG1,ARG2,..."

-.RS

-Only displays the fields ARG1,ARG2,... (name, time, state)

-.RE

-.B "\-\-sort=ARG1,ARG2,..."

-.RS

-Sorts output on ARG1,ARG2,... (name, time, state)

-.RE

-.B "\-\-stale"

-.RS

-Shows hosts which haven't run in the last 24 hours

-.RE

-.SH "SEE ALSO"

-.BR bcfg2(1),

-.BR bcfg2-server(8)

-.SH "BUGS"

-None currently known

+.TH "bcfg2-reports" 8
+.SH NAME
+bcfg2-reports \- Query reporting system for client status
+.SH SYNOPSIS
+.B bcfg2-reports
+.I [-v] 
+.SH DESCRIPTION
+.PP
+\fBbcfg2-reports\fR allows you to retrieve data from the database about
+clients, and the states of their current interactions. It also allows
+you to change the expired/unexpired states.
+The utility runs as a standalone application. It does, however, use
+the models from /src/lib/Server/Reports/reports/models.py.
+.SH OPTIONS
+.PP
+.B "\-a"
+.RS
+Shows all hosts, including expired hosts.
+.RE
+.B "\-b NAME"
+.RS
+Single-host mode \- shows bad entries from the current interaction of
+NAME. NAME is the name of the entry.
+.RE
+.B "-c\"
+.RS
+Shows only clean hosts.
+.RE
+.B "\-d"
+.RS
+Shows only dirty hosts.
+.RE
+.B "\-e NAME"
+.RS
+Single host mode \- shows extra entries from the current interaction
+of NAME. NAME is the name of the entry.
+.RE
+.B "\-h"
+.RS
+Shows help and usage info about bcfg2-reports.
+.RE
+.B "\-s NAME"
+.RS
+Single host mode \- shows bad and extra entries from the current
+interaction of NAME. NAME is the name of the entry.
+.RE
+.B "\-x NAME"
+.RS
+Toggles expired/unexpired state of NAME. NAME is the name of the entry.
+.RE
+.B "\-\-badentry=KIND,NAME"
+.RS
+Shows only hosts whose current interaction has bad entries in of KIND
+kind and NAME name; if a single argument ARG1 is given, then KIND,NAME
+pairs will be read from a file of name ARG1. KIND is the type of entry
+(Package, Path, Service, etc). NAME is the name of the entry. 
+.RE
+.B "\-\-extraentry=KIND,NAME"
+.RS
+Shows only hosts whose current interaction has extra entries in of KIND
+kind and NAME name; if a single argument ARG1 is given, then KIND,NAME
+pairs will be read from a file of name ARG1. KIND is the type of entry
+(Package, Path, Service, etc). NAME is the name of the entry. 
+.RE
+.B "\-\-fields=ARG1,ARG2,..."
+.RS
+Only displays the fields ARG1,ARG2,... (name, time, state)
+.RE
+.B "\-\-sort=ARG1,ARG2,..."
+.RS
+Sorts output on ARG1,ARG2,... (name, time, state)
+.RE
+.B "\-\-stale"
+.RS
+Shows hosts which haven't run in the last 24 hours
+.RE
+.SH "SEE ALSO"
+.BR bcfg2(1),
+.BR bcfg2-server(8)
+.SH "BUGS"
+None currently known
diff --git a/reports/site_media/CalendarPopup.js b/reports/site_media/CalendarPopup.js
index b63ff2f11..8119032df 100644
--- a/reports/site_media/CalendarPopup.js
+++ b/reports/site_media/CalendarPopup.js
@@ -1,693 +1,693 @@
-// ===================================================================

-// Author: Matt Kruse <matt@mattkruse.com>

-// WWW: http://www.mattkruse.com/

-//

-// NOTICE: You may use this code for any purpose, commercial or

-// private, without any further permission from the author. You may

-// remove this notice from your final code if you wish, however it is

-// appreciated by the author if at least my web site address is kept.

-//

-// You may *NOT* re-distribute this code in any way except through its

-// use. That means, you can include it in your product, or your web

-// site, or any other form where the code is actually being used. You

-// may not put the plain javascript up on your site for download or

-// include it in your javascript libraries for download. 

-// If you wish to share this code with others, please just point them

-// to the URL instead.

-// Please DO NOT link directly to my .js files from your site. Copy

-// the files to your server and use them there. Thank you.

-// ===================================================================

-

-// HISTORY

-// ------------------------------------------------------------------

-// Feb 7, 2005: Fixed a CSS styles to use px unit

-// March 29, 2004: Added check in select() method for the form field

-//      being disabled. If it is, just return and don't do anything.

-// March 24, 2004: Fixed bug - when month name and abbreviations were

-//      changed, date format still used original values.

-// January 26, 2004: Added support for drop-down month and year

-//      navigation (Thanks to Chris Reid for the idea)

-// September 22, 2003: Fixed a minor problem in YEAR calendar with

-//      CSS prefix.

-// August 19, 2003: Renamed the function to get styles, and made it

-//      work correctly without an object reference

-// August 18, 2003: Changed showYearNavigation and 

-//      showYearNavigationInput to optionally take an argument of

-//      true or false

-// July 31, 2003: Added text input option for year navigation.

-//      Added a per-calendar CSS prefix option to optionally use 

-//      different styles for different calendars.

-// July 29, 2003: Fixed bug causing the Today link to be clickable 

-//      even though today falls in a disabled date range.

-//      Changed formatting to use pure CSS, allowing greater control

-//      over look-and-feel options.

-// June 11, 2003: Fixed bug causing the Today link to be unselectable

-//      under certain cases when some days of week are disabled

-// March 14, 2003: Added ability to disable individual dates or date

-//      ranges, display as light gray and strike-through

-// March 14, 2003: Removed dependency on graypixel.gif and instead 

-///     use table border coloring

-// March 12, 2003: Modified showCalendar() function to allow optional

-//      start-date parameter

-// March 11, 2003: Modified select() function to allow optional

-//      start-date parameter

-/* 

-DESCRIPTION: This object implements a popup calendar to allow the user to

-select a date, month, quarter, or year.

-

-COMPATABILITY: Works with Netscape 4.x, 6.x, IE 5.x on Windows. Some small

-positioning errors - usually with Window positioning - occur on the 

-Macintosh platform.

-The calendar can be modified to work for any location in the world by 

-changing which weekday is displayed as the first column, changing the month

-names, and changing the column headers for each day.

-

-USAGE:

-// Create a new CalendarPopup object of type WINDOW

-var cal = new CalendarPopup(); 

-

-// Create a new CalendarPopup object of type DIV using the DIV named 'mydiv'

-var cal = new CalendarPopup('mydiv'); 

-

-// Easy method to link the popup calendar with an input box. 

-cal.select(inputObject, anchorname, dateFormat);

-// Same method, but passing a default date other than the field's current value

-cal.select(inputObject, anchorname, dateFormat, '01/02/2000');

-// This is an example call to the popup calendar from a link to populate an 

-// input box. Note that to use this, date.js must also be included!!

-<A HREF="#" onClick="cal.select(document.forms[0].date,'anchorname','MM/dd/yyyy'); return false;">Select</A>

-

-// Set the type of date select to be used. By default it is 'date'.

-cal.setDisplayType(type);

-

-// When a date, month, quarter, or year is clicked, a function is called and

-// passed the details. You must write this function, and tell the calendar

-// popup what the function name is.

-// Function to be called for 'date' select receives y, m, d

-cal.setReturnFunction(functionname);

-// Function to be called for 'month' select receives y, m

-cal.setReturnMonthFunction(functionname);

-// Function to be called for 'quarter' select receives y, q

-cal.setReturnQuarterFunction(functionname);

-// Function to be called for 'year' select receives y

-cal.setReturnYearFunction(functionname);

-

-// Show the calendar relative to a given anchor

-cal.showCalendar(anchorname);

-

-// Hide the calendar. The calendar is set to autoHide automatically

-cal.hideCalendar();

-

-// Set the month names to be used. Default are English month names

-cal.setMonthNames("January","February","March",...);

-

-// Set the month abbreviations to be used. Default are English month abbreviations

-cal.setMonthAbbreviations("Jan","Feb","Mar",...);

-

-// Show navigation for changing by the year, not just one month at a time

-cal.showYearNavigation();

-

-// Show month and year dropdowns, for quicker selection of month of dates

-cal.showNavigationDropdowns();

-

-// Set the text to be used above each day column. The days start with 

-// sunday regardless of the value of WeekStartDay

-cal.setDayHeaders("S","M","T",...);

-

-// Set the day for the first column in the calendar grid. By default this

-// is Sunday (0) but it may be changed to fit the conventions of other

-// countries.

-cal.setWeekStartDay(1); // week is Monday - Sunday

-

-// Set the weekdays which should be disabled in the 'date' select popup. You can

-// then allow someone to only select week end dates, or Tuedays, for example

-cal.setDisabledWeekDays(0,1); // To disable selecting the 1st or 2nd days of the week

-

-// Selectively disable individual days or date ranges. Disabled days will not

-// be clickable, and show as strike-through text on current browsers.

-// Date format is any format recognized by parseDate() in date.js

-// Pass a single date to disable:

-cal.addDisabledDates("2003-01-01");

-// Pass null as the first parameter to mean "anything up to and including" the

-// passed date:

-cal.addDisabledDates(null, "01/02/03");

-// Pass null as the second parameter to mean "including the passed date and

-// anything after it:

-cal.addDisabledDates("Jan 01, 2003", null);

-// Pass two dates to disable all dates inbetween and including the two

-cal.addDisabledDates("January 01, 2003", "Dec 31, 2003");

-

-// When the 'year' select is displayed, set the number of years back from the 

-// current year to start listing years. Default is 2.

-// This is also used for year drop-down, to decide how many years +/- to display

-cal.setYearSelectStartOffset(2);

-

-// Text for the word "Today" appearing on the calendar

-cal.setTodayText("Today");

-

-// The calendar uses CSS classes for formatting. If you want your calendar to

-// have unique styles, you can set the prefix that will be added to all the

-// classes in the output.

-// For example, normal output may have this:

-//     <SPAN CLASS="cpTodayTextDisabled">Today<SPAN>

-// But if you set the prefix like this:

-cal.setCssPrefix("Test");

-// The output will then look like:

-//     <SPAN CLASS="TestcpTodayTextDisabled">Today<SPAN>

-// And you can define that style somewhere in your page.

-

-// When using Year navigation, you can make the year be an input box, so

-// the user can manually change it and jump to any year

-cal.showYearNavigationInput();

-

-// Set the calendar offset to be different than the default. By default it

-// will appear just below and to the right of the anchorname. So if you have

-// a text box where the date will go and and anchor immediately after the

-// text box, the calendar will display immediately under the text box.

-cal.offsetX = 20;

-cal.offsetY = 20;

-

-NOTES:

-1) Requires the functions in AnchorPosition.js and PopupWindow.js

-

-2) Your anchor tag MUST contain both NAME and ID attributes which are the 

-   same. For example:

-   <A NAME="test" ID="test"> </A>

-

-3) There must be at least a space between <A> </A> for IE5.5 to see the 

-   anchor tag correctly. Do not do <A></A> with no space.

-

-4) When a CalendarPopup object is created, a handler for 'onmouseup' is

-   attached to any event handler you may have already defined. Do NOT define

-   an event handler for 'onmouseup' after you define a CalendarPopup object 

-   or the autoHide() will not work correctly.

-   

-5) The calendar popup display uses style sheets to make it look nice.

-

-*/ 

-

-// CONSTRUCTOR for the CalendarPopup Object

-function CalendarPopup() {

-	var c;

-	if (arguments.length>0) {

-		c = new PopupWindow(arguments[0]);

-		}

-	else {

-		c = new PopupWindow();

-		c.setSize(150,175);

-		}

-	c.offsetX = -152;

-	c.offsetY = 25;

-	c.autoHide();

-	// Calendar-specific properties

-	c.monthNames = new Array("January","February","March","April","May","June","July","August","September","October","November","December");

-	c.monthAbbreviations = new Array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec");

-	c.dayHeaders = new Array("S","M","T","W","T","F","S");

-	c.returnFunction = "CP_tmpReturnFunction";

-	c.returnMonthFunction = "CP_tmpReturnMonthFunction";

-	c.returnQuarterFunction = "CP_tmpReturnQuarterFunction";

-	c.returnYearFunction = "CP_tmpReturnYearFunction";

-	c.weekStartDay = 0;

-	c.isShowYearNavigation = false;

-	c.displayType = "date";

-	c.disabledWeekDays = new Object();

-	c.disabledDatesExpression = "";

-	c.yearSelectStartOffset = 2;

-	c.currentDate = null;

-	c.todayText="Today";

-	c.cssPrefix="";

-	c.isShowNavigationDropdowns=false;

-	c.isShowYearNavigationInput=false;

-	window.CP_calendarObject = null;

-	window.CP_targetInput = null;

-	window.CP_dateFormat = "MM/dd/yyyy";

-	// Method mappings

-	c.copyMonthNamesToWindow = CP_copyMonthNamesToWindow;

-	c.setReturnFunction = CP_setReturnFunction;

-	c.setReturnMonthFunction = CP_setReturnMonthFunction;

-	c.setReturnQuarterFunction = CP_setReturnQuarterFunction;

-	c.setReturnYearFunction = CP_setReturnYearFunction;

-	c.setMonthNames = CP_setMonthNames;

-	c.setMonthAbbreviations = CP_setMonthAbbreviations;

-	c.setDayHeaders = CP_setDayHeaders;

-	c.setWeekStartDay = CP_setWeekStartDay;

-	c.setDisplayType = CP_setDisplayType;

-	c.setDisabledWeekDays = CP_setDisabledWeekDays;

-	c.addDisabledDates = CP_addDisabledDates;

-	c.setYearSelectStartOffset = CP_setYearSelectStartOffset;

-	c.setTodayText = CP_setTodayText;

-	c.showYearNavigation = CP_showYearNavigation;

-	c.showCalendar = CP_showCalendar;

-	c.hideCalendar = CP_hideCalendar;

-	c.getStyles = getCalendarStyles;

-	c.refreshCalendar = CP_refreshCalendar;

-	c.getCalendar = CP_getCalendar;

-	c.select = CP_select;

-	c.setCssPrefix = CP_setCssPrefix;

-	c.showNavigationDropdowns = CP_showNavigationDropdowns;

-	c.showYearNavigationInput = CP_showYearNavigationInput;

-	c.copyMonthNamesToWindow();

-	// Return the object

-	return c;

-	}

-function CP_copyMonthNamesToWindow() {

-	// Copy these values over to the date.js 

-	if (typeof(window.MONTH_NAMES)!="undefined" && window.MONTH_NAMES!=null) {

-		window.MONTH_NAMES = new Array();

-		for (var i=0; i<this.monthNames.length; i++) {

-			window.MONTH_NAMES[window.MONTH_NAMES.length] = this.monthNames[i];

-		}

-		for (var i=0; i<this.monthAbbreviations.length; i++) {

-			window.MONTH_NAMES[window.MONTH_NAMES.length] = this.monthAbbreviations[i];

-		}

-	}

-}

-// Temporary default functions to be called when items clicked, so no error is thrown

-function CP_tmpReturnFunction(y,m,d) { 

-	if (window.CP_targetInput!=null) {

-		var dt = new Date(y,m-1,d,0,0,0);

-		if (window.CP_calendarObject!=null) { window.CP_calendarObject.copyMonthNamesToWindow(); }

-		window.CP_targetInput.value = formatDate(dt,window.CP_dateFormat);

-		}

-	else {

-		alert('Use setReturnFunction() to define which function will get the clicked results!'); 

-		}

-	}

-function CP_tmpReturnMonthFunction(y,m) { 

-	alert('Use setReturnMonthFunction() to define which function will get the clicked results!\nYou clicked: year='+y+' , month='+m); 

-	}

-function CP_tmpReturnQuarterFunction(y,q) { 

-	alert('Use setReturnQuarterFunction() to define which function will get the clicked results!\nYou clicked: year='+y+' , quarter='+q); 

-	}

-function CP_tmpReturnYearFunction(y) { 

-	alert('Use setReturnYearFunction() to define which function will get the clicked results!\nYou clicked: year='+y); 

-	}

-

-// Set the name of the functions to call to get the clicked item

-function CP_setReturnFunction(name) { this.returnFunction = name; }

-function CP_setReturnMonthFunction(name) { this.returnMonthFunction = name; }

-function CP_setReturnQuarterFunction(name) { this.returnQuarterFunction = name; }

-function CP_setReturnYearFunction(name) { this.returnYearFunction = name; }

-

-// Over-ride the built-in month names

-function CP_setMonthNames() {

-	for (var i=0; i<arguments.length; i++) { this.monthNames[i] = arguments[i]; }

-	this.copyMonthNamesToWindow();

-	}

-

-// Over-ride the built-in month abbreviations

-function CP_setMonthAbbreviations() {

-	for (var i=0; i<arguments.length; i++) { this.monthAbbreviations[i] = arguments[i]; }

-	this.copyMonthNamesToWindow();

-	}

-

-// Over-ride the built-in column headers for each day

-function CP_setDayHeaders() {

-	for (var i=0; i<arguments.length; i++) { this.dayHeaders[i] = arguments[i]; }

-	}

-

-// Set the day of the week (0-7) that the calendar display starts on

-// This is for countries other than the US whose calendar displays start on Monday(1), for example

-function CP_setWeekStartDay(day) { this.weekStartDay = day; }

-

-// Show next/last year navigation links

-function CP_showYearNavigation() { this.isShowYearNavigation = (arguments.length>0)?arguments[0]:true; }

-

-// Which type of calendar to display

-function CP_setDisplayType(type) {

-	if (type!="date"&&type!="week-end"&&type!="month"&&type!="quarter"&&type!="year") { alert("Invalid display type! Must be one of: date,week-end,month,quarter,year"); return false; }

-	this.displayType=type;

-	}

-

-// How many years back to start by default for year display

-function CP_setYearSelectStartOffset(num) { this.yearSelectStartOffset=num; }

-

-// Set which weekdays should not be clickable

-function CP_setDisabledWeekDays() {

-	this.disabledWeekDays = new Object();

-	for (var i=0; i<arguments.length; i++) { this.disabledWeekDays[arguments[i]] = true; }

-	}

-	

-// Disable individual dates or ranges

-// Builds an internal logical test which is run via eval() for efficiency

-function CP_addDisabledDates(start, end) {

-	if (arguments.length==1) { end=start; }

-	if (start==null && end==null) { return; }

-	if (this.disabledDatesExpression!="") { this.disabledDatesExpression+= "||"; }

-	if (start!=null) { start = parseDate(start); start=""+start.getFullYear()+LZ(start.getMonth()+1)+LZ(start.getDate());}

-	if (end!=null) { end=parseDate(end); end=""+end.getFullYear()+LZ(end.getMonth()+1)+LZ(end.getDate());}

-	if (start==null) { this.disabledDatesExpression+="(ds<="+end+")"; }

-	else if (end  ==null) { this.disabledDatesExpression+="(ds>="+start+")"; }

-	else { this.disabledDatesExpression+="(ds>="+start+"&&ds<="+end+")"; }

-	}

-	

-// Set the text to use for the "Today" link

-function CP_setTodayText(text) {

-	this.todayText = text;

-	}

-

-// Set the prefix to be added to all CSS classes when writing output

-function CP_setCssPrefix(val) { 

-	this.cssPrefix = val; 

-	}

-

-// Show the navigation as an dropdowns that can be manually changed

-function CP_showNavigationDropdowns() { this.isShowNavigationDropdowns = (arguments.length>0)?arguments[0]:true; }

-

-// Show the year navigation as an input box that can be manually changed

-function CP_showYearNavigationInput() { this.isShowYearNavigationInput = (arguments.length>0)?arguments[0]:true; }

-

-// Hide a calendar object

-function CP_hideCalendar() {

-	if (arguments.length > 0) { window.popupWindowObjects[arguments[0]].hidePopup(); }

-	else { this.hidePopup(); }

-        bcfg2_check_date();

-	}

-

-// Refresh the contents of the calendar display

-function CP_refreshCalendar(index) {

-	var calObject = window.popupWindowObjects[index];

-	if (arguments.length>1) { 

-		calObject.populate(calObject.getCalendar(arguments[1],arguments[2],arguments[3],arguments[4],arguments[5]));

-		}

-	else {

-		calObject.populate(calObject.getCalendar());

-		}

-	calObject.refresh();

-	}

-

-// Populate the calendar and display it

-function CP_showCalendar(anchorname) {

-	if (arguments.length>1) {

-		if (arguments[1]==null||arguments[1]=="") {

-			this.currentDate=new Date();

-			}

-		else {

-			this.currentDate=new Date(parseDate(arguments[1]));

-			}

-		}

-	this.populate(this.getCalendar());

-	this.showPopup(anchorname);

-	}

-

-// Simple method to interface popup calendar with a text-entry box

-function CP_select(inputobj, linkname, format) {

-	var selectedDate=(arguments.length>3)?arguments[3]:null;

-	if (!window.getDateFromFormat) {

-		alert("calendar.select: To use this method you must also include 'date.js' for date formatting");

-		return;

-		}

-	if (this.displayType!="date"&&this.displayType!="week-end") {

-		alert("calendar.select: This function can only be used with displayType 'date' or 'week-end'");

-		return;

-		}

-	if (inputobj.type!="text" && inputobj.type!="hidden" && inputobj.type!="textarea") { 

-		alert("calendar.select: Input object passed is not a valid form input object"); 

-		window.CP_targetInput=null;

-		return;

-		}

-	if (inputobj.disabled) { return; } // Can't use calendar input on disabled form input!

-	window.CP_targetInput = inputobj;

-	window.CP_calendarObject = this;

-	this.currentDate=null;

-	var time=0;

-	if (selectedDate!=null) {

-		time = getDateFromFormat(selectedDate,format)

-		}

-	else if (inputobj.value!="") {

-		time = getDateFromFormat(inputobj.value,format);

-		}

-	if (selectedDate!=null || inputobj.value!="") {

-		if (time==0) { this.currentDate=null; }

-		else { this.currentDate=new Date(time); }

-		}

-	window.CP_dateFormat = format;

-	this.showCalendar(linkname);

-	}

-	

-// Get style block needed to display the calendar correctly

-function getCalendarStyles() {

-	var result = "";

-	var p = "";

-	if (this!=null && typeof(this.cssPrefix)!="undefined" && this.cssPrefix!=null && this.cssPrefix!="") { p=this.cssPrefix; }

-	result += "<STYLE>\n";

-	result += "."+p+"cpYearNavigation,."+p+"cpMonthNavigation { background-color:#C0C0C0; text-align:center; vertical-align:center; text-decoration:none; color:#000000; font-weight:bold; }\n";

-	result += "."+p+"cpDayColumnHeader, ."+p+"cpYearNavigation,."+p+"cpMonthNavigation,."+p+"cpCurrentMonthDate,."+p+"cpCurrentMonthDateDisabled,."+p+"cpOtherMonthDate,."+p+"cpOtherMonthDateDisabled,."+p+"cpCurrentDate,."+p+"cpCurrentDateDisabled,."+p+"cpTodayText,."+p+"cpTodayTextDisabled,."+p+"cpText { font-family:arial; font-size:8pt; }\n";

-	result += "TD."+p+"cpDayColumnHeader { text-align:right; border:solid thin #C0C0C0;border-width:0px 0px 1px 0px; }\n";

-	result += "."+p+"cpCurrentMonthDate, ."+p+"cpOtherMonthDate, ."+p+"cpCurrentDate  { text-align:right; text-decoration:none; }\n";

-	result += "."+p+"cpCurrentMonthDateDisabled, ."+p+"cpOtherMonthDateDisabled, ."+p+"cpCurrentDateDisabled { color:#D0D0D0; text-align:right; text-decoration:line-through; }\n";

-	result += "."+p+"cpCurrentMonthDate, .cpCurrentDate { color:#000000; }\n";

-	result += "."+p+"cpOtherMonthDate { color:#808080; }\n";

-	result += "TD."+p+"cpCurrentDate { color:white; background-color: #C0C0C0; border-width:1px; border:solid thin #800000; }\n";

-	result += "TD."+p+"cpCurrentDateDisabled { border-width:1px; border:solid thin #FFAAAA; }\n";

-	result += "TD."+p+"cpTodayText, TD."+p+"cpTodayTextDisabled { border:solid thin #C0C0C0; border-width:1px 0px 0px 0px;}\n";

-	result += "A."+p+"cpTodayText, SPAN."+p+"cpTodayTextDisabled { height:20px; }\n";

-	result += "A."+p+"cpTodayText { color:black; }\n";

-	result += "."+p+"cpTodayTextDisabled { color:#D0D0D0; }\n";

-	result += "."+p+"cpBorder { border:solid thin #808080; }\n";

-	result += "</STYLE>\n";

-	return result;

-	}

-

-// Return a string containing all the calendar code to be displayed

-function CP_getCalendar() {

-	var now = new Date();

-	// Reference to window

-	if (this.type == "WINDOW") { var windowref = "window.opener."; }

-	else { var windowref = ""; }

-	var result = "";

-	// If POPUP, write entire HTML document

-	if (this.type == "WINDOW") {

-		result += "<HTML><HEAD><TITLE>Calendar</TITLE>"+this.getStyles()+"</HEAD><BODY MARGINWIDTH=0 MARGINHEIGHT=0 TOPMARGIN=0 RIGHTMARGIN=0 LEFTMARGIN=0>\n";

-		result += '<CENTER><TABLE WIDTH=100% BORDER=0 BORDERWIDTH=0 CELLSPACING=0 CELLPADDING=0>\n';

-		}

-	else {

-		result += '<TABLE CLASS="'+this.cssPrefix+'cpBorder" WIDTH=144 BORDER=1 BORDERWIDTH=1 CELLSPACING=0 CELLPADDING=1>\n';

-		result += '<TR><TD ALIGN=CENTER>\n';

-		result += '<CENTER>\n';

-		}

-	// Code for DATE display (default)

-	// -------------------------------

-	if (this.displayType=="date" || this.displayType=="week-end") {

-		if (this.currentDate==null) { this.currentDate = now; }

-		if (arguments.length > 0) { var month = arguments[0]; }

-			else { var month = this.currentDate.getMonth()+1; }

-		if (arguments.length > 1 && arguments[1]>0 && arguments[1]-0==arguments[1]) { var year = arguments[1]; }

-			else { var year = this.currentDate.getFullYear(); }

-		var daysinmonth= new Array(0,31,28,31,30,31,30,31,31,30,31,30,31);

-		if ( ( (year%4 == 0)&&(year%100 != 0) ) || (year%400 == 0) ) {

-			daysinmonth[2] = 29;

-			}

-		var current_month = new Date(year,month-1,1);

-		var display_year = year;

-		var display_month = month;

-		var display_date = 1;

-		var weekday= current_month.getDay();

-		var offset = 0;

-		

-		offset = (weekday >= this.weekStartDay) ? weekday-this.weekStartDay : 7-this.weekStartDay+weekday ;

-		if (offset > 0) {

-			display_month--;

-			if (display_month < 1) { display_month = 12; display_year--; }

-			display_date = daysinmonth[display_month]-offset+1;

-			}

-		var next_month = month+1;

-		var next_month_year = year;

-		if (next_month > 12) { next_month=1; next_month_year++; }

-		var last_month = month-1;

-		var last_month_year = year;

-		if (last_month < 1) { last_month=12; last_month_year--; }

-		var date_class;

-		if (this.type!="WINDOW") {

-			result += "<TABLE WIDTH=144 BORDER=0 BORDERWIDTH=0 CELLSPACING=0 CELLPADDING=0>";

-			}

-		result += '<TR>\n';

-		var refresh = windowref+'CP_refreshCalendar';

-		var refreshLink = 'javascript:' + refresh;

-		if (this.isShowNavigationDropdowns) {

-			result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="78" COLSPAN="3"><select CLASS="'+this.cssPrefix+'cpMonthNavigation" name="cpMonth" onChange="'+refresh+'('+this.index+',this.options[this.selectedIndex].value-0,'+(year-0)+');">';

-			for( var monthCounter=1; monthCounter<=12; monthCounter++ ) {

-				var selected = (monthCounter==month) ? 'SELECTED' : '';

-				result += '<option value="'+monthCounter+'" '+selected+'>'+this.monthNames[monthCounter-1]+'</option>';

-				}

-			result += '</select></TD>';

-			result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="10">&nbsp;</TD>';

-

-			result += '<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="56" COLSPAN="3"><select CLASS="'+this.cssPrefix+'cpYearNavigation" name="cpYear" onChange="'+refresh+'('+this.index+','+month+',this.options[this.selectedIndex].value-0);">';

-			for( var yearCounter=year-this.yearSelectStartOffset; yearCounter<=year+this.yearSelectStartOffset; yearCounter++ ) {

-				var selected = (yearCounter==year) ? 'SELECTED' : '';

-				result += '<option value="'+yearCounter+'" '+selected+'>'+yearCounter+'</option>';

-				}

-			result += '</select></TD>';

-			}

-		else {

-			if (this.isShowYearNavigation) {

-				result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="10"><A CLASS="'+this.cssPrefix+'cpMonthNavigation" HREF="'+refreshLink+'('+this.index+','+last_month+','+last_month_year+');">&lt;</A></TD>';

-				result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="58"><SPAN CLASS="'+this.cssPrefix+'cpMonthNavigation">'+this.monthNames[month-1]+'</SPAN></TD>';

-				result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="10"><A CLASS="'+this.cssPrefix+'cpMonthNavigation" HREF="'+refreshLink+'('+this.index+','+next_month+','+next_month_year+');">&gt;</A></TD>';

-				result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="10">&nbsp;</TD>';

-

-				result += '<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="10"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="'+refreshLink+'('+this.index+','+month+','+(year-1)+');">&lt;</A></TD>';

-				if (this.isShowYearNavigationInput) {

-					result += '<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="36"><INPUT NAME="cpYear" CLASS="'+this.cssPrefix+'cpYearNavigation" SIZE="4" MAXLENGTH="4" VALUE="'+year+'" onBlur="'+refresh+'('+this.index+','+month+',this.value-0);"></TD>';

-					}

-				else {

-					result += '<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="36"><SPAN CLASS="'+this.cssPrefix+'cpYearNavigation">'+year+'</SPAN></TD>';

-					}

-				result += '<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="10"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="'+refreshLink+'('+this.index+','+month+','+(year+1)+');">&gt;</A></TD>';

-				}

-			else {

-				result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="22"><A CLASS="'+this.cssPrefix+'cpMonthNavigation" HREF="'+refreshLink+'('+this.index+','+last_month+','+last_month_year+');">&lt;&lt;</A></TD>\n';

-				result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="100"><SPAN CLASS="'+this.cssPrefix+'cpMonthNavigation">'+this.monthNames[month-1]+' '+year+'</SPAN></TD>\n';

-				result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="22"><A CLASS="'+this.cssPrefix+'cpMonthNavigation" HREF="'+refreshLink+'('+this.index+','+next_month+','+next_month_year+');">&gt;&gt;</A></TD>\n';

-				}

-			}

-		result += '</TR></TABLE>\n';

-		result += '<TABLE WIDTH=120 BORDER=0 CELLSPACING=0 CELLPADDING=1 ALIGN=CENTER>\n';

-		result += '<TR>\n';

-		for (var j=0; j<7; j++) {

-

-			result += '<TD CLASS="'+this.cssPrefix+'cpDayColumnHeader" WIDTH="14%"><SPAN CLASS="'+this.cssPrefix+'cpDayColumnHeader">'+this.dayHeaders[(this.weekStartDay+j)%7]+'</TD>\n';

-			}

-		result += '</TR>\n';

-		for (var row=1; row<=6; row++) {

-			result += '<TR>\n';

-			for (var col=1; col<=7; col++) {

-				var disabled=false;

-				if (this.disabledDatesExpression!="") {

-					var ds=""+display_year+LZ(display_month)+LZ(display_date);

-					eval("disabled=("+this.disabledDatesExpression+")");

-					}

-				var dateClass = "";

-				if ((display_month == this.currentDate.getMonth()+1) && (display_date==this.currentDate.getDate()) && (display_year==this.currentDate.getFullYear())) {

-					dateClass = "cpCurrentDate";

-					}

-				else if (display_month == month) {

-					dateClass = "cpCurrentMonthDate";

-					}

-				else {

-					dateClass = "cpOtherMonthDate";

-					}

-				if (disabled || this.disabledWeekDays[col-1]) {

-					result += '	<TD CLASS="'+this.cssPrefix+dateClass+'"><SPAN CLASS="'+this.cssPrefix+dateClass+'Disabled">'+display_date+'</SPAN></TD>\n';

-					}

-				else {

-					var selected_date = display_date;

-					var selected_month = display_month;

-					var selected_year = display_year;

-					if (this.displayType=="week-end") {

-						var d = new Date(selected_year,selected_month-1,selected_date,0,0,0,0);

-						d.setDate(d.getDate() + (7-col));

-						selected_year = d.getYear();

-						if (selected_year < 1000) { selected_year += 1900; }

-						selected_month = d.getMonth()+1;

-						selected_date = d.getDate();

-						}

-					result += '	<TD CLASS="'+this.cssPrefix+dateClass+'"><A HREF="javascript:'+windowref+this.returnFunction+'('+selected_year+','+selected_month+','+selected_date+');'+windowref+'CP_hideCalendar(\''+this.index+'\');" CLASS="'+this.cssPrefix+dateClass+'">'+display_date+'</A></TD>\n';

-					}

-				display_date++;

-				if (display_date > daysinmonth[display_month]) {

-					display_date=1;

-					display_month++;

-					}

-				if (display_month > 12) {

-					display_month=1;

-					display_year++;

-					}

-				}

-			result += '</TR>';

-			}

-		var current_weekday = now.getDay() - this.weekStartDay;

-		if (current_weekday < 0) {

-			current_weekday += 7;

-			}

-		result += '<TR>\n';

-		result += '	<TD COLSPAN=7 ALIGN=CENTER CLASS="'+this.cssPrefix+'cpTodayText">\n';

-		if (this.disabledDatesExpression!="") {

-			var ds=""+now.getFullYear()+LZ(now.getMonth()+1)+LZ(now.getDate());

-			eval("disabled=("+this.disabledDatesExpression+")");

-			}

-		if (disabled || this.disabledWeekDays[current_weekday+1]) {

-			result += '		<SPAN CLASS="'+this.cssPrefix+'cpTodayTextDisabled">'+this.todayText+'</SPAN>\n';

-			}

-		else {

-			result += '		<A CLASS="'+this.cssPrefix+'cpTodayText" HREF="javascript:'+windowref+this.returnFunction+'(\''+now.getFullYear()+'\',\''+(now.getMonth()+1)+'\',\''+now.getDate()+'\');'+windowref+'CP_hideCalendar(\''+this.index+'\');">'+this.todayText+'</A>\n';

-			}

-		result += '		<BR>\n';

-		result += '	</TD></TR></TABLE></CENTER></TD></TR></TABLE>\n';

-	}

-

-	// Code common for MONTH, QUARTER, YEAR

-	// ------------------------------------

-	if (this.displayType=="month" || this.displayType=="quarter" || this.displayType=="year") {

-		if (arguments.length > 0) { var year = arguments[0]; }

-		else { 

-			if (this.displayType=="year") {	var year = now.getFullYear()-this.yearSelectStartOffset; }

-			else { var year = now.getFullYear(); }

-			}

-		if (this.displayType!="year" && this.isShowYearNavigation) {

-			result += "<TABLE WIDTH=144 BORDER=0 BORDERWIDTH=0 CELLSPACING=0 CELLPADDING=0>";

-			result += '<TR>\n';

-			result += '	<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="22"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="javascript:'+windowref+'CP_refreshCalendar('+this.index+','+(year-1)+');">&lt;&lt;</A></TD>\n';

-			result += '	<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="100">'+year+'</TD>\n';

-			result += '	<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="22"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="javascript:'+windowref+'CP_refreshCalendar('+this.index+','+(year+1)+');">&gt;&gt;</A></TD>\n';

-			result += '</TR></TABLE>\n';

-			}

-		}

-		

-	// Code for MONTH display 

-	// ----------------------

-	if (this.displayType=="month") {

-		// If POPUP, write entire HTML document

-		result += '<TABLE WIDTH=120 BORDER=0 CELLSPACING=1 CELLPADDING=0 ALIGN=CENTER>\n';

-		for (var i=0; i<4; i++) {

-			result += '<TR>';

-			for (var j=0; j<3; j++) {

-				var monthindex = ((i*3)+j);

-				result += '<TD WIDTH=33% ALIGN=CENTER><A CLASS="'+this.cssPrefix+'cpText" HREF="javascript:'+windowref+this.returnMonthFunction+'('+year+','+(monthindex+1)+');'+windowref+'CP_hideCalendar(\''+this.index+'\');" CLASS="'+date_class+'">'+this.monthAbbreviations[monthindex]+'</A></TD>';

-				}

-			result += '</TR>';

-			}

-		result += '</TABLE></CENTER></TD></TR></TABLE>\n';

-		}

-	

-	// Code for QUARTER display

-	// ------------------------

-	if (this.displayType=="quarter") {

-		result += '<BR><TABLE WIDTH=120 BORDER=1 CELLSPACING=0 CELLPADDING=0 ALIGN=CENTER>\n';

-		for (var i=0; i<2; i++) {

-			result += '<TR>';

-			for (var j=0; j<2; j++) {

-				var quarter = ((i*2)+j+1);

-				result += '<TD WIDTH=50% ALIGN=CENTER><BR><A CLASS="'+this.cssPrefix+'cpText" HREF="javascript:'+windowref+this.returnQuarterFunction+'('+year+','+quarter+');'+windowref+'CP_hideCalendar(\''+this.index+'\');" CLASS="'+date_class+'">Q'+quarter+'</A><BR><BR></TD>';

-				}

-			result += '</TR>';

-			}

-		result += '</TABLE></CENTER></TD></TR></TABLE>\n';

-		}

-

-	// Code for YEAR display

-	// ---------------------

-	if (this.displayType=="year") {

-		var yearColumnSize = 4;

-		result += "<TABLE WIDTH=144 BORDER=0 BORDERWIDTH=0 CELLSPACING=0 CELLPADDING=0>";

-		result += '<TR>\n';

-		result += '	<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="50%"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="javascript:'+windowref+'CP_refreshCalendar('+this.index+','+(year-(yearColumnSize*2))+');">&lt;&lt;</A></TD>\n';

-		result += '	<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="50%"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="javascript:'+windowref+'CP_refreshCalendar('+this.index+','+(year+(yearColumnSize*2))+');">&gt;&gt;</A></TD>\n';

-		result += '</TR></TABLE>\n';

-		result += '<TABLE WIDTH=120 BORDER=0 CELLSPACING=1 CELLPADDING=0 ALIGN=CENTER>\n';

-		for (var i=0; i<yearColumnSize; i++) {

-			for (var j=0; j<2; j++) {

-				var currentyear = year+(j*yearColumnSize)+i;

-				result += '<TD WIDTH=50% ALIGN=CENTER><A CLASS="'+this.cssPrefix+'cpText" HREF="javascript:'+windowref+this.returnYearFunction+'('+currentyear+');'+windowref+'CP_hideCalendar(\''+this.index+'\');" CLASS="'+date_class+'">'+currentyear+'</A></TD>';

-				}

-			result += '</TR>';

-			}

-		result += '</TABLE></CENTER></TD></TR></TABLE>\n';

-		}

-	// Common

-	if (this.type == "WINDOW") {

-		result += "</BODY></HTML>\n";

-		}

-	return result;

-	}

+// ===================================================================
+// Author: Matt Kruse <matt@mattkruse.com>
+// WWW: http://www.mattkruse.com/
+//
+// NOTICE: You may use this code for any purpose, commercial or
+// private, without any further permission from the author. You may
+// remove this notice from your final code if you wish, however it is
+// appreciated by the author if at least my web site address is kept.
+//
+// You may *NOT* re-distribute this code in any way except through its
+// use. That means, you can include it in your product, or your web
+// site, or any other form where the code is actually being used. You
+// may not put the plain javascript up on your site for download or
+// include it in your javascript libraries for download.
+// If you wish to share this code with others, please just point them
+// to the URL instead.
+// Please DO NOT link directly to my .js files from your site. Copy
+// the files to your server and use them there. Thank you.
+// ===================================================================
+
+// HISTORY
+// ------------------------------------------------------------------
+// Feb 7, 2005: Fixed a CSS styles to use px unit
+// March 29, 2004: Added check in select() method for the form field
+//      being disabled. If it is, just return and don't do anything.
+// March 24, 2004: Fixed bug - when month name and abbreviations were
+//      changed, date format still used original values.
+// January 26, 2004: Added support for drop-down month and year
+//      navigation (Thanks to Chris Reid for the idea)
+// September 22, 2003: Fixed a minor problem in YEAR calendar with
+//      CSS prefix.
+// August 19, 2003: Renamed the function to get styles, and made it
+//      work correctly without an object reference
+// August 18, 2003: Changed showYearNavigation and
+//      showYearNavigationInput to optionally take an argument of
+//      true or false
+// July 31, 2003: Added text input option for year navigation.
+//      Added a per-calendar CSS prefix option to optionally use
+//      different styles for different calendars.
+// July 29, 2003: Fixed bug causing the Today link to be clickable
+//      even though today falls in a disabled date range.
+//      Changed formatting to use pure CSS, allowing greater control
+//      over look-and-feel options.
+// June 11, 2003: Fixed bug causing the Today link to be unselectable
+//      under certain cases when some days of week are disabled
+// March 14, 2003: Added ability to disable individual dates or date
+//      ranges, display as light gray and strike-through
+// March 14, 2003: Removed dependency on graypixel.gif and instead
+///     use table border coloring
+// March 12, 2003: Modified showCalendar() function to allow optional
+//      start-date parameter
+// March 11, 2003: Modified select() function to allow optional
+//      start-date parameter
+/*
+DESCRIPTION: This object implements a popup calendar to allow the user to
+select a date, month, quarter, or year.
+
+COMPATABILITY: Works with Netscape 4.x, 6.x, IE 5.x on Windows. Some small
+positioning errors - usually with Window positioning - occur on the
+Macintosh platform.
+The calendar can be modified to work for any location in the world by
+changing which weekday is displayed as the first column, changing the month
+names, and changing the column headers for each day.
+
+USAGE:
+// Create a new CalendarPopup object of type WINDOW
+var cal = new CalendarPopup();
+
+// Create a new CalendarPopup object of type DIV using the DIV named 'mydiv'
+var cal = new CalendarPopup('mydiv');
+
+// Easy method to link the popup calendar with an input box.
+cal.select(inputObject, anchorname, dateFormat);
+// Same method, but passing a default date other than the field's current value
+cal.select(inputObject, anchorname, dateFormat, '01/02/2000');
+// This is an example call to the popup calendar from a link to populate an
+// input box. Note that to use this, date.js must also be included!!
+<A HREF="#" onClick="cal.select(document.forms[0].date,'anchorname','MM/dd/yyyy'); return false;">Select</A>
+
+// Set the type of date select to be used. By default it is 'date'.
+cal.setDisplayType(type);
+
+// When a date, month, quarter, or year is clicked, a function is called and
+// passed the details. You must write this function, and tell the calendar
+// popup what the function name is.
+// Function to be called for 'date' select receives y, m, d
+cal.setReturnFunction(functionname);
+// Function to be called for 'month' select receives y, m
+cal.setReturnMonthFunction(functionname);
+// Function to be called for 'quarter' select receives y, q
+cal.setReturnQuarterFunction(functionname);
+// Function to be called for 'year' select receives y
+cal.setReturnYearFunction(functionname);
+
+// Show the calendar relative to a given anchor
+cal.showCalendar(anchorname);
+
+// Hide the calendar. The calendar is set to autoHide automatically
+cal.hideCalendar();
+
+// Set the month names to be used. Default are English month names
+cal.setMonthNames("January","February","March",...);
+
+// Set the month abbreviations to be used. Default are English month abbreviations
+cal.setMonthAbbreviations("Jan","Feb","Mar",...);
+
+// Show navigation for changing by the year, not just one month at a time
+cal.showYearNavigation();
+
+// Show month and year dropdowns, for quicker selection of month of dates
+cal.showNavigationDropdowns();
+
+// Set the text to be used above each day column. The days start with
+// sunday regardless of the value of WeekStartDay
+cal.setDayHeaders("S","M","T",...);
+
+// Set the day for the first column in the calendar grid. By default this
+// is Sunday (0) but it may be changed to fit the conventions of other
+// countries.
+cal.setWeekStartDay(1); // week is Monday - Sunday
+
+// Set the weekdays which should be disabled in the 'date' select popup. You can
+// then allow someone to only select week end dates, or Tuedays, for example
+cal.setDisabledWeekDays(0,1); // To disable selecting the 1st or 2nd days of the week
+
+// Selectively disable individual days or date ranges. Disabled days will not
+// be clickable, and show as strike-through text on current browsers.
+// Date format is any format recognized by parseDate() in date.js
+// Pass a single date to disable:
+cal.addDisabledDates("2003-01-01");
+// Pass null as the first parameter to mean "anything up to and including" the
+// passed date:
+cal.addDisabledDates(null, "01/02/03");
+// Pass null as the second parameter to mean "including the passed date and
+// anything after it:
+cal.addDisabledDates("Jan 01, 2003", null);
+// Pass two dates to disable all dates inbetween and including the two
+cal.addDisabledDates("January 01, 2003", "Dec 31, 2003");
+
+// When the 'year' select is displayed, set the number of years back from the
+// current year to start listing years. Default is 2.
+// This is also used for year drop-down, to decide how many years +/- to display
+cal.setYearSelectStartOffset(2);
+
+// Text for the word "Today" appearing on the calendar
+cal.setTodayText("Today");
+
+// The calendar uses CSS classes for formatting. If you want your calendar to
+// have unique styles, you can set the prefix that will be added to all the
+// classes in the output.
+// For example, normal output may have this:
+//     <SPAN CLASS="cpTodayTextDisabled">Today<SPAN>
+// But if you set the prefix like this:
+cal.setCssPrefix("Test");
+// The output will then look like:
+//     <SPAN CLASS="TestcpTodayTextDisabled">Today<SPAN>
+// And you can define that style somewhere in your page.
+
+// When using Year navigation, you can make the year be an input box, so
+// the user can manually change it and jump to any year
+cal.showYearNavigationInput();
+
+// Set the calendar offset to be different than the default. By default it
+// will appear just below and to the right of the anchorname. So if you have
+// a text box where the date will go and and anchor immediately after the
+// text box, the calendar will display immediately under the text box.
+cal.offsetX = 20;
+cal.offsetY = 20;
+
+NOTES:
+1) Requires the functions in AnchorPosition.js and PopupWindow.js
+
+2) Your anchor tag MUST contain both NAME and ID attributes which are the
+   same. For example:
+   <A NAME="test" ID="test"> </A>
+
+3) There must be at least a space between <A> </A> for IE5.5 to see the
+   anchor tag correctly. Do not do <A></A> with no space.
+
+4) When a CalendarPopup object is created, a handler for 'onmouseup' is
+   attached to any event handler you may have already defined. Do NOT define
+   an event handler for 'onmouseup' after you define a CalendarPopup object
+   or the autoHide() will not work correctly.
+
+5) The calendar popup display uses style sheets to make it look nice.
+
+*/
+
+// CONSTRUCTOR for the CalendarPopup Object
+function CalendarPopup() {
+	var c;
+	if (arguments.length>0) {
+		c = new PopupWindow(arguments[0]);
+		}
+	else {
+		c = new PopupWindow();
+		c.setSize(150,175);
+		}
+	c.offsetX = -152;
+	c.offsetY = 25;
+	c.autoHide();
+	// Calendar-specific properties
+	c.monthNames = new Array("January","February","March","April","May","June","July","August","September","October","November","December");
+	c.monthAbbreviations = new Array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec");
+	c.dayHeaders = new Array("S","M","T","W","T","F","S");
+	c.returnFunction = "CP_tmpReturnFunction";
+	c.returnMonthFunction = "CP_tmpReturnMonthFunction";
+	c.returnQuarterFunction = "CP_tmpReturnQuarterFunction";
+	c.returnYearFunction = "CP_tmpReturnYearFunction";
+	c.weekStartDay = 0;
+	c.isShowYearNavigation = false;
+	c.displayType = "date";
+	c.disabledWeekDays = new Object();
+	c.disabledDatesExpression = "";
+	c.yearSelectStartOffset = 2;
+	c.currentDate = null;
+	c.todayText="Today";
+	c.cssPrefix="";
+	c.isShowNavigationDropdowns=false;
+	c.isShowYearNavigationInput=false;
+	window.CP_calendarObject = null;
+	window.CP_targetInput = null;
+	window.CP_dateFormat = "MM/dd/yyyy";
+	// Method mappings
+	c.copyMonthNamesToWindow = CP_copyMonthNamesToWindow;
+	c.setReturnFunction = CP_setReturnFunction;
+	c.setReturnMonthFunction = CP_setReturnMonthFunction;
+	c.setReturnQuarterFunction = CP_setReturnQuarterFunction;
+	c.setReturnYearFunction = CP_setReturnYearFunction;
+	c.setMonthNames = CP_setMonthNames;
+	c.setMonthAbbreviations = CP_setMonthAbbreviations;
+	c.setDayHeaders = CP_setDayHeaders;
+	c.setWeekStartDay = CP_setWeekStartDay;
+	c.setDisplayType = CP_setDisplayType;
+	c.setDisabledWeekDays = CP_setDisabledWeekDays;
+	c.addDisabledDates = CP_addDisabledDates;
+	c.setYearSelectStartOffset = CP_setYearSelectStartOffset;
+	c.setTodayText = CP_setTodayText;
+	c.showYearNavigation = CP_showYearNavigation;
+	c.showCalendar = CP_showCalendar;
+	c.hideCalendar = CP_hideCalendar;
+	c.getStyles = getCalendarStyles;
+	c.refreshCalendar = CP_refreshCalendar;
+	c.getCalendar = CP_getCalendar;
+	c.select = CP_select;
+	c.setCssPrefix = CP_setCssPrefix;
+	c.showNavigationDropdowns = CP_showNavigationDropdowns;
+	c.showYearNavigationInput = CP_showYearNavigationInput;
+	c.copyMonthNamesToWindow();
+	// Return the object
+	return c;
+	}
+function CP_copyMonthNamesToWindow() {
+	// Copy these values over to the date.js
+	if (typeof(window.MONTH_NAMES)!="undefined" && window.MONTH_NAMES!=null) {
+		window.MONTH_NAMES = new Array();
+		for (var i=0; i<this.monthNames.length; i++) {
+			window.MONTH_NAMES[window.MONTH_NAMES.length] = this.monthNames[i];
+		}
+		for (var i=0; i<this.monthAbbreviations.length; i++) {
+			window.MONTH_NAMES[window.MONTH_NAMES.length] = this.monthAbbreviations[i];
+		}
+	}
+}
+// Temporary default functions to be called when items clicked, so no error is thrown
+function CP_tmpReturnFunction(y,m,d) {
+	if (window.CP_targetInput!=null) {
+		var dt = new Date(y,m-1,d,0,0,0);
+		if (window.CP_calendarObject!=null) { window.CP_calendarObject.copyMonthNamesToWindow(); }
+		window.CP_targetInput.value = formatDate(dt,window.CP_dateFormat);
+		}
+	else {
+		alert('Use setReturnFunction() to define which function will get the clicked results!');
+		}
+	}
+function CP_tmpReturnMonthFunction(y,m) {
+	alert('Use setReturnMonthFunction() to define which function will get the clicked results!\nYou clicked: year='+y+' , month='+m);
+	}
+function CP_tmpReturnQuarterFunction(y,q) {
+	alert('Use setReturnQuarterFunction() to define which function will get the clicked results!\nYou clicked: year='+y+' , quarter='+q);
+	}
+function CP_tmpReturnYearFunction(y) {
+	alert('Use setReturnYearFunction() to define which function will get the clicked results!\nYou clicked: year='+y);
+	}
+
+// Set the name of the functions to call to get the clicked item
+function CP_setReturnFunction(name) { this.returnFunction = name; }
+function CP_setReturnMonthFunction(name) { this.returnMonthFunction = name; }
+function CP_setReturnQuarterFunction(name) { this.returnQuarterFunction = name; }
+function CP_setReturnYearFunction(name) { this.returnYearFunction = name; }
+
+// Over-ride the built-in month names
+function CP_setMonthNames() {
+	for (var i=0; i<arguments.length; i++) { this.monthNames[i] = arguments[i]; }
+	this.copyMonthNamesToWindow();
+	}
+
+// Over-ride the built-in month abbreviations
+function CP_setMonthAbbreviations() {
+	for (var i=0; i<arguments.length; i++) { this.monthAbbreviations[i] = arguments[i]; }
+	this.copyMonthNamesToWindow();
+	}
+
+// Over-ride the built-in column headers for each day
+function CP_setDayHeaders() {
+	for (var i=0; i<arguments.length; i++) { this.dayHeaders[i] = arguments[i]; }
+	}
+
+// Set the day of the week (0-7) that the calendar display starts on
+// This is for countries other than the US whose calendar displays start on Monday(1), for example
+function CP_setWeekStartDay(day) { this.weekStartDay = day; }
+
+// Show next/last year navigation links
+function CP_showYearNavigation() { this.isShowYearNavigation = (arguments.length>0)?arguments[0]:true; }
+
+// Which type of calendar to display
+function CP_setDisplayType(type) {
+	if (type!="date"&&type!="week-end"&&type!="month"&&type!="quarter"&&type!="year") { alert("Invalid display type! Must be one of: date,week-end,month,quarter,year"); return false; }
+	this.displayType=type;
+	}
+
+// How many years back to start by default for year display
+function CP_setYearSelectStartOffset(num) { this.yearSelectStartOffset=num; }
+
+// Set which weekdays should not be clickable
+function CP_setDisabledWeekDays() {
+	this.disabledWeekDays = new Object();
+	for (var i=0; i<arguments.length; i++) { this.disabledWeekDays[arguments[i]] = true; }
+	}
+
+// Disable individual dates or ranges
+// Builds an internal logical test which is run via eval() for efficiency
+function CP_addDisabledDates(start, end) {
+	if (arguments.length==1) { end=start; }
+	if (start==null && end==null) { return; }
+	if (this.disabledDatesExpression!="") { this.disabledDatesExpression+= "||"; }
+	if (start!=null) { start = parseDate(start); start=""+start.getFullYear()+LZ(start.getMonth()+1)+LZ(start.getDate());}
+	if (end!=null) { end=parseDate(end); end=""+end.getFullYear()+LZ(end.getMonth()+1)+LZ(end.getDate());}
+	if (start==null) { this.disabledDatesExpression+="(ds<="+end+")"; }
+	else if (end  ==null) { this.disabledDatesExpression+="(ds>="+start+")"; }
+	else { this.disabledDatesExpression+="(ds>="+start+"&&ds<="+end+")"; }
+	}
+
+// Set the text to use for the "Today" link
+function CP_setTodayText(text) {
+	this.todayText = text;
+	}
+
+// Set the prefix to be added to all CSS classes when writing output
+function CP_setCssPrefix(val) {
+	this.cssPrefix = val;
+	}
+
+// Show the navigation as an dropdowns that can be manually changed
+function CP_showNavigationDropdowns() { this.isShowNavigationDropdowns = (arguments.length>0)?arguments[0]:true; }
+
+// Show the year navigation as an input box that can be manually changed
+function CP_showYearNavigationInput() { this.isShowYearNavigationInput = (arguments.length>0)?arguments[0]:true; }
+
+// Hide a calendar object
+function CP_hideCalendar() {
+	if (arguments.length > 0) { window.popupWindowObjects[arguments[0]].hidePopup(); }
+	else { this.hidePopup(); }
+        bcfg2_check_date();
+	}
+
+// Refresh the contents of the calendar display
+function CP_refreshCalendar(index) {
+	var calObject = window.popupWindowObjects[index];
+	if (arguments.length>1) {
+		calObject.populate(calObject.getCalendar(arguments[1],arguments[2],arguments[3],arguments[4],arguments[5]));
+		}
+	else {
+		calObject.populate(calObject.getCalendar());
+		}
+	calObject.refresh();
+	}
+
+// Populate the calendar and display it
+function CP_showCalendar(anchorname) {
+	if (arguments.length>1) {
+		if (arguments[1]==null||arguments[1]=="") {
+			this.currentDate=new Date();
+			}
+		else {
+			this.currentDate=new Date(parseDate(arguments[1]));
+			}
+		}
+	this.populate(this.getCalendar());
+	this.showPopup(anchorname);
+	}
+
+// Simple method to interface popup calendar with a text-entry box
+function CP_select(inputobj, linkname, format) {
+	var selectedDate=(arguments.length>3)?arguments[3]:null;
+	if (!window.getDateFromFormat) {
+		alert("calendar.select: To use this method you must also include 'date.js' for date formatting");
+		return;
+		}
+	if (this.displayType!="date"&&this.displayType!="week-end") {
+		alert("calendar.select: This function can only be used with displayType 'date' or 'week-end'");
+		return;
+		}
+	if (inputobj.type!="text" && inputobj.type!="hidden" && inputobj.type!="textarea") {
+		alert("calendar.select: Input object passed is not a valid form input object");
+		window.CP_targetInput=null;
+		return;
+		}
+	if (inputobj.disabled) { return; } // Can't use calendar input on disabled form input!
+	window.CP_targetInput = inputobj;
+	window.CP_calendarObject = this;
+	this.currentDate=null;
+	var time=0;
+	if (selectedDate!=null) {
+		time = getDateFromFormat(selectedDate,format)
+		}
+	else if (inputobj.value!="") {
+		time = getDateFromFormat(inputobj.value,format);
+		}
+	if (selectedDate!=null || inputobj.value!="") {
+		if (time==0) { this.currentDate=null; }
+		else { this.currentDate=new Date(time); }
+		}
+	window.CP_dateFormat = format;
+	this.showCalendar(linkname);
+	}
+
+// Get style block needed to display the calendar correctly
+function getCalendarStyles() {
+	var result = "";
+	var p = "";
+	if (this!=null && typeof(this.cssPrefix)!="undefined" && this.cssPrefix!=null && this.cssPrefix!="") { p=this.cssPrefix; }
+	result += "<STYLE>\n";
+	result += "."+p+"cpYearNavigation,."+p+"cpMonthNavigation { background-color:#C0C0C0; text-align:center; vertical-align:center; text-decoration:none; color:#000000; font-weight:bold; }\n";
+	result += "."+p+"cpDayColumnHeader, ."+p+"cpYearNavigation,."+p+"cpMonthNavigation,."+p+"cpCurrentMonthDate,."+p+"cpCurrentMonthDateDisabled,."+p+"cpOtherMonthDate,."+p+"cpOtherMonthDateDisabled,."+p+"cpCurrentDate,."+p+"cpCurrentDateDisabled,."+p+"cpTodayText,."+p+"cpTodayTextDisabled,."+p+"cpText { font-family:arial; font-size:8pt; }\n";
+	result += "TD."+p+"cpDayColumnHeader { text-align:right; border:solid thin #C0C0C0;border-width:0px 0px 1px 0px; }\n";
+	result += "."+p+"cpCurrentMonthDate, ."+p+"cpOtherMonthDate, ."+p+"cpCurrentDate  { text-align:right; text-decoration:none; }\n";
+	result += "."+p+"cpCurrentMonthDateDisabled, ."+p+"cpOtherMonthDateDisabled, ."+p+"cpCurrentDateDisabled { color:#D0D0D0; text-align:right; text-decoration:line-through; }\n";
+	result += "."+p+"cpCurrentMonthDate, .cpCurrentDate { color:#000000; }\n";
+	result += "."+p+"cpOtherMonthDate { color:#808080; }\n";
+	result += "TD."+p+"cpCurrentDate { color:white; background-color: #C0C0C0; border-width:1px; border:solid thin #800000; }\n";
+	result += "TD."+p+"cpCurrentDateDisabled { border-width:1px; border:solid thin #FFAAAA; }\n";
+	result += "TD."+p+"cpTodayText, TD."+p+"cpTodayTextDisabled { border:solid thin #C0C0C0; border-width:1px 0px 0px 0px;}\n";
+	result += "A."+p+"cpTodayText, SPAN."+p+"cpTodayTextDisabled { height:20px; }\n";
+	result += "A."+p+"cpTodayText { color:black; }\n";
+	result += "."+p+"cpTodayTextDisabled { color:#D0D0D0; }\n";
+	result += "."+p+"cpBorder { border:solid thin #808080; }\n";
+	result += "</STYLE>\n";
+	return result;
+	}
+
+// Return a string containing all the calendar code to be displayed
+function CP_getCalendar() {
+	var now = new Date();
+	// Reference to window
+	if (this.type == "WINDOW") { var windowref = "window.opener."; }
+	else { var windowref = ""; }
+	var result = "";
+	// If POPUP, write entire HTML document
+	if (this.type == "WINDOW") {
+		result += "<HTML><HEAD><TITLE>Calendar</TITLE>"+this.getStyles()+"</HEAD><BODY MARGINWIDTH=0 MARGINHEIGHT=0 TOPMARGIN=0 RIGHTMARGIN=0 LEFTMARGIN=0>\n";
+		result += '<CENTER><TABLE WIDTH=100% BORDER=0 BORDERWIDTH=0 CELLSPACING=0 CELLPADDING=0>\n';
+		}
+	else {
+		result += '<TABLE CLASS="'+this.cssPrefix+'cpBorder" WIDTH=144 BORDER=1 BORDERWIDTH=1 CELLSPACING=0 CELLPADDING=1>\n';
+		result += '<TR><TD ALIGN=CENTER>\n';
+		result += '<CENTER>\n';
+		}
+	// Code for DATE display (default)
+	// -------------------------------
+	if (this.displayType=="date" || this.displayType=="week-end") {
+		if (this.currentDate==null) { this.currentDate = now; }
+		if (arguments.length > 0) { var month = arguments[0]; }
+			else { var month = this.currentDate.getMonth()+1; }
+		if (arguments.length > 1 && arguments[1]>0 && arguments[1]-0==arguments[1]) { var year = arguments[1]; }
+			else { var year = this.currentDate.getFullYear(); }
+		var daysinmonth= new Array(0,31,28,31,30,31,30,31,31,30,31,30,31);
+		if ( ( (year%4 == 0)&&(year%100 != 0) ) || (year%400 == 0) ) {
+			daysinmonth[2] = 29;
+			}
+		var current_month = new Date(year,month-1,1);
+		var display_year = year;
+		var display_month = month;
+		var display_date = 1;
+		var weekday= current_month.getDay();
+		var offset = 0;
+
+		offset = (weekday >= this.weekStartDay) ? weekday-this.weekStartDay : 7-this.weekStartDay+weekday ;
+		if (offset > 0) {
+			display_month--;
+			if (display_month < 1) { display_month = 12; display_year--; }
+			display_date = daysinmonth[display_month]-offset+1;
+			}
+		var next_month = month+1;
+		var next_month_year = year;
+		if (next_month > 12) { next_month=1; next_month_year++; }
+		var last_month = month-1;
+		var last_month_year = year;
+		if (last_month < 1) { last_month=12; last_month_year--; }
+		var date_class;
+		if (this.type!="WINDOW") {
+			result += "<TABLE WIDTH=144 BORDER=0 BORDERWIDTH=0 CELLSPACING=0 CELLPADDING=0>";
+			}
+		result += '<TR>\n';
+		var refresh = windowref+'CP_refreshCalendar';
+		var refreshLink = 'javascript:' + refresh;
+		if (this.isShowNavigationDropdowns) {
+			result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="78" COLSPAN="3"><select CLASS="'+this.cssPrefix+'cpMonthNavigation" name="cpMonth" onChange="'+refresh+'('+this.index+',this.options[this.selectedIndex].value-0,'+(year-0)+');">';
+			for( var monthCounter=1; monthCounter<=12; monthCounter++ ) {
+				var selected = (monthCounter==month) ? 'SELECTED' : '';
+				result += '<option value="'+monthCounter+'" '+selected+'>'+this.monthNames[monthCounter-1]+'</option>';
+				}
+			result += '</select></TD>';
+			result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="10">&nbsp;</TD>';
+
+			result += '<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="56" COLSPAN="3"><select CLASS="'+this.cssPrefix+'cpYearNavigation" name="cpYear" onChange="'+refresh+'('+this.index+','+month+',this.options[this.selectedIndex].value-0);">';
+			for( var yearCounter=year-this.yearSelectStartOffset; yearCounter<=year+this.yearSelectStartOffset; yearCounter++ ) {
+				var selected = (yearCounter==year) ? 'SELECTED' : '';
+				result += '<option value="'+yearCounter+'" '+selected+'>'+yearCounter+'</option>';
+				}
+			result += '</select></TD>';
+			}
+		else {
+			if (this.isShowYearNavigation) {
+				result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="10"><A CLASS="'+this.cssPrefix+'cpMonthNavigation" HREF="'+refreshLink+'('+this.index+','+last_month+','+last_month_year+');">&lt;</A></TD>';
+				result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="58"><SPAN CLASS="'+this.cssPrefix+'cpMonthNavigation">'+this.monthNames[month-1]+'</SPAN></TD>';
+				result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="10"><A CLASS="'+this.cssPrefix+'cpMonthNavigation" HREF="'+refreshLink+'('+this.index+','+next_month+','+next_month_year+');">&gt;</A></TD>';
+				result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="10">&nbsp;</TD>';
+
+				result += '<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="10"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="'+refreshLink+'('+this.index+','+month+','+(year-1)+');">&lt;</A></TD>';
+				if (this.isShowYearNavigationInput) {
+					result += '<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="36"><INPUT NAME="cpYear" CLASS="'+this.cssPrefix+'cpYearNavigation" SIZE="4" MAXLENGTH="4" VALUE="'+year+'" onBlur="'+refresh+'('+this.index+','+month+',this.value-0);"></TD>';
+					}
+				else {
+					result += '<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="36"><SPAN CLASS="'+this.cssPrefix+'cpYearNavigation">'+year+'</SPAN></TD>';
+					}
+				result += '<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="10"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="'+refreshLink+'('+this.index+','+month+','+(year+1)+');">&gt;</A></TD>';
+				}
+			else {
+				result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="22"><A CLASS="'+this.cssPrefix+'cpMonthNavigation" HREF="'+refreshLink+'('+this.index+','+last_month+','+last_month_year+');">&lt;&lt;</A></TD>\n';
+				result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="100"><SPAN CLASS="'+this.cssPrefix+'cpMonthNavigation">'+this.monthNames[month-1]+' '+year+'</SPAN></TD>\n';
+				result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="22"><A CLASS="'+this.cssPrefix+'cpMonthNavigation" HREF="'+refreshLink+'('+this.index+','+next_month+','+next_month_year+');">&gt;&gt;</A></TD>\n';
+				}
+			}
+		result += '</TR></TABLE>\n';
+		result += '<TABLE WIDTH=120 BORDER=0 CELLSPACING=0 CELLPADDING=1 ALIGN=CENTER>\n';
+		result += '<TR>\n';
+		for (var j=0; j<7; j++) {
+
+			result += '<TD CLASS="'+this.cssPrefix+'cpDayColumnHeader" WIDTH="14%"><SPAN CLASS="'+this.cssPrefix+'cpDayColumnHeader">'+this.dayHeaders[(this.weekStartDay+j)%7]+'</TD>\n';
+			}
+		result += '</TR>\n';
+		for (var row=1; row<=6; row++) {
+			result += '<TR>\n';
+			for (var col=1; col<=7; col++) {
+				var disabled=false;
+				if (this.disabledDatesExpression!="") {
+					var ds=""+display_year+LZ(display_month)+LZ(display_date);
+					eval("disabled=("+this.disabledDatesExpression+")");
+					}
+				var dateClass = "";
+				if ((display_month == this.currentDate.getMonth()+1) && (display_date==this.currentDate.getDate()) && (display_year==this.currentDate.getFullYear())) {
+					dateClass = "cpCurrentDate";
+					}
+				else if (display_month == month) {
+					dateClass = "cpCurrentMonthDate";
+					}
+				else {
+					dateClass = "cpOtherMonthDate";
+					}
+				if (disabled || this.disabledWeekDays[col-1]) {
+					result += '	<TD CLASS="'+this.cssPrefix+dateClass+'"><SPAN CLASS="'+this.cssPrefix+dateClass+'Disabled">'+display_date+'</SPAN></TD>\n';
+					}
+				else {
+					var selected_date = display_date;
+					var selected_month = display_month;
+					var selected_year = display_year;
+					if (this.displayType=="week-end") {
+						var d = new Date(selected_year,selected_month-1,selected_date,0,0,0,0);
+						d.setDate(d.getDate() + (7-col));
+						selected_year = d.getYear();
+						if (selected_year < 1000) { selected_year += 1900; }
+						selected_month = d.getMonth()+1;
+						selected_date = d.getDate();
+						}
+					result += '	<TD CLASS="'+this.cssPrefix+dateClass+'"><A HREF="javascript:'+windowref+this.returnFunction+'('+selected_year+','+selected_month+','+selected_date+');'+windowref+'CP_hideCalendar(\''+this.index+'\');" CLASS="'+this.cssPrefix+dateClass+'">'+display_date+'</A></TD>\n';
+					}
+				display_date++;
+				if (display_date > daysinmonth[display_month]) {
+					display_date=1;
+					display_month++;
+					}
+				if (display_month > 12) {
+					display_month=1;
+					display_year++;
+					}
+				}
+			result += '</TR>';
+			}
+		var current_weekday = now.getDay() - this.weekStartDay;
+		if (current_weekday < 0) {
+			current_weekday += 7;
+			}
+		result += '<TR>\n';
+		result += '	<TD COLSPAN=7 ALIGN=CENTER CLASS="'+this.cssPrefix+'cpTodayText">\n';
+		if (this.disabledDatesExpression!="") {
+			var ds=""+now.getFullYear()+LZ(now.getMonth()+1)+LZ(now.getDate());
+			eval("disabled=("+this.disabledDatesExpression+")");
+			}
+		if (disabled || this.disabledWeekDays[current_weekday+1]) {
+			result += '		<SPAN CLASS="'+this.cssPrefix+'cpTodayTextDisabled">'+this.todayText+'</SPAN>\n';
+			}
+		else {
+			result += '		<A CLASS="'+this.cssPrefix+'cpTodayText" HREF="javascript:'+windowref+this.returnFunction+'(\''+now.getFullYear()+'\',\''+(now.getMonth()+1)+'\',\''+now.getDate()+'\');'+windowref+'CP_hideCalendar(\''+this.index+'\');">'+this.todayText+'</A>\n';
+			}
+		result += '		<BR>\n';
+		result += '	</TD></TR></TABLE></CENTER></TD></TR></TABLE>\n';
+	}
+
+	// Code common for MONTH, QUARTER, YEAR
+	// ------------------------------------
+	if (this.displayType=="month" || this.displayType=="quarter" || this.displayType=="year") {
+		if (arguments.length > 0) { var year = arguments[0]; }
+		else {
+			if (this.displayType=="year") {	var year = now.getFullYear()-this.yearSelectStartOffset; }
+			else { var year = now.getFullYear(); }
+			}
+		if (this.displayType!="year" && this.isShowYearNavigation) {
+			result += "<TABLE WIDTH=144 BORDER=0 BORDERWIDTH=0 CELLSPACING=0 CELLPADDING=0>";
+			result += '<TR>\n';
+			result += '	<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="22"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="javascript:'+windowref+'CP_refreshCalendar('+this.index+','+(year-1)+');">&lt;&lt;</A></TD>\n';
+			result += '	<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="100">'+year+'</TD>\n';
+			result += '	<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="22"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="javascript:'+windowref+'CP_refreshCalendar('+this.index+','+(year+1)+');">&gt;&gt;</A></TD>\n';
+			result += '</TR></TABLE>\n';
+			}
+		}
+
+	// Code for MONTH display
+	// ----------------------
+	if (this.displayType=="month") {
+		// If POPUP, write entire HTML document
+		result += '<TABLE WIDTH=120 BORDER=0 CELLSPACING=1 CELLPADDING=0 ALIGN=CENTER>\n';
+		for (var i=0; i<4; i++) {
+			result += '<TR>';
+			for (var j=0; j<3; j++) {
+				var monthindex = ((i*3)+j);
+				result += '<TD WIDTH=33% ALIGN=CENTER><A CLASS="'+this.cssPrefix+'cpText" HREF="javascript:'+windowref+this.returnMonthFunction+'('+year+','+(monthindex+1)+');'+windowref+'CP_hideCalendar(\''+this.index+'\');" CLASS="'+date_class+'">'+this.monthAbbreviations[monthindex]+'</A></TD>';
+				}
+			result += '</TR>';
+			}
+		result += '</TABLE></CENTER></TD></TR></TABLE>\n';
+		}
+
+	// Code for QUARTER display
+	// ------------------------
+	if (this.displayType=="quarter") {
+		result += '<BR><TABLE WIDTH=120 BORDER=1 CELLSPACING=0 CELLPADDING=0 ALIGN=CENTER>\n';
+		for (var i=0; i<2; i++) {
+			result += '<TR>';
+			for (var j=0; j<2; j++) {
+				var quarter = ((i*2)+j+1);
+				result += '<TD WIDTH=50% ALIGN=CENTER><BR><A CLASS="'+this.cssPrefix+'cpText" HREF="javascript:'+windowref+this.returnQuarterFunction+'('+year+','+quarter+');'+windowref+'CP_hideCalendar(\''+this.index+'\');" CLASS="'+date_class+'">Q'+quarter+'</A><BR><BR></TD>';
+				}
+			result += '</TR>';
+			}
+		result += '</TABLE></CENTER></TD></TR></TABLE>\n';
+		}
+
+	// Code for YEAR display
+	// ---------------------
+	if (this.displayType=="year") {
+		var yearColumnSize = 4;
+		result += "<TABLE WIDTH=144 BORDER=0 BORDERWIDTH=0 CELLSPACING=0 CELLPADDING=0>";
+		result += '<TR>\n';
+		result += '	<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="50%"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="javascript:'+windowref+'CP_refreshCalendar('+this.index+','+(year-(yearColumnSize*2))+');">&lt;&lt;</A></TD>\n';
+		result += '	<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="50%"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="javascript:'+windowref+'CP_refreshCalendar('+this.index+','+(year+(yearColumnSize*2))+');">&gt;&gt;</A></TD>\n';
+		result += '</TR></TABLE>\n';
+		result += '<TABLE WIDTH=120 BORDER=0 CELLSPACING=1 CELLPADDING=0 ALIGN=CENTER>\n';
+		for (var i=0; i<yearColumnSize; i++) {
+			for (var j=0; j<2; j++) {
+				var currentyear = year+(j*yearColumnSize)+i;
+				result += '<TD WIDTH=50% ALIGN=CENTER><A CLASS="'+this.cssPrefix+'cpText" HREF="javascript:'+windowref+this.returnYearFunction+'('+currentyear+');'+windowref+'CP_hideCalendar(\''+this.index+'\');" CLASS="'+date_class+'">'+currentyear+'</A></TD>';
+				}
+			result += '</TR>';
+			}
+		result += '</TABLE></CENTER></TD></TR></TABLE>\n';
+		}
+	// Common
+	if (this.type == "WINDOW") {
+		result += "</BODY></HTML>\n";
+		}
+	return result;
+	}
diff --git a/src/lib/Client/Tools/POSIX.py b/src/lib/Client/Tools/POSIX.py
index c883fc17a..bcb9f48b3 100644
--- a/src/lib/Client/Tools/POSIX.py
+++ b/src/lib/Client/Tools/POSIX.py
@@ -542,7 +542,7 @@ class POSIX(Bcfg2.Client.Tools.Tool):
                             return False
 
         # If we get here, then the parent directory should exist
-        if (entry.get("paranoid", False) == 'true') and \
+        if (entry.get("paranoid", False) in ['true', 'True']) and \
            self.setup.get("paranoid", False) and not \
            (entry.get('current_exists', 'true') == 'false'):
             bkupnam = entry.get('name').replace('/', '_')
@@ -550,7 +550,7 @@ class POSIX(Bcfg2.Client.Tools.Tool):
             bkuplist = [f for f in os.listdir(self.ppath) if
                         f.startswith(bkupnam)]
             bkuplist.sort()
-            if len(bkuplist) == int(self.max_copies):
+            while len(bkuplist) >= int(self.max_copies):
                 # remove the oldest backup available
                 oldest = bkuplist.pop(0)
                 self.logger.info("Removing %s" % oldest)
@@ -563,7 +563,8 @@ class POSIX(Bcfg2.Client.Tools.Tool):
             try:
                 # backup existing file
                 shutil.copy(entry.get('name'),
-                            "%s/%s_%s" % (self.ppath, bkupnam, datetime.now()))
+                            "%s/%s_%s" % (self.ppath, bkupnam,
+                                          datetime.isoformat(datetime.now())))
                 self.logger.info("Backup of %s saved to %s" %
                                  (entry.get('name'), self.ppath))
             except IOError, e:
diff --git a/src/lib/Server/Hostbase/media/base.css b/src/lib/Server/Hostbase/media/base.css
index 9196c7d51..ddbf02165 100644
--- a/src/lib/Server/Hostbase/media/base.css
+++ b/src/lib/Server/Hostbase/media/base.css
@@ -1,5 +1,5 @@
-

-/* Import other styles */

-@import url('global.css');

-@import url('layout.css');

-@import url('boxypastel.css');

+
+/* Import other styles */
+@import url('global.css');
+@import url('layout.css');
+@import url('boxypastel.css');
diff --git a/src/lib/Server/Hostbase/media/global.css b/src/lib/Server/Hostbase/media/global.css
index 92d7ce0a3..73451e1bc 100644
--- a/src/lib/Server/Hostbase/media/global.css
+++ b/src/lib/Server/Hostbase/media/global.css
@@ -1,8 +1,8 @@
-body {

-        margin:0; 

-        padding:0;

-        font-size:12px;

-        font-family:"Lucida Grande","Bitstream Vera Sans",Verdana,Arial,sans-serif;

-        color:#000;

-        background:#fff;

-        }

+body {
+        margin:0;
+        padding:0;
+        font-size:12px;
+        font-family:"Lucida Grande","Bitstream Vera Sans",Verdana,Arial,sans-serif;
+        color:#000;
+        background:#fff;
+        }
diff --git a/src/lib/Server/Hostbase/media/layout.css b/src/lib/Server/Hostbase/media/layout.css
index 99f61da8f..9085cc220 100644
--- a/src/lib/Server/Hostbase/media/layout.css
+++ b/src/lib/Server/Hostbase/media/layout.css
@@ -1,62 +1,62 @@
-/* Page Structure */

-#container { position:absolute; top: 3em; margin-left:1em; margin-right:2em; padding:0; margin-top:1.5em; min-width:

- 650px; }

-#header { width:100%; }

-#content-main { float:left; }

-

-/*  HEADER  */

-#header { 

-background:#000; 

-color:#ffc; 

-position:absolute;

-}

-#header a:link, #header a:visited { color:white; }

-#header a:hover { text-decoration:underline; }

-#branding h1 { padding:0 10px; font-size:18px; margin:8px 0; font-weight:normal; color:#f4f379; }

-#branding h2 { padding:0 10px; font-size:14px; margin:-8px 0 8px 0; font-weight:normal; color:#ffc; }

-#user-tools { position:absolute; top:0; right:0; padding:1.2em 10px; font-size:11px; text-align:right; }

-

-/*SIDEBAR*/

-#sidebar {

-   float:left; 

-   position: relative; 

-   width: auto; 

-   height: 100%; 

-   margin-top: 3em; 

-   padding-right: 1.5em; 

-   padding-left: 1.5em; 

-   padding-top: 1em; 

-   padding-bottom:3em; 

-   background: #000; 

-   color:ffc;

-}

-

-a.sidebar:link {color: #fff;}

-a.sidebar:active {color: #fff;}

-a.sidebar:visited {color: #fff;}

-a.sidebar:hover {color: #fff;}

-

-ul.sidebar {

-        color: #ffc;

-        text-decoration: none;

-        list-style-type: none;

-        text-indent: -1em;

-}

-ul.sidebar-level2 {

-        text-indent: -2em;

-        list-style-type: none;

-        font-size: 11px;

-}

-

-/* ALIGNED FIELDSETS */

-.aligned label { display:block; padding:0 1em 3px 0; float:left; width:8em; }

-.aligned label.inline { display:inline; float:none; }

-.colMS .aligned .vLargeTextField, .colMS .aligned .vXMLLargeTextField { width:350px; }

-form .aligned p, form .aligned ul { margin-left:7em; padding-left:30px; }

-form .aligned table p { margin-left:0; padding-left:0; }

-form .aligned p.help { padding-left:38px; }

-.aligned .vCheckboxLabel { float:none !important; display:inline; padding-left:4px; }

-.colM .aligned .vLargeTextField, colM .aligned .vXMLLargeTextField { width:610px; }

-.checkbox-row p.help { margin-left:0; padding-left:0 !important; } 

-

-

+/* Page Structure */
+#container { position:absolute; top: 3em; margin-left:1em; margin-right:2em; padding:0; margin-top:1.5em; min-width:
+ 650px; }
+#header { width:100%; }
+#content-main { float:left; }
+
+/*  HEADER  */
+#header {
+background:#000;
+color:#ffc;
+position:absolute;
+}
+#header a:link, #header a:visited { color:white; }
+#header a:hover { text-decoration:underline; }
+#branding h1 { padding:0 10px; font-size:18px; margin:8px 0; font-weight:normal; color:#f4f379; }
+#branding h2 { padding:0 10px; font-size:14px; margin:-8px 0 8px 0; font-weight:normal; color:#ffc; }
+#user-tools { position:absolute; top:0; right:0; padding:1.2em 10px; font-size:11px; text-align:right; }
+
+/*SIDEBAR*/
+#sidebar {
+   float:left;
+   position: relative;
+   width: auto;
+   height: 100%;
+   margin-top: 3em;
+   padding-right: 1.5em;
+   padding-left: 1.5em;
+   padding-top: 1em;
+   padding-bottom:3em;
+   background: #000;
+   color:ffc;
+}
+
+a.sidebar:link {color: #fff;}
+a.sidebar:active {color: #fff;}
+a.sidebar:visited {color: #fff;}
+a.sidebar:hover {color: #fff;}
+
+ul.sidebar {
+        color: #ffc;
+        text-decoration: none;
+        list-style-type: none;
+        text-indent: -1em;
+}
+ul.sidebar-level2 {
+        text-indent: -2em;
+        list-style-type: none;
+        font-size: 11px;
+}
+
+/* ALIGNED FIELDSETS */
+.aligned label { display:block; padding:0 1em 3px 0; float:left; width:8em; }
+.aligned label.inline { display:inline; float:none; }
+.colMS .aligned .vLargeTextField, .colMS .aligned .vXMLLargeTextField { width:350px; }
+form .aligned p, form .aligned ul { margin-left:7em; padding-left:30px; }
+form .aligned table p { margin-left:0; padding-left:0; }
+form .aligned p.help { padding-left:38px; }
+.aligned .vCheckboxLabel { float:none !important; display:inline; padding-left:4px; }
+.colM .aligned .vLargeTextField, colM .aligned .vXMLLargeTextField { width:610px; }
+.checkbox-row p.help { margin-left:0; padding-left:0 !important; }
+
+
diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py
index f851b7914..184bb792c 100644
--- a/src/lib/Server/Plugins/Cfg.py
+++ b/src/lib/Server/Plugins/Cfg.py
@@ -22,6 +22,7 @@ except:
 
 logger = logging.getLogger('Bcfg2.Plugins.Cfg')
 
+
 # snipped from TGenshi
 def removecomment(stream):
     """A genshi filter that removes comments from the stream."""
@@ -30,6 +31,7 @@ def removecomment(stream):
             continue
         yield kind, data, pos
 
+
 def process_delta(data, delta):
     if not delta.specific.delta:
         return data
@@ -63,10 +65,12 @@ def process_delta(data, delta):
             raise Bcfg2.Server.Plugin.PluginExecutionError, ('delta', delta)
         return output
 
+
 class CfgMatcher:
+
     def __init__(self, fname):
         name = re.escape(fname)
-        self.basefile_reg = re.compile('^(?P<basename>%s)(|\\.H_(?P<hostname>\S+)|.G(?P<prio>\d+)_(?P<group>\S+))(?P<genshi>\\.genshi)?$' % name)
+        self.basefile_reg = re.compile('^(?P<basename>%s)(|\\.H_(?P<hostname>\S+?)|.G(?P<prio>\d+)_(?P<group>\S+?))(?P<genshi>\\.genshi)?$' % name)
         self.delta_reg = re.compile('^(?P<basename>%s)(|\\.H_(?P<hostname>\S+)|\\.G(?P<prio>\d+)_(?P<group>\S+))\\.(?P<delta>(cat|diff))$' % name)
         self.cat_count = fname.count(".cat")
         self.diff_count = fname.count(".diff")
@@ -77,7 +81,9 @@ class CfgMatcher:
             return self.delta_reg.match(fname)
         return self.basefile_reg.match(fname)
 
+
 class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet):
+
     def __init__(self, basename, path, entry_type, encoding):
         Bcfg2.Server.Plugin.EntrySet.__init__(self, basename, path,
                                               entry_type, encoding)
@@ -87,15 +93,18 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet):
         return cmp(one.specific, other.specific)
 
     def get_pertinent_entries(self, metadata):
-        '''return a list of all entries pertinent to a client => [base, delta1, delta2]'''
+        """return a list of all entries pertinent
+        to a client => [base, delta1, delta2]
+        """
         matching = [ent for ent in self.entries.values() if \
                     ent.specific.matches(metadata)]
         matching.sort(self.sort_by_specific)
-        non_delta = [matching.index(m) for m in matching if not m.specific.delta]
+        non_delta = [matching.index(m) for m in matching
+                     if not m.specific.delta]
         if not non_delta:
             raise Bcfg2.Server.Plugin.PluginExecutionError
         base = min(non_delta)
-        used = matching[:base+1]
+        used = matching[:base + 1]
         used.reverse()
         return used
 
@@ -113,10 +122,11 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet):
                 template_cls = NewTextTemplate
                 loader = TemplateLoader()
                 template = loader.load(basefile.name, cls=template_cls,
-                                            encoding=self.encoding)
-                stream = template.generate( \
-                    name=entry.get('name'), metadata=metadata,
-                    path=basefile.name).filter(removecomment)
+                                       encoding=self.encoding)
+                fname = entry.get('realname', entry.get('name'))
+                stream = template.generate(name=fname,
+                                           metadata=metadata,
+                                           path=basefile.name).filter(removecomment)
                 try:
                     data = stream.render('text', strip_whitespace=False)
                 except TypeError:
@@ -136,7 +146,12 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet):
         if entry.get('encoding') == 'base64':
             entry.text = binascii.b2a_base64(data)
         else:
-            entry.text = unicode(data, self.encoding)
+            try:
+                entry.text = unicode(data, self.encoding)
+            except UnicodeDecodeError, e:
+                logger.error("Failed to decode %s: %s" % (entry.get('name'), e))
+                logger.error("Please verify you are using the proper encoding.")
+                raise Bcfg2.Server.Plugin.PluginExecutionError
         if entry.text in ['', None]:
             entry.set('empty', 'true')
 
@@ -168,7 +183,8 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet):
             open(name, 'w').write(new_entry['text'])
             if log:
                 logger.info("Wrote file %s" % name)
-        badattr = [attr for attr in ['owner', 'group', 'perms'] if attr in new_entry]
+        badattr = [attr for attr in ['owner', 'group', 'perms']
+                   if attr in new_entry]
         if badattr:
             metadata_updates = {}
             metadata_updates.update(self.metadata)
@@ -178,12 +194,13 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet):
             infotag = lxml.etree.SubElement(infoxml, 'Info')
             [infotag.attrib.__setitem__(attr, metadata_updates[attr]) \
                 for attr in metadata_updates]
-            ofile = open(self.path + "/info.xml","w")
+            ofile = open(self.path + "/info.xml", "w")
             ofile.write(lxml.etree.tostring(infoxml, pretty_print=True))
             ofile.close()
             if log:
                 logger.info("Wrote file %s" % (self.path + "/info.xml"))
 
+
 class Cfg(Bcfg2.Server.Plugin.GroupSpool,
           Bcfg2.Server.Plugin.PullTarget):
     """This generator in the configuration file repository for Bcfg2."""
@@ -197,4 +214,6 @@ class Cfg(Bcfg2.Server.Plugin.GroupSpool,
         return self.entries[entry.get('name')].list_accept_choices(metadata)
 
     def AcceptPullData(self, specific, new_entry, log):
-        return self.entries[new_entry.get('name')].write_update(specific, new_entry, log)
+        return self.entries[new_entry.get('name')].write_update(specific,
+                                                                new_entry,
+                                                                log)
diff --git a/src/sbin/bcfg2-ping-sweep b/src/sbin/bcfg2-ping-sweep
index 4082cad8b..718ad69d0 100755
--- a/src/sbin/bcfg2-ping-sweep
+++ b/src/sbin/bcfg2-ping-sweep
@@ -8,7 +8,7 @@ __revision__ = '$Revision$'
 from os import dup2, execl, fork, uname, wait
 import sys
 import time
-import lxml.etree 
+import lxml.etree
 
 import Bcfg2.Options
 
@@ -20,9 +20,10 @@ if __name__ == '__main__':
 
     cfpath = setup['configfile']
     clientdatapath = "%s/Metadata/clients.xml" % setup['repo']
-    
+
     clientElement = lxml.etree.parse(clientdatapath)
-    hostlist = [client.get('name') for client in clientElement.findall("Client")]
+    hostlist = [client.get('name')
+                for client in clientElement.findall("Client")]
 
     pids = {}
     null = open('/dev/null', 'w+')
@@ -31,7 +32,6 @@ if __name__ == '__main__':
     #/bin/ping on linux /sbin/ping on os x
     osname = uname()[0]
 
-    
     while hostlist or pids:
         if hostlist and len(pids.keys()) < 15:
             host = hostlist.pop()
@@ -47,7 +47,7 @@ if __name__ == '__main__':
                     execl('/sbin/ping', 'ping', '-t', '5', '-c', '1', host)
                 elif osname == 'SunOS':
                     execl('/usr/sbin/ping', 'ping', host, '56', '1')
-                else: #default
+                else:  # default
                     execl('/bin/ping', 'ping', '-w', '5', '-c', '1', host)
             else:
                 pids[pid] = host
@@ -58,14 +58,15 @@ if __name__ == '__main__':
                 continue
             chost = pids[cpid]
             del pids[cpid]
-            elm = clientElement.xpath("//Client[@name='%s']"%chost)[0]
+            elm = clientElement.xpath("//Client[@name='%s']" % chost)[0]
             if status == 0:
-                elm.set("pingable",'Y')
+                elm.set("pingable", 'Y')
                 elm.set("pingtime", str(time.time()))
             else:
-                elm.set("pingable",'N')
+                elm.set("pingable", 'N')
 
     fout = open(clientdatapath, 'w')
-    fout.write(lxml.etree.tostring(clientElement.getroot(), encoding='UTF-8', xml_declaration=True))
+    fout.write(lxml.etree.tostring(clientElement.getroot(),
+                                   encoding='UTF-8',
+                                   xml_declaration=True))
     fout.close()
-                        
diff --git a/src/sbin/bcfg2-reports b/src/sbin/bcfg2-reports
index d83e45e7c..559e9fb43 100755
--- a/src/sbin/bcfg2-reports
+++ b/src/sbin/bcfg2-reports
@@ -5,7 +5,13 @@ __revision__ = '$Revision$'
 import os
 import sys
 
-import Bcfg2.Server.Reports.settings
+try:
+    import Bcfg2.Server.Reports.settings
+except ConfigParser.NoSectionError:
+    print("Your bcfg2.conf is currently missing the statistics section which "
+          "is necessary for the reporting interface. Please see bcfg2.conf(5) "
+          "for more details.")
+    sys.exit(1)
 
 project_directory = os.path.dirname(Bcfg2.Server.Reports.settings.__file__)
 project_name = os.path.basename(project_directory)