Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev

Conflicts:
	modules/gallery/libraries/MY_ORM.php

2 files changed, 25 insertions, 0 deletions

diff --git a/modules/rest/helpers/rest_event.php b/modules/rest/helpers/rest_event.php
index 860c8e41..f9aa34e3 100644
--- a/modules/rest/helpers/rest_event.php
+++ b/modules/rest/helpers/rest_event.php
@@ -74,4 +74,21 @@ class rest_event {
       ->class("g-form-static")
       ->label(t("Remote access key"));
   }
+
+  static function show_user_profile($data) {
+    if ($data->display_all) {
+      $view = new View("user_profile_rest.html");
+      $key = ORM::factory("user_access_token")
+        ->where("user_id", "=", $data->user->id)
+        ->find();
+
+      if (!$key->loaded()) {
+        $key->user_id = $data->user->id;
+        $key->access_key = md5($data->user->name . rand());
+        $key->save();
+      }
+      $view->rest_key = $key->access_key;
+      $data->content[] = (object)array("title" => t("Rest api"), "view" => $view);
+    }
+  }
 }
diff --git a/modules/rest/views/user_profile_rest.html.php b/modules/rest/views/user_profile_rest.html.php
new file mode 100644
index 00000000..3807817e
--- /dev/null
+++ b/modules/rest/views/user_profile_rest.html.php
@@ -0,0 +1,8 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<div id="g-rest-detail">
+<ul>
+  <li id="g-rest-key">
+  <p><b><?= t("Key") ?></b>:<?= $rest_key ?></p>
+  </li>
+</ul>
+</div>