added auto delete module

lam-packaging/debian/copyright

@@ -19,6 +19,7 @@ time.
 * lib/modules/customFields.inc
 * lib/modules/customScripts.inc
 * lib/modules/device.inc
+* lib/modules/autoDelete.inc
 * lib/modules/dynamicList.inc
 * lib/modules/groupOfNames.inc
 * lib/modules/groupOfNamesUser.inc

lam/copyright

@@ -19,6 +19,7 @@ time.
 * lib/modules/customFields.inc
 * lib/modules/customScripts.inc
 * lib/modules/device.inc
+* lib/modules/autoDelete.inc
 * lib/modules/dynamicList.inc
 * lib/modules/groupOfNames.inc
 * lib/modules/groupOfNamesUser.inc

lam/lib/baseType.inc

@@ -102,7 +102,10 @@ class baseType {
 	* @return array list of descriptions
 	*/
 	public function getListAttributeDescriptions() {
-		return array();
+		return array(
+			'entryexpiretimestamp' => _('Deletion time'),
+			"description" => _("Description"),
+		);
 	}
 
 	/**

lam/lib/lists.inc

@@ -566,10 +566,15 @@ class lamList {
 		// print all attribute entries seperated by "; "
 		if (isset($entry[$attribute]) && sizeof($entry[$attribute]) > 0) {
 			if (is_array($entry[$attribute])) {
+				if (($attribute == 'entryexpiretimestamp') && !empty($entry[$attribute][0])) {
+					echo formatLDAPTimestamp($entry[$attribute][0]);
+				}
+				else {
 					// sort array
 					sort($entry[$attribute]);
 					echo htmlspecialchars(implode("; ", $entry[$attribute]), ENT_QUOTES, "UTF-8");
 				}
+			}
 			else {
 				echo htmlspecialchars($entry[$attribute], ENT_QUOTES, "UTF-8");
 			}

lam/lib/modules/.gitignore

@@ -38,3 +38,4 @@
 /kopano*.inc
 /dynamicList.inc
 /customBaseType.inc
+/autoDelete.inc

lam/lib/types/asteriskExt.inc

@@ -91,11 +91,13 @@ class asteriskExt extends baseType {
      * @return array list of descriptions
      */
     function getListAttributeDescriptions() {
-        return array(
+        return array_merge(
+			parent::getListAttributeDescriptions(),
+        	array(
             	"astextension" => _("Extension name"),
             	"astcontext" => _("Account context"),
             	"member" => _("Owner"),
-        );
+        ));
     }
 
 	/**

lam/lib/types/dhcp.inc

@@ -1,10 +1,9 @@
 <?php
 /*
-$Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
   Copyright (C) 2008         Thomas Manninger
-                2009 - 2017  Roland Gruber
+                2009 - 2018  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
@@ -92,11 +91,13 @@ class dhcp extends baseType {
 	* @return array list of descriptions
 	*/
 	public function getListAttributeDescriptions() {
-		return array (
+		return array_merge(
+			parent::getListAttributeDescriptions(),
+			array (
 				"cn" => _("Subnet"),
 				"dhcprange" => _("Ranges"),
 				"fixed_ips" => _("IP address") . ' / ' . _('MAC address') . ' / ' . _("Description")
-			);
+			));
 	}
 
 	/**

lam/lib/types/group.inc

@@ -103,7 +103,9 @@ class group extends baseType {
 	* @return array list of descriptions
 	*/
 	function getListAttributeDescriptions() {
-		$return = array (
+		$return = array_merge(
+			parent::getListAttributeDescriptions(),
+			array(
 				"cn" => _("Group name"),
 				"description" => _("Group description"),
 				"displayName" => _("Display name"),
@@ -113,7 +115,7 @@ class group extends baseType {
 				"roleOccupant" => _("Role member DNs"),
 				"uniqueMember" => _("Group member DNs"),
 				"memberUrl" => _("Entries"),
-		);
+		));
 		if ($this->getType() != null) {
 			$modules = $this->getType()->getModules();
 			if (in_array('organizationalRole', $modules)) {

lam/lib/types/host.inc

@@ -89,7 +89,9 @@ class host extends baseType {
 	* @return array list of descriptions
 	*/
 	function getListAttributeDescriptions() {
-		return array (
+		return array_merge(
+			parent::getListAttributeDescriptions(),
+			array (
 				"uid" => _("Host name"),
 				"cn" => _("Common name"),
 				"rid" => _("RID (Windows UID)"),
@@ -98,7 +100,7 @@ class host extends baseType {
 				"gidnumber" => _("GID number"),
 				'location' => _('Location'),
 				'serialNumber' => _('Serial number')
-			);
+			));
 	}
 
 	/**

lam/lib/types/kolabSharedFolderType.inc

@@ -1,9 +1,8 @@
 <?php
 /*
-$Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2013  Roland Gruber
+  Copyright (C) 2013 - 2018  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
@@ -89,10 +88,12 @@ class kolabSharedFolderType extends baseType {
 	* @return array list of descriptions
 	*/
 	function getListAttributeDescriptions() {
-		return array (
+		return array_merge(
+			parent::getListAttributeDescriptions(),
+			array (
 				"kolabDelegate" => _('Delegates'),
 				'alias' => _('Email aliases'),
-		);
+		));
 	}
 
 	/**

lam/lib/types/mailAlias.inc

@@ -1,9 +1,8 @@
 <?php
 /*
-$Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2005 - 2012  Roland Gruber
+  Copyright (C) 2005 - 2018  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
@@ -89,10 +88,12 @@ class mailAlias extends baseType {
 	* @return array list of descriptions
 	*/
 	function getListAttributeDescriptions() {
-		return array(
+		return array_merge(
+			parent::getListAttributeDescriptions(),
+			array(
 				"cn" => _("Alias name"),
 				"rfc822mailmember" => _("Recipient list")
-			);
+			));
 	}
 
 	/**

lam/lib/types/netgroup.inc

@@ -1,9 +1,8 @@
 <?php
 /*
-$Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2009 - 2012  Roland Gruber
+  Copyright (C) 2009 - 2018  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
@@ -89,12 +88,14 @@ class netgroup extends baseType {
 	* @return array list of descriptions
 	*/
 	function getListAttributeDescriptions() {
-		return array (
+		return array_merge(
+			parent::getListAttributeDescriptions(),
+			array (
 				"cn" => _("Group name"),
 				'description' => _('Description'),
 				'membernisnetgroup' => _('Subgroups'),
 				'nisnetgrouptriple' => _('Members')
-			);
+			));
 	}
 
 	/**

lam/lib/types/pykotaBillingCodeType.inc

@@ -1,9 +1,8 @@
 <?php
 /*
-$Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2013 - 2017  Roland Gruber
+  Copyright (C) 2013 - 2018  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
@@ -89,12 +88,13 @@ class pykotaBillingCodeType extends baseType {
 	* @return array list of descriptions
 	*/
 	function getListAttributeDescriptions() {
-		return array (
+		return array_merge(
+			parent::getListAttributeDescriptions(),
+			array(
 				"cn" => _('Billing code'),
-			"description" => _('Description'),
 				'pykotaBalance' => _('Balance'),
 				'pykotaPageCounter' => _('Page count'),
-		);
+		));
 	}
 
 	/**

lam/lib/types/pykotaPrinterType.inc

@@ -1,9 +1,8 @@
 <?php
 /*
-$Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2013 - 2017  Roland Gruber
+  Copyright (C) 2013 - 2018  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
@@ -89,13 +88,14 @@ class pykotaPrinterType extends baseType {
 	* @return array list of descriptions
 	*/
 	function getListAttributeDescriptions() {
-		return array (
+		return array_merge(
+			parent::getListAttributeDescriptions(),
+			array(
 				"cn" => _('Printer name'),
-			"description" => _('Description'),
 				'pykotaPricePerPage' => _('Price per page'),
 				'pykotaPricePerJob' => _('Price per job'),
 				'pykotaMaxJobSize' => _('Maximum job size'),
-		);
+		));
 	}
 
 	/**

lam/lib/types/smbDomain.inc

@@ -1,9 +1,8 @@
 <?php
 /*
-$Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2005 - 2012  Roland Gruber
+  Copyright (C) 2005 - 2018  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
@@ -89,10 +88,12 @@ class smbDomain extends baseType {
 	* @return array list of descriptions
 	*/
 	function getListAttributeDescriptions() {
-		return array(
+		return array_merge(
+			parent::getListAttributeDescriptions(),
+			array(
 				"sambasid" => _("Domain SID"),
 				"sambadomainname" => _("Domain name")
-			);
+		));
 	}
 
 	/**

lam/lib/types/user.inc

@@ -88,7 +88,9 @@ class user extends baseType {
 	* @return array list of descriptions
 	*/
 	function getListAttributeDescriptions() {
-		return array (
+		return array_merge(
+			parent::getListAttributeDescriptions(),
+			array(
 				"cn" => _("Common name"),
 				'company' => _('Company'),
 				'departmentNumber' => _('Department'),
@@ -115,7 +117,7 @@ class user extends baseType {
 				"uid" => _("User name"),
 				"uidnumber" => _("UID number"),
 				'userPrincipalName' => _('User name'),
-		);
+		));
 	}
 
 	/**