Merge remote-tracking branch 'origin/postfixadmin_4.0'

This commit is contained in:
David Goodwin committed 2025-07-12 19:32:01 +01:00
commit be064858a5
7 files changed
+390 -304

No files matched your search

+1 -1
View File
@@ -780,7 +780,7 @@ $CONF['password_expiration'] = 'YES';
// used in (at least) password-recover.php.
$CONF['site_url'] = null;
$CONF['version'] = '4.0-beta1';
$CONF['version'] = '4.0';
// The smtp_active_flag when set to YES enables editing of the smtp_active
// field of the mailbox table. The smtp_active field can be used to enable
+1 -1
View File
@@ -16,7 +16,7 @@
*/
$min_db_version = 1844; # update (at least) before a release with the latest function number in upgrade.php
$min_db_version = 1850; # update (at least) before a release with the latest function number in upgrade.php
/**
+18 -16
View File
@@ -149,22 +149,24 @@ if (safeget('output') == 'csv') {
fputcsv($out, $fields);
}
fclose($out);
} else { # HTML output
$smarty->assign('admin_list', $list_admins);
$smarty->assign('admin_selected', $username);
$smarty->assign('smarty_template', 'list');
$smarty->assign('struct', $handler->getStruct());
$smarty->assign('msg', $handler->getMsg());
$smarty->assign('table', $table);
$smarty->assign('items', $items);
$smarty->assign('id_field', $handler->getId_field());
$smarty->assign('formconf', $formconf);
$smarty->assign('search', $search);
$smarty->assign('searchmode', $searchmode);
$smarty->assign('domain_selected', ''); /* stop list-virtual.tpl triggering a PHP notice */
$smarty->display('index.tpl');
exit(0);
}
# HTML output
$smarty->assign('admin_list', $list_admins);
$smarty->assign('admin_selected', $username);
$smarty->assign('smarty_template', 'list');
$smarty->assign('struct', $handler->getStruct());
$smarty->assign('msg', $handler->getMsg());
$smarty->assign('table', $table);
$smarty->assign('items', $items);
$smarty->assign('id_field', $handler->getId_field());
$smarty->assign('formconf', $formconf);
$smarty->assign('search', $search);
$smarty->assign('searchmode', $searchmode);
$smarty->assign('domain_selected', ''); /* stop list-virtual.tpl triggering a PHP notice */
$smarty->display('index.tpl');
/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
+114 -109
View File
@@ -10,90 +10,95 @@
{if $table == 'foo' && $key == 'bar'}
<div class="form-group">Special handling (complete table row) for {$table} / {$key}</div>
{else}
<div class="form-group {if $fielderror.{$key}}has-error{/if}">
<label class="col-md-4 col-sm-4 control-label" for="{$key}">{$field.label}</label>
<div class="col-md-6 col-sm-8">
{if $field.editable == 0}
{if $field.type == 'enma'}
{$struct.{$key}.options.{$value_{$key}}}
{else}
{$value_{$key}}
{/if}
{else}
{if $table == 'foo' && $key == 'bar'}
Special handling (td content) for {$table} / {$key}
{elseif $field.type == 'bool'}
<div class="checkbox"><label>
<input type="checkbox" value='1'
name="value[{$key}]"{if {$value_{$key}} == 1} checked="checked"{/if}/>
</label></div>
{elseif $field.type == 'enum'}
<select class="form-control" name="value[{$key}]" id="{$key}">
{html_options output=$struct.{$key}.options values=$struct.{$key}.options selected=$value_{$key}}
</select>
{elseif $field.type == 'enma'}
<select class="form-control" name="value[{$key}]" id="{$key}">
{html_options options=$struct.{$key}.options selected=$value_{$key}}
</select>
{elseif $field.type == 'list'}
<input type="text" class="form-control" style="margin-bottom : 25px;" id="id_searchDomains" onkeyup="searchDomains()" placeholder="Search for domains..." title="search domains">
<ul id="domainsList" name="value[{$key}][]" style="max-height : 250px; overflow: auto;">
{foreach from=$struct.{$key}.options item=domain}
<li>
{assign var=flag value=0}
{foreach from=$value_{$key} item=selectedDomain}
{if $domain == $selectedDomain }
<input type="checkbox" checked name="value[{$key}][]" value="{$domain}" id="{$domain}_id" />
<label for="{$domain}_id">{$domain}</label>
{assign var=flag value=$flag+1}
{/if}
{/foreach}
{if $flag == 0 }
<input type="checkbox" name="value[{$key}][]" value="{$domain}" id="{$domain}_id" />
<label for="{$domain}_id">{$domain}</label>
{/if}
</li>
{/foreach}
</ul>
{elseif $field.type == 'pass' || $field.type == 'b64p'}
<input class="form-control" type="password" name="value[{$key}]" {if $key == 'password' || $key == 'password2'}autocomplete="new-password"{/if}/>
{elseif $field.type == 'txtl'}
<textarea class="form-control" rows="10" cols="35" name="value[{$key}]">{foreach key=key2 item=field2 from=$value_{$key}}{$field2}&#10;{/foreach}</textarea>
{elseif $field.type == 'txta'}
<textarea class="form-control" rows="10" cols="35" name="value[{$key}]">{$value_{$key}}</textarea>
{else}
<input class="form-control" type="text" name="value[{$key}]"
value="{$value_{$key}}"/>
{/if}
{/if}
{if $table == 'foo' && $key == 'bar'}
<span class="help-block">Special handling (td content) for {$table} / {$key}</span>
{else}
{if $fielderror.{$key}}
<span class="help-block">{$fielderror.{$key}}</span>
{else}
<span class="help-block">{$field.desc}</span>
{/if}
{/if}
</div>
</div>
{/if}
<div class="form-group {if $fielderror.{$key}}has-error{/if}">
<label class="col-md-4 col-sm-4 control-label" for="{$key}">{$field.label}</label>
<div class="col-md-6 col-sm-8">
{if $field.editable == 0}
{if $field.type == 'enma'}
{$struct.{$key}.options.{$value_{$key}}}
{else}
{$value_{$key}}
{/if}
{else}
{if $table == 'foo' && $key == 'bar'}
Special handling (td content) for {$table} / {$key}
{elseif $field.type == 'bool'}
<div class="checkbox"><label>
<input type="checkbox" value='1'
name="value[{$key}]"{if {$value_{$key}} == 1} checked="checked"{/if}/>
</label></div>
{elseif $field.type == 'enum'}
<select class="form-control" name="value[{$key}]" id="{$key}">
{html_options output=$struct.{$key}.options values=$struct.{$key}.options selected=$value_{$key}}
</select>
{elseif $field.type == 'enma'}
<select class="form-control" name="value[{$key}]" id="{$key}">
{html_options options=$struct.{$key}.options selected=$value_{$key}}
</select>
{elseif $field.type == 'list'}
<input type="text" class="form-control" style="margin-bottom : 25px;"
id="id_searchDomains" onkeyup="searchDomains()"
placeholder="Search for domains..." title="search domains">
<ul id="domainsList" name="value[{$key}][]"
style="max-height : 250px; overflow: auto;">
{foreach from=$struct.{$key}.options item=domain}
<li style="list-style-type: none">
{assign var=flag value=0}
{foreach from=$value_{$key} item=selectedDomain}
{if $domain == $selectedDomain }
<input type="checkbox" checked name="value[{$key}][]"
value="{$domain}" id="{$domain}_id"/>
<label for="{$domain}_id">{$domain}</label>
{assign var=flag value=$flag+1}
{/if}
{/foreach}
{if $flag == 0 }
<input type="checkbox" name="value[{$key}][]" value="{$domain}"
id="{$domain}_id"/>
<label for="{$domain}_id">{$domain}</label>
{/if}
</li>
{/foreach}
</ul>
{elseif $field.type == 'pass' || $field.type == 'b64p'}
<input class="form-control" type="password" name="value[{$key}]"
{if $key == 'password' || $key == 'password2'}autocomplete="new-password"{/if}/>
{elseif $field.type == 'txtl'}
<textarea class="form-control" rows="10" cols="35"
name="value[{$key}]">{foreach key=key2 item=field2 from=$value_{$key}}{$field2}&#10;{/foreach}</textarea>
{elseif $field.type == 'txta'}
<textarea class="form-control" rows="10" cols="35"
name="value[{$key}]">{$value_{$key}}</textarea>
{else}
<input class="form-control" type="text" name="value[{$key}]"
value="{$value_{$key}}"/>
{/if}
{/if}
{if $table == 'foo' && $key == 'bar'}
<span class="help-block">Special handling (td content) for {$table} / {$key}</span>
{else}
{if $fielderror.{$key}}
<span class="help-block">{$fielderror.{$key}}</span>
{else}
<span class="help-block">{$field.desc}</span>
{/if}
{/if}
</div>
</div>
{/if}
{/foreach}
</div>
<div class="panel-footer">
<div class="btn-toolbar" role="toolbar">
<div class="btn-group pull-right">
<button class="btn btn-primary" type="submit" name="submit">
<span class="glyphicon glyphicon-edit" aria-hidden="true"></span> {$submitbutton}
</button>
</div>
<div class="btn-group pull-right">
<button class="btn btn-primary" type="submit" name="submit">
<span class="glyphicon glyphicon-edit" aria-hidden="true"></span> {$submitbutton}
</button>
</div>
</div>
</div>
@@ -101,42 +106,42 @@
</form>
<script type="text/javascript">
function searchDomains(){
input = document.getElementById("id_searchDomains").value.toLowerCase();
ul = document.getElementById("domainsList");
li = ul.getElementsByTagName("li");
for (i=0; i< li. length; i++){
//get domain
domain = li[i].innerHTML.split('<label')[1].split('>')[1].split('</label')[0];
function searchDomains() {
input = document.getElementById("id_searchDomains").value.toLowerCase();
ul = document.getElementById("domainsList");
li = ul.getElementsByTagName("li");
for (i = 0; i < li.length; i++) {
//get domain
domain = li[i].innerHTML.split('<label')[1].split('>')[1].split('</label')[0];
//if domain = input
if (domain.indexOf(input) > -1) {
li[i].style.display = "";
}else{
li[i].style.display = "none";
}
//if domain = input
if (domain.indexOf(input) > -1) {
li[i].style.display = "";
} else {
li[i].style.display = "none";
}
}
}
{if (isset($struct.local_part) && $struct.local_part.options.legal_chars) }
// If set: Check for illegal characters in local part of username
}
{if (isset($struct.local_part) && $struct.local_part.options.legal_chars) }
// If set: Check for illegal characters in local part of username
// decode htmlentities
var div = document.createElement('div');
div.innerHTML = "{$struct.local_part.options.legal_char_warning}";
var decoded = div.firstChild.nodeValue;
// decode htmlentities
var div = document.createElement('div');
div.innerHTML = "{$struct.local_part.options.legal_char_warning}";
var decoded = div.firstChild.nodeValue;
const local_part = document.getElementsByName("value[local_part]");
if (local_part.length > 0) {
local_part[0].tabIndex = -1
local_part[0].addEventListener("keydown", function(event) {
var regex = new RegExp("{$struct.local_part.options.legal_chars}");
if (!regex.test(event.key)) {
event.preventDefault();
alert(decoded + ": " + event.key);
return false;
}
});
}
{/if}
const local_part = document.getElementsByName("value[local_part]");
if (local_part.length > 0) {
local_part[0].tabIndex = -1
local_part[0].addEventListener("keydown", function (event) {
var regex = new RegExp("{$struct.local_part.options.legal_chars}");
if (!regex.test(event.key)) {
event.preventDefault();
alert(decoded + ": " + event.key);
return false;
}
});
}
{/if}
</script>
+5 -3
View File
@@ -19,8 +19,9 @@
{else}
<h4>{$PALANG.pOverview_welcome}{$fDomain} :</h4>
<ul>
<li>{$PALANG.aliases}: {$limit.alias_count} / {$limit.aliases}</li>
<li>{$PALANG.mailboxes}: {$limit.mailbox_count} / {$limit.mailboxes}</li>
<li style="list-style-type: none">{$PALANG.aliases}: {$limit.alias_count} / {$limit.aliases}</li>
<li style="list-style-type: none"> {$PALANG.mailboxes}: {$limit.mailbox_count}
/ {$limit.mailboxes}</li>
</ul>
{/if}
</div>
@@ -96,7 +97,8 @@
class="btn btn-default"><span class="glyphicon glyphicon-plus-sign"
aria-hidden="true"></span> {$PALANG.add_mailbox}</a>
{/if}
<a role="button" class="btn btn-default" href="list.php?table=mailbox&amp;output=csv&amp;domain={$domain_selected}"><span
<a role="button" class="btn btn-default"
href="list.php?table=mailbox&amp;output=csv&amp;domain={$domain_selected}"><span
class="glyphicon glyphicon-export" aria-hidden="true"></span> {$PALANG.download_csv}</a>
</div>
</div>
+136 -126
View File
@@ -1,68 +1,69 @@
<div id="{$id_div}" class="panel panel-default">
{if ($admin_list|count > 1)}
<div class="panel-heading">
<form name="frmOverview" method="post" action="">
{html_options name='username' output=$admin_list values=$admin_list selected=$admin_selected onchange="this.form.submit();"}
<noscript><input class="button" type="submit" name="go" value="{$PALANG.go}" /></noscript>
</form>
</div>
{/if}
{if $msg.show_simple_search}
{#form_search#}
{/if}
{if $msg.show_simple_search}
{if ($search|count > 0)}
<div class='searchparams'>
<p>{$PALANG.searchparams}
{foreach key=key item=field from=$search}
<span>{if $struct.$key.label}{$struct.$key.label}{else}{$key}{/if}
{if isset($searchmode.$key)}{$searchmode.$key}{else}={/if} {$field}
</span>
{/foreach}
<span><a href="list.php?table={$table}&reset_search=1">[x]</a></span>
{if ($admin_list|count > 1)}
<div class="panel-heading">
<form name="frmOverview" method="post" action="">
{html_options name='username' output=$admin_list values=$admin_list selected=$admin_selected onchange="this.form.submit();"}
<noscript><input class="button" type="submit" name="go" value="{$PALANG.go}"/></noscript>
</form>
</div>
{/if}
{/if}
<table class="table table-hover" border=0 id='admin_table'><!-- TODO: 'admin_table' needed because of CSS for table header -->
{if $msg.show_simple_search}
{#form_search#}
{/if}
{if $msg.list_header}
{assign var="colcount" value=2}
{foreach key=key item=field from=$struct}
{if $field.display_in_list == 1 && $field.label}{* don't show fields without a label *}
{assign var="colcount" value=$colcount+1}
{/if}
{/foreach}
<thead>
<tr>
<th style="text-align:center;" colspan="{$colcount}">{$PALANG.{$msg.list_header}}</th>
</tr>
</thead>
{/if}
<thead>
<tr class="header">
{foreach key=key item=field from=$struct}
{if $field.display_in_list == 1 && $field.label}{* don't show fields without a label *}
<th>{$field.label}</th>
{if $msg.show_simple_search}
{if ($search|count > 0)}
<div class='searchparams'>
<p>{$PALANG.searchparams}
{foreach key=key item=field from=$search}
<span>{if $struct.$key.label}{$struct.$key.label}{else}{$key}{/if}
{if isset($searchmode.$key)}{$searchmode.$key}{else}={/if} {$field}
</span>
{/foreach}
<span><a href="list.php?table={$table}&reset_search=1">[x]</a></span>
</div>
{/if}
{/foreach}
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
</thead>
{/if}
{foreach key=raw_itemkey from=$RAW_items item=RAW_item}
{assign var="itemkey" value=$raw_itemkey|htmlentities_no_double_encode} {* array keys in $items are escaped by PFASmarty::sanitise() *}
{assign var="item" value=$items[$itemkey]}
<table class="table table-hover" id='admin_table'>
<!-- TODO: 'admin_table' needed because of CSS for table header -->
<tr>
{if $msg.list_header}
{assign var="colcount" value=2}
{foreach key=key item=field from=$struct}
{if $field.display_in_list == 1 && $field.label}{* don't show fields without a label *}
{assign var="colcount" value=$colcount+1}
{/if}
{/foreach}
<thead>
<tr>
<th style="text-align:center;" colspan="{$colcount}">{$PALANG.{$msg.list_header}}</th>
</tr>
</thead>
{/if}
{foreach key=key item=field from=$struct}
{if $field.display_in_list == 1 && $field.label}
<thead>
<tr class="header">
{foreach key=key item=field from=$struct}
{if $field.display_in_list == 1 && $field.label}{* don't show fields without a label *}
<th>{$field.label}</th>
{/if}
{/foreach}
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
{foreach key=raw_itemkey from=$RAW_items item=RAW_item}
{assign var="itemkey" value=$raw_itemkey|htmlentities_no_double_encode} {* array keys in $items are escaped by PFASmarty::sanitise() *}
{assign var="item" value=$items[$itemkey]}
<tr>
{foreach key=key item=field from=$struct}
{if $field.display_in_list == 1 && $field.label}
{if $field.linkto != '' && ($item.$id_field != '' || $item.$id_field > 0) }
{assign "linkto" "{$field.linkto|replace:'%s':{$item.$id_field|escape:url}}"} {* TODO: use label field instead *}
@@ -72,97 +73,106 @@
{/if}
{if $table == 'foo' && $key == 'bar'}
<td>Special handling (complete table row) for {$table} / {$key}</td>
<td>Special handling (complete table row) for {$table} / {$key}</td>
{else}
<td>
{if $table == 'foo' && $key == 'bar'}
Special handling (td content) for {$table} / {$key}
{elseif $table == 'aliasdomain' && $key == 'target_domain' && $struct.target_domain.linkto == 'target'}
<a href="list-virtual.php?domain={$item.target_domain|escape:"quotes"}">{$item.target_domain}</a> {* do we need escape:url or escpae:quotes here? see #705 *}
{* {elseif $table == 'domain' && $key == 'domain'}
<a href="list.php?table=domain&domain={$item.domain|escape:"url"}">{$item.domain}</a>
*}
{elseif $key == 'active'}
{if $item._can_edit}
<a class="btn btn-{if ($item.active==0)}info{else}warning{/if}" href="{#url_editactive#}{$table}&amp;id={$RAW_item.$id_field|escape:"url"}&amp;active={if ($item.active==0)}1{else}0{/if}&amp;token={$smarty.session.PFA_token|escape:"url"}">
{if $item._active == $PALANG['YES']}
<span class="glyphicon glyphicon-check" aria-hidden="true"></span>
{else}
<span class="glyphicon glyphicon-unchecked" aria-hidden="true"></span>
{/if}
{$item._active}
</a>
<td>
{if $table == 'foo' && $key == 'bar'}
Special handling (td content) for {$table} / {$key}
{elseif $table == 'aliasdomain' && $key == 'target_domain' && $struct.target_domain.linkto == 'target'}
<a href="list-virtual.php?domain={$item.target_domain|escape:"quotes"}">{$item.target_domain}</a> {* do we need escape:url or escpae:quotes here? see #705 *}
{* {elseif $table == 'domain' && $key == 'domain'}
<a href="list.php?table=domain&domain={$item.domain|escape:"url"}">{$item.domain}</a>
*}
{elseif $key == 'active'}
{if $item._can_edit}
<a class="btn btn-{if ($item.active==0)}info{else}warning{/if}"
href="{#url_editactive#}{$table}&amp;id={$RAW_item.$id_field|escape:"url"}&amp;active={if ($item.active==0)}1{else}0{/if}&amp;token={$smarty.session.PFA_token|escape:"url"}">
{if $item._active == $PALANG['YES']}
<span class="glyphicon glyphicon-check" aria-hidden="true"></span>
{else}
{$item._active}
<span class="glyphicon glyphicon-unchecked" aria-hidden="true"></span>
{/if}
{elseif $field.type == 'bool'}
{assign "tmpkey" "_{$key}"}{$item.{$tmpkey}}
{elseif $field.type == 'list'}
{foreach key=key2 item=field2 from=$item.$key}{$field2}<br> {/foreach}
{elseif $field.type == 'pass'}
(hidden)
{elseif $field.type == 'quot'}
{assign "tmpkey" "_{$key}_percent"}
{$item._active}
</a>
{else}
{$item._active}
{/if}
{elseif $field.type == 'bool'}
{assign "tmpkey" "_{$key}"}{$item.{$tmpkey}}
{elseif $field.type == 'list'}
{foreach key=key2 item=field2 from=$item.$key}{$field2}<br>{/foreach}
{elseif $field.type == 'pass'}
(hidden)
{elseif $field.type == 'quot'}
{assign "tmpkey" "_{$key}_percent"}
{if $item[$tmpkey] > $CONF.quota_level_high_pct}
{assign var="quota_level" value="high"}
{elseif $item[$tmpkey] > $CONF.quota_level_med_pct}
{assign var="quota_level" value="mid"}
{else}
{assign var="quota_level" value="low"}
{/if}
{if $item[$tmpkey] > -1}
<div class="quota quota_{$quota_level}" style="width:{$item[$tmpkey] *1.2}px;"></div>
<div class="quota_bg"></div></div>
<div class="quota_text quota_text_{$quota_level}">{$linktext}</div>
{else}
<div class="quota_bg quota_no_border"></div></div>
<div class="quota_text">{$linktext}</div>
{/if}
{if $item[$tmpkey] > $CONF.quota_level_high_pct}
{assign var="quota_level" value="high"}
{elseif $item[$tmpkey] > $CONF.quota_level_med_pct}
{assign var="quota_level" value="mid"}
{else}
{assign var="quota_level" value="low"}
{/if}
{if $item[$tmpkey] > -1}
<div class="quota quota_{$quota_level}" style="width:{$item[$tmpkey] *1.2}px;"></div>
<div class="quota_bg"></div>
</div>
<div class="quota_text quota_text_{$quota_level}">{$linktext}</div>
{else}
<div class="quota_bg quota_no_border"></div></div>
<div class="quota_text">{$linktext}</div>
{/if}
{elseif $field.type == 'txtl'}
{foreach key=key2 item=field2 from=$item.$key}{$field2}<br> {/foreach}
{elseif $field.type == 'html'}
{$RAW_item.$key}
{else}
{$linktext}
{/if}
</td>
{/if}
{/if}
{/foreach}
{elseif $field.type == 'txtl'}
{foreach key=key2 item=field2 from=$item.$key}{$field2}<br>{/foreach}
{elseif $field.type == 'html'}
{$RAW_item.$key}
{else}
{$linktext}
{/if}
</td>
{/if}
{/if}
{/foreach}
<td>{if $item._can_edit}
<a class="btn btn-primary" href="edit.php?table={$table|escape:"url"}&amp;edit={$RAW_item.$id_field|escape:"url"}"><span class="glyphicon glyphicon-edit" aria-hidden="true"></span> {$PALANG.edit}</a>
{else}&nbsp;
{/if}
</td>
<td>{if $item._can_delete}
<td>{if $item._can_edit}
<a class="btn btn-primary"
href="edit.php?table={$table|escape:"url"}&amp;edit={$RAW_item.$id_field|escape:"url"}"><span
class="glyphicon glyphicon-edit" aria-hidden="true"></span> {$PALANG.edit}</a>
{else}&nbsp;
{/if}
</td>
<td>{if $item._can_delete}
<form method="post" action="{#url_delete#}">
<input type="hidden" name="table" value="{$table}">
<input type="hidden" name="delete" value="{$RAW_item.$id_field|escape:"quotes"}">
<input type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"quotes"}">
<button class="btn btn-danger" onclick="return confirm('{$PALANG.{$msg.confirm_delete}|replace:'%s':$item.$id_field}')">
<button class="btn btn-danger"
onclick="return confirm('{$PALANG.{$msg.confirm_delete}|replace:'%s':$item.$id_field}')">
<span class="glyphicon glyphicon-trash" aria-hidden="true"></span> {$PALANG.del}
</button>
</form>
{else}&nbsp;{/if}
</td>
</tr>
</tr>
{/foreach}
</tbody>
</table>
<div class="panel-footer">
<div class="btn-toolbar" role="toolbar">
<div class="btn-group pull-right">
{if $msg.can_create}
<a href="edit.php?table={$table|escape:"url"}" role="button" class="btn btn-default"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span> {$PALANG.{$formconf.create_button}}</a>
{/if}
<a href="list.php?table={$table|escape:"url"}&amp;output=csv&amp;domain={$domain_selected}" role="button" class="btn btn-default"><span class="glyphicon glyphicon-export" aria-hidden="true"></span> {$PALANG.download_csv}</a>
</div>
</div>
<div class="btn-toolbar" role="toolbar">
<div class="btn-group pull-right">
{if $msg.can_create}
<a href="edit.php?table={$table|escape:"url"}" role="button" class="btn btn-default"><span
class="glyphicon glyphicon-plus-sign"
aria-hidden="true"></span> {$PALANG.{$formconf.create_button}}</a>
{/if}
<a href="list.php?table={$table|escape:"url"}&amp;output=csv&amp;domain={$domain_selected}" role="button"
class="btn btn-default"><span class="glyphicon glyphicon-export"
aria-hidden="true"></span> {$PALANG.download_csv}</a>
</div>
</div>
</div>
</div>
+115 -48
View File
@@ -8,8 +8,6 @@
{/strip}
{strip}
<nav class="navbar navbar-default fixed-top">
<div class="container-fluid">
<div class="navbar-header">
@@ -21,7 +19,9 @@
<span class="icon-bar"></span>
</button>
{*** <a class="navbar-brand" href='main.php'><img id="login_header_logo" src="{$CONF.theme_logo}" alt="Logo" /></a> ***}
<a class="navbar-brand" href='main.php'><img id="login_header_logo" src="{$CONF.theme_logo|default:'images/postbox.png'}" alt="Logo"/></a>
<a class="navbar-brand" href='main.php'><img id="login_header_logo"
src="{$CONF.theme_logo|default:'images/postbox.png'}"
alt="Logo"/></a>
</div>
<div id="navbar" class="collapse navbar-collapse">
<ul class="nav navbar-nav">
@@ -29,28 +29,50 @@
{if $authentication_has_role.global_admin}
{strip}
<li class="dropdown">
<a class="btn navbar-btn dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
aria-expanded="false" href="{#url_list_admin#}"><span class="glyphicon glyphicon-list" aria-hidden="true"></span> {$PALANG.pAdminMenu_list_admin} <span
<a class="btn navbar-btn dropdown-toggle" data-toggle="dropdown" role="button"
aria-haspopup="true"
aria-expanded="false" href="{#url_list_admin#}"><span
class="glyphicon glyphicon-list"
aria-hidden="true"></span> {$PALANG.pAdminMenu_list_admin} <span
class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="{#url_list_admin#}"><span class="glyphicon glyphicon-list" aria-hidden="true"></span> {$PALANG.pAdminMenu_list_admin}</a></li>
<li><a href="{#url_create_admin#}"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {$PALANG.pAdminMenu_create_admin}</a></li>
<li>
<a href="{#url_list_admin#}"><span class="glyphicon glyphicon-list"
aria-hidden="true"></span> {$PALANG.pAdminMenu_list_admin}
</a>
</li>
<li>
<a href="{#url_create_admin#}"><span class="glyphicon glyphicon-plus"
aria-hidden="true"></span> {$PALANG.pAdminMenu_create_admin}
</a>
</li>
</ul>
</li>
{/strip}
{else}
<li><a class="btn navbar-btn" href="{#url_main#}"><span class="glyphicon glyphicon-home" aria-hidden="true"></span> {$PALANG.pMenu_main}</a></li>
<li>
<a class="btn navbar-btn" href="{#url_main#}">
<span class="glyphicon glyphicon-home" aria-hidden="true"></span> {$PALANG.pMenu_main}
</a>
</li>
{/if}
{* list-domain *}
{strip}
<li>
<a class="btn navbar-btn dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
aria-expanded="false" href="{#url_list_domain#}"><span class="glyphicon glyphicon-th-list" aria-hidden="true"></span> {$PALANG.pAdminMenu_list_domain} <span
<a class="btn navbar-btn dropdown-toggle" data-toggle="dropdown" role="button"
aria-haspopup="true"
aria-expanded="false" href="{#url_list_domain#}"><span
class="glyphicon glyphicon-th-list"
aria-hidden="true"></span> {$PALANG.pAdminMenu_list_domain} <span
class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="{#url_list_domain#}"><span class="glyphicon glyphicon-th-list" aria-hidden="true"></span> {$PALANG.pAdminMenu_list_domain}</a></li>
<li><a href="{#url_list_domain#}"><span class="glyphicon glyphicon-th-list"
aria-hidden="true"></span> {$PALANG.pAdminMenu_list_domain}
</a></li>
{if $authentication_has_role.global_admin}
<li><a href="{#url_edit_domain#}"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {$PALANG.pAdminMenu_create_domain}</a></li>
<li><a href="{#url_edit_domain#}"><span class="glyphicon glyphicon-plus"
aria-hidden="true"></span> {$PALANG.pAdminMenu_create_domain}
</a></li>
{/if}
</ul>
</li>
@@ -58,16 +80,27 @@
{* list-virtual *}
{strip}
<li class="dropdown">
<a class="btn navbar-btn dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
aria-expanded="false" href="{#url_list_virtual#}"><span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span> {$PALANG.pAdminMenu_list_virtual} <span
<a class="btn navbar-btn dropdown-toggle" data-toggle="dropdown" role="button"
aria-haspopup="true"
aria-expanded="false" href="{#url_list_virtual#}"><span
class="glyphicon glyphicon-list-alt"
aria-hidden="true"></span> {$PALANG.pAdminMenu_list_virtual} <span
class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="{#url_list_virtual#}"><span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span> {$PALANG.pAdminMenu_list_virtual}</a></li>
<li><a href="{#url_create_mailbox#}{$url_domain}"><span class="glyphicon glyphicon-inbox" aria-hidden="true"></span> {$PALANG.add_mailbox}</a></li>
<li><a href="{#url_create_alias#}{$url_domain}"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span> {$PALANG.add_alias}</a></li>
<li><a href="{#url_list_virtual#}"><span class="glyphicon glyphicon-list-alt"
aria-hidden="true"></span> {$PALANG.pAdminMenu_list_virtual}
</a></li>
<li><a href="{#url_create_mailbox#}{$url_domain}"><span
class="glyphicon glyphicon-inbox"
aria-hidden="true"></span> {$PALANG.add_mailbox}</a></li>
<li><a href="{#url_create_alias#}{$url_domain}"><span
class="glyphicon glyphicon-plus-sign"
aria-hidden="true"></span> {$PALANG.add_alias}</a></li>
{if $boolconf_alias_domain}
<li>
<a href="{#url_create_alias_domain#}{$url_domain}">{$PALANG.add_alias_domain}</a>
<a href="{#url_create_alias_domain#}{$url_domain}">
<span class="glyphicon glyphicon-plus-sign"
aria-hidden="true"></span> {$PALANG.add_alias_domain}</a>
</li>
{/if}
</ul>
@@ -77,12 +110,17 @@
{if $CONF.fetchmail==='YES'}
{strip}
<li class="dropdown">
<a class="btn navbar-btn dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
<a class="btn navbar-btn dropdown-toggle" data-toggle="dropdown" role="button"
aria-haspopup="true"
aria-expanded="false" href="{#url_fetchmail#}">{$PALANG.pMenu_fetchmail} <span
class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="{#url_fetchmail#}">{$PALANG.pMenu_fetchmail}</a></li>
<li><a href="{#url_fetchmail_new_entry#}">{$PALANG.pFetchmail_new_entry}</a></li>
<li><a href="{#url_fetchmail#}">
<span class="glyphicon glyphicon-list-alt"
aria-hidden="true"></span> {$PALANG.pMenu_fetchmail}</a></li>
<li><a href="{#url_fetchmail_new_entry#}">
<span class="glyphicon glyphicon-plus-sign"
aria-hidden="true"></span> {$PALANG.pFetchmail_new_entry}</a></li>
</ul>
</li>
{/strip}
@@ -91,14 +129,21 @@
{if $CONF.sendmail==='YES'}
{strip}
<li class="dropdown">
<a class="btn navbar-btn dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
aria-expanded="false" href="{#url_sendmail#}"><span class="glyphicon glyphicon-send" aria-hidden="true"></span> {$PALANG.pMenu_sendmail} <span
<a class="btn navbar-btn dropdown-toggle" data-toggle="dropdown" role="button"
aria-haspopup="true"
aria-expanded="false" href="{#url_sendmail#}"><span class="glyphicon glyphicon-send"
aria-hidden="true"></span> {$PALANG.pMenu_sendmail}
<span
class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="{#url_sendmail#}"><span class="glyphicon glyphicon-send" aria-hidden="true"></span> {$PALANG.pMenu_sendmail}</a></li>
<li><a href="{#url_sendmail#}"><span class="glyphicon glyphicon-send"
aria-hidden="true"></span> {$PALANG.pMenu_sendmail}
</a></li>
{if $authentication_has_role.global_admin || (isset($CONF.sendmail_all_admins) && $CONF.sendmail_all_admins === 'YES') }
<li>
<a href="{#url_broadcast_message#}"><span class="glyphicon glyphicon-share" aria-hidden="true"></span> {$PALANG.pAdminMenu_broadcast_message}</a>
<a href="{#url_broadcast_message#}"><span class="glyphicon glyphicon-share"
aria-hidden="true"></span> {$PALANG.pAdminMenu_broadcast_message}
</a>
</li>
{/if}
</ul>
@@ -107,19 +152,30 @@
{/if}
{* dkim *}
{if $CONF.dkim==='YES' && (
$authentication_has_role.global_admin ||
(isset($CONF.dkim_all_admins) && $CONF.dkim_all_admins === 'YES') )
$authentication_has_role.global_admin ||
(isset($CONF.dkim_all_admins) && $CONF.dkim_all_admins === 'YES') )
}
{strip}
<li class="dropdown">
<a class="btn navbar-btn dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
aria-expanded="false" href="{#url_dkim#}"><span class="glyphicon glyphicon-certificate" aria-hidden="true"></span> {$PALANG.pMenu_dkim} <span
<a class="btn navbar-btn dropdown-toggle" data-toggle="dropdown" role="button"
aria-haspopup="true"
aria-expanded="false" href="{#url_dkim#}"><span
class="glyphicon glyphicon-certificate"
aria-hidden="true"></span> {$PALANG.pMenu_dkim} <span
class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="{#url_dkim#}"><span class="glyphicon glyphicon-certificate" aria-hidden="true"></span> {$PALANG.pMenu_dkim}</a></li>
<li><a href="{#url_dkim_signing#}"><span class="glyphicon glyphicon-list" aria-hidden="true"></span> {$PALANG.pMenu_dkim_signing}</a></li>
<li><a href="{#url_dkim_newkey#}"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {$PALANG.pDkim_new_key}</a></li>
<li><a href="{#url_dkim_newsign#}"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {$PALANG.pDkim_new_sign}</a></li>
<li><a href="{#url_dkim#}"><span class="glyphicon glyphicon-certificate"
aria-hidden="true"></span> {$PALANG.pMenu_dkim}</a>
</li>
<li><a href="{#url_dkim_signing#}"><span class="glyphicon glyphicon-list"
aria-hidden="true"></span> {$PALANG.pMenu_dkim_signing}
</a></li>
<li><a href="{#url_dkim_newkey#}"><span class="glyphicon glyphicon-plus"
aria-hidden="true"></span> {$PALANG.pDkim_new_key}
</a></li>
<li><a href="{#url_dkim_newsign#}"><span class="glyphicon glyphicon-plus"
aria-hidden="true"></span> {$PALANG.pDkim_new_sign}
</a></li>
</ul>
</li>
{/strip}
@@ -128,42 +184,53 @@
{if $CONF.totp==='YES'}
{strip}
<li class="dropdown">
<a class="btn navbar-btn dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
aria-expanded="false" href="{#url_dkim#}"><span class="glyphicon glyphicon-lock" aria-hidden="true"></span> {$PALANG.pMenu_security} <span
<a class="btn navbar-btn dropdown-toggle" data-toggle="dropdown" role="button"
aria-haspopup="true"
aria-expanded="false" href="{#url_dkim#}"><span class="glyphicon glyphicon-lock"
aria-hidden="true"></span> {$PALANG.pMenu_security}
<span
class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="{#url_password#}"><span class="glyphicon glyphicon-lock" aria-hidden="true"></span> {$PALANG.pMenu_password}</a></li>
<li><a href="{#url_totp#}"><span class="glyphicon glyphicon-lock" aria-hidden="true"></span> {$PALANG.pMenu_totp}</a></li>
<li><a href="{#url_totp_exceptions#}"><span class="glyphicon glyphicon-lock" aria-hidden="true"></span> {$PALANG.pMenu_totp_exceptions}</a></li>
<li><a href="{#url_app_passwords#}"><span class="glyphicon glyphicon-lock" aria-hidden="true"></span> {$PALANG.pMenu_app_passwords}</a></li>
<li><a href="{#url_password#}"><span class="glyphicon glyphicon-lock"
aria-hidden="true"></span> {$PALANG.pMenu_password}
</a></li>
<li><a href="{#url_totp#}"><span class="glyphicon glyphicon-lock"
aria-hidden="true"></span> {$PALANG.pMenu_totp}</a>
</li>
<li><a href="{#url_totp_exceptions#}"><span class="glyphicon glyphicon-lock"
aria-hidden="true"></span> {$PALANG.pMenu_totp_exceptions}
</a></li>
<li><a href="{#url_app_passwords#}"><span class="glyphicon glyphicon-lock"
aria-hidden="true"></span> {$PALANG.pMenu_app_passwords}
</a></li>
</ul>
</li>
{/strip}
{else}
{* password *}
<li><a class="btn navbar-btn" type="button" href="{#url_password#}">
<span class="glyphicon glyphicon-lock" aria-hidden="true"></span>
{$PALANG.pMenu_password}</a></li>
{/if}
<span class="glyphicon glyphicon-lock" aria-hidden="true"></span>
{$PALANG.pMenu_password}</a></li>
{/if}
{* backup *}
{if $authentication_has_role.global_admin && $CONF.database_type!=='pgsql' && $CONF.backup === 'YES'}
<li><a class="btn btn-default navbar-btn btn-sm" type="button"
href="{#url_backup#}">
<span class="glyphicon glyphicon-menu-hamburger" aria-hidden="true"></span>
{$PALANG.pAdminMenu_backup}</a></li>
<span class="glyphicon glyphicon-menu-hamburger" aria-hidden="true"></span>
{$PALANG.pAdminMenu_backup}</a></li>
{/if}
{* viewlog *}
{if $CONF.logging==='YES'}
<li><a class="btn navbar-btn" type="button"
href="{#url_viewlog#}">
<span class="glyphicon glyphicon-file " aria-hidden="true"></span>
{$PALANG.pMenu_viewlog}</a></li>
<span class="glyphicon glyphicon-file " aria-hidden="true"></span>
{$PALANG.pMenu_viewlog}</a></li>
{/if}
{* logout *}
<li><a class="btn navbar-btn" type="button"
href="{#url_logout#}">
<span class="glyphicon glyphicon-log-out" aria-hidden="true"></span>
{$PALANG.pMenu_logout}</a></li>
<span class="glyphicon glyphicon-log-out" aria-hidden="true"></span>
{$PALANG.pMenu_logout}</a></li>
</ul>
</div><!--/.nav-collapse -->
</div>