Merge branch 'master' into talmdal_dev

Conflicts:
	modules/rest/controllers/rest.php

3 files changed, 24 insertions, 16 deletions

diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
index 7440350f..49999520 100644
--- a/modules/rest/helpers/rest.php
+++ b/modules/rest/helpers/rest.php
@@ -37,13 +37,13 @@ class rest_Core {
     }
   }
 
-  static function set_active_user($access_token) {
-    if (empty($access_token)) {
+  static function set_active_user($access_key) {
+    if (empty($access_key)) {
       throw new Rest_Exception("Forbidden", 403);
     }
 
-    $key = ORM::factory("user_access_token")
-      ->where("access_key", "=", $access_token)
+    $key = ORM::factory("user_access_key")
+      ->where("access_key", "=", $access_key)
       ->find();
 
     if (!$key->loaded()) {
@@ -58,8 +58,8 @@ class rest_Core {
     identity::set_active_user($user);
   }
 
-  static function get_access_token($user_id) {
-    $key = ORM::factory("user_access_token")
+  static function get_access_key($user_id) {
+    $key = ORM::factory("user_access_key")
       ->where("user_id", "=", $user_id)
       ->find();
 
diff --git a/modules/rest/helpers/rest_event.php b/modules/rest/helpers/rest_event.php
index 91affe7a..c89436c0 100644
--- a/modules/rest/helpers/rest_event.php
+++ b/modules/rest/helpers/rest_event.php
@@ -24,7 +24,7 @@ class rest_event {
    */
   static function user_before_delete($user) {
     db::build()
-      ->delete("user_access_tokens")
+      ->delete("user_access_keys")
        ->where("id", "=", $user->id)
        ->execute();
   }
@@ -34,7 +34,7 @@ class rest_event {
    * on every add.
    */
   static function user_add_form_admin_completed($user, $form) {
-    $key = ORM::factory("user_access_token");
+    $key = ORM::factory("user_access_key");
     $key->user_id = $user->id;
     $key->access_key = md5($user->name . rand());
     $key->save();
@@ -58,7 +58,7 @@ class rest_event {
    * Get the form fields for user edit
    */
   static function _get_access_key_form($user, $form) {
-    $key = ORM::factory("user_access_token")
+    $key = ORM::factory("user_access_key")
       ->where("user_id", "=", $user->id)
       ->find();
 
@@ -68,7 +68,7 @@ class rest_event {
       $key->save();
     }
 
-    $form->edit_user->input("user_access_token")
+    $form->edit_user->input("user_access_key")
       ->value($key->access_key)
       ->readonly("readonly")
       ->class("g-form-static")
@@ -87,9 +87,9 @@ class rest_event {
     }
 
     $view = new View("user_profile_rest.html");
-    $key = ORM::factory("user_access_token")
-        ->where("user_id", "=", $data->user->id)
-        ->find();
+    $key = ORM::factory("user_access_key")
+      ->where("user_id", "=", $data->user->id)
+      ->find();
 
     if (!$key->loaded()) {
       $key->user_id = $data->user->id;
diff --git a/modules/rest/helpers/rest_installer.php b/modules/rest/helpers/rest_installer.php
index f69f62d1..aeb9573e 100644
--- a/modules/rest/helpers/rest_installer.php
+++ b/modules/rest/helpers/rest_installer.php
@@ -20,7 +20,7 @@
 class rest_installer {
   static function install() {
     Database::instance()
-      ->query("CREATE TABLE {user_access_tokens} (
+      ->query("CREATE TABLE {user_access_keys} (
                 `id` int(9) NOT NULL auto_increment,
                 `user_id` int(9) NOT NULL,
                 `access_key` char(32) NOT NULL,
@@ -28,10 +28,18 @@ class rest_installer {
                 UNIQUE KEY(`access_key`),
                 UNIQUE KEY(`user_id`))
               DEFAULT CHARSET=utf8;");
-    module::set_version("rest", 1);
+    module::set_version("rest", 2);
+  }
+
+  static function upgrade($version) {
+    $db = Database::instance();
+    if ($version == 1) {
+      $db->query("RENAME TABLE {user_access_tokens} TO {user_access_keys}");
+      module::set_version("rest", $version = 2);
+    }
   }
 
   static function uninstall() {
-    Database::instance()->query("DROP TABLE IF EXISTS {user_access_tokens}");
+    Database::instance()->query("DROP TABLE IF EXISTS {user_access_keys}");
   }
 }