Add interface for Session and add getter in server container.

diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index d88330698dc766dc1709f4846e4e85fafff28451..ec7212b306e2777666aec24178847e2b751a5f6b 100644 (file)
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -62,4 +62,11 @@ interface IServerContainer {
         */
        function getRootFolder();
 
+       /**
+        * Returns the current session
+        *
+        * @return \OCP\ISession
+        */
+       function getSession();
+
 }

diff --git a/lib/public/isession.php b/lib/public/isession.php
new file mode 100644 (file)
index 0000000..5f9ce32
--- /dev/null
+++ b/lib/public/isession.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas Tanghus (thomas@tanghus.net)
+ * @author Thomas Tanghus
+ * @author Robin Appelman
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP;
+
+interface ISession {
+       /**
+        * @param string $key
+        * @param mixed $value
+        */
+       public function set($key, $value);
+
+       /**
+        * @param string $key
+        * @return mixed should return null if $key does not exist
+        */
+       public function get($key);
+
+       /**
+        * @param string $key
+        * @return bool
+        */
+       public function exists($key);
+
+       /**
+        * should not throw any errors if $key does not exist
+        *
+        * @param string $key
+        */
+       public function remove($key);
+
+       /**
+        * removes all entries within the cache namespace
+        */
+       public function clear();
+
+}

diff --git a/lib/server.php b/lib/server.php
index 9e87bd3190d514a6cace4cd895ed508edbffca43..0124ad72c02928a42b9af122036895bd4ebc3352 100644 (file)
--- a/lib/server.php
+++ b/lib/server.php
@@ -97,4 +97,14 @@ class Server extends SimpleContainer implements IServerContainer {
        {
                return $this->query('RootFolder');
        }
+
+       /**
+        * Returns the current session
+        *
+        * @return \OCP\ISession
+        */
+       function getSession() {
+               return \OC::$session;
+       }
+
 }

diff --git a/lib/session/session.php b/lib/session/session.php
index 55515f57a87d186adb11c407655b50f943350eda..c55001eccaca570e9381679646be0526855580ee 100644 (file)
--- a/lib/session/session.php
+++ b/lib/session/session.php
@@ -8,7 +8,7 @@
 
 namespace OC\Session;
 
-abstract class Session implements \ArrayAccess {
+abstract class Session implements \ArrayAccess, \OCP\ISession {
        /**
         * $name serves as a namespace for the session keys
         *