fix merge conflicts

1 files changed, 20 insertions, 0 deletions

diff --git a/lib/public/util.php b/lib/public/util.php
index 9b499574da1..995161e2abe 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -248,6 +248,26 @@ class Util {
 	}
 
 
+	/**
+ 	 * Register an get/post call. This is important to prevent CSRF attacks
+	 * TODO: write example
+	 */
+	public static function callRegister(){
+		return(\OC_Util::callRegister());
+	}
+
+
+	/**
+	 * Check an ajax get/post call if the request token is valid. exit if not.
+	 * Todo: Write howto
+	 */
+	public static function callCheck(){
+		return(\OC_Util::callCheck());
+	}
+
+
+
+
 }
 
 ?>