From 7e6d69d166cbc92fb457fc72efc9abe850a0bbe4 Mon Sep 17 00:00:00 2001 From: Julius Härtl Date: Tue, 19 Jan 2021 11:20:50 +0100 Subject: Add templatedirectory config value to let admins have their custom templates by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/private/legacy/OC_Util.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'lib/private/legacy') diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php index 16e68b07cf1..05d54cf84e6 100644 --- a/lib/private/legacy/OC_Util.php +++ b/lib/private/legacy/OC_Util.php @@ -72,6 +72,7 @@ use OCP\IGroupManager; use OCP\ILogger; use OCP\IUser; use OCP\IUserSession; +use Psr\Log\LoggerInterface; class OC_Util { public static $scripts = []; @@ -412,6 +413,9 @@ class OC_Util { * @suppress PhanDeprecatedFunction */ public static function copySkeleton($userId, \OCP\Files\Folder $userDirectory) { + /** @var LoggerInterface $logger */ + $logger = \OC::$server->get(LoggerInterface::class); + $plainSkeletonDirectory = \OC::$server->getConfig()->getSystemValue('skeletondirectory', \OC::$SERVERROOT . '/core/skeleton'); $userLang = \OC::$server->getL10NFactory()->findLanguage(); $skeletonDirectory = str_replace('{lang}', $userLang, $plainSkeletonDirectory); @@ -440,14 +444,12 @@ class OC_Util { } if (!empty($skeletonDirectory)) { - \OCP\Util::writeLog( - 'files_skeleton', - 'copying skeleton for '.$userId.' from '.$skeletonDirectory.' to '.$userDirectory->getFullPath('/'), - ILogger::DEBUG - ); + $logger->debug('copying skeleton for '.$userId.' from '.$skeletonDirectory.' to '.$userDirectory->getFullPath('/'), ['app' => 'files_skeleton']); self::copyr($skeletonDirectory, $userDirectory); // update the file cache $userDirectory->getStorage()->getScanner()->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE); + + /** @var ITemplateManager $templateManaer */ $templateManaer = \OC::$server->get(ITemplateManager::class); $templateManaer->initializeTemplateDirectory(null, $userId); } -- cgit v1.2.3