From 748fcabba48fe0f60951be22a531f3bf88fdabff Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 17 Jul 2012 11:57:38 +0200
Subject: Added CSRF checks to files_versions. Expect some error messages - and
 report them ;)

---
 apps/files_versions/ajax/expireAll.php       | 1 +
 apps/files_versions/ajax/rollbackVersion.php | 1 +
 apps/files_versions/ajax/togglesettings.php  | 1 +
 3 files changed, 3 insertions(+)

(limited to 'apps/files_versions')

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 {
-- 
cgit v1.2.3


From 8a19e134df09dd9a3e49736489f28ad0aee79803 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 21 Jul 2012 00:20:04 +0200
Subject: fix ununsed variables

---
 apps/files_versions/lib/versions.php | 6 +++---
 lib/connector/sabre/locks.php        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'apps/files_versions')

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;
 						
 				}
diff --git a/lib/connector/sabre/locks.php b/lib/connector/sabre/locks.php
index 94382e68a1a..e95dcf02d27 100644
--- a/lib/connector/sabre/locks.php
+++ b/lib/connector/sabre/locks.php
@@ -108,7 +108,7 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 
 		$locks = $this->getLocks($uri,false);
 		$exists = false;
-		foreach($locks as $k=>$lock) {
+		foreach($locks as $lock) {
 			if ($lock->token == $lockInfo->token) $exists = true;
 		}
 	
-- 
cgit v1.2.3