open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4927 from owncloud/fix_namespaces_and_autoloading

Browse Source 
namespaces use upcasefirst parts
remotes/origin/stable6
Thomas Müller 12 years ago
parent 5b95e7aa0f 4b3e56bcf9
commit 2a0c51a8bf
14 changed files with 26 additions and 27 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      apps/files/ajax/delete.php
  2. 2
      apps/files/ajax/getstoragestats.php
  3. 6
      apps/files/ajax/list.php
  4. 6
      apps/files/ajax/rawlist.php
  5. 4
      apps/files/ajax/upload.php
  6. 1
      apps/files/appinfo/app.php
  7. 6
      apps/files/index.php
  8. 6
      apps/files/lib/helper.php
  9. 2
      apps/files_sharing/public.php
  10. 4
      apps/files_trashbin/ajax/list.php
  11. 4
      apps/files_trashbin/appinfo/app.php
  12. 4
      apps/files_trashbin/index.php
  13. 6
      apps/files_trashbin/lib/helper.php
  14. 0
      apps/files_trashbin/lib/trashbin.php

2
apps/files/ajax/delete.php
Unescape View File

@ -24,7 +24,7 @@ foreach ($files as $file) {
} }
// get array with updated storage stats (e.g. max file size) after upload // 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) { if ($success) {
OCP\JSON::success(array("data" => array_merge(array("dir" => $dir, "files" => $files), $storageStats))); OCP\JSON::success(array("data" => array_merge(array("dir" => $dir, "files" => $files), $storageStats)));

2
apps/files/ajax/getstoragestats.php
Unescape View File

@ -6,4 +6,4 @@ $RUNTIME_APPTYPES = array('filesystem');
OCP\JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
// send back json // send back json
OCP\JSON::success(array('data' => \OCA\files\lib\Helper::buildFileStorageStatistics('/'))); OCP\JSON::success(array('data' => \OCA\Files\Helper::buildFileStorageStatistics('/')));

6
apps/files/ajax/list.php
Unescape View File

@ -20,11 +20,11 @@ $doBreadcrumb = isset($_GET['breadcrumb']);
$data = array(); $data = array();
$baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir='; $baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir=';
$permissions = \OCA\files\lib\Helper::getDirPermissions($dir); $permissions = \OCA\Files\Helper::getDirPermissions($dir);
// Make breadcrumb // Make breadcrumb
if($doBreadcrumb) { if($doBreadcrumb) {
$breadcrumb = \OCA\files\lib\Helper::makeBreadcrumb($dir); $breadcrumb = \OCA\Files\Helper::makeBreadcrumb($dir);
$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', ''); $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb, false); $breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
@ -34,7 +34,7 @@ if($doBreadcrumb) {
} }
// make filelist // make filelist
$files = \OCA\files\lib\Helper::getFiles($dir); $files = \OCA\Files\Helper::getFiles($dir);
$list = new OCP\Template("files", "part.list", ""); $list = new OCP\Template("files", "part.list", "");
$list->assign('files', $files, false); $list->assign('files', $files, false);

6
apps/files/ajax/rawlist.php
Unescape View File

@ -28,7 +28,7 @@ if($mimetypes && !in_array('httpd/unix-directory', $mimetypes)) {
$file['directory'] = $dir; $file['directory'] = $dir;
$file['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($file['mimetype']); $file['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($file['mimetype']);
$file["date"] = OCP\Util::formatDate($file["mtime"]); $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; $files[] = $file;
} }
} }
@ -39,7 +39,7 @@ if (is_array($mimetypes) && count($mimetypes)) {
$file['directory'] = $dir; $file['directory'] = $dir;
$file['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($file['mimetype']); $file['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($file['mimetype']);
$file["date"] = OCP\Util::formatDate($file["mtime"]); $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; $files[] = $file;
} }
} }
@ -48,7 +48,7 @@ if (is_array($mimetypes) && count($mimetypes)) {
$file['directory'] = $dir; $file['directory'] = $dir;
$file['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($file['mimetype']); $file['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($file['mimetype']);
$file["date"] = OCP\Util::formatDate($file["mtime"]); $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; $files[] = $file;
} }
} }

4
apps/files/ajax/upload.php
Unescape View File

