9 commits - COPYING package.xml www/admin
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Tue Apr 19 18:40:23 CEST 2011
COPYING | 481 ++++++++++++++++++++++++++++++++++++++++++++++++
package.xml | 45 ++++
www/admin/user/user.php | 10
3 files changed, 528 insertions(+), 8 deletions(-)
New commits:
commit ece93f38cc1ba81ddebc5f6dc2129f2bbd60c9c4
Merge: 93ea966... 2ceab7d...
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Tue Apr 19 17:39:36 2011 +0100
Merge branch '2.3-stable'
commit 93ea9662b69006c18b2e4c7875e661bc96b3be22
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Tue Apr 19 17:39:00 2011 +0100
Revert "Fixing the UID bug. See : https://bugzilla.kolabsys.com/show_bug.cgi?id=75"
This reverts commit 6af61f8c3c46aa032a1f0bb7ff70e939ca4f0454.
diff --git a/www/admin/user/user.php b/www/admin/user/user.php
index f99d6e1..7c00de3 100644
--- a/www/admin/user/user.php
+++ b/www/admin/user/user.php
@@ -2,7 +2,6 @@
/*
(c) 2004-2006 Klaraelvdalens Datakonsult AB
(c) 2004 Martin Konold erfrakon <martin.konold at erfrakon.de>
- (c) 2010 Bogomil Shopov <shopov at kolabsys.com>
This program is Free Software under the GNU General Public License (>=v2).
Read the file COPYING that comes with this packages for details.
*/
@@ -663,9 +662,6 @@ switch( $action ) {
if ($action == "save") {
if (!$errors) {
- //we need unmodified uid for renaming.
- $newid="uid=".$ldap->dn_escape($ldap_object['uid']);
-
if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap->dn_escape($ldap_object['cn']).",".$domain_dn;
else $newdn = $dn;
if (strcmp($dn,$newdn) != 0) {
@@ -678,7 +674,7 @@ switch( $action ) {
if (($result=ldap_read($ldap->connection,$dn,"(objectclass=*)")) &&
($entry=ldap_first_entry($ldap->connection,$result)) &&
($oldattrs=ldap_get_attributes($ldap->connection,$entry))) {
- //$ldap_object['uid'] = $oldattrs['uid'][0];
+ $ldap_object['uid'] = $oldattrs['uid'][0];
$ldap_object['mail'] = $oldattrs['mail'][0];
unset( $oldattrs['count'] );
foreach( $oldattrs as $k => $v ) {
commit 2ceab7dbc7bf619d8c9b18e266597a2e34778d54
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Tue Apr 19 17:21:17 2011 +0100
update package.xml for Bogo's new skin
diff --git a/package.xml b/package.xml
index 34a29c1..dcde2a7 100644
--- a/package.xml
+++ b/package.xml
@@ -159,6 +159,25 @@
<file name="domainmaintainer.php" role="www" />
<file name="index.php" role="www" />
</dir> <!-- /www/admin/domainmaintainer -->
+ <dir name="images">
+ <file name="body.jpg" role="www" />
+ <file name="bottom.png" role="www" />
+ <file name="eye_pencil.png" role="www" />
+ <file name="footer.png" role="www" />
+ <file name="icon_grey_logout.png" role="www" />
+ <file name="identica.png" role="www" />
+ <file name="irc.png" role="www" />
+ <file name="klogo.png" role="www" />
+ <file name="kolab.png" role="www" />
+ <file name="line.png" role="www" />
+ <file name="listitem.png" role="www" />
+ <file name="logo.png" role="www" />
+ <file name="menu.jpg" role="www" />
+ <file name="root.jpg" role="www" />
+ <file name="twitter.png" role="www" />
+ <file name="ul-icon.png" role="www" />
+ <file name="user-icon-1-20x20.gif" role="www" />
+ </dir> <!-- /www/admin/images -->
<dir name="kolab">
<file name="codefusion.php" role="www" />
<file name="erfrakon.php" role="www" />
@@ -203,9 +222,13 @@
<file name="user.php" role="www" />
<file name="vacation.php" role="www" />
</dir> <!-- /www/admin/user -->
+ <file name="custom.css" role="www" />
+ <file name="favicon.ico" role="www" />
+ <file name="favicon.png" role="www" />
<file name="index.php" role="www" />
<file name="logout.php" role="www" />
<file name="print.css" role="www" />
+ <file name="screen.css" role="www" />
<file name="style.css" role="www" />
</dir> <!-- /www/admin -->
<file name="favicon.ico" role="www" />
@@ -303,9 +326,13 @@
<install as="KolabAdmin/Unit/Sieve/Segment/VacationTest.php" name="test/KolabAdmin/Unit/Sieve/Segment/VacationTest.php" />
<install as="favicon.ico" name="www/favicon.ico" />
<install as="favicon.png" name="www/favicon.png" />
+ <install as="admin/custom.css" name="www/admin/custom.css" />
+ <install as="admin/favicon.ico" name="www/admin/favicon.ico" />
+ <install as="admin/favicon.png" name="www/admin/favicon.png" />
<install as="admin/index.php" name="www/admin/index.php" />
<install as="admin/logout.php" name="www/admin/logout.php" />
<install as="admin/print.css" name="www/admin/print.css" />
+ <install as="admin/screen.css" name="www/admin/screen.css" />
<install as="admin/style.css" name="www/admin/style.css" />
<install as="admin/addressbook/addr.php" name="www/admin/addressbook/addr.php" />
<install as="admin/addressbook/index.php" name="www/admin/addressbook/index.php" />
@@ -315,6 +342,23 @@
<install as="admin/distributionlist/list.php" name="www/admin/distributionlist/list.php" />
<install as="admin/domainmaintainer/domainmaintainer.php" name="www/admin/domainmaintainer/domainmaintainer.php" />
<install as="admin/domainmaintainer/index.php" name="www/admin/domainmaintainer/index.php" />
+ <install as="admin/images/body.jpg" name="www/admin/images/body.jpg" />
+ <install as="admin/images/bottom.png" name="www/admin/images/bottom.png" />
+ <install as="admin/images/eye_pencil.png" name="www/admin/images/eye_pencil.png" />
+ <install as="admin/images/footer.png" name="www/admin/images/footer.png" />
+ <install as="admin/images/icon_grey_logout.png" name="www/admin/images/icon_grey_logout.png" />
+ <install as="admin/images/identica.png" name="www/admin/images/identica.png" />
+ <install as="admin/images/irc.png" name="www/admin/images/irc.png" />
+ <install as="admin/images/klogo.png" name="www/admin/images/klogo.png" />
+ <install as="admin/images/kolab.png" name="www/admin/images/kolab.png" />
+ <install as="admin/images/line.png" name="www/admin/images/line.png" />
+ <install as="admin/images/listitem.png" name="www/admin/images/listitem.png" />
+ <install as="admin/images/logo.png" name="www/admin/images/logo.png" />
+ <install as="admin/images/menu.jpg" name="www/admin/images/menu.jpg" />
+ <install as="admin/images/root.jpg" name="www/admin/images/root.jpg" />
+ <install as="admin/images/twitter.png" name="www/admin/images/twitter.png" />
+ <install as="admin/images/ul-icon.png" name="www/admin/images/ul-icon.png" />
+ <install as="admin/images/user-icon-1-20x20.gif" name="www/admin/images/user-icon-1-20x20.gif" />
<install as="admin/kolab/codefusion.php" name="www/admin/kolab/codefusion.php" />
<install as="admin/kolab/erfrakon.php" name="www/admin/kolab/erfrakon.php" />
<install as="admin/kolab/index.php" name="www/admin/kolab/index.php" />
commit 6e996f45d145bdc246cc45612f20f8779003d8ed
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Tue Apr 19 17:19:55 2011 +0100
Check in COPYING and remove INSTALL from package.xml
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..eb685a5
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,481 @@
+ GNU LIBRARY GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+ 675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL. It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it. You can use it for
+your libraries, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library. If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software. To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+ Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs. This
+license, the GNU Library General Public License, applies to certain
+designated libraries. This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+ The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it. Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program. However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+ Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries. We
+concluded that weaker conditions might promote sharing better.
+
+ However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves. This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them. (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.) The hope is that this
+will lead to faster development of free libraries.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+ Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+
+ GNU LIBRARY GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License"). Each licensee is
+addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ c) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ d) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ Appendix: How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free
+ Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/package.xml b/package.xml
index 9194b44..34a29c1 100644
--- a/package.xml
+++ b/package.xml
@@ -214,7 +214,6 @@
<file name="AUTHORS" role="data" />
<file name="ChangeLog" role="data" />
<file name="COPYING" role="data" />
- <file name="INSTALL" role="data" />
<file name="NEWS" role="data" />
</dir> <!-- / -->
</contents>
commit 0a50c36154066f2ec6ea7de2a7684781b8a34e4d
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Tue Apr 19 17:51:17 2011 +0200
Update About section from Georg
diff --git a/data/templates/kolab.tpl b/data/templates/kolab.tpl
old mode 100755
new mode 100644
index d43db6c..9ae895d
--- a/data/templates/kolab.tpl
+++ b/data/templates/kolab.tpl
@@ -5,96 +5,58 @@
End:
*}
<div class="contenttext">
-<h1>{tr msg="Kolab2 Groupware Server"}</h1>
+<h1>{tr msg="Kolab Groupware Solution"}</h1>
<p>
-{tr msg="This is the Kolab2 Server. It is Free Software developed by the <a href=\"http://www.kolab.org/\">Kolab Project</a>, with the intention of bringing groupware functionality to Unix/KDE users as well as Windows desktops."}
+{tr msg="This is the server of the Kolab Groupware Solution, a <a href=\"http://fsfe.org/about/basics/freesoftware\">Free Software</a> Personal Information Management (PIM) solution developed by the <a href=\"http://www.kolab.org/\">Kolab Community</a>. Any installation of the Kolab Groupware Solution would normally include one or more of these servers, in combination with a variety of clients for its users. If you are interested in the technology, you can read more about it <a href=\"/admin/kolab/technology.php\">here</a>."}
</p>
-<div>
-{tr msg="Kolab builds upon many other Free Software projects, namely:"}
-<ul>
- <li><a href="http://www.ijs.si/software/amavisd/">amavisd-new</a> {tr msg="(Mail Scanner)"}</li>
- <li><a href="http://www.apache.org/">Apache</a> {tr msg="(HTTP Server)"}</li>
- <li><a href="http://www.clamav.net/">ClamAV</a> {tr msg="(Virus Scanner)"}</li>
- <li><a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus</a> {tr msg="(IMAP Server)"}</li>
- <li><a href="http://www.openldap.org/">OpenLDAP</a> {tr msg="(LDAP Server)"}</li>
- <li><a href="http://www.postfix.org/">Postfix</a> {tr msg="(MTA)"}</li>
- <li><a href="http://spamassassin.apache.org/">SpamAssasin</a> {tr msg="(SPAM Filter)"}</li>
+<h2>{tr msg="Why Kolab?"}</h2>
+
+<p>{tr msg="There is a wide variety of reasons why Kolab should be your choice. Several of them have been put together for different target groups in the"} <a href="http://files.kolabsys.com/Public/Handouts/">{tr msg="Handouts for the Kolab Groupware Solution by Kolab Systems"}</a>. {tr msg="To summarize just some points, Kolab is your solution, if"}</p>
-</ul>
-{tr msg="The following projects are used in binding the above together, in order to create the Kolab Server:"}
<ul>
- <li><a href="http://www.perl.org/">Perl</a></li>
- <li><a href="http://www.php.net/">PHP</a></li>
- <li><a href="http://smarty.php.net/">Smarty Template Engine</a></li>
+ <li>{tr msg="you want a solution that seamlessly integrates into your existing environment;"}</li>
+ <li>{tr msg="you want full control over your data, with all the convenience of the cloud;"}</li>
+ <li>{tr msg="you have elevated security needs for your data;"}</li>
+ <li>{tr msg="you have a very large installation, or want to reduce your hardware footprint;"}</li>
+ <li>{tr msg="you have to operate in diverse environments and installations;"}</li>
+ <li>{tr msg="strategic issues are important to you, e.g. you need sovereignty of the software you deploy;"}</li>
+ <li>{tr msg="your users should be fully productive whether they are on- or offline;"}</li>
+ <li>{tr msg="you want the flexibility to create solutions for your specialised needs;"}</li>
+ <li>{tr msg="you want Free Software/Open Source, but also want the professional support without having to resort to proprietary lock-in."}</li>
</ul>
-{tr msg="The following projects are used as a base for the Kolab Clients:"}
+
+<h2>{tr msg="More Information"}</h2>
<ul>
- <li><a href="http://www.kde.org/">K Desktop Environment (KDE)</a></li>
- <li><a href="http://www.horde.org/">The Horde Project</a></li>
+ <li><a href="http://www.kolab.org">{tr msg="Kolab Community Web Site"}</a></li>
+ <li><a href="http://wiki.kolab.org">{tr msg="Kolab Community Wiki"}</a></li>
+ <li><a href="http://blogs.fsfe.org/greve/?p=431">{tr msg="Article: "} 'The Kolab Story' by Georg Greve</a></li>
+ <li><a href="http://files.kolabsys.com/Public/Handouts/">{tr msg="Handouts for the Kolab Groupware Solution by Kolab Systems"}</a></li>
</ul>
-</div>
-
-<p>
-{tr msg="The Kolab project owes a great deal of thanks to the people of the <a href=\"http://www.openpkg.org/\">OpenPKG</a> project. OpenPKG allows Kolab to run on many diverse platforms in a reliable and predictable manner, by providing a common, easy-to-install, cross-platform base on which to build the server."}
-</p>
-
-<p>
-{tr msg="To use all Kolab2 features you need an interoperable client. The KDE Kolab Client was the first such client to be developed and is still considered the reference platform for others to follow. The KDE groupware component Kontact can act as Kolab2 Client. Many thanks to the <a href=\"http://www.kde.org\">KDE Project</a> for providing such a powerful base on which to build this client solution."}
-</p>
-
-<p>
-{tr msg="Users of Outlook on Microsoft Windows are able to use a proprietary plug-in to inter-operate with the Kolab server. For Kolab2 the preferred plug-in is the <a href=\"http://www.toltec.co.za/\">Toltec Plug-in</a> by Radley Network Technologies CC. Radley has worked closely with the Kolab community to help develop the Kolab2 storage format."}
-</p>
-<p>
-{tr msg="A list of additional Outlook plug-ins that provide interoperability with the Kolab server is <a href=\"http://www.kolab.org/kolab-plugins.html\">maintained on the Kolab website</a>."}
-</p>
+<h2>{tr msg="Warranties & Commercial Support"}</h2>
<p>
-{tr msg="There is also a <a href=\"http://www.kolab.org/webclient.html\">web-based client</a> in development which provides full groupware functionality to mobile users through a web interface. It allows users to access their email, calendars, tasks, etc. from anywhere in the world, by simply connecting through a standard web browser. The web client would not have been possible without the excellent <a href=\"http://www.horde.org/\">Horde project</a> on which to build."}
+{tr msg="This is the <b>Community Edition</b> of the Kolab Groupware Server. It is provided by Kolab Systems as fully <a href=\"http://fsfe.org/about/basics/freesoftware\">Free Software</a> and you can use it to the fullest extent and any purpose. There are no license costs or other obligations other than those set forth in the respective Free Software licenses of the various components. <b>There are no warranties or guarantees of any kind, nor is there any guaranteed support. You are running this software entirely at your own risk.</b>"}
</p>
<p>
-{tr msg="As Kolab is a Free Software project, anyone can help to extend the functionality of the software. An active community has developed around the software with many people throughout the world contributing. The project was originally started in 2002 by a joint-venture of three companies: <a href=\"http://www.erfrakon.com/\">erfrakon</a> (design, architecture and server); <a href=\"http://www.intevation.de\">Intevation</a> (project management) and <a href=\"http://www.klaralvdalens-datakonsult.se/\">Klarälvdalens Datakonsult</a> (client)."}
-</p>
+{tr msg="There is a wide variety of commercial support options and warranties available by <a href=\"/admin/kolab/kolabsystems.php\">Kolab Systems AG</a> and its network of partners, the Kolab Enterprise Community. This support comes with access to the additionally quality assured and hardened <b>Certified Kolab</b> edition, which like the community edition is fully available as Free Software, so has all the advantages of the Community Edition and is free of hidden lock-in."}</p>
-<p>
-{tr msg="<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> joined the project soon after the original Kolab1 server was released. Its developers are primarily responsible for an updated engine (which forms the base of the Kolab2 server), the web client, as well as contributing to development of the Kolab2 storage format."}
+<p>{tr msg="Kolab Systems AG will provide limited support for the Community Edition on a case-by-case basis, but with no guaranteed response times, as availability permits, and at rates that may be adjusted due to the work load at the time of the request. <b>It is strongly recommended that for mission-critical professional deployments of the Kolab Groupware Solution you at least choose one of the partially self-supported On Demand support models.</b>"}
</p>
-<div>
- {tr msg="Other contributors:"}<br/>
-<ul>
-<li> <a href="http://www.konsec.com">Konsec GmbH</a> {tr msg="CSSified the Kolab1 web admin GUI"}</li>
-</ul>
-</div>
+<p>{tr msg="<center><table cellspacing=\"2\" cellpadding=\"2\" border=\"1\">
+<tr><td></td><td><b>This edition</b></td><td><em>With SLA by Kolab Systems</em></b></td></tr>
+<tr><td>Support channels</td><td><b>Wiki & public mailing lists only</b></td><td><em>Kolab Systems Ticketing</em></td></tr>
+<tr><td>Guaranteed response times</td><td><b>NO</b></td><td><em>YES</em></td></tr>
+<tr><td>Access to Certified Kolab</td><td><b>NO</b></td><td><em>YES</em></td></tr>
+<tr><td>Warranties</td><td><b>NO</b></td><td><em>YES</em></td></tr>
+<tr><td>Access to custom versions</td><td><b>NO</b></td><td><em>YES</em></td></tr>
+</table></center>"}</p>
-<p>
-{tr msg="The principal authors of the Kolab client and server software are (in alphabetical order):"}
-</p>
+<p>{tr msg="Kolab Systems provides an overview of all available <a href=\"http://kolabsys.com/index.php/solutions/101\">Service Level Agreements (SLA)</a>. To upgrade your installation to Certified Kolab, please contact"} <a href="getkolab at kolabsys.com">getkolab at kolabsys.com</a> {tr msg="or visit our"} <a href="http://kolabsys.com/index.php/component/form/Get%20Kolab?form_id=2">{tr msg="web page"}</a>.</p>
-<div>
-<ul>
- <li>Stuart Bingë</li>
- <li>Stephan Buys</li>
- <li>Matthias Kalle Dalheimer</li>
- <li>Tassilo Erlewein</li>
- <li>David Faure</li>
- <li>Achim Frank</li>
- <li>Michel Boyer de la Giroday</li>
- <li>Steffen Hansen</li>
- <li>Bernhard Herzog</li>
- <li>Martin Konold</li>
- <li>Marc Mutz</li>
- <li>Bernhard Reiter</li>
- <li>Lutz Rogowski</li>
- <li>Bo Thorsen</li>
- <li>Jan-Oliver Wagner</li>
- <li>Karl-Heinz Zimmer</li>
- <li>Romain Pokrzywka</li>
-</ul>
-</div>
<hr>
<small>
diff --git a/data/templates/kolabsystems.tpl b/data/templates/kolabsystems.tpl
new file mode 100644
index 0000000..027ef52
--- /dev/null
+++ b/data/templates/kolabsystems.tpl
@@ -0,0 +1,33 @@
+{* Smarty Template *}
+<div class="align_center">
+ <a href="http://kolabsys.com/">
+ <img src="/admin/pics/kolabsystems_logo.png" alt="Kolab Systems AG" longdesc="http://kolabsys.com" style="border:0px;" />
+ </a>
+</div>
+<div class="contentsimple">
+<p>
+{tr msg="Founded in Zürich in 2010, "}<a href="http://kolabsys.com">Kolab Systems AG</a> {tr msg="is the global leader in Kolab Technology. Together with its partners in the Kolab Enterprise Community, Kolab Systems provides quality assurance, integration, support, training, certification of individuals and third-party products, as well as ongoing development for the Kolab Groupware Solution. The strong partnering model and a highly competent enterprise community provides users of the Kolab Groupware Solution with the right level of professional consulting, support and warranties to enable productivity and collaboration."}
+</p>
+
+<h2>{tr msg="Looking for professional support for your Kolab Groupware Solution?"}</h2>
+
+<p>{tr msg="Kolab Systems provides a wide range of "} <a href="http://kolabsys.com/index.php/solutions/101">Service Level Agreements (SLA)</a> {tr msg= "which range from fully self-supported installations to maintained installations with reaction times as low as 1 hour. These are provided exclusively on Kolab Systems' Certified Kolab edition. To upgrade your installation to Certified Kolab, please contact"} <a href="getkolab at kolabsys.com">getkolab at kolabsys.com</a> {tr msg="or visit our"} <a href="http://kolabsys.com/index.php/component/form/Get%20Kolab?form_id=2">{tr msg="web page"}</a>.
+</p>
+
+<h2>{tr msg="Our Development Partners"}</h2>
+
+<p>{tr msg="In continuously improvingall parts of the Kolab Groupware Solution, Kolab Systems is working closely with development partners, such as (in alphabetical order):"}</p>
+
+<ul>
+<li><a href="http://www.pardus.de">P at rdus</a></li>
+<li><a href="/admin/kolab/intevation.php">Intevation</a></li>
+<li><a href="/admin/kolab/kdab.php">KDAB</a></li>
+<li><a href="http://www.libertech.fr/default.htm">Libertech</a></li>
+<li>...and all the community contributors.
+</ul>
+
+<p><b>{tr msg="Thank you for being part of this awesome community!"}</b></p>
+
+<p>{tr msg="If <b>you</b> want to join the community, please go to "} <a href="http://kolab.org">kolab.org</a> {tr msg="and"} <a href="http://wiki.kolab.org">wiki.kolab.org</a>.
+
+</div>
diff --git a/data/templates/technology.tpl b/data/templates/technology.tpl
new file mode 100644
index 0000000..1dbc611
--- /dev/null
+++ b/data/templates/technology.tpl
@@ -0,0 +1,132 @@
+{* Smarty Template *}
+{*
+ Local variables:
+ buffer-file-coding-system: utf-8
+ End:
+*}
+<div class="contenttext">
+<h1>{tr msg="Kolab Groupware Solution - Technologies"}</h1>
+<p>
+{tr msg="This is the server of the Kolab Groupware Solution. It is <a href=\"http://fsfe.org/about/basics/freesoftware\">Free Software</a> developed by the <a href=\"http://www.kolab.org/\">Kolab Community</a>, which works in collaboration with and as part of many other communities and projects to bring you this software."}
+</p>
+
+<div>
+{tr msg="For this server, Free Software communities and projects that the Kolab Community is a part of and builds upon include:"}
+<ul>
+ <li><a href="http://www.ijs.si/software/amavisd/">amavisd-new</a> {tr msg="(Mail Scanner)"}</li>
+ <li><a href="http://www.apache.org/">Apache</a> {tr msg="(HTTP Server)"}</li>
+ <li><a href="http://www.clamav.net/">ClamAV</a> {tr msg="(Virus Scanner)"}</li>
+ <li><a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus</a> {tr msg="(IMAP Server & Database)"}</li>
+ <li><a href="http://www.openldap.org/">OpenLDAP</a> {tr msg="(LDAP Server)"}</li>
+ <li><a href="http://www.postfix.org/">Postfix</a> {tr msg="(MTA)"}</li>
+ <li><a href="http://spamassassin.apache.org/">SpamAssassin</a> {tr msg="(SPAM Filter)"}</li>
+ <li><a href="">Z-Push</a> {tr msg="(ActiveSync Support)"}</li>
+ <li><a href="http://www.horde.org/">The Horde Project</a> {tr msg="(Web client)"}</li>
+ <li><a href="http://www.perl.org/">Perl</a> {tr msg="(Server side scripting & glue)"}</li>
+ <li><a href="http://www.php.net/">PHP</a> {tr msg="(Server side scripting & glue)"}</li>
+ <li><a href="http://smarty.php.net/">Smarty Template Engine</a> {tr msg="(This interface)"}</li>
+</ul>
+{tr msg="For the clients, Free Software communities and projects that the Kolab Community is a part of and builds upon include:"}
+<ul>
+ <li><a href="http://www.kde.org/">K Desktop Environment (KDE)</a></li>
+ <li><a href="http://www.mozilla.org/">Mozilla (Thunderbird & Lightning)</a></li>
+ <li><a href="http://www.gnome.org/">GNOME (Evolution)</a></li>
+</ul>
+</div>
+
+<h2>{tr msg="History & Credits"}</h2>
+
+<p>{tr msg="In 2010, <a href=\"http://www.intevation.de\">Intevation</a>, <a href=\"http://www.kdab.com/\">KDAB</a>, <a href=\"http://uk.linkedin.com/in/pauljadams\">Dr. Paul Adams</a> and <a href=\"http://ch.linkedin.com/in/georggreve\">Georg Greve</a> worked together to re-launch the professional support of the Kolab Groupware Solution into the <a href=\"http://kolabsys.com\">Kolab Systems AG</a>, which took the place of the Kolab-Konsortium."}</p>
+
+<p>{tr msg="Kolab Systems together with its partner network, the Kolab Enterprise Community, has since been the primary facilitator of the Kolab Community, including for the provision of infrastructure, and the focal point for further development of the Kolab Groupware Solution, e.g. for inclusion of ActiveSync support in version 2.3 of the server, or for native packaging on the various platforms."}</p>
+
+<p>{tr msg="If you want to join the community, please visit <a href=\"http://wiki.kolab.org\">http://wiki.kolab.org</a> and <a href=\"http://kolab.org\">http://kolab.org</a>."}
+
+<h3>{tr msg="History before 2010"}</h3>
+
+<p>
+{tr msg="The Kolab project owes a great deal of thanks to the people of the <a href=\"http://www.openpkg.org/\">OpenPKG</a> project. OpenPKG allows Kolab to run on many diverse platforms in a reliable and predictable manner, by providing a common, easy-to-install, cross-platform base on which to build the server."}
+</p>
+
+<p>
+{tr msg="To use all Kolab2 features you need an interoperable client. The KDE Kolab Client was the first such client to be developed and is still considered the reference platform for others to follow. The KDE groupware component Kontact can act as Kolab2 Client. Many thanks to the <a href=\"http://www.kde.org\">KDE Project</a> for providing such a powerful base on which to build this client solution."}
+</p>
+
+<p>
+{tr msg="Users of Outlook on Microsoft Windows are able to use a proprietary plug-in to inter-operate with the Kolab server. For Kolab2 the preferred plug-in is the <a href=\"http://www.toltec.co.za/\">Toltec Plug-in</a> by Radley Network Technologies CC. Radley has worked closely with the Kolab community to help develop the Kolab2 storage format."}
+</p>
+
+<p>
+{tr msg="A list of additional Outlook plug-ins that provide interoperability with the Kolab server is <a href=\"http://www.kolab.org/kolab-plugins.html\">maintained on the Kolab website</a>."}
+</p>
+
+<p>
+{tr msg="There is also a <a href=\"http://www.kolab.org/webclient.html\">web-based client</a> in development which provides full groupware functionality to mobile users through a web interface. It allows users to access their email, calendars, tasks, etc. from anywhere in the world, by simply connecting through a standard web browser. The web client would not have been possible without the excellent <a href=\"http://www.horde.org/\">Horde project</a> on which to build."}
+</p>
+
+<p>
+{tr msg="As Kolab is a Free Software project, anyone can help to extend the functionality of the software. An active community has developed around the software with many people throughout the world contributing. The project was originally started in 2002 by a joint-venture of three companies: <a href=\"http://www.erfrakon.com/\">erfrakon</a> (design, architecture and server); <a href=\"http://www.intevation.de\">Intevation</a> (project management) and <a href=\"http://www.klaralvdalens-datakonsult.se/\">Klarälvdalens Datakonsult</a> (client)."}
+</p>
+
+<p>
+{tr msg="<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> joined the project soon after the original Kolab1 server was released. Its developers are primarily responsible for an updated engine (which forms the base of the Kolab2 server), the web client, as well as contributing to development of the Kolab2 storage format."}
+</p>
+
+<div>
+ {tr msg="Other contributors:"}<br/>
+<ul>
+<li> <a href="http://www.konsec.com">Konsec GmbH</a> {tr msg="CSSified the Kolab1 web admin GUI"}</li>
+</ul>
+</div>
+
+<h2>{tr msg="Kudos"}</h2>
+
+<p>
+{tr msg="Principal contributors of the Kolab Groupware Solution are (in alphabetical order):"}
+</p>
+
+<div>
+<ul>
+ <li>Alain Abbas</li>
+ <li>Till Adam</li>
+ <li>Dr. Paul Adams</li>
+ <li>Thomas Arendsen-Hein</li>
+ <li>Stuart Bingë</li>
+ <li>Stephan Buys</li>
+ <li>Matthias Kalle Dalheimer</li>
+ <li>Tassilo Erlewein</li>
+ <li>David Faure</li>
+ <li>Achim Frank</li>
+ <li>Michel Boyer de la Giroday</li>
+ <li>Georg Greve</li>
+ <li>Steffen Hansen</li>
+ <li>Bernhard Herzog</li>
+ <li>Martin Konold</li>
+ <li>Marc Mutz</li>
+ <li>Jeroen van Meeuwen</li>
+ <li>Bernhard Reiter</li>
+ <li>Lutz Rogowski</li>
+ <li>Bogomil Shopov</li>
+ <li>Bo Thorsen</li>
+ <li>Jan-Oliver Wagner</li>
+ <li>Gunnar Wrobel</li>
+ <li>Christoph Wickert</li>
+ <li>Sascha Wilde</li>
+ <li>Karl-Heinz Zimmer</li>
+ <li>Romain Pokrzywka</li>
+ <li>{tr msg="...and anyone we forgot. Please let us know at <a href=\"mail:server-team at lists.kolabsys.com\">server-team at lists.kolabsys.com</a> so we can add you to this list."}
+</ul>
+</div>
+
+<hr>
+<small>
+ <p>
+ This product includes PHP, freely available from
+ http://www.php.net/
+ </p><p>
+ This product includes software developed by the OpenSSL Project
+ for use in the OpenSSL Toolkit (http://www.openssl.org/)
+ </p>
+</small>
+
+</div>
diff --git a/data/templates/versions.tpl b/data/templates/versions.tpl
index aa1385f..f1f4ab5 100755
--- a/data/templates/versions.tpl
+++ b/data/templates/versions.tpl
@@ -5,9 +5,9 @@
End:
*}
<div class="contenttext">
-<h1>{tr msg="Kolab2 Groupware Server Version"}</h1>
-<pre>{$kolabversion}</pre>
-<h1>{tr msg="Kolab2 Groupware Server Component Versions"}</h1>
+<h1>{tr msg="Kolab Groupware Server Version"}</h1>
+<pre>{$kolabversion} Community Edition</pre>
+<h1>{tr msg="Kolab Groupware Server Component Versions"}</h1>
<pre>{$kolabversions}</pre>
<h1>{tr msg="PEAR/Horde Versions"}</h1>
<pre>{$pearhordeversions}</pre>
diff --git a/data/templates/welcome-admin.tpl b/data/templates/welcome-admin.tpl
new file mode 100644
index 0000000..fd8e441
--- /dev/null
+++ b/data/templates/welcome-admin.tpl
@@ -0,0 +1,31 @@
+{* Smarty Template *}
+{*
+ Local variables:
+ buffer-file-coding-system: utf-8
+ End:
+*}
+<div class="contenttext">
+<h1>{tr msg="Welcome to the Kolab Groupware Server Administration"}</h1>
+
+<table cellspacing="10" cellpadding="10">
+<tr>
+<td>
+<a href="/admin/user/"><img src="/admin/pics/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
+</td>
+<td>
+<a href="/admin/addressbook/"><img src="/admin/pics/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a>
+</td>
+<td>
+<a href="/admin/sharedfolder/"><img src="/admin/pics/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
+</td>
+<td>
+<a href="/admin/administrator/"><img src="/admin/pics/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
+</td>
+<td>
+<a href="/admin/settings/"><img src="/admin/pics/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
+</td>
+<td>
+<a href="/admin/kolab/"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+</td>
+
+</div>
\ No newline at end of file
diff --git a/data/templates/welcome-maintainer.tpl b/data/templates/welcome-maintainer.tpl
new file mode 100644
index 0000000..ef5f190
--- /dev/null
+++ b/data/templates/welcome-maintainer.tpl
@@ -0,0 +1,31 @@
+{* Smarty Template *}
+{*
+ Local variables:
+ buffer-file-coding-system: utf-8
+ End:
+*}
+<div class="contenttext">
+<h1>{tr msg="Welcome to the Kolab Groupware Server Maintenance"}</h1>
+
+<table cellspacing="10" cellpadding="10">
+<tr>
+<td>
+<a href="/admin/user/"><img src="/admin/pics/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
+</td>
+<td>
+<a href="/admin/addressbook/"><img src="/admin/pics/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a>
+</td>
+<td>
+<a href="/admin/sharedfolder/"><img src="/admin/pics/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
+</td>
+<td>
+<a href="/admin/administrator/"><img src="/admin/pics/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
+</td>
+<td>
+<a href="/admin/settings/"><img src="/admin/pics/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
+</td>
+<td>
+<a href="/admin/kolab/"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+</td>
+
+</div>
\ No newline at end of file
diff --git a/data/templates/welcome-user.tpl b/data/templates/welcome-user.tpl
new file mode 100644
index 0000000..968f378
--- /dev/null
+++ b/data/templates/welcome-user.tpl
@@ -0,0 +1,19 @@
+{* Smarty Template *}
+{*
+ Local variables:
+ buffer-file-coding-system: utf-8
+ End:
+*}
+<div class="contenttext">
+<h1>{tr msg="Welcome to the Kolab Groupware Server"}</h1>
+
+<table cellspacing="10" cellpadding="10">
+<tr>
+<td>
+<a href="/admin/user/user.php?action=modify"><img src="/admin/pics/preferences-system.png" border="0" alt="My settings" /><br /><b>{tr msg="My settings"}</b></a>
+</td>
+<td>
+<a href="/admin/kolab/"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+</td>
+
+</div>
\ No newline at end of file
diff --git a/data/templates/welcome.tpl b/data/templates/welcome.tpl
index 4b8fb5a..5d74724 100755
--- a/data/templates/welcome.tpl
+++ b/data/templates/welcome.tpl
@@ -5,5 +5,6 @@
End:
*}
<div class="contenttext">
-<h1>{tr msg="Welcome to the Kolab administration interface"}</h1>
+<h1>{tr msg="Welcome to the Kolab Groupware Server Administration"}</h1>
+
</div>
diff --git a/lib/KolabAdmin/include/menu.php b/lib/KolabAdmin/include/menu.php
index aa0ef6c..ccabb2f 100755
--- a/lib/KolabAdmin/include/menu.php
+++ b/lib/KolabAdmin/include/menu.php
@@ -115,16 +115,10 @@ $menuitems['about'] = array( 'name' => _('About Kolab'),
'url' => $topdir.'/kolab/',
'title' => _('About Kolab'),
'submenu' => array(
- array( 'name' => _('Erfrakon'),
- 'url' => 'erfrakon.php' ),
- array( 'name' => _('Intevation'),
- 'url' => 'intevation.php' ),
- array( 'name' => _('Klarälvdalens Datakonsult'),
- 'url' => 'kdab.php' ),
- array( 'name' => _('Code Fusion'),
- 'url' => 'codefusion.php' ),
- array( 'name' => _('KDE'),
- 'url' => 'kde.php' )
+ array( 'name' => _('Kolab Systems'),
+ 'url' => 'kolabsystems.php' ),
+ array( 'name' => _('Technology'),
+ 'url' => 'technology.php' ),
));
if( $auth->group() == 'admin' || $auth->group() == 'maintainer' || $auth->group() == 'domain-maintainer') {
$menuitems['about']['submenu'][] = array( 'name' => _('Versions'),
diff --git a/package.xml b/package.xml
index ed951f4..9194b44 100644
--- a/package.xml
+++ b/package.xml
@@ -75,6 +75,7 @@
<file name="kdab.tpl" role="data" />
<file name="kde.tpl" role="data" />
<file name="kolab.tpl" role="data" />
+ <file name="kolabsystems.tpl" role="data" />
<file name="login.tpl" role="data" />
<file name="maintainerdeleted.tpl" role="data" />
<file name="maintainerlistall.tpl" role="data" />
@@ -83,12 +84,16 @@
<file name="sfdeleted.tpl" role="data" />
<file name="sflistall.tpl" role="data" />
<file name="systemaliasnagscreen.tpl" role="data" />
+ <file name="technology.tpl" role="data" />
<file name="userdeleted.tpl" role="data" />
<file name="userlistall.tpl" role="data" />
<file name="userlisterror.tpl" role="data" />
<file name="vacation.tpl" role="data" />
<file name="versions.tpl" role="data" />
<file name="welcome.tpl" role="data" />
+ <file name="welcome-admin.tpl" role="data" />
+ <file name="welcome-maintainer.tpl" role="data" />
+ <file name="welcome-user.tpl" role="data" />
</dir> <!-- /data/templates -->
</dir> <!-- /data -->
<dir name="lib">
@@ -161,6 +166,8 @@
<file name="intevation.php" role="www" />
<file name="kdab.php" role="www" />
<file name="kde.php" role="www" />
+ <file name="kolabsystems.php" role="www" />
+ <file name="technology.php" role="www" />
<file name="versions.php" role="www" />
</dir> <!-- /www/admin/kolab -->
<dir name="maintainer">
@@ -169,11 +176,18 @@
</dir> <!-- /www/admin/maintainer -->
<dir name="pics">
<file name="codefusion.png" role="www" />
+ <file name="dialog-information.png" role="www" />
<file name="erfrakon.png" role="www" />
<file name="intevation_logo.png" role="www" />
<file name="kdab.png" role="www" />
<file name="kde.png" role="www" />
<file name="kolab_logo.png" role="www" />
+ <file name="kolabsystems_logo.png" role="www" />
+ <file name="office-address-book.png" role="www" />
+ <file name="preferences-system-network-sharing.png" role="www" />
+ <file name="preferences-system.png" role="www" />
+ <file name="resource-group.png" role="www" />
+ <file name="system-users.png" role="www" />
</dir> <!-- /www/admin/pics -->
<dir name="settings">
<file name="index.php" role="www" />
@@ -244,6 +258,7 @@
<install as="templates/kdab.tpl" name="data/templates/kdab.tpl" />
<install as="templates/kde.tpl" name="data/templates/kde.tpl" />
<install as="templates/kolab.tpl" name="data/templates/kolab.tpl" />
+ <install as="templates/kolabsystems.tpl" name="data/templates/kolabsystems.tpl" />
<install as="templates/login.tpl" name="data/templates/login.tpl" />
<install as="templates/maintainerdeleted.tpl" name="data/templates/maintainerdeleted.tpl" />
<install as="templates/maintainerlistall.tpl" name="data/templates/maintainerlistall.tpl" />
@@ -252,12 +267,16 @@
<install as="templates/sfdeleted.tpl" name="data/templates/sfdeleted.tpl" />
<install as="templates/sflistall.tpl" name="data/templates/sflistall.tpl" />
<install as="templates/systemaliasnagscreen.tpl" name="data/templates/systemaliasnagscreen.tpl" />
+ <install as="templates/technology.tpl" name="data/templates/technology.tpl" />
<install as="templates/userdeleted.tpl" name="data/templates/userdeleted.tpl" />
<install as="templates/userlistall.tpl" name="data/templates/userlistall.tpl" />
<install as="templates/userlisterror.tpl" name="data/templates/userlisterror.tpl" />
<install as="templates/vacation.tpl" name="data/templates/vacation.tpl" />
<install as="templates/versions.tpl" name="data/templates/versions.tpl" />
<install as="templates/welcome.tpl" name="data/templates/welcome.tpl" />
+ <install as="templates/welcome-admin.tpl" name="data/templates/welcome-admin.tpl" />
+ <install as="templates/welcome-maintainer.tpl" name="data/templates/welcome-maintainer.tpl" />
+ <install as="templates/welcome-user.tpl" name="data/templates/welcome-user.tpl" />
<install as="KolabAdmin/Ldap.php" name="lib/KolabAdmin/Ldap.php" />
<install as="KolabAdmin/Sieve.php" name="lib/KolabAdmin/Sieve.php" />
<install as="KolabAdmin/include/auth.class.php" name="lib/KolabAdmin/include/auth.class.php" />
@@ -303,15 +322,24 @@
<install as="admin/kolab/intevation.php" name="www/admin/kolab/intevation.php" />
<install as="admin/kolab/kdab.php" name="www/admin/kolab/kdab.php" />
<install as="admin/kolab/kde.php" name="www/admin/kolab/kde.php" />
+ <install as="admin/kolab/kolabsystems.php" name="www/admin/kolab/kolabsystems.php" />
+ <install as="admin/kolab/technology.php" name="www/admin/kolab/technology.php" />
<install as="admin/kolab/versions.php" name="www/admin/kolab/versions.php" />
<install as="admin/maintainer/index.php" name="www/admin/maintainer/index.php" />
<install as="admin/maintainer/maintainer.php" name="www/admin/maintainer/maintainer.php" />
<install as="admin/pics/codefusion.png" name="www/admin/pics/codefusion.png" />
+ <install as="admin/pics/dialog-information.png" name="www/admin/pics/dialog-information.png" />
<install as="admin/pics/erfrakon.png" name="www/admin/pics/erfrakon.png" />
<install as="admin/pics/intevation_logo.png" name="www/admin/pics/intevation_logo.png" />
<install as="admin/pics/kdab.png" name="www/admin/pics/kdab.png" />
<install as="admin/pics/kde.png" name="www/admin/pics/kde.png" />
<install as="admin/pics/kolab_logo.png" name="www/admin/pics/kolab_logo.png" />
+ <install as="admin/pics/kolabsystems_logo.png" name="www/admin/pics/kolabsystems_logo.png" />
+ <install as="admin/pics/office-address-book.png" name="www/admin/pics/office-address-book.png" />
+ <install as="admin/pics/preferences-system-network-sharing.png" name="www/admin/pics/preferences-system-network-sharing.png" />
+ <install as="admin/pics/preferences-system.png" name="www/admin/pics/preferences-system.png" />
+ <install as="admin/pics/resource-group.png" name="www/admin/pics/resource-group.png" />
+ <install as="admin/pics/system-users.png" name="www/admin/pics/system-users.png" />
<install as="admin/settings/index.php" name="www/admin/settings/index.php" />
<install as="admin/sharedfolder/index.php" name="www/admin/sharedfolder/index.php" />
<install as="admin/sharedfolder/sf.php" name="www/admin/sharedfolder/sf.php" />
diff --git a/www/admin/index.php b/www/admin/index.php
index b1235d4..265a221 100644
--- a/www/admin/index.php
+++ b/www/admin/index.php
@@ -37,6 +37,7 @@ function exists_group( $group ) {
/**** Check for system aliases ****/
$maincontent = 'welcome.tpl';
if( $auth->group() == 'admin' ) {
+ $maincontent = 'welcome-admin.tpl';
$domains = $ldap->domains();
foreach( $domains as $domain ) {
if( (!exists_group( 'hostmaster@'.$domain ) ||
@@ -50,6 +51,13 @@ if( $auth->group() == 'admin' ) {
}
}
}
+if ($auth->group() == 'user') {
+ $maincontent = 'welcome-user.tpl';
+}
+if ($auth->group() == 'maintainer') {
+ $maincontent = 'welcome-maintainer.tpl';
+}
+
/**** Insert into template and output ***/
$smarty = new MySmarty();
diff --git a/www/admin/kolab/kolabsystems.php b/www/admin/kolab/kolabsystems.php
new file mode 100644
index 0000000..8451066
--- /dev/null
+++ b/www/admin/kolab/kolabsystems.php
@@ -0,0 +1,44 @@
+<?php
+/*
+ (c) 2011 Kolab Systems AG
+ (c) 2004 Klarlvdalens Datakonsult AB
+ (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
+ (c) 2003 Martin Konold <martin.konold at erfrakon.de>
+ This program is Free Software under the GNU General Public License (>=v2).
+ Read the file COPYING that comes with this packages for details.
+*/
+
+require_once('admin/include/mysmarty.php');
+require_once('admin/include/headers.php');
+require_once('admin/include/locale.php');
+require_once('admin/include/authenticate.php');
+
+/**** Authentication etc. ***/
+$sidx = 'about';
+
+require_once('admin/include/menu.php');
+
+
+/**** Submenu for current page ***/
+$menuitems[$sidx]['selected'] = 'selected';
+
+/**** Insert into template and output ***/
+$smarty =& new MySmarty();
+$smarty->assign( 'topdir', $topdir );
+$smarty->assign( 'uid', $auth->uid() );
+$smarty->assign( 'group', $auth->group() );
+$smarty->assign( 'page_title', $menuitems[$sidx]['title'] );
+$smarty->assign( 'menuitems', $menuitems );
+$smarty->assign( 'submenuitems', $menuitems[$sidx]['submenu'] );
+$smarty->assign( 'maincontent', 'kolabsystems.tpl' );
+$smarty->display('page.tpl');
+
+/*
+ Local variables:
+ mode: php
+ indent-tabs-mode: t
+ tab-width: 4
+ buffer-file-coding-system: utf-8
+ End:
+*/
+ ?>
diff --git a/www/admin/kolab/technology.php b/www/admin/kolab/technology.php
new file mode 100644
index 0000000..f5d8a3b
--- /dev/null
+++ b/www/admin/kolab/technology.php
@@ -0,0 +1,43 @@
+<?php
+/*
+ (c) 2004 Klarälvdalens Datakonsult AB
+ (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
+ (c) 2003 Martin Konold <martin.konold at erfrakon.de>
+ This program is Free Software under the GNU General Public License (>=v2).
+ Read the file COPYING that comes with this packages for details.
+*/
+
+require_once('admin/include/mysmarty.php');
+require_once('admin/include/headers.php');
+require_once('admin/include/locale.php');
+require_once('admin/include/authenticate.php');
+
+/**** Authentication etc. ***/
+$sidx = 'about';
+
+require_once('admin/include/menu.php');
+
+
+/**** Submenu for current page ***/
+$menuitems[$sidx]['selected'] = 'selected';
+
+/**** Insert into template and output ***/
+$smarty = new MySmarty();
+$smarty->assign( 'topdir', $topdir );
+$smarty->assign( 'uid', $auth->uid() );
+$smarty->assign( 'group', $auth->group() );
+$smarty->assign( 'page_title', $menuitems[$sidx]['title'] );
+$smarty->assign( 'menuitems', $menuitems );
+$smarty->assign( 'submenuitems', $menuitems[$sidx]['submenu'] );
+$smarty->assign( 'maincontent', 'technology.tpl' );
+$smarty->display('page.tpl');
+
+/*
+ Local variables:
+ mode: php
+ indent-tabs-mode: t
+ tab-width: 4
+ coding: utf-8
+ End:
+*/
+ ?>
diff --git a/www/admin/pics/dialog-information.png b/www/admin/pics/dialog-information.png
new file mode 100644
index 0000000..c65f616
Binary files /dev/null and b/www/admin/pics/dialog-information.png differ
diff --git a/www/admin/pics/kolabsystems_logo.png b/www/admin/pics/kolabsystems_logo.png
new file mode 100644
index 0000000..90620d3
Binary files /dev/null and b/www/admin/pics/kolabsystems_logo.png differ
diff --git a/www/admin/pics/office-address-book.png b/www/admin/pics/office-address-book.png
new file mode 100644
index 0000000..3b00f62
Binary files /dev/null and b/www/admin/pics/office-address-book.png differ
diff --git a/www/admin/pics/preferences-system-network-sharing.png b/www/admin/pics/preferences-system-network-sharing.png
new file mode 100644
index 0000000..b6faf42
Binary files /dev/null and b/www/admin/pics/preferences-system-network-sharing.png differ
diff --git a/www/admin/pics/preferences-system.png b/www/admin/pics/preferences-system.png
new file mode 100644
index 0000000..9ea5cec
Binary files /dev/null and b/www/admin/pics/preferences-system.png differ
diff --git a/www/admin/pics/resource-group.png b/www/admin/pics/resource-group.png
new file mode 100644
index 0000000..84cfa89
Binary files /dev/null and b/www/admin/pics/resource-group.png differ
diff --git a/www/admin/pics/system-users.png b/www/admin/pics/system-users.png
new file mode 100644
index 0000000..e2bd558
Binary files /dev/null and b/www/admin/pics/system-users.png differ
commit d0daa629453aec1b088bd767ee9d686898c95c67
Author: Bogomil Shopov <shopov at kolabsys.com>
Date: Tue Apr 19 15:08:25 2011 +0300
ActiveSync management screen
diff --git a/data/templates/activesync.tpl b/data/templates/activesync.tpl
new file mode 100644
index 0000000..f5d5141
--- /dev/null
+++ b/data/templates/activesync.tpl
@@ -0,0 +1,118 @@
+{* Smarty Template *}
+{*
+ Local variables:
+ buffer-file-coding-system: utf-8
+ End:
+*}
+<h1>{tr msg="ActiveSync Configuration"}</h1>
+<div id="wrapper" style="width:90%">
+ <div id="heading">
+ <ul id="buttons">
+
+ {section name=device loop=$devices}
+ <li>{if $devices[device].alias}{$devices[device].alias}{else}{$devices[device].name}{/if}</li>
+ {/section}
+ </ul>
+ </div>
+
+ <div id="panes">
+ <div id="content">
+ {section name=device loop=$devices}
+ <div id="tabs{$devices[device].id}" class="pane">
+ <form name="babajaga-{$devices[device].id}" method="post">
+ <input type="hidden" name="deid" value="{$devices[device].name}">
+ </form>
+ <form method="post">
+ <input type="hidden" name="serial" value="{$devices[device].name}">
+ <input type="hidden" name="type" value="{$devices[device].type}">
+ <input type="hidden" name="actived" value="{$devices[device].id}">
+ <table width="100%" cellpadding="8" cellspacing="8"><tr valign="top"><td style="border-top-style:dotted;border-right-style:dotted;border-bottom-style:dotted;border-left-style:dotted;border-width:1px;">
+ {foreach from=$folders key=myId item=fol}
+ <table border="0" width="100%">
+ <tr bgcolor="#c8d2df"><td colspan="5"> <img src="/admin/pics/{$myId}.png" style="vertical-align:middle;"> <span style="font-weight:bolder;">{tr msg=$pnames[$myId]} </span></td></tr>
+ <tr>
+ <td width="20"> </td>
+ <td width="5"><img src="/admin/pics/sync.png" align="center" style="margin-left:5px;"></td>
+
+ {if $myId eq 'EVENT' or $myId eq 'TASKS'}
+ <td width="5"><img src="/admin/pics/alarm.png" align="center" style="margin-left:5px;"></td>
+ {else}
+ <td width="25"></td>
+ {/if}
+ <td> </td>
+ <td> </td>
+
+ </tr>
+ {foreach from=$fol key=myIdfol item=fols}
+
+ <td width="20"> </td>
+ {kolabsync serial=$devices[device].name folder=$fols.realname}
+ <td width="25"><img src="/admin/pics/f.png" style="vertical-align:middle;padding:4px;"></td>
+ <td>{$fols.name}</td>
+ </tr>
+
+
+ {/foreach}
+ </table>
+ <br/>
+{/foreach}
+
+ </td><td width="50%" style="border-top-style:dotted;border-right-style:dotted;border-bottom-style:dotted;border-left-style:dotted;border-width:1px;">
+ <table width="100%" bgcolor="#c8d2df">
+ <tr bgcolor="white" style="width:100%;height:35px;"><td><span style="font-weight:bolder;"> {tr msg="Device Alias"}</td></span></tr>
+ <tr><td><br/><input type="text" name="alias" maxlength="25" value="{$devices[device].alias}" /><br/><br/></td></tr>
+ <tr bgcolor="white" style="width:100%;height:35px;"><td><span style="font-weight:bolder;"> {tr msg="Device Mode"}</td></span></tr>
+ <tr><td><br/>{html_options name=mode width=50 options=$modetypes selected=$devices[device].mode}<br/><br/></td></tr>
+ <tr bgcolor="white" style="width:100%;height:35px;"><td><span style="font-weight:bolder;"> {tr msg="Picture Settings"}</td></span></tr>
+{if $laxpicdef eq -1}
+ <tr><td><br/><input type="checkbox" name="laxpic" value=1 {if $devices[device].laxpic}checked{/if}/> {tr msg="Enable PNG and GIF formats while syncing"}</td></tr>
+{/if}
+ </table>
+
+ </td></tr></table>
+
+ <input type="submit" value="{tr msg="Save"}" style="float:right;padding:6px;margin-right:22px;">
+ <input type="reset" value="{tr msg="Clear"}" style="float:right;padding:6px;margin-right:22px;">
+ <input type="button" name="delme" value="{tr msg="Forget Device"}" style="float:right;padding:6px;margin-right:132px;color:#ff0000;" onclick="DeleteThisDeviceMate({$devices[device].id});">
+
+ </form>
+ </div>
+ {/section}
+
+ </div></div>
+</div>
+
+</div>
+
+{literal}
+<script type="text/javascript" charset="utf-8">
+ window.addEvent('load', function () {
+ myTabs = new SlidingTabs('buttons', 'panes',{startingSlide:"{/literal}tabs{$actived}{literal}"});
+
+ // this sets up the previous/next buttons, if you want them
+ //$('previous').addEvent('click', myTabs.previous.bind(myTabs));
+ //$('next').addEvent('click', myTabs.next.bind(myTabs));
+
+ // this sets it up to work even if it's width isn't a set amount of pixels
+ window.addEvent('resize', myTabs.recalcWidths.bind(myTabs));
+ });
+
+ function DeleteThisDeviceMate(did)
+ {
+ if (confirm("{/literal}{tr msg="Are you sure?"}{literal}")) {
+ document.forms["babajaga-"+did].submit();
+ //alert("babajaga-"+did);
+ }
+
+ }
+
+ function stopRKey(evt) {
+ var evt = (evt) ? evt : ((event) ? event : null);
+ var node = (evt.target) ? evt.target : ((evt.srcElement) ? evt.srcElement : null);
+ if ((evt.keyCode == 13) && (node.type=="text")) {return false;}
+ }
+
+ document.onkeypress = stopRKey;
+
+ </script>
+ {/literal}
diff --git a/data/templates/page-ajax.tpl b/data/templates/page-ajax.tpl
new file mode 100644
index 0000000..b113f2e
--- /dev/null
+++ b/data/templates/page-ajax.tpl
@@ -0,0 +1,185 @@
+{* Smarty Template *}
+{*
+ Local variables:
+ buffer-file-coding-system: utf-8
+ End:
+*}
+<!DOCTYPE HTML>
+<html lang="en-US">
+<head>
+<meta charset="UTF-8">
+<title>Kolab: {$page_title}</title>
+<link rel="shortcut icon" type="image/png" href="{$webserver_web_prefix}/favicon.png" />
+<meta name="robots" content="noindex" />
+<meta name="description" content="Kolab Administration Webinterface" />
+<meta name="keywords" content="Linux, Unix, Groupware, Email, Calendar" />
+<link rel="stylesheet" type="text/css" href="{$stylesheet|default:"$topdir/screen.css"}" />
+<link rel="stylesheet" type="text/css" href="{"$topdir/custom.css"}" />
+
+<script type="text/javascript">
+<!--
+function changeLanguage(combobox) {ldelim}
+ val=combobox.options[combobox.selectedIndex].value;
+ if(val!="") window.location="{$lang_url}"+val;
+{rdelim}
+-->
+</script>
+{literal}
+<script src="/admin/images/mootools.v1.11.js" type="text/javascript"></script>
+<script src="/admin/images/sliding-tabs.js" type="text/javascript"></script>
+<script type="text/javascript">
+function synced(a)
+{
+ var current = a.getElementById;
+ var ch = a.id;
+
+ //get the real id from id-1 or id-2
+ var actual_id = ch.split('-');
+
+
+ //get the second element
+ var secelement = document.getElementById(actual_id[0]+'-'+'2');
+ var firelement = document.getElementById(actual_id[0]+'-'+'1');
+
+
+ if (firelement.checked==false && secelement.checked==true && a.value==1)
+ {
+ secelement.checked=false;
+
+ }
+
+
+
+}
+</script>
+<style type="text/css" media="screen">
+ #heading {
+ display: block;
+ text-align: center;
+ margin-bottom: 1em;
+ background: #f0f0f0;
+ }
+ #heading * {
+ display: inline;
+ padding: 7px;
+ user-select: none;
+ cursor: pointer;
+ vertical-align: middle;
+ }
+ #heading li.active {
+ background-color: lightgrey;
+ border-radius: 7px;
+ -webkit-border-radius: 5px;
+ -opera-border-radius: 6px;
+ -moz-border-radius: 5px;
+ }
+
+ #wrapper { border: 1px dotted gray; margin: 1em; padding: 1em;}
+
+ #panes {
+ text-align: justify;
+ border-style: none;
+ /*width: 245px;*/
+ margin: 0 1em 0 1em;
+
+ }
+
+ #panes p {
+ width: 500px;
+ margin: 0 auto 1em auto;
+ line-height: 1.2em;
+ }
+
+ #panes div div { overflow: hidden; top:-96px; position:relative;}
+ #previous { float: none; cursor: pointer; }
+ #next { float: none; cursor: pointer; }
+ table, th, td {vertical-align:top;}
+
+ </style>
+
+
+{/literal}
+</head>
+<body>
+<div id="header" class="container">
+<div class="span-24">
+<h3><a href="{$kolab_wui}"><img src="/admin/images/klogo.png" style="vertical-align:middle;" alt="logo"></a></h3>
+<div id="menu-top">
+{if $uid}
+<img src="/admin/images/user-icon-1-20x20.gif" width="16" style="vertical-align:middle;" title="Username" alt="username icon"> {$uid} <img src="/admin/images/eye_pencil.png" width="16" style="vertical-align:middle;margin-left:8px;" title="Role" alt="Role icon"> {$group}
+{/if}
+
+<img src="/admin/images/ul-icon.png" width="16" style="vertical-align:middle;margin-left:8px;" title="Change Language" alt="Language icon"> <select name="lang" style="height:17px;vertical-align:middle" onchange="changeLanguage(this);">
+{section name=id loop=$languages}
+{if $languages[id].code==$currentlang}
+<option value="{$languages[id].code}" selected="selected">{$languages[id].name}</option>
+{else}
+<option value="{$languages[id].code}">{$languages[id].name}</option>
+{/if}
+{/section}
+</select>
+{if $uid}
+<a id="logout" href="{$topdir}/logout.php"><img src="/admin/images/icon_grey_logout.png" width="16" style="vertical-align:middle;margin-left:90px;" title="Logout" alt="Logout icon"></a>
+{/if}
+</div>
+ </div><!-- .span-24 -->
+ </div><!-- #header -->
+ <div id="root">
+ <div class="container">
+ <div>
+ <ul id="navlist">
+
+ {foreach from=$menuitems item=menuitem}
+ <li>
+ <a class="{$menuitem.selected}" href="{$menuitem.url}">{$menuitem.name}</a>
+ </li>
+{/foreach}
+
+ </ul>
+ </div><!-- .span-24 -->
+
+
+ <div id="content">
+
+<div id="submenu">
+{if count($submenuitems) > 0}
+{$page_title}:
+{strip}
+{section name=id loop=$submenuitems}
+<a href="{$submenuitems[id].url}">
+{$submenuitems[id].name}
+</a> |
+{/section}
+{/strip}
+{/if}
+</div>
+
+<!--start-->
+{if $errors}
+<div id="errorcontent">
+<div id="errorheader">{tr msg="Errors:"}</div>
+{section name=id loop=$errors}
+{$errors[id]}<br/>
+{/section}
+</div>
+{/if}
+{if $messages}
+<div id="messagecontent">
+<div id="messageheader">{tr msg="Message:"}</div>
+{section name=id loop=$messages}
+{$messages[id]}<br/>
+{/section}
+</div>
+{/if}
+
+<!--end-->
+<div id="allhere">
+{include file=$maincontent}
+</div>
+ </div>
+ </div><!-- .container -->
+ </div><!-- #root -->
+<div id="footer">
+This is the Community Edition of the <b>Kolab Server</b>. It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>. Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.
+</body>
+</html>
diff --git a/lib/KolabAdmin/include/function.kolabsync.php b/lib/KolabAdmin/include/function.kolabsync.php
new file mode 100644
index 0000000..f254868
--- /dev/null
+++ b/lib/KolabAdmin/include/function.kolabsync.php
@@ -0,0 +1,146 @@
+<?php
+/*
+ * Smarty plugin
+ * -------------------------------------------------------------
+ * File: function.kolabsync.php
+ * Type: function
+ * Name: Kolabsync
+ * Purpose: Check folder settings
+ * -------------------------------------------------------------
+ */
+global $tmbox;
+ at include_once 'Horde/Kolab/Kolab_Zpush/lib/kolabActivesyncData.php';
+
+function smarty_function_kolabsync($params, &$smarty)
+{
+
+ $result = checkFolder($params['folder'],$params['serial']);
+ if ($result=="") $result="0";
+ $folder_type=getFolderType($params['folder']);
+
+ //array
+ if ($result==1)
+ {
+ $checked="checked=checked";
+
+
+ }elseif($result==2)
+ {
+
+ $checked2="checked=checked";
+ $checked="checked=checked";
+ }
+
+ else
+ {
+ $cheked="";
+ $checked2="";
+ }
+ $rnd=rand(5, 121);
+
+ //stupid smarty hack
+ $params['folder']=preg_replace('/( )/','@',$params['folder']);
+ $params['folder']=preg_replace('/\./','*',$params['folder']);
+
+ $ch = "<td><input type=checkbox name='".$params['folder']."' value='1' $checked></td><td width='20'></td>";
+
+
+ if(preg_match("/(event)/",$folder_type) OR preg_match("/(task)/",$folder_type))
+ {
+ $ch = "<td><input type='checkbox' id='".$rnd."-1' name='".$params['folder']."' value='1' $checked onclick='synced(this)'></td>
+ <td><input type='checkbox' id='".$rnd."-2' name='".$params['folder']."' value='2' $checked2 onclick='synced(this)'></td>";
+ }
+
+
+
+
+ return $ch;
+}
+
+
+function connect()
+{
+global $tmbox;
+
+ $connectstring= $_server = "{localhost:143/imap/notls/norsh}";
+ $tmbox = imap_open($_server , $_SESSION['auth_user'], $_SESSION['auth_pw'], OP_HALFOPEN);
+ if ($tmbox) {
+ return $tmbox;
+ }else
+ {
+ return false;
+ }
+
+}
+
+function checkFolder($folder,$serial)
+{
+ $gp=new FolderParam();
+ $result = imap_getannotation(connect(), $folder, "/vendor/kolab/activesync", "value.priv");
+
+
+ if (isset($result["value.priv"]))
+ {
+ $res= json_decode(base64_decode($result["value.priv"]),true);
+
+
+ }
+
+ //is default folder for syncing
+
+ $def=is_default($folder);
+
+
+ if($def==true)
+ {
+ //all default folders
+ $r=1;
+ }
+
+ if((isset($res['FOLDER'][$serial]['S'])) and $res['FOLDER'][$serial]['S'] ==0)
+ {
+
+ $r=0;
+ }else if((isset($res['FOLDER'][$serial]['S'])) and $res['FOLDER'][$serial]['S'] !=0)
+ {
+ return $r=$res['FOLDER'][$serial]['S'];
+
+ }
+
+
+ return $r;
+
+}
+
+ function is_default($folder)
+ {
+
+ if(preg_match("/(^INBOX)/", $folder))
+ {
+
+ return true;
+ }else
+ {
+ return false;
+ }
+ }
+
+ //get folder type
+
+function getFolderType($folder)
+ {
+ global $tmbox;
+
+ $result = imap_getannotation($tmbox, $folder, "/vendor/kolab/folder-type", "value.shared");
+
+ if (isset($result["value.shared"]))
+ {
+ return $result["value.shared"];
+ }
+
+ }
+
+
+/* vim: set expandtab: */
+
+?>
diff --git a/lib/KolabAdmin/include/menu.php b/lib/KolabAdmin/include/menu.php
old mode 100644
new mode 100755
index 6954c5b..aa0ef6c
--- a/lib/KolabAdmin/include/menu.php
+++ b/lib/KolabAdmin/include/menu.php
@@ -39,7 +39,10 @@ if( $auth->group() == "admin" || $auth->group() == "maintainer" || $auth->group(
array( 'name' => _('Forward Email'),
'url' => 'forward.php' ),
array( 'name' => _('Vacation'),
- 'url' => 'vacation.php' )));
+ 'url' => 'vacation.php' ),
+ array( 'name' => _('ActiveSync'),
+ 'url' => 'activesync.php' ),
+ ));
}
if( $auth->group() == "admin" || $auth->group() == "maintainer") {
$menuitems['addressbook'] = array( 'name' => _('Addressbook'),
diff --git a/www/admin/images/mootools.v1.11.js b/www/admin/images/mootools.v1.11.js
new file mode 100644
index 0000000..7f1d9d3
--- /dev/null
+++ b/www/admin/images/mootools.v1.11.js
@@ -0,0 +1,3 @@
+//MooTools, My Object Oriented Javascript Tools. Copyright (c) 2006 Valerio Proietti, <http://mad4milk.net>, MIT Style License.
+
+eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('o ci={cj:\'1.11\'};k $77(N){m(N!=9N)};k $F(N){B(!$77(N))m O;B(N.5i)m\'G\';o F=7c N;B(F==\'2I\'&&N.ch){22(N.84){Y 1:m\'G\';Y 3:m(/\\S/).2v(N.ax)?\'cg\':\'cd\'}}B(F==\'2I\'||F==\'k\'){22(N.9C){Y 2t:m\'1z\';Y 7y:m\'5C\';Y 18:m\'4R\'}B(7c N.V==\'4M\'){B(N.3r)m\'ce\';B(N.8t)m\'1b\'}}m F};k $2a(){o 54={};M(o i=0;i<1b.V;i++){M(o K 1a 1b[i]){o ap=1b[i][K];o 6d=54[K];B(6d&&$F(ap)==\'2I\'&&$F(6d)==\'2I\')54[K]=$2a(6d,ap);14 54[K]=ap}}m 54};o $R=k(){o 1p=1b;B(!1p[1])1p=[c,1p[0]];M(o K 1a 1p[1])1p[0][K]=1p[1][K];m 1p[0]};o $5e=k(){M(o i=0,l=1b.V;i<l;i++){1b[i].R=k(1U){M(o 1V 1a 1U){B(!c.1L[1V])c.1L[1V]=1U[1V];B(!c[1V])c[1V]=$5e.6x(1V)}}}};$5e.6x=k(1V){m k(W){m c.
1L[1V].4j(W,2t.1L.bh.1X(1b,1))}};$5e(7Z,2t,6i,aN);k $2A(N){m!!(N||N===0)};k $4T(N,aY){m $77(N)?N:aY};k $8c(3s,1D){m 1c.9q(1c.8c()*(1D-3s+1)+3s)};k $3A(){m L 96().9w()};k $55(1H){cf(1H);ck(1H);m 1n};o 3M=k(N){N=N||{};N.R=$R;m N};o cl=L 3M(U);o cr=L 3M(Q);Q.6e=Q.33(\'6e\')[0];U.4a=!!(Q.5r);B(U.9o)U.2P=U[U.6C?\'cs\':\'ag\']=1e;14 B(Q.aC&&!Q.cq&&!cp.cm)U.4x=U[U.4a?\'cn\':\'5x\']=1e;14 B(Q.co!=1n)U.8r=1e;U.cc=U.4x;8X.R=$R;B(7c 5B==\'9N\'){o 5B=k(){};B(U.4x)Q.aJ("cb");5B.1L=(U.4x)?U["[[bZ.1L]]"]:{}}5B.1L.5i=k(){};B(U.ag)5j{Q.c0("c1",O,1e)}5c(e){};o 18=k(1J){o 5Z=k(){m(1b[0]!==1n&&c.1i&&$F(c.1i)==\'k\')?c.1i.4j(c,1b):c};$R(5Z,c);5Z.1L=1J;5Z.9C=18;m 5Z};18.1l=k(){};18.1L={R:k(1J){o 7m=L c(1n);M(o K 1a 1J){o 9m=7m[K];7m[K]=18.9l(9m,1J[K])}m L 18(7m)},3i:k(){M(o i=0,l=1b.V;i<l;i++)$R(c.1L,1b[i])}};18.9l=k(2l,2i){B(2l&&2l!=2i){o F=$F(2i);B(F!=$F(2l))m 2i;22(F){Y\'k\':o 8i=k(){c.1r=1b.8t.1r;m 2i.4j(c,1b)};8i.1r=2l;m 8i;Y\'2I\':m $2a(2l,2i)}}m 2i};o 7u=L 18({bY:k(fn){c.4v=c.4v||[];c.4v.1
k(fn);m c},7z:k(){B(c.4v&&c.4v.V)c.4v.aK().2g(10,c)},bX:k(){!
c.4v=[]}
});o 2p=L 18({1B:k(F,fn){B(fn!=18.1l){c.$19=c.$19||{};c.$19[F]=c.$19[F]||[];c.$19[F].5S(fn)}m c},1h:k(F,1p,2g){B(c.$19&&c.$19[F]){c.$19[F].1q(k(fn){fn.3a({\'W\':c,\'2g\':2g,\'1b\':1p})()},c)}m c},4C:k(F,fn){B(c.$19&&c.$19[F])c.$19[F].2K(fn);m c}});o 43=L 18({2Y:k(){c.C=$2a.4j(1n,[c.C].R(1b));B(c.1B){M(o 3z 1a c.C){B($F(c.C[3z]==\'k\')&&(/^67[A-Z]/).2v(3z))c.1B(3z,c.C[3z])}}m c}});2t.R({7b:k(fn,W){M(o i=0,j=c.V;i<j;i++)fn.1X(W,c[i],i,c)},36:k(fn,W){o 4Y=[];M(o i=0,j=c.V;i<j;i++){B(fn.1X(W,c[i],i,c))4Y.1k(c[i])}m 4Y},2D:k(fn,W){o 4Y=[];M(o i=0,j=c.V;i<j;i++)4Y[i]=fn.1X(W,c[i],i,c);m 4Y},4F:k(fn,W){M(o i=0,j=c.V;i<j;i++){B(!fn.1X(W,c[i],i,c))m O}m 1e},bU:k(fn,W){M(o i=0,j=c.V;i<j;i++){B(fn.1X(W,c[i],i,c))m 1e}m O},3k:k(3r,15){o 3S=c.V;M(o i=(15<0)?1c.1D(0,3S+15):15||0;i<3S;i++){B(c[i]===3r)m i}m-1},8e:k(1g,V){1g=1g||0;B(1g<0)1g=c.V+1g;V=V||(c.V-1g);o 8g=[];M(o i=0;i<V;i++)8g[i]=c[1g++];m 8g},2K:k(3r){o i=0;o 3S=c.V;6Z(i<3S){B(c[i]===3r){c.74(i,1);3S--}14{i++}}m c},1j:k(3r,15){m
c.3k(3r,15)!=-1},bV:k(1O){o N={},V=1c.3s(c.V,1O.V);M(o i=0;i<V;i++)N[1O[i]]=c[i];m N},R:k(1z){M(o i=0,j=1z.V;i<j;i++)c.1k(1z[i]);m c},2a:k(1z){M(o i=0,l=1z.V;i<l;i++)c.5S(1z[i]);m c},5S:k(3r){B(!c.1j(3r))c.1k(3r);m c},bW:k(){m c[$8c(0,c.V-1)]||1n},80:k(){m c[c.V-1]||1n}});2t.1L.1q=2t.1L.7b;2t.1q=2t.7b;k $A(1z){m 2t.8e(1z)};k $1q(41,fn,W){B(41&&7c 41.V==\'4M\'&&$F(41)!=\'2I\'){2t.7b(41,fn,W)}14{M(o 1w 1a 41)fn.1X(W||41,41[1w],1w)}};2t.1L.2v=2t.1L.1j;6i.R({2v:k(79,2U){m(($F(79)==\'2z\')?L 7y(79,2U):79).2v(c)},3d:k(){m 5O(c,10)},aH:k(){m 66(c)},8a:k(){m c.3g(/-\\D/g,k(31){m 31.8d(1).7A()})},aL:k(){m c.3g(/\\w[A-Z]/g,k(31){m(31.8d(0)+\'-\'+31.8d(1).5L())})},8R:k(){m c.3g(/\\b[a-z]/g,k(31){m 31.7A()})},5T:k(){m c.3g(/^\\s+|\\s+$/g,\'\')},7r:k(){m c.3g(/\\s{2,}/g,\' \').5T()},5E:k(1z){o 1s=c.31(/\\d{1,3}/g);m(1s)?1s.5E(1z):O},5G:k(1z){o 3C=c.31(/^#?(\\w{1,2})(\\w{1,2})(\\w{1,2})$/);m(3C)?3C.bh(1).5G(1z):O},1j:k(2z,s){m(s)?(s+c+s).3k(s+2z+s)>-1:c.3k(2z)>-1},b5:k(){m c.3g(/([.*+?^${
}()|[\\]\\/\\\\])/g,\'\\\\$1\')}});2t.R({5E:k(1z){B(c.V<3)m !
O;B(c.V=
=4&&c[3]==0&&!1z)m\'c2\';o 3C=[];M(o i=0;i<3;i++){o 5d=(c[i]-0).4l(16);3C.1k((5d.V==1)?\'0\'+5d:5d)}m 1z?3C:\'#\'+3C.2c(\'\')},5G:k(1z){B(c.V!=3)m O;o 1s=[];M(o i=0;i<3;i++){1s.1k(5O((c[i].V==1)?c[i]+c[i]:c[i],16))}m 1z?1s:\'1s(\'+1s.2c(\',\')+\')\'}});7Z.R({3a:k(C){o fn=c;C=$2a({\'W\':fn,\'I\':O,\'1b\':1n,\'2g\':O,\'4f\':O,\'6f\':O},C);B($2A(C.1b)&&$F(C.1b)!=\'1z\')C.1b=[C.1b];m k(I){o 1p;B(C.I){I=I||U.I;1p=[(C.I===1e)?I:L C.I(I)];B(C.1b)1p.R(C.1b)}14 1p=C.1b||1b;o 3N=k(){m fn.4j($4T(C.W,fn),1p)};B(C.2g)m 9M(3N,C.2g);B(C.4f)m c3(3N,C.4f);B(C.6f)5j{m 3N()}5c(c9){m O};m 3N()}},bT:k(1p,W){m c.3a({\'1b\':1p,\'W\':W})},6f:k(1p,W){m c.3a({\'1b\':1p,\'W\':W,\'6f\':1e})()},W:k(W,1p){m c.3a({\'W\':W,\'1b\':1p})},c8:k(W,1p){m c.3a({\'W\':W,\'I\':1e,\'1b\':1p})},2g:k(2g,W,1p){m c.3a({\'2g\':2g,\'W\':W,\'1b\':1p})()},4f:k(aV,W,1p){m c.3a({\'4f\':aV,\'W\':W,\'1b\':1p})()}});aN.R({3d:k(){m 5O(c)},aH:k(){m 66(c)},1F:k(3s,1D){m 1c.3s(1D,1c.1D(3s,c))},2q:k(5Y){5Y=1c.3w(10,5Y||0);m 1c.2q(c*5Y
)/5Y},c7:k(fn){M(o i=0;i<c;i++)fn(i)}});o P=L 18({1i:k(el,1U){B($F(el)==\'2z\'){B(U.2P&&1U&&(1U.1w||1U.F)){o 1w=(1U.1w)?\' 1w="\'+1U.1w+\'"\':\'\';o F=(1U.F)?\' F="\'+1U.F+\'"\':\'\';57 1U.1w;57 1U.F;el=\'<\'+el+1w+F+\'>\'}el=Q.aJ(el)}el=$(el);m(!1U||!el)?el:el.2j(1U)}});o 26=L 18({1i:k(T){m(T)?$R(T,c):c}});26.R=k(1U){M(o 1V 1a 1U){c.1L[1V]=1U[1V];c[1V]=$5e.6x(1V)}};k $(el){B(!el)m 1n;B(el.5i)m 2F.52(el);B([U,Q].1j(el))m el;o F=$F(el);B(F==\'2z\'){el=Q.6W(el);F=(el)?\'G\':O}B(F!=\'G\')m 1n;B(el.5i)m 2F.52(el);B([\'2I\',\'c4\'].1j(el.6S.5L()))m el;$R(el,P.1L);el.5i=k(){};m 2F.52(el)};Q.6Y=Q.33;k $$(){o T=[];M(o i=0,j=1b.V;i<j;i++){o 1S=1b[i];22($F(1S)){Y\'G\':T.1k(1S);Y\'c5\':1C;Y O:1C;Y\'2z\':1S=Q.6Y(1S,1e);62:T.R(1S)}}m $$.5M(T)};$$.5M=k(1z){o T=[];M(o i=0,l=1z.V;i<l;i++){B(1z[i].$6r)6l;o G=$(1z[i]);B(G&&!G.$6r){G.$6r=1e;T.1k(G)}}M(o n=0,d=T.V;n<d;n++)T[n].$6r=1n;m L 26(T)};26.73=k(K){m k(){o 1p=1b;o 1x=[];o T=1e;M(o i=0,j=c.V,3N;i<j;i++){3N=c[i][K].4j(c[i],1p);B($F(3N)!=\'
G\')T=O;1x.1k(3N)};m(T)?$$.5M(1x):1x}};P.R=k(1J){M(o K 1a 1J!
){5B.1L[
K]=1J[K];P.1L[K]=1J[K];P[K]=$5e.6x(K);o aB=(2t.1L[K])?K+\'26\':K;26.1L[aB]=26.73(K)}};P.R({2j:k(1U){M(o 1V 1a 1U){o 4m=1U[1V];22(1V){Y\'8J\':c.4A(4m);1C;Y\'19\':B(c.6j)c.6j(4m);1C;Y\'1J\':c.6o(4m);1C;62:c.7l(1V,4m)}}m c},28:k(el,ay){el=$(el);22(ay){Y\'9k\':el.3n.91(c,el);1C;Y\'94\':o 3x=el.8I();B(!3x)el.3n.86(c);14 el.3n.91(c,3x);1C;Y\'1o\':o 8Z=el.88;B(8Z){el.91(c,8Z);1C}62:el.86(c)}m c},7Y:k(el){m c.28(el,\'9k\')},6v:k(el){m c.28(el,\'94\')},c6:k(el){m c.28(el,\'3P\')},ct:k(el){m c.28(el,\'1o\')},b2:k(){o T=[];$1q(1b,k(4t){T=T.7P(4t)});$$(T).28(c);m c},2K:k(){m c.3n.bl(c)},9G:k(9V){o el=$(c.cu(9V!==O));B(!el.$19)m el;el.$19={};M(o F 1a c.$19)el.$19[F]={\'1O\':$A(c.$19[F].1O),\'1I\':$A(c.$19[F].1I)};m el.78()},cT:k(el){el=$(el);c.3n.cU(el,c);m el},bn:k(1K){c.86(Q.cS(1K));m c},7s:k(1A){m c.1A.1j(1A,\' \')},9z:k(1A){B(!c.7s(1A))c.1A=(c.1A+\' \'+1A).7r();m c},9E:k(1A){c.1A=c.1A.3g(L 7y(\'(^|\\\\s)\'+1A+\'(?:\\\\s|$)\'),\'$1\').7r();m c},cR:k(1A){m c.7s(1A)?c.9E(1A):c.9z(1A)},1P
:k(K,J){22(K){Y\'21\':m c.bk(66(J));Y\'cO\':K=(U.2P)?\'cP\':\'cQ\'}K=K.8a();22($F(J)){Y\'4M\':B(![\'cV\',\'ak\'].1j(K))J+=\'4W\';1C;Y\'1z\':J=\'1s(\'+J.2c(\',\')+\')\'}c.1N[K]=J;m c},4A:k(1Z){22($F(1Z)){Y\'2I\':P.72(c,\'1P\',1Z);1C;Y\'2z\':c.1N.87=1Z}m c},bk:k(21){B(21==0){B(c.1N.4z!="4O")c.1N.4z="4O"}14{B(c.1N.4z!="8G")c.1N.4z="8G"}B(!c.6p||!c.6p.cW)c.1N.ak=1;B(U.2P)c.1N.36=(21==1)?\'\':"7d(21="+21*35+")";c.1N.21=c.$1W.21=21;m c},2h:k(K){K=K.8a();o 1M=c.1N[K];B(!$2A(1M)){B(K==\'21\')m c.$1W.21;1M=[];M(o 1N 1a P.4c){B(K==1N){P.4c[1N].1q(k(s){o 1N=c.2h(s);1M.1k(5O(1N)?1N:\'bo\')},c);B(K==\'2R\'){o 4F=1M.4F(k(5d){m(5d==1M[0])});m(4F)?1M[0]:O}m 1M.2c(\' \')}}B(K.1j(\'2R\')){B(P.4c.2R.1j(K)){m[\'bf\',\'7T\',\'2Q\'].2D(k(p){m c.2h(K+p)},c).2c(\' \')}14 B(P.97.1j(K)){m[\'bi\',\'bs\',\'az\',\'a6\'].2D(k(p){m c.2h(\'2R\'+p+K.3g(\'2R\',\'\'))},c).2c(\' \')}}B(Q.aF)1M=Q.aF.d2(c,1n).d3(K.aL());14 B(c.6p)1M=c.6p[K]}B(U.2P)1M=P.b6(K,1M,c);B(1M&&K.2v(/2E/i)&&1M.1j(\'1s\')){m 1M.68(\'1s\')
.74(1,4).2D(k(2E){m 2E.5E()}).2c(\' \')}m 1M},bg:k(){m P.7H(!
c,\'2h\'
,1b)},61:k(6u,1g){6u+=\'d1\';o el=(1g)?c[1g]:c[6u];6Z(el&&$F(el)!=\'G\')el=el[6u];m $(el)},9W:k(){m c.61(\'2l\')},8I:k(){m c.61(\'3x\')},d0:k(){m c.61(\'3x\',\'88\')},80:k(){m c.61(\'2l\',\'cX\')},cY:k(){m $(c.3n)},8H:k(){m $$(c.aC)},8o:k(el){m!!$A(c.33(\'*\')).1j(el)},5R:k(K){o 25=P.6A[K];B(25)m c[25];o 7V=P.a3[K]||0;B(!U.2P||7V)m c.cZ(K,7V);o 81=c.cN[K];m(81)?81.ax:1n},cM:k(K){o 25=P.6A[K];B(25)c[25]=\'\';14 c.a7(K);m c},cA:k(){m P.7H(c,\'5R\',1b)},7l:k(K,J){o 25=P.6A[K];B(25)c[25]=J;14 c.cB(K,J);m c},6o:k(1Z){m P.72(c,\'7l\',1Z)},5s:k(){c.b3=$A(1b).2c(\'\');m c},cC:k(1K){o 3q=c.4D();B([\'1N\',\'2s\'].1j(3q)){B(U.2P){B(3q==\'1N\')c.b4.87=1K;14 B(3q==\'2s\')c.7l(\'1K\',1K);m c}14{c.bl(c.88);m c.bn(1K)}}c[$77(c.83)?\'83\':\'b1\']=1K;m c},cz:k(){o 3q=c.4D();B([\'1N\',\'2s\'].1j(3q)){B(U.2P){B(3q==\'1N\')m c.b4.87;14 B(3q==\'2s\')m c.5R(\'1K\')}14{m c.b3}}m($4T(c.83,c.b1))},4D:k(){m c.6S.5L()},1l:k(){2F.3V(c.33(\'*\'));m c.5s(\'\')}});P.b6=k(K,1M,G){B($2A(5O(1M)))m 1M;B([\'2N\'
,\'2y\'].1j(K)){o 1I=(K==\'2y\')?[\'1u\',\'4n\']:[\'1o\',\'3P\'];o 3l=0;1I.1q(k(J){3l+=G.2h(\'2R-\'+J+\'-2y\').3d()+G.2h(\'4w-\'+J).3d()});m G[\'1E\'+K.8R()]-3l+\'4W\'}14 B(K.2v(/2R(.+)bf|34|4w/)){m\'bo\'}m 1M};P.4c={\'2R\':[],\'4w\':[],\'34\':[]};[\'bi\',\'bs\',\'az\',\'a6\'].1q(k(9v){M(o 1N 1a P.4c)P.4c[1N].1k(1N+9v)});P.97=[\'cy\',\'cv\',\'cw\'];P.7H=k(el,23,1O){o 1M={};$1q(1O,k(1t){1M[1t]=el[23](1t)});m 1M};P.72=k(el,23,7G){M(o 1t 1a 7G)el[23](1t,7G[1t]);m el};P.6A=L 3M({\'4R\':\'1A\',\'M\':\'cx\',\'cD\':\'cE\',\'cK\':\'cL\',\'cJ\':\'cI\',\'cF\':\'cG\',\'cH\':\'d4\',\'bI\':\'bN\',\'bB\':\'bJ\',\'J\':\'J\',\'7D\':\'7D\',\'7E\':\'7E\',\'7J\':\'7J\',\'7Q\':\'7Q\'});P.a3={\'4N\':2,\'4s\':2};P.2H={6J:{2C:k(F,fn){B(c.8j)c.8j(F,fn,O);14 c.bD(\'67\'+F,fn);m c},3h:k(F,fn){B(c.a4)c.a4(F,fn,O);14 c.bP(\'67\'+F,fn);m c}}};U.R(P.2H.6J);Q.R(P.2H.6J);P.R(P.2H.6J);o 2F={T:[],52:k(el){B(!el.$1W){2F.T.1k(el);el.$1W={\'21\':1}}m el},3V:k(T){M(o i=0,j=T.V,el;i<j;i++){B(!(el=T[i])||!el.$1W)6
l;B(el.$19)el.1h(\'3V\').78();M(o p 1a el.$1W)el.$1W[p]=1n;M!
(o d 1a
P.1L)el[d]=1n;2F.T[2F.T.3k(el)]=1n;el.5i=el.$1W=el=1n}2F.T.2K(1n)},1l:k(){2F.52(U);2F.52(Q);2F.3V(2F.T)}};U.2C(\'9t\',k(){U.2C(\'7v\',2F.1l);B(U.2P)U.2C(\'7v\',bH)});o 2X=L 18({1i:k(I){B(I&&I.$bq)m I;c.$bq=1e;I=I||U.I;c.I=I;c.F=I.F;c.3v=I.3v||I.bF;B(c.3v.84==3)c.3v=c.3v.3n;c.aK=I.bx;c.bG=I.bC;c.bK=I.bz;c.bO=I.by;B([\'8b\',\'5a\'].1j(c.F)){c.bS=(I.9p)?I.9p/bQ:-(I.bE||0)/3}14 B(c.F.1j(\'1t\')){c.6O=I.9K||I.bL;M(o 1w 1a 2X.1O){B(2X.1O[1w]==c.6O){c.1t=1w;1C}}B(c.F==\'9X\'){o 6Q=c.6O-bM;B(6Q>0&&6Q<13)c.1t=\'f\'+6Q}c.1t=c.1t||6i.bA(c.6O).5L()}14 B(c.F.2v(/(6h|3m|bw)/)){c.1Y={\'x\':I.8E||I.9f+Q.2Z.5V,\'y\':I.8w||I.at+Q.2Z.63};c.9B={\'x\':I.8E?I.8E-U.99:I.9f,\'y\':I.8w?I.8w-U.9i:I.at};c.bR=(I.9K==3)||(I.bv==2);22(c.F){Y\'90\':c.2o=I.2o||I.ca;1C;Y\'8Y\':c.2o=I.2o||I.8A}c.aU()}m c},1R:k(){m c.6U().6X()},6U:k(){B(c.I.6U)c.I.6U();14 c.I.db=1e;m c},6X:k(){B(c.I.6X)c.I.6X();14 c.I.eK=O;m c}});2X.6m={2o:k(){B(c.2o&&c.2o.84==3)c.2o=c.2o.3n},aD:k(){5j{2X.6m.2o.1X(c)}5c(e){c.2o=c.3v}}};2X.1L.a
U=(U.8r)?2X.6m.aD:2X.6m.2o;2X.1O=L 3M({\'eL\':13,\'6P\':38,\'eJ\':40,\'1u\':37,\'4n\':39,\'eI\':27,\'eF\':32,\'eG\':8,\'eH\':9,\'57\':46});P.2H.2p={1B:k(F,fn){c.$19=c.$19||{};c.$19[F]=c.$19[F]||{\'1O\':[],\'1I\':[]};B(c.$19[F].1O.1j(fn))m c;c.$19[F].1O.1k(fn);o 76=F;o 2w=P.2p[F];B(2w){B(2w.7F)2w.7F.1X(c,fn);B(2w.2D)fn=2w.2D;B(2w.F)76=2w.F}B(!c.8j)fn=fn.3a({\'W\':c,\'I\':1e});c.$19[F].1I.1k(fn);m(P.8V.1j(76))?c.2C(76,fn):c},4C:k(F,fn){B(!c.$19||!c.$19[F])m c;o 1m=c.$19[F].1O.3k(fn);B(1m==-1)m c;o 1t=c.$19[F].1O.74(1m,1)[0];o J=c.$19[F].1I.74(1m,1)[0];o 2w=P.2p[F];B(2w){B(2w.2K)2w.2K.1X(c,fn);B(2w.F)F=2w.F}m(P.8V.1j(F))?c.3h(F,J):c},6j:k(1Z){m P.72(c,\'1B\',1Z)},78:k(F){B(!c.$19)m c;B(!F){M(o 6g 1a c.$19)c.78(6g);c.$19=1n}14 B(c.$19[F]){c.$19[F].1O.1q(k(fn){c.4C(F,fn)},c);c.$19[F]=1n}m c},1h:k(F,1p,2g){B(c.$19&&c.$19[F]){c.$19[F].1O.1q(k(fn){fn.3a({\'W\':c,\'2g\':2g,\'1b\':1p})()},c)}m c},au:k(15,F){B(!15.$19)m c;B(!F){M(o 6g 1a 15.$19)c.au(15,6g)}14 B(15.$19[F]){15.$19[F].1O.
1q(k(fn){c.1B(F,fn)},c)}m c}};U.R(P.2H.2p);Q.R(P.2H.2p);P.R(!
P.2H.2p)
;P.2p=L 3M({\'8N\':{F:\'90\',2D:k(I){I=L 2X(I);B(I.2o!=c&&!c.8o(I.2o))c.1h(\'8N\',I)}},\'8P\':{F:\'8Y\',2D:k(I){I=L 2X(I);B(I.2o!=c&&!c.8o(I.2o))c.1h(\'8P\',I)}},\'5a\':{F:(U.8r)?\'8b\':\'5a\'}});P.8V=[\'6h\',\'eM\',\'5z\',\'5n\',\'5a\',\'8b\',\'90\',\'8Y\',\'2M\',\'9X\',\'eN\',\'eS\',\'4e\',\'7v\',\'9t\',\'eT\',\'5o\',\'eR\',\'eQ\',\'3F\',\'eO\',\'eP\',\'48\',\'aE\',\'8s\',\'eE\',\'2G\'];7Z.R({3e:k(W,1p){m c.3a({\'W\':W,\'1b\':1p,\'I\':2X})}});26.R({eV:k(3q){m L 26(c.36(k(el){m(P.4D(el)==3q)}))},a8:k(1A,2J){o T=c.36(k(el){m(el.1A&&el.1A.1j(1A,\' \'))});m(2J)?T:L 26(T)},a2:k(4u,2J){o T=c.36(k(el){m(el.4u==4u)});m(2J)?T:L 26(T)},a9:k(1w,82,J,2J){o T=c.36(k(el){o 2i=P.5R(el,1w);B(!2i)m O;B(!82)m 1e;22(82){Y\'=\':m(2i==J);Y\'*=\':m(2i.1j(J));Y\'^=\':m(2i.6K(0,J.V)==J);Y\'$=\':m(2i.6K(2i.V-J.V)==J);Y\'!=\':m(2i!=J);Y\'~=\':m 2i.1j(J,\' \')}m O});m(2J)?T:L 26(T)}});k $E(1S,36){m($(36)||Q).9P(1S)};k $et(1S,36){m($(36)||Q).6Y(1S)};$$.3B={\'5C\':/^(\\w*|\\*)(?:#([\\w-]+)|\\.([\\w-]+)
)?(?:\\[(\\w+)(?:([!*^$]?=)["\']?([^"\'\\]]*)["\']?)?])?$/,\'4a\':{7L:k(1x,3b,1d,i){o 2r=[3b.eu?\'7N:\':\'\',1d[1]];B(1d[2])2r.1k(\'[@4u="\',1d[2],\'"]\');B(1d[3])2r.1k(\'[1j(7P(" ", @4R, " "), " \',1d[3],\' ")]\');B(1d[4]){B(1d[5]&&1d[6]){22(1d[5]){Y\'*=\':2r.1k(\'[1j(@\',1d[4],\', "\',1d[6],\'")]\');1C;Y\'^=\':2r.1k(\'[es-er(@\',1d[4],\', "\',1d[6],\'")]\');1C;Y\'$=\':2r.1k(\'[eo(@\',1d[4],\', 2z-V(@\',1d[4],\') - \',1d[6].V,\' + 1) = "\',1d[6],\'"]\');1C;Y\'=\':2r.1k(\'[@\',1d[4],\'="\',1d[6],\'"]\');1C;Y\'!=\':2r.1k(\'[@\',1d[4],\'!="\',1d[6],\'"]\')}}14{2r.1k(\'[@\',1d[4],\']\')}}1x.1k(2r.2c(\'\'));m 1x},7O:k(1x,3b,2J){o T=[];o 4a=Q.5r(\'.//\'+1x.2c(\'//\'),3b,$$.3B.ac,ep.eq,1n);M(o i=0,j=4a.ev;i<j;i++)T.1k(4a.ew(i));m(2J)?T:L 26(T.2D($))}},\'9T\':{7L:k(1x,3b,1d,i){B(i==0){B(1d[2]){o el=3b.6W(1d[2]);B(!el||((1d[1]!=\'*\')&&(P.4D(el)!=1d[1])))m O;1x=[el]}14{1x=$A(3b.33(1d[1]))}}14{1x=$$.3B.33(1x,1d[1]);B(1d[2])1x=26.a2(1x,1d[2],1e)}B(1d[3])1x=26.a8(1x,1d[3],1e);B(1d[4])1
x=26.a9(1x,1d[4],1d[5],1d[6],1e);m 1x},7O:k(1x,3b,2J){m(2J)?!
1x:$$.5M
(1x)}},ac:k(9Z){m(9Z==\'7N\')?\'9Y://aS.eB.eC/eA/7N\':O},33:k(3b,6S){o 7M=[];M(o i=0,j=3b.V;i<j;i++)7M.R(3b[i].33(6S));m 7M}};$$.3B.23=(U.4a)?\'4a\':\'9T\';P.2H.7R={6N:k(1S,2J){o 1x=[];1S=1S.5T().68(\' \');M(o i=0,j=1S.V;i<j;i++){o 9U=1S[i];o 1d=9U.31($$.3B.5C);B(!1d)1C;1d[1]=1d[1]||\'*\';o 2r=$$.3B[$$.3B.23].7L(1x,c,1d,i);B(!2r)1C;1x=2r}m $$.3B[$$.3B.23].7O(1x,c,2J)},9P:k(1S){m $(c.6N(1S,1e)[0]||O)},6Y:k(1S,2J){o T=[];1S=1S.68(\',\');M(o i=0,j=1S.V;i<j;i++)T=T.7P(c.6N(1S[i],1e));m(2J)?T:$$.5M(T)}};P.R({6W:k(4u){o el=Q.6W(4u);B(!el)m O;M(o 1r=el.3n;1r!=c;1r=1r.3n){B(!1r)m O}m el},ez:k(1A){m c.6N(\'.\'+1A)}});Q.R(P.2H.7R);P.R(P.2H.7R);P.R({44:k(){22(c.4D()){Y\'48\':o 1I=[];$1q(c.C,k(3z){B(3z.7Q)1I.1k($4T(3z.J,3z.1K))});m(c.7J)?1I:1I[0];Y\'ab\':B(!(c.7E&&[\'ex\',\'ey\'].1j(c.F))&&![\'4O\',\'1K\',\'eU\'].1j(c.F))1C;Y\'ad\':m c.J}m O},ae:k(){m $$(c.33(\'ab\'),c.33(\'48\'),c.33(\'ad\'))},5A:k(){o 5f=[];c.ae().1q(k(el){o 1w=el.1w;o J=el.44();B(J===O||!1w||el.7D)m;o 7C=k(4m){5f.1k(1
w+\'=\'+7e(4m))};B($F(J)==\'1z\')J.1q(7C);14 7C(J)});m 5f.2c(\'&\')}});P.R({3G:k(x,y){c.5V=x;c.63=y},7g:k(){m{\'2G\':{\'x\':c.5V,\'y\':c.63},\'3l\':{\'x\':c.4b,\'y\':c.3R},\'7h\':{\'x\':c.71,\'y\':c.5P}}},3p:k(2k){2k=2k||[];o el=c,1u=0,1o=0;do{1u+=el.fp||0;1o+=el.fh||0;el=el.fj}6Z(el);2k.1q(k(G){1u-=G.5V||0;1o-=G.63||0});m{\'x\':1u,\'y\':1o}},aQ:k(2k){m c.3p(2k).y},aP:k(2k){m c.3p(2k).x},4E:k(2k){o 1v=c.3p(2k);o N={\'2y\':c.4b,\'2N\':c.3R,\'1u\':1v.x,\'1o\':1v.y};N.4n=N.1u+N.2y;N.3P=N.1o+N.2N;m N}});P.2p.7S={7F:k(fn){B(U.6B){fn.1X(c);m}o 5X=k(){B(U.6B)m;U.6B=1e;U.1H=$55(U.1H);c.1h(\'7S\')}.W(c);B(Q.5m&&U.4x){U.1H=k(){B([\'6B\',\'8p\'].1j(Q.5m))5X()}.4f(50)}14 B(Q.5m&&U.2P){B(!$(\'7I\')){o 4s=(U.5k.ff==\'fi:\')?\'://0\':\'8q:fk(0)\';Q.fg(\'<2s 4u="7I" fd 4s="\'+4s+\'"><\\/2s>\');$(\'7I\').7i=k(){B(c.5m==\'8p\')5X()}}}14{U.2C("4e",5X);Q.2C("fe",5X)}}};U.fm=k(fn){m c.1B(\'7S\',fn)};U.R({8m:k(){B(c.5x)m c.fl;B(c.9a)m Q.4B.9c;m Q.2Z.9c},8n:k(){B(c.5x)m c.fo;B(c.9a)m Q.4B.9d;m Q.2
Z.9d},93:k(){B(c.2P)m 1c.1D(Q.2Z.4b,Q.2Z.71);B(c.4x)m Q.4B.7!
1;m Q.2Z
.71},92:k(){B(c.2P)m 1c.1D(Q.2Z.3R,Q.2Z.5P);B(c.4x)m Q.4B.5P;m Q.2Z.5P},8u:k(){m c.99||Q.2Z.5V},8v:k(){m c.9i||Q.2Z.63},7g:k(){m{\'3l\':{\'x\':c.8m(),\'y\':c.8n()},\'7h\':{\'x\':c.93(),\'y\':c.92()},\'2G\':{\'x\':c.8u(),\'y\':c.8v()}}},3p:k(){m{\'x\':0,\'y\':0}}});o 1f={};1f.2T=L 18({C:{3X:18.1l,1Q:18.1l,7w:18.1l,2f:k(p){m-(1c.av(1c.7W*p)-1)/2},49:fb,2x:\'4W\',3T:1e,98:50},1i:k(C){c.G=c.G||1n;c.2Y(C);B(c.C.1i)c.C.1i.1X(c)},2n:k(){o 3A=$3A();B(3A<c.3A+c.C.49){c.4p=c.C.2f((3A-c.3A)/c.C.49);c.4q();c.4k()}14{c.1R(1e);c.2j(c.17);c.1h(\'1Q\',c.G,10);c.7z()}},2j:k(17){c.12=17;c.4k();m c},4q:k(){c.12=c.4o(c.15,c.17)},4o:k(15,17){m(17-15)*c.4p+15},1g:k(15,17){B(!c.C.3T)c.1R();14 B(c.1H)m c;c.15=15;c.17=17;c.3F=c.17-c.15;c.3A=$3A();c.1H=c.2n.4f(1c.2q(bd/c.C.98),c);c.1h(\'3X\',c.G);m c},1R:k(29){B(!c.1H)m c;c.1H=$55(c.1H);B(!29)c.1h(\'7w\',c.G);m c},2w:k(15,17){m c.1g(15,17)},f1:k(29){m c.1R(29)}});1f.2T.3i(L 7u,L 2p,L 43);1f.3t={48:k(K,17){B(K.2v(/2E/i))m c.2Q;o F=$F(17);B((F==\'1z\')|
|(F==\'2z\'&&17.1j(\' \')))m c.73;m c.9j},2V:k(el,K,5b){B(!5b.1k)5b=[5b];o 15=5b[0],17=5b[1];B(!$2A(17)){17=15;15=el.2h(K)}o 1y=c.48(K,17);m{\'15\':1y.2V(15),\'17\':1y.2V(17),\'1y\':1y}}};1f.3t.9j={2V:k(J){m 66(J)},56:k(15,17,2O){m 2O.4o(15,17)},44:k(J,2x,K){B(2x==\'4W\'&&K!=\'21\')J=1c.2q(J);m J+2x}};1f.3t.73={2V:k(J){m J.1k?J:J.68(\' \').2D(k(v){m 66(v)})},56:k(15,17,2O){o 12=[];M(o i=0;i<15.V;i++)12[i]=2O.4o(15[i],17[i]);m 12},44:k(J,2x,K){B(2x==\'4W\'&&K!=\'21\')J=J.2D(1c.2q);m J.2c(2x+\' \')+2x}};1f.3t.2Q={2V:k(J){m J.1k?J:J.5G(1e)},56:k(15,17,2O){o 12=[];M(o i=0;i<15.V;i++)12[i]=1c.2q(2O.4o(15[i],17[i]));m 12},44:k(J){m\'1s(\'+J.2c(\',\')+\')\'}};1f.7T=1f.2T.R({1i:k(el,K,C){c.G=$(el);c.K=K;c.1r(C)},3Z:k(){m c.2j(0)},4q:k(){c.12=c.1y.56(c.15,c.17,c)},2j:k(17){c.1y=1f.3t.48(c.K,17);m c.1r(c.1y.2V(17))},1g:k(15,17){B(c.1H&&c.C.3T)m c;o 2e=1f.3t.2V(c.G,c.K,[15,17]);c.1y=2e.1y;m c.1r(2e.15,2e.17)},4k:k(){c.G.1P(c.K,c.1y.44(c.12,c.C.2x,c.K))}});P.R({f2:k(K,C){m L 1f.7T(c,K,C
)}});1f.4c=1f.2T.R({1i:k(el,C){c.G=$(el);c.1r(C)},4q:k(){M(o!
p 1a c.
15)c.12[p]=c.1y[p].56(c.15[p],c.17[p],c)},2j:k(17){o 2e={};c.1y={};M(o p 1a 17){c.1y[p]=1f.3t.48(p,17[p]);2e[p]=c.1y[p].2V(17[p])}m c.1r(2e)},1g:k(N){B(c.1H&&c.C.3T)m c;c.12={};c.1y={};o 15={},17={};M(o p 1a N){o 2e=1f.3t.2V(c.G,p,N[p]);15[p]=2e.15;17[p]=2e.17;c.1y[p]=2e.1y}m c.1r(15,17)},4k:k(){M(o p 1a c.12)c.G.1P(p,c.1y[p].44(c.12[p],c.C.2x,p))}});P.R({3U:k(C){m L 1f.4c(c,C)}});1f.26=1f.2T.R({1i:k(T,C){c.T=$$(T);c.1r(C)},4q:k(){M(o i 1a c.15){o 5Q=c.15[i],47=c.17[i],3u=c.1y[i],5U=c.12[i]={};M(o p 1a 5Q)5U[p]=3u[p].56(5Q[p],47[p],c)}},2j:k(17){o 2e={};c.1y={};M(o i 1a 17){o 47=17[i],3u=c.1y[i]={},9u=2e[i]={};M(o p 1a 47){3u[p]=1f.3t.48(p,47[p]);9u[p]=3u[p].2V(47[p])}}m c.1r(2e)},1g:k(N){B(c.1H&&c.C.3T)m c;c.12={};c.1y={};o 15={},17={};M(o i 1a N){o 85=N[i],5Q=15[i]={},47=17[i]={},3u=c.1y[i]={};M(o p 1a 85){o 2e=1f.3t.2V(c.T[i],p,85[p]);5Q[p]=2e.15;47[p]=2e.17;3u[p]=2e.1y}}m c.1r(15,17)},4k:k(){M(o i 1a c.12){o 5U=c.12[i],3u=c.1y[i];M(o p 1a 5U)c.T[i].1P(p,3u[p].44(5U[p],c.C
.2x,p))}}});1f.ah=1f.2T.R({C:{2k:[],1E:{\'x\':0,\'y\':0},9r:1e},1i:k(G,C){c.12=[];c.G=$(G);c.1G={\'1R\':c.1R.W(c,O)};c.1r(C);B(c.C.9r){c.1B(\'3X\',k(){Q.1B(\'5a\',c.1G.1R)}.W(c));c.1B(\'1Q\',k(){Q.4C(\'5a\',c.1G.1R)}.W(c))}},4q:k(){M(o i=0;i<2;i++)c.12[i]=c.4o(c.15[i],c.17[i])},3G:k(x,y){B(c.1H&&c.C.3T)m c;o el=c.G.7g();o 1I={\'x\':x,\'y\':y};M(o z 1a el.3l){o 1D=el.7h[z]-el.3l[z];B($2A(1I[z]))1I[z]=($F(1I[z])==\'4M\')?1I[z].1F(0,1D):1D;14 1I[z]=el.2G[z];1I[z]+=c.C.1E[z]}m c.1g([el.2G.x,el.2G.y],[1I.x,1I.y])},f0:k(){m c.3G(O,0)},eZ:k(){m c.3G(O,\'bu\')},eW:k(){m c.3G(0,O)},eX:k(){m c.3G(\'bu\',O)},8A:k(el){o 1r=c.G.3p(c.C.2k);o 3v=$(el).3p(c.C.2k);m c.3G(3v.x-1r.x,3v.y-1r.y)},4k:k(){c.G.3G(c.12[0],c.12[1])}});1f.eY=1f.2T.R({C:{2b:\'8Q\'},1i:k(el,C){c.G=$(el);c.3c=L P(\'4Z\',{\'8J\':$R(c.G.bg(\'34\'),{\'9y\':\'4O\'})}).6v(c.G).b2(c.G);c.G.1P(\'34\',0);c.2Y(C);c.12=[];c.1r(c.C);c.4X=1e;c.1B(\'1Q\',k(){c.4X=(c.12[0]===0)});B(U.5x)c.1B(\'1Q\',k(){B(c.4X)c.G.2K().28(c.3c)})},4q:k
(){M(o i=0;i<2;i++)c.12[i]=c.4o(c.15[i],c.17[i])},8Q:k(){c.3!
4=\'34-1
o\';c.64=\'2N\';c.1E=c.G.3R},8M:k(){c.34=\'34-1u\';c.64=\'2y\';c.1E=c.G.4b},ba:k(2b){c[2b||c.C.2b]();m c.1g([c.G.2h(c.34).3d(),c.3c.2h(c.64).3d()],[0,c.1E])},bb:k(2b){c[2b||c.C.2b]();m c.1g([c.G.2h(c.34).3d(),c.3c.2h(c.64).3d()],[-c.1E,0])},3Z:k(2b){c[2b||c.C.2b]();c.4X=O;m c.2j([-c.1E,0])},4d:k(2b){c[2b||c.C.2b]();c.4X=1e;m c.2j([0,c.1E])},f3:k(2b){B(c.3c.3R==0||c.3c.4b==0)m c.ba(2b);m c.bb(2b)},4k:k(){c.G.1P(c.34,c.12[0]+c.C.2x);c.3c.1P(c.64,c.12[1]+c.C.2x)}});1f.7U=k(2f,2U){2U=2U||[];B($F(2U)!=\'1z\')2U=[2U];m $R(2f,{f4:k(1m){m 2f(1m,2U)},f9:k(1m){m 1-2f(1-1m,2U)},fa:k(1m){m(1m<=0.5)?2f(2*1m,2U)/2:(2-2f(2*(1-1m),2U))/2}})};1f.3o=L 3M({fc:k(p){m p}});1f.3o.R=k(7B){M(o 2f 1a 7B){1f.3o[2f]=L 1f.7U(7B[2f]);1f.3o.7X(2f)}};1f.3o.7X=k(2f){[\'f8\',\'f7\',\'f5\'].1q(k(89){1f.3o[2f.5L()+89]=1f.3o[2f][\'f6\'+89]})};1f.3o.R({eD:k(p,x){m 1c.3w(p,x[0]||6)},em:k(p){m 1c.3w(2,8*(p-1))},dw:k(p){m 1-1c.bj(1c.dx(p))},dy:k(p){m 1-1c.bj((1-p)*1c.7W/2)},dv:k(p,x){x=x[0]||1.du;m 1c.3w(p,2)*((x+1
)*p-x)},dr:k(p){o J;M(o a=0,b=1;1;a+=b,b/=2){B(p>=(7-4*a)/11){J=-1c.3w((11-6*a-11*p)/4,2)+b*b;1C}}m J},ds:k(p,x){m 1c.3w(2,10*--p)*1c.av(20*p*1c.7W*(x[0]||1)/3)}});[\'dt\',\'dz\',\'dA\',\'dG\'].1q(k(2f,i){1f.3o[2f]=L 1f.7U(k(p){m 1c.3w(p,[i+2])});1f.3o.7X(2f)});o 4g={};4g.2T=L 18({C:{3J:O,2x:\'4W\',3X:18.1l,al:18.1l,1Q:18.1l,as:18.1l,8S:18.1l,1F:O,3E:{x:\'1u\',y:\'1o\'},4P:O,6M:6},1i:k(el,C){c.2Y(C);c.G=$(el);c.3J=$(c.C.3J)||c.G;c.3m={\'12\':{},\'1m\':{}};c.J={\'1g\':{},\'12\':{}};c.1G={\'1g\':c.1g.3e(c),\'4i\':c.4i.3e(c),\'3D\':c.3D.3e(c),\'1R\':c.1R.W(c)};c.6V();B(c.C.1i)c.C.1i.1X(c)},6V:k(){c.3J.1B(\'5n\',c.1G.1g);m c},9F:k(){c.3J.4C(\'5n\',c.1G.1g);m c},1g:k(I){c.1h(\'al\',c.G);c.3m.1g=I.1Y;o 1F=c.C.1F;c.1F={\'x\':[],\'y\':[]};M(o z 1a c.C.3E){B(!c.C.3E[z])6l;c.J.12[z]=c.G.2h(c.C.3E[z]).3d();c.3m.1m[z]=I.1Y[z]-c.J.12[z];B(1F&&1F[z]){M(o i=0;i<2;i++){B($2A(1F[z][i]))c.1F[z][i]=($F(1F[z][i])==\'k\')?1F[z][i]():1F[z][i]}}}B($F(c.C.4P)==\'4M\')c.C.4P={\'x\':c.C.4P,\'y\':c.C.
4P};Q.2C(\'2M\',c.1G.4i);Q.2C(\'5z\',c.1G.1R);c.1h(\'3X\',c.!
G);I.1R(
)},4i:k(I){o ao=1c.2q(1c.dH(1c.3w(I.1Y.x-c.3m.1g.x,2)+1c.3w(I.1Y.y-c.3m.1g.y,2)));B(ao>c.C.6M){Q.3h(\'2M\',c.1G.4i);Q.2C(\'2M\',c.1G.3D);c.3D(I);c.1h(\'as\',c.G)}I.1R()},3D:k(I){c.69=O;c.3m.12=I.1Y;M(o z 1a c.C.3E){B(!c.C.3E[z])6l;c.J.12[z]=c.3m.12[z]-c.3m.1m[z];B(c.1F[z]){B($2A(c.1F[z][1])&&(c.J.12[z]>c.1F[z][1])){c.J.12[z]=c.1F[z][1];c.69=1e}14 B($2A(c.1F[z][0])&&(c.J.12[z]<c.1F[z][0])){c.J.12[z]=c.1F[z][0];c.69=1e}}B(c.C.4P[z])c.J.12[z]-=(c.J.12[z]%c.C.4P[z]);c.G.1P(c.C.3E[z],c.J.12[z]+c.C.2x)}c.1h(\'8S\',c.G);I.1R()},1R:k(){Q.3h(\'2M\',c.1G.4i);Q.3h(\'2M\',c.1G.3D);Q.3h(\'5z\',c.1G.1R);c.1h(\'1Q\',c.G)}});4g.2T.3i(L 2p,L 43);P.R({dF:k(C){m L 4g.2T(c,$2a({3E:{x:\'2y\',y:\'2N\'}},C))}});4g.aM=4g.2T.R({C:{6c:[],2d:O,2k:[]},1i:k(el,C){c.2Y(C);c.G=$(el);c.6c=$$(c.C.6c);c.2d=$(c.C.2d);c.1v={\'G\':c.G.2h(\'1v\'),\'2d\':O};B(c.2d)c.1v.2d=c.2d.2h(\'1v\');B(![\'70\',\'3Y\',\'4V\'].1j(c.1v.G))c.1v.G=\'3Y\';o 1o=c.G.2h(\'1o\').3d();o 1u=c.G.2h(\'1u\').3d();B(c.1v.G==\'3Y\'&&![\'70\',
\'3Y\',\'4V\'].1j(c.1v.2d)){1o=$2A(1o)?1o:c.G.aQ(c.C.2k);1u=$2A(1u)?1u:c.G.aP(c.C.2k)}14{1o=$2A(1o)?1o:0;1u=$2A(1u)?1u:0}c.G.4A({\'1o\':1o,\'1u\':1u,\'1v\':c.1v.G});c.1r(c.G)},1g:k(I){c.3f=1n;B(c.2d){o 4r=c.2d.4E();o el=c.G.4E();B(c.1v.G==\'3Y\'&&![\'70\',\'3Y\',\'4V\'].1j(c.1v.2d)){c.C.1F={\'x\':[4r.1u,4r.4n-el.2y],\'y\':[4r.1o,4r.3P-el.2N]}}14{c.C.1F={\'y\':[0,4r.2N-el.2N],\'x\':[0,4r.2y-el.2y]}}}c.1r(I)},3D:k(I){c.1r(I);o 3f=c.69?O:c.6c.36(c.aO,c).80();B(c.3f!=3f){B(c.3f)c.3f.1h(\'dE\',[c.G,c]);c.3f=3f?3f.1h(\'dB\',[c.G,c]):1n}m c},aO:k(el){el=el.4E(c.C.2k);o 12=c.3m.12;m(12.x>el.1u&&12.x<el.4n&&12.y<el.3P&&12.y>el.1o)},1R:k(){B(c.3f&&!c.69)c.3f.1h(\'dC\',[c.G,c]);14 c.G.1h(\'dD\',c);c.1r();m c}});P.R({dq:k(C){m L 4g.aM(c,C)}});o 6n=L 18({C:{23:\'59\',be:1e,9g:18.1l,5h:18.1l,6w:18.1l,aG:1e,5J:\'dp-8\',aZ:O,4J:{}},7q:k(){c.2u=(U.6C)?L 6C():(U.2P?L 9o(\'en.dc\'):O);m c},1i:k(C){c.7q().2Y(C);c.C.5D=c.C.5D||c.5D;c.4J={};B(c.C.aG&&c.C.23==\'59\'){o 5J=(c.C.5J)?\'; dd=\'+c.C.5J
:\'\';c.5l(\'9R-F\',\'9J/x-aS-da-d9\'+5J)}B(c.C.1i)c.C.1i.1X!
(c)},9s:
k(){B(c.2u.5m!=4||!c.4Q)m;c.4Q=O;o 4I=0;5j{4I=c.2u.4I}5c(e){};B(c.C.5D.1X(c,4I))c.5h();14 c.6w();c.2u.7i=18.1l},5D:k(4I){m((4I>=d6)&&(4I<d7))},5h:k(){c.3L={\'1K\':c.2u.d8,\'5t\':c.2u.de};c.1h(\'5h\',[c.3L.1K,c.3L.5t]);c.7z()},6w:k(){c.1h(\'6w\',c.2u)},5l:k(1w,J){c.4J[1w]=J;m c},6a:k(2L,1T){B(c.C.aZ)c.95();14 B(c.4Q)m c;c.4Q=1e;B(1T&&c.C.23==\'5q\'){2L=2L+(2L.1j(\'?\')?\'&\':\'?\')+1T;1T=1n}c.2u.4X(c.C.23.7A(),2L,c.C.be);c.2u.7i=c.9s.W(c);B((c.C.23==\'59\')&&c.2u.d5)c.5l(\'df\',\'dl\');$R(c.4J,c.C.4J);M(o F 1a c.4J)5j{c.2u.dm(F,c.4J[F])}5c(e){};c.1h(\'9g\');c.2u.6a($4T(1T,1n));m c},95:k(){B(!c.4Q)m c;c.4Q=O;c.2u.8s();c.2u.7i=18.1l;c.7q();c.1h(\'7w\');m c}});6n.3i(L 7u,L 2p,L 43);o 9b=6n.R({C:{1T:1n,7x:1n,1Q:18.1l,6R:O,7p:O},1i:k(2L,C){c.1B(\'5h\',c.1Q);c.2Y(C);c.C.1T=c.C.1T||c.C.dn;B(![\'59\',\'5q\'].1j(c.C.23)){c.5H=\'5H=\'+c.C.23;c.C.23=\'59\'}c.1r();c.5l(\'X-dk-dj\',\'6C\');c.5l(\'dg\',\'1K/8q, 1K/dh, 9J/5t, 1K/5t, */*\');c.2L=2L},1Q:k(){B(c.C.7x)$(c.C.7x).1l().5s(c.3L.1K);
B(c.C.6R||c.C.7p)c.6R();c.1h(\'1Q\',[c.3L.1K,c.3L.5t],20)},9h:k(1T){1T=1T||c.C.1T;22($F(1T)){Y\'G\':1T=$(1T).5A();1C;Y\'2I\':1T=8X.5A(1T)}B(c.5H)1T=(1T)?[c.5H,1T].2c(\'&\'):c.5H;m c.6a(c.2L,1T)},6R:k(){o 2s,3y;B(c.C.7p||(/(di|dI)2s/).2v(c.af(\'9R-F\')))3y=c.3L.1K;14{3y=[];o 5C=/<2s[^>]*>([\\s\\S]*?)<\\/2s>/dJ;6Z((2s=5C.e9(c.3L.1K)))3y.1k(2s[1]);3y=3y.2c(\'\\n\')}B(3y)(U.9O)?U.9O(3y):U.9M(3y,0)},af:k(1w){5j{m c.2u.ea(1w)}5c(e){};m 1n}});8X.5A=k(1Z){o 5f=[];M(o K 1a 1Z)5f.1k(7e(K)+\'=\'+7e(1Z[K]));m 5f.2c(\'&\')};P.R({6a:k(C){m L 9b(c.5R(\'eb\'),$2a({1T:c.5A()},C,{23:\'59\'})).9h()}});o 3H=L 3M({C:{7o:O,7k:O,49:O,5g:O},2j:k(1t,J,C){C=$2a(c.C,C);J=7e(J);B(C.7o)J+=\'; 7o=\'+C.7o;B(C.7k)J+=\'; 7k=\'+C.7k;B(C.49){o 6k=L 96();6k.e8(6k.9w()+C.49*24*60*60*bd);J+=\'; e7=\'+6k.e4()}B(C.5g)J+=\'; 5g\';Q.4K=1t+\'=\'+J;m $R(C,{\'1t\':1t,\'J\':J})},5q:k(1t){o J=Q.4K.31(\'(?:^|;)\\\\s*\'+1t.b5()+\'=([^;]*)\');m J?e5(J[1]):O},2K:k(4K,C){B($F(4K)==\'2I\')c.2j(4K.1t,\'\',$2a(4K,{49:-1}));14 c.
2j(4K,\'\',$2a(C,{49:-1}))}});o 3I={4l:k(N){22($F(N)){Y\'2z\!
':m\'"\'
+N.3g(/(["\\\\])/g,\'\\\\$1\')+\'"\';Y\'1z\':m\'[\'+N.2D(3I.4l).2c(\',\')+\']\';Y\'2I\':o 2z=[];M(o K 1a N)2z.1k(3I.4l(K)+\':\'+3I.4l(N[K]));m\'{\'+2z.2c(\',\')+\'}\';Y\'4M\':B(e6(N))1C;Y O:m\'1n\'}m 6i(N)},5r:k(4H,5g){m(($F(4H)!=\'2z\')||(5g&&!4H.2v(/^("(\\\\.|[^"\\\\\\n\\r])*?"|[,:{}\\[\\]0-9.\\-+ec-u \\n\\r\\t])+?$/)))?1n:ed(\'(\'+4H+\')\')}};3I.ej=6n.R({1i:k(2L,C){c.2L=2L;c.1B(\'5h\',c.1Q);c.1r(C);c.5l(\'X-ek\',\'ei\')},6a:k(N){m c.1r(c.2L,\'eh=\'+3I.4l(N))},1Q:k(){c.1h(\'1Q\',[3I.5r(c.3L.1K,c.C.5g)])}});o ar=L 3M({8q:k(1Z,1J){1J=$2a({\'5N\':18.1l},1J);o 2s=L P(\'2s\',{\'4s\':1Z}).6j({\'4e\':1J.5N,\'ee\':k(){B(c.5m==\'8p\')c.1h(\'4e\')}});57 1J.5N;m 2s.6o(1J).28(Q.6e)},1y:k(1Z,1J){m L P(\'4y\',$2a({\'a1\':\'ef\',\'eg\':\'e3\',\'F\':\'1K/1y\',\'4N\':1Z},1J)).28(Q.6e)},4S:k(1Z,1J){1J=$2a({\'5N\':18.1l,\'e2\':18.1l,\'dP\':18.1l},1J);o 4S=L dQ();4S.4s=1Z;o G=L P(\'8x\',{\'4s\':1Z});[\'4e\',\'8s\',\'aE\'].1q(k(F){o I=1J[\'67\'+F];57 1J[\'67\'+F];G.1B(F,k(){c.4C(F,1b.8t);I.1X(c
)})});B(4S.2y&&4S.2N)G.1h(\'4e\',G,1);m G.6o(1J)},6s:k(58,C){C=$2a({1Q:18.1l,an:18.1l},C);B(!58.1k)58=[58];o 6s=[];o 6q=0;58.1q(k(1Z){o 8x=L ar.4S(1Z,{\'5N\':k(){C.an.1X(c,6q);6q++;B(6q==58.V)C.1Q()}});6s.1k(8x)});m L 26(6s)}});o 3O=L 18({V:0,1i:k(2I){c.N=2I||{};c.5K()},5q:k(1t){m(c.6t(1t))?c.N[1t]:1n},6t:k(1t){m(1t 1a c.N)},2j:k(1t,J){B(!c.6t(1t))c.V++;c.N[1t]=J;m c},5K:k(){c.V=0;M(o p 1a c.N)c.V++;m c},2K:k(1t){B(c.6t(1t)){57 c.N[1t];c.V--}m c},1q:k(fn,W){$1q(c.N,fn,W)},R:k(N){$R(c.N,N);m c.5K()},2a:k(){c.N=$2a.4j(1n,[c.N].R(1b));m c.5K()},1l:k(){c.N={};c.V=0;m c},1O:k(){o 1O=[];M(o K 1a c.N)1O.1k(K);m 1O},1I:k(){o 1I=[];M(o K 1a c.N)1I.1k(c.N[K]);m 1I}});k $H(N){m L 3O(N)};3O.3H=3O.R({1i:k(1w,C){c.1w=1w;c.C=$R({\'aw\':1e},C||{});c.4e()},aX:k(){B(c.V==0){3H.2K(c.1w,c.C);m 1e}o 4H=3I.4l(c.N);B(4H.V>dR)m O;3H.2j(c.1w,4H,c.C);m 1e},4e:k(){c.N=3I.5r(3H.5q(c.1w),1e)||{};c.5K()}});3O.3H.2H={};[\'R\',\'2j\',\'2a\',\'1l\',\'2K\'].1q(k(23){3O.3H.2H[23]=k(){3O.1L[23].4j(c,1b);B(c.C.
aw)c.aX();m c}});3O.3H.3i(3O.3H.2H);o 2Q=L 18({1i:k(2E,F){F=!
F||(2E.1
k?\'1s\':\'3C\');o 1s,2m;22(F){Y\'1s\':1s=2E;2m=1s.8h();1C;Y\'2m\':1s=2E.b9();2m=2E;1C;62:1s=2E.5G(1e);2m=1s.8h()}1s.2m=2m;1s.3C=1s.5E();m $R(1s,2Q.1L)},54:k(){o 5I=$A(1b);o 7d=($F(5I[5I.V-1])==\'4M\')?5I.dO():50;o 1s=c.8e();5I.1q(k(2E){2E=L 2Q(2E);M(o i=0;i<3;i++)1s[i]=1c.2q((1s[i]/ 35 * (35 - 7d)) + (2E[i] /35*7d))});m L 2Q(1s,\'1s\')},dN:k(){m L 2Q(c.2D(k(J){m 51-J}))},dK:k(J){m L 2Q([J,c.2m[1],c.2m[2]],\'2m\')},dL:k(7a){m L 2Q([c.2m[0],7a,c.2m[2]],\'2m\')},dM:k(7a){m L 2Q([c.2m[0],c.2m[1],7a],\'2m\')}});k $dS(r,g,b){m L 2Q([r,g,b],\'1s\')};k $dT(h,s,b){m L 2Q([h,s,b],\'2m\')};2t.R({8h:k(){o 5W=c[0],65=c[1],75=c[2];o 2W,6y,8k;o 1D=1c.1D(5W,65,75),3s=1c.3s(5W,65,75);o 4p=1D-3s;8k=1D/51;6y=(1D!=0)?4p/1D:0;B(6y==0){2W=0}14{o 8l=(1D-5W)/4p;o 8W=(1D-65)/4p;o br=(1D-75)/4p;B(5W==1D)2W=br-8W;14 B(65==1D)2W=2+8l-br;14 2W=4+8W-8l;2W/=6;B(2W<0)2W++}m[1c.2q(2W*bc),1c.2q(6y*35),1c.2q(8k*35)]},b9:k(){o br=1c.2q(c[2]/35*51);B(c[1]==0){m[br,br,br]}14{o 2W=c[0]%bc;o f=2W%60;o p=1c.2q((c[2
]*(35-c[1]))/dZ*51);o q=1c.2q((c[2]*(b7-c[1]*f))/bm*51);o t=1c.2q((c[2]*(b7-c[1]*(60-f)))/bm*51);22(1c.9q(2W/60)){Y 0:m[br,t,p];Y 1:m[q,br,p];Y 2:m[p,br,t];Y 3:m[p,q,br];Y 4:m[t,p,br];Y 5:m[br,p,q]}}m O}});o 9x=L 18({C:{6b:20,8O:1,6F:k(x,y){c.G.3G(x,y)}},1i:k(G,C){c.2Y(C);c.G=$(G);c.8y=([U,Q].1j(G))?$(Q.4B):c.G},1g:k(){c.8z=c.9A.3e(c);c.8y.2C(\'2M\',c.8z)},1R:k(){c.8y.3h(\'2M\',c.8z);c.1H=$55(c.1H)},9A:k(I){c.1Y=(c.G==U)?I.9B:I.1Y;B(!c.1H)c.1H=c.2G.4f(50,c)},2G:k(){o el=c.G.7g();o 1m=c.G.3p();o 3F={\'x\':0,\'y\':0};M(o z 1a c.1Y){B(c.1Y[z]<(c.C.6b+1m[z])&&el.2G[z]!=0)3F[z]=(c.1Y[z]-c.C.6b-1m[z])*c.C.8O;14 B(c.1Y[z]+c.C.6b>(el.3l[z]+1m[z])&&el.2G[z]+el.3l[z]!=el.7h[z])3F[z]=(c.1Y[z]-el.3l[z]+c.C.6b-1m[z])*c.C.8O}B(3F.y||3F.x)c.1h(\'6F\',[el.2G.x+3F.x,el.2G.y+3F.y])}});9x.3i(L 2p,L 43);o 8B=L 18({C:{6F:18.1l,1Q:18.1l,8L:k(1m){c.4h.1P(c.p,1m)},2b:\'8M\',6E:35,1E:0},1i:k(el,4h,C){c.G=$(el);c.4h=$(4h);c.2Y(C);c.8K=-1;c.8D=-1;c.2n=-1;c.G.1B(\'5n\',c.9D.3e(c));o 6H,1E;22(c.C.2b){Y\
'8M\':c.z=\'x\';c.p=\'1u\';6H={\'x\':\'1u\',\'y\':O};1E=\'4b!
\';1C;Y\
'8Q\':c.z=\'y\';c.p=\'1o\';6H={\'x\':O,\'y\':\'1o\'};1E=\'3R\'}c.1D=c.G[1E]-c.4h[1E]+(c.C.1E*2);c.a5=c.4h[1E]/2;c.ai=c.G[\'5q\'+c.p.8R()].W(c.G);c.4h.1P(\'1v\',\'70\').1P(c.p,-c.C.1E);o 8U={};8U[c.z]=[-c.C.1E,c.1D-c.C.1E];c.3D=L 4g.2T(c.4h,{1F:8U,3E:6H,6M:0,3X:k(){c.6L()}.W(c),8S:k(){c.6L()}.W(c),1Q:k(){c.6L();c.29()}.W(c)});B(c.C.1i)c.C.1i.1X(c)},2j:k(2n){c.2n=2n.1F(0,c.C.6E);c.6G();c.29();c.1h(\'8L\',c.a0(c.2n));m c},9D:k(I){o 1v=I.1Y[c.z]-c.ai()-c.a5;1v=1v.1F(-c.C.1E,c.1D-c.C.1E);c.2n=c.8C(1v);c.6G();c.29();c.1h(\'8L\',1v)},6L:k(){c.2n=c.8C(c.3D.J.12[c.z]);c.6G()},6G:k(){B(c.8K!=c.2n){c.8K=c.2n;c.1h(\'6F\',c.2n)}},29:k(){B(c.8D!==c.2n){c.8D=c.2n;c.1h(\'1Q\',c.2n+\'\')}},8C:k(1v){m 1c.2q((1v+c.C.1E)/c.1D*c.C.6E)},a0:k(2n){m c.1D*2n/c.C.6E}});8B.3i(L 2p);8B.3i(L 43);o e0=1f.ah.R({1i:k(C){c.1r(U,C);c.5w=(c.C.5w)?$$(c.C.5w):$$(Q.5w);o 5k=U.5k.4N.31(/^[^#]*/)[0]+\'#\';c.5w.1q(k(4y){B(4y.4N.3k(5k)!=0)m;o 3K=4y.4N.6K(5k.V);B(3K&&$(3K))c.9L(4y,3K)},c);B(!U.5x)c.1B(\'1Q\',k(){U.5k.
e1=c.3K})},9L:k(4y,3K){4y.1B(\'6h\',k(I){c.3K=3K;c.8A(3K);I.1R()}.3e(c))}});o 9S=L 18({C:{4L:O,3X:18.1l,1Q:18.1l,2S:1e,6M:3,9H:k(G,2S){2S.1P(\'21\',0.7);G.1P(\'21\',0.7)},9e:k(G,2S){G.1P(\'21\',1);2S.2K();c.3V.2K()}},1i:k(5p,C){c.2Y(C);c.5p=$(5p);c.T=c.5p.8H();c.4L=(c.C.4L)?$$(c.C.4L):c.T;c.1G={\'1g\':[],\'5y\':c.5y.3e(c)};M(o i=0,l=c.4L.V;i<l;i++){c.1G.1g[i]=c.1g.3e(c,c.T[i])}c.6V();B(c.C.1i)c.C.1i.1X(c);c.1G.5o=c.5o.3e(c);c.1G.29=c.29.W(c)},6V:k(){c.4L.1q(k(3J,i){3J.1B(\'5n\',c.1G.1g[i])},c)},9F:k(){c.4L.1q(k(3J,i){3J.4C(\'5n\',c.1G.1g[i])},c)},1g:k(I,el){c.4G=el;c.8F=c.5p.4E();B(c.C.2S){o 1v=el.3p();c.1E=I.1Y.y-1v.y;c.3V=L P(\'4Z\').28(Q.4B);c.2S=el.9G().28(c.3V).4A({\'1v\':\'3Y\',\'1u\':1v.x,\'1o\':I.1Y.y-c.1E});Q.2C(\'2M\',c.1G.5y);c.1h(\'9H\',[el,c.2S])}Q.2C(\'2M\',c.1G.5o);Q.2C(\'5z\',c.1G.29);c.1h(\'3X\',el);I.1R()},5y:k(I){o J=I.1Y.y-c.1E;J=J.1F(c.8F.1o,c.8F.3P-c.2S.3R);c.2S.1P(\'1o\',J);I.1R()},5o:k(I){o 12=I.1Y.y;c.2l=c.2l||12;o 6P=((c.2l-12)>0);o 6T=c.4G.9W();o 3
x=c.4G.8I();B(6T&&6P&&12<6T.4E().3P)c.4G.7Y(6T);B(3x&&!6P&&1!
2>3x.4E(
).1o)c.4G.6v(3x);c.2l=12},dY:k(9Q){m c.5p.8H().2D(9Q||k(el){m c.T.3k(el)},c)},29:k(){c.2l=1n;Q.3h(\'2M\',c.1G.5o);Q.3h(\'5z\',c.1G.29);B(c.C.2S){Q.3h(\'2M\',c.1G.5y);c.1h(\'9e\',[c.4G,c.2S])}c.1h(\'1Q\',c.4G)}});9S.3i(L 2p,L 43);o aI=L 18({C:{aT:k(3W){3W.1P(\'4z\',\'8G\')},aW:k(3W){3W.1P(\'4z\',\'4O\')},8T:30,bp:35,bt:35,1A:\'dX\',5F:{\'x\':16,\'y\':16},4V:O},1i:k(T,C){c.2Y(C);c.45=L P(\'4Z\',{\'4R\':c.C.1A+\'-3W\',\'8J\':{\'1v\':\'3Y\',\'1o\':\'0\',\'1u\':\'0\',\'4z\':\'4O\'}}).28(Q.4B);c.3c=L P(\'4Z\').28(c.45);$$(T).1q(c.9I,c);B(c.C.1i)c.C.1i.1X(c)},9I:k(el){el.$1W.42=(el.4N&&el.4D()==\'a\')?el.4N.3g(\'9Y://\',\'\'):(el.a1||O);B(el.53){o 6z=el.53.68(\'::\');B(6z.V>1){el.$1W.42=6z[0].5T();el.$1W.5u=6z[1].5T()}14{el.$1W.5u=el.53}el.a7(\'53\')}14{el.$1W.5u=O}B(el.$1W.42&&el.$1W.42.V>c.C.8T)el.$1W.42=el.$1W.42.6K(0,c.C.8T-1)+"&dU;";el.1B(\'8N\',k(I){c.1g(el);B(!c.C.4V)c.8f(I);14 c.1v(el)}.W(c));B(!c.C.4V)el.1B(\'2M\',c.8f.3e(c));o 29=c.29.W(c);el.1B(\'8P\',29);el.1B(\'3V\',29)
},1g:k(el){c.3c.1l();B(el.$1W.42){c.53=L P(\'b0\').28(L P(\'4Z\',{\'4R\':c.C.1A+\'-53\'}).28(c.3c)).5s(el.$1W.42)}B(el.$1W.5u){c.1K=L P(\'b0\').28(L P(\'4Z\',{\'4R\':c.C.1A+\'-1K\'}).28(c.3c)).5s(el.$1W.5u)}$55(c.1H);c.1H=c.4d.2g(c.C.bp,c)},29:k(I){$55(c.1H);c.1H=c.3Z.2g(c.C.bt,c)},1v:k(G){o 1m=G.3p();c.45.4A({\'1u\':1m.x+c.C.5F.x,\'1o\':1m.y+c.C.5F.y})},8f:k(I){o am={\'x\':U.8m(),\'y\':U.8n()};o 2G={\'x\':U.8u(),\'y\':U.8v()};o 3W={\'x\':c.45.4b,\'y\':c.45.3R};o 1V={\'x\':\'1u\',\'y\':\'1o\'};M(o z 1a 1V){o 1m=I.1Y[z]+c.C.5F[z];B((1m+3W[z]-2G[z])>am[z])1m=I.1Y[z]-c.C.5F[z]-3W[z];c.45.1P(1V[z],1m)}},4d:k(){B(c.C.aq)c.1H=c.3Z.2g(c.C.aq,c);c.1h(\'aT\',[c.45])},3Z:k(){c.1h(\'aW\',[c.45])}});aI.3i(L 2p,L 43);o dV=L 18({1i:k(){c.6D=$A(1b);c.19={};c.4U={}},1B:k(F,fn){c.4U[F]=c.4U[F]||{};c.19[F]=c.19[F]||[];B(c.19[F].1j(fn))m O;14 c.19[F].1k(fn);c.6D.1q(k(5v,i){5v.1B(F,c.4i.W(c,[F,5v,i]))},c);m c},4i:k(F,5v,i){c.4U[F][i]=1e;o 4F=c.6D.4F(k(2i,j){m c.4U[F][j]||O},c);B(!4F)m;c.4U[F]={
};c.19[F].1q(k(I){I.1X(c,c.6D,5v)},c)}});o 7t=1f.26.R({C:{7K!
:18.1l,a
a:18.1l,3Q:0,4d:O,2N:1e,2y:O,21:1e,7f:O,7n:O,3T:O,6I:O},1i:k(){o C,2B,T,2d;$1q(1b,k(4t,i){22($F(4t)){Y\'2I\':C=4t;1C;Y\'G\':2d=$(4t);1C;62:o 2r=$$(4t);B(!2B)2B=2r;14 T=2r}});c.2B=2B||[];c.T=T||[];c.2d=$(2d);c.2Y(C);c.2l=-1;B(c.C.6I)c.C.3T=1e;B($2A(c.C.4d)){c.C.3Q=O;c.2l=c.C.4d}B(c.C.1g){c.C.3Q=O;c.C.4d=O}c.3U={};B(c.C.21)c.3U.21=\'b8\';B(c.C.2y)c.3U.2y=c.C.7n?\'aj\':\'4b\';B(c.C.2N)c.3U.2N=c.C.7f?\'9n\':\'5P\';M(o i=0,l=c.2B.V;i<l;i++)c.aR(c.2B[i],c.T[i]);c.T.1q(k(el,i){B(c.C.4d===i){c.1h(\'7K\',[c.2B[i],el])}14{M(o 2O 1a c.3U)el.1P(2O,0)}},c);c.1r(c.T);B($2A(c.C.3Q))c.3Q(c.C.3Q)},aR:k(3j,G,1m){3j=$(3j);G=$(G);o 2v=c.2B.1j(3j);o 3S=c.2B.V;c.2B.5S(3j);c.T.5S(G);B(3S&&(!2v||1m)){1m=$4T(1m,3S-1);3j.7Y(c.2B[1m]);G.6v(3j)}14 B(c.2d&&!2v){3j.28(c.2d);G.28(c.2d)}o aA=c.2B.3k(3j);3j.1B(\'6h\',c.3Q.W(c,aA));B(c.C.2N)G.4A({\'4w-1o\':0,\'2R-1o\':\'7j\',\'4w-3P\':0,\'2R-3P\':\'7j\'});B(c.C.2y)G.4A({\'4w-1u\':0,\'2R-1u\':\'7j\',\'4w-4n\':0,\'2R-4n\':\'7j\'});G.b8=1;B(c.C.7n)G.aj=c.C.7n;B(
c.C.7f)G.9n=c.C.7f;G.1P(\'9y\',\'4O\');B(!2v){M(o 2O 1a c.3U)G.1P(2O,0)}m c},3Q:k(25){25=($F(25)==\'G\')?c.T.3k(25):25;B((c.1H&&c.C.3T)||(25===c.2l&&!c.C.6I))m c;c.2l=25;o N={};c.T.1q(k(el,i){N[i]={};o 3Z=(i!=25)||(c.C.6I&&(el.3R>0));c.1h(3Z?\'aa\':\'7K\',[c.2B[i],el]);M(o 2O 1a c.3U)N[i][2O]=3Z?0:el[c.3U[2O]]},c);m c.1g(N)},dW:k(25){m c.3Q(25)}});1f.7t=7t;',62,956,'||||||||||||this||||||||function||return||var|||||||||||||if|options|||type|element||event|value|property|new|for|obj|false|Element|document|extend||elements|window|length|bind||case||||now||else|from||to|Class|events|in|arguments|Math|param|true|Fx|start|fireEvent|initialize|contains|push|empty|pos|null|top|args|each|parent|rgb|key|left|position|name|items|css|array|className|addEvent|break|max|offset|limit|bound|timer|values|properties|text|prototype|result|style|keys|setStyle|onComplete|stop|selector|data|props|prop|tmp|call|page|source||opacity|switch|method||index|Elements||inject|end|merge|mode|join|contain
er|parsed|transition|delay|getStyle|current|set|overflown|pr!
evious|h
sb|step|relatedTarget|Events|round|temp|script|Array|transport|test|custom|unit|width|string|chk|togglers|addListener|map|color|Garbage|scroll|Methods|object|nocash|remove|url|mousemove|height|fx|ie|Color|border|ghost|Base|params|parse|hue|Event|setOptions|documentElement||match||getElementsByTagName|margin|100|filter||||create|context|wrapper|toInt|bindWithEvent|overed|replace|removeListener|implement|toggler|indexOf|size|mouse|parentNode|Transitions|getPosition|tag|item|min|CSS|iCss|target|pow|next|scripts|option|time|shared|hex|drag|modifiers|change|scrollTo|Cookie|Json|handle|anchor|response|Abstract|returns|Hash|bottom|display|offsetHeight|len|wait|effects|trash|tip|onStart|absolute|hide||iterable|myTitle|Options|getValue|toolTip||iTo|select|duration|xpath|offsetWidth|Styles|show|load|periodical|Drag|knob|check|apply|increase|toString|val|right|compute|delta|setNow|cont|src|argument|id|chains|padding|webkit|link|visibility|setStyles|body|removeEvent|getTag|getCoordinates
|every|active|str|status|headers|cookie|handles|number|href|hidden|grid|running|class|image|pick|checker|fixed|px|open|results|div||255|collect|title|mix|clear|getNow|delete|sources|post|mousewheel|fromTo|catch|bit|native|queryString|secure|onSuccess|htmlElement|try|location|setHeader|readyState|mousedown|move|list|get|evaluate|setHTML|xml|myText|instance|links|webkit419|moveGhost|mouseup|toQueryString|HTMLElement|regexp|isSuccess|rgbToHex|offsets|hexToRgb|_method|colors|encoding|setLength|toLowerCase|unique|onload|parseInt|scrollHeight|iFrom|getProperty|include|trim|iNow|scrollLeft|red|domReady|precision|klass||walk|default|scrollTop|layout|green|parseFloat|on|split|out|send|area|droppables|mp|head|attempt|evType|click|String|addEvents|date|continue|fix|XHR|setProperties|currentStyle|counter|included|images|hasKey|brother|injectAfter|onFailure|generic|saturation|dual|Properties|loaded|XMLHttpRequest|instances|steps|onChange|checkStep|mod|alwaysHide|Listeners|substr|draggedK
nob|snap|getElements|code|up|fKey|evalScripts|tagName|prev|s!
topPropa
gation|attach|getElementById|preventDefault|getElementsBySelector|while|relative|scrollWidth|setMany|Multi|splice|blue|realType|defined|removeEvents|regex|percent|forEach|typeof|alpha|encodeURIComponent|fixedHeight|getSize|scrollSize|onreadystatechange|none|path|setProperty|proto|fixedWidth|domain|evalResponse|setTransport|clean|hasClass|Accordion|Chain|unload|onCancel|update|RegExp|callChain|toUpperCase|transitions|qs|disabled|checked|add|pairs|getMany|ie_ready|multiple|onActive|getParam|found|xhtml|getItems|concat|selected|Dom|domready|Style|Transition|flag|PI|compat|injectBefore|Function|getLast|node|operator|innerText|nodeType|iProps|appendChild|cssText|firstChild|easeType|camelCase|DOMMouseScroll|random|charAt|copy|locate|newArray|rgbToHsb|merged|addEventListener|brightness|rr|getWidth|getHeight|hasChild|complete|javascript|gecko|abort|callee|getScrollLeft|getScrollTop|pageY|img|mousemover|coord|toElement|Slider|toStep|previousEnd|pageX|coordinates|visible|getChildren|ge
tNext|styles|previousChange|onTick|horizontal|mouseenter|velocity|mouseleave|vertical|capitalize|onDrag|maxTitleChars|lim|NativeEvents|gr|Object|mouseout|first|mouseover|insertBefore|getScrollHeight|getScrollWidth|after|cancel|Date|borderShort|fps|pageXOffset|opera|Ajax|clientWidth|clientHeight|onDragComplete|clientX|onRequest|request|pageYOffset|Single|before|Merge|pp|fullHeight|ActiveXObject|wheelDelta|floor|wheelStops|onStateChange|beforeunload|iParsed|direction|getTime|Scroller|overflow|addClass|getCoords|client|constructor|clickedElement|removeClass|detach|clone|onDragStart|build|application|which|useLink|setTimeout|undefined|execScript|getElement|converter|Content|Sortables|normal|sel|contents|getPrevious|keydown|http|prefix|toPosition|rel|filterById|PropertiesIFlag|removeEventListener|half|Left|removeAttribute|filterByClass|filterByAttribute|onBackground|input|resolver|textarea|getFormElements|getHeader|ie6|Scroll|getPos|fullWidth|zoom|onBeforeStart|win|onProgress|dis
tance||timeout|Asset|onSnap|clientY|cloneEvents|cos|autoSave!
|nodeVal
ue|where|Bottom|idx|elementsProperty|childNodes|relatedTargetGecko|error|defaultView|urlEncoded|toFloat|Tips|createElement|shift|hyphenate|Move|Number|checkAgainst|getLeft|getTop|addSection|www|onShow|fixRelatedTarget|interval|onHide|save|picked|autoCancel|span|textContent|adopt|innerHTML|styleSheet|escapeRegExp|fixStyle|6000|fullOpacity|hsbToRgb|slideIn|slideOut|360|1000|async|Width|getStyles|slice|Top|sin|setOpacity|removeChild|600000|appendText|0px|showDelay|extended||Right|hideDelay|full|button|menu|shiftKey|metaKey|altKey|fromCharCode|frameborder|ctrlKey|attachEvent|detail|srcElement|control|CollectGarbage|readonly|frameBorder|alt|keyCode|111|readOnly|meta|detachEvent|120|rightClick|wheel|pass|some|associate|getRandom|clearChain|chain|DOMElement|execCommand|BackgroundImageCache|transparent|setInterval|embed|boolean|injectInside|times|bindAsEventListener|err|fromElement|iframe|khtml|whitespace|collection|clearTimeout|textnode|nodeName|MooTools|version|clearInterval|Window
|taintEnabled|webkit420|getBoxObjectFor|navigator|all|Document|ie7|injectTop|cloneNode|borderStyle|borderColor|htmlFor|borderWidth|getText|getProperties|setAttribute|setText|colspan|colSpan|tabindex|tabIndex|maxlength|accessKey|accesskey|rowspan|rowSpan|removeProperty|attributes|float|styleFloat|cssFloat|toggleClass|createTextNode|replaceWith|replaceChild|zIndex|hasLayout|lastChild|getParent|getAttribute|getFirst|Sibling|getComputedStyle|getPropertyValue|maxLength|overrideMimeType|200|300|responseText|urlencoded|form|cancelBubble|XMLHTTP|charset|responseXML|Connection|Accept|html|ecma|With|Requested|close|setRequestHeader|postBody||utf|makeDraggable|Bounce|Elastic|Quad|618|Back|Circ|acos|Sine|Cubic|Quart|over|drop|emptydrop|leave|makeResizable|Quint|sqrt|java|gi|setHue|setSaturation|setBrightness|invert|pop|onerror|Image|4096|RGB|HSB|hellip|Group|showThisHideOpen|tool|serialize|10000|SmoothScroll|hash|onabort|screen|toGMTString|decodeURIComponent|isFinite|expires|setTime|exe
c|getResponseHeader|action|Eaeflnr|eval|readystatechange|sty!
lesheet|
media|json|JSON|Remote|Request||Expo|Microsoft|substring|XPathResult|UNORDERED_NODE_SNAPSHOT_TYPE|with|starts|ES|namespaceURI|snapshotLength|snapshotItem|checkbox|radio|getElementsByClassName|1999|w3|org|Pow|contextmenu|space|backspace|tab|esc|down|returnValue|enter|dblclick|keypress|submit|reset|blur|focus|keyup|resize|password|filterByTag|toLeft|toRight|Slide|toBottom|toTop|clearTimer|effect|toggle|easeIn|InOut|ease|Out|In|easeOut|easeInOut|500|linear|defer|DOMContentLoaded|protocol|write|offsetTop|https|offsetParent|void|innerWidth|onDomReady||innerHeight|offsetLeft'.split('|'),0,{}))
diff --git a/www/admin/images/sliding-tabs.js b/www/admin/images/sliding-tabs.js
new file mode 100644
index 0000000..682c868
--- /dev/null
+++ b/www/admin/images/sliding-tabs.js
@@ -0,0 +1,140 @@
+// The Sliding Tabs mootools plugin is a creation of Jenna “Blueberry†Fox!
+// This isn't free software, so don't forget to give me a gift of some sort!
+// some idea's include poetry, drawings, songs, doodads, whosits, fuzzy things,
+// software licenses, and general free stuff. Contact me at http://creativepony.com/#contact
+// and let me know where you're using Sliding Tabs!
+// Documentation: http://creativepony.com/journal/scripts/sliding-tabs/
+// version: 1.8
+
+var SlidingTabs = new Class({
+ options: {
+ startingSlide: false, // sets the slide to start on, either an element or an id
+ activeButtonClass: 'active', // class to add to selected button
+ activationEvent: 'click', // you can set this to ‘mouseover’ or whatever you like
+ wrap: true, // calls to previous() and next() should wrap around?
+ slideEffect: { // options for effect used to animate the sliding, see Fx.Base in mootools docs
+ duration: 400 // 0.4 of a second
+ },
+ animateHeight: true, // animate height of container
+ rightOversized: 0 // how much of the next pane to show to the right of the current pane
+ },
+ current: null, // zero based current pane number, read only
+ buttons: false,
+ outerSlidesBox: null,
+ innerSlidesBox: null,
+ panes: null,
+ fx: null, // this one animates the scrolling inside
+ heightFx: null, // this one animates the height
+
+
+ initialize: function(buttonContainer, slideContainer, options) {
+ if (buttonContainer) { this.buttons = $(buttonContainer).getChildren(); }
+ this.outerSlidesBox = $(slideContainer);
+ this.innerSlidesBox = this.outerSlidesBox.getFirst();
+ this.panes = this.innerSlidesBox.getChildren();
+
+ this.setOptions(options);
+
+ this.fx = new Fx.Scroll(this.outerSlidesBox, this.options.slideEffect);
+ this.heightFx = this.outerSlidesBox.effect('height', this.options.slideEffect);
+
+ // set up button highlight
+ this.current = this.options.startingSlide ? this.panes.indexOf($(this.options.startingSlide)) : 0;
+ if (this.buttons) { this.buttons[this.current].addClass(this.options.activeButtonClass); }
+
+ // add needed stylings
+ this.outerSlidesBox.setStyle('overflow', 'hidden');
+ this.panes.each(function(pane, index) {
+ pane.setStyles({
+ 'float': 'left',
+ 'overflow': 'hidden'
+ });
+ }.bind(this));
+
+ // stupidness to make IE work - it boggles the mind why this has any effect
+ // maybe it's something to do with giving it layout?
+ this.innerSlidesBox.setStyle('float', 'left');
+
+ if (this.options.startingSlide) this.fx.toElement(this.options.startingSlide);
+
+ // add events to the buttons
+ if (this.buttons) this.buttons.each( function(button) {
+ button.addEvent(this.options.activationEvent, this.buttonEventHandler.bindWithEvent(this, button));
+ }.bind(this));
+
+ if (this.options.animateHeight)
+ this.heightFx.set(this.panes[this.current].offsetHeight);
+
+
+ // set up all the right widths inside the panes
+ this.recalcWidths();
+ },
+
+ // to change to a specific tab, call this, argument is the pane element you want to switch to.
+ changeTo: function(element, animate) {
+ if ($type(element) == 'number') element = this.panes[element - 1];
+ if (!$defined(animate)) animate = true;
+ var event = { cancel: false, target: $(element), animateChange: animate };
+ this.fireEvent('change', event);
+ if (event.cancel == true) { return; };
+
+ if (this.buttons) { this.buttons[this.current].removeClass(this.options.activeButtonClass); };
+ this.current = this.panes.indexOf($(event.target));
+ if (this.buttons) { this.buttons[this.current].addClass(this.options.activeButtonClass); };
+
+ this.fx.stop();
+ if (event.animateChange) {
+ this.fx.toElement(event.target);
+ } else {
+ this.outerSlidesBox.scrollTo(this.current * this.outerSlidesBox.offsetWidth.toInt(), 0);
+ }
+
+ if (this.options.animateHeight)
+ this.heightFx.start(this.panes[this.current].offsetHeight);
+ },
+
+ // Handles a click
+ buttonEventHandler: function(event, button) {
+ if (event.target == this.buttons[this.current]) return;
+ this.changeTo(this.panes[this.buttons.indexOf($(button))]);
+ },
+
+ // call this to go to the next tab
+ next: function() {
+ var next = this.current + 1;
+ if (next == this.panes.length) {
+ if (this.options.wrap == true) { next = 0 } else { return }
+ }
+
+ this.changeTo(this.panes[next]);
+ },
+
+ // to go to the previous tab
+ previous: function() {
+ var prev = this.current - 1
+ if (prev < 0) {
+ if (this.options.wrap == true) { prev = this.panes.length - 1 } else { return }
+ }
+
+ this.changeTo(this.panes[prev]);
+ },
+
+ // call this if the width of the sliding tabs container changes to get everything in line again
+ recalcWidths: function() {
+ this.panes.each(function(pane, index) {
+ pane.setStyle('width', this.outerSlidesBox.offsetWidth.toInt() - this.options.rightOversized + 'px');
+ }.bind(this));
+
+ this.innerSlidesBox.setStyle(
+ 'width', (this.outerSlidesBox.offsetWidth.toInt() * this.panes.length) + 'px'
+ );
+
+ // fix positioning
+ if (this.current > 0) {
+ this.fx.stop();
+ this.outerSlidesBox.scrollTo(this.current * this.outerSlidesBox.offsetWidth.toInt(), 0);
+ }
+ }
+});
+
+SlidingTabs.implement(new Options, new Events);
diff --git a/www/admin/pics/CONTACT.png b/www/admin/pics/CONTACT.png
new file mode 100644
index 0000000..916f6ab
Binary files /dev/null and b/www/admin/pics/CONTACT.png differ
diff --git a/www/admin/pics/EVENT.png b/www/admin/pics/EVENT.png
new file mode 100644
index 0000000..2e02fc9
Binary files /dev/null and b/www/admin/pics/EVENT.png differ
diff --git a/www/admin/pics/MAIL.png b/www/admin/pics/MAIL.png
new file mode 100644
index 0000000..bc77592
Binary files /dev/null and b/www/admin/pics/MAIL.png differ
diff --git a/www/admin/pics/NOTES.png b/www/admin/pics/NOTES.png
new file mode 100644
index 0000000..7dca846
Binary files /dev/null and b/www/admin/pics/NOTES.png differ
diff --git a/www/admin/pics/TASKS.png b/www/admin/pics/TASKS.png
new file mode 100644
index 0000000..d3d600d
Binary files /dev/null and b/www/admin/pics/TASKS.png differ
diff --git a/www/admin/pics/alarm.png b/www/admin/pics/alarm.png
new file mode 100644
index 0000000..0703e7a
Binary files /dev/null and b/www/admin/pics/alarm.png differ
diff --git a/www/admin/pics/f.png b/www/admin/pics/f.png
new file mode 100644
index 0000000..7572bac
Binary files /dev/null and b/www/admin/pics/f.png differ
diff --git a/www/admin/pics/sync.png b/www/admin/pics/sync.png
new file mode 100644
index 0000000..389f036
Binary files /dev/null and b/www/admin/pics/sync.png differ
diff --git a/www/admin/user/activesync.php b/www/admin/user/activesync.php
new file mode 100644
index 0000000..081a15a
--- /dev/null
+++ b/www/admin/user/activesync.php
@@ -0,0 +1,517 @@
+<?php
+/*
+ * Copyright (c) 2004 Klarälvdalens Datakonsult AB
+ *
+ * Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+ *
+ * (c) 2011 Bogomil Shopov <shopov at kolabsys.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You can view the GNU General Public License, online, at the GNU
+ * Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
+ */
+
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
+require_once('KolabAdmin/include/form.class.php');
+require_once('KolabAdmin/include/passwd.php');
+
+
+
+
+///kolab/etc/kolab/templates/zpush-config.php.template which is then copied to /kolab/var/kolab/www/z-push/zpush.config
+
+if((@include_once 'Horde/Kolab/Kolab_Zpush/lib/kolabActivesyncData.php') === false ) {
+ //z-Push in not installed. Why don't you show some scarry warining?
+ $errors[] =_('zPush in not enabled in your system.');
+}
+ at include_once '/kolab/var/kolab/www/z-push/config.php';
+ at include_once '/etc/z-push/config.php';
+ at include_once '/usr/share/z-push/config.php';
+ at include_once '/var/www/z-push/config.php';
+
+/*read from here value of the KOLAB_LAXPIC
+ -1 = allow the user to select (or if the constant doesn't exist)
+ 0 = same as the annotations (no lax mode just jpeg)
+ 1 = force the lax mode for all
+*/
+
+if(!defined('KOLAB_LAXPIC')){define('KOLAB_LAXPIC',-1);}
+
+//define errors array
+$errors = array();
+
+//delete device
+if(isset($_POST['deid']))
+{
+ $save = new ActiveSyncManager();
+ $save->deleteDevice($_POST['deid']);
+}
+
+if (isset($_POST['actived']))
+{
+
+ $save = new ActiveSyncManager();
+ $save->storeDevicenFolders($_POST);
+}
+
+
+
+ class ActiveSyncManager
+{
+
+ var $inbox;
+ var $connectstring;
+ var $orig_devs;
+ var $base_folders;
+
+function __construct()
+{
+ //not sure about that
+ list($prefix, $domain) = split("@",$_SESSION['auth_user']);
+ $this->connectstring= $_server = "{localhost:143/imap/notls/norsh}";
+ $tmbox = imap_open($_server , $_SESSION['auth_user'], $_SESSION['auth_pw'], OP_HALFOPEN);
+ if ($tmbox) {
+ $this->inbox=$tmbox;
+ }
+ else {
+ return false;
+ }
+}
+
+
+
+
+//get devices from annotation
+
+ function getDevices()
+ {
+
+ $result = imap_getannotation($this->inbox, "INBOX", "/vendor/kolab/activesync", "value.priv");
+
+ $gp=new GlobalParam();
+ if (isset($result["value.priv"]))
+ {
+ $gp->unserialize($result["value.priv"]);
+
+
+ }
+ $i=0;
+ foreach( $gp->deviceList() as $device)
+ {
+ //$devs[$device]=array("S"=>$gp->getDeviceMode($device),"Type"=>$gp->getDeviceType($device));
+
+
+
+ $odevs[$device]['MODE']= $gp->getDeviceMode($device);
+ $odevs[$device]['TYPE'] = $gp->getDeviceType($device);
+ $odevs[$device]['ALIAS']= $gp->getDeviceAlias($device);
+ $odevs[$device]['LAXPIC'] = $gp->getDeviceLaxPic($device);
+
+ //we need original devices in order to save the annotation later
+ $this->orig_devs = $odevs;
+
+ //variable for pasring via Smarty
+ $devs[$i]['name'] = $device;
+ $devs[$i]['id'] = $i;
+ $devs[$i]['mode']= $gp->getDeviceMode($device);
+ $devs[$i]['type'] = $gp->getDeviceType($device);
+ $devs[$i]['alias']= $gp->getDeviceAlias($device);
+ $devs[$i]['laxpic'] = $gp->getDeviceLaxPic($device);
+ $i++;
+
+ }
+
+ return $devs;
+
+ }
+
+
+ function deleteDevice($serial)
+ {
+ $result = imap_getannotation($this->inbox, "INBOX", "/vendor/kolab/activesync", "value.priv");
+
+ $gp=new GlobalParam();
+ if (isset($result["value.priv"]))
+ {
+ $gp->unserialize($result["value.priv"]);
+
+ }
+ foreach( $gp->deviceList() as $device)
+ {
+ $odevs[$device]['MODE']= $gp->getDeviceMode($device);
+ $odevs[$device]['TYPE'] = $gp->getDeviceType($device);
+ $odevs[$device]['ALIAS']= $gp->getDeviceAlias($device);
+ $odevs[$device]['LAXPIC'] = $gp->getDeviceLaxPic($device);
+ }
+
+ unset($odevs[$serial]);
+
+
+ //delete device
+ $to_store=array('DEVICE'=>$odevs);
+ $value_to_store= base64_encode(json_encode($to_store));
+
+ //resource stream_id, string mailbox, string entry, string attr, string value
+ imap_setannotation($this->inbox, "INBOX", "/vendor/kolab/activesync","value.priv",$value_to_store);
+
+
+ }
+
+
+
+
+ function getFolderAnn($folder)
+ {
+
+ $result = imap_getannotation($this->inbox, $folder, "/vendor/kolab/activesync", "value.priv");
+
+
+ if (isset($result["value.priv"]))
+ {
+ $res= json_decode(base64_decode($result["value.priv"]),true);
+ }
+
+ return $res['FOLDER'];
+
+ }
+
+ function getFolders()
+ {
+
+ $list = imap_getmailboxes($this->inbox, $this->connectstring, "*");
+
+ if (is_array($list)) {
+
+ $i=0;
+ //print_r($list);
+ foreach ($list as $key => $val) {
+
+ //we need realname in order to check for annotations
+
+ $last= strrpos($val->name,'}');
+
+ //foldername
+
+ $folder=substr($val->name,($last+1),strlen($val->name));
+
+ //put in array folders
+ $folders[$i]['realname']=$folder;
+
+ //fic the encoding
+ $folder = mb_convert_encoding($folder,"UTF8", "UTF7-IMAP");
+
+ //remove Inbox/ part from the name
+ $folder_chunk=explode("/",$folder);
+
+ //if if only inbox/ show it
+ if($folder_chunk[1]!=""){
+ //else is inbox/somepart - show only somepart
+ $folder=$folder_chunk[1];
+
+ }if($folder_chunk[2]!="")
+ {
+ //user folder
+ $folder="(".$folder_chunk[1].") ".$folder_chunk[2];
+ }
+ //for saving annot
+ $part_folder[]=$folders[$i]['realname'];
+
+
+ //for smarty
+ $folders[$i]['name']=$folder;
+ $folders[$i]['type']=$this->getFolderType($folders[$i]['realname']);
+
+ $this->base_folders=$part_folder;
+ $i++;
+
+
+ }
+ } else {
+ echo "imap_getmailboxes failed: " . imap_last_error() . "\n";
+ }
+
+ //start sorting
+ //define array
+ $types = array("MAIL","CONTACT","EVENT","TASKS");
+
+
+
+
+ foreach ($types as $key => $row) {
+ for($im=0;$im<count($folders);$im++) {
+ if ($folders[$im]['type']==$row)
+ $foldern[$row][$im] = $folders[$im];
+
+ }
+ }
+ //array_multisort($type, SORT_DESC, $folders);
+
+ return $foldern;
+ //return $folders;
+ }
+
+function getFolderType($folder)
+ {
+
+
+ $result = imap_getannotation($this->inbox, $folder, "/vendor/kolab/folder-type", "value.shared");
+
+ if (isset($result["value.shared"]))
+ {
+
+ if(preg_match("/(event)/",$result["value.shared"]))
+ {
+ return "EVENT";
+
+ }else if(preg_match("/(task)/",$result["value.shared"]))
+ {
+
+ return "TASKS";
+ }else if(preg_match("/(contact)/",$result["value.shared"]))
+ {
+
+ return "CONTACT";
+ }
+ else if(preg_match("/(note)/",$result["value.shared"]))
+ {
+
+ return "NOTES";
+ }
+ }else{
+
+ return "MAIL";
+ }
+
+ }
+
+
+
+ function storeDevicenFolders($device){
+
+
+ //get current annotation devices
+ $devices= $this->getDevices();
+
+ //assign the array to an variable
+ $old_devices= $this->orig_devs;
+
+ //change the data on this device, based on $POST_data
+ $old_devices[$device['serial']]['MODE']=$device['mode'];
+ $old_devices[$device['serial']]['ALIAS']=$device['alias'];
+ $old_devices[$device['serial']]['LAXPIC']=$device['laxpic'];
+ $old_devices[$device['serial']]['TYPE']=$device['type'];
+ $to_store=array('DEVICE'=>$old_devices);
+ $value_to_store= base64_encode(json_encode($to_store));
+
+ //resource stream_id, string mailbox, string entry, string attr, string value
+ imap_setannotation($this->inbox, "INBOX", "/vendor/kolab/activesync","value.priv","");
+ if($old_devices[$device['serial']]['TYPE']=$device['type'])
+ {
+ imap_setannotation($this->inbox, "INBOX", "/vendor/kolab/activesync","value.priv",$value_to_store);
+ }
+
+ //Folders
+ //1. Get All folders
+ $this->GetFolders();
+
+ //set all folders -> array
+ $allfolders= $this->base_folders;
+
+ foreach($allfolders as $index=>$folder)
+ {
+
+ $smfolder=preg_replace(array('/( )/','/\./'),array('@','*'),$folder);
+
+
+
+ //is folder is default and ! in POST array = set s=0;
+ if($this->is_default($folder) and !isset($device[$smfolder]))
+ {
+ $this->SetUnset($folder,$device);
+
+
+ }else if($this->is_default($folder) and isset($device[$smfolder]))
+ {
+ $this->SetSet($folder,$device);
+
+ }else if(isset($device[$smfolder]))
+ {
+
+ // is not defaul - just we have it in post with value == put in annot this value
+ $this->SetSet($folder,$device);
+
+
+ }else
+ {
+ //is not default folder - we don't have it == unset this value in annot
+ $this->SetUnset($folder,$device);
+
+ }
+
+ }
+
+
+ }
+
+ //if the folder is yes for sync by default -return true;
+
+
+ function SetUnset($folder,$device)
+ {
+
+
+ $result = imap_getannotation($this->inbox, $folder, "/vendor/kolab/activesync", "value.priv");
+
+
+ if (isset($result["value.priv"]))
+ {
+ $res= json_decode(base64_decode($result["value.priv"]),true);
+ }
+
+ $res['FOLDER'][$device['serial']]['S']=0;
+
+ imap_setannotation($this->inbox, $folder, "/vendor/kolab/activesync","value.priv",base64_encode(json_encode($res)));
+
+
+
+
+ }
+
+ function SetSet($folder,$device)
+ {
+ $result = imap_getannotation($this->inbox, $folder, "/vendor/kolab/activesync", "value.priv");
+ //echo "$folder<br/>";
+
+ if (isset($result["value.priv"]))
+ {
+ $res= json_decode(base64_decode($result["value.priv"]),true);
+ }
+ // echo $folder."<pre>";
+ // print_r($res);
+ // echo "</pre><hr>";
+ $smfolder=preg_replace(array('/( )/','/\./'),array('@','*'),$folder);
+
+ $res['FOLDER'][$device['serial']]['S']=$device[$smfolder];
+ imap_setannotation($this->inbox, $folder, "/vendor/kolab/activesync","value.priv",base64_encode(json_encode($res)));
+ // echo $folder."<pre>";
+ // print_r($res);
+ // echo "</pre><hr>";
+
+ }
+
+function is_default($folder)
+ {
+
+ if(preg_match("/(^INBOX)/", $folder))
+ {
+
+ return true;
+ }else
+ {
+ return false;
+ }
+ }
+
+
+ function __destruct()
+ {
+ imap_close($this->inbox);
+ $this->inbox = "";
+
+
+ }
+}
+
+
+
+/**** Authentication etc. ***/
+$sidx = 'user';
+require_once('KolabAdmin/include/menu.php');
+
+/**** Submenu for current page ***/
+$menuitems[$sidx]['selected'] = 'selected';
+
+
+
+//ActiveSync part
+$d= new ActiveSyncManager;
+
+$devs= $d->getdevices();
+$folds=$d->getfolders();
+$ola=true;
+if(count($devs)<1)
+{
+ $errors[] =_("There are currently no devices known for your user.<br/><br/>In order to register a device, please connect it to the server first, using <a href='http://wiki.kolab.org/Z_push#Clients'>the instructions in the Wiki</a>. Afterwards the device should become available for configuration in this dialogue.");
+ $ola = false;
+}
+
+/**** Insert into template and output ***/
+$smarty = new MySmarty();
+//add the plugin
+$smarty->plugins_dir[] = 'KolabAdmin/include/';
+$smarty->assign( 'errors', $errors );
+$smarty->assign( 'messages', $messages );
+$smarty->assign( 'uid', $auth->uid() );
+$smarty->assign( 'group', $auth->group() );
+$smarty->assign( 'page_title', $menuitems[$sidx]['title'] );
+$smarty->assign( 'menuitems', $menuitems );
+$smarty->assign( 'submenuitems',
+ array_key_exists('submenu',
+ $menuitems[$sidx])?$menuitems[$sidx]['submenu']:array() );
+$smarty->assign( 'active', $active );
+
+
+//print_r($d->getdevices());
+if ($ola !=false)
+{
+ //select list of modes
+
+$publicnames = array("MAIL"=>_("E-mail"),"CONTACT"=>_("Address Books"),"EVENT"=>_("Calendars"),"TASKS"=>_("Tasks"),"NOTES"=>_("Notes"));
+
+
+$smarty->assign('modetypes', array(
+ -1 => _('Automatic'),
+ 0 => _('Flat Mode'),
+ 1 => _('Folder Mode')
+ ));
+
+$smarty->assign('picsettings', array(
+ 0 => _('No'),
+ 1 => _('Yes')
+ ));
+
+
+ $smarty->assign( 'devices',$devs);
+ $smarty->assign( 'pnames',$publicnames);
+ $smarty->assign( 'folders',$folds);
+ if ($_POST['actived']){$ac=$_POST['actived'];}else{$ac=0;}
+ $smarty->assign( 'actived',$ac );
+ $smarty->assign( 'laxpicdef',KOLAB_LAXPIC);
+ $smarty->assign( 'maincontent', 'activesync.tpl' );
+}
+
+
+$smarty->display('page-ajax.tpl');
+
+/*
+ Local variables:
+ mode: php
+ indent-tabs-mode: t
+ tab-width: 4
+ buffer-file-coding-system: utf-8
+ End:
+ vim:encoding=utf-8:
+ */
+?>
diff --git a/www/favicon.ico b/www/favicon.ico
old mode 100644
new mode 100755
index 0f8fa08..2c200be
Binary files a/www/favicon.ico and b/www/favicon.ico differ
diff --git a/www/favicon.png b/www/favicon.png
old mode 100644
new mode 100755
index 7d911c4..d8e35a9
Binary files a/www/favicon.png and b/www/favicon.png differ
commit 92bc5f226575313229376330af96d97909d4cefa
Author: Bogomil Shopov <shopov at kolabsys.com>
Date: Fri Apr 15 16:58:18 2011 +0300
Fixing problem with multi-language: https://bugzilla.kolabsys.com/show_bug.cgi?id=69
diff --git a/lib/KolabAdmin/include/locale.php b/lib/KolabAdmin/include/locale.php
old mode 100644
new mode 100755
index 4172a42..2fd6202
--- a/lib/KolabAdmin/include/locale.php
+++ b/lib/KolabAdmin/include/locale.php
@@ -22,8 +22,6 @@
// PENDING(romain,steffen): Clean up so this is not a mix of code and global functions
-session_start();
-
function supported_lang($lang) {
// REMEMBER TO UPDATE THIS WHEN ADDING NEW LANGUAGES
@@ -99,6 +97,9 @@ function setLanguage($lang)
if(!empty($_REQUEST["lang"])) {
setLanguage($_REQUEST["lang"]);
}
+//reset the Locale BEFORE adding a new one:
+setlocale(LC_ALL,null);
+
// I18N support information
$language = getLanguage();
commit ecea9420c67e25536629d2067bde009b659eacc2
Author: Bogomil Shopov <shopov at kolabsys.com>
Date: Wed Apr 13 12:34:03 2011 +0300
New webadmin skin
diff --git a/data/templates/login.tpl b/data/templates/login.tpl
index 3c36775..6c56dcf 100755
--- a/data/templates/login.tpl
+++ b/data/templates/login.tpl
@@ -5,18 +5,22 @@
End:
*}
<h1>{tr msg="Enter UID and password to login"}</h1>
-<div class="contentform">
+
+
+<div class="contentform_login" style="width:40%;text-align:center;">
<form method="post">
<table>
<tr>
- <td><label for="username">{tr msg="Username:"}</label></td><td><input type="text" name="username" id="username"/></td>
+ <td><label for="username">{tr msg="Username:"}</label></td><td><input type="text" name="username" id="username" style="background:#f0f0f0;margin:5px;padding:4px;"/></td>
</tr>
+
<tr>
- <td><label for="password">{tr msg="Password:"}</label></td><td><input type="password" name="password" id="password"/></td>
+ <td colspan="2" align="right" width="1px"></td>
</tr>
-<tr>
- <td colspan="2" align="right"><input type="submit" name="login" value="{tr msg="Login"}"/></td>
+<tr style="background:#fefefe">
+ <td><label for="password">{tr msg="Password:"}</label></td><td><input type="password" name="password" id="password" style="background:#f0f0f0;margin:5px;padding:4px;"/> <input type="submit" name="login" value="{tr msg="Login"}"/></td>
</tr>
+
</table>
</form>
</div>
diff --git a/data/templates/page.tpl b/data/templates/page.tpl
index 4b71979..e6d178d 100755
--- a/data/templates/page.tpl
+++ b/data/templates/page.tpl
@@ -4,19 +4,17 @@
buffer-file-coding-system: utf-8
End:
*}
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<!DOCTYPE HTML>
+<html lang="en-US">
<head>
-<title>{$page_title}</title>
+<meta charset="UTF-8">
+<title>Kolab: {$page_title}</title>
<link rel="shortcut icon" type="image/png" href="{$webserver_web_prefix}/favicon.png" />
<meta name="robots" content="noindex" />
-<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-<meta http-equiv="Content-Language" content="{$currentlang}" />
<meta name="description" content="Kolab Administration Webinterface" />
<meta name="keywords" content="Linux, Unix, Groupware, Email, Calendar" />
-<link rel="stylesheet" type="text/css" href="{$stylesheet|default:"$topdir/style.css"}" />
-<link rel="stylesheet" type="text/css" media="print" href="{"$topdir/print.css"}" />
+<link rel="stylesheet" type="text/css" href="{$stylesheet|default:"$topdir/screen.css"}" />
+<link rel="stylesheet" type="text/css" href="{"$topdir/custom.css"}" />
<script type="text/javascript">
<!--
@@ -29,18 +27,15 @@ function changeLanguage(combobox) {ldelim}
</head>
<body>
-<div id="topbar">
- <a href="{$kolab_wui}"><span id="toplogo"></span></a>
- <div id="toptitle">{$page_title}</div>
-</div>
-<div id="topuserinfo">
+<div id="header" class="container">
+<div class="span-24">
+<h3><a href="{$kolab_wui}"><img src="/admin/images/klogo.png" style="vertical-align:middle;" alt="logo"></a></h3>
+<div id="menu-top">
{if $uid}
-{tr msg="User:"} {$uid} | {tr msg="Role:"} {$group} | <a id="logout" href="{$topdir}/logout.php">{tr msg="Logout"}</a>
-{else}
-{tr msg="Not logged in"}
+<img src="/admin/images/user-icon-1-20x20.gif" width="16" style="vertical-align:middle;" title="Username" alt="username icon"> {$uid} <img src="/admin/images/eye_pencil.png" width="16" style="vertical-align:middle;margin-left:8px;" title="Role" alt="Role icon"> {$group}
{/if}
-<br/>
-<select name="lang" class="langcombo" onchange="changeLanguage(this);">
+
+<img src="/admin/images/ul-icon.png" width="16" style="vertical-align:middle;margin-left:8px;" title="Change Language" alt="Language icon"> <select name="lang" style="height:17px;vertical-align:middle" onchange="changeLanguage(this);">
{section name=id loop=$languages}
{if $languages[id].code==$currentlang}
<option value="{$languages[id].code}" selected="selected">{$languages[id].name}</option>
@@ -49,28 +44,43 @@ function changeLanguage(combobox) {ldelim}
{/if}
{/section}
</select>
+{if $uid}
+<a id="logout" href="{$topdir}/logout.php"><img src="/admin/images/icon_grey_logout.png" width="16" style="vertical-align:middle;margin-left:90px;" title="Logout" alt="Logout icon"></a>
+{/if}
</div>
-{strip}
-<div id="topmenu">
-{foreach from=$menuitems item=menuitem}
-<a href="{$menuitem.url}">
- <span class="topmenuitem{$menuitem.selected}"> {$menuitem.name} </span>
-</a>
+ </div><!-- .span-24 -->
+ </div><!-- #header -->
+ <div id="root">
+ <div class="container">
+ <div>
+ <ul id="navlist">
+
+ {foreach from=$menuitems item=menuitem}
+ <li>
+ <a class="{$menuitem.selected}" href="{$menuitem.url}">{$menuitem.name}</a>
+ </li>
{/foreach}
-</div>
-{/strip}
-{if count($submenuitems) > 0}
+
+ </ul>
+ </div><!-- .span-24 -->
+
+
+ <div id="content">
+
<div id="submenu">
+{if count($submenuitems) > 0}
+{$page_title}:
{strip}
{section name=id loop=$submenuitems}
<a href="{$submenuitems[id].url}">
- <span class="submenuitem{$submenuitems[id].selected}">{$submenuitems[id].name}</span>
+{$submenuitems[id].name}
</a> |
{/section}
{/strip}
-</div>
{/if}
-<div id="page">
+</div>
+
+<!--start-->
{if $errors}
<div id="errorcontent">
<div id="errorheader">{tr msg="Errors:"}</div>
@@ -87,23 +97,15 @@ function changeLanguage(combobox) {ldelim}
{/section}
</div>
{/if}
-<div id="maincontent">
+
+<!--end-->
+<div id="allhere">
{include file=$maincontent}
</div>
-<!--
-<div id="validators">
-<a href="http://validator.w3.org/check/referer">
-<img style="border:0;width:88px;height:31px"
- src="http://www.w3.org/Icons/valid-xhtml10"
- alt="Valid XHTML 1.0!" />
-</a>
-<a href="http://jigsaw.w3.org/css-validator/check/referer">
-<img style="border:0;width:88px;height:31px"
- src="http://jigsaw.w3.org/css-validator/images/vcss"
- alt="Valid CSS!" />
-</a>
-</div>
--->
-</div>
+ </div>
+ </div><!-- .container -->
+ </div><!-- #root -->
+<div id="footer">
+This is the Community Edition of the <b>Kolab Server</b>. It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>. Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/www/admin/custom.css b/www/admin/custom.css
new file mode 100644
index 0000000..c529cca
--- /dev/null
+++ b/www/admin/custom.css
@@ -0,0 +1,183 @@
+html {background: #e7e7e7;}
+body {background: #ffffff url(/admin/images/body.jpg) repeat-x top left; width:100%;}
+
+.span-24{display: block;float:none;}
+
+#header {
+ margin-top: 5px;
+ height: 80px;
+}
+
+
+ #header .span-24 {padding-left: 22px;}
+
+ #header h3{
+ height: 54px;
+ top: 17px;
+ position:relative;
+ }
+
+
+
+ #header ul li {
+ list-style-type: none;
+ list-style-image: url(/admin/images/listitem.png);
+ }
+
+#root {
+ background: #e7e7e7 url(/admin/images/root.jpg) repeat-x top left;
+ min-height: 150px;
+
+}
+
+ #root .container {background: transparent url(/admin/images/bottom.png) no-repeat bottom left;}
+
+ #root #main {
+ background: transparent url(/admin/images/bottom_all.png) no-repeat bottom left;
+ margin-bottom: 10px;
+ padding-bottom: 5px;
+ }
+ #navlist{
+ width:100%;
+
+ }
+
+#navlist li {
+ float:left;
+ line-height: 55px;
+ margin-left: 15px;
+ margin-right: 2px;
+ list-style: none;
+ margin-top: 1px;
+
+}
+
+
+ #navlist li a {
+ color: #5d5656;
+ text-decoration: none;
+ text-align: center;
+ display: block;
+ font-weight:normal;
+ font-size:14px;
+ }
+
+ #navlist li a.selected {font-weight:bold;color: #c6ced8;}
+
+#content {
+ color: #626262;
+ padding-top: 8em;
+ padding-bottom: 24px;
+ margin-bottom: 20px;
+}
+
+ #content h2, #content h2 a, #content h1 {color: #5c5c5c; font-weight: normal;text-shadow: 0 2px 2px #FFFFFF; }
+ #content p:first-letter { font-size: 1.3em; }
+
+#footer {
+
+ padding: 6px;
+text-align: center;
+}
+
+/* Overriding some global properties */
+a:link, a:visited { font-weight: normal; }
+
+
+ #submenu
+ {
+ margin-top:-42px;
+ margin-left: 47px;
+ float:left;
+
+
+ padding:5px;
+
+
+ }
+
+#submenu a {
+ color: #5d5656;
+ text-decoration: underline;
+ text-align: left;
+ padding:7px;
+
+
+ }
+
+#menu-top{
+
+ float:right;
+ position:absolute;
+ top: 16px;
+ right: 12px;
+
+
+}
+
+
+#errorcontent
+{
+ background:#ffffff;
+ width:90%;
+ display:block;
+ padding: 0.2em;
+ margin: 1em;
+ text-align: left;
+ border: 1px dashed;
+
+}
+
+#errorheader
+{
+background:#cf5659;
+font-size:17px;
+color:#ffffff;
+}
+
+
+#messagecontent
+{
+ background:#ffffff;
+ width:90%;
+ display:block;
+ padding: 0.2em;
+ margin: 1em;
+ text-align: left;
+ border: 1px dashed;
+
+}
+
+#messageheader
+{
+background:#a8cc76;
+font-size:17px;
+color:#ffffff;
+}
+
+#allhere
+{
+background:#ffffff;
+margin:2px;
+padding:9px;
+border-radius: 15px;
+-moz-border-radius:10px;
+-webkit-border-radius:10px;
+}
+
+.align_center {
+ text-align: center;
+}
+
+.contentform {
+ /*float: left;*/
+ padding: .1em .5em .1em .5em;
+ background-color: #c6ced8;
+ border: solid 0.2px black;
+}
+
+.contentrow {
+border: 1px dashed;
+background-color: #c6ced8;
+
+}
diff --git a/www/admin/favicon.ico b/www/admin/favicon.ico
new file mode 100644
index 0000000..2c200be
Binary files /dev/null and b/www/admin/favicon.ico differ
diff --git a/www/admin/favicon.png b/www/admin/favicon.png
new file mode 100644
index 0000000..d8e35a9
Binary files /dev/null and b/www/admin/favicon.png differ
diff --git a/www/admin/images/body.jpg b/www/admin/images/body.jpg
new file mode 100644
index 0000000..1b36d8f
Binary files /dev/null and b/www/admin/images/body.jpg differ
diff --git a/www/admin/images/bottom.png b/www/admin/images/bottom.png
new file mode 100644
index 0000000..4e74138
Binary files /dev/null and b/www/admin/images/bottom.png differ
diff --git a/www/admin/images/eye_pencil.png b/www/admin/images/eye_pencil.png
new file mode 100644
index 0000000..53562db
Binary files /dev/null and b/www/admin/images/eye_pencil.png differ
diff --git a/www/admin/images/footer.png b/www/admin/images/footer.png
new file mode 100644
index 0000000..c59c9c0
Binary files /dev/null and b/www/admin/images/footer.png differ
diff --git a/www/admin/images/icon_grey_logout.png b/www/admin/images/icon_grey_logout.png
new file mode 100644
index 0000000..f70c017
Binary files /dev/null and b/www/admin/images/icon_grey_logout.png differ
diff --git a/www/admin/images/identica.png b/www/admin/images/identica.png
new file mode 100644
index 0000000..0b593dd
Binary files /dev/null and b/www/admin/images/identica.png differ
diff --git a/www/admin/images/irc.png b/www/admin/images/irc.png
new file mode 100644
index 0000000..0353e7d
Binary files /dev/null and b/www/admin/images/irc.png differ
diff --git a/www/admin/images/klogo.png b/www/admin/images/klogo.png
new file mode 100644
index 0000000..dad734b
Binary files /dev/null and b/www/admin/images/klogo.png differ
diff --git a/www/admin/images/kolab.png b/www/admin/images/kolab.png
new file mode 100644
index 0000000..b2d1e72
Binary files /dev/null and b/www/admin/images/kolab.png differ
diff --git a/www/admin/images/line.png b/www/admin/images/line.png
new file mode 100644
index 0000000..7a702a8
Binary files /dev/null and b/www/admin/images/line.png differ
diff --git a/www/admin/images/listitem.png b/www/admin/images/listitem.png
new file mode 100644
index 0000000..766adbb
Binary files /dev/null and b/www/admin/images/listitem.png differ
diff --git a/www/admin/images/logo.png b/www/admin/images/logo.png
new file mode 100644
index 0000000..3d90965
Binary files /dev/null and b/www/admin/images/logo.png differ
diff --git a/www/admin/images/menu.jpg b/www/admin/images/menu.jpg
new file mode 100644
index 0000000..bef56ff
Binary files /dev/null and b/www/admin/images/menu.jpg differ
diff --git a/www/admin/images/root.jpg b/www/admin/images/root.jpg
new file mode 100644
index 0000000..64623ad
Binary files /dev/null and b/www/admin/images/root.jpg differ
diff --git a/www/admin/images/twitter.png b/www/admin/images/twitter.png
new file mode 100644
index 0000000..714857f
Binary files /dev/null and b/www/admin/images/twitter.png differ
diff --git a/www/admin/images/ul-icon.png b/www/admin/images/ul-icon.png
new file mode 100644
index 0000000..9acd221
Binary files /dev/null and b/www/admin/images/ul-icon.png differ
diff --git a/www/admin/images/user-icon-1-20x20.gif b/www/admin/images/user-icon-1-20x20.gif
new file mode 100644
index 0000000..941020a
Binary files /dev/null and b/www/admin/images/user-icon-1-20x20.gif differ
diff --git a/www/admin/screen.css b/www/admin/screen.css
new file mode 100644
index 0000000..5221c67
--- /dev/null
+++ b/www/admin/screen.css
@@ -0,0 +1,265 @@
+/* -----------------------------------------------------------------------
+
+
+ Blueprint CSS Framework 1.0
+ http://blueprintcss.org
+
+ * Copyright (c) 2007-Present. See LICENSE for more info.
+ * See README for instructions on how to use Blueprint.
+ * For credits and origins, see AUTHORS.
+ * This is a compressed file. See the sources in the 'src' directory.
+
+----------------------------------------------------------------------- */
+
+/* reset.css */
+html {margin:0;padding:0;border:0;}
+body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;}
+article, aside, dialog, figure, footer, header, hgroup, nav, section {display:block;}
+body {line-height:1.5;background:white;}
+table {border-collapse:separate;border-spacing:0;}
+caption, th, td {text-align:left;font-weight:normal;float:none !important;}
+table, th, td {vertical-align:middle;}
+blockquote:before, blockquote:after, q:before, q:after {content:'';}
+blockquote, q {quotes:"" "";}
+a img {border:none;}
+:focus {outline:0;}
+
+/* typography.css */
+html {font-size:100.01%;}
+body {font-size:75%;color:#222;background:#fff;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;}
+h1, h2, h3, h4, h5, h6 {font-weight:normal;color:#111;}
+h1 {font-size:3em;line-height:1;margin-bottom:0.5em;}
+h2 {font-size:2em;margin-bottom:0.75em;}
+h3 {font-size:1.5em;line-height:1;margin-bottom:1em;}
+h4 {font-size:1.2em;line-height:1.25;margin-bottom:1.25em;}
+h5 {font-size:1em;font-weight:bold;margin-bottom:1.5em;}
+h6 {font-size:1em;font-weight:bold;}
+h1 img, h2 img, h3 img, h4 img, h5 img, h6 img {margin:0;}
+p {margin:0 0 1.5em;}
+.left {float:left !important;}
+p .left {margin:1.5em 1.5em 1.5em 0;padding:0;}
+.right {float:right !important;}
+p .right {margin:1.5em 0 1.5em 1.5em;padding:0;}
+a:focus, a:hover {color:#09f;}
+a {color:#06c;text-decoration:underline;}
+blockquote {margin:1.5em;color:#666;font-style:italic;}
+strong, dfn {font-weight:bold;}
+em, dfn {font-style:italic;}
+sup, sub {line-height:0;}
+abbr, acronym {border-bottom:1px dotted #666;}
+address {margin:0 0 1.5em;font-style:italic;}
+del {color:#666;}
+pre {margin:1.5em 0;white-space:pre;}
+pre, code, tt {font:1em 'andale mono', 'lucida console', monospace;line-height:1.5;}
+li ul, li ol {margin:0;}
+ul, ol {margin:0 1.5em 1.5em 0;padding-left:1.5em;}
+ul {list-style-type:disc;}
+ol {list-style-type:decimal;}
+dl {margin:0 0 1.5em 0;}
+dl dt {font-weight:bold;}
+dd {margin-left:1.5em;}
+table {margin-bottom:1.4em;width:100%;}
+th {font-weight:bold;}
+thead th {background:#c3d9ff;}
+th, td, caption {padding:4px 10px 4px 5px;}
+tbody tr:nth-child(even) td, tbody tr.even td {background:#e5ecf9;}
+tfoot {font-style:italic;}
+caption {background:#eee;}
+.small {font-size:.8em;margin-bottom:1.875em;line-height:1.875em;}
+.large {font-size:1.2em;line-height:2.5em;margin-bottom:1.25em;}
+.hide {display:none;}
+.quiet {color:#666;}
+.loud {color:#000;}
+.highlight {background:#ff0;}
+.added {background:#060;color:#fff;}
+.removed {background:#900;color:#fff;}
+.first {margin-left:0;padding-left:0;}
+.last {margin-right:0;padding-right:0;}
+.top {margin-top:0;padding-top:0;}
+.bottom {margin-bottom:0;padding-bottom:0;}
+
+/* forms.css */
+label {font-weight:bold;}
+fieldset {padding:0 1.4em 1.4em 1.4em;margin:0 0 1.5em 0;border:1px solid #ccc;}
+legend {font-weight:bold;font-size:1.2em;margin-top:-0.2em;margin-bottom:1em;}
+fieldset, #IE8#HACK {padding-top:1.4em;}
+legend, #IE8#HACK {margin-top:0;margin-bottom:0;}
+input[type=text], input[type=password], input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;}
+input[type=text]:focus, input[type=password]:focus, input.text:focus, input.title:focus, textarea:focus {border-color:#666;}
+select {background-color:#fff;border-width:1px;border-style:solid;}
+input[type=text], input[type=password], input.text, input.title, textarea, select {margin:0.5em 0;}
+input.text, input.title {width:300px;padding:5px;}
+input.title {font-size:1.5em;}
+textarea {width:390px;height:250px;padding:5px;}
+form.inline {line-height:3;}
+form.inline p {margin-bottom:0;}
+.error, .alert, .notice, .success, .info {padding:0.8em;margin-bottom:1em;border:2px solid #ddd;}
+.error, .alert {background:#fbe3e4;color:#8a1f11;border-color:#fbc2c4;}
+.notice {background:#fff6bf;color:#514721;border-color:#ffd324;}
+.success {background:#e6efc2;color:#264409;border-color:#c6d880;}
+.info {background:#d5edf8;color:#205791;border-color:#92cae4;}
+.error a, .alert a {color:#8a1f11;}
+.notice a {color:#514721;}
+.success a {color:#264409;}
+.info a {color:#205791;}
+
+/* grid.css */
+.container {width:95%;margin:0 auto;}
+.showgrid {background:url(src/grid.png);}
+.column, .span-1, .span-2, .span-3, .span-4, .span-5, .span-6, .span-7, .span-8, .span-9, .span-10, .span-11, .span-12, .span-13, .span-14, .span-15, .span-16, .span-17, .span-18, .span-19, .span-20, .span-21, .span-22, .span-23, .span-24 {float:left;margin-right:10px;}
+.last {margin-right:0;}
+.span-1 {width:30px;}
+.span-2 {width:70px;}
+.span-3 {width:110px;}
+.span-4 {width:150px;}
+.span-5 {width:190px;}
+.span-6 {width:230px;}
+.span-7 {width:270px;}
+.span-8 {width:310px;}
+.span-9 {width:350px;}
+.span-10 {width:390px;}
+.span-11 {width:430px;}
+.span-12 {width:470px;}
+.span-13 {width:510px;}
+.span-14 {width:550px;}
+.span-15 {width:590px;}
+.span-16 {width:630px;}
+.span-17 {width:670px;}
+.span-18 {width:710px;}
+.span-19 {width:750px;}
+.span-20 {width:790px;}
+.span-21 {width:830px;}
+.span-22 {width:870px;}
+.span-23 {width:910px;}
+.span-24 {width:950px;margin-right:0;}
+input.span-1, textarea.span-1, input.span-2, textarea.span-2, input.span-3, textarea.span-3, input.span-4, textarea.span-4, input.span-5, textarea.span-5, input.span-6, textarea.span-6, input.span-7, textarea.span-7, input.span-8, textarea.span-8, input.span-9, textarea.span-9, input.span-10, textarea.span-10, input.span-11, textarea.span-11, input.span-12, textarea.span-12, input.span-13, textarea.span-13, input.span-14, textarea.span-14, input.span-15, textarea.span-15, input.span-16, textarea.span-16, input.span-17, textarea.span-17, input.span-18, textarea.span-18, input.span-19, textarea.span-19, input.span-20, textarea.span-20, input.span-21, textarea.span-21, input.span-22, textarea.span-22, input.span-23, textarea.span-23, input.span-24, textarea.span-24 {border-left-width:1px;border-right-width:1px;padding-left:5px;padding-right:5px;}
+input.span-1, textarea.span-1 {width:18px;}
+input.span-2, textarea.span-2 {width:58px;}
+input.span-3, textarea.span-3 {width:98px;}
+input.span-4, textarea.span-4 {width:138px;}
+input.span-5, textarea.span-5 {width:178px;}
+input.span-6, textarea.span-6 {width:218px;}
+input.span-7, textarea.span-7 {width:258px;}
+input.span-8, textarea.span-8 {width:298px;}
+input.span-9, textarea.span-9 {width:338px;}
+input.span-10, textarea.span-10 {width:378px;}
+input.span-11, textarea.span-11 {width:418px;}
+input.span-12, textarea.span-12 {width:458px;}
+input.span-13, textarea.span-13 {width:498px;}
+input.span-14, textarea.span-14 {width:538px;}
+input.span-15, textarea.span-15 {width:578px;}
+input.span-16, textarea.span-16 {width:618px;}
+input.span-17, textarea.span-17 {width:658px;}
+input.span-18, textarea.span-18 {width:698px;}
+input.span-19, textarea.span-19 {width:738px;}
+input.span-20, textarea.span-20 {width:778px;}
+input.span-21, textarea.span-21 {width:818px;}
+input.span-22, textarea.span-22 {width:858px;}
+input.span-23, textarea.span-23 {width:898px;}
+input.span-24, textarea.span-24 {width:938px;}
+.append-1 {padding-right:40px;}
+.append-2 {padding-right:80px;}
+.append-3 {padding-right:120px;}
+.append-4 {padding-right:160px;}
+.append-5 {padding-right:200px;}
+.append-6 {padding-right:240px;}
+.append-7 {padding-right:280px;}
+.append-8 {padding-right:320px;}
+.append-9 {padding-right:360px;}
+.append-10 {padding-right:400px;}
+.append-11 {padding-right:440px;}
+.append-12 {padding-right:480px;}
+.append-13 {padding-right:520px;}
+.append-14 {padding-right:560px;}
+.append-15 {padding-right:600px;}
+.append-16 {padding-right:640px;}
+.append-17 {padding-right:680px;}
+.append-18 {padding-right:720px;}
+.append-19 {padding-right:760px;}
+.append-20 {padding-right:800px;}
+.append-21 {padding-right:840px;}
+.append-22 {padding-right:880px;}
+.append-23 {padding-right:920px;}
+.prepend-1 {padding-left:40px;}
+.prepend-2 {padding-left:80px;}
+.prepend-3 {padding-left:120px;}
+.prepend-4 {padding-left:160px;}
+.prepend-5 {padding-left:200px;}
+.prepend-6 {padding-left:240px;}
+.prepend-7 {padding-left:280px;}
+.prepend-8 {padding-left:320px;}
+.prepend-9 {padding-left:360px;}
+.prepend-10 {padding-left:400px;}
+.prepend-11 {padding-left:440px;}
+.prepend-12 {padding-left:480px;}
+.prepend-13 {padding-left:520px;}
+.prepend-14 {padding-left:560px;}
+.prepend-15 {padding-left:600px;}
+.prepend-16 {padding-left:640px;}
+.prepend-17 {padding-left:680px;}
+.prepend-18 {padding-left:720px;}
+.prepend-19 {padding-left:760px;}
+.prepend-20 {padding-left:800px;}
+.prepend-21 {padding-left:840px;}
+.prepend-22 {padding-left:880px;}
+.prepend-23 {padding-left:920px;}
+.border {padding-right:4px;margin-right:5px;border-right:1px solid #ddd;}
+.colborder {padding-right:24px;margin-right:25px;border-right:1px solid #ddd;}
+.pull-1 {margin-left:-40px;}
+.pull-2 {margin-left:-80px;}
+.pull-3 {margin-left:-120px;}
+.pull-4 {margin-left:-160px;}
+.pull-5 {margin-left:-200px;}
+.pull-6 {margin-left:-240px;}
+.pull-7 {margin-left:-280px;}
+.pull-8 {margin-left:-320px;}
+.pull-9 {margin-left:-360px;}
+.pull-10 {margin-left:-400px;}
+.pull-11 {margin-left:-440px;}
+.pull-12 {margin-left:-480px;}
+.pull-13 {margin-left:-520px;}
+.pull-14 {margin-left:-560px;}
+.pull-15 {margin-left:-600px;}
+.pull-16 {margin-left:-640px;}
+.pull-17 {margin-left:-680px;}
+.pull-18 {margin-left:-720px;}
+.pull-19 {margin-left:-760px;}
+.pull-20 {margin-left:-800px;}
+.pull-21 {margin-left:-840px;}
+.pull-22 {margin-left:-880px;}
+.pull-23 {margin-left:-920px;}
+.pull-24 {margin-left:-960px;}
+.pull-1, .pull-2, .pull-3, .pull-4, .pull-5, .pull-6, .pull-7, .pull-8, .pull-9, .pull-10, .pull-11, .pull-12, .pull-13, .pull-14, .pull-15, .pull-16, .pull-17, .pull-18, .pull-19, .pull-20, .pull-21, .pull-22, .pull-23, .pull-24 {float:left;position:relative;}
+.push-1 {margin:0 -40px 1.5em 40px;}
+.push-2 {margin:0 -80px 1.5em 80px;}
+.push-3 {margin:0 -120px 1.5em 120px;}
+.push-4 {margin:0 -160px 1.5em 160px;}
+.push-5 {margin:0 -200px 1.5em 200px;}
+.push-6 {margin:0 -240px 1.5em 240px;}
+.push-7 {margin:0 -280px 1.5em 280px;}
+.push-8 {margin:0 -320px 1.5em 320px;}
+.push-9 {margin:0 -360px 1.5em 360px;}
+.push-10 {margin:0 -400px 1.5em 400px;}
+.push-11 {margin:0 -440px 1.5em 440px;}
+.push-12 {margin:0 -480px 1.5em 480px;}
+.push-13 {margin:0 -520px 1.5em 520px;}
+.push-14 {margin:0 -560px 1.5em 560px;}
+.push-15 {margin:0 -600px 1.5em 600px;}
+.push-16 {margin:0 -640px 1.5em 640px;}
+.push-17 {margin:0 -680px 1.5em 680px;}
+.push-18 {margin:0 -720px 1.5em 720px;}
+.push-19 {margin:0 -760px 1.5em 760px;}
+.push-20 {margin:0 -800px 1.5em 800px;}
+.push-21 {margin:0 -840px 1.5em 840px;}
+.push-22 {margin:0 -880px 1.5em 880px;}
+.push-23 {margin:0 -920px 1.5em 920px;}
+.push-24 {margin:0 -960px 1.5em 960px;}
+.push-1, .push-2, .push-3, .push-4, .push-5, .push-6, .push-7, .push-8, .push-9, .push-10, .push-11, .push-12, .push-13, .push-14, .push-15, .push-16, .push-17, .push-18, .push-19, .push-20, .push-21, .push-22, .push-23, .push-24 {float:left;position:relative;}
+div.prepend-top, .prepend-top {margin-top:1.5em;}
+div.append-bottom, .append-bottom {margin-bottom:1.5em;}
+.box {padding:1.5em;margin-bottom:1.5em;background:#e5eCf9;}
+hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:1px;margin:0 0 1.45em;border:none;}
+hr.space {background:#fff;color:#fff;visibility:hidden;}
+.clearfix:after, .container:after {content:"\0020";display:block;height:0;clear:both;visibility:hidden;overflow:hidden;}
+.clearfix, .container {display:block;}
+.clear {clear:both;}
commit 7c0aaddd7cde72b7b17e8a1762d78d6f230924bd
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date: Tue Apr 19 17:11:48 2011 +0100
Check in server.git changes to cn->uid naming attribute
diff --git a/www/admin/user/user.php b/www/admin/user/user.php
index 7c00de3..7ba9d27 100644
--- a/www/admin/user/user.php
+++ b/www/admin/user/user.php
@@ -662,7 +662,7 @@ switch( $action ) {
if ($action == "save") {
if (!$errors) {
- if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap->dn_escape($ldap_object['cn']).",".$domain_dn;
+ if (!empty($ldap_object['uid'])) $newdn = "uid=".$ldap->dn_escape($ldap_object['uid']).",".$domain_dn;
else $newdn = $dn;
if (strcmp($dn,$newdn) != 0) {
// Check for distribution lists with this user as member
@@ -771,7 +771,7 @@ switch( $action ) {
} else {
// firstsave
if (!$errors) {
- $dn = "cn=".$ldap->dn_escape($ldap_object['cn']).$dn_add.",".$domain_dn;
+ $dn = "uid=".$ldap->dn_escape($ldap_object['uid']).$dn_add.",".$domain_dn;
foreach( $ldap_object as $k => $v ) {
if( $v == array() ) unset($ldap_object[$k]);
}
More information about the commits
mailing list