remove unneccessary lib in namespace

diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index ad79549e5e4c3903ab0016498ff4fbc1b8c96bd0..c69f5a8860c692218d1d07330852e0521b0a72f8 100644 (file)
--- 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 ace261ba769cbf1c2cabfe4bb7c49bb7cd012993..32a77bff6c3054961a364ce1561b5c5e82f04f85 100644 (file)
--- 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 869c9b9e348b5dac54b48760d9613abda5270a11..350fc7fa5f6512bac59c5d6996018ad935c7aec5 100644 (file)
--- 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 742da4d2da3d551df2bf325ff0f3ca017354268b..5ca0d5e81173edbff5c616393b7029267be7a2aa 100644 (file)
--- 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 e07e2c07f3a37ec40096776c9c86950db40bfc7e..0920bf62109d7adcb42bb8523a2f69b525d06caa 100644 (file)
--- 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 (file)
--- 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 32c3e09cd6d7b34e5c98fc61a6c480479634d59a..6f22fdfdc19bb4fccfbfae5d0b8b5d2c7b2dd9d5 100644 (file)
--- 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 5b454127a71188e8f010915b38a5ad8a015e1600..08c807d7f7b20b31492a642d4656aae8fbf377e3 100644 (file)
--- 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 02201c16edad5639a634c833b7d61e50d1a1ff4f..136767aeb456b39ba2c8c563590d9f73d0eb6042 100644 (file)
--- 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/lib/helper.php b/apps/files_trashbin/lib/helper.php
index 1c89eaf2c2a33abe6b0a4667492e98b9ab024ce8..99f534565f943dcae8970eb4b59d00f584b5d74c 100644 (file)
--- a/apps/files_trashbin/lib/helper.php
+++ b/apps/files_trashbin/lib/helper.php
@@ -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;
        }