@ -53,7 +53,7 @@ OCP\JSON::callCheck();
// get array with current storage stats (e.g. max file size) // 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'])) { if (!isset($_FILES['files'])) {
OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('No file was uploaded. Unknown error')), $storageStats))); 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)) { if (is_uploaded_file($files['tmp_name'][$i]) and \OC\Files\Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
// updated max file size after upload // 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); $meta = \OC\Files\Filesystem::getFileInfo($target);
if ($meta === false) { if ($meta === false) {

1
apps/files/appinfo/app.php
Unescape View File

@ -1,5 +1,4 @@
<?php <?php
OC::$CLASSPATH['OCA\Files\Capabilities'] = 'apps/files/lib/capabilities.php';
$l = OC_L10N::get('files'); $l = OC_L10N::get('files');

6
apps/files/index.php
Unescape View File

@ -74,14 +74,14 @@ if (\OC\Files\Cache\Upgrade::needUpgrade($user)) { //dont load anything if we ne
$ajaxLoad = true; $ajaxLoad = true;
} }
else{ else{
$files = \OCA\files\lib\Helper::getFiles($dir); $files = \OCA\Files\Helper::getFiles($dir);
} }
$freeSpace = \OC\Files\Filesystem::free_space($dir); $freeSpace = \OC\Files\Filesystem::free_space($dir);
$needUpgrade = false; $needUpgrade = false;
} }
// Make breadcrumb // Make breadcrumb
$breadcrumb = \OCA\files\lib\Helper::makeBreadcrumb($dir); $breadcrumb = \OCA\Files\Helper::makeBreadcrumb($dir);
// make breadcrumb und filelist markup // make breadcrumb und filelist markup
$list = new OCP\Template('files', 'part.list', ''); $list = new OCP\Template('files', 'part.list', '');
@ -93,7 +93,7 @@ $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb); $breadcrumbNav->assign('breadcrumb', $breadcrumb);
$breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir='); $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) { if ($needUpgrade) {
OCP\Util::addscript('files', 'upgrade'); OCP\Util::addscript('files', 'upgrade');

6
apps/files/lib/helper.php
Unescape View File

@ -1,6 +1,6 @@
<?php <?php
namespace OCA\files\lib; namespace OCA\Files;
class Helper class Helper
{ {
@ -85,11 +85,11 @@ class Helper
} }
$i['directory'] = $dir; $i['directory'] = $dir;
$i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($i['mimetype']); $i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($i['mimetype']);
$i['icon'] = \OCA\files\lib\Helper::determineIcon($i); $i['icon'] = \OCA\Files\Helper::determineIcon($i);
$files[] = $i; $files[] = $i;
} }
usort($files, array('\OCA\files\lib\Helper', 'fileCmp')); usort($files, array('\OCA\Files\Helper', 'fileCmp'));
return $files; return $files;
} }

2
apps/files_sharing/public.php
Unescape View File

@ -22,7 +22,7 @@ function fileCmp($a, $b) {
function determineIcon($file, $sharingRoot, $sharingToken) { function determineIcon($file, $sharingRoot, $sharingToken) {
// for folders we simply reuse the files logic // for folders we simply reuse the files logic
if($file['type'] == 'dir') { if($file['type'] == 'dir') {
return \OCA\files\lib\Helper::determineIcon($file); return \OCA\Files\Helper::determineIcon($file);
} }
$relativePath = substr($file['path'], 6); $relativePath = substr($file['path'], 6);

4
apps/files_trashbin/ajax/list.php
Unescape View File

@ -15,7 +15,7 @@ $data = array();
// Make breadcrumb // Make breadcrumb
if($doBreadcrumb) { 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 = new OCP\Template('files_trashbin', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb, false); $breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
@ -26,7 +26,7 @@ if($doBreadcrumb) {
} }
// make filelist // make filelist
$files = \OCA\files_trashbin\lib\Helper::getTrashFiles($dir); $files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir);
if ($files === null){ if ($files === null){
header("HTTP/1.0 404 Not Found"); header("HTTP/1.0 404 Not Found");

4
apps/files_trashbin/appinfo/app.php
Unescape View File

@ -1,7 +1,7 @@
<?php <?php
OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'files_trashbin/lib/hooks.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\Trashbin'] = 'files_trashbin/lib/trash.php';
// register hooks // register hooks
\OCA\Files_Trashbin\Trashbin::registerHooks(); \OCA\Files_Trashbin\Trashbin::registerHooks();

4
apps/files_trashbin/index.php
Unescape View File

@ -36,7 +36,7 @@ if ($isIE8 && isset($_GET['dir'])){
$ajaxLoad = false; $ajaxLoad = false;
if (!$isIE8){ if (!$isIE8){
$files = \OCA\files_trashbin\lib\Helper::getTrashFiles($dir); $files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir);
} }
else{ else{
$files = array(); $files = array();
@ -54,7 +54,7 @@ if ($dir && $dir !== '/') {
$dirlisting = true; $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 = new OCP\Template('files_trashbin', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb); $breadcrumbNav->assign('breadcrumb', $breadcrumb);

6
apps/files_trashbin/lib/helper.php
Unescape View File

@ -1,6 +1,6 @@
<?php <?php
namespace OCA\files_trashbin\lib; namespace OCA\Files_Trashbin;
class Helper class Helper
{ {
@ -62,11 +62,11 @@ class Helper
} }
$i['permissions'] = \OCP\PERMISSION_READ; $i['permissions'] = \OCP\PERMISSION_READ;
$i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($r['mime']); $i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($r['mime']);
$i['icon'] = \OCA\files\lib\Helper::determineIcon($i); $i['icon'] = \OCA\Files\Helper::determineIcon($i);
$files[] = $i; $files[] = $i;
} }
usort($files, array('\OCA\files\lib\Helper', 'fileCmp')); usort($files, array('\OCA\Files\Helper', 'fileCmp'));
return $files; return $files;
} }

0
apps/files_trashbin/lib/trash.php → apps/files_trashbin/lib/trashbin.php
Unescape View File

Write Preview
Loading…
Cancel
Save