-
-
diff --git a/interface/web/mail/templates/xmpp_user_edit.htm b/interface/web/mail/templates/xmpp_user_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e155ec023106563eec7de3b896f62eb48f8bcfaf
--- /dev/null
+++ b/interface/web/mail/templates/xmpp_user_edit.htm
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
{tmpl_var name='password_mismatch_txt'}
+
{tmpl_var name='password_match_txt'}
+
+
+
+
+
+
+
+
+
diff --git a/interface/web/mail/xmpp_domain_edit.php b/interface/web/mail/xmpp_domain_edit.php
index d87778d110cbbe2c7db32d523269266b69c132d3..127acd7ab7ded0b4cde5dfe45eb07eef03fda5bd 100644
--- a/interface/web/mail/xmpp_domain_edit.php
+++ b/interface/web/mail/xmpp_domain_edit.php
@@ -263,16 +263,19 @@ class page_action extends tform_actions {
if(isset($this->dataRecord["domain"])) $this->dataRecord["domain"] = strtolower($this->dataRecord["domain"]);
// Read auth method
- if(isset($this->dataRecord["auth_method"]))
- switch($this->dataRecord["auth_method"]){
+ if(isset($this->dataRecord["management_method"]))
+ switch($this->dataRecord["management_method"]){
case 0:
- $this->dataRecord["auth_method"] = 'plain';
+ $this->dataRecord["management_method"] = 'normal';
break;
case 1:
- $this->dataRecord["auth_method"] = 'hashed';
- break;
- case 2:
- $this->dataRecord["auth_method"] = 'isp';
+ $this->dataRecord["management_method"] = 'maildomain';
+ // Check for corresponding mail domain
+ $tmp = $app->db->queryOneRecord("SELECT count(domain_id) AS number FROM mail_domain WHERE domain = '".$this->dataRecord["domain"]."' AND ".$app->tform->getAuthSQL('r')." ORDER BY domain");
+ if($tmp['count']==0){
+ $app->error($app->tform->wordbook["no_corresponding_maildomain_txt"]);
+ break;
+ }
break;
}
// vjud opt mode
@@ -312,6 +315,10 @@ class page_action extends tform_actions {
//* make sure that the xmpp domain is lowercase
if(isset($this->dataRecord["domain"])) $this->dataRecord["domain"] = strtolower($this->dataRecord["domain"]);
+ // create new accounts from mail domain
+ if($this->dataRecord['management_method']=='maildomain')
+ $this->syncMailusers($this->dataRecord['domain']);
+
// Insert DNS Records
$soa = $app->db->queryOneRecord("SELECT id AS zone, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, server_id, ttl, serial FROM dns_soa WHERE active = 'Y' AND origin = ?", $this->dataRecord['domain'].'.');
if ( isset($soa) && !empty($soa) ) $this->update_dns($this->dataRecord, $soa);
@@ -354,10 +361,16 @@ class page_action extends tform_actions {
function onAfterUpdate() {
global $app, $conf;
+ // create new accounts from mail domain
+ if($this->oldDataRecord['management_method'] != 'maildomain' && $this->dataRecord['management_method']=='maildomain')
+ $this->syncMailusers($this->dataRecord['domain']);
+ // or reset to normal permissions
+ elseif($this->oldDataRecord['management_method'] == 'maildomain' && $this->dataRecord['management_method']!='maildomain')
+ $this->desyncMailusers($this->dataRecord['domain']);
// Update DNS Records
// TODO: Update gets only triggered from main form. WHY?
// TODO: if(in_array($this->_xmpp_type, array('muc', 'modules'))){
- $soa = $app->db->queryOneRecord("SELECT id AS zone, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, server_id, ttl, serial FROM dns_soa WHERE active = 'Y' AND origin = ?", $this->dataRecord['domain'].'.');
+ $soa = $app->db->queryOneRecord("SELECT id AS zone, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other FROM dns_soa WHERE active = 'Y' AND = ?", $this->dataRecord['domain'].'.');
if ( isset($soa) && !empty($soa) ) $this->update_dns($this->dataRecord, $soa);
//}
}
@@ -428,6 +441,66 @@ class page_action extends tform_actions {
}
+ private function syncMailusers($domain){
+ global $app, $conf;
+ // get all mailusers
+ $db_mailusers = $app->db->queryAllRecords("SELECT email, password, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other FROM mail_user WHERE email like ?", '@'.$this->dataRecord['domain'].'.');
+ // get existing xmpp users
+ $db_xmppusers = $app->db->queryAllRecords("SELECT jid, password, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other FROM xmpp_user WHERE jid like ?", '@'.$this->dataRecord['domain'].'.');
+
+ // Migrate user accounts
+ $users_delete = array();
+ $users_update = array();
+ $users_create = array();
+ foreach($db_xmppusers AS $ix=>$x){
+ $matched = false;
+ foreach($db_mailusers AS $im=>$m){
+ if($x['jid']==$m['email']){
+ // User matched, mark for update
+ $x['password'] = $m['password'];
+ $users_update[] = $x;
+ unset($db_xmppusers[$ix]);
+ unset($db_mailusers[$im]);
+ $matched = true;
+ break;
+ }
+ }
+ // XMPP user not matched, mark for deletion
+ if(!$matched){
+ $users_delete[] = $x;
+ unset($db_xmppusers[$ix]);
+ }
+ }
+ // Mark remaining mail users for creation
+ $users_create = $db_xmppusers;
+ foreach($users_create AS $u){
+ $u['server_id'] = $this->dataRecord['server_id'];
+ $u['sys_perm_user'] = 'r';
+ $u['sys_perm_group'] = 'r';
+ $app->db->datalogInsert('xmpp_user', $u, 'xmppuser_id');
+ }
+ foreach($users_update AS $u){
+ $u['sys_perm_user'] = 'r';
+ $u['sys_perm_group'] = 'r';
+ $app->db->datalogUpdate('xmpp_user', $u, 'xmppuser_id', $u['xmppuser_id']);
+ }
+ foreach($users_delete AS $u){
+ $app->db->datalogDelete('xmpp_user', 'xmppuser_id', $u['xmppuser_id']);
+ }
+
+ }
+
+ private function desyncMailusers($domain){
+ global $app, $conf;
+ // get existing xmpp users
+ $db_xmppusers = $app->db->queryAllRecords("SELECT jid, password, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other FROM xmpp_user WHERE jid like ?", '@'.$this->dataRecord['domain'].'.');
+ foreach($db_xmppusers AS $u){
+ $u['sys_perm_user'] = 'riud';
+ $u['sys_perm_group'] = 'riud';
+ $app->db->datalogUpdate('xmpp_user', $u, 'xmppuser_id', $u['xmppuser_id']);
+ }
+ }
+
}
$page = new page_action;
diff --git a/interface/web/mail/xmpp_user_del.php b/interface/web/mail/xmpp_user_del.php
new file mode 100644
index 0000000000000000000000000000000000000000..3d32f7fd1340ba2b7a02fe711f7a045d7cf11a0f
--- /dev/null
+++ b/interface/web/mail/xmpp_user_del.php
@@ -0,0 +1,71 @@
+auth->check_module_permissions('mail');
+
+// Loading classes
+$app->uses('tpl,tform,tform_actions');
+$app->load('tform_actions');
+
+class page_action extends tform_actions {
+
+ function onBeforeDelete() {
+ global $app, $conf;
+
+ $jid_parts = explode("@", $this->dataRecord['jid']);
+ $domain = $jid_parts[1];
+
+ // check if domain is managed through mail domain
+ $app->error('blubb');
+
+
+ }
+
+}
+
+$page = new page_action;
+$page->onDelete();
+
+?>
diff --git a/interface/web/mail/xmpp_user_edit.php b/interface/web/mail/xmpp_user_edit.php
new file mode 100644
index 0000000000000000000000000000000000000000..6ad6161b4aeffa46bce2b4f4177c8dd79617fc12
--- /dev/null
+++ b/interface/web/mail/xmpp_user_edit.php
@@ -0,0 +1,172 @@
+auth->check_module_permissions('mail');
+
+// Loading classes
+$app->uses('tpl,tform,tform_actions');
+$app->load('tform_actions');
+
+class page_action extends tform_actions {
+
+
+ function onShowNew() {
+ global $app, $conf;
+
+ // we will check only users, not admins
+ if($_SESSION["s"]["user"]["typ"] == 'user') {
+ if(!$app->tform->checkClientLimit('limit_xmpp_user')) {
+ $app->error($app->tform->wordbook["limit_xmpp_user_txt"]);
+ }
+ if(!$app->tform->checkResellerLimit('limit_xmpp_user')) {
+ $app->error('Reseller: '.$app->tform->wordbook["limit_xmpp_user_txt"]);
+ }
+ }
+
+ parent::onShowNew();
+ }
+
+ function onShowEnd() {
+ global $app, $conf;
+
+ $jid = $this->dataRecord["jid"];
+ $jid_parts = explode("@", $jid);
+ $app->tpl->setVar("jid_local_part", $jid_parts[0]);
+ $jid_parts[1] = $app->functions->idn_decode($jid_parts[1]);
+
+ // Getting Domains of the user
+ $sql = "SELECT domain, server_id FROM xmpp_domain WHERE ".$app->tform->getAuthSQL('r')." ORDER BY domain";
+ $domains = $app->db->queryAllRecords($sql);
+ $domain_select = '';
+ if(is_array($domains)) {
+ foreach( $domains as $domain) {
+ $domain['domain'] = $app->functions->idn_decode($domain['domain']);
+ $selected = ($domain["domain"] == @$jid_parts[1])?'SELECTED':'';
+ $domain_select .= "
\r\n";
+ }
+ }
+ $app->tpl->setVar("jid_domain", $domain_select);
+ unset($domains);
+ unset($domain_select);
+
+
+ parent::onShowEnd();
+ }
+
+ function onSubmit() {
+ global $app, $conf;
+ //* Check if Domain belongs to user
+ if(isset($_POST["jid_domain"])) {
+ $domain = $app->db->queryOneRecord("SELECT server_id, domain FROM xmpp_domain WHERE domain = '".$app->db->quote($app->functions->idn_encode($_POST["jid_domain"]))."' AND ".$app->tform->getAuthSQL('r'));
+ if($domain["domain"] != $app->functions->idn_encode($_POST["jid_domain"])) $app->tform->errorMessage .= $app->tform->lng("no_domain_perm");
+ }
+
+
+ //* if its an insert, check that the password is not empty
+ if($this->id == 0 && $_POST["password"] == '') {
+ $app->tform->errorMessage .= $app->tform->lng("error_no_pwd")."
";
+ }
+
+ //* Check the client limits, if user is not the admin
+ if($_SESSION["s"]["user"]["typ"] != 'admin') { // if user is not admin
+ // Get the limits of the client
+ $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
+ $client = $app->db->queryOneRecord("SELECT limit_xmpp_user, parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+
+
+ // Check if the user may add another xmpp user.
+ if($this->id == 0 && $client["limit_xmpp_user"] >= 0) {
+ $tmp = $app->db->queryOneRecord("SELECT count(xmppuser_id) as number FROM xmpp_user WHERE sys_groupid = $client_group_id");
+ if($tmp["number"] >= $client["limit_xmpp_user"]) {
+ $app->tform->errorMessage .= $app->tform->lng("limit_xmpp_user_txt")."
";
+ }
+ unset($tmp);
+ }
+ } // end if user is not admin
+
+
+ $app->uses('getconf');
+ $xmpp_config = $app->getconf->get_server_config(!empty($domain["server_id"]) ? $domain["server_id"] : '', 'xmpp');
+
+ //* compose the xmpp field
+ if(isset($_POST["jid_local_part"]) && isset($_POST["jid_domain"])) {
+ $this->dataRecord["jid"] = strtolower($_POST["jid_local_part"]."@".$app->functions->idn_encode($_POST["jid_domain"]));
+
+ // Set the server id of the xmpp user = server ID of xmpp domain.
+ $this->dataRecord["server_id"] = $domain["server_id"];
+
+ unset($this->dataRecord["jid_local_part"]);
+ unset($this->dataRecord["jid_domain"]);
+
+ }
+
+ parent::onSubmit();
+ }
+
+ function onAfterInsert() {
+ global $app, $conf;
+
+ // Set the domain owner as xmpp user owner
+ $domain = $app->db->queryOneRecord("SELECT sys_groupid, server_id FROM xmpp_domain WHERE domain = '".$app->db->quote($app->functions->idn_encode($_POST["jid_domain"]))."' AND ".$app->tform->getAuthSQL('r'));
+ $app->db->query("UPDATE xmpp_user SET sys_groupid = ".$app->functions->intval($domain["sys_groupid"])." WHERE xmppuser_id = ".$this->id);
+
+ }
+
+ function onAfterUpdate() {
+ global $app, $conf;
+
+ // Set the domain owner as mailbox owner
+ if(isset($_POST["xmpp_domain"])) {
+ $domain = $app->db->queryOneRecord("SELECT sys_groupid, server_id FROM xmpp_domain WHERE domain = '".$app->db->quote($app->functions->idn_encode($_POST["jid_domain"]))."' AND ".$app->tform->getAuthSQL('r'));
+ $app->db->query("UPDATE xmpp_user SET sys_groupid = ".$app->functions->intval($domain["sys_groupid"])." WHERE xmppuser_id = ".$this->id);
+
+ }
+ }
+
+}
+
+$app->tform_actions = new page_action;
+$app->tform_actions->onLoad();
+
+?>
diff --git a/server/conf/metronome_conf_host.master b/server/conf/metronome_conf_host.master
index 66cbf0b60bf77c3b1b8a97de40eb82d9b9e15119..2b4783202f91e587dc672d632c66f498f643ca16 100644
--- a/server/conf/metronome_conf_host.master
+++ b/server/conf/metronome_conf_host.master
@@ -1,11 +1,8 @@
VirtualHost "{tmpl_var name='domain'}"
- enabled = {tmpl_var name='active'};
- authentication = "{tmpl_var name='auth_method'}";
-
- external_auth_command = "/usr/lib/metronome/isp-modules/mod_auth_external/authenticate_isp.sh";
-
- allow_registration = {tmpl_var name='public_registration'};
-
+ enabled = {tmpl_var name='active'};
+ authentication = "external";
+ external_auth_command = "/usr/lib/metronome/isp-modules/mod_auth_external/authenticate_isp.sh";
+ allow_registration = {tmpl_var name='public_registration'};
registration_url = "{tmpl_var name='registration_url'}";
registration_text = "{tmpl_var name='registration_message'}";
diff --git a/server/plugins-available/xmpp_plugin.inc.php b/server/plugins-available/xmpp_plugin.inc.php
index c4f70e30dd69f511474c495d383c3e287f0ced47..1b177e7f0f5d51e9a07f47f70e24c6d7d9545447 100644
--- a/server/plugins-available/xmpp_plugin.inc.php
+++ b/server/plugins-available/xmpp_plugin.inc.php
@@ -67,6 +67,9 @@ class xmpp_plugin {
$app->plugins->registerEvent('xmpp_domain_insert', 'xmpp_plugin', 'domainInsert');
$app->plugins->registerEvent('xmpp_domain_update', 'xmpp_plugin', 'domainUpdate');
$app->plugins->registerEvent('xmpp_domain_delete', 'xmpp_plugin', 'domainDelete');
+ $app->plugins->registerEvent('xmpp_user_insert', 'xmpp_plugin', 'userInsert');
+ $app->plugins->registerEvent('xmpp_user_update', 'xmpp_plugin', 'userUpdate');
+ $app->plugins->registerEvent('xmpp_user_delete', 'xmpp_plugin', 'userDelete');
}
@@ -135,7 +138,6 @@ class xmpp_plugin {
$tpl->newTemplate('metronome_conf_host.master');
$tpl->setVar('domain', $data['new']['domain']);
$tpl->setVar('active', $data['new']['active'] == 'y' ? 'true' : 'false');
- $tpl->setVar('auth_method', $data['new']['auth_method'] == 'isp' ? 'external' : 'internal_'.$data['new']['auth_method']);
$tpl->setVar('public_registration', $data['new']['public_registration'] == 'y' ? 'true' : 'false');
$admins = array();
@@ -227,6 +229,27 @@ class xmpp_plugin {
$app->services->restartServiceDelayed('metronome', 'restart');
}
+ function userInsert($event_name, $data){
+ //$data['new']['auth_method']
+ // Check domain for auth settings
+ // Don't allow manual user creation for mailaccount controlled domains
+
+ // maybe metronomectl adduser for new local users
+ }
+ function userUpdate($event_name, $data){
+ // Check domain for auth settings
+ // Don't allow manual user update for mailaccount controlled domains
+
+ // maybe metronomectl passwd for existing local users
+ }
+ function userDelete($event_name, $data){
+ // Check domain for auth settings
+ // Don't allow manual user deletion for mailaccount controlled domains
+
+ // Remove account from metronome
+ exec('metronomectl deluser '.$data['old']['jid']);
+ }
+
} // end class
?>