maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

enhance description of newsfeed-settings; ask whether to activate the newsfeed on install in case admin does not want any external requests

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-03-05 13:56:34 +01:00
parent ca34f7a78a
commit 77502efce7
8 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
install/lib/class.FroxlorInstall.php
View File

@@ -160,6 +160,7 @@ class FroxlorInstall {
$this->_getPostField('admin_user', 'admin');
$this->_getPostField('admin_pass1');
$this->_getPostField('admin_pass2');
$this->_getPostField('activate_newsfeed', 1);
$posixusername = posix_getpwuid(posix_getuid());
$this->_getPostField('httpuser', $posixusername['name']);
$posixgroup = posix_getgrgid(posix_getgid());
@@ -473,6 +474,7 @@ class FroxlorInstall {
$this->_updateSetting($upd_stmt, '/var/run/', 'phpfpm', 'fastcgi_ipcdir');
}
$this->_updateSetting($upd_stmt, $this->_data['activate_newsfeed'], 'admin', 'show_news_feed');
$this->_updateSetting($upd_stmt, dirname(dirname(dirname(__FILE__))), 'system', 'letsencryptchallengepath');
// insert the lastcronrun to be the installation date
@@ -746,6 +748,8 @@ class FroxlorInstall {
} else { $style = '';
}
$formdata .= $this->_getSectionItemString('admin_pass2', true, $style, 'password');
// activate newsfeed?
$formdata .= $this->_getSectionItemYesNo('activate_newsfeed', true);
/**
* Server data
@@ -819,10 +823,10 @@ class FroxlorInstall {
}
/**
* generate form checkbox field
* generate form radio field for webserver-selection
*
* @param string $fieldname
* @param boolean $required
* @param boolean $checked
* @param string $style
*
* @return string
@@ -837,6 +841,25 @@ class FroxlorInstall {
return $sectionitem;
}
/**
* generate form checkbox field
*
* @param string $fieldname
* @param boolean $checked
* @param string $style
*
* @return string
*/
private function _getSectionItemYesNo($fieldname = null, $checked = false, $style = "") {
$fieldlabel = $this->_lng['install'][$fieldname];
if ($checked) {
$checked = 'checked="checked"';
}
$sectionitem = "";
eval("\$sectionitem .= \"" . $this->_getTemplate("dataitemyesno") . "\";");
return $sectionitem;
}
/**
* check for requirements froxlor needs
*/