/[smeserver]/rpms/e-smith-manager/sme9/e-smith-manager-2.6.0-Koozali_manager.patch
ViewVC logotype

Annotation of /rpms/e-smith-manager/sme9/e-smith-manager-2.6.0-Koozali_manager.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Tue Jul 19 13:12:36 2016 UTC (8 years, 3 months ago) by unnilennium
Branch: MAIN
CVS Tags: e-smith-manager-2_6_0-10_el6_sme
* Tue Jul 19 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-10.sme
- Update server-manager to Koozali branding [SME: 9678]
- We thanks John Crisp for his wonderful work.
- e-smith-manager-2.6.0-Koozali_manager.patch

1 unnilennium 1.1 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
2     --- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/COPYING 2002-03-01 13:33:07.000000000 -0500
3     +++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/COPYING 1969-12-31 19:00:00.000000000 -0500
4     @@ -1,340 +0,0 @@
5     - GNU GENERAL PUBLIC LICENSE
6     - Version 2, June 1991
7     -
8     - Copyright (C) 1989, 1991 Free Software Foundation, Inc.
9     - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
10     - Everyone is permitted to copy and distribute verbatim copies
11     - of this license document, but changing it is not allowed.
12     -
13     - Preamble
14     -
15     - The licenses for most software are designed to take away your
16     -freedom to share and change it. By contrast, the GNU General Public
17     -License is intended to guarantee your freedom to share and change free
18     -software--to make sure the software is free for all its users. This
19     -General Public License applies to most of the Free Software
20     -Foundation's software and to any other program whose authors commit to
21     -using it. (Some other Free Software Foundation software is covered by
22     -the GNU Library General Public License instead.) You can apply it to
23     -your programs, too.
24     -
25     - When we speak of free software, we are referring to freedom, not
26     -price. Our General Public Licenses are designed to make sure that you
27     -have the freedom to distribute copies of free software (and charge for
28     -this service if you wish), that you receive source code or can get it
29     -if you want it, that you can change the software or use pieces of it
30     -in new free programs; and that you know you can do these things.
31     -
32     - To protect your rights, we need to make restrictions that forbid
33     -anyone to deny you these rights or to ask you to surrender the rights.
34     -These restrictions translate to certain responsibilities for you if you
35     -distribute copies of the software, or if you modify it.
36     -
37     - For example, if you distribute copies of such a program, whether
38     -gratis or for a fee, you must give the recipients all the rights that
39     -you have. You must make sure that they, too, receive or can get the
40     -source code. And you must show them these terms so they know their
41     -rights.
42     -
43     - We protect your rights with two steps: (1) copyright the software, and
44     -(2) offer you this license which gives you legal permission to copy,
45     -distribute and/or modify the software.
46     -
47     - Also, for each author's protection and ours, we want to make certain
48     -that everyone understands that there is no warranty for this free
49     -software. If the software is modified by someone else and passed on, we
50     -want its recipients to know that what they have is not the original, so
51     -that any problems introduced by others will not reflect on the original
52     -authors' reputations.
53     -
54     - Finally, any free program is threatened constantly by software
55     -patents. We wish to avoid the danger that redistributors of a free
56     -program will individually obtain patent licenses, in effect making the
57     -program proprietary. To prevent this, we have made it clear that any
58     -patent must be licensed for everyone's free use or not licensed at all.
59     -
60     - The precise terms and conditions for copying, distribution and
61     -modification follow.
62     -
63     - GNU GENERAL PUBLIC LICENSE
64     - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
65     -
66     - 0. This License applies to any program or other work which contains
67     -a notice placed by the copyright holder saying it may be distributed
68     -under the terms of this General Public License. The "Program", below,
69     -refers to any such program or work, and a "work based on the Program"
70     -means either the Program or any derivative work under copyright law:
71     -that is to say, a work containing the Program or a portion of it,
72     -either verbatim or with modifications and/or translated into another
73     -language. (Hereinafter, translation is included without limitation in
74     -the term "modification".) Each licensee is addressed as "you".
75     -
76     -Activities other than copying, distribution and modification are not
77     -covered by this License; they are outside its scope. The act of
78     -running the Program is not restricted, and the output from the Program
79     -is covered only if its contents constitute a work based on the
80     -Program (independent of having been made by running the Program).
81     -Whether that is true depends on what the Program does.
82     -
83     - 1. You may copy and distribute verbatim copies of the Program's
84     -source code as you receive it, in any medium, provided that you
85     -conspicuously and appropriately publish on each copy an appropriate
86     -copyright notice and disclaimer of warranty; keep intact all the
87     -notices that refer to this License and to the absence of any warranty;
88     -and give any other recipients of the Program a copy of this License
89     -along with the Program.
90     -
91     -You may charge a fee for the physical act of transferring a copy, and
92     -you may at your option offer warranty protection in exchange for a fee.
93     -
94     - 2. You may modify your copy or copies of the Program or any portion
95     -of it, thus forming a work based on the Program, and copy and
96     -distribute such modifications or work under the terms of Section 1
97     -above, provided that you also meet all of these conditions:
98     -
99     - a) You must cause the modified files to carry prominent notices
100     - stating that you changed the files and the date of any change.
101     -
102     - b) You must cause any work that you distribute or publish, that in
103     - whole or in part contains or is derived from the Program or any
104     - part thereof, to be licensed as a whole at no charge to all third
105     - parties under the terms of this License.
106     -
107     - c) If the modified program normally reads commands interactively
108     - when run, you must cause it, when started running for such
109     - interactive use in the most ordinary way, to print or display an
110     - announcement including an appropriate copyright notice and a
111     - notice that there is no warranty (or else, saying that you provide
112     - a warranty) and that users may redistribute the program under
113     - these conditions, and telling the user how to view a copy of this
114     - License. (Exception: if the Program itself is interactive but
115     - does not normally print such an announcement, your work based on
116     - the Program is not required to print an announcement.)
117     -
118     -These requirements apply to the modified work as a whole. If
119     -identifiable sections of that work are not derived from the Program,
120     -and can be reasonably considered independent and separate works in
121     -themselves, then this License, and its terms, do not apply to those
122     -sections when you distribute them as separate works. But when you
123     -distribute the same sections as part of a whole which is a work based
124     -on the Program, the distribution of the whole must be on the terms of
125     -this License, whose permissions for other licensees extend to the
126     -entire whole, and thus to each and every part regardless of who wrote it.
127     -
128     -Thus, it is not the intent of this section to claim rights or contest
129     -your rights to work written entirely by you; rather, the intent is to
130     -exercise the right to control the distribution of derivative or
131     -collective works based on the Program.
132     -
133     -In addition, mere aggregation of another work not based on the Program
134     -with the Program (or with a work based on the Program) on a volume of
135     -a storage or distribution medium does not bring the other work under
136     -the scope of this License.
137     -
138     - 3. You may copy and distribute the Program (or a work based on it,
139     -under Section 2) in object code or executable form under the terms of
140     -Sections 1 and 2 above provided that you also do one of the following:
141     -
142     - a) Accompany it with the complete corresponding machine-readable
143     - source code, which must be distributed under the terms of Sections
144     - 1 and 2 above on a medium customarily used for software interchange; or,
145     -
146     - b) Accompany it with a written offer, valid for at least three
147     - years, to give any third party, for a charge no more than your
148     - cost of physically performing source distribution, a complete
149     - machine-readable copy of the corresponding source code, to be
150     - distributed under the terms of Sections 1 and 2 above on a medium
151     - customarily used for software interchange; or,
152     -
153     - c) Accompany it with the information you received as to the offer
154     - to distribute corresponding source code. (This alternative is
155     - allowed only for noncommercial distribution and only if you
156     - received the program in object code or executable form with such
157     - an offer, in accord with Subsection b above.)
158     -
159     -The source code for a work means the preferred form of the work for
160     -making modifications to it. For an executable work, complete source
161     -code means all the source code for all modules it contains, plus any
162     -associated interface definition files, plus the scripts used to
163     -control compilation and installation of the executable. However, as a
164     -special exception, the source code distributed need not include
165     -anything that is normally distributed (in either source or binary
166     -form) with the major components (compiler, kernel, and so on) of the
167     -operating system on which the executable runs, unless that component
168     -itself accompanies the executable.
169     -
170     -If distribution of executable or object code is made by offering
171     -access to copy from a designated place, then offering equivalent
172     -access to copy the source code from the same place counts as
173     -distribution of the source code, even though third parties are not
174     -compelled to copy the source along with the object code.
175     -
176     - 4. You may not copy, modify, sublicense, or distribute the Program
177     -except as expressly provided under this License. Any attempt
178     -otherwise to copy, modify, sublicense or distribute the Program is
179     -void, and will automatically terminate your rights under this License.
180     -However, parties who have received copies, or rights, from you under
181     -this License will not have their licenses terminated so long as such
182     -parties remain in full compliance.
183     -
184     - 5. You are not required to accept this License, since you have not
185     -signed it. However, nothing else grants you permission to modify or
186     -distribute the Program or its derivative works. These actions are
187     -prohibited by law if you do not accept this License. Therefore, by
188     -modifying or distributing the Program (or any work based on the
189     -Program), you indicate your acceptance of this License to do so, and
190     -all its terms and conditions for copying, distributing or modifying
191     -the Program or works based on it.
192     -
193     - 6. Each time you redistribute the Program (or any work based on the
194     -Program), the recipient automatically receives a license from the
195     -original licensor to copy, distribute or modify the Program subject to
196     -these terms and conditions. You may not impose any further
197     -restrictions on the recipients' exercise of the rights granted herein.
198     -You are not responsible for enforcing compliance by third parties to
199     -this License.
200     -
201     - 7. If, as a consequence of a court judgment or allegation of patent
202     -infringement or for any other reason (not limited to patent issues),
203     -conditions are imposed on you (whether by court order, agreement or
204     -otherwise) that contradict the conditions of this License, they do not
205     -excuse you from the conditions of this License. If you cannot
206     -distribute so as to satisfy simultaneously your obligations under this
207     -License and any other pertinent obligations, then as a consequence you
208     -may not distribute the Program at all. For example, if a patent
209     -license would not permit royalty-free redistribution of the Program by
210     -all those who receive copies directly or indirectly through you, then
211     -the only way you could satisfy both it and this License would be to
212     -refrain entirely from distribution of the Program.
213     -
214     -If any portion of this section is held invalid or unenforceable under
215     -any particular circumstance, the balance of the section is intended to
216     -apply and the section as a whole is intended to apply in other
217     -circumstances.
218     -
219     -It is not the purpose of this section to induce you to infringe any
220     -patents or other property right claims or to contest validity of any
221     -such claims; this section has the sole purpose of protecting the
222     -integrity of the free software distribution system, which is
223     -implemented by public license practices. Many people have made
224     -generous contributions to the wide range of software distributed
225     -through that system in reliance on consistent application of that
226     -system; it is up to the author/donor to decide if he or she is willing
227     -to distribute software through any other system and a licensee cannot
228     -impose that choice.
229     -
230     -This section is intended to make thoroughly clear what is believed to
231     -be a consequence of the rest of this License.
232     -
233     - 8. If the distribution and/or use of the Program is restricted in
234     -certain countries either by patents or by copyrighted interfaces, the
235     -original copyright holder who places the Program under this License
236     -may add an explicit geographical distribution limitation excluding
237     -those countries, so that distribution is permitted only in or among
238     -countries not thus excluded. In such case, this License incorporates
239     -the limitation as if written in the body of this License.
240     -
241     - 9. The Free Software Foundation may publish revised and/or new versions
242     -of the General Public License from time to time. Such new versions will
243     -be similar in spirit to the present version, but may differ in detail to
244     -address new problems or concerns.
245     -
246     -Each version is given a distinguishing version number. If the Program
247     -specifies a version number of this License which applies to it and "any
248     -later version", you have the option of following the terms and conditions
249     -either of that version or of any later version published by the Free
250     -Software Foundation. If the Program does not specify a version number of
251     -this License, you may choose any version ever published by the Free Software
252     -Foundation.
253     -
254     - 10. If you wish to incorporate parts of the Program into other free
255     -programs whose distribution conditions are different, write to the author
256     -to ask for permission. For software which is copyrighted by the Free
257     -Software Foundation, write to the Free Software Foundation; we sometimes
258     -make exceptions for this. Our decision will be guided by the two goals
259     -of preserving the free status of all derivatives of our free software and
260     -of promoting the sharing and reuse of software generally.
261     -
262     - NO WARRANTY
263     -
264     - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
265     -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
266     -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
267     -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
268     -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
269     -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
270     -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
271     -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
272     -REPAIR OR CORRECTION.
273     -
274     - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
275     -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
276     -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
277     -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
278     -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
279     -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
280     -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
281     -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
282     -POSSIBILITY OF SUCH DAMAGES.
283     -
284     - END OF TERMS AND CONDITIONS
285     -
286     - How to Apply These Terms to Your New Programs
287     -
288     - If you develop a new program, and you want it to be of the greatest
289     -possible use to the public, the best way to achieve this is to make it
290     -free software which everyone can redistribute and change under these terms.
291     -
292     - To do so, attach the following notices to the program. It is safest
293     -to attach them to the start of each source file to most effectively
294     -convey the exclusion of warranty; and each file should have at least
295     -the "copyright" line and a pointer to where the full notice is found.
296     -
297     - <one line to give the program's name and a brief idea of what it does.>
298     - Copyright (C) 19yy <name of author>
299     -
300     - This program is free software; you can redistribute it and/or modify
301     - it under the terms of the GNU General Public License as published by
302     - the Free Software Foundation; either version 2 of the License, or
303     - (at your option) any later version.
304     -
305     - This program is distributed in the hope that it will be useful,
306     - but WITHOUT ANY WARRANTY; without even the implied warranty of
307     - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
308     - GNU General Public License for more details.
309     -
310     - You should have received a copy of the GNU General Public License
311     - along with this program; if not, write to the Free Software
312     - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
313     -
314     -
315     -Also add information on how to contact you by electronic and paper mail.
316     -
317     -If the program is interactive, make it output a short notice like this
318     -when it starts in an interactive mode:
319     -
320     - Gnomovision version 69, Copyright (C) 19yy name of author
321     - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
322     - This is free software, and you are welcome to redistribute it
323     - under certain conditions; type `show c' for details.
324     -
325     -The hypothetical commands `show w' and `show c' should show the appropriate
326     -parts of the General Public License. Of course, the commands you use may
327     -be called something other than `show w' and `show c'; they could even be
328     -mouse-clicks or menu items--whatever suits your program.
329     -
330     -You should also get your employer (if you work as a programmer) or your
331     -school, if any, to sign a "copyright disclaimer" for the program, if
332     -necessary. Here is a sample; alter the names:
333     -
334     - Yoyodyne, Inc., hereby disclaims all copyright interest in the program
335     - `Gnomovision' (which makes passes at compilers) written by James Hacker.
336     -
337     - <signature of Ty Coon>, 1 April 1989
338     - Ty Coon, President of Vice
339     -
340     -This General Public License does not permit incorporating your program into
341     -proprietary programs. If your program is a subroutine library, you may
342     -consider it more useful to permit linking proprietary applications with the
343     -library. If this is what you want to do, use the GNU Library General
344     -Public License instead of this License.
345     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
346     --- e-smith-manager-2.6.0.old/e-smith-manager-2.6.0/createlinks 2007-01-26 20:51:30.000000000 -0500
347     +++ e-smith-manager-2.6.0/e-smith-manager-2.6.0/createlinks 1969-12-31 19:00:00.000000000 -0500
348     @@ -1,91 +0,0 @@
349     -#!/usr/bin/perl -w
350     -
351     -use esmith::Build::CreateLinks qw(:all);
352     -
353     -panel_link("navigation", "manager");
354     -panel_link("noframes", "manager");
355     -
356     -event_link("navigation-conf", 'bootstrap-console-save', 50);
357     -
358     -for ( qw( sme_core.css
359     - sme_header.css
360     - sme_main.css
361     - sme_menu.css
362     - sme_panel_menu.css
363     - ) )
364     -{
365     - templates2events("/etc/e-smith/web/common/css/$_", qw(
366     - bootstrap-console-save
367     - ));
368     -}
369     -
370     -templates2events("/etc/e-smith/web/panels/manager/html/header.htm", qw(
371     - console-save
372     - bootstrap-console-save
373     - network-create
374     - network-delete
375     - logrotate
376     - ));
377     -templates2events("/etc/e-smith/web/common/head.tmpl", qw(
378     - console-save
379     - bootstrap-console-save
380     - network-create
381     - network-delete
382     - logrotate
383     - ));
384     -templates2events("/etc/e-smith/web/common/foot.tmpl", qw(
385     - console-save
386     - bootstrap-console-save
387     - network-create
388     - network-delete
389     - logrotate
390     - ));
391     -
392     -# conf-httpd-admin
393     -
394     -templates2events("/etc/httpd/admin-conf/httpd.conf", qw(
395     - console-save
396     - bootstrap-console-save
397     - network-create
398     - network-delete
399     - remoteaccess-update
400     - logrotate
401     - ));
402     -
403     -templates2events("/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg", 'bootstrap-console-save');
404     -
405     -# Set up generic logfile timestamp renaming/symlinking
406     -
407     -foreach (qw(
408     - /var/log/httpd/admin_access_log
409     - /var/log/httpd/admin_error_log
410     - ))
411     -{
412     - safe_touch "root/etc/e-smith/events/logrotate/logfiles2timestamp/$_";
413     - safe_touch "root/etc/e-smith/events/post-install/logfiles2timestamp/$_";
414     - safe_touch "root/etc/e-smith/events/post-upgrade/logfiles2timestamp/$_";
415     -}
416     -
417     -foreach (qw(console-save remoteaccess-update logrotate))
418     -{
419     - safe_symlink("sigusr1", "root/etc/e-smith/events/$_/services2adjust/httpd-admin");
420     -}
421     -
422     -my %service2order =
423     -(
424     - 'httpd-admin' => "86",
425     -);
426     -
427     -foreach my $service (keys %service2order)
428     -{
429     - service_link_enhanced($service, $service2order{$service}, 7);
430     -}
431     -
432     -# Symlink httpd-admin to httpd.
433     -safe_symlink("httpd", "root/usr/sbin/httpd-admin");
434     -
435     -# Set up links to daemontools.
436     -safe_symlink("daemontools", "root/etc/rc.d/init.d/httpd-admin");
437     -service_link_enhanced("httpd-admin", "K15", "6");
438     -service_link_enhanced("httpd-admin", "K15", "0");
439     -
440     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
441     --- 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
442     +++ 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
443     @@ -1 +0,0 @@
444     -localhost
445     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
446     --- 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
447     +++ 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
448     @@ -1 +0,0 @@
449     -no
450     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
451     --- 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
452     +++ 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
453     @@ -1 +0,0 @@
454     -enabled
455     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
456     --- 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
457     +++ 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
458     @@ -1 +0,0 @@
459     -980
460     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
461     --- 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
462     +++ 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
463     @@ -1 +0,0 @@
464     -service
465     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
466     --- 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
467     +++ 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
468     @@ -1,7 +0,0 @@
469     -{
470     - my $admin = $DB->get('httpd-admin');
471     - return unless $admin;
472     - return if $admin->prop('TKTAuthSecret');
473     - use Data::UUID;
474     - $admin->set_prop('TKTAuthSecret', Data::UUID->new->create_str());
475     -}
476     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
477     --- 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
478     +++ 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
479     @@ -1,153 +0,0 @@
480     -#!/usr/bin/perl -w
481     -
482     -#----------------------------------------------------------------------
483     -# copyright (C) 1999-2006 Mitel Networks Corporation
484     -#
485     -# This program is free software; you can redistribute it and/or modify
486     -# it under the terms of the GNU General Public License as published by
487     -# the Free Software Foundation; either version 2 of the License, or
488     -# (at your option) any later version.
489     -#
490     -# This program is distributed in the hope that it will be useful,
491     -# but WITHOUT ANY WARRANTY; without even the implied warranty of
492     -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
493     -# GNU General Public License for more details.
494     -#
495     -# You should have received a copy of the GNU General Public License
496     -# along with this program; if not, write to the Free Software
497     -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
498     -#
499     -#----------------------------------------------------------------------
500     -package esmith;
501     -
502     -use strict;
503     -
504     -use esmith::NavigationDB;
505     -use esmith::I18N;
506     -
507     -use constant WEBFUNCTIONS => '/etc/e-smith/web/functions';
508     -use constant NAVIGATIONDIR => '/home/e-smith/db/navigation';
509     -use constant NEW_NAVDIR => '/home/e-smith/db';
510     -
511     -my $navigation_ignore =
512     - "(\.\.?|navigation|noframes|online-manual|(internal|pleasewait)(-.*)?)";
513     -
514     -my $i18n = new esmith::I18N;
515     -
516     -my %navdbs;
517     -
518     -opendir FUNCTIONS, WEBFUNCTIONS or
519     - die "Couldn't open ", WEBFUNCTIONS, "\n";
520     -
521     -my @files = grep (!/^${navigation_ignore}$/, readdir (FUNCTIONS));
522     -my @langs = $i18n->availableLanguages();
523     -
524     -use XML::Parser;
525     -my $parser = new XML::Parser (Style => 'Tree',
526     - ProtocolEncoding => 'UTF-8');
527     -
528     -foreach my $file (@files)
529     -{
530     - next if (-d WEBFUNCTIONS . "/$file");
531     - next unless (-x WEBFUNCTIONS . "/$file");
532     -
533     - #--------------------------------------------------
534     - # extract heading, description and weight information
535     - # from CGI script
536     - #--------------------------------------------------
537     - open(SCRIPT, WEBFUNCTIONS . "/$file");
538     - my $heading = undef;
539     - my $description = undef;
540     - my $heading_weight = undef;
541     - my $description_weight = undef;
542     - while ( <SCRIPT> )
543     - {
544     - $heading = $1 if (/^\s*#\s*heading\s*:\s*(.+?)\s*$/);
545     -
546     - $description = $1
547     - if (/^\s*#\s*description\s*:\s*(.+?)\s*$/);
548     -
549     - ($heading_weight, $description_weight) = ($1, $2)
550     - if (/^\s*#\s*navigation\s*:\s*(\d+?)\s+(\d+?)\s*$/);
551     -
552     - last if (defined $heading and
553     - defined $description and
554     - defined $heading_weight and
555     - defined $description_weight);
556     - }
557     - close SCRIPT;
558     - foreach my $lang (@langs)
559     - {
560     -#warn "updating script $file for lang $lang\n";
561     - my $navdb = $navdbs{$lang};
562     - my $navinfo = NAVIGATIONDIR . "/navigation.$lang";
563     - $navdb ||= esmith::NavigationDB->open($navinfo);
564     - $navdb ||= esmith::NavigationDB->create($navinfo) or
565     - die "Couldn't create $navinfo\n";
566     - $navdbs{$lang} ||= $navdb;
567     - my $rec = $navdb->get($file) ||
568     - $navdb->new_record($file, { type => 'panel' } );
569     -
570     - my $lexicon = {};
571     -
572     - foreach my $lfile ( "/etc/e-smith/locale/$lang/FormMagick/general",
573     - "/etc/e-smith/locale/$lang/etc/e-smith/web/functions/$file" )
574     - {
575     - if (-f $lfile)
576     - {
577     - # Do a quick and dirty parse of the lexicon file
578     - my $xmlstr = "";
579     - open(FILE, $lfile) or die "Couldn't open $lfile:\n$!";
580     - binmode(FILE, ":utf8");
581     - {
582     - local $^W = 0;
583     - while ( my $line = <FILE> ) {
584     - unless ( utf8::valid($line) ) {
585     - warn "$lfile not in UTF-8 format\n";
586     - utf8::encode($line);
587     - }
588     - $xmlstr .= $line;
589     - }
590     - }
591     - my $xml = $parser->parsestring($xmlstr);
592     - my @lexicon = @{$xml->[1]};
593     - shift @lexicon; # Remove lexicon attributes
594     - while (@lexicon)
595     - {
596     - my ($tag, $data) = splice(@lexicon, 0, 2);
597     - next unless $tag eq 'entry';
598     - my %entry_hash = ('attributes', @$data);
599     - my $base = $entry_hash{base};
600     - $base = @{$base}[2];
601     - my $trans = $entry_hash{trans};
602     - $trans = @{$trans}[2];
603     - next unless defined $base && defined $trans;
604     - $lexicon->{$base} = $trans;
605     - }
606     - }
607     - }
608     -
609     - my $loc_heading = localise($lexicon, $heading);
610     - $loc_heading =~ s/^\s*(\w.*?)\s*$/$1/;
611     - my $loc_description = localise($lexicon, $description);
612     - $loc_description =~ s/^\s*(\w.*?)\s*$/$1/;
613     - $rec->merge_props(
614     - Heading => $loc_heading,
615     - Description => $loc_description,
616     - HeadingWeight => localise($lexicon, $heading_weight),
617     - DescriptionWeight => localise($lexicon, $description_weight));
618     - }
619     -}
620     -foreach my $lang (@langs)
621     -{
622     -#warn "trying to close for lang $lang\n";
623     - my $navdb = $navdbs{$lang};
624     - $navdb->close();
625     -}
626     -
627     -sub localise {
628     - my ($lexicon, $string) = @_;
629     - $string = "" unless defined $string;
630     - return $lexicon->{$string} || $string;
631     -}
632     -
633     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
634     --- 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
635     +++ 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
636     @@ -1,6 +0,0 @@
637     -{
638     - my $secret = ${'httpd-admin'}{TKTAuthSecret} || "34322500-7330-4400-423A-3A00434F5245";
639     - $OUT .= "TKTAuthSecret $secret\n";
640     - $OUT .= "TKTAuthTimeout 5m\n";
641     - $OUT .= "TKTAuthCookieExpires 5m";
642     -}
643     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
644     --- 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
645     +++ 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
646     @@ -1,229 +0,0 @@
647     -{
648     - $OUT = <<'EOF';
649     -
650     -
651     -/* INSERT COPYRIGHT HERE */
652     -
653     -/* This is the stylesheet used as the basis for older broswers.
654     -
655     -Note that you CANNOT simly add styles here and hope they work. ONLY CSS
656     -level 1 styles should be in this file. Everyting else goes into the other 3
657     -files.
658     -
659     -These basic styles ensire that browsers that don't understand the @import
660     -method will still be usable. All modern browsers will use the styles in
661     -sme_main.css, sme_menu.css or sme_header.css depending on the frame in which
662     -the page is found.
663     -*/
664     -
665     -/* Default HTML styles */
666     -body {
667     - background: #ffffff;
668     - color: #000000;
669     - font-family: Verdana, Arial, Helvetica, sans-serif;
670     - font-size: 11px;
671     - border-width: 0;
672     -}
673     -
674     -table, tr, td, div, p, form {
675     - color: #000000;
676     - font-family: Verdana, Arial, Helvetica, sans-serif;
677     - font-size: 11px;
678     -}
679     -
680     -p {
681     - margin-top: 8px;
682     - margin-bottom: 2px;
683     -}
684     -
685     -form {
686     - margin-top: 2px;
687     - margin-bottom: 2px;
688     -}
689     -
690     -span {
691     - font-family: Verdana, Arial, Helvetica, sans-serif;
692     - font-size: 11px;
693     -}
694     -
695     -.notsmall {
696     - font-family: Verdana, Arial, Helvetica, sans-serif;
697     - font-size: 11px;
698     -}
699     -
700     -h1, .h1 {
701     - font-family: Verdana, Arial, Helvetica, sans-serif;
702     - color: #333333;
703     - font-size: 18px;
704     - margin-bottom: 4px;
705     - margin-top: 12px;
706     -}
707     -
708     -h2, .h2 {
709     - font-family: Verdana, Arial, Helvetica, sans-serif;
710     - color: #333333;
711     - font-size: 14px;
712     - margin-bottom: 3px;
713     - margin-top: 12px;
714     -}
715     -
716     -h3, .h3 {
717     - font-family: Verdana, Arial, Helvetica, sans-serif;
718     - color: #333333;
719     - font-size: 12px;
720     - margin-bottom: 2px;
721     - margin-top: 12px;
722     -}
723     -
724     -h4, .h4 {
725     - font-family: Verdana, Arial, Helvetica, sans-serif;
726     - font-style: italic;
727     - color: #333333;
728     - font-size: 12px;
729     - margin-bottom: 2px;
730     - margin-top: 10px;
731     -}
732     -
733     -ol, ul, li {
734     - font-family: Verdana, Arial, Helvetica, sans-serif;
735     - font-size: 10px;
736     - font-weight: normal;
737     - color: black;
738     -}
739     -
740     -ul {
741     - list-style-type: circle;
742     -}
743     -
744     -/* Core styles for use with sme_header.css*/
745     -body.header {
746     - font-family: Verdana, Arial, Helvetica, sans-serif;
747     - font-size: 11px;
748     - background: #cccccc;
749     - margin-top: 0px;
750     - margin-right: 0px;
751     - margin-bottom: 0px;
752     - margin-left: 0px;
753     -}
754     -
755     -.hilightbar {
756     - background-color: #ffc50a;
757     - font-size: 4px;
758     -}
759     -
760     -.infobar {
761     - font-family: Verdana, Arial, Helvetica, sans-serif;
762     - font-size: 11px;
763     - background-color: #cccccc;
764     -}
765     -
766     -.darkergrey {
767     - color: #666666;
768     -}
769     -
770     -td.darkgrey {
771     - background-color: #888888;
772     -}
773     -
774     -a.update {
775     - color: red;
776     - font-family: Verdana, Arial, Helvetica, sans-serif;
777     - font-size: 11px;
778     - background: #cccccc;
779     -}
780     -
781     -/* Core styles for use with sme_menu.css */
782     -
783     -body.menu {
784     - font-family: Verdana, Arial, Helvetica, sans-serif;
785     - font-size: 11px;
786     - background-color: #eeeeee;
787     -}
788     -
789     -td.section {
790     - padding-bottom: 2px;
791     - padding-top: 8px;
792     -}
793     -
794     -.section {
795     - font-family: Verdana, Arial, Helvetica, sans-serif;
796     - font-size: 11px;
797     - font-weight: bold;
798     - background-color: #eeeeee;
799     -}
800     -
801     -a.item {
802     - color: #00008b;
803     - font-family: Verdana, Arial, Helvetica, sans-serif;
804     - font-size: 11px;
805     - background: #eeeeee;
806     -}
807     -
808     -a.sl {
809     - color: green;
810     - font-family: Verdana, Arial, Helvetica, sans-serif;
811     - font-size: 11px;
812     - background: #eeeeee;
813     -}
814     -
815     -a.alert {
816     - color: red;
817     - font-family: Verdana, Arial, Helvetica, sans-serif;
818     - font-size: 11px;
819     - background: #eeeeee;
820     -}
821     -
822     -/* Core styles for use with sme_main.css */
823     -body.main {
824     - font-family: Verdana, Arial, Helvetica, sans-serif;
825     - font-size: 11px;
826     - background-color: #ffffff;
827     - color: #000000;
828     -}
829     -
830     -td.sme-noborders-label {
831     - font-weight: bold;
832     - width: 33%;
833     - text-align: right;
834     -}
835     -
836     -hr.sectionbar {
837     - color: #666666;
838     - background-color: #666666;
839     - height: 1px;
840     - width: 80%;
841     - border: 0;
842     -}
843     -
844     -hr.sme-copyrightbar {
845     - color: #dddddd;
846     - background-color: #dddddd;
847     - height: 1px;
848     - width: 100%;
849     - border: 0;
850     -}
851     -
852     -.sme-copyright {
853     - color: #777777;
854     - font-family: Verdana, Arial, Helvetica, sans-serif;
855     - font-size: 10px;
856     -}
857     -
858     -/*These style definitions were found int he old css file (manager.css)
859     -but don't seem to ever be referenced in the code. They're here
860     -for reference.
861     -
862     -.centerit {
863     - text-align: center;
864     -}
865     -.highlight {
866     - background: #ffc61e;
867     -}
868     -.subheading {
869     - background: #ffffff;
870     - color: #1e385b;
871     -}
872     -*/
873     -
874     -EOF
875     -}
876     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
877     --- 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
878     +++ 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
879     @@ -1 +0,0 @@
880     -/* DO NOT MODIFY THIS FILE! It is updated automatically */
881     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
882     --- 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
883     +++ 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
884     @@ -1,128 +0,0 @@
885     -{
886     - $OUT = <<'EOF';
887     -
888     -/* INSERT COPYRIGHT HERE */
889     -
890     -/* This is the stylesheet used in the header panel only
891     -
892     - This file inherits the styles use in sme_core in the "header" section, and
893     - as noted in the code below. Note that some of the styles here are empty.
894     - This is because the style definition has moved safely to sme_core.css
895     - and the placeholder is left here for reference or future use.
896     -
897     - There are a lot of styles in here, so read carefully. Each one is documented.
898     -
899     - Styles that were in the old stylesheets, but are not used in the UI are at the
900     - bottom, commented out. These can be removed at the end of the 6.0 cycle */
901     -
902     -/* general table cell properties */
903     -td {
904     - font-family: Verdana, Arial, Helvetica, sans-serif;
905     - font-size: 11px;
906     - color: black;
907     -}
908     -
909     -table {
910     - width=100%;
911     - margin-top: 0px;
912     - margin-right: 0px;
913     - margin-bottom: 1px;
914     - margin-left: 0px;
915     -}
916     -
917     -/* This is the class of the product bar, orange in the case of the 6000 MAS */
918     -.hilightbar {
919     - border-color: #888888 ;
920     - border-style: solid;
921     - border-top-width: 1px;
922     - border-right-width: 0px;
923     - border-bottom-width: 1px;
924     - border-left-width: 0px;
925     -}
926     -
927     -/* this is the class of the grey bar under the hilight bar, where text and
928     - buttons live.
929     -*/
930     -.infobar {
931     - border-color: #888888 ;
932     - border-style: solid;
933     - border-top-width: 0px;
934     - border-right-width: 0px;
935     - border-bottom-width: 10px;
936     - border-left-width: 0px;
937     -}
938     -
939     -.darkergrey {
940     - color: #666666;
941     -}
942     -
943     -/* default class for links*/
944     -a:link, a:visited, a:hover, a:active {
945     - font-family: Verdana, Arial, Helvetica, sans-serif;
946     - font-size: 11px;
947     - color: black;
948     - background: #cccccc;
949     - text-decoration: none;
950     - text-align: left;
951     - border-color: #cccccc #cccccc #cccccc #cccccc ;
952     - margin-top: 0px;
953     - margin-right: 0px;
954     - margin-bottom: 0px;
955     - margin-left: 0px;
956     - border-style: solid;
957     - border-top-width: 1px;
958     - border-right-width: 1px;
959     - border-bottom-width: 1px;
960     - border-left-width: 1px;
961     - padding-right: 10px;
962     - padding-left: 10px;
963     - }
964     -
965     -a:hover {
966     - background: #eeeeee;
967     - border-color: #000000 #000000 #000000 #000000;
968     -}
969     -
970     -a:active {
971     - color: white;
972     - background: black;
973     - border-color: #000000 #000000 #000000 #000000;
974     -}
975     -
976     -
977     -/* These a classes define the update link appearance, using a pseudoclass
978     - called "update" */
979     -a.update:link, a.update:visited, a.update:hover, a.update:active {
980     - font-family: Verdana, Arial, Helvetica, sans-serif;
981     - font-size: 11px;
982     - color: #ffffff;
983     - background-color: #ee0000;
984     - text-decoration: none;
985     - text-align: left;
986     - border-color: #cccccc ;
987     - margin-top: 0px;
988     - margin-right: 0px;
989     - margin-bottom: 0px;
990     - margin-left: 0px;
991     - border-style: solid;
992     - border-top-width: 1px;
993     - border-right-width: 1px;
994     - border-bottom-width: 1px;
995     - border-left-width: 1px;
996     - padding-right: 10px;
997     - padding-left: 10px;
998     - }
999     -
1000     -a.update:hover {
1001     - background: #FF8080;
1002     - border-color: #ff0000;
1003     -}
1004     -
1005     -a.update:active {
1006     - color: #ff0000;
1007     - background: #ffffff;
1008     - border-color: #ff0000;
1009     -}
1010     -
1011     -EOF
1012     -}
1013     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
1014     --- 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
1015     +++ 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
1016     @@ -1 +0,0 @@
1017     -/* DO NOT MODIFY THIS FILE! It is updated automatically */
1018     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
1019     --- 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
1020     +++ 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
1021     @@ -1,418 +0,0 @@
1022     -{
1023     - $OUT = <<'EOF';
1024     -
1025     -/* INSERT COPYRIGHT HERE */
1026     -
1027     -/* This is the stylesheet used in the main panels only.
1028     -
1029     - This file inherits the styles use in sme_core in the "header" section, and
1030     - as noted in the code below. Note that some of the styles here are empty.
1031     - This is because the style definition has moved safely to sme_core.css
1032     - and the placeholder is left here for reference or future use.
1033     -
1034     - There are a lot of styles in here, so read carefully. Each one is documented.
1035     -
1036     - Styles that were in the old stylesheets, but are not used in the UI are at the
1037     - bottom, commented out. These can be removed at the end of the 6.0 cycle */
1038     -
1039     -/* general page properties */
1040     -body, body.main {
1041     - margin-top: 5px;
1042     - margin-right: 20px;
1043     - margin-bottom: 5px;
1044     - margin-left: 5px;
1045     -}
1046     -
1047     -
1048     -/* Table properties ****************************************/
1049     -/* There are THREE types of tables
1050     - 1. *.sme-layout* is used for layout purposes. It is the "master
1051     - container" on a page. It controls the top-level table
1052     - inside of which everything else is put.
1053     - 2. *.sme-noborders* is used for layout, and defines a borderless table and
1054     - cells used within it.
1055     - 2. *.sme-border* is used for tabular data, and defines a header row and borders
1056     - for tables that need borders
1057     -
1058     - */
1059     -
1060     -/*First, some defaults */
1061     -td {
1062     - text-align: left;
1063     -}
1064     -
1065     -
1066     -/*
1067     -sme-layout* : Used for top-level layout
1068     -*/
1069     -
1070     -table.sme-layout {
1071     - border-collapse: collapse;
1072     - margin-bottom: 2px;
1073     - margin-top: 2px;
1074     -}
1075     -
1076     -tr.sme-layout {
1077     - border: 1px solid #dddddd;
1078     -}
1079     -
1080     -td.sme-layout {
1081     - border: 1px solid #dddddd;
1082     -}
1083     -
1084     -/*This special style is actually used only for the button row along the bottom of each page*/
1085     -th.sme-layout {
1086     - border: 1px solid #dddddd;
1087     - background-color: #eeeeee;
1088     - font-family: Verdana, Arial, Helvetica, sans-serif;
1089     - font-size: 9pt;
1090     - font-weight: bold;
1091     - color: #000000;
1092     - text-align: right;
1093     - padding: 4px;
1094     -}
1095     -
1096     -/*
1097     -sme-noborders* : Used for mid-level layout
1098     -*/
1099     -table.sme-noborders {
1100     - padding: 0px;
1101     - margin-top: 0px;
1102     - margin-bottom: 20px;
1103     - margin-left: 0px;
1104     - margin-right: 0px;
1105     - font-family: Verdana, Arial, Helvetica, sans-serif;
1106     - font-size: 11px;
1107     -}
1108     -td.sme-noborders-label {
1109     - font-weight: bold;
1110     - /*width: 250px;*/
1111     - text-align: right;
1112     - /*vertical-align: top;*/
1113     - background-color: #eeeeee;
1114     - font-family: Verdana, Arial, Helvetica, sans-serif;
1115     - font-size: 11px;
1116     -}
1117     -td.sme-noborders-content {
1118     - text-align: left;
1119     - vertical-align: top;
1120     - font-family: Verdana, Arial, Helvetica, sans-serif;
1121     - font-size: 11px;
1122     -}
1123     -td.sme-noborders-info, div.sme-noborders-info {
1124     - text-align: left;
1125     - vertical-align: top;
1126     -}
1127     -/* Used for a left-most column of radio buttons (see date/time panel) */
1128     -td.sme-radiobutton {
1129     - width: 30px;
1130     -}
1131     -/*
1132     -sme-border* : Used for tabular data
1133     -*/
1134     -table.sme-border {
1135     - border-collapse: collapse;
1136     - border: 2px solid #cccccc;
1137     - empty-cells: show;
1138     - margin: 5px 5px 5px 2px;
1139     -}
1140     -td.sme-border,
1141     -td.sme-border-warning,
1142     -td.sme-border-right,
1143     -td.sme-border-center {
1144     - border: 1px solid #cccccc;
1145     - font-family: Verdana, Arial, Helvetica, sans-serif;
1146     - font-size: 10px;
1147     - font-weight: normal;
1148     - color: #000000;
1149     - text-align: left;
1150     - padding-left: 2px;
1151     - padding-right: 2px;
1152     - padding-top: 3px;
1153     - padding-bottom: 3px;
1154     -}
1155     -td.sme-border-warning {
1156     - color: red;
1157     - }
1158     -td.sme-border-right {text-align: right;}
1159     -td.sme-border-center {text-align: center;}
1160     -th.sme-border {
1161     - border: 1px solid #cccccc;
1162     - background-color: #dedfde;
1163     - font-family: Verdana, Arial, Helvetica, sans-serif;
1164     - font-size: 10px;
1165     - font-weight: bold;
1166     - color: #000000;
1167     - text-align: center;
1168     - vertical-align: bottom;
1169     - padding-left: 2px;
1170     - padding-right: 2px;
1171     - padding-left: 3px;
1172     - padding-right: 3px;
1173     - padding-top: 3px;
1174     - padding-bottom: 3px;
1175     - /*border-width: 1px;
1176     - border-style: solid;
1177     - border-color: #F2F0EE #75736E #75736E #F2F0EE ;*/
1178     -}
1179     -td.sme-border a, td.sme-border-right a, td.sme-border-center a {
1180     - font-size: 10px;
1181     -}
1182     -
1183     -/* misc layout stuff*/
1184     -/* these two are for any error messages that pop up*/
1185     -div.error, div.sme-error, span.error, span.sme-error {
1186     - color: red;
1187     - background-color: #ffffff;
1188     - border-width: 1px;
1189     - border-style: solid;
1190     - border-color: red ;
1191     - padding: 2px;
1192     - margin-left: 20px;
1193     - margin-right: 20px;
1194     - margin-top:0px;
1195     - margin-bottom:0px;
1196     -
1197     -}
1198     -
1199     -div.error-noborders, div.sme-error-noborders,
1200     -span.error-noborders, span.sme-error-noborders
1201     -{
1202     - color: red;
1203     - background-color: #ffffff;
1204     - border-width: 0px;
1205     -}
1206     -
1207     -div.error h2, span.error h2,
1208     -div.error p, span.error p
1209     -{
1210     - color: red;
1211     -}
1212     -/* These are for the special case of a link being inside an error message */
1213     -div.sme-error a, div.error a, span.error a, span.sme-error a,
1214     -div.error-noborders a, div.sme-error-noborders a,
1215     -span.error-noborders a, span.sme-error-noborders a
1216     -{
1217     - color: #ff0000;
1218     - font-weight: bold;
1219     - text-decoration: underline;
1220     -}
1221     -
1222     -/* For when a link is the error message */
1223     -a.error:link, a.error:visited, a.error:hover, a.error:active {
1224     - color: #ff0000;
1225     - font-weight: normal;
1226     - text-decoration: underline;
1227     -}
1228     -
1229     -/* these two are for any success messages that pop up*/
1230     -div.success, span.success {
1231     - color: #006400;
1232     - background-color: #ffffff;
1233     - border-width: 1px;
1234     - border-style: solid;
1235     - border-color: #006400 ;
1236     - padding: 2px;
1237     - margin-left: 20px;
1238     - margin-right: 20px;
1239     - margin-top:0px;
1240     - margin-bottom:0px;
1241     -
1242     -}
1243     -
1244     -/* These two are for the special case of a link being inside a success message */
1245     -div.success a, span.success a
1246     -{
1247     - color: #006400;
1248     - font-weight: bold;
1249     - text-decoration: underline;
1250     -}
1251     -
1252     -div.success h2, span.success h2,
1253     -div.success p, span.success p
1254     -{
1255     - color: green;
1256     -}
1257     -
1258     -/*These two define the copyright footer styles, one for the line and one for the text*/
1259     -hr.sme-copyrightbar {
1260     -}
1261     -.sme-copyright {
1262     -}
1263     -
1264     -/* These ones define styles for the links that are made to look like
1265     - standard form submit buttons */
1266     -a.button-like:link,
1267     -a.button-like:visited,
1268     -a.button-like:hover,
1269     -a.button-like:active,
1270     -a.button-like-small:link,
1271     -a.button-like-small:visited,
1272     -a.button-like-small:hover,
1273     -a.button-like-small:active {
1274     - font-family: sans-serif;
1275     - font-size: 13px;
1276     - color: black;
1277     - background: #D4D0C8;
1278     - text-decoration: none;
1279     - text-align: left;
1280     - border-color: #F2F0EE #75736E #75736E #F2F0EE ;
1281     - margin-top: 10px;
1282     - margin-right: 2px;
1283     - margin-bottom: 10px;
1284     - margin-left: 2px;
1285     - border-style: solid;
1286     - border-top-width: 2px;
1287     - border-right-width: 2px;
1288     - border-bottom-width: 2px;
1289     - border-left-width: 2px;
1290     - padding-top: 2px;
1291     - padding-bottom: 2px;
1292     - padding-left: 6px;
1293     - padding-right: 6px;
1294     - }
1295     -a.button-like-small:link,
1296     -a.button-like-small:visited,
1297     -a.button-like-small:hover,
1298     -a.button-like-small:active {
1299     - border-top-width: 1px;
1300     - border-right-width: 1px;
1301     - border-bottom-width: 1px;
1302     - border-left-width: 1px;
1303     - font-size: 10px;
1304     - padding-top: 0px;
1305     - padding-bottom: 0px;
1306     - padding-left: 1px;
1307     - padding-right: 1px;
1308     -}
1309     -a.button-like:active,
1310     -a.button-like-small:active {
1311     - border-color: #75736E #F2F0EE #F2F0EE #75736E ;
1312     -}
1313     -
1314     -/* EXPERIMENTAL SECTION */
1315     -/* These are styles used to experiment with. */
1316     -
1317     -/* class for links, similar to the class in sme_menu.css, but for a red button */
1318     -a.button-like-red:link,
1319     -a.button-like-red:visited,
1320     -a.button-like-red:hover,
1321     -a.button-like-red:active {
1322     - border-left: #F1726C 2px solid;
1323     - border-right: #B42025 2px solid;
1324     - border-top: #F1726C 2px solid;
1325     - border-bottom: #B42025 2px solid;
1326     - }
1327     -a.button-like-red:active {
1328     - border-color: #75736E #F2F0EE #F2F0EE #75736E ;
1329     -}
1330     -
1331     -/*These are style definitions found in the UI but not defined in any file I
1332     - could locate. They're listed here for historical purposes, but have been
1333     - removed from the UI
1334     -
1335     -pagedescription (used in the first paragraph of text on a page) [HTML.pm]
1336     -label (used in forms) [HTML.pm]
1337     -field (used in forms) [HTML.pm]
1338     -fielddescription (used ???)[HTML.pm]
1339     -buttons (used in forms) [HTML.pm]
1340     -*/
1341     -/*td.sme-submitbutton {
1342     - text-align: right;
1343     -}
1344     -*/
1345     -
1346     -/*These style definitions were found int he old css file (manager.css)
1347     - but don't seem to ever be referenced in the code. They're here
1348     - for reference.
1349     -
1350     -.banner {
1351     - background: #000000;
1352     - color: #ffffff;
1353     -}
1354     -.banner-right {
1355     - font-family: Verdana, Arial, Helvetica, sans-serif;
1356     - background: #e17200;
1357     - color: #ffffff;
1358     -}
1359     -.border {
1360     - background: #000000;
1361     - color: #000000;
1362     - border-color: #000000;
1363     -}
1364     -.sidebar {
1365     - width: 200px;
1366     - background: #ffffff;
1367     - font-size: smaller;
1368     - font-family: Verdana, Arial, Helvetica, sans-serif;
1369     - font-weight: normal;
1370     -}
1371     -.sidebar-title {
1372     - background: #1e385b;
1373     - color: #ffffff;
1374     - font-family: Verdana, Arial, Helvetica, sans-serif;
1375     - font-weight: bold;
1376     -}
1377     -.newsitem {
1378     - background: #ffffff;
1379     - color: #000000;
1380     - font-family: Verdana, Arial, Helvetica, sans-serif;
1381     - margin-left: 5px;
1382     - margin-right: 5px;
1383     - margin-top: 5px;
1384     - margin-bottom: 5px;
1385     -}
1386     -.newsitem-title {
1387     - background: #cccccc;
1388     - color: #ffffff;
1389     - font-family: Verdana, Arial, Helvetica, sans-serif;
1390     - font-weight: bold;
1391     -}
1392     -.newsitem-footer {
1393     - background: #cccccc;
1394     - color: #000000;
1395     - font-family: Verdana, Arial, Helvetica, sans-serif;
1396     - font-size: smaller;
1397     - text-align: right;
1398     -}
1399     -.newsitem-detail {
1400     - font-size: smaller;
1401     - font-weight: normal;
1402     -}
1403     -.formlabel {
1404     - background: #c0c0c0;
1405     - color: #000000;
1406     - font-family: Verdana, Arial, Helvetica, sans-serif;
1407     - font-size: small;
1408     - font-weight: bold;
1409     - text-align: right;
1410     -}
1411     -.welcome-link {
1412     - background: #ffffff;
1413     - color: #1e385b;
1414     -}
1415     -.littlelink {
1416     - font-family: Verdana, Arial, Helvetica, sans-serif;
1417     -}
1418     -#textlayer {
1419     - position: absolute;
1420     - visibility: inherit;
1421     - top: 160px;
1422     - left: 50px;
1423     - z-index: 2;
1424     -}
1425     -#para {
1426     - font-family: Verdana, Arial, Helvetica, sans-serif;
1427     - font-weight: bold;
1428     - color: #000000;
1429     -}
1430     -#title {
1431     - font-family: Verdana, Arial, Helvetica, sans-serif;
1432     - font-weight: bold;
1433     - padding: 7px 7px 7px 7px;
1434     - color: #ffffff;
1435     -}
1436     -*/
1437     -
1438     -EOF
1439     -}
1440     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
1441     --- 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
1442     +++ 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
1443     @@ -1 +0,0 @@
1444     -/* DO NOT MODIFY THIS FILE! It is updated automatically */
1445     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
1446     --- 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
1447     +++ 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
1448     @@ -1,227 +0,0 @@
1449     -{
1450     - $OUT = <<'EOF';
1451     -
1452     -/*----------------------------------------------------------------------
1453     - * copyright (C) 1999-2003 Mitel Networks Corporation
1454     - *
1455     - * This program is free software; you can redistribute it and/or modify
1456     - * it under the terms of the GNU General Public License as published by
1457     - * the Free Software Foundation; either version 2 of the License, or
1458     - * (at your option) any later version.
1459     - *
1460     - * This program is distributed in the hope that it will be useful,
1461     - * but WITHOUT ANY WARRANTY; without even the implied warranty of
1462     - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1463     - * GNU General Public License for more details.
1464     - *
1465     - * You should have received a copy of the GNU General Public License
1466     - * along with this program; if not, write to the Free Software
1467     - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1468     - *
1469     - * Technical support for this program is available from Mitel Networks
1470     - * Please visit our web site www.mitel.com for details.
1471     - *----------------------------------------------------------------------
1472     - */
1473     -
1474     -/* This is the stylesheet used in the navigation panel only
1475     -
1476     - This file inherits the styles use in sme_core in the "navigation" section,
1477     - and as noted in the code below. Note that some of the styles here are empty.
1478     - This is because the style definition has moved safely to sme_core.css and
1479     - the placeholder is left here for reference or future use.
1480     -
1481     - There are a lot of styles in here, so read carefully. Each one is
1482     - documented.
1483     -
1484     - Styles that were in the old stylesheets, but are not used in the UI are at
1485     - the bottom, commented out. These can be removed at the end of the 6.0
1486     - cycle */
1487     -
1488     -/* Sets the general page properties */
1489     -body, body.menu {
1490     - margin-top: 0px;
1491     - margin-right: 0px;
1492     - margin-bottom: 0px;
1493     - margin-left: 2px;
1494     -}
1495     -
1496     -/* This is the section heading style */
1497     -.section {
1498     -}
1499     -
1500     -td.menu-cell {
1501     - margin-top: 0px;
1502     - margin-right: 0px;
1503     - margin-bottom: 0px;
1504     - margin-left: 0px;
1505     - padding-left: 0px;
1506     - padding-right: 0px;
1507     - padding-top: 0px;
1508     - padding-bottom: 0px;
1509     -
1510     -}
1511     -
1512     -/*
1513     -All the a links use pseudoclasses to control the two visual link styles.
1514     -For example:
1515     - a.item:link the general link item
1516     - a.item-current:link: the active link item
1517     -
1518     -The switch from item to item-current is done with a javascript script in the head of the
1519     -navigation page, using the onClick event.
1520     -
1521     -We are making heavy use of the cascade with these.
1522     -*/
1523     -
1524     -/* a:link controls the look of a link when the mouse is nowhere near it */
1525     -a.item:link, a.item-current:link,
1526     -a.warn:link, a.warn-current:link {
1527     - display: block;
1528     - font-family: Verdana, Arial, Helvetica, sans-serif;
1529     - font-size: 10px;
1530     - color: black;
1531     - background: #eeeeee;
1532     - text-decoration: none;
1533     - text-align: left;
1534     - border-color: #eeeeee;
1535     - margin-top: 0px;
1536     - margin-right: 0px;
1537     - margin-bottom: 0px;
1538     - margin-left: 0px;
1539     - border-style: solid;
1540     - border-top-width: 1px;
1541     - border-right-width: 1px;
1542     - border-bottom-width: 1px;
1543     - border-left-width: 1px;
1544     - padding-right: 10px;
1545     - padding-left: 10px;
1546     - padding-top: 0px;
1547     - padding-bottom: 2px;
1548     - }
1549     -
1550     -/* a:visited controls the look of a visited link (one that has been clicked) */
1551     -a.item:visited, a.item-current:visited,
1552     -a.warn:visited, a.warn-current:visited {
1553     - display: block;
1554     - font-family: Verdana, Arial, Helvetica, sans-serif;
1555     - font-size: 10px;
1556     - color: black;
1557     - background: #eeeeee;
1558     - text-decoration: none;
1559     - border-color: #eeeeee;
1560     - margin-top: 0px;
1561     - margin-right: 0px;
1562     - margin-bottom: 0px;
1563     - margin-left: 0px;
1564     - border-style: solid;
1565     - border-top-width: 1px;
1566     - border-right-width: 1px;
1567     - border-bottom-width: 1px;
1568     - border-left-width: 1px;
1569     - padding-right: 10px;
1570     - padding-left: 10px;
1571     - padding-bottom: 2px;
1572     - text-align: left;
1573     -}
1574     -
1575     -/* a:hover controls the look of a link under the curser*/
1576     -a.item:hover, a.item-current:hover,
1577     -a.warn:hover, a.warn-current:hover {
1578     - display: block;
1579     - font-family: Verdana, Arial, Helvetica, sans-serif;
1580     - font-size: 10px;
1581     - color: black;
1582     - text-decoration: none;
1583     - background: #cccccc;
1584     - border-color: #888888;
1585     - margin-top: 0px;
1586     - margin-right: 0px;
1587     - margin-bottom: 0px;
1588     - margin-left: 0px;
1589     - border-style: solid;
1590     - border-top-width: 1px;
1591     - border-right-width: 1px;
1592     - border-bottom-width: 1px;
1593     - border-left-width: 1px;
1594     - padding-right: 10px;
1595     - padding-left: 10px;
1596     - padding-bottom: 2px;
1597     - text-align: left;
1598     -}
1599     -
1600     -/* a:active controls the look of a link as it is selected*/
1601     -a.item:active, a.item-current:active,
1602     -a.warn:active, a.warn-current:active {
1603     - display: block;
1604     - font-family: Verdana, Arial, Helvetica, sans-serif;
1605     - font-size: 10px;
1606     - color: white;
1607     - background: black;
1608     - text-decoration: none ;
1609     - border-color: #000000;
1610     - margin-top: 0px;
1611     - margin-right: 0px;
1612     - margin-bottom: 0px;
1613     - margin-left: 0px;
1614     - border-style: solid;
1615     - border-top-width: 1px;
1616     - border-right-width: 1px;
1617     - border-bottom-width: 1px;
1618     - border-left-width: 1px;
1619     - padding-right: 10px;
1620     - padding-left: 10px;
1621     - padding-bottom: 2px;
1622     - text-align: left;
1623     -}
1624     -
1625     -/*
1626     -These styles are to ensure that a selected link appears selected, even if the link
1627     -opens in another frame. This uses a javascript chunk in the head of the navigation
1628     -frame to change the style using the onClick event.
1629     -*/
1630     -a.item-current:link, a.warn-current:link,
1631     -a.item-current:visited, a.warn-current:visited,
1632     -a.item-current:active, a.warn-current:active,
1633     -a.item-current:hover, a.warn-current:hover {
1634     - display: block;
1635     - font-family: Verdana, Arial, Helvetica, sans-serif;
1636     - font-size: 10px;
1637     - color: black;
1638     - text-decoration: none;
1639     - background: #ffffff;
1640     - border-color: #888888;
1641     - margin-top: 0px;
1642     - margin-right: 0px;
1643     - margin-bottom: 0px;
1644     - margin-left: 0px;
1645     - border-style: solid;
1646     - border-top-width: 1px;
1647     - border-right-width: 1px;
1648     - border-bottom-width: 1px;
1649     - border-left-width: 1px;
1650     - padding-right: 10px;
1651     - padding-left: 10px;
1652     - padding-bottom: 2px;
1653     - text-align: left;
1654     -}
1655     -
1656     -/* these two add a border on the styles defined directly above when
1657     -the mouse is hovering over them */
1658     -a.item-current:hover, a.warn-current:hover {
1659     - border-color: #888888;
1660     -}
1661     -
1662     -/* These redefine a few elements to make room for the icon to the left of the warn class*/
1663     -a.warn:link, a.warn-current:link,
1664     -a.warn:visited, a.warn-current:visited,
1665     -a.warn:active, a.warn-current:active,
1666     -a.warn:hover, a.warn-current:hover {
1667     - background-image: url(/server-common/warn.gif);
1668     - background-repeat: no-repeat;
1669     - background-position: 10px;
1670     - padding-left: 25px;
1671     -}
1672     -/*end*/
1673     -
1674     -EOF
1675     -}
1676     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
1677     --- 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
1678     +++ 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
1679     @@ -1 +0,0 @@
1680     -/* DO NOT MODIFY THIS FILE! It is updated automatically */
1681     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
1682     --- 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
1683     +++ 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
1684     @@ -1,89 +0,0 @@
1685     -{
1686     - $OUT = <<'EOF';
1687     -
1688     -/*----------------------------------------------------------------------
1689     - * copyright (C) 1999-2003 Mitel Networks Corporation
1690     - *
1691     - * This program is free software; you can redistribute it and/or modify
1692     - * it under the terms of the GNU General Public License as published by
1693     - * the Free Software Foundation; either version 2 of the License, or
1694     - * (at your option) any later version.
1695     - *
1696     - * This program is distributed in the hope that it will be useful,
1697     - * but WITHOUT ANY WARRANTY; without even the implied warranty of
1698     - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1699     - * GNU General Public License for more details.
1700     - *
1701     - * You should have received a copy of the GNU General Public License
1702     - * along with this program; if not, write to the Free Software
1703     - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1704     - *
1705     - * Technical support for this program is available from Mitel Networks
1706     - * Please visit our web site www.mitel.com for details.
1707     - *----------------------------------------------------------------------
1708     - */
1709     -
1710     -/* This set of classes is intended for use as a tabbed menu in a panel. The
1711     - * menu itself is built out of an itemized list, with the navmenu style applied
1712     - * to it. In this way, if the browser does not support CSS 2.0, a standard
1713     - * itemized list will be seen instead. This also makes the menu perfectly
1714     - * workable in Lynx.
1715     - *
1716     - * To make use of this menu, see the new menu attribute of the page tab in
1717     - * FormMagick, perl-CGI-FormMagick-0.91-09. Use that callback to output your
1718     - * itemized list with this style, and set the 'here' class to indicate the
1719     - * current position in the menu.
1720     - *
1721     - * This code is currently being tested using inline styles in the Teleworker
1722     - * product, version 3.1 or higher, and the mps_2004_05_21-16_16_27 branch of
1723     - * e-smith-backup. Look to those initially for examples of use.
1724     - *
1725     - * While this does not yet support nested tabs, it would not be difficult to
1726     - * add.
1727     - */
1728     -
1729     -#navmenu {
1730     - border-bottom : 1px solid #ccc;
1731     - margin : 0;
1732     - padding-bottom : 19px;
1733     - padding-left : 10px;
1734     -}
1735     -
1736     -#navmenu ul, #navmenu li {
1737     - display : inline;
1738     - list-style-type : none;
1739     - margin : 0;
1740     - padding : 0;
1741     -}
1742     -
1743     -#navmenu a {
1744     - background : #E8EBF0;
1745     - border : 1px solid #ccc;
1746     - color : #666;
1747     - float : left;
1748     - font-size : small;
1749     - font-weight : normal;
1750     - line-height : 14px;
1751     - margin-right : 8px;
1752     - padding : 2px 10px 2px 10px;
1753     - text-decoration : none;
1754     -}
1755     -
1756     -#navmenu a:link.active, #navmenu a:visited.active, #navmenu a.here {
1757     - background : #fff;
1758     - border-bottom : 1px solid #fff;
1759     - color : #000;
1760     -}
1761     -
1762     -#navmenu a:hover {
1763     - color : #f00;
1764     -}
1765     -
1766     -#navmenu ul a:hover {
1767     - color : #f00 !important;
1768     -}
1769     -
1770     -/* End sme panel menu. */
1771     -
1772     -EOF
1773     -}
1774     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
1775     --- 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
1776     +++ 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
1777     @@ -1 +0,0 @@
1778     -/* DO NOT MODIFY THIS FILE! It is updated automatically */
1779     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
1780     --- 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
1781     +++ 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
1782     @@ -1,20 +0,0 @@
1783     -\{
1784     - # we can snag lexical $fi_filename from Text::Template to find out how
1785     - # we were called
1786     - $NO_FRAMES = ($fi_filename =~ /noframes_.*\.tmpl$/) ? 1 : 0;
1787     - $OUT;
1788     -\}
1789     -<HR class="sme-copyrightbar">
1790     -<FONT class="sme-copyright">
1791     - \{
1792     - use esmith::ConfigDB;
1793     - my $db = esmith::ConfigDB->open();
1794     -
1795     - my $sysconfig = $db->get("sysconfig");
1796     -
1797     - my $lang = (split(/,/, $ENV\{"HTTP_ACCEPT_LANGUAGE"\}))[0];
1798     - # convert xx_XX lang format to xx-xx
1799     - ($lang = lc($lang)) =~ s/_/-/;
1800     -
1801     - my $releaseVersion = $sysconfig->prop("ReleaseVersion");
1802     -
1803     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
1804     --- 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
1805     +++ 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
1806     @@ -1,10 +0,0 @@
1807     - $OUT .= "Copyright 1999-2006 Mitel Corporation<BR>";
1808     -
1809     - use Locale::gettext;
1810     - use esmith::I18N;
1811     - my $i18n = esmith::I18N->new();
1812     - $i18n->setLocale('foot.tmpl', $i18n->preferredLanguage());
1813     - $OUT .= gettext("All rights reserved.");
1814     - $OUT;
1815     - \}
1816     -
1817     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
1818     --- 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
1819     +++ 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
1820     @@ -1,10 +0,0 @@
1821     -</FONT>
1822     -</BODY>
1823     -\{
1824     - if ($NO_FRAMES)
1825     - \{
1826     - $OUT .= "</NOFRAMES>\n";
1827     - \}
1828     - $OUT;
1829     -\}
1830     -</HTML>
1831     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
1832     --- 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
1833     +++ 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
1834     @@ -1,12 +0,0 @@
1835     -\{
1836     - # we can snag lexical $fi_filename from Text::Template to find out how
1837     - # we were called
1838     - $NO_FRAMES = ($fi_filename =~ /noframes_.*\.tmpl$/) ? 1 : 0;
1839     - $USER_PASSWORD = ($fi_filename =~ /userpassword_.*\.tmpl$/) ? 1 : 0;
1840     - $OUT;
1841     -\}
1842     -<!DOCTYPE html
1843     - PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
1844     - "http://www.w3.org/TR/html4/loose.dtd">
1845     -<html>
1846     -<head>
1847     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
1848     --- 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
1849     +++ 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
1850     @@ -1,15 +0,0 @@
1851     -\{
1852     - unless ($NO_FRAMES)
1853     - \{
1854     - $OUT .= <<EOF;
1855     - <link rev="made" href="mailto:bugs%40e-smith.com">
1856     - <meta name="copyright" content="(head.tmpl)Copyright 2003-2004 Mitel Corporation">
1857     - <link rel="stylesheet" type="text/css" href="/server-common/css/sme_core.css">
1858     - <style type="text/css">
1859     - \@import url("/server-common/css/sme_main.css");
1860     - </style>
1861     -EOF
1862     - \}
1863     - $OUT;
1864     -\}
1865     -</head>
1866     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
1867     --- 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
1868     +++ 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
1869     @@ -1,45 +0,0 @@
1870     -\{
1871     - if ($NO_FRAMES)
1872     - \{
1873     - $OUT .= <<EOF;
1874     -<frameset rows="68,*" cols="*" frameborder="NO" border="0" framespacing="0">
1875     - <frame src="/server-manager/header.htm" name="header" scrolling="NO" noresize >
1876     - <frameset rows="*" cols="192,*" framespacing="0" frameborder="NO" border="0">
1877     - <frame src="/server-manager/navigation" name="navigation" scrolling="auto" noresize>
1878     - <frame src="/server-manager/initial.cgi" name="main">
1879     - </frameset>
1880     -</frameset>
1881     -
1882     -</FRAMESET>
1883     -
1884     -<NOFRAMES>
1885     -EOF
1886     - \}
1887     - else
1888     - \{
1889     - my $panel = "Server manager";
1890     - my $img = "smeserver_logo.jpg";
1891     -
1892     - $OUT .= <<EOF;
1893     -<body>
1894     -EOF
1895     - \}
1896     -
1897     - if( $ENV\{REQUEST_URI\} =~ m/(server-manager)/) \{
1898     -
1899     - $DB = esmith::ConfigDB->open();
1900     - $OUT .= qq(<div class="sme-error"><h5>
1901     - Warning: you have not yet changed the default system password.</h5></div>)
1902     - unless ($DB->get('PasswordSet')->value eq "yes");
1903     -
1904     - $OUT .= qq(<div class="sme-error"><h5>
1905     - Warning: a reconfigure and reboot is required before proceeding! Failure to do so now
1906     - may leave your system in an unknown state!</h5></div>)
1907     - if ($DB->get('bootstrap-console') and $DB->get('bootstrap-console')->prop('Run') eq 'yes') ||
1908     - ($DB->get('UnsavedChanges') and $DB->get('UnsavedChanges')->value eq 'yes');
1909     -
1910     - $OUT;
1911     -
1912     - \}
1913     -
1914     -\}
1915     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
1916     --- 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
1917     +++ 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
1918     @@ -1,10 +0,0 @@
1919     -<html>
1920     -<head>
1921     -<title>Untitled Document</title>
1922     -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
1923     -<link rel="stylesheet" type="text/css" href="/server-common/css/sme_core.css">
1924     -<link rel="stylesheet" type="text/css" href="/server-common/css/sme_panel_menu.css">
1925     -<style type="text/css">
1926     -@import url("/server-common/css/sme_header.css");
1927     -</style>
1928     -</head>
1929     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
1930     --- 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
1931     +++ 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
1932     @@ -1 +0,0 @@
1933     -<body class=header leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
1934     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
1935     --- 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
1936     +++ 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
1937     @@ -1,7 +0,0 @@
1938     -<table width="100%" border="0" cellspacing="0" cellpadding="0">
1939     - <tr>
1940     - <td class="hilightbar">
1941     - <img src="/server-common/spacer.gif" height="6" width="1">
1942     - </td>
1943     - </tr>
1944     -</table>
1945     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
1946     --- 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
1947     +++ 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
1948     @@ -1,15 +0,0 @@
1949     -<table width="100%" border="0" cellspacing="0" cellpadding="0">
1950     - <tr>
1951     - <td align=left nowrap class="infobar">
1952     - <img src="/server-common/spacer.gif" height="14" width="1" align="left">
1953     - <b>admin@{ "${SystemName}.${DomainName}" }</b>
1954     - &nbsp;&nbsp;&nbsp;
1955     - <!-- <a href="#">Logout</a> --></td>
1956     - <td align=right nowrap class="infobar">
1957     - <!-- <a class="update" target="main" href="/server-manager/cgi-bin/blades">Update Available</a>|-->
1958     - <a target="main" href="/server-manager/cgi-bin/online-manual">&nbsp;&nbsp;<b> ? </b>&nbsp;&nbsp;</a>&nbsp;</td>
1959     - <td nowrap class="infobar">
1960     - <a target="_parent" href="/server-common/cgi-bin/logout"><b>Logout</b></a>&nbsp;</td>
1961     - </tr>
1962     -</table>
1963     -
1964     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
1965     --- 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
1966     +++ 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
1967     @@ -1,2 +0,0 @@
1968     -</body>
1969     -</html>
1970     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
1971     --- 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
1972     +++ 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
1973     @@ -1,10 +0,0 @@
1974     -<!--
1975     -#------------------------------------------------------------
1976     -# DO NOT MODIFY THIS FILE! It is updated automatically by the
1977     -# SME Server software. Instead, modify the source template in
1978     -# an /etc/e-smith/templates-custom directory. For more
1979     -# information, see http://www.e-smith.org/custom/
1980     -#
1981     -# copyright (C) 2002 Mitel Networks Corporation
1982     -#------------------------------------------------------------
1983     --->
1984     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
1985     --- 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
1986     +++ 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
1987     @@ -1,22 +0,0 @@
1988     -{
1989     - #---------------------------------------------------------------------
1990     - # Grab ValidFrom access list property of httpd-admin
1991     - # SSL enabled virtual hosts should only allow access from IP's in
1992     - # this list, as well as local networks.
1993     - #---------------------------------------------------------------------
1994     - use esmith::NetworksDB;
1995     -
1996     - my $ndb = esmith::NetworksDB->open_ro();
1997     -
1998     - my @localAccess = $ndb->local_access_spec();
1999     - my $validFrom = ${'httpd-admin'}{'ValidFrom'};
2000     - if ($validFrom)
2001     - {
2002     - push @localAccess, split /,/, $validFrom;
2003     - }
2004     - $localAccess .= join ' ',
2005     - map { s:/255.255.255.255::; $_ }
2006     - @localAccess;
2007     -
2008     - "";
2009     -}
2010     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
2011     --- 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
2012     +++ 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
2013     @@ -1,163 +0,0 @@
2014     -{
2015     - $OUT .= "Listen 127.0.0.1:${'httpd-admin'}{TCPPort}\n";
2016     -
2017     - $OUT .= <<HERE;
2018     -
2019     -HostnameLookups off
2020     -
2021     -ServerAdmin admin@$DomainName
2022     -ServerRoot /etc/httpd
2023     -ServerTokens ProductOnly
2024     -
2025     -User admin
2026     -Group admin
2027     -
2028     -ErrorLog /var/log/httpd/admin_error_log
2029     -LogLevel warn
2030     -HERE
2031     -
2032     -foreach (qw(
2033     - env
2034     - log_config
2035     - mime
2036     - negotiation
2037     - status
2038     - info
2039     - include
2040     - autoindex
2041     - dir
2042     - cgi
2043     - asis
2044     - imap
2045     - imagemap
2046     - actions
2047     - userdir
2048     - proxy
2049     - proxy_http
2050     - alias
2051     - rewrite
2052     - access
2053     - authz_host
2054     - authz_user
2055     - auth
2056     - auth_anon
2057     - auth_digest
2058     - expires
2059     - headers
2060     - usertrack
2061     - setenvif
2062     - ))
2063     -{
2064     - next unless -f "/usr/lib/httpd/modules/mod_${_}.so" ||
2065     - -f "/usr/lib64/httpd/modules/mod_${_}.so";
2066     - $OUT .= "LoadModule ${_}_module modules/mod_${_}.so\n";
2067     -}
2068     -
2069     -$OUT .= <<HERE;
2070     -PidFile /var/run/httpd-admin.pid
2071     -ScoreBoardFile /var/run/httpd-admin.scoreboard
2072     -UseCanonicalName off
2073     -LogFormat "%h %l %u %t \\"%r\\" %>s %b" common
2074     -LogFormat "%{User-agent}i" agent
2075     -
2076     -CustomLog /var/log/httpd/admin_access_log common
2077     -
2078     -KeepAlive On
2079     -MaxKeepAliveRequests 100
2080     -KeepAliveTimeout 15
2081     -
2082     -MaxClients 150
2083     -MaxRequestsPerChild 100
2084     -
2085     -ServerName www.$DomainName
2086     -
2087     -MinSpareServers 1
2088     -MaxSpareServers 5
2089     -StartServers 1
2090     -Timeout 300
2091     -
2092     -DefaultIcon /icons/unknown.gif
2093     -DirectoryIndex index.htm index.html index.shtml index.cgi
2094     -IndexOptions FancyIndexing VersionSort NameWidth=*
2095     -IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
2096     -AccessFileName .htaccess
2097     -
2098     -AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip
2099     -AddIconByType (TXT,/icons/text.gif) text/*
2100     -AddIconByType (IMG,/icons/image2.gif) image/*
2101     -AddIconByType (SND,/icons/sound2.gif) audio/*
2102     -AddIconByType (VID,/icons/movie.gif) video/*
2103     -DefaultType text/plain
2104     -TypesConfig /etc/mime.types
2105     -
2106     -AddEncoding x-compress Z
2107     -AddEncoding x-gzip gz
2108     -
2109     -AddIcon /icons/binary.gif .bin .exe
2110     -AddIcon /icons/binhex.gif .hqx
2111     -AddIcon /icons/tar.gif .tar
2112     -AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv
2113     -AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip
2114     -AddIcon /icons/a.gif .ps .ai .eps
2115     -AddIcon /icons/layout.gif .html .shtml .htm .pdf
2116     -AddIcon /icons/text.gif .txt
2117     -AddIcon /icons/c.gif .c
2118     -AddIcon /icons/p.gif .pl .py
2119     -AddIcon /icons/f.gif .for
2120     -AddIcon /icons/dvi.gif .dvi
2121     -AddIcon /icons/uuencoded.gif .uu
2122     -AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
2123     -AddIcon /icons/tex.gif .tex
2124     -AddIcon /icons/bomb.gif core
2125     -
2126     -AddIcon /icons/back.gif ..
2127     -AddIcon /icons/hand.right.gif README
2128     -AddIcon /icons/folder.gif ^^DIRECTORY^^
2129     -AddIcon /icons/blank.gif ^^BLANKICON^^
2130     -
2131     -AddLanguage en .en
2132     -AddLanguage fr .fr
2133     -AddLanguage de .de
2134     -AddLanguage da .da
2135     -AddLanguage el .el
2136     -AddLanguage it .it
2137     -
2138     -LanguagePriority en fr de
2139     -
2140     -AddType text/html .shtml
2141     -AddType application/x-pkcs7-crl .crl
2142     -
2143     -AddType application/x-x509-ca-cert .crt
2144     -
2145     -BrowserMatch "Mozilla/2" nokeepalive
2146     -BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
2147     -BrowserMatch "RealPlayer 4\.0" force-response-1.0
2148     -BrowserMatch "Java/1\.0" force-response-1.0
2149     -BrowserMatch "JDK/1\.0" force-response-1.0
2150     -
2151     -AddHandler cgi-script .cgi
2152     -AddHandler server-parsed .shtml
2153     -AddHandler imap-file map
2154     -
2155     -DocumentRoot /etc/e-smith/web/panels/manager/html
2156     -
2157     -ScriptAlias /server-common/cgi-bin/ /etc/e-smith/web/common/cgi-bin/
2158     -Alias /server-common/ /etc/e-smith/web/common/
2159     -ScriptAlias /server-manager/noframes /etc/e-smith/web/panels/manager/cgi-bin/noframes
2160     -ScriptAlias /server-manager/support /etc/e-smith/web/panels/manager/cgi-bin/support
2161     -ScriptAlias /server-manager/navigation /etc/e-smith/web/panels/manager/cgi-bin/navigation
2162     -
2163     -# e-smith manager panel
2164     -ScriptAlias /server-manager/cgi-bin /etc/e-smith/web/panels/manager/cgi-bin
2165     -Alias /server-manager /etc/e-smith/web/panels/manager/html
2166     -
2167     -# e-smith password panel
2168     -ScriptAlias /user-password /etc/e-smith/web/panels/password/cgi-bin/userpassword
2169     -
2170     -Alias /server-resources/ /home/e-smith/files/server-resources/
2171     -
2172     -Alias /icons/ /var/www/icons/
2173     -
2174     -HERE
2175     -}
2176     -
2177     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
2178     --- 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
2179     +++ 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
2180     @@ -1,6 +0,0 @@
2181     -{
2182     - $OUT .= "LoadModule auth_tkt_module modules/mod_auth_tkt.so\n";
2183     -
2184     - my $secret = ${'httpd-admin'}{TKTAuthSecret} || "34322500-7330-4400-423A-3A00434F5245";
2185     - $OUT .= "TKTAuthSecret \"$secret\"\n";
2186     -}
2187     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
2188     --- 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
2189     +++ 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
2190     @@ -1,12 +0,0 @@
2191     -
2192     -# First, we configure the "default" to be a very restrictive set of
2193     -# permissions.
2194     -
2195     -<Directory />
2196     - Options None
2197     - AllowOverride None
2198     - order deny,allow
2199     - deny from all
2200     - allow from none
2201     -</Directory>
2202     -
2203     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
2204     --- 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
2205     +++ 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
2206     @@ -1,10 +0,0 @@
2207     -# Server resources access configuration
2208     -
2209     -<Directory /home/e-smith/files/server-resources>
2210     - Options +Indexes
2211     - order deny,allow
2212     - deny from all
2213     -{
2214     - $OUT .= " allow from $localAccess\n";
2215     -}
2216     -</Directory>
2217     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
2218     --- 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
2219     +++ 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
2220     @@ -1,12 +0,0 @@
2221     -#------------------------------------------------------------
2222     -# e-smith files shared by manager and other control packages
2223     -#------------------------------------------------------------
2224     -
2225     -<Directory "/home/e-smith/web/common">
2226     - Options Indexes Includes
2227     - AllowOverride None
2228     - order deny,allow
2229     - deny from all
2230     - allow from all
2231     -</Directory>
2232     -
2233     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
2234     --- 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
2235     +++ 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
2236     @@ -1,40 +0,0 @@
2237     -#------------------------------------------------------------
2238     -# e-smith files shared by manager and other control packages
2239     -#------------------------------------------------------------
2240     -
2241     -<Directory "/etc/e-smith/web/common/cgi-bin">
2242     - AllowOverride None
2243     - Options ExecCGI
2244     - order deny,allow
2245     - deny from all
2246     - allow from { $localAccess }
2247     - Satisfy all
2248     -</Directory>
2249     -
2250     -<Directory "/etc/e-smith/web/common">
2251     - Options Includes
2252     - AllowOverride None
2253     - order deny,allow
2254     - deny from all
2255     - allow from all
2256     - <FilesMatch ".*\.tmpl">
2257     - Order allow,deny
2258     - Deny from all
2259     - </FilesMatch>
2260     -</Directory>
2261     -
2262     -<Directory "/etc/e-smith/web/panels/manager/common">
2263     - Options Includes FollowSymLinks
2264     - AllowOverride None
2265     - order deny,allow
2266     - deny from all
2267     - allow from all
2268     - AuthType basic
2269     -
2270     - TKTAuthLoginURL /server-common/cgi-bin/login
2271     - TKTAuthTimeout 5m
2272     - TKTAuthCookieExpires 5m
2273     - require valid-user
2274     - Satisfy all
2275     -</Directory>
2276     -
2277     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
2278     --- 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
2279     +++ 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
2280     @@ -1,34 +0,0 @@
2281     -
2282     -#------------------------------------------------------------
2283     -# e-smith-manager panel
2284     -#------------------------------------------------------------
2285     -
2286     -<Directory "/etc/e-smith/web/panels/manager/html" >
2287     - Options Includes FollowSymLinks ExecCGI
2288     - AllowOverride None
2289     - order deny,allow
2290     - deny from all
2291     - allow from { $localAccess }
2292     - AuthType Basic
2293     - TKTAuthLoginURL /server-common/cgi-bin/login
2294     - TKTAuthTimeout 5m
2295     - TKTAuthCookieExpires 5m
2296     -
2297     - require user admin
2298     - Satisfy all
2299     -</Directory>
2300     -
2301     -<Directory "/etc/e-smith/web/panels/manager/cgi-bin">
2302     - Options Includes FollowSymLinks ExecCGI
2303     - AllowOverride None
2304     - order deny,allow
2305     - deny from all
2306     - allow from { $localAccess }
2307     - AuthType Basic
2308     - TKTAuthLoginURL /server-common/cgi-bin/login
2309     - TKTAuthTimeout 5m
2310     - TKTAuthCookieExpires 5m
2311     -
2312     - require user admin
2313     - Satisfy all
2314     -</Directory>
2315     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
2316     --- 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
2317     +++ 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
2318     @@ -1,16 +0,0 @@
2319     -
2320     -#------------------------------------------------------------
2321     -# e-smith-password panel
2322     -#------------------------------------------------------------
2323     -<Directory "/etc/e-smith/web/panels/password/html">
2324     - order deny,allow
2325     - deny from all
2326     - allow from { $localAccess }
2327     -</Directory>
2328     -
2329     -<Directory "/etc/e-smith/web/panels/password/cgi-bin">
2330     - order deny,allow
2331     - deny from all
2332     - allow from { $localAccess }
2333     -</Directory>
2334     -
2335     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
2336     --- 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
2337     +++ 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
2338     @@ -1,40 +0,0 @@
2339     -{
2340     - # vim: ft=perl:
2341     -
2342     - $haveSSL = (exists ${modSSL}{status} and ${modSSL}{status} eq "enabled") ? 'yes' : 'no';
2343     - $plainTextAccess = ${'httpd-admin'}{PermitPlainTextAccess} || 'no';
2344     - $plainPort = ${'httpd-e-smith'}{TCPPort} || '80';
2345     - $sslPort = ${modSSL}{TCPPort} || '443';
2346     -
2347     - $OUT = '';
2348     - foreach $place ('server-manager','server-common','user-password')
2349     - {
2350     - if (($port eq $plainPort) && ($haveSSL eq 'yes') && ($plainTextAccess ne 'yes'))
2351     - {
2352     - $OUT .= ' RewriteCond %{REMOTE_ADDR} !^127\.0\.0\.1$' . "\n";
2353     - $OUT .= " RewriteRule ^/$place(/.*|\$) https://%{HTTP_HOST}/$place\$1 [L,R]\n";
2354     - }
2355     - if ($port eq $sslPort)
2356     - {
2357     - # mod_auth_tkt needs to know the protocol to write 307 redirection
2358     - $OUT .= " RequestHeader set X-Forwarded-Proto \"https\"\n";
2359     - }
2360     - $OUT .= " ProxyPass /$place http://127.0.0.1:${'httpd-admin'}{TCPPort}/$place\n";
2361     - $OUT .= " ProxyPassReverse /$place http://127.0.0.1:${'httpd-admin'}{TCPPort}/$place\n";
2362     -
2363     - $OUT .= " <Location /$place>\n";
2364     - $OUT .= " order deny,allow\n";
2365     - $OUT .= " deny from all\n";
2366     - if ($port eq $plainPort)
2367     - {
2368     - $OUT .= ' allow from 127.0.0.1' . "\n";
2369     - }
2370     - elsif (($haveSSL eq 'yes') && (($port eq $sslPort) || ($plainTextAccess ne 'yes')))
2371     - {
2372     - $OUT .= " allow from $localAccess $externalSSLAccess\n";
2373     - } else {
2374     - $OUT .= " allow from $localAccess\n";
2375     - }
2376     - $OUT .= " </Location>\n";
2377     - }
2378     -}
2379     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
2380     --- 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
2381     +++ 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
2382     @@ -1 +0,0 @@
2383     -http-admin { ${'httpd-admin'}{TCPPort} }/tcp # admin HTTP server
2384     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
2385     --- 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
2386     +++ 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
2387     @@ -1,352 +0,0 @@
2388     -#!/usr/bin/perl -w
2389     -#
2390     -# mod_auth_tkt sample login script - runs as a vanilla CGI, under
2391     -# mod_perl 1 via Apache::Registry, and under mod_perl2 via
2392     -# ModPerl::Registry.
2393     -#
2394     -# This script can run in a few different modes, depending on how it is
2395     -# named. Copy the script to a cgi-bin area, and create appropriately
2396     -# named symlinks to access the different behaviours.
2397     -# Modes:
2398     -# - login mode (default): request a username and password and test via
2399     -# $validate_sub - if successful, issue an auth ticket and redirect to
2400     -# the back location
2401     -# - guest mode ('guest.cgi'): automatically issues an auth ticket a
2402     -# special username (as defined in $guest_sub, default 'guest'), and
2403     -# redirect to the back location (now largely obsolete - use
2404     -# TKTAuthGuestLogin instead)
2405     -# - autologin mode ('autologin.cgi'): [typically used to allow tickets
2406     -# across multiple domains] if no valid auth ticket exists, redirect
2407     -# to the login (or guest) version; otherwise automatically redirect
2408     -# to the back location passing the current auth ticket as a GET
2409     -# argument. mod_auth_tkt (>= 1.3.8) will turn this new ticket into
2410     -# an auth cookie for the new domain if none already exists.
2411     -#
2412     -
2413     -use File::Basename;
2414     -use lib dirname($ENV{SCRIPT_FILENAME});
2415     -use Apache::AuthTkt 0.03;
2416     -use CGI qw(:standard);
2417     -use CGI::Cookie;
2418     -use URI::Escape;
2419     -use URI;
2420     -use strict;
2421     -
2422     -# ------------------------------------------------------------------------
2423     -# Configure this section to taste
2424     -
2425     -# CSS stylesheet to use (optional)
2426     -my $STYLESHEET = '/server-common/css/tkt.css';
2427     -# Page title (optional)
2428     -my $TITLE = 'SME Server manager';
2429     -# For autologin, mode to fallback to if autologin fails ('login' or 'guest')
2430     -my $AUTOLOGIN_FALLBACK_MODE = 'login';
2431     -# Boolean flag, whether to fallback to HTTP_REFERER for back link
2432     -my $BACK_REFERER = 0;
2433     -
2434     -# For login mode (if used), setup username/password validation
2435     -# (modify or point $validate_sub somewhere appropriate).
2436     -# The validation routine should return a true value (e.g. 1) if the
2437     -# given username/password combination is valid, and a false value
2438     -# (e.g. 0) otherwise.
2439     -# This version uses Apache::Htpasswd and a standard htpasswd file.
2440     -sub validate
2441     -{
2442     - my ($username, $password) = @_;
2443     - unless (open(PWAUTH, "|/usr/bin/pwauth"))
2444     - {
2445     - warn "Could not open pipe to pwauth: $!";
2446     - return 0;
2447     - }
2448     - print PWAUTH "$username\n";
2449     - print PWAUTH "$password\n";
2450     - return close(PWAUTH) ? 1 : 0;
2451     -#require Apache::Htpasswd;
2452     -# my $ht = Apache::Htpasswd->new({
2453     -# passwdFile => '/etc/httpd/conf/htpasswd', ReadOnly => 1 });
2454     -# return $ht->htCheckPassword($username, $password);
2455     -}
2456     -my $validate_sub = \&validate;
2457     -
2458     -# For guest mode (if used), setup guest username
2459     -# Could use a counter or a random suffix etc.
2460     -sub guest_user
2461     -{
2462     - return 'guest';
2463     -}
2464     -my $guest_sub = \&guest_user;
2465     -
2466     -# ------------------------------------------------------------------------
2467     -# Main code begins
2468     -my $debug = 0;
2469     -my $at = Apache::AuthTkt->new(conf => "/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg");
2470     -my $q = CGI->new;
2471     -my $x_f = $q->http('X-Forwarded-Host');
2472     -#warn "X-Forwarded-Host is $x_f\n" if $x_f;
2473     -#warn "HTTP_HOST is $ENV{HTTP_HOST}\n" if $ENV{HTTP_HOST};
2474     -my ($server_name, $server_port) = split /:/, $q->http('X-Forwarded-Host') || $ENV{HTTP_HOST};
2475     -$server_name ||= $ENV{SERVER_NAME} if $ENV{SERVER_NAME};
2476     -$server_port ||= $ENV{SERVER_PORT} if $ENV{SERVER_PORT};
2477     -#my $AUTH_DOMAIN = $at->domain || $server_name;
2478     -my $AUTH_DOMAIN = $server_name;
2479     -#warn "AUTH_DOMAIN is $AUTH_DOMAIN\n";
2480     -#warn "AuthTkt->domain was set\n" if $at->domain;
2481     -my @auth_domain = $AUTH_DOMAIN && $AUTH_DOMAIN =~ /\./ ? ( -domain => $AUTH_DOMAIN ) : ();
2482     -my $ticket = $q->cookie($at->cookie_name);
2483     -my $probe = $q->cookie('auth_probe');
2484     -my $back = $q->cookie($at->back_cookie_name) if $at->back_cookie_name;
2485     -#warn "back from cookie is $back\n" if $back;
2486     -my $have_cookies = $ticket || $probe || $back || '';
2487     -$back ||= $q->param($at->back_arg_name) if $at->back_arg_name;
2488     -#warn "back from cgi param is $back\n" if $back;
2489     -$back ||= $ENV{HTTP_REFERER} if $ENV{HTTP_REFERER} && $BACK_REFERER;
2490     -$back = uri_unescape($back) if $back && $back =~ m/^https?%3A%2F%2F/i;
2491     -$back =~ s/^http:/https:/ if $server_name ne 'localhost';
2492     -#warn "back is $back\n";
2493     -if ($back && $back =~ m!^/!) {
2494     - my $hostname = $server_name;
2495     - my $port = $server_port;
2496     - $hostname .= ':' . $port if $port && $port != 80 && $port != 443;
2497     - $back = sprintf "http%s://%s%s", ($port == 443 ? 's' : ''), $hostname, $back;
2498     -#warn "back is $back\n";
2499     -} elsif ($back && $back !~ m/^http/i) {
2500     - $back = 'http://' . $back;
2501     -#warn "back is $back\n";
2502     -}
2503     -
2504     -#warn "back is $back\n";
2505     -my $back_esc = uri_escape($back) if $back;
2506     -my $back_html = escapeHTML($back) if $back;
2507     -
2508     -my ($fatal, @errors);
2509     -my ($mode, $location, $suffix) = fileparse($ENV{SCRIPT_NAME}, '\.cgi', '\.pl');
2510     -$mode = 'login' unless $mode eq 'guest' || $mode eq 'autologin';
2511     -my $self_redirect = $q->param('redirect') || 0;
2512     -my $username = lc($q->param('username'));
2513     -my $password = $q->param('password');
2514     -my $timeout = $q->param('timeout');
2515     -my $unauth = $q->param('unauth');
2516     -my $ip_addr = $at->ignore_ip ? undef : $ENV{REMOTE_ADDR};
2517     -my $redirected = 0;
2518     -
2519     -# ------------------------------------------------------------------------
2520     -# Set the auth cookie and redirect to $back
2521     -my $set_cookie_redirect = sub {
2522     - my ($tkt, $back) = @_;
2523     - my @expires = $at->cookie_expires ?
2524     - ( -expires => sprintf("+%ss", $at->cookie_expires) ) :
2525     - ();
2526     - my $cookie = CGI::Cookie->new(
2527     - -name => $at->cookie_name,
2528     - -value => $tkt,
2529     - -path => '/',
2530     - -secure => $at->require_ssl,
2531     - @expires,
2532     - @auth_domain,
2533     - );
2534     -
2535     - # If no $back, just set the auth cookie and hope for the best
2536     - if (! $back) {
2537     - print $q->header( -cookie => $cookie );
2538     - print $q->start_html, $q->p("Login successful"), $q->end_html;
2539     - return 0;
2540     - }
2541     -
2542     - # Set (local) cookie, and redirect to $back
2543     - print $q->header( -cookie => $cookie );
2544     -#return 0 if $debug;
2545     -
2546     - my $b = URI->new($back);
2547     - # If $back domain doesn't match $AUTH_DOMAIN, pass ticket via back GET param
2548     - my $domain = $AUTH_DOMAIN || $server_name;
2549     - if ($b->host !~ m/\b$domain$/i) {
2550     - $back .= $b->query ? '&' : '?';
2551     - $back .= $at->cookie_name . '=' . $tkt;
2552     - }
2553     -
2554     - # For some reason, using a Location: header doesn't seem to then see the
2555     - # cookie, but a meta refresh one does - weird
2556     - print $q->start_html(
2557     - -head => meta({ -http_equiv => 'refresh', -content => "0;URL=$back" }),
2558     - ),
2559     - $q->end_html;
2560     - return 1;
2561     -};
2562     -
2563     -# ------------------------------------------------------------------------
2564     -# Actual processing
2565     -
2566     -# If no cookies found, first check whether cookies are supported
2567     -if (! $have_cookies) {
2568     - # If this is a self redirect warn the user about cookie support
2569     - if ($self_redirect) {
2570     - $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.";
2571     - }
2572     - # If no cookies and not a redirect, redirect to self to test cookies
2573     - else {
2574     - my $extra = '';
2575     - $extra .= 'timeout=1' if $timeout;
2576     - $extra .= 'unauth=1' if $unauth;
2577     - $extra = "&$extra" if $extra;
2578     - print $q->header(
2579     - -cookie => CGI::Cookie->new(-name => 'auth_probe', -value => 1, @auth_domain),
2580     - );
2581     - # For some reason, a Location: redirect doesn't seem to then see the cookie,
2582     - # but a meta refresh one does - go figure
2583     - print $q->start_html(
2584     - -head => meta({
2585     - -http_equiv => 'refresh', -content => ("0;URL=" . sprintf("%s%s%s?redirect=%s&%s=%s%s",
2586     - $location, $mode, $suffix, $self_redirect + 1, $at->back_arg_name,
2587     - $back_esc || '', $extra))
2588     - }));
2589     - $redirected = 1;
2590     - }
2591     -}
2592     -
2593     -elsif ($mode eq 'autologin') {
2594     - # If we have a ticket, redirect to $back, including ticket as GET param
2595     - if ($ticket && $back && ! $timeout) {
2596     - my $b = URI->new($back);
2597     - $back .= $b->query ? '&' : '?';
2598     - $back .= $at->cookie_name . '=' . $ticket;
2599     - print $q->redirect($back);
2600     - $redirected = 1;
2601     - }
2602     - # Can't autologin - change mode to either guest or login
2603     - else {
2604     - $mode = $AUTOLOGIN_FALLBACK_MODE;
2605     - }
2606     -}
2607     -
2608     -unless ($fatal || $redirected) {
2609     - if (! $at) {
2610     - $fatal = "AuthTkt error: " . $at->errstr;
2611     - }
2612     - elsif ($mode eq 'login') {
2613     - if ($username && $validate_sub->($username, $password)) {
2614     -# my $user_data = join(':', encrypt($password), time(), $ip_addr);
2615     - my $user_data = join(':', time(), $ip_addr || ''); # Optional
2616     - my $tkt = $at->ticket(uid => $username, data => $user_data, ip_addr => $ip_addr, debug => $debug);
2617     - if (! @errors) {
2618     - $redirected = $set_cookie_redirect->($tkt, $back);
2619     - $fatal = "Login successful.";
2620     - }
2621     - }
2622     - elsif ($username) {
2623     - push @errors, "Invalid username or password.";
2624     - }
2625     - }
2626     -
2627     - elsif ($mode eq 'guest') {
2628     - # Generate a guest ticket and redirect to $back
2629     - my $tkt = $at->ticket(uid => $guest_sub->(), ip_addr => $ip_addr);
2630     - if (! @errors) {
2631     - $redirected = $set_cookie_redirect->($tkt, $back);
2632     - $fatal = "No back link found.";
2633     - }
2634     - }
2635     -}
2636     -
2637     -my @style = $STYLESHEET ? ('-style' => { src => $STYLESHEET }) : ();
2638     -$TITLE ||= "\u$mode Page";
2639     -unless ($redirected) {
2640     - # If here, either some kind of error or a login page
2641     - if ($fatal) {
2642     - print $q->header,
2643     - $q->start_html(
2644     - -title => $TITLE,
2645     - @style,
2646     - );
2647     - }
2648     - else {
2649     - push @errors, qq(Your session has timed out.) if $timeout;
2650     - push @errors, qq(You are not authorised to access this area.) if $unauth;
2651     - print $q->header,
2652     - $q->start_html(
2653     - -title => $TITLE,
2654     - -onLoad => "getFocus()",
2655     - @style,
2656     - -script => qq(
2657     -function getFocus() {
2658     - document.forms[0].elements[0].focus();
2659     - document.forms[0].elements[0].select();
2660     -}));
2661     - }
2662     - print <<EOD;
2663     -<div align="center">
2664     -<p>&nbsp;</p>
2665     -<p>&nbsp;</p>
2666     -<h2>Welcome to SME server</h2>
2667     -EOD
2668     -
2669     - if ($debug) {
2670     - my $cookie_name = $at->cookie_name;
2671     - my $back_cookie_name = $at->back_cookie_name || '';
2672     - my $back_cookie_path = $q->cookie($at->back_cookie_name) || '';
2673     - my $back_arg_name = $at->back_arg_name || '';
2674     - my $cookie_expires = $at->cookie_expires || 0;
2675     - my $referer = $ENV{HTTP_REFERER};
2676     - print <<EOD;
2677     -<pre>
2678     -server_name: $server_name
2679     -server_port: $server_port
2680     -domain: $AUTH_DOMAIN
2681     -mode: $mode
2682     -suffix: $suffix
2683     -cookie_name: $cookie_name
2684     -cookie_expires: $cookie_expires
2685     -back_cookie_name: $back_cookie_name
2686     -back_cookie_path: $back_cookie_path
2687     -back_arg_name: $back_arg_name
2688     -referer: $referer
2689     -back: $back
2690     -back_esc: $back_esc
2691     -back_html: $back_html
2692     -have_cookies: $have_cookies
2693     -ip_addr: $ip_addr
2694     -</pre>
2695     -EOD
2696     - }
2697     -
2698     - if ($fatal) {
2699     - print qq(<p class="error">$fatal</p>\n);
2700     - }
2701     -
2702     - else {
2703     - print qq(<p class="error">\n), join(qq(<br />\n), @errors), "</p>\n"
2704     - if @errors;
2705     - print <<EOD;
2706     -<form name="login" method="post" action="$mode$suffix">
2707     -<table border="0" cellpadding="5">
2708     -<tr><th>Username:</th><td><input type="text" name="username" /></td></tr>
2709     -<tr><th>Password:</th><td><input type="password" name="password" /></td></tr>
2710     -<tr><td colspan="2" align="center">
2711     -<input type="submit" value="Login" />
2712     -</td></tr>
2713     -</table>
2714     -EOD
2715     - print qq(<input type="hidden" name="back" value="$back_html" />\n) if $back_html;
2716     - print qq(</form>\n);
2717     -}
2718     -
2719     -# print qq(<p><a href="$back_html">Previous Page</a></p>\n) if $back_html;
2720     - print <<EOD;
2721     -<!-- Start Donate section -->
2722     -<p>Remember that SME Server is <i>free to download</i> and use, but it is <i><b>not</b>
2723     -free to build</i></p>
2724     -<p>Please help the project</p>
2725     -<p><a href="http://www.smeserver.org/donate/" target="_blank"><img
2726     -src="../btn_donateCC_LG.gif"
2727     -alt="http://www.smeserver.org/donate/" align="middle"></a>
2728     -</p>
2729     -<p>-- The SME Server Team --</p>
2730     -<!-- Finish Donate section -->
2731     -</div>
2732     -</body>
2733     -</html>
2734     -EOD
2735     -}
2736     -
2737     -# arch-tag: 1cac856d-534c-4c81-9e9a-34e39d26f4f2
2738     -# vim:sw=2:sm:cin
2739     -
2740     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
2741     --- 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
2742     +++ 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
2743     @@ -1,128 +0,0 @@
2744     -#!/usr/bin/perl -w
2745     -#
2746     -# mod_auth_tkt sample logout script
2747     -#
2748     -# Note that this needs script needs to be available locally on all domains
2749     -# if using multiple domains (unlike login.cgi, which only needs to exist
2750     -# on one domain).
2751     -#
2752     -
2753     -use File::Basename;
2754     -use lib dirname($ENV{SCRIPT_FILENAME});
2755     -use Apache::AuthTkt 0.03;
2756     -use CGI qw(:standard);
2757     -use URI::Escape;
2758     -use URI;
2759     -use strict;
2760     -
2761     -# ------------------------------------------------------------------------
2762     -# Configure this section to taste
2763     -
2764     -# CSS stylesheet to use (optional)
2765     -my $STYLESHEET = '/server-common/css/tkt.css';
2766     -# Page title (optional)
2767     -my $TITLE = '';
2768     -# Boolean flag, whether to fallback to HTTP_REFERER for back link
2769     -my $BACK_REFERER = 1;
2770     -# Additional cookies to clear on logout e.g. PHPSESSID
2771     -my @NUKE_COOKIES = qw();
2772     -
2773     -# ------------------------------------------------------------------------
2774     -# Main code begins
2775     -my $debug = 0;
2776     -my $at = Apache::AuthTkt->new(conf => "/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg");
2777     -my $q = CGI->new;
2778     -my ($server_name, $server_port) = split /:/, $q->http('X-Forwarded-Host') || $ENV{HTTP_HOST};
2779     -#warn "servername is $server_name; HOST is $ENV{HTTP_HOST}\n";
2780     -$server_name ||= $ENV{SERVER_NAME};
2781     -$server_port ||= $ENV{SERVER_PORT};
2782     -$server_port = ( $server_name eq 'localhost' ) ? '80' : '443';
2783     -my $AUTH_DOMAIN = $server_name;
2784     -my $back = $q->cookie($at->back_cookie_name) if $at->back_cookie_name;
2785     -$back ||= $q->param($at->back_arg_name) if $at->back_arg_name;
2786     -$back ||= $ENV{HTTP_REFERER} if $BACK_REFERER;
2787     -$back = "/server-manager/";
2788     -if ($back && $back =~ m!^/!) {
2789     - my $hostname = $server_name;
2790     - my $port = $server_port;
2791     - $hostname .= ':' . $port if $port && $port != 80 && $port != 443;
2792     - $back = sprintf "http%s://%s%s", ($port == 443 ? 's' : ''), $hostname, $back;
2793     -} elsif ($back && $back !~ m/^http/i) {
2794     - $back = 'http://' . $back;
2795     -}
2796     -$back = uri_unescape($back) if $back =~ m/^https?%3A%2F%2F/;
2797     -my $back_html = escapeHTML($back) if $back;
2798     -
2799     -# Logout by resetting the auth cookie
2800     -my @cookies = cookie(-name => $at->cookie_name, -value => '', -expires => '-1h',
2801     - ($AUTH_DOMAIN && $AUTH_DOMAIN =~ /\./ ? (-domain => $AUTH_DOMAIN) : ()));
2802     -push @cookies, map { cookie(-name => $_, -value => '', -expires => '-1h') } @NUKE_COOKIES;
2803     -
2804     -my $redirected = 0;
2805     -if ($back) {
2806     - my $b = URI->new($back);
2807     - # If $back domain doesn't match $AUTH_DOMAIN, add ticket reset to back
2808     - if ($b->host !~ m/\b$AUTH_DOMAIN$/i) {
2809     - $back .= $b->query ? '&' : '?';
2810     - $back .= $at->cookie_name . '=';
2811     - }
2812     -
2813     - if ($debug) {
2814     - print $q->header(-cookie => \@cookies);
2815     - }
2816     -
2817     - else {
2818     - # Set (local) cookie, and redirect to $back
2819     - print $q->header(
2820     - -cookie => \@cookies,
2821     -# -location => $back,
2822     - );
2823     - # For some reason, a Location: redirect doesn't seem to then see the cookie,
2824     - # but a meta refresh one does - weird
2825     - print $q->start_html(
2826     - -head => meta({
2827     - -http_equiv => 'refresh', -content => "0;URL=$back"
2828     - }));
2829     - $redirected = 1;
2830     - }
2831     -}
2832     -
2833     -# If no $back, just set the auth cookie and hope for the best
2834     -else {
2835     - print $q->header(-cookie => \@cookies);
2836     -}
2837     -
2838     -my @style = $STYLESHEET ? ('-style' => { src => $STYLESHEET }) : ();
2839     -$TITLE ||= 'Logout Page';
2840     -unless ($redirected) {
2841     - # If here, either some kind of error or no back ref found
2842     - print $q->start_html(
2843     - -title => $TITLE,
2844     - @style,
2845     - );
2846     - print <<EOD;
2847     -<div align="center">
2848     -<h1>$TITLE</h1>
2849     -EOD
2850     - if ($debug) {
2851     - print <<EOD;
2852     -<pre>
2853     -back: $back
2854     -back_html: $back_html
2855     -</pre>
2856     -EOD
2857     - }
2858     - print <<EOD;
2859     -<p>You are now logged out.</p>
2860     -EOD
2861     - print qq(<p><a href="$back_html">Return to server manager login</a></p>\n) if $back_html;
2862     - print <<EOD;
2863     -</div>
2864     -</body>
2865     -</html>
2866     -EOD
2867     -}
2868     -
2869     -# arch-tag: 09c96fc6-5119-4c79-8086-6c6b24951f96
2870     -# vim:sw=2:sm:cin
2871     -
2872     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
2873     --- 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
2874     +++ 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
2875     @@ -1,32 +0,0 @@
2876     -/* mod_auth_tkt example css */
2877     -
2878     -BODY {background-image: url(../smeserver_logo.jpg);
2879     - background-repeat: no-repeat;
2880     - background-position: 600px 40px;
2881     - background-position: top;
2882     -
2883     - font-family: arial, helvetica, sans-serif;
2884     - font-size: small;
2885     -}
2886     -
2887     -P, TH, TD {
2888     - font-family: arial, helvetica, sans-serif;
2889     - font-size: small;
2890     -}
2891     -
2892     -H1, H2, H3, H4, H5, H6 { color: #006; }
2893     -H1 { font-size: x-large; }
2894     -H2 { font-size: large; }
2895     -H3 { font-size: medium; }
2896     -
2897     -.warning { color: #c00; font-size: medium; font-weight: bold; }
2898     -
2899     -TABLE {
2900     - background-color: #eee;
2901     - color: #666;
2902     - border: 1px solid #ccc;
2903     - padding: 20px;
2904     -}
2905     -
2906     -
2907     -/* arch-tag: ac35e093-c2c0-4994-bc18-2d25715b1192 */
2908     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
2909     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
2910     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
2911     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
2912     --- 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
2913     +++ 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
2914     @@ -1,36 +0,0 @@
2915     -#!/usr/bin/perl -wT
2916     -
2917     -#----------------------------------------------------------------------
2918     -# copyright (C) 1999-2006 Mitel Networks Corporation
2919     -#
2920     -# This program is free software; you can redistribute it and/or modify
2921     -# it under the terms of the GNU General Public License as published by
2922     -# the Free Software Foundation; either version 2 of the License, or
2923     -# (at your option) any later version.
2924     -#
2925     -# This program is distributed in the hope that it will be useful,
2926     -# but WITHOUT ANY WARRANTY; without even the implied warranty of
2927     -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2928     -# GNU General Public License for more details.
2929     -#
2930     -# You should have received a copy of the GNU General Public License
2931     -# along with this program; if not, write to the Free Software
2932     -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2933     -#
2934     -#----------------------------------------------------------------------
2935     -
2936     -use strict;
2937     -use esmith::FormMagick;
2938     -
2939     -my $fm = new esmith::FormMagick;
2940     -$fm->display();
2941     -
2942     -exit 0;
2943     -
2944     -__DATA__
2945     -<form title="FORM_TITLE" header="/etc/e-smith/web/common/noframes_head.tmpl" footer="/etc/e-smith/web/common/noframes_foot.tmpl">
2946     - <page name="First">
2947     - <description>NOFRAMES_BODY</description>
2948     - </page>
2949     -
2950     -</form>
2951     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
2952     --- 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
2953     +++ 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
2954     @@ -1,36 +0,0 @@
2955     -#!/usr/bin/perl -wT
2956     -
2957     -#----------------------------------------------------------------------
2958     -# copyright (C) 1999-2006 Mitel Networks Corporation
2959     -#
2960     -# This program is free software; you can redistribute it and/or modify
2961     -# it under the terms of the GNU General Public License as published by
2962     -# the Free Software Foundation; either version 2 of the License, or
2963     -# (at your option) any later version.
2964     -#
2965     -# This program is distributed in the hope that it will be useful,
2966     -# but WITHOUT ANY WARRANTY; without even the implied warranty of
2967     -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2968     -# GNU General Public License for more details.
2969     -#
2970     -# You should have received a copy of the GNU General Public License
2971     -# along with this program; if not, write to the Free Software
2972     -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2973     -#
2974     -#----------------------------------------------------------------------
2975     -use strict;
2976     -use esmith::FormMagick;
2977     -
2978     -my $fm = new esmith::FormMagick;
2979     -
2980     -$fm->display();
2981     -
2982     -exit 0;
2983     -
2984     -__DATA__
2985     -<form title="FORM_TITLE" header="/etc/e-smith/web/common/head.tmpl" footer="/etc/e-smith/web/common/foot.tmpl">
2986     - <page name="First">
2987     - <description>FRAMES_BODY</description>
2988     - </page>
2989     -
2990     -</form>
2991     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
2992     --- 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
2993     +++ 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
2994     @@ -1,340 +0,0 @@
2995     -#!/usr/bin/perl -wT
2996     -
2997     -#----------------------------------------------------------------------
2998     -# e-smith manager functions: navigation
2999     -#
3000     -# copyright (C) 2002 Mitel Networks Corporation
3001     -#
3002     -# This program is free software; you can redistribute it and/or modify
3003     -# it under the terms of the GNU General Public License as published by
3004     -# the Free Software Foundation; either version 2 of the License, or
3005     -# (at your option) any later version.
3006     -#
3007     -# This program is distributed in the hope that it will be useful,
3008     -# but WITHOUT ANY WARRANTY; without even the implied warranty of
3009     -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3010     -# GNU General Public License for more details.
3011     -#
3012     -# You should have received a copy of the GNU General Public License
3013     -# along with this program; if not, write to the Free Software
3014     -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
3015     -#
3016     -# Technical support for this program is available from Mitel Networks
3017     -# Please visit our web site www.e-smith.com for details.
3018     -#----------------------------------------------------------------------
3019     -package esmith;
3020     -
3021     -use strict;
3022     -use CGI ':no_xhtml', ':all';
3023     -use CGI::Carp qw(fatalsToBrowser);
3024     -
3025     -use esmith::cgi;
3026     -use esmith::config;
3027     -use esmith::NavigationDB;
3028     -use esmith::util;
3029     -use esmith::I18N;
3030     -
3031     -sub determineGroup;
3032     -sub showNavigation ($);
3033     -
3034     -BEGIN
3035     -{
3036     - # Clear PATH and related environment variables so that calls to
3037     - # external programs do not cause results to be tainted. See
3038     - # "perlsec" manual page for details.
3039     -
3040     - $ENV {'PATH'} = '';
3041     - $ENV {'SHELL'} = '/bin/bash';
3042     - delete $ENV {'ENV'};
3043     -}
3044     -
3045     -esmith::util::setRealToEffective ();
3046     -
3047     -$CGI::POST_MAX=1024 * 100; # max 100K posts
3048     -$CGI::DISABLE_UPLOADS = 1; # no uploads
3049     -
3050     -# Use the one script for navigation and noframes
3051     -my $NO_FRAMES = ($0 =~ /noframes/);
3052     -
3053     -my %conf;
3054     -tie %conf, 'esmith::config';
3055     -
3056     -my $q = new CGI;
3057     -
3058     -showNavigation ($q);
3059     -exit (0);
3060     -
3061     -
3062     -#------------------------------------------------------
3063     -# subroutine to determine which group a user belongs to
3064     -#------------------------------------------------------
3065     -
3066     -sub determineGroup
3067     -{
3068     - my ($user) = shift;
3069     -
3070     - # Group file for authentication
3071     - my $group_file = '/etc/group';
3072     - open ( GF, $group_file )
3073     - or die "Cannot open group file: $group_file: $!\n";
3074     -
3075     - # list of groups this user belongs to
3076     - my @groupList;
3077     - while (<GF>)
3078     - {
3079     - if (/[:,]$user\b/)
3080     - {
3081     - my ($groupName, undef) = split(/:/);
3082     - push @groupList, $groupName;
3083     - }
3084     - }
3085     - close GF;
3086     - return @groupList;
3087     -}
3088     -
3089     -#------------------------------------------------------------
3090     -# subroutine to display navigation bar
3091     -#------------------------------------------------------------
3092     -
3093     -sub showNavigation ($)
3094     -{
3095     - my $q = shift;
3096     -
3097     - # enable utf8 binmode so new translations work
3098     - binmode STDOUT, ":utf8";
3099     -
3100     - # Use this variable throughout to keep track of files
3101     - # list of just the files
3102     - my $c = "1";
3103     - my @files = ();
3104     - my %files_hash = ();
3105     - my @panel_group = $ENV{'REMOTE_USER'} eq "admin" ?
3106     - ("admin") : determineGroup($ENV{'REMOTE_USER'});
3107     -
3108     - #-----------------------------------------------------
3109     - # Determine the directory where the functions are kept
3110     - #-----------------------------------------------------
3111     -
3112     - my $navigation_ignore =
3113     - "(\.\.?|navigation|noframes|online-manual|(internal|pleasewait)(-.*)?)";
3114     -
3115     - my $cgidir = 'nowhere';
3116     - if ($panel_group[0] eq 'admin')
3117     - {
3118     - $cgidir = '/etc/e-smith/web/panels/manager/cgi-bin/';
3119     -
3120     - if (opendir (DIR, $cgidir))
3121     - {
3122     - @files = grep (!/^${navigation_ignore}$/,
3123     - readdir (DIR));
3124     - closedir (DIR);
3125     - }
3126     - else
3127     - {
3128     - warn "Can't open directory $cgidir\n";
3129     - }
3130     -
3131     - foreach my $file (@files)
3132     - {
3133     - next if (-d "$cgidir/$file");
3134     - $files_hash{$file} = $cgidir;
3135     - }
3136     - }
3137     - else
3138     - {
3139     - foreach my $panel (@panel_group)
3140     - {
3141     - $cgidir = "/etc/e-smith/web/panels/manager/$panel/cgi-bin";
3142     -
3143     - if (opendir (DIR, $cgidir))
3144     - {
3145     - @files = grep (!/^${navigation_ignore}$/,
3146     - readdir (DIR));
3147     - closedir (DIR);
3148     - foreach my $file (@files)
3149     - {
3150     - next if (-d "$cgidir/$file");
3151     - $files_hash{$file} = $cgidir;
3152     - }
3153     - }
3154     - else
3155     - {
3156     - warn "Can't open directory $cgidir\n";
3157     - }
3158     - }
3159     - }
3160     -
3161     - #--------------------------------------------------
3162     - # For each script, extract the description and category
3163     - # information. Build up an associative array mapping headings
3164     - # to heading structures. Each heading structure contains the
3165     - # total weight for the heading, the number of times the heading
3166     - # has been encountered, and another associative array mapping
3167     - # descriptions to description structures. Each description
3168     - # structure contains the filename of the particular cgi script
3169     - # and a weight.
3170     - #--------------------------------------------------
3171     - my %nav = ();
3172     -
3173     - use constant NAVIGATIONDIR => '/home/e-smith/db/navigation';
3174     - use constant WEBFUNCTIONS => '/etc/e-smith/web/functions';
3175     -
3176     - my $i18n = new esmith::I18N;
3177     -
3178     - my $language = $i18n->preferredLanguage( $ENV{HTTP_ACCEPT_LANGUAGE} );
3179     -
3180     - my $navinfo = NAVIGATIONDIR . "/navigation.$language";
3181     -
3182     - my $navdb = esmith::NavigationDB->open_ro( $navinfo ) or
3183     - die "Couldn't open $navinfo\n";
3184     -
3185     - # Check the navdb for anything with a UrlPath, which means that it doesn't
3186     - # have a cgi file to be picked up by the above code. Ideally, only pages
3187     - # that exist should be in the db, but that's not the case. Anything
3188     - # without a cgi file will have to remove themselves on uninstall from the
3189     - # navigation dbs.
3190     - foreach my $rec ($navdb->get_all)
3191     - {
3192     - if ($rec->prop('UrlPath'))
3193     - {
3194     - $files_hash{$rec->{key}} = $cgidir;
3195     - }
3196     - }
3197     -
3198     - foreach my $file (keys %files_hash)
3199     - {
3200     - my $heading = 'Unknown';
3201     - my $description = $file;
3202     - my $headingWeight = 99999;
3203     - my $descriptionWeight = 99999;
3204     - my $urlpath = '';
3205     -
3206     - my $rec = $navdb->get($file);
3207     -
3208     - if (defined $rec)
3209     - {
3210     - $heading = $rec->prop('Heading');
3211     - $description = $rec->prop('Description');
3212     - $headingWeight = $rec->prop('HeadingWeight');
3213     - $descriptionWeight = $rec->prop('DescriptionWeight');
3214     - $urlpath = $rec->prop('UrlPath') || '';
3215     - }
3216     -
3217     - #--------------------------------------------------
3218     - # add heading, description and weight information to data structure
3219     - #--------------------------------------------------
3220     -
3221     - unless (exists $nav {$heading})
3222     - {
3223     - $nav {$heading} = { COUNT => 0, WEIGHT => 0, DESCRIPTIONS => [] };
3224     - }
3225     -
3226     - $nav {$heading} {'COUNT'} ++;
3227     - $nav {$heading} {'WEIGHT'} += $headingWeight;
3228     -
3229     - # Check for manager panel, and assign the appropriate
3230     - # cgi-bin prefix for the links.
3231     - # Grab the last 2 directories by splitting for '/'s and
3232     - # then concatenating the last 2
3233     - # probably a better way, but I don't know it.
3234     - my @filename = split /\//, $files_hash{$file};
3235     - my $path = ($cgidir eq '/etc/e-smith/web/panels/manager/cgi-bin/') ?
3236     - "/$filename[scalar @filename - 1]" :
3237     - "/$filename[scalar @filename - 2]/$filename[scalar @filename - 1]";
3238     -
3239     - push @{ $nav {$heading} {'DESCRIPTIONS'} },
3240     - { DESCRIPTION => $description,
3241     - WEIGHT => $descriptionWeight,
3242     - FILENAME => $urlpath ? $urlpath : "$path/$file",
3243     - CGIPATH => $path
3244     - };
3245     - }
3246     -
3247     - #--------------------------------------------------
3248     - # generate list of headings sorted by average weight
3249     - #--------------------------------------------------
3250     - if ( $NO_FRAMES )
3251     - {
3252     - esmith::cgi::genNoframesHeader ($q);
3253     - }
3254     - else
3255     - {
3256     - esmith::cgi::genNavigationHeader ($q, undef);
3257     - print "\n<TABLE BORDER=\"0\" CELLSPACING=\"0\" CELLPADDING=\"0\">\n";
3258     - }
3259     -
3260     - print '<script language="JavaScript" type="text/javascript">
3261     - <!-- Hide script
3262     - //This swap the class of the selected item.
3263     - function swapClass() {
3264     - var i,x,tB,j=0,tA=new Array(),arg=swapClass.arguments;
3265     - if(document.getElementsByTagName){for(i=4;i<arg.length;i++){tB=document.getElementsByTagName(arg[i]);
3266     - for(x=0;x<tB.length;x++){tA[j]=tB[x];j++;}}for(i=0;i<tA.length;i++){
3267     - if(tA[i].className){if(tA[i].id==arg[1]){if(arg[0]==1){
3268     - tA[i].className=(tA[i].className==arg[3])?arg[2]:arg[3];}else{tA[i].className=arg[2];}
3269     - }else if(arg[0]==1 && arg[1]==\'none\'){if(tA[i].className==arg[2] || tA[i].className==arg[3]){
3270     - tA[i].className=(tA[i].className==arg[3])?arg[2]:arg[3];}
3271     - }else if(tA[i].className==arg[2]){tA[i].className=arg[3];}}}}}
3272     - ';
3273     - print "
3274     - //This swap the class of the selected item.
3275     - function swapClasses() {
3276     - var arg=swapClasses.arguments;
3277     - swapClass(0,'none','item-current','item','a');
3278     - swapClass(0,'none','warn-current','warn','a');
3279     - swapClass(0,arg[0],'item-current','item','a');
3280     - }
3281     -
3282     - // End script hiding -->
3283     - </script>
3284     - ";
3285     -
3286     - foreach my $h (sort {
3287     - ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) <=>
3288     - ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav)
3289     - {
3290     - if ( $NO_FRAMES )
3291     - {
3292     - print $q->h2 ($h);
3293     - }
3294     - else
3295     - {
3296     - print "\n", $q->Tr ($q->td({class => "section"},$q->span({class => "section"}, $h)));
3297     - }
3298     -
3299     - #--------------------------------------------------
3300     - # generate list of descriptions sorted by weight
3301     - #--------------------------------------------------
3302     - print "<ul>\n" if ( $NO_FRAMES );
3303     -
3304     - foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} } @{$nav {$h}{'DESCRIPTIONS'}})
3305     - {
3306     - my $href = "/server-manager" . $_->{'FILENAME'};
3307     - if ( $NO_FRAMES )
3308     - {
3309     - print $q->li ($q->a ({href => "$href?noframes=1"}, $_->{'DESCRIPTION'}));
3310     - }
3311     - else
3312     - {
3313     - print "\n",$q->Tr(
3314     - $q->td ({-class => "menu-cell"},
3315     - $q->a ({-id => "sme$c",
3316     - -class => "item",
3317     - -onClick => "swapClasses('sme$c')",
3318     - href => $href,
3319     - target => 'main'},
3320     - $_->{'DESCRIPTION'})
3321     - ));
3322     - }
3323     - $c++;
3324     -
3325     - }
3326     - print "</ul>\n" if ($NO_FRAMES);
3327     - }
3328     -
3329     - unless ( $NO_FRAMES )
3330     - {
3331     - print "\n</TABLE>\n";
3332     - esmith::cgi::genNavigationFooter ($q);
3333     - }
3334     -}
3335     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
3336     --- 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
3337     +++ 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
3338     @@ -1,340 +0,0 @@
3339     -#!/usr/bin/perl -wT
3340     -
3341     -#----------------------------------------------------------------------
3342     -# e-smith manager functions: navigation
3343     -#
3344     -# copyright (C) 2002 Mitel Networks Corporation
3345     -#
3346     -# This program is free software; you can redistribute it and/or modify
3347     -# it under the terms of the GNU General Public License as published by
3348     -# the Free Software Foundation; either version 2 of the License, or
3349     -# (at your option) any later version.
3350     -#
3351     -# This program is distributed in the hope that it will be useful,
3352     -# but WITHOUT ANY WARRANTY; without even the implied warranty of
3353     -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3354     -# GNU General Public License for more details.
3355     -#
3356     -# You should have received a copy of the GNU General Public License
3357     -# along with this program; if not, write to the Free Software
3358     -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
3359     -#
3360     -# Technical support for this program is available from Mitel Networks
3361     -# Please visit our web site www.e-smith.com for details.
3362     -#----------------------------------------------------------------------
3363     -package esmith;
3364     -
3365     -use strict;
3366     -use CGI ':no_xhtml', ':all';
3367     -use CGI::Carp qw(fatalsToBrowser);
3368     -
3369     -use esmith::cgi;
3370     -use esmith::config;
3371     -use esmith::NavigationDB;
3372     -use esmith::util;
3373     -use esmith::I18N;
3374     -
3375     -sub determineGroup;
3376     -sub showNavigation ($);
3377     -
3378     -BEGIN
3379     -{
3380     - # Clear PATH and related environment variables so that calls to
3381     - # external programs do not cause results to be tainted. See
3382     - # "perlsec" manual page for details.
3383     -
3384     - $ENV {'PATH'} = '';
3385     - $ENV {'SHELL'} = '/bin/bash';
3386     - delete $ENV {'ENV'};
3387     -}
3388     -
3389     -esmith::util::setRealToEffective ();
3390     -
3391     -$CGI::POST_MAX=1024 * 100; # max 100K posts
3392     -$CGI::DISABLE_UPLOADS = 1; # no uploads
3393     -
3394     -# Use the one script for navigation and noframes
3395     -my $NO_FRAMES = ($0 =~ /noframes/);
3396     -
3397     -my %conf;
3398     -tie %conf, 'esmith::config';
3399     -
3400     -my $q = new CGI;
3401     -
3402     -showNavigation ($q);
3403     -exit (0);
3404     -
3405     -
3406     -#------------------------------------------------------
3407     -# subroutine to determine which group a user belongs to
3408     -#------------------------------------------------------
3409     -
3410     -sub determineGroup
3411     -{
3412     - my ($user) = shift;
3413     -
3414     - # Group file for authentication
3415     - my $group_file = '/etc/group';
3416     - open ( GF, $group_file )
3417     - or die "Cannot open group file: $group_file: $!\n";
3418     -
3419     - # list of groups this user belongs to
3420     - my @groupList;
3421     - while (<GF>)
3422     - {
3423     - if (/[:,]$user\b/)
3424     - {
3425     - my ($groupName, undef) = split(/:/);
3426     - push @groupList, $groupName;
3427     - }
3428     - }
3429     - close GF;
3430     - return @groupList;
3431     -}
3432     -
3433     -#------------------------------------------------------------
3434     -# subroutine to display navigation bar
3435     -#------------------------------------------------------------
3436     -
3437     -sub showNavigation ($)
3438     -{
3439     - my $q = shift;
3440     -
3441     - # enable utf8 binmode so new translations work
3442     - binmode STDOUT, ":utf8";
3443     -
3444     - # Use this variable throughout to keep track of files
3445     - # list of just the files
3446     - my $c = "1";
3447     - my @files = ();
3448     - my %files_hash = ();
3449     - my @panel_group = $ENV{'REMOTE_USER'} eq "admin" ?
3450     - ("admin") : determineGroup($ENV{'REMOTE_USER'});
3451     -
3452     - #-----------------------------------------------------
3453     - # Determine the directory where the functions are kept
3454     - #-----------------------------------------------------
3455     -
3456     - my $navigation_ignore =
3457     - "(\.\.?|navigation|noframes|online-manual|(internal|pleasewait)(-.*)?)";
3458     -
3459     - my $cgidir = 'nowhere';
3460     - if ($panel_group[0] eq 'admin')
3461     - {
3462     - $cgidir = '/etc/e-smith/web/panels/manager/cgi-bin/';
3463     -
3464     - if (opendir (DIR, $cgidir))
3465     - {
3466     - @files = grep (!/^${navigation_ignore}$/,
3467     - readdir (DIR));
3468     - closedir (DIR);
3469     - }
3470     - else
3471     - {
3472     - warn "Can't open directory $cgidir\n";
3473     - }
3474     -
3475     - foreach my $file (@files)
3476     - {
3477     - next if (-d "$cgidir/$file");
3478     - $files_hash{$file} = $cgidir;
3479     - }
3480     - }
3481     - else
3482     - {
3483     - foreach my $panel (@panel_group)
3484     - {
3485     - $cgidir = "/etc/e-smith/web/panels/manager/$panel/cgi-bin";
3486     -
3487     - if (opendir (DIR, $cgidir))
3488     - {
3489     - @files = grep (!/^${navigation_ignore}$/,
3490     - readdir (DIR));
3491     - closedir (DIR);
3492     - foreach my $file (@files)
3493     - {
3494     - next if (-d "$cgidir/$file");
3495     - $files_hash{$file} = $cgidir;
3496     - }
3497     - }
3498     - else
3499     - {
3500     - warn "Can't open directory $cgidir\n";
3501     - }
3502     - }
3503     - }
3504     -
3505     - #--------------------------------------------------
3506     - # For each script, extract the description and category
3507     - # information. Build up an associative array mapping headings
3508     - # to heading structures. Each heading structure contains the
3509     - # total weight for the heading, the number of times the heading
3510     - # has been encountered, and another associative array mapping
3511     - # descriptions to description structures. Each description
3512     - # structure contains the filename of the particular cgi script
3513     - # and a weight.
3514     - #--------------------------------------------------
3515     - my %nav = ();
3516     -
3517     - use constant NAVIGATIONDIR => '/home/e-smith/db/navigation';
3518     - use constant WEBFUNCTIONS => '/etc/e-smith/web/functions';
3519     -
3520     - my $i18n = new esmith::I18N;
3521     -
3522     - my $language = $i18n->preferredLanguage( $ENV{HTTP_ACCEPT_LANGUAGE} );
3523     -
3524     - my $navinfo = NAVIGATIONDIR . "/navigation.$language";
3525     -
3526     - my $navdb = esmith::NavigationDB->open_ro( $navinfo ) or
3527     - die "Couldn't open $navinfo\n";
3528     -
3529     - # Check the navdb for anything with a UrlPath, which means that it doesn't
3530     - # have a cgi file to be picked up by the above code. Ideally, only pages
3531     - # that exist should be in the db, but that's not the case. Anything
3532     - # without a cgi file will have to remove themselves on uninstall from the
3533     - # navigation dbs.
3534     - foreach my $rec ($navdb->get_all)
3535     - {
3536     - if ($rec->prop('UrlPath'))
3537     - {
3538     - $files_hash{$rec->{key}} = $cgidir;
3539     - }
3540     - }
3541     -
3542     - foreach my $file (keys %files_hash)
3543     - {
3544     - my $heading = 'Unknown';
3545     - my $description = $file;
3546     - my $headingWeight = 99999;
3547     - my $descriptionWeight = 99999;
3548     - my $urlpath = '';
3549     -
3550     - my $rec = $navdb->get($file);
3551     -
3552     - if (defined $rec)
3553     - {
3554     - $heading = $rec->prop('Heading');
3555     - $description = $rec->prop('Description');
3556     - $headingWeight = $rec->prop('HeadingWeight');
3557     - $descriptionWeight = $rec->prop('DescriptionWeight');
3558     - $urlpath = $rec->prop('UrlPath') || '';
3559     - }
3560     -
3561     - #--------------------------------------------------
3562     - # add heading, description and weight information to data structure
3563     - #--------------------------------------------------
3564     -
3565     - unless (exists $nav {$heading})
3566     - {
3567     - $nav {$heading} = { COUNT => 0, WEIGHT => 0, DESCRIPTIONS => [] };
3568     - }
3569     -
3570     - $nav {$heading} {'COUNT'} ++;
3571     - $nav {$heading} {'WEIGHT'} += $headingWeight;
3572     -
3573     - # Check for manager panel, and assign the appropriate
3574     - # cgi-bin prefix for the links.
3575     - # Grab the last 2 directories by splitting for '/'s and
3576     - # then concatenating the last 2
3577     - # probably a better way, but I don't know it.
3578     - my @filename = split /\//, $files_hash{$file};
3579     - my $path = ($cgidir eq '/etc/e-smith/web/panels/manager/cgi-bin/') ?
3580     - "/$filename[scalar @filename - 1]" :
3581     - "/$filename[scalar @filename - 2]/$filename[scalar @filename - 1]";
3582     -
3583     - push @{ $nav {$heading} {'DESCRIPTIONS'} },
3584     - { DESCRIPTION => $description,
3585     - WEIGHT => $descriptionWeight,
3586     - FILENAME => $urlpath ? $urlpath : "$path/$file",
3587     - CGIPATH => $path
3588     - };
3589     - }
3590     -
3591     - #--------------------------------------------------
3592     - # generate list of headings sorted by average weight
3593     - #--------------------------------------------------
3594     - if ( $NO_FRAMES )
3595     - {
3596     - esmith::cgi::genNoframesHeader ($q);
3597     - }
3598     - else
3599     - {
3600     - esmith::cgi::genNavigationHeader ($q, undef);
3601     - print "\n<TABLE BORDER=\"0\" CELLSPACING=\"0\" CELLPADDING=\"0\">\n";
3602     - }
3603     -
3604     - print '<script language="JavaScript" type="text/javascript">
3605     - <!-- Hide script
3606     - //This swap the class of the selected item.
3607     - function swapClass() {
3608     - var i,x,tB,j=0,tA=new Array(),arg=swapClass.arguments;
3609     - if(document.getElementsByTagName){for(i=4;i<arg.length;i++){tB=document.getElementsByTagName(arg[i]);
3610     - for(x=0;x<tB.length;x++){tA[j]=tB[x];j++;}}for(i=0;i<tA.length;i++){
3611     - if(tA[i].className){if(tA[i].id==arg[1]){if(arg[0]==1){
3612     - tA[i].className=(tA[i].className==arg[3])?arg[2]:arg[3];}else{tA[i].className=arg[2];}
3613     - }else if(arg[0]==1 && arg[1]==\'none\'){if(tA[i].className==arg[2] || tA[i].className==arg[3]){
3614     - tA[i].className=(tA[i].className==arg[3])?arg[2]:arg[3];}
3615     - }else if(tA[i].className==arg[2]){tA[i].className=arg[3];}}}}}
3616     - ';
3617     - print "
3618     - //This swap the class of the selected item.
3619     - function swapClasses() {
3620     - var arg=swapClasses.arguments;
3621     - swapClass(0,'none','item-current','item','a');
3622     - swapClass(0,'none','warn-current','warn','a');
3623     - swapClass(0,arg[0],'item-current','item','a');
3624     - }
3625     -
3626     - // End script hiding -->
3627     - </script>
3628     - ";
3629     -
3630     - foreach my $h (sort {
3631     - ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) <=>
3632     - ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav)
3633     - {
3634     - if ( $NO_FRAMES )
3635     - {
3636     - print $q->h2 ($h);
3637     - }
3638     - else
3639     - {
3640     - print "\n", $q->Tr ($q->td({class => "section"},$q->span({class => "section"}, $h)));
3641     - }
3642     -
3643     - #--------------------------------------------------
3644     - # generate list of descriptions sorted by weight
3645     - #--------------------------------------------------
3646     - print "<ul>\n" if ( $NO_FRAMES );
3647     -
3648     - foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} } @{$nav {$h}{'DESCRIPTIONS'}})
3649     - {
3650     - my $href = "/server-manager" . $_->{'FILENAME'};
3651     - if ( $NO_FRAMES )
3652     - {
3653     - print $q->li ($q->a ({href => "$href?noframes=1"}, $_->{'DESCRIPTION'}));
3654     - }
3655     - else
3656     - {
3657     - print "\n",$q->Tr(
3658     - $q->td ({-class => "menu-cell"},
3659     - $q->a ({-id => "sme$c",
3660     - -class => "item",
3661     - -onClick => "swapClasses('sme$c')",
3662     - href => $href,
3663     - target => 'main'},
3664     - $_->{'DESCRIPTION'})
3665     - ));
3666     - }
3667     - $c++;
3668     -
3669     - }
3670     - print "</ul>\n" if ($NO_FRAMES);
3671     - }
3672     -
3673     - unless ( $NO_FRAMES )
3674     - {
3675     - print "\n</TABLE>\n";
3676     - esmith::cgi::genNavigationFooter ($q);
3677     - }
3678     -}
3679     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
3680     --- 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
3681     +++ 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
3682     @@ -1,26 +0,0 @@
3683     -#!/bin/sh
3684     -
3685     -#----------------------------------------------------------------------
3686     -# copyright (C) 2005 Mitel Networks Corporation
3687     -#
3688     -# This program is free software; you can redistribute it and/or modify
3689     -# it under the terms of the GNU General Public License as published by
3690     -# the Free Software Foundation; either version 2 of the License, or
3691     -# (at your option) any later version.
3692     -#
3693     -# This program is distributed in the hope that it will be useful,
3694     -# but WITHOUT ANY WARRANTY; without even the implied warranty of
3695     -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3696     -# GNU General Public License for more details.
3697     -#
3698     -# You should have received a copy of the GNU General Public License
3699     -# along with this program; if not, write to the Free Software
3700     -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
3701     -#
3702     -# Technical support for this program is available from Mitel Networks
3703     -# Please visit our web site www.mitel.com/sme/ for details.
3704     -#----------------------------------------------------------------------
3705     -exec \
3706     - /usr/local/bin/setuidgid smelog \
3707     - /usr/local/bin/multilog t s5000000 \
3708     - /var/log/httpd-admin
3709     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
3710     --- 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
3711     +++ 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
3712     @@ -1,11 +0,0 @@
3713     -#!/bin/sh
3714     -#----------------------------------------------------------------------
3715     -# copyright (C) 1999-2004 Mitel Networks Corporation
3716     -#----------------------------------------------------------------------
3717     -
3718     -config=/etc/httpd/admin-conf/httpd.conf
3719     -
3720     -[ -e $config ] || exit 1
3721     -
3722     -exec 2>&1
3723     -exec chpst -P /usr/sbin/httpd-admin -f $config -D FOREGROUND
3724     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
3725     --- 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
3726     +++ e-smith-manager-2.6.0/e-smith-manager-2.6.0-6.el6.sme-filelist 1969-12-31 19:00:00.000000000 -0500
3727     @@ -1,254 +0,0 @@
3728     -%dir %attr(0755,root,root) /etc/e-smith
3729     -%dir %attr(0755,root,root) /etc/e-smith/templates
3730     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc
3731     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/services
3732     -/etc/e-smith/templates/etc/services/20http-admin
3733     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/httpd
3734     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/httpd/conf
3735     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/httpd/conf/httpd.conf
3736     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts
3737     -/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27ManagerProxyPass
3738     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/httpd/admin-conf
3739     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf
3740     -/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/20Manager
3741     -/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15common
3742     -/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15brand
3743     -/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85ServerResourcesAccess
3744     -/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20password
3745     -/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85DefaultAccess
3746     -/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20manager
3747     -/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/01localAccessString
3748     -/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/20ManagerAuthTKT
3749     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith
3750     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web
3751     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/panels
3752     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/panels/manager
3753     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/panels/manager/html
3754     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm
3755     -/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/template-begin
3756     -/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/99End
3757     -/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/10Head
3758     -/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/70LayoutTableEnd
3759     -/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/60InfoBar
3760     -/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/30LayoutTableStart
3761     -/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/20Body
3762     -/etc/e-smith/templates/etc/e-smith/web/panels/manager/html/header.htm/50HilightBar
3763     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/common
3764     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/common/cgi-bin
3765     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg
3766     -/etc/e-smith/templates/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg/manager_access
3767     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/common/css
3768     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/common/css/sme_header.css
3769     -/etc/e-smith/templates/etc/e-smith/web/common/css/sme_header.css/template-begin
3770     -/etc/e-smith/templates/etc/e-smith/web/common/css/sme_header.css/50body
3771     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/common/css/sme_panel_menu.css
3772     -/etc/e-smith/templates/etc/e-smith/web/common/css/sme_panel_menu.css/template-begin
3773     -/etc/e-smith/templates/etc/e-smith/web/common/css/sme_panel_menu.css/50body
3774     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/common/css/sme_main.css
3775     -/etc/e-smith/templates/etc/e-smith/web/common/css/sme_main.css/template-begin
3776     -/etc/e-smith/templates/etc/e-smith/web/common/css/sme_main.css/50body
3777     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/common/css/sme_menu.css
3778     -/etc/e-smith/templates/etc/e-smith/web/common/css/sme_menu.css/template-begin
3779     -/etc/e-smith/templates/etc/e-smith/web/common/css/sme_menu.css/50body
3780     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/common/css/sme_core.css
3781     -/etc/e-smith/templates/etc/e-smith/web/common/css/sme_core.css/template-begin
3782     -/etc/e-smith/templates/etc/e-smith/web/common/css/sme_core.css/50body
3783     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/common/head.tmpl
3784     -/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/30FrameSetup00
3785     -/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/30FrameSetup01
3786     -/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/10Setup
3787     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl
3788     -/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/25Copyright
3789     -/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/90Finish
3790     -/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/10Setup
3791     -%dir %attr(0755,root,root) /etc/e-smith/events
3792     -%dir %attr(0755,root,root) /etc/e-smith/events/actions
3793     -%attr(0554,root,root) /etc/e-smith/events/actions/navigation-conf
3794     -%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save
3795     -/etc/e-smith/events/bootstrap-console-save/S50navigation-conf
3796     -%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand
3797     -%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc
3798     -%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith
3799     -%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web
3800     -%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/common
3801     -/etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/common/head.tmpl
3802     -/etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/common/foot.tmpl
3803     -%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/common/css
3804     -/etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/common/css/sme_core.css
3805     -/etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/common/css/sme_header.css
3806     -/etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/common/css/sme_main.css
3807     -/etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/common/css/sme_menu.css
3808     -/etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/common/css/sme_panel_menu.css
3809     -%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/common/cgi-bin
3810     -/etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg
3811     -%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/panels
3812     -%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/panels/manager
3813     -%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/panels/manager/html
3814     -/etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/web/panels/manager/html/header.htm
3815     -%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/httpd
3816     -%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/httpd/admin-conf
3817     -/etc/e-smith/events/bootstrap-console-save/templates2expand/etc/httpd/admin-conf/httpd.conf
3818     -%dir %attr(0755,root,root) /etc/e-smith/events/console-save
3819     -%dir %attr(0755,root,root) /etc/e-smith/events/console-save/templates2expand
3820     -%dir %attr(0755,root,root) /etc/e-smith/events/console-save/templates2expand/etc
3821     -%dir %attr(0755,root,root) /etc/e-smith/events/console-save/templates2expand/etc/e-smith
3822     -%dir %attr(0755,root,root) /etc/e-smith/events/console-save/templates2expand/etc/e-smith/web
3823     -%dir %attr(0755,root,root) /etc/e-smith/events/console-save/templates2expand/etc/e-smith/web/panels
3824     -%dir %attr(0755,root,root) /etc/e-smith/events/console-save/templates2expand/etc/e-smith/web/panels/manager
3825     -%dir %attr(0755,root,root) /etc/e-smith/events/console-save/templates2expand/etc/e-smith/web/panels/manager/html
3826     -/etc/e-smith/events/console-save/templates2expand/etc/e-smith/web/panels/manager/html/header.htm
3827     -%dir %attr(0755,root,root) /etc/e-smith/events/console-save/templates2expand/etc/e-smith/web/common
3828     -/etc/e-smith/events/console-save/templates2expand/etc/e-smith/web/common/head.tmpl
3829     -/etc/e-smith/events/console-save/templates2expand/etc/e-smith/web/common/foot.tmpl
3830     -%dir %attr(0755,root,root) /etc/e-smith/events/console-save/templates2expand/etc/httpd
3831     -%dir %attr(0755,root,root) /etc/e-smith/events/console-save/templates2expand/etc/httpd/admin-conf
3832     -/etc/e-smith/events/console-save/templates2expand/etc/httpd/admin-conf/httpd.conf
3833     -%dir %attr(0755,root,root) /etc/e-smith/events/console-save/services2adjust
3834     -/etc/e-smith/events/console-save/services2adjust/httpd-admin
3835     -%dir %attr(0755,root,root) /etc/e-smith/events/network-create
3836     -%dir %attr(0755,root,root) /etc/e-smith/events/network-create/templates2expand
3837     -%dir %attr(0755,root,root) /etc/e-smith/events/network-create/templates2expand/etc
3838     -%dir %attr(0755,root,root) /etc/e-smith/events/network-create/templates2expand/etc/e-smith
3839     -%dir %attr(0755,root,root) /etc/e-smith/events/network-create/templates2expand/etc/e-smith/web
3840     -%dir %attr(0755,root,root) /etc/e-smith/events/network-create/templates2expand/etc/e-smith/web/panels
3841     -%dir %attr(0755,root,root) /etc/e-smith/events/network-create/templates2expand/etc/e-smith/web/panels/manager
3842     -%dir %attr(0755,root,root) /etc/e-smith/events/network-create/templates2expand/etc/e-smith/web/panels/manager/html
3843     -/etc/e-smith/events/network-create/templates2expand/etc/e-smith/web/panels/manager/html/header.htm
3844     -%dir %attr(0755,root,root) /etc/e-smith/events/network-create/templates2expand/etc/e-smith/web/common
3845     -/etc/e-smith/events/network-create/templates2expand/etc/e-smith/web/common/head.tmpl
3846     -/etc/e-smith/events/network-create/templates2expand/etc/e-smith/web/common/foot.tmpl
3847     -%dir %attr(0755,root,root) /etc/e-smith/events/network-create/templates2expand/etc/httpd
3848     -%dir %attr(0755,root,root) /etc/e-smith/events/network-create/templates2expand/etc/httpd/admin-conf
3849     -/etc/e-smith/events/network-create/templates2expand/etc/httpd/admin-conf/httpd.conf
3850     -%dir %attr(0755,root,root) /etc/e-smith/events/network-delete
3851     -%dir %attr(0755,root,root) /etc/e-smith/events/network-delete/templates2expand
3852     -%dir %attr(0755,root,root) /etc/e-smith/events/network-delete/templates2expand/etc
3853     -%dir %attr(0755,root,root) /etc/e-smith/events/network-delete/templates2expand/etc/e-smith
3854     -%dir %attr(0755,root,root) /etc/e-smith/events/network-delete/templates2expand/etc/e-smith/web
3855     -%dir %attr(0755,root,root) /etc/e-smith/events/network-delete/templates2expand/etc/e-smith/web/panels
3856     -%dir %attr(0755,root,root) /etc/e-smith/events/network-delete/templates2expand/etc/e-smith/web/panels/manager
3857     -%dir %attr(0755,root,root) /etc/e-smith/events/network-delete/templates2expand/etc/e-smith/web/panels/manager/html
3858     -/etc/e-smith/events/network-delete/templates2expand/etc/e-smith/web/panels/manager/html/header.htm
3859     -%dir %attr(0755,root,root) /etc/e-smith/events/network-delete/templates2expand/etc/e-smith/web/common
3860     -/etc/e-smith/events/network-delete/templates2expand/etc/e-smith/web/common/head.tmpl
3861     -/etc/e-smith/events/network-delete/templates2expand/etc/e-smith/web/common/foot.tmpl
3862     -%dir %attr(0755,root,root) /etc/e-smith/events/network-delete/templates2expand/etc/httpd
3863     -%dir %attr(0755,root,root) /etc/e-smith/events/network-delete/templates2expand/etc/httpd/admin-conf
3864     -/etc/e-smith/events/network-delete/templates2expand/etc/httpd/admin-conf/httpd.conf
3865     -%dir %attr(0755,root,root) /etc/e-smith/events/logrotate
3866     -%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/templates2expand
3867     -%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/templates2expand/etc
3868     -%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/templates2expand/etc/e-smith
3869     -%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/templates2expand/etc/e-smith/web
3870     -%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/templates2expand/etc/e-smith/web/panels
3871     -%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/templates2expand/etc/e-smith/web/panels/manager
3872     -%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/templates2expand/etc/e-smith/web/panels/manager/html
3873     -/etc/e-smith/events/logrotate/templates2expand/etc/e-smith/web/panels/manager/html/header.htm
3874     -%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/templates2expand/etc/e-smith/web/common
3875     -/etc/e-smith/events/logrotate/templates2expand/etc/e-smith/web/common/head.tmpl
3876     -/etc/e-smith/events/logrotate/templates2expand/etc/e-smith/web/common/foot.tmpl
3877     -%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/templates2expand/etc/httpd
3878     -%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/templates2expand/etc/httpd/admin-conf
3879     -/etc/e-smith/events/logrotate/templates2expand/etc/httpd/admin-conf/httpd.conf
3880     -%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/logfiles2timestamp
3881     -%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/logfiles2timestamp/var
3882     -%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/logfiles2timestamp/var/log
3883     -%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/logfiles2timestamp/var/log/httpd
3884     -/etc/e-smith/events/logrotate/logfiles2timestamp/var/log/httpd/admin_access_log
3885     -/etc/e-smith/events/logrotate/logfiles2timestamp/var/log/httpd/admin_error_log
3886     -%dir %attr(0755,root,root) /etc/e-smith/events/logrotate/services2adjust
3887     -/etc/e-smith/events/logrotate/services2adjust/httpd-admin
3888     -%dir %attr(0755,root,root) /etc/e-smith/events/remoteaccess-update
3889     -%dir %attr(0755,root,root) /etc/e-smith/events/remoteaccess-update/templates2expand
3890     -%dir %attr(0755,root,root) /etc/e-smith/events/remoteaccess-update/templates2expand/etc
3891     -%dir %attr(0755,root,root) /etc/e-smith/events/remoteaccess-update/templates2expand/etc/httpd
3892     -%dir %attr(0755,root,root) /etc/e-smith/events/remoteaccess-update/templates2expand/etc/httpd/admin-conf
3893     -/etc/e-smith/events/remoteaccess-update/templates2expand/etc/httpd/admin-conf/httpd.conf
3894     -%dir %attr(0755,root,root) /etc/e-smith/events/remoteaccess-update/services2adjust
3895     -/etc/e-smith/events/remoteaccess-update/services2adjust/httpd-admin
3896     -%dir %attr(0755,root,root) /etc/e-smith/events/post-install
3897     -%dir %attr(0755,root,root) /etc/e-smith/events/post-install/logfiles2timestamp
3898     -%dir %attr(0755,root,root) /etc/e-smith/events/post-install/logfiles2timestamp/var
3899     -%dir %attr(0755,root,root) /etc/e-smith/events/post-install/logfiles2timestamp/var/log
3900     -%dir %attr(0755,root,root) /etc/e-smith/events/post-install/logfiles2timestamp/var/log/httpd
3901     -/etc/e-smith/events/post-install/logfiles2timestamp/var/log/httpd/admin_access_log
3902     -/etc/e-smith/events/post-install/logfiles2timestamp/var/log/httpd/admin_error_log
3903     -%dir %attr(0755,root,root) /etc/e-smith/events/post-upgrade
3904     -%dir %attr(0755,root,root) /etc/e-smith/events/post-upgrade/logfiles2timestamp
3905     -%dir %attr(0755,root,root) /etc/e-smith/events/post-upgrade/logfiles2timestamp/var
3906     -%dir %attr(0755,root,root) /etc/e-smith/events/post-upgrade/logfiles2timestamp/var/log
3907     -%dir %attr(0755,root,root) /etc/e-smith/events/post-upgrade/logfiles2timestamp/var/log/httpd
3908     -/etc/e-smith/events/post-upgrade/logfiles2timestamp/var/log/httpd/admin_access_log
3909     -/etc/e-smith/events/post-upgrade/logfiles2timestamp/var/log/httpd/admin_error_log
3910     -%dir %attr(0755,root,root) /etc/e-smith/db
3911     -%dir %attr(0755,root,root) /etc/e-smith/db/configuration
3912     -%dir %attr(0755,root,root) /etc/e-smith/db/configuration/defaults
3913     -%dir %attr(0755,root,root) /etc/e-smith/db/configuration/defaults/httpd-admin
3914     -/etc/e-smith/db/configuration/defaults/httpd-admin/type
3915     -/etc/e-smith/db/configuration/defaults/httpd-admin/TCPPort
3916     -/etc/e-smith/db/configuration/defaults/httpd-admin/status
3917     -/etc/e-smith/db/configuration/defaults/httpd-admin/access
3918     -/etc/e-smith/db/configuration/defaults/httpd-admin/PermitPlainTextAccess
3919     -%dir %attr(0755,root,root) /etc/e-smith/db/configuration/migrate
3920     -/etc/e-smith/db/configuration/migrate/20TKTAuthSecret
3921     -%dir %attr(0755,root,root) /etc/e-smith/web
3922     -%dir %attr(0550,root,admin) /etc/e-smith/web/functions
3923     -%attr(04750,root,admin) /etc/e-smith/web/functions/index.cgi
3924     -%attr(04750,root,admin) /etc/e-smith/web/functions/navigation
3925     -/etc/e-smith/web/functions/noframes
3926     -%attr(04750,root,admin) /etc/e-smith/web/functions/initial.cgi
3927     -%dir %attr(0550,www,admin) /etc/e-smith/web/common
3928     -/etc/e-smith/web/common/spacer.gif
3929     -/etc/e-smith/web/common/warn.gif
3930     -/etc/e-smith/web/common/sl_icon.gif
3931     -/etc/e-smith/web/common/userpassword_head.tmpl
3932     -/etc/e-smith/web/common/noframes_head.tmpl
3933     -/etc/e-smith/web/common/noframes_foot.tmpl
3934     -%dir %attr(0755,root,root) /etc/e-smith/web/common/cgi-bin
3935     -%attr(0755,root,root) /etc/e-smith/web/common/cgi-bin/login
3936     -%attr(0755,root,root) /etc/e-smith/web/common/cgi-bin/logout
3937     -%dir %attr(0755,root,root) /etc/e-smith/web/common/css
3938     -/etc/e-smith/web/common/css/tkt.css
3939     -%dir %attr(0550,root,admin) /etc/e-smith/web/panels
3940     -%dir %attr(0755,root,root) /etc/e-smith/web/panels/manager
3941     -%dir %attr(0755,root,root) /etc/e-smith/web/panels/manager/cgi-bin
3942     -/etc/e-smith/web/panels/manager/cgi-bin/navigation
3943     -/etc/e-smith/web/panels/manager/cgi-bin/noframes
3944     -%dir %attr(0755,root,root) /etc/e-smith/web/panels/manager/html
3945     -/etc/e-smith/web/panels/manager/html/index.cgi
3946     -/etc/e-smith/web/panels/manager/html/initial.cgi
3947     -%dir %attr(0755,root,root) /etc/e-smith/web/panels/password
3948     -%dir %attr(0755,root,root) /etc/e-smith/web/panels/password/cgi-bin
3949     -%dir %attr(0755,root,root) /etc/e-smith/web/panels/password/html
3950     -%dir %attr(0755,root,root) /etc/rc.d/rc7.d
3951     -/etc/rc.d/rc7.d/S86httpd-admin
3952     -/etc/rc.d/init.d/httpd-admin
3953     -%dir %attr(0755,root,root) /etc/rc.d/init.d/supervise
3954     -/etc/rc.d/init.d/supervise/httpd-admin
3955     -%dir %attr(0755,root,root) /etc/rc.d/rc6.d
3956     -/etc/rc.d/rc6.d/K15httpd-admin
3957     -%dir %attr(0755,root,root) /etc/rc.d/rc0.d
3958     -/etc/rc.d/rc0.d/K15httpd-admin
3959     -%dir %attr(0755,root,root) /etc/httpd
3960     -%dir %attr(0755,root,root) /etc/httpd/admin-conf
3961     -%dir %attr(0755,root,root) /var/service
3962     -%dir %attr(01755,root,root) /var/service/httpd-admin
3963     -%attr(0755,root,root) /var/service/httpd-admin/run
3964     -%attr(0644,root,root) /var/service/httpd-admin/down
3965     -%dir %attr(0755,root,root) /var/service/httpd-admin/log
3966     -%attr(0755,root,root) /var/service/httpd-admin/log/run
3967     -%dir %attr(0700,root,root) /var/service/httpd-admin/log/supervise
3968     -%dir %attr(0700,root,root) /var/service/httpd-admin/supervise
3969     -%dir %attr(0750,smelog,smelog) /var/log/httpd-admin
3970     -%dir %attr(0755,root,root) /usr/sbin
3971     -/usr/sbin/httpd-admin
3972     -%dir %attr(0755,root,root) /usr/share/locale
3973     -%dir %attr(0755,root,root) /usr/share/locale/en_US
3974     -%dir %attr(0755,root,root) /usr/share/locale/en_US/LC_MESSAGES
3975     -/usr/share/locale/en_US/LC_MESSAGES/foot.tmpl.po
3976     -%dir %attr(0755,admin,admin) /home/e-smith
3977     -%dir %attr(0755,root,root) /home/e-smith/db
3978     -%dir %attr(0755,root,root) /home/e-smith/db/navigation
3979     -%dir %attr(0755,root,root) /service
3980     -/service/httpd-admin
3981     -%doc COPYING
3982     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
3983     --- 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
3984     +++ e-smith-manager-2.6.0/root/etc/e-smith/events/bootstrap-console-save/S50navigation-conf 1969-12-31 19:00:00.000000000 -0500
3985     @@ -1,153 +0,0 @@
3986     -#!/usr/bin/perl -w
3987     -
3988     -#----------------------------------------------------------------------
3989     -# copyright (C) 1999-2006 Mitel Networks Corporation
3990     -#
3991     -# This program is free software; you can redistribute it and/or modify
3992     -# it under the terms of the GNU General Public License as published by
3993     -# the Free Software Foundation; either version 2 of the License, or
3994     -# (at your option) any later version.
3995     -#
3996     -# This program is distributed in the hope that it will be useful,
3997     -# but WITHOUT ANY WARRANTY; without even the implied warranty of
3998     -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3999     -# GNU General Public License for more details.
4000     -#
4001     -# You should have received a copy of the GNU General Public License
4002     -# along with this program; if not, write to the Free Software
4003     -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
4004     -#
4005     -#----------------------------------------------------------------------
4006     -package esmith;
4007     -
4008     -use strict;
4009     -
4010     -use esmith::NavigationDB;
4011     -use esmith::I18N;
4012     -
4013     -use constant WEBFUNCTIONS => '/etc/e-smith/web/functions';
4014     -use constant NAVIGATIONDIR => '/home/e-smith/db/navigation';
4015     -use constant NEW_NAVDIR => '/home/e-smith/db';
4016     -
4017     -my $navigation_ignore =
4018     - "(\.\.?|navigation|noframes|online-manual|(internal|pleasewait)(-.*)?)";
4019     -
4020     -my $i18n = new esmith::I18N;
4021     -
4022     -my %navdbs;
4023     -
4024     -opendir FUNCTIONS, WEBFUNCTIONS or
4025     - die "Couldn't open ", WEBFUNCTIONS, "\n";
4026     -
4027     -my @files = grep (!/^${navigation_ignore}$/, readdir (FUNCTIONS));
4028     -my @langs = $i18n->availableLanguages();
4029     -
4030     -use XML::Parser;
4031     -my $parser = new XML::Parser (Style => 'Tree',
4032     - ProtocolEncoding => 'UTF-8');
4033     -
4034     -foreach my $file (@files)
4035     -{
4036     - next if (-d WEBFUNCTIONS . "/$file");
4037     - next unless (-x WEBFUNCTIONS . "/$file");
4038     -
4039     - #--------------------------------------------------
4040     - # extract heading, description and weight information
4041     - # from CGI script
4042     - #--------------------------------------------------
4043     - open(SCRIPT, WEBFUNCTIONS . "/$file");
4044     - my $heading = undef;
4045     - my $description = undef;
4046     - my $heading_weight = undef;
4047     - my $description_weight = undef;
4048     - while ( <SCRIPT> )
4049     - {
4050     - $heading = $1 if (/^\s*#\s*heading\s*:\s*(.+?)\s*$/);
4051     -
4052     - $description = $1
4053     - if (/^\s*#\s*description\s*:\s*(.+?)\s*$/);
4054     -
4055     - ($heading_weight, $description_weight) = ($1, $2)
4056     - if (/^\s*#\s*navigation\s*:\s*(\d+?)\s+(\d+?)\s*$/);
4057     -
4058     - last if (defined $heading and
4059     - defined $description and
4060     - defined $heading_weight and
4061     - defined $description_weight);
4062     - }
4063     - close SCRIPT;
4064     - foreach my $lang (@langs)
4065     - {
4066     -#warn "updating script $file for lang $lang\n";
4067     - my $navdb = $navdbs{$lang};
4068     - my $navinfo = NAVIGATIONDIR . "/navigation.$lang";
4069     - $navdb ||= esmith::NavigationDB->open($navinfo);
4070     - $navdb ||= esmith::NavigationDB->create($navinfo) or
4071     - die "Couldn't create $navinfo\n";
4072     - $navdbs{$lang} ||= $navdb;
4073     - my $rec = $navdb->get($file) ||
4074     - $navdb->new_record($file, { type => 'panel' } );
4075     -
4076     - my $lexicon = {};
4077     -
4078     - foreach my $lfile ( "/etc/e-smith/locale/$lang/FormMagick/general",
4079     - "/etc/e-smith/locale/$lang/etc/e-smith/web/functions/$file" )
4080     - {
4081     - if (-f $lfile)
4082     - {
4083     - # Do a quick and dirty parse of the lexicon file
4084     - my $xmlstr = "";
4085     - open(FILE, $lfile) or die "Couldn't open $lfile:\n$!";
4086     - binmode(FILE, ":utf8");
4087     - {
4088     - local $^W = 0;
4089     - while ( my $line = <FILE> ) {
4090     - unless ( utf8::valid($line) ) {
4091     - warn "$lfile not in UTF-8 format\n";
4092     - utf8::encode($line);
4093     - }
4094     - $xmlstr .= $line;
4095     - }
4096     - }
4097     - my $xml = $parser->parsestring($xmlstr);
4098     - my @lexicon = @{$xml->[1]};
4099     - shift @lexicon; # Remove lexicon attributes
4100     - while (@lexicon)
4101     - {
4102     - my ($tag, $data) = splice(@lexicon, 0, 2);
4103     - next unless $tag eq 'entry';
4104     - my %entry_hash = ('attributes', @$data);
4105     - my $base = $entry_hash{base};
4106     - $base = @{$base}[2];
4107     - my $trans = $entry_hash{trans};
4108     - $trans = @{$trans}[2];
4109     - next unless defined $base && defined $trans;
4110     - $lexicon->{$base} = $trans;
4111     - }
4112     - }
4113     - }
4114     -
4115     - my $loc_heading = localise($lexicon, $heading);
4116     - $loc_heading =~ s/^\s*(\w.*?)\s*$/$1/;
4117     - my $loc_description = localise($lexicon, $description);
4118     - $loc_description =~ s/^\s*(\w.*?)\s*$/$1/;
4119     - $rec->merge_props(
4120     - Heading => $loc_heading,
4121     - Description => $loc_description,
4122     - HeadingWeight => localise($lexicon, $heading_weight),
4123     - DescriptionWeight => localise($lexicon, $description_weight));
4124     - }
4125     -}
4126     -foreach my $lang (@langs)
4127     -{
4128     -#warn "trying to close for lang $lang\n";
4129     - my $navdb = $navdbs{$lang};
4130     - $navdb->close();
4131     -}
4132     -
4133     -sub localise {
4134     - my ($lexicon, $string) = @_;
4135     - $string = "" unless defined $string;
4136     - return $lexicon->{$string} || $string;
4137     -}
4138     -
4139     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
4140     --- 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
4141     +++ 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
4142     @@ -137,7 +137,7 @@
4143     body.menu {
4144     font-family: Verdana, Arial, Helvetica, sans-serif;
4145     font-size: 11px;
4146     - background-color: #eeeeee;
4147     + background-color: #e8f3e1;
4148     }
4149    
4150     td.section {
4151     @@ -149,28 +149,28 @@
4152     font-family: Verdana, Arial, Helvetica, sans-serif;
4153     font-size: 11px;
4154     font-weight: bold;
4155     - background-color: #eeeeee;
4156     + background-color: #e8f3e1;
4157     }
4158    
4159     a.item {
4160     color: #00008b;
4161     font-family: Verdana, Arial, Helvetica, sans-serif;
4162     font-size: 11px;
4163     - background: #eeeeee;
4164     + background: #e8f3e1;
4165     }
4166    
4167     a.sl {
4168     color: green;
4169     font-family: Verdana, Arial, Helvetica, sans-serif;
4170     font-size: 11px;
4171     - background: #eeeeee;
4172     + background: #e8f3e1;
4173     }
4174    
4175     a.alert {
4176     color: red;
4177     font-family: Verdana, Arial, Helvetica, sans-serif;
4178     font-size: 11px;
4179     - background: #eeeeee;
4180     + background: #e8f3e1;
4181     }
4182    
4183     /* Core styles for use with sme_main.css */
4184     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
4185     --- 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
4186     +++ 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
4187     @@ -79,7 +79,7 @@
4188     }
4189    
4190     a:hover {
4191     - background: #eeeeee;
4192     + background: #e8f3e1;
4193     border-color: #000000 #000000 #000000 #000000;
4194     }
4195    
4196     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
4197     --- 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
4198     +++ 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
4199     @@ -63,7 +63,7 @@
4200     /*This special style is actually used only for the button row along the bottom of each page*/
4201     th.sme-layout {
4202     border: 1px solid #dddddd;
4203     - background-color: #eeeeee;
4204     + background-color: #e8f3e1;
4205     font-family: Verdana, Arial, Helvetica, sans-serif;
4206     font-size: 9pt;
4207     font-weight: bold;
4208     @@ -89,7 +89,7 @@
4209     /*width: 250px;*/
4210     text-align: right;
4211     /*vertical-align: top;*/
4212     - background-color: #eeeeee;
4213     + background-color: #e8f3e1;
4214     font-family: Verdana, Arial, Helvetica, sans-serif;
4215     font-size: 11px;
4216     }
4217     @@ -138,7 +138,7 @@
4218     td.sme-border-center {text-align: center;}
4219     th.sme-border {
4220     border: 1px solid #cccccc;
4221     - background-color: #dedfde;
4222     + background-color: #bee6a2;
4223     font-family: Verdana, Arial, Helvetica, sans-serif;
4224     font-size: 10px;
4225     font-weight: bold;
4226     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
4227     --- 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
4228     +++ 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
4229     @@ -80,10 +80,10 @@
4230     font-family: Verdana, Arial, Helvetica, sans-serif;
4231     font-size: 10px;
4232     color: black;
4233     - background: #eeeeee;
4234     + background: #e8f3e1;
4235     text-decoration: none;
4236     text-align: left;
4237     - border-color: #eeeeee;
4238     + border-color: #e8f3e1;
4239     margin-top: 0px;
4240     margin-right: 0px;
4241     margin-bottom: 0px;
4242     @@ -106,9 +106,9 @@
4243     font-family: Verdana, Arial, Helvetica, sans-serif;
4244     font-size: 10px;
4245     color: black;
4246     - background: #eeeeee;
4247     + background: #e8f3e1;
4248     text-decoration: none;
4249     - border-color: #eeeeee;
4250     + border-color: #e8f3e1;
4251     margin-top: 0px;
4252     margin-right: 0px;
4253     margin-bottom: 0px;
4254     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
4255     --- 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
4256     +++ 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
4257     @@ -57,7 +57,7 @@
4258     }
4259    
4260     #navmenu a {
4261     - background : #E8EBF0;
4262     + background : #e8f0e8;
4263     border : 1px solid #ccc;
4264     color : #666;
4265     float : left;
4266     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
4267     --- 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
4268     +++ 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
4269     @@ -0,0 +1,36 @@
4270     +{
4271     + $OUT =<<'HERE';
4272     +/* mod_auth_tkt example css */
4273     +
4274     +BODY {background-image: url(../smeserver_login.jpg);
4275     +background-repeat: no-repeat;
4276     +/*background-size: 600px 40px; */
4277     +background-position: center top;
4278     +font-family: arial, helvetica, sans-serif;
4279     +font-size: small;
4280     +}
4281     +
4282     +P, TH, TD {
4283     + font-family: arial, helvetica, sans-serif;
4284     + font-size: small;
4285     +}
4286     +
4287     +H1, H2, H3, H4, H5, H6 { color: #006600; }
4288     +H1 { font-size: x-large; }
4289     +H2 { font-size: large; }
4290     +H3 { font-size: medium; }
4291     +
4292     +.warning { color: #c00; font-size: medium; font-weight: bold; }
4293     +
4294     +TABLE {
4295     + background-color: #eee;
4296     + color: #666;
4297     + border: 1px solid #ccc;
4298     + padding: 20px;
4299     +}
4300     +
4301     +
4302     +/* arch-tag: ac35e093-c2c0-4994-bc18-2d25715b1192 */
4303     +
4304     +HERE
4305     +}
4306     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
4307     --- 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
4308     +++ 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
4309     @@ -0,0 +1 @@
4310     +/* DO NOT MODIFY THIS FILE! It is updated automatically */
4311     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
4312     --- 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
4313     +++ 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
4314     @@ -2,7 +2,7 @@
4315     unless ($NO_FRAMES)
4316     \{
4317     $OUT .= <<EOF;
4318     - <link rev="made" href="mailto:bugs%40e-smith.com">
4319     + <link rev="made" href="mailto:bugs%40koozali.org">
4320     <meta name="copyright" content="(head.tmpl)Copyright 2003-2004 Mitel Corporation">
4321     <link rel="stylesheet" type="text/css" href="/server-common/css/sme_core.css">
4322     <style type="text/css">
4323     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
4324     --- 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
4325     +++ 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
4326     @@ -12,15 +12,19 @@
4327     </Directory>
4328    
4329     <Directory "/etc/e-smith/web/common">
4330     - Options Indexes Includes
4331     + Options Includes
4332     AllowOverride None
4333     order deny,allow
4334     deny from all
4335     allow from all
4336     + <FilesMatch ".*\.tmpl">
4337     + Order allow,deny
4338     + Deny from all
4339     + </FilesMatch>
4340     </Directory>
4341    
4342     <Directory "/etc/e-smith/web/panels/manager/common">
4343     - Options Indexes Includes FollowSymLinks
4344     + Options Includes FollowSymLinks
4345     AllowOverride None
4346     order deny,allow
4347     deny from all
4348     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
4349     --- 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
4350     +++ 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
4351     @@ -4,7 +4,7 @@
4352     #------------------------------------------------------------
4353    
4354     <Directory "/etc/e-smith/web/panels/manager/html" >
4355     - Options Includes Indexes FollowSymLinks ExecCGI
4356     + Options Includes FollowSymLinks ExecCGI
4357     AllowOverride None
4358     order deny,allow
4359     deny from all
4360     @@ -19,7 +19,7 @@
4361     </Directory>
4362    
4363     <Directory "/etc/e-smith/web/panels/manager/cgi-bin">
4364     - Options Includes Indexes FollowSymLinks ExecCGI
4365     + Options Includes FollowSymLinks ExecCGI
4366     AllowOverride None
4367     order deny,allow
4368     deny from all
4369     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
4370     --- 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
4371     +++ 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
4372     @@ -14,6 +14,11 @@
4373     $OUT .= ' RewriteCond %{REMOTE_ADDR} !^127\.0\.0\.1$' . "\n";
4374     $OUT .= " RewriteRule ^/$place(/.*|\$) https://%{HTTP_HOST}/$place\$1 [L,R]\n";
4375     }
4376     + if ($port eq $sslPort)
4377     + {
4378     + # mod_auth_tkt needs to know the protocol to write 307 redirection
4379     + $OUT .= " RequestHeader set X-Forwarded-Proto \"https\"\n";
4380     + }
4381     $OUT .= " ProxyPass /$place http://127.0.0.1:${'httpd-admin'}{TCPPort}/$place\n";
4382     $OUT .= " ProxyPassReverse /$place http://127.0.0.1:${'httpd-admin'}{TCPPort}/$place\n";
4383    
4384     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
4385     --- e-smith-manager-2.6.0.old/root/etc/e-smith/web/common/cgi-bin/login 2016-06-13 04:18:01.132000000 -0400
4386     +++ e-smith-manager-2.6.0/root/etc/e-smith/web/common/cgi-bin/login 2016-07-19 09:09:58.116000000 -0400
4387     @@ -276,6 +276,7 @@
4388     <div align="center">
4389     <p>&nbsp;</p>
4390     <p>&nbsp;</p>
4391     +<p>&nbsp;</p>
4392     <h2>Welcome to SME server</h2>
4393     EOD
4394    
4395     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
4396     --- 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
4397     +++ e-smith-manager-2.6.0/root/etc/e-smith/web/panels/manager/cgi-bin/navigation 1969-12-31 19:00:00.000000000 -0500
4398     @@ -1,340 +0,0 @@
4399     -#!/usr/bin/perl -wT
4400     -
4401     -#----------------------------------------------------------------------
4402     -# e-smith manager functions: navigation
4403     -#
4404     -# copyright (C) 2002 Mitel Networks Corporation
4405     -#
4406     -# This program is free software; you can redistribute it and/or modify
4407     -# it under the terms of the GNU General Public License as published by
4408     -# the Free Software Foundation; either version 2 of the License, or
4409     -# (at your option) any later version.
4410     -#
4411     -# This program is distributed in the hope that it will be useful,
4412     -# but WITHOUT ANY WARRANTY; without even the implied warranty of
4413     -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4414     -# GNU General Public License for more details.
4415     -#
4416     -# You should have received a copy of the GNU General Public License
4417     -# along with this program; if not, write to the Free Software
4418     -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
4419     -#
4420     -# Technical support for this program is available from Mitel Networks
4421     -# Please visit our web site www.e-smith.com for details.
4422     -#----------------------------------------------------------------------
4423     -package esmith;
4424     -
4425     -use strict;
4426     -use CGI ':no_xhtml', ':all';
4427     -use CGI::Carp qw(fatalsToBrowser);
4428     -
4429     -use esmith::cgi;
4430     -use esmith::config;
4431     -use esmith::NavigationDB;
4432     -use esmith::util;
4433     -use esmith::I18N;
4434     -
4435     -sub determineGroup;
4436     -sub showNavigation ($);
4437     -
4438     -BEGIN
4439     -{
4440     - # Clear PATH and related environment variables so that calls to
4441     - # external programs do not cause results to be tainted. See
4442     - # "perlsec" manual page for details.
4443     -
4444     - $ENV {'PATH'} = '';
4445     - $ENV {'SHELL'} = '/bin/bash';
4446     - delete $ENV {'ENV'};
4447     -}
4448     -
4449     -esmith::util::setRealToEffective ();
4450     -
4451     -$CGI::POST_MAX=1024 * 100; # max 100K posts
4452     -$CGI::DISABLE_UPLOADS = 1; # no uploads
4453     -
4454     -# Use the one script for navigation and noframes
4455     -my $NO_FRAMES = ($0 =~ /noframes/);
4456     -
4457     -my %conf;
4458     -tie %conf, 'esmith::config';
4459     -
4460     -my $q = new CGI;
4461     -
4462     -showNavigation ($q);
4463     -exit (0);
4464     -
4465     -
4466     -#------------------------------------------------------
4467     -# subroutine to determine which group a user belongs to
4468     -#------------------------------------------------------
4469     -
4470     -sub determineGroup
4471     -{
4472     - my ($user) = shift;
4473     -
4474     - # Group file for authentication
4475     - my $group_file = '/etc/group';
4476     - open ( GF, $group_file )
4477     - or die "Cannot open group file: $group_file: $!\n";
4478     -
4479     - # list of groups this user belongs to
4480     - my @groupList;
4481     - while (<GF>)
4482     - {
4483     - if (/[:,]$user\b/)
4484     - {
4485     - my ($groupName, undef) = split(/:/);
4486     - push @groupList, $groupName;
4487     - }
4488     - }
4489     - close GF;
4490     - return @groupList;
4491     -}
4492     -
4493     -#------------------------------------------------------------
4494     -# subroutine to display navigation bar
4495     -#------------------------------------------------------------
4496     -
4497     -sub showNavigation ($)
4498     -{
4499     - my $q = shift;
4500     -
4501     - # enable utf8 binmode so new translations work
4502     - binmode STDOUT, ":utf8";
4503     -
4504     - # Use this variable throughout to keep track of files
4505     - # list of just the files
4506     - my $c = "1";
4507     - my @files = ();
4508     - my %files_hash = ();
4509     - my @panel_group = $ENV{'REMOTE_USER'} eq "admin" ?
4510     - ("admin") : determineGroup($ENV{'REMOTE_USER'});
4511     -
4512     - #-----------------------------------------------------
4513     - # Determine the directory where the functions are kept
4514     - #-----------------------------------------------------
4515     -
4516     - my $navigation_ignore =
4517     - "(\.\.?|navigation|noframes|online-manual|(internal|pleasewait)(-.*)?)";
4518     -
4519     - my $cgidir = 'nowhere';
4520     - if ($panel_group[0] eq 'admin')
4521     - {
4522     - $cgidir = '/etc/e-smith/web/panels/manager/cgi-bin/';
4523     -
4524     - if (opendir (DIR, $cgidir))
4525     - {
4526     - @files = grep (!/^${navigation_ignore}$/,
4527     - readdir (DIR));
4528     - closedir (DIR);
4529     - }
4530     - else
4531     - {
4532     - warn "Can't open directory $cgidir\n";
4533     - }
4534     -
4535     - foreach my $file (@files)
4536     - {
4537     - next if (-d "$cgidir/$file");
4538     - $files_hash{$file} = $cgidir;
4539     - }
4540     - }
4541     - else
4542     - {
4543     - foreach my $panel (@panel_group)
4544     - {
4545     - $cgidir = "/etc/e-smith/web/panels/manager/$panel/cgi-bin";
4546     -
4547     - if (opendir (DIR, $cgidir))
4548     - {
4549     - @files = grep (!/^${navigation_ignore}$/,
4550     - readdir (DIR));
4551     - closedir (DIR);
4552     - foreach my $file (@files)
4553     - {
4554     - next if (-d "$cgidir/$file");
4555     - $files_hash{$file} = $cgidir;
4556     - }
4557     - }
4558     - else
4559     - {
4560     - warn "Can't open directory $cgidir\n";
4561     - }
4562     - }
4563     - }
4564     -
4565     - #--------------------------------------------------
4566     - # For each script, extract the description and category
4567     - # information. Build up an associative array mapping headings
4568     - # to heading structures. Each heading structure contains the
4569     - # total weight for the heading, the number of times the heading
4570     - # has been encountered, and another associative array mapping
4571     - # descriptions to description structures. Each description
4572     - # structure contains the filename of the particular cgi script
4573     - # and a weight.
4574     - #--------------------------------------------------
4575     - my %nav = ();
4576     -
4577     - use constant NAVIGATIONDIR => '/home/e-smith/db/navigation';
4578     - use constant WEBFUNCTIONS => '/etc/e-smith/web/functions';
4579     -
4580     - my $i18n = new esmith::I18N;
4581     -
4582     - my $language = $i18n->preferredLanguage( $ENV{HTTP_ACCEPT_LANGUAGE} );
4583     -
4584     - my $navinfo = NAVIGATIONDIR . "/navigation.$language";
4585     -
4586     - my $navdb = esmith::NavigationDB->open_ro( $navinfo ) or
4587     - die "Couldn't open $navinfo\n";
4588     -
4589     - # Check the navdb for anything with a UrlPath, which means that it doesn't
4590     - # have a cgi file to be picked up by the above code. Ideally, only pages
4591     - # that exist should be in the db, but that's not the case. Anything
4592     - # without a cgi file will have to remove themselves on uninstall from the
4593     - # navigation dbs.
4594     - foreach my $rec ($navdb->get_all)
4595     - {
4596     - if ($rec->prop('UrlPath'))
4597     - {
4598     - $files_hash{$rec->{key}} = $cgidir;
4599     - }
4600     - }
4601     -
4602     - foreach my $file (keys %files_hash)
4603     - {
4604     - my $heading = 'Unknown';
4605     - my $description = $file;
4606     - my $headingWeight = 99999;
4607     - my $descriptionWeight = 99999;
4608     - my $urlpath = '';
4609     -
4610     - my $rec = $navdb->get($file);
4611     -
4612     - if (defined $rec)
4613     - {
4614     - $heading = $rec->prop('Heading');
4615     - $description = $rec->prop('Description');
4616     - $headingWeight = $rec->prop('HeadingWeight');
4617     - $descriptionWeight = $rec->prop('DescriptionWeight');
4618     - $urlpath = $rec->prop('UrlPath') || '';
4619     - }
4620     -
4621     - #--------------------------------------------------
4622     - # add heading, description and weight information to data structure
4623     - #--------------------------------------------------
4624     -
4625     - unless (exists $nav {$heading})
4626     - {
4627     - $nav {$heading} = { COUNT => 0, WEIGHT => 0, DESCRIPTIONS => [] };
4628     - }
4629     -
4630     - $nav {$heading} {'COUNT'} ++;
4631     - $nav {$heading} {'WEIGHT'} += $headingWeight;
4632     -
4633     - # Check for manager panel, and assign the appropriate
4634     - # cgi-bin prefix for the links.
4635     - # Grab the last 2 directories by splitting for '/'s and
4636     - # then concatenating the last 2
4637     - # probably a better way, but I don't know it.
4638     - my @filename = split /\//, $files_hash{$file};
4639     - my $path = ($cgidir eq '/etc/e-smith/web/panels/manager/cgi-bin/') ?
4640     - "/$filename[scalar @filename - 1]" :
4641     - "/$filename[scalar @filename - 2]/$filename[scalar @filename - 1]";
4642     -
4643     - push @{ $nav {$heading} {'DESCRIPTIONS'} },
4644     - { DESCRIPTION => $description,
4645     - WEIGHT => $descriptionWeight,
4646     - FILENAME => $urlpath ? $urlpath : "$path/$file",
4647     - CGIPATH => $path
4648     - };
4649     - }
4650     -
4651     - #--------------------------------------------------
4652     - # generate list of headings sorted by average weight
4653     - #--------------------------------------------------
4654     - if ( $NO_FRAMES )
4655     - {
4656     - esmith::cgi::genNoframesHeader ($q);
4657     - }
4658     - else
4659     - {
4660     - esmith::cgi::genNavigationHeader ($q, undef);
4661     - print "\n<TABLE BORDER=\"0\" CELLSPACING=\"0\" CELLPADDING=\"0\">\n";
4662     - }
4663     -
4664     - print '<script language="JavaScript" type="text/javascript">
4665     - <!-- Hide script
4666     - //This swap the class of the selected item.
4667     - function swapClass() {
4668     - var i,x,tB,j=0,tA=new Array(),arg=swapClass.arguments;
4669     - if(document.getElementsByTagName){for(i=4;i<arg.length;i++){tB=document.getElementsByTagName(arg[i]);
4670     - for(x=0;x<tB.length;x++){tA[j]=tB[x];j++;}}for(i=0;i<tA.length;i++){
4671     - if(tA[i].className){if(tA[i].id==arg[1]){if(arg[0]==1){
4672     - tA[i].className=(tA[i].className==arg[3])?arg[2]:arg[3];}else{tA[i].className=arg[2];}
4673     - }else if(arg[0]==1 && arg[1]==\'none\'){if(tA[i].className==arg[2] || tA[i].className==arg[3]){
4674     - tA[i].className=(tA[i].className==arg[3])?arg[2]:arg[3];}
4675     - }else if(tA[i].className==arg[2]){tA[i].className=arg[3];}}}}}
4676     - ';
4677     - print "
4678     - //This swap the class of the selected item.
4679     - function swapClasses() {
4680     - var arg=swapClasses.arguments;
4681     - swapClass(0,'none','item-current','item','a');
4682     - swapClass(0,'none','warn-current','warn','a');
4683     - swapClass(0,arg[0],'item-current','item','a');
4684     - }
4685     -
4686     - // End script hiding -->
4687     - </script>
4688     - ";
4689     -
4690     - foreach my $h (sort {
4691     - ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) <=>
4692     - ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav)
4693     - {
4694     - if ( $NO_FRAMES )
4695     - {
4696     - print $q->h2 ($h);
4697     - }
4698     - else
4699     - {
4700     - print "\n", $q->Tr ($q->td({class => "section"},$q->span({class => "section"}, $h)));
4701     - }
4702     -
4703     - #--------------------------------------------------
4704     - # generate list of descriptions sorted by weight
4705     - #--------------------------------------------------
4706     - print "<ul>\n" if ( $NO_FRAMES );
4707     -
4708     - foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} } @{$nav {$h}{'DESCRIPTIONS'}})
4709     - {
4710     - my $href = "/server-manager" . $_->{'FILENAME'};
4711     - if ( $NO_FRAMES )
4712     - {
4713     - print $q->li ($q->a ({href => "$href?noframes=1"}, $_->{'DESCRIPTION'}));
4714     - }
4715     - else
4716     - {
4717     - print "\n",$q->Tr(
4718     - $q->td ({-class => "menu-cell"},
4719     - $q->a ({-id => "sme$c",
4720     - -class => "item",
4721     - -onClick => "swapClasses('sme$c')",
4722     - href => $href,
4723     - target => 'main'},
4724     - $_->{'DESCRIPTION'})
4725     - ));
4726     - }
4727     - $c++;
4728     -
4729     - }
4730     - print "</ul>\n" if ($NO_FRAMES);
4731     - }
4732     -
4733     - unless ( $NO_FRAMES )
4734     - {
4735     - print "\n</TABLE>\n";
4736     - esmith::cgi::genNavigationFooter ($q);
4737     - }
4738     -}
4739     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
4740     --- 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
4741     +++ e-smith-manager-2.6.0/root/etc/e-smith/web/panels/manager/cgi-bin/noframes 1969-12-31 19:00:00.000000000 -0500
4742     @@ -1,340 +0,0 @@
4743     -#!/usr/bin/perl -wT
4744     -
4745     -#----------------------------------------------------------------------
4746     -# e-smith manager functions: navigation
4747     -#
4748     -# copyright (C) 2002 Mitel Networks Corporation
4749     -#
4750     -# This program is free software; you can redistribute it and/or modify
4751     -# it under the terms of the GNU General Public License as published by
4752     -# the Free Software Foundation; either version 2 of the License, or
4753     -# (at your option) any later version.
4754     -#
4755     -# This program is distributed in the hope that it will be useful,
4756     -# but WITHOUT ANY WARRANTY; without even the implied warranty of
4757     -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4758     -# GNU General Public License for more details.
4759     -#
4760     -# You should have received a copy of the GNU General Public License
4761     -# along with this program; if not, write to the Free Software
4762     -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
4763     -#
4764     -# Technical support for this program is available from Mitel Networks
4765     -# Please visit our web site www.e-smith.com for details.
4766     -#----------------------------------------------------------------------
4767     -package esmith;
4768     -
4769     -use strict;
4770     -use CGI ':no_xhtml', ':all';
4771     -use CGI::Carp qw(fatalsToBrowser);
4772     -
4773     -use esmith::cgi;
4774     -use esmith::config;
4775     -use esmith::NavigationDB;
4776     -use esmith::util;
4777     -use esmith::I18N;
4778     -
4779     -sub determineGroup;
4780     -sub showNavigation ($);
4781     -
4782     -BEGIN
4783     -{
4784     - # Clear PATH and related environment variables so that calls to
4785     - # external programs do not cause results to be tainted. See
4786     - # "perlsec" manual page for details.
4787     -
4788     - $ENV {'PATH'} = '';
4789     - $ENV {'SHELL'} = '/bin/bash';
4790     - delete $ENV {'ENV'};
4791     -}
4792     -
4793     -esmith::util::setRealToEffective ();
4794     -
4795     -$CGI::POST_MAX=1024 * 100; # max 100K posts
4796     -$CGI::DISABLE_UPLOADS = 1; # no uploads
4797     -
4798     -# Use the one script for navigation and noframes
4799     -my $NO_FRAMES = ($0 =~ /noframes/);
4800     -
4801     -my %conf;
4802     -tie %conf, 'esmith::config';
4803     -
4804     -my $q = new CGI;
4805     -
4806     -showNavigation ($q);
4807     -exit (0);
4808     -
4809     -
4810     -#------------------------------------------------------
4811     -# subroutine to determine which group a user belongs to
4812     -#------------------------------------------------------
4813     -
4814     -sub determineGroup
4815     -{
4816     - my ($user) = shift;
4817     -
4818     - # Group file for authentication
4819     - my $group_file = '/etc/group';
4820     - open ( GF, $group_file )
4821     - or die "Cannot open group file: $group_file: $!\n";
4822     -
4823     - # list of groups this user belongs to
4824     - my @groupList;
4825     - while (<GF>)
4826     - {
4827     - if (/[:,]$user\b/)
4828     - {
4829     - my ($groupName, undef) = split(/:/);
4830     - push @groupList, $groupName;
4831     - }
4832     - }
4833     - close GF;
4834     - return @groupList;
4835     -}
4836     -
4837     -#------------------------------------------------------------
4838     -# subroutine to display navigation bar
4839     -#------------------------------------------------------------
4840     -
4841     -sub showNavigation ($)
4842     -{
4843     - my $q = shift;
4844     -
4845     - # enable utf8 binmode so new translations work
4846     - binmode STDOUT, ":utf8";
4847     -
4848     - # Use this variable throughout to keep track of files
4849     - # list of just the files
4850     - my $c = "1";
4851     - my @files = ();
4852     - my %files_hash = ();
4853     - my @panel_group = $ENV{'REMOTE_USER'} eq "admin" ?
4854     - ("admin") : determineGroup($ENV{'REMOTE_USER'});
4855     -
4856     - #-----------------------------------------------------
4857     - # Determine the directory where the functions are kept
4858     - #-----------------------------------------------------
4859     -
4860     - my $navigation_ignore =
4861     - "(\.\.?|navigation|noframes|online-manual|(internal|pleasewait)(-.*)?)";
4862     -
4863     - my $cgidir = 'nowhere';
4864     - if ($panel_group[0] eq 'admin')
4865     - {
4866     - $cgidir = '/etc/e-smith/web/panels/manager/cgi-bin/';
4867     -
4868     - if (opendir (DIR, $cgidir))
4869     - {
4870     - @files = grep (!/^${navigation_ignore}$/,
4871     - readdir (DIR));
4872     - closedir (DIR);
4873     - }
4874     - else
4875     - {
4876     - warn "Can't open directory $cgidir\n";
4877     - }
4878     -
4879     - foreach my $file (@files)
4880     - {
4881     - next if (-d "$cgidir/$file");
4882     - $files_hash{$file} = $cgidir;
4883     - }
4884     - }
4885     - else
4886     - {
4887     - foreach my $panel (@panel_group)
4888     - {
4889     - $cgidir = "/etc/e-smith/web/panels/manager/$panel/cgi-bin";
4890     -
4891     - if (opendir (DIR, $cgidir))
4892     - {
4893     - @files = grep (!/^${navigation_ignore}$/,
4894     - readdir (DIR));
4895     - closedir (DIR);
4896     - foreach my $file (@files)
4897     - {
4898     - next if (-d "$cgidir/$file");
4899     - $files_hash{$file} = $cgidir;
4900     - }
4901     - }
4902     - else
4903     - {
4904     - warn "Can't open directory $cgidir\n";
4905     - }
4906     - }
4907     - }
4908     -
4909     - #--------------------------------------------------
4910     - # For each script, extract the description and category
4911     - # information. Build up an associative array mapping headings
4912     - # to heading structures. Each heading structure contains the
4913     - # total weight for the heading, the number of times the heading
4914     - # has been encountered, and another associative array mapping
4915     - # descriptions to description structures. Each description
4916     - # structure contains the filename of the particular cgi script
4917     - # and a weight.
4918     - #--------------------------------------------------
4919     - my %nav = ();
4920     -
4921     - use constant NAVIGATIONDIR => '/home/e-smith/db/navigation';
4922     - use constant WEBFUNCTIONS => '/etc/e-smith/web/functions';
4923     -
4924     - my $i18n = new esmith::I18N;
4925     -
4926     - my $language = $i18n->preferredLanguage( $ENV{HTTP_ACCEPT_LANGUAGE} );
4927     -
4928     - my $navinfo = NAVIGATIONDIR . "/navigation.$language";
4929     -
4930     - my $navdb = esmith::NavigationDB->open_ro( $navinfo ) or
4931     - die "Couldn't open $navinfo\n";
4932     -
4933     - # Check the navdb for anything with a UrlPath, which means that it doesn't
4934     - # have a cgi file to be picked up by the above code. Ideally, only pages
4935     - # that exist should be in the db, but that's not the case. Anything
4936     - # without a cgi file will have to remove themselves on uninstall from the
4937     - # navigation dbs.
4938     - foreach my $rec ($navdb->get_all)
4939     - {
4940     - if ($rec->prop('UrlPath'))
4941     - {
4942     - $files_hash{$rec->{key}} = $cgidir;
4943     - }
4944     - }
4945     -
4946     - foreach my $file (keys %files_hash)
4947     - {
4948     - my $heading = 'Unknown';
4949     - my $description = $file;
4950     - my $headingWeight = 99999;
4951     - my $descriptionWeight = 99999;
4952     - my $urlpath = '';
4953     -
4954     - my $rec = $navdb->get($file);
4955     -
4956     - if (defined $rec)
4957     - {
4958     - $heading = $rec->prop('Heading');
4959     - $description = $rec->prop('Description');
4960     - $headingWeight = $rec->prop('HeadingWeight');
4961     - $descriptionWeight = $rec->prop('DescriptionWeight');
4962     - $urlpath = $rec->prop('UrlPath') || '';
4963     - }
4964     -
4965     - #--------------------------------------------------
4966     - # add heading, description and weight information to data structure
4967     - #--------------------------------------------------
4968     -
4969     - unless (exists $nav {$heading})
4970     - {
4971     - $nav {$heading} = { COUNT => 0, WEIGHT => 0, DESCRIPTIONS => [] };
4972     - }
4973     -
4974     - $nav {$heading} {'COUNT'} ++;
4975     - $nav {$heading} {'WEIGHT'} += $headingWeight;
4976     -
4977     - # Check for manager panel, and assign the appropriate
4978     - # cgi-bin prefix for the links.
4979     - # Grab the last 2 directories by splitting for '/'s and
4980     - # then concatenating the last 2
4981     - # probably a better way, but I don't know it.
4982     - my @filename = split /\//, $files_hash{$file};
4983     - my $path = ($cgidir eq '/etc/e-smith/web/panels/manager/cgi-bin/') ?
4984     - "/$filename[scalar @filename - 1]" :
4985     - "/$filename[scalar @filename - 2]/$filename[scalar @filename - 1]";
4986     -
4987     - push @{ $nav {$heading} {'DESCRIPTIONS'} },
4988     - { DESCRIPTION => $description,
4989     - WEIGHT => $descriptionWeight,
4990     - FILENAME => $urlpath ? $urlpath : "$path/$file",
4991     - CGIPATH => $path
4992     - };
4993     - }
4994     -
4995     - #--------------------------------------------------
4996     - # generate list of headings sorted by average weight
4997     - #--------------------------------------------------
4998     - if ( $NO_FRAMES )
4999     - {
5000     - esmith::cgi::genNoframesHeader ($q);
5001     - }
5002     - else
5003     - {
5004     - esmith::cgi::genNavigationHeader ($q, undef);
5005     - print "\n<TABLE BORDER=\"0\" CELLSPACING=\"0\" CELLPADDING=\"0\">\n";
5006     - }
5007     -
5008     - print '<script language="JavaScript" type="text/javascript">
5009     - <!-- Hide script
5010     - //This swap the class of the selected item.
5011     - function swapClass() {
5012     - var i,x,tB,j=0,tA=new Array(),arg=swapClass.arguments;
5013     - if(document.getElementsByTagName){for(i=4;i<arg.length;i++){tB=document.getElementsByTagName(arg[i]);
5014     - for(x=0;x<tB.length;x++){tA[j]=tB[x];j++;}}for(i=0;i<tA.length;i++){
5015     - if(tA[i].className){if(tA[i].id==arg[1]){if(arg[0]==1){
5016     - tA[i].className=(tA[i].className==arg[3])?arg[2]:arg[3];}else{tA[i].className=arg[2];}
5017     - }else if(arg[0]==1 && arg[1]==\'none\'){if(tA[i].className==arg[2] || tA[i].className==arg[3]){
5018     - tA[i].className=(tA[i].className==arg[3])?arg[2]:arg[3];}
5019     - }else if(tA[i].className==arg[2]){tA[i].className=arg[3];}}}}}
5020     - ';
5021     - print "
5022     - //This swap the class of the selected item.
5023     - function swapClasses() {
5024     - var arg=swapClasses.arguments;
5025     - swapClass(0,'none','item-current','item','a');
5026     - swapClass(0,'none','warn-current','warn','a');
5027     - swapClass(0,arg[0],'item-current','item','a');
5028     - }
5029     -
5030     - // End script hiding -->
5031     - </script>
5032     - ";
5033     -
5034     - foreach my $h (sort {
5035     - ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) <=>
5036     - ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav)
5037     - {
5038     - if ( $NO_FRAMES )
5039     - {
5040     - print $q->h2 ($h);
5041     - }
5042     - else
5043     - {
5044     - print "\n", $q->Tr ($q->td({class => "section"},$q->span({class => "section"}, $h)));
5045     - }
5046     -
5047     - #--------------------------------------------------
5048     - # generate list of descriptions sorted by weight
5049     - #--------------------------------------------------
5050     - print "<ul>\n" if ( $NO_FRAMES );
5051     -
5052     - foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} } @{$nav {$h}{'DESCRIPTIONS'}})
5053     - {
5054     - my $href = "/server-manager" . $_->{'FILENAME'};
5055     - if ( $NO_FRAMES )
5056     - {
5057     - print $q->li ($q->a ({href => "$href?noframes=1"}, $_->{'DESCRIPTION'}));
5058     - }
5059     - else
5060     - {
5061     - print "\n",$q->Tr(
5062     - $q->td ({-class => "menu-cell"},
5063     - $q->a ({-id => "sme$c",
5064     - -class => "item",
5065     - -onClick => "swapClasses('sme$c')",
5066     - href => $href,
5067     - target => 'main'},
5068     - $_->{'DESCRIPTION'})
5069     - ));
5070     - }
5071     - $c++;
5072     -
5073     - }
5074     - print "</ul>\n" if ($NO_FRAMES);
5075     - }
5076     -
5077     - unless ( $NO_FRAMES )
5078     - {
5079     - print "\n</TABLE>\n";
5080     - esmith::cgi::genNavigationFooter ($q);
5081     - }
5082     -}
5083     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
5084     --- 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
5085     +++ e-smith-manager-2.6.0/root/etc/e-smith/web/panels/manager/html/index.cgi 1969-12-31 19:00:00.000000000 -0500
5086     @@ -1,36 +0,0 @@
5087     -#!/usr/bin/perl -wT
5088     -
5089     -#----------------------------------------------------------------------
5090     -# copyright (C) 1999-2006 Mitel Networks Corporation
5091     -#
5092     -# This program is free software; you can redistribute it and/or modify
5093     -# it under the terms of the GNU General Public License as published by
5094     -# the Free Software Foundation; either version 2 of the License, or
5095     -# (at your option) any later version.
5096     -#
5097     -# This program is distributed in the hope that it will be useful,
5098     -# but WITHOUT ANY WARRANTY; without even the implied warranty of
5099     -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5100     -# GNU General Public License for more details.
5101     -#
5102     -# You should have received a copy of the GNU General Public License
5103     -# along with this program; if not, write to the Free Software
5104     -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
5105     -#
5106     -#----------------------------------------------------------------------
5107     -
5108     -use strict;
5109     -use esmith::FormMagick;
5110     -
5111     -my $fm = new esmith::FormMagick;
5112     -$fm->display();
5113     -
5114     -exit 0;
5115     -
5116     -__DATA__
5117     -<form title="FORM_TITLE" header="/etc/e-smith/web/common/noframes_head.tmpl" footer="/etc/e-smith/web/common/noframes_foot.tmpl">
5118     - <page name="First">
5119     - <description>NOFRAMES_BODY</description>
5120     - </page>
5121     -
5122     -</form>
5123     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
5124     --- 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
5125     +++ e-smith-manager-2.6.0/root/etc/e-smith/web/panels/manager/html/initial.cgi 1969-12-31 19:00:00.000000000 -0500
5126     @@ -1,36 +0,0 @@
5127     -#!/usr/bin/perl -wT
5128     -
5129     -#----------------------------------------------------------------------
5130     -# copyright (C) 1999-2006 Mitel Networks Corporation
5131     -#
5132     -# This program is free software; you can redistribute it and/or modify
5133     -# it under the terms of the GNU General Public License as published by
5134     -# the Free Software Foundation; either version 2 of the License, or
5135     -# (at your option) any later version.
5136     -#
5137     -# This program is distributed in the hope that it will be useful,
5138     -# but WITHOUT ANY WARRANTY; without even the implied warranty of
5139     -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5140     -# GNU General Public License for more details.
5141     -#
5142     -# You should have received a copy of the GNU General Public License
5143     -# along with this program; if not, write to the Free Software
5144     -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
5145     -#
5146     -#----------------------------------------------------------------------
5147     -use strict;
5148     -use esmith::FormMagick;
5149     -
5150     -my $fm = new esmith::FormMagick;
5151     -
5152     -$fm->display();
5153     -
5154     -exit 0;
5155     -
5156     -__DATA__
5157     -<form title="FORM_TITLE" header="/etc/e-smith/web/common/head.tmpl" footer="/etc/e-smith/web/common/foot.tmpl">
5158     - <page name="First">
5159     - <description>FRAMES_BODY</description>
5160     - </page>
5161     -
5162     -</form>
5163     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
5164     --- 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
5165     +++ 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
5166     @@ -1,22 +0,0 @@
5167     -# SOME DESCRIPTIVE TITLE.
5168     -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
5169     -# This file is distributed under the same license as the PACKAGE package.
5170     -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5171     -#
5172     -#, fuzzy
5173     -msgid ""
5174     -msgstr ""
5175     -"Project-Id-Version: PACKAGE VERSION\n"
5176     -"Report-Msgid-Bugs-To: \n"
5177     -"POT-Creation-Date: 2016-06-13 04:18-0400\n"
5178     -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
5179     -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
5180     -"Language-Team: LANGUAGE <LL@li.org>\n"
5181     -"Language: \n"
5182     -"MIME-Version: 1.0\n"
5183     -"Content-Type: text/plain; charset=CHARSET\n"
5184     -"Content-Transfer-Encoding: 8bit\n"
5185     -
5186     -#: root/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/25Copyright:7
5187     -msgid "All rights reserved."
5188     -msgstr ""

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed