From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 2 Sep 2013 09:36:20 +0000 (+0200)
Subject: error.php no longer needed
X-Git-Tag: v6.0.0alpha2~104^2~12
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6572ca811fc56c71b4efc970668741630acbd63c;p=nextcloud-server.git

error.php no longer needed
---

diff --git a/apps/files_encryption/files/error.php b/apps/files_encryption/files/error.php
deleted file mode 100644
index 7a2bb1a2811..00000000000
--- a/apps/files_encryption/files/error.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-if (!isset($_)) { //also provide standalone error page
-	require_once __DIR__ . '/../../../lib/base.php';
-
-	$l = OC_L10N::get('files_encryption');
-
-	$errorMsg = $l->t('Your private key is not valid! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app. If this doesn\'t help maybe your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.');
-
-	if(isset($_GET['p']) && $_GET['p'] === '1') {
-		header('HTTP/1.0 404 ' . $errorMsg);
-	}
-
-	// check if ajax request
-	if(!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {
-		\OCP\JSON::error(array('data' => array('message' => $errorMsg)));
-	} else {
-		header('HTTP/1.0 404 ' . $errorMsg);
-		$tmpl = new OC_Template('files_encryption', 'invalid_private_key', 'guest');
-		$tmpl->printPage();
-	}
-
-	exit;
-}