Compare commits

..

29 Commits

Author SHA1 Message Date
Michael Kaufmann (d00p)
10996c5bed set version to 0.9.18.1
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2011-03-07 09:55:23 +01:00
Michael Kaufmann (d00p)
fc712bde90 remove nested table in admin:admin-overview
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2011-03-07 09:40:32 +01:00
Michael Kaufmann (d00p)
4e1433d861 fix linebreaks in php-configurations and other textareas, fixes #632
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2011-03-06 17:32:51 +01:00
Michael Kaufmann (d00p)
4fc02e6c93 fix inline-if-statements to show specific fields only if necessary, refs #633
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2011-03-06 16:49:22 +01:00
Michael Kaufmann (d00p)
57c72d68a4 fix html-layout if resetting password is disabled
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2011-03-06 14:12:51 +01:00
Andreas Burchert (scarya)
0230c6ac2b Replaced all picture to have a consistent look.
Added <image>_big.png to have bigger icons for page titles.
2011-03-05 17:16:48 +01:00
Florian Aders (EleRas)
865f7036fd Adding formfields for autoresponder (part 2, forgot some files), fixes #629
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
2011-03-04 21:45:17 +01:00
Florian Aders (EleRas)
6825c5e0dc Adding formfields for autoresponder, fixes #629
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
2011-03-04 21:44:05 +01:00
Michael Kaufmann (d00p)
3e63b1aabb - fix possible error in usage-report if customer has no traffic (traffic = 0)
- fix another missing hidden-field in classic-theme template

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2011-03-04 13:35:54 +01:00
Michael Kaufmann (d00p)
d6d19e7cb2 - fix undefined index in customer_domains.php
- add possibility to disable form-buttons if not needed
- corrected ticket-categories order-counter begin-value
- beautify domains-add and e-mail add form for customers
- added various missing hidden-fields in templates (Classic-theme)

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2011-03-04 11:46:40 +01:00
Michael Kaufmann (d00p)
adeac9cce1 Merge branch 'master' of git.froxlor.org:froxlor 2011-03-04 08:48:49 +01:00
Michael Kaufmann (d00p)
5a743b2005 add missing traffic-images to theme 'Froxlor' and correct templates to reflect the new directory-layout, fixes #634
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2011-03-04 08:46:20 +01:00
Andreas Burchert (scarya)
dc1f33f494 Added fallback solution in getTemplate() for 3rd party modules.
Thanks to atari.
2011-03-02 10:15:46 +01:00
Michael Kaufmann (d00p)
e04ae041ab add save/reset button to the end of each form, fixes #631
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2011-03-02 07:54:57 +01:00
Michael Kaufmann (d00p)
236377c28e many fixes in Classic and Froxlor templates
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2011-03-02 07:46:32 +01:00
Michael Kaufmann (d00p)
687b28016e Merge branch 'master' of git.froxlor.org:froxlor 2011-03-02 07:27:24 +01:00
Florian Aders (EleRas)
00edba1d0d Fixing dynamic selection of themes in settings, fixes #628
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
2011-03-01 20:38:09 +01:00
Florian Aders (EleRas)
207e9e1b43 Fixed adding of email-forwarding in classic template, too, fixes #626 again
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
2011-03-01 20:15:07 +01:00
Florian Aders (EleRas)
0afbad5ff1 Fixed adding of email-forwarding, fixes #626
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
2011-03-01 20:07:48 +01:00
Florian Aders (EleRas)
357e60c054 Reworked admin -> customerslist, fixes #619
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
2011-03-01 19:52:34 +01:00
Florian Aders (EleRas)
9d45759613 Fixing paths in CSS, now relative instead of absolute
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
2011-03-01 19:28:34 +01:00
Florian Aders (EleRas)
9503ae0ac5 Fixed syntax error in configfiles_index
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
2011-03-01 19:12:04 +01:00
Florian Aders (EleRas)
97d20199fe Fixed missing nginx in installer
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
2011-03-01 19:10:46 +01:00
Michael Kaufmann (d00p)
d66d32066d fix php-syntax error in configfiles_index.inc.php, fixes #622
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2011-03-01 14:34:27 +01:00
Michael Kaufmann (d00p)
13bde22344 - updated outdated domains_add & domains_edit templates in Classic-theme
- fixed formfield when path-mode is 'Manual'
fixes #620

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2011-03-01 10:31:38 +01:00
Michael Kaufmann (d00p)
fb430e55d2 don't show input-fields for editing ftp@domain users as it should not be done, fixes #617 2011-03-01 07:46:42 +01:00
Michael Kaufmann (d00p)
5fde181fdc don't create fpm-socket in own vhost if not enabled, fixes #613
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2011-03-01 07:39:29 +01:00
Michael Kaufmann (d00p)
4da7b815f3 add missing hidden-field for 'id' in emails_edit.tpl
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2011-02-28 21:54:03 +01:00
Michael Kaufmann (d00p)
84e17ab91f correct main httpd.conf path, fixes #615
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2011-02-28 21:43:27 +01:00
152 changed files with 466 additions and 410 deletions

