aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/MDB2/Driver/sqlite3.php2
-rw-r--r--lib/api.php22
-rw-r--r--lib/app.php2
-rw-r--r--lib/backgroundjob.php2
-rw-r--r--lib/connector/sabre/node.php6
-rw-r--r--lib/filecache.php4
-rw-r--r--lib/fileproxy/quota.php2
-rw-r--r--lib/files.php2
-rw-r--r--lib/filesystem.php14
-rw-r--r--lib/filesystemview.php38
-rw-r--r--lib/helper.php2
-rw-r--r--lib/image.php2
-rw-r--r--lib/json.php2
-rw-r--r--lib/log.php4
-rw-r--r--lib/ocs/cloud.php6
-rw-r--r--lib/ocs/config.php4
-rw-r--r--lib/ocs/person.php2
-rw-r--r--lib/ocs/privatedata.php4
-rw-r--r--lib/ocs/result.php14
-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
-rwxr-xr-xlib/request.php4
-rw-r--r--lib/setup.php2
-rw-r--r--lib/vcategories.php1
26 files changed, 78 insertions, 80 deletions
diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php
index 9839dafbce1..8f057cfb6e8 100644
--- a/lib/MDB2/Driver/sqlite3.php
+++ b/lib/MDB2/Driver/sqlite3.php
@@ -98,7 +98,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
if ($this->connection) {
$native_code = $this->connection->lastErrorCode();
}
- $native_msg = html_entity_decode($this->_lasterror);
+ $native_msg = html_entity_decode($this->_lasterror);
// PHP 5.2+ prepends the function name to $php_errormsg, so we need
// this hack to work around it, per bug #9599.
diff --git a/lib/api.php b/lib/api.php
index c464cd04913..8d728d4311f 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -42,12 +42,12 @@ class OC_API {
private static function init() {
self::$server = new OC_OAuth_Server(new OC_OAuth_Store());
}
-
+
/**
* api actions
*/
protected static $actions = array();
-
+
/**
* registers an api call
* @param string $method the http method
@@ -58,7 +58,7 @@ class OC_API {
* @param array $defaults
* @param array $requirements
*/
- public static function register($method, $url, $action, $app,
+ public static function register($method, $url, $action, $app,
$authLevel = OC_API::USER_AUTH,
$defaults = array(),
$requirements = array()) {
@@ -73,7 +73,7 @@ class OC_API {
}
self::$actions[$name] = array('app' => $app, 'action' => $action, 'authlevel' => $authLevel);
}
-
+
/**
* handles an api call
* @param array $parameters
@@ -92,7 +92,7 @@ class OC_API {
$response = call_user_func(self::$actions[$name]['action'], $parameters);
} else {
$response = new OC_OCS_Result(null, 998, 'Api method not found');
- }
+ }
} else {
$response = new OC_OCS_Result(null, 997, 'Unauthorised');
}
@@ -103,7 +103,7 @@ class OC_API {
// logout the user to be stateless
OC_User::logout();
}
-
+
/**
* authenticate the api call
* @param array $action the action details as supplied to OC_API::register()
@@ -148,18 +148,18 @@ class OC_API {
return false;
break;
}
- }
-
+ }
+
/**
* http basic auth
* @return string|false (username, or false on failure)
*/
- private static function loginUser(){
+ private static function loginUser(){
$authUser = isset($_SERVER['PHP_AUTH_USER']) ? $_SERVER['PHP_AUTH_USER'] : '';
$authPw = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : '';
return OC_User::login($authUser, $authPw) ? $authUser : false;
}
-
+
/**
* respond to a call
* @param int|array $result the result from the api method
@@ -195,5 +195,5 @@ class OC_API {
}
}
}
-
+
}
diff --git a/lib/app.php b/lib/app.php
index 3b039733fe5..410cb4c12fc 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -137,7 +137,7 @@ class OC_App{
OC_Appconfig::setValue($app, 'types', $appTypes);
}
-
+
/**
* check if app is shipped
* @param string $appid the id of the app to check
diff --git a/lib/backgroundjob.php b/lib/backgroundjob.php
index 28b5ce3af20..9619dcb732c 100644
--- a/lib/backgroundjob.php
+++ b/lib/backgroundjob.php
@@ -34,7 +34,7 @@ class OC_BackgroundJob{
public static function getExecutionType() {
return OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' );
}
-
+
/**
* @brief sets the background jobs execution type
* @param $type execution type
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index 52350072fb2..026ec9f7ec5 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -176,9 +176,9 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
* @brief Returns a list of properties for this nodes.;
* @param array $properties
* @return array
- * @note The properties list is a list of propertynames the client
- * requested, encoded as xmlnamespace#tagName, for example:
- * http://www.example.org/namespace#author If the array is empty, all
+ * @note The properties list is a list of propertynames the client
+ * requested, encoded as xmlnamespace#tagName, for example:
+ * http://www.example.org/namespace#author If the array is empty, all
* properties should be returned
*/
public function getProperties($properties) {
diff --git a/lib/filecache.php b/lib/filecache.php
index c3256c783e6..bde70757d31 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -59,7 +59,7 @@ class OC_FileCache{
* @param string $path
* @param array data
* @param string root (optional)
- * @note $data is an associative array in the same format as returned
+ * @note $data is an associative array in the same format as returned
* by get
*/
public static function put($path, $data, $root=false) {
@@ -206,7 +206,7 @@ class OC_FileCache{
OC_Cache::remove('fileid/'.$root.$path);
}
-
+
/**
* return array of filenames matching the querty
* @param string $query
diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php
index 742e02d471b..503288142aa 100644
--- a/lib/fileproxy/quota.php
+++ b/lib/fileproxy/quota.php
@@ -76,7 +76,7 @@ class OC_FileProxy_Quota extends OC_FileProxy{
$usedSpace=isset($sharedInfo['size'])?$usedSpace-$sharedInfo['size']:$usedSpace;
return $totalSpace-$usedSpace;
}
-
+
public function postFree_space($path, $space) {
$free=$this->getFreeSpace($path);
if($free==-1) {
diff --git a/lib/files.php b/lib/files.php
index 69097e41074..f4e0f140a44 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -141,7 +141,7 @@ class OC_Files {
*/
public static function get($dir, $files, $only_header = false) {
$xsendfile = false;
- if (isset($_SERVER['MOD_X_SENDFILE_ENABLED']) ||
+ if (isset($_SERVER['MOD_X_SENDFILE_ENABLED']) ||
isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])) {
$xsendfile = true;
}
diff --git a/lib/filesystem.php b/lib/filesystem.php
index aa03593908d..f185d777def 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -179,11 +179,11 @@ class OC_Filesystem{
$internalPath=substr($path, strlen($mountPoint));
return $internalPath;
}
-
+
static private function mountPointsLoaded($user) {
return in_array($user, self::$loadedUsers);
}
-
+
/**
* get the storage object for a path
* @param string path
@@ -216,7 +216,7 @@ class OC_Filesystem{
self::mount($options['class'], $options['options'], $mountPoint);
}
}
-
+
if(isset($mountConfig['group'])) {
foreach($mountConfig['group'] as $group=>$mounts) {
if(OC_Group::inGroup($user, $group)) {
@@ -230,7 +230,7 @@ class OC_Filesystem{
}
}
}
-
+
if(isset($mountConfig['user'])) {
foreach($mountConfig['user'] as $mountUser=>$mounts) {
if($user==='all' or strtolower($mountUser)===strtolower($user)) {
@@ -244,16 +244,16 @@ class OC_Filesystem{
}
}
}
-
+
$mtime=filemtime(OC::$SERVERROOT.'/config/mount.php');
$previousMTime=OC_Appconfig::getValue('files', 'mountconfigmtime', 0);
if($mtime>$previousMTime) {//mount config has changed, filecache needs to be updated
OC_FileCache::triggerUpdate();
OC_Appconfig::setValue('files', 'mountconfigmtime', $mtime);
}
- }
+ }
}
-
+
static public function init($root, $user = '') {
if(self::$defaultInstance) {
return false;
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index e944ae5045d..ea9cbecee0e 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -430,10 +430,10 @@ class OC_FilesystemView {
$target = $this->fopen($path2.$postFix2, 'w');
$result = OC_Helper::streamCopy($source, $target);
}
- if( $this->fakeRoot==OC_Filesystem::getRoot() ) {
- // If the file to be copied originates within
+ if( $this->fakeRoot==OC_Filesystem::getRoot() ) {
+ // If the file to be copied originates within
// the user's data directory
-
+
OC_Hook::emit(
OC_Filesystem::CLASSNAME,
OC_Filesystem::signal_post_copy,
@@ -454,33 +454,33 @@ class OC_FilesystemView {
OC_Filesystem::signal_post_write,
array( OC_Filesystem::signal_param_path => $path2)
);
-
- } else {
- // If this is not a normal file copy operation
- // and the file originates somewhere else
- // (e.g. a version rollback operation), do not
+
+ } else {
+ // If this is not a normal file copy operation
+ // and the file originates somewhere else
+ // (e.g. a version rollback operation), do not
// perform all the other post_write actions
-
+
// Update webdav properties
OC_Filesystem::removeETagHook(array("path" => $path2), $this->fakeRoot);
-
+
$splitPath2 = explode( '/', $path2 );
-
- // Only cache information about files
- // that are being copied from within
- // the user files directory. Caching
+
+ // Only cache information about files
+ // that are being copied from within
+ // the user files directory. Caching
// other files, like VCS backup files,
// serves no purpose
if ( $splitPath2[1] == 'files' ) {
-
+
OC_FileCache_Update::update($path2, $this->fakeRoot);
-
+
}
-
+
}
-
+
return $result;
-
+
}
}
}
diff --git a/lib/helper.php b/lib/helper.php
index 7f34d895821..5d7e3fa4894 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -553,7 +553,7 @@ class OC_Helper {
fclose($fh);
return $file;
}
-
+
/**
* create a temporary folder with an unique filename
* @return string
diff --git a/lib/image.php b/lib/image.php
index 2043a452541..cfc6d477395 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -646,7 +646,7 @@ class OC_Image {
fclose($fh);
return $im;
}
-
+
/**
* @brief Resizes the image preserving ratio.
* @param $maxsize The maximum size of either the width or height.
diff --git a/lib/json.php b/lib/json.php
index c87de3e200b..f929e958957 100644
--- a/lib/json.php
+++ b/lib/json.php
@@ -74,7 +74,7 @@ class OC_JSON{
exit();
}
}
-
+
/**
* Send json error msg
*/
diff --git a/lib/log.php b/lib/log.php
index e9cededa5c0..e869282e88c 100644
--- a/lib/log.php
+++ b/lib/log.php
@@ -39,7 +39,7 @@ class OC_Log {
$log_class::write($app, $message, $level);
}
}
-
+
//Fatal errors handler
public static function onShutdown() {
$error = error_get_last();
@@ -50,7 +50,7 @@ class OC_Log {
return true;
}
}
-
+
// Uncaught exception handler
public static function onException($exception) {
self::write('PHP', $exception->getMessage() . ' at ' . $exception->getFile() . '#' . $exception->getLine(), self::FATAL);
diff --git a/lib/ocs/cloud.php b/lib/ocs/cloud.php
index faafe9a62dd..2d18b1db3f2 100644
--- a/lib/ocs/cloud.php
+++ b/lib/ocs/cloud.php
@@ -37,7 +37,7 @@ class OC_OCS_Cloud {
}
return new OC_OCS_Result($values);
}
-
+
public static function getUserQuota($parameters) {
$user = OC_User::getUser();
if(OC_User::isAdminUser($user) or ($user==$parameters['user'])) {
@@ -68,7 +68,7 @@ class OC_OCS_Cloud {
return new OC_OCS_Result(null, 300);
}
}
-
+
public static function getUserPublickey($parameters) {
if(OC_User::userExists($parameters['user'])) {
@@ -79,7 +79,7 @@ class OC_OCS_Cloud {
return new OC_OCS_Result(null, 300);
}
}
-
+
public static function getUserPrivatekey($parameters) {
$user = OC_User::getUser();
if(OC_User::isAdminUser($user) or ($user==$parameters['user'])) {
diff --git a/lib/ocs/config.php b/lib/ocs/config.php
index 03c54aa2314..f19121f4b2b 100644
--- a/lib/ocs/config.php
+++ b/lib/ocs/config.php
@@ -23,7 +23,7 @@
*/
class OC_OCS_Config {
-
+
public static function apiConfig($parameters) {
$xml['version'] = '1.7';
$xml['website'] = 'ownCloud';
@@ -32,5 +32,5 @@ class OC_OCS_Config {
$xml['ssl'] = 'false';
return new OC_OCS_Result($xml);
}
-
+
}
diff --git a/lib/ocs/person.php b/lib/ocs/person.php
index 169cc8211db..1c8210d0825 100644
--- a/lib/ocs/person.php
+++ b/lib/ocs/person.php
@@ -38,5 +38,5 @@ class OC_OCS_Person {
return new OC_OCS_Result(null, 101);
}
}
-
+
}
diff --git a/lib/ocs/privatedata.php b/lib/ocs/privatedata.php
index e01ed5e8b07..311b24269dd 100644
--- a/lib/ocs/privatedata.php
+++ b/lib/ocs/privatedata.php
@@ -39,7 +39,7 @@ class OC_OCS_Privatedata {
return new OC_OCS_Result($xml);
//TODO: replace 'privatedata' with 'attribute' once a new libattice has been released that works with it
}
-
+
public static function set($parameters) {
OC_Util::checkLoggedIn();
$user = OC_User::getUser();
@@ -50,7 +50,7 @@ class OC_OCS_Privatedata {
return new OC_OCS_Result(null, 100);
}
}
-
+
public static function delete($parameters) {
OC_Util::checkLoggedIn();
$user = OC_User::getUser();
diff --git a/lib/ocs/result.php b/lib/ocs/result.php
index b08d911f785..65b2067fc3f 100644
--- a/lib/ocs/result.php
+++ b/lib/ocs/result.php
@@ -21,9 +21,9 @@
*/
class OC_OCS_Result{
-
+
private $data, $message, $statusCode, $items, $perPage;
-
+
/**
* create the OCS_Result object
* @param $data mixed the data to return
@@ -33,7 +33,7 @@ class OC_OCS_Result{
$this->statusCode = $code;
$this->message = $message;
}
-
+
/**
* optionally set the total number of items available
* @param $items int
@@ -41,7 +41,7 @@ class OC_OCS_Result{
public function setTotalItems(int $items) {
$this->items = $items;
}
-
+
/**
* optionally set the the number of items per page
* @param $items int
@@ -49,7 +49,7 @@ class OC_OCS_Result{
public function setItemsPerPage(int $items) {
$this->perPage = $items;
}
-
+
/**
* returns the data associated with the api result
* @return array
@@ -70,6 +70,6 @@ class OC_OCS_Result{
// Return the result data.
return $return;
}
-
-
+
+
} \ No newline at end of file
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/request.php b/lib/request.php
index 99a77e1b59e..f2f15c21103 100755
--- a/lib/request.php
+++ b/lib/request.php
@@ -19,7 +19,7 @@ class OC_Request {
return 'localhost';
}
if(OC_Config::getValue('overwritehost', '')<>'') {
- return OC_Config::getValue('overwritehost');
+ return OC_Config::getValue('overwritehost');
}
if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
if (strpos($_SERVER['HTTP_X_FORWARDED_HOST'], ",") !== false) {
@@ -44,7 +44,7 @@ class OC_Request {
*/
public static function serverProtocol() {
if(OC_Config::getValue('overwriteprotocol', '')<>'') {
- return OC_Config::getValue('overwriteprotocol');
+ return OC_Config::getValue('overwriteprotocol');
}
if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
$proto = strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']);
diff --git a/lib/setup.php b/lib/setup.php
index fdd10be6824..b88bc4b52ce 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -153,7 +153,7 @@ class OC_Setup {
if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
self::createHtaccess();
}
-
+
//and we are done
OC_Config::setValue('installed', true);
}
diff --git a/lib/vcategories.php b/lib/vcategories.php
index 406a4eb1074..1700870f91f 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -763,4 +763,3 @@ class OC_VCategories {
return array_search(strtolower($needle), array_map('strtolower', $haystack));
}
}
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 10:08:59 +0000