diff --git a/3.0/modules/user_chroot/helpers/MY_access.php b/3.0/modules/user_chroot/helpers/MY_access.php
new file mode 100644
index 00000000..5f73b4ca
--- /dev/null
+++ b/3.0/modules/user_chroot/helpers/MY_access.php
@@ -0,0 +1,61 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+class access extends access_Core {
+
+  /**
+   * Does the active user have this permission on this item?
+   *
+   * @param  string     $perm_name
+   * @param  Item_Model $item
+   * @return boolean
+   */
+  static function can($perm_name, $item) {
+    return self::user_can(identity::active_user(), $perm_name, $item);
+  }
+
+  /**
+   * If the active user does not have this permission, failed with an access::forbidden().
+   *
+   * @param  string     $perm_name
+   * @param  Item_Model $item
+   * @return boolean
+   */
+  static function required($perm_name, $item) {
+    if (!self::can($perm_name, $item)) {
+      if ($perm_name == "view") {
+        // Treat as if the item didn't exist, don't leak any information.
+        throw new Kohana_404_Exception();
+      } else {
+        self::forbidden();
+      }
+    }
+  }
+
+  static function user_can($user, $perm_name, $item) {
+    if( $user->id == identity::active_user()->id && user_chroot::album() ) {
+      if( $item->left_ptr < user_chroot::album()->left_ptr || user_chroot::album()->right_ptr < $item->right_ptr ) {
+        return false;
+      }
+    }
+
+    return parent::user_can($user, $perm_name, $item);
+  }
+}
diff --git a/3.0/modules/user_chroot/helpers/MY_item.php b/3.0/modules/user_chroot/helpers/MY_item.php
new file mode 100644
index 00000000..423b8ddc
--- /dev/null
+++ b/3.0/modules/user_chroot/helpers/MY_item.php
@@ -0,0 +1,34 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+class item extends item_Core {
+  static function viewable($model) {
+    $model = parent::viewable($model);
+
+    if( user_chroot::album() ) {
+      $model->and_open()
+            ->and_where("items.left_ptr", ">=", user_chroot::album()->left_ptr)
+            ->and_where("items.right_ptr", "<=", user_chroot::album()->right_ptr)
+            ->close();
+    }
+
+    return $model;
+  }
+}
diff --git a/3.0/modules/user_chroot/helpers/MY_url.php b/3.0/modules/user_chroot/helpers/MY_url.php
new file mode 100644
index 00000000..31818fa4
--- /dev/null
+++ b/3.0/modules/user_chroot/helpers/MY_url.php
@@ -0,0 +1,47 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+// /!\ Hack: There is no good way to extend gallery url
+$gallery_url = file_get_contents(MODPATH . 'gallery/helpers/MY_url.php');
+$gallery_url = preg_replace('#^<\?php #', '', $gallery_url);
+$gallery_url = preg_replace('#class url extends url_Core#', 'class url_G3 extends url_Core', $gallery_url);
+eval($gallery_url);
+
+class url extends url_G3 {
+  static function parse_url() {
+    if( user_chroot::album() ) {
+      if( Router::$current_uri == '' ) {
+        Router::$controller = false;
+      }
+
+      Router::$current_uri = trim(user_chroot::album()->relative_url().'/'.Router::$current_uri, '/');
+    }
+
+    return parent::parse_url();
+  }
+
+  static function site($uri = '', $protocol = FALSE) {
+    if( user_chroot::album() ) {
+      $uri = preg_replace('#^'.user_chroot::album()->relative_url().'#', '', $uri);
+    }
+
+    return parent::site($uri, $protocol);
+  }
+}
\ No newline at end of file
diff --git a/3.0/modules/user_chroot/helpers/user_chroot.php b/3.0/modules/user_chroot/helpers/user_chroot.php
new file mode 100644
index 00000000..4d0a8499
--- /dev/null
+++ b/3.0/modules/user_chroot/helpers/user_chroot.php
@@ -0,0 +1,41 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+class user_chroot_Core {
+  private static $_album = null;
+
+  public static function album() {
+    if( is_null(self::$_album) ) {
+      self::$_album = false;
+
+      $user = identity::active_user();
+
+      $user_chroot = ORM::factory("user_chroot", $user->id);
+      if( $user_chroot->loaded() && $user_chroot->album_id != 0 ) {
+        $item = ORM::factory("item", $user_chroot->album_id);
+        if( $item->loaded() ) {
+          self::$_album = $item;
+        }
+      }
+    }
+
+    return self::$_album;
+  }
+}
\ No newline at end of file
diff --git a/3.0/modules/user_chroot/helpers/user_chroot_event.php b/3.0/modules/user_chroot/helpers/user_chroot_event.php
new file mode 100644
index 00000000..c43c6dc4
--- /dev/null
+++ b/3.0/modules/user_chroot/helpers/user_chroot_event.php
@@ -0,0 +1,112 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+class user_chroot_event_Core {
+
+  /**
+   * Called just before a user is deleted. This will remove the user from
+   * the user_chroot directory.
+   */
+  static function user_before_delete($user) {
+    ORM::factory("user_chroot")->delete($user->id);
+  }
+
+  /**
+   * Called when admin is adding a user
+   */
+  static function user_add_form_admin($user, $form) {
+    $form->add_user->dropdown("user_chroot")
+      ->label(t("Root Album"))
+      ->options(self::createGalleryArray())
+      ->selected(0);
+  }
+
+  /**
+   * Called after a user has been added
+   */
+  static function user_add_form_admin_completed($user, $form) {
+    $user_chroot = ORM::factory("user_chroot")->where("id", "=", $user->id)->find();
+    $user_chroot->id = $user->id;
+    $user_chroot->album_id = $form->add_user->user_chroot->value;
+    $user_chroot->save();
+  }
+
+  /**
+   * Called when admin is editing a user
+   */
+  static function user_edit_form_admin($user, $form) {
+    $user_chroot = ORM::factory("user_chroot")->where("id", "=", $user->id)->find();
+    if ($user_chroot->loaded()) {
+      $selected = $user_chroot->album_id;
+    } else {
+      $selected = 0;
+    }
+    $form->edit_user->dropdown("user_chroot")
+      ->label(t("Root Album"))
+      ->options(self::createGalleryArray())
+      ->selected($selected);
+  }
+
+  /**
+   * Called after a user had been edited by the admin
+   */
+  static function user_edit_form_admin_completed($user, $form) {
+    $user_chroot = ORM::factory("user_chroot")->where("id", "=", $user->id)->find();
+    if ($user_chroot->loaded()) {
+      $user_chroot->album_id = $form->edit_user->user_chroot->value;
+    } else {
+      $user_chroot->id = $user->id;
+      $user_chroot->album_id = $form->edit_user->user_chroot->value;
+    }
+    $user_chroot->save();
+  }
+
+
+  /**
+   * Creates an array of galleries
+   */
+  static function createGalleryArray() {
+    $array[0] = "none";
+    $root = ORM::factory("item", 1);
+    self::tree($root, "", $array);
+    return $array;
+  }
+
+  /**
+   * recursive function to build array for drop down list
+   */
+  static function tree($parent, $dashes, &$array) {
+    if ($parent->id == "1") {
+      $array[$parent->id] = ORM::factory("item", 1)->title;
+    } else {
+      $array[$parent->id] = "$dashes $parent->name";
+    }
+
+    $albums = ORM::factory("item")
+      ->where("parent_id", "=", $parent->id)
+      ->where("type", "=", "album")
+      ->order_by("title", "ASC")
+      ->find_all();
+    foreach ($albums as $album) {
+      self::tree($album, "-$dashes", $array);
+    }
+    return;
+  }
+}
diff --git a/3.0/modules/user_chroot/helpers/user_chroot_installer.php b/3.0/modules/user_chroot/helpers/user_chroot_installer.php
new file mode 100644
index 00000000..ee89fb13
--- /dev/null
+++ b/3.0/modules/user_chroot/helpers/user_chroot_installer.php
@@ -0,0 +1,40 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+class user_chroot_installer {
+  static function install() {
+    $db = Database::instance();
+    $db->query("CREATE TABLE IF NOT EXISTS {user_chroots} (
+                  `id` int(9) NOT NULL,
+                  `album_id` int(9) default NULL,
+                  PRIMARY KEY (`id`),
+                  UNIQUE KEY(`id`))
+                  DEFAULT CHARSET=utf8;");
+    module::set_version("user_chroot", 1);
+  }
+
+  /**
+   * Drops the table of user chroot when the module is uninstalled.
+   */
+  static function uninstall() {
+    $db = Database::instance();
+    $db->query("DROP TABLE IF EXISTS {user_chroots};");
+  }
+}
diff --git a/3.0/modules/user_chroot/libraries/MY_ORM_MPTT.php b/3.0/modules/user_chroot/libraries/MY_ORM_MPTT.php
new file mode 100644
index 00000000..e31124ca
--- /dev/null
+++ b/3.0/modules/user_chroot/libraries/MY_ORM_MPTT.php
@@ -0,0 +1,61 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+class ORM_MPTT extends ORM_MPTT_Core {
+  private $model_name = null;
+
+  function __construct($id=null) {
+    parent::__construct($id);
+    $this->model_name = inflector::singular($this->table_name);
+  }
+
+  /**
+   * Return the parent of this node
+   *
+   * @return ORM
+   */
+  /*function parent() {
+    if( user_chroot::album() && user_chroot::album()->id == $this->id ) {
+      return null;
+    } else {
+      return parent::parent();
+    }
+  }*/
+
+  /**
+   * Return all the parents of this node, in order from root to this node's immediate parent.
+   *
+   * @return array ORM
+   */
+  function parents() {
+    $select = $this
+      ->where("left_ptr", "<=", $this->left_ptr)
+      ->where("right_ptr", ">=", $this->right_ptr)
+      ->where("id", "<>", $this->id)
+      ->order_by("left_ptr", "ASC");
+
+    if( user_chroot::album() ) {
+      $select->where("left_ptr", ">=", user_chroot::album()->left_ptr);
+      $select->where("right_ptr", "<=", user_chroot::album()->right_ptr);
+    }
+
+    return $select->find_all();
+  }
+}
diff --git a/3.0/modules/user_chroot/models/user_chroot.php b/3.0/modules/user_chroot/models/user_chroot.php
new file mode 100644
index 00000000..30184597
--- /dev/null
+++ b/3.0/modules/user_chroot/models/user_chroot.php
@@ -0,0 +1,22 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+class User_chroot_Model extends ORM {
+}
diff --git a/3.0/modules/user_chroot/module.info b/3.0/modules/user_chroot/module.info
new file mode 100644
index 00000000..45346556
--- /dev/null
+++ b/3.0/modules/user_chroot/module.info
@@ -0,0 +1,3 @@
+name = "Chroot Users"
+description = "Restrict access to one album."
+version = 1