summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/files_versions/ajax/getVersions.php18
-rw-r--r--apps/files_versions/ajax/rollbackVersion.php2
-rw-r--r--apps/files_versions/appinfo/app.php1
-rw-r--r--apps/files_versions/css/versions.css48
-rw-r--r--apps/files_versions/download.php50
-rw-r--r--apps/files_versions/history.php78
-rw-r--r--apps/files_versions/js/versions.js161
-rw-r--r--apps/files_versions/lib/versions.php38
-rw-r--r--apps/files_versions/templates/history.php36
9 files changed, 221 insertions, 211 deletions
diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php
index f9174c45a65..4f48f71d8ca 100644
--- a/apps/files_versions/ajax/getVersions.php
+++ b/apps/files_versions/ajax/getVersions.php
@@ -2,24 +2,22 @@
OCP\JSON::checkAppEnabled('files_versions');
$source = $_GET['source'];
+$start = $_GET['start'];
list ($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($source);
$count = 5; //show the newest revisions
-if( ($versions = OCA\Files_Versions\Storage::getVersions($uid, $filename, $count)) ) {
+if( ($versions = OCA\Files_Versions\Storage::getVersions($uid, $filename)) ) {
- $versionsFormatted = array();
-
- foreach ( $versions AS $version ) {
- $versionsFormatted[] = OCP\Util::formatDate( $version['version'] );
+ $endReached = false;
+ if (count($versions) <= $start+$count) {
+ $endReached = true;
}
- $versionsSorted = array_reverse( $versions );
+ $versions = array_slice($versions, $start, $count);
- if ( !empty( $versionsSorted ) ) {
- OCP\JSON::encodedPrint($versionsSorted);
- }
+ \OCP\JSON::success(array('data' => array('versions' => $versions, 'endReached' => $endReached)));
} else {
- return;
+ \OCP\JSON::success(array('data' => array('versions' => false, 'endReached' => true)));
}
diff --git a/apps/files_versions/ajax/rollbackVersion.php b/apps/files_versions/ajax/rollbackVersion.php
index 284b46ee093..900d8cd6e28 100644
--- a/apps/files_versions/ajax/rollbackVersion.php
+++ b/apps/files_versions/ajax/rollbackVersion.php
@@ -3,8 +3,6 @@
OCP\JSON::checkAppEnabled('files_versions');
OCP\JSON::callCheck();
-$userDirectory = "/".OCP\USER::getUser()."/files";
-
$file = $_GET['file'];
$revision=(int)$_GET['revision'];
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index 0d0850e1864..5b1e464ba6c 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -6,6 +6,7 @@ OC::$CLASSPATH['OCA\Files_Versions\Hooks'] = 'files_versions/lib/hooks.php';
OC::$CLASSPATH['OCA\Files_Versions\Capabilities'] = 'files_versions/lib/capabilities.php';
OCP\Util::addscript('files_versions', 'versions');
+OCP\Util::addStyle('files_versions', 'versions');
// Listen to write signals
OCP\Util::connectHook('OC_Filesystem', 'write', "OCA\Files_Versions\Hooks", "write_hook");
diff --git a/apps/files_versions/css/versions.css b/apps/files_versions/css/versions.css
index a9b259ce140..6146eda3372 100644
--- a/apps/files_versions/css/versions.css
+++ b/apps/files_versions/css/versions.css
@@ -1,16 +1,44 @@
-#history {
- margin: 2em 2em 0;
+#found_versions li {
+ width: 100%;
+ cursor: default;
+ height: 36px;
+ float: left;
+ border-bottom: 1px solid rgba(100,100,100,.1);
+}
+#found_versions li:last-child {
+ border-bottom: none;
+}
+
+#found_versions li > * {
+ padding: 7px;
+ float: left;
+ vertical-align: top;
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
+ filter: alpha(opacity=50);
+ opacity: .5;
+}
+#found_versions li > *:hover,
+#found_versions li > *:focus {
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+ filter: alpha(opacity=100);
+ opacity: 1;
}
-#feedback-messages h3 {
- font-size: 1.3em;
- font-style: italic;
+#found_versions img {
+ cursor: pointer;
+ padding-right: 4px;
}
-.success {
- color: green;
+#found_versions .versionDate {
+ min-width: 100px;
+ vertical-align: text-bottom;
}
-.failure {
- color: red;
-} \ No newline at end of file
+#found_versions .revertVersion {
+ cursor: pointer;
+ float: right;
+}
+
+.drop-versions #makelink {
+ float: left;
+}
diff --git a/apps/files_versions/download.php b/apps/files_versions/download.php
new file mode 100644
index 00000000000..040a662e61b
--- /dev/null
+++ b/apps/files_versions/download.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+* ownCloud - Download versions directly from the versions drop-down
+*
+* @author Bjoern Schiessle
+* @copyright 2013 Bjoern Schiessle schiessle@owncloud.com
+*
+* 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 Affero General Public
+* License along with this library. If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+OCP\JSON::checkAppEnabled('files_versions');
+//OCP\JSON::callCheck();
+
+$file = $_GET['file'];
+$revision=(int)$_GET['revision'];
+
+list($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($file);
+
+$versionName = '/'.$uid.'/files_versions/'.$filename.'.v'.$revision;
+
+$view = new OC\Files\View('/');
+
+$ftype = $view->getMimeType('/'.$uid.'/files/'.$filename);
+
+header('Content-Type:'.$ftype);
+if ( preg_match( "/MSIE/", $_SERVER["HTTP_USER_AGENT"] ) ) {
+ header( 'Content-Disposition: attachment; filename="' . rawurlencode( basename($filename) ) . '"' );
+} else {
+ header( 'Content-Disposition: attachment; filename*=UTF-8\'\'' . rawurlencode( basename($filename) )
+ . '; filename="' . rawurlencode( basename($filename) ) . '"' );
+}
+OCP\Response::disableCaching();
+header('Content-Length: '.$view->filesize($versionName));
+
+OC_Util::obEnd();
+
+$view->readfile($versionName);
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
deleted file mode 100644
index 719a7208fed..00000000000
--- a/apps/files_versions/history.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * ownCloud - History page of the Versions App
- *
- * @author Frank Karlitschek
- * @copyright 2012 Frank Karlitschek frank@owncloud.org
- *
- * 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/>.
- *
- */
-
-OCP\User::checkLoggedIn( );
-OCP\Util::addStyle('files_versions', 'versions');
-$tmpl = new OCP\Template( 'files_versions', 'history', 'user' );
-$l = OC_L10N::get('files_versions');
-
-if ( isset( $_GET['path'] ) ) {
-
- $path = $_GET['path'];
- $tmpl->assign( 'path', $path );
- $versions = new OCA\Files_Versions\Storage();
-
- // roll back to old version if button clicked
- if( isset( $_GET['revert'] ) ) {
-
- if( $versions->rollback( $path, $_GET['revert'] ) ) {
-
- $tmpl->assign( 'outcome_stat', $l->t('success') );
-
- $message = $l->t('File %s was reverted to version %s',
- array($_GET['path'], OCP\Util::formatDate( doubleval($_GET['revert']) ) ) );
-
- $tmpl->assign( 'outcome_msg', $message);
-
- } else {
-
- $tmpl->assign( 'outcome_stat', $l->t('failure') );
-
- $message = $l->t('File %s could not be reverted to version %s',
- array($_GET['path'], OCP\Util::formatDate( doubleval($_GET['revert']) ) ) );
-
- $tmpl->assign( 'outcome_msg', $message);
-
- }
-
- }
-
- // show the history only if there is something to show
- $count = 999; //show the newest revisions
- list ($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($path);
- if( ($versions = OCA\Files_Versions\Storage::getVersions($uid, $filename, $count)) ) {
-
- $tmpl->assign( 'versions', array_reverse( $versions ) );
-
- }else{
-
- $tmpl->assign( 'message', $l->t('No old versions available') );
-
- }
-}else{
-
- $tmpl->assign( 'message', $l->t('No path specified') );
-
-}
-
-$tmpl->printPage( );
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index a5b24417483..ca479507d48 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -1,4 +1,5 @@
$(document).ready(function(){
+
if (typeof FileActions !== 'undefined') {
// Add versions button to 'files/index.php'
FileActions.register(
@@ -14,39 +15,68 @@ $(document).ready(function(){
if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback
var file = $('#dir').val()+'/'+filename;
+ var createDropDown = true;
// Check if drop down is already visible for a different file
- if (($('#dropdown').length > 0) && $('#dropdown').hasClass('drop-versions') ) {
- if (file != $('#dropdown').data('file')) {
- $('#dropdown').hide('blind', function() {
- $('#dropdown').remove();
- $('tr').removeClass('mouseOver');
- createVersionsDropdown(filename, file);
- });
+ if (($('#dropdown').length > 0) ) {
+ if ( $('#dropdown').hasClass('drop-versions') && file == $('#dropdown').data('file')) {
+ createDropDown = false;
}
- } else {
+ $('#dropdown').remove();
+ $('tr').removeClass('mouseOver');
+ }
+
+ if(createDropDown === true) {
createVersionsDropdown(filename, file);
}
}
);
}
+
+ $(document).on("click", 'span[class="revertVersion"]', function() {
+ var revision = $(this).attr('id');
+ var file = $(this).attr('value');
+ revertFile(file, revision);
+ });
+
});
+function revertFile(file, revision) {
+
+ $.ajax({
+ type: 'GET',
+ url: OC.linkTo('files_versions', 'ajax/rollbackVersion.php'),
+ dataType: 'json',
+ data: {file: file, revision: revision},
+ async: false,
+ success: function(response) {
+ if (response.status === 'error') {
+ OC.Notification.show( t('files_version', 'Failed to revert {file} to revision {timestamp}.', {file:file, timestamp:formatDate(revision * 1000)}) );
+ } else {
+ $('#dropdown').hide('blind', function() {
+ $('#dropdown').remove();
+ $('tr').removeClass('mouseOver');
+ // TODO also update the modified time in the web ui
+ });
+ }
+ }
+ });
+
+}
+
function goToVersionPage(url){
window.location.assign(url);
}
function createVersionsDropdown(filename, files) {
- var historyUrl = OC.linkTo('files_versions', 'history.php') + '?path='+encodeURIComponent( $( '#dir' ).val() ).replace( /%2F/g, '/' )+'/'+encodeURIComponent( filename );
+ var start = 0;
var html = '<div id="dropdown" class="drop drop-versions" data-file="'+escapeHTML(files)+'">';
html += '<div id="private">';
- html += '<select data-placeholder="Saved versions" id="found_versions" class="chzen-select" style="width:16em;">';
- html += '<option value=""></option>';
- html += '</select>';
+ html += '<ul id="found_versions">';
+ html += '</ul>';
html += '</div>';
- html += '<input type="button" value="All versions..." name="makelink" id="makelink" />';
- html += '<input id="link" style="display:none; width:90%;" />';
+ html += '<input type="button" value="'+ t('files_versions', 'More versions...') + '" name="show-more-versions" id="show-more-versions" style="display: none;" />';
if (filename) {
$('tr').filterAttr('data-file',filename).addClass('mouseOver');
@@ -55,73 +85,72 @@ function createVersionsDropdown(filename, files) {
$(html).appendTo($('thead .share'));
}
- $("#makelink").click(function() {
- goToVersionPage(historyUrl);
- });
+ getVersions(start);
+ start = start + 5;
- $.ajax({
- type: 'GET',
- url: OC.filePath('files_versions', 'ajax', 'getVersions.php'),
- dataType: 'json',
- data: { source: files },
- async: false,
- success: function( versions ) {
-
- if (versions) {
- $.each( versions, function(index, row ) {
- addVersion( row );
- });
- } else {
- $('#found_versions').hide();
- $('#makelink').hide();
- $('<div style="text-align:center;">No other versions available</div>').appendTo('#dropdown');
- }
- $('#found_versions').change(function(){
- var revision=parseInt($(this).val());
- revertFile(files,revision);
- });
- }
+ $("#show-more-versions").click(function() {
+ //get more versions
+ getVersions(start);
+ start = start + 5;
});
- function revertFile(file, revision) {
-
+ function getVersions(start) {
$.ajax({
type: 'GET',
- url: OC.linkTo('files_versions', 'ajax/rollbackVersion.php'),
+ url: OC.filePath('files_versions', 'ajax', 'getVersions.php'),
dataType: 'json',
- data: {file: file, revision: revision},
+ data: {source: files, start: start},
async: false,
- success: function(response) {
- if (response.status=='error') {
- OC.dialogs.alert('Failed to revert '+file+' to revision '+formatDate(revision*1000)+'.','Failed to revert');
+ success: function(result) {
+ var versions = result.data.versions;
+ if (result.data.endReached === true) {
+ document.getElementById("show-more-versions").style.display="none";
} else {
- $('#dropdown').hide('blind', function() {
- $('#dropdown').remove();
- $('tr').removeClass('mouseOver');
- // TODO also update the modified time in the web ui
+ document.getElementById("show-more-versions").style.display="block";
+ }
+ if (versions) {
+ $.each(versions, function(index, row) {
+ addVersion(row);
});
+ } else {
+ $('<div style="text-align:center;">'+ t('files_versions', 'No other versions available') + '</div>').appendTo('#dropdown');
}
+ $('#found_versions').change(function() {
+ var revision = parseInt($(this).val());
+ revertFile(files, revision);
+ });
}
});
-
}
function addVersion( revision ) {
- name=formatDate(revision.version*1000);
- var version=$('<option/>');
- version.attr('value',revision.version);
- version.text(name);
-
-// } else {
-// var checked = ((permissions > 0) ? 'checked="checked"' : 'style="display:none;"');
-// var style = ((permissions == 0) ? 'style="display:none;"' : '');
-// var user = '<li data-uid_shared_with="'+uid_shared_with+'">';
-// user += '<a href="" class="unshare" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core','actions/delete')+'"/></a>';
-// user += uid_shared_with;
-// user += '<input type="checkbox" name="permissions" id="'+uid_shared_with+'" class="permissions" '+checked+' />';
-// user += '<label for="'+uid_shared_with+'" '+style+'>can edit</label>';
-// user += '</li>';
-// }
+ title = formatDate(revision.version*1000);
+ name ='<span class="versionDate" title="' + title + '">' + revision.humanReadableTimestamp + '</span>';
+
+ path = OC.filePath('files_versions', '', 'download.php');
+
+ download ='<a href="' + path + "?file=" + files + '&revision=' + revision.version + '">';
+ download+='<img';
+ download+=' src="' + OC.imagePath('core', 'actions/download') + '"';
+ download+=' id="' + revision.version + '"';
+ download+=' value="' + files + '"';
+ download+=' name="downloadVersion" />';
+ download+=name;
+ download+='</a>';
+
+ revert='<span class="revertVersion"';
+ revert+=' id="' + revision.version + '"';
+ revert+=' value="' + files + '">';
+ revert+='<img';
+ revert+=' src="' + OC.imagePath('core', 'actions/history') + '"';
+ revert+=' id="' + revision.version + '"';
+ revert+=' value="' + files + '"';
+ revert+=' name="revertVersion"';
+ revert+='/>'+t('files_versions', 'Restore')+'</span>';
+
+ var version=$('<li/>');
+ version.attr('value', revision.version);
+ version.html(download + revert);
version.appendTo('#found_versions');
}
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index c083a000c37..7c75d70f79c 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -239,10 +239,9 @@ class Storage {
* @brief get a list of all available versions of a file in descending chronological order
* @param $uid user id from the owner of the file
* @param $filename file to find versions of, relative to the user files dir
- * @param $count number of versions to return
* @returns array
*/
- public static function getVersions($uid, $filename, $count = 0 ) {
+ public static function getVersions($uid, $filename ) {
if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
$versions_fileview = new \OC\Files\View('/' . $uid . '/files_versions');
$versionsName = $versions_fileview->getLocalFile($filename).'.v';
@@ -268,6 +267,7 @@ class Storage {
$key = $version.'#'.$filename;
$versions[$key]['cur'] = 0;
$versions[$key]['version'] = $version;
+ $versions[$key]['humanReadableTimestamp'] = self::getHumanReadableTimestamp($version);
$versions[$key]['path'] = $filename;
$versions[$key]['size'] = $versions_fileview->filesize($filename.'.v'.$version);
@@ -276,6 +276,7 @@ class Storage {
}
+ // newest versions first
$versions = array_reverse( $versions );
foreach( $versions as $key => $value ) {
@@ -286,13 +287,6 @@ class Storage {
}
}
- $versions = array_reverse( $versions );
-
- // only show the newest commits
- if( $count != 0 and ( count( $versions )>$count ) ) {
- $versions = array_slice( $versions, count( $versions ) - $count );
- }
-
return( $versions );
} else {
@@ -302,6 +296,32 @@ class Storage {
}
+ /**
+ * @brief translate a timestamp into a string like "5 days ago"
+ * @param int $timestamp
+ * @return string for example "5 days ago"
+ */
+ private static function getHumanReadableTimestamp($timestamp) {
+
+ $diff = time() - $timestamp;
+
+ if ($diff < 60) { // first minute
+ return $diff . " seconds ago";
+ } elseif ($diff < 3600) { //first hour
+ return round($diff / 60) . " minutes ago";
+ } elseif ($diff < 86400) { // first day
+ return round($diff / 3600) . " hours ago";
+ } elseif ($diff < 604800) { //first week
+ return round($diff / 86400) . " days ago";
+ } elseif ($diff < 2419200) { //first month
+ return round($diff / 604800) . " weeks ago";
+ } elseif ($diff < 29030400) { // first year
+ return round($diff / 2419200) . " months ago";
+ } else {
+ return round($diff / 29030400) . " years ago";
+ }
+
+ }
/**
* @brief deletes used space for files versions in db if user was deleted
diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
deleted file mode 100644
index 3a6d5f0c9e7..00000000000
--- a/apps/files_versions/templates/history.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<div id="history">
-
-<?php
-
-if( isset( $_['message'] ) ) {
-
-
- if( isset($_['path'] ) ) print_unescaped('<strong>File: '.OC_Util::sanitizeHTML($_['path']).'</strong><br>');
- print_unescaped('<strong>'.OC_Util::sanitizeHTML($_['message']) .'</strong><br>');
-
-}else{
-
- if( isset( $_['outcome_stat'] ) ) {
-
- print_unescaped( '<div id="feedback-messages" class="'.OC_Util::sanitizeHTML($_['outcome_stat']).'"><h3>'.OC_Util::sanitizeHTML($_['outcome_msg']).'</h3></div><br>');
-
- }
-
- print_unescaped( '<strong>Versions of '.OC_Util::sanitizeHTML($_['path']).'</strong><br>');
- print_unescaped('<p><em>'.OC_Util::sanitizeHTML($l->t('Revert a file to a previous version by clicking on its revert button')).'</em></p><br />');
-
- foreach ( $_['versions'] as $v ) {
- p(' ');
- p(OCP\Util::formatDate( doubleval($v['version'])));
- print_unescaped(' <a href="'.OCP\Util::linkTo('files_versions', 'history.php',
- array('path' => $_['path'], 'revert' => $v['version'])) .'" class="button">Revert</a><br /><br />');
- if ( $v['cur'] ) {
- print_unescaped(' (<b>Current</b>)');
- }
- print_unescaped('<br /><br />');
- }
-
-}
-
-?>
-</div>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-30 13:06:23 +0000