Project

General

Profile

« Previous | Next » 

Revision 4589

Added by daigle over 15 years ago

Rename LDAPUtil to AuthUtil

View differences:

DocumentImpl.java
58 58
import edu.ucsb.nceas.metacat.service.XMLSchema;
59 59
import edu.ucsb.nceas.metacat.service.XMLSchemaService;
60 60
import edu.ucsb.nceas.metacat.spatial.SpatialHarvester;
61
import edu.ucsb.nceas.metacat.util.LDAPUtil;
61
import edu.ucsb.nceas.metacat.util.AuthUtil;
62 62
import edu.ucsb.nceas.metacat.util.MetaCatUtil;
63 63
import edu.ucsb.nceas.metacat.util.SystemUtil;
64 64
import edu.ucsb.nceas.utilities.FileUtil;
......
2628 2628
        if (action.equals("UPDATE")) {
2629 2629
            // check for 'write' permission for 'user' to update this document
2630 2630
            if (!hasWritePermission(user, groups, accnum) 
2631
            		&& !LDAPUtil.isAdministrator(user, groups)) {
2631
            		&& !AuthUtil.isAdministrator(user, groups)) {
2632 2632
                throw new Exception(
2633 2633
                    "User " + user
2634 2634
                    + " does not have permission to update XML Document #"
......
3082 3082
            double start = System.currentTimeMillis()/1000;
3083 3083
            // check for 'write' permission for 'user' to delete this document
3084 3084
            if (!hasAllPermission(user, groups, accnum)) {
3085
                if(!LDAPUtil.isAdministrator(user, groups)){
3085
                if(!AuthUtil.isAdministrator(user, groups)){
3086 3086
                    throw new Exception(
3087 3087
                        "User " + user
3088 3088
                        + " does not have permission to delete XML Document #"

Also available in: Unified diff