Skip to content

Commit

Permalink
closes #19
Browse files Browse the repository at this point in the history
  • Loading branch information
@lukesUbuntu
lukesUbuntu committed Jun 14, 2020
1 parent 479d695 commit 4ec32ef
Show file tree
Hide file tree
Showing 6 changed files with 234 additions and 241 deletions.
2 changes: 0 additions & 2 deletions views/default/add_row.pdt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<?php
$this->Form->label($this->_("virtualmin.row_meta.host_name", true), "host_name");
$this->Form->fieldText("host_name", $this->Html->ifSet($vars->host_name),array('id'=>"host_name"));
//@todo fix this up so port is properly inline with hostname
echo $this->_("virtualmin.row_meta.port_number", true);
$this->Form->fieldText("port_number", $this->Html->ifSet($vars->port_number),array('id'=>"port_number"));

Expand Down Expand Up @@ -82,7 +81,6 @@
</thead>
<tbody>
<?php
//@todo make namservers optional
$num_servers = count($this->Html->ifSet($vars->name_servers,[]));
for ($i=0; $i<max(2,$num_servers); $i++) {
?>
Expand Down
4 changes: 1 addition & 3 deletions views/default/client_tab_database.pdt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@

<div>
<div class="btn-group pull-right">
<!-- @todo add change password
<button class="sorry btn btn-info">Change Password</button>
!-->

<button id="add_database" class="btn btn-success" role="menuitem" tabindex="-1" data-toggle="modal" data-target="#createDatabaseForm" role="presentation">
<?php $this->_("virtualmin.client.tabs.database.add_database");?>
</button>
Expand Down
216 changes: 7 additions & 209 deletions views/default/client_tab_mail.pdt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
<!--
@todo add html5 validation, currently testing validating fields via backend for safety.
@todo move static text to language file
!-->

<h4><?php $this->_("virtualmin.client.tabs.mail.menu");?></h4>

<div id="add_account_button">
Expand Down Expand Up @@ -211,7 +208,7 @@
}
?> <li role="presentation" class="divider">
</li>
<li data-toggle="modal" data-target="#ConfirmEmailDelete" role="presentation"><a role="menuitem"
<li onclick="updateCurrentEmailAddress('<?php echo $email_data['email_address'] ?>', <?php echo $email_id; ?>)" data-toggle="modal" data-target="#ConfirmEmailDelete" role="presentation"><a role="menuitem"
tabindex="-1" href="#">Delete Account</a></li>
</ul>
</div>
Expand Down Expand Up @@ -312,14 +309,14 @@
</div>

<!-- action menu template !-->
<div id="template_action_menu">
<div id="template_action_menu" style="display:none">
<div class="dropdown pull-right">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown"
aria-expanded="true">
Actions
<span class="caret"></span>
</button>
<ul data-email_id="<?php echo $email_id; ?>" class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1">
<ul data-email_id="" class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1">
<li onclick="updateCurrentEmailAddress('%email%' , 0)" class="disabled" role="presentation"><a
role="menuitem" tabindex="-1" href="#">Edit
Account</a></li>
Expand All @@ -336,12 +333,12 @@
</li>

<li role="presentation" class="divider"></li>
<li data-toggle="modal" data-target="#ConfirmEmailDelete" role="presentation"><a role="menuitem"
<li onclick="updateCurrentEmailAddress('%email%', 0)" data-toggle="modal" data-target="#ConfirmEmailDelete" role="presentation"><a role="menuitem"
tabindex="-1" href="#">Delete Account</a></li>
</ul>
</div>
</div>
<!-- action menu end template !-->
<!-- action menu end template !-->


<div class="modal fade" id="ConfirmEmailDelete" tabindex="-1" role="dialog" aria-labelledby="confirmation"
Expand Down Expand Up @@ -379,207 +376,8 @@ var currentEmail = null;
var MailAccountsDiv = $("#mail_accounts");
var $Domain = '<?php $this->Html->_($service_fields->virtualmin_domain);?>';
var $mail_accounts = '<?php echo json_encode($email_accounts); ?>';

function generateActionMenu(email){

console.log("TCL: generateActionMenu -> $email_address", $mail_accounts)
$actionMenu = $("#action_menu");
}

function updateCurrentEmailAddress(email_address, id) {

currentEmail = {
email_address: email_address,
id: id
}

}

