diff --git a/interface/lib/classes/remote.d/client.inc.php b/interface/lib/classes/remote.d/client.inc.php index b5a0b421d72869b74809b0140ca791ae812a62fb..612e667f9733f55e1522359f76c6af4f7d314456 100644 --- a/interface/lib/classes/remote.d/client.inc.php +++ b/interface/lib/classes/remote.d/client.inc.php @@ -113,20 +113,20 @@ class remoting_client extends remoting { } } - + //* Get the contact details to send a email like email address, name, etc. public function client_get_emailcontact($session_id, $client_id) { global $app; - + if(!$this->checkPerm($session_id, 'client_get_emailcontact')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } - + $client_id = $app->functions->intval($client_id); $rec = $app->db->queryOneRecord("SELECT company_name,contact_name,gender,email,language FROM client WHERE client_id = ?", $client_id); - + if(is_array($rec)) { return $rec; } else { @@ -159,7 +159,7 @@ class remoting_client extends remoting { public function client_add($session_id, $reseller_id, $params) { global $app; - + if (!$this->checkPerm($session_id, 'client_add')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); @@ -198,7 +198,7 @@ class remoting_client extends remoting { $app->uses('remoting_lib'); $app->remoting_lib->loadFormDef('../client/form/' . (isset($params['limit_client']) && $params['limit_client'] != 0 ? 'reseller' : 'client') . '.tform.php'); $old_rec = $app->remoting_lib->getDataRecord($client_id); - + //* merge old record with params, so only new values have to be set in $params $params = $app->functions->array_merge($old_rec,$params); @@ -218,7 +218,7 @@ class remoting_client extends remoting { } } - // we need the previuos templates assigned here + // we need the previous templates assigned here $this->oldTemplatesAssigned = $app->db->queryAllRecords('SELECT * FROM `client_template_assigned` WHERE `client_id` = ?', $client_id); if(!is_array($this->oldTemplatesAssigned) || count($this->oldTemplatesAssigned) < 1) { // check previous type of storing templates @@ -243,7 +243,7 @@ class remoting_client extends remoting { $affected_rows = $this->updateQuery('../client/form/' . (isset($params['limit_client']) && $params['limit_client'] != 0 ? 'reseller' : 'client') . '.tform.php', $reseller_id, $client_id, $params, 'client:' . ($reseller_id ? 'reseller' : 'client') . ':on_after_update'); $app->remoting_lib->ispconfig_sysuser_update($params, $client_id); - + // if canceled if ($params['canceled']) { $result = $app->functions->func_client_cancel($client_id, $params['canceled']); @@ -482,7 +482,7 @@ class remoting_client extends remoting { return false; } } - + public function client_get_by_customer_no($session_id, $customer_no) { global $app; if(!$this->checkPerm($session_id, 'client_get_by_customer_no')) { @@ -573,16 +573,16 @@ class remoting_client extends remoting { $result = $app->db->queryAllRecords($sql); return $result; } - + public function client_login_get($session_id,$username,$password,$remote_ip = '') { global $app; - + //* Check permissions if(!$this->checkPerm($session_id, 'client_get')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } - + //* Check username and password if(!preg_match("/^[\w\.\-\_\@]{1,128}$/", $username)) { throw new SoapFault('user_regex_error', 'Username contains invalid characters.'); @@ -592,21 +592,21 @@ class remoting_client extends remoting { throw new SoapFault('password_length_error', 'Invalid password length or no password provided.'); return false; } - + //* Check failed logins $sql = "SELECT * FROM `attempts_login` WHERE `ip`= ? AND `login_time` > (NOW() - INTERVAL 1 MINUTE) LIMIT 1"; $alreadyfailed = $app->db->queryOneRecord($sql, $remote_ip); - + //* too many failedlogins if($alreadyfailed['times'] > 5) { throw new SoapFault('error_user_too_many_logins', 'Too many failed logins.'); return false; } - - + + //*Set variables $returnval == false; - + if(strstr($username,'@')) { // Check against client table $sql = "SELECT * FROM client WHERE email = ?"; @@ -628,7 +628,7 @@ class remoting_client extends remoting { } } } - + if(is_array($user)) { $returnval = array( 'username' => $user['username'], 'type' => 'user', @@ -636,7 +636,7 @@ class remoting_client extends remoting { 'language' => $user['language'], 'country' => $user['country']); } - + } else { // Check against sys_user table $sql = "SELECT * FROM sys_user WHERE username = ?"; @@ -658,7 +658,7 @@ class remoting_client extends remoting { } } } - + if(is_array($user)) { $returnval = array( 'username' => $user['username'], 'type' => $user['typ'], @@ -669,7 +669,7 @@ class remoting_client extends remoting { throw new SoapFault('login_failed', 'Login failed.'); } } - + //* Log failed login attempts if($user === false) { if(!$alreadyfailed['times'] ) { @@ -682,10 +682,10 @@ class remoting_client extends remoting { $app->db->query($sql, $remote_ip); } } - + return $returnval; } - + public function client_get_by_groupid($session_id, $group_id) { global $app; diff --git a/interface/lib/lang/ar.lng b/interface/lib/lang/ar.lng index d00c7dc1b381c9de60af300b6bd80a6f0ed3643e..f81ee118cf72892f85b9fc4d1343906378e9d69a 100644 --- a/interface/lib/lang/ar.lng +++ b/interface/lib/lang/ar.lng @@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/bg.lng b/interface/lib/lang/bg.lng index 35bec0ab45f4164aa84e221b877e694127d08827..96ed3368def1dd9b5f2f51915a7e66016a324119 100644 --- a/interface/lib/lang/bg.lng +++ b/interface/lib/lang/bg.lng @@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/br.lng b/interface/lib/lang/br.lng index 4195702e25102dead8bb294f5e17429489600724..b24b769e1744c1b6c086f2a4260badbb15a538c1 100644 --- a/interface/lib/lang/br.lng +++ b/interface/lib/lang/br.lng @@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/ca.lng b/interface/lib/lang/ca.lng index 2d61af651a9dab14b178ccb11ab609af3218559b..0e069a7f383b5f2804d66f3648868fe02333c53f 100644 --- a/interface/lib/lang/ca.lng +++ b/interface/lib/lang/ca.lng @@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/cn.lng b/interface/lib/lang/cn.lng index cbb6ace68a31c5b35f266dd8404817ae5d218310..f56043cde96be5021798db8606a24e0322051614 100644 --- a/interface/lib/lang/cn.lng +++ b/interface/lib/lang/cn.lng @@ -185,4 +185,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng index 880f4fea117eed9761c8640855211723f0384f9b..adcd0b7245bd2fe471f06605fdceed8975295197 100644 --- a/interface/lib/lang/cz.lng +++ b/interface/lib/lang/cz.lng @@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng index 885feb171b0de555c1978ae062ed2a1640a58cec..a158fe3ba61be48c0d8475165468b26fcab6ed91 100644 --- a/interface/lib/lang/de.lng +++ b/interface/lib/lang/de.lng @@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/dk.lng b/interface/lib/lang/dk.lng index 6082b1a3919b4efeb0c46f1d7a74961b4f849b03..c6262113488d3b056ef7048b7adedcc56a9cb6f7 100644 --- a/interface/lib/lang/dk.lng +++ b/interface/lib/lang/dk.lng @@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/el.lng b/interface/lib/lang/el.lng index fb45cd8b68f0d426c0a79979e6dcec8aecd727ee..a8b54fdf8193f7325cc41a919bf29fa79bf1fd50 100644 --- a/interface/lib/lang/el.lng +++ b/interface/lib/lang/el.lng @@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng index 866a1249decf22ba79c29e46580c49769475249e..bc3dd424a8c7f7d16f71796d19b5423c71cd917a 100644 --- a/interface/lib/lang/en.lng +++ b/interface/lib/lang/en.lng @@ -185,4 +185,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/es.lng b/interface/lib/lang/es.lng index bc2ead77a86825286abdd10af01c1e0d0bbdddfa..c246a5215b0c3531e58e061615a9e24c355ab7cd 100644 --- a/interface/lib/lang/es.lng +++ b/interface/lib/lang/es.lng @@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/fi.lng b/interface/lib/lang/fi.lng index b8f1c502fc10a9ce10de3f7de7d53a11124286eb..38b1f39da924ccd7878ea82d4949374730558c4e 100644 --- a/interface/lib/lang/fi.lng +++ b/interface/lib/lang/fi.lng @@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/fr.lng b/interface/lib/lang/fr.lng index 273cc125dc891467e963b3cf1a707f7aa1ad3ad3..87c22cf5f057ad4999b487af69d53f58e55eb4ef 100644 --- a/interface/lib/lang/fr.lng +++ b/interface/lib/lang/fr.lng @@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/hr.lng b/interface/lib/lang/hr.lng index bf52fe0be5b925f1bfcc0f2fab33414c6f87a41a..acd909c2c61f8c8683d81b4d1ee2a8af2ee63f99 100644 --- a/interface/lib/lang/hr.lng +++ b/interface/lib/lang/hr.lng @@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/hu.lng b/interface/lib/lang/hu.lng index 732e078f8a6e4363542ae2687d1b09e52ca0bc6e..c48d40d7d502cd58eb39c4a2ef101fc7773da757 100644 --- a/interface/lib/lang/hu.lng +++ b/interface/lib/lang/hu.lng @@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/id.lng b/interface/lib/lang/id.lng index 970f7d8396769aec3e8b6af2fd860e878a229bfd..3889cfd4fa256df4ebaa8a089c8f14c850fb0f15 100644 --- a/interface/lib/lang/id.lng +++ b/interface/lib/lang/id.lng @@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/it.lng b/interface/lib/lang/it.lng index 235c86e8368b59aab772c9ead5d6eaadf1325cdf..bb6e04436db6da983ef73d237ce46ad5c7a7a4ba 100644 --- a/interface/lib/lang/it.lng +++ b/interface/lib/lang/it.lng @@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/ja.lng b/interface/lib/lang/ja.lng index 657b6128b11bb59a6c68369e5d6cd4aa9f231bc6..8e34e90c240b61f3620c0eef570b932f78a14c97 100644 --- a/interface/lib/lang/ja.lng +++ b/interface/lib/lang/ja.lng @@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/nl.lng b/interface/lib/lang/nl.lng index 577c0ec70af717b22b3e6ba332f373d2fe08c986..dfe0657b41dfb592c80aa0833e21b6dfe32ead52 100644 --- a/interface/lib/lang/nl.lng +++ b/interface/lib/lang/nl.lng @@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/pl.lng b/interface/lib/lang/pl.lng index e33f45575e3dd815179261fb129c80a0dc700769..89e8fa292eb41d0fe75ae3232ce1f85b94a3de37 100644 --- a/interface/lib/lang/pl.lng +++ b/interface/lib/lang/pl.lng @@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/pt.lng b/interface/lib/lang/pt.lng index 95fb1f2ddb428e77e3c668157a93d58ccdaca544..52045ee79dc8fdebfda95e1bca92c4ba2bce8e79 100644 --- a/interface/lib/lang/pt.lng +++ b/interface/lib/lang/pt.lng @@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/ro.lng b/interface/lib/lang/ro.lng index 6ec3d59702c3f3f50ae50083d11243e5b0648d91..98b965398ab51e76e06987d3497b11e606c56fc1 100644 --- a/interface/lib/lang/ro.lng +++ b/interface/lib/lang/ro.lng @@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/ru.lng b/interface/lib/lang/ru.lng index 0bf578468ed631cb56124bf8c04f9b9335b81b08..38b2261dc7cfa7fd5dd51cd67c7ee9b15004971d 100644 --- a/interface/lib/lang/ru.lng +++ b/interface/lib/lang/ru.lng @@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/se.lng b/interface/lib/lang/se.lng index c175f9e54cb80b4a3c3aa413acff838d73842050..542537c70a1779eeb9d12578f5069c4a3710740e 100644 --- a/interface/lib/lang/se.lng +++ b/interface/lib/lang/se.lng @@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/sk.lng b/interface/lib/lang/sk.lng index e39f39a92fa2e8240c0f4cc79999416a3cce782b..c509cfc5fe9dc75759a2e47b11473043a32a366c 100644 --- a/interface/lib/lang/sk.lng +++ b/interface/lib/lang/sk.lng @@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/lib/lang/tr.lng b/interface/lib/lang/tr.lng index 8a0661a6af35d754e2da56e086b1330cb93860da..caeec0328d7143b4300615a1170843890bab323e 100644 --- a/interface/lib/lang/tr.lng +++ b/interface/lib/lang/tr.lng @@ -185,4 +185,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup'; $wb['datalog_status_i_dns_template'] = 'Create DNS template'; $wb['datalog_status_u_dns_template'] = 'Update DNS template'; $wb['datalog_status_d_dns_template'] = 'Delete DNS template'; +$wb['datalog_status_i_sys_group'] = 'Create new client group'; +$wb['datalog_status_u_sys_ini'] = 'Update main config'; ?> diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php index 823a9ed3f63f81b67172bff54e4c019c3264666e..5f522049190ff8a1840c772463dd93d191a84d4f 100644 --- a/interface/web/client/client_edit.php +++ b/interface/web/client/client_edit.php @@ -469,7 +469,7 @@ class page_action extends tform_actions { // lock and cancel if(!isset($this->dataRecord['locked'])) $this->dataRecord['locked'] = 'n'; - if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && $this->dataRecord["locked"] != $this->oldDataRecord['locked']) + if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && $this->dataRecord["locked"] != $this->oldDataRecord['locked']) { $lock = $app->functions->func_client_lock($this->id,$this->dataRecord["locked"]); } diff --git a/server/lib/classes/cron.d/200-logfiles.inc.php b/server/lib/classes/cron.d/200-logfiles.inc.php index b87798c29edd78237e74d8ffca585575ad6e9c56..7cd3b4f6a273211206608aad10e29502d61576d1 100644 --- a/server/lib/classes/cron.d/200-logfiles.inc.php +++ b/server/lib/classes/cron.d/200-logfiles.inc.php @@ -227,9 +227,8 @@ class cronjob_logfiles extends cronjob { //###################################################################################################### if ($app->running_on_masterserver()) { - /** 7 days */ - + /** 7 days */ $tstamp = time() - (60*60*24*7); /* @@ -266,10 +265,10 @@ class cronjob_logfiles extends cronjob { /* * The sys_datalog is more difficult. - * 1) We have to keet ALL entries with + * 1) We have to keep ALL entries with * server_id=0, because they depend on ALL servers (even if they are not * actually in the system (and will be insered in 3 days or so). - * 2) We have to keey ALL entries which are not actually precessed by the + * 2) We have to keep ALL entries which are not actually precessed by the * server never mind how old they are! * 3) We have to keep the entry with the highest autoinc-id, because mysql calculates the * autoinc-id as "new value = max(row) +1" and does not store this in a separate table. diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index c30e83bcc694e8d665aa5cddc918e8ac27348588..af18a6df1365b357434998610e7ad5c39b753df9 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -662,7 +662,7 @@ class apache2_plugin { $app->log('Renaming existing directory in new docroot location. mv '.$data['new']['document_root'].' '.$data['new']['document_root'].'_bak_'.date('Y_m_d_H_i_s'), LOGLEVEL_DEBUG); } - //* Unmount the old log directory bfore we move the log dir + //* Unmount the old log directory before we move the log dir $app->system->exec_safe('umount -l ?', $data['old']['document_root'].'/log'); //* Create new base directory, if it does not exist yet diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php index 9be9278269d70b1c5bc7ededa5daae2ac0a73934..26777f91b21bd83cb4cf9b82a92a4770dad96d0d 100644 --- a/server/plugins-available/bind_plugin.inc.php +++ b/server/plugins-available/bind_plugin.inc.php @@ -528,7 +528,7 @@ class bind_plugin { global $app, $conf; //* Get the data of the soa and call soa_update - //* In a singel server setup the record in dns_soa will already be gone ... so this will give an empty array. + //* In a single server setup the record in dns_soa will already be gone ... so this will give an empty array. $tmp = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ?", $data['old']['zone']); $data["new"] = $tmp; $data["old"] = $tmp;