"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "install/lib/class.FroxlorInstall.php" between
froxlor-0.10.26.tar.gz and froxlor-0.10.27.tar.gz

About: Froxlor is a web-based server management panel. It’s a fork of SysCP and has its main focus on simplicity and usability.

class.FroxlorInstall.php  (froxlor-0.10.26):class.FroxlorInstall.php  (froxlor-0.10.27)
skipping to change at line 787 skipping to change at line 787
private function _showDataForm() private function _showDataForm()
{ {
$content = ""; $content = "";
// form action // form action
$formaction = htmlspecialchars($_SERVER['PHP_SELF']); $formaction = htmlspecialchars($_SERVER['PHP_SELF']);
if (isset($_GET['check'])) { if (isset($_GET['check'])) {
$formaction .= '?check=' . (int) $_GET['check']; $formaction .= '?check=' . (int) $_GET['check'];
} }
// language selection // language selection
$language_options = ''; $language_options = '';
foreach ($this->_languages as $language_name => $language_file) { foreach ($this->_languages as $language_file => $language_name) {
$language_options .= \Froxlor\UI\HTML::makeoption($langua ge_name, $language_file, $this->_activelng, true, true); $language_options .= \Froxlor\UI\HTML::makeoption($langua ge_name, $language_file, $this->_activelng, true, true);
} }
// get language-form-template // get language-form-template
eval("\$content .= \"" . $this->_getTemplate("lngform") . "\";"); eval("\$content .= \"" . $this->_getTemplate("lngform") . "\";");
// form-data // form-data
$formdata = ""; $formdata = "";
/** /**
* Database * Database
*/ */
skipping to change at line 870 skipping to change at line 870
$section = $this->_lng['install']['serversettings']; $section = $this->_lng['install']['serversettings'];
eval("\$formdata .= \"" . $this->_getTemplate("datasection") . "\ ";"); eval("\$formdata .= \"" . $this->_getTemplate("datasection") . "\ ";");
// distribution // distribution
if (! empty($_POST['installstep']) && $this->_data['distribution' ] == '') { if (! empty($_POST['installstep']) && $this->_data['distribution' ] == '') {
$diststyle = 'color:red;'; $diststyle = 'color:red;';
} else { } else {
$diststyle = ''; $diststyle = '';
} }
// show list of available distro's // show list of available distro's
$distributions_select_data = [];
$distros = glob(\Froxlor\FileDir::makeCorrectDir(\Froxlor\Froxlor ::getInstallDir() . '/lib/configfiles/') . '*.xml'); $distros = glob(\Froxlor\FileDir::makeCorrectDir(\Froxlor\Froxlor ::getInstallDir() . '/lib/configfiles/') . '*.xml');
foreach ($distros as $_distribution) { foreach ($distros as $_distribution) {
$dist = new \Froxlor\Config\ConfigParser($_distribution); $dist = new \Froxlor\Config\ConfigParser($_distribution);
$dist_display = $dist->distributionName . " " . $dist->di stributionCodename . " (" . $dist->distributionVersion . ")"; $dist_display = $dist->distributionName . " " . $dist->di stributionCodename . " (" . $dist->distributionVersion . ")";
if (!array_key_exists($dist_display, $distributions_selec
t_data)) {
$distributions_select_data[$dist_display] = '';
}
$distributions_select_data[$dist_display] .= str_replace( ".xml", "", strtolower(basename($_distribution))); $distributions_select_data[$dist_display] .= str_replace( ".xml", "", strtolower(basename($_distribution)));
} }
// sort by distribution name // sort by distribution name
ksort($distributions_select_data); ksort($distributions_select_data);
$distributions_select = '';
foreach ($distributions_select_data as $dist_display => $dist_ind ex) { foreach ($distributions_select_data as $dist_display => $dist_ind ex) {
// create select-box-option // create select-box-option
$distributions_select .= \Froxlor\UI\HTML::makeoption($di st_display, $dist_index, $this->_data['distribution']); $distributions_select .= \Froxlor\UI\HTML::makeoption($di st_display, $dist_index, $this->_data['distribution'] ?? '');
// $this->_data['distribution'] // $this->_data['distribution']
} }
$formdata .= $this->_getSectionItemSelectbox('distribution', $dis tributions_select, $diststyle); $formdata .= $this->_getSectionItemSelectbox('distribution', $dis tributions_select, $diststyle);
// servername // servername
if (! empty($_POST['installstep']) && $this->_data['servername'] == '') { if (! empty($_POST['installstep']) && $this->_data['servername'] == '') {
$style = 'color:red;'; $style = 'color:red;';
} else { } else {
$style = ''; $style = '';
skipping to change at line 997 skipping to change at line 1002
* generate form selectbox * generate form selectbox
* *
* @param string $fieldname * @param string $fieldname
* @param boolean $options * @param boolean $options
* @param string $style * @param string $style
* *
* @return string * @return string
*/ */
private function _getSectionItemSelectbox($fieldname = null, $options = n ull, $style = "") private function _getSectionItemSelectbox($fieldname = null, $options = n ull, $style = "")
{ {
$groupname = $this->_lng['install'][$groupname];
$fieldlabel = $this->_lng['install'][$fieldname]; $fieldlabel = $this->_lng['install'][$fieldname];
$sectionitem = ""; $sectionitem = "";
eval("\$sectionitem .= \"" . $this->_getTemplate("dataitemselect" ) . "\";"); eval("\$sectionitem .= \"" . $this->_getTemplate("dataitemselect" ) . "\";");
return $sectionitem; return $sectionitem;
} }
/** /**
* generate form checkbox field * generate form checkbox field
* *
 End of changes. 6 change blocks. 
3 lines changed or deleted 8 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)