summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #17264 from nextcloud/move-from-storage-wrappersRoeland Jago Douma2019-09-262-1/+37
|\
| * handle moveFromStorage within the same storage even when storage wrappers are...Robin Appelman2019-09-252-1/+37
* | Merge pull request #17252 from nextcloud/bugfix/noid/user-0-can-not-commentRoeland Jago Douma2019-09-262-5/+5
|\ \
| * | Fix user with id 0 to be able to commentJoas Schilling2019-09-252-5/+5
* | | Merge pull request #17262 from nextcloud/objectstore-remove-cache-on-deleteRoeland Jago Douma2019-09-261-3/+11
|\ \ \ | |/ / |/| |
| * | dont delete cache entries if deleting an object from object store failedRobin Appelman2019-09-251-3/+11
| |/
* | Merge pull request #17163 from nextcloud/bugfix/noid/print-error-on-data-dir-...Roeland Jago Douma2019-09-231-1/+1
|\ \
| * | Print the error pages as error so we load less scripts and might be able to v...Joas Schilling2019-09-161-1/+1
* | | Merge pull request #17206 from nextcloud/logger-catch-exceptionsRoeland Jago Douma2019-09-191-24/+31
|\ \ \
| * | | catch exceptions that occur during loggingRobin Appelman2019-09-191-24/+31
* | | | Fix l10n in federated file sharingChristoph Wurst2019-09-191-1/+1
|/ / /
* | | Use the actual password to update the tokensRoeland Jago Douma2019-09-181-1/+1
* | | Add uid to delete temp token queryDaniel Kesselberg2019-09-181-1/+2
* | | Fix getById for files in appdata and the root mountJoas Schilling2019-09-171-0/+44
|/ /
* | Merge pull request #17151 from nextcloud/td/remove/createPreviewRoeland Jago Douma2019-09-151-28/+0
|\ \
| * | Remove deprecated function createPreviewRoeland Jago Douma2019-09-151-28/+0
* | | Disable app token creation for impersonated people, ref #15539Greta Doci2019-09-151-0/+23
|/ /
* | Harden identifyproof openssl codeRoeland Jago Douma2019-09-142-15/+28
* | Use Symfony's new contract Event class instead of the deprecated oneChristoph Wurst2019-09-121-4/+3
* | Merge pull request #17106 from nextcloud/feature/dispatch-typed-eventblizzz2019-09-121-0/+5
|\ \
| * | Add Symfony inspired typed event dispatcher methodChristoph Wurst2019-09-111-0/+5
* | | Merge pull request #17084 from nextcloud/refactor/symfony-dispatcher-signatureRoeland Jago Douma2019-09-111-2/+1
|\ \ \ | |/ / |/| |
| * | Use the new Symfony event dispatcher signatureChristoph Wurst2019-09-101-2/+1
* | | Merge pull request #17021 from nextcloud/bye-spreed-hello-talkJoas Schilling2019-09-111-2/+2
|\ \ \
| * | | Bye Spreed namespace, hello Talk!Joas Schilling2019-09-051-2/+2
* | | | Merge pull request #16682 from nextcloud/enh/12790/workflow-backendRoeland Jago Douma2019-09-115-22/+40
|\ \ \ \
| * | | | emit file events via Dispatcher, tooArthur Schiwon2019-09-095-22/+40
| | |/ / | |/| |
* / | | Split personal security settings in codeRoeland Jago Douma2019-09-101-0/+4
|/ / /
* | | Merge pull request #16836 from nextcloud/fix/16724/smb-availabilityRoeland Jago Douma2019-09-092-109/+102
|\ \ \ | |_|/ |/| |
| * | set a storage availability delay on auth issues to avoid lock outArthur Schiwon2019-08-222-109/+102
* | | Merge pull request #16859 from PhrozenByte/patch-1Roeland Jago Douma2019-09-092-0/+18
|\ \ \
| * | | Improve usage of IAppManager::getAppWebPath()Daniel Rudolf2019-09-052-1/+3
| * | | Add IAppManager::getAppWebPath()Daniel Rudolf2019-08-251-0/+16
* | | | Merge pull request #16962 from nextcloud/keep-cypress-gitRoeland Jago Douma2019-09-082-84/+0
|\ \ \ \
| * | | | Kill repair step for cypress testsDaniel Kesselberg2019-09-022-88/+0
| * | | | Keep cypress if gitDaniel Kesselberg2019-09-011-0/+4
* | | | | Merge pull request #17006 from nextcloud/querybuilder-max-minRoeland Jago Douma2019-09-071-0/+8
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | add MAX and MIN to functionbuilderRobin Appelman2019-09-061-0/+8
* | | | | Return the proper jailed path when requesting the root pathJulius Härtl2019-09-041-1/+1
* | | | | Merge pull request #16972 from nextcloud/enh/default_client_timeoutRoeland Jago Douma2019-09-041-0/+1
|\ \ \ \ \
| * | | | | Set a default request timeoutRoeland Jago Douma2019-09-021-0/+1
* | | | | | Fix sanity checks #16963Samuel CHEMLA2019-09-011-5/+3
|/ / / / /
* | | | | Handle throwables in the http dispatcherJulius Härtl2019-08-291-0/+4
* | | | | Merge pull request #16913 from nextcloud/fix/declare_membersRoeland Jago Douma2019-08-292-18/+6
|\ \ \ \ \
| * | | | | SessionMiddleware: declare session propertyRoeland Jago Douma2019-08-282-18/+6
| | |/ / / | |/| | |
* / | | | Make sure they keys are uniqueRoeland Jago Douma2019-08-281-1/+0
|/ / / /
* | | | Merge pull request #16723 from nextcloud/fix/sharing/unshare-messageJoas Schilling2019-08-262-2/+9
|\ \ \ \
| * | | | Add expiration event for sharesJohn Molakvoæ (skjnldsv)2019-08-212-2/+9
| |/ / /
* | | | Merge pull request #16795 from nextcloud/enh/phpstan/limiterJohn Molakvoæ2019-08-262-18/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix report of phpstan in LimiterRoeland Jago Douma2019-08-192-18/+4
n class="s2">/img/$image")) { $path = \OC::$WEBROOT . "/themes/$theme/apps/$app/img/$image"; } elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$basename.svg") && file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$basename.png")) { $path = \OC::$WEBROOT . "/themes/$theme/apps/$app/img/$basename.png"; } elseif (!empty($app) and file_exists(\OC::$SERVERROOT . "/themes/$theme/$app/img/$image")) { $path = \OC::$WEBROOT . "/themes/$theme/$app/img/$image"; } elseif (!empty($app) and (!file_exists(\OC::$SERVERROOT . "/themes/$theme/$app/img/$basename.svg") && file_exists(\OC::$SERVERROOT . "/themes/$theme/$app/img/$basename.png"))) { $path = \OC::$WEBROOT . "/themes/$theme/$app/img/$basename.png"; } elseif (file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$image")) { $path = \OC::$WEBROOT . "/themes/$theme/core/img/$image"; } elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.svg") && file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.png")) { $path = \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png"; } elseif($themingEnabled && $themingImagePath) { $path = $themingImagePath; } elseif ($appPath && file_exists($appPath . "/img/$image")) { $path = \OC_App::getAppWebPath($app) . "/img/$image"; } elseif ($appPath && !file_exists($appPath . "/img/$basename.svg") && file_exists($appPath . "/img/$basename.png")) { $path = \OC_App::getAppWebPath($app) . "/img/$basename.png"; } elseif (!empty($app) and file_exists(\OC::$SERVERROOT . "/$app/img/$image")) { $path = \OC::$WEBROOT . "/$app/img/$image"; } elseif (!empty($app) and (!file_exists(\OC::$SERVERROOT . "/$app/img/$basename.svg") && file_exists(\OC::$SERVERROOT . "/$app/img/$basename.png"))) { $path = \OC::$WEBROOT . "/$app/img/$basename.png"; } elseif (file_exists(\OC::$SERVERROOT . "/core/img/$image")) { $path = \OC::$WEBROOT . "/core/img/$image"; } elseif (!file_exists(\OC::$SERVERROOT . "/core/img/$basename.svg") && file_exists(\OC::$SERVERROOT . "/core/img/$basename.png")) { $path = \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png"; } if($path !== '') { $cache->set($cacheKey, $path); return $path; } else { throw new RuntimeException('image not found: image:' . $image . ' webroot:' . \OC::$WEBROOT . ' serverroot:' . \OC::$SERVERROOT); } } /** * Makes an URL absolute * @param string $url the url in the ownCloud host * @return string the absolute version of the url */ public function getAbsoluteURL($url) { $separator = $url[0] === '/' ? '' : '/'; if (\OC::$CLI && !defined('PHPUNIT_RUN')) { return rtrim($this->config->getSystemValue('overwrite.cli.url'), '/') . '/' . ltrim($url, '/'); } // The ownCloud web root can already be prepended. if(substr($url, 0, strlen(\OC::$WEBROOT)) === \OC::$WEBROOT) { $url = substr($url, strlen(\OC::$WEBROOT)); } return $this->getBaseUrl() . $separator . $url; } /** * @param string $key * @return string url to the online documentation */ public function linkToDocs($key) { $theme = \OC::$server->getThemingDefaults(); return $theme->buildDocLinkToKey($key); } /** * @return string base url of the current request */ public function getBaseUrl() { return $this->request->getServerProtocol() . '://' . $this->request->getServerHost() . \OC::$WEBROOT; } }