View File

@@ -39,8 +39,7 @@ return array(
'type' => 'option',
'default' => 'Froxlor',
'option_mode' => 'one',
'option_options' => array('Classic' => 'Classic', 'Froxlor' => 'Froxlor'),
/* 'option_options_method' => 'getThemes', // iterate through templates/ and dynamically display all folders found */
'option_options_method' => 'getThemes',
'save_method' => 'storeSettingField',
),
'panel_natsorting' => array(

View File

@@ -110,6 +110,14 @@ if($action == "add")
$date_from_off = makecheckbox('date_from_off', $lng['panel']['not_activated'], '-1', false, '-1', true, true);
$date_until_off = makecheckbox('date_until_off', $lng['panel']['not_activated'], '-1', false, '-1', true, true);
$isactive = makeyesno('active', '1', '0', '1');
$autoresponder_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_addautoresponder.php';
$autoresponder_add_form = htmlform::genHTMLForm($autoresponder_add_data);
$title = $autoresponder_add_data['autoresponder_add']['title'];
$image = $autoresponder_add_data['autoresponder_add']['image'];
eval("echo \"" . getTemplate("email/autoresponder_add") . "\";");
}
@@ -212,6 +220,7 @@ if($action == "edit")
if($date_from == -1)
{
$deactivated = '-1';
$date_from = '';
}
else
{
@@ -223,7 +232,7 @@ if($action == "edit")
if($date_until == -1)
{
$deactivated = '-1';
$date_until = '-1';
$date_until = '';
}
else
{
@@ -232,12 +241,13 @@ if($action == "edit")
}
$date_until_off = makecheckbox('date_until_off', $lng['panel']['not_activated'], '-1', false, $deactivated, true, true);
$checked = '';
$isactive = makeyesno('active', '1', '0', $row['enabled']);
if($row['enabled'] == 1)
{
$checked = "checked=\"checked\"";
}
$autoresponder_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_editautoresponder.php';
$autoresponder_edit_form = htmlform::genHTMLForm($autoresponder_edit_data);
$title = $autoresponder_edit_data['autoresponder_edit']['title'];
$image = $autoresponder_edit_data['autoresponder_edit']['image'];
eval("echo \"" . getTemplate("email/autoresponder_edit") . "\";");
}

View File

