diff --git a/lam-packaging/debian/copyright b/lam-packaging/debian/copyright
index 5ef9783f..222c1ce3 100644
--- a/lam-packaging/debian/copyright
+++ b/lam-packaging/debian/copyright
@@ -1,4 +1,4 @@
-This software is copyright (c) 2003 - 2014 by Roland Gruber
+This software is copyright (c) 2003 - 2017 by Roland Gruber
If you purchased a copy of LDAP Account Manager Pro then the following
files are licensed under the conditions which you accepted at purchase
@@ -6,6 +6,12 @@ time.
* templates/lists/changePassword.php
* templates/selfService/*
+* templates/config/jobs.php
+* lib/cron.inc
+* lib/database.inc
+* lib/env.inc
+* lib/jobs.inc
+* lib/passwordExpirationJob.inc
* lib/modules/aliasEntry.inc
* lib/modules/automount.inc
* lib/modules/bindDLZ.inc
@@ -17,15 +23,18 @@ time.
* lib/modules/groupOfUniqueNames.inc
* lib/modules/heimdalKerberos.inc
* lib/modules/ipHost.inc
+* lib/modules/locking389ds.inc
* lib/modules/mitKerberos.inc
* lib/modules/mitKerberosStructural.inc
* lib/modules/namedObject.inc
* lib/modules/nisObject.inc
-* lib/modules/passwordSelfReset.inc
+* lib/modules/nsview.inc
* lib/modules/oracleService.inc
* lib/modules/organizationalRole*.inc
+* lib/modules/passwordSelfReset.inc
* lib/modules/ppolicy.inc
* lib/modules/ppolicyUser.inc
+* lib/modules/qmailGroup.inc
* lib/modules/qmailUser.inc
* lib/modules/rfc2307bisAutomount.inc
* lib/modules/rfc2307bisPosixGroup.inc
@@ -43,6 +52,7 @@ time.
* lib/types/automountType.inc
* lib/types/gon.inc
* lib/types/nisObjectType.inc
+* lib/types/nsview.inc
* lib/types/oracleContextType.inc
* lib/types/ppolicyType.inc
* lib/types/sudo.inc
@@ -52,20 +62,19 @@ time.
All other files are licensed under the conditions below.
+ 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 3 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
The complete license can be found in the file COPYING.
@@ -74,82 +83,98 @@ Some parts of this package have other, compatible licences. These are:
A:
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software to use, copy, modify, distribute, sublicense, and/or sell
- copies of the software, and to permit persons to whom the software is furnished
- to do so.
+ DejaVu Fonts — License
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED.
+ Fonts are © Bitstream (see below). DejaVu changes are in public domain. Explanation
+ of copyright is on Gnome page on Bitstream Vera fonts (https://www.gnome.org/fonts/).
+ Glyphs imported from Arev fonts
+ (https://dejavu-fonts.github.io/Bitstream_Vera_Derivatives.html) are © Tavmjung Bah
+ (see below)
+ Bitstream Vera Fonts Copyright
+
+ Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a
+ trademark of Bitstream, Inc.
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy of the
+ fonts accompanying this license ("Fonts") and associated documentation files (the
+ "Font Software"), to reproduce and distribute the Font Software, including without
+ limitation the rights to use, copy, merge, publish, distribute, and/or sell copies
+ of the Font Software, and to permit persons to whom the Font Software is furnished
+ to do so, subject to the following conditions:
+
+ The above copyright and trademark notices and this permission notice shall be included
+ in all copies of one or more of the Font Software typefaces.
+
+ The Font Software may be modified, altered, or added to, and in particular the designs
+ of glyphs or characters in the Fonts may be modified and additional glyphs or
+ characters may be added to the Fonts, only if the fonts are renamed to names not
+ containing either the words "Bitstream" or the word "Vera".
+
+ This License becomes null and void to the extent applicable to Fonts or Font Software
+ that has been modified and is distributed under the "Bitstream Vera" names.
+
+ The Font Software may be sold as part of a larger software package but no copy of one
+ or more of the Font Software typefaces may be sold by itself.
+
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR
+ A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER
+ RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM,
+ DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR
+ CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN
+ THE FONT SOFTWARE.
+
+ Except as contained in this notice, the names of Gnome, the Gnome Foundation, and
+ Bitstream Inc., shall not be used in advertising or otherwise to promote the sale,
+ use or other dealings in this Font Software without prior written authorization from
+ the Gnome Foundation or Bitstream Inc., respectively. For further information,
+ contact: fonts at gnome dot org.
+
+ Arev Fonts Copyright
+
+ Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy of the
+ fonts accompanying this license ("Fonts") and associated documentation files (the
+ "Font Software"), to reproduce and distribute the modifications to the Bitstream
+ Vera Font Software, including without limitation the rights to use, copy, merge,
+ publish, distribute, and/or sell copies of the Font Software, and to permit persons
+ to whom the Font Software is furnished to do so, subject to the following
+ conditions:
+
+ The above copyright and trademark notices and this permission notice shall be
+ included in all copies of one or more of the Font Software typefaces.
+
+ The Font Software may be modified, altered, or added to, and in particular the
+ designs of glyphs or characters in the Fonts may be modified and additional
+ glyphs or characters may be added to the Fonts, only if the fonts are renamed
+ to names not containing either the words "Tavmjong Bah" or the word "Arev".
+
+ This License becomes null and void to the extent applicable to Fonts or Font
+ Software that has been modified and is distributed under the "Tavmjong Bah Arev"
+ names.
+
+ The Font Software may be sold as part of a larger software package but no copy of
+ one or more of the Font Software typefaces may be sold by itself.
+
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS
+ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR
+ OTHER RIGHT. IN NO EVENT SHALL TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR
+ CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
+ DEALINGS IN THE FONT SOFTWARE.
+
+ Except as contained in this notice, the name of Tavmjong Bah shall not be used in
+ advertising or otherwise to promote the sale, use or other dealings in this Font
+ Software without prior written authorization from Tavmjong Bah. For further
+ information, contact: tavmjong @ free . fr.
B:
- Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream
- Vera is a trademark of Bitstream, Inc.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of the fonts accompanying this license ("Fonts") and associated
- documentation files (the "Font Software"), to reproduce and distribute
- the Font Software, including without limitation the rights to use,
- copy, merge, publish, distribute, and/or sell copies of the Font
- Software, and to permit persons to whom the Font Software is furnished
- to do so, subject to the following conditions:
-
- The above copyright and trademark notices and this permission notice
- shall be included in all copies of one or more of the Font Software
- typefaces.
-
- The Font Software may be modified, altered, or added to, and in
- particular the designs of glyphs or characters in the Fonts may be
- modified and additional glyphs or characters may be added to the
- Fonts, only if the fonts are renamed to names not containing either
- the words "Bitstream" or the word "Vera".
-
- This License becomes null and void to the extent applicable to Fonts
- or Font Software that has been modified and is distributed under the
- "Bitstream Vera" names.
-
- The Font Software may be sold as part of a larger software package but
- no copy of one or more of the Font Software typefaces may be sold by
- itself.
-
- THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
- OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
- BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
- OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
- OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
- SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
-
- Except as contained in this notice, the names of Gnome, the Gnome
- Foundation, and Bitstream Inc., shall not be used in advertising or
- otherwise to promote the sale, use or other dealings in this Font
- Software without prior written authorization from the Gnome Foundation
- or Bitstream Inc., respectively. For further information, contact:
- fonts at gnome dot org.
-
-
-C:
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License (LGPL) as published by the Free Software Foundation; either
- version 2.1 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.
-
- For more details on the GNU Lesser General Public License,
- see http://www.gnu.org/copyleft/lesser.html
-
- See also /usr/share/common-licenses/LGPL-2.
-
-
-D:
-
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
@@ -173,12 +198,12 @@ D:
Programs and licenses with other licenses and/or authors than the
main license and authors:
-lib/fpdf-lam.inc A 2008 Olivier Plathey
-lib/font/Vera* B 2003 Bitstream, Inc.
-templates/lib/*wz_tooltip.js C Walter Zorn
-lib/3rdParty/phpseclib D Jim Wigginton
-templates/lib/*jquery*.js D 2010 John Resig, Paul Bakaus, Fred Heusschen
-templates/lib/*jquery-validationEngine-*.js D 2010 Cedric Dugas and Olivier Refalo
-templates/lib/*jquery-fineuploader-*.js D 2010 Andrew Valums
+lib/3rdParty/tcpdf/fonts/DejaVu*.ttf A Public Domain, Bitstream, Inc., Tavmjong Bah
+lib/3rdParty/tcpdf/fonts/DejaVu*.z A Public Domain, Bitstream, Inc., Tavmjong Bah
+lib/3rdParty/phpseclib B Jim Wigginton
+templates/lib/*jquery*.js B 2010 John Resig, Paul Bakaus, Fred Heusschen
+templates/lib/*jquery-dropmenu-*.js B 2010 Fred Heusschen
+templates/lib/*jquery-validationEngine-*.js B 2010 Cedric Dugas and Olivier Refalo
+templates/lib/*jquery-fineuploader-*.js B 2010 Andrew Valums
diff --git a/lam-packaging/debian/rules b/lam-packaging/debian/rules
index 32c7b0e8..9d61377c 100755
--- a/lam-packaging/debian/rules
+++ b/lam-packaging/debian/rules
@@ -40,8 +40,6 @@ install:
install -D --mode=644 lib/.htaccess debian/ldap-account-manager/usr/share/ldap-account-manager/lib/.htaccess
install -D --mode=644 lib/*.inc debian/ldap-account-manager/usr/share/ldap-account-manager/lib
install -D --mode=755 lib/*.sh debian/ldap-account-manager/usr/share/ldap-account-manager/lib
- install -D --mode=644 lib/ufpdf.php debian/ldap-account-manager/usr/share/ldap-account-manager/lib/ufpdf.php
- cp -r lib/font debian/ldap-account-manager/usr/share/ldap-account-manager/lib/
cp -r lib/modules debian/ldap-account-manager/usr/share/ldap-account-manager/lib/
cp -r lib/types debian/ldap-account-manager/usr/share/ldap-account-manager/lib/
cp -r lib/tools debian/ldap-account-manager/usr/share/ldap-account-manager/lib/
@@ -66,8 +64,8 @@ binary-indep: build install
dh_install
dh_compress
dh_fixperms
- dh_link /usr/share/fonts/truetype/dejavu/DejaVuSerif.ttf /usr/share/ldap-account-manager/lib/font/DejaVuSerif.ttf
- dh_link /usr/share/fonts/truetype/dejavu/DejaVuSerif-Bold.ttf /usr/share/ldap-account-manager/lib/font/DejaVuSerif-Bold.ttf
+ dh_link /usr/share/fonts/truetype/dejavu/DejaVuSerif.ttf /usr/share/ldap-account-manager/lib/3rdParty/tcpdf/fonts/DejaVuSerif.ttf
+ dh_link /usr/share/fonts/truetype/dejavu/DejaVuSerif-Bold.ttf /usr/share/ldap-account-manager/lib/3rdParty/tcpdf/fonts/DejaVuSerif-Bold.ttf
dh_link /usr/share/doc/ldap-account-manager/docs /usr/share/ldap-account-manager/docs
install -D --mode=644 debian/lam.apache.conf debian/ldap-account-manager/etc/ldap-account-manager/apache.conf
install -D --mode=644 debian/lam.nginx.conf debian/ldap-account-manager/etc/ldap-account-manager/nginx.conf
diff --git a/lam/copyright b/lam/copyright
index 0e1a36f3..222c1ce3 100644
--- a/lam/copyright
+++ b/lam/copyright
@@ -198,8 +198,6 @@ B:
Programs and licenses with other licenses and/or authors than the
main license and authors:
-lib/font/DejaVu*.ttf A Public Domain, Bitstream, Inc., Tavmjong Bah
-lib/font/DejaVu*.z A Public Domain, Bitstream, Inc., Tavmjong Bah
lib/3rdParty/tcpdf/fonts/DejaVu*.ttf A Public Domain, Bitstream, Inc., Tavmjong Bah
lib/3rdParty/tcpdf/fonts/DejaVu*.z A Public Domain, Bitstream, Inc., Tavmjong Bah
lib/3rdParty/phpseclib B Jim Wigginton
diff --git a/lam/docs/devel/pdf_libs.htm b/lam/docs/devel/pdf_libs.htm
index 20135493..3d9ab5f4 100644
--- a/lam/docs/devel/pdf_libs.htm
+++ b/lam/docs/devel/pdf_libs.htm
@@ -31,11 +31,10 @@ file, saves it to the tmp
folder and returns the file name.
-The lamPDF class extends the UFPDF class and adds the LAM
+The LAMTCPDF class extends the TCPDF class and adds the LAM
specific header and footer.
-It also defines the used font. Currently only Bitstream-Vera is
-supported.
+It also defines the used font.