diff --git a/htroot/Blog.java b/htroot/Blog.java index 74474b5e0..ef2654539 100644 --- a/htroot/Blog.java +++ b/htroot/Blog.java @@ -107,7 +107,7 @@ public class Blog { if(!hasRights){ final userDB.Entry userentry = switchboard.userDB.proxyAuth((String)header.get("Authorization", "xxxxxx")); - if(userentry != null && userentry.hasBlogRight()){ + if(userentry != null && userentry.hasRight(userDB.Entry.BLOG_RIGHT)){ hasRights=true; } else if(post.containsKey("login")) { //opens login window if login link is clicked - contrib [MN] diff --git a/htroot/BlogComments.java b/htroot/BlogComments.java index 1f84494e4..ebc8a2ee8 100644 --- a/htroot/BlogComments.java +++ b/htroot/BlogComments.java @@ -92,7 +92,7 @@ public class BlogComments { if(!hasRights){ userDB.Entry userentry = switchboard.userDB.proxyAuth((String)header.get("Authorization", "xxxxxx")); - if(userentry != null && userentry.hasBlogRight()){ + if(userentry != null && userentry.hasRight(userDB.Entry.BLOG_RIGHT)){ hasRights=true; } //opens login window if login link is clicked - contrib [MN] diff --git a/htroot/htdocsdefault/dir.java b/htroot/htdocsdefault/dir.java index c0528e2af..613d9a70e 100644 --- a/htroot/htdocsdefault/dir.java +++ b/htroot/htdocsdefault/dir.java @@ -128,9 +128,9 @@ public class dir { uploadAuthorization = (adminAuthorization ||(uploadAccountBase64MD5.length() != 0 && uploadAccountBase64MD5.equals(authorizationMD5))); downloadAuthorization = (adminAuthorization || uploadAuthorization || downloadAccountBase64MD5.length() == 0 || downloadAccountBase64MD5.equals(authorizationMD5)); }else{ //userDB - adminAuthorization=entry.hasAdminRight(); - uploadAuthorization=entry.hasUploadRight(); - downloadAuthorization=entry.hasDownloadRight(); + adminAuthorization=entry.hasRight(userDB.Entry.ADMIN_RIGHT); + uploadAuthorization=entry.hasRight(userDB.Entry.UPLOAD_RIGHT); + downloadAuthorization=entry.hasRight(userDB.Entry.DOWNLOAD_RIGHT); } // do authentitcate processes by triggering the http authenticate method diff --git a/source/de/anomic/kelondro/kelondroFlexTable.java b/source/de/anomic/kelondro/kelondroFlexTable.java index fe84a4a35..a076d0373 100644 --- a/source/de/anomic/kelondro/kelondroFlexTable.java +++ b/source/de/anomic/kelondro/kelondroFlexTable.java @@ -72,7 +72,7 @@ public class kelondroFlexTable extends kelondroFlexWidthArray implements kelondr long start = System.currentTimeMillis(); - if (serverMemory.available(neededRAM, true)) { + if (serverMemory.request(neededRAM, true)) { // we can use a RAM index if (indexfile.exists()) { diff --git a/source/de/anomic/ymage/ymageMatrix.java b/source/de/anomic/ymage/ymageMatrix.java index baf6d0ee9..e71a3c0bd 100644 --- a/source/de/anomic/ymage/ymageMatrix.java +++ b/source/de/anomic/ymage/ymageMatrix.java @@ -84,7 +84,7 @@ public class ymageMatrix /*implements Cloneable*/ { } public ymageMatrix(int width, int height, long backgroundColor) { - if (!(serverMemory.available(1024 * 1024 + 3 * width * height, true))) throw new RuntimeException("ymage: not enough memory (" + serverMemory.available() + ") available"); + if (!(serverMemory.request(1024 * 1024 + 3 * width * height, false))) throw new RuntimeException("ymage: not enough memory (" + serverMemory.available() + ") available"); this.width = width; this.height = height; this.defaultCol = new int[]{0xFF, 0xFF, 0xFF};