From f9c4975a456940bb24cacd6723a37f2857fbc65c Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Fri, 13 Jan 2012 13:57:46 +0100 Subject: improve import form for calendar --- apps/calendar/js/loader.js | 39 +++++++++++++++-- apps/calendar/templates/part.import.php | 75 ++++++--------------------------- 2 files changed, 48 insertions(+), 66 deletions(-) (limited to 'apps') diff --git a/apps/calendar/js/loader.js b/apps/calendar/js/loader.js index c21c20275e2..50a7b082d98 100644 --- a/apps/calendar/js/loader.js +++ b/apps/calendar/js/loader.js @@ -2,10 +2,43 @@ Calendar_Import={ importdialog: function(filename){ var path = $('#dir').val(); $('body').append('
'); - $('#calendar_import').load(OC.filePath('calendar', 'ajax', 'importdialog.php'), {filename:filename, path:path}, Calendar_Import.initdialog()); + $('#calendar_import').load(OC.filePath('calendar', 'ajax', 'importdialog.php'), {filename:filename, path:path}, function(){Calendar_Import.initdialog(filename);}); }, - initdialog: function(){ - + initdialog: function(filename){ + $("#calendar_import_dialog").dialog({ + width : 500, + close : function() { + $(this).dialog('destroy').remove(); + $("#calendar_import").remove(); + } + }); + $('#progressbar').progressbar({value: 87}); + $('#startimport').click(function(){ + var filename = $('#filename').val(); + var path = $('#path').val(); + if($('#calendar option:selected').val() == 'newcal'){ + var method = 'new'; + var calname = $('#newcalendar').val(); + var calname = $.trim(calname); + if(calname == ''){ + $('#newcalendar').css('background-color', '#FF2626'); + return false; + } + }else{ + var method = 'old'; + } + $('#newcalendar').attr('readonly', 'readonly'); + $('#calendar').attr('disabled', 'disabled'); + $.post(OC.filePath('calendar', '', 'import.php'), {'method':method, 'calname':calname, 'path':path, 'file':filename}, function(){}); + $('#progressbar').slideDown('slow'); + }); + $('#calendar').change(function(){ + if($('#calendar option:selected').val() == 'newcal'){ + $('#newcalform').slideDown('slow'); + }else{ + $('#newcalform').slideUp('slow'); + } + }); }, getimportstatus: function(){ diff --git a/apps/calendar/templates/part.import.php b/apps/calendar/templates/part.import.php index b8805e6b6ef..13685cfb273 100644 --- a/apps/calendar/templates/part.import.php +++ b/apps/calendar/templates/part.import.php @@ -1,69 +1,18 @@ -
"> +
"> "> "> -
t("How to import the new calendar?");?> -

-" onclick="$('#first').css('display', 'none');$('#existingcal').css('display', 'block');"> -" onclick="$('#first').css('display', 'none');$('#newcal').css('display', 'block');"> -
- - \ No newline at end of file + +
\ No newline at end of file -- cgit v1.2.3 From a9878dca6d16258ac7ce3d1e7415b88ef30e9491 Mon Sep 17 00:00:00 2001 From: Bartek Przybylski Date: Sat, 14 Jan 2012 11:19:24 +0100 Subject: content divs alignment --- apps/gallery/css/styles.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apps') diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css index 6bfd756e5f1..4ada23b0b06 100644 --- a/apps/gallery/css/styles.css +++ b/apps/gallery/css/styles.css @@ -1,5 +1,5 @@ div#gallery_list { margin: 90pt 20pt; } -div#gallery_list.leftcontent { padding-top: 15pt; margin: 0; height: 80%; text-align: center; overflow: scroll; } +div#gallery_list.leftcontent { padding-top: 15pt; margin: 0; position: absolute; bottom:0px; text-align: center; overflow: scroll; } div#gallery_album_box { width: 200px; text-align: center; border: 0; display: inline-block; margin: 5pt; vertical-align: top; padding: 10px; position: relative; overflow: hidden; color: #999; } div#gallery_album_box:hover { color: black; } .leftcontent div#gallery_album_box { margin: 5px; } @@ -7,5 +7,5 @@ div#gallery_album_box h1 { font-size: 9pt; font-family: Verdana; } div#gallery_album_cover { width: 199px; height: 199px; border: solid 1pt #999; padding: 0; } div#gallery_control_overlay { border: 0; position:absolute; right: 10pt; background-color: #333; opacity: 0.5; visibility:hidden; padding: 0 5pt; } div#gallery_control_overlay a { color:white; } -#gallery_images { padding:10px 5px; } +#gallery_images.rightcontent { padding:10px 5px; position:absolute; bottom: 0px; overflow: scroll; } -- cgit v1.2.3 From 06388e13394e026c5dd70b36c1ab65238d1cc254 Mon Sep 17 00:00:00 2001 From: Bartek Przybylski Date: Sat, 14 Jan 2012 13:52:24 +0100 Subject: handling directory renaming and thumbnail move on gallery name chenge --- apps/gallery/ajax/galleryOp.php | 1 + apps/gallery/js/album_cover.js | 2 +- apps/gallery/lib/album.php | 11 +++++ apps/gallery/lib/hooks_handlers.php | 85 ++++++++++++++++++++++--------------- 4 files changed, 63 insertions(+), 36 deletions(-) (limited to 'apps') diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php index 0224977e633..a62f0fe3f5b 100644 --- a/apps/gallery/ajax/galleryOp.php +++ b/apps/gallery/ajax/galleryOp.php @@ -29,6 +29,7 @@ OC_JSON::checkAppEnabled('gallery'); function handleRename($oldname, $newname) { OC_JSON::checkLoggedIn(); OC_Gallery_Album::rename($oldname, $newname, OC_User::getUser()); + OC_Gallery_Album::changeThumbnailPath($oldname, $newname); } function handleRemove($name) { diff --git a/apps/gallery/js/album_cover.js b/apps/gallery/js/album_cover.js index 84a89c5a91f..0009eb04e4f 100644 --- a/apps/gallery/js/album_cover.js +++ b/apps/gallery/js/album_cover.js @@ -58,7 +58,7 @@ function galleryRemove(albumName) { } function galleryRename(name) { - var result = window.prompt("Input new gallery name", ""); + var result = window.prompt("Input new gallery name", name); if (result) { if (Albums.find(result)) { alert("Album named '" + result + "' already exists"); diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php index a94eff3acd7..a708ba83ea4 100644 --- a/apps/gallery/lib/album.php +++ b/apps/gallery/lib/album.php @@ -58,6 +58,17 @@ class OC_Gallery_Album { return $stmt->execute($args); } + public static function changePath($oldname, $newname, $owner) { + $stmt = OC_DB::prepare('UPDATE OR IGNORE *PREFIX*gallery_albums SET album_path=? WHERE uid_owner=? AND album_path=?'); + $stmt->execute(array($newname, $owner, $oldname)); + } + + public static function changeThumbnailPath($oldname, $newname) { + require_once('../../../lib/base.php'); + $thumbpath = OC::$CONFIG_DATADIRECTORY.'/../gallery/'; + rename($thumbpath.$oldname.'.png', $thumbpath.$newname.'.png'); + } + } ?> diff --git a/apps/gallery/lib/hooks_handlers.php b/apps/gallery/lib/hooks_handlers.php index 65f3faaeeaf..ee17c0df7df 100644 --- a/apps/gallery/lib/hooks_handlers.php +++ b/apps/gallery/lib/hooks_handlers.php @@ -34,8 +34,19 @@ class OC_Gallery_Hooks_Handlers { private static function isPhoto($filename) { OC_Log::write(self::$APP_TAG, "Checking file ".$filename." with mimetype ".OC_Filesystem::getMimeType($filename), OC_Log::DEBUG); if (substr(OC_Filesystem::getMimeType($filename), 0, 6) == "image/") - return 1; - return 0; + return true; + return false; + } + + private static function directoryContainsPhotos($dirpath) { + $dirhandle = opendir(OC::$CONFIG_DATADIRECTORY.$dirpath); + if ($dirhandle != FALSE) { + while (($filename = readdir($dirhandle)) != FALSE) { + if ($filename[0] == '.') continue; + if (self::isPhoto($dirpath.'/'.$filename)) return true; + } + } + return false; } private static function createAlbum($path) { @@ -77,41 +88,45 @@ class OC_Gallery_Hooks_Handlers { } public static function renamePhoto($params) { - $olddir = substr($params['oldpath'], 0, strrpos($params['oldpath'], '/')); - $newdir = substr($params['newpath'], 0, strrpos($params['newpath'], '/')); - if ($olddir == '') $olddir = '/'; - if ($newdir == '') $newdir = '/'; - if (!self::isPhoto($params['newpath'])) return; - OC_Log::write(self::$APP_TAG, 'Moving photo from '.$params['oldpath'].' to '.$params['newpath'], OC_Log::DEBUG); - $album; - $newAlbumId; - $oldAlbumId; - if ($olddir == $newdir) { - // album changing is not needed - $album = OC_Gallery_Album::find(OC_User::getUser(), null, $olddir); - if ($album->numRows() == 0) { - $album = self::createAlbum($newdir); - } - $album = $album->fetchRow(); - $newAlbumId = $oldAlbumId = $album['album_id']; - } else { - $newalbum = OC_Gallery_Album::find(OC_User::getUser(), null, $newdir); - $oldalbum = OC_Gallery_Album::find(OC_User::getUser(), null, $olddir); - - if ($newalbum->numRows() == 0) { - $newalbum = self::createAlbum($newdir); - } - $newalbum = $newalbum->fetchRow(); - if ($oldalbum->numRows() == 0) { - OC_Gallery_Photo::create($newalbum['album_id'], $params['newpath']); - return; - } - $oldalbum = $oldalbum->fetchRow(); - $newAlbumId = $newalbum['album_id']; - $oldAlbumId = $oldalbum['album_id']; + if (OC_Filesystem::is_dir($params['newpath']) && self::directoryContainsPhotos($params['newpath'])) { + OC_Gallery_Album::changePath($params['oldpath'], $params['newpath'], OC_User::getUser()); + } elseif (!self::isPhoto($params['newpath'])) { + $olddir = substr($params['oldpath'], 0, strrpos($params['oldpath'], '/')); + $newdir = substr($params['newpath'], 0, strrpos($params['newpath'], '/')); + if ($olddir == '') $olddir = '/'; + if ($newdir == '') $newdir = '/'; + if (!self::isPhoto($params['newpath'])) return; + OC_Log::write(self::$APP_TAG, 'Moving photo from '.$params['oldpath'].' to '.$params['newpath'], OC_Log::DEBUG); + $album; + $newAlbumId; + $oldAlbumId; + if ($olddir == $newdir) { + // album changing is not needed + $album = OC_Gallery_Album::find(OC_User::getUser(), null, $olddir); + if ($album->numRows() == 0) { + $album = self::createAlbum($newdir); + } + $album = $album->fetchRow(); + $newAlbumId = $oldAlbumId = $album['album_id']; + } else { + $newalbum = OC_Gallery_Album::find(OC_User::getUser(), null, $newdir); + $oldalbum = OC_Gallery_Album::find(OC_User::getUser(), null, $olddir); + + if ($newalbum->numRows() == 0) { + $newalbum = self::createAlbum($newdir); + } + $newalbum = $newalbum->fetchRow(); + if ($oldalbum->numRows() == 0) { + OC_Gallery_Photo::create($newalbum['album_id'], $params['newpath']); + return; + } + $oldalbum = $oldalbum->fetchRow(); + $newAlbumId = $newalbum['album_id']; + $oldAlbumId = $oldalbum['album_id']; + } + OC_Gallery_Photo::changePath($oldAlbumId, $newAlbumId, $params['oldpath'], $params['newpath']); } - OC_Gallery_Photo::changePath($oldAlbumId, $newAlbumId, $params['oldpath'], $params['newpath']); } } -- cgit v1.2.3 From 868cf4629051c557312b63acbb3e6facd8f0f86e Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Sat, 14 Jan 2012 14:22:30 +0100 Subject: improve import function --- apps/calendar/ajax/importdialog.php | 13 ++-- apps/calendar/import.php | 132 +++++++++++++++++++++++++------- apps/calendar/import_tmp/Info | 2 + apps/calendar/js/loader.js | 43 +++++++++-- apps/calendar/templates/part.import.php | 19 +++-- 5 files changed, 161 insertions(+), 48 deletions(-) create mode 100644 apps/calendar/import_tmp/Info (limited to 'apps') diff --git a/apps/calendar/ajax/importdialog.php b/apps/calendar/ajax/importdialog.php index 983a3d95a84..f6b8453fc22 100644 --- a/apps/calendar/ajax/importdialog.php +++ b/apps/calendar/ajax/importdialog.php @@ -1,20 +1,17 @@ + * Copyright (c) 2012 Georg Ehrke * This file is licensed under the Affero General Public License version 3 or * later. * See the COPYING-README file. */ require_once('../../../lib/base.php'); - +OC_JSON::checkLoggedIn(); +OC_Util::checkAppEnabled('calendar'); $l10n = new OC_L10N('calendar'); - -if(!OC_USER::isLoggedIn()) { - die(''); -} -OC_JSON::checkAppEnabled('calendar'); - $tmpl = new OC_Template('calendar', 'part.import'); +$tmpl->assign('path', $_POST['path']); +$tmpl->assign('filename', $_POST['filename']); $tmpl->printpage(); ?> diff --git a/apps/calendar/import.php b/apps/calendar/import.php index 759726b8d10..d1186e691e5 100644 --- a/apps/calendar/import.php +++ b/apps/calendar/import.php @@ -1,46 +1,122 @@ + * Copyright (c) 2012 Georg Ehrke * This file is licensed under the Affero General Public License version 3 or * later. * See the COPYING-README file. */ - +//check for calendar rights or create new one +ob_start(); require_once ('../../lib/base.php'); OC_JSON::checkLoggedIn(); OC_Util::checkAppEnabled('calendar'); - -if($_GET["import"] == "existing"){ - $calid = $_GET["calid"]; - $calendar = OC_Calendar_App::getCalendar($calid); - if($_GET["path"] != ""){ - $filename = $_GET["path"] . "/" . $_GET["file"]; - }else{ - $filename = "/" . $_GET["file"]; - } -}else{ +$progressfile = 'import_tmp/' . md5(session_id()) . '.txt'; +if(is_writable('import_tmp/')){ + $progressfopen = fopen($progressfile, 'w'); + fwrite($progressfopen, '10'); + fclose($progressfopen); +} +$file = OC_Filesystem::file_get_contents($_POST['path'] . '/' . $_POST['file']); +if($_POST['method'] == 'new'){ $id = OC_Calendar_Calendar::addCalendar(OC_User::getUser(), $_POST['calname']); OC_Calendar_Calendar::setCalendarActive($id, 1); - $calid = $id; - if($_POST["path"] != ""){ - $filename = $_POST["path"] . "/" . $_POST["file"]; +}else{ + $calendar = OC_Calendar_App::getCalendar($_POST['id']); + if($calendar['userid'] != OC_USER::getUser()){ + OC_JSON::error(); + exit(); + } + $id = $_POST['id']; +} +//analyse the calendar file +if(is_writable('import_tmp/')){ + $progressfopen = fopen($progressfile, 'w'); + fwrite($progressfopen, '20'); + fclose($progressfopen); +} +$searchfor = array('VEVENT', 'VTODO', 'VJOURNAL'); +$parts = $searchfor; +$filearr = explode(' +', $file); +$inelement = false; +$parts = array(); +$i = 0; +foreach($filearr as $line){ + foreach($searchfor as $search){ + if(substr_count($line, $search) == 1){ + list($attr, $val) = explode(':', $line); + if($attr == 'BEGIN'){ + $parts[]['begin'] = $i; + $inelement = true; + } + if($attr == 'END'){ + $parts[count($parts) - 1]['end'] = $i; + $inelement = false; + } + } + } + $i++; +} +//import the calendar +if(is_writable('import_tmp/')){ + $progressfopen = fopen($progressfile, 'w'); + fwrite($progressfopen, '40'); + fclose($progressfopen); +} +$start = ''; +$nl = ' +'; +for ($i = 0; $i < $parts[0]['begin']; $i++) { + if($i == 0){ + $start = $filearr[0]; }else{ - $filename = "/" . $_POST["file"]; + $start .= $nl . $filearr[$i]; } } -$vcalendar = OC_Filesystem::file_get_contents($filename); -$vcalendar = explode("BEGIN:VEVENT", $vcalendar); -for($i = 1;$i < count($vcalendar);$i++){ - $vcalendar[$i] = "BEGIN:VEVENT" . $vcalendar[$i]; +$end = ''; +for($i = $parts[count($parts) - 1]['end'] + 1;$i <= count($filearr) - 1; $i++){ + if($i == $parts[count($parts) - 1]['end'] + 1){ + $end = $filearr[$parts[count($parts) - 1]['end'] + 1]; + }else{ + $end .= $nl . $filearr[$i]; + } } -for($i = 1;$i < count($vcalendar) - 1;$i++){ - $vcalendar[$i] = $vcalendar[$i] . "END:VCALENDAR"; +if(is_writable('import_tmp/')){ + $progressfopen = fopen($progressfile, 'w'); + fwrite($progressfopen, '50'); + fclose($progressfopen); +} +$importready = array(); +foreach($parts as $part){ + for($i = $part['begin']; $i <= $part['end'];$i++){ + if($i == $part['begin']){ + $content = $filearr[$i]; + }else{ + $content .= $nl . $filearr[$i]; + } + } + $importready[] = $start . $nl . $content . $nl . $end; +} +if(is_writable('import_tmp/')){ + $progressfopen = fopen($progressfile, 'w'); + fwrite($progressfopen, '70'); + fclose($progressfopen); +} +if(count($parts) == 1){ + OC_Calendar_Object::add($id, $file); +}else{ + foreach($importready as $import){ + OC_Calendar_Object::add($id, $import); + } } -for($i = 1;$i < count($vcalendar);$i++){ - $vcalendar[$i] = $vcalendar[0] . $vcalendar[$i]; +//done the import +if(is_writable('import_tmp/')){ + $progressfopen = fopen($progressfile, 'w'); + fwrite($progressfopen, '100'); + fclose($progressfopen); } -for($i = 1;$i < count($vcalendar);$i++){ - OC_Calendar_Object::add($calid, $vcalendar[$i]); +sleep(3); +if(is_writable('import_tmp/')){ + unlink($progressfile); } -OC_JSON::success(); -?> +OC_JSON::success(); \ No newline at end of file diff --git a/apps/calendar/import_tmp/Info b/apps/calendar/import_tmp/Info new file mode 100644 index 00000000000..abafbce435c --- /dev/null +++ b/apps/calendar/import_tmp/Info @@ -0,0 +1,2 @@ +This folder contains static files with the percentage of the import. +Requires write permission diff --git a/apps/calendar/js/loader.js b/apps/calendar/js/loader.js index 50a7b082d98..4e483f9864e 100644 --- a/apps/calendar/js/loader.js +++ b/apps/calendar/js/loader.js @@ -1,3 +1,9 @@ +/** + * Copyright (c) 2012 Georg Ehrke + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ Calendar_Import={ importdialog: function(filename){ var path = $('#dir').val(); @@ -5,23 +11,31 @@ Calendar_Import={ $('#calendar_import').load(OC.filePath('calendar', 'ajax', 'importdialog.php'), {filename:filename, path:path}, function(){Calendar_Import.initdialog(filename);}); }, initdialog: function(filename){ - $("#calendar_import_dialog").dialog({ + $('#calendar_import_dialog').dialog({ width : 500, close : function() { $(this).dialog('destroy').remove(); - $("#calendar_import").remove(); + $('#calendar_import').remove(); } }); - $('#progressbar').progressbar({value: 87}); + $('#import_done_button').click(function(){ + $('#calendar_import_dialog').dialog('destroy').remove(); + $('#calendar_import').remove(); + }); + $('#progressbar').progressbar({value: 0}); $('#startimport').click(function(){ var filename = $('#filename').val(); var path = $('#path').val(); + var calid = $('#calendar option:selected').val(); if($('#calendar option:selected').val() == 'newcal'){ var method = 'new'; var calname = $('#newcalendar').val(); var calname = $.trim(calname); if(calname == ''){ $('#newcalendar').css('background-color', '#FF2626'); + $('#newcalendar').focus(function(){ + $('#newcalendar').css('background-color', '#F8F8F8'); + }); return false; } }else{ @@ -29,8 +43,16 @@ Calendar_Import={ } $('#newcalendar').attr('readonly', 'readonly'); $('#calendar').attr('disabled', 'disabled'); - $.post(OC.filePath('calendar', '', 'import.php'), {'method':method, 'calname':calname, 'path':path, 'file':filename}, function(){}); - $('#progressbar').slideDown('slow'); + var progressfile = $('#progressfile').val(); + $.post(OC.filePath('calendar', '', 'import.php'), {method: String (method), calname: String (calname), path: String (path), file: String (filename), id: String (calid)}, function(data){ + if(data.status == 'success'){ + $('#progressbar').progressbar('option', 'value', 100); + $('#import_done').css('display', 'block'); + } + }); + $('#form_container').css('display', 'none'); + $('#progressbar_container').css('display', 'block'); + window.setTimeout('Calendar_Import.getimportstatus(\'' + progressfile + '\')', 500); }); $('#calendar').change(function(){ if($('#calendar option:selected').val() == 'newcal'){ @@ -40,8 +62,15 @@ Calendar_Import={ } }); }, - getimportstatus: function(){ - + getimportstatus: function(progressfile){ + $.get(OC.filePath('calendar', 'import_tmp', progressfile), function(percent){ + $('#progressbar').progressbar('option', 'value', parseInt(percent)); + if(percent < 100){ + window.setTimeout('Calendar_Import.getimportstatus(\'' + progressfile + '\')', 500); + }else{ + $('#import_done').css('display', 'block'); + } + }); } } $(document).ready(function(){ diff --git a/apps/calendar/templates/part.import.php b/apps/calendar/templates/part.import.php index 13685cfb273..8f46484b42b 100644 --- a/apps/calendar/templates/part.import.php +++ b/apps/calendar/templates/part.import.php @@ -1,7 +1,9 @@
"> -"> -"> -

t('Please choose the calendar'); ?> +

+ + + +

t('Please choose the calendar'); ?> !" id="startimport"> -

-

+
+
\ No newline at end of file -- cgit v1.2.3 From e0dc8b8ab2c1803357e6bd4fbb477effe5d4c599 Mon Sep 17 00:00:00 2001 From: Bartek Przybylski Date: Sat, 14 Jan 2012 14:59:18 +0100 Subject: handle gallery remove when removing dir via webinterface --- apps/gallery/lib/album.php | 7 +++++++ apps/gallery/lib/hooks_handlers.php | 7 +++++-- apps/gallery/lib/photo.php | 5 +++++ 3 files changed, 17 insertions(+), 2 deletions(-) (limited to 'apps') diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php index a708ba83ea4..6adff196071 100644 --- a/apps/gallery/lib/album.php +++ b/apps/gallery/lib/album.php @@ -42,6 +42,13 @@ class OC_Gallery_Album { $stmt = OC_DB::prepare($sql); return $stmt->execute($args); } + + public static function removeByPath($path, $owner) { + $album = self::find($owner, null, $path); + $album = $album->fetchRow(); + self::remove($owner, $album['album_name']); + OC_Gallery_Photo::removeByAlbumId($album['album_id']); + } public static function find($owner, $name=null, $path=null){ $sql = 'SELECT * FROM *PREFIX*gallery_albums WHERE uid_owner = ?'; diff --git a/apps/gallery/lib/hooks_handlers.php b/apps/gallery/lib/hooks_handlers.php index ee17c0df7df..534f76896d7 100644 --- a/apps/gallery/lib/hooks_handlers.php +++ b/apps/gallery/lib/hooks_handlers.php @@ -83,8 +83,11 @@ class OC_Gallery_Hooks_Handlers { public static function removePhoto($params) { $path = $params['path']; - if (!self::isPhoto($path)) return; - OC_Gallery_Photo::removeByPath($path); + if (OC_Filesystem::is_dir($path) && self::directoryContainsPhotos($path)) { + OC_Gallery_Album::removeByPath($path, OC_User::getUser()); + } elseif (self::isPhoto($path)) { + OC_Gallery_Photo::removeByPath($path); + } } public static function renamePhoto($params) { diff --git a/apps/gallery/lib/photo.php b/apps/gallery/lib/photo.php index 23887098e0f..14b0c4b2a07 100644 --- a/apps/gallery/lib/photo.php +++ b/apps/gallery/lib/photo.php @@ -56,6 +56,11 @@ class OC_Gallery_Photo{ $stmt->execute(array($id)); } + public static function removeByAlbumId($albumid) { + $stmt = OC_DB::prepare('DELETE FROM *PREFIX*gallery_photos WHERE album_id = ?'); + $stmt->execute(array($albumid)); + } + public static function changePath($oldAlbumId, $newAlbumId, $oldpath, $newpath) { $stmt = OC_DB::prepare("UPDATE *PREFIX*gallery_photos SET file_path = ?, album_id = ? WHERE album_id = ? and file_path = ?"); $stmt->execute(array($newpath, $newAlbumId, $oldAlbumId, $oldpath)); -- cgit v1.2.3