Commit 26c0fc98 authored by tbrehm's avatar tbrehm
Browse files

Merged revisions 3100-3175 from stable branch.

parent c2568b07
...@@ -542,6 +542,10 @@ class installer_dist extends installer_base { ...@@ -542,6 +542,10 @@ class installer_dist extends installer_base {
replaceLine('/etc/suphp.conf','umask=0077','umask=0022',0); replaceLine('/etc/suphp.conf','umask=0077','umask=0022',0);
//} //}
if(!file_exists('/srv/www/cgi-bin/php5') && file_exists('/srv/www/cgi-bin/php')) {
symlink('/srv/www/cgi-bin/php','/srv/www/cgi-bin/php5');
}
// Sites enabled and available dirs // Sites enabled and available dirs
exec('mkdir -p '.$conf['apache']['vhost_conf_enabled_dir']); exec('mkdir -p '.$conf['apache']['vhost_conf_enabled_dir']);
exec('mkdir -p '.$conf['apache']['vhost_conf_dir']); exec('mkdir -p '.$conf['apache']['vhost_conf_dir']);
......
...@@ -315,7 +315,7 @@ if($install_mode == 'standard') { ...@@ -315,7 +315,7 @@ if($install_mode == 'standard') {
if($conf['courier']['courier-pop'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart'); if($conf['courier']['courier-pop'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart'); if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script'])) system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart'); if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script'])) system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart');
if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script'])) system($conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart'); if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script'])) system('nohup '.$conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart >/dev/null 2>&1 &');
if($conf['apache']['installed'] == true && $conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart'); if($conf['apache']['installed'] == true && $conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
//* Reload is enough for nginx //* Reload is enough for nginx
if($conf['nginx']['installed'] == true){ if($conf['nginx']['installed'] == true){
...@@ -453,7 +453,7 @@ if($install_mode == 'standard') { ...@@ -453,7 +453,7 @@ if($install_mode == 'standard') {
if($conf['courier']['courier-pop'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart'); if($conf['courier']['courier-pop'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart'); if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script'])) system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart'); if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script'])) system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart');
if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script'])) system($conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart'); if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script'])) system('nohup '.$conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart >/dev/null 2>&1 &');
} }
//** Configure Jailkit //** Configure Jailkit
......
...@@ -775,9 +775,22 @@ class installer_base { ...@@ -775,9 +775,22 @@ class installer_base {
public function configure_saslauthd() { public function configure_saslauthd() {
global $conf; global $conf;
//* Get saslsauthd version
exec('saslauthd -v 2>&1',$out);
$parts = explode(' ',$out[0]);
$saslversion = $parts[1];
unset($parts);
unset($out);
if(version_compare($saslversion , '2.1.23') > 0) {
$configfile = 'sasl_smtpd.conf'; //* Configfile for saslauthd versions 2.1.24 and newer
$configfile = 'sasl_smtpd2.conf';
} else {
//* Configfile for saslauthd versions up to 2.1.23
$configfile = 'sasl_smtpd.conf';
}
if(is_file($conf['postfix']['config_dir'].'/sasl/smtpd.conf')) copy($conf['postfix']['config_dir'].'/sasl/smtpd.conf',$conf['postfix']['config_dir'].'/sasl/smtpd.conf~'); if(is_file($conf['postfix']['config_dir'].'/sasl/smtpd.conf')) copy($conf['postfix']['config_dir'].'/sasl/smtpd.conf',$conf['postfix']['config_dir'].'/sasl/smtpd.conf~');
if(is_file($conf['postfix']['config_dir'].'/sasl/smtpd.conf~')) chmod($conf['postfix']['config_dir'].'/sasl/smtpd.conf~', 0400); if(is_file($conf['postfix']['config_dir'].'/sasl/smtpd.conf~')) chmod($conf['postfix']['config_dir'].'/sasl/smtpd.conf~', 0400);
$content = rf('tpl/'.$configfile.'.master'); $content = rf('tpl/'.$configfile.'.master');
...@@ -1417,7 +1430,7 @@ class installer_base { ...@@ -1417,7 +1430,7 @@ class installer_base {
$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content); $content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content); $content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
$content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content); $content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content);
$content = str_replace('{mysql_server_ip}',$conf['mysql']['host'],$content); $content = str_replace('{mysql_server_ip}',$conf['mysql']['ip'],$content);
} }
wf($conf['vlogger']['config_dir'].'/'.$configfile,$content); wf($conf['vlogger']['config_dir'].'/'.$configfile,$content);
chmod($conf['vlogger']['config_dir'].'/'.$configfile, 0600); chmod($conf['vlogger']['config_dir'].'/'.$configfile, 0600);
......
...@@ -2065,6 +2065,6 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`, ...@@ -2065,6 +2065,6 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
-- Dumping data for table `sys_config` -- Dumping data for table `sys_config`
-- --
INSERT INTO sys_config VALUES ('1','db','db_version','3.0.4.4'); INSERT INTO sys_config VALUES ('1','db','db_version','3.0.4.5');
SET FOREIGN_KEY_CHECKS = 1; SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
################################################ ################################################
LogFormat "%v %h %l %u %t \"%r\" %>s %B \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig LogFormat "%v %h %l %u %t \"%r\" %>s %B \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig
CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m%d-access.log\" -d \"/etc/vlogger-dbi.conf\" /var/log/ispconfig/httpd" combined_ispconfig CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig
<Directory /var/www/clients> <Directory /var/www/clients>
AllowOverride None AllowOverride None
......
...@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision); ...@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
//** Application //** Application
define('ISPC_APP_TITLE', 'ISPConfig'); define('ISPC_APP_TITLE', 'ISPConfig');
define('ISPC_APP_VERSION', '3.0.4.4'); define('ISPC_APP_VERSION', '3.0.4.5');
define('DEVSYSTEM', 0); define('DEVSYSTEM', 0);
......
pwcheck_method: saslauthd
mech_list: plain login
allow_plaintext: true
auxprop_plugin: sql
sql_engine: mysql
sql_hostnames: {mysql_server_ip}
sql_user: {mysql_server_ispconfig_user}
sql_passwd: {mysql_server_ispconfig_password}
sql_database: {mysql_server_database}
sql_select: select password from mail_user where login = '%u@%r' and postfix = 'y'
...@@ -54,7 +54,7 @@ nginx_group=www-data ...@@ -54,7 +54,7 @@ nginx_group=www-data
apps_vhost_port=8081 apps_vhost_port=8081
apps_vhost_ip=_default_ apps_vhost_ip=_default_
apps_vhost_servername= apps_vhost_servername=
php_open_basedir=[website_path]/web:[website_path]/tmp:/var/www/[website_domain]/web:/srv/www/[website_domain]/web:/usr/share/php5:/tmp:/usr/share/phpmyadmin:/etc/phpmyadmin:/var/lib/phpmyadmin php_open_basedir=[website_path]/web:[website_path]/tmp:/var/www/[website_domain]/web:/srv/www/[website_domain]/web:/usr/share/php5:/tmp:/usr/share/phpmyadmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/usr/share/php
htaccess_allow_override=All htaccess_allow_override=All
awstats_conf_dir=/etc/awstats awstats_conf_dir=/etc/awstats
awstats_data_dir=/var/lib/awstats awstats_data_dir=/var/lib/awstats
......
...@@ -402,7 +402,7 @@ if($reconfigure_services_answer == 'yes') { ...@@ -402,7 +402,7 @@ if($reconfigure_services_answer == 'yes') {
if($conf['courier']['courier-pop'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart'); if($conf['courier']['courier-pop'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart'); if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script'])) system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart'); if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script'])) system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart');
if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script'])) system($conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart'); if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script'])) system('nohup '.$conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart >/dev/null 2>&1 &');
} }
if($conf['services']['web']) { if($conf['services']['web']) {
if($conf['webserver']['server_type'] == 'apache' && $conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart'); if($conf['webserver']['server_type'] == 'apache' && $conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
......
...@@ -101,7 +101,7 @@ class functions { ...@@ -101,7 +101,7 @@ class functions {
} }
public function get_ispconfig_url() { public function get_ispconfig_url() {
$url = (stristr($_SERVER['SERVER_PROTOCOL'],'HTTPS'))?'https':'http'; $url = (stristr($_SERVER['SERVER_PROTOCOL'],'HTTPS') || stristr($_SERVER['HTTPS'],'on'))?'https':'http';
$url .= '://'.$_SERVER['SERVER_NAME']; $url .= '://'.$_SERVER['SERVER_NAME'];
if($_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) { if($_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) {
$url .= ':'.$_SERVER['SERVER_PORT']; $url .= ':'.$_SERVER['SERVER_PORT'];
......
...@@ -195,13 +195,13 @@ class listform { ...@@ -195,13 +195,13 @@ class listform {
//* Add Global Limit from selectbox //* Add Global Limit from selectbox
if(!empty($_POST['search_limit']) AND intval($_POST['search_limit'])){ if(!empty($_POST['search_limit']) AND intval($_POST['search_limit'])){
$_SESSION['search']['limit'] = $_POST['search_limit']; $_SESSION['search']['limit'] = intval($_POST['search_limit']);
} }
//* Get Config variables //* Get Config variables
$list_name = $this->listDef['name']; $list_name = $this->listDef['name'];
$search_prefix = $this->listDef['search_prefix']; $search_prefix = $this->listDef['search_prefix'];
$records_per_page = (empty($_SESSION['search']['limit']) ? $this->listDef['records_per_page'] : $_SESSION['search']['limit']) ; $records_per_page = (empty($_SESSION['search']['limit']) ? intval($this->listDef['records_per_page']) : intval($_SESSION['search']['limit'])) ;
$table = $this->listDef['table']; $table = $this->listDef['table'];
//* set PAGE to zero, if in session not set //* set PAGE to zero, if in session not set
......
...@@ -2462,6 +2462,7 @@ class remoting { ...@@ -2462,6 +2462,7 @@ class remoting {
//* Get the SQL query //* Get the SQL query
$sql = $app->remoting_lib->getSQL($params,'UPDATE',$primary_id); $sql = $app->remoting_lib->getSQL($params,'UPDATE',$primary_id);
// $this->server->fault('debug', $sql);
if($app->remoting_lib->errorMessage != '') { if($app->remoting_lib->errorMessage != '') {
$this->server->fault('data_processing_error', $app->remoting_lib->errorMessage); $this->server->fault('data_processing_error', $app->remoting_lib->errorMessage);
return false; return false;
......
...@@ -630,17 +630,19 @@ class remoting_lib { ...@@ -630,17 +630,19 @@ class remoting_lib {
$sql_insert_val .= "'".$record[$key]."', "; $sql_insert_val .= "'".$record[$key]."', ";
} }
} else { } else {
if($field['formtype'] == 'PASSWORD') { if($field['formtype'] == 'PASSWORD') {
if($field['encryption'] == 'CRYPT') { if(isset($field['encryption']) && $field['encryption'] == 'CRYPT') {
$record[$key] = $app->auth->crypt_password(stripslashes($record[$key])); $record[$key] = $app->auth->crypt_password(stripslashes($record[$key]));
} elseif ($field['encryption'] == 'MYSQL') { $sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
$sql_insert_val .= "PASSWORD('".$app->db->quote($record[$key])."'), "; } elseif (isset($field['encryption']) && $field['encryption'] == 'MYSQL') {
} elseif ($field['encryption'] == 'CLEARTEXT') { $sql_update .= "`$key` = PASSWORD('".$app->db->quote($record[$key])."'), ";
$sql_insert_val .= "'".$app->db->quote($record[$key])."', "; } elseif (isset($field['encryption']) && $field['encryption'] == 'CLEARTEXT') {
$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
} else { } else {
$record[$key] = md5($record[$key]); $record[$key] = md5(stripslashes($record[$key]));
$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
} }
$sql_update .= "`$key` = '".$record[$key]."', ";
} elseif ($field['formtype'] == 'CHECKBOX') { } elseif ($field['formtype'] == 'CHECKBOX') {
if($record[$key] == '') { if($record[$key] == '') {
// if a checkbox is not set, we set it to the unchecked value // if a checkbox is not set, we set it to the unchecked value
......
...@@ -918,7 +918,7 @@ class tform { ...@@ -918,7 +918,7 @@ class tform {
$this->action = $action; $this->action = $action;
$this->primary_id = $primary_id; $this->primary_id = $primary_id;
$record = $this->encode($record,$tab); $record = $this->encode($record,$tab,true);
$sql_insert_key = ''; $sql_insert_key = '';
$sql_insert_val = ''; $sql_insert_val = '';
$sql_update = ''; $sql_update = '';
...@@ -1041,7 +1041,7 @@ class tform { ...@@ -1041,7 +1041,7 @@ class tform {
//* return a empty string if there is nothing to update //* return a empty string if there is nothing to update
if(trim($sql_update) == '') $sql = ''; if(trim($sql_update) == '') $sql = '';
} }
return $sql; return $sql;
} }
......
...@@ -128,7 +128,7 @@ $form["tabs"]['sites'] = array ( ...@@ -128,7 +128,7 @@ $form["tabs"]['sites'] = array (
'datatype' => 'VARCHAR', 'datatype' => 'VARCHAR',
'formtype' => 'TEXT', 'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX', 'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/', 'regex' => '/^[0-9a-zA-Z\:\/\-\.\[\]]{0,255}$/',
'errmsg'=> 'phpmyadmin_url_error_regex'), 'errmsg'=> 'phpmyadmin_url_error_regex'),
), ),
'default' => '', 'default' => '',
......
<?php <?php
$wb['uid_txt'] = 'UID'; $wb['uid_txt'] = "UID";
$wb['gid_txt'] = 'GID'; $wb['gid_txt'] = "GID";
$wb['dir_txt'] = 'Directory'; $wb['dir_txt'] = "Directory";
$wb['quota_files_txt'] = 'Filequota'; $wb['quota_files_txt'] = "Filequota";
$wb['quota_files_unity_txt'] = 'Files'; $wb['quota_files_unity_txt'] = "Files";
$wb['ul_ratio_txt'] = 'Uploadratio'; $wb['ul_ratio_txt'] = "Uploadratio";
$wb['dl_ratio_txt'] = 'Downloadratio'; $wb['dl_ratio_txt'] = "Downloadratio";
$wb['ul_bandwidth_txt'] = 'Uploadbandwidth'; $wb['ul_bandwidth_txt'] = "Uploadbandwidth";
$wb['dl_bandwidth_txt'] = 'Downloadbandwidth'; $wb['dl_bandwidth_txt'] = "Downloadbandwidth";
$wb['server_id_txt'] = 'Server'; $wb['server_id_txt'] = "Server";
$wb['parent_domain_id_txt'] = 'Website'; $wb['parent_domain_id_txt'] = "Website";
$wb['username_txt'] = 'Username'; $wb['username_txt'] = "Username";
$wb['password_txt'] = 'Password'; $wb['password_txt'] = "Password";
$wb['password_strength_txt'] = 'Password strength'; $wb['password_strength_txt'] = "Password strength";
$wb['quota_size_txt'] = 'Harddisk-Quota'; $wb['quota_size_txt'] = "Harddisk-Quota";
$wb['active_txt'] = 'Active'; $wb['active_txt'] = "Active";
$wb['limit_ftp_user_txt'] = 'The max. number of FTP users for your account is reached.'; $wb['limit_ftp_user_txt'] = "The max. number of FTP users for your account is reached.";
$wb['username_error_empty'] = 'Username is empty.'; $wb['username_error_empty'] = "Username is empty.";
$wb['username_error_unique'] = 'The username must be unique.'; $wb['username_error_unique'] = "The username must be unique.";
$wb['username_error_regex'] = 'The username contains charachters that are not allowed.'; $wb['username_error_regex'] = "The username contains characters that are not allowed.";
$wb['quota_size_error_empty'] = 'Quota is empty.'; $wb['quota_size_error_empty'] = "Quota is empty.";
$wb['uid_error_empty'] = 'GID empty.'; $wb['uid_error_empty'] = "GID empty.";
$wb['directory_error_empty'] = 'Directory empty.'; $wb['directory_error_empty'] = "Directory empty.";
$wb['directory_error_notinweb'] = 'Directory not inside of web root directory.'; $wb['directory_error_notinweb'] = "Directory not inside of web root directory.";
$wb['parent_domain_id_error_empty'] = 'No website selected.'; $wb['parent_domain_id_error_empty'] = "No website selected.";
$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0'; $wb['quota_size_error_regex'] = "Quota: enter a -1 for unlimited or a number > 0";
$wb['dir_dot_error'] = 'No .. in path allowed.'; $wb['dir_dot_error'] = "No .. in path allowed.";
$wb['dir_slashdot_error'] = 'No ./ in path allowed.'; $wb['dir_slashdot_error'] = "No ./ in path allowed.";
?> ?>
<?php <?php
$wb['shell_txt'] = 'Shell'; $wb['shell_txt'] = "Shell";
$wb['dir_txt'] = 'Dir'; $wb['dir_txt'] = "Dir";
$wb['server_id_txt'] = 'Server'; $wb['server_id_txt'] = "Server";
$wb['parent_domain_id_txt'] = 'Site'; $wb['parent_domain_id_txt'] = "Site";
$wb['username_txt'] = 'Username'; $wb['username_txt'] = "Username";
$wb['password_txt'] = 'Password'; $wb['password_txt'] = "Password";
$wb['password_strength_txt'] = 'Password strength'; $wb['password_strength_txt'] = "Password strength";
$wb['chroot_txt'] = 'Chroot Shell'; $wb['chroot_txt'] = "Chroot Shell";
$wb['quota_size_txt'] = 'Quota'; $wb['quota_size_txt'] = "Quota";
$wb['active_txt'] = 'Active'; $wb['active_txt'] = "Active";
$wb['username_error_empty'] = 'Username is empty.'; $wb['username_error_empty'] = "Username is empty.";
$wb['username_error_unique'] = 'The username must be unique.'; $wb['username_error_unique'] = "The username must be unique.";
$wb['username_error_regex'] = 'The username contains charachters that are not allowed.'; $wb['username_error_regex'] = "The username contains characters that are not allowed.";
$wb['quota_size_error_empty'] = 'Quota is empty.'; $wb['quota_size_error_empty'] = "Quota is empty.";
$wb['uid_error_empty'] = 'GID empty.'; $wb['uid_error_empty'] = "GID empty.";
$wb['directory_error_empty'] = 'Directory empty.'; $wb['directory_error_empty'] = "Directory empty.";
$wb['limit_shell_user_txt'] = 'The max number of shell users is reached.'; $wb['limit_shell_user_txt'] = "The max number of shell users is reached.";
$wb['parent_domain_id_error_empty'] = 'No website selected.'; $wb['parent_domain_id_error_empty'] = "No website selected.";
$wb['puser_txt'] = 'Web Username'; $wb['puser_txt'] = "Web Username";
$wb['pgroup_txt'] = 'Web Group'; $wb['pgroup_txt'] = "Web Group";
$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)'; $wb['ssh_rsa_txt'] = "SSH-RSA Public Key (for key-based logins)";
$wb['dir_dot_error'] = 'No .. in path allowed.'; $wb['dir_dot_error'] = "No .. in path allowed.";
$wb['dir_slashdot_error'] = 'No ./ in path allowed.'; $wb['dir_slashdot_error'] = "No ./ in path allowed.";
?> ?>
<?php <?php
$wb['dir_txt'] = 'Directory'; $wb['dir_txt'] = "Directory";
$wb['server_id_txt'] = 'Server'; $wb['server_id_txt'] = "Server";
$wb['parent_domain_id_txt'] = 'Website'; $wb['parent_domain_id_txt'] = "Website";
$wb['username_txt'] = 'Username'; $wb['username_txt'] = "Username";
$wb['password_txt'] = 'Password'; $wb['password_txt'] = "Password";
$wb['password_strength_txt'] = 'Password strength'; $wb['password_strength_txt'] = "Password strength";
$wb['active_txt'] = 'Active'; $wb['active_txt'] = "Active";
$wb['limit_webdav_user_txt'] = 'The max. number of webdav users for your account is reached.'; $wb['limit_webdav_user_txt'] = "The max. number of webdav users for your account is reached.";
$wb['username_error_empty'] = 'Username is empty.'; $wb['username_error_empty'] = "Username is empty.";
$wb['username_error_unique'] = 'The username must be unique.'; $wb['username_error_unique'] = "The username must be unique.";
$wb['username_error_regex'] = 'The username contains charachters that are not allowed.'; $wb['username_error_regex'] = "The username contains characters that are not allowed.";
$wb['directory_error_empty'] = 'Directory empty.'; $wb['directory_error_empty'] = "Directory empty.";
$wb['parent_domain_id_error_empty'] = 'No website selected.'; $wb['parent_domain_id_error_empty'] = "No website selected.";
$wb['dir_dot_error'] = 'No .. in path allowed.'; $wb['dir_dot_error'] = "No .. in path allowed.";
$wb['dir_slashdot_error'] = 'No ./ in path allowed.'; $wb['dir_slashdot_error'] = "No ./ in path allowed.";
?> ?>
<?php <?php
$wb['dir_txt'] = 'Directory'; $wb['dir_txt'] = "Directory";
$wb['server_id_txt'] = 'Server'; $wb['server_id_txt'] = "Server";
$wb['parent_domain_id_txt'] = 'Website'; $wb['parent_domain_id_txt'] = "Website";
$wb['username_txt'] = 'Username'; $wb['username_txt'] = "Username";
$wb['password_txt'] = 'Password'; $wb['password_txt'] = "Password";
$wb['password_strength_txt'] = 'Password strength'; $wb['password_strength_txt'] = "Password strength";
$wb['active_txt'] = 'Active'; $wb['active_txt'] = "Active";
$wb['limit_webdav_user_txt'] = 'The max. number of webdav users for your account is reached.'; $wb['limit_webdav_user_txt'] = "The max. number of webdav users for your account is reached.";
$wb['username_error_empty'] = 'Username is empty.'; $wb['username_error_empty'] = "Username is empty.";
$wb['username_error_unique'] = 'The username must be unique.'; $wb['username_error_unique'] = "The username must be unique.";
$wb['username_error_regex'] = 'The username contains charachters that are not allowed.'; $wb['username_error_regex'] = "The username contains characters that are not allowed.";
$wb['directory_error_empty'] = 'Directory empty.'; $wb['directory_error_empty'] = "Directory empty.";
$wb['parent_domain_id_error_empty'] = 'No website selected.'; $wb['parent_domain_id_error_empty'] = "No website selected.";
$wb['dir_dot_error'] = 'No .. in path allowed.'; $wb['dir_dot_error'] = "No .. in path allowed.";
$wb['dir_slashdot_error'] = 'No ./ in path allowed.'; $wb['dir_slashdot_error'] = "No ./ in path allowed.";
?> ?>
<?php <?php
$wb['dir_txt'] = 'Directory'; $wb['dir_txt'] = "Directory";
$wb['server_id_txt'] = 'Server'; $wb['server_id_txt'] = "Server";
$wb['parent_domain_id_txt'] = 'Website'; $wb['parent_domain_id_txt'] = "Website";
$wb['username_txt'] = 'Username'; $wb['username_txt'] = "Username";
$wb['password_txt'] = 'Password'; $wb['password_txt'] = "Password";
$wb['password_strength_txt'] = 'Password strength'; $wb['password_strength_txt'] = "Password strength";
$wb['active_txt'] = 'Active'; $wb['active_txt'] = "Active";
$wb['limit_webdav_user_txt'] = 'The max. number of webdav users for your account is reached.'; $wb['limit_webdav_user_txt'] = "The max. number of webdav users for your account is reached.";
$wb['username_error_empty'] = 'Username is empty.'; $wb['username_error_empty'] = "Username is empty.";
$wb['username_error_unique'] = 'The username must be unique.'; $wb['username_error_unique'] = "The username must be unique.";
$wb['username_error_regex'] = 'The username contains charachters that are not allowed.'; $wb['username_error_regex'] = "The username contains characters that are not allowed.";
$wb['directory_error_empty'] = 'Directory empty.'; $wb['directory_error_empty'] = "Directory empty.";
$wb['parent_domain_id_error_empty'] = 'No website selected.'; $wb['parent_domain_id_error_empty'] = "No website selected.";
$wb['dir_dot_error'] = 'No .. in path allowed.'; $wb['dir_dot_error'] = "No .. in path allowed.";
$wb['dir_slashdot_error'] = 'No ./ in path allowed.'; $wb['dir_slashdot_error'] = "No ./ in path allowed.";
?> ?>
<?php <?php
$wb['dir_txt'] = 'Directory'; $wb['dir_txt'] = "Directory";
$wb['server_id_txt'] = 'Server'; $wb['server_id_txt'] = "Server";
$wb['parent_domain_id_txt'] = 'Website'; $wb['parent_domain_id_txt'] = "Website";
$wb['username_txt'] = 'Username'; $wb['username_txt'] = "Username";
$wb['password_txt'] = 'Password'; $wb['password_txt'] = "Password";
$wb['password_strength_txt'] = 'Password strength'; $wb['password_strength_txt'] = "Password strength";
$wb['active_txt'] = 'Active'; $wb['active_txt'] = "Active";
$wb['limit_webdav_user_txt'] = 'The max. number of webdav users for your account is reached.'; $wb['limit_webdav_user_txt'] = "The max. number of webdav users for your account is reached.";
$wb['username_error_empty'] = 'Username is empty.'; $wb['username_error_empty'] = "Username is empty.";
$wb['username_error_unique'] = 'The username must be unique.'; $wb['username_error_unique'] = "The username must be unique.";
$wb['username_error_regex'] = 'The username contains charachters that are not allowed.'; $wb['username_error_regex'] = "The username contains characters that are not allowed.";
$wb['directory_error_empty'] = 'Directory empty.'; $wb['directory_error_empty'] = "Directory empty.";
$wb['parent_domain_id_error_empty'] = 'No website selected.'; $wb['parent_domain_id_error_empty'] = "No website selected.";
$wb['dir_dot_error'] = 'No .. in path allowed.'; $wb['dir_dot_error'] = "No .. in path allowed.";
$wb['dir_slashdot_error'] = 'No ./ in path allowed.'; $wb['dir_slashdot_error'] = "No ./ in path allowed.";
?>