aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/util.php
Commit message (Collapse)AuthorAgeFilesLines
* Remove legacy routing codeLukas Reschke2014-06-051-4/+1
| | | | | | | | | | | | | | | | | | | The getfile routing code was absolutely legacy and not needed anymore. Additionally \OC::$REQUESTEDAPP was never set to the actually accessed application. This commit removes the legacy routing code and ensures that $REQUESTEDAPP is always set so that other applications (e.g. the firewall or a two-factor authentication) can intercept the currently accessed app. Testplan: [x] Installation works [x] Login with DB works [x] Logout works [x] Login with alternate backend works (tested with user_webdavauth) [x] Other apps are accessible [x] Redirect on login works (e.g. index.php?redirect_url=%2Fcore%2Findex.php%2Fsettings%2Fapps%3Finstalled) [x] Personal settings are accessible [x] Admin settings are accessible [x] Sharing files works [x] DAV works [x] OC::$REQUESTEDAPP contains the requested application and can be intercepted by other applications
* Merge pull request #8884 from owncloud/move-flock-to-appJörn Friedrich Dreyer2014-06-051-10/+0
|\ | | | | remove file locking - code will continue to live in it's own app
| * remove file locking - code will continue to live in it's own appThomas Müller2014-06-041-10/+0
| |
* | Upgrade SabreDAV to 1.8.10Thomas Müller2014-06-041-1/+1
|/ | | | Updating SabreDAV namespaces
* name the storage wrapper to make sure that we don't apply the wrapper ↵Bjoern Schiessle2014-06-041-2/+2
| | | | multiple times
* flock changes. Work in progress.ringmaster2014-06-041-0/+10
|
* Merge pull request #7614 from owncloud/test_annotations_workingThomas Müller2014-05-301-0/+18
|\ | | | | Check if ReflectionMethod::getDocComment is working
| * adding annotation check to checkServer()Thomas Müller2014-05-191-0/+6
| |
| * Merge branch 'master' into test_annotations_workingThomas Müller2014-05-191-46/+76
| |\ | | | | | | | | | | | | Conflicts: lib/private/util.php
| * | Check if ReflectionMethod::getDocComment is workingThomas Tanghus2014-05-091-0/+12
| | |
* | | Use instanceOfStorage instead of instanceofRobin Appelman2014-05-291-1/+4
| | |
* | | allow admin to disable sharing for specific groups of usersBjoern Schiessle2014-05-221-0/+23
| |/ |/|
* | Remove all occurences of @brief and @returns from PHPDocMorris Jobke2014-05-191-35/+35
| | | | | | | | * test case added to avoid adding them later
* | allow admin to enforce passwords for public link sharesBjoern Schiessle2014-05-161-0/+10
| |
* | Fix various code errors detected by ScrutinizerRobin McCorkell2014-05-131-1/+1
| | | | | | | | | | | | Fixed: - An error with a misplaced bracket in lib/private/util.php - An error with an incorrect function being called in lib/public/contacts.php
* | Fix all PHPDoc types and variable names, in /libRobin McCorkell2014-05-131-5/+5
| |
* | Fix @return array PHPDocs, in /libRobin McCorkell2014-05-131-1/+1
| |
* | backup the encryption key after the encryption was disabled so that the userBjoern Schiessle2014-05-131-8/+28
|/ | | | can restore them if needed
* Fix PHP Doc and use readable variable nameLukas Reschke2014-05-041-6/+6
|
* Fix typoLukas Reschke2014-05-041-2/+2
|
* Some more PHPDoc fixesLukas Reschke2014-04-211-7/+8
|
* Fix a wrong WebDAV Warning with self-signed-certskondou2014-04-131-0/+2
| | | | Occuring in the admin interface
* Only encode dangerous dangerous charactersLukas Reschke2014-04-111-1/+1
| | | | | There is no need to encode all characters into HTML entities, only potential dangerous characters as &, ", ', < and > should get encoded. This may fix issues like https://github.com/owncloud/calendar/pull/394
* Sub-dir was prepended twiceThomas Tanghus2014-03-291-1/+1
|
* Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936Thomas Tanghus2014-03-281-4/+5
|
* Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction ↵Thomas Müller2014-03-281-4/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enabled. Squashed commit of the following: commit eaf4f43f687db59137a0b00bc0e12ed4eb0d0943 Merge: 1e9c5be 1e7d7bd Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Fri Mar 28 11:49:04 2014 +0100 Merge branch 'master' of https://github.com/kev300/core into kev300-master commit 1e7d7bdd8b5c7f301501cb822cdf2ef0ad3f2872 Author: kev300 <admin@gadeco.de> Date: Tue Dec 17 14:11:42 2013 +0100 Update util.php commit 3f0723f054a27a506be7f26932ccb54fff6f2be9 Author: kev300 <admin@gadeco.de> Date: Tue Dec 17 14:09:15 2013 +0100 Update util.php commit 512176abdcfbe5b2b060b91033abc9608912d1f8 Author: kev300 <admin@gadeco.de> Date: Tue Dec 17 14:02:04 2013 +0100 Update util.php commit 6cbefd080188d287024e0b047b88dd4525d6c2c1 Author: kev300 <admin@gadeco.de> Date: Mon Dec 16 16:44:46 2013 +0100 Update util.php Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.
* Merge pull request #7107 from owncloud/load-apps-proper-masterThomas Müller2014-03-281-3/+1
|\ | | | | Load apps proper master
| * Merge branch 'master' into load-apps-proper-masterThomas Müller2014-03-211-15/+64
| |\ | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/rawlist.php cron.php ocs/v1.php
| * | remove some more global variable $RUNTIME_NOAPPSThomas Müller2014-02-061-3/+1
| | |
* | | Merge pull request #7748 from owncloud/postgresversionwarningThomas Müller2014-03-251-0/+35
|\ \ \ | | | | | | | | Added PostgreSQL version warning on upgrade
| * | | fixing code styleThomas Müller2014-03-251-2/+1
| | | |
| * | | Log exception when PostgreSQL version check failedVincent Petry2014-03-241-1/+3
| | | |
| * | | Added PostgreSQL version warning on upgradeVincent Petry2014-03-171-0/+34
| | | |
* | | | Added warning for Mac OS on setup pageVincent Petry2014-03-201-1/+10
| |_|/ |/| |
* | | Merge pull request #7732 from owncloud/datafolderexistenceVincent Petry2014-03-201-4/+28
|\ \ \ | |/ / |/| | Added .ocdata file to check for data folder validity
| * | Added .ocdata file to check for data folder validityVincent Petry2014-03-141-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | In environments where the data folder is mount from another partition, it is important to check that the data folder we see is actually the real one. If the mount failed for some reasons, this fix will make ownCloud temporarily unavailable instead of causing unpredictable behavior.
* | | use a non-recursive chmod on the datadirRobin Appelman2014-03-171-1/+1
|/ /
* | Merge branch 'master' into no-css-js-delivery-via-phpThomas Müller2014-02-211-1/+1
|\ \ | | | | | | | | | | | | Conflicts: config/config.sample.php
| * \ Merge pull request #6962 from owncloud/quota-space-rootThomas Müller2014-02-201-1/+1
| |\ \ | | | | | | | | Allow passing a root folder to get the used space from in the quota wrapper
| | * | Merge branch 'master' into quota-space-rootRobin Appelman2014-02-071-2/+6
| | |\|
| | * | Allow passing a root folder to get the used space from in the quota wrapperRobin Appelman2014-01-271-1/+1
| | | |
* | | | kill $coreStyles and $coreScriptsThomas Müller2014-02-201-2/+0
|/ / /
* | | Merge pull request #6714 from owncloud/files-newfileinvalidcharsfixLukas Reschke2014-02-201-0/+21
|\ \ \ | | | | | | | | Added extra checks for invalid file chars in newfile.php and newfolder.php
| * | | Added extra checks for invalid file chars in newfile.php and newfolder.phpVincent Petry2014-02-181-0/+21
| | |/ | |/| | | | | | | | | | | | | | | | - added PHP utility function to check for file name validity - fixes issue where a user can create a file called ".." from the files UI - added extra checks to make sure newfile.php and newfolder.php also check for invalid characters
* | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2014-02-191-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch was automatically generated as part of the following inspection: https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720 Enabled analysis tools: - PHP Analyzer - JSHint - PHP Copy/Paste Detector - PHP PDepend
* | | Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-181-2/+3
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: lib/private/migration/content.php
| * | | Remove usage of legacy OC_AppconfigRobin Appelman2014-02-131-2/+3
| |/ /
* | | Fix more documentation failesJoas Schilling2014-02-081-3/+2
| | | | | | | | | | | | Issue #7111
* | | polish documentation based on scrutinizer patchesJörn Friedrich Dreyer2014-02-061-2/+7
|/ /
* | Merge branch 'master' into setupBart Visscher2014-01-311-53/+121
|\| | | | | | | | | Conflicts: core/setup.php