$(document).ready(function() {

generateActionMenu('wassup@myexample.com');
if (typeof sendRequest != "function") throw new Error("pagehelper.js has not loaded");

/**
* Change password
*/
$('#changePassword', $CurrentPage).on('show.bs.modal', function(e) {

//$(this).find('.danger').attr('href', $(e.relatedTarget).data('href'))
var email_id = $(e.relatedTarget).parent().data("email_id");

//not correct way should be binding data to the element but its just for basic display for now
var email_address = $("#email_" + email_id + ' > .email_address', MailAccountsDiv).text();

console.log("email_address", email_address);
$("#email_address", this).text(email_address);

$(this).find('.change_password').click(function(e) {
//doesn't matter if code gets injected as all code gets passed via blesta users domain
new_password = $('#changePassword #change_password', $CurrentPage).val();

var $postVars = {
'email_address': email_address,
'new_password': new_password,
'action': "mail_change_password"
};
errorLocation = $("#changePassword .modal-body");
sendRequest($postVars, function(response) {
if (response.success == false)
return processErrors(response, errorLocation);

console.log("database changepassword response", response)
$('#changePassword #change_password', $CurrentPage).val('')

attachSuccess(response.data);
return $('#changePassword').modal('toggle');

}, errorLocation);
//$('#confirm-delete').hide.bs.modal
return e.preventDefault();
})
});

/**
* Confirm Deletion
*/
$('#ConfirmEmailDelete', $CurrentPage).on('show.bs.modal', function(e) {

//$(this).find('.danger').attr('href', $(e.relatedTarget).data('href'))
var email_id = $(e.relatedTarget).parent().data("email_id");

//not correct way should be binding data to the element but its just for basic display for now
var email_address = $("#email_" + email_id + ' > .email_address', MailAccountsDiv).text();

console.log("email_address", email_address);
$("#email_address", this).text(email_address);

$(this).find('.danger').click(function(e) {

var $postVars = {
'email_id': email_id,
'email_address': email_address,
'action': "mail_delete_user"
};

sendRequest($postVars, function(response) {
console.log("delete email response", response)
$('#confirm-delete', $CurrentPage).modal('hide');
$('#email_' + email_id, MailAccountsDiv).remove();

});
//$('#confirm-delete').hide.bs.modal
return e.preventDefault();
})
});
// save_email_forward
$("#addEmailForward", $CurrentPage).click(function(e) {
var add_email_forward = $("#add_email_forward").val();
if (/^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/.test(
add_email_forward) == false) {
alert("Invalid email forwarding address")
return;
}

var $postVars = {
'email_id': currentEmail.id,
'email_address': currentEmail.email_address,
'forward_email': add_email_forward,
'action': "mail_add_forward"
};
console.log("postVars", $postVars)
sendRequest($postVars, function(response) {
console.log("delete email response", response)
$('#addMailForward', $CurrentPage).modal('hide');


});
//$('#confirm-delete').hide.bs.modal


});
$("#disable_forward", $CurrentPage).click(function(e) {
var email_id = $(this).parent().data("email_id");
var email_address = $("#email_" + email_id + ' > .email_address', MailAccountsDiv).text();
var $postVars = {
'email_id': email_id,
'email_address': email_address,
'action': "mail_disable_forward"
};
sendRequest($postVars, function(response) {
console.log("disabling forwarder", response)


});

})
/*
* Create Email Account
*/
$("#create_account", $CurrentPage).click(function(e) {

e.preventDefault();
//get our filled out form data
var formData = $("#createEmailAccount", $CurrentPage).serializeFormToObject();

sendRequest(formData, function(response) {

if (response && response.success == false) {
processErrors(response)
} else {
addEmailToList(formData);
attachSuccess(response.data);
toggleAddMail();
}


});
});

//toggle add mail div to show form
$(".add_mail", $CurrentPage).click(toggleAddMail);

//enable_mail_forward display textbox
$('#enable_mail_forward', $CurrentPage).change(function() {
if ($(this).is(":checked")) {
$(this).val("enabled");
$("#email_forward_to").removeClass("hide")
} else {
$(this).val("");
$("#email_forward_to").addClass("hide");
}
});


});

/**
* Adds an email to our email list table
*/
function addEmailToList(emailForm) {
//@todo add full row options
$('tr:last', MailAccountsDiv).after('<tr><td>' + emailForm.add_mail_username + '@' + $Domain +
'</td> edit options have not been loaded<td></td><td></td></tr>')

}
/*
* Toggles between adding a mail address form
*/
function toggleAddMail() {
$("#createEmailAccount", $CurrentPage).toggleClass("hide");
$("#mail_accounts", $CurrentPage).toggleClass("hide");

//modify form
if ($(".add_mail", $CurrentPage).hasClass("btn-warning")) {
$(".add_mail", $CurrentPage).toggleClass("btn-warning", "btn-success");
$("span", ".add_mail", $CurrentPage).text("Add Mail Account");

} else {
$(".add_mail", $CurrentPage).toggleClass("btn-warning");
$("span", ".add_mail", $CurrentPage).text("Cancel");
}
}
</script>

<!--Include our javascript file !-->
<script type='text/javascript' src='<?php echo $this->Html->safe($this->view_dir . 'js/client_tab_mail.js');?>'></script>
<script type='text/javascript' src='<?php echo $this->Html->safe($this->view_dir . 'js/pagehelper.js');?>'></script>
2 changes: 1 addition & 1 deletion views/default/client_tab_status.pdt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
</div>

<?php
//@todo check for multiple assigning of ips

$server_ip = $serverDetails->ip_address;
if (preg_match('#(?:[0-9]{1,3}\.){3}[0-9]{1,3}#', $serverDetails->ip_address, $serverIp)) {
$server_ip = $serverIp[0];
Expand Down
Loading

0 comments on commit 4ec32ef

Please sign in to comment.