refactoring

lam/lib/baseModule.inc

@@ -64,7 +64,7 @@ abstract class baseModule {
 	/**
 	 * These attributes will be ignored by default if a new account is copied from an existing one.
 	 */
-	const ATTRIBUTES_TO_IGNORE_ON_COPY_DEFAULT = ['uid', 'uidNumber', 'gid', 'gidNumber',
+	public const ATTRIBUTES_TO_IGNORE_ON_COPY_DEFAULT = ['uid', 'uidNumber', 'gid', 'gidNumber',
 		'cn', 'userpassword', 'sn', 'givenName', 'initials', 'telephoneNumber',
 		'homePhone', 'mobile', 'facsimileTelephoneNumber', 'pager', 'mail',
 		'employeeNumber', 'userCertificate;binary', 'userCertificate',

lam/lib/modules/asteriskAccount.inc

@@ -45,7 +45,7 @@ class asteriskAccount extends baseModule implements passwordService {
 	/**
 	 * These attributes will be ignored by default if a new account is copied from an existing one.
 	 */
-	const ATTRIBUTES_TO_IGNORE_ON_COPY = ['AstAccountCallerID', 'AstAccountRealmedPassword',
+	private const ATTRIBUTES_TO_IGNORE_ON_COPY = ['AstAccountCallerID', 'AstAccountRealmedPassword',
 		'AstAccountFullContact', 'AstAccountMailbox', 'AstAccountIPAddress'];
 
 	/**

lam/lib/modules/asteriskExtension.inc

@@ -47,7 +47,7 @@ class asteriskExtension extends baseModule {
 	/**
 	 * These attributes will be ignored by default if a new account is copied from an existing one.
 	 */
-	const ATTRIBUTES_TO_IGNORE_ON_COPY = ['AstExtension'];
+	private const ATTRIBUTES_TO_IGNORE_ON_COPY = ['AstExtension'];
 
 	/** if true then only Asterisk accounts are shown as possible owners */
 	private $filterOwnerForAsteriskAccounts = true;

lam/lib/modules/asteriskVoicemail.inc

@@ -43,7 +43,7 @@ class asteriskVoicemail extends baseModule implements passwordService {
 	/**
 	 * These attributes will be ignored by default if a new account is copied from an existing one.
 	 */
-	const ATTRIBUTES_TO_IGNORE_ON_COPY = ['AstVoicemailMailbox', 'AstVoicemailPassword',
+	private const ATTRIBUTES_TO_IGNORE_ON_COPY = ['AstVoicemailMailbox', 'AstVoicemailPassword',
 		'AstVoicemailEmail', 'AstVoicemailPager', 'AstVoicemailFullname'];
 
 	/**

lam/lib/modules/courierMailAccount.inc

@@ -45,7 +45,7 @@ class courierMailAccount extends baseModule {
 	/**
 	 * These attributes will be ignored by default if a new account is copied from an existing one.
 	 */
-	const ATTRIBUTES_TO_IGNORE_ON_COPY = ['mailbox'];
+	private const ATTRIBUTES_TO_IGNORE_ON_COPY = ['mailbox'];
 
 	/**
 	 * Creates a new courierMailAccount object.

lam/lib/modules/eduPerson.inc

@@ -38,7 +38,7 @@ class eduPerson extends baseModule {
 	/**
 	 * These attributes will be ignored by default if a new account is copied from an existing one.
 	 */
-	const ATTRIBUTES_TO_IGNORE_ON_COPY = ['eduPersonNickname', 'eduPersonPrincipalName'];
+	private const ATTRIBUTES_TO_IGNORE_ON_COPY = ['eduPersonNickname', 'eduPersonPrincipalName'];
 
 	/** possible affiliation types */
 	private $affiliationTypes = ['faculty', 'student', 'staff', 'alum',

lam/lib/modules/freeRadius.inc

@@ -38,7 +38,7 @@ class freeRadius extends baseModule {
 	/**
 	 * These attributes will be ignored by default if a new account is copied from an existing one.
 	 */
-	const ATTRIBUTES_TO_IGNORE_ON_COPY = ['radiusFramedIPAddress'];
+	private const ATTRIBUTES_TO_IGNORE_ON_COPY = ['radiusFramedIPAddress'];
 
 	/** list of possible months */
 	private static $monthList = ['01' => 'Jan', '02' => 'Feb', '03' => 'Mar', '04' => 'Apr', '05' => 'May',

lam/lib/modules/ieee802device.inc

@@ -38,7 +38,7 @@ class ieee802device extends baseModule {
 	/**
 	 * These attributes will be ignored by default if a new account is copied from an existing one.
 	 */
-	const ATTRIBUTES_TO_IGNORE_ON_COPY = ['macAddress'];
+	private const ATTRIBUTES_TO_IGNORE_ON_COPY = ['macAddress'];
 
 	/**
 	 * Returns true if this module can manage accounts of the current type, otherwise false.

lam/lib/modules/inetLocalMailRecipient.inc

@@ -38,7 +38,7 @@ class inetLocalMailRecipient extends baseModule {
 	/**
 	 * These attributes will be ignored by default if a new account is copied from an existing one.
 	 */
-	const ATTRIBUTES_TO_IGNORE_ON_COPY = ['mailLocalAddress', 'mailRoutingAddress'];
+	private const ATTRIBUTES_TO_IGNORE_ON_COPY = ['mailLocalAddress', 'mailRoutingAddress'];
 
 	/**
 	 * Creates a new mitKerberos object.

lam/lib/modules/pykotaBillingCode.inc

@@ -38,7 +38,7 @@ class pykotaBillingCode extends baseModule {
 	/**
 	 * These attributes will be ignored by default if a new account is copied from an existing one.
 	 */
-	const ATTRIBUTES_TO_IGNORE_ON_COPY = ['pykotaBalance', 'pykotaPageCounter', 'pykotaBillingCode'];
+	private const ATTRIBUTES_TO_IGNORE_ON_COPY = ['pykotaBalance', 'pykotaPageCounter', 'pykotaBillingCode'];
 
 	/** cache for existing codes (array(dn1 => pykotaBillingCode1, dn2 => pykotaBillingCode2)) */
 	private $codeCache;

lam/lib/modules/pykotaGroup.inc

@@ -40,7 +40,7 @@ class pykotaGroup extends baseModule {
 	/**
 	 * These attributes will be ignored by default if a new account is copied from an existing one.
 	 */
-	const ATTRIBUTES_TO_IGNORE_ON_COPY = ['pykotaGroupName'];
+	private const ATTRIBUTES_TO_IGNORE_ON_COPY = ['pykotaGroupName'];
 
 	/** cache for cn attribute */
 	private $cnCache;

lam/lib/modules/pykotaPrinter.inc

@@ -38,7 +38,7 @@ class pykotaPrinter extends baseModule {
 	/**
 	 * These attributes will be ignored by default if a new account is copied from an existing one.
 	 */
-	const ATTRIBUTES_TO_IGNORE_ON_COPY = ['pykotaPrinterName'];
+	private const ATTRIBUTES_TO_IGNORE_ON_COPY = ['pykotaPrinterName'];
 
 	/** cache for existing printers (array(dn => array(cn => ..., description => ...))) */
 	private $printerCache;

lam/lib/modules/pykotaUser.inc

@@ -43,7 +43,7 @@ class pykotaUser extends baseModule {
 	/**
 	 * These attributes will be ignored by default if a new account is copied from an existing one.
 	 */
-	const ATTRIBUTES_TO_IGNORE_ON_COPY = ['pykotaUserName', 'pykotaBalance', 'pykotaLifeTimePaid',
+	private const ATTRIBUTES_TO_IGNORE_ON_COPY = ['pykotaUserName', 'pykotaBalance', 'pykotaLifeTimePaid',
 		'pykotaPayments'];
 
 	/** cache for uid attribute */

lam/lib/modules/sambaDomain.inc

@@ -38,7 +38,7 @@ class sambaDomain extends baseModule {
 	/**
 	 * These attributes will be ignored by default if a new account is copied from an existing one.
 	 */
-	const ATTRIBUTES_TO_IGNORE_ON_COPY = ['sambaDomainName', 'sambaSID', 'sambaNextRid',
+	private const ATTRIBUTES_TO_IGNORE_ON_COPY = ['sambaDomainName', 'sambaSID', 'sambaNextRid',
 		'sambaNextGroupRid', 'sambaNextUserRid'];
 
 	/**

lam/lib/modules/sambaGroupMapping.inc

@@ -45,7 +45,7 @@ class sambaGroupMapping extends baseModule {
 	/**
 	 * These attributes will be ignored by default if a new account is copied from an existing one.
 	 */
-	const ATTRIBUTES_TO_IGNORE_ON_COPY = ['sambaSID', 'gidNumber', 'displayName'];
+	private const ATTRIBUTES_TO_IGNORE_ON_COPY = ['sambaSID', 'gidNumber', 'displayName'];
 
 	// Variables
 	/** Array of well known RIDs */

lam/lib/modules/sambaSamAccount.inc

@@ -58,7 +58,7 @@ class sambaSamAccount extends baseModule implements passwordService, AccountStat
 	/**
 	 * These attributes will be ignored by default if a new account is copied from an existing one.
 	 */
-	const ATTRIBUTES_TO_IGNORE_ON_COPY = ['sambaSID', 'sambaNTPassword',
+	private const ATTRIBUTES_TO_IGNORE_ON_COPY = ['sambaSID', 'sambaNTPassword',
 		'sambaPwdLastSet', 'displayName', 'sambaHomePath', 'sambaProfilePath',
 		'sambaPasswordHistory', 'sambaPwdCanChange', 'sambaPwdMustChange', 'sambaKickoffTime',
 		'sambaLogonTime', 'sambaLogoffTime'];

lam/lib/modules/shadowAccount.inc

@@ -44,7 +44,7 @@ class shadowAccount extends baseModule implements passwordService, AccountStatus
 	/**
 	 * These attributes will be ignored by default if a new account is copied from an existing one.
 	 */
-	const ATTRIBUTES_TO_IGNORE_ON_COPY = ['shadowlastchange', 'shadowexpire'];
+	private const ATTRIBUTES_TO_IGNORE_ON_COPY = ['shadowlastchange', 'shadowexpire'];
 
 	/**
 	 * ID for expired account status.

lam/lib/modules/windowsGroup.inc

@@ -43,7 +43,7 @@ class windowsGroup extends baseModule {
 	/**
 	 * These attributes will be ignored by default if a new account is copied from an existing one.
 	 */
-	const ATTRIBUTES_TO_IGNORE_ON_COPY = ['sAMAccountName', 'msSFU30Name', 'msSFU30NisDomain'];
+	private const ATTRIBUTES_TO_IGNORE_ON_COPY = ['sAMAccountName', 'msSFU30Name', 'msSFU30NisDomain'];
 
 	/** possible group types (e.g. distribution) */
 	private $groupTypes;

lam/lib/modules/windowsHost.inc

@@ -39,7 +39,7 @@ class windowsHost extends baseModule {
 	/**
 	 * These attributes will be ignored by default if a new account is copied from an existing one.
 	 */
-	const ATTRIBUTES_TO_IGNORE_ON_COPY = ['sAMAccountName', 'pwdLastSet', 'lastLogonTimestamp',
+	private const ATTRIBUTES_TO_IGNORE_ON_COPY = ['sAMAccountName', 'pwdLastSet', 'lastLogonTimestamp',
 		'logonCount'];
 
 	/**

lam/lib/modules/windowsUser.inc

@@ -56,7 +56,7 @@ class windowsUser extends baseModule implements passwordService, AccountStatusPr
 	/**
 	 * These attributes will be ignored by default if a new account is copied from an existing one.
 	 */
-	const ATTRIBUTES_TO_IGNORE_ON_COPY = ['userPrincipalName', 'sAMAccountName', 'displayName',
+	private const ATTRIBUTES_TO_IGNORE_ON_COPY = ['userPrincipalName', 'sAMAccountName', 'displayName',
 		'profilePath', 'scriptPath', 'pwdLastSet', 'otherMailbox', 'homeDirectory', 'msSFU30Name',
 		'pwdLastSet', 'lastLogonTimestamp', 'accountexpires', 'lockouttime'];