From 5fa5c0b33700c0a8227f33bde50b664d93d4cc00 Mon Sep 17 00:00:00 2001
From: jmontoya <jmontoya@ispconfig3>
Date: Tue, 03 Aug 2010 10:31:10 -0400
Subject: [PATCH] Moving id, and datarecord in the insertQuery in order to get the values when loading a plugin
---
interface/lib/classes/remoting.inc.php | 278 +++++++++++++++++++++++++++++--------------------------
1 files changed, 148 insertions(+), 130 deletions(-)
diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php
index 19e4e3f..4716437 100644
--- a/interface/lib/classes/remoting.inc.php
+++ b/interface/lib/classes/remoting.inc.php
@@ -122,8 +122,31 @@
return ($app->db->affectedRows() == 1);
}
+ // Get server details
+ /**
+ Gets the server configuration
+ @param int session id
+ @param int server id
+ @param string section of the config field in the server table. Could be 'web', 'dns', 'mail', 'dns', 'cron', etc
+ @author Julio Montoya <gugli100@gmail.com>
+ */
+ public function server_get($session_id, $server_id, $section ='') {
+ global $app;
+ if(!$this->checkPerm($session_id, 'server_get')) {
+ $this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+ return false;
+ }
+ if (!empty($session_id) && !empty($server_id)) {
+ $app->uses('remoting_lib , getconf');
+ $section_config = $app->getconf->get_server_config($server_id,$section);
+ return $section_config;
+ } else {
+ return false;
+ }
+ }
+
//* Get mail domain details
- public function mail_domain_get($session_id, $domain_id)
+ public function mail_domain_get($session_id, $primary_id)
{
global $app;
@@ -133,7 +156,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
@@ -143,29 +166,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;
}
@@ -185,37 +208,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;
}
@@ -240,8 +263,8 @@
$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);
+ $affected_rows = $this->insertQuery('../mail/form/mail_user_filter.tform.php', $client_id, $params,'mail:mail_user_filter:on_after_insert');
+ // $app->plugin->raiseEvent('mail:mail_user_filter:on_after_insert',$this);
return $affected_rows;
}
@@ -253,12 +276,12 @@
$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);
+ $affected_rows = $this->updateQuery('../mail/form/mail_user_filter.tform.php', $client_id, $primary_id, $params,'mail:mail_user_filter:on_after_update');
+ // $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'))
@@ -266,7 +289,7 @@
$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;
}
@@ -286,37 +309,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;
}
@@ -335,38 +358,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;
}
@@ -385,36 +408,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;
}
@@ -433,38 +456,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;
}
@@ -483,38 +506,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;
}
@@ -533,38 +556,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;
}
@@ -583,38 +606,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;
}
@@ -633,38 +656,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;
}
@@ -683,38 +706,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;
}
@@ -733,38 +756,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;
}
@@ -783,38 +806,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;
}
@@ -833,38 +856,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;
}
@@ -896,7 +919,7 @@
public function client_get_id($session_id, $sys_userid)
{
global $app;
- if(!$this->checkPerm($session_id, 'client_get')) {
+ 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;
}
@@ -926,7 +949,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;
@@ -935,7 +958,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);
@@ -1921,32 +1944,23 @@
//* Save changes to Datalog
if($app->remoting_lib->formDef["db_history"] == 'yes') {
$new_rec = $app->remoting_lib->getDataRecord($insert_id);
- $app->remoting_lib->datalogSave('INSERT',$primary_id,array(),$new_rec);
-
- $app->remoting_lib->ispconfig_sysuser_add($params,$insert_id);
-
+ $app->remoting_lib->datalogSave('INSERT',$primary_id,array(),$new_rec);
+ $app->remoting_lib->ispconfig_sysuser_add($params,$insert_id);
}
-
-
-
-
return $insert_id;
}
-
-
-
- private function insertQuery($formdef_file, $client_id, $params)
+ private function insertQuery($formdef_file, $client_id, $params,$event_identifier = '')
{
global $app, $tform, $remoting_lib;
$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);
@@ -1964,36 +1978,33 @@
$insert_id = $app->db->insertID();
+ // set a few values for compatibility with tform actions, mostly used by plugins
+ $this->id = $insert_id;
+ $this->dataRecord = $params;
+ if($event_identifier != '') $app->plugin->raiseEvent($event_identifier,$this);
//$app->uses('tform');
//* Save changes to Datalog
if($app->remoting_lib->formDef["db_history"] == 'yes') {
$new_rec = $app->remoting_lib->getDataRecord($insert_id);
- $app->remoting_lib->datalogSave('INSERT',$primary_id,array(),$new_rec);
-
- }
-
- // set a few values for compatibility with tform actions, mostly used by plugins
- $this->id = $insert_id;
- $this->dataRecord = $params;
-
-
+ $app->remoting_lib->datalogSave('INSERT',$primary_id,array(),$new_rec);
+ }
return $insert_id;
}
- private function updateQuery($formdef_file, $client_id, $primary_id, $params)
+ private function updateQuery($formdef_file, $client_id, $primary_id, $params, $event_identifier = '')
{
global $app;
$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);
@@ -2009,7 +2020,6 @@
$this->id = $primary_id;
$this->dataRecord = $params;
-
$app->db->query($sql);
if($app->db->errorMessage != '') {
@@ -2019,13 +2029,13 @@
$affected_rows = $app->db->affectedRows();
+ if($event_identifier != '') $app->plugin->raiseEvent($event_identifier,$this);
+
//* Save changes to Datalog
if($app->remoting_lib->formDef["db_history"] == 'yes') {
$new_rec = $app->remoting_lib->getDataRecord($primary_id);
$app->remoting_lib->datalogSave('UPDATE',$primary_id,$old_rec,$new_rec);
}
-
-
return $affected_rows;
}
@@ -2036,8 +2046,18 @@
$app->uses('remoting_lib');
+ //* load the user profile of the client
+ $app->remoting_lib->loadUserProfile(0);
+
//* Load the form definition
$app->remoting_lib->loadFormDef($formdef_file);
+
+ $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;
//* Get the SQL query
$sql = $app->remoting_lib->getDeleteSQL($primary_id);
@@ -2053,8 +2073,7 @@
//* Save changes to Datalog
if($app->remoting_lib->formDef["db_history"] == 'yes') {
- $rec = $app->remoting_lib->getDataRecord($primary_id);
- $app->remoting_lib->datalogSave('DELETE',$primary_id,$rec,array());
+ $app->remoting_lib->datalogSave('DELETE',$primary_id,$old_rec,array());
}
@@ -2097,5 +2116,4 @@
}
}
}
-
-?>
+?>
\ No newline at end of file
--
Gitblit v1.9.1