@@ -368,9 +368,9 @@ elseif($page == 'domains')
$aliasdomains.= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['id']);
}
$redirectcode = '';
if($settings['customredirect']['enabled'] == '1')
{
$redirectcode = '';
$codes = getRedirectCodesArray();
foreach($codes as $rc)
{
@@ -552,10 +552,10 @@ elseif($page == 'domains')
$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit'], $result['documentroot']);
}
$redirectcode = '';
if($settings['customredirect']['enabled'] == '1')
{
$def_code = getDomainRedirectId($id);
$redirectcode = '';
$codes = getRedirectCodesArray();
foreach($codes as $rc)
{

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1011 B

After

Width:  |  Height:  |  Size: 1015 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1015 B

After

Width:  |  Height:  |  Size: 1017 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1012 B

After

Width:  |  Height:  |  Size: 1009 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 979 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 972 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 950 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 921 B

After

Width:  |  Height:  |  Size: 977 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 987 B

After

Width:  |  Height:  |  Size: 987 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 921 B

After

Width:  |  Height:  |  Size: 977 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 987 B

After

Width:  |  Height:  |  Size: 987 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 967 B

After

Width:  |  Height:  |  Size: 986 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 974 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 948 B

After

Width:  |  Height:  |  Size: 984 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 939 B

After

Width:  |  Height:  |  Size: 975 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 1021 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 988 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 505 B

After

Width:  |  Height:  |  Size: 986 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 919 B

After

Width:  |  Height:  |  Size: 1003 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 820 B

After

Width:  |  Height:  |  Size: 994 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1021 B

After

Width:  |  Height:  |  Size: 974 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1007 B

After

Width:  |  Height:  |  Size: 961 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1011 B

After

Width:  |  Height:  |  Size: 986 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1005 B

After

Width:  |  Height:  |  Size: 973 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1007 B

After

Width:  |  Height:  |  Size: 961 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 978 B

After

Width:  |  Height:  |  Size: 969 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 953 B

After

Width:  |  Height:  |  Size: 996 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 66 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 82 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 105 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 827 B

View File

@@ -465,7 +465,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('syste
INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'vmail_homedir', '/var/customers/mail/');
INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bindconf_directory', '/etc/bind/');
INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bindreload_command', '/etc/init.d/bind9 reload');
INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.18');
INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.18.1');
INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'hostname', 'SERVERNAME');
INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('login', 'maxloginattempts', '3');
INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('login', 'deactivatetime', '900');

View File

@@ -931,8 +931,12 @@ else
<input type="radio" name="webserver" id="apache" value="apache2" <?php echo $webserver == "apache2" ? 'checked="checked"' : "" ?>/>Apache2
</p>
<p>
<label for="lighty"<?php echo ((!empty($_POST['installstep']) && $webserver == '') ? ' style="color:red;"' : ''); ?>><?php echo $lng['install']['webserver']; ?> ligHTTPd:</label>&nbsp;
<input type="radio" name="webserver" id="lighty" value="lighttpd" <?php echo $webserver == "lighttpd" ? 'checked="checked"' : "" ?>/>ligHTTPd
<label for="lighty"<?php echo ((!empty($_POST['installstep']) && $webserver == '') ? ' style="color:red;"' : ''); ?>><?php echo $lng['install']['webserver']; ?> LigHTTPd:</label>&nbsp;
<input type="radio" name="webserver" id="lighty" value="lighttpd" <?php echo $webserver == "lighttpd" ? 'checked="checked"' : "" ?>/>LigHTTPd
</p>
<p>
<label for="nginx"<?php echo ((!empty($_POST['installstep']) && $webserver == '') ? ' style="color:red;"' : ''); ?>><?php echo $lng['install']['webserver']; ?> Nginx:</label>&nbsp;
<input type="radio" name="webserver" id="nginx" value="nginx" <?php echo $webserver == "nginx" ? 'checked="checked"' : "" ?>/>Nginx
</p>
<p>
<label for="httpuser"<?php echo ((!empty($_POST['installstep']) && $httpuser == '') ? ' style="color:red;"' : ''); ?>><?php echo $lng['install']['httpuser']; ?>:</label>&nbsp;

View File

@@ -1474,3 +1474,11 @@ if(isFroxlorVersion('0.9.18-svn2'))
updateToVersion('0.9.18');
}
if(isFroxlorVersion('0.9.18'))
{
showUpdateStep("Updating from 0.9.18 to 0.9.18.1");
lastStepStatus(0);
updateToVersion('0.9.18.1');
}

View File

@@ -27,6 +27,7 @@ class htmlform
public static function genHTMLForm($data = array())
{
global $lng;
$nob = false;
self::$_form = '';
@@ -47,7 +48,11 @@ class htmlform
continue;
}
eval("self::\$_form .= \"" . getTemplate("misc/form/table_section", "1") . "\";");
if (!isset($section['nobuttons']) || $section['nobuttons'] == false) {
eval("self::\$_form .= \"" . getTemplate("misc/form/table_section", "1") . "\";");
} else {
$nob = true;
}
$nexto = false;
foreach($section['fields'] as $fieldname => $fielddata)
@@ -63,7 +68,7 @@ class htmlform
$style = (isset($fielddata['style']) ? ' style="'.$fielddata['style'].'"' : '');
$mandatory = self::_getMandatoryFlag($fielddata);
$data_field = self::_parseDataField($fieldname, $fielddata);
$data_field = str_replace("\n", "", $data_field);
//$data_field = str_replace("\n", "", $data_field);
$data_field = str_replace("\t", "", $data_field);
if (isset($fielddata['has_nextto'])) {
$nexto = array('field' => $fieldname);
@@ -74,7 +79,7 @@ class htmlform
eval("self::\$_form .= \"" . getTemplate("misc/form/table_row", "1") . "\";");
} else {
$data_field = self::_parseDataField($fieldname, $fielddata);
$data_field = str_replace("\n", "", $data_field);
//$data_field = str_replace("\n", "", $data_field);
$data_field = str_replace("\t", "", $data_field);
$data_field = $fielddata['next_to_prefix'].$data_field;
self::$_form = str_replace(
@@ -88,6 +93,11 @@ class htmlform
}
}
// add save/reset buttons at the end of the form
if (!$nob) {
eval("self::\$_form .= \"" . getTemplate("misc/form/table_end", "1") . "\";");
}
return self::$_form;
}

