From e28564dbde4f922a6a8263e3dea32d56b60b5b5b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 16 Jun 2010 11:41:46 -0400
Subject: [PATCH] Implemented: FS#468 - Client name conversion in FTP user too restricted
---
interface/lib/classes/remoting.inc.php | 234 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 137 insertions(+), 97 deletions(-)
diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php
index 7e4256e..1a9c351 100644
--- a/interface/lib/classes/remoting.inc.php
+++ b/interface/lib/classes/remoting.inc.php
@@ -40,6 +40,9 @@
private $session_timeout = 600;
private $server;
+ public $oldDataRecord;
+ public $dataRecord;
+ public $id;
/*
These variables shall stay global.
@@ -120,7 +123,7 @@
}
//* Get mail domain details
- public function mail_domain_get($session_id, $domain_id)
+ public function mail_domain_get($session_id, $primary_id)
{
global $app;
@@ -130,7 +133,7 @@
}
$app->uses('remoting_lib');
$app->remoting_lib->loadFormDef('../mail/form/mail_domain.tform.php');
- return $app->remoting_lib->getDataRecord($domain_id);
+ return $app->remoting_lib->getDataRecord($primary_id);
}
//* Add a mail domain
@@ -140,29 +143,29 @@
$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
return false;
}
- $domain_id = $this->insertQuery('../mail/form/mail_domain.tform.php',$client_id,$params);
- return $domain_id;
+ $primary_id = $this->insertQuery('../mail/form/mail_domain.tform.php',$client_id,$params);
+ return $primary_id;
}
//* Update a mail domain
- public function mail_domain_update($session_id, $client_id, $domain_id, $params)
+ public function mail_domain_update($session_id, $client_id, $primary_id, $params)
{
if(!$this->checkPerm($session_id, 'mail_domain_update')) {
$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->updateQuery('../mail/form/mail_domain.tform.php',$client_id,$domain_id,$params);
+ $affected_rows = $this->updateQuery('../mail/form/mail_domain.tform.php', $client_id, $primary_id, $params);
return $affected_rows;
}
//* Delete a mail domain
- public function mail_domain_delete($session_id, $domain_id)
+ public function mail_domain_delete($session_id, $primary_id)
{
if(!$this->checkPerm($session_id, 'mail_domain_delete')) {
$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->deleteQuery('../mail/form/mail_domain.tform.php',$domain_id);
+ $affected_rows = $this->deleteQuery('../mail/form/mail_domain.tform.php', $primary_id);
return $affected_rows;
}
@@ -182,37 +185,37 @@
//* dodanie uzytkownika email
- public function mail_user_add($session_id,$domain_id, $client_id, $params){
+ public function mail_user_add($session_id, $client_id, $params){
if (!$this->checkPerm($session_id, 'mail_user_add')){
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->insertQuery('../mail/form/mail_user.tform.php',$domain_id, $client_id, $params);
+ $affected_rows = $this->insertQuery('../mail/form/mail_user.tform.php', $client_id, $params);
return $affected_rows;
}
//* edycja uzytkownika email
- public function mail_user_update($session_id, $client_id, $domain_id, $params)
+ public function mail_user_update($session_id, $client_id, $primary_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_user_update'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->updateQuery('../mail/form/mail_user.tform.php', $client_id, $domain_id, $params);
+ $affected_rows = $this->updateQuery('../mail/form/mail_user.tform.php', $client_id, $primary_id, $params);
return $affected_rows;
}
//*usuniecie uzytkownika emial
- public function mail_user_delete($session_id,$domain_id)
+ public function mail_user_delete($session_id, $primary_id)
{
if (!$this->checkPerm($session_id, 'mail_user_delete'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->deleteQuery('../mail/form/mail_user.tform.php',$domain_id);
+ $affected_rows = $this->deleteQuery('../mail/form/mail_user.tform.php', $primary_id);
return $affected_rows;
}
@@ -232,33 +235,39 @@
public function mail_user_filter_add($session_id, $client_id, $params)
{
+ global $app;
if (!$this->checkPerm($session_id, 'mail_user_filter_add')){
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
$affected_rows = $this->insertQuery('../mail/form/mail_user_filter.tform.php', $client_id, $params);
+ $app->plugin->raiseEvent('mail:mail_user_filter:on_after_insert',$this);
return $affected_rows;
}
public function mail_user_filter_update($session_id, $client_id, $primary_id, $params)
{
+ global $app;
if (!$this->checkPerm($session_id, 'mail_user_filter_update'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
$affected_rows = $this->updateQuery('../mail/form/mail_user_filter.tform.php', $client_id, $primary_id, $params);
+ $app->plugin->raiseEvent('mail:mail_user_filter:on_after_update',$this);
return $affected_rows;
}
- public function mail_user_filter_delete($session_id,$domain_id)
+ public function mail_user_filter_delete($session_id, $primary_id)
{
+ global $app;
if (!$this->checkPerm($session_id, 'mail_user_filter_delete'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->deleteQuery('../mail/form/mail_user_filter.tform.php',$domain_id);
+ $affected_rows = $this->deleteQuery('../mail/form/mail_user_filter.tform.php', $primary_id);
+ $app->plugin->raiseEvent('mail:mail_user_filter:on_after_delete',$this);
return $affected_rows;
}
@@ -277,37 +286,37 @@
}
//* aliasy email
- public function mail_alias_add($session_id,$domain_id, $client_id, $params)
+ public function mail_alias_add($session_id, $client_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_alias_add'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->insertQuery('../mail/form/mail_alias.tform.php', $domain_id, $client_id, $params);
+ $affected_rows = $this->insertQuery('../mail/form/mail_alias.tform.php', $client_id, $params);
return $affected_rows;
}
- public function mail_alias_update($session_id, $domain_id, $client_id, $params)
+ public function mail_alias_update($session_id, $client_id, $primary_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_alias_update'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->updateQuery('../mail/form/mail_alias.tform.php', $client_id, $domain_id, $params);
+ $affected_rows = $this->updateQuery('../mail/form/mail_alias.tform.php', $client_id, $primary_id, $params);
return $affected_rows;
}
- public function mail_alias_delete($session_id,$domain_id)
+ public function mail_alias_delete($session_id, $primary_id)
{
if (!$this->checkPerm($session_id, 'mail_alias_delete'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->deleteQuery('../mail/form/mail_alias.tform.php',$domain_id);
+ $affected_rows = $this->deleteQuery('../mail/form/mail_alias.tform.php', $primary_id);
return $affected_rows;
}
@@ -326,38 +335,38 @@
}
//* przekierowania email
- public function mail_forward_add($session_id,$domain_id, $client_id, $params)
+ public function mail_forward_add($session_id, $client_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_forward_add'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->insertQuery('../mail/form/mail_forward.tform.php', $domain_id, $client_id, $params);
+ $affected_rows = $this->insertQuery('../mail/form/mail_forward.tform.php', $client_id, $params);
return $affected_rows;
}
- public function mail_forward_update($session_id, $domain_id, $client_id, $params)
+ public function mail_forward_update($session_id, $client_id, $primary_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_forward_update'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->updateQuery('../mail/form/mail_forward.tform.php', $client_id, $domain_id, $params);
+ $affected_rows = $this->updateQuery('../mail/form/mail_forward.tform.php', $client_id, $primary_id, $params);
return $affected_rows;
}
- public function mail_forward_delete($session_id,$domain_id)
+ public function mail_forward_delete($session_id, $primary_id)
{
if (!$this->checkPerm($session_id, 'mail_forward_delete'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->deleteQuery('../mail/form/mail_forward.tform.php',$domain_id);
+ $affected_rows = $this->deleteQuery('../mail/form/mail_forward.tform.php', $primary_id);
return $affected_rows;
}
@@ -376,36 +385,36 @@
}
//* catchall e-mail
- public function mail_catchall_add($session_id,$domain_id, $client_id, $params)
+ public function mail_catchall_add($session_id, $client_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_catchall_add'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->insertQuery('../mail/form/mail_domain_catchall.tform.php', $domain_id, $client_id, $params);
+ $affected_rows = $this->insertQuery('../mail/form/mail_domain_catchall.tform.php', $client_id, $params);
return $affected_rows;
}
- public function mail_catchall_update($session_id, $domain_id, $client_id, $params)
+ public function mail_catchall_update($session_id, $client_id, $primary_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_catchall_update'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->updateQuery('../mail/form/mail_domain_catchall.tform.php', $client_id, $domain_id, $params);
+ $affected_rows = $this->updateQuery('../mail/form/mail_domain_catchall.tform.php', $client_id, $primary_id, $params);
return $affected_rows;
}
- public function mail_catchall_delete($session_id,$domain_id)
+ public function mail_catchall_delete($session_id, $primary_id)
{
if (!$this->checkPerm($session_id, 'mail_catchall_delete'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->deleteQuery('../mail/form/mail_domain_catchall.tform.php',$domain_id);
+ $affected_rows = $this->deleteQuery('../mail/form/mail_domain_catchall.tform.php', $primary_id);
return $affected_rows;
}
@@ -424,38 +433,38 @@
}
//* przeniesienia e-mail
- public function mail_transport_add($session_id,$domain_id, $client_id, $params)
+ public function mail_transport_add($session_id, $client_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_transport_add'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->insertQuery('../mail/form/mail_transport.tform.php', $domain_id, $client_id, $params);
+ $affected_rows = $this->insertQuery('../mail/form/mail_transport.tform.php', $client_id, $params);
return $affected_rows;
}
- public function mail_transport_update($session_id, $domain_id, $client_id, $params)
+ public function mail_transport_update($session_id, $client_id, $primary_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_transport_update'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->updateQuery('../mail/form/mail_transport.tform.php', $client_id, $domain_id, $params);
+ $affected_rows = $this->updateQuery('../mail/form/mail_transport.tform.php', $client_id, $primary_id, $params);
return $affected_rows;
}
- public function mail_transport_delete($session_id,$domain_id)
+ public function mail_transport_delete($session_id, $primary_id)
{
if (!$this->checkPerm($session_id, 'mail_transport_delete'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->deleteQuery('../mail/form/mail_transport.tform.php',$domain_id);
+ $affected_rows = $this->deleteQuery('../mail/form/mail_transport.tform.php', $primary_id);
return $affected_rows;
}
@@ -474,38 +483,38 @@
}
//* biała lista e-mail
- public function mail_spamfilter_whitelist_add($session_id,$domain_id, $client_id, $params)
+ public function mail_spamfilter_whitelist_add($session_id, $client_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_spamfilter_whitelist_add'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->insertQuery('../mail/form/spamfilter_whitelist.tform.php', $domain_id, $client_id, $params);
+ $affected_rows = $this->insertQuery('../mail/form/spamfilter_whitelist.tform.php', $client_id, $params);
return $affected_rows;
}
- public function mail_spamfilter_whitelist_update($session_id, $domain_id, $client_id, $params)
+ public function mail_spamfilter_whitelist_update($session_id, $client_id, $primary_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_spamfilter_whitelist_update'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->updateQuery('../mail/form/spamfilter_whitelist.tform.php', $client_id, $domain_id, $params);
+ $affected_rows = $this->updateQuery('../mail/form/spamfilter_whitelist.tform.php', $client_id, $primary_id, $params);
return $affected_rows;
}
- public function mail_spamfilter_whitelist_delete($session_id,$domain_id)
+ public function mail_spamfilter_whitelist_delete($session_id, $primary_id)
{
if (!$this->checkPerm($session_id, 'mail_spamfilter_whitelist_delete'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->deleteQuery('../mail/form/spamfilter_whitelist.tform.php',$domain_id);
+ $affected_rows = $this->deleteQuery('../mail/form/spamfilter_whitelist.tform.php', $primary_id);
return $affected_rows;
}
@@ -524,38 +533,38 @@
}
//* czarna lista e-mail
- public function mail_spamfilter_blacklist_add($session_id,$domain_id, $client_id, $params)
+ public function mail_spamfilter_blacklist_add($session_id, $client_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_spamfilter_blacklist_add'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->insertQuery('../mail/form/spamfilter_blacklist.tform.php', $domain_id, $client_id, $params);
+ $affected_rows = $this->insertQuery('../mail/form/spamfilter_blacklist.tform.php', $client_id, $params);
return $affected_rows;
}
- public function mail_spamfilter_blacklist_update($session_id, $domain_id, $client_id, $params)
+ public function mail_spamfilter_blacklist_update($session_id, $client_id, $primary_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_spamfilter_blacklist_update'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->updateQuery('../mail/form/spamfilter_blacklist.tform.php', $client_id, $domain_id, $params);
+ $affected_rows = $this->updateQuery('../mail/form/spamfilter_blacklist.tform.php', $client_id, $primary_id, $params);
return $affected_rows;
}
- public function mail_spamfilter_blacklist_delete($session_id,$domain_id)
+ public function mail_spamfilter_blacklist_delete($session_id, $primary_id)
{
if (!$this->checkPerm($session_id, 'mail_spamfilter_blacklist_delete'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->deleteQuery('../mail/form/spamfilter_blacklist.tform.php',$domain_id);
+ $affected_rows = $this->deleteQuery('../mail/form/spamfilter_blacklist.tform.php', $primary_id);
return $affected_rows;
}
@@ -574,38 +583,38 @@
}
//* filtr spamu użytkowników e-mail
- public function mail_spamfilter_user_add($session_id,$domain_id, $client_id, $params)
+ public function mail_spamfilter_user_add($session_id, $client_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_spamfilter_user_add'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->insertQuery('../mail/form/spamfilter_users.tform.php', $domain_id, $client_id, $params);
+ $affected_rows = $this->insertQuery('../mail/form/spamfilter_users.tform.php', $client_id, $params);
return $affected_rows;
}
- public function mail_spamfilter_user_update($session_id, $domain_id, $client_id, $params)
+ public function mail_spamfilter_user_update($session_id, $client_id, $primary_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_spamfilter_user_update'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->updateQuery('../mail/form/spamfilter_users.tform.php', $client_id, $domain_id, $params);
+ $affected_rows = $this->updateQuery('../mail/form/spamfilter_users.tform.php', $client_id, $primary_id, $params);
return $affected_rows;
}
- public function mail_spamfilter_user_delete($session_id,$domain_id)
+ public function mail_spamfilter_user_delete($session_id, $primary_id)
{
if (!$this->checkPerm($session_id, 'mail_spamfilter_user_delete'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->deleteQuery('../mail/form/spamfilter_users.tform.php',$domain_id);
+ $affected_rows = $this->deleteQuery('../mail/form/spamfilter_users.tform.php', $primary_id);
return $affected_rows;
}
@@ -624,38 +633,38 @@
}
//* polityki filtrów spamu e-mail
- public function mail_policy_add($session_id,$domain_id, $client_id, $params)
+ public function mail_policy_add($session_id, $client_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_policy_add'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->insertQuery('../mail/form/spamfilter_policy.tform.php', $domain_id, $client_id, $params);
+ $affected_rows = $this->insertQuery('../mail/form/spamfilter_policy.tform.php', $client_id, $params);
return $affected_rows;
}
- public function mail_policy_update($session_id, $domain_id, $client_id, $params)
+ public function mail_policy_update($session_id, $client_id, $primary_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_policy_update'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->updateQuery('../mail/form/spamfilter_policy.tform.php', $client_id, $domain_id, $params);
+ $affected_rows = $this->updateQuery('../mail/form/spamfilter_policy.tform.php', $client_id, $primary_id, $params);
return $affected_rows;
}
- public function mail_policy_delete($session_id,$domain_id)
+ public function mail_policy_delete($session_id, $primary_id)
{
if (!$this->checkPerm($session_id, 'mail_policy_delete'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->deleteQuery('../mail/form/spamfilter_policy.tform.php',$domain_id);
+ $affected_rows = $this->deleteQuery('../mail/form/spamfilter_policy.tform.php', $primary_id);
return $affected_rows;
}
@@ -674,38 +683,38 @@
}
//* fetchmail
- public function mail_fetchmail_add($session_id,$domain_id, $client_id, $params)
+ public function mail_fetchmail_add($session_id, $client_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_fetchmail_add'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->insertQuery('../mail/form/mail_get.tform.php', $domain_id, $client_id, $params);
+ $affected_rows = $this->insertQuery('../mail/form/mail_get.tform.php', $client_id, $params);
return $affected_rows;
}
- public function mail_fetchmail_update($session_id, $domain_id, $client_id, $params)
+ public function mail_fetchmail_update($session_id, $client_id, $primary_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_fetchmail_update'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->updateQuery('../mail/form/mail_get.tform.php', $client_id, $domain_id, $params);
+ $affected_rows = $this->updateQuery('../mail/form/mail_get.tform.php', $client_id, $primary_id, $params);
return $affected_rows;
}
- public function mail_fetchmail_delete($session_id,$domain_id)
+ public function mail_fetchmail_delete($session_id, $primary_id)
{
if (!$this->checkPerm($session_id, 'mail_fetchmail_delete'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->deleteQuery('../mail/form/mail_get.tform.php',$domain_id);
+ $affected_rows = $this->deleteQuery('../mail/form/mail_get.tform.php', $primary_id);
return $affected_rows;
}
@@ -724,38 +733,38 @@
}
//* wpisy białej listy
- public function mail_whitelist_add($session_id,$domain_id, $client_id, $params)
+ public function mail_whitelist_add($session_id, $client_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_whitelist_add'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->insertQuery('../mail/form/mail_whitelist.tform.php', $domain_id, $client_id, $params);
+ $affected_rows = $this->insertQuery('../mail/form/mail_whitelist.tform.php', $client_id, $params);
return $affected_rows;
}
- public function mail_whitelist_update($session_id, $domain_id, $client_id, $params)
+ public function mail_whitelist_update($session_id, $client_id, $primary_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_whitelist_update'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->updateQuery('../mail/form/mail_whitelist.tform.php', $client_id, $domain_id, $params);
+ $affected_rows = $this->updateQuery('../mail/form/mail_whitelist.tform.php', $client_id, $primary_id, $params);
return $affected_rows;
}
- public function mail_whitelist_delete($session_id,$domain_id)
+ public function mail_whitelist_delete($session_id, $primary_id)
{
if (!$this->checkPerm($session_id, 'mail_whitelist_delete'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->deleteQuery('../mail/form/mail_whitelist.tform.php',$domain_id);
+ $affected_rows = $this->deleteQuery('../mail/form/mail_whitelist.tform.php', $primary_id);
return $affected_rows;
}
@@ -774,38 +783,38 @@
}
//* wpisy białej listy
- public function mail_blacklist_add($session_id,$domain_id, $client_id, $params)
+ public function mail_blacklist_add($session_id, $client_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_blacklist_add'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->insertQuery('../mail/form/mail_blacklist.tform.php', $domain_id, $client_id, $params);
+ $affected_rows = $this->insertQuery('../mail/form/mail_blacklist.tform.php', $client_id, $params);
return $affected_rows;
}
- public function mail_blacklist_update($session_id, $domain_id, $client_id, $params)
+ public function mail_blacklist_update($session_id, $client_id, $primary_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_blacklist_update'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->updateQuery('../mail/form/mail_blacklist.tform.php', $client_id, $domain_id, $params);
+ $affected_rows = $this->updateQuery('../mail/form/mail_blacklist.tform.php', $client_id, $primary_id, $params);
return $affected_rows;
}
- public function mail_blacklist_delete($session_id,$domain_id)
+ public function mail_blacklist_delete($session_id, $primary_id)
{
if (!$this->checkPerm($session_id, 'mail_blacklist_delete'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->deleteQuery('../mail/form/mail_blacklist.tform.php',$domain_id);
+ $affected_rows = $this->deleteQuery('../mail/form/mail_blacklist.tform.php', $primary_id);
return $affected_rows;
}
@@ -824,38 +833,38 @@
}
//* wpisy filtrow e-mail
- public function mail_filter_add($session_id,$domain_id, $client_id, $params)
+ public function mail_filter_add($session_id, $client_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_filter_add'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->insertQuery('../mail/form/mail_content_filter.tform.php', $domain_id, $client_id, $params);
+ $affected_rows = $this->insertQuery('../mail/form/mail_content_filter.tform.php', $client_id, $params);
return $affected_rows;
}
- public function mail_filter_update($session_id, $domain_id, $client_id, $params)
+ public function mail_filter_update($session_id, $client_id, $primary_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_filter_update'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->updateQuery('../mail/form/mail_content_filter.tform.php', $client_id, $domain_id, $params);
+ $affected_rows = $this->updateQuery('../mail/form/mail_content_filter.tform.php', $client_id, $primary_id, $params);
return $affected_rows;
}
- public function mail_filter_delete($session_id,$domain_id)
+ public function mail_filter_delete($session_id, $primary_id)
{
if (!$this->checkPerm($session_id, 'mail_filter_delete'))
{
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->deleteQuery('../mail/form/mail_content_filter.tform.php',$domain_id);
+ $affected_rows = $this->deleteQuery('../mail/form/mail_content_filter.tform.php', $primary_id);
return $affected_rows;
}
@@ -884,6 +893,26 @@
return $app->remoting_lib->getDataRecord($client_id);
}
+ public function client_get_id($session_id, $sys_userid)
+ {
+ global $app;
+ if(!$this->checkPerm($session_id, 'client_get_id')) {
+ $this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+ return false;
+ }
+
+ $sys_userid = intval($sys_userid);
+
+ $rec = $app->db->queryOneRecord("SELECT client_id FROM sys_user WHERE userid = ".$sys_userid);
+ if(isset($rec['client_id'])) {
+ return intval($rec['client_id']);
+ } else {
+ $this->server->fault('no_client_found', 'There is no sysuser account for this client ID.');
+ return false;
+ }
+
+ }
+
public function client_add($session_id, $reseller_id, $params)
{
@@ -897,7 +926,7 @@
}
- public function client_update($session_id, $reseller_id, $client_id, $params)
+ public function client_update($session_id, $client_id, $reseller_id, $params)
{
global $app;
@@ -906,7 +935,7 @@
$this->server->fault('permission_denied','You do not have the permissions to access this function.');
return false;
}
- $affected_rows = $this->updateQuery('../client/form/client.tform.php', $reseller_id, $client_id, $params);
+ $affected_rows = $this->updateQuery('../client/form/client.tform.php', $client_id, $reseller_id, $params);
$app->remoting_lib->ispconfig_sysuser_update($params,$client_id);
@@ -1913,11 +1942,11 @@
$app->uses('remoting_lib');
- //* Load the form definition
- $app->remoting_lib->loadFormDef($formdef_file);
-
//* load the user profile of the client
$app->remoting_lib->loadUserProfile($client_id);
+
+ //* Load the form definition
+ $app->remoting_lib->loadFormDef($formdef_file);
//* Get the SQL query
$sql = $app->remoting_lib->getSQL($params,'INSERT',0);
@@ -1945,7 +1974,9 @@
}
-
+ // set a few values for compatibility with tform actions, mostly used by plugins
+ $this->id = $insert_id;
+ $this->dataRecord = $params;
return $insert_id;
@@ -1958,11 +1989,11 @@
$app->uses('remoting_lib');
- //* Load the form definition
- $app->remoting_lib->loadFormDef($formdef_file);
-
//* load the user profile of the client
$app->remoting_lib->loadUserProfile($client_id);
+
+ //* Load the form definition
+ $app->remoting_lib->loadFormDef($formdef_file);
//* Get the SQL query
$sql = $app->remoting_lib->getSQL($params,'UPDATE',$primary_id);
@@ -1972,6 +2003,12 @@
}
$old_rec = $app->remoting_lib->getDataRecord($primary_id);
+
+ // set a few values for compatibility with tform actions, mostly used by plugins
+ $this->oldDataRecord = $old_rec;
+ $this->id = $primary_id;
+ $this->dataRecord = $params;
+
$app->db->query($sql);
@@ -1999,6 +2036,9 @@
$app->uses('remoting_lib');
+ //* load the user profile of the client
+ $app->remoting_lib->loadUserProfile($client_id);
+
//* Load the form definition
$app->remoting_lib->loadFormDef($formdef_file);
--
Gitblit v1.9.1