Commit f1634087 authored by Marius Cramer's avatar Marius Cramer
Browse files

Merge remote-tracking branch 'origin/stable-3.0.5'

Conflicts:
	interface/web/admin/lib/lang/se_remote_action.lng
	interface/web/admin/lib/lang/se_system_config.lng
	interface/web/dashboard/lib/lang/se_dashlet_limits.lng
	interface/web/mail/lib/lang/se_mail_domain.lng
	interface/web/monitor/lib/lang/se.lng
	interface/web/sites/lib/lang/se_web_aliasdomain.lng
	interface/web/sites/lib/lang/se_web_domain_list.lng
	interface/web/sites/lib/lang/se_web_subdomain.lng
	interface/web/sites/lib/lang/se_web_subdomain_list.lng
	interface/web/sites/lib/lang/se_web_vhost_domain.lng
	interface/web/sites/lib/lang/se_web_vhost_subdomain.lng
	interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng
	server/mods-available/rescue_core_module.inc.php
	server/plugins-available/cron_plugin.inc.php
parents 306c962f 1deddf54
......@@ -198,8 +198,10 @@ if($conf['services']['mail'] == true) {
$inst->configure_postfix('dont-create-certs');
//** Configure mailman
swriteln('Configuring Mailman');
$inst->configure_mailman('update');
if($conf['mailman']['installed'] == true) {
swriteln('Configuring Mailman');
$inst->configure_mailman('update');
}
//* Configure Jailkit
swriteln('Configuring Jailkit');
......
......@@ -405,7 +405,6 @@ class installer_dist extends installer_base {
'virtual_transport = lmtp:unix:private/dovecot-lmtp',
'smtpd_sasl_type = dovecot',
'smtpd_sasl_path = private/auth',
'receive_override_options = no_address_mappings'
);
// Make a backup copy of the main.cf file
......@@ -451,6 +450,8 @@ class installer_dist extends installer_base {
copy("$config_dir/$configfile", "$config_dir/$configfile~");
exec("chmod 400 $config_dir/$configfile~");
}
if(!@file_exists('/etc/dovecot-sql.conf')) exec('ln -s /etc/dovecot/dovecot-sql.conf /etc/dovecot-sql.conf');
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot-sql.conf.master', "tpl/fedora_dovecot-sql.conf.master");
$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
......@@ -463,7 +464,7 @@ class installer_dist extends installer_base {
exec("chown root:root $config_dir/$configfile");
// Dovecot shall ignore mounts in website directory
exec("doveadm mount add '/var/www/*' ignore");
if(is_installed('doveadm')) exec("doveadm mount add '/var/www/*' ignore > /dev/null 2> /dev/null");
}
......@@ -1227,6 +1228,9 @@ class installer_dist extends installer_base {
//* Remove Domain module as its functions are available in the client module now
if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
// Add symlink for patch tool
if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
}
......
......@@ -1103,6 +1103,9 @@ class installer extends installer_base
//* Remove Domain module as its functions are available in the client module now
if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
// Add symlink for patch tool
if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
}
......
......@@ -456,7 +456,6 @@ class installer_dist extends installer_base {
'virtual_transport = lmtp:unix:private/dovecot-lmtp',
'smtpd_sasl_type = dovecot',
'smtpd_sasl_path = private/auth',
'receive_override_options = no_address_mappings'
);
// Make a backup copy of the main.cf file
......@@ -514,7 +513,7 @@ class installer_dist extends installer_base {
exec("chown root:root $config_dir/$configfile");
// Dovecot shall ignore mounts in website directory
exec("doveadm mount add '/srv/www/*' ignore");
if(is_installed('doveadm')) exec("doveadm mount add '/srv/www/*' ignore > /dev/null 2> /dev/null");
}
......@@ -1299,6 +1298,9 @@ class installer_dist extends installer_base {
//* Remove Domain module as its functions are available in the client module now
if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
// Add symlink for patch tool
if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
}
......
......@@ -191,7 +191,9 @@ if($install_mode == 'standard') {
$inst->configure_postfix();
//* Configure Mailman
$inst->configure_mailman('install');
if($conf['mailman']['installed'] == true) {
$inst->configure_mailman('install');
}
//* Configure jailkit
swriteln('Configuring Jailkit');
......
......@@ -699,7 +699,7 @@ class installer_base {
if(!is_user($cf['vmail_username'])) caselog("$command &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
//* These postconf commands will be executed on installation and update
$server_ini_rec = $this->db->queryOneRecord("SELECT config FROM server WHERE server_id = ".$conf['server_id']);
$server_ini_rec = $this->db->queryOneRecord("SELECT config FROM `" . $this->db->quote($conf["mysql"]["database"]) . "`.`server` WHERE server_id = ".$conf['server_id']);
$server_ini_array = ini_to_array(stripslashes($server_ini_rec['config']));
unset($server_ini_rec);
......@@ -2144,7 +2144,8 @@ class installer_base {
replaceLine('/etc/default/rkhunter', 'CRON_DB_UPDATE="yes"', 'CRON_DB_UPDATE="no"', 1, 0);
}
// Add symlink for patch tool
if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
}
......
......@@ -49,7 +49,7 @@ ALTER TABLE `dns_rr`
CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
CHANGE `zone` `zone` int(11) unsigned NOT NULL DEFAULT '0',
CHANGE `name` `name` varchar(64) NOT NULL DEFAULT '',
CHANGE `name` `name` varchar(255) NOT NULL DEFAULT '',
CHANGE `data` `data` varchar(255) NOT NULL DEFAULT '';
ALTER TABLE `dns_slave`
......
ALTER TABLE `dns_rr` CHANGE `name` `name` varchar(255) NOT NULL DEFAULT '';
\ No newline at end of file
......@@ -447,7 +447,7 @@ CREATE TABLE `dns_rr` (
`sys_perm_other` varchar(5) NOT NULL DEFAULT '',
`server_id` int(11) NOT NULL default '1',
`zone` int(11) unsigned NOT NULL DEFAULT '0',
`name` varchar(64) NOT NULL DEFAULT '',
`name` varchar(255) NOT NULL DEFAULT '',
`type` enum('A','AAAA','ALIAS','CNAME','HINFO','MX','NAPTR','NS','PTR','RP','SRV','TXT') default NULL,
`data` varchar(255) NOT NULL DEFAULT '',
`aux` int(11) unsigned NOT NULL default '0',
......
......@@ -5,7 +5,7 @@ server {
root {apps_vhost_dir};
client_max_body_size 20M;
client_max_body_size 100M;
location / {
index index.php index.html;
......
......@@ -262,8 +262,10 @@ if($reconfigure_services_answer == 'yes') {
$inst->configure_postfix('dont-create-certs');
//** Configure mailman
swriteln('Configuring Mailman');
$inst->configure_mailman('update');
if($conf['mailman']['installed'] == true) {
swriteln('Configuring Mailman');
$inst->configure_mailman('update');
}
//* Configure Jailkit
swriteln('Configuring Jailkit');
......
......@@ -38,19 +38,27 @@ class validate_password {
return 1;
}
$different = 0;
if (preg_match('/[abcdefghijklnmopqrstuvwxyz]/', $password)) {
$different += 1;
}
if (preg_match('/[ABCDEFGHIJKLNMOPQRSTUVWXYZ]/', $password)) {
$points += 1;
$different += 1;
}
if (preg_match('/[0123456789]/', $password)) {
$points += 1;
$different += 1;
}
if (preg_match('/[`~!@#$%^&*()_+|\\=-[]}{\';:\/?.>,<" ]/', $password)) {
$points += 1;
$different += 1;
}
if ($points == 0) {
if ($points == 0 || $different < 3) {
if ($length >= 5 && $length <= 6) {
return 1;
} else if ($length >= 7 && $length <= 8) {
......
......@@ -16,135 +16,136 @@ $wb['error_1003'] = 'Detta användarnamn är deaktiverat!';
$wb['delete_confirmation'] = 'Vill du verkligen ta bort detta inlägg?';
$wb['error_no_view_permission'] = 'Du har ej behörighet att se detta inlägg eller så existerar den ej!';
$wb['error_no_delete_permission'] = 'Du har ej behörighet att ta bort detta inlägg!';
$wb['page_txt'] = 'Page';
$wb['page_of_txt'] = 'of';
$wb['page_next_txt'] = 'Next';
$wb['page_back_txt'] = 'Back';
$wb['delete_txt'] = 'Delete';
$wb['page_txt'] = 'Sida';
$wb['page_of_txt'] = 'av';
$wb['page_next_txt'] = 'Nästa';
$wb['page_back_txt'] = 'Tillbaka';
$wb['delete_txt'] = 'Radera';
$wb['filter_txt'] = 'Filter';
$wb['add_new_record_txt'] = 'Add new record';
$wb['btn_save_txt'] = 'Save';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['toolsarea_head_txt'] = 'Tools';
$wb['page_and_txt'] = 'and';
$wb['add_new_record_txt'] = 'Lägg till nytt inlägg';
$wb['btn_save_txt'] = 'Spara';
$wb['btn_cancel_txt'] = 'Avbryt';
$wb['toolsarea_head_txt'] = 'Verktyg';
$wb['page_and_txt'] = 'och';
$wb['top_menu_system'] = 'System';
$wb['top_menu_client'] = 'Client';
$wb['top_menu_email'] = 'Email';
$wb['top_menu_monitor'] = 'Monitor';
$wb['top_menu_sites'] = 'Sites';
$wb['top_menu_client'] = 'Kund';
$wb['top_menu_email'] = 'Epost';
$wb['top_menu_monitor'] = 'Övervakning';
$wb['top_menu_sites'] = 'Sajter';
$wb['top_menu_dns'] = 'DNS';
$wb['top_menu_tools'] = 'Tools';
$wb['top_menu_help'] = 'Help';
$wb['top_menu_billing'] = 'Billing';
$wb['top_menu_domain'] = 'Domains';
$wb['top_menu_dashboard'] = 'Home';
$wb['latest_news_txt'] = 'Latest news';
$wb['top_menu_tools'] = 'Verktyg';
$wb['top_menu_help'] = 'Hlp';
$wb['top_menu_billing'] = 'Fakturering';
$wb['top_menu_domain'] = 'Domäner';
$wb['top_menu_dashboard'] = 'Hem';
$wb['latest_news_txt'] = 'Senaste nytt';
$wb['top_menu_vm'] = 'VServer';
$wb['daynamesmin_su'] = 'Su';
$wb['daynamesmin_mo'] = 'Mo';
$wb['daynamesmin_tu'] = 'Tu';
$wb['daynamesmin_we'] = 'We';
$wb['daynamesmin_th'] = 'Th';
$wb['daynamesmin_su'] = 'Sö';
$wb['daynamesmin_mo'] = 'Må';
$wb['daynamesmin_tu'] = 'Ti';
$wb['daynamesmin_we'] = 'On';
$wb['daynamesmin_th'] = 'To';
$wb['daynamesmin_fr'] = 'Fr';
$wb['daynamesmin_sa'] = 'Sa';
$wb['daynames_sunday'] = 'Sunday';
$wb['daynames_monday'] = 'Monday';
$wb['daynames_tuesday'] = 'Tuesday';
$wb['daynames_wednesday'] = 'Wednesday';
$wb['daynames_thursday'] = 'Thursday';
$wb['daynames_friday'] = 'Friday';
$wb['daynames_saturday'] = 'Saturday';
$wb['daynamesmin_sa'] = '';
$wb['daynames_sunday'] = 'Söndag';
$wb['daynames_monday'] = 'Måndag';
$wb['daynames_tuesday'] = 'Tisdag';
$wb['daynames_wednesday'] = 'Onsdag';
$wb['daynames_thursday'] = 'Torsdag';
$wb['daynames_friday'] = 'Fredag';
$wb['daynames_saturday'] = 'rdag';
$wb['monthnamesshort_jan'] = 'Jan';
$wb['monthnamesshort_feb'] = 'Feb';
$wb['monthnamesshort_mar'] = 'Mar';
$wb['monthnamesshort_apr'] = 'Apr';
$wb['monthnamesshort_may'] = 'May';
$wb['monthnamesshort_may'] = 'Maj';
$wb['monthnamesshort_jun'] = 'Jun';
$wb['monthnamesshort_jul'] = 'Jul';
$wb['monthnamesshort_aug'] = 'Aug';
$wb['monthnamesshort_sep'] = 'Sep';
$wb['monthnamesshort_oct'] = 'Oct';
$wb['monthnamesshort_oct'] = 'Okt';
$wb['monthnamesshort_nov'] = 'Nov';
$wb['monthnamesshort_dec'] = 'Dec';
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
$wb['logout_txt'] = 'Logout';
$wb['datepicker_nextText'] = 'Nästa';
$wb['datepicker_prevText'] = 'Föreg.';
$wb['logout_txt'] = 'Logga ut';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
$wb['submit_confirmation'] = 'Do you really want to perform this action?';
$wb['top_menu_mailuser'] = 'Mailuser';
$wb['globalsearch_resultslimit_of_txt'] = 'of';
$wb['globalsearch_resultslimit_results_txt'] = 'results';
$wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
$wb['submit_confirmation'] = 'Är du säker på att du vill utföra detta?';
$wb['top_menu_mailuser'] = 'Epostanvändare';
$wb['globalsearch_resultslimit_of_txt'] = 'av';
$wb['globalsearch_resultslimit_results_txt'] = 'resultat';
$wb['globalsearch_noresults_text_txt'] = 'Inga resultat.';
$wb['globalsearch_noresults_limit_txt'] = '0 resultat';
$wb['globalsearch_searchfield_watermark_txt'] = 'Sök';
$wb['globalsearch_suggestions_text_txt'] = 'Förslag';
$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
$wb['datalog_status_i_web_database'] = 'Create new database';
$wb['datalog_status_u_web_database'] = 'Update database';
$wb['datalog_status_d_web_database'] = 'Delete database';
$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
$wb['datalog_status_u_web_database_user'] = 'Update database user';
$wb['datalog_status_d_web_database_user'] = 'Delete database user';
$wb['datalog_status_i_web_domain'] = 'Create new website';
$wb['datalog_status_u_web_domain'] = 'Update website settings';
$wb['datalog_status_d_web_domain'] = 'Delete website';
$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
$wb['datalog_status_i_mail_domain'] = 'Create email domain';
$wb['datalog_status_u_mail_domain'] = 'Update email domain';
$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
$wb['datalog_status_i_mail_user'] = 'Create email user';
$wb['datalog_status_u_mail_user'] = 'Update email user';
$wb['datalog_status_d_mail_user'] = 'Delete email user';
$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
$wb['datalog_status_i_cron'] = 'Create cron job';
$wb['datalog_status_u_cron'] = 'Update cron job';
$wb['datalog_status_d_cron'] = 'Delete cron job';
$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
$wb['datalog_status_i_shell_user'] = 'Create shell user';
$wb['datalog_status_u_shell_user'] = 'Update shell user';
$wb['datalog_status_d_shell_user'] = 'Delete shell user';
$wb['datalog_status_i_web_folder'] = 'Create folder protection';
$wb['datalog_status_u_web_folder'] = 'Update folder protection';
$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
$wb['datalog_status_i_web_database'] = 'Skapa ny databas';
$wb['datalog_status_u_web_database'] = 'Uppdatera databas';
$wb['datalog_status_d_web_database'] = 'Radera databas';
$wb['datalog_status_i_web_database_user'] = 'Skapa databasanvändare för databas';
$wb['datalog_status_u_web_database_user'] = 'Uppdatera databasanvändare';
$wb['datalog_status_d_web_database_user'] = 'Radera databasanvändare';
$wb['datalog_status_i_web_domain'] = 'Skapa ny webbsida';
$wb['datalog_status_u_web_domain'] = 'Uppdatera webbsideinställningar';
$wb['datalog_status_d_web_domain'] = 'Radera webbsida';
$wb['datalog_status_i_ftp_user'] = 'Skapa FTP-användare';
$wb['datalog_status_u_ftp_user'] = 'Uppdatera FTP-användare';
$wb['datalog_status_d_ftp_user'] = 'Radera FTP-användare';
$wb['datalog_status_i_mail_domain'] = 'Skapa epostdomän';
$wb['datalog_status_u_mail_domain'] = 'Uppdatera epostdomän';
$wb['datalog_status_d_mail_domain'] = 'Radera epostdomän';
$wb['datalog_status_i_mail_user'] = 'Skapa epostanvändare';
$wb['datalog_status_u_mail_user'] = 'Uppdatera epostanvändare';
$wb['datalog_status_d_mail_user'] = 'Radera epostanvändare';
$wb['datalog_status_i_mail_forwarding'] = 'Skapa epostadress';
$wb['datalog_status_u_mail_forwarding'] = 'Uppdatera epostadress';
$wb['datalog_status_d_mail_forwarding'] = 'Radera epostadress';
$wb['datalog_status_i_dns_rr'] = 'Skapa DNS-inlägg';
$wb['datalog_status_u_dns_rr'] = 'Radera DNS-inlägg';
$wb['datalog_status_d_dns_rr'] = 'Radera DNS-inlägg';
$wb['datalog_status_i_dns_soa'] = 'Skapa DNS-zon';
$wb['datalog_status_u_dns_soa'] = 'Uppdatera DNS-zon';
$wb['datalog_status_d_dns_soa'] = 'Radera DNS-zon';
$wb['datalog_status_i_cron'] = 'Skapa cron-jobb';
$wb['datalog_status_u_cron'] = 'Uppdatera cron-jobb';
$wb['datalog_status_d_cron'] = 'Radera cron-jobb';
$wb['datalog_status_i_mail_get'] = 'Skapa eposthämtarkonto';
$wb['datalog_status_u_mail_get'] = 'Uppdatera eposthämtarkonto';
$wb['datalog_status_d_mail_get'] = 'Rarera eposthämtarkonto';
$wb['datalog_status_i_mail_mailinglist'] = 'Skapa mailinglista';
$wb['datalog_status_u_mail_mailinglist'] = 'Uppdatera mailinglista';
$wb['datalog_status_d_mail_mailinglist'] = 'Radera mailinglista';
$wb['datalog_status_i_shell_user'] = 'Skapa shell-användare';
$wb['datalog_status_u_shell_user'] = 'Uppdatera shell-användare';
$wb['datalog_status_d_shell_user'] = 'Radera shell-användare';
$wb['datalog_status_i_web_folder'] = 'Skapp katalogskydd';
$wb['datalog_status_u_web_folder'] = 'Uppdatera katalogskydd';
$wb['datalog_status_d_web_folder'] = 'Radera katalogskydd';
$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
$wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings';
$wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings';
$wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings';
$wb['login_as_txt'] = 'Log in as';
$wb['no_domain_perm'] = 'You have no permission for this domain.';
$wb['datalog_status_i_spamfilter_users'] = 'Skapa spamfilterinställningar';
$wb['datalog_status_u_spamfilter_users'] = 'Uppdatera spamfilterinställningar';
$wb['datalog_status_d_spamfilter_users'] = 'Radera spamfilterinställningar';
$wb['login_as_txt'] = 'Logga in som';
$wb['no_domain_perm'] = 'Du har ingen behörighet för denna domän';
$wb['no_destination_perm'] = 'You have no permission for this destination.';
$wb['client_you_are_locked'] = 'You have no permission to change any settings.';
$wb['gender_m_txt'] = 'Mr.';
$wb['gender_f_txt'] = 'Ms.';
$wb['client_you_are_locked'] = 'Du har inte behörighet att ändra inställningar.';
$wb['gender_m_txt'] = 'Herr';
$wb['gender_f_txt'] = 'Fru';
$wb['client_cannot_be_deleted_because_of_billing_module_txt'] = 'This client has records in the billing module, therefore he cannot be deleted.';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
$wb['None'] = 'None';
$wb['strength_1'] = 'Weak';
$wb['strength_2'] = 'Fair';
$wb['strength_3'] = 'Good';
$wb['strength_4'] = 'Strong';
$wb['strength_5'] = 'Very Strong';
$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
$wb['yes_txt'] = 'Ja';
$wb['no_txt'] = 'Nej';
$wb['None'] = 'Ingen';
$wb['strength_1'] = 'Svag';
$wb['strength_2'] = 'Sådär';
$wb['strength_3'] = 'Bra';
$wb['strength_4'] = 'Starkt';
$wb['strength_5'] = 'Väldigt starkt';
$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of "{strength}".';
$wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
?>
......@@ -62,7 +62,7 @@ $form["tabs"]['sites'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
'regex' => '/^[a-zA-Z0-9\-\_\[\]]{0,50}$/',
'errmsg'=> 'dbname_prefix_error_regex'),
),
'default' => '',
......@@ -74,7 +74,7 @@ $form["tabs"]['sites'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
'regex' => '/^[a-zA-Z0-9\-\_\[\]]{0,50}$/',
'errmsg'=> 'dbuser_prefix_error_regex'),
),
'default' => '',
......@@ -86,7 +86,7 @@ $form["tabs"]['sites'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
'regex' => '/^[a-zA-Z0-9\-\_\[\]]{0,50}$/',
'errmsg'=> 'ftpuser_prefix_error_regex'),
),
'default' => '',
......@@ -98,7 +98,7 @@ $form["tabs"]['sites'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
'regex' => '/^[a-zA-Z0-9\-\_\[\]]{0,50}$/',
'errmsg'=> 'shelluser_prefix_error_regex'),
),
'default' => '',
......@@ -110,7 +110,7 @@ $form["tabs"]['sites'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
'regex' => '/^[a-zA-Z0-9\-\_\[\]]{0,50}$/',
'errmsg'=> 'webdavuser_prefix_error_regex'),
),
'default' => '',
......
......@@ -67,7 +67,7 @@ $wb['customer_no_template_error_regex_txt'] = 'Die Kundennummer-Vorlage enthält
$wb['customer_no_start_txt'] = 'Kundennummer Startwert';
$wb['customer_no_counter_txt'] = 'Kundennummer Zähler';
$wb['session_timeout_txt'] = 'Session-Timeout (Minuten)';
$wb['session_allow_endless_txt'] = '\\"Eingeloggt bleiben\\" aktivieren';
$wb['session_allow_endless_txt'] = '&quot;Eingeloggt bleiben&quot; aktivieren';
$wb['No'] = 'Nein';
$wb['min_password_length_txt'] = 'Minimale Passwortlänge';
$wb['min_password_strength_txt'] = 'Minimale Passwortstärke';
......
<?php
$wb['1001'] = 'Username or password is empty.';
$wb['1002'] = 'Username or password is wrong.';
$wb['Groups'] = 'Groups';
$wb['groups_description'] = 'Form to edit systemuser groups.';
$wb['Servers'] = 'Servers';
$wb['Config'] = 'Config';
$wb['Add user'] = 'Add user';
$wb['Edit user'] = 'Edit user';
$wb['Add group'] = 'Add group';
$wb['Edit group'] = 'Edit group';
$wb['Edit server'] = 'Edit server';
$wb['Sync. Now'] = 'Sync. Now';
$wb['DB Sync.'] = 'DB Sync.';
$wb['User Management'] = 'User Management';
$wb['CP Users'] = 'CP Users';
$wb['Remote Users'] = 'Remote Users';
$wb['1001'] = 'Användarnamn eller lösenord är fel.';
$wb['1002'] = 'Användarnamn eller lösenord är fel.';
$wb['Groups'] = 'Grupper';
$wb['groups_description'] = 'Formulär för att redigera systemanvändargrupper.';
$wb['Servers'] = 'Servrar';
$wb['Config'] = 'Konfiguration';
$wb['Add user'] = 'Lägg till användare';
$wb['Edit user'] = 'Redigera användare';
$wb['Add group'] = 'Lägg till grupp';
$wb['Edit group'] = 'Redigera grupp';
$wb['Edit server'] = 'Redigera server';
$wb['Sync. Now'] = 'Synka nu';
$wb['DB Sync.'] = 'DB-synk.';
$wb['User Management'] = 'Användarhantering';
$wb['CP Users'] = 'Kontrollpanelanvändare';
$wb['Remote Users'] = 'Fjärranvändare';
$wb['System'] = 'System';
$wb['Server Services'] = 'Server Services';
$wb['Services'] = 'Services';
$wb['Server Config'] = 'Server Config';
$wb['Server Services'] = 'Servertjänster';
$wb['Services'] = 'Tjänster';
$wb['Server Config'] = 'Serverkonfiguration';
$wb['Server'] = 'Server';
$wb['Mail'] = 'Mail';
$wb['Mail'] = 'Epost';
$wb['Getmail'] = 'Getmail';
$wb['Web'] = 'Web';
$wb['Web'] = 'Webb';
$wb['FastCGI'] = 'FastCGI';
$wb['Jailkit'] = 'Jailkit';
$wb['Rescue'] = 'Rescue';
$wb['Server IP addresses'] = 'Server IP addresses';
$wb['Additional PHP Versions'] = 'Additional PHP Versions';
$wb['Firewall'] = 'Firewall';
$wb['Interface'] = 'Interface';
$wb['Interface Config'] = 'Main Config';
$wb['Domains'] = 'Domains';
$wb['Misc'] = 'Misc';
$wb['Software'] = 'Apps & Addons';
$wb['Repositories'] = 'Repositories';
$wb['Packages'] = 'Packages';
$wb['Updates'] = 'Updates';
$wb['Language Editor'] = 'Language Editor';
$wb['Languages'] = 'Languages';
$wb['New Language'] = 'New Language';
$wb['Merge'] = 'Merge';
$wb['Export'] = 'Export';
$wb['Import'] = 'Import';
$wb['Remote Actions'] = 'Remote Actions';
$wb['Do OS-Update'] = 'Do OS-Update';
$wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
$wb['Rescue'] = 'Bevakning';
$wb['Server IP addresses'] = 'Server IP-adresser';
$wb['Additional PHP Versions'] = 'Ytterligare PHP-versioner';
$wb['Firewall'] = 'Brandvägg';
$wb['Interface'] = 'Gränssnitt';
$wb['Interface Config'] = 'Huvudkonfiguration';
$wb['Domains'] = 'Domäner';
$wb['Misc'] = 'Blandat';
$wb['Software'] = 'Appar och tillägg';
$wb['Repositories'] = 'Bibliotek';
$wb['Packages'] = 'Paket';
$wb['Updates'] = 'Uppdateringar';
$wb['Language Editor'] = 'Språkredigerare';
$wb['Languages'] = 'Språk';
$wb['New Language'] = 'Nytt språk';
$wb['Merge'] = 'Slå ihop';