View File

@@ -453,7 +453,7 @@ class ticket
{
$sql = "SELECT MAX(`logicalorder`) as `highestorder` FROM `" . TABLE_PANEL_TICKET_CATS . "`;";
$result = $_db->query_first($sql);
return (isset($result['highestorder']) ? (int)$result['highestorder'] : 1);
return (isset($result['highestorder']) ? (int)$result['highestorder'] : 0);
}
/**

View File

@@ -22,13 +22,13 @@ $configcommand = array();
if(isConfigDir($settings['system']['apacheconf_vhost']))
{
$configcommand['vhost'] = 'mkdir -p ' . $settings['system']['apacheconf_vhost'];
$configcommand['include'] = 'echo -e "\\nInclude ' . makeCorrectDir($settings['system']['apacheconf_vhost']) . '*.conf" >> ' . makeCorrectFile(makeCorrectDir($settings['system']['apacheconf_vhost']) . '/httpd.conf');
$configcommand['include'] = 'echo -e "\\nInclude ' . makeCorrectDir($settings['system']['apacheconf_vhost']) . '*.conf" >> ' . makeCorrectFile(makeCorrectDir('/etc/apache2/httpd.conf'));
$configcommand['v_inclighty'] = 'echo -e \'\\ninclude_shell "cat ' . makeCorrectDir($settings['system']['apacheconf_vhost']) . '*.conf"\' >> /etc/lighttpd/lighttpd.conf';
}
else
{
$configcommand['vhost'] = 'touch ' . $settings['system']['apacheconf_vhost'];
$configcommand['include'] = 'echo -e "\\nInclude ' . $settings['system']['apacheconf_vhost'] . '" >> ' . makeCorrectFile(dirname($settings['system']['apacheconf_vhost']) . '/httpd.conf');
$configcommand['include'] = 'echo -e "\\nInclude ' . $settings['system']['apacheconf_vhost'] . '" >> ' . makeCorrectFile('/etc/apache2/httpd.conf');
$configcommand['v_inclighty'] = 'echo -e \'\\ninclude "' . $settings['system']['apacheconf_vhost'] . '"\' >> /etc/lighttpd/lighttpd.conf';
}
@@ -47,4 +47,3 @@ $cfgPath = 'lib/configfiles/';
$configfiles = Array();
$configfiles = array_merge(include $cfgPath . 'lenny.inc.php', include $cfgPath . 'hardy.inc.php', include $cfgPath . 'lucid.inc.php', include $cfgPath . 'gentoo.inc.php', include $cfgPath . 'suse10.inc.php', include $cfgPath . 'freebsd.inc.php');
?>

View File

@@ -155,7 +155,7 @@ return array(
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
'visible' => $settings['system']['mail_quota_enabled'],
'visible' => ($settings['system']['mail_quota_enabled'] == '1' ? true : false),
'mandatory' => true,
'ul_field' => $email_quota_ul
),
@@ -164,7 +164,7 @@ return array(
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
'visible' => $settings['autoresponder']['autoresponder_active'],
'visible' => ($settings['autoresponder']['autoresponder_active'] == '1' ? true : false),
'ul_field' => $email_autoresponder_ul
),
'ftps' => array(
@@ -179,7 +179,7 @@ return array(
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
'visible' => $settings['ticket']['enabled'],
'visible' => ($settings['ticket']['enabled'] == '1' ? true : false),
'ul_field' => $tickets_ul
),
'mysqls' => array(
@@ -194,14 +194,14 @@ return array(
'label' => $lng['aps']['canmanagepackages'],
'type' => 'yesno',
'yesno_var' => $can_manage_aps_packages,
'visible' => $settings['aps']['aps_active']
'visible' => ($settings['aps']['aps_active'] == '1' ? true : false)
),
'number_of_aps_packages' => array(
'label' => $lng['aps']['numberofapspackages'],
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
'visible' => $settings['aps']['aps_active'],
'visible' => ($settings['aps']['aps_active'] == '1' ? true : false),
'ul_field' => $number_of_aps_packages_ul
)
)

View File

@@ -165,7 +165,7 @@ return array(
'type' => 'textul',
'value' => $result['email_quota'],
'maxlength' => 9,
'visible' => $settings['system']['mail_quota_enabled'],
'visible' => ($settings['system']['mail_quota_enabled'] == '1' ? true : false),
'mandatory' => true,
'ul_field' => $email_quota_ul
),
@@ -174,7 +174,7 @@ return array(
'type' => 'textul',
'value' => $result['email_autoresponder'],
'maxlength' => 9,
'visible' => $settings['autoresponder']['autoresponder_active'],
'visible' => ($settings['autoresponder']['autoresponder_active'] == '1' ? true : false),
'ul_field' => $email_autoresponder_ul
),
'ftps' => array(
@@ -189,7 +189,7 @@ return array(
'type' => 'textul',
'value' => $result['tickets'],
'maxlength' => 9,
'visible' => $settings['ticket']['enabled'],
'visible' => ($settings['ticket']['enabled'] == '1' ? true : false),
'ul_field' => $tickets_ul
),
'mysqls' => array(
@@ -204,14 +204,14 @@ return array(
'label' => $lng['aps']['canmanagepackages'],
'type' => 'yesno',
'yesno_var' => $can_manage_aps_packages,
'visible' => $settings['aps']['aps_active']
'visible' => ($settings['aps']['aps_active'] == '1' ? true : false)
),
'number_of_aps_packages' => array(
'label' => $lng['aps']['numberofapspackages'],
'type' => 'textul',
'value' => $result['aps_packages'],
'maxlength' => 9,
'visible' => $settings['aps']['aps_active'],
'visible' => ($settings['aps']['aps_active'] == '1' ? true : false),
'ul_field' => $number_of_aps_packages_ul
)
)

View File

@@ -161,7 +161,7 @@ return array(
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
'visible' => $settings['system']['mail_quota_enabled'],
'visible' => ($settings['system']['mail_quota_enabled'] == '1' ? true : false),
'mandatory' => true,
'ul_field' => $email_quota_ul
),
@@ -170,7 +170,7 @@ return array(
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
'visible' => $settings['autoresponder']['autoresponder_active'],
'visible' => ($settings['autoresponder']['autoresponder_active'] == '1' ? true : false),
'ul_field' => $email_autoresponder_ul
),
'email_imap' => array(
@@ -197,7 +197,7 @@ return array(
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
'visible' => $settings['ticket']['enabled'],
'visible' => ($settings['ticket']['enabled'] == '1' ? true : false),
'ul_field' => $tickets_ul
),
'mysqls' => array(
@@ -223,7 +223,7 @@ return array(
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
'visible' => $settings['aps']['aps_active'],
'visible' => ($settings['aps']['aps_active'] == '1' ? true : false),
'ul_field' => $number_of_aps_packages_ul
)
)

View File

@@ -172,7 +172,7 @@ return array(
'type' => 'textul',
'value' => $result['email_quota'],
'maxlength' => 9,
'visible' => $settings['system']['mail_quota_enabled'],
'visible' => ($settings['system']['mail_quota_enabled'] == '1' ? true : false),
'mandatory' => true,
'ul_field' => $email_quota_ul
),
@@ -181,7 +181,7 @@ return array(
'type' => 'textul',
'value' => $result['email_autoresponder'],
'maxlength' => 9,
'visible' => $settings['autoresponder']['autoresponder_active'],
'visible' => ($settings['autoresponder']['autoresponder_active'] == '1' ? true : false),
'ul_field' => $email_autoresponder_ul
),
'email_imap' => array(
@@ -208,7 +208,7 @@ return array(
'type' => 'textul',
'value' => $result['tickets'],
'maxlength' => 9,
'visible' => $settings['ticket']['enabled'],
'visible' => ($settings['ticket']['enabled'] == '1' ? true : false),
'ul_field' => $tickets_ul
),
'mysqls' => array(
@@ -234,7 +234,7 @@ return array(
'type' => 'textul',
'value' => $result['aps_packages'],
'maxlength' => 9,
'visible' => $settings['aps']['aps_active'],
'visible' => ($settings['aps']['aps_active'] == '1' ? true : false),
'ul_field' => $number_of_aps_packages_ul
)
)

View File

@@ -26,7 +26,8 @@ return array(
'fields' => array(
'subdomain' => array(
'label' => $lng['domains']['domainname'],
'type' => 'text',
'type' => 'textul',
'ul_field' => '',
'has_nextto' => true
),
'domain' => array(
@@ -44,7 +45,8 @@ return array(
'label' => $lng['panel']['path'],
'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''),
'type' => $pathSelect['type'],
'select_var' => $pathSelect['value']
'select_var' => $pathSelect['value'],
'value' => $pathSelect['value']
),
'url' => array(
'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false),

View File

@@ -44,7 +44,8 @@ return array(
'label' => $lng['panel']['path'],
'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''),
'type' => $pathSelect['type'],
'select_var' => $pathSelect['value']
'select_var' => $pathSelect['value'],
'value' => $pathSelect['value']
),
'url' => array(
'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false),

View File

@@ -26,7 +26,8 @@ return array(
'fields' => array(
'email_part' => array(
'label' => $lng['emails']['emailaddress'],
'type' => 'text',
'type' => 'textul',
'ul_field' => '',
'has_nextto' => true
),
'domain' => array(

View File

@@ -34,14 +34,14 @@ return array(
'type' => 'password'
),
'email_quota' => array(
'visible' => $settings['system']['mail_quota_enabled'],
'visible' => ($settings['system']['mail_quota_enabled'] == '1' ? true : false),
'label' => $lng['emails']['quota'],
'desc' => $lng['panel']['megabyte'],
'type' => 'text',
'value' => $quota
),
'alternative_email' => array(
'visible' => $settings['panel']['sendalternativemail'],
'visible' => ($settings['panel']['sendalternativemail'] == '1' ? true : false),
'label' => $lng['emails']['alternative_emailaddress'],
'type' => 'text'
)

View File

@@ -0,0 +1,64 @@
<?php
/**
* This file is part of the Froxlor project.
* Copyright (c) 2010 the Froxlor Team (see authors).
*
* For the full copyright and license information, please view the COPYING
* file that was distributed with this source code. You can also view the
* COPYING file online at http://files.froxlor.org/misc/COPYING.txt
*
* @copyright (c) the authors
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Formfields
* @version $Id: formfield.domains_add.php 112 2010-12-14 12:11:20Z d00p $
*/
return array(
'autoresponder_add' => array(
'title' => $lng['autoresponder']['autoresponder_new'],
'image' => 'icons/autoresponder_add.png',
'sections' => array(
'section_a' => array(
'title' => $lng['autoresponder']['autoresponder_new'],
'image' => 'icons/autoresponder_add.png',
'fields' => array(
'account' => array(
'label' => $lng['autoresponder']['account'],
'type' => 'select',
'select_var' => $accounts,
),
'active' => array(
'label' => $lng['autoresponder']['active'],
'type' => 'yesno',
'yesno_var' => $isactive,
),
'date_from' => array(
'label' => $lng['autoresponder']['date_from'] . " (dd-mm-yyyy)",
'type' => 'textul',
'maxlength' => 10,
'ul_field' => $date_from_off,
),
'date_until' => array(
'label' => $lng['autoresponder']['date_until'] . " (dd-mm-yyyy)",
'type' => 'textul',
'maxlength' => 10,
'ul_field' => $date_until_off,
),
'subject' => array(
'label' => $lng['autoresponder']['subject'],
'type' => 'text',
),
'message' => array(
'style' => 'vertical-align:top;',
'label' => $lng['autoresponder']['message'],
'type' => 'textarea',
'cols' => 60,
'rows' => 12
)
)
)
)
)
);

