rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2025-01-31 20:52:17 +01:00
Code Issues Releases Activity

remove use of obsolete class OC_FileProxy

Browse Source
This commit is contained in:
babelouest 2015-04-26 15:09:13 -04:00
parent de7eafb8b9
commit 03776258bb
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/controller/importcontroller.php
View File

@ -86,10 +86,7 @@ class ImportController extends Controller {
return $response; return $response;
} }
$content = file_get_contents($tmpname); $content = file_get_contents($tmpname);
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
if($view->file_put_contents('/imports/'.$filename, $content)) { if($view->file_put_contents('/imports/'.$filename, $content)) {
\OC_FileProxy::$enabled = $proxyStatus;
$progresskey = 'contacts-import-' . rand(); $progresskey = 'contacts-import-' . rand();
$response->setParams( $response->setParams(
array( array(
@ -101,7 +98,6 @@ class ImportController extends Controller {
) )
); );
} else { } else {
\OC_FileProxy::$enabled = $proxyStatus;
$response->bailOut(App::$l10n->t('Error uploading contacts to storage.')); $response->bailOut(App::$l10n->t('Error uploading contacts to storage.'));
return $response; return $response;
} }
@ -129,12 +125,8 @@ class ImportController extends Controller {
$view->mkdir('imports'); $view->mkdir('imports');
} }
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
$content = \OC_Filesystem::file_get_contents($path . '/' . $filename); $content = \OC_Filesystem::file_get_contents($path . '/' . $filename);
//$content = file_get_contents('oc://' . $path . '/' . $filename);
if($view->file_put_contents('/imports/' . $filename, $content)) { if($view->file_put_contents('/imports/' . $filename, $content)) {
\OC_FileProxy::$enabled = $proxyStatus;
$progresskey = 'contacts-import-' . rand(); $progresskey = 'contacts-import-' . rand();
$response->setParams( $response->setParams(
array( array(
@ -146,7 +138,6 @@ class ImportController extends Controller {
) )
); );
} else { } else {
\OC_FileProxy::$enabled = $proxyStatus;
$response->bailOut(App::$l10n->t('Error moving file to imports folder.')); $response->bailOut(App::$l10n->t('Error moving file to imports folder.'));
} }
return $response; return $response;
@ -189,10 +180,7 @@ class ImportController extends Controller {
return $response; return $response;
} }
$view = \OCP\Files::getStorage('contacts'); $view = \OCP\Files::getStorage('contacts');
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
$file = $view->file_get_contents('/imports/' . $filename); $file = $view->file_get_contents('/imports/' . $filename);
\OC_FileProxy::$enabled = $proxyStatus;
$importManager = new ImportManager(); $importManager = new ImportManager();