diff --git a/lib/administration/GroupManager.inc b/lib/administration/GroupManager.inc deleted file mode 100644 index 0ef7de7..0000000 --- a/lib/administration/GroupManager.inc +++ /dev/null @@ -1,386 +0,0 @@ -owl_groups_table WHERE name = '" . $name . "'"; - $sql->query($query); - $rows = $sql->num_rows($sql); - - if ($rows > 0) - { - // duplicate username - $default->errorMessage = "GroupManager::The Group name " . $name . " is already in use, please choose another one"; - $default->log->debug($default->errorMessage); - return false; - } - // insert the user - $query = "INSERT INTO $default->owl_groups_table (name) VALUES ('" . $name . "')"; - - $result = $sql->query($query); - - if(!'result') - { - $default->log->debug( "GroupManager::New Group Addition Unsuccessful!
"); - return false; - } - else - { - $default->log->debug ("GroupManager::New Group added Successfully!
"); - return true; - } - - - -} - - /** - * Removes a group from the groups table as well as from the groups_units_link table - * - * @param groupID - * The id of the group to be deleted - * @return boolean - * True if the deletion was successful, else false if not or nonexistant. - */ - function removeGroup($groupID) - { - global $default; - // create a connection - $sql = new Owl_DB; - - //do validation that userid exists - $query = "SELECT * FROM $default->owl_groups_table WHERE id = '" . $groupID ."'"; - $result = $sql->query($query); - $row = $sql->num_rows($result); - - // check if result was found..0 if not - if($row == 0) - { - $default->log->debug("GroupManager::Group does not exist in the database
"); - return false; - } - - //if user id exists delete it from the users table - $query = "DELETE FROM $default->owl_groups_table WHERE id = $groupID"; - $result = $sql->query($query); - - if(!'result') - { - $default->log->debug("GroupManager::Deletion unsuccessful
"); - return false; - } - else - { - $default->log->debug ("GroupManager::Deletion from user table Successful
"); - //check if belongs to group - - $result= $this->removeGroupFromUnit($groupID); - return true; - } - - - - } - - /** - * Updates groups details ..ie rename the group - * - * @param groupID - * the group which is to be renamed - * @param name - * new name of the group - * @return boolean - * true if the addition was successful, else false. - */ - function updateGroup($groupID, $name) - { - global $default; - // create a connection - $sql = new Owl_DB; - - //do validation that userid exists - $query = "SELECT * FROM $default->owl_groups_table WHERE id = $groupID"; - $result = $sql->query($query); - $row = $sql->num_rows($result); - - //if row = 0 ...then no entry was found..so return false - if($row == 0) - { - $default->log->debug("GroupManager::Group does not exist in the database
"); - return false; - } - - //if user id exists update all info into the users table - $query = "UPDATE $default->owl_groups_table SET name = '" . $name . "' WHERE id = $groupID " ; - - $result = $sql->query($query); - - - // error checking to see if success - if(!'result') - { - $default->log->debug("GroupManager::Not Updated"); - return false; - } - else - { - $default->log->debug("GroupManager::Update Successful
"); - return true; - } - } - - /** - * Returns an array of all the groups - * - * @return array - * An array of groups - */ - function listGroups() - { - - global $default; - $groups = array (); - $i = 0; - // create a connection - $sql = new Owl_DB; - - //Get list of all the usernames - $query = "SELECT name FROM $default->owl_groups_table"; - $result = $sql->query($query); - $row = $sql->num_rows($result); - - //error checking - if($row == 0) - { - $default->log->debug("GroupManager::No users in table"); - return false; - } - - //store in array - while($sql->next_record()) - { - $groups["$i"] = array("name" => $sql->f("name")); - $i++; - } - - //return an array of the groups - return $groups; - - } - - /** - * - * Adds a group to a unit NB: Group belongs to 1 unit only - * - * @param groupID - * The ID of the group to add the user to - * @param unitID - * The Id of the unit to add to - * @return boolean - * True if the addition was successful, else false if not or nonexistant. - */ - function addGroupToUnit($groupID,$unitID) - { - global $default; - // create a connection - $sql = new Owl_DB; - - //do validation that groupid exists - $query = "SELECT * FROM $default->owl_groups_units_table WHERE group_id = $groupID"; - $result = $sql->query($query); - $row = $sql->num_rows($result); - - // if it does exist return false..already there - if($row >= 1) - { - $default->log->debug("GroupManager::Group already belongs to a unit
"); - return false; - } - - //add user to the table - $query = "INSERT INTO $default->owl_groups_units_table (group_id,unit_id) VALUES($groupID,$unitID)"; - $result = $sql->query($query); - - if(!'result') - { - $default->log->debug("GroupManager::Insertion into groups_units table unsuccessful
"); - return false; - } - else - { - $default->log->debug("GroupManager::Insertion into groups_units table Successful
"); - return true; - } - - } - - - /** - * Removes a group from a unit NB: Group can only belong to 1 unit - * - * @param groupID - * The ID of the group be removed from a unit - - * @return boolean - * True if the deletion was successful, else false if not or nonexistant. - */ - function removeGroupFromUnit($groupID) - { - global $default; - // create a connection - $sql = new Owl_DB; - - //do validation that groupid exists - $query = "SELECT * FROM $default->owl_groups_units_table WHERE group_id = $groupID"; - $result = $sql->query($query); - $row = $sql->num_rows($result); - - // check if result was found..0 if not - if($row == 0) - { - $default->log->debug("GroupManager::Group does not exist in the database
"); - return false; - } - - //if group id exists delete it from the users table - $query = "DELETE FROM $default->owl_groups_units_table WHERE group_id = $groupID"; - $result = $sql->query($query); - - if(!'result') - { - $default->log->debug ("GroupManager::Deletion unsuccessful
"); - return false; - } - else - { - $default->log->debug("GroupManager::Deletion from user_group_link table Successful
"); - return true; - } - - } - /* - * - * gets the id of a group using its name - * - * @param $groupName - * The GroupName for which we want its ID - * @return Integer - * The groupname's Id - */ - - function getGroupID($groupName) - { - global $default; - - $id = lookupID($default->owl_groups_table, "name", $groupName); - - return $id; - } - - /* - * Function getGroupName($groupID) - * - * gets the id of a user using their username - * - * @param $username - * The username for which we want its ID - * @return char - * name of group - */ - - function getGroupName($groupID) - { - global $default; - - //call lookup function - $name = lookupField($default->owl_groups_table, "name" , "id", $groupID); - - return $name; - } - - /* - * - * Gets the unit that the group belongs to - * - * @param $groupID - * The ID of the group - * @return Array - * array of unitID and name of the unit - */ - function getUnit($groupID) - { - global $default; - $unitinfo = array(); - - // call lookup functions - $unitID = lookupField($default->owl_groups_units_table, "unit_id" , "group_id", $groupID); - $unitName = lookupField($default->owl_units_table, "name" , "id", $unitID); - - $unitinfo[1] = array("id" => $unitID, "name" => $unitName); - - // return an array - return $unitinfo; - - } - - - - /* - * - * gets the org details of the org a unit belongs to TODO: move into System/Or Management - * - * @param orgID - * The id of the org who's name we want based on the unit who belongs to it - * @return array - * if and name of org - */ - - function getOrg($unitID) - { - - global $default; - $orginfo = array(); - - // call lookup functions - $orgID = lookupField($default->owl_units_table, "organisation_id" , "id", $unitID); - $orgName = lookupField($default->owl_organisations_table, "name" , "id", $orgID); - - $orginfo[1] = array("id" => $orgID, "name" => $orgName); - - // return an array - return $orginfo; - - - } - - } - -?> \ No newline at end of file diff --git a/lib/administration/UnitManager.inc b/lib/administration/UnitManager.inc deleted file mode 100644 index ebaf2e6..0000000 --- a/lib/administration/UnitManager.inc +++ /dev/null @@ -1,512 +0,0 @@ -owl_fs_root/lib/class.AuthLdap.php"); - -/** - * $Id$ - * - * Performs unit administration tasks- this includes user, group and category management, - * - * @version $Revision$ - * @author Mukhtar Dharsey - * @package lib.administration - */ -/*-----------------------------------------------------------------*/ -/** - * Class Unit Manager - * - * Performs unit administration tasks- this includes user, group and category management, - * - * - */ -/*-----------------------------------------------------------------*/ - -class UnitManager { - - /** - * Handle to the ldap util class - */ - var $ldap; - - // user management - - /*-----------------------------------------------------------------*/ - /* - * Function ListLdapUsers($userNameSearch) - * - * Searches the LDAP directory for users matching the supplied search string. - * - * @param $userNameSearch - * the username to search for - * @return - * returns an array containing the users found - */ - /*-----------------------------------------------------------------*/ - function listLdapUsers($userNameSearch) { - global $default; - - // user attributes to search for - $attributes = array ("dn", "uid", "givenname", "sn", "mail", "mobile"); - // initialise the ldap connection - $ldap = new AuthLdap(); - $server[0] = $default->ldapServer; - $ldap->server = $server; - $ldap->dn = $default->ldapRootDn; - - if ( $ldap->connect()) { - // search for the users - // append and prepend wildcards - $userArray = $ldap->getUsers("*" . $userNameSearch . "*", $attributes); - if ($userArray) { - // return the array - return $userArray; - } else { - // the search failed, bail - return false; - } - } else { - // ldap connection failed, bail - // TODO: error handling - return false; - /* - echo "There was a problem.
"; - echo "Error code : " . $ldap->ldapErrorCode . "
"; - echo "Error text : " . $ldap->ldapErrorText . "
"; - */ - } - } - - - //----------------------------------------------------------------- - /* - * Function addUser($unitID, $userDetails) - * - * Adds a user to the unit. - * - * @param unitID - * the ID of the unit to add the user to - * @param userDetails - * an array containing the details of the user - * @return - * true if the addition was successful, else false. - */ - //----------------------------------------------------------------- - function addUser($unitID, $userDetails) { - global $default; - - $sql = new Owl_DB; - - // TODO: userDetails validation - - // check that the username is unique - $query = "select username from $default->owl_users_table where username = '" . $userDetails['username'] . "'"; - $sql->query($query); - $numrows = $sql->num_rows($sql); - - if ($numrows > 0) { - // duplicate username - $default->errorMessage = "The username " . $userDetails['username'] . " is already in use, please choose another one"; - return false; - } - // insert the user - $query = "insert into $default->owl_users_table (username, name, password, email, mobile, ldap_dn) " . - "values ( '" . $userDetails['username'] . "', " . - "'" . $userDetails['name'] . "', " . - "'', " . - "'" . $userDetails['email'] . "', " . - "'" . $userDetails['mobile'] . "', " . - "'" . $userDetails['ldap_dn'] . "')"; - $result = $sql->query($query); - if(!'result') { - return false; - } else { - echo "insert into user table worked!
"; - } - - // TODO: insert into group table - - // TODO: must check that username is unique! - // retrieve the generated id for insert into the user unit mapping table - $query = "select * from $default->owl_users_table where username = '" . $userDetails['username'] . "'"; - $sql->query($query); - $numrows = $sql->num_rows($sql); - - if ($numrows == "1") { - while($sql->next_record()) { - $userID = $sql->f("id"); - echo "read userID=$userID from db
"; - } - } else { - // select failed, bail - // FIXME: need a rollback here - echo "id select failed
"; - return false; - } - - // now insert into the user-unit mapping table - $query = "insert into $default->owl_user_unit_table (user_id, unit_id) values ($userID, $unitID)"; - $result = $sql->query($query); - if (!'result') { - // FIXME: rollback! - echo "insert into user-unit table failed
"; - return false; - } else { - echo "insert into user-unit table worked!
"; - } - - return true; - } - - //----------------------------------------------------------------- - /* - * Function RemoveUser($unitID, $userID) - * - * Adds a user to the unit. - * - * @param unitID - * The ID of the unit to add the user to - * @param userID - * The Id of the User that must be deleted - * @return - * True if the deletion was successful, else false if not or nonexistant. - */ - //----------------------------------------------------------------- - function removeUser($unitID, $userID) - { - global $default; - // create a connection - $db = new Owl_DB; - - //do validation that userid exists - $sql = "SELECT * FROM $default->owl_users_table WHERE $id = $userID"; - $result = $db->query($sql) - if(!'result') - { - printf"User does not exist in the database") - return false - } - - //if user id exists delete it from the users table - $sql = "DELETE FROM $default->owl_users_table WHERE id = $userID"; - $result = $db->query($sql) - if(!'result') - { - return false; - } - else - { - echo "Deletion from user table Successful
"; - return true; - } - - } - - //----------------------------------------------------------------- - /* - * Function updateUser($userID, $userDetails) - * - * Adds a user to the unit. - * - * @param userID - * the ID of the unit to add the user to - * @param userDetails - * an array containing the details of the user - * @return - * true if the addition was successful, else false. - */ - //----------------------------------------------------------------- - function updateUser($userID, $userDetails) - { - global $default; - // create a connection - $db = new Owl_DB; - - //do validation that userid exists - $sql = "SELECT * FROM $default->owl_users_table WHERE $id = $userID"; - $result = $db->query($sql) - if(!'result') - { - printf"User does not exist in the database") - return false - } - - //if user id exists update all info into the users table - //TODO group id change?????? - $sql = "UPDATE $default->owl_users_table SET " . - " username = " . $userDetails['username'] . "," . - " name = " . $userDetails['name'] . "," . - " password = " . $userDetails['password'] . "," . - " quota_max = " . $userDetails['quota_max'] ."," . - " quota_current = " . $userDetails['quota_current'] ."," . - " name = " . $userDetails['name'] . "," . - " email = " . $userDetails['email'] . "," . - " mobile = " . $userDetails['mobile'] . "," . - " email_notification = " . $userDetails['email_notification'] ."," . - " sms_notification = " . $userDetails['sms_notification'] . " - " WHERE id = ". $userID ."" ; - - - $result = $db->query($sql) - if(!'result') - { - printf("Not Updated) - return false; - } - else - { - echo "Deletion from user table Successful
"; - return true; - } - } - //----------------------------------------------------------------- - /* - * Function listUser() - * - * returns an array of all the usernames - * - * @return - * an array of usernames - */ - //----------------------------------------------------------------- - function listUser(){ - - global $default; - // create a connection - $db = new Owl_DB; - - //Get list of all the usernames - $sql = "SELECT username FROM $default->owl_users_table"; - $result = $db->query($sql) - - //return an array of the usernames - return $result; - - } - - //----------------------------------------------------------------- - /* - * Function GetUserDetails($userID) - * - * Returns an array of all the details for a specified user. - * - * @return - * an array of usernames - */ - //----------------------------------------------------------------- - function GetUserDetails($userID){ - - global $default; - // create a connection - $db = new Owl_DB; - - //do validation that userid exists - $sql = "SELECT * FROM $default->owl_users_table WHERE $id = $userID"; - $result = $db->query($sql) - if(!'result') - { - printf"User does not exist in the database") - return false - } - - //return an array of the usernames - return $result; - - } - - // group management - - //----------------------------------------------------------------- - /* - * Function addUser($unitID, $userDetails) - * - * Adds a user to the unit. - * - * @param unitID - * the ID of the unit to add the user to - * @param userDetails - * an array containing the details of the user - * @return - * true if the addition was successful, else false. - */ - //----------------------------------------------------------------- - function createGroup($name){ - return false; - } - - //----------------------------------------------------------------- - /* - * Function addUser($unitID, $userDetails) - * - * Adds a user to the unit. - * - * @param unitID - * the ID of the unit to add the user to - * @param userDetails - * an array containing the details of the user - * @return - * true if the addition was successful, else false. - */ - //----------------------------------------------------------------- - function removeGroup($groupID){ - return false; - } - - //----------------------------------------------------------------- - /* - * Function addUser($unitID, $userDetails) - * - * Adds a user to the unit. - * - * @param unitID - * the ID of the unit to add the user to - * @param userDetails - * an array containing the details of the user - * @return - * true if the addition was successful, else false. - */ - //----------------------------------------------------------------- - function updateGroup($groupID, $name){ - return false; - } -//----------------------------------------------------------------- - /* - * Function addUser($unitID, $userDetails) - * - * Adds a user to the unit. - * - * @param unitID - * the ID of the unit to add the user to - * @param userDetails - * an array containing the details of the user - * @return - * true if the addition was successful, else false. - */ - //----------------------------------------------------------------- - function listGroup(){ - //return null; - } - //----------------------------------------------------------------- - /* - * Function addUser($unitID, $userDetails) - * - * Adds a user to the unit. - * - * @param unitID - * the ID of the unit to add the user to - * @param userDetails - * an array containing the details of the user - * @return - * true if the addition was successful, else false. - */ - //----------------------------------------------------------------- - /** - * @param groupID - * @param userID - */ - function addUserToGroup($groupID, $userID){ - return false; - } -//----------------------------------------------------------------- - /* - * Function addUser($unitID, $userDetails) - * - * Adds a user to the unit. - * - * @param unitID - * the ID of the unit to add the user to - * @param userDetails - * an array containing the details of the user - * @return - * true if the addition was successful, else false. - */ - //----------------------------------------------------------------- - /** - * @param groupID - * @param userID - */ - function removeUserFromGroup($groupID, $userID){ - return false; - } - //----------------------------------------------------------------- - /* - * Function addUser($unitID, $userDetails) - * - * Adds a user to the unit. - * - * @param unitID - * the ID of the unit to add the user to - * @param userDetails - * an array containing the details of the user - * @return - * true if the addition was successful, else false. - */ - //----------------------------------------------------------------- - // category management - - /** - * @param name - */ - function createCategory($name){ - return false; - } -//----------------------------------------------------------------- - /* - * Function addUser($unitID, $userDetails) - * - * Adds a user to the unit. - * - * @param unitID - * the ID of the unit to add the user to - * @param userDetails - * an array containing the details of the user - * @return - * true if the addition was successful, else false. - */ - //----------------------------------------------------------------- - /** - * @param categoryID - */ - function removeCategory($categoryID){ - return false; - } -//----------------------------------------------------------------- - /* - * Function addUser($unitID, $userDetails) - * - * Adds a user to the unit. - * - * @param unitID - * the ID of the unit to add the user to - * @param userDetails - * an array containing the details of the user - * @return - * true if the addition was successful, else false. - */ - //----------------------------------------------------------------- - /** - * @param name - * @param categoryID - */ - function updateCategory($name, $categoryID){ - return false; - } -//----------------------------------------------------------------- - /* - * Function addUser($unitID, $userDetails) - * - * Adds a user to the unit. - * - * @param unitID - * the ID of the unit to add the user to - * @param userDetails - * an array containing the details of the user - * @return - * true if the addition was successful, else false. - */ - //----------------------------------------------------------------- - function listCategories(){ - //return null; - } - -} -?>