View File

@@ -23,6 +23,7 @@ return array(
'section_a' => array(
'title' => $lng['emails']['emails_edit'],
'image' => 'icons/email_edit.png',
'nobuttons' => true,
'fields' => array(
'email_full' => array(
'label' => $lng['emails']['emailaddress'],

View File

@@ -0,0 +1,68 @@
<?php
/**
* This file is part of the Froxlor project.
* Copyright (c) 2010 the Froxlor Team (see authors).
*
* For the full copyright and license information, please view the COPYING
* file that was distributed with this source code. You can also view the
* COPYING file online at http://files.froxlor.org/misc/COPYING.txt
*
* @copyright (c) the authors
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Formfields
* @version $Id: formfield.domains_add.php 112 2010-12-14 12:11:20Z d00p $
*/
return array(
'autoresponder_edit' => array(
'title' => $lng['autoresponder']['autoresponder_edit'],
'image' => 'icons/autoresponder_edit.png',
'sections' => array(
'section_a' => array(
'title' => $lng['autoresponder']['autoresponder_edit'],
'image' => 'icons/autoresponder_edit.png',
'fields' => array(
'account' => array(
'label' => $lng['autoresponder']['account'],
'type' => 'label',
'value' => $email,
),
'active' => array(
'label' => $lng['autoresponder']['active'],
'type' => 'yesno',
'yesno_var' => $isactive,
),
'date_from' => array(
'label' => $lng['autoresponder']['date_from'] . " (dd-mm-yyyy)",
'type' => 'textul',
'maxlength' => 10,
'ul_field' => $date_from_off,
'value' => $date_from,
),
'date_until' => array(
'label' => $lng['autoresponder']['date_until'] . " (dd-mm-yyyy)",
'type' => 'textul',
'maxlength' => 10,
'ul_field' => $date_until_off,
'value' => $date_until,
),
'subject' => array(
'label' => $lng['autoresponder']['subject'],
'type' => 'text',
'value' => $subject
),
'message' => array(
'style' => 'vertical-align:top;',
'label' => $lng['autoresponder']['message'],
'type' => 'textarea',
'cols' => 60,
'rows' => 12,
'value' => $message,
)
)
)
)
)
);

Some files were not shown because too many files have changed in this diff Show More