wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #13494 from owncloud/windows_warning

Browse source 
add a Windows warning
This commit is contained in:
Morris Jobke 2015-01-20 14:12:30 +01:00
commit a87a2e8e2c
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
settings/admin.php
View file

@ -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');

21
settings/templates/admin.php
View file

@ -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']) {
?>