Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2012-10-14 23:04:08 +0400
committerBart Visscher <bartv@thisnet.nl>2012-10-14 23:04:08 +0400
commit4af5b016cc0bb4e5f7e73a50d38e16d3c539bf5f (patch)
tree04ea8615a228fb252473bef72eb8b763e558ea80 /apps
parent2c427f050e2bc263b5c4c2faabf73e3993f1d29d (diff)
Whitespace cleanup
Diffstat (limited to 'apps')
-rw-r--r--apps/files/admin.php1
-rw-r--r--apps/files/css/files.css1
-rw-r--r--apps/files/js/filelist.js8
-rw-r--r--apps/files/js/files.js2
-rw-r--r--apps/files/templates/part.list.php2
-rw-r--r--apps/files_external/ajax/addRootCertificate.php12
-rw-r--r--apps/files_external/ajax/removeRootCertificate.php1
-rwxr-xr-xapps/files_external/lib/config.php6
-rw-r--r--apps/files_sharing/lib/share/folder.php2
-rw-r--r--apps/files_sharing/public.php12
-rw-r--r--apps/files_versions/js/versions.js6
-rw-r--r--apps/files_versions/lib/versions.php2
12 files changed, 26 insertions, 29 deletions
diff --git a/apps/files/admin.php b/apps/files/admin.php
index 547f2bd7ddb..e8b3cb0aca0 100644
--- a/apps/files/admin.php
+++ b/apps/files/admin.php
@@ -63,4 +63,3 @@ $tmpl->assign( 'maxPossibleUploadSize', $maxUploadFilesizePossible);
$tmpl->assign( 'allowZipDownload', $allowZipDownload);
$tmpl->assign( 'maxZipInputSize', $maxZipInputSize);
return $tmpl->fetchPage();
-
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index f15cd514241..14482c5edb5 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -89,4 +89,3 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
#scanning-message{ top:40%; left:40%; position:absolute; display:none; }
div.crumb a{ padding: 0.9em 0 0.7em 0; }
-
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 100a2368722..870437ae672 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -150,7 +150,7 @@ var FileList={
if (newname != name) {
if (FileList.checkName(name, newname, false)) {
newname = name;
- } else {
+ } else {
$.get(OC.filePath('files','ajax','rename.php'), { dir : $('#dir').val(), newname: newname, file: name },function(result) {
if (!result || result.status == 'error') {
OC.dialogs.alert(result.data.message, 'Error moving file');
@@ -158,7 +158,7 @@ var FileList={
}
tr.data('renaming',false);
});
-
+
}
}
tr.attr('data-file', newname);
@@ -264,9 +264,9 @@ var FileList={
if (FileList.lastAction) {
FileList.lastAction();
}
-
+
FileList.prepareDeletion(files);
-
+
if (!FileList.useUndo) {
FileList.lastAction();
} else {
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index c5333f2fafb..777a5ec647e 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -199,7 +199,7 @@ $(document).ready(function() {
$(document).bind('drop dragover', function (e) {
e.preventDefault(); // prevent browser from doing anything, if file isn't dropped in dropZone
});
-
+
if ( document.getElementById("data-upload-form") ) {
$(function() {
$('.file_upload_start').fileupload({
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 1329b5dc5cd..0f5b839b180 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -6,7 +6,7 @@
}
?>
</script>
-
+
<?php foreach($_['files'] as $file):
$simple_file_size = OCP\simple_file_size($file['size']);
$simple_size_color = intval(200-$file['size']/(1024*1024)*2); // the bigger the file, the darker the shade of grey; megabytes*2
diff --git a/apps/files_external/ajax/addRootCertificate.php b/apps/files_external/ajax/addRootCertificate.php
index e0a0239c954..72eb30009d1 100644
--- a/apps/files_external/ajax/addRootCertificate.php
+++ b/apps/files_external/ajax/addRootCertificate.php
@@ -3,23 +3,23 @@
OCP\JSON::checkAppEnabled('files_external');
if ( !($filename = $_FILES['rootcert_import']['name']) ) {
- header("Location: settings/personal.php");
+ header("Location: settings/personal.php");
exit;
}
-$fh = fopen($_FILES['rootcert_import']['tmp_name'], 'r');
-$data = fread($fh, filesize($_FILES['rootcert_import']['tmp_name']));
+$fh = fopen($_FILES['rootcert_import']['tmp_name'], 'r');
+$data = fread($fh, filesize($_FILES['rootcert_import']['tmp_name']));
fclose($fh);
$filename = $_FILES['rootcert_import']['name'];
-
-$view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_external/uploads');
+
+$view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_external/uploads');
if (!$view->file_exists('')) $view->mkdir('');
$isValid = openssl_pkey_get_public($data);
//maybe it was just the wrong file format, try to convert it...
if ($isValid == false) {
- $data = chunk_split(base64_encode($data), 64, "\n");
+ $data = chunk_split(base64_encode($data), 64, "\n");
$data = "-----BEGIN CERTIFICATE-----\n".$data."-----END CERTIFICATE-----\n";
$isValid = openssl_pkey_get_public($data);
}
diff --git a/apps/files_external/ajax/removeRootCertificate.php b/apps/files_external/ajax/removeRootCertificate.php
index 6871b0fd1d4..664b3937e97 100644
--- a/apps/files_external/ajax/removeRootCertificate.php
+++ b/apps/files_external/ajax/removeRootCertificate.php
@@ -11,4 +11,3 @@ if ( $view->file_exists($file) ) {
$view->unlink($file);
OC_Mount_Config::createCertificateBundle();
}
-
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 0a576f06f1f..068475783cd 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -120,10 +120,10 @@ class OC_Mount_Config {
$dir = $dir.'/'.$pathPart;
if ( !$view->file_exists($dir)) {
$view->mkdir($dir);
- }
+ }
}
}
-
+
/**
* Add a mount point to the filesystem
@@ -160,7 +160,7 @@ class OC_Mount_Config {
self::addMountPointDirectory($view, $path);
}
break;
- case 'group' :
+ case 'group' :
$groupMembers = OC_Group::usersInGroups(array($applicable));
foreach ( $groupMembers as $user ) {
$path = $user.'/files/'.ltrim($mountPoint, '/');
diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php
index e29e9b7e002..bddda99f8bb 100644
--- a/apps/files_sharing/lib/share/folder.php
+++ b/apps/files_sharing/lib/share/folder.php
@@ -59,7 +59,7 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share
$parents = array();
while ($file = $result->fetchRow()) {
$children[] = array('source' => $file['id'], 'file_path' => $file['name']);
- // If a child folder is found look inside it
+ // If a child folder is found look inside it
if ($file['mimetype'] == 'httpd/unix-directory') {
$parents[] = $file['id'];
}
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index e9f318efd9d..d79f1955978 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -45,10 +45,10 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
}
if (isset($linkItem['share_with'])) {
// Check password
- if (isset($_GET['file'])) {
- $url = OCP\Util::linkToPublic('files').'&file='.$_GET['file'];
- } else {
- $url = OCP\Util::linkToPublic('files').'&dir='.$_GET['dir'];
+ if (isset($_GET['file'])) {
+ $url = OCP\Util::linkToPublic('files').'&file='.$_GET['file'];
+ } else {
+ $url = OCP\Util::linkToPublic('files').'&dir='.$_GET['dir'];
}
if (isset($_POST['password'])) {
$password = $_POST['password'];
@@ -98,7 +98,7 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
} else { // download a single shared file
OC_Files::get("", $path, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
}
-
+
} else {
OCP\Util::addStyle('files_sharing', 'public');
OCP\Util::addScript('files_sharing', 'public');
@@ -134,7 +134,7 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
if ($i != '') {
if ($i != $baseDir) {
$pathtohere .= '/'.$i;
- }
+ }
if ( strlen($pathtohere) < strlen($_GET['dir'])) {
continue;
}
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index 07c5655560e..426d521df82 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -68,7 +68,7 @@ function createVersionsDropdown(filename, files) {
data: { source: files },
async: false,
success: function( versions ) {
-
+
if (versions) {
$.each( versions, function(index, row ) {
addVersion( row );
@@ -128,7 +128,7 @@ function createVersionsDropdown(filename, files) {
version.appendTo('#found_versions');
}
-
+
$('tr').filterAttr('data-file',filename).addClass('mouseOver');
$('#dropdown').show('blind');
@@ -144,6 +144,6 @@ $(this).click(
});
}
-
+
}
);
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index b68fa28a1ff..076094ae781 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -106,7 +106,7 @@ class Storage {
// create all parent folders
- $info=pathinfo($filename);
+ $info=pathinfo($filename);
if(!file_exists($versionsFolderName.'/'.$info['dirname'])) {
mkdir($versionsFolderName.'/'.$info['dirname'],0750,true);
}