diff --git a/lam/HISTORY b/lam/HISTORY
index a49286c6..b6a66347 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -3,6 +3,10 @@ March 2016 5.3
- Windows: support management of fax number
- Login can show display name instead of server URL
- Personal/Unix: support K5KEY hash type for smbk5pwd
+ - fixed bugs:
+ -> autoload errors in tree view
+ - LAM Pro:
+ -> Support for LDAP views based on nsview object class
15.12.2015 5.2
diff --git a/lam/config/templates/pdf/default.nsviewType.xml b/lam/config/templates/pdf/default.nsviewType.xml
new file mode 100644
index 00000000..1cbc7126
--- /dev/null
+++ b/lam/config/templates/pdf/default.nsviewType.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/lam/config/templates/profiles/default.nsviewType b/lam/config/templates/profiles/default.nsviewType
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/lam/config/templates/profiles/default.nsviewType
@@ -0,0 +1 @@
+
diff --git a/lam/copyright b/lam/copyright
index efbf4d09..eaa796ac 100644
--- a/lam/copyright
+++ b/lam/copyright
@@ -26,6 +26,7 @@ time.
* lib/modules/mitKerberosStructural.inc
* lib/modules/namedObject.inc
* lib/modules/nisObject.inc
+* lib/modules/nsview.inc
* lib/modules/passwordSelfReset.inc
* lib/modules/oracleService.inc
* lib/modules/organizationalRole*.inc
@@ -48,6 +49,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
diff --git a/lam/lib/baseModule.inc b/lam/lib/baseModule.inc
index 1b4b6a9a..6cb3b721 100644
--- a/lam/lib/baseModule.inc
+++ b/lam/lib/baseModule.inc
@@ -3,7 +3,7 @@
$Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
- Copyright (C) 2003 - 2015 Roland Gruber
+ Copyright (C) 2003 - 2016 Roland Gruber
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
@@ -1222,6 +1222,15 @@ abstract class baseModule {
return 0;
}
+ /**
+ * Defines if the LDAP entry has only virtual child entries. This is the case for e.g. LDAP views.
+ *
+ * @return boolean has only virtual children
+ */
+ public function hasOnlyVirtualChildren() {
+ return false;
+ }
+
/**
* This function processes user input.
*
diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc
index 55b2533a..1547ac54 100644
--- a/lam/lib/modules.inc
+++ b/lam/lib/modules.inc
@@ -3,7 +3,7 @@
$Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
- Copyright (C) 2003 - 2015 Roland Gruber
+ Copyright (C) 2003 - 2016 Roland Gruber
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
@@ -1971,6 +1971,20 @@ class accountContainer {
return $errors;
}
+ /**
+ * Defines if the LDAP entry has only virtual child entries. This is the case for e.g. LDAP views.
+ *
+ * @return boolean has only virtual children
+ */
+ public function hasOnlyVirtualChildren() {
+ foreach ($this->module as $module) {
+ if ($module->hasOnlyVirtualChildren()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
/**
* Returns a list of possible PDF entries for this account.
*
diff --git a/lam/style/500_layout.css b/lam/style/500_layout.css
index 8e708be2..71271701 100644
--- a/lam/style/500_layout.css
+++ b/lam/style/500_layout.css
@@ -3,7 +3,7 @@ $Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2003 Leonhard Walchshaeusl
- Copyright (C) 2005 - 2015 Roland Gruber
+ Copyright (C) 2005 - 2016 Roland Gruber
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
@@ -674,6 +674,10 @@ h4.schema_oclass_sub {
.oracleContextType-bright { background:#b6eeff !important; }
.oracleContextType-dark { background-color:#80e0e1 !important; }
+.nsviewType-border { border-color:#af8800; }
+.nsviewType-bright { background:#fff3c8 !important; }
+.nsviewType-dark { background-color:#ffe27f !important; }
+
/** responsive styles */
.row {
diff --git a/lam/templates/delete.php b/lam/templates/delete.php
index 97094baa..3bda6ad7 100644
--- a/lam/templates/delete.php
+++ b/lam/templates/delete.php
@@ -4,7 +4,7 @@
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2003 - 2006 Tilo Lutz
- Copyright (C) 2007 - 2015 Roland Gruber
+ Copyright (C) 2007 - 2016 Roland Gruber
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
@@ -103,9 +103,12 @@ if (isset($_GET['type']) && isset($_SESSION['delete_dn'])) {
echo "