e-smith-manager/sme9/e-smith-manager-2.6.0-Koozali_manager.patch

diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/COPYING e-smith-manager-2.6.0/e-smith-manager-2.6.0/COPYING
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/COPYING     2002-03-01 13:33:07.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/COPYING 1969-12-31 19:00:00.000000000 -0500
@@ -1,340 +0,0 @@
-                   GNU GENERAL PUBLIC LICENSE
-                      Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                           Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                   GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                           NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                    END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/createlinks e-smith-manager-2.6.0/e-smith-manager-2.6.0/createlinks
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/createlinks 2007-01-26 20:51:30.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/createlinks     1969-12-31 19:00:00.000000000 -0500
@@ -1,91 +0,0 @@
-#!/usr/bin/perl -w
-
-use esmith::Build::CreateLinks  qw(:all);
-
-panel_link("navigation", "manager");
-panel_link("noframes", "manager");
-
-event_link("navigation-conf", 'bootstrap-console-save', 50);
-
-for (  qw(     sme_core.css
-               sme_header.css
-               sme_main.css
-               sme_menu.css
-               sme_panel_menu.css
-       ) )
-{
-    templates2events("/etc/e-smith/web/common/css/$_", qw(
-        bootstrap-console-save
-        ));
-}
-
-templates2events("/etc/e-smith/web/panels/manager/html/header.htm", qw(
-       console-save
-       bootstrap-console-save
-       network-create
-       network-delete
-       logrotate
-       ));
-templates2events("/etc/e-smith/web/common/head.tmpl", qw(
-       console-save
-       bootstrap-console-save
-       network-create
-       network-delete
-       logrotate
-       ));
-templates2events("/etc/e-smith/web/common/foot.tmpl", qw(
-       console-save
-       bootstrap-console-save
-       network-create
-       network-delete
-       logrotate
-       ));
-
-# conf-httpd-admin
-
-templates2events("/etc/httpd/admin-conf/httpd.conf", qw(
-       console-save
-       bootstrap-console-save
-       network-create
-       network-delete
-       remoteaccess-update
-       logrotate
-       ));
-
-templates2events("/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg", 'bootstrap-console-save');
-
-# Set up generic logfile timestamp renaming/symlinking
-
-foreach (qw(
-    /var/log/httpd/admin_access_log
-    /var/log/httpd/admin_error_log
-    ))
-{
-    safe_touch "root/etc/e-smith/events/logrotate/logfiles2timestamp/$_";
-    safe_touch "root/etc/e-smith/events/post-install/logfiles2timestamp/$_";
-    safe_touch "root/etc/e-smith/events/post-upgrade/logfiles2timestamp/$_";
-}
-
-foreach (qw(console-save remoteaccess-update logrotate))
-{
-    safe_symlink("sigusr1", "root/etc/e-smith/events/$_/services2adjust/httpd-admin");
-}
-
-my %service2order =
-(
-    'httpd-admin'      => "86",
-);
-
-foreach my $service (keys %service2order)
-{
-    service_link_enhanced($service, $service2order{$service}, 7);
-}
-
-# Symlink httpd-admin to httpd.
-safe_symlink("httpd", "root/usr/sbin/httpd-admin");
-
-# Set up links to daemontools.
-safe_symlink("daemontools", "root/etc/rc.d/init.d/httpd-admin");
-service_link_enhanced("httpd-admin", "K15", "6");
-service_link_enhanced("httpd-admin", "K15", "0");
-
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/defaults/httpd-admin/access e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/defaults/httpd-admin/access
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/defaults/httpd-admin/access       2006-11-02 11:38:41.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/defaults/httpd-admin/access   1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-localhost
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/defaults/httpd-admin/PermitPlainTextAccess e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/defaults/httpd-admin/PermitPlainTextAccess
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/defaults/httpd-admin/PermitPlainTextAccess        2006-11-02 11:38:41.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/defaults/httpd-admin/PermitPlainTextAccess    1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-no
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/defaults/httpd-admin/status e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/defaults/httpd-admin/status
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/defaults/httpd-admin/status       2006-11-02 11:38:41.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/defaults/httpd-admin/status   1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-enabled
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/defaults/httpd-admin/TCPPort e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/defaults/httpd-admin/TCPPort
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/defaults/httpd-admin/TCPPort      2006-11-02 11:38:41.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/defaults/httpd-admin/TCPPort  1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-980
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/defaults/httpd-admin/type e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/defaults/httpd-admin/type
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/defaults/httpd-admin/type 2006-11-02 11:38:41.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/defaults/httpd-admin/type     1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-service
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/migrate/20TKTAuthSecret e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/migrate/20TKTAuthSecret
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/migrate/20TKTAuthSecret   2007-01-26 20:51:30.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/db/configuration/migrate/20TKTAuthSecret       1969-12-31 19:00:00.000000000 -0500
@@ -1,7 +0,0 @@
-{
-    my $admin = $DB->get('httpd-admin');
-    return unless $admin;
-    return if $admin->prop('TKTAuthSecret');
-    use Data::UUID;
-    $admin->set_prop('TKTAuthSecret', Data::UUID->new->create_str());
-}
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/events/actions/navigation-conf e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/events/actions/navigation-conf
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/events/actions/navigation-conf     2008-10-07 13:36:17.000000000 -0400
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/events/actions/navigation-conf 1969-12-31 19:00:00.000000000 -0500
@@ -1,153 +0,0 @@
-#!/usr/bin/perl -w
-
-#----------------------------------------------------------------------
-# copyright (C) 1999-2006 Mitel Networks Corporation
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#              
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#              
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-# 
-#----------------------------------------------------------------------
-package esmith;
-
-use strict;
-
-use esmith::NavigationDB;
-use esmith::I18N;
-
-use constant WEBFUNCTIONS => '/etc/e-smith/web/functions';
-use constant NAVIGATIONDIR => '/home/e-smith/db/navigation';
-use constant NEW_NAVDIR => '/home/e-smith/db';
-
-my $navigation_ignore = 
-    "(\.\.?|navigation|noframes|online-manual|(internal|pleasewait)(-.*)?)";
-
-my $i18n = new esmith::I18N;
-
-my %navdbs;
-
-opendir FUNCTIONS, WEBFUNCTIONS or 
-    die "Couldn't open ", WEBFUNCTIONS, "\n";
-
-my @files = grep (!/^${navigation_ignore}$/, readdir (FUNCTIONS));
-my @langs = $i18n->availableLanguages(); 
-
-use XML::Parser;
-my $parser = new XML::Parser (Style => 'Tree',
-      ProtocolEncoding => 'UTF-8');
-
-foreach my $file (@files)
-{
-    next if (-d WEBFUNCTIONS . "/$file");
-    next unless (-x WEBFUNCTIONS . "/$file");
-
-    #-------------------------------------------------- 
-    # extract heading, description and weight information
-    # from CGI script
-    #-------------------------------------------------- 
-    open(SCRIPT, WEBFUNCTIONS . "/$file");
-    my $heading            = undef;
-    my $description        = undef;
-    my $heading_weight     = undef;
-    my $description_weight = undef;
-    while ( <SCRIPT> )
-    {
-       $heading = $1 if (/^\s*#\s*heading\s*:\s*(.+?)\s*$/);
-
-       $description = $1 
-           if (/^\s*#\s*description\s*:\s*(.+?)\s*$/);
-
-       ($heading_weight, $description_weight) = ($1, $2) 
-           if (/^\s*#\s*navigation\s*:\s*(\d+?)\s+(\d+?)\s*$/);
-
-       last if (defined $heading and 
-           defined $description and
-           defined $heading_weight and
-           defined $description_weight);
-    }
-    close SCRIPT;
-    foreach my $lang (@langs)
-    {
-#warn "updating script $file for lang $lang\n";
-       my $navdb = $navdbs{$lang};
-       my $navinfo = NAVIGATIONDIR . "/navigation.$lang";
-       $navdb ||= esmith::NavigationDB->open($navinfo);
-       $navdb ||= esmith::NavigationDB->create($navinfo) or
-           die "Couldn't create $navinfo\n";
-        $navdbs{$lang} ||= $navdb;
-       my $rec = $navdb->get($file) || 
-           $navdb->new_record($file, { type => 'panel' } );
-
-       my $lexicon = {};
-
-       foreach my $lfile ( "/etc/e-smith/locale/$lang/FormMagick/general",
-                           "/etc/e-smith/locale/$lang/etc/e-smith/web/functions/$file" )
-       {
-           if (-f $lfile)
-           {
-               # Do a quick and dirty parse of the lexicon file
-                my $xmlstr = "";
-                open(FILE, $lfile) or die "Couldn't open $lfile:\n$!";
-                binmode(FILE, ":utf8");
-                {
-                    local $^W = 0;
-                    while ( my $line = <FILE> ) {
-                        unless ( utf8::valid($line) ) {
-                            warn "$lfile not in UTF-8 format\n";
-                            utf8::encode($line);
-                        }
-                        $xmlstr .= $line;
-                    }
-                }
-                my $xml = $parser->parsestring($xmlstr);
-               my @lexicon = @{$xml->[1]};
-               shift @lexicon; # Remove lexicon attributes
-               while (@lexicon)
-               {
-                   my ($tag, $data) = splice(@lexicon, 0, 2);
-                   next unless $tag eq 'entry';
-                   my %entry_hash = ('attributes', @$data);
-                   my $base = $entry_hash{base};
-                   $base = @{$base}[2];
-                   my $trans = $entry_hash{trans};
-                   $trans = @{$trans}[2];
-                   next unless defined $base && defined $trans;
-                   $lexicon->{$base} = $trans;
-               }
-           }
-       }
-
-       my $loc_heading =  localise($lexicon, $heading);
-       $loc_heading =~ s/^\s*(\w.*?)\s*$/$1/;
-       my $loc_description =  localise($lexicon, $description);
-       $loc_description =~ s/^\s*(\w.*?)\s*$/$1/;
-       $rec->merge_props(
-           Heading => $loc_heading,
-           Description => $loc_description,
-           HeadingWeight => localise($lexicon, $heading_weight),
-           DescriptionWeight => localise($lexicon, $description_weight));
-    }
-}
-foreach my $lang (@langs)
-{
-#warn "trying to close for lang $lang\n";
-    my $navdb = $navdbs{$lang};
-    $navdb->close();
-}
-
-sub localise {
-    my ($lexicon, $string) = @_;
-    $string  = "" unless defined $string;
-    return $lexicon->{$string} || $string;
-}
-
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg/manager_access e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg/manager_access
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg/manager_access        2016-07-19 09:03:46.681000000 -0400
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg/manager_access    1969-12-31 19:00:00.000000000 -0500
@@ -1,6 +0,0 @@
-{
-    my $secret = ${'httpd-admin'}{TKTAuthSecret} || "34322500-7330-4400-423A-3A00434F5245";
-    $OUT .= "TKTAuthSecret $secret\n";
-    $OUT .= "TKTAuthTimeout 5m\n";
-    $OUT .= "TKTAuthCookieExpires 5m";
-}
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_core.css/50body e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_core.css/50body
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_core.css/50body   2006-03-15 16:59:54.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_core.css/50body       1969-12-31 19:00:00.000000000 -0500
@@ -1,229 +0,0 @@
-{
-    $OUT = <<'EOF';
-
-
-/* INSERT COPYRIGHT HERE */
-
-/* This is the stylesheet used as the basis for older broswers.
-
-Note that you CANNOT simly add styles here and hope they work.  ONLY CSS
-level 1 styles should be in this file.  Everyting else goes into the other 3
-files.
-
-These basic styles ensire that browsers that don't understand the @import
-method will still be usable.  All modern browsers will use the styles in
-sme_main.css, sme_menu.css or sme_header.css depending on the frame in which
-the page is found.   
-*/
-
-/* Default HTML styles */
-body {
-    background: #ffffff;
-    color: #000000;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-    border-width: 0;
-}
-
-table, tr, td, div, p, form {
-    color: #000000;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-}
-
-p {
-    margin-top: 8px;
-    margin-bottom: 2px;
-}
-
-form {
-    margin-top: 2px;
-    margin-bottom: 2px;
-}
-
-span {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-}
-
-.notsmall {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-}
-
-h1, .h1 {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    color: #333333;
-    font-size: 18px;
-    margin-bottom: 4px;
-    margin-top: 12px;
-}
-
-h2, .h2 {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    color: #333333;
-    font-size: 14px;
-    margin-bottom: 3px;
-    margin-top: 12px;
-}
-
-h3, .h3 {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    color: #333333;
-    font-size: 12px;
-    margin-bottom: 2px;
-    margin-top: 12px;
-}
-
-h4, .h4 {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-style: italic;
-    color: #333333;
-    font-size: 12px;
-    margin-bottom: 2px;
-    margin-top: 10px;
-}
-
-ol, ul, li {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 10px;
-    font-weight: normal;
-    color: black;
-}
-
-ul {
-    list-style-type: circle;
-}
-
-/* Core styles for use with sme_header.css*/
-body.header { 
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-    background: #cccccc; 
-    margin-top: 0px; 
-    margin-right: 0px; 
-    margin-bottom: 0px; 
-    margin-left: 0px; 
-}
-
-.hilightbar {
-    background-color: #ffc50a;
-    font-size: 4px;
-}
-
-.infobar {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-    background-color: #cccccc;
-}
-
-.darkergrey {
-    color: #666666;
-}
-
-td.darkgrey {
-    background-color: #888888;
-}
-
-a.update {
-    color: red;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-    background: #cccccc; 
-}
-
-/* Core styles for use with sme_menu.css */
-
-body.menu { 
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px;
-    background-color: #eeeeee;
-}
-
-td.section {
-    padding-bottom: 2px; 
-    padding-top: 8px; 
-}
-
-.section {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px;
-    font-weight: bold;
-    background-color: #eeeeee;
-}
-
-a.item { 
-    color: #00008b;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-    background: #eeeeee; 
-}
-
-a.sl { 
-    color: green;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-    background: #eeeeee; 
-}
-
-a.alert { 
-    color: red;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-    background: #eeeeee; 
-}
-
-/* Core styles for use with sme_main.css */
-body.main { 
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-    background-color: #ffffff;
-    color: #000000;
-}
-
-td.sme-noborders-label {
-    font-weight: bold;
-    width: 33%;
-    text-align: right;
-}
-
-hr.sectionbar {
-    color: #666666;
-    background-color: #666666;
-    height: 1px;
-    width: 80%;
-    border: 0;
-}
-
-hr.sme-copyrightbar {
-    color: #dddddd;
-    background-color: #dddddd;
-    height: 1px;
-    width: 100%;
-    border: 0;
-}
-
-.sme-copyright {
-    color: #777777;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 10px; 
-}
-
-/*These style definitions were found int he old css file (manager.css)
-but don't seem to ever be referenced in the code.  They're here
-for reference.
-
-.centerit {
-    text-align: center;
-}
-.highlight {
-    background: #ffc61e;
-}
-.subheading {
-    background: #ffffff;
-    color: #1e385b;
-}
-*/
-
-EOF
-}
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_core.css/template-begin e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_core.css/template-begin
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_core.css/template-begin   2006-03-15 16:59:54.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_core.css/template-begin       1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-/* DO NOT MODIFY THIS FILE! It is updated automatically */
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_header.css/50body e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_header.css/50body
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_header.css/50body 2006-03-15 16:59:54.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_header.css/50body     1969-12-31 19:00:00.000000000 -0500
@@ -1,128 +0,0 @@
-{
-    $OUT = <<'EOF';
-
-/* INSERT COPYRIGHT HERE */
-
-/* This is the stylesheet used in the header panel only
-
-   This file inherits the styles use in sme_core in the "header" section, and
-   as noted in the code below.  Note that some of the styles here are empty.  
-       This is because the style definition has moved safely to sme_core.css
-       and the placeholder is left here for reference or future use.
-
-   There are a lot of styles in here, so read carefully.  Each one is documented.
-
-       Styles that were in the old stylesheets, but are not used in the UI are at the
-       bottom, commented out.  These can be removed at the end of the 6.0 cycle */
-
-/* general table cell properties */
-td { 
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-    color: black; 
-}
-
-table {
-    width=100%;
-        margin-top: 0px; 
-    margin-right: 0px; 
-    margin-bottom: 1px; 
-    margin-left: 0px; 
-}  
-
-/* This is the class of the product bar, orange in the case of the 6000 MAS */
-.hilightbar {
-    border-color: #888888 ; 
-    border-style: solid; 
-    border-top-width: 1px; 
-    border-right-width: 0px; 
-    border-bottom-width: 1px; 
-    border-left-width: 0px;
-}
-
-/* this is the class of the grey bar under the hilight bar, where text and
-   buttons live.
-*/
-.infobar {
-    border-color: #888888 ; 
-    border-style: solid; 
-    border-top-width: 0px; 
-    border-right-width: 0px; 
-    border-bottom-width: 10px; 
-    border-left-width: 0px;
-}
-
-.darkergrey {
-    color: #666666;
-}
-
-/* default class for links*/
-a:link, a:visited, a:hover, a:active { 
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-    color: black; 
-    background: #cccccc; 
-    text-decoration: none;
-    text-align: left; 
-    border-color: #cccccc #cccccc #cccccc #cccccc ; 
-    margin-top: 0px; 
-    margin-right: 0px; 
-    margin-bottom: 0px; 
-    margin-left: 0px; 
-    border-style: solid; 
-    border-top-width: 1px; 
-    border-right-width: 1px; 
-    border-bottom-width: 1px; 
-    border-left-width: 1px;
-    padding-right: 10px; 
-    padding-left: 10px; 
- }
-
-a:hover { 
-    background: #eeeeee; 
-    border-color: #000000 #000000 #000000 #000000; 
-}
-
-a:active { 
-    color: white; 
-    background: black; 
-    border-color: #000000 #000000 #000000 #000000; 
-}
-
-
-/* These a classes define the update link appearance, using a pseudoclass
-   called "update" */    
-a.update:link, a.update:visited, a.update:hover, a.update:active { 
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-    color: #ffffff; 
-    background-color: #ee0000;
-    text-decoration: none;
-    text-align: left; 
-    border-color: #cccccc ; 
-    margin-top: 0px; 
-    margin-right: 0px; 
-    margin-bottom: 0px; 
-    margin-left: 0px; 
-    border-style: solid; 
-    border-top-width: 1px; 
-    border-right-width: 1px; 
-    border-bottom-width: 1px; 
-    border-left-width: 1px;
-    padding-right: 10px; 
-    padding-left: 10px; 
- }
-
-a.update:hover { 
-    background: #FF8080; 
-    border-color: #ff0000;
-}
-
-a.update:active { 
-    color: #ff0000; 
-    background: #ffffff; 
-    border-color: #ff0000;
-}
-
-EOF
-}
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_header.css/template-begin e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_header.css/template-begin
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_header.css/template-begin 2006-03-15 16:59:54.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_header.css/template-begin     1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-/* DO NOT MODIFY THIS FILE! It is updated automatically */
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_main.css/50body e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_main.css/50body
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_main.css/50body   2013-01-31 16:31:37.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_main.css/50body       1969-12-31 19:00:00.000000000 -0500
@@ -1,418 +0,0 @@
-{
-    $OUT = <<'EOF';
-
-/* INSERT COPYRIGHT HERE */
-
-/* This is the stylesheet used in the main panels only.  
-
-   This file inherits the styles use in sme_core in the "header" section, and
-   as noted in the code below. Note that some of the styles here are empty.  
-       This is because the style definition has moved safely to sme_core.css
-       and the placeholder is left here for reference or future use.
-
-   There are a lot of styles in here, so read carefully.  Each one is documented.
-
-       Styles that were in the old stylesheets, but are not used in the UI are at the
-       bottom, commented out.  These can be removed at the end of the 6.0 cycle */
-
-/* general page properties */
-body, body.main { 
-    margin-top: 5px; 
-    margin-right: 20px; 
-    margin-bottom: 5px; 
-    margin-left: 5px; 
-}
-
-
-/* Table properties ****************************************/
-/* There are THREE  types of tables
-   1. *.sme-layout*     is used for layout purposes.  It is the "master
-                             container" on a page.  It controls the top-level table
-                         inside of which everything else is put.
-       2. *.sme-noborders*  is used for layout, and defines a borderless table and 
-                             cells used within it.
-       2. *.sme-border*     is used for tabular data, and defines a header row and borders
-                             for tables that need borders
-
-       */
-
-/*First, some defaults */
-td {
-    text-align: left;
-}
-
-
-/* 
-sme-layout* : Used for top-level layout
-*/
-
-table.sme-layout {
-    border-collapse: collapse;
-        margin-bottom: 2px;
-        margin-top: 2px;
-}
-
-tr.sme-layout {
-    border: 1px solid #dddddd; 
-}
-
-td.sme-layout {
-    border: 1px solid #dddddd; 
-}
-
-/*This special style is actually used only for the button row along the bottom of each page*/
-th.sme-layout {
-    border: 1px solid #dddddd; 
-    background-color: #eeeeee;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 9pt;
-    font-weight: bold;
-    color: #000000;
-    text-align: right; 
-    padding: 4px;
-}
-
-/* 
-sme-noborders* : Used for mid-level layout
-*/
-table.sme-noborders {
-    padding: 0px;
-    margin-top: 0px;
-    margin-bottom: 20px;
-    margin-left: 0px;
-    margin-right: 0px;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px;
-}
-td.sme-noborders-label {
-    font-weight: bold;
-    /*width: 250px;*/
-    text-align: right;
-    /*vertical-align: top;*/
-    background-color: #eeeeee;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px;
-}
-td.sme-noborders-content {
-    text-align: left;
-    vertical-align: top;       
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px;
-}
-td.sme-noborders-info, div.sme-noborders-info {
-    text-align: left;
-    vertical-align: top;       
-}
-/* Used for a left-most column of radio buttons (see date/time panel) */
-td.sme-radiobutton {
-    width: 30px;
-}
-/* 
-sme-border* : Used for tabular data
-*/
-table.sme-border {
-    border-collapse: collapse;
-    border: 2px solid #cccccc;
-    empty-cells: show;
-    margin: 5px 5px 5px 2px;    
-}
-td.sme-border,
-td.sme-border-warning,
-td.sme-border-right,
-td.sme-border-center {
-    border: 1px solid #cccccc;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 10px;
-    font-weight: normal;
-    color: #000000;
-    text-align: left;
-    padding-left: 2px;
-    padding-right: 2px;
-    padding-top: 3px;
-    padding-bottom: 3px;
-}
-td.sme-border-warning {
-    color: red;
-        }
-td.sme-border-right {text-align: right;}
-td.sme-border-center {text-align: center;}
-th.sme-border {
-    border: 1px solid #cccccc; 
-    background-color: #dedfde;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 10px;
-    font-weight: bold;
-    color: #000000;
-    text-align: center;
-        vertical-align: bottom;
-    padding-left: 2px;
-    padding-right: 2px;
-    padding-left: 3px;
-    padding-right: 3px;
-    padding-top: 3px;
-    padding-bottom: 3px;
-        /*border-width: 1px;
-        border-style: solid;
-    border-color: #F2F0EE #75736E #75736E #F2F0EE ;*/ 
-}
-td.sme-border a, td.sme-border-right a, td.sme-border-center a {
-    font-size: 10px;
-}
-
-/* misc layout stuff*/
-/* these two are for any error messages that pop up*/
-div.error, div.sme-error, span.error, span.sme-error {
-    color: red;
-    background-color: #ffffff;
-    border-width: 1px;
-    border-style: solid;
-    border-color: red ; 
-    padding: 2px;
-    margin-left: 20px;
-    margin-right: 20px;
-    margin-top:0px;
-    margin-bottom:0px;
-        
-}
-
-div.error-noborders, div.sme-error-noborders,
-span.error-noborders, span.sme-error-noborders
-{
-    color: red;
-    background-color: #ffffff;
-    border-width: 0px;
-}
-
-div.error h2, span.error h2,
-div.error p, span.error p
-{
-    color: red;
-}
-/* These are for the special case of a link being inside an error message */
-div.sme-error a, div.error a, span.error a, span.sme-error a,
-div.error-noborders a, div.sme-error-noborders a,
-span.error-noborders a, span.sme-error-noborders a
-{
-    color: #ff0000;
-    font-weight: bold;
-    text-decoration: underline;
-}
-
-/* For when a link is the error message */
-a.error:link, a.error:visited, a.error:hover, a.error:active {
-    color: #ff0000;
-    font-weight: normal;
-    text-decoration: underline;
-}
-
-/* these two are for any success messages that pop up*/
-div.success, span.success {
-    color: #006400;
-    background-color: #ffffff;
-    border-width: 1px;
-    border-style: solid;
-    border-color: #006400 ; 
-    padding: 2px;
-    margin-left: 20px;
-    margin-right: 20px;
-    margin-top:0px;
-    margin-bottom:0px;
-        
-}
-
-/* These two are for the special case of a link being inside a success message */
-div.success a, span.success a 
-{
-    color: #006400;
-    font-weight: bold;
-    text-decoration: underline;
-}
-
-div.success h2, span.success h2,
-div.success p, span.success p
-{
-    color: green;
-}
-
-/*These two define the copyright footer styles, one for the line and one for the text*/
-hr.sme-copyrightbar {
-}
-.sme-copyright {
-}
-
-/* These ones define styles for the links that are made to look like
-   standard form submit buttons */
-a.button-like:link, 
-a.button-like:visited,
-a.button-like:hover,
-a.button-like:active,
-a.button-like-small:link, 
-a.button-like-small:visited,
-a.button-like-small:hover,
-a.button-like-small:active { 
-    font-family: sans-serif;
-    font-size: 13px; 
-    color: black; 
-    background: #D4D0C8; 
-    text-decoration: none;
-    text-align: left; 
-    border-color: #F2F0EE #75736E #75736E #F2F0EE ; 
-    margin-top: 10px; 
-    margin-right: 2px; 
-    margin-bottom: 10px; 
-    margin-left: 2px; 
-    border-style: solid; 
-    border-top-width: 2px; 
-    border-right-width: 2px; 
-    border-bottom-width: 2px; 
-    border-left-width: 2px;
-    padding-top: 2px; 
-    padding-bottom: 2px; 
-    padding-left: 6px; 
-    padding-right: 6px; 
- }
-a.button-like-small:link, 
-a.button-like-small:visited,
-a.button-like-small:hover,
-a.button-like-small:active { 
-    border-top-width: 1px; 
-    border-right-width: 1px; 
-    border-bottom-width: 1px; 
-    border-left-width: 1px;
-    font-size: 10px; 
-    padding-top: 0px; 
-    padding-bottom: 0px; 
-    padding-left: 1px; 
-    padding-right: 1px; 
-}
-a.button-like:active,
-a.button-like-small:active { 
-    border-color: #75736E #F2F0EE #F2F0EE #75736E  ; 
-}
-
-/* EXPERIMENTAL SECTION */
-/* These are styles used to experiment with. */
-
-/* class for links, similar to the class in sme_menu.css, but for a red button */
-a.button-like-red:link, 
-a.button-like-red:visited,
-a.button-like-red:hover,
-a.button-like-red:active { 
-    border-left: #F1726C 2px solid;
-    border-right: #B42025 2px solid;
-    border-top: #F1726C 2px solid;
-    border-bottom: #B42025 2px solid;
- }
-a.button-like-red:active { 
-    border-color: #75736E #F2F0EE #F2F0EE #75736E  ; 
-}
-
-/*These are style definitions found in the UI but not defined in any file I 
-  could locate.  They're listed here for historical purposes, but have been
-  removed from the UI
-
-pagedescription (used in the first paragraph of text on a page) [HTML.pm]
-label (used in forms) [HTML.pm]
-field (used in forms) [HTML.pm]
-fielddescription (used ???)[HTML.pm]
-buttons (used in forms) [HTML.pm]
-*/  
-/*td.sme-submitbutton {
-       text-align: right;
-}
-*/
-
-/*These style definitions were found int he old css file (manager.css)
-  but don't seem to ever be referenced in the code.  They're here
-  for reference.
-
-.banner {
-    background: #000000;
-    color: #ffffff;
-}
-.banner-right {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    background: #e17200;
-    color: #ffffff;
-}
-.border {
-    background: #000000;
-    color: #000000;
-    border-color: #000000;
-}
-.sidebar {
-    width: 200px;
-    background: #ffffff;
-    font-size: smaller;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-weight: normal;
-}
-.sidebar-title {
-    background: #1e385b;
-    color: #ffffff;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-weight: bold;
-}
-.newsitem {
-    background: #ffffff;
-    color: #000000;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    margin-left: 5px;
-    margin-right: 5px;
-    margin-top: 5px;
-    margin-bottom: 5px;
-}
-.newsitem-title {
-    background: #cccccc;
-    color: #ffffff;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-weight: bold;
-}
-.newsitem-footer {
-    background: #cccccc;
-    color: #000000;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: smaller;
-    text-align: right;
-}
-.newsitem-detail {
-    font-size: smaller;
-    font-weight: normal;
-} 
-.formlabel {
-    background: #c0c0c0;
-    color: #000000;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: small;
-    font-weight: bold;
-    text-align: right;
-}
-.welcome-link {
-    background: #ffffff;
-    color: #1e385b;
-}
-.littlelink {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-#textlayer {
-    position: absolute;
-    visibility: inherit;
-    top: 160px;
-    left: 50px;
-    z-index: 2;
-}
-#para {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-weight: bold;
-    color: #000000;
-}  
-#title {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-weight: bold;
-    padding: 7px 7px 7px 7px;
-    color: #ffffff;
-} 
-*/
-
-EOF
-}
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_main.css/template-begin e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_main.css/template-begin
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_main.css/template-begin   2006-03-15 16:59:54.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_main.css/template-begin       1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-/* DO NOT MODIFY THIS FILE! It is updated automatically */
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_menu.css/50body e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_menu.css/50body
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_menu.css/50body   2006-03-15 16:59:54.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_menu.css/50body       1969-12-31 19:00:00.000000000 -0500
@@ -1,227 +0,0 @@
-{
-    $OUT = <<'EOF';
-
-/*----------------------------------------------------------------------
- * copyright (C) 1999-2003 Mitel Networks Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- *
- * Technical support for this program is available from Mitel Networks
- * Please visit our web site www.mitel.com for details.
- *----------------------------------------------------------------------
- */
-
-/* This is the stylesheet used in the navigation panel only
-
-   This file inherits the styles use in sme_core in the "navigation" section,
-   and as noted in the code below. Note that some of the styles here are empty.
-   This is because the style definition has moved safely to sme_core.css and
-   the placeholder is left here for reference or future use.
-
-   There are a lot of styles in here, so read carefully.  Each one is
-   documented.
-
-   Styles that were in the old stylesheets, but are not used in the UI are at
-   the bottom, commented out.  These can be removed at the end of the 6.0
-   cycle */
-
-/* Sets the general page properties */
-body, body.menu { 
-    margin-top: 0px; 
-    margin-right: 0px; 
-    margin-bottom: 0px; 
-    margin-left: 2px; 
-}
-
-/* This is the section heading style */
-.section {
-}
-
-td.menu-cell {
-    margin-top: 0px; 
-    margin-right: 0px; 
-    margin-bottom: 0px; 
-    margin-left: 0px; 
-    padding-left: 0px;
-    padding-right: 0px;
-    padding-top: 0px;
-    padding-bottom: 0px;
-
-}
-
-/*
-All the a links use pseudoclasses to control the two visual link styles.
-For example:
-  a.item:link             the general link item
-  a.item-current:link:    the active link item
-
-The switch from item to item-current is done with a javascript script in the head of the
-navigation page, using the onClick event.
-
-We are making heavy use of the cascade with these.
-*/    
-
-/* a:link controls the look of a link when the mouse is nowhere near it */
-a.item:link, a.item-current:link, 
-a.warn:link, a.warn-current:link { 
-    display: block;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 10px; 
-    color: black; 
-    background: #eeeeee; 
-    text-decoration: none;
-    text-align: left; 
-    border-color: #eeeeee; 
-    margin-top: 0px; 
-    margin-right: 0px; 
-    margin-bottom: 0px; 
-    margin-left: 0px; 
-    border-style: solid; 
-    border-top-width: 1px; 
-    border-right-width: 1px; 
-    border-bottom-width: 1px; 
-    border-left-width: 1px;
-    padding-right: 10px; 
-    padding-left: 10px; 
-    padding-top: 0px; 
-    padding-bottom: 2px; 
- }
-
-/* a:visited controls the look of a visited link (one that has been clicked) */
-a.item:visited, a.item-current:visited, 
-a.warn:visited, a.warn-current:visited { 
-    display: block;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 10px; 
-    color: black; 
-    background: #eeeeee; 
-    text-decoration: none; 
-    border-color: #eeeeee; 
-    margin-top: 0px; 
-    margin-right: 0px; 
-    margin-bottom: 0px; 
-    margin-left: 0px; 
-    border-style: solid; 
-    border-top-width: 1px; 
-    border-right-width: 1px; 
-    border-bottom-width: 1px; 
-    border-left-width: 1px;
-    padding-right: 10px; 
-    padding-left: 10px; 
-    padding-bottom: 2px; 
-    text-align: left; 
-}
-
-/* a:hover controls the look of a link under the curser*/
-a.item:hover, a.item-current:hover,
-a.warn:hover, a.warn-current:hover { 
-    display: block;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 10px; 
-    color: black; 
-    text-decoration: none; 
-    background: #cccccc; 
-    border-color: #888888; 
-    margin-top: 0px; 
-    margin-right: 0px;
-    margin-bottom: 0px; 
-    margin-left: 0px; 
-    border-style: solid; 
-    border-top-width: 1px; 
-    border-right-width: 1px; 
-    border-bottom-width: 1px; 
-    border-left-width: 1px; 
-    padding-right: 10px; 
-    padding-left: 10px; 
-    padding-bottom: 2px; 
-    text-align: left; 
-}
-
-/* a:active controls the look of a link as it is selected*/
-a.item:active, a.item-current:active, 
-a.warn:active, a.warn-current:active { 
-    display: block;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 10px; 
-    color: white; 
-    background: black; 
-    text-decoration: none ; 
-    border-color: #000000; 
-    margin-top: 0px; 
-    margin-right: 0px; 
-    margin-bottom: 0px; 
-    margin-left: 0px; 
-    border-style: solid; 
-    border-top-width: 1px; 
-    border-right-width: 1px; 
-    border-bottom-width: 1px; 
-    border-left-width: 1px;
-    padding-right: 10px; 
-    padding-left: 10px; 
-    padding-bottom: 2px; 
-    text-align: left; 
-}
-
-/* 
-These styles are to ensure that a selected link appears selected, even if the link
-opens in another frame.  This uses a javascript chunk in the head of the navigation 
-frame to change the style using the onClick event.
-*/
-a.item-current:link,    a.warn-current:link,
-a.item-current:visited, a.warn-current:visited, 
-a.item-current:active,  a.warn-current:active,
-a.item-current:hover,   a.warn-current:hover { 
-    display: block;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 10px; 
-    color: black; 
-    text-decoration: none; 
-    background: #ffffff; 
-    border-color: #888888; 
-    margin-top: 0px; 
-    margin-right: 0px;
-    margin-bottom: 0px; 
-    margin-left: 0px; 
-    border-style: solid; 
-    border-top-width: 1px; 
-    border-right-width: 1px; 
-    border-bottom-width: 1px; 
-    border-left-width: 1px; 
-    padding-right: 10px; 
-    padding-left: 10px; 
-    padding-bottom: 2px; 
-    text-align: left; 
-}
-
-/* these two add a border on the styles defined directly above when
-the mouse is hovering over them */
-a.item-current:hover,   a.warn-current:hover { 
-    border-color: #888888; 
-}
-
-/* These redefine a few elements to make room for the icon to the left of the warn class*/
-a.warn:link,    a.warn-current:link, 
-a.warn:visited, a.warn-current:visited, 
-a.warn:active,  a.warn-current:active,
-a.warn:hover,   a.warn-current:hover { 
-    background-image: url(/server-common/warn.gif);
-    background-repeat: no-repeat;
-    background-position: 10px; 
-    padding-left: 25px; 
-}
-/*end*/
-
-EOF
-}
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_menu.css/template-begin e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_menu.css/template-begin
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_menu.css/template-begin   2006-03-15 16:59:54.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_menu.css/template-begin       1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-/* DO NOT MODIFY THIS FILE! It is updated automatically */
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_panel_menu.css/50body e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_panel_menu.css/50body
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_panel_menu.css/50body     2006-03-15 16:59:54.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_panel_menu.css/50body 1969-12-31 19:00:00.000000000 -0500
@@ -1,89 +0,0 @@
-{
-    $OUT = <<'EOF';
-
-/*----------------------------------------------------------------------
- * copyright (C) 1999-2003 Mitel Networks Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- *
- * Technical support for this program is available from Mitel Networks
- * Please visit our web site www.mitel.com for details.
- *----------------------------------------------------------------------
- */
-
-/* This set of classes is intended for use as a tabbed menu in a panel. The 
- * menu itself is built out of an itemized list, with the navmenu style applied
- * to it. In this way, if the browser does not support CSS 2.0, a standard
- * itemized list will be seen instead. This also makes the menu perfectly
- * workable in Lynx. 
- *
- * To make use of this menu, see the new menu attribute of the page tab in
- * FormMagick, perl-CGI-FormMagick-0.91-09. Use that callback to output your
- * itemized list with this style, and set the 'here' class to indicate the
- * current position in the menu.
- *
- * This code is currently being tested using inline styles in the Teleworker
- * product, version 3.1 or higher, and the mps_2004_05_21-16_16_27 branch of
- * e-smith-backup. Look to those initially for examples of use.
- *
- * While this does not yet support nested tabs, it would not be difficult to
- * add.
- */
-
-#navmenu {
-    border-bottom : 1px solid #ccc;
-    margin : 0;
-    padding-bottom : 19px;
-    padding-left : 10px;
-}
-
-#navmenu ul, #navmenu li    {
-    display : inline;
-    list-style-type : none;
-    margin : 0;
-    padding : 0;
-}
-
-#navmenu a {
-    background : #E8EBF0;
-    border : 1px solid #ccc;
-    color : #666;
-    float : left;
-    font-size : small;
-    font-weight : normal;
-    line-height : 14px;
-    margin-right : 8px;
-    padding : 2px 10px 2px 10px;
-    text-decoration : none;
-}
-
-#navmenu a:link.active, #navmenu a:visited.active, #navmenu a.here {
-    background : #fff;
-    border-bottom : 1px solid #fff;
-    color : #000;
-}
-
-#navmenu a:hover    {
-    color : #f00;
-}
-
-#navmenu ul a:hover {
-    color : #f00 !important;
-}
-
-/* End sme panel menu. */
-
-EOF
-}
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_panel_menu.css/template-begin e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_panel_menu.css/template-begin
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_panel_menu.css/template-begin     2006-03-15 16:59:54.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_panel_menu.css/template-begin 1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-/* DO NOT MODIFY THIS FILE! It is updated automatically */
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/10Setup e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/10Setup
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/10Setup 2013-01-31 16:31:37.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/10Setup     1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-\{
-    # we can snag lexical $fi_filename from Text::Template to find out how
-    # we were called
-    $NO_FRAMES = ($fi_filename =~ /noframes_.*\.tmpl$/) ? 1 : 0;
-    $OUT;
-\}
-<HR class="sme-copyrightbar">
-<FONT class="sme-copyright">
-  \{
-    use esmith::ConfigDB;
-    my $db = esmith::ConfigDB->open();
-
-    my $sysconfig = $db->get("sysconfig");
-    
-    my $lang = (split(/,/, $ENV\{"HTTP_ACCEPT_LANGUAGE"\}))[0];
-    # convert xx_XX lang format to xx-xx
-    ($lang = lc($lang)) =~ s/_/-/;
-    
-    my $releaseVersion = $sysconfig->prop("ReleaseVersion");
-
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/25Copyright e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/25Copyright
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/25Copyright     2006-11-02 11:38:41.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/25Copyright 1969-12-31 19:00:00.000000000 -0500
@@ -1,10 +0,0 @@
-    $OUT .= "Copyright 1999-2006 Mitel Corporation<BR>";
-
-    use Locale::gettext;
-    use esmith::I18N;
-    my $i18n = esmith::I18N->new();
-    $i18n->setLocale('foot.tmpl', $i18n->preferredLanguage());
-    $OUT .= gettext("All rights reserved.");
-    $OUT;
-  \}
-
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/90Finish e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/90Finish
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/90Finish        2006-11-02 11:38:41.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/90Finish    1969-12-31 19:00:00.000000000 -0500
@@ -1,10 +0,0 @@
-</FONT>
-</BODY>
-\{
-    if ($NO_FRAMES) 
-    \{
-       $OUT .= "</NOFRAMES>\n";
-    \}
-    $OUT;
-\}
-</HTML>
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/10Setup e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/10Setup
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/10Setup 2006-11-02 11:38:41.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/10Setup     1969-12-31 19:00:00.000000000 -0500
@@ -1,12 +0,0 @@
-\{
-    # we can snag lexical $fi_filename from Text::Template to find out how
-    # we were called
-    $NO_FRAMES = ($fi_filename =~ /noframes_.*\.tmpl$/) ? 1 : 0;
-    $USER_PASSWORD = ($fi_filename =~ /userpassword_.*\.tmpl$/) ? 1 : 0;
-    $OUT;
-\}
-<!DOCTYPE html
-    PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-    "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/30FrameSetup00 e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/30FrameSetup00
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/30FrameSetup00  2007-01-26 20:51:30.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/30FrameSetup00      1969-12-31 19:00:00.000000000 -0500
@@ -1,15 +0,0 @@
-\{ 
-    unless ($NO_FRAMES)
-    \{
-       $OUT .= <<EOF;
-  <link rev="made" href="mailto:bugs%40e-smith.com">
-  <meta name="copyright" content="(head.tmpl)Copyright 2003-2004 Mitel Corporation">
-  <link rel="stylesheet" type="text/css" href="/server-common/css/sme_core.css">
-  <style type="text/css"> 
-  \@import url("/server-common/css/sme_main.css");
-  </style>
-EOF
-    \}
-    $OUT;
-\}
-</head>
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/30FrameSetup01 e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/30FrameSetup01
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/30FrameSetup01  2014-03-23 22:15:04.000000000 -0400
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/30FrameSetup01      1969-12-31 19:00:00.000000000 -0500
@@ -1,45 +0,0 @@
-\{
-  if ($NO_FRAMES)
-  \{
-    $OUT .= <<EOF;
-<frameset rows="68,*" cols="*" frameborder="NO" border="0" framespacing="0">
-  <frame src="/server-manager/header.htm" name="header" scrolling="NO" noresize >
-  <frameset rows="*" cols="192,*" framespacing="0" frameborder="NO" border="0">
-    <frame src="/server-manager/navigation" name="navigation" scrolling="auto" noresize>
-    <frame src="/server-manager/initial.cgi" name="main">
-  </frameset>
-</frameset>
-
-</FRAMESET>
-
-<NOFRAMES>
-EOF
-  \}
-  else
-  \{
-     my $panel = "Server manager";
-     my $img = "smeserver_logo.jpg";
-
-     $OUT .= <<EOF;
-<body>
-EOF
-  \}
-
-  if( $ENV\{REQUEST_URI\} =~ m/(server-manager)/) \{
-
-    $DB = esmith::ConfigDB->open();
-    $OUT .= qq(<div class="sme-error"><h5>
-      Warning: you have not yet changed the default system password.</h5></div>)
-      unless ($DB->get('PasswordSet')->value eq "yes");
-
-    $OUT .= qq(<div class="sme-error"><h5>
-      Warning: a reconfigure and reboot is required before proceeding! Failure to do so now
-      may leave your system in an unknown state!</h5></div>)
-      if ($DB->get('bootstrap-console') and $DB->get('bootstrap-console')->prop('Run') eq 'yes') ||
-         ($DB->get('UnsavedChanges') and $DB->get('UnsavedChanges')->value eq 'yes');
-
-    $OUT;
-
-  \}
-
-\}
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/10Head e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/10Head
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/10Head    2008-10-07 13:36:17.000000000 -0400
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/10Head        1969-12-31 19:00:00.000000000 -0500
@@ -1,10 +0,0 @@
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<link rel="stylesheet" type="text/css" href="/server-common/css/sme_core.css">
-<link rel="stylesheet" type="text/css" href="/server-common/css/sme_panel_menu.css">
-<style type="text/css">
-@import url("/server-common/css/sme_header.css");
-</style>
-</head>
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/20Body e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/20Body
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/20Body    2002-12-10 09:54:09.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/20Body        1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-<body class=header leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/50HilightBar e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/50HilightBar
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/50HilightBar      2002-12-10 09:54:09.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/50HilightBar  1969-12-31 19:00:00.000000000 -0500
@@ -1,7 +0,0 @@
-<table width="100%" border="0" cellspacing="0" cellpadding="0"> 
-  <tr>
-    <td class="hilightbar">
-      <img src="/server-common/spacer.gif" height="6" width="1">
-    </td>
-  </tr>
-</table>
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/60InfoBar e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/60InfoBar
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/60InfoBar 2008-10-07 13:36:17.000000000 -0400
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/60InfoBar     1969-12-31 19:00:00.000000000 -0500
@@ -1,15 +0,0 @@
-<table width="100%" border="0" cellspacing="0" cellpadding="0"> 
-  <tr>
-    <td align=left nowrap class="infobar">
-      <img src="/server-common/spacer.gif" height="14" width="1" align="left">
-        <b>admin@{ "${SystemName}.${DomainName}" }</b> 
-        &nbsp;&nbsp;&nbsp;
-        <!-- <a href="#">Logout</a> --></td>
-        <td align=right nowrap class="infobar">
-          <!-- <a class="update" target="main" href="/server-manager/cgi-bin/blades">Update Available</a>|-->
-          <a target="main" href="/server-manager/cgi-bin/online-manual">&nbsp;&nbsp;<b> ? </b>&nbsp;&nbsp;</a>&nbsp;</td>
-        <td nowrap class="infobar">
-          <a target="_parent" href="/server-common/cgi-bin/logout"><b>Logout</b></a>&nbsp;</td>
-  </tr>
-</table>
-
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/99End e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/99End
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/99End     2002-11-22 11:34:50.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/99End 1969-12-31 19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-</body>
-</html>
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/template-begin e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/template-begin
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/template-begin    2002-11-22 11:34:50.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/template-begin        1969-12-31 19:00:00.000000000 -0500
@@ -1,10 +0,0 @@
-<!--
-#------------------------------------------------------------
-# DO NOT MODIFY THIS FILE! It is updated automatically by the
-# SME Server software. Instead, modify the source template in
-# an /etc/e-smith/templates-custom directory. For more
-# information, see http://www.e-smith.org/custom/
-#
-# copyright (C) 2002 Mitel Networks Corporation
-#------------------------------------------------------------
--->
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/01localAccessString e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/01localAccessString
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/01localAccessString      2006-11-02 11:38:41.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/01localAccessString  1969-12-31 19:00:00.000000000 -0500
@@ -1,22 +0,0 @@
-{
-    #---------------------------------------------------------------------
-    # Grab ValidFrom access list property of httpd-admin
-    # SSL enabled virtual hosts should only allow access from IP's in
-    # this list, as well as local networks.
-    #---------------------------------------------------------------------
-    use esmith::NetworksDB;
-
-    my $ndb = esmith::NetworksDB->open_ro();
-
-    my @localAccess = $ndb->local_access_spec();
-    my $validFrom = ${'httpd-admin'}{'ValidFrom'};
-    if ($validFrom)
-    {
-       push @localAccess, split /,/, $validFrom;
-    }
-    $localAccess .= join ' ',
-       map { s:/255.255.255.255::; $_ }
-           @localAccess;
-
-    "";
-}
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/20Manager e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/20Manager
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/20Manager        2014-03-23 22:15:04.000000000 -0400
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/20Manager    1969-12-31 19:00:00.000000000 -0500
@@ -1,163 +0,0 @@
-{
-    $OUT .= "Listen 127.0.0.1:${'httpd-admin'}{TCPPort}\n";
-
-    $OUT .= <<HERE;
-
-HostnameLookups off
-
-ServerAdmin admin@$DomainName
-ServerRoot /etc/httpd
-ServerTokens ProductOnly
-
-User admin
-Group admin
-
-ErrorLog /var/log/httpd/admin_error_log
-LogLevel warn
-HERE
-
-foreach (qw(
-    env
-    log_config
-    mime
-    negotiation
-    status
-    info
-    include
-    autoindex
-    dir
-    cgi
-    asis
-    imap
-    imagemap
-    actions
-    userdir
-    proxy
-    proxy_http
-    alias
-    rewrite
-    access
-    authz_host
-    authz_user
-    auth
-    auth_anon
-    auth_digest
-    expires
-    headers
-    usertrack
-    setenvif
-    ))
-{
-    next unless -f "/usr/lib/httpd/modules/mod_${_}.so" || 
-                -f "/usr/lib64/httpd/modules/mod_${_}.so";
-    $OUT .= "LoadModule ${_}_module modules/mod_${_}.so\n";
-}
-
-$OUT .= <<HERE;
-PidFile /var/run/httpd-admin.pid
-ScoreBoardFile /var/run/httpd-admin.scoreboard
-UseCanonicalName off
-LogFormat "%h %l %u %t \\"%r\\" %>s %b" common
-LogFormat "%{User-agent}i" agent
-
-CustomLog /var/log/httpd/admin_access_log common
-
-KeepAlive On
-MaxKeepAliveRequests 100
-KeepAliveTimeout 15
-
-MaxClients 150
-MaxRequestsPerChild 100
-
-ServerName www.$DomainName
-
-MinSpareServers 1
-MaxSpareServers 5
-StartServers 1
-Timeout 300
-
-DefaultIcon /icons/unknown.gif
-DirectoryIndex index.htm index.html index.shtml index.cgi
-IndexOptions FancyIndexing VersionSort NameWidth=*
-IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
-AccessFileName .htaccess
-
-AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip
-AddIconByType (TXT,/icons/text.gif) text/*
-AddIconByType (IMG,/icons/image2.gif) image/*
-AddIconByType (SND,/icons/sound2.gif) audio/*
-AddIconByType (VID,/icons/movie.gif) video/*
-DefaultType text/plain
-TypesConfig /etc/mime.types
-
-AddEncoding x-compress Z
-AddEncoding x-gzip gz
-
-AddIcon /icons/binary.gif .bin .exe
-AddIcon /icons/binhex.gif .hqx
-AddIcon /icons/tar.gif .tar
-AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv
-AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip
-AddIcon /icons/a.gif .ps .ai .eps
-AddIcon /icons/layout.gif .html .shtml .htm .pdf
-AddIcon /icons/text.gif .txt
-AddIcon /icons/c.gif .c
-AddIcon /icons/p.gif .pl .py
-AddIcon /icons/f.gif .for
-AddIcon /icons/dvi.gif .dvi
-AddIcon /icons/uuencoded.gif .uu
-AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
-AddIcon /icons/tex.gif .tex
-AddIcon /icons/bomb.gif core
-
-AddIcon /icons/back.gif ..
-AddIcon /icons/hand.right.gif README
-AddIcon /icons/folder.gif ^^DIRECTORY^^
-AddIcon /icons/blank.gif ^^BLANKICON^^
-
-AddLanguage en .en
-AddLanguage fr .fr
-AddLanguage de .de
-AddLanguage da .da
-AddLanguage el .el
-AddLanguage it .it
-
-LanguagePriority en fr de
-
-AddType text/html .shtml
-AddType application/x-pkcs7-crl    .crl
-
-AddType application/x-x509-ca-cert .crt
-
-BrowserMatch "Mozilla/2" nokeepalive
-BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
-BrowserMatch "RealPlayer 4\.0" force-response-1.0
-BrowserMatch "Java/1\.0" force-response-1.0
-BrowserMatch "JDK/1\.0" force-response-1.0
-
-AddHandler cgi-script .cgi
-AddHandler server-parsed .shtml
-AddHandler imap-file map
-
-DocumentRoot         /etc/e-smith/web/panels/manager/html
-
-ScriptAlias /server-common/cgi-bin/    /etc/e-smith/web/common/cgi-bin/
-Alias /server-common/ /etc/e-smith/web/common/
-ScriptAlias /server-manager/noframes    /etc/e-smith/web/panels/manager/cgi-bin/noframes
-ScriptAlias /server-manager/support    /etc/e-smith/web/panels/manager/cgi-bin/support
-ScriptAlias /server-manager/navigation    /etc/e-smith/web/panels/manager/cgi-bin/navigation
-
-# e-smith manager panel
-ScriptAlias /server-manager/cgi-bin /etc/e-smith/web/panels/manager/cgi-bin
-Alias       /server-manager /etc/e-smith/web/panels/manager/html
-
-# e-smith password panel
-ScriptAlias /user-password /etc/e-smith/web/panels/password/cgi-bin/userpassword
-
-Alias /server-resources/ /home/e-smith/files/server-resources/
-
-Alias /icons/ /var/www/icons/
-
-HERE
-}
-
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/20ManagerAuthTKT e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/20ManagerAuthTKT
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/20ManagerAuthTKT 2007-01-26 20:51:30.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/20ManagerAuthTKT     1969-12-31 19:00:00.000000000 -0500
@@ -1,6 +0,0 @@
-{
-    $OUT .= "LoadModule auth_tkt_module modules/mod_auth_tkt.so\n";
-
-    my $secret = ${'httpd-admin'}{TKTAuthSecret} || "34322500-7330-4400-423A-3A00434F5245";
-    $OUT .= "TKTAuthSecret \"$secret\"\n";
-}
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85DefaultAccess e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85DefaultAccess
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85DefaultAccess  2006-11-02 11:38:41.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85DefaultAccess      1969-12-31 19:00:00.000000000 -0500
@@ -1,12 +0,0 @@
-
-# First, we configure the "default" to be a very restrictive set of 
-# permissions.  
-
-<Directory />
-    Options None
-    AllowOverride None
-    order deny,allow
-    deny from all
-    allow from none
-</Directory>
-
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85ServerResourcesAccess e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85ServerResourcesAccess
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85ServerResourcesAccess  2006-11-02 11:38:41.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85ServerResourcesAccess      1969-12-31 19:00:00.000000000 -0500
@@ -1,10 +0,0 @@
-# Server resources access configuration
-
-<Directory /home/e-smith/files/server-resources>
-    Options +Indexes
-    order deny,allow
-    deny from all
-{
-    $OUT .= "    allow from $localAccess\n";
-}
-</Directory>
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15brand e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15brand
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15brand   2006-11-02 11:38:41.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15brand       1969-12-31 19:00:00.000000000 -0500
@@ -1,12 +0,0 @@
-#------------------------------------------------------------
-# e-smith files shared by manager and other control packages
-#------------------------------------------------------------
-
-<Directory "/home/e-smith/web/common">
-    Options Indexes Includes
-    AllowOverride None
-    order deny,allow
-    deny from all
-    allow from all
-</Directory>
-
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15common e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15common
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15common  2016-07-19 09:03:46.683000000 -0400
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15common      1969-12-31 19:00:00.000000000 -0500
@@ -1,40 +0,0 @@
-#------------------------------------------------------------
-# e-smith files shared by manager and other control packages
-#------------------------------------------------------------
-
-<Directory "/etc/e-smith/web/common/cgi-bin">
-    AllowOverride None
-    Options ExecCGI
-    order deny,allow
-    deny from all
-    allow from { $localAccess }
-    Satisfy all
-</Directory>
-
-<Directory "/etc/e-smith/web/common">
-    Options Includes
-    AllowOverride None
-    order deny,allow
-    deny from all
-    allow from all
-    <FilesMatch ".*\.tmpl">
-        Order allow,deny
-        Deny from all
-    </FilesMatch>
-</Directory>
-
-<Directory "/etc/e-smith/web/panels/manager/common">
-    Options Includes FollowSymLinks
-    AllowOverride None
-    order deny,allow
-    deny from all
-    allow from all
-    AuthType basic
-
-    TKTAuthLoginURL /server-common/cgi-bin/login
-    TKTAuthTimeout 5m
-    TKTAuthCookieExpires 5m
-    require valid-user
-    Satisfy all
-</Directory>
-
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20manager e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20manager
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20manager 2016-07-19 09:03:46.683000000 -0400
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20manager     1969-12-31 19:00:00.000000000 -0500
@@ -1,34 +0,0 @@
-
-#------------------------------------------------------------
-# e-smith-manager panel
-#------------------------------------------------------------
-
-<Directory "/etc/e-smith/web/panels/manager/html" >
-    Options Includes FollowSymLinks ExecCGI
-    AllowOverride None
-    order deny,allow
-    deny from all
-    allow from { $localAccess }
-    AuthType Basic
-    TKTAuthLoginURL /server-common/cgi-bin/login
-    TKTAuthTimeout 5m
-    TKTAuthCookieExpires 5m
-
-    require user admin
-    Satisfy all
-</Directory>
-
-<Directory "/etc/e-smith/web/panels/manager/cgi-bin">
-    Options Includes FollowSymLinks ExecCGI
-    AllowOverride None
-    order deny,allow
-    deny from all
-    allow from { $localAccess }
-    AuthType Basic
-    TKTAuthLoginURL /server-common/cgi-bin/login
-    TKTAuthTimeout 5m
-    TKTAuthCookieExpires 5m
-
-    require user admin
-    Satisfy all
-</Directory>
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20password e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20password
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20password        2014-03-23 22:15:04.000000000 -0400
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20password    1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-
-#------------------------------------------------------------
-# e-smith-password panel
-#------------------------------------------------------------
-<Directory "/etc/e-smith/web/panels/password/html">
-    order deny,allow
-    deny from all
-    allow from { $localAccess }
-</Directory>
-
-<Directory "/etc/e-smith/web/panels/password/cgi-bin">
-    order deny,allow
-    deny from all
-    allow from { $localAccess }
-</Directory>
-
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27ManagerProxyPass e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27ManagerProxyPass
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27ManagerProxyPass        2016-07-19 09:03:46.681000000 -0400
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27ManagerProxyPass    1969-12-31 19:00:00.000000000 -0500
@@ -1,40 +0,0 @@
-{
-    # vim: ft=perl:
-
-    $haveSSL = (exists ${modSSL}{status} and ${modSSL}{status} eq "enabled") ?  'yes' : 'no';
-    $plainTextAccess = ${'httpd-admin'}{PermitPlainTextAccess} || 'no';
-    $plainPort = ${'httpd-e-smith'}{TCPPort} || '80';
-    $sslPort = ${modSSL}{TCPPort} || '443';
-
-    $OUT = '';
-    foreach $place ('server-manager','server-common','user-password')
-    {
-        if (($port eq $plainPort) && ($haveSSL eq 'yes') && ($plainTextAccess ne 'yes'))
-        {
-            $OUT .= '    RewriteCond %{REMOTE_ADDR} !^127\.0\.0\.1$' . "\n";
-            $OUT .= "    RewriteRule ^/$place(/.*|\$)    https://%{HTTP_HOST}/$place\$1 [L,R]\n";
-        }
-       if ($port eq $sslPort)
-       {
-            # mod_auth_tkt needs to know the protocol to write  307 redirection
-           $OUT .= "    RequestHeader set X-Forwarded-Proto \"https\"\n";
-       }
-        $OUT .= "    ProxyPass /$place http://127.0.0.1:${'httpd-admin'}{TCPPort}/$place\n";
-        $OUT .= "    ProxyPassReverse /$place http://127.0.0.1:${'httpd-admin'}{TCPPort}/$place\n";
-
-        $OUT .= "    <Location /$place>\n";
-        $OUT .= "        order deny,allow\n";
-        $OUT .= "        deny from all\n";
-        if ($port eq $plainPort)
-        {
-            $OUT .= '        allow from 127.0.0.1' . "\n";
-        }
-        elsif (($haveSSL eq 'yes') && (($port eq $sslPort) || ($plainTextAccess ne 'yes')))
-        {
-            $OUT .= "        allow from $localAccess $externalSSLAccess\n";
-        } else {
-            $OUT .= "        allow from $localAccess\n";
-        }
-        $OUT .= "    </Location>\n";
-    }
-}
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/services/20http-admin e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/services/20http-admin
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/services/20http-admin        2007-01-26 20:51:30.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/services/20http-admin    1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-http-admin     { ${'httpd-admin'}{TCPPort} }/tcp               # admin HTTP server
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/web/common/cgi-bin/login e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/web/common/cgi-bin/login
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/web/common/cgi-bin/login   2016-07-19 09:03:46.679000000 -0400
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/web/common/cgi-bin/login       1969-12-31 19:00:00.000000000 -0500
@@ -1,352 +0,0 @@
-#!/usr/bin/perl -w
-#
-# mod_auth_tkt sample login script - runs as a vanilla CGI, under 
-#   mod_perl 1 via Apache::Registry, and under mod_perl2 via 
-#   ModPerl::Registry.
-#
-# This script can run in a few different modes, depending on how it is 
-#   named. Copy the script to a cgi-bin area, and create appropriately 
-#   named symlinks to access the different behaviours. 
-# Modes:
-#   - login mode (default): request a username and password and test via
-#     $validate_sub - if successful, issue an auth ticket and redirect to 
-#     the back location
-#   - guest mode ('guest.cgi'): automatically issues an auth ticket a 
-#     special username (as defined in $guest_sub, default 'guest'), and 
-#     redirect to the back location (now largely obsolete - use 
-#     TKTAuthGuestLogin instead)
-#   - autologin mode ('autologin.cgi'): [typically used to allow tickets 
-#     across multiple domains] if no valid auth ticket exists, redirect
-#     to the login (or guest) version; otherwise automatically redirect 
-#     to the back location passing the current auth ticket as a GET 
-#     argument. mod_auth_tkt (>= 1.3.8) will turn this new ticket into 
-#     an auth cookie for the new domain if none already exists.
-#
-
-use File::Basename;
-use lib dirname($ENV{SCRIPT_FILENAME});
-use Apache::AuthTkt 0.03;
-use CGI qw(:standard);
-use CGI::Cookie;
-use URI::Escape;
-use URI;
-use strict;
-
-# ------------------------------------------------------------------------
-# Configure this section to taste
-
-# CSS stylesheet to use (optional)
-my $STYLESHEET = '/server-common/css/tkt.css';
-# Page title (optional)
-my $TITLE = 'SME Server manager';
-# For autologin, mode to fallback to if autologin fails ('login' or 'guest')
-my $AUTOLOGIN_FALLBACK_MODE = 'login';
-# Boolean flag, whether to fallback to HTTP_REFERER for back link
-my $BACK_REFERER = 0;
-
-# For login mode (if used), setup username/password validation
-#   (modify or point $validate_sub somewhere appropriate).
-# The validation routine should return a true value (e.g. 1) if the 
-#   given username/password combination is valid, and a false value
-#   (e.g. 0) otherwise.
-# This version uses Apache::Htpasswd and a standard htpasswd file.
-sub validate
-{
-  my ($username, $password) = @_;
-  unless (open(PWAUTH, "|/usr/bin/pwauth"))
-  {
-    warn "Could not open pipe to pwauth: $!";
-    return 0;
-  }
-  print PWAUTH "$username\n";
-  print PWAUTH "$password\n";
-  return close(PWAUTH) ? 1 : 0;
-#require Apache::Htpasswd;
-#  my $ht = Apache::Htpasswd->new({ 
-#    passwdFile => '/etc/httpd/conf/htpasswd', ReadOnly => 1 });
-#  return $ht->htCheckPassword($username, $password);
-}
-my $validate_sub = \&validate;
-
-# For guest mode (if used), setup guest username
-#   Could use a counter or a random suffix etc.
-sub guest_user
-{
-  return 'guest';
-}
-my $guest_sub = \&guest_user;
-
-# ------------------------------------------------------------------------
-# Main code begins
-my $debug = 0;
-my $at = Apache::AuthTkt->new(conf => "/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg");
-my $q = CGI->new;
-my $x_f = $q->http('X-Forwarded-Host');
-#warn "X-Forwarded-Host is $x_f\n" if $x_f;
-#warn "HTTP_HOST is $ENV{HTTP_HOST}\n" if $ENV{HTTP_HOST};
-my ($server_name, $server_port) = split /:/, $q->http('X-Forwarded-Host') || $ENV{HTTP_HOST};
-$server_name ||= $ENV{SERVER_NAME} if $ENV{SERVER_NAME};
-$server_port ||= $ENV{SERVER_PORT} if $ENV{SERVER_PORT};
-#my $AUTH_DOMAIN = $at->domain || $server_name;
-my $AUTH_DOMAIN = $server_name;
-#warn "AUTH_DOMAIN is $AUTH_DOMAIN\n";
-#warn "AuthTkt->domain was set\n" if $at->domain;
-my @auth_domain = $AUTH_DOMAIN && $AUTH_DOMAIN =~ /\./ ? ( -domain => $AUTH_DOMAIN ) : ();
-my $ticket = $q->cookie($at->cookie_name);
-my $probe = $q->cookie('auth_probe');
-my $back = $q->cookie($at->back_cookie_name) if $at->back_cookie_name;
-#warn "back from cookie is $back\n" if $back;
-my $have_cookies = $ticket || $probe || $back || '';
-$back ||= $q->param($at->back_arg_name) if $at->back_arg_name;
-#warn "back from cgi param is $back\n" if $back;
-$back ||= $ENV{HTTP_REFERER} if $ENV{HTTP_REFERER} && $BACK_REFERER;
-$back = uri_unescape($back) if $back && $back =~ m/^https?%3A%2F%2F/i;
-$back =~ s/^http:/https:/ if $server_name ne 'localhost';
-#warn "back is $back\n";
-if ($back && $back =~ m!^/!) {
-  my $hostname = $server_name;
-  my $port = $server_port;
-  $hostname .= ':' . $port if $port && $port != 80 && $port != 443;
-  $back = sprintf "http%s://%s%s", ($port == 443 ? 's' : ''), $hostname, $back;
-#warn "back is $back\n";
-} elsif ($back && $back !~ m/^http/i) {
-  $back = 'http://' . $back;
-#warn "back is $back\n";
-}
-
-#warn "back is $back\n";
-my $back_esc = uri_escape($back) if $back;
-my $back_html = escapeHTML($back) if $back;
-
-my ($fatal, @errors);
-my ($mode, $location, $suffix) = fileparse($ENV{SCRIPT_NAME}, '\.cgi', '\.pl');
-$mode = 'login' unless $mode eq 'guest' || $mode eq 'autologin';
-my $self_redirect = $q->param('redirect') || 0;
-my $username = lc($q->param('username'));
-my $password = $q->param('password');
-my $timeout = $q->param('timeout');
-my $unauth = $q->param('unauth');
-my $ip_addr = $at->ignore_ip ? undef : $ENV{REMOTE_ADDR};
-my $redirected = 0;
-
-# ------------------------------------------------------------------------
-# Set the auth cookie and redirect to $back
-my $set_cookie_redirect = sub {
-  my ($tkt, $back) = @_;
-  my @expires = $at->cookie_expires ? 
-    ( -expires => sprintf("+%ss", $at->cookie_expires) ) :
-    ();
-  my $cookie = CGI::Cookie->new(
-    -name => $at->cookie_name,
-    -value => $tkt, 
-    -path => '/',
-    -secure => $at->require_ssl,
-    @expires,
-    @auth_domain,
-  );
-
-  # If no $back, just set the auth cookie and hope for the best
-  if (! $back) {
-    print $q->header( -cookie => $cookie );
-    print $q->start_html, $q->p("Login successful"), $q->end_html;
-    return 0;
-  }
-
-  # Set (local) cookie, and redirect to $back
-  print $q->header( -cookie => $cookie );
-#return 0 if $debug;
-
-  my $b = URI->new($back);
-  # If $back domain doesn't match $AUTH_DOMAIN, pass ticket via back GET param
-  my $domain = $AUTH_DOMAIN || $server_name;
-  if ($b->host !~ m/\b$domain$/i) {
-    $back .= $b->query ? '&' : '?';
-    $back .= $at->cookie_name . '=' . $tkt;
-  }
-
-  # For some reason, using a Location: header doesn't seem to then see the 
-  #   cookie, but a meta refresh one does - weird
-  print $q->start_html(
-    -head => meta({ -http_equiv => 'refresh', -content => "0;URL=$back" }),
-    ), 
-    $q->end_html;
-  return 1;
-};
-
-# ------------------------------------------------------------------------
-# Actual processing
-
-# If no cookies found, first check whether cookies are supported
-if (! $have_cookies) {
-  # If this is a self redirect warn the user about cookie support
-  if ($self_redirect) {
-    $fatal = "Your browser does not appear to support cookies or has cookie support disabled.<br />\nThis site requires cookies - please turn cookie support on or try again using a different browser.";
-  }
-  # If no cookies and not a redirect, redirect to self to test cookies
-  else {
-    my $extra = '';
-    $extra .= 'timeout=1' if $timeout;
-    $extra .= 'unauth=1' if $unauth;
-    $extra = "&$extra" if $extra;
-    print $q->header(
-      -cookie => CGI::Cookie->new(-name => 'auth_probe', -value => 1, @auth_domain),
-    );
-    # For some reason, a Location: redirect doesn't seem to then see the cookie,
-    #   but a meta refresh one does - go figure
-    print $q->start_html(
-      -head => meta({
-        -http_equiv => 'refresh', -content => ("0;URL=" . sprintf("%s%s%s?redirect=%s&%s=%s%s",
-          $location, $mode, $suffix, $self_redirect + 1, $at->back_arg_name, 
-          $back_esc || '', $extra))
-    }));
-    $redirected = 1;
-  }
-}
-
-elsif ($mode eq 'autologin') {
-  # If we have a ticket, redirect to $back, including ticket as GET param
-  if ($ticket && $back && ! $timeout) {
-    my $b = URI->new($back);
-    $back .= $b->query ? '&' : '?';
-    $back .= $at->cookie_name . '=' . $ticket;
-    print $q->redirect($back);
-    $redirected = 1;
-  }
-  # Can't autologin - change mode to either guest or login
-  else {
-    $mode = $AUTOLOGIN_FALLBACK_MODE;
-  }
-}
-
-unless ($fatal || $redirected) {
-  if (! $at) {
-    $fatal = "AuthTkt error: " . $at->errstr;
-  }
-  elsif ($mode eq 'login') {
-    if ($username && $validate_sub->($username, $password)) {
-#     my $user_data = join(':', encrypt($password), time(), $ip_addr);
-      my $user_data = join(':', time(), $ip_addr || '');    # Optional
-      my $tkt = $at->ticket(uid => $username, data => $user_data, ip_addr => $ip_addr, debug => $debug);
-      if (! @errors) {
-        $redirected = $set_cookie_redirect->($tkt, $back);
-        $fatal = "Login successful.";
-      }
-    }
-    elsif ($username) {
-      push @errors, "Invalid username or password.";
-    }
-  }
-
-  elsif ($mode eq 'guest') {
-    # Generate a guest ticket and redirect to $back
-    my $tkt = $at->ticket(uid => $guest_sub->(), ip_addr => $ip_addr);
-    if (! @errors) {
-      $redirected = $set_cookie_redirect->($tkt, $back);
-      $fatal = "No back link found.";
-    }
-  }
-}
-
-my @style = $STYLESHEET ? ('-style' => { src => $STYLESHEET }) : ();
-$TITLE ||= "\u$mode Page";
-unless ($redirected) {
-  # If here, either some kind of error or a login page
-  if ($fatal) {
-    print $q->header,
-      $q->start_html(
-        -title => $TITLE,
-        @style,
-      );
-  }
-  else {
-    push @errors, qq(Your session has timed out.) if $timeout;
-    push @errors, qq(You are not authorised to access this area.) if $unauth;
-    print $q->header,
-      $q->start_html(
-        -title => $TITLE,
-        -onLoad => "getFocus()",
-        @style,
-        -script => qq(
-function getFocus() {
-  document.forms[0].elements[0].focus();
-  document.forms[0].elements[0].select();
-}));
-  }
-  print <<EOD;
-<div align="center">
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<h2>Welcome to SME server</h2>
-EOD
-
-  if ($debug) {
-    my $cookie_name = $at->cookie_name;
-    my $back_cookie_name = $at->back_cookie_name || '';
-    my $back_cookie_path = $q->cookie($at->back_cookie_name) || '';
-    my $back_arg_name = $at->back_arg_name || '';
-    my $cookie_expires = $at->cookie_expires || 0;
-    my $referer = $ENV{HTTP_REFERER};
-    print <<EOD;
-<pre>
-server_name: $server_name
-server_port: $server_port
-domain: $AUTH_DOMAIN
-mode: $mode
-suffix: $suffix
-cookie_name: $cookie_name
-cookie_expires: $cookie_expires
-back_cookie_name: $back_cookie_name
-back_cookie_path: $back_cookie_path
-back_arg_name: $back_arg_name
-referer: $referer
-back: $back
-back_esc: $back_esc
-back_html: $back_html
-have_cookies: $have_cookies
-ip_addr: $ip_addr
-</pre>
-EOD
-  }
-
-  if ($fatal) {
-    print qq(<p class="error">$fatal</p>\n);
-  }
-
-  else {
-    print qq(<p class="error">\n), join(qq(<br />\n), @errors), "</p>\n"
-      if @errors;
-    print <<EOD;
-<form name="login" method="post" action="$mode$suffix">
-<table border="0" cellpadding="5">
-<tr><th>Username:</th><td><input type="text" name="username" /></td></tr>
-<tr><th>Password:</th><td><input type="password" name="password" /></td></tr>
-<tr><td colspan="2" align="center"> 
-<input type="submit" value="Login" />
-</td></tr>
-</table>
-EOD
-    print qq(<input type="hidden" name="back" value="$back_html" />\n) if $back_html;
-    print qq(</form>\n);
-}
-
-#  print qq(<p><a href="$back_html">Previous Page</a></p>\n) if $back_html;
-  print <<EOD;
-<!-- Start Donate section -->
-<p>Remember that SME Server is <i>free to download</i> and use, but it is <i><b>not</b>
-free to build</i></p>
-<p>Please help the project</p>
-<p><a href="http://www.smeserver.org/donate/" target="_blank"><img
-src="../btn_donateCC_LG.gif"
-alt="http://www.smeserver.org/donate/" align="middle"></a>
-</p>
-<p>-- The SME Server Team --</p>
-<!-- Finish Donate section -->
-</div>
-</body>
-</html>
-EOD
-}
-
-# arch-tag: 1cac856d-534c-4c81-9e9a-34e39d26f4f2
-# vim:sw=2:sm:cin
-
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/web/common/cgi-bin/logout e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/web/common/cgi-bin/logout
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/web/common/cgi-bin/logout  2016-07-19 09:03:46.679000000 -0400
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/web/common/cgi-bin/logout      1969-12-31 19:00:00.000000000 -0500
@@ -1,128 +0,0 @@
-#!/usr/bin/perl -w
-#
-# mod_auth_tkt sample logout script
-# 
-# Note that this needs script needs to be available locally on all domains 
-#   if using multiple domains (unlike login.cgi, which only needs to exist
-#   on one domain).
-#
-
-use File::Basename;
-use lib dirname($ENV{SCRIPT_FILENAME});
-use Apache::AuthTkt 0.03;
-use CGI qw(:standard);
-use URI::Escape;
-use URI;
-use strict;
-
-# ------------------------------------------------------------------------
-# Configure this section to taste
-
-# CSS stylesheet to use (optional)
-my $STYLESHEET = '/server-common/css/tkt.css';
-# Page title (optional)
-my $TITLE = '';
-# Boolean flag, whether to fallback to HTTP_REFERER for back link
-my $BACK_REFERER = 1;
-# Additional cookies to clear on logout e.g. PHPSESSID
-my @NUKE_COOKIES = qw();
-
-# ------------------------------------------------------------------------
-# Main code begins
-my $debug = 0;
-my $at = Apache::AuthTkt->new(conf => "/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg");
-my $q = CGI->new;
-my ($server_name, $server_port) = split /:/, $q->http('X-Forwarded-Host') || $ENV{HTTP_HOST};
-#warn "servername is $server_name; HOST is $ENV{HTTP_HOST}\n";
-$server_name ||= $ENV{SERVER_NAME};
-$server_port ||= $ENV{SERVER_PORT};
-$server_port = ( $server_name eq 'localhost' ) ? '80' : '443';
-my $AUTH_DOMAIN = $server_name;
-my $back = $q->cookie($at->back_cookie_name) if $at->back_cookie_name;
-$back ||= $q->param($at->back_arg_name) if $at->back_arg_name;
-$back ||= $ENV{HTTP_REFERER} if $BACK_REFERER;
-$back = "/server-manager/";
-if ($back && $back =~ m!^/!) {
-  my $hostname = $server_name;
-  my $port = $server_port;
-  $hostname .= ':' . $port if $port && $port != 80 && $port != 443;
-  $back = sprintf "http%s://%s%s", ($port == 443 ? 's' : ''), $hostname, $back;
-} elsif ($back && $back !~ m/^http/i) {
-  $back = 'http://' . $back;
-}
-$back = uri_unescape($back) if $back =~ m/^https?%3A%2F%2F/;
-my $back_html = escapeHTML($back) if $back;
-
-# Logout by resetting the auth cookie
-my @cookies = cookie(-name => $at->cookie_name, -value => '', -expires => '-1h', 
-    ($AUTH_DOMAIN && $AUTH_DOMAIN =~ /\./ ? (-domain => $AUTH_DOMAIN) : ()));
-push @cookies, map { cookie(-name => $_, -value => '', -expires => '-1h') } @NUKE_COOKIES;
-
-my $redirected = 0;
-if ($back) {
-  my $b = URI->new($back);
-  # If $back domain doesn't match $AUTH_DOMAIN, add ticket reset to back
-  if ($b->host !~ m/\b$AUTH_DOMAIN$/i) {
-    $back .= $b->query ? '&' : '?';
-    $back .= $at->cookie_name . '=';
-  }
-
-  if ($debug) {
-    print $q->header(-cookie => \@cookies);
-  }
-
-  else {
-    # Set (local) cookie, and redirect to $back
-    print $q->header(
-      -cookie => \@cookies,
-#     -location => $back,
-    );
-    # For some reason, a Location: redirect doesn't seem to then see the cookie,
-    #   but a meta refresh one does - weird
-    print $q->start_html(
-      -head => meta({
-        -http_equiv => 'refresh', -content => "0;URL=$back"
-    }));
-    $redirected = 1;
-  }
-}
-
-# If no $back, just set the auth cookie and hope for the best
-else {
-  print $q->header(-cookie => \@cookies);
-}
-
-my @style = $STYLESHEET ? ('-style' => { src => $STYLESHEET }) : ();
-$TITLE ||= 'Logout Page';
-unless ($redirected) {
-  # If here, either some kind of error or no back ref found
-  print $q->start_html(
-      -title => $TITLE,
-      @style,
-    );
-  print <<EOD;
-<div align="center">
-<h1>$TITLE</h1>
-EOD
-  if ($debug) {
-    print <<EOD;
-<pre>
-back: $back
-back_html: $back_html
-</pre>
-EOD
-  }
-  print <<EOD;
-<p>You are now logged out.</p>
-EOD
-  print qq(<p><a href="$back_html">Return to server manager login</a></p>\n) if $back_html;
-  print <<EOD;
-</div>
-</body>
-</html>
-EOD
-}
-
-# arch-tag: 09c96fc6-5119-4c79-8086-6c6b24951f96
-# vim:sw=2:sm:cin
-
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/web/common/css/tkt.css e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/web/common/css/tkt.css
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/web/common/css/tkt.css     2008-10-07 13:36:17.000000000 -0400
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/web/common/css/tkt.css 1969-12-31 19:00:00.000000000 -0500
@@ -1,32 +0,0 @@
-/* mod_auth_tkt example css */
-
-BODY {background-image: url(../smeserver_logo.jpg);
-       background-repeat: no-repeat;
-       background-position: 600px 40px;
-       background-position: top;
-
-    font-family: arial, helvetica, sans-serif;
-    font-size: small;
-}
-
-P, TH, TD {
-    font-family: arial, helvetica, sans-serif;
-    font-size: small;
-}
-
-H1, H2, H3, H4, H5, H6 { color: #006; }
-H1 { font-size: x-large; }
-H2 { font-size: large; }
-H3 { font-size: medium; }
-
-.warning { color: #c00; font-size: medium; font-weight: bold; }
-
-TABLE {
-    background-color: #eee;
-    color: #666;
-    border: 1px solid #ccc;
-    padding: 20px;
-}
-
-
-/* arch-tag: ac35e093-c2c0-4994-bc18-2d25715b1192 */
Binary files e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/web/common/sl_icon.gif and e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/web/common/sl_icon.gif differ
Binary files e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/web/common/spacer.gif and e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/web/common/spacer.gif differ
Binary files e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/web/common/warn.gif and e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/web/common/warn.gif differ
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/web/functions/index.cgi e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/web/functions/index.cgi
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/web/functions/index.cgi    2006-11-02 11:38:41.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/web/functions/index.cgi        1969-12-31 19:00:00.000000000 -0500
@@ -1,36 +0,0 @@
-#!/usr/bin/perl -wT
-
-#----------------------------------------------------------------------
-# copyright (C) 1999-2006 Mitel Networks Corporation
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#              
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#              
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-# 
-#----------------------------------------------------------------------
-
-use strict;
-use esmith::FormMagick;
-
-my $fm = new esmith::FormMagick;
-$fm->display();
-
-exit 0;
-
-__DATA__
-<form title="FORM_TITLE" header="/etc/e-smith/web/common/noframes_head.tmpl" footer="/etc/e-smith/web/common/noframes_foot.tmpl">
-    <page name="First">
-        <description>NOFRAMES_BODY</description>
-    </page>
- 
-</form>
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/web/functions/initial.cgi e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/web/functions/initial.cgi
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/web/functions/initial.cgi  2006-11-02 11:38:41.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/web/functions/initial.cgi      1969-12-31 19:00:00.000000000 -0500
@@ -1,36 +0,0 @@
-#!/usr/bin/perl -wT
-
-#----------------------------------------------------------------------
-# copyright (C) 1999-2006 Mitel Networks Corporation
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#              
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#              
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-# 
-#----------------------------------------------------------------------
-use strict;
-use esmith::FormMagick;
-
-my $fm = new esmith::FormMagick;
-
-$fm->display();
-
-exit 0;
-
-__DATA__
-<form title="FORM_TITLE" header="/etc/e-smith/web/common/head.tmpl" footer="/etc/e-smith/web/common/foot.tmpl">
-    <page name="First">
-        <description>FRAMES_BODY</description>
-    </page>
-  
-</form>
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/web/functions/navigation e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/web/functions/navigation
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/web/functions/navigation   2008-10-07 13:36:17.000000000 -0400
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/web/functions/navigation       1969-12-31 19:00:00.000000000 -0500
@@ -1,340 +0,0 @@
-#!/usr/bin/perl -wT
-
-#----------------------------------------------------------------------
-# e-smith manager functions: navigation
-#
-# copyright (C) 2002 Mitel Networks Corporation
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#              
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#              
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-# 
-# Technical support for this program is available from Mitel Networks 
-# Please visit our web site www.e-smith.com for details.
-#----------------------------------------------------------------------
-package esmith;
-
-use strict;
-use CGI ':no_xhtml', ':all';
-use CGI::Carp qw(fatalsToBrowser);
-
-use esmith::cgi;
-use esmith::config;
-use esmith::NavigationDB;
-use esmith::util;
-use esmith::I18N;
-
-sub determineGroup;
-sub showNavigation ($);
-
-BEGIN
-{
-    # Clear PATH and related environment variables so that calls to
-    # external programs do not cause results to be tainted. See
-    # "perlsec" manual page for details.
-
-    $ENV {'PATH'} = '';
-    $ENV {'SHELL'} = '/bin/bash';
-    delete $ENV {'ENV'};
-}
-
-esmith::util::setRealToEffective ();
-
-$CGI::POST_MAX=1024 * 100;  # max 100K posts
-$CGI::DISABLE_UPLOADS = 1;  # no uploads
-
-# Use the one script for navigation and noframes
-my $NO_FRAMES = ($0 =~ /noframes/);
-
-my %conf;
-tie %conf, 'esmith::config';
-
-my $q = new CGI;
-
-showNavigation ($q);
-exit (0);
-
-
-#------------------------------------------------------
-# subroutine to determine which group a user belongs to
-#------------------------------------------------------
-
-sub determineGroup
-{
-       my ($user) = shift;
-
-       # Group file for authentication
-       my $group_file = '/etc/group';
-       open ( GF, $group_file )
-           or die "Cannot open group file: $group_file: $!\n";
-
-       # list of groups this user belongs to
-       my @groupList;
-       while (<GF>) 
-       {
-               if (/[:,]$user\b/) 
-               {
-                       my ($groupName, undef) = split(/:/);
-                       push @groupList, $groupName;
-               }
-       }
-       close GF;       
-       return @groupList;
-}
-
-#------------------------------------------------------------
-# subroutine to display navigation bar
-#------------------------------------------------------------
-
-sub showNavigation ($)
-{
-    my $q = shift;
- 
-    # enable utf8 binmode so new translations work
-    binmode STDOUT, ":utf8";
-
-    # Use this variable throughout to keep track of files
-    # list of just the files
-    my $c = "1";
-    my @files = ();
-    my %files_hash = ();
-    my @panel_group = $ENV{'REMOTE_USER'} eq "admin" ?
-       ("admin") : determineGroup($ENV{'REMOTE_USER'});
-       
-    #-----------------------------------------------------
-    # Determine the directory where the functions are kept
-    #----------------------------------------------------- 
-       
-    my $navigation_ignore = 
-       "(\.\.?|navigation|noframes|online-manual|(internal|pleasewait)(-.*)?)";
-
-    my $cgidir = 'nowhere';
-    if ($panel_group[0] eq 'admin')
-    {
-       $cgidir = '/etc/e-smith/web/panels/manager/cgi-bin/';
-
-       if (opendir (DIR, $cgidir))
-       {
-           @files = grep (!/^${navigation_ignore}$/,
-               readdir (DIR));
-           closedir (DIR);
-       }
-       else
-       {
-           warn "Can't open directory $cgidir\n";
-       }
-
-       foreach my $file (@files)
-       {
-           next if (-d "$cgidir/$file");
-           $files_hash{$file} = $cgidir;
-       }
-    }
-    else
-    {
-       foreach my $panel (@panel_group)
-       {
-           $cgidir = "/etc/e-smith/web/panels/manager/$panel/cgi-bin";
-
-           if (opendir (DIR, $cgidir))
-           {
-               @files = grep (!/^${navigation_ignore}$/,
-                   readdir (DIR));
-               closedir (DIR);
-               foreach my $file (@files)
-               {
-                   next if (-d "$cgidir/$file");
-                   $files_hash{$file} = $cgidir;
-               }
-           }
-           else
-           {
-               warn "Can't open directory $cgidir\n";
-           }
-       }
-    }
-
-    #-------------------------------------------------- 
-    # For each script, extract the description and category
-    # information. Build up an associative array mapping headings
-    # to heading structures. Each heading structure contains the
-    # total weight for the heading, the number of times the heading
-    # has been encountered, and another associative array mapping
-    # descriptions to description structures. Each description
-    # structure contains the filename of the particular cgi script
-    # and a weight.
-    #-------------------------------------------------- 
-    my %nav = ();
-
-    use constant NAVIGATIONDIR => '/home/e-smith/db/navigation';
-    use constant WEBFUNCTIONS  => '/etc/e-smith/web/functions';
-
-    my $i18n = new esmith::I18N;
-
-    my $language = $i18n->preferredLanguage( $ENV{HTTP_ACCEPT_LANGUAGE} );
-
-    my $navinfo = NAVIGATIONDIR . "/navigation.$language";
-
-    my $navdb = esmith::NavigationDB->open_ro( $navinfo ) or
-       die "Couldn't open $navinfo\n";
-
-    # Check the navdb for anything with a UrlPath, which means that it doesn't
-    # have a cgi file to be picked up by the above code. Ideally, only pages
-    # that exist should be in the db, but that's not the case. Anything
-    # without a cgi file will have to remove themselves on uninstall from the
-    # navigation dbs.
-    foreach my $rec ($navdb->get_all)
-    {
-       if ($rec->prop('UrlPath'))
-       {
-           $files_hash{$rec->{key}} = $cgidir;
-       }
-    }
-
-    foreach my $file (keys %files_hash)
-    {
-       my $heading = 'Unknown';
-       my $description = $file;
-       my $headingWeight = 99999;
-       my $descriptionWeight = 99999;
-       my $urlpath = '';
-
-       my $rec = $navdb->get($file);
-
-       if (defined $rec)
-       {
-           $heading = $rec->prop('Heading');
-           $description = $rec->prop('Description');
-           $headingWeight = $rec->prop('HeadingWeight');
-           $descriptionWeight = $rec->prop('DescriptionWeight');
-           $urlpath = $rec->prop('UrlPath') || '';
-       }
-
-       #-------------------------------------------------- 
-       # add heading, description and weight information to data structure
-       #-------------------------------------------------- 
-
-       unless (exists $nav {$heading})
-       {
-           $nav {$heading} = { COUNT => 0, WEIGHT => 0, DESCRIPTIONS => [] };
-       }
-
-       $nav {$heading} {'COUNT'} ++;
-       $nav {$heading} {'WEIGHT'} += $headingWeight;
-
-       # Check for manager panel, and assign the appropriate
-       #  cgi-bin prefix for the links.
-       # Grab the last 2 directories by splitting for '/'s and
-       #  then concatenating the last 2
-       # probably a better way, but I don't know it.
-       my @filename = split /\//, $files_hash{$file};
-       my $path = ($cgidir eq '/etc/e-smith/web/panels/manager/cgi-bin/') ? 
-           "/$filename[scalar @filename - 1]" : 
-           "/$filename[scalar @filename - 2]/$filename[scalar @filename - 1]";
-       
-       push @{ $nav {$heading} {'DESCRIPTIONS'} },
-               { DESCRIPTION => $description,
-                 WEIGHT => $descriptionWeight, 
-                 FILENAME => $urlpath ? $urlpath : "$path/$file",
-                 CGIPATH => $path
-               };
-    }
-
-    #-------------------------------------------------- 
-    # generate list of headings sorted by average weight
-    #-------------------------------------------------- 
-    if ( $NO_FRAMES )
-    {
-       esmith::cgi::genNoframesHeader ($q);
-    }
-    else
-    {
-        esmith::cgi::genNavigationHeader ($q, undef);
-       print "\n<TABLE BORDER=\"0\" CELLSPACING=\"0\" CELLPADDING=\"0\">\n";
-    }
-
-  print '<script language="JavaScript" type="text/javascript">
-  <!-- Hide script
-  //This swap the class of the selected item.
-    function swapClass() {
-    var i,x,tB,j=0,tA=new Array(),arg=swapClass.arguments;
-    if(document.getElementsByTagName){for(i=4;i<arg.length;i++){tB=document.getElementsByTagName(arg[i]);
-    for(x=0;x<tB.length;x++){tA[j]=tB[x];j++;}}for(i=0;i<tA.length;i++){
-    if(tA[i].className){if(tA[i].id==arg[1]){if(arg[0]==1){
-    tA[i].className=(tA[i].className==arg[3])?arg[2]:arg[3];}else{tA[i].className=arg[2];}
-    }else if(arg[0]==1 && arg[1]==\'none\'){if(tA[i].className==arg[2] || tA[i].className==arg[3]){
-    tA[i].className=(tA[i].className==arg[3])?arg[2]:arg[3];}
-    }else if(tA[i].className==arg[2]){tA[i].className=arg[3];}}}}}
-    ';
-    print "
-  //This swap the class of the selected item.
-    function swapClasses() {
-    var arg=swapClasses.arguments;
-    swapClass(0,'none','item-current','item','a');
-    swapClass(0,'none','warn-current','warn','a');
-    swapClass(0,arg[0],'item-current','item','a');
-    }
-
-    // End script hiding -->
-    </script>
-    ";
-
-    foreach my $h (sort {
-        ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) <=>
-       ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav)
-    {
-        if ( $NO_FRAMES )
-       {
-           print $q->h2 ($h);
-       }
-       else
-       {
-           print "\n", $q->Tr ($q->td({class => "section"},$q->span({class => "section"}, $h)));
-       }
-
-       #-------------------------------------------------- 
-       # generate list of descriptions sorted by weight
-       #-------------------------------------------------- 
-        print "<ul>\n" if ( $NO_FRAMES );
-
-       foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} }  @{$nav {$h}{'DESCRIPTIONS'}})
-       {
-           my $href = "/server-manager" .  $_->{'FILENAME'};
-           if ( $NO_FRAMES )
-           {
-               print $q->li ($q->a ({href => "$href?noframes=1"}, $_->{'DESCRIPTION'}));
-           }
-           else
-           {
-               print "\n",$q->Tr(
-                            $q->td ({-class => "menu-cell"},
-                                    $q->a ({-id => "sme$c",
-                                            -class => "item",
-                                            -onClick => "swapClasses('sme$c')",
-                                            href => $href, 
-                                            target => 'main'}, 
-                                        $_->{'DESCRIPTION'})
-                                    ));
-                        }
-                        $c++;
-                        
-       }
-        print "</ul>\n" if ($NO_FRAMES);
-    }
-
-    unless ( $NO_FRAMES )
-    {
-       print "\n</TABLE>\n";
-        esmith::cgi::genNavigationFooter ($q);
-    }
-}
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/web/functions/noframes e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/web/functions/noframes
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/etc/e-smith/web/functions/noframes     2008-10-07 13:36:17.000000000 -0400
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/etc/e-smith/web/functions/noframes 1969-12-31 19:00:00.000000000 -0500
@@ -1,340 +0,0 @@
-#!/usr/bin/perl -wT
-
-#----------------------------------------------------------------------
-# e-smith manager functions: navigation
-#
-# copyright (C) 2002 Mitel Networks Corporation
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#              
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#              
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-# 
-# Technical support for this program is available from Mitel Networks 
-# Please visit our web site www.e-smith.com for details.
-#----------------------------------------------------------------------
-package esmith;
-
-use strict;
-use CGI ':no_xhtml', ':all';
-use CGI::Carp qw(fatalsToBrowser);
-
-use esmith::cgi;
-use esmith::config;
-use esmith::NavigationDB;
-use esmith::util;
-use esmith::I18N;
-
-sub determineGroup;
-sub showNavigation ($);
-
-BEGIN
-{
-    # Clear PATH and related environment variables so that calls to
-    # external programs do not cause results to be tainted. See
-    # "perlsec" manual page for details.
-
-    $ENV {'PATH'} = '';
-    $ENV {'SHELL'} = '/bin/bash';
-    delete $ENV {'ENV'};
-}
-
-esmith::util::setRealToEffective ();
-
-$CGI::POST_MAX=1024 * 100;  # max 100K posts
-$CGI::DISABLE_UPLOADS = 1;  # no uploads
-
-# Use the one script for navigation and noframes
-my $NO_FRAMES = ($0 =~ /noframes/);
-
-my %conf;
-tie %conf, 'esmith::config';
-
-my $q = new CGI;
-
-showNavigation ($q);
-exit (0);
-
-
-#------------------------------------------------------
-# subroutine to determine which group a user belongs to
-#------------------------------------------------------
-
-sub determineGroup
-{
-       my ($user) = shift;
-
-       # Group file for authentication
-       my $group_file = '/etc/group';
-       open ( GF, $group_file )
-           or die "Cannot open group file: $group_file: $!\n";
-
-       # list of groups this user belongs to
-       my @groupList;
-       while (<GF>) 
-       {
-               if (/[:,]$user\b/) 
-               {
-                       my ($groupName, undef) = split(/:/);
-                       push @groupList, $groupName;
-               }
-       }
-       close GF;       
-       return @groupList;
-}
-
-#------------------------------------------------------------
-# subroutine to display navigation bar
-#------------------------------------------------------------
-
-sub showNavigation ($)
-{
-    my $q = shift;
- 
-    # enable utf8 binmode so new translations work
-    binmode STDOUT, ":utf8";
-
-    # Use this variable throughout to keep track of files
-    # list of just the files
-    my $c = "1";
-    my @files = ();
-    my %files_hash = ();
-    my @panel_group = $ENV{'REMOTE_USER'} eq "admin" ?
-       ("admin") : determineGroup($ENV{'REMOTE_USER'});
-       
-    #-----------------------------------------------------
-    # Determine the directory where the functions are kept
-    #----------------------------------------------------- 
-       
-    my $navigation_ignore = 
-       "(\.\.?|navigation|noframes|online-manual|(internal|pleasewait)(-.*)?)";
-
-    my $cgidir = 'nowhere';
-    if ($panel_group[0] eq 'admin')
-    {
-       $cgidir = '/etc/e-smith/web/panels/manager/cgi-bin/';
-
-       if (opendir (DIR, $cgidir))
-       {
-           @files = grep (!/^${navigation_ignore}$/,
-               readdir (DIR));
-           closedir (DIR);
-       }
-       else
-       {
-           warn "Can't open directory $cgidir\n";
-       }
-
-       foreach my $file (@files)
-       {
-           next if (-d "$cgidir/$file");
-           $files_hash{$file} = $cgidir;
-       }
-    }
-    else
-    {
-       foreach my $panel (@panel_group)
-       {
-           $cgidir = "/etc/e-smith/web/panels/manager/$panel/cgi-bin";
-
-           if (opendir (DIR, $cgidir))
-           {
-               @files = grep (!/^${navigation_ignore}$/,
-                   readdir (DIR));
-               closedir (DIR);
-               foreach my $file (@files)
-               {
-                   next if (-d "$cgidir/$file");
-                   $files_hash{$file} = $cgidir;
-               }
-           }
-           else
-           {
-               warn "Can't open directory $cgidir\n";
-           }
-       }
-    }
-
-    #-------------------------------------------------- 
-    # For each script, extract the description and category
-    # information. Build up an associative array mapping headings
-    # to heading structures. Each heading structure contains the
-    # total weight for the heading, the number of times the heading
-    # has been encountered, and another associative array mapping
-    # descriptions to description structures. Each description
-    # structure contains the filename of the particular cgi script
-    # and a weight.
-    #-------------------------------------------------- 
-    my %nav = ();
-
-    use constant NAVIGATIONDIR => '/home/e-smith/db/navigation';
-    use constant WEBFUNCTIONS  => '/etc/e-smith/web/functions';
-
-    my $i18n = new esmith::I18N;
-
-    my $language = $i18n->preferredLanguage( $ENV{HTTP_ACCEPT_LANGUAGE} );
-
-    my $navinfo = NAVIGATIONDIR . "/navigation.$language";
-
-    my $navdb = esmith::NavigationDB->open_ro( $navinfo ) or
-       die "Couldn't open $navinfo\n";
-
-    # Check the navdb for anything with a UrlPath, which means that it doesn't
-    # have a cgi file to be picked up by the above code. Ideally, only pages
-    # that exist should be in the db, but that's not the case. Anything
-    # without a cgi file will have to remove themselves on uninstall from the
-    # navigation dbs.
-    foreach my $rec ($navdb->get_all)
-    {
-       if ($rec->prop('UrlPath'))
-       {
-           $files_hash{$rec->{key}} = $cgidir;
-       }
-    }
-
-    foreach my $file (keys %files_hash)
-    {
-       my $heading = 'Unknown';
-       my $description = $file;
-       my $headingWeight = 99999;
-       my $descriptionWeight = 99999;
-       my $urlpath = '';
-
-       my $rec = $navdb->get($file);
-
-       if (defined $rec)
-       {
-           $heading = $rec->prop('Heading');
-           $description = $rec->prop('Description');
-           $headingWeight = $rec->prop('HeadingWeight');
-           $descriptionWeight = $rec->prop('DescriptionWeight');
-           $urlpath = $rec->prop('UrlPath') || '';
-       }
-
-       #-------------------------------------------------- 
-       # add heading, description and weight information to data structure
-       #-------------------------------------------------- 
-
-       unless (exists $nav {$heading})
-       {
-           $nav {$heading} = { COUNT => 0, WEIGHT => 0, DESCRIPTIONS => [] };
-       }
-
-       $nav {$heading} {'COUNT'} ++;
-       $nav {$heading} {'WEIGHT'} += $headingWeight;
-
-       # Check for manager panel, and assign the appropriate
-       #  cgi-bin prefix for the links.
-       # Grab the last 2 directories by splitting for '/'s and
-       #  then concatenating the last 2
-       # probably a better way, but I don't know it.
-       my @filename = split /\//, $files_hash{$file};
-       my $path = ($cgidir eq '/etc/e-smith/web/panels/manager/cgi-bin/') ? 
-           "/$filename[scalar @filename - 1]" : 
-           "/$filename[scalar @filename - 2]/$filename[scalar @filename - 1]";
-       
-       push @{ $nav {$heading} {'DESCRIPTIONS'} },
-               { DESCRIPTION => $description,
-                 WEIGHT => $descriptionWeight, 
-                 FILENAME => $urlpath ? $urlpath : "$path/$file",
-                 CGIPATH => $path
-               };
-    }
-
-    #-------------------------------------------------- 
-    # generate list of headings sorted by average weight
-    #-------------------------------------------------- 
-    if ( $NO_FRAMES )
-    {
-       esmith::cgi::genNoframesHeader ($q);
-    }
-    else
-    {
-        esmith::cgi::genNavigationHeader ($q, undef);
-       print "\n<TABLE BORDER=\"0\" CELLSPACING=\"0\" CELLPADDING=\"0\">\n";
-    }
-
-  print '<script language="JavaScript" type="text/javascript">
-  <!-- Hide script
-  //This swap the class of the selected item.
-    function swapClass() {
-    var i,x,tB,j=0,tA=new Array(),arg=swapClass.arguments;
-    if(document.getElementsByTagName){for(i=4;i<arg.length;i++){tB=document.getElementsByTagName(arg[i]);
-    for(x=0;x<tB.length;x++){tA[j]=tB[x];j++;}}for(i=0;i<tA.length;i++){
-    if(tA[i].className){if(tA[i].id==arg[1]){if(arg[0]==1){
-    tA[i].className=(tA[i].className==arg[3])?arg[2]:arg[3];}else{tA[i].className=arg[2];}
-    }else if(arg[0]==1 && arg[1]==\'none\'){if(tA[i].className==arg[2] || tA[i].className==arg[3]){
-    tA[i].className=(tA[i].className==arg[3])?arg[2]:arg[3];}
-    }else if(tA[i].className==arg[2]){tA[i].className=arg[3];}}}}}
-    ';
-    print "
-  //This swap the class of the selected item.
-    function swapClasses() {
-    var arg=swapClasses.arguments;
-    swapClass(0,'none','item-current','item','a');
-    swapClass(0,'none','warn-current','warn','a');
-    swapClass(0,arg[0],'item-current','item','a');
-    }
-
-    // End script hiding -->
-    </script>
-    ";
-
-    foreach my $h (sort {
-        ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) <=>
-       ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav)
-    {
-        if ( $NO_FRAMES )
-       {
-           print $q->h2 ($h);
-       }
-       else
-       {
-           print "\n", $q->Tr ($q->td({class => "section"},$q->span({class => "section"}, $h)));
-       }
-
-       #-------------------------------------------------- 
-       # generate list of descriptions sorted by weight
-       #-------------------------------------------------- 
-        print "<ul>\n" if ( $NO_FRAMES );
-
-       foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} }  @{$nav {$h}{'DESCRIPTIONS'}})
-       {
-           my $href = "/server-manager" .  $_->{'FILENAME'};
-           if ( $NO_FRAMES )
-           {
-               print $q->li ($q->a ({href => "$href?noframes=1"}, $_->{'DESCRIPTION'}));
-           }
-           else
-           {
-               print "\n",$q->Tr(
-                            $q->td ({-class => "menu-cell"},
-                                    $q->a ({-id => "sme$c",
-                                            -class => "item",
-                                            -onClick => "swapClasses('sme$c')",
-                                            href => $href, 
-                                            target => 'main'}, 
-                                        $_->{'DESCRIPTION'})
-                                    ));
-                        }
-                        $c++;
-                        
-       }
-        print "</ul>\n" if ($NO_FRAMES);
-    }
-
-    unless ( $NO_FRAMES )
-    {
-       print "\n</TABLE>\n";
-        esmith::cgi::genNavigationFooter ($q);
-    }
-}
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/var/service/httpd-admin/log/run e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/var/service/httpd-admin/log/run
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/var/service/httpd-admin/log/run        2006-11-02 11:38:41.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/var/service/httpd-admin/log/run    1969-12-31 19:00:00.000000000 -0500
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-#----------------------------------------------------------------------
-# copyright (C) 2005 Mitel Networks Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-#
-# Technical support for this program is available from Mitel Networks
-# Please visit our web site www.mitel.com/sme/ for details.
-#----------------------------------------------------------------------
-exec                                    \
-    /usr/local/bin/setuidgid smelog     \
-    /usr/local/bin/multilog t s5000000  \
-    /var/log/httpd-admin
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/var/service/httpd-admin/run e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/var/service/httpd-admin/run
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/root/var/service/httpd-admin/run    2006-11-02 11:38:41.000000000 -0500
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/root/var/service/httpd-admin/run        1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-#!/bin/sh
-#----------------------------------------------------------------------
-# copyright (C) 1999-2004 Mitel Networks Corporation
-#----------------------------------------------------------------------
-                                                                                    
-config=/etc/httpd/admin-conf/httpd.conf
-                                                                                    
-[ -e $config ] || exit 1
-                                                                                    
-exec 2>&1
-exec chpst -P /usr/sbin/httpd-admin -f $config -D FOREGROUND
diff -Nur e-smith-manager-2.6.0.old/e-smith-manager-2.6.0-6.el6.sme-filelist e-smith-manager-2.6.0/e-smith-manager-2.6.0-6.el6.sme-filelist
--- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0-6.el6.sme-filelist  2016-06-13 04:18:01.339000000 -0400
+++ e-smith-manager-2.6.0/e-smith-manager-2.6.0-6.el6.sme-filelist      1969-12-31 19:00:00.000000000 -0500
@@ -1,254 +0,0 @@
-%dir %attr(0755,root,root) /etc/e-smith
-%dir %attr(0755,root,root) /etc/e-smith/templates
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/services
-/etc/e-smith/templates/etc/services/20http-admin
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/httpd
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/httpd/conf
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/httpd/conf/httpd.conf
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts
-/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27ManagerProxyPass
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/httpd/admin-conf
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf
-/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/20Manager
-/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15common
-/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15brand
-/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85ServerResourcesAccess
-/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20password
-/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85DefaultAccess
-/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20manager
-/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/01localAccessString
-/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/20ManagerAuthTKT
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/panels
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/panels/manager
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/panels/manager/html
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm
-/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/template-begin
-/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/99End
-/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/10Head
-/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/70LayoutTableEnd
-/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/60InfoBar
-/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/30LayoutTableStart
-/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/20Body
-/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/50HilightBar
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/common
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/common/cgi-bin
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg
-/etc/e-smith/templates/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg/manager_access
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/common/css
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/common/css/sme_header.css
-/etc/e-smith/templates/etc/e-smith/web/common/css/sme_header.css/template-begin
-/etc/e-smith/templates/etc/e-smith/web/common/css/sme_header.css/50body
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/common/css/sme_panel_menu.css
-/etc/e-smith/templates/etc/e-smith/web/common/css/sme_panel_menu.css/template-begin
-/etc/e-smith/templates/etc/e-smith/web/common/css/sme_panel_menu.css/50body
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/common/css/sme_main.css
-/etc/e-smith/templates/etc/e-smith/web/common/css/sme_main.css/template-begin
-/etc/e-smith/templates/etc/e-smith/web/common/css/sme_main.css/50body
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/common/css/sme_menu.css
-/etc/e-smith/templates/etc/e-smith/web/common/css/sme_menu.css/template-begin
-/etc/e-smith/templates/etc/e-smith/web/common/css/sme_menu.css/50body
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/common/css/sme_core.css
-/etc/e-smith/templates/etc/e-smith/web/common/css/sme_core.css/template-begin
-/etc/e-smith/templates/etc/e-smith/web/common/css/sme_core.css/50body
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/common/head.tmpl
-/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/30FrameSetup00
-/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/30FrameSetup01
-/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/10Setup
-%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl
-/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/25Copyright
-/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/90Finish
-/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/10Setup
-%dir %attr(0755,root,root) /etc/e-smith/events
-%dir %attr(0755,root,root) /etc/e-smith/events/actions
-%attr(0554,root,root) /etc/e-smith/events/actions/navigation-conf
-%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save
-/etc/e-smith/events/bootstrap-console-save/S50navigation-conf
-%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand
-%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc
-%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith
-%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web
-%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/common
-/etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/common/head.tmpl
-/etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/common/foot.tmpl
-%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/common/css
-/etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/common/css/sme_core.css
-/etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/common/css/sme_header.css
-/etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/common/css/sme_main.css
-/etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/common/css/sme_menu.css
-/etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/common/css/sme_panel_menu.css
-%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/common/cgi-bin
-/etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg
-%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/panels
-%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/panels/manager
-%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/panels/manager/html
-/etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/panels/manager/html/header.htm
-%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/httpd
-%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/httpd/admin-conf
-/etc/e-smith/events/bootstrap-console-save/templates2expand/etc/httpd/admin-conf/httpd.conf
-%dir %attr(0755,root,root) /etc/e-smith/events/console-save
-%dir %attr(0755,root,root) /etc/e-smith/events/console-save/templates2expand
-%dir %attr(0755,root,root) /etc/e-smith/events/console-save/templates2expand/etc
-%dir %attr(0755,root,root) /etc/e-smith/events/console-save/templates2expand/etc/e-smith
-%dir %attr(0755,root,root) /etc/e-smith/events/console-save/templates2expand/etc/e-smith/web
-%dir %attr(0755,root,root) /etc/e-smith/events/console-save/templates2expand/etc/e-smith/web/panels
-%dir %attr(0755,root,root) /etc/e-smith/events/console-save/templates2expand/etc/e-smith/web/panels/manager
-%dir %attr(0755,root,root) /etc/e-smith/events/console-save/templates2expand/etc/e-smith/web/panels/manager/html
-/etc/e-smith/events/console-save/templates2expand/etc/e-smith/web/panels/manager/html/header.htm
-%dir %attr(0755,root,root) /etc/e-smith/events/console-save/templates2expand/etc/e-smith/web/common
-/etc/e-smith/events/console-save/templates2expand/etc/e-smith/web/common/head.tmpl
-/etc/e-smith/events/console-save/templates2expand/etc/e-smith/web/common/foot.tmpl
-%dir %attr(0755,root,root) /etc/e-smith/events/console-save/templates2expand/etc/httpd
-%dir %attr(0755,root,root) /etc/e-smith/events/console-save/templates2expand/etc/httpd/admin-conf
-/etc/e-smith/events/console-save/templates2expand/etc/httpd/admin-conf/httpd.conf
-%dir %attr(0755,root,root) /etc/e-smith/events/console-save/services2adjust
-/etc/e-smith/events/console-save/services2adjust/httpd-admin
-%dir %attr(0755,root,root) /etc/e-smith/events/network-create
-%dir %attr(0755,root,root) /etc/e-smith/events/network-create/templates2expand
-%dir %attr(0755,root,root) /etc/e-smith/events/network-create/templates2expand/etc
-%dir %attr(0755,root,root) /etc/e-smith/events/network-create/templates2expand/etc/e-smith
-%dir %attr(0755,root,root) /etc/e-smith/events/network-create/templates2expand/etc/e-smith/web
-%dir %attr(0755,root,root) /etc/e-smith/events/network-create/templates2expand/etc/e-smith/web/panels
-%dir %attr(0755,root,root) /etc/e-smith/events/network-create/templates2expand/etc/e-smith/web/panels/manager
-%dir %attr(0755,root,root) /etc/e-smith/events/network-create/templates2expand/etc/e-smith/web/panels/manager/html
-/etc/e-smith/events/network-create/templates2expand/etc/e-smith/web/panels/manager/html/header.htm
-%dir %attr(0755,root,root) /etc/e-smith/events/network-create/templates2expand/etc/e-smith/web/common
-/etc/e-smith/events/network-create/templates2expand/etc/e-smith/web/common/head.tmpl
-/etc/e-smith/events/network-create/templates2expand/etc/e-smith/web/common/foot.tmpl
-%dir %attr(0755,root,root) /etc/e-smith/events/network-create/templates2expand/etc/httpd
-%dir %attr(0755,root,root) /etc/e-smith/events/network-create/templates2expand/etc/httpd/admin-conf
-/etc/e-smith/events/network-create/templates2expand/etc/httpd/admin-conf/httpd.conf
-%dir %attr(0755,root,root) /etc/e-smith/events/network-delete
-%dir %attr(0755,root,root) /etc/e-smith/events/network-delete/templates2expand
-%dir %attr(0755,root,root) /etc/e-smith/events/network-delete/templates2expand/etc
-%dir %attr(0755,root,root) /etc/e-smith/events/network-delete/templates2expand/etc/e-smith
-%dir %attr(0755,root,root) /etc/e-smith/events/network-delete/templates2expand/etc/e-smith/web
-%dir %attr(0755,root,root) /etc/e-smith/events/network-delete/templates2expand/etc/e-smith/web/panels
-%dir %attr(0755,root,root) /etc/e-smith/events/network-delete/templates2expand/etc/e-smith/web/panels/manager
-%dir %attr(0755,root,root) /etc/e-smith/events/network-delete/templates2expand/etc/e-smith/web/panels/manager/html
-/etc/e-smith/events/network-delete/templates2expand/etc/e-smith/web/panels/manager/html/header.htm
-%dir %attr(0755,root,root) /etc/e-smith/events/network-delete/templates2expand/etc/e-smith/web/common
-/etc/e-smith/events/network-delete/templates2expand/etc/e-smith/web/common/head.tmpl
-/etc/e-smith/events/network-delete/templates2expand/etc/e-smith/web/common/foot.tmpl
-%dir %attr(0755,root,root) /etc/e-smith/events/network-delete/templates2expand/etc/httpd
-%dir %attr(0755,root,root) /etc/e-smith/events/network-delete/templates2expand/etc/httpd/admin-conf
-/etc/e-smith/events/network-delete/templates2expand/etc/httpd/admin-conf/httpd.conf
-%dir %attr(0755,root,root) /etc/e-smith/events/logrotate
-%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/templates2expand
-%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/templates2expand/etc
-%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/templates2expand/etc/e-smith
-%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/templates2expand/etc/e-smith/web
-%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/templates2expand/etc/e-smith/web/panels
-%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/templates2expand/etc/e-smith/web/panels/manager
-%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/templates2expand/etc/e-smith/web/panels/manager/html
-/etc/e-smith/events/logrotate/templates2expand/etc/e-smith/web/panels/manager/html/header.htm
-%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/templates2expand/etc/e-smith/web/common
-/etc/e-smith/events/logrotate/templates2expand/etc/e-smith/web/common/head.tmpl
-/etc/e-smith/events/logrotate/templates2expand/etc/e-smith/web/common/foot.tmpl
-%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/templates2expand/etc/httpd
-%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/templates2expand/etc/httpd/admin-conf
-/etc/e-smith/events/logrotate/templates2expand/etc/httpd/admin-conf/httpd.conf
-%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/logfiles2timestamp
-%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/logfiles2timestamp/var
-%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/logfiles2timestamp/var/log
-%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/logfiles2timestamp/var/log/httpd
-/etc/e-smith/events/logrotate/logfiles2timestamp/var/log/httpd/admin_access_log
-/etc/e-smith/events/logrotate/logfiles2timestamp/var/log/httpd/admin_error_log
-%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/services2adjust
-/etc/e-smith/events/logrotate/services2adjust/httpd-admin
-%dir %attr(0755,root,root) /etc/e-smith/events/remoteaccess-update
-%dir %attr(0755,root,root) /etc/e-smith/events/remoteaccess-update/templates2expand
-%dir %attr(0755,root,root) /etc/e-smith/events/remoteaccess-update/templates2expand/etc
-%dir %attr(0755,root,root) /etc/e-smith/events/remoteaccess-update/templates2expand/etc/httpd
-%dir %attr(0755,root,root) /etc/e-smith/events/remoteaccess-update/templates2expand/etc/httpd/admin-conf
-/etc/e-smith/events/remoteaccess-update/templates2expand/etc/httpd/admin-conf/httpd.conf
-%dir %attr(0755,root,root) /etc/e-smith/events/remoteaccess-update/services2adjust
-/etc/e-smith/events/remoteaccess-update/services2adjust/httpd-admin
-%dir %attr(0755,root,root) /etc/e-smith/events/post-install
-%dir %attr(0755,root,root) /etc/e-smith/events/post-install/logfiles2timestamp
-%dir %attr(0755,root,root) /etc/e-smith/events/post-install/logfiles2timestamp/var
-%dir %attr(0755,root,root) /etc/e-smith/events/post-install/logfiles2timestamp/var/log
-%dir %attr(0755,root,root) /etc/e-smith/events/post-install/logfiles2timestamp/var/log/httpd
-/etc/e-smith/events/post-install/logfiles2timestamp/var/log/httpd/admin_access_log
-/etc/e-smith/events/post-install/logfiles2timestamp/var/log/httpd/admin_error_log
-%dir %attr(0755,root,root) /etc/e-smith/events/post-upgrade
-%dir %attr(0755,root,root) /etc/e-smith/events/post-upgrade/logfiles2timestamp
-%dir %attr(0755,root,root) /etc/e-smith/events/post-upgrade/logfiles2timestamp/var
-%dir %attr(0755,root,root) /etc/e-smith/events/post-upgrade/logfiles2timestamp/var/log
-%dir %attr(0755,root,root) /etc/e-smith/events/post-upgrade/logfiles2timestamp/var/log/httpd
-/etc/e-smith/events/post-upgrade/logfiles2timestamp/var/log/httpd/admin_access_log
-/etc/e-smith/events/post-upgrade/logfiles2timestamp/var/log/httpd/admin_error_log
-%dir %attr(0755,root,root) /etc/e-smith/db
-%dir %attr(0755,root,root) /etc/e-smith/db/configuration
-%dir %attr(0755,root,root) /etc/e-smith/db/configuration/defaults
-%dir %attr(0755,root,root) /etc/e-smith/db/configuration/defaults/httpd-admin
-/etc/e-smith/db/configuration/defaults/httpd-admin/type
-/etc/e-smith/db/configuration/defaults/httpd-admin/TCPPort
-/etc/e-smith/db/configuration/defaults/httpd-admin/status
-/etc/e-smith/db/configuration/defaults/httpd-admin/access
-/etc/e-smith/db/configuration/defaults/httpd-admin/PermitPlainTextAccess
-%dir %attr(0755,root,root) /etc/e-smith/db/configuration/migrate
-/etc/e-smith/db/configuration/migrate/20TKTAuthSecret
-%dir %attr(0755,root,root) /etc/e-smith/web
-%dir %attr(0550,root,admin) /etc/e-smith/web/functions
-%attr(04750,root,admin) /etc/e-smith/web/functions/index.cgi
-%attr(04750,root,admin) /etc/e-smith/web/functions/navigation
-/etc/e-smith/web/functions/noframes
-%attr(04750,root,admin) /etc/e-smith/web/functions/initial.cgi
-%dir %attr(0550,www,admin) /etc/e-smith/web/common
-/etc/e-smith/web/common/spacer.gif
-/etc/e-smith/web/common/warn.gif
-/etc/e-smith/web/common/sl_icon.gif
-/etc/e-smith/web/common/userpassword_head.tmpl
-/etc/e-smith/web/common/noframes_head.tmpl
-/etc/e-smith/web/common/noframes_foot.tmpl
-%dir %attr(0755,root,root) /etc/e-smith/web/common/cgi-bin
-%attr(0755,root,root) /etc/e-smith/web/common/cgi-bin/login
-%attr(0755,root,root) /etc/e-smith/web/common/cgi-bin/logout
-%dir %attr(0755,root,root) /etc/e-smith/web/common/css
-/etc/e-smith/web/common/css/tkt.css
-%dir %attr(0550,root,admin) /etc/e-smith/web/panels
-%dir %attr(0755,root,root) /etc/e-smith/web/panels/manager
-%dir %attr(0755,root,root) /etc/e-smith/web/panels/manager/cgi-bin
-/etc/e-smith/web/panels/manager/cgi-bin/navigation
-/etc/e-smith/web/panels/manager/cgi-bin/noframes
-%dir %attr(0755,root,root) /etc/e-smith/web/panels/manager/html
-/etc/e-smith/web/panels/manager/html/index.cgi
-/etc/e-smith/web/panels/manager/html/initial.cgi
-%dir %attr(0755,root,root) /etc/e-smith/web/panels/password
-%dir %attr(0755,root,root) /etc/e-smith/web/panels/password/cgi-bin
-%dir %attr(0755,root,root) /etc/e-smith/web/panels/password/html
-%dir %attr(0755,root,root) /etc/rc.d/rc7.d
-/etc/rc.d/rc7.d/S86httpd-admin
-/etc/rc.d/init.d/httpd-admin
-%dir %attr(0755,root,root) /etc/rc.d/init.d/supervise
-/etc/rc.d/init.d/supervise/httpd-admin
-%dir %attr(0755,root,root) /etc/rc.d/rc6.d
-/etc/rc.d/rc6.d/K15httpd-admin
-%dir %attr(0755,root,root) /etc/rc.d/rc0.d
-/etc/rc.d/rc0.d/K15httpd-admin
-%dir %attr(0755,root,root) /etc/httpd
-%dir %attr(0755,root,root) /etc/httpd/admin-conf
-%dir %attr(0755,root,root) /var/service
-%dir %attr(01755,root,root) /var/service/httpd-admin
-%attr(0755,root,root) /var/service/httpd-admin/run
-%attr(0644,root,root) /var/service/httpd-admin/down
-%dir %attr(0755,root,root) /var/service/httpd-admin/log
-%attr(0755,root,root) /var/service/httpd-admin/log/run
-%dir %attr(0700,root,root) /var/service/httpd-admin/log/supervise
-%dir %attr(0700,root,root) /var/service/httpd-admin/supervise
-%dir %attr(0750,smelog,smelog) /var/log/httpd-admin
-%dir %attr(0755,root,root) /usr/sbin
-/usr/sbin/httpd-admin
-%dir %attr(0755,root,root) /usr/share/locale
-%dir %attr(0755,root,root) /usr/share/locale/en_US
-%dir %attr(0755,root,root) /usr/share/locale/en_US/LC_MESSAGES
-/usr/share/locale/en_US/LC_MESSAGES/foot.tmpl.po
-%dir %attr(0755,admin,admin) /home/e-smith
-%dir %attr(0755,root,root) /home/e-smith/db
-%dir %attr(0755,root,root) /home/e-smith/db/navigation
-%dir %attr(0755,root,root) /service
-/service/httpd-admin
-%doc COPYING
diff -Nur e-smith-manager-2.6.0.old/root/etc/e-smith/events/bootstrap-console-save/S50navigation-conf e-smith-manager-2.6.0/root/etc/e-smith/events/bootstrap-console-save/S50navigation-conf
--- e-smith-manager-2.6.0.old/root/etc/e-smith/events/bootstrap-console-save/S50navigation-conf 2008-10-07 13:36:17.000000000 -0400
+++ e-smith-manager-2.6.0/root/etc/e-smith/events/bootstrap-console-save/S50navigation-conf     1969-12-31 19:00:00.000000000 -0500
@@ -1,153 +0,0 @@
-#!/usr/bin/perl -w
-
-#----------------------------------------------------------------------
-# copyright (C) 1999-2006 Mitel Networks Corporation
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#              
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#              
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-# 
-#----------------------------------------------------------------------
-package esmith;
-
-use strict;
-
-use esmith::NavigationDB;
-use esmith::I18N;
-
-use constant WEBFUNCTIONS => '/etc/e-smith/web/functions';
-use constant NAVIGATIONDIR => '/home/e-smith/db/navigation';
-use constant NEW_NAVDIR => '/home/e-smith/db';
-
-my $navigation_ignore = 
-    "(\.\.?|navigation|noframes|online-manual|(internal|pleasewait)(-.*)?)";
-
-my $i18n = new esmith::I18N;
-
-my %navdbs;
-
-opendir FUNCTIONS, WEBFUNCTIONS or 
-    die "Couldn't open ", WEBFUNCTIONS, "\n";
-
-my @files = grep (!/^${navigation_ignore}$/, readdir (FUNCTIONS));
-my @langs = $i18n->availableLanguages(); 
-
-use XML::Parser;
-my $parser = new XML::Parser (Style => 'Tree',
-      ProtocolEncoding => 'UTF-8');
-
-foreach my $file (@files)
-{
-    next if (-d WEBFUNCTIONS . "/$file");
-    next unless (-x WEBFUNCTIONS . "/$file");
-
-    #-------------------------------------------------- 
-    # extract heading, description and weight information
-    # from CGI script
-    #-------------------------------------------------- 
-    open(SCRIPT, WEBFUNCTIONS . "/$file");
-    my $heading            = undef;
-    my $description        = undef;
-    my $heading_weight     = undef;
-    my $description_weight = undef;
-    while ( <SCRIPT> )
-    {
-       $heading = $1 if (/^\s*#\s*heading\s*:\s*(.+?)\s*$/);
-
-       $description = $1 
-           if (/^\s*#\s*description\s*:\s*(.+?)\s*$/);
-
-       ($heading_weight, $description_weight) = ($1, $2) 
-           if (/^\s*#\s*navigation\s*:\s*(\d+?)\s+(\d+?)\s*$/);
-
-       last if (defined $heading and 
-           defined $description and
-           defined $heading_weight and
-           defined $description_weight);
-    }
-    close SCRIPT;
-    foreach my $lang (@langs)
-    {
-#warn "updating script $file for lang $lang\n";
-       my $navdb = $navdbs{$lang};
-       my $navinfo = NAVIGATIONDIR . "/navigation.$lang";
-       $navdb ||= esmith::NavigationDB->open($navinfo);
-       $navdb ||= esmith::NavigationDB->create($navinfo) or
-           die "Couldn't create $navinfo\n";
-        $navdbs{$lang} ||= $navdb;
-       my $rec = $navdb->get($file) || 
-           $navdb->new_record($file, { type => 'panel' } );
-
-       my $lexicon = {};
-
-       foreach my $lfile ( "/etc/e-smith/locale/$lang/FormMagick/general",
-                           "/etc/e-smith/locale/$lang/etc/e-smith/web/functions/$file" )
-       {
-           if (-f $lfile)
-           {
-               # Do a quick and dirty parse of the lexicon file
-                my $xmlstr = "";
-                open(FILE, $lfile) or die "Couldn't open $lfile:\n$!";
-                binmode(FILE, ":utf8");
-                {
-                    local $^W = 0;
-                    while ( my $line = <FILE> ) {
-                        unless ( utf8::valid($line) ) {
-                            warn "$lfile not in UTF-8 format\n";
-                            utf8::encode($line);
-                        }
-                        $xmlstr .= $line;
-                    }
-                }
-                my $xml = $parser->parsestring($xmlstr);
-               my @lexicon = @{$xml->[1]};
-               shift @lexicon; # Remove lexicon attributes
-               while (@lexicon)
-               {
-                   my ($tag, $data) = splice(@lexicon, 0, 2);
-                   next unless $tag eq 'entry';
-                   my %entry_hash = ('attributes', @$data);
-                   my $base = $entry_hash{base};
-                   $base = @{$base}[2];
-                   my $trans = $entry_hash{trans};
-                   $trans = @{$trans}[2];
-                   next unless defined $base && defined $trans;
-                   $lexicon->{$base} = $trans;
-               }
-           }
-       }
-
-       my $loc_heading =  localise($lexicon, $heading);
-       $loc_heading =~ s/^\s*(\w.*?)\s*$/$1/;
-       my $loc_description =  localise($lexicon, $description);
-       $loc_description =~ s/^\s*(\w.*?)\s*$/$1/;
-       $rec->merge_props(
-           Heading => $loc_heading,
-           Description => $loc_description,
-           HeadingWeight => localise($lexicon, $heading_weight),
-           DescriptionWeight => localise($lexicon, $description_weight));
-    }
-}
-foreach my $lang (@langs)
-{
-#warn "trying to close for lang $lang\n";
-    my $navdb = $navdbs{$lang};
-    $navdb->close();
-}
-
-sub localise {
-    my ($lexicon, $string) = @_;
-    $string  = "" unless defined $string;
-    return $lexicon->{$string} || $string;
-}
-
diff -Nur e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_core.css/50body e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_core.css/50body
--- e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_core.css/50body 2006-03-15 16:59:54.000000000 -0500
+++ e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_core.css/50body     2016-06-23 08:13:57.000000000 -0400
@@ -137,7 +137,7 @@
 body.menu { 
     font-family: Verdana, Arial, Helvetica, sans-serif;
     font-size: 11px;
-    background-color: #eeeeee;
+    background-color: #e8f3e1;
 }
 
 td.section {
@@ -149,28 +149,28 @@
     font-family: Verdana, Arial, Helvetica, sans-serif;
     font-size: 11px;
     font-weight: bold;
-    background-color: #eeeeee;
+    background-color: #e8f3e1;
 }
 
 a.item { 
     color: #00008b;
     font-family: Verdana, Arial, Helvetica, sans-serif;
     font-size: 11px; 
-    background: #eeeeee; 
+    background: #e8f3e1; 
 }
 
 a.sl { 
     color: green;
     font-family: Verdana, Arial, Helvetica, sans-serif;
     font-size: 11px; 
-    background: #eeeeee; 
+    background: #e8f3e1; 
 }
 
 a.alert { 
     color: red;
     font-family: Verdana, Arial, Helvetica, sans-serif;
     font-size: 11px; 
-    background: #eeeeee; 
+    background: #e8f3e1; 
 }
 
 /* Core styles for use with sme_main.css */
diff -Nur e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_header.css/50body e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_header.css/50body
--- e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_header.css/50body       2006-03-15 16:59:54.000000000 -0500
+++ e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_header.css/50body   2016-06-23 08:14:45.000000000 -0400
@@ -79,7 +79,7 @@
  }
 
 a:hover { 
-    background: #eeeeee; 
+    background: #e8f3e1; 
     border-color: #000000 #000000 #000000 #000000; 
 }
 
diff -Nur e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_main.css/50body e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_main.css/50body
--- e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_main.css/50body 2013-01-31 16:31:37.000000000 -0500
+++ e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_main.css/50body     2016-06-22 07:06:47.000000000 -0400
@@ -63,7 +63,7 @@
 /*This special style is actually used only for the button row along the bottom of each page*/
 th.sme-layout {
     border: 1px solid #dddddd; 
-    background-color: #eeeeee;
+    background-color: #e8f3e1;
     font-family: Verdana, Arial, Helvetica, sans-serif;
     font-size: 9pt;
     font-weight: bold;
@@ -89,7 +89,7 @@
     /*width: 250px;*/
     text-align: right;
     /*vertical-align: top;*/
-    background-color: #eeeeee;
+    background-color: #e8f3e1;
     font-family: Verdana, Arial, Helvetica, sans-serif;
     font-size: 11px;
 }
@@ -138,7 +138,7 @@
 td.sme-border-center {text-align: center;}
 th.sme-border {
     border: 1px solid #cccccc; 
-    background-color: #dedfde;
+    background-color: #bee6a2;
     font-family: Verdana, Arial, Helvetica, sans-serif;
     font-size: 10px;
     font-weight: bold;
diff -Nur e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_menu.css/50body e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_menu.css/50body
--- e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_menu.css/50body 2006-03-15 16:59:54.000000000 -0500
+++ e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_menu.css/50body     2016-06-22 07:06:47.000000000 -0400
@@ -80,10 +80,10 @@
     font-family: Verdana, Arial, Helvetica, sans-serif;
     font-size: 10px; 
     color: black; 
-    background: #eeeeee; 
+    background: #e8f3e1; 
     text-decoration: none;
     text-align: left; 
-    border-color: #eeeeee; 
+    border-color: #e8f3e1; 
     margin-top: 0px; 
     margin-right: 0px; 
     margin-bottom: 0px; 
@@ -106,9 +106,9 @@
     font-family: Verdana, Arial, Helvetica, sans-serif;
     font-size: 10px; 
     color: black; 
-    background: #eeeeee; 
+    background: #e8f3e1; 
     text-decoration: none; 
-    border-color: #eeeeee; 
+    border-color: #e8f3e1; 
     margin-top: 0px; 
     margin-right: 0px; 
     margin-bottom: 0px; 
diff -Nur e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_panel_menu.css/50body e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_panel_menu.css/50body
--- e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_panel_menu.css/50body   2006-03-15 16:59:54.000000000 -0500
+++ e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_panel_menu.css/50body       2016-06-22 07:06:47.000000000 -0400
@@ -57,7 +57,7 @@
 }
 
 #navmenu a {
-    background : #E8EBF0;
+    background : #e8f0e8;
     border : 1px solid #ccc;
     color : #666;
     float : left;
diff -Nur e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/web/common/css/tkt.css/50body e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/tkt.css/50body
--- e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/web/common/css/tkt.css/50body      1969-12-31 19:00:00.000000000 -0500
+++ e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/tkt.css/50body  2016-06-22 07:44:23.000000000 -0400
@@ -0,0 +1,36 @@
+{
+    $OUT =<<'HERE';
+/* mod_auth_tkt example css */
+
+BODY {background-image: url(../smeserver_login.jpg);
+background-repeat: no-repeat;
+/*background-size: 600px 40px; */
+background-position: center top;
+font-family: arial, helvetica, sans-serif;
+font-size: small;
+}
+
+P, TH, TD {
+    font-family: arial, helvetica, sans-serif;
+    font-size: small;
+}
+
+H1, H2, H3, H4, H5, H6 { color: #006600; }
+H1 { font-size: x-large; }
+H2 { font-size: large; }
+H3 { font-size: medium; }
+
+.warning { color: #c00; font-size: medium; font-weight: bold; }
+
+TABLE {
+    background-color: #eee;
+    color: #666;
+    border: 1px solid #ccc;
+    padding: 20px;
+}
+
+
+/* arch-tag: ac35e093-c2c0-4994-bc18-2d25715b1192 */
+
+HERE
+}
diff -Nur e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/web/common/css/tkt.css/template-begin e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/tkt.css/template-begin
--- e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/web/common/css/tkt.css/template-begin      1969-12-31 19:00:00.000000000 -0500
+++ e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/tkt.css/template-begin  2016-06-23 08:05:36.000000000 -0400
@@ -0,0 +1 @@
+/* DO NOT MODIFY THIS FILE! It is updated automatically */
diff -Nur e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/30FrameSetup00 e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/30FrameSetup00
--- e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/30FrameSetup00        2007-01-26 20:51:30.000000000 -0500
+++ e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/30FrameSetup00    2016-06-23 08:20:49.000000000 -0400
@@ -2,7 +2,7 @@
     unless ($NO_FRAMES)
     \{
        $OUT .= <<EOF;
-  <link rev="made" href="mailto:bugs%40e-smith.com">
+  <link rev="made" href="mailto:bugs%40koozali.org">
   <meta name="copyright" content="(head.tmpl)Copyright 2003-2004 Mitel Corporation">
   <link rel="stylesheet" type="text/css" href="/server-common/css/sme_core.css">
   <style type="text/css"> 
diff -Nur e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15common e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15common
--- e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15common        2016-06-13 04:18:01.134000000 -0400
+++ e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15common    2016-07-19 09:03:46.683000000 -0400
@@ -12,15 +12,19 @@
 </Directory>
 
 <Directory "/etc/e-smith/web/common">
-    Options Indexes Includes
+    Options Includes
     AllowOverride None
     order deny,allow
     deny from all
     allow from all
+    <FilesMatch ".*\.tmpl">
+        Order allow,deny
+        Deny from all
+    </FilesMatch>
 </Directory>
 
 <Directory "/etc/e-smith/web/panels/manager/common">
-    Options Indexes Includes FollowSymLinks
+    Options Includes FollowSymLinks
     AllowOverride None
     order deny,allow
     deny from all
diff -Nur e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20manager e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20manager
--- e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20manager       2016-06-13 04:18:01.134000000 -0400
+++ e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20manager   2016-07-19 09:03:46.683000000 -0400
@@ -4,7 +4,7 @@
 #------------------------------------------------------------
 
 <Directory "/etc/e-smith/web/panels/manager/html" >
-    Options Includes Indexes FollowSymLinks ExecCGI
+    Options Includes FollowSymLinks ExecCGI
     AllowOverride None
     order deny,allow
     deny from all
@@ -19,7 +19,7 @@
 </Directory>
 
 <Directory "/etc/e-smith/web/panels/manager/cgi-bin">
-    Options Includes Indexes FollowSymLinks ExecCGI
+    Options Includes FollowSymLinks ExecCGI
     AllowOverride None
     order deny,allow
     deny from all
diff -Nur e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27ManagerProxyPass e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27ManagerProxyPass
--- e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27ManagerProxyPass      2016-06-13 04:18:01.130000000 -0400
+++ e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27ManagerProxyPass  2016-07-19 09:03:46.681000000 -0400
@@ -14,6 +14,11 @@
             $OUT .= '    RewriteCond %{REMOTE_ADDR} !^127\.0\.0\.1$' . "\n";
             $OUT .= "    RewriteRule ^/$place(/.*|\$)    https://%{HTTP_HOST}/$place\$1 [L,R]\n";
         }
+       if ($port eq $sslPort)
+       {
+            # mod_auth_tkt needs to know the protocol to write  307 redirection
+           $OUT .= "    RequestHeader set X-Forwarded-Proto \"https\"\n";
+       }
         $OUT .= "    ProxyPass /$place http://127.0.0.1:${'httpd-admin'}{TCPPort}/$place\n";
         $OUT .= "    ProxyPassReverse /$place http://127.0.0.1:${'httpd-admin'}{TCPPort}/$place\n";
 
diff -Nur e-smith-manager-2.6.0.old/root/etc/e-smith/web/common/cgi-bin/login e-smith-manager-2.6.0/root/etc/e-smith/web/common/cgi-bin/login
--- e-smith-manager-2.6.0.old/root/etc/e-smith/web/common/cgi-bin/login 2016-06-13 04:18:01.132000000 -0400
+++ e-smith-manager-2.6.0/root/etc/e-smith/web/common/cgi-bin/login     2016-07-19 09:09:58.116000000 -0400
@@ -276,6 +276,7 @@
 <div align="center">
 <p>&nbsp;</p>
 <p>&nbsp;</p>
+<p>&nbsp;</p>
 <h2>Welcome to SME server</h2>
 EOD
 
diff -Nur e-smith-manager-2.6.0.old/root/etc/e-smith/web/panels/manager/cgi-bin/navigation e-smith-manager-2.6.0/root/etc/e-smith/web/panels/manager/cgi-bin/navigation
--- e-smith-manager-2.6.0.old/root/etc/e-smith/web/panels/manager/cgi-bin/navigation    2008-10-07 13:36:17.000000000 -0400
+++ e-smith-manager-2.6.0/root/etc/e-smith/web/panels/manager/cgi-bin/navigation        1969-12-31 19:00:00.000000000 -0500
@@ -1,340 +0,0 @@
-#!/usr/bin/perl -wT
-
-#----------------------------------------------------------------------
-# e-smith manager functions: navigation
-#
-# copyright (C) 2002 Mitel Networks Corporation
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#              
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#              
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-# 
-# Technical support for this program is available from Mitel Networks 
-# Please visit our web site www.e-smith.com for details.
-#----------------------------------------------------------------------
-package esmith;
-
-use strict;
-use CGI ':no_xhtml', ':all';
-use CGI::Carp qw(fatalsToBrowser);
-
-use esmith::cgi;
-use esmith::config;
-use esmith::NavigationDB;
-use esmith::util;
-use esmith::I18N;
-
-sub determineGroup;
-sub showNavigation ($);
-
-BEGIN
-{
-    # Clear PATH and related environment variables so that calls to
-    # external programs do not cause results to be tainted. See
-    # "perlsec" manual page for details.
-
-    $ENV {'PATH'} = '';
-    $ENV {'SHELL'} = '/bin/bash';
-    delete $ENV {'ENV'};
-}
-
-esmith::util::setRealToEffective ();
-
-$CGI::POST_MAX=1024 * 100;  # max 100K posts
-$CGI::DISABLE_UPLOADS = 1;  # no uploads
-
-# Use the one script for navigation and noframes
-my $NO_FRAMES = ($0 =~ /noframes/);
-
-my %conf;
-tie %conf, 'esmith::config';
-
-my $q = new CGI;
-
-showNavigation ($q);
-exit (0);
-
-
-#------------------------------------------------------
-# subroutine to determine which group a user belongs to
-#------------------------------------------------------
-
-sub determineGroup
-{
-       my ($user) = shift;
-
-       # Group file for authentication
-       my $group_file = '/etc/group';
-       open ( GF, $group_file )
-           or die "Cannot open group file: $group_file: $!\n";
-
-       # list of groups this user belongs to
-       my @groupList;
-       while (<GF>) 
-       {
-               if (/[:,]$user\b/) 
-               {
-                       my ($groupName, undef) = split(/:/);
-                       push @groupList, $groupName;
-               }
-       }
-       close GF;       
-       return @groupList;
-}
-
-#------------------------------------------------------------
-# subroutine to display navigation bar
-#------------------------------------------------------------
-
-sub showNavigation ($)
-{
-    my $q = shift;
- 
-    # enable utf8 binmode so new translations work
-    binmode STDOUT, ":utf8";
-
-    # Use this variable throughout to keep track of files
-    # list of just the files
-    my $c = "1";
-    my @files = ();
-    my %files_hash = ();
-    my @panel_group = $ENV{'REMOTE_USER'} eq "admin" ?
-       ("admin") : determineGroup($ENV{'REMOTE_USER'});
-       
-    #-----------------------------------------------------
-    # Determine the directory where the functions are kept
-    #----------------------------------------------------- 
-       
-    my $navigation_ignore = 
-       "(\.\.?|navigation|noframes|online-manual|(internal|pleasewait)(-.*)?)";
-
-    my $cgidir = 'nowhere';
-    if ($panel_group[0] eq 'admin')
-    {
-       $cgidir = '/etc/e-smith/web/panels/manager/cgi-bin/';
-
-       if (opendir (DIR, $cgidir))
-       {
-           @files = grep (!/^${navigation_ignore}$/,
-               readdir (DIR));
-           closedir (DIR);
-       }
-       else
-       {
-           warn "Can't open directory $cgidir\n";
-       }
-
-       foreach my $file (@files)
-       {
-           next if (-d "$cgidir/$file");
-           $files_hash{$file} = $cgidir;
-       }
-    }
-    else
-    {
-       foreach my $panel (@panel_group)
-       {
-           $cgidir = "/etc/e-smith/web/panels/manager/$panel/cgi-bin";
-
-           if (opendir (DIR, $cgidir))
-           {
-               @files = grep (!/^${navigation_ignore}$/,
-                   readdir (DIR));
-               closedir (DIR);
-               foreach my $file (@files)
-               {
-                   next if (-d "$cgidir/$file");
-                   $files_hash{$file} = $cgidir;
-               }
-           }
-           else
-           {
-               warn "Can't open directory $cgidir\n";
-           }
-       }
-    }
-
-    #-------------------------------------------------- 
-    # For each script, extract the description and category
-    # information. Build up an associative array mapping headings
-    # to heading structures. Each heading structure contains the
-    # total weight for the heading, the number of times the heading
-    # has been encountered, and another associative array mapping
-    # descriptions to description structures. Each description
-    # structure contains the filename of the particular cgi script
-    # and a weight.
-    #-------------------------------------------------- 
-    my %nav = ();
-
-    use constant NAVIGATIONDIR => '/home/e-smith/db/navigation';
-    use constant WEBFUNCTIONS  => '/etc/e-smith/web/functions';
-
-    my $i18n = new esmith::I18N;
-
-    my $language = $i18n->preferredLanguage( $ENV{HTTP_ACCEPT_LANGUAGE} );
-
-    my $navinfo = NAVIGATIONDIR . "/navigation.$language";
-
-    my $navdb = esmith::NavigationDB->open_ro( $navinfo ) or
-       die "Couldn't open $navinfo\n";
-
-    # Check the navdb for anything with a UrlPath, which means that it doesn't
-    # have a cgi file to be picked up by the above code. Ideally, only pages
-    # that exist should be in the db, but that's not the case. Anything
-    # without a cgi file will have to remove themselves on uninstall from the
-    # navigation dbs.
-    foreach my $rec ($navdb->get_all)
-    {
-       if ($rec->prop('UrlPath'))
-       {
-           $files_hash{$rec->{key}} = $cgidir;
-       }
-    }
-
-    foreach my $file (keys %files_hash)
-    {
-       my $heading = 'Unknown';
-       my $description = $file;
-       my $headingWeight = 99999;
-       my $descriptionWeight = 99999;
-       my $urlpath = '';
-
-       my $rec = $navdb->get($file);
-
-       if (defined $rec)
-       {
-           $heading = $rec->prop('Heading');
-           $description = $rec->prop('Description');
-           $headingWeight = $rec->prop('HeadingWeight');
-           $descriptionWeight = $rec->prop('DescriptionWeight');
-           $urlpath = $rec->prop('UrlPath') || '';
-       }
-
-       #-------------------------------------------------- 
-       # add heading, description and weight information to data structure
-       #-------------------------------------------------- 
-
-       unless (exists $nav {$heading})
-       {
-           $nav {$heading} = { COUNT => 0, WEIGHT => 0, DESCRIPTIONS => [] };
-       }
-
-       $nav {$heading} {'COUNT'} ++;
-       $nav {$heading} {'WEIGHT'} += $headingWeight;
-
-       # Check for manager panel, and assign the appropriate
-       #  cgi-bin prefix for the links.
-       # Grab the last 2 directories by splitting for '/'s and
-       #  then concatenating the last 2
-       # probably a better way, but I don't know it.
-       my @filename = split /\//, $files_hash{$file};
-       my $path = ($cgidir eq '/etc/e-smith/web/panels/manager/cgi-bin/') ? 
-           "/$filename[scalar @filename - 1]" : 
-           "/$filename[scalar @filename - 2]/$filename[scalar @filename - 1]";
-       
-       push @{ $nav {$heading} {'DESCRIPTIONS'} },
-               { DESCRIPTION => $description,
-                 WEIGHT => $descriptionWeight, 
-                 FILENAME => $urlpath ? $urlpath : "$path/$file",
-                 CGIPATH => $path
-               };
-    }
-
-    #-------------------------------------------------- 
-    # generate list of headings sorted by average weight
-    #-------------------------------------------------- 
-    if ( $NO_FRAMES )
-    {
-       esmith::cgi::genNoframesHeader ($q);
-    }
-    else
-    {
-        esmith::cgi::genNavigationHeader ($q, undef);
-       print "\n<TABLE BORDER=\"0\" CELLSPACING=\"0\" CELLPADDING=\"0\">\n";
-    }
-
-  print '<script language="JavaScript" type="text/javascript">
-  <!-- Hide script
-  //This swap the class of the selected item.
-    function swapClass() {
-    var i,x,tB,j=0,tA=new Array(),arg=swapClass.arguments;
-    if(document.getElementsByTagName){for(i=4;i<arg.length;i++){tB=document.getElementsByTagName(arg[i]);
-    for(x=0;x<tB.length;x++){tA[j]=tB[x];j++;}}for(i=0;i<tA.length;i++){
-    if(tA[i].className){if(tA[i].id==arg[1]){if(arg[0]==1){
-    tA[i].className=(tA[i].className==arg[3])?arg[2]:arg[3];}else{tA[i].className=arg[2];}
-    }else if(arg[0]==1 && arg[1]==\'none\'){if(tA[i].className==arg[2] || tA[i].className==arg[3]){
-    tA[i].className=(tA[i].className==arg[3])?arg[2]:arg[3];}
-    }else if(tA[i].className==arg[2]){tA[i].className=arg[3];}}}}}
-    ';
-    print "
-  //This swap the class of the selected item.
-    function swapClasses() {
-    var arg=swapClasses.arguments;
-    swapClass(0,'none','item-current','item','a');
-    swapClass(0,'none','warn-current','warn','a');
-    swapClass(0,arg[0],'item-current','item','a');
-    }
-
-    // End script hiding -->
-    </script>
-    ";
-
-    foreach my $h (sort {
-        ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) <=>
-       ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav)
-    {
-        if ( $NO_FRAMES )
-       {
-           print $q->h2 ($h);
-       }
-       else
-       {
-           print "\n", $q->Tr ($q->td({class => "section"},$q->span({class => "section"}, $h)));
-       }
-
-       #-------------------------------------------------- 
-       # generate list of descriptions sorted by weight
-       #-------------------------------------------------- 
-        print "<ul>\n" if ( $NO_FRAMES );
-
-       foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} }  @{$nav {$h}{'DESCRIPTIONS'}})
-       {
-           my $href = "/server-manager" .  $_->{'FILENAME'};
-           if ( $NO_FRAMES )
-           {
-               print $q->li ($q->a ({href => "$href?noframes=1"}, $_->{'DESCRIPTION'}));
-           }
-           else
-           {
-               print "\n",$q->Tr(
-                            $q->td ({-class => "menu-cell"},
-                                    $q->a ({-id => "sme$c",
-                                            -class => "item",
-                                            -onClick => "swapClasses('sme$c')",
-                                            href => $href, 
-                                            target => 'main'}, 
-                                        $_->{'DESCRIPTION'})
-                                    ));
-                        }
-                        $c++;
-                        
-       }
-        print "</ul>\n" if ($NO_FRAMES);
-    }
-
-    unless ( $NO_FRAMES )
-    {
-       print "\n</TABLE>\n";
-        esmith::cgi::genNavigationFooter ($q);
-    }
-}
diff -Nur e-smith-manager-2.6.0.old/root/etc/e-smith/web/panels/manager/cgi-bin/noframes e-smith-manager-2.6.0/root/etc/e-smith/web/panels/manager/cgi-bin/noframes
--- e-smith-manager-2.6.0.old/root/etc/e-smith/web/panels/manager/cgi-bin/noframes      2008-10-07 13:36:17.000000000 -0400
+++ e-smith-manager-2.6.0/root/etc/e-smith/web/panels/manager/cgi-bin/noframes  1969-12-31 19:00:00.000000000 -0500
@@ -1,340 +0,0 @@
-#!/usr/bin/perl -wT
-
-#----------------------------------------------------------------------
-# e-smith manager functions: navigation
-#
-# copyright (C) 2002 Mitel Networks Corporation
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#              
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#              
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-# 
-# Technical support for this program is available from Mitel Networks 
-# Please visit our web site www.e-smith.com for details.
-#----------------------------------------------------------------------
-package esmith;
-
-use strict;
-use CGI ':no_xhtml', ':all';
-use CGI::Carp qw(fatalsToBrowser);
-
-use esmith::cgi;
-use esmith::config;
-use esmith::NavigationDB;
-use esmith::util;
-use esmith::I18N;
-
-sub determineGroup;
-sub showNavigation ($);
-
-BEGIN
-{
-    # Clear PATH and related environment variables so that calls to
-    # external programs do not cause results to be tainted. See
-    # "perlsec" manual page for details.
-
-    $ENV {'PATH'} = '';
-    $ENV {'SHELL'} = '/bin/bash';
-    delete $ENV {'ENV'};
-}
-
-esmith::util::setRealToEffective ();
-
-$CGI::POST_MAX=1024 * 100;  # max 100K posts
-$CGI::DISABLE_UPLOADS = 1;  # no uploads
-
-# Use the one script for navigation and noframes
-my $NO_FRAMES = ($0 =~ /noframes/);
-
-my %conf;
-tie %conf, 'esmith::config';
-
-my $q = new CGI;
-
-showNavigation ($q);
-exit (0);
-
-
-#------------------------------------------------------
-# subroutine to determine which group a user belongs to
-#------------------------------------------------------
-
-sub determineGroup
-{
-       my ($user) = shift;
-
-       # Group file for authentication
-       my $group_file = '/etc/group';
-       open ( GF, $group_file )
-           or die "Cannot open group file: $group_file: $!\n";
-
-       # list of groups this user belongs to
-       my @groupList;
-       while (<GF>) 
-       {
-               if (/[:,]$user\b/) 
-               {
-                       my ($groupName, undef) = split(/:/);
-                       push @groupList, $groupName;
-               }
-       }
-       close GF;       
-       return @groupList;
-}
-
-#------------------------------------------------------------
-# subroutine to display navigation bar
-#------------------------------------------------------------
-
-sub showNavigation ($)
-{
-    my $q = shift;
- 
-    # enable utf8 binmode so new translations work
-    binmode STDOUT, ":utf8";
-
-    # Use this variable throughout to keep track of files
-    # list of just the files
-    my $c = "1";
-    my @files = ();
-    my %files_hash = ();
-    my @panel_group = $ENV{'REMOTE_USER'} eq "admin" ?
-       ("admin") : determineGroup($ENV{'REMOTE_USER'});
-       
-    #-----------------------------------------------------
-    # Determine the directory where the functions are kept
-    #----------------------------------------------------- 
-       
-    my $navigation_ignore = 
-       "(\.\.?|navigation|noframes|online-manual|(internal|pleasewait)(-.*)?)";
-
-    my $cgidir = 'nowhere';
-    if ($panel_group[0] eq 'admin')
-    {
-       $cgidir = '/etc/e-smith/web/panels/manager/cgi-bin/';
-
-       if (opendir (DIR, $cgidir))
-       {
-           @files = grep (!/^${navigation_ignore}$/,
-               readdir (DIR));
-           closedir (DIR);
-       }
-       else
-       {
-           warn "Can't open directory $cgidir\n";
-       }
-
-       foreach my $file (@files)
-       {
-           next if (-d "$cgidir/$file");
-           $files_hash{$file} = $cgidir;
-       }
-    }
-    else
-    {
-       foreach my $panel (@panel_group)
-       {
-           $cgidir = "/etc/e-smith/web/panels/manager/$panel/cgi-bin";
-
-           if (opendir (DIR, $cgidir))
-           {
-               @files = grep (!/^${navigation_ignore}$/,
-                   readdir (DIR));
-               closedir (DIR);
-               foreach my $file (@files)
-               {
-                   next if (-d "$cgidir/$file");
-                   $files_hash{$file} = $cgidir;
-               }
-           }
-           else
-           {
-               warn "Can't open directory $cgidir\n";
-           }
-       }
-    }
-
-    #-------------------------------------------------- 
-    # For each script, extract the description and category
-    # information. Build up an associative array mapping headings
-    # to heading structures. Each heading structure contains the
-    # total weight for the heading, the number of times the heading
-    # has been encountered, and another associative array mapping
-    # descriptions to description structures. Each description
-    # structure contains the filename of the particular cgi script
-    # and a weight.
-    #-------------------------------------------------- 
-    my %nav = ();
-
-    use constant NAVIGATIONDIR => '/home/e-smith/db/navigation';
-    use constant WEBFUNCTIONS  => '/etc/e-smith/web/functions';
-
-    my $i18n = new esmith::I18N;
-
-    my $language = $i18n->preferredLanguage( $ENV{HTTP_ACCEPT_LANGUAGE} );
-
-    my $navinfo = NAVIGATIONDIR . "/navigation.$language";
-
-    my $navdb = esmith::NavigationDB->open_ro( $navinfo ) or
-       die "Couldn't open $navinfo\n";
-
-    # Check the navdb for anything with a UrlPath, which means that it doesn't
-    # have a cgi file to be picked up by the above code. Ideally, only pages
-    # that exist should be in the db, but that's not the case. Anything
-    # without a cgi file will have to remove themselves on uninstall from the
-    # navigation dbs.
-    foreach my $rec ($navdb->get_all)
-    {
-       if ($rec->prop('UrlPath'))
-       {
-           $files_hash{$rec->{key}} = $cgidir;
-       }
-    }
-
-    foreach my $file (keys %files_hash)
-    {
-       my $heading = 'Unknown';
-       my $description = $file;
-       my $headingWeight = 99999;
-       my $descriptionWeight = 99999;
-       my $urlpath = '';
-
-       my $rec = $navdb->get($file);
-
-       if (defined $rec)
-       {
-           $heading = $rec->prop('Heading');
-           $description = $rec->prop('Description');
-           $headingWeight = $rec->prop('HeadingWeight');
-           $descriptionWeight = $rec->prop('DescriptionWeight');
-           $urlpath = $rec->prop('UrlPath') || '';
-       }
-
-       #-------------------------------------------------- 
-       # add heading, description and weight information to data structure
-       #-------------------------------------------------- 
-
-       unless (exists $nav {$heading})
-       {
-           $nav {$heading} = { COUNT => 0, WEIGHT => 0, DESCRIPTIONS => [] };
-       }
-
-       $nav {$heading} {'COUNT'} ++;
-       $nav {$heading} {'WEIGHT'} += $headingWeight;
-
-       # Check for manager panel, and assign the appropriate
-       #  cgi-bin prefix for the links.
-       # Grab the last 2 directories by splitting for '/'s and
-       #  then concatenating the last 2
-       # probably a better way, but I don't know it.
-       my @filename = split /\//, $files_hash{$file};
-       my $path = ($cgidir eq '/etc/e-smith/web/panels/manager/cgi-bin/') ? 
-           "/$filename[scalar @filename - 1]" : 
-           "/$filename[scalar @filename - 2]/$filename[scalar @filename - 1]";
-       
-       push @{ $nav {$heading} {'DESCRIPTIONS'} },
-               { DESCRIPTION => $description,
-                 WEIGHT => $descriptionWeight, 
-                 FILENAME => $urlpath ? $urlpath : "$path/$file",
-                 CGIPATH => $path
-               };
-    }
-
-    #-------------------------------------------------- 
-    # generate list of headings sorted by average weight
-    #-------------------------------------------------- 
-    if ( $NO_FRAMES )
-    {
-       esmith::cgi::genNoframesHeader ($q);
-    }
-    else
-    {
-        esmith::cgi::genNavigationHeader ($q, undef);
-       print "\n<TABLE BORDER=\"0\" CELLSPACING=\"0\" CELLPADDING=\"0\">\n";
-    }
-
-  print '<script language="JavaScript" type="text/javascript">
-  <!-- Hide script
-  //This swap the class of the selected item.
-    function swapClass() {
-    var i,x,tB,j=0,tA=new Array(),arg=swapClass.arguments;
-    if(document.getElementsByTagName){for(i=4;i<arg.length;i++){tB=document.getElementsByTagName(arg[i]);
-    for(x=0;x<tB.length;x++){tA[j]=tB[x];j++;}}for(i=0;i<tA.length;i++){
-    if(tA[i].className){if(tA[i].id==arg[1]){if(arg[0]==1){
-    tA[i].className=(tA[i].className==arg[3])?arg[2]:arg[3];}else{tA[i].className=arg[2];}
-    }else if(arg[0]==1 && arg[1]==\'none\'){if(tA[i].className==arg[2] || tA[i].className==arg[3]){
-    tA[i].className=(tA[i].className==arg[3])?arg[2]:arg[3];}
-    }else if(tA[i].className==arg[2]){tA[i].className=arg[3];}}}}}
-    ';
-    print "
-  //This swap the class of the selected item.
-    function swapClasses() {
-    var arg=swapClasses.arguments;
-    swapClass(0,'none','item-current','item','a');
-    swapClass(0,'none','warn-current','warn','a');
-    swapClass(0,arg[0],'item-current','item','a');
-    }
-
-    // End script hiding -->
-    </script>
-    ";
-
-    foreach my $h (sort {
-        ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) <=>
-       ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav)
-    {
-        if ( $NO_FRAMES )
-       {
-           print $q->h2 ($h);
-       }
-       else
-       {
-           print "\n", $q->Tr ($q->td({class => "section"},$q->span({class => "section"}, $h)));
-       }
-
-       #-------------------------------------------------- 
-       # generate list of descriptions sorted by weight
-       #-------------------------------------------------- 
-        print "<ul>\n" if ( $NO_FRAMES );
-
-       foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} }  @{$nav {$h}{'DESCRIPTIONS'}})
-       {
-           my $href = "/server-manager" .  $_->{'FILENAME'};
-           if ( $NO_FRAMES )
-           {
-               print $q->li ($q->a ({href => "$href?noframes=1"}, $_->{'DESCRIPTION'}));
-           }
-           else
-           {
-               print "\n",$q->Tr(
-                            $q->td ({-class => "menu-cell"},
-                                    $q->a ({-id => "sme$c",
-                                            -class => "item",
-                                            -onClick => "swapClasses('sme$c')",
-                                            href => $href, 
-                                            target => 'main'}, 
-                                        $_->{'DESCRIPTION'})
-                                    ));
-                        }
-                        $c++;
-                        
-       }
-        print "</ul>\n" if ($NO_FRAMES);
-    }
-
-    unless ( $NO_FRAMES )
-    {
-       print "\n</TABLE>\n";
-        esmith::cgi::genNavigationFooter ($q);
-    }
-}
diff -Nur e-smith-manager-2.6.0.old/root/etc/e-smith/web/panels/manager/html/index.cgi e-smith-manager-2.6.0/root/etc/e-smith/web/panels/manager/html/index.cgi
--- e-smith-manager-2.6.0.old/root/etc/e-smith/web/panels/manager/html/index.cgi        2006-11-02 11:38:41.000000000 -0500
+++ e-smith-manager-2.6.0/root/etc/e-smith/web/panels/manager/html/index.cgi    1969-12-31 19:00:00.000000000 -0500
@@ -1,36 +0,0 @@
-#!/usr/bin/perl -wT
-
-#----------------------------------------------------------------------
-# copyright (C) 1999-2006 Mitel Networks Corporation
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#              
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#              
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-# 
-#----------------------------------------------------------------------
-
-use strict;
-use esmith::FormMagick;
-
-my $fm = new esmith::FormMagick;
-$fm->display();
-
-exit 0;
-
-__DATA__
-<form title="FORM_TITLE" header="/etc/e-smith/web/common/noframes_head.tmpl" footer="/etc/e-smith/web/common/noframes_foot.tmpl">
-    <page name="First">
-        <description>NOFRAMES_BODY</description>
-    </page>
- 
-</form>
diff -Nur e-smith-manager-2.6.0.old/root/etc/e-smith/web/panels/manager/html/initial.cgi e-smith-manager-2.6.0/root/etc/e-smith/web/panels/manager/html/initial.cgi
--- e-smith-manager-2.6.0.old/root/etc/e-smith/web/panels/manager/html/initial.cgi      2006-11-02 11:38:41.000000000 -0500
+++ e-smith-manager-2.6.0/root/etc/e-smith/web/panels/manager/html/initial.cgi  1969-12-31 19:00:00.000000000 -0500
@@ -1,36 +0,0 @@
-#!/usr/bin/perl -wT
-
-#----------------------------------------------------------------------
-# copyright (C) 1999-2006 Mitel Networks Corporation
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#              
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#              
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-# 
-#----------------------------------------------------------------------
-use strict;
-use esmith::FormMagick;
-
-my $fm = new esmith::FormMagick;
-
-$fm->display();
-
-exit 0;
-
-__DATA__
-<form title="FORM_TITLE" header="/etc/e-smith/web/common/head.tmpl" footer="/etc/e-smith/web/common/foot.tmpl">
-    <page name="First">
-        <description>FRAMES_BODY</description>
-    </page>
-  
-</form>
diff -Nur e-smith-manager-2.6.0.old/root/usr/share/locale/en_US/LC_MESSAGES/foot.tmpl.po e-smith-manager-2.6.0/root/usr/share/locale/en_US/LC_MESSAGES/foot.tmpl.po
--- e-smith-manager-2.6.0.old/root/usr/share/locale/en_US/LC_MESSAGES/foot.tmpl.po      2016-06-13 04:18:01.270000000 -0400
+++ e-smith-manager-2.6.0/root/usr/share/locale/en_US/LC_MESSAGES/foot.tmpl.po  1969-12-31 19:00:00.000000000 -0500
@@ -1,22 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-13 04:18-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: root/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/25Copyright:7
-msgid "All rights reserved."
-msgstr ""