diff --git a/authorizationdb.php b/authorizationdb.php index afa08db..3ec3a3b 100644 --- a/authorizationdb.php +++ b/authorizationdb.php @@ -63,7 +63,7 @@ class authorizationdb extends authorization if (substr ($object, -1) === "/") $object = substr ($object, 0, -1); if (substr ($object, 0, 1) !== "/") - throw new Exception (_("Object don't start by slash"), 412); + throw new Exception (_("Object don't start by slash"), 406); $object = preg_replace ("#//+#", "/", $object); if ($this->authiduser === "") throw new Exception (_("Not authenticated"), 401); @@ -73,7 +73,7 @@ class authorizationdb extends authorization } catch (Exception $e) { - throw new Exception ($e->getMessage(), 401); + throw new Exception ($e->getMessage(), 405); } // All the folder structure is accessible. Check if the object already @@ -137,21 +137,21 @@ class authorizationdb extends authorization if (substr ($object, -1) === "/") $object = substr ($object, 0, -1); if (substr ($object, 0, 1) !== "/") - throw new Exception (_("Object don't start by slash"), 412); + throw new Exception (_("Object don't start by slash"), 406); $object = preg_replace ("#//+#", "/", $object); if ($this->authiduser === "") - throw new Exception (_("Not authenticated !!"), 401); + throw new Exception (_("Not authenticated"), 401); if ($this->authiduser !== 0 && $this->authiduser !== $ownerid) - throw new Exception (_("Can't create object not owned by myself"), 412); + throw new Exception (_("Can't create object not owned by myself"), 406); if ($this->authiduser !== 0 && !in_array ($groupid, $this->authgroups)) - throw new Exception (_("Can't create object with not owned group"), 412); + throw new Exception (_("Can't create object with not owned group"), 406); try { $this->treecheckExecute ($object); } catch (Exception $e) { - throw new Exception ($e->getMessage(), 401); + throw new Exception ($e->getMessage(), 405); } // All the folder structure is accessible. Check if the object already @@ -178,7 +178,7 @@ class authorizationdb extends authorization } catch (Exception $e) { - throw new Exception ($e->getMessage(), 401); + throw new Exception ($e->getMessage(), 405); } $this->db->create (array ("object"=>$object, @@ -198,19 +198,19 @@ class authorizationdb extends authorization if (substr ($object, -1) === "/") $object = substr ($object, 0, -1); if (substr ($object, 0, 1) !== "/") - throw new Exception (_("Object don't start by slash"), 412); + throw new Exception (_("Object don't start by slash"), 406); $object = preg_replace ("#//+#", "/", $object); if ($this->authiduser === "") throw new Exception (_("Not authenticated"), 401); if ($object === "/") - throw new Exception (_("The root can not be removed"), 412); + throw new Exception (_("The root can not be removed"), 406); try { $this->treecheckExecute ($object); } catch (Exception $e) { - throw new Exception ($e->getMessage(), 401); + throw new Exception ($e->getMessage(), 405); } // All the folder structure is accessible. Check if the object already @@ -226,9 +226,9 @@ class authorizationdb extends authorization { $rc = $this->db->delete ($object); if ($rc > 1) - throw new Exception (_("Removing more than one object"), 412); + throw new Exception (_("Removing more than one object"), 406); if ($rc == 0) - throw new Exception (_("No object removed"), 412); + throw new Exception (_("No object removed"), 406); $rc = $this->db->delete ("$object$this->separator%"); return TRUE; } @@ -239,14 +239,14 @@ class authorizationdb extends authorization } catch (Exception $e) { - throw new Exception ($e->getMessage(), 401); + throw new Exception ($e->getMessage(), 405); } $rc = $this->db->delete ($object); if ($rc > 1) - throw new Exception (_("Removing more than one object"), 412); + throw new Exception (_("Removing more than one object"), 406); if ($rc == 0) - throw new Exception (_("No object removed"), 412); + throw new Exception (_("No object removed"), 406); $rc = $this->db->delete ("$object$this->separator%"); return TRUE; } @@ -263,19 +263,19 @@ class authorizationdb extends authorization if (substr ($object, -1) === "/") $object = substr ($object, 0, -1); if (substr ($object, 0, 1) !== "/") - throw new Exception (_("Object don't start by slash"), 412); + throw new Exception (_("Object don't start by slash"), 406); $object = preg_replace ("#//+#", "/", $object); if ($this->authiduser === "") - throw new Exception (_("Not authenticated !!"), 401); + throw new Exception (_("Not authenticated"), 401); if ($this->authiduser !== 0) - throw new Exception (_("The chown is reserved to root user"), 401); + throw new Exception (_("The chown is reserved to root user"), 405); try { $this->treecheckExecute ($object); } catch (Exception $e) { - throw new Exception ($e->getMessage(), 401); + throw new Exception ($e->getMessage(), 405); } // All the folder structure is accessible. Check if the object already @@ -301,21 +301,21 @@ class authorizationdb extends authorization if (substr ($object, -1) === "/") $object = substr ($object, 0, -1); if (substr ($object, 0, 1) !== "/") - throw new Exception (_("Object don't start by slash"), 412); + throw new Exception (_("Object don't start by slash"), 406); $object = preg_replace ("#//+#", "/", $object); if ($this->authiduser === "") throw new Exception (_("Not authenticated"), 401); if ($this->authiduser !== 0 && !in_array ($groupid, $this->authgroups)) - throw new Exception (_("The user must be in the wanted group"), 401); + throw new Exception (_("The user must be in the wanted group"), 405); if (!in_array ("WRITE", $this->validate ($object))) - throw new Exception (sprintf (_("%s is write protected"), $object), 401); + throw new Exception (sprintf (_("%s is write protected"), $object), 405); try { $this->treecheckExecute ($object); } catch (Exception $e) { - throw new Exception ($e->getMessage(), 401); + throw new Exception ($e->getMessage(), 405); } // All the folder structure is accessible. Check if the object already @@ -341,19 +341,19 @@ class authorizationdb extends authorization if (substr ($object, -1) === "/") $object = substr ($object, 0, -1); if (substr ($object, 0, 1) !== "/") - throw new Exception (_("Object don't start by slash"), 412); + throw new Exception (_("Object don't start by slash"), 406); $object = preg_replace ("#//+#", "/", $object); if ($this->authiduser === "") throw new Exception (_("Not authenticated"), 401); if (!in_array ("WRITE", $this->validate ($object))) - throw new Exception (sprintf (_("%s is write protected"), $object), 401); + throw new Exception (sprintf (_("%s is write protected"), $object), 405); try { $this->treecheckExecute ($object); } catch (Exception $e) { - throw new Exception ($e->getMessage(), 401); + throw new Exception ($e->getMessage(), 405); } // All the folder structure is accessible. Check if the object already @@ -379,7 +379,7 @@ class authorizationdb extends authorization if (substr ($object, -1) === "/") $object = substr ($object, 0, -1); if (substr ($object, 0, 1) !== "/") - throw new Exception (_("Object don't start by slash"), 412); + throw new Exception (_("Object don't start by slash"), 406); $object = preg_replace ("#//+#", "/", $object); if ($this->authiduser === "") throw new Exception (_("Not authenticated"), 401); @@ -389,7 +389,7 @@ class authorizationdb extends authorization } catch (Exception $e) { - throw new Exception ($e->getMessage(), 401); + throw new Exception ($e->getMessage(), 405); } // All the folder structure is accessible. Check if the object already @@ -413,17 +413,17 @@ class authorizationdb extends authorization if (substr ($object, -1) === "/") $object = substr ($object, 0, -1); if (substr ($object, 0, 1) !== "/") - throw new Exception (_("Object don't start by slash"), 412); + throw new Exception (_("Object don't start by slash"), 406); $object = preg_replace ("#//+#", "/", $object); if ($this->authiduser === "") - throw new Exception (_("Not authenticated !!"), 401); + throw new Exception (_("Not authenticated"), 401); try { $this->treecheckExecute ($object); } catch (Exception $e) { - throw new Exception ($e->getMessage(), 401); + throw new Exception ($e->getMessage(), 405); } // All the folder structure is accessible. Check if the object already @@ -447,17 +447,17 @@ class authorizationdb extends authorization if (substr ($object, -1) === "/") $object = substr ($object, 0, -1); if (substr ($object, 0, 1) !== "/") - throw new Exception (_("Object don't start by slash"), 412); + throw new Exception (_("Object don't start by slash"), 406); $object = preg_replace ("#//+#", "/", $object); if ($this->authiduser === "") - throw new Exception (_("Not authenticated !!"), 401); + throw new Exception (_("Not authenticated"), 401); try { $this->treecheckExecute ($object); } catch (Exception $e) { - throw new Exception ($e->getMessage(), 401); + throw new Exception ($e->getMessage(), 405); } // All the folder structure is accessible. Check if the object already @@ -465,7 +465,7 @@ class authorizationdb extends authorization $search = $this->db->read (array (array ("object", $object))); if (count ($search) === 0) throw new Exception (sprintf (_("Object %s doesn't exists"), $object), - 400); + 404); $search = reset ($search); return intval ($search["groupid"]); } @@ -539,7 +539,7 @@ class authorizationdb extends authorization if (($parentModbits & 0001) === 1) continue; - throw new Exception (sprintf (_("No execute rights on %s"), $p), 401); + throw new Exception (sprintf (_("No execute rights on %s"), $p), 405); } } return TRUE; @@ -569,6 +569,6 @@ class authorizationdb extends authorization if (($parentModbits & 0002) === 2) return TRUE; - throw new Exception (sprintf (_("No write rights on %s"), $parent), 401); + throw new Exception (sprintf (_("No write rights on %s"), $parent), 405); } }