diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-14 10:20:00 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-14 10:22:13 -0400 |
| commit | 4c7fd8cd0191871e48704f693f48554d4ee7a726 (patch) | |
| tree | a66a930783de938deaa3d2362dcf779e5c2b45af /apps/gallery | |
| parent | 64ef1e21819979d7fdc406d2628bc175b16fe554 (diff) | |
| parent | 62e4f55f721971dacd06649cecefe0487626aa75 (diff) | |
| download | nextcloud-server-4c7fd8cd0191871e48704f693f48554d4ee7a726.tar.gz nextcloud-server-4c7fd8cd0191871e48704f693f48554d4ee7a726.zip | |
Merge branch 'master' into share_api
Conflicts:
lib/group.php
lib/group/backend.php
lib/group/database.php
lib/group/interface.php
lib/public/user.php
lib/user.php
lib/user/backend.php
lib/user/database.php
lib/user/interface.php
Diffstat (limited to 'apps/gallery')
| -rw-r--r-- | apps/gallery/sharing.php | 2 | ||||
| -rw-r--r-- | apps/gallery/templates/view_album.php | 47 |
2 files changed, 1 insertions, 48 deletions
diff --git a/apps/gallery/sharing.php b/apps/gallery/sharing.php index 44fcd9c864b..af3e553e454 100644 --- a/apps/gallery/sharing.php +++ b/apps/gallery/sharing.php @@ -37,7 +37,7 @@ OCP\App::checkAppEnabled('gallery'); <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script> <script src="js/sharing.js" type="text/javascript"></script> <script> - var TOKEN = '<?php echo $_GET['token']; ?>'; + var TOKEN = '<?php echo htmlentities($_GET['token']); ?>'; </script> </head> <body> diff --git a/apps/gallery/templates/view_album.php b/apps/gallery/templates/view_album.php deleted file mode 100644 index 00e891103f1..00000000000 --- a/apps/gallery/templates/view_album.php +++ /dev/null @@ -1,47 +0,0 @@ -<?php -OCP\Util::addStyle('gallery', 'styles'); -OCP\Util::addScript('gallery', 'albums'); -OCP\Util::addScript('gallery', 'album_cover'); -OCP\Util::addScript('files_imageviewer', 'jquery.mousewheel-3.0.4.pack'); -OCP\Util::addScript('files_imageviewer', 'jquery.fancybox-1.3.4.pack'); -OCP\Util::addStyle( 'files_imageviewer', 'jquery.fancybox-1.3.4' ); -$l = OC_L10N::get('gallery'); -?> -<script type="text/javascript"> - $(document).ready(function() { - $("a[rel=images]").fancybox({ - 'titlePosition': 'inside' - }); - }); -</script> - -<div id="controls"> - <a href="?"><input type="button" value="<?php echo $l->t('Back');?>" /></a> -<br/> -</div> - -<div id="gallery_list" class="leftcontent"> -</div> - -<div id="gallery_images" class="rightcontent"> -<?php -foreach ($_['photos'] as $a) { -?> -<a rel="images" href="../../files/download.php?file=<?php echo urlencode($a); ?>"><img src="ajax/thumbnail.php?img=<?php echo urlencode($a) ?>"></a> -<?php - } -?> -</div> - -<div id="dialog-confirm" title="<?php echo $l->t('Remove confirmation');?>" style="display: none"> - <p><span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span><?php echo $l->t('Do you want to remove album');?> <span id="albumName"></span>?</p> -</div> - -<div id="dialog-form" title="<?php echo $l->t('Change album name');?>" style="display:none"> - <form> - <fieldset> - <label for="name"><?php echo $l->t('New album name');?></label> - <input type="text" name="name" id="name" class="text ui-widget-content ui-corner-all" /> - </fieldset> - </form> -</div> |