Skip to content
GitLab
Commit 3dbe806b authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5

parents 7550de6d d7e78a89
Expand all Hide whitespace changes
Inline Side-by-side
interface/lib/classes/remoting.inc.php
View file @ 3dbe806b
......@@ -683,6 +683,59 @@ class remoting {
return $affected_rows;
}
//* Get mail relay_recipient details
public function mail_relay_recipient_get($session_id, $primary_id)
{
global $app;
if(!$this->checkPerm($session_id, 'mail_relay_get')) {
$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
return false;
}
$app->uses('remoting_lib');
$app->remoting_lib->loadFormDef('../mail/form/mail_relay_recipient.tform.php');
return $app->remoting_lib->getDataRecord($primary_id);
}
//* relay recipient email
public function mail_relay_recipient_add($session_id, $client_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_relay_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_relay_recipient.tform.php', $client_id, $params);
return $affected_rows;
}
public function mail_relay_recipient_update($session_id, $client_id, $primary_id, $params)
{
if (!$this->checkPerm($session_id, 'mail_relay_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_relay_recipient.tform.php', $client_id, $primary_id, $params);
return $affected_rows;
}
public function mail_relay_recipient_delete($session_id, $primary_id)
{
if (!$this->checkPerm($session_id, 'mail_relay_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_relay_recipient.tform.php', $primary_id);
return $affected_rows;
}
//* Get spamfilter whitelist details
public function mail_spamfilter_whitelist_get($session_id, $primary_id)
{
......
interface/web/mail/lib/remote.conf.php
View file @ 3dbe806b
......@@ -8,6 +8,7 @@ $function_list['mail_alias_get,mail_alias_add,mail_alias_update,mail_alias_delet
$function_list['mail_forward_get,mail_forward_add,mail_forward_update,mail_forward_delete'] = 'Mail forward functions';
$function_list['mail_catchall_get,mail_catchall_add,mail_catchall_update,mail_catchall_delete'] = 'Mail catchall functions';
$function_list['mail_transport_get,mail_transport_add,mail_transport_update,mail_transport_delete'] = 'Mail transport functions';
$function_list['mail_relay_get,mail_relay_add,mail_relay_update,mail_relay_delete'] = 'Mail relay functions';
$function_list['mail_whitelist_get,mail_whitelist_add,mail_whitelist_update,mail_whitelist_delete'] = 'Mail whitelist functions';
$function_list['mail_blacklist_get,mail_blacklist_add,mail_blacklist_update,mail_blacklist_delete'] = 'Mail blacklist functions';
$function_list['mail_spamfilter_user_get,mail_spamfilter_user_add,mail_spamfilter_user_update,mail_spamfilter_user_delete'] = 'Mail spamfilter user functions';
......
interface/web/themes/blue/css/styles.css 0 → 100644
View file @ 3dbe806b
This diff is collapsed.
interface/web/themes/blue/templates/main.tpl.htm 0 → 100644
View file @ 3dbe806b
<!DOCTYPE html>
<html dir="ltr" lang="en-US">
<head>
<!--Possible? Vars in lang= ?-->
<meta charset="<tmpl_var name="html_content_encoding">" />
<title><tmpl_var name="app_title"> <tmpl_var name="app_version"></title>
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
<link href="themes/blue/css/styles.css" rel="stylesheet" media="screen" type="text/css" />
<link href="themes/default/css/print.css" rel="stylesheet" media="print" type="text/css" />
<!--[if IE 9]><link href="themes/default/css/iehacks.css" rel="stylesheet" type="text/css" /><![endif]-->
<!--[if lte IE 8]><script type="text/javascript" src="themes/default/js/html5shiv.js"></script><![endif]-->
<!--[if lte IE 7]><link href="themes/default/css/iehacks.css" rel="stylesheet" type="text/css" /><![endif]-->
<link href="themes/default/css/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css" />
<link rel="shortcut icon" href="/themes/default/images/favicon.ico" />
<script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="js/scrigo.js.php"></script>
<script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
<script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
<script type="text/javascript" src="js/jquery.tipsy.js"></script>
<script language="JavaScript" type="text/javascript">
jQuery(document).ready(function() {
loadInitContent();
$("#pageForm").submit(function(e){
//Prevent form submit: e.preventDefault() in lists
if ($(".panel #Filter").length > 0) {
e.preventDefault();
}
});
jQuery('.subsectiontoggle').live("click", function(){
jQuery(this).children().toggleClass('showing').end().next().slideToggle();
});
jQuery('#globalsearch').ispconfigSearch({
dataSrc: '/dashboard/ajax_get_json.php?type=globalsearch',
resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
searchFieldWatermark: '<tmpl_var name="globalsearch_searchfield_watermark_txt">'
});
jQuery('.ttip').tipsy({live: true, gravity: 'ne', html: true});
tabChangeDiscard = '<tmpl_var name="tabchange_discard_enabled>';
tabChangeWarning = '<tmpl_var name="tabchange_warning_enabled>';
tabChangeWarningTxt = '<tmpl_var name="global_tabchange_warning_txt">';
tabChangeDiscardTxt = '<tmpl_var name="global_tabchange_discard_txt">';
// Store password in browser; works in Firefox, but not Chrome
$('#username').live("blur", function(){
if($('#username').val() == '') {
return true;
}
if($('#dummy_username').val() == '' || $('#dummy_username').val() != $(this).val()){
$('#dummy_login').show();
$('#dummy_username').attr('value', $(this).val()).trigger('focus').trigger('blur');
$('#dummy_login').hide();
}
if($('#dummy_username').val() == $(this).val() && $(this).val() != ''){
$('#passwort').val($('#dummy_passwort').val());
} else {
$('#passwort').val('');
}
$('#passwort').focus();
});
$('#username').live("keyup", function(){
$('#dummy_username').val('');
$('#dummy_passwort').val('');
$('#passwort').val('');
});
});
jQuery(document).bind("change", function(event) {
var elName = event.target.localName;
if (jQuery(".panel #Filter").length > 0 && elName == 'select') {
event.preventDefault();
jQuery(".panel #Filter").trigger('click');
}
if(elName == 'select' || elName == 'input' || elName == 'textarea') {
if(jQuery(event.target).hasClass('no-page-form-change') == false) {
// set marker that something was changed
pageFormChanged = true;
}
}
});
jQuery(document).bind("keypress", function(event) {
//Use jQuery submit with keypress Enter in panel filterbar
if (event.which == '13' && jQuery(".panel #Filter").length > 0 && jQuery(event.target).hasClass('ui-autocomplete-input') == false ) {
event.preventDefault();
jQuery(".panel #Filter").trigger('click');
}
//Use jQuery submit with keypress Enter in forms
if (event.which == '13' && jQuery(".pnl_formsarea button.positive").length > 0 && event.target.localName != 'textarea' && jQuery(event.target).is(':input')) {
event.preventDefault();
jQuery(".pnl_formsarea button.positive:first").not("[disabled='disabled']").trigger('click');
}
});
jQuery(document).delegate('.pnl_listarea th', 'click', function(event) {
if(jQuery(this).attr('class').length > 0 && jQuery(".panel #Filter").length > 0 && jQuery(this).hasClass('tbl_col_buttons') == false && jQuery(this).hasClass('tbl_col_limit') == false && jQuery(this).hasClass('tbl_col_nosort') == false) {
event.preventDefault();
var clickevent = jQuery('#Filter').attr('onclick');
var element = jQuery(this).attr('class');
if(typeof clickevent == 'string') {
jQuery('#Filter').attr('onclick', clickevent.replace(".php')", ".php?orderby=" + element + "')"));
}
jQuery(".panel #Filter").trigger('click');
jQuery("#pageForm").ajaxComplete(function() {
if(jQuery("th."+element).css("background-position") == '0px -15px') {
if(jQuery("th."+element).css("text-align") == "right") {
jQuery("th."+element).css("text-align","left");
} else {
jQuery("th."+element).css("text-align","right");
}
} else {
jQuery(".pnl_listarea th").css("text-align","");
}
jQuery(".pnl_listarea th").css("background-position","0 0");
jQuery("th."+element).css("background-position","0 -15px");
});
}
});
</script>
</head>
<body>
<div id="page">
<!-- begin: header -->
<header>
<nav id="topsubnav">
<!-- start: skip link navigation -->
<a class="skip" href="#navigation" title="skip link">Skip to the navigation</a><span class="hideme">.</span>
<a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
<!-- end: skip link navigation -->
<tmpl_if name="cpuser">
<a href="#logout" onclick="loadContent('login/logout.php');"><tmpl_var format="strtoupper" name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>-->
<tmpl_if name='usertype' op='==' value='normaluser'><input type="text" id="globalsearch" size="25" value="" /></tmpl_if>
</tmpl_if>
</nav>
<h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
<span>hosting control panel</span>
</header>
<!-- end: header -->
<a id="navigation" name="navigation"></a><!-- skiplink anchor: navigation -->
<!-- begin: main navigation #nav -->
<nav id="topNav">&nbsp;</nav>
<!-- end: main navigation -->
<!-- begin: main content area #main -->
<section id="main" name="content">
<nav id="sideNav" class="clearfix">&nbsp;</nav>
<!-- begin: #content -->
<section id="content">
<form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
<div id="pageContent"><!-- AJAX CONTENT --></div>
</form>
<div id="ie_clearing">&nbsp;</div>
<!-- End: IE Column Clearing -->
</section>
<!-- end: #content -->
</section>
<!-- end: #main -->
<!-- begin: footer -->
<footer>
Powered by <a href="<tmpl_var name="app_link">" target="_blank"><tmpl_var name="app_title"></a>
</footer><!-- end: footer -->
</div>
<div id="dummy_login" style="display:none;position:absolute;top:-1000px;left:-1000px;">
<form action="" method="post" target="dummy_login" id="dummy_login_form">
<input name="username" id="dummy_username" type="text" autocomplete="on" value="" />
<input name="passwort" id="dummy_passwort" type="password" autocomplete="on" value="" />
<input type="submit" value="Login" id="dummy_submit"/>
</form>
<iframe id="dummy_iframe" src="dummy_login.html" name="dummy_login" style="display:none;"></iframe>
</div>
</body>
</html>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment