Merge branch 'master' into share_api

Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php

5 files changed, 42 insertions, 3 deletions

diff --git a/apps/files_versions/ajax/expireAll.php b/apps/files_versions/ajax/expireAll.php
index 4f165be0ae9..2a678c7f0a5 100644
--- a/apps/files_versions/ajax/expireAll.php
+++ b/apps/files_versions/ajax/expireAll.php
@@ -27,6 +27,7 @@
 // Check user and app status
 OCP\JSON::checkLoggedIn();
 OCP\App::checkAppEnabled('files_versions');
+OCP\JSON::callCheck();
 
 $versions = new OCA_Versions\Storage();
 
diff --git a/apps/files_versions/ajax/rollbackVersion.php b/apps/files_versions/ajax/rollbackVersion.php
index 8d1092f8b8e..24d71a914a4 100644
--- a/apps/files_versions/ajax/rollbackVersion.php
+++ b/apps/files_versions/ajax/rollbackVersion.php
@@ -1,6 +1,7 @@
 <?php
 
 OCP\JSON::checkAppEnabled('files_versions');
+OCP\JSON::callCheck();
 
 $userDirectory = "/".OCP\USER::getUser()."/files";
 
diff --git a/apps/files_versions/ajax/togglesettings.php b/apps/files_versions/ajax/togglesettings.php
index 86f614c5c89..546b37ae1aa 100644
--- a/apps/files_versions/ajax/togglesettings.php
+++ b/apps/files_versions/ajax/togglesettings.php
@@ -2,6 +2,7 @@
 
 OCP\JSON::checkAppEnabled('files_versions');
 OCP\JSON::checkAdminUser();
+OCP\JSON::callCheck();
 if (OCP\Config::getSystemValue('versions', 'true')=='true') {
 	OCP\Config::setSystemValue('versions', 'false');
 } else {
diff --git a/apps/files_versions/appinfo/api.php b/apps/files_versions/appinfo/api.php
new file mode 100644
index 00000000000..a7386bc2c9f
--- /dev/null
+++ b/apps/files_versions/appinfo/api.php
@@ -0,0 +1,36 @@
+<?php
+/**
+* ownCloud
+*
+* @author Michael Gapczynski
+* @copyright 2012 Michael Gapczynski mtgap@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/>.
+*/
+
+return array(
+	'list' => array('method' => 'GET', 'class' => 'Storage', 'function' => 'getVersions',
+		'parameters' => array(
+			'file' => array('required' => true, 'type' => 'string')
+		)
+	),
+	'revert' => array('method' => 'POST', 'class' => 'Storage', 'function' => 'rollback',
+		'parameters' => array(
+			'file' => array('required' => true, 'type' => 'string'),
+			'time' => array('required' => true, 'type' => 'int')
+		)
+	)
+);
+
+?>
\ No newline at end of file
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 0ce884c3ea0..f146676757d 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -227,13 +227,13 @@ class Storage {
 			}

 				

 			$versions = array_reverse( $versions );

-				

+			

 			foreach( $versions as $key => $value ) {

 

 				// flag the first matched file in array (which will have latest modification date) as current version

-				if ( $versions[$key]['fileMatch'] ) {

+				if ( $value['fileMatch'] ) {

 

-					$versions[$key]['cur'] = 1;

+					$value['cur'] = 1;

 					break;

 						

 				}