Group Creation

core/Api/GroupsAPI.class.php

@@ -2,8 +2,21 @@
 
 namespace Api {
 
+  use Driver\SQL\Condition\Compare;
+
   class GroupsAPI extends Request {
 
+    protected function groupExists($name) {
+      $sql = $this->user->getSQL();
+      $res = $sql->select($sql->count())
+        ->from("Group")
+        ->where(new Compare("name", $name))
+        ->execute();
+
+      $this->success = ($res !== FALSE);
+      $this->lastError = $sql->getLastError();
+      return $this->success && $res[0]["count"] > 0;
+    }
   }
 
 }
@@ -12,6 +25,7 @@ namespace Api\Groups {
 
   use Api\GroupsAPI;
   use Api\Parameter\Parameter;
+  use Api\Parameter\StringType;
 
   class Fetch extends GroupsAPI {
 
@@ -96,4 +110,53 @@ namespace Api\Groups {
     }
   }
 
+  class Create extends GroupsAPI {
+    public function __construct($user, $externalCall = false) {
+      parent::__construct($user, $externalCall, array(
+        'name' => new StringType('name', 32),
+        'color' => new StringType('color', 10),
+      ));
+
+      $this->loginRequired = true;
+      $this->requiredGroup = array(USER_GROUP_ADMIN);
+    }
+
+    public function execute($values = array()) {
+      if (!parent::execute($values)) {
+        return false;
+      }
+
+      $name = $this->getParam("name");
+      if (preg_match("/^[a-zA-Z][a-zA-Z0-9_-]*$/", $name) !== 1) {
+        return $this->createError("Invalid name");
+      }
+
+      $color = $this->getParam("color");
+      if (preg_match("/^#[a-fA-F0-9]{3,6}$/", $color) !== 1) {
+        return $this->createError("Invalid color");
+      }
+
+      $exists = $this->groupExists($name);
+      if (!$this->success) {
+        return false;
+      } else if ($exists) {
+        return $this->createError("A group with this name already exists");
+      }
+
+      $sql = $this->user->getSQL();
+      $res = $sql->insert("Group", array("name", "color"))
+        ->addRow($name, $color)
+        ->returning("uid")
+        ->execute();
+
+      $this->success = ($res !== FALSE);
+      $this->lastError = $sql->getLastError();
+
+      if ($this->success) {
+        $this->result["uid"] = $sql->getLastInsertId();
+      }
+
+      return $this->success;
+    }
+  }
 }

core/Api/UserAPI.class.php

@@ -118,7 +118,7 @@ namespace Api\User {
     public function __construct($user, $externalCall = false) {
       parent::__construct($user, $externalCall, array(
         'username' => new StringType('username', 32),
-        'email' => new StringType('email', 64, true),
+        'email' => new Parameter('email', Parameter::TYPE_EMAIL, true, NULL),
         'password' => new StringType('password'),
         'confirmPassword' => new StringType('confirmPassword'),
       ));
@@ -501,7 +501,7 @@ If the invitation was not intended, you can simply ignore this email.<br><br><a
     public function __construct($user, $externalCall = false) {
       parent::__construct($user, $externalCall, array(
         "username" => new StringType("username", 32),
-        "email" => new StringType("email", 64),
+        'email' => new Parameter('email', Parameter::TYPE_EMAIL),
         "password" => new StringType("password"),
         "confirmPassword" => new StringType("confirmPassword"),
       ));
@@ -608,7 +608,7 @@ If the registration was not intended, you can simply ignore this email.<br><br><
       parent::__construct($user, $externalCall, array(
         'id' => new Parameter('id', Parameter::TYPE_INT),
         'username' => new StringType('username', 32, true, NULL),
-        'email' => new StringType('email', 64, true, NULL),
+        'email' => new Parameter('email', Parameter::TYPE_EMAIL, true, NULL),
         'password' => new StringType('password', -1, true, NULL),
         'groups' => new Parameter('groups', Parameter::TYPE_ARRAY, true, NULL),
       ));