[Patch] Updating ldap database cache table names

cernbox · Mar 31, 2016 · 942bf33 · 942bf33
1 parent cdd1613
commit 942bf33
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/db_structure.xml b/db_structure.xml
@@ -1318,7 +1318,7 @@
 	</table>
 
 	<table>
-		<name>ldap_groups</name>
+		<name>cernbox_ldap_groups</name>
 		<declaration>
 			<field>
 				<name>cn</name>
@@ -1339,7 +1339,7 @@
 	</table>
 
 	<table>
-		<name>ldap_group_members</name>
+		<name>cernbox_ldap_group_members</name>
 		<declaration>
 			<field>
 				<name>user_cn</name>
@@ -1370,7 +1370,7 @@
 	</table>
 
 	<table>
-		<name>ldap_group_members</name>
+		<name>cernbox_ldap_group_members</name>
 		<declaration>
 			<field>
 				<name>user_cn</name>

diff --git a/lib/ldapupdatecron.php b/lib/ldapupdatecron.php
@@ -252,7 +252,7 @@ function insertIntoDatabase($table, $sql, $useLoadData = false)
 
 		//cronlog('Inserting groups into database...');
 
-		insertIntoDatabase('ldap_groups', buildQuery('ldap_groups', 's', ['cn'], $ldapGroups));
+		insertIntoDatabase('cernbox_ldap_groups', buildQuery('cernbox_ldap_groups', 's', ['cn'], $ldapGroups));
 		unset($ldapGroups);
 
 		//cronlog('Done');
@@ -281,13 +281,13 @@ function insertIntoDatabase($table, $sql, $useLoadData = false)
 
 		//cronlog('Inserting users into database...');
 
-		insertIntoDatabase('ldap_users', buildQuery('ldap_users', 'siss', ['cn','uidnumber','displayname','employeetype'], $ldapUsers));
+		insertIntoDatabase('cernbox_ldap_users', buildQuery('cernbox_ldap_users', 'siss', ['cn','uidnumber','displayname','employeetype'], $ldapUsers));
 		unset($ldapUsers);
 
 		//cronlog('Done');
 		//cronlog('Inserting users <-> groups into database...');
 
-		insertIntoDatabase('ldap_group_members', buildCVSFile('ss', ['user_cn','group_cn'], $userGroups), true);
+		insertIntoDatabase('cernbox_ldap_group_members', buildCVSFile('ss', ['user_cn','group_cn'], $userGroups), true);
 		unset($userGroups);
 
 		cronlog('Done');

diff --git a/lib/private/cache/ldapdatabase.php b/lib/private/cache/ldapdatabase.php
@@ -3,9 +3,9 @@
 
 class LDAPDatabase
 {
-	const GROUPS_TABLE = 'ldap_groups';
-	const USERS_TABLE = 'ldap_users';
-	const GROUP_MAPPINGS = 'ldap_group_members';
+	const GROUPS_TABLE = 'cernbox_ldap_groups';
+	const USERS_TABLE = 'cernbox_ldap_users';
+	const GROUP_MAPPINGS = 'cernbox_ldap_group_members';
 
 	/**
 	 *