summaryrefslogtreecommitdiffstats
path: root/lib/public
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2013-01-16 09:25:57 -0800
committerBart Visscher <bartv@thisnet.nl>2013-01-16 09:25:57 -0800
commit1d57a2e2a9d5e392bb1061479543cd1dec860c4b (patch)
treec0a4b2c32975ec45c5d7ec371f1a4dfcb7caab0b /lib/public
parentcb0fd30458c29db7667582b7c182b4d530366634 (diff)
parent5bfe4adbaa9c402db5bd0d0f74fd9ad7bb037129 (diff)
downloadnextcloud-server-1d57a2e2a9d5e392bb1061479543cd1dec860c4b.tar.gz
nextcloud-server-1d57a2e2a9d5e392bb1061479543cd1dec860c4b.zip
Merge pull request #1180 from owncloud/whitespace-cleanup
Whitespace cleanup
Diffstat (limited to 'lib/public')
-rw-r--r--lib/public/api.php4
-rw-r--r--lib/public/constants.php1
-rw-r--r--lib/public/db.php6
-rw-r--r--lib/public/share.php8
-rw-r--r--lib/public/user.php2
-rw-r--r--lib/public/util.php2
6 files changed, 11 insertions, 12 deletions
diff --git a/lib/public/api.php b/lib/public/api.php
index a85daa1935c..95d333f2165 100644
--- a/lib/public/api.php
+++ b/lib/public/api.php
@@ -26,7 +26,7 @@ namespace OCP;
* This class provides functions to manage apps in ownCloud
*/
class API {
-
+
/**
* registers an api call
* @param string $method the http method
@@ -40,5 +40,5 @@ class API {
public static function register($method, $url, $action, $app, $authLevel = OC_API::USER_AUTH, $defaults = array(), $requirements = array()){
\OC_API::register($method, $url, $action, $app, $authLevel, $defaults, $requirements);
}
-
+
}
diff --git a/lib/public/constants.php b/lib/public/constants.php
index bc979c9031f..1495c620dc9 100644
--- a/lib/public/constants.php
+++ b/lib/public/constants.php
@@ -35,4 +35,3 @@ const PERMISSION_UPDATE = 2;
const PERMISSION_DELETE = 8;
const PERMISSION_SHARE = 16;
const PERMISSION_ALL = 31;
-
diff --git a/lib/public/db.php b/lib/public/db.php
index 5d4aadd22ae..932e79d9ef1 100644
--- a/lib/public/db.php
+++ b/lib/public/db.php
@@ -49,9 +49,9 @@ class DB {
* @brief Insert a row if a matching row doesn't exists.
* @param $table string The table name (will replace *PREFIX*) to perform the replace on.
* @param $input array
- *
+ *
* The input array if in the form:
- *
+ *
* array ( 'id' => array ( 'value' => 6,
* 'key' => true
* ),
@@ -65,7 +65,7 @@ class DB {
public static function insertIfNotExist($table, $input) {
return(\OC_DB::insertIfNotExist($table, $input));
}
-
+
/**
* @brief gets last value of autoincrement
* @param $table string The optional table name (will replace *PREFIX*) and add sequence suffix
diff --git a/lib/public/share.php b/lib/public/share.php
index 7ed1c42490d..cda583aa073 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -351,14 +351,14 @@ class Share {
//delete the old share
self::delete($checkExists['id']);
}
-
+
// Generate hash of password - same method as user passwords
if (isset($shareWith)) {
$forcePortable = (CRYPT_BLOWFISH != 1);
$hasher = new \PasswordHash(8, $forcePortable);
$shareWith = $hasher->HashPassword($shareWith.\OC_Config::getValue('passwordsalt', ''));
}
-
+
// Generate token
if (isset($oldToken)) {
$token = $oldToken;
@@ -415,7 +415,7 @@ class Share {
if ($parentFolder && $files = \OC_Files::getDirectoryContent($itemSource)) {
for ($i = 0; $i < count($files); $i++) {
$name = substr($files[$i]['name'], strpos($files[$i]['name'], $itemSource) - strlen($itemSource));
- if ($files[$i]['mimetype'] == 'httpd/unix-directory'
+ if ($files[$i]['mimetype'] == 'httpd/unix-directory'
&& $children = \OC_Files::getDirectoryContent($name, '/')
) {
// Continue scanning into child folders
@@ -864,7 +864,7 @@ class Share {
}
} else {
if ($fileDependent) {
- if (($itemType == 'file' || $itemType == 'folder')
+ if (($itemType == 'file' || $itemType == 'folder')
&& $format == \OC_Share_Backend_File::FORMAT_FILE_APP
|| $format == \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT
) {
diff --git a/lib/public/user.php b/lib/public/user.php
index e297b716dc2..204d8e4c0f1 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -65,7 +65,7 @@ class User {
/**
* @brief check if a user exists
* @param string $uid the username
- * @param string $excludingBackend (default none)
+ * @param string $excludingBackend (default none)
* @return boolean
*/
public static function userExists( $uid, $excludingBackend = null ) {
diff --git a/lib/public/util.php b/lib/public/util.php
index 1320ffabd80..8197482c0dd 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -203,7 +203,7 @@ class Util {
$host_name = self::getServerHostName();
// handle localhost installations
if ($host_name === 'localhost') {
- $host_name = "example.com";
+ $host_name = "example.com";
}
return $user_part.'@'.$host_name;
}