3 files changed, 93 insertions, 3 deletions
diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
index 070afdd6cd6..ef361a37913 100644
--- a/apps/gallery/lib/album.php
+++ b/apps/gallery/lib/album.php
@@ -79,7 +79,7 @@ class OC_Gallery_Album {
 			$sql .= ' AND parent_path = ?';
 			$args[] = $parent;
 		}
-		$order = OC_Preferences::getValue(OC_User::getUser(), 'gallery', 'order', 'ASC');
+    $order = OC_Preferences::getValue($owner, 'gallery', 'order', 'ASC');
 		$sql .= ' ORDER BY album_name ' . $order;
 
 		$stmt = OC_DB::prepare($sql);
diff --git a/apps/gallery/lib/photo.php b/apps/gallery/lib/photo.php
index 5e6df8069b5..0c0f16e659a 100644
--- a/apps/gallery/lib/photo.php
+++ b/apps/gallery/lib/photo.php
@@ -66,8 +66,9 @@ class OC_Gallery_Photo {
 		$stmt->execute(array($newpath, $newAlbumId, $oldAlbumId, $oldpath));
 	}
 
-	public static function getThumbnail($image_name) {
-		$save_dir = OC_Config::getValue("datadirectory").'/'. OC_User::getUser() .'/gallery/';
+  public static function getThumbnail($image_name, $owner = null) {
+    if (!$owner) $owner = OC_User::getUser();
+    $save_dir = OC_Config::getValue("datadirectory").'/'. $owner .'/gallery/';
 		$save_dir .= dirname($image_name). '/';
 		$image_path = $image_name;
 		$thumb_file = $save_dir . basename($image_name);
diff --git a/apps/gallery/lib/sharing.php b/apps/gallery/lib/sharing.php
new file mode 100644
index 00000000000..60f108bd6c6
--- /dev/null
+++ b/apps/gallery/lib/sharing.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+* ownCloud - gallery application
+*
+* @author Bartek Przybylski
+* @copyright 2012 Bartek Przybylski bartek@alefzero.eu
+* 
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either 
+* version 3 of the License, or any later version.
+* 
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*  
+* You should have received a copy of the GNU Lesser General Public 
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+* 
+*/
+
+class OC_Gallery_Sharing {
+  private static function getEntries($token) {
+    $sql = 'SELECT * FROM *PREFIX*gallery_sharing WHERE token = ?';
+    $stmt = OC_DB::prepare($sql);
+    return $stmt->execute(array($token));
+  }
+
+  public static function isTokenValid($token) {
+    $r = self::getEntries($token);
+    $row = $r->fetchRow();
+    return $row != null;
+  }
+
+  public static function isRecursive($token) {
+    $r = self::getEntries($token);
+    if ($row = $r->fetchRow()) return $row['recursive'] == 1;
+    return false;
+  }
+
+  public static function getTokenOwner($token) {
+    $r = self::getEntries($token);
+    if ($row = $r->fetchRow()) {
+      $galleryId = $row['gallery_id'];
+      $sql = 'SELECT * FROM *PREFIX*gallery_albums WHERE album_id = ?';
+      $stmt = OC_DB::prepare($sql);
+      $r = $stmt->execute(array($galleryId));
+      if ($row = $r->fetchRow())
+       return $row['uid_owner'];
+     }
+    return false;
+  }
+
+  public static function getPath($token) {
+    $r = self::getEntries($token);
+    if ($row = $r->fetchRow()) {
+      $galleryId = $row['gallery_id'];
+      $sql = 'SELECT * FROM *PREFIX*gallery_albums WHERE album_id = ?';
+      $stmt = OC_DB::prepare($sql);
+      $r = $stmt->execute(array($galleryId));
+      if ($row = $r->fetchRow())
+        return $row['album_path'];
+    }
+  }
+
+  public static function updateSharingByToken($token, $recursive) {
+    $stmt = OC_DB::prepare('UPDATE *PREFIX*gallery_sharing SET recursive = ? WHERE token = ?');
+    $stmt->execute(array($recursive, $token));
+  }
+
+  public static function getEntryByAlbumId($album_id) {
+    $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_sharing WHERE gallery_id = ?');
+    return $stmt->execute(array($album_id));
+  }
+
+  public static function addShared($token, $albumId, $recursive) {
+    $sql = 'INSERT INTO *PREFIX*gallery_sharing (token, gallery_id, recursive) VALUES (?, ?, ?)';
+    $stmt = OC_DB::prepare($sql);
+    $stmt->execute(array($token, $albumId, $recursive));
+  }
+
+  public static function remove($albumId) {
+    $stmt = OC_DB::prepare('DELETE FROM *PREFIX*gallery_sharing WHERE gallery_id = ?');
+    $stmt->execute(array($albumId));
+  }
+}
+