From 4bd960b10d9f32cb8a82a0718caaa005768c107c Mon Sep 17 00:00:00 2001 From: tbrehm Date: Wed, 24 Oct 2012 10:07:53 +0000 Subject: [PATCH] Merged revisions 3557-3594 from 3.0.5 stable branch. --- install/sql/incremental/upd_0043.sql | 7 + install/sql/ispconfig3.sql | 5 + .../lib/classes/aps_guicontroller.inc.php | 6 +- interface/lib/classes/remoting.inc.php | 7 + interface/lib/classes/remoting_lib.inc.php | 14 +- interface/lib/classes/tform.inc.php | 9 +- interface/lib/lang/de.lng | 163 ++++----- interface/web/admin/form/users.tform.php | 2 +- interface/web/admin/lib/lang/de.lng | 97 ++--- .../admin/lib/lang/de_directive_snippets.lng | 15 +- .../lib/lang/de_directive_snippets_list.lng | 1 + interface/web/admin/lib/lang/de_firewall.lng | 1 + .../web/admin/lib/lang/de_firewall_list.lng | 13 +- interface/web/admin/lib/lang/de_groups.lng | 1 + .../web/admin/lib/lang/de_groups_list.lng | 1 + interface/web/admin/lib/lang/de_iptables.lng | 23 +- .../web/admin/lib/lang/de_iptables_list.lng | 27 +- .../web/admin/lib/lang/de_language_add.lng | 1 + .../admin/lib/lang/de_language_complete.lng | 1 + .../web/admin/lib/lang/de_language_edit.lng | 1 + .../web/admin/lib/lang/de_language_export.lng | 1 + .../web/admin/lib/lang/de_language_import.lng | 1 + .../web/admin/lib/lang/de_language_list.lng | 1 + .../web/admin/lib/lang/de_package_install.lng | 1 + .../web/admin/lib/lang/de_remote_action.lng | 1 + .../web/admin/lib/lang/de_remote_user.lng | 91 ++--- .../admin/lib/lang/de_remote_user_list.lng | 11 +- interface/web/admin/lib/lang/de_server.lng | 27 +- .../web/admin/lib/lang/de_server_config.lng | 343 +++++++++--------- .../admin/lib/lang/de_server_config_list.lng | 1 + interface/web/admin/lib/lang/de_server_ip.lng | 1 + .../web/admin/lib/lang/de_server_ip_list.lng | 17 +- .../web/admin/lib/lang/de_server_list.lng | 1 + .../web/admin/lib/lang/de_server_php.lng | 29 +- .../web/admin/lib/lang/de_server_php_list.lng | 11 +- .../lib/lang/de_software_package_install.lng | 1 + .../lib/lang/de_software_package_list.lng | 17 +- .../web/admin/lib/lang/de_software_repo.lng | 1 + .../admin/lib/lang/de_software_repo_list.lng | 1 + .../lib/lang/de_software_update_list.lng | 1 + .../web/admin/lib/lang/de_system_config.lng | 85 ++--- .../admin/lib/lang/de_tpl_default_admin.lng | 33 +- interface/web/admin/lib/lang/de_users.lng | 1 + .../web/admin/lib/lang/de_users_list.lng | 1 + .../web/admin/lib/menu.d/tpl_default.menu.php | 3 +- interface/web/client/form/client.tform.php | 6 +- interface/web/client/form/reseller.tform.php | 6 +- interface/web/client/lib/lang/de.lng | 1 + interface/web/client/lib/lang/de_client.lng | 275 +++++++------- .../web/client/lib/lang/de_client_circle.lng | 1 + .../client/lib/lang/de_client_circle_list.lng | 1 + .../web/client/lib/lang/de_client_del.lng | 1 + .../web/client/lib/lang/de_client_message.lng | 1 + .../client/lib/lang/de_client_template.lng | 171 ++++----- .../lib/lang/de_client_template_list.lng | 1 + .../web/client/lib/lang/de_clients_list.lng | 1 + interface/web/client/lib/lang/de_domain.lng | 1 + .../web/client/lib/lang/de_domain_list.lng | 1 + interface/web/client/lib/lang/de_reseller.lng | 261 ++++++------- .../web/client/lib/lang/de_resellers_list.lng | 1 + interface/web/client/lib/lang/en_client.lng | 1 + interface/web/client/lib/lang/en_reseller.lng | 1 + interface/web/client/lib/module.conf.php | 2 + interface/web/dashboard/lib/lang/de.lng | 1 + .../dashboard/lib/lang/de_dashlet_limits.lng | 57 +-- .../dashboard/lib/lang/de_dashlet_modules.lng | 1 + interface/web/designer/lib/lang/de.lng | 1 + .../web/designer/lib/lang/de_form_edit.lng | 1 + .../web/designer/lib/lang/de_form_list.lng | 1 + .../web/designer/lib/lang/de_form_show.lng | 1 + .../web/designer/lib/lang/de_module_edit.lng | 1 + .../web/designer/lib/lang/de_module_list.lng | 1 + .../designer/lib/lang/de_module_nav_edit.lng | 1 + .../lib/lang/de_module_nav_item_edit.lng | 1 + .../web/designer/lib/lang/de_module_show.lng | 1 + interface/web/dns/form/dns_soa.tform.php | 8 +- interface/web/dns/lib/lang/de.lng | 1 + interface/web/dns/lib/lang/de_dns_a.lng | 1 + interface/web/dns/lib/lang/de_dns_a_list.lng | 1 + interface/web/dns/lib/lang/de_dns_aaaa.lng | 1 + interface/web/dns/lib/lang/de_dns_alias.lng | 1 + interface/web/dns/lib/lang/de_dns_cname.lng | 1 + interface/web/dns/lib/lang/de_dns_hinfo.lng | 1 + interface/web/dns/lib/lang/de_dns_import.lng | 1 + interface/web/dns/lib/lang/de_dns_mx.lng | 1 + interface/web/dns/lib/lang/de_dns_ns.lng | 1 + interface/web/dns/lib/lang/de_dns_ptr.lng | 1 + interface/web/dns/lib/lang/de_dns_rp.lng | 1 + interface/web/dns/lib/lang/de_dns_slave.lng | 1 + .../web/dns/lib/lang/de_dns_slave_list.lng | 1 + interface/web/dns/lib/lang/de_dns_soa.lng | 1 + .../web/dns/lib/lang/de_dns_soa_list.lng | 1 + interface/web/dns/lib/lang/de_dns_srv.lng | 1 + .../web/dns/lib/lang/de_dns_template.lng | 1 + .../web/dns/lib/lang/de_dns_template_list.lng | 1 + interface/web/dns/lib/lang/de_dns_txt.lng | 1 + interface/web/dns/lib/lang/de_dns_wizard.lng | 1 + interface/web/help/lib/lang/de.lng | 1 + interface/web/help/lib/lang/de_faq_form.lng | 1 + .../lib/lang/de_faq_manage_questions_list.lng | 1 + .../help/lib/lang/de_faq_sections_form.lng | 1 + .../web/help/lib/lang/de_help_faq_list.lng | 1 + .../lib/lang/de_help_faq_sections_list.lng | 1 + .../web/help/lib/lang/de_support_message.lng | 1 + .../help/lib/lang/de_support_message_list.lng | 1 + interface/web/js/jquery.tipsy.js | 42 ++- interface/web/js/uni-form/uni-form.jquery.js | 1 + interface/web/login/lib/lang/de.lng | 1 + interface/web/mail/lib/lang/de.lng | 92 ++--- interface/web/mail/lib/lang/de_mail_alias.lng | 25 +- .../web/mail/lib/lang/de_mail_alias_list.lng | 1 + .../web/mail/lib/lang/de_mail_aliasdomain.lng | 19 +- .../lib/lang/de_mail_aliasdomain_list.lng | 11 +- .../web/mail/lib/lang/de_mail_blacklist.lng | 15 +- .../mail/lib/lang/de_mail_blacklist_list.lng | 1 + .../mail/lib/lang/de_mail_content_filter.lng | 1 + .../lib/lang/de_mail_content_filter_list.lng | 1 + .../web/mail/lib/lang/de_mail_domain.lng | 23 +- .../lib/lang/de_mail_domain_admin_list.lng | 13 +- .../mail/lib/lang/de_mail_domain_catchall.lng | 19 +- .../lib/lang/de_mail_domain_catchall_list.lng | 1 + .../web/mail/lib/lang/de_mail_domain_list.lng | 11 +- .../web/mail/lib/lang/de_mail_forward.lng | 15 +- .../mail/lib/lang/de_mail_forward_list.lng | 1 + interface/web/mail/lib/lang/de_mail_get.lng | 33 +- .../web/mail/lib/lang/de_mail_get_list.lng | 15 +- .../web/mail/lib/lang/de_mail_mailinglist.lng | 1 + .../lib/lang/de_mail_mailinglist_list.lng | 1 + .../mail/lib/lang/de_mail_relay_recipient.lng | 15 +- .../lib/lang/de_mail_relay_recipient_list.lng | 1 + .../web/mail/lib/lang/de_mail_spamfilter.lng | 31 +- .../mail/lib/lang/de_mail_spamfilter_list.lng | 1 + .../web/mail/lib/lang/de_mail_transport.lng | 19 +- .../mail/lib/lang/de_mail_transport_list.lng | 15 +- interface/web/mail/lib/lang/de_mail_user.lng | 97 ++--- .../web/mail/lib/lang/de_mail_user_filter.lng | 37 +- .../lib/lang/de_mail_user_filter_list.lng | 1 + .../web/mail/lib/lang/de_mail_user_list.lng | 13 +- .../mail/lib/lang/de_mail_user_stats_list.lng | 13 +- .../web/mail/lib/lang/de_mail_whitelist.lng | 15 +- .../mail/lib/lang/de_mail_whitelist_list.lng | 1 + .../mail/lib/lang/de_spamfilter_blacklist.lng | 1 + .../lib/lang/de_spamfilter_blacklist_list.lng | 1 + .../mail/lib/lang/de_spamfilter_config.lng | 37 +- .../lib/lang/de_spamfilter_config_list.lng | 1 + .../mail/lib/lang/de_spamfilter_policy.lng | 73 ++-- .../lib/lang/de_spamfilter_policy_list.lng | 1 + .../web/mail/lib/lang/de_spamfilter_users.lng | 13 +- .../lib/lang/de_spamfilter_users_list.lng | 1 + .../mail/lib/lang/de_spamfilter_whitelist.lng | 15 +- .../lib/lang/de_spamfilter_whitelist_list.lng | 1 + .../lib/lang/de_user_quota_stats_list.lng | 11 +- interface/web/mail/mail_domain_edit.php | 6 +- interface/web/mailuser/lib/lang/de.lng | 1 + interface/web/mailuser/lib/lang/de_index.lng | 21 +- .../lib/lang/de_mail_user_autoresponder.lng | 1 + .../web/mailuser/lib/lang/de_mail_user_cc.lng | 1 + .../mailuser/lib/lang/de_mail_user_filter.lng | 37 +- .../lib/lang/de_mail_user_filter_list.lng | 1 + .../lib/lang/de_mail_user_password.lng | 17 +- .../lib/lang/de_mail_user_spamfilter.lng | 1 + interface/web/monitor/lib/lang/de.lng | 295 +++++++-------- .../web/monitor/lib/lang/de_datalog_list.lng | 1 + interface/web/sites/aps_do_operation.php | 6 +- interface/web/sites/database_user_edit.php | 4 +- .../web/sites/form/web_aliasdomain.tform.php | 2 +- interface/web/sites/form/web_domain.tform.php | 2 +- .../web/sites/form/web_subdomain.tform.php | 2 +- .../sites/form/web_vhost_subdomain.tform.php | 2 +- interface/web/sites/lib/lang/de.lng | 63 ++-- interface/web/sites/lib/lang/de_aps.lng | 3 +- .../sites/lib/lang/de_aps_instances_list.lng | 1 + .../sites/lib/lang/de_aps_packages_list.lng | 1 + interface/web/sites/lib/lang/de_cron.lng | 1 + interface/web/sites/lib/lang/de_cron_list.lng | 1 + interface/web/sites/lib/lang/de_database.lng | 1 + .../sites/lib/lang/de_database_admin_list.lng | 1 + .../web/sites/lib/lang/de_database_list.lng | 1 + .../web/sites/lib/lang/de_database_user.lng | 1 + .../lib/lang/de_database_user_admin_list.lng | 1 + .../sites/lib/lang/de_database_user_list.lng | 1 + interface/web/sites/lib/lang/de_ftp_user.lng | 65 ++-- .../web/sites/lib/lang/de_ftp_user_list.lng | 1 + .../web/sites/lib/lang/de_shell_user.lng | 1 + .../web/sites/lib/lang/de_shell_user_list.lng | 1 + .../lib/lang/de_user_quota_stats_list.lng | 15 +- .../lib/lang/de_web_aliasdomain_list.lng | 1 + .../web/sites/lib/lang/de_web_backup_list.lng | 1 + .../web/sites/lib/lang/de_web_domain.lng | 221 +++++------ .../lib/lang/de_web_domain_admin_list.lng | 1 + .../web/sites/lib/lang/de_web_domain_list.lng | 1 + .../web/sites/lib/lang/de_web_folder.lng | 1 + .../web/sites/lib/lang/de_web_folder_list.lng | 1 + .../web/sites/lib/lang/de_web_folder_user.lng | 1 + .../lib/lang/de_web_folder_user_list.lng | 1 + .../lib/lang/de_web_sites_stats_list.lng | 15 +- .../web/sites/lib/lang/de_web_subdomain.lng | 1 + .../sites/lib/lang/de_web_subdomain_list.lng | 1 + .../sites/lib/lang/de_web_vhost_subdomain.lng | 1 + .../lib/lang/de_web_vhost_subdomain_list.lng | 1 + .../web/sites/lib/lang/de_webdav_user.lng | 1 + .../sites/lib/lang/de_webdav_user_list.lng | 1 + .../web/sites/lib/lang/en_web_backup_list.lng | 4 +- .../sites/templates/aps_instances_list.htm | 4 +- .../web/sites/templates/web_domain_edit.htm | 7 +- .../templates/web_vhost_subdomain_edit.htm | 5 +- interface/web/sites/web_domain_edit.php | 1 + .../lib/lang/de_strengthmeter.lng | 1 + .../{ISPC_VERSION => ispconfig_version} | 0 interface/web/themes/default/css/styles.css | 11 +- .../{ISPC_VERSION => ispconfig_version} | 0 .../{ISPC_VERSION => ispconfig_version} | 0 .../{ISPC_VERSION => ispconfig_version} | 0 .../tools/form/interface_settings.tform.php | 2 +- interface/web/tools/interface_settings.php | 2 +- interface/web/tools/lib/lang/de.lng | 1 + .../tools/lib/lang/de_import_ispconfig.lng | 1 + interface/web/tools/lib/lang/de_index.lng | 1 + interface/web/tools/lib/lang/de_interface.lng | 11 +- interface/web/tools/lib/lang/de_resync.lng | 1 + .../web/tools/lib/lang/de_tpl_default.lng | 11 +- .../web/tools/lib/lang/de_usersettings.lng | 1 + interface/web/vm/lib/lang/de.lng | 1 + .../web/vm/lib/lang/de_openvz_action.lng | 1 + interface/web/vm/lib/lang/de_openvz_ip.lng | 1 + .../web/vm/lib/lang/de_openvz_ip_list.lng | 1 + .../web/vm/lib/lang/de_openvz_ostemplate.lng | 1 + .../vm/lib/lang/de_openvz_ostemplate_list.lng | 1 + .../web/vm/lib/lang/de_openvz_template.lng | 1 + .../vm/lib/lang/de_openvz_template_list.lng | 1 + interface/web/vm/lib/lang/de_openvz_vm.lng | 1 + .../web/vm/lib/lang/de_openvz_vm_list.lng | 1 + server/conf/sieve_filter_1.2.master | 6 + server/cron_daily.sh | 4 + server/lib/classes/system.inc.php | 13 + .../plugins-available/apache2_plugin.inc.php | 16 +- .../plugins-available/backup_plugin.inc.php | 2 +- server/plugins-available/bind_plugin.inc.php | 2 +- .../cron_jailkit_plugin.inc.php | 34 +- server/plugins-available/cron_plugin.inc.php | 10 +- .../maildeliver_plugin.inc.php | 8 + server/plugins-available/nginx_plugin.inc.php | 2 +- .../plugins-available/powerdns_plugin.inc.php | 6 +- .../shelluser_base_plugin.inc.php | 29 +- .../shelluser_jailkit_plugin.inc.php | 30 +- 245 files changed, 2019 insertions(+), 1697 deletions(-) create mode 100644 install/sql/incremental/upd_0043.sql rename interface/web/themes/default-304/{ISPC_VERSION => ispconfig_version} (100%) rename interface/web/themes/default_64_navimg/{ISPC_VERSION => ispconfig_version} (100%) rename interface/web/themes/default_combobox/{ISPC_VERSION => ispconfig_version} (100%) rename interface/web/themes/default_no_navimg/{ISPC_VERSION => ispconfig_version} (100%) diff --git a/install/sql/incremental/upd_0043.sql b/install/sql/incremental/upd_0043.sql new file mode 100644 index 000000000..c37304076 --- /dev/null +++ b/install/sql/incremental/upd_0043.sql @@ -0,0 +1,7 @@ +ALTER TABLE `sys_theme` ADD `sys_userid` int(11) unsigned NOT NULL DEFAULT '0', + ADD `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0', + ADD `sys_perm_user` varchar(5) DEFAULT NULL, + ADD `sys_perm_group` varchar(5) DEFAULT NULL, + ADD `sys_perm_other` varchar(5) DEFAULT NULL; + + diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index 67df290f4..76a13c54d 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -1550,6 +1550,11 @@ CREATE TABLE `sys_session` ( -- CREATE TABLE IF NOT EXISTS `sys_theme` ( + `sys_userid` int(11) unsigned NOT NULL DEFAULT '0', + `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0', + `sys_perm_user` varchar(5) DEFAULT NULL, + `sys_perm_group` varchar(5) DEFAULT NULL, + `sys_perm_other` varchar(5) DEFAULT NULL, `var_id` int(11) unsigned NOT NULL AUTO_INCREMENT, `tpl_name` varchar(32) NOT NULL, `username` varchar(64) NOT NULL, diff --git a/interface/lib/classes/aps_guicontroller.inc.php b/interface/lib/classes/aps_guicontroller.inc.php index cec49d76f..53c9ea39b 100644 --- a/interface/lib/classes/aps_guicontroller.inc.php +++ b/interface/lib/classes/aps_guicontroller.inc.php @@ -306,7 +306,8 @@ class ApsGUIController extends ApsBase */ public function deleteInstance($instanceid) { - /* + global $app; + /* $this->db->query("UPDATE aps_instances SET instance_status = ".INSTANCE_REMOVE." WHERE id = ".$instanceid.";"); $webserver_id = $this->getInstanceDataForDatalog($instanceid); @@ -325,7 +326,8 @@ class ApsGUIController extends ApsBase $tmp = $this->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_database` WHERE `database_user_id` = '" . $app->functions->intval($database_user) . "' OR `database_ro_user_id` = '" . $app->functions->intval($database_user) . "'"); if($tmp['cnt'] < 1) $this->db->datalogDelete('web_database_user', 'database_user_id', $database_user); - $this->db->datalogUpdate('aps_instances', "instance_status = ".INSTANCE_REMOVE, 'id', $instanceid); + $app->db->datalogUpdate('aps_instances', "instance_status = ".INSTANCE_REMOVE, 'id', $instanceid); + } /** diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php index 6cf9133c1..269a5cba8 100644 --- a/interface/lib/classes/remoting.inc.php +++ b/interface/lib/classes/remoting.inc.php @@ -1261,6 +1261,13 @@ class remoting { $this->server->fault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + + //* Check for duplicates + $tmp = $app->db->queryOneRecord("SELECT count(database_id) as dbnum FROM web_database WHERE database_name = '".$app->db->quote($params['database_name'])."' AND server_id = '".intval($params["server_id"])."'"); + if($tmp['dbnum'] > 0) { + $this->server->fault('database_name_error_unique', 'There is already a database with that name on the same server.'); + return false; + } $sql = $this->insertQueryPrepare('../sites/form/database.tform.php', $client_id, $params); if($sql !== false) { diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php index 40db6e072..47660f71c 100644 --- a/interface/lib/classes/remoting_lib.inc.php +++ b/interface/lib/classes/remoting_lib.inc.php @@ -113,6 +113,7 @@ class remoting_lib { var $sys_userid; var $sys_default_group; var $sys_groups; + var $client_id; //* Load the form definition from file. @@ -136,12 +137,12 @@ class remoting_lib { } //* Load the user profile - function loadUserProfile($client_id = 0) { + function loadUserProfile($client_id_param = 0) { global $app,$conf; - $client_id = $app->functions->intval($client_id); + $this->client_id = $app->functions->intval($client_id_param); - if($client_id == 0) { + if($this->client_id == 0) { $this->sys_username = 'admin'; $this->sys_userid = 1; $this->sys_default_group = 1; @@ -758,7 +759,12 @@ class remoting_lib { $sql = "INSERT INTO ".$escape.$this->formDef['db_table'].$escape." ($sql_insert_key) VALUES ($sql_insert_val)"; } else { if($primary_id != 0) { - $sql_update = substr($sql_update,0,-2); + // update client permissions only if client_id > 0 + if($this->formDef['auth'] == 'yes' && $this->client_id > 0) { + $sql_update .= '`sys_userid` = '.$this->sys_userid.', '; + $sql_update .= '`sys_groupid` = '.$this->sys_default_group.', '; + } + $sql_update = substr($sql_update,0,-2); $sql = "UPDATE ".$escape.$this->formDef['db_table'].$escape." SET ".$sql_update." WHERE ".$this->formDef['db_table_idx']." = ".$primary_id; if($sql_ext_where != '') $sql .= " and ".$sql_ext_where; } else { diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php index 7789a81e3..66615d0ea 100644 --- a/interface/lib/classes/tform.inc.php +++ b/interface/lib/classes/tform.inc.php @@ -799,7 +799,9 @@ class tform { } break; case 'UNIQUE': - if($this->action == 'NEW') { + if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n'; + if($validator['allowempty'] == 'n' || ($validator['allowempty'] == 'y' && $field_value != '')){ + if($this->action == 'NEW') { $num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM ".$escape.$this->formDef['db_table'].$escape. " WHERE $field_name = '".$app->db->quote($field_value)."'"); if($num_rec["number"] > 0) { $errmsg = $validator['errmsg']; @@ -809,7 +811,7 @@ class tform { $this->errorMessage .= $errmsg."
\r\n"; } } - } else { + } else { $num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM ".$escape.$this->formDef['db_table'].$escape. " WHERE $field_name = '".$app->db->quote($field_value)."' AND ".$this->formDef['db_table_idx']." != ".$this->primary_id); if($num_rec["number"] > 0) { $errmsg = $validator['errmsg']; @@ -819,7 +821,8 @@ class tform { $this->errorMessage .= $errmsg."
\r\n"; } } - } + } + } break; case 'NOTEMPTY': if(empty($field_value)) { diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng index cedbd734e..5527584ac 100644 --- a/interface/lib/lang/de.lng +++ b/interface/lib/lang/de.lng @@ -1,83 +1,84 @@ + diff --git a/interface/web/admin/form/users.tform.php b/interface/web/admin/form/users.tform.php index 96ed417d0..dc445d58e 100644 --- a/interface/web/admin/form/users.tform.php +++ b/interface/web/admin/form/users.tform.php @@ -100,7 +100,7 @@ $handle = @opendir(ISPC_THEMES_PATH); while ($file = @readdir ($handle)) { if (substr($file, 0, 1) != '.') { if(@is_dir(ISPC_THEMES_PATH."/$file")) { - if($file == 'default' || (@file_exists(ISPC_THEMES_PATH."/$file/ISPC_VERSION") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ISPC_VERSION")) == ISPC_APP_VERSION)) { + if(!file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") || (@file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ispconfig_version")) == ISPC_APP_VERSION)) { $themes_list[$file] = $file; } } diff --git a/interface/web/admin/lib/lang/de.lng b/interface/web/admin/lib/lang/de.lng index 1a16931d1..a4e8c55c2 100644 --- a/interface/web/admin/lib/lang/de.lng +++ b/interface/web/admin/lib/lang/de.lng @@ -1,50 +1,51 @@ + diff --git a/interface/web/admin/lib/lang/de_directive_snippets.lng b/interface/web/admin/lib/lang/de_directive_snippets.lng index 7a9b7563b..a858301b0 100644 --- a/interface/web/admin/lib/lang/de_directive_snippets.lng +++ b/interface/web/admin/lib/lang/de_directive_snippets.lng @@ -1,9 +1,10 @@ + diff --git a/interface/web/admin/lib/lang/de_directive_snippets_list.lng b/interface/web/admin/lib/lang/de_directive_snippets_list.lng index c5f1b1001..e1cfd39b0 100644 --- a/interface/web/admin/lib/lang/de_directive_snippets_list.lng +++ b/interface/web/admin/lib/lang/de_directive_snippets_list.lng @@ -5,3 +5,4 @@ $wb['name_txt'] = 'Name des Schnipsels'; $wb['type_txt'] = 'Typ'; $wb['add_new_record_txt'] = 'Direcktiven Schnipsel hinzufügen'; ?> + diff --git a/interface/web/admin/lib/lang/de_firewall.lng b/interface/web/admin/lib/lang/de_firewall.lng index 92b73270f..a475290e1 100644 --- a/interface/web/admin/lib/lang/de_firewall.lng +++ b/interface/web/admin/lib/lang/de_firewall.lng @@ -9,3 +9,4 @@ $wb['firewall_error_unique'] = 'Es gibt bereits einen Firewalldatensatz für die $wb['tcp_ports_error_regex'] = 'Zeichen nicht erlaubt in TCP Port Definition. Erlaubte Zeichen sind Nummern, : und ,.'; $wb['udp_ports_error_regex'] = 'Zeichen nicht erlaubt in UDP Port Definition. Erlaubte Zeichen sind Nummern, : und ,.'; ?> + diff --git a/interface/web/admin/lib/lang/de_firewall_list.lng b/interface/web/admin/lib/lang/de_firewall_list.lng index 0cf79f0af..a0b44aedf 100644 --- a/interface/web/admin/lib/lang/de_firewall_list.lng +++ b/interface/web/admin/lib/lang/de_firewall_list.lng @@ -1,8 +1,9 @@ + diff --git a/interface/web/admin/lib/lang/de_groups.lng b/interface/web/admin/lib/lang/de_groups.lng index 80abd65f7..b29c0996f 100644 --- a/interface/web/admin/lib/lang/de_groups.lng +++ b/interface/web/admin/lib/lang/de_groups.lng @@ -3,3 +3,4 @@ $wb['description_txt'] = 'Beschreibung'; $wb['name_txt'] = 'Gruppe'; $wb['name_err'] = 'Der Gruppenname muss min. 1, max. 30 Zeichen lang sein.'; ?> + diff --git a/interface/web/admin/lib/lang/de_groups_list.lng b/interface/web/admin/lib/lang/de_groups_list.lng index 244743177..23492f19f 100644 --- a/interface/web/admin/lib/lang/de_groups_list.lng +++ b/interface/web/admin/lib/lang/de_groups_list.lng @@ -5,3 +5,4 @@ $wb['name_txt'] = 'Gruppe'; $wb['add_new_record_txt'] = 'Neue Gruppe hinzufügen'; $wb['warning_txt'] = 'WARNUNG: Bitte hier keine Benutzereinstellungen verändern. Benutzen Sie die Kunden- und Resellereinstellungen im Kundenmodul. Modifizieren der Benutzer oder Gruppen hier könnte zum Datenverlust führen!'; ?> + diff --git a/interface/web/admin/lib/lang/de_iptables.lng b/interface/web/admin/lib/lang/de_iptables.lng index 3e5553234..0ba1920ff 100644 --- a/interface/web/admin/lib/lang/de_iptables.lng +++ b/interface/web/admin/lib/lang/de_iptables.lng @@ -1,13 +1,14 @@ + diff --git a/interface/web/admin/lib/lang/de_iptables_list.lng b/interface/web/admin/lib/lang/de_iptables_list.lng index 378db7955..b367a5613 100644 --- a/interface/web/admin/lib/lang/de_iptables_list.lng +++ b/interface/web/admin/lib/lang/de_iptables_list.lng @@ -1,15 +1,16 @@ + diff --git a/interface/web/admin/lib/lang/de_language_add.lng b/interface/web/admin/lib/lang/de_language_add.lng index 118bdee04..52b98691a 100644 --- a/interface/web/admin/lib/lang/de_language_add.lng +++ b/interface/web/admin/lib/lang/de_language_add.lng @@ -6,3 +6,4 @@ $wb['language_new_hint_txt'] = '2 Buchstaben ISO 639-1 Sprachcode (siehe http:// $wb['btn_save_txt'] = 'Neues Sprachdateiset erstellen'; $wb['btn_cancel_txt'] = 'Zurück'; ?> + diff --git a/interface/web/admin/lib/lang/de_language_complete.lng b/interface/web/admin/lib/lang/de_language_complete.lng index 1376e0c8a..d8c31934e 100644 --- a/interface/web/admin/lib/lang/de_language_complete.lng +++ b/interface/web/admin/lib/lang/de_language_complete.lng @@ -5,3 +5,4 @@ $wb['language_select_txt'] = 'Sprache auswählen'; $wb['btn_save_txt'] = 'Dateien jetzt zusammenführen'; $wb['btn_cancel_txt'] = 'Zurück'; ?> + diff --git a/interface/web/admin/lib/lang/de_language_edit.lng b/interface/web/admin/lib/lang/de_language_edit.lng index 30ab21b28..66743049a 100644 --- a/interface/web/admin/lib/lang/de_language_edit.lng +++ b/interface/web/admin/lib/lang/de_language_edit.lng @@ -6,3 +6,4 @@ $wb['lang_file_txt'] = 'Sprachdatei'; $wb['btn_save_txt'] = 'Speichern'; $wb['btn_cancel_txt'] = 'Zurück'; ?> + diff --git a/interface/web/admin/lib/lang/de_language_export.lng b/interface/web/admin/lib/lang/de_language_export.lng index 70eb466d4..7893f39d0 100644 --- a/interface/web/admin/lib/lang/de_language_export.lng +++ b/interface/web/admin/lib/lang/de_language_export.lng @@ -4,3 +4,4 @@ $wb['language_select_txt'] = 'Sprache auswählen'; $wb['btn_save_txt'] = 'Ausgewähltes Sprachdateiset exportieren'; $wb['btn_cancel_txt'] = 'Zurück'; ?> + diff --git a/interface/web/admin/lib/lang/de_language_import.lng b/interface/web/admin/lib/lang/de_language_import.lng index 29ee03078..26f82c877 100644 --- a/interface/web/admin/lib/lang/de_language_import.lng +++ b/interface/web/admin/lib/lang/de_language_import.lng @@ -6,3 +6,4 @@ $wb['language_overwrite_txt'] = 'Datei überschreiben, falls diese schon existie $wb['btn_cancel_txt'] = 'Zurück'; $wb['ignore_version_txt'] = 'ISPConfig Versionsüberprüfung überspringen'; ?> + diff --git a/interface/web/admin/lib/lang/de_language_list.lng b/interface/web/admin/lib/lang/de_language_list.lng index bf75420cf..6d4a7ae77 100644 --- a/interface/web/admin/lib/lang/de_language_list.lng +++ b/interface/web/admin/lib/lang/de_language_list.lng @@ -5,3 +5,4 @@ $wb['module_txt'] = 'Modul'; $wb['lang_file_txt'] = 'Sprachdatei'; $wb['lang_file_date_txt'] = 'Letzte Änderung'; ?> + diff --git a/interface/web/admin/lib/lang/de_package_install.lng b/interface/web/admin/lib/lang/de_package_install.lng index bbacc85d4..f54fbfefb 100644 --- a/interface/web/admin/lib/lang/de_package_install.lng +++ b/interface/web/admin/lib/lang/de_package_install.lng @@ -5,3 +5,4 @@ $wb['repo_username_txt'] = 'Benutzername (optional)'; $wb['repo_password_txt'] = 'Passwort (optional)'; $wb['active_txt'] = 'Aktiv'; ?> + diff --git a/interface/web/admin/lib/lang/de_remote_action.lng b/interface/web/admin/lib/lang/de_remote_action.lng index c1dacca34..b8534e34f 100644 --- a/interface/web/admin/lib/lang/de_remote_action.lng +++ b/interface/web/admin/lib/lang/de_remote_action.lng @@ -10,3 +10,4 @@ $wb['select_all_server'] = 'Alle Server'; $wb['ispconfig_update_title'] = 'ISPConfig 3 Update Anweisungen'; $wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> + diff --git a/interface/web/admin/lib/lang/de_remote_user.lng b/interface/web/admin/lib/lang/de_remote_user.lng index 9e7d2a0c7..37eb47e7b 100644 --- a/interface/web/admin/lib/lang/de_remote_user.lng +++ b/interface/web/admin/lib/lang/de_remote_user.lng @@ -1,47 +1,48 @@ + diff --git a/interface/web/admin/lib/lang/de_remote_user_list.lng b/interface/web/admin/lib/lang/de_remote_user_list.lng index 5aa8972fd..cb19beb20 100644 --- a/interface/web/admin/lib/lang/de_remote_user_list.lng +++ b/interface/web/admin/lib/lang/de_remote_user_list.lng @@ -1,7 +1,8 @@ + diff --git a/interface/web/admin/lib/lang/de_server.lng b/interface/web/admin/lib/lang/de_server.lng index 1d6c2b7d7..a83149ed3 100644 --- a/interface/web/admin/lib/lang/de_server.lng +++ b/interface/web/admin/lib/lang/de_server.lng @@ -1,15 +1,16 @@ + diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng index bcbab1919..81cc6ab5c 100644 --- a/interface/web/admin/lib/lang/de_server_config.lng +++ b/interface/web/admin/lib/lang/de_server_config.lng @@ -1,173 +1,174 @@ Information: Falls Sie MySQL stoppen möchten, wählen Sie die '; -$wb['enable_sni_txt'] = 'Aktiviere SNI'; -$wb['set_folder_permissions_on_update_txt'] = 'Verzeichnisberechtigungen beim Update setzen'; -$wb['add_web_users_to_sshusers_group_txt'] = 'Webbenutzer zur -sshusers- hinzufügen'; -$wb['connect_userid_to_webid_txt'] = 'Linux Userid mit webid verknüpfen'; -$wb['connect_userid_to_webid_start_txt'] = 'Start ID für userid/webid Verknüpfung'; -$wb['realtime_blackhole_list_txt'] = 'Realtime Blackhole Liste'; -$wb['realtime_blackhole_list_note_txt'] = '(RBL\'s mit Kommas trennen)'; -$wb['ssl_settings_txt'] = 'SSL Einstellungen'; -$wb['permissions_txt'] = 'Berechtigungen'; -$wb['php_settings_txt'] = 'PHP Einstellungen'; -$wb['apps_vhost_settings_txt'] = 'Apps vHost Einstellungen'; -$wb['awstats_settings_txt'] = 'AWStats Einstellungen'; -$wb['backup_mode_txt'] = 'Backupmodus'; -$wb['backup_mode_userzip'] = 'Backup Dateien gehören dem Web Benutzer (ZIP-Datei)'; -$wb['backup_mode_rootgz'] = 'Backup aller Dateien des Webverzeichnisses als Root Benutzer'; -$wb['firewall_txt'] = 'Firewall'; -$wb['mailbox_quota_stats_txt'] = 'Mailboxbeschränkung Statistiken'; -$wb['enable_ip_wildcard_txt'] = 'IP Adressen Wildcard (*) aktivieren'; -$wb['web_folder_protection_txt'] = 'Webverzeichnis unveränderlich machen (erweiterte Attribute)'; -$wb['overtraffic_notify_admin_txt'] = 'Überschreiten des Transfer Limits an den Administrator senden'; -$wb['overtraffic_notify_client_txt'] = 'Überschreiten des Transfer Limits an den Kunden senden'; +$wb['jailkit_chroot_home_txt'] = "Jailkit Chroot home"; +$wb['jailkit_chroot_app_sections_txt'] = "Jailkit Chroot Anwendungsbereiche"; +$wb['jailkit_chroot_app_programs_txt'] = "Jailkit Chrooted Anwendungen"; +$wb['jailkit_chroot_cron_programs_txt'] = "Jailkit Cron Chrooted Anwendungen"; +$wb['website_path_txt'] = "Webseiten Pfad"; +$wb['website_symlinks_txt'] = "Webseiten Symlinks"; +$wb['website_symlinks_rel_txt'] = "Erstelle relative Symlinks"; +$wb['vhost_conf_dir_txt'] = "vHost Konfigurationsverzeichnis"; +$wb['vhost_conf_enabled_dir_txt'] = "vHost config enabled dir"; +$wb['getmail_config_dir_txt'] = "Getmail Konfigurationsverzeichnis"; +$wb['fastcgi_starter_path_txt'] = "FastCGI Starter Pfad"; +$wb['fastcgi_starter_script_txt'] = "FastCGI Starter Script"; +$wb['fastcgi_alias_txt'] = "FastCGI Alias"; +$wb['fastcgi_phpini_path_txt'] = "FastCGI php.ini Pfad"; +$wb['fastcgi_children_txt'] = "FastCGI Children"; +$wb['fastcgi_max_requests_txt'] = "FastCGI max. Anfragen"; +$wb['fastcgi_bin_txt'] = "FastCGI Bin"; +$wb['module_txt'] = "Modul"; +$wb['maildir_path_txt'] = "Maildir Pfad"; +$wb['homedir_path_txt'] = "Homedir Pfad"; +$wb['mailuser_uid_txt'] = "Mailbenutzer UID"; +$wb['mailuser_gid_txt'] = "Mailbenutzer GID"; +$wb['mailuser_name_txt'] = "Mailbenutzer Name"; +$wb['mailuser_group_txt'] = "Mailbenutzer Gruppe"; +$wb['relayhost_txt'] = "Relayhost"; +$wb['relayhost_user_txt'] = "Relayhost Benutzer"; +$wb['relayhost_password_txt'] = "Relayhost Passwort"; +$wb['mailbox_size_limit_txt'] = "Mailboxgrößen Limit"; +$wb['message_size_limit_txt'] = "Nachrichtengrößen Limit"; +$wb['ip_address_txt'] = "IP Adresse"; +$wb['netmask_txt'] = "Netzmaske"; +$wb['gateway_txt'] = "Gateway"; +$wb['hostname_txt'] = "Hostname"; +$wb['nameservers_txt'] = "Nameserver"; +$wb['auto_network_configuration_txt'] = "Netzwerkkonfiguration"; +$wb['website_basedir_txt'] = "Webseiten basedir"; +$wb['website_autoalias_txt'] = "Webseiten Autoalias"; +$wb['website_autoalias_note_txt'] = "Platzhalter:"; +$wb['ip_address_error_wrong'] = "Ungültiges IP Adressen Format."; +$wb['netmask_error_wrong'] = "Ungültiges Netzmasken Format."; +$wb['gateway_error_wrong'] = "Ungültiges Gateway Format."; +$wb['hostname_error_empty'] = "Hostname ist leer."; +$wb['nameservers_error_empty'] = "Nameserver ist leer."; +$wb['config_dir_txt'] = "Konfigurationsverzeichnis"; +$wb['init_script_txt'] = "Cron init Script Name"; +$wb['crontab_dir_txt'] = "Pfad für individuelle Crontabs"; +$wb['wget_txt'] = "Pfad zum wget Programm"; +$wb['web_user_txt'] = "Apache Benutzer"; +$wb['web_group_txt'] = "Apache Gruppe"; +$wb['security_level_txt'] = "Sicherheitslevel"; +$wb['loglevel_txt'] = "Loglevel"; +$wb['apps_vhost_port_txt'] = "Apps vHost Port"; +$wb['apps_vhost_ip_txt'] = "Apps vHost IP Adresse"; +$wb['apps_vhost_servername_txt'] = "Apps vHost Domain"; +$wb['bind_user_txt'] = "BIND Benutzer"; +$wb['bind_group_txt'] = "BIND Gruppe"; +$wb['bind_zonefiles_dir_txt'] = "BIND Zonefiles Verzeichnis"; +$wb['named_conf_path_txt'] = "BIND named.conf Pfad"; +$wb['bind_user_error_empty'] = "BIND Benutzer ist leer."; +$wb['bind_group_error_empty'] = "BIND Gruppe ist leer."; +$wb['bind_zonefiles_dir_error_empty'] = "BIND Zonefiles Verzeichnis ist leer."; +$wb['named_conf_path_error_empty'] = "BIND named.conf Pfad ist leer."; +$wb['named_conf_local_path_error_empty'] = "BIND named.conf.local Pfad ist leer."; +$wb['mail_filter_syntax_txt'] = "Mailfilter Syntax"; +$wb['pop3_imap_daemon_txt'] = "POP3/IMAP Dämon"; +$wb['php_open_basedir_txt'] = "PHP open_basedir"; +$wb['php_open_basedir_error_empty'] = "PHP open_basedir ist leer."; +$wb['htaccess_allow_override_txt'] = ".htaccess AllowOverride"; +$wb['htaccess_allow_override_error_empty'] = ".htaccess AllowOverride ist leer."; +$wb['awstats_conf_dir_txt'] = "AWStats Konfigurationsverzeichnis"; +$wb['awstats_data_dir_txt'] = "AWStats Datenverzeichnis"; +$wb['awstats_pl_txt'] = "AWStats awstats.pl Script"; +$wb['awstats_buildstaticpages_pl_txt'] = "AWStats awstats_buildstaticpages.pl Script"; +$wb['backup_dir_txt'] = "Backupverzeichnis"; +$wb['named_conf_local_path_txt'] = "BIND named.conf.local Pfad"; +$wb['php_ini_path_cgi_txt'] = "CGI php.ini Pfad"; +$wb['php_ini_path_apache_txt'] = "Apache php.ini Pfad"; +$wb['check_apache_config_txt'] = "Teste Apache Konfiguration beim Neustart"; +$wb['CA_path_txt'] = "CA Pfad"; +$wb['CA_pass_txt'] = "CA Passwort"; +$wb['ufw_enable_txt'] = "Aktivieren"; +$wb['ufw_manage_builtins_txt'] = "Manage Builtin Rules"; +$wb['ufw_ipv6_txt'] = "Aktiviere IPv6"; +$wb['ufw_default_input_policy_txt'] = "Default Input Policy"; +$wb['ufw_default_output_policy_txt'] = "Default Output Policy"; +$wb['ufw_default_forward_policy_txt'] = "Default Forward Policy"; +$wb['ufw_default_application_policy_txt'] = "Default Application Policy"; +$wb['ufw_log_level_txt'] = "Loglevel"; +$wb['network_config_warning_txt'] = "Die Netzwerk Konfiguration Option ist nur auf Debian- und Ubuntu Servern verfügbar. Aktivieren Sie diese Option nicht, falls Ihr Netzwerk Interface nicht eth0 heißt."; +$wb['server_type_txt'] = "Server Typ"; +$wb['nginx_vhost_conf_dir_txt'] = "Nginx vHost Konfigurations Verzeichnis"; +$wb['nginx_vhost_conf_enabled_dir_txt'] = "Nginx Vhost config enabled dir"; +$wb['nginx_user_txt'] = "Nginx Benutzer"; +$wb['nginx_group_txt'] = "Nginx Gruppe"; +$wb['nginx_cgi_socket_txt'] = "Nginx CGI Socket"; +$wb['backup_dir_error_empty'] = "Backup Verzeichnis ist leer."; +$wb['maildir_path_error_empty'] = "Maildir Pfad ist leer."; +$wb['homedir_path_error_empty'] = "Homedir Pfad ist leer."; +$wb['mailuser_uid_error_empty'] = "Mail Benutzer UID ist leer."; +$wb['mailuser_gid_error_empty'] = "Mail Benutzer GID ist leer."; +$wb['mailuser_name_error_empty'] = "Mail Benutzer Name ist leer."; +$wb['mailuser_group_error_empty'] = "Mail Benutzer Gruppe ist leer."; +$wb['getmail_config_dir_error_empty'] = "Getmail config dir ist leer."; +$wb['website_basedir_error_empty'] = "Webseiten basedir ist leer."; +$wb['website_path_error_empty'] = "Webseiten Pfad ist leer."; +$wb['website_symlinks_error_empty'] = "Webseiten Symlinks ist leer."; +$wb['vhost_conf_dir_error_empty'] = "vHost config dir ist leer."; +$wb['vhost_conf_enabled_dir_error_empty'] = "vHost config enabled dir ist leer."; +$wb['nginx_vhost_conf_dir_error_empty'] = "Nginx vHost config dir ist leer."; +$wb['nginx_vhost_conf_enabled_dir_error_empty'] = "Nginx vHost config enabled dir ist leer."; +$wb['apache_user_error_empty'] = "Apache Benutzer ist leer."; +$wb['apache_group_error_empty'] = "Apache Grupp ist leer."; +$wb['nginx_user_error_empty'] = "Nginx Benutzer ist leer."; +$wb['nginx_group_error_empty'] = "Nginx Gruppe ist leer."; +$wb['php_ini_path_apache_error_empty'] = "Apache php.ini Pfad ist leer."; +$wb['php_ini_path_cgi_error_empty'] = "CGI php.ini Pfad ist leer."; +$wb['nginx_cgi_socket_empty'] = "Nginx CGI Socket ist leer."; +$wb['apps_vhost_port_error_empty'] = "Apps vHost Port ist leer."; +$wb['apps_vhost_ip_error_empty'] = "Apps vHost IP Adresse ist leer."; +$wb['fastcgi_starter_path_error_empty'] = "FastCGI Starter Pfad ist leer."; +$wb['fastcgi_starter_script_error_empty'] = "FastCGI Starter Script ist leer."; +$wb['fastcgi_alias_error_empty'] = "FastCGI Alias ist leer."; +$wb['fastcgi_phpini_path_error_empty'] = "FastCGI php.ini Pfad ist leer."; +$wb['fastcgi_children_error_empty'] = "FastCGI Children ist leer."; +$wb['fastcgi_max_requests_error_empty'] = "FastCGI max. Requests ist leer."; +$wb['fastcgi_bin_error_empty'] = "FastCGI Bin ist leer."; +$wb['jailkit_chroot_home_error_empty'] = "Jailkit Chroot home ist leer."; +$wb['jailkit_chroot_app_sections_error_empty'] = "Jailkit Chroot Anwendungsbereiche ist leer."; +$wb['jailkit_chroot_app_programs_error_empty'] = "Jailkit Chrooted Anwendungen ist leer."; +$wb['jailkit_chroot_cron_programs_error_empty'] = "Jailkit Cron Chrooted Anwendungen ist leer."; +$wb['vlogger_config_dir_error_empty'] = "Config Verzeichnis ist leer."; +$wb['cron_init_script_error_empty'] = "Cron init Script Name ist leer."; +$wb['crontab_dir_error_empty'] = "Pfad für individuelle Crontabs ist leer."; +$wb['cron_wget_error_empty'] = "Pfad zum wget Programm ist leer."; +$wb['php_fpm_init_script_txt'] = "PHP-FPM Init Script"; +$wb['php_fpm_init_script_error_empty'] = "PHP-FPM Init Script ist leer."; +$wb['php_fpm_ini_path_txt'] = "PHP-FPM php.ini Pfad"; +$wb['php_fpm_ini_path_error_empty'] = "PHP-FPM php.ini Pfad ist leer."; +$wb['php_fpm_pool_dir_txt'] = "PHP-FPM Pool Verzeichnis"; +$wb['php_fpm_pool_dir_error_empty'] = "PHP-FPM Pool Verzeichnis ist leer."; +$wb['php_fpm_start_port_txt'] = "PHP-FPM Start Port"; +$wb['php_fpm_start_port_error_empty'] = "PHP-FPM Start Port ist leer."; +$wb['php_fpm_socket_dir_txt'] = "PHP-FPM Socket Verzeichnis"; +$wb['php_fpm_socket_dir_error_empty'] = "PHP-FPM Socket Verzeichnis ist leer."; +$wb['fastcgi_config_syntax_txt'] = "FastCGI Konfigurations Syntax"; +$wb['try_rescue_txt'] = "Aktiviere Service Monitoring und Neustart bei Unerreichbarkeit"; +$wb['do_not_try_rescue_httpd_txt'] = "Deaktiviere HTTPD Monitoring"; +$wb['do_not_try_rescue_mysql_txt'] = "Deaktiviere MySQL Monitoring"; +$wb['do_not_try_rescue_mail_txt'] = "Deaktiviere E-Mail Monitoring"; +$wb['rescue_description_txt'] = "Information: Falls Sie MySQL stoppen möchten, wählen Sie die "; +$wb['enable_sni_txt'] = "Aktiviere SNI"; +$wb['set_folder_permissions_on_update_txt'] = "Verzeichnisberechtigungen beim Update setzen"; +$wb['add_web_users_to_sshusers_group_txt'] = "Webbenutzer zur -sshusers- hinzufügen"; +$wb['connect_userid_to_webid_txt'] = "Linux Userid mit webid verknüpfen"; +$wb['connect_userid_to_webid_start_txt'] = "Start ID für userid/webid Verknüpfung"; +$wb['realtime_blackhole_list_txt'] = "Realtime Blackhole Liste"; +$wb['realtime_blackhole_list_note_txt'] = "(RBL's mit Kommas trennen)"; +$wb['ssl_settings_txt'] = "SSL Einstellungen"; +$wb['permissions_txt'] = "Berechtigungen"; +$wb['php_settings_txt'] = "PHP Einstellungen"; +$wb['apps_vhost_settings_txt'] = "Apps vHost Einstellungen"; +$wb['awstats_settings_txt'] = "AWStats Einstellungen"; +$wb['backup_mode_txt'] = "Backupmodus"; +$wb['backup_mode_userzip'] = "Backup Dateien gehören dem Web Benutzer (ZIP-Datei)"; +$wb['backup_mode_rootgz'] = "Backup aller Dateien des Webverzeichnisses als Root Benutzer"; +$wb['firewall_txt'] = "Firewall"; +$wb['mailbox_quota_stats_txt'] = "Mailboxbeschränkung Statistiken"; +$wb['enable_ip_wildcard_txt'] = "IP Adressen Wildcard (*) aktivieren"; +$wb['web_folder_protection_txt'] = "Webverzeichnis unveränderlich machen (erweiterte Attribute)"; +$wb['overtraffic_notify_admin_txt'] = "Überschreiten des Transfer Limits an den Administrator senden"; +$wb['overtraffic_notify_client_txt'] = "Überschreiten des Transfer Limits an den Kunden senden"; ?> + diff --git a/interface/web/admin/lib/lang/de_server_config_list.lng b/interface/web/admin/lib/lang/de_server_config_list.lng index 191b2c8d3..9ff7f9b64 100644 --- a/interface/web/admin/lib/lang/de_server_config_list.lng +++ b/interface/web/admin/lib/lang/de_server_config_list.lng @@ -2,3 +2,4 @@ $wb['list_head_txt'] = 'Serverkonfiguration'; $wb['server_name_txt'] = 'Server'; ?> + diff --git a/interface/web/admin/lib/lang/de_server_ip.lng b/interface/web/admin/lib/lang/de_server_ip.lng index 5757b165c..9f5f2e0a8 100644 --- a/interface/web/admin/lib/lang/de_server_ip.lng +++ b/interface/web/admin/lib/lang/de_server_ip.lng @@ -9,3 +9,4 @@ $wb['ip_type_txt'] = 'Typ'; $wb['virtualhost_port_txt'] = 'HTTP Ports'; $wb['error_port_syntax'] = 'Ungültige Zeichen im Ports Feld. Bitte geben Sie nur komma-separierte Nummern an. Beispiel: 80,443'; ?> + diff --git a/interface/web/admin/lib/lang/de_server_ip_list.lng b/interface/web/admin/lib/lang/de_server_ip_list.lng index 37f237c9e..697c49462 100644 --- a/interface/web/admin/lib/lang/de_server_ip_list.lng +++ b/interface/web/admin/lib/lang/de_server_ip_list.lng @@ -1,10 +1,11 @@ + diff --git a/interface/web/admin/lib/lang/de_server_list.lng b/interface/web/admin/lib/lang/de_server_list.lng index a770a850c..416dba046 100644 --- a/interface/web/admin/lib/lang/de_server_list.lng +++ b/interface/web/admin/lib/lang/de_server_list.lng @@ -11,3 +11,4 @@ $wb['add_new_record_txt'] = 'Neuen Server hinzufügen'; $wb['proxy_server_txt'] = 'Proxy'; $wb['firewall_server_txt'] = 'Firewall'; ?> + diff --git a/interface/web/admin/lib/lang/de_server_php.lng b/interface/web/admin/lib/lang/de_server_php.lng index 9b26ea3c6..dc2a833fe 100644 --- a/interface/web/admin/lib/lang/de_server_php.lng +++ b/interface/web/admin/lib/lang/de_server_php.lng @@ -1,16 +1,17 @@ + diff --git a/interface/web/admin/lib/lang/de_server_php_list.lng b/interface/web/admin/lib/lang/de_server_php_list.lng index d775fc6c0..f821fef31 100644 --- a/interface/web/admin/lib/lang/de_server_php_list.lng +++ b/interface/web/admin/lib/lang/de_server_php_list.lng @@ -1,7 +1,8 @@ + diff --git a/interface/web/admin/lib/lang/de_software_package_install.lng b/interface/web/admin/lib/lang/de_software_package_install.lng index cd4b20d06..107a58d0b 100644 --- a/interface/web/admin/lib/lang/de_software_package_install.lng +++ b/interface/web/admin/lib/lang/de_software_package_install.lng @@ -4,3 +4,4 @@ $wb['install_key_txt'] = 'Installations Key eingeben'; $wb['btn_save_txt'] = 'Installation starten'; $wb['btn_cancel_txt'] = 'Abbrechen'; ?> + diff --git a/interface/web/admin/lib/lang/de_software_package_list.lng b/interface/web/admin/lib/lang/de_software_package_list.lng index 8cf3e39d8..38819af1f 100644 --- a/interface/web/admin/lib/lang/de_software_package_list.lng +++ b/interface/web/admin/lib/lang/de_software_package_list.lng @@ -1,10 +1,11 @@ + diff --git a/interface/web/admin/lib/lang/de_software_repo.lng b/interface/web/admin/lib/lang/de_software_repo.lng index bbacc85d4..f54fbfefb 100644 --- a/interface/web/admin/lib/lang/de_software_repo.lng +++ b/interface/web/admin/lib/lang/de_software_repo.lng @@ -5,3 +5,4 @@ $wb['repo_username_txt'] = 'Benutzername (optional)'; $wb['repo_password_txt'] = 'Passwort (optional)'; $wb['active_txt'] = 'Aktiv'; ?> + diff --git a/interface/web/admin/lib/lang/de_software_repo_list.lng b/interface/web/admin/lib/lang/de_software_repo_list.lng index 4a9c2c42d..9d290cc60 100644 --- a/interface/web/admin/lib/lang/de_software_repo_list.lng +++ b/interface/web/admin/lib/lang/de_software_repo_list.lng @@ -4,3 +4,4 @@ $wb['active_txt'] = 'Aktiv'; $wb['repo_name_txt'] = 'Bibliothek'; $wb['repo_url_txt'] = 'URL'; ?> + diff --git a/interface/web/admin/lib/lang/de_software_update_list.lng b/interface/web/admin/lib/lang/de_software_update_list.lng index 6f01c1f08..e636219ab 100644 --- a/interface/web/admin/lib/lang/de_software_update_list.lng +++ b/interface/web/admin/lib/lang/de_software_update_list.lng @@ -6,3 +6,4 @@ $wb['update_title_txt'] = 'Update'; $wb['version_txt'] = 'Version'; $wb['action_txt'] = 'Aktion'; ?> + diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng index 0eff4a171..164b81ab0 100644 --- a/interface/web/admin/lib/lang/de_system_config.lng +++ b/interface/web/admin/lib/lang/de_system_config.lng @@ -1,44 +1,45 @@ + diff --git a/interface/web/admin/lib/lang/de_tpl_default_admin.lng b/interface/web/admin/lib/lang/de_tpl_default_admin.lng index 22c7839a4..d397616fb 100644 --- a/interface/web/admin/lib/lang/de_tpl_default_admin.lng +++ b/interface/web/admin/lib/lang/de_tpl_default_admin.lng @@ -1,18 +1,19 @@ + diff --git a/interface/web/admin/lib/lang/de_users.lng b/interface/web/admin/lib/lang/de_users.lng index 1ead952e5..e60d8efc3 100644 --- a/interface/web/admin/lib/lang/de_users.lng +++ b/interface/web/admin/lib/lang/de_users.lng @@ -30,3 +30,4 @@ $wb['repeat_password_txt'] = 'Passwort wiederholen'; $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; $wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; ?> + diff --git a/interface/web/admin/lib/lang/de_users_list.lng b/interface/web/admin/lib/lang/de_users_list.lng index c635ba728..8cb2a46a8 100644 --- a/interface/web/admin/lib/lang/de_users_list.lng +++ b/interface/web/admin/lib/lang/de_users_list.lng @@ -7,3 +7,4 @@ $wb['groups_txt'] = 'Gruppen'; $wb['add_new_record_txt'] = 'Neuen Benutzer hinzufügen'; $wb['warning_txt'] = 'WARNUNG: Bitte hier keine Benutzereinstellungen verändern. Benutzen Sie die Kunden- und Resellereinstellungen im Kundenmodul. Modifizieren der Benutzer oder Gruppen hier könnte zum Datenverlust führen!'; ?> + diff --git a/interface/web/admin/lib/menu.d/tpl_default.menu.php b/interface/web/admin/lib/menu.d/tpl_default.menu.php index e2e774567..544400246 100644 --- a/interface/web/admin/lib/menu.d/tpl_default.menu.php +++ b/interface/web/admin/lib/menu.d/tpl_default.menu.php @@ -1,5 +1,5 @@ diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php index 8d4023908..1b66ac754 100644 --- a/interface/web/client/form/client.tform.php +++ b/interface/web/client/form/client.tform.php @@ -73,7 +73,7 @@ $handle = @opendir(ISPC_THEMES_PATH); while ($file = @readdir ($handle)) { if (substr($file, 0, 1) != '.') { if(@is_dir(ISPC_THEMES_PATH."/$file")) { - if($file == 'default' || (@file_exists(ISPC_THEMES_PATH."/$file/ISPC_VERSION") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ISPC_VERSION")) == ISPC_APP_VERSION)) { + if(!file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") || (@file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ispconfig_version")) == ISPC_APP_VERSION)) { $themes_list[$file] = $file; } } @@ -118,6 +118,10 @@ $form["tabs"]['address'] = array ( 'customer_no' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'UNIQUE', + 'errmsg'=> 'customer_no_error_unique', + 'allowempty' => 'y'), + ), 'default' => '', 'value' => '', 'separator' => '', diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php index 1669e36bf..c9079ec6a 100644 --- a/interface/web/client/form/reseller.tform.php +++ b/interface/web/client/form/reseller.tform.php @@ -61,7 +61,7 @@ $handle = @opendir(ISPC_THEMES_PATH); while ($file = @readdir ($handle)) { if (substr($file, 0, 1) != '.') { if(@is_dir(ISPC_THEMES_PATH."/$file")) { - if($file == 'default' || (@file_exists(ISPC_THEMES_PATH."/$file/ISPC_VERSION") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ISPC_VERSION")) == ISPC_APP_VERSION)) { + if(!file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") || (@file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ispconfig_version")) == ISPC_APP_VERSION)) { $themes_list[$file] = $file; } } @@ -118,6 +118,10 @@ $form["tabs"]['address'] = array ( 'customer_no' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'UNIQUE', + 'errmsg'=> 'customer_no_error_unique', + 'allowempty' => 'y'), + ), 'default' => '', 'value' => '', 'separator' => '', diff --git a/interface/web/client/lib/lang/de.lng b/interface/web/client/lib/lang/de.lng index 607a70b32..cffdb186b 100644 --- a/interface/web/client/lib/lang/de.lng +++ b/interface/web/client/lib/lang/de.lng @@ -23,3 +23,4 @@ $wb['error_domain_in webuse'] = 'Diese Domain kann nicht gelöscht werden, weil $wb['error_client_can_not_add_domain'] = 'Sie können keine neue Domain anlegen'; $wb['error_client_group_id_empty'] = 'Sie müssen ein Benutzerdefiniertes auswählen
'; ?> + diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng index 0caeaea43..d43c98a59 100644 --- a/interface/web/client/lib/lang/de_client.lng +++ b/interface/web/client/lib/lang/de_client.lng @@ -1,139 +1,140 @@ + diff --git a/interface/web/client/lib/lang/de_client_circle.lng b/interface/web/client/lib/lang/de_client_circle.lng index 27c5d1561..ef1bc27db 100644 --- a/interface/web/client/lib/lang/de_client_circle.lng +++ b/interface/web/client/lib/lang/de_client_circle.lng @@ -7,3 +7,4 @@ $wb['client_ids_txt'] = 'Kunden/Reseller'; $wb['description_txt'] = 'Beschreibung'; $wb['active_txt'] = 'Aktiv'; ?> + diff --git a/interface/web/client/lib/lang/de_client_circle_list.lng b/interface/web/client/lib/lang/de_client_circle_list.lng index 709b50911..d37dcda2c 100644 --- a/interface/web/client/lib/lang/de_client_circle_list.lng +++ b/interface/web/client/lib/lang/de_client_circle_list.lng @@ -8,3 +8,4 @@ $wb['filter_txt'] = 'Filter'; $wb['delete_txt'] = 'Löschen'; $wb['active_txt'] = 'Aktiv'; ?> + diff --git a/interface/web/client/lib/lang/de_client_del.lng b/interface/web/client/lib/lang/de_client_del.lng index c6982a2f2..4bc471aac 100644 --- a/interface/web/client/lib/lang/de_client_del.lng +++ b/interface/web/client/lib/lang/de_client_del.lng @@ -4,3 +4,4 @@ $wb['delete_explanation'] = 'Diese Aktion wird folgende Anzahl an Datensätzen d $wb['btn_save_txt'] = 'Kunden löschen'; $wb['btn_cancel_txt'] = 'Abbrechen, ohne den Kunden zu löschen'; ?> + diff --git a/interface/web/client/lib/lang/de_client_message.lng b/interface/web/client/lib/lang/de_client_message.lng index f4def3017..457cf6c17 100644 --- a/interface/web/client/lib/lang/de_client_message.lng +++ b/interface/web/client/lib/lang/de_client_message.lng @@ -16,3 +16,4 @@ $wb['all_clients_resellers_txt'] = 'Alle Kunden und Reseller'; $wb['all_clients_txt'] = 'Alle Kunden'; $wb['variables_txt'] = 'Variablen:'; ?> + diff --git a/interface/web/client/lib/lang/de_client_template.lng b/interface/web/client/lib/lang/de_client_template.lng index 2de316bcf..d33571bfa 100644 --- a/interface/web/client/lib/lang/de_client_template.lng +++ b/interface/web/client/lib/lang/de_client_template.lng @@ -1,87 +1,88 @@ + diff --git a/interface/web/client/lib/lang/de_client_template_list.lng b/interface/web/client/lib/lang/de_client_template_list.lng index 98195fed1..1fd2c92d3 100644 --- a/interface/web/client/lib/lang/de_client_template_list.lng +++ b/interface/web/client/lib/lang/de_client_template_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Kundenvorlagen'; $wb['template_type_txt'] = 'Typ'; $wb['template_name_txt'] = 'Vorlagenname'; ?> + diff --git a/interface/web/client/lib/lang/de_clients_list.lng b/interface/web/client/lib/lang/de_clients_list.lng index 44c42cd2e..701eb7995 100644 --- a/interface/web/client/lib/lang/de_clients_list.lng +++ b/interface/web/client/lib/lang/de_clients_list.lng @@ -8,3 +8,4 @@ $wb['country_txt'] = 'Land'; $wb['add_new_record_txt'] = 'Kunden hinzufügen'; $wb['username_txt'] = 'Benutzername'; ?> + diff --git a/interface/web/client/lib/lang/de_domain.lng b/interface/web/client/lib/lang/de_domain.lng index eb4276a3f..339c6ffd4 100644 --- a/interface/web/client/lib/lang/de_domain.lng +++ b/interface/web/client/lib/lang/de_domain.lng @@ -4,3 +4,4 @@ $wb['domain_error_unique'] = 'Die Domain existiert bereits'; $wb['domain_error_regex'] = 'Dieser Domain Name ist nicht gültig'; $wb['Domain'] = 'Domain'; ?> + diff --git a/interface/web/client/lib/lang/de_domain_list.lng b/interface/web/client/lib/lang/de_domain_list.lng index b066bff57..4198e9096 100644 --- a/interface/web/client/lib/lang/de_domain_list.lng +++ b/interface/web/client/lib/lang/de_domain_list.lng @@ -4,3 +4,4 @@ $wb['add_new_record_txt'] = 'Neue Domain hinzufügen'; $wb['domain_txt'] = 'Domain'; $wb['user_txt'] = 'Kunde'; ?> + diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng index 58c061f58..90d45e3cf 100644 --- a/interface/web/client/lib/lang/de_reseller.lng +++ b/interface/web/client/lib/lang/de_reseller.lng @@ -1,132 +1,133 @@ 0 sein'; -$wb['limit_web_quota_txt'] = 'Speicherplatzbeschränkung'; -$wb['limit_traffic_quota_txt'] = 'Transfervolumenbeschränkung'; -$wb['limit_trafficquota_error_notint'] = 'Transfervolumenbeschränkung muss eine Zahl sein.'; -$wb['limit_dns_slave_zone_txt'] = 'Max. Anzahl an Secondary DNS Zonen'; -$wb['limit_dns_slave_zone_error_notint'] = 'Das Secondary DNS Zonen Limit muss eine Zahl sein.'; -$wb['limit_dns_record_error_notint'] = 'Das DNS Eintrag Limit muss eine Zahl sein.'; -$wb['customer_no_txt'] = 'Kundennummer'; -$wb['vat_id_txt'] = 'USt-ID'; -$wb['required_fields_txt'] = '* Benötigte Felder'; -$wb['limit_webdav_user_txt'] = 'Max. Anzahl an WebDAV Benutzern'; -$wb['limit_webdav_user_error_notint'] = 'Das WebDAV Benutzer Limit muss eine Zahl sein.'; -$wb['limit_mailmailinglist_txt'] = 'Max. Anzahl an Mailinglisten'; -$wb['limit_mailaliasdomain_txt'] = 'Max. Anzahl an E-Mail Domainaliases'; -$wb['limit_mailmailinglist_error_notint'] = 'Das Mailinglisten Limit muss eine Zahl sein.'; -$wb['limit_openvz_vm_txt'] = 'Max. Anzahl an virtuellen Servern'; -$wb['limit_openvz_vm_template_id_txt'] = 'Template für virtuelle Server erzwingen'; -$wb['limit_openvz_vm_error_notint'] = 'Das Limit virtueller Server muss eine Zahl sein.'; -$wb['web_php_options_notempty'] = 'Keine PHP Option ausgewählt. Wähle mindestens eine PHP Option.'; -$wb['ssh_chroot_notempty'] = 'Keine SSH Chroot-Option ausgewählt. Wähle mindestens eine SSH Option.'; -$wb['username_error_collision'] = 'Der Benutzername sollte nicht mit dem Wort -web- oder -web- gefolgt von einer Nummer anfangen.'; -$wb['web_limits_txt'] = 'Web Limits'; -$wb['email_limits_txt'] = 'E-Mail Limits'; -$wb['database_limits_txt'] = 'Datenbank Limits'; -$wb['cron_job_limits_txt'] = 'Cronjob Limits'; -$wb['dns_limits_txt'] = 'DNS Limits'; -$wb['virtualization_limits_txt'] = 'Virtualisierungs Limits'; -$wb['generate_password_txt'] = 'Passwort erzeugen'; -$wb['repeat_password_txt'] = 'Passwort wiederholen'; -$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; -$wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; -$wb['email_error_isemail'] = 'Please enter a valid email address.'; +$wb['limit_maildomain_txt'] = "Max. Anzahl an E-Mail Domains"; +$wb['limit_mailbox_txt'] = "Max. Anzahl an Mailboxen"; +$wb['limit_mailalias_txt'] = "Max. Anzahl an E-Mail Aliases"; +$wb['limit_mailforward_txt'] = "Max. Anzahl an E-Mail Weiterleitungen"; +$wb['limit_mailcatchall_txt'] = "Max. Anzahl an E-Mail Catchall Konten"; +$wb['limit_mailrouting_txt'] = "Max. Anzahl an E-Mail Routen"; +$wb['limit_mailfilter_txt'] = "Max. Anzahl an E-Mail Filtern"; +$wb['limit_fetchmail_txt'] = "Max. Anzahl an Fetchmail Konten"; +$wb['limit_mailquota_txt'] = "Mailbox Beschränkung"; +$wb['limit_spamfilter_wblist_txt'] = "Max. Anzahl an White-/Blacklist Filter"; +$wb['limit_spamfilter_user_txt'] = "Max. Anzahl an Spamfilter Benutzern"; +$wb['limit_spamfilter_policy_txt'] = "Max. Anzahl an Spamfilter Richtlinien"; +$wb['default_mailserver_txt'] = "Standardmailserver"; +$wb['company_name_txt'] = "Firmenname"; +$wb['contact_name_txt'] = "Kontakt"; +$wb['username_txt'] = "Benutzername"; +$wb['password_txt'] = "Passwort"; +$wb['password_strength_txt'] = "Passwortkomplexität"; +$wb['language_txt'] = "Sprache"; +$wb['usertheme_txt'] = "Oberflächen Design"; +$wb['street_txt'] = "Straße"; +$wb['zip_txt'] = "PLZ"; +$wb['city_txt'] = "Ort"; +$wb['state_txt'] = "Bundesland"; +$wb['country_txt'] = "Land"; +$wb['telephone_txt'] = "Telefon"; +$wb['mobile_txt'] = "Mobiltelefon"; +$wb['fax_txt'] = "Fax"; +$wb['email_txt'] = "E-Mail"; +$wb['internet_txt'] = "Internet"; +$wb['icq_txt'] = "ICQ"; +$wb['notes_txt'] = "Notizen"; +$wb['company_txt'] = "Firma"; +$wb['title_txt'] = "Titel"; +$wb['firstname_txt'] = "Vorname"; +$wb['surname_txt'] = "Nachname"; +$wb['limit_domain_txt'] = "Max. Anzahl an Domains"; +$wb['limit_subdomain_txt'] = "Max. Anzahl an Subdomains"; +$wb['limit_webquota_txt'] = "Max. Speicherplatzbeschränkung"; +$wb['limit_database_txt'] = "Max. Anzahl an Datenbanken"; +$wb['limit_cron_txt'] = "Max. Anzahl an Cronjobs"; +$wb['limit_cron_type_txt'] = "Erlaubter Cronjob Typen (chrooted und full erlauben auch url)"; +$wb['limit_cron_frequency_txt'] = "Min. Abstand zwischen Ausführungen"; +$wb['ip_address_txt'] = "IP Adresse"; +$wb['limit_client_error_notint'] = "Das Subkunden Limit muss eine Zahl sein."; +$wb['firstname_error_empty'] = "Vorname ist leer."; +$wb['contact_error_empty'] = "Kontakt ist leer."; +$wb['default_webserver_txt'] = "Standardwebserver"; +$wb['limit_web_domain_txt'] = "Max. Anzahl an Webdomains"; +$wb['limit_web_aliasdomain_txt'] = "Max. Anzahl an Webaliasdomains"; +$wb['limit_web_subdomain_txt'] = "Max. Anzahl an Websubdomains"; +$wb['limit_ftp_user_txt'] = "Max. Anzahl an FTP Benutzern"; +$wb['default_dnsserver_txt'] = "Standard DNS Server"; +$wb['limit_dns_zone_txt'] = "Max. Anzahl an DNS Zonen"; +$wb['limit_dns_record_txt'] = "Max. Anzahl an DNS Einträgen"; +$wb['limit_shell_user_txt'] = "Max. Anzahl an Shell Benutzern"; +$wb['limit_client_txt'] = "Max. Anzahl an Kunden"; +$wb['username_error_empty'] = "Benutzername ist leer."; +$wb['username_error_unique'] = "Der Benutzername muss einzigartig sein."; +$wb['limit_maildomain_error_notint'] = "Das E-Mail Domain Limit muss eine Nummer sein."; +$wb['limit_mailbox_error_notint'] = "Das Mailbox Limit muss eine Nummer sein."; +$wb['limit_mailalias_error_notint'] = "Das E-Mail Alias Limit muss eine Zahl sein."; +$wb['limit_mailforward_error_notint'] = "Das E-Mail Weiterleitungs Limit muss eine Zahl sein."; +$wb['limit_mailcatchall_error_notint'] = "Das E-Mail Catchall Limit muss eine Zahl sein."; +$wb['limit_mailrouting_error_notint'] = "Das E-Mail Routing Limit muss eine Zahl sein."; +$wb['limit_mailfilter_error_notint'] = "Das E-Mail Filter Limit muss eine Zahl sein."; +$wb['limit_mailfetchmail_error_notint'] = "Das Fetchmail Limit muss eine Zahl sein."; +$wb['limit_mailquota_error_notint'] = "Das E-Mail Beschräkungs Limit muss eine Zahl sein."; +$wb['limit_spamfilter_wblist_error_notint'] = "Das Spamfilter White-/Blacklist Limit muss eine Zahl sein."; +$wb['limit_spamfilter_user_error_notint'] = "Das Spamfilter Benutzer Limit muss eine Zahl sein."; +$wb['limit_spamfilter_policy_error_notint'] = "Das Spamfilter Richtlinien Limit muss eine Zahl sein."; +$wb['limit_web_domain_error_notint'] = "Das Webseiten Limit muss eine Zahl sein."; +$wb['limit_web_aliasdomain_error_notint'] = "Das Webseiten Aliasdomain Limit muss eine Zahl sein."; +$wb['limit_web_subdomain_error_notint'] = "Das Webseiten Subdomain Limit muss eine Zahl sein."; +$wb['limit_ftp_user_error_notint'] = "Das FTP Benutzer Limit muss eine Zahl sein."; +$wb['limit_shell_user_error_notint'] = "Das Shell Benutzer Limit muss eine Zahl sein."; +$wb['limit_dns_zone_error_notint'] = "Das DNS Einträge Limit muss eine Zahl sein."; +$wb['default_dbserver_txt'] = "Standarddatenbankserver"; +$wb['limit_database_error_notint'] = "Das Datenbank Limit muss eine Zahl sein."; +$wb['limit_cron_error_notint'] = "Das Cronjob Limit muss eine Zahl sein."; +$wb['limit_cron_error_frequency'] = "Das Cronjob Intervall Limit muss eine Zahl sein."; +$wb['username_error_regex'] = "Der Benutzername enthält ungültige Zeichen."; +$wb['template_master_txt'] = "Mastervorlage"; +$wb['template_additional_txt'] = "Add-Ons"; +$wb['add_additional_template_txt'] = "Zusätzliches Template hinzufügen"; +$wb['delete_additional_template_txt'] = "Zusätzliches Template löschen"; +$wb['ssh_chroot_txt'] = "SSH Chroot Optionen"; +$wb['web_php_options_txt'] = "PHP Optionen"; +$wb['limit_cgi_txt'] = "CGI verfügbar"; +$wb['limit_ssi_txt'] = "SSI verfügbar"; +$wb['limit_perl_txt'] = "Perl verfügbar"; +$wb['limit_ruby_txt'] = "Ruby verfügbar"; +$wb['limit_python_txt'] = "Python verfügbar"; +$wb['force_suexec_txt'] = "SuEXEC erzwungen"; +$wb['limit_hterror_txt'] = "Eigene Fehlerseiten verfügbar"; +$wb['limit_wildcard_txt'] = "Wildcard Subdomain verfügbar"; +$wb['limit_ssl_txt'] = "SSL verfügbar"; +$wb['limit_client_error'] = "Die maximale Anzahl an Kunden wurde erreicht."; +$wb['limit_client_error_positive'] = "Die Anzahl an Kunden muss > 0 sein"; +$wb['limit_web_quota_txt'] = "Speicherplatzbeschränkung"; +$wb['limit_traffic_quota_txt'] = "Transfervolumenbeschränkung"; +$wb['limit_trafficquota_error_notint'] = "Transfervolumenbeschränkung muss eine Zahl sein."; +$wb['limit_dns_slave_zone_txt'] = "Max. Anzahl an Secondary DNS Zonen"; +$wb['limit_dns_slave_zone_error_notint'] = "Das Secondary DNS Zonen Limit muss eine Zahl sein."; +$wb['limit_dns_record_error_notint'] = "Das DNS Eintrag Limit muss eine Zahl sein."; +$wb['customer_no_txt'] = "Kundennummer"; +$wb['vat_id_txt'] = "USt-ID"; +$wb['required_fields_txt'] = "* Benötigte Felder"; +$wb['limit_webdav_user_txt'] = "Max. Anzahl an WebDAV Benutzern"; +$wb['limit_webdav_user_error_notint'] = "Das WebDAV Benutzer Limit muss eine Zahl sein."; +$wb['limit_mailmailinglist_txt'] = "Max. Anzahl an Mailinglisten"; +$wb['limit_mailaliasdomain_txt'] = "Max. Anzahl an E-Mail Domainaliases"; +$wb['limit_mailmailinglist_error_notint'] = "Das Mailinglisten Limit muss eine Zahl sein."; +$wb['limit_openvz_vm_txt'] = "Max. Anzahl an virtuellen Servern"; +$wb['limit_openvz_vm_template_id_txt'] = "Template für virtuelle Server erzwingen"; +$wb['limit_openvz_vm_error_notint'] = "Das Limit virtueller Server muss eine Zahl sein."; +$wb['web_php_options_notempty'] = "Keine PHP Option ausgewählt. Wähle mindestens eine PHP Option."; +$wb['ssh_chroot_notempty'] = "Keine SSH Chroot-Option ausgewählt. Wähle mindestens eine SSH Option."; +$wb['username_error_collision'] = "Der Benutzername sollte nicht mit dem Wort -web- oder -web- gefolgt von einer Nummer anfangen."; +$wb['web_limits_txt'] = "Web Limits"; +$wb['email_limits_txt'] = "E-Mail Limits"; +$wb['database_limits_txt'] = "Datenbank Limits"; +$wb['cron_job_limits_txt'] = "Cronjob Limits"; +$wb['dns_limits_txt'] = "DNS Limits"; +$wb['virtualization_limits_txt'] = "Virtualisierungs Limits"; +$wb['generate_password_txt'] = "Passwort erzeugen"; +$wb['repeat_password_txt'] = "Passwort wiederholen"; +$wb['password_mismatch_txt'] = "Die Passwörter stimmen nicht überein."; +$wb['password_match_txt'] = "Die Passwörter stimmen überein."; +$wb["customer_no_error_unique"] = 'Die Kundennummer muß einzigartig sein (oder leer).'; ?> + diff --git a/interface/web/client/lib/lang/de_resellers_list.lng b/interface/web/client/lib/lang/de_resellers_list.lng index f9084e0eb..b899434ee 100644 --- a/interface/web/client/lib/lang/de_resellers_list.lng +++ b/interface/web/client/lib/lang/de_resellers_list.lng @@ -7,3 +7,4 @@ $wb['city_txt'] = 'Ort'; $wb['country_txt'] = 'Land'; $wb['add_new_record_txt'] = 'Neuen Reseller hinzufügen'; ?> + diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng index 38946a48c..1334dc4ca 100644 --- a/interface/web/client/lib/lang/en_client.lng +++ b/interface/web/client/lib/lang/en_client.lng @@ -139,4 +139,5 @@ $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; $wb['email_error_isemail'] = 'Please enter a valid email address.'; +$wb["customer_no_error_unique"] = 'The customer no. must be unique (or empty).'; ?> diff --git a/interface/web/client/lib/lang/en_reseller.lng b/interface/web/client/lib/lang/en_reseller.lng index bc2651550..f23cd1896 100644 --- a/interface/web/client/lib/lang/en_reseller.lng +++ b/interface/web/client/lib/lang/en_reseller.lng @@ -131,4 +131,5 @@ $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; $wb['email_error_isemail'] = 'Please enter a valid email address.'; +$wb["customer_no_error_unique"] = 'The customer no. must be unique (or empty).'; ?> diff --git a/interface/web/client/lib/module.conf.php b/interface/web/client/lib/module.conf.php index 233d4f673..f0564f126 100644 --- a/interface/web/client/lib/module.conf.php +++ b/interface/web/client/lib/module.conf.php @@ -82,6 +82,7 @@ if ($settings['use_domain_module'] == 'y') { unset($items); } +/* if($_SESSION["s"]["user"]["typ"] == 'admin'){ $items[] = array( 'title' => "Interface Settings", 'target' => 'content', @@ -95,4 +96,5 @@ $module["nav"][] = array( 'title' => 'Reseller Panel', unset($items); } +*/ ?> \ No newline at end of file diff --git a/interface/web/dashboard/lib/lang/de.lng b/interface/web/dashboard/lib/lang/de.lng index debf75413..896b1f147 100644 --- a/interface/web/dashboard/lib/lang/de.lng +++ b/interface/web/dashboard/lib/lang/de.lng @@ -2,3 +2,4 @@ $wb['welcome_user_txt'] = 'Herzlich Willkommen %s'; $wb['available_modules_txt'] = 'Verfügbare Module'; ?> + diff --git a/interface/web/dashboard/lib/lang/de_dashlet_limits.lng b/interface/web/dashboard/lib/lang/de_dashlet_limits.lng index fd6fd93a2..efa5da386 100644 --- a/interface/web/dashboard/lib/lang/de_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/de_dashlet_limits.lng @@ -1,30 +1,31 @@ + diff --git a/interface/web/dashboard/lib/lang/de_dashlet_modules.lng b/interface/web/dashboard/lib/lang/de_dashlet_modules.lng index 3d2c6c651..d898ac6ec 100644 --- a/interface/web/dashboard/lib/lang/de_dashlet_modules.lng +++ b/interface/web/dashboard/lib/lang/de_dashlet_modules.lng @@ -1,3 +1,4 @@ + diff --git a/interface/web/designer/lib/lang/de.lng b/interface/web/designer/lib/lang/de.lng index acb6c3546..29f4a51ef 100644 --- a/interface/web/designer/lib/lang/de.lng +++ b/interface/web/designer/lib/lang/de.lng @@ -1,2 +1,3 @@ + diff --git a/interface/web/designer/lib/lang/de_form_edit.lng b/interface/web/designer/lib/lang/de_form_edit.lng index 74bf458d9..4eb8e9309 100644 --- a/interface/web/designer/lib/lang/de_form_edit.lng +++ b/interface/web/designer/lib/lang/de_form_edit.lng @@ -22,3 +22,4 @@ $wb['auth_preset_perm_user_txt'] = 'Benutzerberechtigungen'; $wb['auth_preset_perm_group_txt'] = 'Gruppenberechtigungen'; $wb['auth_preset_perm_other_txt'] = 'andere Berechtigungen'; ?> + diff --git a/interface/web/designer/lib/lang/de_form_list.lng b/interface/web/designer/lib/lang/de_form_list.lng index 998a64f70..853ce1000 100644 --- a/interface/web/designer/lib/lang/de_form_list.lng +++ b/interface/web/designer/lib/lang/de_form_list.lng @@ -5,3 +5,4 @@ $wb['module_txt'] = 'Modul'; $wb['title_txt'] = 'Bezeichnung'; $wb['description_txt'] = 'Beschreibung'; ?> + diff --git a/interface/web/designer/lib/lang/de_form_show.lng b/interface/web/designer/lib/lang/de_form_show.lng index b19fd3445..c4b2c1d19 100644 --- a/interface/web/designer/lib/lang/de_form_show.lng +++ b/interface/web/designer/lib/lang/de_form_show.lng @@ -16,3 +16,4 @@ $wb['module_del_txt'] = 'Modul und alle Unterverzeichnisse löschen?'; $wb['menu_del_txt'] = 'Menü samt Menüeinträgen löschen?'; $wb['item_del_txt'] = 'Menüeintrag löschen?'; ?> + diff --git a/interface/web/designer/lib/lang/de_module_edit.lng b/interface/web/designer/lib/lang/de_module_edit.lng index 6eacd64b1..09d9f390d 100644 --- a/interface/web/designer/lib/lang/de_module_edit.lng +++ b/interface/web/designer/lib/lang/de_module_edit.lng @@ -10,3 +10,4 @@ $wb['cancel_txt'] = 'Abbrechen'; $wb['header_txt'] = 'Moduleigenschaften'; $wb['description_txt'] = 'Beschreibung'; ?> + diff --git a/interface/web/designer/lib/lang/de_module_list.lng b/interface/web/designer/lib/lang/de_module_list.lng index 604063020..a09b5139b 100644 --- a/interface/web/designer/lib/lang/de_module_list.lng +++ b/interface/web/designer/lib/lang/de_module_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Backend Module'; $wb['module_txt'] = 'Modul'; $wb['title_txt'] = 'Bezeichnung'; ?> + diff --git a/interface/web/designer/lib/lang/de_module_nav_edit.lng b/interface/web/designer/lib/lang/de_module_nav_edit.lng index d5142f03c..25e2085cc 100644 --- a/interface/web/designer/lib/lang/de_module_nav_edit.lng +++ b/interface/web/designer/lib/lang/de_module_nav_edit.lng @@ -4,3 +4,4 @@ $wb['header_txt'] = 'Navigation Eigenschaften'; $wb['save_txt'] = 'Speichern'; $wb['cancel_txt'] = 'Abbrechen'; ?> + diff --git a/interface/web/designer/lib/lang/de_module_nav_item_edit.lng b/interface/web/designer/lib/lang/de_module_nav_item_edit.lng index 8c0c33c1a..6353a7347 100644 --- a/interface/web/designer/lib/lang/de_module_nav_item_edit.lng +++ b/interface/web/designer/lib/lang/de_module_nav_item_edit.lng @@ -6,3 +6,4 @@ $wb['header_txt'] = 'Navigation Eigenschaften'; $wb['save_txt'] = 'Speichern'; $wb['cancel_txt'] = 'Abbrechen'; ?> + diff --git a/interface/web/designer/lib/lang/de_module_show.lng b/interface/web/designer/lib/lang/de_module_show.lng index f4b2ad11f..d0c4d4b41 100644 --- a/interface/web/designer/lib/lang/de_module_show.lng +++ b/interface/web/designer/lib/lang/de_module_show.lng @@ -14,3 +14,4 @@ $wb['module_del_txt'] = 'Wollen Sie das Modul und alle im Modul angelegten Datei $wb['menu_del_txt'] = 'Wollen Sie das Menü mit allen Untereinträgen löschen?'; $wb['item_del_txt'] = 'Wollen Sie den Menüeintrag löschen?'; ?> + diff --git a/interface/web/dns/form/dns_soa.tform.php b/interface/web/dns/form/dns_soa.tform.php index 00c2aaceb..4481d5aa4 100644 --- a/interface/web/dns/form/dns_soa.tform.php +++ b/interface/web/dns/form/dns_soa.tform.php @@ -225,10 +225,14 @@ $form["tabs"]['dns_soa'] = array ( 'also_notify' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', -// 'validators' => array ( 0 => array ( 'type' => 'ISIPV4', + 'validators' => array ( 0 => array ( 'type' => 'REGEX', + 'regex' => '/^(((25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})\.){3}(25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})(;){0,1}(\ ){0,1}){0,10}$/', + 'errmsg'=> 'also_notify_error_regex' + ), +// 0 => array ( 'type' => 'ISIPV4', // 'errmsg'=> 'also_notify_error_regex' // ), -// ), + ), 'default' => '', 'value' => '', 'width' => '30', diff --git a/interface/web/dns/lib/lang/de.lng b/interface/web/dns/lib/lang/de.lng index 7d5f345e8..6d5146afc 100644 --- a/interface/web/dns/lib/lang/de.lng +++ b/interface/web/dns/lib/lang/de.lng @@ -20,3 +20,4 @@ $wb['Templates'] = 'Vorlagen'; $wb['Secondary Zones'] = 'Secondary DNS Zonen'; $wb['Import Zone File'] = 'Zone File Import'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_a.lng b/interface/web/dns/lib/lang/de_dns_a.lng index 2e21543e8..2b9ba55c2 100644 --- a/interface/web/dns/lib/lang/de_dns_a.lng +++ b/interface/web/dns/lib/lang/de_dns_a.lng @@ -14,3 +14,4 @@ $wb['data_error_empty'] = 'IPv4 Adresse ist leer'; $wb['data_error_regex'] = 'IPv4 Adressen-Format ist ungültig'; $wb['data_error_duplicate'] = 'Doppelter A oder CNAME Eintrag'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_a_list.lng b/interface/web/dns/lib/lang/de_dns_a_list.lng index 6e8f19509..0fc441992 100644 --- a/interface/web/dns/lib/lang/de_dns_a_list.lng +++ b/interface/web/dns/lib/lang/de_dns_a_list.lng @@ -13,3 +13,4 @@ $wb['page_txt'] = 'Seite'; $wb['page_of_txt'] = 'von'; $wb['delete_confirmation'] = 'Wollen Sie den Datensatz wirklich löschen?'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_aaaa.lng b/interface/web/dns/lib/lang/de_dns_aaaa.lng index 854d623cf..c2d0e35f5 100644 --- a/interface/web/dns/lib/lang/de_dns_aaaa.lng +++ b/interface/web/dns/lib/lang/de_dns_aaaa.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Der Hostname hat das falsche Format.'; $wb['data_error_empty'] = 'IPv6 Adresse ist leer'; $wb['data_error_regex'] = 'IPv6 Adressen Format ist ungültig'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_alias.lng b/interface/web/dns/lib/lang/de_dns_alias.lng index e950909bb..48da14fcf 100644 --- a/interface/web/dns/lib/lang/de_dns_alias.lng +++ b/interface/web/dns/lib/lang/de_dns_alias.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Der Hostname hat ein falsches Format.'; $wb['data_error_empty'] = 'Ziel Hostname ist leer'; $wb['data_error_regex'] = 'Ziel Hostname Format ist ungültig'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_cname.lng b/interface/web/dns/lib/lang/de_dns_cname.lng index a07419485..48efdef90 100644 --- a/interface/web/dns/lib/lang/de_dns_cname.lng +++ b/interface/web/dns/lib/lang/de_dns_cname.lng @@ -14,3 +14,4 @@ $wb['data_error_empty'] = 'Ziel Hostname ist leer'; $wb['data_error_regex'] = 'Ziel Hostname Format ist ungültig'; $wb['data_error_duplicate'] = 'Doppelter A oder CNAME Eintrag'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_hinfo.lng b/interface/web/dns/lib/lang/de_dns_hinfo.lng index 5fb182c98..e0393c6be 100644 --- a/interface/web/dns/lib/lang/de_dns_hinfo.lng +++ b/interface/web/dns/lib/lang/de_dns_hinfo.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Der Hostname hat ein falsches Format.'; $wb['data_error_empty'] = 'Host Information ist leer'; $wb['data_error_regex'] = 'Host Information Format ist ungültig'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_import.lng b/interface/web/dns/lib/lang/de_dns_import.lng index 63670962a..559f1bc74 100644 --- a/interface/web/dns/lib/lang/de_dns_import.lng +++ b/interface/web/dns/lib/lang/de_dns_import.lng @@ -12,3 +12,4 @@ $wb['domain_field_desc_txt'] = 'Kann freigelassen werden, falls der Dateiname od $wb['title'] = 'Zone File importieren'; $wb['no_file_uploaded_error'] = 'Keine Datei hochgeladen'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_mx.lng b/interface/web/dns/lib/lang/de_dns_mx.lng index 2968a1322..d9a77c513 100644 --- a/interface/web/dns/lib/lang/de_dns_mx.lng +++ b/interface/web/dns/lib/lang/de_dns_mx.lng @@ -14,3 +14,4 @@ $wb['name_error_regex'] = 'Der Hostname hat das falsche Format.'; $wb['data_error_empty'] = 'Mailserver Hostname ist leer'; $wb['data_error_regex'] = 'Mailserver Hostname Format ist ungültig'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_ns.lng b/interface/web/dns/lib/lang/de_dns_ns.lng index 01662d2f8..0f61c1693 100644 --- a/interface/web/dns/lib/lang/de_dns_ns.lng +++ b/interface/web/dns/lib/lang/de_dns_ns.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Die Zone hat ein falsches Format.'; $wb['data_error_empty'] = 'Nameserver ist leer.'; $wb['data_error_regex'] = 'Nameserver Format ist ungültig.'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_ptr.lng b/interface/web/dns/lib/lang/de_dns_ptr.lng index 020c7a328..5ff80e322 100644 --- a/interface/web/dns/lib/lang/de_dns_ptr.lng +++ b/interface/web/dns/lib/lang/de_dns_ptr.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Der Name hat das falsche Format.'; $wb['data_error_empty'] = 'Kanonischer Hostname ist leer'; $wb['data_error_regex'] = 'Kanonischer Hostname Format ist ungültig'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_rp.lng b/interface/web/dns/lib/lang/de_dns_rp.lng index 8a398d483..e7cd52850 100644 --- a/interface/web/dns/lib/lang/de_dns_rp.lng +++ b/interface/web/dns/lib/lang/de_dns_rp.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Der Hostname hat das falsche Format.'; $wb['data_error_empty'] = 'Kontaktperson Feld leer'; $wb['data_error_regex'] = 'Kontaktperson Format ungültig'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_slave.lng b/interface/web/dns/lib/lang/de_dns_slave.lng index 724d8a3b2..241290d7b 100644 --- a/interface/web/dns/lib/lang/de_dns_slave.lng +++ b/interface/web/dns/lib/lang/de_dns_slave.lng @@ -15,3 +15,4 @@ $wb['ns_error_regex'] = 'NS hat ein ungültiges Format.'; $wb['eg_domain_tld'] = 'Format: domain.tld.'; $wb['ipv4_form_txt'] = 'IPv4 Format: 1.2.3.4'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_slave_list.lng b/interface/web/dns/lib/lang/de_dns_slave_list.lng index 05dee329b..0d80a1b4b 100644 --- a/interface/web/dns/lib/lang/de_dns_slave_list.lng +++ b/interface/web/dns/lib/lang/de_dns_slave_list.lng @@ -7,3 +7,4 @@ $wb['ns_txt'] = 'NS'; $wb['add_new_record_txt'] = 'Neue Secondary DNS Zone hinzufügen'; $wb['eg_domain_tld'] = 'Format: domain.tld.'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_soa.lng b/interface/web/dns/lib/lang/de_dns_soa.lng index 6fdc87565..9c2f69759 100644 --- a/interface/web/dns/lib/lang/de_dns_soa.lng +++ b/interface/web/dns/lib/lang/de_dns_soa.lng @@ -35,3 +35,4 @@ $wb['expire_range_error'] = 'Min. Expire ist 60 Sekunden.'; $wb['minimum_range_error'] = 'Min. Minimum ist 60 Sekunden.'; $wb['ttl_range_error'] = 'Min. TTL ist 60 Sekunden.'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_soa_list.lng b/interface/web/dns/lib/lang/de_dns_soa_list.lng index 8281fbd22..a6df1ee4d 100644 --- a/interface/web/dns/lib/lang/de_dns_soa_list.lng +++ b/interface/web/dns/lib/lang/de_dns_soa_list.lng @@ -8,3 +8,4 @@ $wb['mbox_txt'] = 'E-Mail'; $wb['add_new_record_txt'] = 'Neue DNS Zone (SOA) hinzufügen'; $wb['add_new_record_wizard_txt'] = 'Neue DNS Zone per Assistent hinzufügen'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_srv.lng b/interface/web/dns/lib/lang/de_dns_srv.lng index 91eba844a..7dbeb8e81 100644 --- a/interface/web/dns/lib/lang/de_dns_srv.lng +++ b/interface/web/dns/lib/lang/de_dns_srv.lng @@ -17,3 +17,4 @@ $wb['data_error_regex'] = 'Servereintrag-Format ungültig'; $wb['srv_error_regex'] = 'Ungültiges Server Record Format. Der ServerRecord muss 3 Text Strings getrennt durch Leerzeichen beinhalten.'; $wb['aux_txt'] = 'Priorität'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_template.lng b/interface/web/dns/lib/lang/de_dns_template.lng index 33d1090cb..77cf99618 100644 --- a/interface/web/dns/lib/lang/de_dns_template.lng +++ b/interface/web/dns/lib/lang/de_dns_template.lng @@ -4,3 +4,4 @@ $wb['fields_txt'] = 'Felder'; $wb['template_txt'] = 'Vorlage'; $wb['visible_txt'] = 'Sichtbar'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_template_list.lng b/interface/web/dns/lib/lang/de_dns_template_list.lng index a0f2d9a7d..3557292fa 100644 --- a/interface/web/dns/lib/lang/de_dns_template_list.lng +++ b/interface/web/dns/lib/lang/de_dns_template_list.lng @@ -4,3 +4,4 @@ $wb['visible_txt'] = 'Sichtbar'; $wb['name_txt'] = 'Name'; $wb['add_new_record_txt'] = 'Neuen Eintrag hinzufügen'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_txt.lng b/interface/web/dns/lib/lang/de_dns_txt.lng index c0638679a..39a5dbfeb 100644 --- a/interface/web/dns/lib/lang/de_dns_txt.lng +++ b/interface/web/dns/lib/lang/de_dns_txt.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Der Hostname hat das falsche Format.'; $wb['data_error_empty'] = 'Text ist leer'; $wb['data_error_regex'] = 'Textformat ungültig'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_wizard.lng b/interface/web/dns/lib/lang/de_dns_wizard.lng index a9a284f65..e2d77387e 100644 --- a/interface/web/dns/lib/lang/de_dns_wizard.lng +++ b/interface/web/dns/lib/lang/de_dns_wizard.lng @@ -36,3 +36,4 @@ $wb['globalsearch_noresults_limit_txt'] = '0 Treffer'; $wb['globalsearch_searchfield_watermark_txt'] = 'Suche'; $wb['globalsearch_suggestions_text_txt'] = 'Vorschläge'; ?> + diff --git a/interface/web/help/lib/lang/de.lng b/interface/web/help/lib/lang/de.lng index f9deb2066..606b4f039 100644 --- a/interface/web/help/lib/lang/de.lng +++ b/interface/web/help/lib/lang/de.lng @@ -12,3 +12,4 @@ $wb['Manage Sections'] = 'Kategorien verwalten'; $wb['Add a Question & Answer Pair'] = 'Neues Frage/Antwort Paar hinzufügen'; $wb['Manage Questions'] = 'Fragen verwalten'; ?> + diff --git a/interface/web/help/lib/lang/de_faq_form.lng b/interface/web/help/lib/lang/de_faq_form.lng index 35042fa12..90c6a4437 100644 --- a/interface/web/help/lib/lang/de_faq_form.lng +++ b/interface/web/help/lib/lang/de_faq_form.lng @@ -4,3 +4,4 @@ $wb['faq_question_txt'] = 'Frage'; $wb['faq_answer_txt'] = 'Antwort'; $wb['faq_section_txt'] = 'Kategorie'; ?> + diff --git a/interface/web/help/lib/lang/de_faq_manage_questions_list.lng b/interface/web/help/lib/lang/de_faq_manage_questions_list.lng index b47a69589..f3be08c85 100644 --- a/interface/web/help/lib/lang/de_faq_manage_questions_list.lng +++ b/interface/web/help/lib/lang/de_faq_manage_questions_list.lng @@ -7,3 +7,4 @@ $wb['faq_sections_txt'] = 'Kategorie'; $wb['faq_faq_questions_txt'] = 'Frequently Asked Questions'; $wb['faq_new_question_txt'] = 'Neues Frage/Antwort Paar hinzufügen'; ?> + diff --git a/interface/web/help/lib/lang/de_faq_sections_form.lng b/interface/web/help/lib/lang/de_faq_sections_form.lng index 873dab2c1..f9f7cd422 100644 --- a/interface/web/help/lib/lang/de_faq_sections_form.lng +++ b/interface/web/help/lib/lang/de_faq_sections_form.lng @@ -1,3 +1,4 @@ + diff --git a/interface/web/help/lib/lang/de_help_faq_list.lng b/interface/web/help/lib/lang/de_help_faq_list.lng index 3a240f403..66fd26c6b 100644 --- a/interface/web/help/lib/lang/de_help_faq_list.lng +++ b/interface/web/help/lib/lang/de_help_faq_list.lng @@ -1,3 +1,4 @@ + diff --git a/interface/web/help/lib/lang/de_help_faq_sections_list.lng b/interface/web/help/lib/lang/de_help_faq_sections_list.lng index 190f85a31..5d52ec809 100644 --- a/interface/web/help/lib/lang/de_help_faq_sections_list.lng +++ b/interface/web/help/lib/lang/de_help_faq_sections_list.lng @@ -6,3 +6,4 @@ $wb['faq_sections_txt'] = 'Kategorie'; $wb['faq_faq_sections_txt'] = 'FAQ Kategorie'; $wb['faq_new_section_txt'] = 'Neue Kategorie hinzufügen'; ?> + diff --git a/interface/web/help/lib/lang/de_support_message.lng b/interface/web/help/lib/lang/de_support_message.lng index 60d3c0c10..0e34d252f 100644 --- a/interface/web/help/lib/lang/de_support_message.lng +++ b/interface/web/help/lib/lang/de_support_message.lng @@ -6,3 +6,4 @@ $wb['message_txt'] = 'Nachricht'; $wb['tstamp_txt'] = 'Zeitpunkt'; $wb['reply_txt'] = 'Antworten'; ?> + diff --git a/interface/web/help/lib/lang/de_support_message_list.lng b/interface/web/help/lib/lang/de_support_message_list.lng index 72734756a..88fb3bad2 100644 --- a/interface/web/help/lib/lang/de_support_message_list.lng +++ b/interface/web/help/lib/lang/de_support_message_list.lng @@ -4,3 +4,4 @@ $wb['sender_id_txt'] = 'Absender'; $wb['subject_txt'] = 'Betreff'; $wb['add_new_record_txt'] = 'Neue Supportnachricht erstellen'; ?> + diff --git a/interface/web/js/jquery.tipsy.js b/interface/web/js/jquery.tipsy.js index e6f6600f6..efe9612e4 100644 --- a/interface/web/js/jquery.tipsy.js +++ b/interface/web/js/jquery.tipsy.js @@ -249,18 +249,18 @@ var elheight = this.element.height(); var input, self = this, - select = this.element.hide(), + select = this.element, selected = select.children( ":selected" ), value = selected.val() ? selected.text() : "", wrapper = this.wrapper = $( "" ) .addClass( "ui-combobox" ) .insertAfter( select ); - input = $( "" ) - .appendTo( wrapper ) + input = $( "" ).css( { "width": (select.is(':visible') ? (elwidth > 15 ? elwidth - 15 : 1) : 350), "height": (elheight > 0 ? elheight : 16) }); + select.hide(); + input.appendTo( wrapper ) .val( value ) .addClass( "ui-state-default ui-combobox-input" ) - .css( { "width": (elwidth > 15 ? elwidth - 15 : 1), "height": elheight }) .autocomplete({ delay: 0, minLength: 0, @@ -269,7 +269,7 @@ response( select.children( "option" ).map(function() { var text = $( this ).text(); //if ( this.value && ( !request.term || matcher.test(text) ) ) - if ( !request.term || matcher.test(text) ) + if ( (!request.term || matcher.test(text)) && $(this).css('display') != 'none' ) return { label: (text == "" ? " " : text.replace( new RegExp( @@ -278,6 +278,7 @@ ")(?![^<>]*>)(?![^&;]+;)", "gi" ), "$1" )), value: text, + class: (select.hasClass('flags') ? 'country-' + $(this).val().toUpperCase() : $(this).attr('class')), option: this }; }) ); @@ -291,6 +292,8 @@ select.onchange( { target: select } ); } else if($(select).attr('onchange')) { eval($(select).attr('onchange')); + } else { + if(!ui.item.internal) $(select).change(); } if (jQuery(".panel #Filter").length > 0) { jQuery(".panel #Filter").trigger('click'); @@ -302,7 +305,7 @@ matchtext = $(this).val(); valid = false; select.children( "option" ).each(function() { - if( ($(this).text() == "" && matchtext == "") || $( this ).text().match( matcher ) ) { + if( (($(this).text() == "" && matchtext == "") || $( this ).text().match( matcher )) && $(this).css('display') != 'none' ) { select.val($(this).val()); this.selected = valid = true; return false; @@ -326,7 +329,7 @@ valid = false, selected = false; select.children( "option" ).each(function() { - if( ($(this).val() == "" && matchtext == "") || $( this ).text().match( matcher ) ) { + if( (($(this).val() == "" && matchtext == "") || $( this ).text().match( matcher )) && $(this).css('display') != 'none' ) { valid = true; selected = $(this); return false; @@ -334,17 +337,36 @@ }); if(!valid) return false; - $(this).autocomplete('option','select').call($(this), event, { item: { option: selected.get(0) } }); + $(this).autocomplete('option','select').call($(this), event, { item: { option: selected.get(0), internal: true } }); } }) .addClass( "ui-widget ui-widget-content ui-corner-left" ); + if(select.hasClass('flags')) input.addClass('flags'); input.data( "autocomplete" )._renderItem = function( ul, item ) { - return $( "
  • " ) + var el = $( "
  • " ) .data( "item.autocomplete", item ) .append( "" + item.label + "" ) .appendTo( ul ); + if(item.class) el.addClass(item.class); + return el; }; + select.change(function(e) { + var matcher = new RegExp( "" + $.ui.autocomplete.escapeRegex( $(this).val() ) + "", "i" ), + matchtext = $(this).val(); + valid = false, + selected = false; + select.children( "option" ).each(function() { + if( (($(this).val() == "" && matchtext == "") || $( this ).text().match( matcher )) && $(this).css('display') != 'none' ) { + valid = true; + selected = $(this); + return false; + } + }); + if(!valid) return false; + + input.val($(this).val()).autocomplete('option','select').call(input, (e ? e : {target: select}), { item: { option: selected.get(0), internal: true } }); + }); $( "" ) .attr( "tabIndex", -1 ) @@ -358,7 +380,7 @@ }) .removeClass( "ui-corner-all" ) .addClass( "ui-corner-right ui-combobox-toggle" ) - .css( { "width": 15, "height": elheight }) + .css( { "width": 15, "height": (elheight > 0 ? elheight : 16) }) .click(function() { // close if already visible if ( input.autocomplete( "widget" ).is( ":visible" ) ) { diff --git a/interface/web/js/uni-form/uni-form.jquery.js b/interface/web/js/uni-form/uni-form.jquery.js index 99ab409d6..f103d1ffe 100644 --- a/interface/web/js/uni-form/uni-form.jquery.js +++ b/interface/web/js/uni-form/uni-form.jquery.js @@ -101,6 +101,7 @@ function DateTime_SetValues(datetime_id, date_obj) unit_obj = $("#"+ datetime_id + "_" + unit_name); if (unit_obj.val() !== null) { unit_obj.val(unit_value); + unit_obj.change(); } }); } \ No newline at end of file diff --git a/interface/web/login/lib/lang/de.lng b/interface/web/login/lib/lang/de.lng index 31d18efb6..86e22d5a5 100644 --- a/interface/web/login/lib/lang/de.lng +++ b/interface/web/login/lib/lang/de.lng @@ -22,3 +22,4 @@ $wb['email_txt'] = 'E-Mail'; $wb['error_maintenance_mode'] = 'Diese ISPConfig Installation wird gerade gewartet. Wir sind in Kürze wieder für Sie da. Vielen Dank für Ihre Geduld.'; $wb['theme_not_compatible'] = 'Das gewählte Design ist mit dieser ISPConfig Version nicht kompatibel. Bitte prüfen Sie, ob ein Update des Themes verfügbar ist.
    Es wurde nun automatisch das Standard Design aktiviert.'; ?> + diff --git a/interface/web/mail/lib/lang/de.lng b/interface/web/mail/lib/lang/de.lng index 07bb98fa3..29e7cbd11 100644 --- a/interface/web/mail/lib/lang/de.lng +++ b/interface/web/mail/lib/lang/de.lng @@ -1,47 +1,49 @@ + diff --git a/interface/web/mail/lib/lang/de_mail_alias.lng b/interface/web/mail/lib/lang/de_mail_alias.lng index 80a9978b5..2a0c5d36e 100644 --- a/interface/web/mail/lib/lang/de_mail_alias.lng +++ b/interface/web/mail/lib/lang/de_mail_alias.lng @@ -1,14 +1,15 @@ + diff --git a/interface/web/mail/lib/lang/de_mail_alias_list.lng b/interface/web/mail/lib/lang/de_mail_alias_list.lng index e741d02b3..7c0c1145a 100644 --- a/interface/web/mail/lib/lang/de_mail_alias_list.lng +++ b/interface/web/mail/lib/lang/de_mail_alias_list.lng @@ -6,3 +6,4 @@ $wb['destination_txt'] = 'Ziel'; $wb['email_txt'] = 'E-Mail Adresse'; $wb['add_new_record_txt'] = 'Neuen E-Mail Alias hinzufügen'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_aliasdomain.lng b/interface/web/mail/lib/lang/de_mail_aliasdomain.lng index 62e12ae65..bf877dafb 100644 --- a/interface/web/mail/lib/lang/de_mail_aliasdomain.lng +++ b/interface/web/mail/lib/lang/de_mail_aliasdomain.lng @@ -1,11 +1,12 @@ + diff --git a/interface/web/mail/lib/lang/de_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/de_mail_aliasdomain_list.lng index e18fa3b85..88a4ae45e 100644 --- a/interface/web/mail/lib/lang/de_mail_aliasdomain_list.lng +++ b/interface/web/mail/lib/lang/de_mail_aliasdomain_list.lng @@ -1,7 +1,8 @@ + diff --git a/interface/web/mail/lib/lang/de_mail_blacklist.lng b/interface/web/mail/lib/lang/de_mail_blacklist.lng index a6ca6dc0e..e249b1957 100644 --- a/interface/web/mail/lib/lang/de_mail_blacklist.lng +++ b/interface/web/mail/lib/lang/de_mail_blacklist.lng @@ -1,9 +1,10 @@ + diff --git a/interface/web/mail/lib/lang/de_mail_blacklist_list.lng b/interface/web/mail/lib/lang/de_mail_blacklist_list.lng index b16990911..03b1b46e7 100644 --- a/interface/web/mail/lib/lang/de_mail_blacklist_list.lng +++ b/interface/web/mail/lib/lang/de_mail_blacklist_list.lng @@ -8,3 +8,4 @@ $wb['recipient_txt'] = 'Empfänger'; $wb['add_new_record_txt'] = 'Neuen Blacklist Eintrag hinzufügen'; $wb['access_txt'] = 'Zugriff'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_content_filter.lng b/interface/web/mail/lib/lang/de_mail_content_filter.lng index 9ea542249..48348b20a 100644 --- a/interface/web/mail/lib/lang/de_mail_content_filter.lng +++ b/interface/web/mail/lib/lang/de_mail_content_filter.lng @@ -7,3 +7,4 @@ $wb['action_txt'] = 'Aktion'; $wb['active_txt'] = 'Aktiv'; $wb['pattern_error_empty'] = 'Zeichenkette ist leer'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_content_filter_list.lng b/interface/web/mail/lib/lang/de_mail_content_filter_list.lng index 126f23ce4..930f1e537 100644 --- a/interface/web/mail/lib/lang/de_mail_content_filter_list.lng +++ b/interface/web/mail/lib/lang/de_mail_content_filter_list.lng @@ -6,3 +6,4 @@ $wb['pattern_txt'] = 'Zeichenkette'; $wb['action_txt'] = 'Aktion'; $wb['add_new_record_txt'] = 'Neuen Inhaltsfilter hinzufügen'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_domain.lng b/interface/web/mail/lib/lang/de_mail_domain.lng index e0bd05131..93fdf4e46 100644 --- a/interface/web/mail/lib/lang/de_mail_domain.lng +++ b/interface/web/mail/lib/lang/de_mail_domain.lng @@ -1,13 +1,14 @@ + diff --git a/interface/web/mail/lib/lang/de_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/de_mail_domain_admin_list.lng index 403bb90fe..3b3ac491e 100644 --- a/interface/web/mail/lib/lang/de_mail_domain_admin_list.lng +++ b/interface/web/mail/lib/lang/de_mail_domain_admin_list.lng @@ -1,8 +1,9 @@ + diff --git a/interface/web/mail/lib/lang/de_mail_domain_catchall.lng b/interface/web/mail/lib/lang/de_mail_domain_catchall.lng index 658139a99..15ae2fc18 100644 --- a/interface/web/mail/lib/lang/de_mail_domain_catchall.lng +++ b/interface/web/mail/lib/lang/de_mail_domain_catchall.lng @@ -1,11 +1,12 @@ + diff --git a/interface/web/mail/lib/lang/de_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/de_mail_domain_catchall_list.lng index 558cb5c9f..7ce05d321 100644 --- a/interface/web/mail/lib/lang/de_mail_domain_catchall_list.lng +++ b/interface/web/mail/lib/lang/de_mail_domain_catchall_list.lng @@ -7,3 +7,4 @@ $wb['server_id_txt'] = 'Server'; $wb['domain_txt'] = 'Domain'; $wb['add_new_record_txt'] = 'Neuen Catchall hinzufügen'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_domain_list.lng b/interface/web/mail/lib/lang/de_mail_domain_list.lng index ff25a5817..a13af2559 100644 --- a/interface/web/mail/lib/lang/de_mail_domain_list.lng +++ b/interface/web/mail/lib/lang/de_mail_domain_list.lng @@ -1,7 +1,8 @@ + diff --git a/interface/web/mail/lib/lang/de_mail_forward.lng b/interface/web/mail/lib/lang/de_mail_forward.lng index fb0e0e7dd..d611a51eb 100644 --- a/interface/web/mail/lib/lang/de_mail_forward.lng +++ b/interface/web/mail/lib/lang/de_mail_forward.lng @@ -1,9 +1,10 @@ + diff --git a/interface/web/mail/lib/lang/de_mail_forward_list.lng b/interface/web/mail/lib/lang/de_mail_forward_list.lng index 99b6ab5ea..01b295061 100644 --- a/interface/web/mail/lib/lang/de_mail_forward_list.lng +++ b/interface/web/mail/lib/lang/de_mail_forward_list.lng @@ -6,3 +6,4 @@ $wb['destination_txt'] = 'Ziel'; $wb['email_txt'] = 'E-Mail'; $wb['add_new_record_txt'] = 'Neue E-Mail Weiterleitung hinzufügen'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_get.lng b/interface/web/mail/lib/lang/de_mail_get.lng index e9c06b519..f634a812f 100644 --- a/interface/web/mail/lib/lang/de_mail_get.lng +++ b/interface/web/mail/lib/lang/de_mail_get.lng @@ -1,18 +1,19 @@ + diff --git a/interface/web/mail/lib/lang/de_mail_get_list.lng b/interface/web/mail/lib/lang/de_mail_get_list.lng index f31bc08f7..ddeba625d 100644 --- a/interface/web/mail/lib/lang/de_mail_get_list.lng +++ b/interface/web/mail/lib/lang/de_mail_get_list.lng @@ -1,9 +1,10 @@ + diff --git a/interface/web/mail/lib/lang/de_mail_mailinglist.lng b/interface/web/mail/lib/lang/de_mail_mailinglist.lng index d854c4930..848ef0848 100644 --- a/interface/web/mail/lib/lang/de_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/de_mail_mailinglist.lng @@ -17,3 +17,4 @@ $wb['repeat_password_txt'] = 'Passwort wiederholen'; $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; $wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/de_mail_mailinglist_list.lng index 3eee785f2..c9959f000 100644 --- a/interface/web/mail/lib/lang/de_mail_mailinglist_list.lng +++ b/interface/web/mail/lib/lang/de_mail_mailinglist_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Mailinglisten'; $wb['domain_txt'] = 'Domain'; $wb['listname_txt'] = 'Listenname'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_relay_recipient.lng b/interface/web/mail/lib/lang/de_mail_relay_recipient.lng index 3c4426030..ee1228194 100644 --- a/interface/web/mail/lib/lang/de_mail_relay_recipient.lng +++ b/interface/web/mail/lib/lang/de_mail_relay_recipient.lng @@ -1,9 +1,10 @@ + diff --git a/interface/web/mail/lib/lang/de_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/de_mail_relay_recipient_list.lng index fc5d6f47c..ec6574a59 100644 --- a/interface/web/mail/lib/lang/de_mail_relay_recipient_list.lng +++ b/interface/web/mail/lib/lang/de_mail_relay_recipient_list.lng @@ -7,3 +7,4 @@ $wb['recipient_txt'] = 'Empfänger'; $wb['add_new_record_txt'] = 'Neuen Relay Empfänger hinzufügen'; $wb['access_txt'] = 'Zugriff'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_spamfilter.lng b/interface/web/mail/lib/lang/de_mail_spamfilter.lng index 4d5c65000..f51fe47ff 100644 --- a/interface/web/mail/lib/lang/de_mail_spamfilter.lng +++ b/interface/web/mail/lib/lang/de_mail_spamfilter.lng @@ -1,17 +1,18 @@ + diff --git a/interface/web/mail/lib/lang/de_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/de_mail_spamfilter_list.lng index 95c7d406a..7ccd9f5ff 100644 --- a/interface/web/mail/lib/lang/de_mail_spamfilter_list.lng +++ b/interface/web/mail/lib/lang/de_mail_spamfilter_list.lng @@ -6,3 +6,4 @@ $wb['server_name_txt'] = 'Servername'; $wb['email_txt'] = 'E-Mail'; $wb['add_new_record_txt'] = 'Neuen Spamfilter Eintrag hinzufügen'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_transport.lng b/interface/web/mail/lib/lang/de_mail_transport.lng index 0f6f973fe..096282629 100644 --- a/interface/web/mail/lib/lang/de_mail_transport.lng +++ b/interface/web/mail/lib/lang/de_mail_transport.lng @@ -1,11 +1,12 @@ + diff --git a/interface/web/mail/lib/lang/de_mail_transport_list.lng b/interface/web/mail/lib/lang/de_mail_transport_list.lng index 4910863b5..c08235b90 100644 --- a/interface/web/mail/lib/lang/de_mail_transport_list.lng +++ b/interface/web/mail/lib/lang/de_mail_transport_list.lng @@ -1,9 +1,10 @@ + diff --git a/interface/web/mail/lib/lang/de_mail_user.lng b/interface/web/mail/lib/lang/de_mail_user.lng index ecbd92e4b..c31708444 100644 --- a/interface/web/mail/lib/lang/de_mail_user.lng +++ b/interface/web/mail/lib/lang/de_mail_user.lng @@ -1,50 +1,51 @@ 1'; -$wb['autoresponder_start_date_txt'] = 'Startet am'; -$wb['autoresponder_start_date_ispast'] = 'Startdatum kann nicht in der Vergangenheit liegen.'; -$wb['autoresponder_end_date_txt'] = 'Endet am'; -$wb['autoresponder_end_date_isgreater'] = 'Enddatum muss angegeben werden und muss später als das Startdatum sein.'; -$wb['move_junk_txt'] = 'Spam E-Mails in den Junk Ordner verschieben'; -$wb['name_txt'] = 'Name'; -$wb['name_optional_txt'] = '(optional)'; -$wb['autoresponder_active'] = 'Autoresponder aktivieren'; -$wb['cc_txt'] = 'Kopie senden an'; -$wb['cc_error_isemail'] = 'Das -Kopie senden an- Feld enthält keine gültige E-Mail Adresse'; -$wb['login_error_unique'] = 'Login wird bereits verwendet.'; -$wb['login_error_regex'] = 'Zulässige Zeichen sind A-Z, a-z, 0-9, ., _ und -.'; -$wb['login_txt'] = 'Login'; -$wb['error_login_email_txt'] = 'Dieser Loginname ist nicht zulässig. Bitte verwenden Sie einen anderen Loginnamen oder die E-Mail Adresse als Login.'; -$wb['domain_txt'] = 'Domain'; -$wb['now_txt'] = 'Jetzt'; -$wb['generate_password_txt'] = 'Passwort erzeugen'; -$wb['repeat_password_txt'] = 'Passwort wiederholen'; -$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; -$wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; +$wb['custom_mailfilter_txt'] = "Benutzerdefinierte E-Mailfilter Regel"; +$wb['email_txt'] = "E-Mail"; +$wb['cryptpwd_txt'] = "Passwort"; +$wb['active_txt'] = "Aktiv"; +$wb['email_error_isemail'] = "E-Mail Adresse ist ungültig."; +$wb['email_error_unique'] = "Doppelte E-Mail Adresse."; +$wb['autoresponder_subject_txt'] = "E-Mail Betreff"; +$wb['autoresponder_subject'] = "Abwesenheitsnotiz"; +$wb['autoresponder_text_txt'] = "Text"; +$wb['autoresponder_txt'] = "Autoresponder"; +$wb['no_domain_perm'] = "Sie haben keine Berechtigung für diese Domain."; +$wb['error_no_pwd'] = "Passwort ist leer."; +$wb['quota_error_isint'] = "E-Mailkontogröße muss eine Zahl sein."; +$wb['quota_txt'] = "Beschränkung"; +$wb['server_id_txt'] = "Server ID"; +$wb['password_txt'] = "Passwort"; +$wb['maildir_txt'] = "E-Mail Verzeichnis"; +$wb['postfix_txt'] = "Aktiviere Empfang"; +$wb['access_txt'] = "Aktiviere Zugriff"; +$wb['policy_txt'] = "Spamfilter"; +$wb['no_policy'] = "- nicht aktiviert -"; +$wb['limit_mailbox_txt'] = "Die maximale Anzahl an E-Mailkonten für Ihr Konto wurde erreicht."; +$wb['limit_mailquota_txt'] = "Der maximale Speicherplatz für Ihr E-Mail Konto wurde erreicht. Der maximal verfügbare Speicher in MB ist"; +$wb['disableimap_txt'] = "IMAP deaktivieren"; +$wb['disablepop3_txt'] = "POP3 deaktivieren"; +$wb['password_strength_txt'] = "Passwortkomplexität"; +$wb['duplicate_alias_or_forward_txt'] = "Es existiert bereits ein Alias oder eine Weiterleitung mit dieser E-Mail Adresse."; +$wb['quota_error_value'] = "Ungültige Beschränkungseingabe. Erlaubte Größen sind: 0 für unlimitiert oder Nummern > 1"; +$wb['autoresponder_start_date_txt'] = "Startet am"; +$wb['autoresponder_start_date_ispast'] = "Startdatum kann nicht in der Vergangenheit liegen."; +$wb['autoresponder_end_date_txt'] = "Endet am"; +$wb['autoresponder_end_date_isgreater'] = "Enddatum muss angegeben werden und muss später als das Startdatum sein."; +$wb['move_junk_txt'] = "Spam E-Mails in das Junk Verzeichnis verschieben"; +$wb['name_txt'] = "Name"; +$wb['name_optional_txt'] = "(optional)"; +$wb['autoresponder_active'] = "Autoresponder aktivieren"; +$wb['cc_txt'] = "Kopie senden an"; +$wb['cc_error_isemail'] = "Das -Kopie senden an- Feld enthält keine gültige E-Mail Adresse"; +$wb['login_error_unique'] = "Benutzername wird bereits verwendet."; +$wb['login_error_regex'] = "Zulässige Zeichen sind A-Z, a-z, 0-9, ., _ und -."; +$wb['login_txt'] = "Anmelden"; +$wb['error_login_email_txt'] = "Dieser Benutzername ist nicht zulässig. Bitte verwenden Sie einen anderen Benutzernamen oder die E-Mail Adresse als Benutzername."; +$wb['domain_txt'] = "Domain"; +$wb['now_txt'] = "Jetzt"; +$wb['generate_password_txt'] = "Passwort erzeugen"; +$wb['repeat_password_txt'] = "Passwort wiederholen"; +$wb['password_mismatch_txt'] = "Die Passwörter stimmen nicht überein."; +$wb['password_match_txt'] = "Die Passwörter stimmen überein."; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_user_filter.lng b/interface/web/mail/lib/lang/de_mail_user_filter.lng index b0b1bc378..116bf264d 100644 --- a/interface/web/mail/lib/lang/de_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/de_mail_user_filter.lng @@ -1,20 +1,21 @@ + diff --git a/interface/web/mail/lib/lang/de_mail_user_filter_list.lng b/interface/web/mail/lib/lang/de_mail_user_filter_list.lng index 003ed0e24..695e404c8 100644 --- a/interface/web/mail/lib/lang/de_mail_user_filter_list.lng +++ b/interface/web/mail/lib/lang/de_mail_user_filter_list.lng @@ -5,3 +5,4 @@ $wb['page_txt'] = 'Seite'; $wb['page_of_txt'] = 'von'; $wb['delete_confirmation'] = 'Wollen Sie den Filter wirklich löschen?'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_user_list.lng b/interface/web/mail/lib/lang/de_mail_user_list.lng index 2eba6f62a..2a4b775e7 100644 --- a/interface/web/mail/lib/lang/de_mail_user_list.lng +++ b/interface/web/mail/lib/lang/de_mail_user_list.lng @@ -1,8 +1,9 @@ + diff --git a/interface/web/mail/lib/lang/de_mail_user_stats_list.lng b/interface/web/mail/lib/lang/de_mail_user_stats_list.lng index 1bb54e033..951fd758e 100644 --- a/interface/web/mail/lib/lang/de_mail_user_stats_list.lng +++ b/interface/web/mail/lib/lang/de_mail_user_stats_list.lng @@ -1,8 +1,9 @@ + diff --git a/interface/web/mail/lib/lang/de_mail_whitelist.lng b/interface/web/mail/lib/lang/de_mail_whitelist.lng index b4190ab7b..711c645a6 100644 --- a/interface/web/mail/lib/lang/de_mail_whitelist.lng +++ b/interface/web/mail/lib/lang/de_mail_whitelist.lng @@ -1,9 +1,10 @@ + diff --git a/interface/web/mail/lib/lang/de_mail_whitelist_list.lng b/interface/web/mail/lib/lang/de_mail_whitelist_list.lng index bcd4ccb4e..cf511a565 100644 --- a/interface/web/mail/lib/lang/de_mail_whitelist_list.lng +++ b/interface/web/mail/lib/lang/de_mail_whitelist_list.lng @@ -8,3 +8,4 @@ $wb['recipient_txt'] = 'Empfänger'; $wb['add_new_record_txt'] = 'Whitelist Eintrag hinzufügen'; $wb['access_txt'] = 'Zugriff'; ?> + diff --git a/interface/web/mail/lib/lang/de_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/de_spamfilter_blacklist.lng index 1dd4c6e3f..9be7f067c 100644 --- a/interface/web/mail/lib/lang/de_spamfilter_blacklist.lng +++ b/interface/web/mail/lib/lang/de_spamfilter_blacklist.lng @@ -7,3 +7,4 @@ $wb['priority_txt'] = 'Priorität'; $wb['active_txt'] = 'Aktiv'; $wb['limit_spamfilter_wblist_txt'] = 'Die maximale Anzahl an White- oder Blacklist Einträgen für ihr Konto wurde erreicht.'; ?> + diff --git a/interface/web/mail/lib/lang/de_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/de_spamfilter_blacklist_list.lng index 7ba623b65..a0fe0722c 100644 --- a/interface/web/mail/lib/lang/de_spamfilter_blacklist_list.lng +++ b/interface/web/mail/lib/lang/de_spamfilter_blacklist_list.lng @@ -7,3 +7,4 @@ $wb['rid_txt'] = 'Benutzer'; $wb['email_txt'] = 'Blacklisted E-Mail Adressen'; $wb['add_new_record_txt'] = 'Blacklist Eintrag hinzufügen'; ?> + diff --git a/interface/web/mail/lib/lang/de_spamfilter_config.lng b/interface/web/mail/lib/lang/de_spamfilter_config.lng index c4a39d45d..72548e41d 100644 --- a/interface/web/mail/lib/lang/de_spamfilter_config.lng +++ b/interface/web/mail/lib/lang/de_spamfilter_config.lng @@ -1,20 +1,21 @@ + diff --git a/interface/web/mail/lib/lang/de_spamfilter_config_list.lng b/interface/web/mail/lib/lang/de_spamfilter_config_list.lng index db92a4bd0..579d3155d 100644 --- a/interface/web/mail/lib/lang/de_spamfilter_config_list.lng +++ b/interface/web/mail/lib/lang/de_spamfilter_config_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Serverkonfiguration'; $wb['server_name_txt'] = 'Server'; $wb['server_id_txt'] = 'Server ID'; ?> + diff --git a/interface/web/mail/lib/lang/de_spamfilter_policy.lng b/interface/web/mail/lib/lang/de_spamfilter_policy.lng index b503bdfb9..4d3e985ba 100644 --- a/interface/web/mail/lib/lang/de_spamfilter_policy.lng +++ b/interface/web/mail/lib/lang/de_spamfilter_policy.lng @@ -1,38 +1,39 @@ + diff --git a/interface/web/mail/lib/lang/de_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/de_spamfilter_policy_list.lng index b5ec8e98c..02083ef5d 100644 --- a/interface/web/mail/lib/lang/de_spamfilter_policy_list.lng +++ b/interface/web/mail/lib/lang/de_spamfilter_policy_list.lng @@ -7,3 +7,4 @@ $wb['banned_files_lover_txt'] = 'Gesperrte Dateien Liebhaber'; $wb['bad_header_lover_txt'] = 'Ungültige Header Liebhaber'; $wb['add_new_record_txt'] = 'Richtlinien Eintrag hinzufügen'; ?> + diff --git a/interface/web/mail/lib/lang/de_spamfilter_users.lng b/interface/web/mail/lib/lang/de_spamfilter_users.lng index a2667d021..92c60b07b 100644 --- a/interface/web/mail/lib/lang/de_spamfilter_users.lng +++ b/interface/web/mail/lib/lang/de_spamfilter_users.lng @@ -1,8 +1,9 @@ + diff --git a/interface/web/mail/lib/lang/de_spamfilter_users_list.lng b/interface/web/mail/lib/lang/de_spamfilter_users_list.lng index 8e53193f7..89a598328 100644 --- a/interface/web/mail/lib/lang/de_spamfilter_users_list.lng +++ b/interface/web/mail/lib/lang/de_spamfilter_users_list.lng @@ -8,3 +8,4 @@ $wb['fullname_txt'] = 'Name'; $wb['email_txt'] = 'E-Mail Adresse'; $wb['add_new_record_txt'] = 'Spamfilterbenutzer hinzufügen'; ?> + diff --git a/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng index c47426f9d..4a95035d7 100644 --- a/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng +++ b/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng @@ -1,9 +1,10 @@ + diff --git a/interface/web/mail/lib/lang/de_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/de_spamfilter_whitelist_list.lng index 4d7769d2a..ed8a22089 100644 --- a/interface/web/mail/lib/lang/de_spamfilter_whitelist_list.lng +++ b/interface/web/mail/lib/lang/de_spamfilter_whitelist_list.lng @@ -7,3 +7,4 @@ $wb['rid_txt'] = 'Benutzer'; $wb['email_txt'] = 'Whitelisted E-Mail Adresse'; $wb['add_new_record_txt'] = 'Whitelist Eintrag hinzufügen'; ?> + diff --git a/interface/web/mail/lib/lang/de_user_quota_stats_list.lng b/interface/web/mail/lib/lang/de_user_quota_stats_list.lng index 6207032fe..7279daed3 100755 --- a/interface/web/mail/lib/lang/de_user_quota_stats_list.lng +++ b/interface/web/mail/lib/lang/de_user_quota_stats_list.lng @@ -1,7 +1,8 @@ + diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php index 7c1d7dff3..e3cad686f 100644 --- a/interface/web/mail/mail_domain_edit.php +++ b/interface/web/mail/mail_domain_edit.php @@ -266,7 +266,7 @@ class page_action extends tform_actions { $tmp_domain = $app->db->queryOneRecord("SELECT sys_groupid FROM mail_domain WHERE domain_id = ".$this->id); // We create a new record $insert_data = "(`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `priority`, `policy_id`, `email`, `fullname`, `local`) - VALUES (".$_SESSION["s"]["user"]["userid"].", ".$tmp_domain["sys_groupid"].", 'riud', 'riud', '', ".$this->dataRecord["server_id"].", 5, ".$policy_id.", '@".mysql_real_escape_string($this->dataRecord["domain"])."', '@".mysql_real_escape_string($this->dataRecord["domain"])."', 'Y')"; + VALUES (".$_SESSION["s"]["user"]["userid"].", ".$tmp_domain["sys_groupid"].", 'riud', 'riud', '', ".$this->dataRecord["server_id"].", 5, ".$policy_id.", '@".$app->db->quote($this->dataRecord["domain"])."', '@".$app->db->quote($this->dataRecord["domain"])."', 'Y')"; $app->db->datalogInsert('spamfilter_users', $insert_data, 'id'); unset($tmp_domain); } @@ -330,7 +330,7 @@ class page_action extends tform_actions { $tmp_domain = $app->db->queryOneRecord("SELECT sys_groupid FROM mail_domain WHERE domain_id = ".$this->id); // We create a new record $insert_data = "(`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `priority`, `policy_id`, `email`, `fullname`, `local`) - VALUES (".$_SESSION["s"]["user"]["userid"].", ".$tmp_domain["sys_groupid"].", 'riud', 'riud', '', ".$this->dataRecord["server_id"].", 5, ".$policy_id.", '@".mysql_real_escape_string($this->dataRecord["domain"])."', '@".mysql_real_escape_string($this->dataRecord["domain"])."', 'Y')"; + VALUES (".$_SESSION["s"]["user"]["userid"].", ".$tmp_domain["sys_groupid"].", 'riud', 'riud', '', ".$this->dataRecord["server_id"].", 5, ".$policy_id.", '@".$app->db->quote($this->dataRecord["domain"])."', '@".$app->db->quote($this->dataRecord["domain"])."', 'Y')"; $app->db->datalogInsert('spamfilter_users', $insert_data, 'id'); unset($tmp_domain); } @@ -363,7 +363,7 @@ class page_action extends tform_actions { } //* Update the aliases - $forwardings = $app->db->queryAllRecords("SELECT * FROM mail_forwarding WHERE source like '%@".$app->db->quote($this->oldDataRecord['domain'])."' OR destination like '%@".mysql_real_escape_string($this->oldDataRecord['domain'])."'"); + $forwardings = $app->db->queryAllRecords("SELECT * FROM mail_forwarding WHERE source like '%@".$app->db->quote($this->oldDataRecord['domain'])."' OR destination like '%@".$app->db->quote($this->oldDataRecord['domain'])."'"); if(is_array($forwardings)) { foreach($forwardings as $rec) { $destination = $app->db->quote(str_replace($this->oldDataRecord['domain'],$this->dataRecord['domain'],$rec['destination'])); diff --git a/interface/web/mailuser/lib/lang/de.lng b/interface/web/mailuser/lib/lang/de.lng index 326c7495f..412abe788 100644 --- a/interface/web/mailuser/lib/lang/de.lng +++ b/interface/web/mailuser/lib/lang/de.lng @@ -7,3 +7,4 @@ $wb['Send copy'] = 'Kopie senden an'; $wb['Spamfilter'] = 'Spamfilter'; $wb['Email Filters'] = 'E-Mail Filter'; ?> + diff --git a/interface/web/mailuser/lib/lang/de_index.lng b/interface/web/mailuser/lib/lang/de_index.lng index 0f557787e..90c97720f 100644 --- a/interface/web/mailuser/lib/lang/de_index.lng +++ b/interface/web/mailuser/lib/lang/de_index.lng @@ -1,12 +1,13 @@ + diff --git a/interface/web/mailuser/lib/lang/de_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/de_mail_user_autoresponder.lng index f8d4e46b1..ce28da041 100644 --- a/interface/web/mailuser/lib/lang/de_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/de_mail_user_autoresponder.lng @@ -11,3 +11,4 @@ $wb['autoresponder_active'] = 'Autoresponder aktivieren'; $wb['now_txt'] = 'Jetzt'; $wb['autoresponder_subject_txt'] = 'Betreff'; ?> + diff --git a/interface/web/mailuser/lib/lang/de_mail_user_cc.lng b/interface/web/mailuser/lib/lang/de_mail_user_cc.lng index b85077ea7..6292bb574 100644 --- a/interface/web/mailuser/lib/lang/de_mail_user_cc.lng +++ b/interface/web/mailuser/lib/lang/de_mail_user_cc.lng @@ -5,3 +5,4 @@ $wb['email_txt'] = 'E-Mail'; $wb['cc_error_isemail'] = 'E-Mail Adresse ungültig im -Kopie senden an- Feld'; $wb['email_is_cc_error'] = 'E-Mail Adresse und '; ?> + diff --git a/interface/web/mailuser/lib/lang/de_mail_user_filter.lng b/interface/web/mailuser/lib/lang/de_mail_user_filter.lng index 4344b319e..9b86cc66a 100644 --- a/interface/web/mailuser/lib/lang/de_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/de_mail_user_filter.lng @@ -1,20 +1,21 @@ + diff --git a/interface/web/mailuser/lib/lang/de_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/de_mail_user_filter_list.lng index d0be3c560..f43891ef7 100644 --- a/interface/web/mailuser/lib/lang/de_mail_user_filter_list.lng +++ b/interface/web/mailuser/lib/lang/de_mail_user_filter_list.lng @@ -6,3 +6,4 @@ $wb['page_txt'] = 'Seite'; $wb['page_of_txt'] = 'von'; $wb['delete_confirmation'] = 'Möchten Sie die E-Mail Filter Regel wirklich löschen?'; ?> + diff --git a/interface/web/mailuser/lib/lang/de_mail_user_password.lng b/interface/web/mailuser/lib/lang/de_mail_user_password.lng index ebca601ed..e2890c960 100644 --- a/interface/web/mailuser/lib/lang/de_mail_user_password.lng +++ b/interface/web/mailuser/lib/lang/de_mail_user_password.lng @@ -1,10 +1,11 @@ + diff --git a/interface/web/mailuser/lib/lang/de_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/de_mail_user_spamfilter.lng index 47ac53a00..019679a82 100644 --- a/interface/web/mailuser/lib/lang/de_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/de_mail_user_spamfilter.lng @@ -5,3 +5,4 @@ $wb['email_txt'] = 'E-Mail'; $wb['no_policy'] = '- nicht aktiviert -'; $wb['policy_txt'] = 'Richtlinie'; ?> + diff --git a/interface/web/monitor/lib/lang/de.lng b/interface/web/monitor/lib/lang/de.lng index d483d92ee..38096b63d 100644 --- a/interface/web/monitor/lib/lang/de.lng +++ b/interface/web/monitor/lib/lang/de.lng @@ -1,149 +1,150 @@ We cant find any of them at your server.

    This means we can not support your RAID yet.'; -$wb['monitor_serverstate_beancounterok_txt'] = 'The beancounter is ok'; -$wb['monitor_serverstate_beancounterinfo_txt'] = 'There are vew failure in the beancounter'; -$wb['monitor_serverstate_beancounterwarning_txt'] = 'There are some failure in the beancounter'; -$wb['monitor_serverstate_beancountercritical_txt'] = 'There are many failure in the beancounter'; -$wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in the beancounter'; -$wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; -$wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; -$wb['monitor_title_iptables_txt'] = 'IPTables Regeln'; -$wb['Show fail2ban-Log'] = 'Fail2ban Protokoll anzeigen'; -$wb['Show IPTables'] = 'IPTables anzeigen'; -$wb['Show OpenVz VE BeanCounter'] = 'OpenVz VE BeanCounter anzeigen'; +$wb['Memory usage'] = "Speicherauslastung"; +$wb['Server online since'] = "Server ist online seit"; +$wb['Users online'] = "Benutzer online"; +$wb['System load 1 minute'] = "Systemlast 1 Minute"; +$wb['System load 5 minutes'] = "Systemlast 5 Minuten"; +$wb['System load 15 minutes'] = "Systemlast 15 Minuten"; +$wb['Server Load'] = "Serverauslastung"; +$wb['Disk usage'] = "Festplattenbelegung"; +$wb['no_data_serverload_txt'] = "Derzeit stehen keine Daten über die Serverlast zur Verfügung. Bitte später erneut überprüfen."; +$wb['no_data_memusage_txt'] = "Derzeit stehen keine Daten über die Speicherauslastung zur Verfügung. Bitte später erneut überprüfen."; +$wb['no_data_diskusage_txt'] = "Derzeit stehen keine Daten über die Festplattenbelegung zur Verfügung. Bitte später erneut überprüfen."; +$wb['no_data_cpuinfo_txt'] = "Derzeit stehen keine Daten über die CPU zur Verfügung. Bitte später erneut überprüfen."; +$wb['no_data_services_txt'] = "Derzeit stehen keine Daten über die Dienste zur Verfügung. Bitte später erneut überprüfen."; +$wb['no_logdata_txt'] = "Derzeit stehen keine Protokolldaten zur Verfügung. Bitte später erneut überprüfen."; +$wb['Monitoring'] = "Überwachung"; +$wb['Server to Monitor'] = "Zu überwachende Server"; +$wb['Logfiles'] = "Protokolldateien"; +$wb['Status of services'] = "Dienststatus"; +$wb['No Refresh'] = "keine Aktualisierung"; +$wb['minutes'] = "Minuten"; +$wb['Show Overview'] = "Übersicht zeigen"; +$wb['System State (All Servers)'] = "Systemstatus (Alle Server)"; +$wb['Hardware-Information'] = "Hardwareinformationen"; +$wb['Show CPU info'] = "CPU Informationen"; +$wb['Server State'] = "Serverstatus"; +$wb['Show Update State'] = "Updatestatus anzeigen"; +$wb['Show RAID state'] = "RAID Status anzeigen"; +$wb['Show Server load'] = "Serverauslastung anzeigen"; +$wb['Show Disk usage'] = "Festplattenbelegung anzeigen"; +$wb['Show Memory usage'] = "Speicherauslastung anzeigen"; +$wb['Show Services'] = "Dienste anzeigen"; +$wb['Show Mail-Queue'] = "E-Mail Warteschlange anzeigen"; +$wb['Show Mail-Log'] = "E-Mail Protokoll anzeigen"; +$wb['Show Mail warn-Log'] = "E-Mail Warn Protokoll anzeigen"; +$wb['Show Mail err-Log'] = "E-Mail Fehler Protokoll anzeigen"; +$wb['Show System-Log'] = "System Protokoll anzeigen"; +$wb['Show Freshclam-Log'] = "Freshclam Protokoll anzeigen"; +$wb['Show Clamav-Log'] = "ClamAV Protokoll anzeigen"; +$wb['Show ISPConfig-Log'] = "ISPConfig Protokoll anzeigen"; +$wb['Show RKHunter-Log'] = "RKHunter Protokoll anzeigen"; +$wb['Show Jobqueue'] = "Jobwarteschlange anzeigen"; +$wb['Show ISPC Cron-Log'] = "Cron Protokoll anzeigen"; +$wb['no_data_updates_txt'] = "Derzeit stehen keine Daten über Updates zur Verfügung. Bitte später erneut überprüfen."; +$wb['no_data_raid_txt'] = "Derzeit stehen keine Daten über RAID zur Verfügung. Bitte später erneut überprüfen."; +$wb['no_data_rkhunter_txt'] = "Derzeit stehen keine Daten von RKHunter zur Verfügung. Bitte später erneut überprüfen."; +$wb['no_data_mailq_txt'] = "Derzeit stehen keine Daten der EMail Warteschlange zur Verfügung.Bitte später erneut überprüfen."; +$wb['monitor_general_serverstate_txt'] = "Serverstatus"; +$wb['monitor_general_systemstate_txt'] = "Systemstatus"; +$wb['monitor_diskusage_filesystem_txt'] = "Dateisystem"; +$wb['monitor_diskusage_type_txt'] = "Typ"; +$wb['monitor_diskusage_size_txt'] = "Größe"; +$wb['monitor_diskusage_used_txt'] = "In Verwendung"; +$wb['monitor_diskusage_available_txt'] = "verfügbar"; +$wb['monitor_diskusage_usage_txt'] = "Verwendung in %"; +$wb['monitor_diskusage_mounted_txt'] = "gemountet unter"; +$wb['monitor_logs_mail_txt'] = "E-Mail Protokoll"; +$wb['monitor_logs_mailwarn_txt'] = "E-Mail Warnung Protokoll"; +$wb['monitor_logs_mailerr_txt'] = "Mail Fehler Protokoll"; +$wb['monitor_logs_messages_txt'] = "Systemmeldungen Protokoll"; +$wb['monitor_logs_ispccron_txt'] = "Cron Protokoll"; +$wb['monitor_logs_freshclam_txt'] = "Freshclam Protokoll"; +$wb['monitor_logs_clamav_txt'] = "ClamAV Protokoll"; +$wb['monitor_logs_ispc_txt'] = "ISPConfig Protokoll"; +$wb['monitor_norkhunter_txt'] = "RKHunter ist nicht installiert, deshalb gibt es keine Protokolldatei"; +$wb['monitor_serverstate_server_txt'] = "Server"; +$wb['monitor_serverstate_state_txt'] = "Status"; +$wb['monitor_serverstate_unknown_txt'] = "unbekannt"; +$wb['monitor_serverstate_info_txt'] = "Info"; +$wb['monitor_serverstate_warning_txt'] = "Warnung"; +$wb['monitor_serverstate_critical_txt'] = "kritisch"; +$wb['monitor_serverstate_error_txt'] = "Fehler"; +$wb['monitor_serverstate_moreinfo_txt'] = "Mehr Informationen..."; +$wb['monitor_serverstate_more_txt'] = "mehr..."; +$wb['monitor_serverstate_fclamok_txt'] = "Ihr Virenschutz ist in Ordnung."; +$wb['monitor_serverstate_fclamoutdated_txt'] = "Ihr Virenschutz ist VERALTET!"; +$wb['monitor_serverstate_fclamunknown_txt'] = "Freshclam: ???"; +$wb['monitor_serverstate_hdok_txt'] = "Die Festplattenauslastung ist in Ordnung"; +$wb['monitor_serverstate_hdgoingfull_txt'] = "Die Festplatte ist bald voll"; +$wb['monitor_serverstate_hdnearlyfull_txt'] = "Die Festplatte wird langsam voll"; +$wb['monitor_serverstate_hdveryfull_txt'] = "Die Festplatte ist sehr voll"; +$wb['monitor_serverstate_hdfull_txt'] = "Die Festplatte hat keinen Platz mehr frei"; +$wb['monitor_serverstate_hdunknown_txt'] = "Festplatte: ???"; +$wb['monitor_serverstate_listok_txt'] = "in Ordnung"; +$wb['monitor_serverstate_listinfo_txt'] = "Information"; +$wb['monitor_serverstate_listwarning_txt'] = "Warnung"; +$wb['monitor_serverstate_listcritical_txt'] = "kritisch"; +$wb['monitor_serverstate_listerror_txt'] = "Fehler"; +$wb['monitor_serverstate_listunknown_txt'] = "unbekannt"; +$wb['monitor_serverstate_loadok_txt'] = "Die Serverauslastung ist in Ordnung"; +$wb['monitor_serverstate_loadheavy_txt'] = "Der Server ist extrem ausgelastet"; +$wb['monitor_serverstate_loadhigh_txt'] = "Der Server ist stark ausgelastet"; +$wb['monitor_serverstate_loaghigher_txt'] = "Der Server ist stärker ausgelastet"; +$wb['monitor_serverstate_loadhighest_txt'] = "Der Server ist höchst ausgelastet"; +$wb['monitor_serverstate_loadunknown_txt'] = "Serverauslastung: ???"; +$wb['monitor_serverstate_mailqok_txt'] = "Die E-Mail Wartenschlangenauslastung ist in Ordnung"; +$wb['monitor_serverstate_mailqheavy_txt'] = "Die E-Mail Wartenschlange ist extrem ausgelastet"; +$wb['monitor_serverstate_mailqhigh_txt'] = "Die E-Mail Wartenschlange ist stark ausgelastet"; +$wb['monitor_serverstate_mailqhigher_txt'] = "Die E-Mail Wartenschlange ist stärker ausgelastet"; +$wb['monitor_serverstate_mailqhighest_txt'] = "Die E-Mail Wartenschlange ist höchst ausgelastet"; +$wb['monitor_serverstate_mailqunknown_txt'] = "E-Mail Wartenschlange: ???"; +$wb['monitor_serverstate_raidok_txt'] = "Das RAID ist in Ordnung"; +$wb['monitor_serverstate_raidresync_txt'] = "Das RAID ist im RESYNC Modus"; +$wb['monitor_serverstate_raidfault_txt'] = "Das RAID hat eine DEFEKTE Festplatte. Bitte schnellstmöglich ersetzen!"; +$wb['monitor_serverstate_raiderror_txt'] = "Das RAID funktioniert nicht mehr"; +$wb['monitor_serverstate_raidunknown_txt'] = "RAID Status: ???"; +$wb['monitor_serverstate_servicesonline_txt'] = "Alle benötigten Dienste sind online"; +$wb['monitor_serverstate_servicesoffline_txt'] = "Einer oder mehrere benötigte Dienste sind offline"; +$wb['monitor_serverstate_servicesunknown_txt'] = "Dienste: ???"; +$wb['monitor_serverstate_syslogok_txt'] = "Das System Protokoll ist in Ordnung"; +$wb['monitor_serverstate_syslogwarning_txt'] = "Es gibt Warnungen im System Protokoll"; +$wb['monitor_serverstate_syslogerror_txt'] = "Es gibt Fehler im System Protokoll"; +$wb['monitor_serverstate_syslogunknown_txt'] = "System Protokoll: ???"; +$wb['monitor_serverstate_updatesok_txt'] = "Ihr System ist aktuell"; +$wb['monitor_serverstate_updatesneeded_txt'] = "Eine oder mehrere Komponenten benötigen ein Update"; +$wb['monitor_serverstate_updatesunknown_txt'] = "System Update: ???"; +$wb['monitor_services_online_txt'] = "Online"; +$wb['monitor_services_offline_txt'] = "Offline"; +$wb['monitor_services_web_txt'] = "Web Server:"; +$wb['monitor_services_ftp_txt'] = "FTP Server:"; +$wb['monitor_services_smtp_txt'] = "SMTP Server:"; +$wb['monitor_services_pop_txt'] = "POP3 Server:"; +$wb['monitor_services_imap_txt'] = "IMAP Server:"; +$wb['monitor_services_mydns_txt'] = "DNS Server:"; +$wb['monitor_services_mysql_txt'] = "MySQL Server:"; +$wb['monitor_settings_datafromdate_txt'] = "Daten vom: "; +$wb['monitor_settings_datetimeformat_txt'] = "d.m.Y H:i"; +$wb['monitor_settings_refreshsq_txt'] = "Aktualisierungsrate:"; +$wb['monitor_settings_server_txt'] = "Server"; +$wb['monitor_title_cpuinfo_txt'] = "CPU Informationen"; +$wb['monitor_title_updatestate_txt'] = "Updatestatus"; +$wb['monitor_title_mailq_txt'] = "E-Mail Warteschlange"; +$wb['monitor_title_raidstate_txt'] = "RAID Status"; +$wb['monitor_title_rkhunterlog_txt'] = "RKHunter Protokoll"; +$wb['monitor_updates_nosupport_txt'] = "Ihre Distribution wird für die Überwachung nicht unterstützt"; +$wb['monitor_title_fail2ban_txt'] = "Fail2Ban Protokoll"; +$wb['monitor_nosupportedraid1_txt'] = "At the moment, we support mdadm or mpt-status for monitoring the RAID.
    We cant find any of them at your server.

    This means we can not support your RAID yet."; +$wb['monitor_serverstate_beancounterok_txt'] = "The beancounter is ok"; +$wb['monitor_serverstate_beancounterinfo_txt'] = "There are vew failure in the beancounter"; +$wb['monitor_serverstate_beancounterwarning_txt'] = "There are some failure in the beancounter"; +$wb['monitor_serverstate_beancountercritical_txt'] = "There are many failure in the beancounter"; +$wb['monitor_serverstate_beancountererror_txt'] = "There are too much failure in the beancounter"; +$wb['monitor_title_beancounter_txt'] = "OpenVz VE BeanCounter"; +$wb['monitor_beancounter_nosupport_txt'] = "This server is not a OpenVz VE and has no beancounter information"; +$wb['monitor_title_iptables_txt'] = "IPTables Regeln"; +$wb['Show fail2ban-Log'] = "Fail2ban Protokoll anzeigen"; +$wb['Show IPTables'] = "IPTables anzeigen"; +$wb['Show OpenVz VE BeanCounter'] = "OpenVz VE BeanCounter anzeigen"; ?> + diff --git a/interface/web/monitor/lib/lang/de_datalog_list.lng b/interface/web/monitor/lib/lang/de_datalog_list.lng index 0b6bf9a4b..8939cab06 100644 --- a/interface/web/monitor/lib/lang/de_datalog_list.lng +++ b/interface/web/monitor/lib/lang/de_datalog_list.lng @@ -6,3 +6,4 @@ $wb['dbtable_txt'] = 'Datenbanktabelle'; $wb['action_txt'] = 'Aktion'; $wb['status_txt'] = 'Status'; ?> + diff --git a/interface/web/sites/aps_do_operation.php b/interface/web/sites/aps_do_operation.php index 033bece03..c3362ae8b 100644 --- a/interface/web/sites/aps_do_operation.php +++ b/interface/web/sites/aps_do_operation.php @@ -27,7 +27,7 @@ OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - + require_once('../../lib/config.inc.php'); require_once('../../lib/app.inc.php'); $app->load('aps_guicontroller'); @@ -72,6 +72,7 @@ else if($_GET['action'] == 'delete_instance') $cid = $app->db->queryOneRecord("SELECT client_id FROM client WHERE username = '".$app->db->quote($_SESSION['s']['user']['username'])."';"); $client_id = $cid['client_id']; } + // Assume that the given instance belongs to the currently calling client_id. Unimportant if status is admin if(!$gui->isValidInstanceID($_GET['id'], $client_id, $is_admin)) die($app->lng('Invalid ID')); @@ -79,8 +80,7 @@ else if($_GET['action'] == 'delete_instance') $check = $app->db->queryOneRecord("SELECT id FROM aps_instances WHERE id = ".$app->db->quote($_GET['id'])." AND (instance_status = ".INSTANCE_SUCCESS." OR instance_status = ".INSTANCE_ERROR.");"); - if(!empty($check)) $gui->deleteInstance($_GET['id']); - + if($check['id'] > 0) $gui->deleteInstance($_GET['id']); echo $app->lng('Installation_remove'); } else if($_GET['action'] == 'reinstall_instance') diff --git a/interface/web/sites/database_user_edit.php b/interface/web/sites/database_user_edit.php index 357fa89ad..c486a5aae 100644 --- a/interface/web/sites/database_user_edit.php +++ b/interface/web/sites/database_user_edit.php @@ -66,13 +66,13 @@ class page_action extends tform_actions { if ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) { // Get the limits of the client $client_group_id = $_SESSION["s"]["user"]["default_group"]; - $client = $app->db->queryOneRecord("SELECT client.contactname, client.name, client.client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + $client = $app->db->queryOneRecord("SELECT client.company_name, client.contact_name, client.client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); // Fill the client select field $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(client.company_name,' :: ',client.contact_name) as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY sys_group.name"; $records = $app->db->queryAllRecords($sql); $tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']); - $client_select = ''; + $client_select = ''; //$tmp_data_record = $app->tform->getDataRecord($this->id); if(is_array($records)) { foreach( $records as $rec) { diff --git a/interface/web/sites/form/web_aliasdomain.tform.php b/interface/web/sites/form/web_aliasdomain.tform.php index 28307be69..71365a15a 100644 --- a/interface/web/sites/form/web_aliasdomain.tform.php +++ b/interface/web/sites/form/web_aliasdomain.tform.php @@ -122,7 +122,7 @@ $form["tabs"]['domain'] = array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', 'validators' => array ( 0 => array ( 'type' => 'REGEX', - 'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@', + 'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@', 'errmsg'=> 'redirect_error_regex'), ), 'default' => '', diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php index ee948bb6f..ca9b852ff 100644 --- a/interface/web/sites/form/web_domain.tform.php +++ b/interface/web/sites/form/web_domain.tform.php @@ -297,7 +297,7 @@ $form["tabs"]['redirect'] = array ( 'redirect_path' => array ( 'datatype' => 'VARCHAR', 'validators' => array ( 0 => array ( 'type' => 'REGEX', - 'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?\~!]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@', + 'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@', 'errmsg'=> 'redirect_error_regex'), ), 'formtype' => 'TEXT', diff --git a/interface/web/sites/form/web_subdomain.tform.php b/interface/web/sites/form/web_subdomain.tform.php index f0e5751ad..970c12b23 100644 --- a/interface/web/sites/form/web_subdomain.tform.php +++ b/interface/web/sites/form/web_subdomain.tform.php @@ -123,7 +123,7 @@ $form["tabs"]['domain'] = array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', 'validators' => array ( 0 => array ( 'type' => 'REGEX', - 'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@', + 'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@', 'errmsg'=> 'redirect_error_regex'), ), 'default' => '', diff --git a/interface/web/sites/form/web_vhost_subdomain.tform.php b/interface/web/sites/form/web_vhost_subdomain.tform.php index bd423b106..f85c5f40d 100644 --- a/interface/web/sites/form/web_vhost_subdomain.tform.php +++ b/interface/web/sites/form/web_vhost_subdomain.tform.php @@ -296,7 +296,7 @@ $form["tabs"]['redirect'] = array ( 'redirect_path' => array ( 'datatype' => 'VARCHAR', 'validators' => array ( 0 => array ( 'type' => 'REGEX', - 'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?\~!]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@', + 'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@', 'errmsg'=> 'redirect_error_regex'), ), 'formtype' => 'TEXT', diff --git a/interface/web/sites/lib/lang/de.lng b/interface/web/sites/lib/lang/de.lng index 39d62ef97..ba7f57c99 100644 --- a/interface/web/sites/lib/lang/de.lng +++ b/interface/web/sites/lib/lang/de.lng @@ -1,33 +1,34 @@ + diff --git a/interface/web/sites/lib/lang/de_aps.lng b/interface/web/sites/lib/lang/de_aps.lng index fa48a7c0a..5263f8d5a 100644 --- a/interface/web/sites/lib/lang/de_aps.lng +++ b/interface/web/sites/lib/lang/de_aps.lng @@ -28,7 +28,7 @@ $wb['installation_txt'] = 'Installation'; $wb['install_location_txt'] = 'Installationsort'; $wb['btn_install_txt'] = 'Installieren'; $wb['btn_cancel_txt'] = 'Abbrechen'; -$wb['acceptance_txt'] = 'Lizenzvereinbarung'; +$wb['acceptance_txt'] = 'Lizenzvereinbarung akzeptieren'; $wb['acceptance_text_txt'] = 'Ja, ich habe die Lizenzvereinbarung gelesen und akzeptiere sie.'; $wb['install_language_txt'] = 'Sprache der Oberfläche'; $wb['new_database_password_txt'] = 'Datenbank Passwort'; @@ -55,3 +55,4 @@ $wb['installation_success_txt'] = 'Installiert'; $wb['installation_remove_txt'] = 'Deinstallation vorgemerkt'; $wb['packagelist_update_finished_txt'] = 'APS Paketlistenupdate beendet.'; ?> + diff --git a/interface/web/sites/lib/lang/de_aps_instances_list.lng b/interface/web/sites/lib/lang/de_aps_instances_list.lng index e5f8b7b7f..753ba3b8a 100644 --- a/interface/web/sites/lib/lang/de_aps_instances_list.lng +++ b/interface/web/sites/lib/lang/de_aps_instances_list.lng @@ -11,3 +11,4 @@ $wb['filter_txt'] = 'Suche'; $wb['delete_txt'] = 'Löschen'; $wb['reinstall_txt'] = 'Neuinstallieren'; ?> + diff --git a/interface/web/sites/lib/lang/de_aps_packages_list.lng b/interface/web/sites/lib/lang/de_aps_packages_list.lng index 6cada812b..ab21a1477 100644 --- a/interface/web/sites/lib/lang/de_aps_packages_list.lng +++ b/interface/web/sites/lib/lang/de_aps_packages_list.lng @@ -6,3 +6,4 @@ $wb['category_txt'] = 'Kategorie'; $wb['status_txt'] = 'Verfügbar'; $wb['filter_txt'] = 'Suche'; ?> + diff --git a/interface/web/sites/lib/lang/de_cron.lng b/interface/web/sites/lib/lang/de_cron.lng index 8cebfa9c5..d89e2dcd4 100644 --- a/interface/web/sites/lib/lang/de_cron.lng +++ b/interface/web/sites/lib/lang/de_cron.lng @@ -19,3 +19,4 @@ $wb['run_wday_error_format'] = 'Das Format für Wochentage ist nicht korrekt.'; $wb['command_error_format'] = 'Das Format für den Befehl ist nicht korrekt. Beachten Sie, dass bei einem URL Aufruf nur http und https erlaubt ist.'; $wb['unknown_fieldtype_error'] = 'Es wurde ein unbekanntes Feld verwendet.'; ?> + diff --git a/interface/web/sites/lib/lang/de_cron_list.lng b/interface/web/sites/lib/lang/de_cron_list.lng index 687505b4a..029cd59b7 100644 --- a/interface/web/sites/lib/lang/de_cron_list.lng +++ b/interface/web/sites/lib/lang/de_cron_list.lng @@ -11,3 +11,4 @@ $wb['command_txt'] = 'Befehl'; $wb['add_new_cron_txt'] = 'Neuen Cronjob anlegen'; $wb['parent_domain_id_txt'] = 'Webseite'; ?> + diff --git a/interface/web/sites/lib/lang/de_database.lng b/interface/web/sites/lib/lang/de_database.lng index 5bed48f85..5bec72467 100644 --- a/interface/web/sites/lib/lang/de_database.lng +++ b/interface/web/sites/lib/lang/de_database.lng @@ -42,3 +42,4 @@ $wb['globalsearch_noresults_limit_txt'] = '0 Treffer'; $wb['globalsearch_searchfield_watermark_txt'] = 'Suche'; $wb['globalsearch_suggestions_text_txt'] = 'Vorschläge'; ?> + diff --git a/interface/web/sites/lib/lang/de_database_admin_list.lng b/interface/web/sites/lib/lang/de_database_admin_list.lng index 3f7542a30..af17ba88a 100644 --- a/interface/web/sites/lib/lang/de_database_admin_list.lng +++ b/interface/web/sites/lib/lang/de_database_admin_list.lng @@ -8,3 +8,4 @@ $wb['database_name_txt'] = 'Datenbankname'; $wb['add_new_record_txt'] = 'Neue Datenbank hinzufügen'; $wb['sys_groupid_txt'] = 'Kunde'; ?> + diff --git a/interface/web/sites/lib/lang/de_database_list.lng b/interface/web/sites/lib/lang/de_database_list.lng index bae444c42..29959817a 100644 --- a/interface/web/sites/lib/lang/de_database_list.lng +++ b/interface/web/sites/lib/lang/de_database_list.lng @@ -7,3 +7,4 @@ $wb['database_name_txt'] = 'Datenbankname'; $wb['add_new_record_txt'] = 'Neue Datenbank hinzufügen'; $wb['database_user_txt'] = 'Database user'; ?> + diff --git a/interface/web/sites/lib/lang/de_database_user.lng b/interface/web/sites/lib/lang/de_database_user.lng index 78884bc3b..ca05e60d2 100644 --- a/interface/web/sites/lib/lang/de_database_user.lng +++ b/interface/web/sites/lib/lang/de_database_user.lng @@ -21,3 +21,4 @@ $wb['globalsearch_noresults_limit_txt'] = '0 Treffer'; $wb['globalsearch_searchfield_watermark_txt'] = 'Suche'; $wb['globalsearch_suggestions_text_txt'] = 'Vorschläge'; ?> + diff --git a/interface/web/sites/lib/lang/de_database_user_admin_list.lng b/interface/web/sites/lib/lang/de_database_user_admin_list.lng index 82c09fcf1..4cbdc9dbd 100644 --- a/interface/web/sites/lib/lang/de_database_user_admin_list.lng +++ b/interface/web/sites/lib/lang/de_database_user_admin_list.lng @@ -4,3 +4,4 @@ $wb['add_new_record_txt'] = 'Neuen Benutzer hinzufügen'; $wb['database_user_txt'] = 'Datenbank Benutzer'; $wb['sys_groupid_txt'] = 'Kunde'; ?> + diff --git a/interface/web/sites/lib/lang/de_database_user_list.lng b/interface/web/sites/lib/lang/de_database_user_list.lng index 7ee8222dc..d746d2f2c 100644 --- a/interface/web/sites/lib/lang/de_database_user_list.lng +++ b/interface/web/sites/lib/lang/de_database_user_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Datenbank Benutzer'; $wb['add_new_record_txt'] = 'Neuen Benutzer hinzufügen'; $wb['database_user_txt'] = 'Datenbank Benutzer'; ?> + diff --git a/interface/web/sites/lib/lang/de_ftp_user.lng b/interface/web/sites/lib/lang/de_ftp_user.lng index c367ffffb..80072ec49 100644 --- a/interface/web/sites/lib/lang/de_ftp_user.lng +++ b/interface/web/sites/lib/lang/de_ftp_user.lng @@ -1,34 +1,35 @@ 0'; -$wb['dir_dot_error'] = 'Kein .. im Pfad erlaubt.'; -$wb['dir_slashdot_error'] = 'Kein ./ im Pfad erlaubt.'; -$wb['generate_password_txt'] = 'Passwort erzeugen'; -$wb['repeat_password_txt'] = 'Passwort wiederholen'; -$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; -$wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; +$wb['uid_txt'] = "Benutzerkennung (UID)"; +$wb['gid_txt'] = "Benutzergruppe (GID)"; +$wb['dir_txt'] = "Verzeichnis"; +$wb['quota_files_txt'] = "Dateibeschränkung"; +$wb['quota_files_unity_txt'] = "Dateien"; +$wb['ul_ratio_txt'] = "Uploadrate"; +$wb['dl_ratio_txt'] = "Downloadrate"; +$wb['ul_bandwidth_txt'] = "Uploadbandbreite"; +$wb['dl_bandwidth_txt'] = "Downloadbandbreite"; +$wb['server_id_txt'] = "Server"; +$wb['parent_domain_id_txt'] = "Domain"; +$wb['username_txt'] = "Benutzername"; +$wb['password_txt'] = "Passwort"; +$wb['quota_size_txt'] = "Festplatten Quota"; +$wb['active_txt'] = "Aktiv"; +$wb['limit_ftp_user_txt'] = "Die maximale Anzahl an FTP Benutzer für Ihr Konto wurde erreicht."; +$wb['username_error_empty'] = "Benutzername ist leer."; +$wb['username_error_unique'] = "Der Benutzername muss einzigartig sein."; +$wb['username_error_regex'] = "Der Benutzername enthält nicht erlaubte Zeichen."; +$wb['quota_size_error_empty'] = "Beschränkung ist leer."; +$wb['uid_error_empty'] = "GID ist leer."; +$wb['directory_error_empty'] = "Verzeichnis ist leer."; +$wb['password_strength_txt'] = "Passwortkomplexität"; +$wb['directory_error_notinweb'] = "Das Verzeichnis befindet sich nicht innerhalb des Verzeichnisses der Website."; +$wb['parent_domain_id_error_empty'] = "Keine Domain ausgewählt."; +$wb['quota_size_error_regex'] = "Beschränkung: Geben Sie -1 ein für unlimitiert oder eine Zahl > 0"; +$wb['dir_dot_error'] = "Kein .. im Pfad erlaubt."; +$wb['dir_slashdot_error'] = "Kein ./ im Pfad erlaubt."; +$wb['generate_password_txt'] = "Passwort erzeugen"; +$wb['repeat_password_txt'] = "Passwort wiederholen"; +$wb['password_mismatch_txt'] = "Die Passwörter stimmen nicht überein."; +$wb['password_match_txt'] = "Die Passwörter stimmen überein."; ?> + diff --git a/interface/web/sites/lib/lang/de_ftp_user_list.lng b/interface/web/sites/lib/lang/de_ftp_user_list.lng index 8d1b0817a..d39ff1f52 100644 --- a/interface/web/sites/lib/lang/de_ftp_user_list.lng +++ b/interface/web/sites/lib/lang/de_ftp_user_list.lng @@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Domain'; $wb['username_txt'] = 'Benutzername'; $wb['add_new_record_txt'] = 'Neuen FTP Benutzer hinzufügen'; ?> + diff --git a/interface/web/sites/lib/lang/de_shell_user.lng b/interface/web/sites/lib/lang/de_shell_user.lng index 20d82cc3e..c9cb6bd4f 100644 --- a/interface/web/sites/lib/lang/de_shell_user.lng +++ b/interface/web/sites/lib/lang/de_shell_user.lng @@ -27,3 +27,4 @@ $wb['repeat_password_txt'] = 'Passwort wiederholen'; $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; $wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; ?> + diff --git a/interface/web/sites/lib/lang/de_shell_user_list.lng b/interface/web/sites/lib/lang/de_shell_user_list.lng index c953cf6b0..176a4e597 100644 --- a/interface/web/sites/lib/lang/de_shell_user_list.lng +++ b/interface/web/sites/lib/lang/de_shell_user_list.lng @@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Webseite'; $wb['username_txt'] = 'Benutzername'; $wb['add_new_record_txt'] = 'Neuen Shell Benutzer hinzufügen'; ?> + diff --git a/interface/web/sites/lib/lang/de_user_quota_stats_list.lng b/interface/web/sites/lib/lang/de_user_quota_stats_list.lng index 74a0b1747..671b1c010 100644 --- a/interface/web/sites/lib/lang/de_user_quota_stats_list.lng +++ b/interface/web/sites/lib/lang/de_user_quota_stats_list.lng @@ -1,9 +1,10 @@ + diff --git a/interface/web/sites/lib/lang/de_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/de_web_aliasdomain_list.lng index df8ebc683..914474660 100644 --- a/interface/web/sites/lib/lang/de_web_aliasdomain_list.lng +++ b/interface/web/sites/lib/lang/de_web_aliasdomain_list.lng @@ -12,3 +12,4 @@ $wb['no_redirect_txt'] = 'Kein Redirect'; $wb['no_flag_txt'] = 'Kein Flag'; $wb['none_txt'] = 'keine'; ?> + diff --git a/interface/web/sites/lib/lang/de_web_backup_list.lng b/interface/web/sites/lib/lang/de_web_backup_list.lng index 4cc06d82e..44f0b8b06 100644 --- a/interface/web/sites/lib/lang/de_web_backup_list.lng +++ b/interface/web/sites/lib/lang/de_web_backup_list.lng @@ -13,3 +13,4 @@ $wb['restore_pending_txt'] = 'Es liegt bereits ein Backup Wiederherstellungs Job $wb['backup_type_mysql'] = 'MySQL Datenbank'; $wb['backup_type_web'] = 'Webseiten Dateien'; ?> + diff --git a/interface/web/sites/lib/lang/de_web_domain.lng b/interface/web/sites/lib/lang/de_web_domain.lng index 220752bd2..c26522e5f 100644 --- a/interface/web/sites/lib/lang/de_web_domain.lng +++ b/interface/web/sites/lib/lang/de_web_domain.lng @@ -1,112 +1,113 @@ www'; -$wb['www_to_non_www_txt'] = 'www -> Nicht-www'; -$wb['php_fpm_use_socket_txt'] = 'Benutze Socket für PHP-FPM'; -$wb['ipv6_address_txt'] = 'IPv6 Adresse'; -$wb['error_no_sni_txt'] = 'SNI für SSL ist auf diesem Server nicht aktiviert. Sie können daher nur ein SSL Zertifikat pro IP Adresse eintragen.'; -$wb['python_txt'] = 'Python'; -$wb['perl_txt'] = 'Perl'; -$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children'; -$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers'; -$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers'; -$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers'; -$wb['error_php_fpm_pm_settings_txt'] = 'Die Werte der PHP-FPM pm Einstellungen müssen wie folgt sein: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0'; -$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children muß eine positive ganze Zahl sein.'; -$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers muß eine positive ganze Zahl sein.'; -$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers muß eine positive ganze Zahl sein.'; -$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers muß eine positive ganze Zahl sein.'; -$wb['hd_quota_error_regex'] = 'Speicherplatzbeschränkung ist ungültig.'; -$wb['traffic_quota_error_regex'] = 'Transfervolumenbeschränkung ist ungültig.'; -$wb['fastcgi_php_version_txt'] = 'PHP Version'; -$wb['pm_txt'] = 'PHP-FPM FastCGI Prozess Manager'; -$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout'; -$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests'; -$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout muß eine positive ganze Zahl sein.'; -$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests muß eine ganze Zahl >= 0 sein.'; -$wb['pm_ondemand_hint_txt'] = 'Bitte beachten Sie, daß Ihre PHP Version >= 5.3.9 sein muß, wenn Sie den ondemand Process-Manager nutzen möchten. Wenn Sie ondemand für eine ältere PHP Version auswählen, wird PHP nicht mehr starten!'; -$wb['generate_password_txt'] = 'Passwort erzeugen'; -$wb['repeat_password_txt'] = 'Passwort wiederholen'; -$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; -$wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; -$wb['available_php_directive_snippets_txt'] = 'Verfügbare PHP Direktiven Schnipsel:'; -$wb['available_apache_directive_snippets_txt'] = 'Verfügbare Apache Direktiven Schnipsel:'; -$wb['available_nginx_directive_snippets_txt'] = 'Verfügbare nginx Direktiven Schnipsel:'; +$wb['ssl_state_txt'] = "Bundesland"; +$wb['ssl_locality_txt'] = "Ort"; +$wb['ssl_organisation_txt'] = "Firma"; +$wb['ssl_organisation_unit_txt'] = "Abteilung"; +$wb['ssl_country_txt'] = "Land"; +$wb['ssl_key_txt'] = "SSL Key"; +$wb['ssl_request_txt'] = "SSL Request"; +$wb['ssl_cert_txt'] = "SSL Zertifikat"; +$wb['ssl_bundle_txt'] = "SSL Bundle"; +$wb['ssl_action_txt'] = "SSL Aktion"; +$wb['server_id_txt'] = "Server"; +$wb['domain_txt'] = "Domain"; +$wb['type_txt'] = "Typ"; +$wb['parent_domain_id_txt'] = "Zugehörige Webseite"; +$wb['web_folder_error_regex'] = "Ungültige Verzeichnisangabe, bitte keinen / eingeben."; +$wb['redirect_type_txt'] = "Weiterleitungstyp"; +$wb['redirect_path_txt'] = "Weiterleitungspfad"; +$wb['active_txt'] = "Aktiv"; +$wb['document_root_txt'] = "Documentroot"; +$wb['system_user_txt'] = "Linux Benutzer"; +$wb['system_group_txt'] = "Linux Gruppe"; +$wb['ip_address_txt'] = "IP Adresse"; +$wb['vhost_type_txt'] = "VHost Type"; +$wb['hd_quota_txt'] = "Speicherplatzbeschränkung"; +$wb['traffic_quota_txt'] = "Transfervolumenbeschränkung"; +$wb['cgi_txt'] = "CGI"; +$wb['ssi_txt'] = "SSI"; +$wb['ssl_txt'] = "SSL"; +$wb['suexec_txt'] = "SuEXEC"; +$wb['php_txt'] = "PHP"; +$wb['client_txt'] = "Kunde"; +$wb['limit_web_domain_txt'] = "Die maximale Anzahl an Webdomains für Ihr Konto wurde erreicht."; +$wb['limit_web_aliasdomain_txt'] = "Die maximale Anzahl an Aliasdomains für Ihr Konto wurde erreicht."; +$wb['limit_web_subdomain_txt'] = "Die maximale Anzahl an Subdomains für Ihr Konto wurde erreicht."; +$wb['apache_directives_txt'] = "Apache Direktiven"; +$wb['domain_error_empty'] = "Domain ist leer."; +$wb['domain_error_unique'] = "Domain muss eindeutig sein"; +$wb['domain_error_regex'] = "Domain Name ungültig."; +$wb['domain_error_autosub'] = "Es existiert bereits eine Subdomain mit diesen Einstellungen."; +$wb['hd_quota_error_empty'] = "Speicherplatzbeschränkung ist leer."; +$wb['traffic_quota_error_empty'] = "Transfervolumenbeschränkung ist leer."; +$wb['errordocs_txt'] = "Eigene Fehlerseiten"; +$wb['error_ssl_state_empty'] = "SSL Status ist leer."; +$wb['error_ssl_locality_empty'] = "Ort (SSL) ist leer."; +$wb['error_ssl_organisation_empty'] = "Organisation (SSL) ist leer."; +$wb['error_ssl_organisation_unit_empty'] = "Abteilung (SSL) ist leer."; +$wb['error_ssl_country_empty'] = "Land (SSL) ist leer."; +$wb['subdomain_txt'] = "Auto Subdomain"; +$wb['client_group_id_txt'] = "Kunde"; +$wb['stats_password_txt'] = "Webstatistik Passwort"; +$wb['ssl_domain_txt'] = "SSL Domain"; +$wb['allow_override_txt'] = "Allow Override"; +$wb['limit_web_quota_free_txt'] = "Max. mögliche Speicherplatzbeschränkung"; +$wb['ssl_state_error_regex'] = "Ungültige SSL State. Gültige Zeichen sind: a-z, 0-9 und .,-_"; +$wb['ssl_locality_error_regex'] = "Ungültige SSL Locality. Gülige Zeichen sind: a-z, 0-9 und .,-_"; +$wb['ssl_organisation_error_regex'] = "Ungültige SSL Organisation. Gültige Zeichen sind: a-z, 0-9 und .,-_"; +$wb['ssl_organistaion_unit_error_regex'] = "Ungültige SSL Organisation Unit. Gültige Zeichen sind: a-z, 0-9 und .,-_"; +$wb['ssl_country_error_regex'] = "Ungültiges SSL Land. Gültige Zeichen sind: A-Z"; +$wb['limit_traffic_quota_free_txt'] = "Max. mögliche Transfervolumenbeschränkung"; +$wb['redirect_error_regex'] = "Ungültiger Weiterleitungspfad. Gültige Angaben sind beispielsweise: /test/ oder http://www.domain.tld/test/"; +$wb['php_open_basedir_txt'] = "PHP open_basedir"; +$wb['backup_interval_txt'] = "Backup Intervall"; +$wb['backup_copies_txt'] = "Anzahl an Backups"; +$wb['traffic_quota_exceeded_txt'] = "Transfervolumen verbraucht."; +$wb['ruby_txt'] = "Ruby"; +$wb['stats_user_txt'] = "Webstatistik Benutzername"; +$wb['stats_type_txt'] = "Webstatistik Programm"; +$wb['custom_php_ini_txt'] = "Individuelle php.ini Einstellungen"; +$wb['error_ssl_cert_empty'] = "SSL Zertifikat Feld ist leer."; +$wb['none_txt'] = "Keine"; +$wb['disabled_txt'] = "Deaktiviert"; +$wb['no_redirect_txt'] = "Kein Redirect"; +$wb['no_flag_txt'] = "Kein Flag"; +$wb['save_certificate_txt'] = "Zertifikat speichern"; +$wb['create_certificate_txt'] = "Zertifikat erstellen"; +$wb['delete_certificate_txt'] = "Zertifikat löschen"; +$wb['nginx_directives_txt'] = "nginx Direktiven"; +$wb['seo_redirect_txt'] = "SEO Redirect"; +$wb['non_www_to_www_txt'] = "Nicht-www -> www"; +$wb['www_to_non_www_txt'] = "www -> Nicht-www"; +$wb['php_fpm_use_socket_txt'] = "Benutze Socket für PHP-FPM"; +$wb['ipv6_address_txt'] = "IPv6 Adresse"; +$wb['error_no_sni_txt'] = "SNI für SSL ist auf diesem Server nicht aktiviert. Sie können daher nur ein SSL Zertifikat pro IP Adresse eintragen."; +$wb['python_txt'] = "Python"; +$wb['perl_txt'] = "Perl"; +$wb['pm_max_children_txt'] = "PHP-FPM pm.max_children"; +$wb['pm_start_servers_txt'] = "PHP-FPM pm.start_servers"; +$wb['pm_min_spare_servers_txt'] = "PHP-FPM pm.min_spare_servers"; +$wb['pm_max_spare_servers_txt'] = "PHP-FPM pm.max_spare_servers"; +$wb['error_php_fpm_pm_settings_txt'] = "Die Werte der PHP-FPM pm Einstellungen müssen wie folgt sein: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0"; +$wb['pm_max_children_error_regex'] = "PHP-FPM pm.max_children muß eine positive ganze Zahl sein."; +$wb['pm_start_servers_error_regex'] = "PHP-FPM pm.start_servers muß eine positive ganze Zahl sein."; +$wb['pm_min_spare_servers_error_regex'] = "PHP-FPM pm.min_spare_servers muß eine positive ganze Zahl sein."; +$wb['pm_max_spare_servers_error_regex'] = "PHP-FPM pm.max_spare_servers muß eine positive ganze Zahl sein."; +$wb['hd_quota_error_regex'] = "Speicherplatzbeschränkung ist ungültig."; +$wb['traffic_quota_error_regex'] = "Transfervolumenbeschränkung ist ungültig."; +$wb['fastcgi_php_version_txt'] = "PHP Version"; +$wb['pm_txt'] = "PHP-FPM FastCGI Prozess Manager"; +$wb['pm_process_idle_timeout_txt'] = "PHP-FPM pm.process_idle_timeout"; +$wb['pm_max_requests_txt'] = "PHP-FPM pm.max_requests"; +$wb['pm_process_idle_timeout_error_regex'] = "PHP-FPM pm.process_idle_timeout muß eine positive ganze Zahl sein."; +$wb['pm_max_requests_error_regex'] = "PHP-FPM pm.max_requests muß eine ganze Zahl >= 0 sein."; +$wb['pm_ondemand_hint_txt'] = "Bitte beachten Sie, daß Ihre PHP Version >= 5.3.9 sein muß, wenn Sie den ondemand Process-Manager nutzen möchten. Wenn Sie ondemand für eine ältere PHP Version auswählen, wird PHP nicht mehr starten!"; +$wb['generate_password_txt'] = "Passwort erzeugen"; +$wb['repeat_password_txt'] = "Passwort wiederholen"; +$wb['password_mismatch_txt'] = "Die Passwörter stimmen nicht überein."; +$wb['password_match_txt'] = "Die Passwörter stimmen überein."; +$wb['available_php_directive_snippets_txt'] = "Verfügbare PHP Direktiven Schnipsel:"; +$wb['available_apache_directive_snippets_txt'] = "Verfügbare Apache Direktiven Schnipsel:"; +$wb['available_nginx_directive_snippets_txt'] = "Verfügbare nginx Direktiven Schnipsel:"; ?> + diff --git a/interface/web/sites/lib/lang/de_web_domain_admin_list.lng b/interface/web/sites/lib/lang/de_web_domain_admin_list.lng index d9dc65c6c..276696c70 100644 --- a/interface/web/sites/lib/lang/de_web_domain_admin_list.lng +++ b/interface/web/sites/lib/lang/de_web_domain_admin_list.lng @@ -7,3 +7,4 @@ $wb['server_id_txt'] = 'Server'; $wb['domain_txt'] = 'Domain'; $wb['add_new_record_txt'] = 'Neue Webseite hinzufügen'; ?> + diff --git a/interface/web/sites/lib/lang/de_web_domain_list.lng b/interface/web/sites/lib/lang/de_web_domain_list.lng index ce56a1cd1..b722783e7 100644 --- a/interface/web/sites/lib/lang/de_web_domain_list.lng +++ b/interface/web/sites/lib/lang/de_web_domain_list.lng @@ -6,3 +6,4 @@ $wb['server_id_txt'] = 'Server'; $wb['domain_txt'] = 'Domain'; $wb['add_new_record_txt'] = 'Neue Domain hinzufügen'; ?> + diff --git a/interface/web/sites/lib/lang/de_web_folder.lng b/interface/web/sites/lib/lang/de_web_folder.lng index 8defc36f4..615e34050 100644 --- a/interface/web/sites/lib/lang/de_web_folder.lng +++ b/interface/web/sites/lib/lang/de_web_folder.lng @@ -5,3 +5,4 @@ $wb['path_txt'] = 'Pfad'; $wb['active_txt'] = 'Aktiv'; $wb['path_error_regex'] = 'Ungültiger Pfad.'; ?> + diff --git a/interface/web/sites/lib/lang/de_web_folder_list.lng b/interface/web/sites/lib/lang/de_web_folder_list.lng index 5491202ac..2ac8f0399 100644 --- a/interface/web/sites/lib/lang/de_web_folder_list.lng +++ b/interface/web/sites/lib/lang/de_web_folder_list.lng @@ -5,3 +5,4 @@ $wb['server_id_txt'] = 'Server'; $wb['parent_domain_id_txt'] = 'Webseite'; $wb['path_txt'] = 'Pfad'; ?> + diff --git a/interface/web/sites/lib/lang/de_web_folder_user.lng b/interface/web/sites/lib/lang/de_web_folder_user.lng index 9562168e1..d570a0673 100644 --- a/interface/web/sites/lib/lang/de_web_folder_user.lng +++ b/interface/web/sites/lib/lang/de_web_folder_user.lng @@ -10,3 +10,4 @@ $wb['repeat_password_txt'] = 'Passwort wiederholen'; $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; $wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; ?> + diff --git a/interface/web/sites/lib/lang/de_web_folder_user_list.lng b/interface/web/sites/lib/lang/de_web_folder_user_list.lng index 5357760eb..cd41dbff3 100644 --- a/interface/web/sites/lib/lang/de_web_folder_user_list.lng +++ b/interface/web/sites/lib/lang/de_web_folder_user_list.lng @@ -4,3 +4,4 @@ $wb['active_txt'] = 'Aktiv'; $wb['web_folder_id_txt'] = 'Ordner'; $wb['username_txt'] = 'Benutzername'; ?> + diff --git a/interface/web/sites/lib/lang/de_web_sites_stats_list.lng b/interface/web/sites/lib/lang/de_web_sites_stats_list.lng index f7d8d424c..c6e52310a 100644 --- a/interface/web/sites/lib/lang/de_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/de_web_sites_stats_list.lng @@ -1,9 +1,10 @@ + diff --git a/interface/web/sites/lib/lang/de_web_subdomain.lng b/interface/web/sites/lib/lang/de_web_subdomain.lng index 1847ba8d1..e64f3f47e 100644 --- a/interface/web/sites/lib/lang/de_web_subdomain.lng +++ b/interface/web/sites/lib/lang/de_web_subdomain.lng @@ -41,3 +41,4 @@ $wb['redirect_error_regex'] = 'Ungültiger redirect Pfad. Gültige Pfade sind be $wb['no_redirect_txt'] = 'Kein Redirect'; $wb['no_flag_txt'] = 'Kein Flag'; ?> + diff --git a/interface/web/sites/lib/lang/de_web_subdomain_list.lng b/interface/web/sites/lib/lang/de_web_subdomain_list.lng index 042b9f02c..91970764d 100644 --- a/interface/web/sites/lib/lang/de_web_subdomain_list.lng +++ b/interface/web/sites/lib/lang/de_web_subdomain_list.lng @@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Webseite'; $wb['domain_txt'] = 'Subdomain'; $wb['add_new_record_txt'] = 'Neue Subdomain hinzufügen'; ?> + diff --git a/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng index fe83bf21f..e0b840c77 100644 --- a/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng @@ -111,3 +111,4 @@ $wb['repeat_password_txt'] = 'Passwort wiederholen'; $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; $wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; ?> + diff --git a/interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng index 042b9f02c..91970764d 100644 --- a/interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng +++ b/interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng @@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Webseite'; $wb['domain_txt'] = 'Subdomain'; $wb['add_new_record_txt'] = 'Neue Subdomain hinzufügen'; ?> + diff --git a/interface/web/sites/lib/lang/de_webdav_user.lng b/interface/web/sites/lib/lang/de_webdav_user.lng index eeefda85e..381c0a077 100644 --- a/interface/web/sites/lib/lang/de_webdav_user.lng +++ b/interface/web/sites/lib/lang/de_webdav_user.lng @@ -19,3 +19,4 @@ $wb['repeat_password_txt'] = 'Passwort wiederholen'; $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; $wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; ?> + diff --git a/interface/web/sites/lib/lang/de_webdav_user_list.lng b/interface/web/sites/lib/lang/de_webdav_user_list.lng index 927bfbb2d..84b9fadcf 100644 --- a/interface/web/sites/lib/lang/de_webdav_user_list.lng +++ b/interface/web/sites/lib/lang/de_webdav_user_list.lng @@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Webseite'; $wb['username_txt'] = 'Benutzername'; $wb['add_new_record_txt'] = 'Neuen WebDAV Benutzer hinzufügen'; ?> + diff --git a/interface/web/sites/lib/lang/en_web_backup_list.lng b/interface/web/sites/lib/lang/en_web_backup_list.lng index 1ac668762..74bcbd9b7 100644 --- a/interface/web/sites/lib/lang/en_web_backup_list.lng +++ b/interface/web/sites/lib/lang/en_web_backup_list.lng @@ -3,8 +3,8 @@ $wb['list_head_txt'] = 'Existing backups'; $wb['date_txt'] = 'Date'; $wb['backup_type_txt'] = 'Type'; $wb['filename_txt'] = 'Backup file'; -$wb['restore_backup_txt'] = 'Restore backup'; -$wb['download_backup_txt'] = 'Download backup'; +$wb['restore_backup_txt'] = 'Restore'; +$wb['download_backup_txt'] = 'Download'; $wb['download_info_txt'] = 'The backup file will be available for download in the backup folder of the website in a few minutes.'; $wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.'; $wb['restore_confirm_txt'] = 'Restoring will overwrite existing files in your website. Do you really want to restore this backup?'; diff --git a/interface/web/sites/templates/aps_instances_list.htm b/interface/web/sites/templates/aps_instances_list.htm index 11de54fdd..be985b583 100644 --- a/interface/web/sites/templates/aps_instances_list.htm +++ b/interface/web/sites/templates/aps_instances_list.htm @@ -41,10 +41,10 @@ {tmpl_var name='instance_status'} -     {tmpl_var name='delete_txt'} + {tmpl_var name='delete_txt'} - {tmpl_var name='reinstall_txt'} + {tmpl_var name='reinstall_txt'} diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm index 145104e0e..fe8e316f2 100644 --- a/interface/web/sites/templates/web_domain_edit.htm +++ b/interface/web/sites/templates/web_domain_edit.htm @@ -193,20 +193,19 @@ if(data.servertype == "nginx"){ var selected = jQuery('#php').val(); jQuery('.apache').hide(); - jQuery('.apache').hide(); jQuery('#php option[value="fast-cgi"]').hide(); jQuery('#php option[value="cgi"]').hide(); jQuery('#php option[value="mod"]').hide(); jQuery('#php option[value="suphp"]').hide(); if(selected != "no" && selected != "php-fpm") jQuery('#php option[value="php-fpm"]').attr('selected', 'selected'); } else { - jQuery('.apache').show(); jQuery('.apache').show(); jQuery('#php option[value="fast-cgi"]').show(); jQuery('#php option[value="cgi"]').show(); jQuery('#php option[value="mod"]').show(); jQuery('#php option[value="suphp"]').show(); } + jQuery('#php').change(); }); } @@ -227,7 +226,7 @@ } options += ''; }); - $('#fastcgi_php_version').html(options); + $('#fastcgi_php_version').html(options).change(); }); } @@ -246,4 +245,4 @@ }); - + \ No newline at end of file diff --git a/interface/web/sites/templates/web_vhost_subdomain_edit.htm b/interface/web/sites/templates/web_vhost_subdomain_edit.htm index ce89c84b3..60d887ea8 100644 --- a/interface/web/sites/templates/web_vhost_subdomain_edit.htm +++ b/interface/web/sites/templates/web_vhost_subdomain_edit.htm @@ -167,20 +167,19 @@ if(data.servertype == "nginx"){ var selected = jQuery('#php').val(); jQuery('.apache').hide(); - jQuery('.apache').hide(); jQuery('#php option[value="fast-cgi"]').hide(); jQuery('#php option[value="cgi"]').hide(); jQuery('#php option[value="mod"]').hide(); jQuery('#php option[value="suphp"]').hide(); if(selected != "no" && selected != "php-fpm") jQuery('#php option[value="php-fpm"]').attr('selected', 'selected'); } else { - jQuery('.apache').show(); jQuery('.apache').show(); jQuery('#php option[value="fast-cgi"]').show(); jQuery('#php option[value="cgi"]').show(); jQuery('#php option[value="mod"]').show(); jQuery('#php option[value="suphp"]').show(); } + jQuery('#php').change(); }); } @@ -201,7 +200,7 @@ } options += ''; }); - $('#fastcgi_php_version').html(options); + $('#fastcgi_php_version').html(options).change(); }); } diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php index 142c7d2a3..8ac503abe 100644 --- a/interface/web/sites/web_domain_edit.php +++ b/interface/web/sites/web_domain_edit.php @@ -80,6 +80,7 @@ class page_action extends tform_actions { $client = $app->db->queryOneRecord("SELECT client.default_webserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); $app->tpl->setVar("server_id_value", $client['default_webserver']); } + $app->tform->formDef['tabs']['domain']['readonly'] = false; parent::onShowNew(); } diff --git a/interface/web/strengthmeter/lib/lang/de_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/de_strengthmeter.lng index 52f10189e..dbfdce3ae 100644 --- a/interface/web/strengthmeter/lib/lang/de_strengthmeter.lng +++ b/interface/web/strengthmeter/lib/lang/de_strengthmeter.lng @@ -6,3 +6,4 @@ $wb['password_strength_3_txt'] = 'Gut'; $wb['password_strength_4_txt'] = 'Stark'; $wb['password_strength_5_txt'] = 'Sehr stark'; ?> + diff --git a/interface/web/themes/default-304/ISPC_VERSION b/interface/web/themes/default-304/ispconfig_version similarity index 100% rename from interface/web/themes/default-304/ISPC_VERSION rename to interface/web/themes/default-304/ispconfig_version diff --git a/interface/web/themes/default/css/styles.css b/interface/web/themes/default/css/styles.css index d58d28b5d..0801b687b 100644 --- a/interface/web/themes/default/css/styles.css +++ b/interface/web/themes/default/css/styles.css @@ -667,6 +667,7 @@ input.button:focus, .buttons button[type]{ padding:5px 10px 5px 7px; /* Firefox */ line-height:17px; /* Safari */ + white-space: nowrap; } *:first-child+html button[type]{ padding:4px 10px 3px 7px; /* IE7 */ @@ -836,6 +837,12 @@ div[class^=country-] { height: 20px; width: 26px; } +li[class^=country-] { + background-image: url("../icons/flags_sprite.png"); + background-repeat: no-repeat; + text-indent: 24px; +} +li[class^=country-] a.ui-state-hover { background: transparent; } div[class^=country-] span { display: none; } @@ -1444,7 +1451,7 @@ span.icons16-empty { width:16px; height:16px; cursor:pointer; - background: url("../icons/x16_sprite.png") no-repeat center center transparent; + background: url("../icons/x16_sprite.png") no-repeat -2px -42px transparent; float:right; display:inline; position:relative; @@ -1771,7 +1778,7 @@ p.value { } .ui-widget { font-family: "Trebuchet MS", Arial, sans-serif; font-size: 100%; } .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: "Trebuchet MS", Arial, sans-serif; font-size: 100%; } -ul.ui-autocomplete { max-height: 250px; overflow-y: auto; } +ul.ui-autocomplete { max-height: 250px; overflow-y: auto; min-width: 50px;} .ui-combobox { position: relative; display: inline-block; margin-right: 17px; } .ui-combobox-toggle { position: absolute !important; top: 0; bottom: 0; margin-left: -1px; padding: 1px !important; background: none repeat scroll 0 0 #FFFFFF !important; border: 1px solid #DFDFDF !important;} .ui-combobox-input { background: none repeat scroll 0 0 #FFFFFF !important; border: 1px solid #DFDFDF !important; padding: 1px; font-weight: normal !important; } \ No newline at end of file diff --git a/interface/web/themes/default_64_navimg/ISPC_VERSION b/interface/web/themes/default_64_navimg/ispconfig_version similarity index 100% rename from interface/web/themes/default_64_navimg/ISPC_VERSION rename to interface/web/themes/default_64_navimg/ispconfig_version diff --git a/interface/web/themes/default_combobox/ISPC_VERSION b/interface/web/themes/default_combobox/ispconfig_version similarity index 100% rename from interface/web/themes/default_combobox/ISPC_VERSION rename to interface/web/themes/default_combobox/ispconfig_version diff --git a/interface/web/themes/default_no_navimg/ISPC_VERSION b/interface/web/themes/default_no_navimg/ispconfig_version similarity index 100% rename from interface/web/themes/default_no_navimg/ISPC_VERSION rename to interface/web/themes/default_no_navimg/ispconfig_version diff --git a/interface/web/tools/form/interface_settings.tform.php b/interface/web/tools/form/interface_settings.tform.php index e992c3321..49ed62d16 100644 --- a/interface/web/tools/form/interface_settings.tform.php +++ b/interface/web/tools/form/interface_settings.tform.php @@ -113,7 +113,7 @@ $handle = @opendir(ISPC_THEMES_PATH); while ($file = @readdir ($handle)) { if (substr($file, 0, 1) != '.') { if(@is_dir(ISPC_THEMES_PATH."/$file")) { - if($file == 'default' || (@file_exists(ISPC_THEMES_PATH."/$file/ISPC_VERSION") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ISPC_VERSION")) == ISPC_APP_VERSION)) { + if(!file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") || (@file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ispconfig_version")) == ISPC_APP_VERSION)) { $themes_list[$file] = $file; } } diff --git a/interface/web/tools/interface_settings.php b/interface/web/tools/interface_settings.php index 0744c7399..0c17ac9ef 100644 --- a/interface/web/tools/interface_settings.php +++ b/interface/web/tools/interface_settings.php @@ -104,7 +104,7 @@ class page_action extends tform_actions { if($this->dataRecord['app_theme'] != 'default') { $tmp_path = ISPC_THEMES_PATH."/".$this->dataRecord['app_theme']; - if(!@is_dir($tmp_path) || !@file_exists($tmp_path."/ISPC_VERSION") || trim(file_get_contents($tmp_path."/ISPC_VERSION")) != ISPC_APP_VERSION) { + if(!@is_dir($tmp_path) || (@file_exists($tmp_path."/ispconfig_version") && trim(file_get_contents($tmp_path."/ispconfig_version")) != ISPC_APP_VERSION)) { // fall back to default theme if this one is not compatible with current ispc version $this->dataRecord['app_theme'] = 'default'; } diff --git a/interface/web/tools/lib/lang/de.lng b/interface/web/tools/lib/lang/de.lng index 4f0aea421..4748b925b 100644 --- a/interface/web/tools/lib/lang/de.lng +++ b/interface/web/tools/lib/lang/de.lng @@ -11,3 +11,4 @@ $wb['Import'] = 'Import'; $wb['ISPConfig 3 mail'] = 'ISPConfig 3 mail'; $wb['PDNS Tupa'] = 'PowerDNS Tupa'; ?> + diff --git a/interface/web/tools/lib/lang/de_import_ispconfig.lng b/interface/web/tools/lib/lang/de_import_ispconfig.lng index f9e171de3..63994e1dd 100644 --- a/interface/web/tools/lib/lang/de_import_ispconfig.lng +++ b/interface/web/tools/lib/lang/de_import_ispconfig.lng @@ -21,3 +21,4 @@ $wb['import_forward_txt'] = 'Weiterleitungen importieren'; $wb['import_user_filter_txt'] = 'Benutzer Filter importieren'; $wb['import_spamfilter_txt'] = 'Spamfilter importieren'; ?> + diff --git a/interface/web/tools/lib/lang/de_index.lng b/interface/web/tools/lib/lang/de_index.lng index d36ff7192..701985b5d 100644 --- a/interface/web/tools/lib/lang/de_index.lng +++ b/interface/web/tools/lib/lang/de_index.lng @@ -2,3 +2,4 @@ $wb['page_head_txt'] = 'ISPConfig Tools'; $wb['page_desc_txt'] = 'Benutzereinstellungen ändern'; ?> + diff --git a/interface/web/tools/lib/lang/de_interface.lng b/interface/web/tools/lib/lang/de_interface.lng index 9f31f353b..a94ba14e0 100644 --- a/interface/web/tools/lib/lang/de_interface.lng +++ b/interface/web/tools/lib/lang/de_interface.lng @@ -1,7 +1,8 @@ + diff --git a/interface/web/tools/lib/lang/de_resync.lng b/interface/web/tools/lib/lang/de_resync.lng index 634027cf3..d90a3e9c4 100644 --- a/interface/web/tools/lib/lang/de_resync.lng +++ b/interface/web/tools/lib/lang/de_resync.lng @@ -11,3 +11,4 @@ $wb['resync_dns_txt'] = 'Resync DNS Einträge'; $wb['btn_start_txt'] = 'Start'; $wb['btn_cancel_txt'] = 'Zurück'; ?> + diff --git a/interface/web/tools/lib/lang/de_tpl_default.lng b/interface/web/tools/lib/lang/de_tpl_default.lng index ce9d5bba1..72c45ce7e 100644 --- a/interface/web/tools/lib/lang/de_tpl_default.lng +++ b/interface/web/tools/lib/lang/de_tpl_default.lng @@ -1,7 +1,8 @@ + diff --git a/interface/web/tools/lib/lang/de_usersettings.lng b/interface/web/tools/lib/lang/de_usersettings.lng index 908bbf6d5..167a0f7df 100644 --- a/interface/web/tools/lib/lang/de_usersettings.lng +++ b/interface/web/tools/lib/lang/de_usersettings.lng @@ -10,3 +10,4 @@ $wb['repeat_password_txt'] = 'Passwort wiederholen'; $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; $wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; ?> + diff --git a/interface/web/vm/lib/lang/de.lng b/interface/web/vm/lib/lang/de.lng index 474d2ac7b..536ad315a 100644 --- a/interface/web/vm/lib/lang/de.lng +++ b/interface/web/vm/lib/lang/de.lng @@ -5,3 +5,4 @@ $wb['VM Templates'] = 'VM-Templates'; $wb['IP addresses'] = 'IP-Adressen'; $wb['OpenVZ'] = 'OpenVZ'; ?> + diff --git a/interface/web/vm/lib/lang/de_openvz_action.lng b/interface/web/vm/lib/lang/de_openvz_action.lng index f40d2f28b..c0a5c0e51 100644 --- a/interface/web/vm/lib/lang/de_openvz_action.lng +++ b/interface/web/vm/lib/lang/de_openvz_action.lng @@ -14,3 +14,4 @@ $wb['ostemplate_name_error'] = 'Der Name des OSTemplates enthält ungültige Zei $wb['ostemplate_name_unique_error'] = 'Es existiert bereits ein OSTemplate mit diesem Namen.'; $wb['ostemplate_exec_txt'] = 'Der Befehl um das OSTemplate zu erstellen wurde an den VM-Host gesendet. Es kann einige Minuten dauern bis das OSTemplate verfügbar ist.'; ?> + diff --git a/interface/web/vm/lib/lang/de_openvz_ip.lng b/interface/web/vm/lib/lang/de_openvz_ip.lng index 48c9a520c..b7b1498b7 100644 --- a/interface/web/vm/lib/lang/de_openvz_ip.lng +++ b/interface/web/vm/lib/lang/de_openvz_ip.lng @@ -7,3 +7,4 @@ $wb['ip_error_wrong'] = 'Bitte tragen Sie eine gültige IPv4-Adresse ein.'; $wb['ip_error_unique'] = 'Diese IP-Adresse existiert bereits.'; $wb['IP address'] = 'IP-Adresse'; ?> + diff --git a/interface/web/vm/lib/lang/de_openvz_ip_list.lng b/interface/web/vm/lib/lang/de_openvz_ip_list.lng index f4302d813..d214e9515 100644 --- a/interface/web/vm/lib/lang/de_openvz_ip_list.lng +++ b/interface/web/vm/lib/lang/de_openvz_ip_list.lng @@ -5,3 +5,4 @@ $wb['vm_id_txt'] = 'VM'; $wb['ip_address_txt'] = 'IP-Adresse'; $wb['reserved_txt'] = 'Reserviert'; ?> + diff --git a/interface/web/vm/lib/lang/de_openvz_ostemplate.lng b/interface/web/vm/lib/lang/de_openvz_ostemplate.lng index 8e4cfcb97..e0fb9396d 100644 --- a/interface/web/vm/lib/lang/de_openvz_ostemplate.lng +++ b/interface/web/vm/lib/lang/de_openvz_ostemplate.lng @@ -9,3 +9,4 @@ $wb['template_name_error_empty'] = 'Template-Name ist leer.'; $wb['template_file_error_empty'] = 'Template-Dateiname ist leer.'; $wb['Template'] = 'Template'; ?> + diff --git a/interface/web/vm/lib/lang/de_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/de_openvz_ostemplate_list.lng index dff6bd2de..09a174ee8 100644 --- a/interface/web/vm/lib/lang/de_openvz_ostemplate_list.lng +++ b/interface/web/vm/lib/lang/de_openvz_ostemplate_list.lng @@ -6,3 +6,4 @@ $wb['server_id_txt'] = 'Server'; $wb['allservers_txt'] = 'Existiert auf allen Servern'; $wb['ostemplate_id_txt'] = 'ID'; ?> + diff --git a/interface/web/vm/lib/lang/de_openvz_template.lng b/interface/web/vm/lib/lang/de_openvz_template.lng index 329a10601..9e76ecaac 100644 --- a/interface/web/vm/lib/lang/de_openvz_template.lng +++ b/interface/web/vm/lib/lang/de_openvz_template.lng @@ -91,3 +91,4 @@ $wb['swappages_error_empty'] = 'Swappages ist leer.'; $wb['Template'] = 'Template'; $wb['Advanced'] = 'Erweitert'; ?> + diff --git a/interface/web/vm/lib/lang/de_openvz_template_list.lng b/interface/web/vm/lib/lang/de_openvz_template_list.lng index 9e32b341b..682f2cc3c 100644 --- a/interface/web/vm/lib/lang/de_openvz_template_list.lng +++ b/interface/web/vm/lib/lang/de_openvz_template_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'OpenVZ Virtual Machine Template'; $wb['active_txt'] = 'Aktiv'; $wb['template_name_txt'] = 'Template-Name'; ?> + diff --git a/interface/web/vm/lib/lang/de_openvz_vm.lng b/interface/web/vm/lib/lang/de_openvz_vm.lng index c773885c6..b45a79fef 100644 --- a/interface/web/vm/lib/lang/de_openvz_vm.lng +++ b/interface/web/vm/lib/lang/de_openvz_vm.lng @@ -38,3 +38,4 @@ $wb['template_nameserver_error_empty'] = 'Nameserver ist leer.'; $wb['Virtual server'] = 'Virtueller Server'; $wb['Advanced'] = 'Erweitert'; ?> + diff --git a/interface/web/vm/lib/lang/de_openvz_vm_list.lng b/interface/web/vm/lib/lang/de_openvz_vm_list.lng index 0b3ac30c7..aecb4621e 100644 --- a/interface/web/vm/lib/lang/de_openvz_vm_list.lng +++ b/interface/web/vm/lib/lang/de_openvz_vm_list.lng @@ -8,3 +8,4 @@ $wb['hostname_txt'] = 'Hostname'; $wb['ip_address_txt'] = 'IP-Adresse'; $wb['veid_txt'] = 'VEID'; ?> + diff --git a/server/conf/sieve_filter_1.2.master b/server/conf/sieve_filter_1.2.master index 1c63ddf39..a88dc2d60 100644 --- a/server/conf/sieve_filter_1.2.master +++ b/server/conf/sieve_filter_1.2.master @@ -30,11 +30,17 @@ if header :contains "X-Spam-Flag" "YES" { stop; } + if allof(currentdate :value "ge" "iso8601" "", currentdate :value "le" "iso8601" "") { + + vacation :days 1 :subject "" ""; + + } + diff --git a/server/cron_daily.sh b/server/cron_daily.sh index 717b943d6..ea87447c0 100644 --- a/server/cron_daily.sh +++ b/server/cron_daily.sh @@ -10,3 +10,7 @@ if [ -f /usr/local/ispconfig/server/lib/php.ini ]; then fi /usr/bin/php -q /usr/local/ispconfig/server/cron_daily.php + +if [ -f /usr/local/ispconfig/interface/web/billing/cron/create_recurring_invoices_cron.php ]; then + /usr/bin/php -q /usr/local/ispconfig/interface/web/billing/cron/create_recurring_invoices_cron.php +fi diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php index 01b70feeb..b460875fd 100644 --- a/server/lib/classes/system.inc.php +++ b/server/lib/classes/system.inc.php @@ -709,6 +709,19 @@ class system{ return copy($file1,$file2); } + function touch($file, $allow_symlink = false){ + global $app; + if($allow_symlink == false && @file_exists($file) && $this->checkpath($file) == false) { + $this->unlink($file); + } + if(@touch($file)) { + return true; + } else { + $app->log("touch failed: $file",LOGLEVEL_DEBUG); + return false; + } + } + function checkpath($path) { $path = trim($path); //* We allow only absolute paths diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index a1820d9d9..182a73868 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -115,8 +115,8 @@ class apache2_plugin { $csr_file = $ssl_dir.'/'.$domain.'.csr'; $crt_file = $ssl_dir.'/'.$domain.'.crt'; - //* Create a SSL Certificate - if($data['new']['ssl_action'] == 'create') { + //* Create a SSL Certificate, but only if this is not a mirror server. + if($data['new']['ssl_action'] == 'create' && $conf['mirror_server_id'] == 0) { $this->ssl_certificate_changed = true; @@ -1354,7 +1354,7 @@ class apache2_plugin { $app->system->web_folder_protection($data['new']['document_root'],false); $app->system->file_put_contents($data['new']['document_root'].'/.htpasswd_stats',$htp_file); $app->system->web_folder_protection($data['new']['document_root'],true); - $app->system->chmod($data['new']['document_root'].'/.htpasswd_stats',0755); + $app->system->chmod($data['new']['document_root'].'/.htpasswd_stats',0750); unset($htp_file); } } @@ -1715,8 +1715,8 @@ class apache2_plugin { //* Create empty .htpasswd file, if it does not exist if(!is_file($folder_path.'.htpasswd')) { - touch($folder_path.'.htpasswd'); - $app->system->chmod($folder_path.'.htpasswd',0755); + $app->system->touch($folder_path.'.htpasswd'); + $app->system->chmod($folder_path.'.htpasswd',0750); $app->system->chown($folder_path.'.htpasswd',$website['system_user']); $app->system->chgrp($folder_path.'.htpasswd',$website['system_group']); $app->log('Created file '.$folder_path.'.htpasswd',LOGLEVEL_DEBUG); @@ -1770,7 +1770,7 @@ class apache2_plugin { unset($old_content); $app->system->file_put_contents($folder_path.'.htaccess',$ht_file); - $app->system->chmod($folder_path.'.htaccess',0755); + $app->system->chmod($folder_path.'.htaccess',0750); $app->system->chown($folder_path.'.htaccess',$website['system_user']); $app->system->chgrp($folder_path.'.htaccess',$website['system_group']); $app->log('Created/modified file '.$folder_path.'.htaccess',LOGLEVEL_DEBUG); @@ -1932,7 +1932,7 @@ class apache2_plugin { } $app->system->file_put_contents($new_folder_path.'.htaccess',$ht_file); - $app->system->chmod($new_folder_path.'.htaccess',0755); + $app->system->chmod($new_folder_path.'.htaccess',0750); $app->system->chown($new_folder_path.'.htaccess',$website['system_user']); $app->system->chgrp($new_folder_path.'.htaccess',$website['system_group']); $app->log('Created/modified file '.$new_folder_path.'.htaccess',LOGLEVEL_DEBUG); @@ -2118,6 +2118,8 @@ class apache2_plugin { * @param string $pwd The password-hash of the user */ private function _writeHtDigestFile($filename, $username, $authname, $pwdhash ) { + global $app; + $changed = false; if(is_file($filename) && !is_link($filename)) { $in = fopen($filename, 'r'); diff --git a/server/plugins-available/backup_plugin.inc.php b/server/plugins-available/backup_plugin.inc.php index dfe3ddd5b..3727f8273 100644 --- a/server/plugins-available/backup_plugin.inc.php +++ b/server/plugins-available/backup_plugin.inc.php @@ -61,7 +61,7 @@ class backup_plugin { global $app,$conf; $backup_id = intval($data); - $backup = $app->db->queryOneRecord("SELECT * FROM web_backup WHERE backup_id = $backup_id"); + $backup = $app->dbmaster->queryOneRecord("SELECT * FROM web_backup WHERE backup_id = $backup_id"); if(is_array($backup)) { diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php index 4dd37fbde..49ca191ed 100644 --- a/server/plugins-available/bind_plugin.inc.php +++ b/server/plugins-available/bind_plugin.inc.php @@ -39,7 +39,7 @@ class bind_plugin { function onInstall() { global $conf; - if(isset($conf['bind']['installed']) && $conf['bind']['installed'] == true) { + if(isset($conf['bind']['installed']) && $conf['bind']['installed'] == true && @is_link('/usr/local/ispconfig/server/mods-enabled/dns_module.inc.php')) { return true; } else { return false; diff --git a/server/plugins-available/cron_jailkit_plugin.inc.php b/server/plugins-available/cron_jailkit_plugin.inc.php index f0c96b36d..41669b5f8 100644 --- a/server/plugins-available/cron_jailkit_plugin.inc.php +++ b/server/plugins-available/cron_jailkit_plugin.inc.php @@ -116,9 +116,9 @@ class cron_jailkit_plugin { $this->app = $app; $this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit'); - $app->system->web_folder_protection($parent_domain['document_root'],false); - $this->_update_website_security_level(); + + $app->system->web_folder_protection($parent_domain['document_root'],false); $this->_setup_jailkit_chroot(); @@ -185,9 +185,10 @@ class cron_jailkit_plugin { $this->data = $data; $this->app = $app; $this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit'); + + $this->_update_website_security_level(); $app->system->web_folder_protection($parent_domain['document_root'],false); - $this->_update_website_security_level(); $this->_setup_jailkit_chroot(); $this->_add_jailkit_user(); @@ -214,6 +215,8 @@ class cron_jailkit_plugin { function _setup_jailkit_chroot() { + global $app; + //check if the chroot environment is created yet if not create it with a list of program sections from the config if (!is_dir($this->parent_domain['document_root'].'/etc/jailkit')) { @@ -238,7 +241,7 @@ class cron_jailkit_plugin { $bashrc = escapeshellcmd($this->parent_domain['document_root']).'/etc/bash.bashrc'; if(@is_file($bashrc) || @is_link($bashrc)) unlink($bashrc); - file_put_contents($bashrc,$tpl->grab()); + $app->system->file_put_contents($bashrc,$tpl->grab()); unset($tpl); $this->app->log('Added bashrc script: '.$bashrc,LOGLEVEL_DEBUG); @@ -251,7 +254,7 @@ class cron_jailkit_plugin { $motd = escapeshellcmd($this->parent_domain['document_root']).'/var/run/motd'; if(@is_file($motd) || @is_link($motd)) unlink($motd); - file_put_contents($motd,$tpl->grab()); + $app->system->file_put_contents($motd,$tpl->grab()); } $this->_add_jailkit_programs(); @@ -296,9 +299,9 @@ class cron_jailkit_plugin { $this->app->log("Added jailkit user to chroot with command: ".$command,LOGLEVEL_DEBUG); - mkdir(escapeshellcmd($this->parent_domain['document_root'].$jailkit_chroot_userhome), 0755, true); - chown(escapeshellcmd($this->parent_domain['document_root'].$jailkit_chroot_userhome), escapeshellcmd($this->parent_domain['system_user'])); - chgrp(escapeshellcmd($this->parent_domain['document_root'].$jailkit_chroot_userhome), escapeshellcmd($this->parent_domain['system_group'])); + $app->system->mkdir(escapeshellcmd($this->parent_domain['document_root'].$jailkit_chroot_userhome), 0755, true); + $app->system->chown(escapeshellcmd($this->parent_domain['document_root'].$jailkit_chroot_userhome), escapeshellcmd($this->parent_domain['system_user'])); + $app->system->chgrp(escapeshellcmd($this->parent_domain['document_root'].$jailkit_chroot_userhome), escapeshellcmd($this->parent_domain['system_group'])); } @@ -314,13 +317,18 @@ class cron_jailkit_plugin { // load the server configuration options $app->uses("getconf"); $web_config = $app->getconf->get_server_config($conf["server_id"], 'web'); - + + // Get the parent website of this shell user + $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$this->data['new']['parent_domain_id']); + //* If the security level is set to high - if($web_config['security_level'] == 20) { - $this->_exec('chmod 755 '.escapeshellcmd($this->parent_domain['document_root'])); - $this->_exec('chown root:root '.escapeshellcmd($this->parent_domain['document_root'])); + if($web_config['security_level'] == 20 && is_array($web)) { + $app->system->web_folder_protection($web["document_root"],false); + $app->system->chmod($web["document_root"],0755); + $app->system->chown($web["document_root"],'root'); + $app->system->chgrp($web["document_root"],'root'); + $app->system->web_folder_protection($web["document_root"],true); } - } //* Wrapper for exec function for easier debugging diff --git a/server/plugins-available/cron_plugin.inc.php b/server/plugins-available/cron_plugin.inc.php index fd83331bf..4ccbcb2b0 100644 --- a/server/plugins-available/cron_plugin.inc.php +++ b/server/plugins-available/cron_plugin.inc.php @@ -142,7 +142,7 @@ class cron_plugin { } // make temp directory writable for the apache and website users - chmod(escapeshellcmd($parent_domain["document_root"].'/tmp'), 0777); + $app->system->chmod(escapeshellcmd($parent_domain["document_root"].'/tmp'), 0777); /** TODO READ CRON MASTER **/ @@ -234,19 +234,19 @@ class cron_plugin { } if($cmd_count > 0) { - file_put_contents($cron_file, $cron_content); + $app->system->file_put_contents($cron_file, $cron_content); $app->log("Wrote Cron file $cron_file with content:\n$cron_content",LOGLEVEL_DEBUG); } else { - @unlink($cron_file); + $app->system->unlink($cron_file); $app->log("Deleted Cron file $cron_file",LOGLEVEL_DEBUG); } $cron_file = escapeshellcmd($cron_config["crontab_dir"].'/ispc_chrooted_'.$this->parent_domain["system_user"]); if($chr_cmd_count > 0) { - file_put_contents($cron_file, $chr_cron_content); + $app->system->file_put_contents($cron_file, $chr_cron_content); $app->log("Wrote Cron file $cron_file with content:\n$chr_cron_content",LOGLEVEL_DEBUG); } else { - @unlink($cron_file); + $app->system->unlink($cron_file); $app->log("Deleted Cron file $cron_file",LOGLEVEL_DEBUG); } diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php index 25e4cf2c8..9df9fd6de 100644 --- a/server/plugins-available/maildeliver_plugin.inc.php +++ b/server/plugins-available/maildeliver_plugin.inc.php @@ -127,6 +127,14 @@ class maildeliver_plugin { // Move junk $tpl->setVar('move_junk',$data["new"]["move_junk"]); + + // Check autoresponder dates + if($data["new"]["autoresponder_start_date"] == '0000-00-00 00:00:00' && $data["new"]["autoresponder_end_date"] == '0000-00-00 00:00:00') { + $tpl->setVar('autoresponder_date_limit',0); + } else { + $tpl->setVar('autoresponder_date_limit',1); + } + // Set autoresponder start date $data["new"]["autoresponder_start_date"] = str_replace (" ", "T", $data["new"]["autoresponder_start_date"]); diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php index 7a329c19f..a0e8314cb 100644 --- a/server/plugins-available/nginx_plugin.inc.php +++ b/server/plugins-available/nginx_plugin.inc.php @@ -115,7 +115,7 @@ class nginx_plugin { $crt_file = $ssl_dir.'/'.$domain.'.crt'; //* Create a SSL Certificate - if($data['new']['ssl_action'] == 'create') { + if($data['new']['ssl_action'] == 'create' && $conf['mirror_server_id'] == 0) { $this->ssl_certificate_changed = true; diff --git a/server/plugins-available/powerdns_plugin.inc.php b/server/plugins-available/powerdns_plugin.inc.php index 74f32b904..01419687e 100644 --- a/server/plugins-available/powerdns_plugin.inc.php +++ b/server/plugins-available/powerdns_plugin.inc.php @@ -135,7 +135,7 @@ class powerdns_plugin { $serial = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ".$ispconfig_id); $serial_id = $serial["serial"]; $app->db->query("INSERT INTO powerdns.domains (name, type, notified_serial, ispconfig_id) VALUES ('$origin', 'MASTER', $serial_id, $ispconfig_id)"); - $zone_id = mysql_insert_id(); + $zone_id = $app->db->insertID(); if(substr($data["new"]["ns"], -1) == '.'){ $ns = substr($data["new"]["ns"], 0, -1); } else { @@ -228,7 +228,7 @@ class powerdns_plugin { $app->db->query("INSERT INTO powerdns.domains (name, type, master, ispconfig_id) VALUES ('$origin', 'SLAVE', '$master_ns', $ispconfig_id)"); //$app->db->query("INSERT INTO powerdns.domains (name, type, ispconfig_id) VALUES ('$origin', 'NATIVE', $ispconfig_id)"); - $zone_id = mysql_insert_id(); + $zone_id = $app->db->insertID(); //* Reload powerdns nameserver $app->services->restartServiceDelayed('powerdns','reload'); @@ -250,7 +250,7 @@ class powerdns_plugin { $app->db->query("UPDATE powerdns.domains SET name = '$origin', type = 'SLAVE', master = '$master_ns' WHERE ispconfig_id=$ispconfig_id AND type = 'SLAVE'"); //$app->db->query("INSERT INTO powerdns.domains (name, type, ispconfig_id) VALUES ('$origin', 'NATIVE', $ispconfig_id)"); - $zone_id = mysql_insert_id(); + $zone_id = $app->db->insertID(); $zone = $app->db->queryOneRecord("SELECT * FROM powerdns.domains WHERE ispconfig_id = ".$ispconfig_id." AND type = 'SLAVE'"); $zone_id = $zone["id"]; diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php index d63b6b221..48e2cde62 100755 --- a/server/plugins-available/shelluser_base_plugin.inc.php +++ b/server/plugins-available/shelluser_base_plugin.inc.php @@ -107,10 +107,10 @@ class shelluser_base_plugin { $this->_setup_ssh_rsa(); //* Create .bash_history file - touch(escapeshellcmd($data['new']['dir']).'/.bash_history'); - chmod(escapeshellcmd($data['new']['dir']).'/.bash_history', 0755); - chown(escapeshellcmd($data['new']['dir']).'/.bash_history', escapeshellcmd($data['new']['username'])); - chgrp(escapeshellcmd($data['new']['dir']).'/.bash_history', escapeshellcmd($data['new']['pgroup'])); + $app->system->touch(escapeshellcmd($data['new']['dir']).'/.bash_history'); + $app->system->chmod(escapeshellcmd($data['new']['dir']).'/.bash_history', 0755); + $app->system->chown(escapeshellcmd($data['new']['dir']).'/.bash_history', $data['new']['username']); + $app->system->chgrp(escapeshellcmd($data['new']['dir']).'/.bash_history', $data['new']['pgroup']); //* Disable shell user temporarily if we use jailkit if($data['new']['chroot'] == 'jailkit') { @@ -174,10 +174,10 @@ class shelluser_base_plugin { //* Create .bash_history file if(!is_file($data['new']['dir']).'/.bash_history') { - touch(escapeshellcmd($data['new']['dir']).'/.bash_history'); - chmod(escapeshellcmd($data['new']['dir']).'/.bash_history', 0755); - chown(escapeshellcmd($data['new']['dir']).'/.bash_history',escapeshellcmd($data['new']['username'])); - chgrp(escapeshellcmd($data['new']['dir']).'/.bash_history',escapeshellcmd($data['new']['pgroup'])); + $app->system->touch(escapeshellcmd($data['new']['dir']).'/.bash_history'); + $app->system->chmod(escapeshellcmd($data['new']['dir']).'/.bash_history', 0755); + $app->system->chown(escapeshellcmd($data['new']['dir']).'/.bash_history',escapeshellcmd($data['new']['username'])); + $app->system->chgrp(escapeshellcmd($data['new']['dir']).'/.bash_history',escapeshellcmd($data['new']['pgroup'])); } } else { @@ -248,19 +248,20 @@ class shelluser_base_plugin { exec('ssh-keygen -t rsa -C '.$username.'-rsa-key-'.time().' -f /tmp/id_rsa -N ""'); // use the public key that has been generated - $userkey = file_get_contents('/tmp/id_rsa.pub'); + $userkey = $app->system->file_get_contents('/tmp/id_rsa.pub'); // save keypair in client table - $this->app->db->query("UPDATE client SET created_at = ".time().", id_rsa = '".file_get_contents('/tmp/id_rsa')."', ssh_rsa = '".$userkey."' WHERE client_id = ".$id); + $this->app->db->query("UPDATE client SET created_at = ".time().", id_rsa = '".$app->db->quote($app->system->file_get_contents('/tmp/id_rsa'))."', ssh_rsa = '".$app->db->quote($userkey)."' WHERE client_id = ".$id); - exec('rm -f /tmp/id_rsa /tmp/id_rsa.pub'); + $app->system->unlink('/tmp/id_rsa'); + $app->system->unlink('/tmp/id_rsa.pub'); $this->app->log("ssh-rsa keypair generated for ".$username,LOGLEVEL_DEBUG); }; if (!file_exists($sshkeys)){ // add root's key $app->file->mkdirs($sshdir, '0700'); - if(is_file('/root/.ssh/authorized_keys')) file_put_contents($sshkeys, file_get_contents('/root/.ssh/authorized_keys')); + if(is_file('/root/.ssh/authorized_keys')) $app->system->file_put_contents($sshkeys, $app->system->file_get_contents('/root/.ssh/authorized_keys')); // Remove duplicate keys $existing_keys = @file($sshkeys); @@ -275,7 +276,7 @@ class shelluser_base_plugin { $final_keys = implode("\n", array_flip(array_flip($new_final_keys_arr))); // add the user's key - file_put_contents($sshkeys, $final_keys); + $app->system->file_put_contents($sshkeys, $final_keys); $app->file->remove_blank_lines($sshkeys); $this->app->log("ssh-rsa authorisation keyfile created in ".$sshkeys,LOGLEVEL_DEBUG); } @@ -309,7 +310,7 @@ class shelluser_base_plugin { $final_keys = implode("\n", array_flip(array_flip($new_final_keys_arr))); // add the custom key - file_put_contents($sshkeys, $final_keys); + $app->system->file_put_contents($sshkeys, $final_keys); $app->file->remove_blank_lines($sshkeys); $this->app->log("ssh-rsa key updated in ".$sshkeys,LOGLEVEL_DEBUG); diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php index d0487d15e..c465b719d 100755 --- a/server/plugins-available/shelluser_jailkit_plugin.inc.php +++ b/server/plugins-available/shelluser_jailkit_plugin.inc.php @@ -80,7 +80,7 @@ class shelluser_jailkit_plugin { */ if ($data['new']['chroot'] == "jailkit") { - $app->system->web_folder_protection($web['document_root'],false); + // load the server configuration options $app->uses("getconf"); @@ -89,6 +89,8 @@ class shelluser_jailkit_plugin { $this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit'); $this->_update_website_security_level(); + + $app->system->web_folder_protection($web['document_root'],false); $this->_setup_jailkit_chroot(); @@ -131,7 +133,6 @@ class shelluser_jailkit_plugin { */ if ($data['new']['chroot'] == "jailkit") { - $app->system->web_folder_protection($web['document_root'],false); // load the server configuration options $app->uses("getconf"); @@ -140,6 +141,8 @@ class shelluser_jailkit_plugin { $this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit'); $this->_update_website_security_level(); + + $app->system->web_folder_protection($web['document_root'],false); $this->_setup_jailkit_chroot(); $this->_add_jailkit_user(); @@ -201,6 +204,8 @@ class shelluser_jailkit_plugin { function _setup_jailkit_chroot() { + global $app; + //check if the chroot environment is created yet if not create it with a list of program sections from the config if (!is_dir($this->data['new']['dir'].'/etc/jailkit')) { @@ -242,7 +247,7 @@ class shelluser_jailkit_plugin { $motd = escapeshellcmd($this->data['new']['dir']).'/var/run/motd'; if(@is_file($motd) || @is_link($motd)) unlink($motd); - file_put_contents($motd,$tpl->grab()); + $app->system->file_put_contents($motd,$tpl->grab()); } } @@ -315,14 +320,14 @@ class shelluser_jailkit_plugin { $this->app->log("Added jailkit user to chroot with command: ".$command,LOGLEVEL_DEBUG); if(!is_dir($this->data['new']['dir'].$jailkit_chroot_userhome)) mkdir(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), 0755, true); - chown(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), $this->data['new']['username']); - chgrp(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), $this->data['new']['pgroup']); + $app->system->chown(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), $this->data['new']['username']); + $app->system->chgrp(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), $this->data['new']['pgroup']); $this->app->log("Added created jailkit user home in : ".$this->data['new']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG); if(!is_dir($this->data['new']['dir'].$jailkit_chroot_puserhome)) mkdir(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), 0755, true); - chown(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), $this->data['new']['puser']); - chgrp(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), $this->data['new']['pgroup']); + $app->system->chown(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), $this->data['new']['puser']); + $app->system->chgrp(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), $this->data['new']['pgroup']); $this->app->log("Added jailkit parent user home in : ".$this->data['new']['dir'].$jailkit_chroot_puserhome,LOGLEVEL_DEBUG); @@ -387,19 +392,20 @@ class shelluser_jailkit_plugin { exec('ssh-keygen -t rsa -C '.$username.'-rsa-key-'.time().' -f /tmp/id_rsa -N ""'); // use the public key that has been generated - $userkey = file_get_contents('/tmp/id_rsa.pub'); + $userkey = $app->system->file_get_contents('/tmp/id_rsa.pub'); // save keypair in client table - $this->app->db->query("UPDATE client SET created_at = ".time().", id_rsa = '".file_get_contents('/tmp/id_rsa')."', ssh_rsa = '".$userkey."' WHERE client_id = ".$id); + $this->app->db->query("UPDATE client SET created_at = ".time().", id_rsa = '".$app->db->quote($app->system->file_get_contents('/tmp/id_rsa'))."', ssh_rsa = '".$app->db->quote($userkey)."' WHERE client_id = ".$id); - exec('rm -f /tmp/id_rsa /tmp/id_rsa.pub'); + $app->system->unlink('/tmp/id_rsa'); + $app->system->unlink('/tmp/id_rsa.pub'); $this->app->log("ssh-rsa keypair generated for ".$username,LOGLEVEL_DEBUG); }; if (!file_exists($sshkeys)){ // add root's key $app->file->mkdirs($sshdir, '0755'); - if(is_file('/root/.ssh/authorized_keys')) file_put_contents($sshkeys, file_get_contents('/root/.ssh/authorized_keys')); + if(is_file('/root/.ssh/authorized_keys')) $app->system->file_put_contents($sshkeys, $app->system->file_get_contents('/root/.ssh/authorized_keys')); // Remove duplicate keys $existing_keys = @file($sshkeys); @@ -447,7 +453,7 @@ class shelluser_jailkit_plugin { $final_keys = implode("\n", array_flip(array_flip($new_final_keys_arr))); // add the custom key - file_put_contents($sshkeys, $final_keys); + $app->system->file_put_contents($sshkeys, $final_keys); $app->file->remove_blank_lines($sshkeys); $this->app->log("ssh-rsa key updated in ".$sshkeys,LOGLEVEL_DEBUG); -- GitLab