Compare commits
29 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
10996c5bed | ||
|
|
fc712bde90 | ||
|
|
4e1433d861 | ||
|
|
4fc02e6c93 | ||
|
|
57c72d68a4 | ||
|
|
0230c6ac2b | ||
|
|
865f7036fd | ||
|
|
6825c5e0dc | ||
|
|
3e63b1aabb | ||
|
|
d6d19e7cb2 | ||
|
|
adeac9cce1 | ||
|
|
5a743b2005 | ||
|
|
dc1f33f494 | ||
|
|
e04ae041ab | ||
|
|
236377c28e | ||
|
|
687b28016e | ||
|
|
00edba1d0d | ||
|
|
207e9e1b43 | ||
|
|
0afbad5ff1 | ||
|
|
357e60c054 | ||
|
|
9d45759613 | ||
|
|
9503ae0ac5 | ||
|
|
97d20199fe | ||
|
|
d66d32066d | ||
|
|
13bde22344 | ||
|
|
fb430e55d2 | ||
|
|
5fde181fdc | ||
|
|
4da7b815f3 | ||
|
|
84e17ab91f |
@@ -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(
|
||||
|
||||
@@ -109,7 +109,15 @@ 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
|
||||
{
|
||||
@@ -231,13 +240,14 @@ if($action == "edit")
|
||||
$date_until = date('d-m-Y', $date_until);
|
||||
}
|
||||
$date_until_off = makecheckbox('date_until_off', $lng['panel']['not_activated'], '-1', false, $deactivated, true, true);
|
||||
|
||||
$isactive = makeyesno('active', '1', '0', $row['enabled']);
|
||||
|
||||
$checked = '';
|
||||
$autoresponder_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_editautoresponder.php';
|
||||
$autoresponder_edit_form = htmlform::genHTMLForm($autoresponder_edit_data);
|
||||
|
||||
if($row['enabled'] == 1)
|
||||
{
|
||||
$checked = "checked=\"checked\"";
|
||||
}
|
||||
$title = $autoresponder_edit_data['autoresponder_edit']['title'];
|
||||
$image = $autoresponder_edit_data['autoresponder_edit']['image'];
|
||||
|
||||
eval("echo \"" . getTemplate("email/autoresponder_edit") . "\";");
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
|
Before Width: | Height: | Size: 1011 B After Width: | Height: | Size: 1015 B |
BIN
images/Froxlor/icons/categories_big.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1015 B After Width: | Height: | Size: 1017 B |
BIN
images/Froxlor/icons/category_add_big.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1012 B After Width: | Height: | Size: 1009 B |
BIN
images/Froxlor/icons/category_edit_big.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
BIN
images/Froxlor/icons/domain_add_big.png
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.1 KiB |
BIN
images/Froxlor/icons/domain_edit_big.png
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
BIN
images/Froxlor/icons/domains_big.png
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 979 B |
BIN
images/Froxlor/icons/email_add_big.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 972 B |
BIN
images/Froxlor/icons/email_edit_big.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 950 B |
BIN
images/Froxlor/icons/emails_big.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
BIN
images/Froxlor/icons/group_edit_big.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 921 B After Width: | Height: | Size: 977 B |
|
Before Width: | Height: | Size: 987 B After Width: | Height: | Size: 987 B |
BIN
images/Froxlor/icons/htaccess_add_big.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
BIN
images/Froxlor/icons/htaccess_big.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 921 B After Width: | Height: | Size: 977 B |
|
Before Width: | Height: | Size: 987 B After Width: | Height: | Size: 987 B |
BIN
images/Froxlor/icons/htpasswd_add_big.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
BIN
images/Froxlor/icons/htpasswd_big.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 967 B After Width: | Height: | Size: 986 B |
BIN
images/Froxlor/icons/htpasswd_edit_big.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
BIN
images/Froxlor/icons/ipsports_add_big.png
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
BIN
images/Froxlor/icons/ipsports_big.png
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.1 KiB |
BIN
images/Froxlor/icons/ipsports_edit_big.png
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.1 KiB |
BIN
images/Froxlor/icons/mysql_add_big.png
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
BIN
images/Froxlor/icons/mysql_edit_big.png
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.1 KiB |
BIN
images/Froxlor/icons/mysqls_big.png
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 974 B |
|
Before Width: | Height: | Size: 948 B After Width: | Height: | Size: 984 B |
BIN
images/Froxlor/icons/phpsettings_add_big.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
BIN
images/Froxlor/icons/phpsettings_big.png
Normal file
|
After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 939 B After Width: | Height: | Size: 975 B |
BIN
images/Froxlor/icons/phpsettings_edit_big.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 1021 B |
BIN
images/Froxlor/icons/settings_big.png
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 1.1 KiB |
BIN
images/Froxlor/icons/syslog_big.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 988 B |
BIN
images/Froxlor/icons/syslog_truncate_big.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 505 B After Width: | Height: | Size: 986 B |
|
Before Width: | Height: | Size: 919 B After Width: | Height: | Size: 1003 B |
BIN
images/Froxlor/icons/templates_add_big.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
BIN
images/Froxlor/icons/templates_big.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 820 B After Width: | Height: | Size: 994 B |
BIN
images/Froxlor/icons/templates_edit_big.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1021 B After Width: | Height: | Size: 974 B |
BIN
images/Froxlor/icons/ticket_add_big.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1007 B After Width: | Height: | Size: 961 B |
BIN
images/Froxlor/icons/ticket_archive_big.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1011 B After Width: | Height: | Size: 986 B |
BIN
images/Froxlor/icons/ticket_archive_search_big.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
BIN
images/Froxlor/icons/ticket_new_big.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1005 B After Width: | Height: | Size: 973 B |
BIN
images/Froxlor/icons/ticket_reply_big.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1007 B After Width: | Height: | Size: 961 B |
BIN
images/Froxlor/icons/tickets_big.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
BIN
images/Froxlor/icons/traffic_big.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
BIN
images/Froxlor/icons/trash_big.png
Normal file
|
After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 978 B After Width: | Height: | Size: 969 B |
BIN
images/Froxlor/icons/user_add_big.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 953 B After Width: | Height: | Size: 996 B |
BIN
images/Froxlor/icons/user_edit_big.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
BIN
images/Froxlor/traffic_blue.gif
Normal file
|
After Width: | Height: | Size: 66 B |
BIN
images/Froxlor/traffic_green.gif
Normal file
|
After Width: | Height: | Size: 82 B |
BIN
images/Froxlor/traffic_red.gif
Normal file
|
After Width: | Height: | Size: 105 B |
BIN
images/Froxlor/traffic_yellow.gif
Normal file
|
After Width: | Height: | Size: 827 B |
@@ -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');
|
||||
|
||||
@@ -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>
|
||||
<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>
|
||||
<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>
|
||||
<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>
|
||||
|
||||
@@ -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');
|
||||
}
|
||||
|
||||
@@ -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(
|
||||
@@ -87,7 +92,12 @@ 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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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');
|
||||
|
||||
?>
|
||||
@@ -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
|
||||
)
|
||||
)
|
||||
|
||||
@@ -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
|
||||
)
|
||||
)
|
||||
|
||||
@@ -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
|
||||
)
|
||||
)
|
||||
|
||||
@@ -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
|
||||
)
|
||||
)
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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'
|
||||
)
|
||||
|
||||
@@ -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
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
);
|
||||
@@ -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'],
|
||||
|
||||
@@ -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,
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
);
|
||||