diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index 5f4856ec790a64f8dc52f6bb86b42266945afe5d..c69f5a8860c692218d1d07330852e0521b0a72f8 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -24,7 +24,7 @@ foreach ($files as $file) {
}
// get array with updated storage stats (e.g. max file size) after upload
-$storageStats = \OCA\files\lib\Helper::buildFileStorageStatistics($dir);
+$storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);
if ($success) {
OCP\JSON::success(array("data" => array_merge(array("dir" => $dir, "files" => $files), $storageStats)));
diff --git a/apps/files/ajax/getstoragestats.php b/apps/files/ajax/getstoragestats.php
index 7a2b642a9bd11296f64bc16afd1fb559dbde2443..32a77bff6c3054961a364ce1561b5c5e82f04f85 100644
--- a/apps/files/ajax/getstoragestats.php
+++ b/apps/files/ajax/getstoragestats.php
@@ -6,4 +6,4 @@ $RUNTIME_APPTYPES = array('filesystem');
OCP\JSON::checkLoggedIn();
// send back json
-OCP\JSON::success(array('data' => \OCA\files\lib\Helper::buildFileStorageStatistics('/')));
+OCP\JSON::success(array('data' => \OCA\Files\Helper::buildFileStorageStatistics('/')));
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index f1b713b55346714907d6da144d1cb92dc6b36bc2..350fc7fa5f6512bac59c5d6996018ad935c7aec5 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -20,11 +20,11 @@ $doBreadcrumb = isset($_GET['breadcrumb']);
$data = array();
$baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir=';
-$permissions = \OCA\files\lib\Helper::getDirPermissions($dir);
+$permissions = \OCA\Files\Helper::getDirPermissions($dir);
// Make breadcrumb
if($doBreadcrumb) {
- $breadcrumb = \OCA\files\lib\Helper::makeBreadcrumb($dir);
+ $breadcrumb = \OCA\Files\Helper::makeBreadcrumb($dir);
$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
@@ -34,7 +34,7 @@ if($doBreadcrumb) {
}
// make filelist
-$files = \OCA\files\lib\Helper::getFiles($dir);
+$files = \OCA\Files\Helper::getFiles($dir);
$list = new OCP\Template("files", "part.list", "");
$list->assign('files', $files, false);
diff --git a/apps/files/ajax/rawlist.php b/apps/files/ajax/rawlist.php
index 9ccd4cc299a17ad114bd7a3a1604b1c375de281e..5ca0d5e81173edbff5c616393b7029267be7a2aa 100644
--- a/apps/files/ajax/rawlist.php
+++ b/apps/files/ajax/rawlist.php
@@ -28,7 +28,7 @@ if($mimetypes && !in_array('httpd/unix-directory', $mimetypes)) {
$file['directory'] = $dir;
$file['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($file['mimetype']);
$file["date"] = OCP\Util::formatDate($file["mtime"]);
- $file['mimetype_icon'] = \OCA\files\lib\Helper::determineIcon($file);
+ $file['mimetype_icon'] = \OCA\Files\Helper::determineIcon($file);
$files[] = $file;
}
}
@@ -39,7 +39,7 @@ if (is_array($mimetypes) && count($mimetypes)) {
$file['directory'] = $dir;
$file['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($file['mimetype']);
$file["date"] = OCP\Util::formatDate($file["mtime"]);
- $file['mimetype_icon'] = \OCA\files\lib\Helper::determineIcon($file);
+ $file['mimetype_icon'] = \OCA\Files\Helper::determineIcon($file);
$files[] = $file;
}
}
@@ -48,7 +48,7 @@ if (is_array($mimetypes) && count($mimetypes)) {
$file['directory'] = $dir;
$file['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($file['mimetype']);
$file["date"] = OCP\Util::formatDate($file["mtime"]);
- $file['mimetype_icon'] = \OCA\files\lib\Helper::determineIcon($file);
+ $file['mimetype_icon'] = \OCA\Files\Helper::determineIcon($file);
$files[] = $file;
}
}
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 3d5314afc89d0209230b11a4728055945551c70a..0920bf62109d7adcb42bb8523a2f69b525d06caa 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -53,7 +53,7 @@ OCP\JSON::callCheck();
// get array with current storage stats (e.g. max file size)
-$storageStats = \OCA\files\lib\Helper::buildFileStorageStatistics($dir);
+$storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);
if (!isset($_FILES['files'])) {
OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('No file was uploaded. Unknown error')), $storageStats)));
@@ -113,7 +113,7 @@ if (strpos($dir, '..') === false) {
if (is_uploaded_file($files['tmp_name'][$i]) and \OC\Files\Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
// updated max file size after upload
- $storageStats = \OCA\files\lib\Helper::buildFileStorageStatistics($dir);
+ $storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);
$meta = \OC\Files\Filesystem::getFileInfo($target);
if ($meta === false) {
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index bd3245ded3f39a2b73e733653f3a593fb02fec66..909baca92ea7457050d53f6a0a242719836742e9 100644
--- a/apps/files/appinfo/app.php
+++ b/apps/files/appinfo/app.php
@@ -1,5 +1,4 @@
<?php
-OC::$CLASSPATH['OCA\Files\Capabilities'] = 'apps/files/lib/capabilities.php';
$l = OC_L10N::get('files');
diff --git a/apps/files/index.php b/apps/files/index.php
index 9e54a706c01f6ad391b8a90e57a5d44c10ff896d..6f22fdfdc19bb4fccfbfae5d0b8b5d2c7b2dd9d5 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -74,14 +74,14 @@ if (\OC\Files\Cache\Upgrade::needUpgrade($user)) { //dont load anything if we ne
$ajaxLoad = true;
}
else{
- $files = \OCA\files\lib\Helper::getFiles($dir);
+ $files = \OCA\Files\Helper::getFiles($dir);
}
$freeSpace = \OC\Files\Filesystem::free_space($dir);
$needUpgrade = false;
}
// Make breadcrumb
-$breadcrumb = \OCA\files\lib\Helper::makeBreadcrumb($dir);
+$breadcrumb = \OCA\Files\Helper::makeBreadcrumb($dir);
// make breadcrumb und filelist markup
$list = new OCP\Template('files', 'part.list', '');
@@ -93,7 +93,7 @@ $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb);
$breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=');
-$permissions = \OCA\files\lib\Helper::getDirPermissions($dir);
+$permissions = \OCA\Files\Helper::getDirPermissions($dir);
if ($needUpgrade) {
OCP\Util::addscript('files', 'upgrade');
diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php
index 3c13b8ea6e2509b2fe6b6b1e1766d7a007b28648..08c807d7f7b20b31492a642d4656aae8fbf377e3 100644
--- a/apps/files/lib/helper.php
+++ b/apps/files/lib/helper.php
@@ -1,6 +1,6 @@
<?php
-namespace OCA\files\lib;
+namespace OCA\Files;
class Helper
{
@@ -85,11 +85,11 @@ class Helper
}
$i['directory'] = $dir;
$i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($i['mimetype']);
- $i['icon'] = \OCA\files\lib\Helper::determineIcon($i);
+ $i['icon'] = \OCA\Files\Helper::determineIcon($i);
$files[] = $i;
}
- usort($files, array('\OCA\files\lib\Helper', 'fileCmp'));
+ usort($files, array('\OCA\Files\Helper', 'fileCmp'));
return $files;
}
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index c997a7950c2fbd8ba8d27153fbc34a0c37763485..136767aeb456b39ba2c8c563590d9f73d0eb6042 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -22,7 +22,7 @@ function fileCmp($a, $b) {
function determineIcon($file, $sharingRoot, $sharingToken) {
// for folders we simply reuse the files logic
if($file['type'] == 'dir') {
- return \OCA\files\lib\Helper::determineIcon($file);
+ return \OCA\Files\Helper::determineIcon($file);
}
$relativePath = substr($file['path'], 6);
diff --git a/apps/files_trashbin/ajax/list.php b/apps/files_trashbin/ajax/list.php
index e72e67b01d7e504f6a5fa5f54278e6fde67a28b5..c9dc13b7840ba650d32cddf8f6afa330e6dabcf9 100644
--- a/apps/files_trashbin/ajax/list.php
+++ b/apps/files_trashbin/ajax/list.php
@@ -15,7 +15,7 @@ $data = array();
// Make breadcrumb
if($doBreadcrumb) {
- $breadcrumb = \OCA\files_trashbin\lib\Helper::makeBreadcrumb($dir);
+ $breadcrumb = \OCA\Files_Trashbin\Helper::makeBreadcrumb($dir);
$breadcrumbNav = new OCP\Template('files_trashbin', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
@@ -26,7 +26,7 @@ if($doBreadcrumb) {
}
// make filelist
-$files = \OCA\files_trashbin\lib\Helper::getTrashFiles($dir);
+$files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir);
if ($files === null){
header("HTTP/1.0 404 Not Found");
diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php
index 2c101f0a723b18cbb0890d9271c51b712719a62a..d30a601ef564c0282fdbed5715cf62f394cd114d 100644
--- a/apps/files_trashbin/appinfo/app.php
+++ b/apps/files_trashbin/appinfo/app.php
@@ -1,7 +1,7 @@
<?php
-OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'files_trashbin/lib/hooks.php';
-OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'files_trashbin/lib/trash.php';
+//OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'files_trashbin/lib/hooks.php';
+//OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'files_trashbin/lib/trash.php';
// register hooks
\OCA\Files_Trashbin\Trashbin::registerHooks();
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index 9f17448a757ecce21f03e57f3ea9fff70674de09..d8661e170a58cd69ebde886cb0fa92192969916f 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -36,7 +36,7 @@ if ($isIE8 && isset($_GET['dir'])){
$ajaxLoad = false;
if (!$isIE8){
- $files = \OCA\files_trashbin\lib\Helper::getTrashFiles($dir);
+ $files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir);
}
else{
$files = array();
@@ -54,7 +54,7 @@ if ($dir && $dir !== '/') {
$dirlisting = true;
}
-$breadcrumb = \OCA\files_trashbin\lib\Helper::makeBreadcrumb($dir);
+$breadcrumb = \OCA\Files_Trashbin\Helper::makeBreadcrumb($dir);
$breadcrumbNav = new OCP\Template('files_trashbin', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb);
diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php
index 098fc0b54b7f9f61d246b48717b52051d579a2a4..99f534565f943dcae8970eb4b59d00f584b5d74c 100644
--- a/apps/files_trashbin/lib/helper.php
+++ b/apps/files_trashbin/lib/helper.php
@@ -1,6 +1,6 @@
<?php
-namespace OCA\files_trashbin\lib;
+namespace OCA\Files_Trashbin;
class Helper
{
@@ -62,11 +62,11 @@ class Helper
}
$i['permissions'] = \OCP\PERMISSION_READ;
$i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($r['mime']);
- $i['icon'] = \OCA\files\lib\Helper::determineIcon($i);
+ $i['icon'] = \OCA\Files\Helper::determineIcon($i);
$files[] = $i;
}
- usort($files, array('\OCA\files\lib\Helper', 'fileCmp'));
+ usort($files, array('\OCA\Files\Helper', 'fileCmp'));
return $files;
}
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trashbin.php
similarity index 100%
rename from apps/files_trashbin/lib/trash.php
rename to apps/files_trashbin/lib/trashbin.php