Merge branch 'master' into tasks

3 files changed, 98 insertions, 0 deletions

diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php
new file mode 100755
index 00000000000..5949c32ed16
--- /dev/null
+++ b/apps/files_versions/ajax/getVersions.php
@@ -0,0 +1,61 @@
+<?php
+
+require_once('../../../lib/base.php');
+OCP\JSON::checkAppEnabled('files_versions');
+require_once('../versions.php');
+
+$userDirectory = "/".OCP\USER::getUser()."/files";
+$source = $_GET['source'];
+$source = strip_tags( $source );
+
+if( OCA_Versions\Storage::isversioned( $source ) ) {
+
+	$count=5; //show the newest revisions
+	$versions = OCA_Versions\Storage::getversions( $source, $count);
+	$versionsFormatted = array();
+	
+	foreach ( $versions AS $version ) {
+	
+		$versionsFormatted[] = OCP\Util::formatDate( $version );
+		
+	}
+
+	$versionsSorted = array_reverse( $versionsFormatted );
+	
+	if ( !empty( $versionsSorted ) ) {
+		OCP\JSON::encodedPrint($versionsSorted);
+	}
+	
+}else{
+
+	return;
+	
+}
+
+// $path = $source;
+// $users = array();
+// if ($users = OC_Share::getMySharedItem($source)) {
+// 	for ($i = 0; $i < count($users); $i++) {
+// 		if ($users[$i]['uid_shared_with'] == OC_Share::PUBLICLINK) {
+// 			$users[$i]['token'] = OC_Share::getTokenFromSource($source);
+// 		}
+// 	}
+// }
+// $source = dirname($source);
+// while ($source != "" && $source != "/" && $source != "." && $source != $userDirectory) {
+// 	if ($values = OC_Share::getMySharedItem($source)) {
+// 		$values = array_values($values);
+// 		$parentUsers = array();
+// 		for ($i = 0; $i < count($values); $i++) {
+// 			if ($values[$i]['uid_shared_with'] == OC_Share::PUBLICLINK) {
+// 				$values[$i]['token'] = OC_Share::getTokenFromSource($source)."&path=".substr($path, strlen($source));
+// 			}
+// 			$parentUsers[basename($source)."-".$i] = $values[$i];
+// 		}
+// 		$users = array_merge($users, $parentUsers);
+// 	}
+// 	$source = dirname($source);
+// }
+// if (!empty($users)) {
+// 	OCP\JSON::encodedPrint($users);
+// }
diff --git a/apps/files_versions/ajax/rollbackVersion.php b/apps/files_versions/ajax/rollbackVersion.php
new file mode 100755
index 00000000000..3faaafe935d
--- /dev/null
+++ b/apps/files_versions/ajax/rollbackVersion.php
@@ -0,0 +1,26 @@
+<?php
+
+require_once('../../../lib/base.php');
+OCP\JSON::checkAppEnabled('files_versions');
+require_once('../versions.php');
+
+$userDirectory = "/".OCP\USER::getUser()."/files";
+
+$source = $_GET['source'];
+
+$source = strip_tags( $source );
+
+echo "\n\n$source\n\n";
+
+$revision = strtotime( $source );
+
+echo "\n\n$revision\n\n";
+
+if( OCA_Versions\Storage::isversioned( $source ) ) {
+
+
+        #\OCA_Versions\Storage::rollback( $source, $revision );
+	
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_versions/ajax/togglesettings.php b/apps/files_versions/ajax/togglesettings.php
new file mode 100755
index 00000000000..d513d12dd6c
--- /dev/null
+++ b/apps/files_versions/ajax/togglesettings.php
@@ -0,0 +1,11 @@
+<?php
+
+OCP\JSON::checkAppEnabled('files_versions');
+OCP\JSON::checkAdminUser();
+if (OCP\Config::getSystemValue('versions', 'true')=='true') {
+	OCP\Config::setSystemValue('versions', 'false');
+} else {
+	OCP\Config::setSystemValue('versions', 'true');
+}
+
+?>