diff options
author | Robin Appelman <icewind@owncloud.com> | 2012-10-10 13:18:36 +0200 |
---|---|---|
committer | Robin Appelman <icewind@owncloud.com> | 2012-10-10 13:18:36 +0200 |
commit | aaa1b733642c41821a53bc6d04fab246bfe7f1e6 (patch) | |
tree | d5eb087401acb4591f176a87c01f276f42a307af /apps/files_external | |
parent | c88c54bbb054fe2d79b3a93604989d527b5dd444 (diff) | |
download | nextcloud-server-aaa1b733642c41821a53bc6d04fab246bfe7f1e6.tar.gz nextcloud-server-aaa1b733642c41821a53bc6d04fab246bfe7f1e6.zip |
don't use depricated OC_Filesystem
Diffstat (limited to 'apps/files_external')
-rw-r--r-- | apps/files_external/ajax/addRootCertificate.php | 12 | ||||
-rwxr-xr-x | apps/files_external/lib/config.php | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/apps/files_external/ajax/addRootCertificate.php b/apps/files_external/ajax/addRootCertificate.php index e0a0239c954..6fef9aac1ed 100644 --- a/apps/files_external/ajax/addRootCertificate.php +++ b/apps/files_external/ajax/addRootCertificate.php @@ -3,23 +3,23 @@ OCP\JSON::checkAppEnabled('files_external'); if ( !($filename = $_FILES['rootcert_import']['name']) ) { - header("Location: settings/personal.php");
+ header("Location: settings/personal.php"); exit; } -$fh = fopen($_FILES['rootcert_import']['tmp_name'], 'r');
-$data = fread($fh, filesize($_FILES['rootcert_import']['tmp_name']));
+$fh = fopen($_FILES['rootcert_import']['tmp_name'], 'r'); +$data = fread($fh, filesize($_FILES['rootcert_import']['tmp_name'])); fclose($fh); $filename = $_FILES['rootcert_import']['name']; -
-$view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_external/uploads');
+ +$view = new \OC\Files\View('/'.\OCP\User::getUser().'/files_external/uploads'); if (!$view->file_exists('')) $view->mkdir(''); $isValid = openssl_pkey_get_public($data); //maybe it was just the wrong file format, try to convert it... if ($isValid == false) { - $data = chunk_split(base64_encode($data), 64, "\n");
+ $data = chunk_split(base64_encode($data), 64, "\n"); $data = "-----BEGIN CERTIFICATE-----\n".$data."-----END CERTIFICATE-----\n"; $isValid = openssl_pkey_get_public($data); } diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index cb32fed2032..7be23360199 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -109,10 +109,10 @@ class OC_Mount_Config { return $personal; } - /**
- * Add directory for mount point to the filesystem
- * @param OC_Fileview instance $view
- * @param string path to mount point
+ /** + * Add directory for mount point to the filesystem + * @param OC_Fileview instance $view + * @param string path to mount point */ private static function addMountPointDirectory($view, $path) { $dir = ''; @@ -142,11 +142,11 @@ class OC_Mount_Config { if ($applicable != OCP\User::getUser() || $class == '\OC\Files\Storage\Local') { return false; } - $view = new OC_FilesystemView('/'.OCP\User::getUser().'/files'); + $view = new \OC\Files\View('/'.OCP\User::getUser().'/files'); self::addMountPointDirectory($view, ltrim($mountPoint, '/')); $mountPoint = '/'.$applicable.'/files/'.ltrim($mountPoint, '/'); } else { - $view = new OC_FilesystemView('/'); + $view = new \OC\Files\View('/'); switch ($mountType) { case 'user': if ($applicable == "all") { |