github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-14 02:28:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

SSL files upload feature added

Browse source
This commit is contained in:
Dima Malishev 2011-09-11 00:35:57 +03:00
commit e1011048bd
5 changed files with 69 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

23
web/js/helpers.js
View file

@ -282,6 +282,29 @@ App.Helpers.closeInnerPopup = function(evt)
$('#inner-popup').remove();
}
App.Helpers.getUploadUrl = function()
{
var url_parts = location.href.split('#');
if (url_parts.length > 1) {
var tab = url_parts[url_parts.length - 1];
if ($.inArray(tab, App.Constants.TABS) != -1) {
App.Tmp.loadTAB = tab;
}
}
var url_parts = location.href.split('?', 1);
var url = url_parts[0];
url_parts = url.split('/');
if (url_parts[url_parts.length -1] == 'index.html') {
url_parts[url_parts.length -1] = 'vesta/upload.php';
}
else {
url_parts.push('vesta/upload.php');
}
return url_parts.join('/');
}
App.Helpers.getBackendUrl = function()
{
var url_parts = location.href.split('#');

6
web/js/html.js
View file

@ -475,9 +475,13 @@ App.HTML.Build.dns_subrecord = function(record)
App.HTML.Build.ssl_key_file = function()
{
return '<iframe src="http://dev.vestacp.com:8083/vesta/upload.php?action=show&type=key" width="500px;" height="50px;" framevorder="0" scroll="no">..</iframe>';
return '<iframe src="'+App.Helpers.getUploadUrl()+'?action=show&type=key" width="500px;" height="53px;" framevorder="0" scroll="no">..</iframe>';
}
App.HTML.Build.ssl_cert_file = function()
{
return '<iframe src="'+App.Helpers.getUploadUrl()+'?action=show&type=cert" width="500px;" height="53px;" framevorder="0" scroll="no">..</iframe>';
}
App.HTML.Build.user_selects = function(tpl, options)
{

8
web/js/pages.js
View file

@ -71,10 +71,14 @@ App.Pages.WEB_DOMAIN.new_entry = function(evt)
App.Helpers.updateScreen();
$('#'+form_id).find('.ns-entry, .additional-ns-add').addClass('hidden');
var ssl_key_upload = App.HTML.Build.ssl_key_file();
var ssl_cert_upload = App.HTML.Build.ssl_cert_file();
$('#'+form_id).find('.ssl-key-input-dummy:first').replaceWith(ssl_key_upload);
$('#'+form_id).find('.ssl-cert-input-dummy:first').replaceWith(ssl_cert_upload);
}
App.Pages.WEB_DOMAIN.setSSL = function(content, type)
App.Pages.WEB_DOMAIN.setSSL = function(type, frame)
{
fb.warn(content);
var txt = App.Helpers.evalJSON(content);
var ref = frame.frameElement;
$(ref).next('textarea').val(frame.document.getElementById('result').value);
}

4
web/js/templates.js
View file

@ -567,12 +567,12 @@ App.Templates.html = {
<div class="form-row ssl-crtfct-box cc">\
<label for="#" class="field-label">ssl key: <span class="remark">(upload file or insert text)</span></label>\
<span class="ssl-key-input-dummy">...</span>\
<textarea name="SSL_KEY" class="textarea">~!:SSL_KEY~!</textarea>\
<textarea name="SSL_KEY" class="textarea ssl-key">~!:SSL_KEY~!</textarea>\
</div>\
<div class="form-row ssl-crtfct-box cc">\
<label for="#" class="field-label">ssl certificate: <span class="remark">(upload file or insert text)</span></label>\
<span class="ssl-cert-input-dummy">...</span>\
<textarea name="SSL_CERT" class="textarea">~!:SSL_CERT~!</textarea>\
<textarea name="SSL_CERT" class="textarea ssl-cert">~!:SSL_CERT~!</textarea>\
</div>\
</div><!-- // advanced options -->\
</div>\