diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-01-20 14:12:30 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-01-20 14:12:30 +0100 |
| commit | a87a2e8e2c6baf2da586a0cdd2630c1d4d1f96d3 (patch) | |
| tree | 041724d43ed081a1292c55a31c898122bd7cad38 | |
| parent | fedc7c6f34f659401f503d6306faff65f5eecf6a (diff) | |
| parent | 828d7d6cf5e9cc7df89527243268a14ad7d4d0b9 (diff) | |
| download | nextcloud-server-a87a2e8e2c6baf2da586a0cdd2630c1d4d1f96d3.tar.gz nextcloud-server-a87a2e8e2c6baf2da586a0cdd2630c1d4d1f96d3.zip | |
Merge pull request #13494 from owncloud/windows_warning
add a Windows warning
| -rw-r--r-- | settings/admin.php | 2 | ||||
| -rw-r--r-- | settings/templates/admin.php | 21 |
2 files changed, 18 insertions, 5 deletions
diff --git a/settings/admin.php b/settings/admin.php index 01cab1fa1f4..bb20c665f56 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -81,6 +81,8 @@ $template->assign('onlyShareWithGroupMembers', \OC\Share\Share::shareWithGroupMe $databaseOverload = (strpos(\OCP\Config::getSystemValue('dbtype'), 'sqlite') !== false); $template->assign('databaseOverload', $databaseOverload); +// warn if Windows is used +$template->assign('WindowsWarning', OC_Util::runningOnWindows()); // add hardcoded forms from the template $forms = OC_App::getForms('admin'); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 41b60b64428..65c6359e509 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -10,13 +10,10 @@ */ style('settings', 'settings'); -script('settings', 'settings'); -script( "settings", "admin" ); -script( "settings", "log" ); -script( 'core', 'multiselect' ); +script('settings', [ 'settings', 'admin', 'log'] ); +script('core', ['multiselect', 'setupchecks']); vendor_script('select2/select2'); vendor_style('select2/select2'); -script('core', 'setupchecks'); $levels = array('Debug', 'Info', 'Warning', 'Error', 'Fatal'); $levelLabels = array( @@ -125,6 +122,20 @@ if ($_['databaseOverload']) { <?php } +// Windows Warning +if ($_['WindowsWarning']) { + ?> +<div class="section"> + <h2><?php p($l->t('Microsoft Windows Platform'));?></h2> + + <p class="securitywarning"> + <?php p($l->t('Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience.')); ?> + </p> + +</div> +<?php +} + // if module fileinfo available? if (!$_['has_fileinfo']) { ?> |