summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2013-01-14 20:30:39 +0100
committerBart Visscher <bartv@thisnet.nl>2013-01-16 18:09:16 +0100
commit5bfe4adbaa9c402db5bd0d0f74fd9ad7bb037129 (patch)
treec0a4b2c32975ec45c5d7ec371f1a4dfcb7caab0b /apps
parenta8f963d9cf5b243cae497450af78c20cbc367b4b (diff)
downloadnextcloud-server-5bfe4adbaa9c402db5bd0d0f74fd9ad7bb037129.tar.gz
nextcloud-server-5bfe4adbaa9c402db5bd0d0f74fd9ad7bb037129.zip
Whitespace cleanup
Diffstat (limited to 'apps')
-rw-r--r--apps/files/css/files.css4
-rw-r--r--apps/files/js/fileactions.js14
-rw-r--r--apps/files/js/files.js2
-rw-r--r--apps/files_external/lib/amazons3.php2
-rwxr-xr-xapps/files_external/lib/config.php14
-rw-r--r--apps/files_external/templates/settings.php4
-rw-r--r--apps/files_sharing/js/share.js2
-rw-r--r--apps/files_sharing/public.php12
8 files changed, 27 insertions, 27 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 36a1e5c954b..0c97b009b88 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -23,7 +23,7 @@
#new>ul>li>p { cursor:pointer; }
#new>ul>li>form>input { padding:0.3em; margin:-0.3em; }
-#upload {
+#upload {
height:27px; padding:0; margin-left:0.2em; overflow:hidden;
}
#upload a {
@@ -35,7 +35,7 @@
}
.file_upload_target { display:none; }
.file_upload_form { display:inline; float:left; margin:0; padding:0; cursor:pointer; overflow:visible; }
-#file_upload_start {
+#file_upload_start {
left:0; top:0; width:28px; height:27px; padding:0;
font-size:1em;
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0;
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 80b9c01f838..f5ee363a4c8 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -70,23 +70,23 @@ var FileActions = {
}
parent.children('a.name').append('<span class="fileactions" />');
var defaultAction = FileActions.getDefault(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
-
+
var actionHandler = function (event) {
event.stopPropagation();
event.preventDefault();
FileActions.currentFile = event.data.elem;
var file = FileActions.getCurrentFile();
-
+
event.data.actionFunc(file);
};
-
+
$.each(actions, function (name, action) {
// NOTE: Temporary fix to prevent rename action in root of Shared directory
if (name === 'Rename' && $('#dir').val() === '/Shared') {
return true;
}
-
+
if ((name === 'Download' || action !== defaultAction) && name !== 'Delete') {
var img = FileActions.icons[name];
if (img.call) {
@@ -97,16 +97,16 @@ var FileActions = {
html += '<img class ="svg" src="' + img + '" /> ';
}
html += t('files', name) + '</a>';
-
+
var element = $(html);
element.data('action', name);
//alert(element);
element.on('click',{a:null, elem:parent, actionFunc:actions[name]},actionHandler);
parent.find('a.name>span.fileactions').append(element);
}
-
+
});
-
+
if (actions['Delete']) {
var img = FileActions.icons['Delete'];
if (img.call) {
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index a4260c43285..3a4af6416e9 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -52,7 +52,7 @@ Files={
}
};
$(document).ready(function() {
- Files.bindKeyboardShortcuts(document, jQuery);
+ Files.bindKeyboardShortcuts(document, jQuery);
$('#fileList tr').each(function(){
//little hack to set unescape filenames in attribute
$(this).attr('data-file',decodeURIComponent($(this).attr('data-file')));
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 235ade06db6..e5ef4eb097c 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -108,7 +108,7 @@ class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common {
$stat['atime'] = time();
$stat['mtime'] = $stat['atime'];
$stat['ctime'] = $stat['atime'];
- } else {
+ } else {
$object = $this->getObject($path);
if ($object) {
$stat['size'] = $object['Size'];
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 1be544fbc07..fd3dc2ca0d0 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -38,7 +38,7 @@ class OC_Mount_Config {
* @return array
*/
public static function getBackends() {
-
+
$backends['OC_Filestorage_Local']=array(
'backend' => 'Local',
'configuration' => array(
@@ -77,7 +77,7 @@ class OC_Mount_Config {
'token' => '#token',
'token_secret' => '#token secret'),
'custom' => 'google');
-
+
$backends['OC_Filestorage_SWIFT']=array(
'backend' => 'OpenStack Swift',
'configuration' => array(
@@ -86,7 +86,7 @@ class OC_Mount_Config {
'token' => '*Token',
'root' => '&Root',
'secure' => '!Secure ftps://'));
-
+
if(OC_Mount_Config::checksmbclient()) $backends['OC_Filestorage_SMB']=array(
'backend' => 'SMB / CIFS',
'configuration' => array(
@@ -95,7 +95,7 @@ class OC_Mount_Config {
'password' => '*Password',
'share' => 'Share',
'root' => '&Root'));
-
+
$backends['OC_Filestorage_DAV']=array(
'backend' => 'ownCloud / WebDAV',
'configuration' => array(
@@ -103,7 +103,7 @@ class OC_Mount_Config {
'user' => 'Username',
'password' => '*Password',
'root' => '&Root',
- 'secure' => '!Secure https://'));
+ 'secure' => '!Secure https://'));
return($backends);
}
@@ -403,7 +403,7 @@ class OC_Mount_Config {
}
/**
- * check if smbclient is installed
+ * check if smbclient is installed
*/
public static function checksmbclient() {
if(function_exists('shell_exec')) {
@@ -415,7 +415,7 @@ class OC_Mount_Config {
}
/**
- * check if php-ftp is installed
+ * check if php-ftp is installed
*/
public static function checkphpftp() {
if(function_exists('ftp_login')) {
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index ebfcbfdc42f..78ca1c87fee 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -47,7 +47,7 @@
<?php elseif (strpos($placeholder, '!') !== false): ?>
<label><input type="checkbox"
data-parameter="<?php echo $parameter; ?>"
- <?php if ($value == 'true'): ?> checked="checked"<?php endif; ?>
+ <?php if ($value == 'true'): ?> checked="checked"<?php endif; ?>
/><?php echo substr($placeholder, 1); ?></label>
<?php elseif (strpos($placeholder, '&') !== false): ?>
<input type="text"
@@ -105,7 +105,7 @@
<?php endif; ?>
<td <?php if ($mountPoint != ''): ?>class="remove"
<?php else: ?>style="visibility:hidden;"
- <?php endif ?>><img alt="<?php echo $l->t('Delete'); ?>"
+ <?php endif ?>><img alt="<?php echo $l->t('Delete'); ?>"
title="<?php echo $l->t('Delete'); ?>"
class="svg action"
src="<?php echo image_path('core', 'actions/delete.svg'); ?>" /></td>
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 8a546d62163..a46d0179801 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -1,7 +1,7 @@
$(document).ready(function() {
if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined' && !publicListView) {
-
+
FileActions.register('all', 'Share', OC.PERMISSION_READ, OC.imagePath('core', 'actions/share'), function(filename) {
if ($('#dir').val() == '/') {
var item = $('#dir').val() + filename;
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 487b9e79961..efd977a1b6a 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -66,12 +66,12 @@ if (isset($_GET['t'])) {
$type = $linkItem['item_type'];
$fileSource = $linkItem['file_source'];
$shareOwner = $linkItem['uid_owner'];
-
+
if (OCP\User::userExists($shareOwner) && $fileSource != -1 ) {
-
+
$pathAndUser = getPathAndUser($linkItem['file_source']);
$fileOwner = $pathAndUser['user'];
-
+
//if this is a reshare check the file owner also exists
if ($shareOwner != $fileOwner && ! OCP\User::userExists($fileOwner)) {
OCP\Util::writeLog('share', 'original file owner '.$fileOwner
@@ -81,7 +81,7 @@ if (isset($_GET['t'])) {
$tmpl->printPage();
exit();
}
-
+
//mount filesystem of file owner
OC_Util::setupFS($fileOwner);
}
@@ -104,7 +104,7 @@ if (isset($_GET['t'])) {
}
}
$shareOwner = substr($path, 1, strpos($path, '/', 1) - 1);
-
+
if (OCP\User::userExists($shareOwner)) {
OC_Util::setupFS($shareOwner);
$fileSource = getId($path);
@@ -159,7 +159,7 @@ if ($linkItem) {
$tmpl->printPage();
exit();
}
-
+
} else {
// Check if item id is set in session
if (!isset($_SESSION['public_link_authenticated'])