fix gallery sharing

diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php
index 2501ae7bbd520131da62945c30fa326af446d3af..333b1581ce102171d3f31a20b0e5cda3aafaf810 100755 (executable)
--- a/apps/gallery/appinfo/app.php
+++ b/apps/gallery/appinfo/app.php
@@ -56,4 +56,5 @@ class OC_GallerySearchProvider extends OC_Search_Provider{
 OC_Search::registerProvider('OC_GallerySearchProvider');
 
 require_once('apps/gallery/lib/hooks_handlers.php');
+OCP\CONFIG::setAppValue('core', 'public_gallery', '/apps/gallery/sharing.php');
 ?>

diff --git a/apps/gallery/js/album_cover.js b/apps/gallery/js/album_cover.js
index d44e7f83d1f7a4ff74e5c0943e0d0742daf2e781..61084c99b29b921697d4e1db38c8af23f881ddcc 100644 (file)
--- a/apps/gallery/js/album_cover.js
+++ b/apps/gallery/js/album_cover.js
@@ -31,7 +31,7 @@ function albumClick(title) {
 }
 
 function constructSharingPath() {
-  return document.location.protocol + '//' + document.location.host + OC.linkTo('gallery', 'sharing.php') + '?token=' + Albums.token;
+  return document.location.protocol + '//' + document.location.host + OC.linkTo('', 'public.php') + '?service=gallery&token=' + Albums.token;
 }
 
 function shareGallery() {

diff --git a/apps/gallery/js/sharing.js b/apps/gallery/js/sharing.js
index 340d1b9b2745b6c6ad42aa58f83141367830115a..679e39578aa4cd27357c0f3b9c1b651fa1fb95c4 100644 (file)
--- a/apps/gallery/js/sharing.js
+++ b/apps/gallery/js/sharing.js
@@ -1,5 +1,5 @@
 $(document).ready(function() {
-  $.getJSON('ajax/sharing.php', {operation: 'get_gallery', token: TOKEN}, albumClickHandler);
+  $.getJSON(OC.filePath('gallery', 'ajax', 'sharing.php'), {operation: 'get_gallery', token: TOKEN}, albumClickHandler);
 });
 
 var paths = [];
@@ -13,7 +13,7 @@ function returnTo(num) {
   }
   path = '';
   for (var e in paths) path += '/' + paths[e];
-  $.getJSON('ajax/sharing.php', {operation: 'get_gallery', token: TOKEN, path: path}, function(r) {
+  $.getJSON(OC.filePath('gallery', 'ajax', 'sharing.php'), {operation: 'get_gallery', token: TOKEN, path: path}, function(r) {
     albumClickHandler(r);
   });
 }
@@ -21,7 +21,7 @@ function returnTo(num) {
 function albumClickHandler(r) {
   var element = $('div#gallery_list');
   element.html('');
-  var album_template = '<div class="gallery_box"><div><a rel="images"><img src="ajax/sharing.php?token='+TOKEN+'&operation=get_album_thumbnail&albumname=IMGPATH"></a></div><h1></h1></div>';
+  var album_template = '<div class="gallery_box"><div><a rel="images"><img src="' + OC.filePath('gallery', 'ajax', 'sharing.php') + '?token='+TOKEN+'&operation=get_album_thumbnail&albumname=IMGPATH"></a></div><h1></h1></div>';
 
   for (var i in r.albums) {
     var a = r.albums[i];
@@ -36,7 +36,7 @@ function albumClickHandler(r) {
       paths.push($(this).attr('title'));
       path = '';
       for (var e in paths) path += '/' + paths[e];
-      $.getJSON('ajax/sharing.php', {operation: 'get_gallery', token: TOKEN, path: path}, function(r) {
+      $.getJSON(OC.filePath('gallery', 'ajax', 'sharing.php'), {operation: 'get_gallery', token: TOKEN, path: path}, function(r) {
         var name = paths[paths.length-1];
         counter++;
         var d = '<span class="breadcrumbelement" onclick="javascript:returnTo('+counter+');return false;">'+name+'</span>';
@@ -49,9 +49,9 @@ function albumClickHandler(r) {
 
   var pat = '';
   for (var a in paths) pat += '/'+paths[a];
-  var photo_template = '<div class="gallery_box"><div><a rel="images" href="*HREF*" target="_blank"><img src="ajax/sharing.php?token='+TOKEN+'&operation=get_thumbnail&img=IMGPATH"></a></div></div>';
+  var photo_template = '<div class="gallery_box"><div><a rel="images" href="*HREF*" target="_blank"><img src="' + OC.filePath('gallery', 'ajax', 'sharing.php') + '?token='+TOKEN+'&operation=get_thumbnail&img=IMGPATH"></a></div></div>';
   for (var a in r.photos) {
-    var local = photo_template.replace('IMGPATH', encodeURIComponent(r.photos[a])).replace('*HREF*', 'ajax/sharing.php?token='+TOKEN+'&operation=get_photo&photo='+encodeURIComponent(r.photos[a]));
+    var local = photo_template.replace('IMGPATH', encodeURIComponent(r.photos[a])).replace('*HREF*', OC.filePath('gallery', 'ajax', 'sharing.php') + '?token='+TOKEN+'&operation=get_photo&photo='+encodeURIComponent(r.photos[a]));
     element.append(local);
   }
 }