diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2014-08-17 20:01:02 -0400 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2014-08-17 20:01:02 -0400 |
| commit | ddeb301ad63d464c7d16416a2e056a0225f0a61e (patch) | |
| tree | 60eed96811c8ed7a4fe496fb67119f75e01c5b05 | |
| parent | 942d09030ee162299ab3baf6b7b6c9938a4fd0ab (diff) | |
| parent | ccc46be740264f3374834ece24a11e804924c180 (diff) | |
| download | nextcloud-server-ddeb301ad63d464c7d16416a2e056a0225f0a61e.tar.gz nextcloud-server-ddeb301ad63d464c7d16416a2e056a0225f0a61e.zip | |
Merge pull request #10456 from kroimon/skeleton_dir_config
Make skeleton directory configurable.
| -rwxr-xr-x | config/config.sample.php | 5 | ||||
| -rwxr-xr-x | lib/private/util.php | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 402c84fe0c7..a0f3e0a4e72 100755 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -222,6 +222,11 @@ $CONFIG = array( */ // "datadirectory" => "", +/* The directory where the skeleton files are located. These files will be copied to the data + * directory of new users. Leave empty to not copy any skeleton files. + */ +// "skeletondirectory" => "", + /* Enable maintenance mode to disable ownCloud If you want to prevent users to login to ownCloud before you start doing some maintenance work, you need to set the value of the maintenance parameter to true. diff --git a/lib/private/util.php b/lib/private/util.php index be4aac69564..f46f5983d21 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -208,7 +208,10 @@ class OC_Util { * @param string $userDirectory */ public static function copySkeleton($userDirectory) { - OC_Util::copyr(\OC::$SERVERROOT.'/core/skeleton' , $userDirectory); + $skeletonDirectory = OC_Config::getValue('skeletondirectory', \OC::$SERVERROOT.'/core/skeleton'); + if (!empty($skeletonDirectory)) { + OC_Util::copyr($skeletonDirectory , $userDirectory); + } } /** |