diff options
author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-20 16:37:07 +0200 |
---|---|---|
committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-20 16:37:07 +0200 |
commit | 9e39118b526afe6464fc15ea3fa5ed6301f1f63d (patch) | |
tree | 6db10176608de0d7a5b79d6a3b05750fc01791a9 /apps/files | |
parent | 09cfebe93653f9168bdfb8e480a47c50a28868ea (diff) | |
download | nextcloud-server-9e39118b526afe6464fc15ea3fa5ed6301f1f63d.tar.gz nextcloud-server-9e39118b526afe6464fc15ea3fa5ed6301f1f63d.zip |
namespaces use upcasefirst parts
when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app
its magic!
Diffstat (limited to 'apps/files')
-rw-r--r-- | apps/files/ajax/delete.php | 2 | ||||
-rw-r--r-- | apps/files/ajax/getstoragestats.php | 2 | ||||
-rw-r--r-- | apps/files/ajax/list.php | 6 | ||||
-rw-r--r-- | apps/files/ajax/rawlist.php | 6 | ||||
-rw-r--r-- | apps/files/ajax/upload.php | 4 | ||||
-rw-r--r-- | apps/files/index.php | 6 | ||||
-rw-r--r-- | apps/files/lib/helper.php | 6 |
7 files changed, 16 insertions, 16 deletions
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php index 5f4856ec790..ad79549e5e4 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\Lib\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 7a2b642a9bd..ace261ba769 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\Lib\Helper::buildFileStorageStatistics('/'))); diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php index f1b713b5534..869c9b9e348 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\Lib\Helper::getDirPermissions($dir); // Make breadcrumb if($doBreadcrumb) { - $breadcrumb = \OCA\files\lib\Helper::makeBreadcrumb($dir); + $breadcrumb = \OCA\Files\Lib\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\Lib\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 9ccd4cc299a..742da4d2da3 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\Lib\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\Lib\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\Lib\Helper::determineIcon($file); $files[] = $file; } } diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index 3d5314afc89..e07e2c07f3a 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\Lib\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\Lib\Helper::buildFileStorageStatistics($dir); $meta = \OC\Files\Filesystem::getFileInfo($target); if ($meta === false) { diff --git a/apps/files/index.php b/apps/files/index.php index 9e54a706c01..32c3e09cd6d 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\Lib\Helper::getFiles($dir); } $freeSpace = \OC\Files\Filesystem::free_space($dir); $needUpgrade = false; } // Make breadcrumb -$breadcrumb = \OCA\files\lib\Helper::makeBreadcrumb($dir); +$breadcrumb = \OCA\Files\Lib\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\Lib\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 3c13b8ea6e2..5b454127a71 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\Lib; 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\Lib\Helper::determineIcon($i); $files[] = $i; } - usort($files, array('\OCA\files\lib\Helper', 'fileCmp')); + usort($files, array('\OCA\Files\Lib\Helper', 'fileCmp')); return $files; } |