aboutsummaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Move { to same lineLukas Reschke2013-01-141-2/+1
|
* Expand if to multiple linesLukas Reschke2013-01-141-2/+6
| | | Oneliners are ugly.
* Merge pull request #1177 from owncloud/OC_User--isAdminUser()Bart Visscher2013-01-148-72/+29
|\ | | | | Check if user is admin - bool
| * Enhanced auth is totally unmaintained and brokenLukas Reschke2013-01-142-47/+0
| | | | | | | | | | | | Let's remove it, it's also not secure anymore with the introduction of our API etc... (And doesn't work with ldap etc…)
| * Check if user is admin - boolLukas Reschke2013-01-148-25/+29
| | | | | | | | | | | | | | | | | | | | | | There was no "isAdminUser()" function which returned bool. This is irritiating as there were a loooooooot of places in the code which checked this itself with `OC_Group::inGroup($uid, 'admin)` - why not use a function for this? (Especially if you consider that we might change the group name in the future, which would lead to problems then) Additionally, @Raydiation needed such a method for his AppFramework :)
* | Merge pull request #1172 from owncloud/isSubDirectoryBart Visscher2013-01-141-24/+4
|\ \ | |/ |/| Simplify the isSubDirectory() function
| * Check for string position instead of string existenceLukas Reschke2013-01-141-1/+1
| | | | | | | | | | | | otherwise /foo/bar would be detected as a subfolder of /bar THX @icewind1991
| * Commentblocks should begin with two *Lukas Reschke2013-01-131-1/+1
| |
| * Add @brief to descriptionLukas Reschke2013-01-131-1/+1
| |
| * Simplify the isSubDirectory() functionLukas Reschke2013-01-131-22/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isSubDirectory() checks if a specified $sub is a subdirectory of the $parent, this is needed to prevent file inclusions. Actually, the current code is more kind of a "hack" which I always struggle over if browsing through source. So this should be a much better implementation. The implementation is really straightforward: - [realpath()](http://php.net/manual/function.realpath.php) expands all symbolic links and resolves references to '/./', '/../' and extra '/' characters in the input path and return the canonicalized absolute pathname. - [strpos()](php.net/manual/function.strpos.php) returns FALSE if the substring wasn't found. Since this is an absolutely critical piece of code, I'd like to ensure that this is absolutely safe!
* | Merge pull request #1112 from Raydiation/masterBart Visscher2013-01-141-17/+5
|\ \ | | | | | | This fixes a problem that prevented app routes from being loaded after ocs_api merge
| * | added cleanup recommendations by including ocs in the cachedKey method and ↵Bernhard Posselt2013-01-071-5/+5
| | | | | | | | | | | | moving the ocs routes stuff at the end of the loadRoutes method
| * | readded ocs routesBernhard Posselt2013-01-071-0/+5
| | |
| * | fixed error that displayed a white page and a warning that routes could not ↵Bernhard Posselt2013-01-071-17/+0
| | | | | | | | | | | | be loaded from apps that was caused by the ocs_api merge
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-141-1/+7
| |/ |/|
* | Merge pull request #1133 from owncloud/add_linebreaks_in_sharingThomas Müller2013-01-101-96/+484
|\ \ | | | | | | add more linebreaks, replace SQL LIMIT with param
| * | add more linebreaks, replace SQL LIMIT with paramJörn Friedrich Dreyer2013-01-091-96/+484
| |/
* | [tx-robot] updated from transifexJenkins for ownCloud2013-01-111-6/+17
| |
* | Merge pull request #1127 from owncloud/fixing-641-for-webdav-masterThomas Müller2013-01-102-0/+78
|\ \ | | | | | | webdav returns "503 Service Unavailable" in case the ownCloud server is ...
| * | webdav returns "503 Service Unavailable" in case the ownCloud server is ↵Thomas Mueller2013-01-092-0/+78
| |/ | | | | | | currently in maintenance mode.
* | [tx-robot] updated from transifexJenkins for ownCloud2013-01-101-2/+32
| |
* | Upstream merged my patch to add additional ssl root certificates to the ↵Björn Schießle2013-01-081-173/+0
|/ | | | | | webdav client. This means that OC_Connector_Sabre_Client is no longer needed
* Merge branch 'master' into update-progressMichael Gapczynski2013-01-0514-505/+710
|\
| * Merge pull request #1066 from owncloud/fix-388-masterThomas Müller2013-01-053-21/+85
| |\ | | | | | | workaround for 32-bit systems to handle filesizes bigger than 2GB
| | * remove duplicate returnThomas Mueller2013-01-051-2/+0
| | |
| | * enhanced log messageThomas Mueller2013-01-041-1/+1
| | |
| | * documentation adjusted on the wayThomas Mueller2013-01-041-0/+1
| | |
| | * Fallback to use COM or exec('stat ..') is only executed if stat or filesize ↵Thomas Mueller2013-01-041-12/+35
| | | | | | | | | | | | | | | | | | | | | return negative values. Special case of BSD has been added as stat syntax differs In addition unknown OS is logged
| | * OC_Helper::is_function_enabled() added to find out if a function is availableThomas Mueller2013-01-041-18/+43
| | | | | | | | | | | | And some documentation adjusted on the way
| | * workaround for 32-bit systems to handle filesizes bigger than 2GBThomas Mueller2013-01-032-2/+19
| | |
| * | Merge pull request #1053 from owncloud/ocs_apiMichael Gapczynski2013-01-0411-484/+625
| |\ \ | | | | | | | | External API for ownCloud based on OCS
| | * | Remove WIP OAuth codeTom Needham2012-12-312-206/+0
| | | |
| | * | Code cleanup and add copyright infoTom Needham2012-12-311-1/+23
| | | |
| | * | Merge branch 'master' into ocs_apiTom Needham2012-12-3120-874/+1142
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: l10n/templates/core.pot l10n/templates/files.pot l10n/templates/files_encryption.pot l10n/templates/files_external.pot l10n/templates/files_sharing.pot l10n/templates/files_versions.pot l10n/templates/lib.pot l10n/templates/settings.pot l10n/templates/user_ldap.pot l10n/templates/user_webdavauth.pot
| | * | | Remove unused methodsTom Needham2012-12-311-16/+0
| | | | |
| | * | | Fall back to default log file if logfile config file not found, suppress ↵Michael Gapczynski2012-12-291-5/+10
| | | | | | | | | | | | | | | | | | | | writing errors, fixes issue #826
| | * | | Merge branch 'master' into ocs_apiTom Needham2012-12-1614-178/+198
| | |\ \ \
| | * | | | API: PUT and DELETE variables are now accessed from the parameters arrayTom Needham2012-12-151-3/+3
| | | | | |
| | * | | | Merge master into ocs_api, fix conflicts.Tom Needham2012-12-14126-1146/+2987
| | |\ \ \ \
| | * | | | | API: Add check to see if the user is authorised to run the api methodTom Needham2012-12-121-5/+9
| | | | | | |
| | * | | | | API: Include totalitems and itemsperpage meta data when needed.Tom Needham2012-12-121-1/+7
| | | | | | |
| | * | | | | API: Remove old code. Move remaining methods to OC_OCS_Result.Tom Needham2012-12-124-319/+10
| | | | | | |
| | * | | | | API: OCS methods now use OC_OCS_Result to return dataTom Needham2012-12-124-10/+10
| | | | | | |
| | * | | | | API: Further tidying, implement OC_OCS_Result object for api results.Tom Needham2012-12-122-60/+74
| | | | | | |
| | * | | | | API: Specify the response format using a GET parameterTom Needham2012-12-111-9/+5
| | | | | | |
| | * | | | | Merge master into ocs_apiTom Needham2012-10-28117-1090/+2590
| | |\ \ \ \ \
| | * | | | | | Add API method for sharing a file, currently only via a link.Tom Needham2012-10-281-1/+1
| | | | | | | |
| | * | | | | | Allow apps to pass defaults and requirements for their API callsTom Needham2012-10-281-2/+4
| | | | | | | |
| | * | | | | | Merge branch 'master' into ocs_apiTom Needham2012-09-174-8/+13
| | |\ \ \ \ \ \
| | * | | | | | | API: Parse PUT and DELETE variablesTom Needham2012-09-171-0/+6
| | | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-07 19:00:11 +0000