Thread: SF.net SVN: postfixadmin:[1722] trunk (Page 12)
Brought to you by:
christian_boltz,
gingerdog
From: <chr...@us...> - 2014-11-02 21:05:25
|
Revision: 1722 http://sourceforge.net/p/postfixadmin/code/1722 Author: christian_boltz Date: 2014-11-02 21:05:22 +0000 (Sun, 02 Nov 2014) Log Message: ----------- add list.php and list.tpl - generic files to display lists (will replace list-admin, list-domain etc.) list.php: - generic list view, select *Handler with ?table= list.tpl: - display list view - columns based on $struct (every column with display_in_list and non-empty label will be displayed) Added Paths: ----------- trunk/list.php trunk/templates/list.tpl Added: trunk/list.php =================================================================== --- trunk/list.php (rev 0) +++ trunk/list.php 2014-11-02 21:05:22 UTC (rev 1722) @@ -0,0 +1,67 @@ +<?php /** + * Postfix Admin + * + * LICENSE + * This source file is subject to the GPL license that is bundled with + * this package in the file LICENSE.TXT. + * + * Further details on the project are available at http://postfixadmin.sf.net + * + * @version $Id$ + * @license GNU GPL v2 or later. + * + * File: list.php + * List all items as a quick overview. + * + */ + +require_once('common.php'); + +# if (safeget('token') != $_SESSION['PFA_token']) die('Invalid token!'); + +$username = authentication_get_username(); # enforce login + +$table = safeget('table'); + +$handlerclass = ucfirst($table) . 'Handler'; + +if ( !preg_match('/^[a-z]+$/', $table) || !file_exists("model/$handlerclass.php")) { # validate $table + die ("Invalid table name given!"); +} + +# default: domain admin restrictions +$list_admins = array($username); +$is_superadmin = 0; + +if (authentication_has_role('global-admin')) { # more permissions? Fine! + $list_admins = array_keys(list_admins()); + $is_superadmin = 1; + $username = safepost('username', safeget('username', authentication_get_username())); # prefer POST over GET variable +} + +$handler = new $handlerclass(0, $username); + +$formconf = $handler->webformConfig(); + +authentication_require_role($formconf['required_role']); + +$handler->getList(''); +$items = $handler->result(); + +$smarty->assign ('select_options', select_options($list_admins, array ($fUsername)), false); +#if ($is_superadmin) { + $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); +#} else { +# $smarty->assign ('smarty_template', 'overview-get'); +#} + +$smarty->display ('index.tpl'); + +/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ +?> Property changes on: trunk/list.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/templates/list.tpl =================================================================== --- trunk/templates/list.tpl (rev 0) +++ trunk/templates/list.tpl 2014-11-02 21:05:22 UTC (rev 1722) @@ -0,0 +1,68 @@ +<div id="overview"> +<form name="frmOverview" method="post" action=""> + <select name="username" onchange="this.form.submit();"> + {$select_options} + </select> + <input class="button" type="submit" name="go" value="{$PALANG.go}" /> +</form> +{#form_search#} +</div> + + +<div id="list"> +<table border=0 id='admin_table'><!-- TODO: 'admin_table' needed because of CSS for table header --> + +<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 *} + <td>{$field.label}</td> + {/if} + {/foreach} + <td> </td> + <td> </td> +</tr> + +{foreach from=$items item=item} + {#tr_hilightoff#} + + {foreach key=key item=field from=$struct} + {if $field.display_in_list == 1 && $field.label} + + {if $table == 'foo' && $key == 'bar'} + <td>Special handling (complete table row) for {$table} / {$key}</td></tr> + {else} + <td> + {if $table == 'foo' && $key == 'bar'} + Special handling (td content) for {$table} / {$key} +{* {elseif $table == 'domain' && $key == 'domain'} + <a href="list.php?table=domain&domain={$item.domain|escape:"url"}">{$item.domain}</a> +*} + {elseif $key == 'active'} + <a href="{#url_editactive#}{$table}&id={$item.$id_field|escape:"url"}&active={if ($item.active==0)}1{else}0{/if}&token={$smarty.session.PFA_token|escape:"url"}">{$item._active}</a> + {elseif $field.type == 'bool'} + {assign "tmpkey" "_{$key}"}{$item.{$tmpkey}} + {elseif $field.type == 'list'} + {foreach key=key2 item=field2 from=$value_{$key}}<p>{$field2} {/foreach} + {elseif $field.type == 'pass'} + (hidden) + {elseif $field.type == 'txtl'} + {foreach key=key2 item=field2 from=$value_{$key}}<p>{$field2} {/foreach} + {else} +{$item.{$key}} + {/if} + </td> + {/if} + {/if} + {/foreach} + + <td>{if $item._can_edit}<a href="edit.php?table={$table|escape:"url"}&edit={$item.$id_field|escape:"url"}">{$PALANG.edit}</a>{else} {/if}</td> + <td>{if $item._can_delete}<a href="{#url_delete#}?table={$table}&delete={$item.$id_field|escape:"url"}&token={$smarty.session.PFA_token|escape:"url"}" + onclick="return confirm ('{$PALANG.{$msg.confirm_delete}|replace:'%s':$item.$id_field}')">{$PALANG.del}</a>{else} {/if}</td> + </tr> +{/foreach} + +</table> + +<br /><a href="edit.php?table={$table|escape:"url"}" class="button">{$PALANG.{$formconf.create_button}}</a><br /> + +</div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2014-11-02 21:14:20
|
Revision: 1723 http://sourceforge.net/p/postfixadmin/code/1723 Author: christian_boltz Date: 2014-11-02 21:14:16 +0000 (Sun, 02 Nov 2014) Log Message: ----------- list.php, list.tpl: - use smarty-style dropdown for admin dropdown instead of select_options() - only display admin dropdown if more than one admin is available (which basically means hiding it for domain admins) Modified Paths: -------------- trunk/list.php trunk/templates/list.tpl Modified: trunk/list.php =================================================================== --- trunk/list.php 2014-11-02 21:05:22 UTC (rev 1722) +++ trunk/list.php 2014-11-02 21:14:16 UTC (rev 1723) @@ -48,7 +48,8 @@ $handler->getList(''); $items = $handler->result(); -$smarty->assign ('select_options', select_options($list_admins, array ($fUsername)), false); +$smarty->assign('admin_list', $list_admins); +$smarty->assign('admin_selected', $username); #if ($is_superadmin) { $smarty->assign('smarty_template', 'list'); $smarty->assign('struct', $handler->getStruct()); Modified: trunk/templates/list.tpl =================================================================== --- trunk/templates/list.tpl 2014-11-02 21:05:22 UTC (rev 1722) +++ trunk/templates/list.tpl 2014-11-02 21:14:16 UTC (rev 1723) @@ -1,9 +1,9 @@ <div id="overview"> <form name="frmOverview" method="post" action=""> - <select name="username" onchange="this.form.submit();"> - {$select_options} - </select> - <input class="button" type="submit" name="go" value="{$PALANG.go}" /> + {if ($admin_list|count > 1)} + {html_options name='username' output=$admin_list values=$admin_list selected=$admin_selected onchange="this.form.submit();"} + <input class="button" type="submit" name="go" value="{$PALANG.go}" /> + {/if} </form> {#form_search#} </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2014-11-02 21:32:28
|
Revision: 1725 http://sourceforge.net/p/postfixadmin/code/1725 Author: christian_boltz Date: 2014-11-02 21:32:25 +0000 (Sun, 02 Nov 2014) Log Message: ----------- list.php: - add CSV export list.tpl: - add "export as CSV" link *.lang: - new text 'download_csv' Modified Paths: -------------- trunk/languages/bg.lang trunk/languages/ca.lang trunk/languages/cn.lang trunk/languages/cs.lang trunk/languages/da.lang trunk/languages/de.lang trunk/languages/en.lang trunk/languages/es.lang trunk/languages/et.lang trunk/languages/eu.lang trunk/languages/fi.lang trunk/languages/fo.lang trunk/languages/fr.lang trunk/languages/hr.lang trunk/languages/hu.lang trunk/languages/is.lang trunk/languages/it.lang trunk/languages/ja.lang trunk/languages/lt.lang trunk/languages/mk.lang trunk/languages/nb.lang trunk/languages/nl.lang trunk/languages/nn.lang trunk/languages/pl.lang trunk/languages/pt-br.lang trunk/languages/ru.lang trunk/languages/sk.lang trunk/languages/sl.lang trunk/languages/sv.lang trunk/languages/tr.lang trunk/languages/tw.lang trunk/list.php trunk/templates/list.tpl Modified: trunk/languages/bg.lang =================================================================== --- trunk/languages/bg.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/bg.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -22,6 +22,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/ca.lang =================================================================== --- trunk/languages/ca.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/ca.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -21,6 +21,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/cn.lang =================================================================== --- trunk/languages/cn.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/cn.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -21,6 +21,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/cs.lang =================================================================== --- trunk/languages/cs.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/cs.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -25,6 +25,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/da.lang =================================================================== --- trunk/languages/da.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/da.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -24,6 +24,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/de.lang =================================================================== --- trunk/languages/de.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/de.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -22,6 +22,7 @@ $PALANG['all'] = 'Alle'; $PALANG['created'] = 'Erstellt'; $PALANG['unknown'] = 'unbekannt'; +$PALANG['download_csv'] = 'Diese Liste als CSV-Datei herunterladen'; $PALANG['missing_field'] = 'Das Feld %s fehlt'; $PALANG['must_be_numeric'] = '%s muss numerisch sein'; $PALANG['must_be_boolean'] = "%s muss ein Bool'scher Wert sein"; Modified: trunk/languages/en.lang =================================================================== --- trunk/languages/en.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/en.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -22,6 +22,7 @@ $PALANG['all'] = 'All'; $PALANG['created'] = 'Created'; $PALANG['unknown'] = 'unknown'; +$PALANG['download_csv'] = 'Download this list as CSV file'; $PALANG['missing_field'] = 'Field %s is missing'; $PALANG['must_be_numeric'] = '%s must be numeric'; $PALANG['must_be_boolean'] = '%s must be boolean'; Modified: trunk/languages/es.lang =================================================================== --- trunk/languages/es.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/es.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -22,6 +22,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/et.lang =================================================================== --- trunk/languages/et.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/et.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -21,6 +21,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/eu.lang =================================================================== --- trunk/languages/eu.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/eu.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -21,6 +21,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/fi.lang =================================================================== --- trunk/languages/fi.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/fi.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -22,6 +22,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/fo.lang =================================================================== --- trunk/languages/fo.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/fo.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -21,6 +21,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/fr.lang =================================================================== --- trunk/languages/fr.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/fr.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -23,6 +23,7 @@ $PALANG['all'] = 'Tous'; $PALANG['created'] = 'Créé'; $PALANG['unknown'] = 'inconnu'; +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Le champ %s est manquant'; $PALANG['must_be_numeric'] = '%s doit être numérique'; $PALANG['must_be_boolean'] = '%s doit être booléen'; Modified: trunk/languages/hr.lang =================================================================== --- trunk/languages/hr.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/hr.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -20,6 +20,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/hu.lang =================================================================== --- trunk/languages/hu.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/hu.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -21,6 +21,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/is.lang =================================================================== --- trunk/languages/is.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/is.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -21,6 +21,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/it.lang =================================================================== --- trunk/languages/it.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/it.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -22,6 +22,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/ja.lang =================================================================== --- trunk/languages/ja.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/ja.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -22,6 +22,7 @@ $PALANG['all'] = '全て'; $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/lt.lang =================================================================== --- trunk/languages/lt.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/lt.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -21,6 +21,7 @@ $PALANG['all'] = 'Visi'; $PALANG['created'] = 'Sukurta'; $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/mk.lang =================================================================== --- trunk/languages/mk.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/mk.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -21,6 +21,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/nb.lang =================================================================== --- trunk/languages/nb.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/nb.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -23,6 +23,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/nl.lang =================================================================== --- trunk/languages/nl.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/nl.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -22,6 +22,7 @@ $PALANG['all'] = 'Alle'; $PALANG['created'] = 'Aangemaakt'; #XXX $PALANG['unknown'] = 'onbekend'; #XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Veld %s is niet aanwezig'; #XXX $PALANG['must_be_numeric'] = '%s moet een getal zijn'; #XXX $PALANG['must_be_boolean'] = '%s moet een boolean zijn'; #XXX Modified: trunk/languages/nn.lang =================================================================== --- trunk/languages/nn.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/nn.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -21,6 +21,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/pl.lang =================================================================== --- trunk/languages/pl.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/pl.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -24,6 +24,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/pt-br.lang =================================================================== --- trunk/languages/pt-br.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/pt-br.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -22,6 +22,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/ru.lang =================================================================== --- trunk/languages/ru.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/ru.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -23,6 +23,7 @@ $PALANG['all'] = 'Все'; $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/sk.lang =================================================================== --- trunk/languages/sk.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/sk.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -22,6 +22,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/sl.lang =================================================================== --- trunk/languages/sl.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/sl.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -21,6 +21,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/sv.lang =================================================================== --- trunk/languages/sv.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/sv.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -23,6 +23,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/tr.lang =================================================================== --- trunk/languages/tr.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/tr.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -21,6 +21,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/languages/tw.lang =================================================================== --- trunk/languages/tw.lang 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/languages/tw.lang 2014-11-02 21:32:25 UTC (rev 1725) @@ -21,6 +21,7 @@ $PALANG['all'] = 'All'; # XXX $PALANG['created'] = 'Created'; # XXX $PALANG['unknown'] = 'unknown'; # XXX +$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX $PALANG['missing_field'] = 'Field %s is missing'; # XXX $PALANG['must_be_numeric'] = '%s must be numeric'; # XXX $PALANG['must_be_boolean'] = '%s must be boolean'; # XXX Modified: trunk/list.php =================================================================== --- trunk/list.php 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/list.php 2014-11-02 21:32:25 UTC (rev 1725) @@ -56,9 +56,46 @@ $handler->getList(''); $items = $handler->result(); -$smarty->assign('admin_list', $list_admins); -$smarty->assign('admin_selected', $username); -#if ($is_superadmin) { +if (safeget('output') == 'csv') { + + $out = fopen('php://output', 'w'); + header( 'Content-Type: text/csv; charset=utf-8' ); + header( 'Content-Disposition: attachment;filename='.$table.'.csv'); + + print "\xEF\xBB\xBF"; # utf8 byte-order to indicate the file is utf8 encoded + # print "sep=;"; # hint that ; is used as seperator - breaks the utf8 flag in excel import! + print "\n"; + + if (!defined('ENT_HTML401')) { # for compability for PHP < 5.4.0 + define('ENT_HTML401', 0); + } + + # print column headers as csv + $header = array(); + $columns = array(); + foreach ($handler->getStruct() as $key => $field) { + if ($field['display_in_list'] && $field['label'] != '') { # don't show fields without a label + $header[] = html_entity_decode ( $field['label'], ENT_COMPAT | ENT_HTML401, 'UTF-8' ); + $columns[] = $key; + } + } + fputcsv($out, $header, ';'); + + # print items as csv + foreach ($items as $item) { + $fields = array(); + foreach ($columns as $column) { + $fields[] = $item[$column]; + } + 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()); @@ -66,11 +103,10 @@ $smarty->assign('items', $items); $smarty->assign('id_field', $handler->getId_field()); $smarty->assign('formconf', $formconf); -#} else { -# $smarty->assign ('smarty_template', 'overview-get'); -#} -$smarty->display ('index.tpl'); + $smarty->display ('index.tpl'); +} + /* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ ?> Modified: trunk/templates/list.tpl =================================================================== --- trunk/templates/list.tpl 2014-11-02 21:19:54 UTC (rev 1724) +++ trunk/templates/list.tpl 2014-11-02 21:32:25 UTC (rev 1725) @@ -64,5 +64,7 @@ </table> <br /><a href="edit.php?table={$table|escape:"url"}" class="button">{$PALANG.{$formconf.create_button}}</a><br /> +<br /> +<br /><a href="list.php?table={$table|escape:"url"}&output=csv">{$PALANG.download_csv}</a> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2014-11-02 22:45:26
|
Revision: 1731 http://sourceforge.net/p/postfixadmin/code/1731 Author: christian_boltz Date: 2014-11-02 22:45:22 +0000 (Sun, 02 Nov 2014) Log Message: ----------- PFAHandler: - read_from_db(), getList(): - add $searchmode parameter (_before_ $limit and $offset!) to be able to use query different query modes, not only "=" - add a warning that $condition will be changed to array only in the future - getList(): filter $condition for fields that are available to the user to avoid information leaks by using search parameters (filter is only applied if $condition is an array!) functions.inc.php: - db_where_clause(): - add $additional_raw_where parameter for additional query parameters - add $searchmode parameter to be able to use query different query modes, not only "=" (see $allowed_operators) - check for allowed operators in $searchmode - split query into WHERE and HAVING (if a parameter has $struct[select] set, HAVING is used) list-virtual.php: - adopt getList() call to the new syntax AliasHandler: - adopt getList() definition and call to the new syntax Modified Paths: -------------- trunk/functions.inc.php trunk/list-virtual.php trunk/model/AliasHandler.php trunk/model/PFAHandler.php Modified: trunk/functions.inc.php =================================================================== --- trunk/functions.inc.php 2014-11-02 22:07:20 UTC (rev 1730) +++ trunk/functions.inc.php 2014-11-02 22:45:22 UTC (rev 1731) @@ -1617,21 +1617,54 @@ * Call: db_where_clause (array $conditions, array $struct) * param array $conditios: array('field' => 'value', 'field2' => 'value2, ...) * param array $struct - field structure, used for automatic bool conversion + * param string $additional_raw_where - raw sniplet to include in the WHERE part - typically needs to start with AND + * param array $searchmode - operators to use (=, <, > etc.) - defaults to = if not specified for a field (see + * $allowed_operators for available operators) */ -function db_where_clause($condition, $struct) { +function db_where_clause($condition, $struct, $additional_raw_where = '', $searchmode = array()) { if (!is_array($condition)) { die('db_where_cond: parameter $cond is not an array!'); + } elseif(!is_array($searchmode)) { + die('db_where_cond: parameter $searchmode is not an array!'); } elseif (count($condition) == 0) { die("db_where_cond: parameter is an empty array!"); # die() might sound harsh, but can prevent information leaks } elseif(!is_array($struct)) { die('db_where_cond: parameter $struct is not an array!'); } + $allowed_operators = explode(' ', '< > >= <= = != <> CONT LIKE'); + $where_parts = array(); + $having_parts = array(); + foreach($condition as $field => $value) { if (isset($struct[$field]) && $struct[$field]['type'] == 'bool') $value = db_get_boolean($value); - $parts[] = "$field='" . escape_string($value) . "'"; + $operator = '='; + if (isset($searchmode[$field])) { + if (in_array($searchmode[$field], $allowed_operators)) { + $operator = $searchmode[$field]; + + if ($operator == 'CONT') { # CONT - as in "contains" + $operator = ' LIKE '; # add spaces + $value = '%' . $value . '%'; + } elseif ($operator == 'LIKE') { # LIKE -without adding % wildcards (the search value can contain %) + $operator = ' LIKE '; # add spaces + } + } else { + die('db_where_clause: Invalid searchmode for ' . $field); + } + } + $querypart = $field . $operator . "'" . escape_string($value) . "'"; + if($struct[$field]['select'] != '') { + $having_parts[$field] = $querypart; + } else { + $where_parts[$field] = $querypart; + } } - $query = " WHERE ( " . join(" AND ", $parts) . " ) "; + $query = ' WHERE 1=1 '; + $query .= " $additional_raw_where "; + if (count($where_parts) > 0) $query .= " AND ( " . join(" AND ", $where_parts) . " ) "; + if (count($having_parts) > 0) $query .= " HAVING ( " . join(" AND ", $having_parts) . " ) "; + return $query; } Modified: trunk/list-virtual.php =================================================================== --- trunk/list-virtual.php 2014-11-02 22:07:20 UTC (rev 1730) +++ trunk/list-virtual.php 2014-11-02 22:45:22 UTC (rev 1731) @@ -126,7 +126,7 @@ "; $handler = new AliasHandler(0, $admin_username); -$handler->getList($list_param, $page_size, $fDisplay); +$handler->getList($list_param, array(), $page_size, $fDisplay); $tAlias = $handler->result(); Modified: trunk/model/AliasHandler.php =================================================================== --- trunk/model/AliasHandler.php 2014-11-02 22:07:20 UTC (rev 1730) +++ trunk/model/AliasHandler.php 2014-11-02 22:45:22 UTC (rev 1731) @@ -287,10 +287,10 @@ return $db_result; } - public function getList($condition, $limit=-1, $offset=-1) { + public function getList($condition, $searchmode = array(), $limit=-1, $offset=-1) { # only list aliases that do not belong to mailboxes # TODO: breaks if $condition is an array - return parent::getList( "__mailbox_username IS NULL AND ( $condition )", $limit, $offset); + return parent::getList( "__mailbox_username IS NULL AND ( $condition )", $searchmode, $limit, $offset); } protected function _validate_goto($field, $val) { Modified: trunk/model/PFAHandler.php =================================================================== --- trunk/model/PFAHandler.php 2014-11-02 22:07:20 UTC (rev 1730) +++ trunk/model/PFAHandler.php 2014-11-02 22:45:22 UTC (rev 1731) @@ -533,11 +533,13 @@ * * @param array or string - condition (an array will be AND'ed using db_where_clause, a string will be directly used) * (if you use a string, make sure it is correctly escaped!) + * - WARNING: will be changed to array only in the future, with an option to include a raw string inside the array + * @param array searchmode - operators to use (=, <, >) if $condition is an array. Defaults to = if not specified for a field. * @param integer limit - maximum number of rows to return * @param integer offset - number of first row to return * @return array - rows (as associative array, with the ID as key) */ - protected function read_from_db($condition, $limit=-1, $offset=-1) { + protected function read_from_db($condition, $searchmode = array(), $limit=-1, $offset=-1) { $select_cols = array(); $yes = escape_string(Config::lang('YES')); @@ -577,21 +579,23 @@ $cols = join(',', $select_cols); $table = table_by_key($this->db_table); - if (is_array($condition)) { - $where = db_where_clause($condition, $this->struct); - } else { - if ($condition == "") $condition = '1=1'; - $where = " WHERE ( $condition ) "; - } - + $additional_where = ''; if ($this->domain_field != "") { - $where .= " AND " . db_in_clause($this->domain_field, $this->allowed_domains); + $additional_where .= " AND " . db_in_clause($this->domain_field, $this->allowed_domains); } # if logged in as user, restrict to the items the user is allowed to see if ( (!$this->is_admin) && $this->user_field != '') { - $where .= " AND " . $this->user_field . " = '" . escape_string($this->username) . "' "; + $additional_where .= " AND " . $this->user_field . " = '" . escape_string($this->username) . "' "; } + + if (is_array($condition)) { + $where = db_where_clause($condition, $this->struct, $additional_where, $searchmode); + } else { + if ($condition == "") $condition = '1=1'; + $where = " WHERE ( $condition ) $additional_where"; + } + $query = "SELECT $cols FROM $table $extrafrom $where ORDER BY " . $this->order_by; $limit = (int) $limit; # make sure $limit and $offset are really integers @@ -644,14 +648,31 @@ /** * get a list of one or more items with all values * @param array or string $condition - see read_from_db for details + * WARNING: will be changed to array only in the future, with an option to include a raw string inside the array + * @param array - modes to use if $condition is an array - see read_from_db for details * @param integer limit - maximum number of rows to return * @param integer offset - number of first row to return * @return bool - always true, no need to check ;-) (if $result is not an array, getList die()s) * The data is stored in $this->result (as array of rows, each row is an associative array of column => value) */ - public function getList($condition, $limit=-1, $offset=-1) { - $result = $this->read_from_db($condition, $limit, $offset); + public function getList($condition, $searchmode = array(), $limit=-1, $offset=-1) { + if (is_array($condition)) { + $real_condition = array(); + foreach ($condition as $key => $value) { + # allow only access to fields the user can access to avoid information leaks via search parameters + if (isset($this->struct[$key]) && ($this->struct[$key]['display_in_list'] || $this->struct[$key]['display_in_form']) ) { + $real_condition[$key] = $value; + } else { + $this->errormsg[] = "Ignoring unknown search field $key"; + } + } + } else { + # warning: no sanity checks are applied if $condition is not an array! + $real_condition = $condition; + } + $result = $this->read_from_db($real_condition, $searchmode, $limit, $offset); + if (!is_array($result)) { error_log('getList: read_from_db didn\'t return an array. table: ' . $this->db_table . ' - condition: $condition - limit: $limit - offset: $offset'); error_log('getList: This is most probably caused by read_from_db_postprocess()'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2014-11-02 23:04:23
|
Revision: 1732 http://sourceforge.net/p/postfixadmin/code/1732 Author: christian_boltz Date: 2014-11-02 23:04:15 +0000 (Sun, 02 Nov 2014) Log Message: ----------- list.php: - add search support: - new parameters: - search[$field] - value to search for - searchmode[$field] - search mode (=, <, > etc.) - reset_search - if given, empty $search and $searchmode - remember $search and $searchmode via session - display errormsg and infomsg from $handler, if any list.tpl: - display current search parameters and a "[x]" link to remove all search parameters This change doesn't add a search form, but you can use ?search[field]= and ?searchmode[field]= URL parameters Modified Paths: -------------- trunk/list.php trunk/templates/list.tpl Modified: trunk/list.php =================================================================== --- trunk/list.php 2014-11-02 22:45:22 UTC (rev 1731) +++ trunk/list.php 2014-11-02 23:04:15 UTC (rev 1732) @@ -53,9 +53,32 @@ } } -$handler->getList(''); +$search = safeget('search', safesession("search_$table", array())); +$searchmode = safeget('searchmode', safesession("searchmode_$table", array())); + +if (!is_array($search) || !is_array($searchmode)) { + # avoid injection of raw SQL if $search is a string instead of an array + die("Invalid parameter"); +} + +if (safeget('reset_search', 0)) { + $search = array(); + $searchmode = array(); +} +$_SESSION["search_$table"] = $search; +$_SESSION["searchmode_$table"] = $searchmode; + +if (count($search)) { + $handler->getList($search, $searchmode); +} else { + $handler->getList(''); +} $items = $handler->result(); +if (count($handler->errormsg)) flash_error($handler->errormsg); +if (count($handler->infomsg)) flash_error($handler->infomsg); + + if (safeget('output') == 'csv') { $out = fopen('php://output', 'w'); @@ -103,6 +126,8 @@ $smarty->assign('items', $items); $smarty->assign('id_field', $handler->getId_field()); $smarty->assign('formconf', $formconf); + $smarty->assign('search', $search); + $smarty->assign('searchmode', $searchmode); $smarty->display ('index.tpl'); Modified: trunk/templates/list.tpl =================================================================== --- trunk/templates/list.tpl 2014-11-02 22:45:22 UTC (rev 1731) +++ trunk/templates/list.tpl 2014-11-02 23:04:15 UTC (rev 1732) @@ -8,7 +8,20 @@ {#form_search#} </div> + {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} + + <div id="list"> <table border=0 id='admin_table'><!-- TODO: 'admin_table' needed because of CSS for table header --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2015-02-28 22:26:21
|
Revision: 1743 http://sourceforge.net/p/postfixadmin/code/1743 Author: christian_boltz Date: 2015-02-28 22:26:14 +0000 (Sat, 28 Feb 2015) Log Message: ----------- list.tpl, default.css: - format unlimited/disabled quota similar to x/y, but no border Modified Paths: -------------- trunk/css/default.css trunk/templates/list.tpl Modified: trunk/css/default.css =================================================================== --- trunk/css/default.css 2015-02-28 21:58:43 UTC (rev 1742) +++ trunk/css/default.css 2015-02-28 22:26:14 UTC (rev 1743) @@ -376,6 +376,7 @@ margin-top:-14px; } .quota_bg { background-color: white; z-index:98; width:120px; height:14px;margin-top:-1px;margin-left:-1px; border: 1px solid #999;} +.quota_no_border { border:none; margin:0; } .quota_high { background: url(../images/quota-colors.png) repeat-x 0 -28px #f90509; } .quota_mid { background: url(../images/quota-colors.png) repeat-x 0 -14px #e3e909; } .quota_low { background: url(../images/quota-colors.png) repeat-x 0 0px #05f905; } Modified: trunk/templates/list.tpl =================================================================== --- trunk/templates/list.tpl 2015-02-28 21:58:43 UTC (rev 1742) +++ trunk/templates/list.tpl 2015-02-28 22:26:14 UTC (rev 1743) @@ -84,7 +84,8 @@ <div class="quota_bg"></div></div> <div class="quota_text quota_text_{$quota_level}">{$linktext}</div> {else} - {$item[$key]} + <div class="quota_bg quota_no_border"></div></div> + <div class="quota_text">{$linktext}</div> {/if} {elseif $field.type == 'txtl'} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2015-02-28 22:42:13
|
Revision: 1745 http://sourceforge.net/p/postfixadmin/code/1745 Author: christian_boltz Date: 2015-02-28 22:42:11 +0000 (Sat, 28 Feb 2015) Log Message: ----------- model/DomainHandler.php: - initStruct(): - add optical quota indicators for aliases, mailboxes, domain quota - some adjustments to get nice output with list.php (mostly following list-domain.php) - webformConfig(): switch listview to list.php configs/menu.conf, templates/adminlistadmin.tpl: - switch list-domain.php to list.php?table=domain Modified Paths: -------------- trunk/configs/menu.conf trunk/model/DomainHandler.php trunk/templates/adminlistadmin.tpl Modified: trunk/configs/menu.conf =================================================================== --- trunk/configs/menu.conf 2015-02-28 22:30:21 UTC (rev 1744) +++ trunk/configs/menu.conf 2015-02-28 22:42:11 UTC (rev 1745) @@ -4,7 +4,7 @@ url_list_admin = list-admin.php url_create_admin = edit.php?table=admin # list-domain -url_list_domain = list-domain.php +url_list_domain = list.php?table=domain url_edit_domain = edit.php?table=domain # list-virtual url_list_virtual = list-virtual.php Modified: trunk/model/DomainHandler.php =================================================================== --- trunk/model/DomainHandler.php 2015-02-28 22:30:21 UTC (rev 1744) +++ trunk/model/DomainHandler.php 2015-02-28 22:42:11 UTC (rev 1745) @@ -33,9 +33,13 @@ $super = $this->is_superadmin; $transp = min($super, Config::intbool('transport')); - $quota = min($super, Config::intbool('quota')); - $dom_q = min($super, Config::intbool('domain_quota')); + $editquota = min($super, Config::intbool('quota')); + $quota = Config::intbool('quota'); + $edit_dom_q = min($super, Config::intbool('domain_quota')); + $dom_q = Config::intbool('domain_quota'); + $query_used_domainquota = 'round(coalesce(__total_quota/' . intval(Config::read('quota_multiplier')) . ',0))'; + # NOTE: There are dependencies between alias_count, mailbox_count and total_quota. # NOTE: If you disable "display in list" for one of them, the SQL query for the others might break. # NOTE: (Disabling all of them shouldn't be a problem.) @@ -43,35 +47,54 @@ $this->struct=array( # field name allow display in... type $PALANG label $PALANG description default / options / ... # editing? form list - 'domain' => pacol( $this->new, 1, 1, 'text', 'domain' , '' ), - 'description' => pacol( $super, 1, 1, 'text', 'description' , '' ), - 'aliases' => pacol( $super, $super, 1, 'num' , 'aliases' , 'pAdminEdit_domain_aliases_text' , Config::read('aliases') ), + 'domain' => pacol( $this->new, 1, 1, 'text', 'domain' , '' , '', '', + array('linkto' => 'list-virtual.php?domain=%s') ), + 'description' => pacol( $super, $super, $super, 'text', 'description' , '' ), + + # Aliases + 'aliases' => pacol( $super, $super, 0, 'num' , 'aliases' , 'pAdminEdit_domain_aliases_text' , Config::read('aliases') ), 'alias_count' => pacol( 0, 0, 1, 'vnum', '' , '' , '', '', /*not_in_db*/ 0, /*dont_write_to_db*/ 1, /*select*/ 'coalesce(__alias_count,0) - coalesce(__mailbox_count,0) as alias_count', /*extrafrom*/ 'left join ( select count(*) as __alias_count, domain as __alias_domain from ' . table_by_key('alias') . ' group by domain) as __alias on domain = __alias_domain'), - 'mailboxes' => pacol( $super, $super, 1, 'num' , 'mailboxes' , 'pAdminEdit_domain_aliases_text' , Config::read('mailboxes') ), + 'aliases_quot' => pacol( 0, 0, 1, 'quot', 'aliases' , '' , 0, '', + array('select' => db_quota_text( '__alias_count - __mailbox_count', 'aliases', 'aliases_quot')) ), + '_aliases_quot_percent' => pacol( 0, 0, 1, 'vnum', '' ,'' , 0, '', + array('select' => db_quota_percent('__alias_count - __mailbox_count', 'aliases', '_aliases_quot_percent')) ), + + # Mailboxes + 'mailboxes' => pacol( $super, $super, 0, 'num' , 'mailboxes' , 'pAdminEdit_domain_aliases_text' , Config::read('mailboxes') ), 'mailbox_count' => pacol( 0, 0, 1, 'vnum', '' , '' , '', '', /*not_in_db*/ 0, /*dont_write_to_db*/ 1, /*select*/ 'coalesce(__mailbox_count,0) as mailbox_count', /*extrafrom*/ 'left join ( select count(*) as __mailbox_count, sum(quota) as __total_quota, domain as __mailbox_domain from ' . table_by_key('mailbox') . ' group by domain) as __mailbox on domain = __mailbox_domain'), - 'maxquota' => pacol( $quota, $quota, $quota, 'num' , 'pAdminEdit_domain_maxquota' , 'pAdminEdit_domain_maxquota_text' , Config::read('maxquota') ), - 'total_quota' => pacol( 0, 0, 1, 'vnum', '' , '' , '', '', - /*not_in_db*/ 0, - /*dont_write_to_db*/ 1, - /*select*/ 'round(coalesce(__total_quota/' . intval(Config::read('quota_multiplier')) . ',0)) as total_quota' /*extrafrom*//* already in mailbox_count */ ), - 'quota' => pacol( $dom_q, $dom_q, $dom_q, 'num' , 'pAdminEdit_domain_quota' , 'pAdminEdit_domain_maxquota_text' , Config::read('domain_quota_default') ), + 'mailboxes_quot' => pacol( 0, 0, 1, 'quot', 'mailboxes' , '' , 0, '', + array('select' => db_quota_text( '__mailbox_count', 'mailboxes', 'mailboxes_quot')) ), + '_mailboxes_quot_percent' => pacol( 0, 0, 1, 'vnum', '' , '' , 0, '', + array('select' => db_quota_percent('__mailbox_count', 'mailboxes', '_mailboxes_quot_percent')) ), + + 'maxquota' => pacol($editquota,$editquota,$quota, 'num' , 'pOverview_get_quota' , 'pAdminEdit_domain_maxquota_text' , Config::read('maxquota') ), + + # Domain quota + 'quota' => pacol($edit_dom_q,$edit_dom_q, 0, 'num', 'pAdminEdit_domain_quota' , 'pAdminEdit_domain_maxquota_text' , Config::read('domain_quota_default') ), + 'total_quota' => pacol( 0, 0, 1, 'vnum', 'total_quota' , '' , '', '', + array('select' => "$query_used_domainquota AS total_quota") /*extrafrom*//* already in mailbox_count */ ), + 'total_quot' => pacol( 0, 0, 1, 'quot', 'pAdminEdit_domain_quota' , '' , 0, '', + array('select' => db_quota_text( $query_used_domainquota, 'quota', 'total_quot')) ), + '_total_quot_percent'=> pacol( 0, 0, 1, 'vnum', '' , '' , 0, '', + array('select' => db_quota_percent($query_used_domainquota, 'quota', '_total_quot_percent')) ), + 'transport' => pacol( $transp, $transp,$transp,'enum', 'transport' , 'pAdminEdit_domain_transport_text' , Config::read('transport_default') , /*options*/ Config::read('transport_options') ), 'backupmx' => pacol( $super, $super, 1, 'bool', 'pAdminEdit_domain_backupmx' , '' , 0), 'active' => pacol( $super, $super, 1, 'bool', 'active' , '' , 1 ), 'default_aliases' => pacol( $this->new, $this->new, 0, 'bool', 'pAdminCreate_domain_defaultaliases', '' , 1,'', /*not in db*/ 1 ), - 'created' => pacol( 0, 0, 1, 'ts', 'created' , '' ), - 'modified' => pacol( 0, 0, 1, 'ts', 'last_modified' , '' ), + 'created' => pacol( 0, 0, 0, 'ts', 'created' , '' ), + 'modified' => pacol( 0, 0, $super, 'ts', 'last_modified' , '' ), '_can_edit' => pacol( 0, 0, 1, 'int', '' , '' , 0 , /*options*/ '', /*not_in_db*/ 0, @@ -108,7 +131,7 @@ # various settings 'required_role' => 'admin', - 'listview' => 'list-domain.php', + 'listview' => 'list.php?table=domain', 'early_init' => 0, ); } Modified: trunk/templates/adminlistadmin.tpl =================================================================== --- trunk/templates/adminlistadmin.tpl 2015-02-28 22:30:21 UTC (rev 1744) +++ trunk/templates/adminlistadmin.tpl 2015-02-28 22:42:11 UTC (rev 1745) @@ -9,7 +9,7 @@ </tr> {foreach from=$admin_properties item=admin} {#tr_hilightoff#} - <td><a href="list-domain.php?username={$admin.username|escape:"url"}">{$admin.username}</a></td> + <td><a href="list.php?table=domain&username={$admin.username|escape:"url"}">{$admin.username}</a></td> <td> {if $admin.superadmin == 1} {$PALANG.super_admin} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2015-02-28 22:46:01
|
Revision: 1747 http://sourceforge.net/p/postfixadmin/code/1747 Author: christian_boltz Date: 2015-02-28 22:45:58 +0000 (Sat, 28 Feb 2015) Log Message: ----------- delete list-domain.php and its templates Removed Paths: ------------- trunk/list-domain.php trunk/templates/adminlistdomain.tpl trunk/templates/overview-get.tpl Deleted: trunk/list-domain.php =================================================================== --- trunk/list-domain.php 2015-02-28 22:44:51 UTC (rev 1746) +++ trunk/list-domain.php 2015-02-28 22:45:58 UTC (rev 1747) @@ -1,53 +0,0 @@ -<?php /** - * Postfix Admin - * - * LICENSE - * This source file is subject to the GPL license that is bundled with - * this package in the file LICENSE.TXT. - * - * Further details on the project are available at http://postfixadmin.sf.net - * - * @version $Id$ - * @license GNU GPL v2 or later. - * - * File: list-domain.php - * List all domains as a quick overview. - * - */ - -require_once('common.php'); - -authentication_require_role('admin'); - -# default: domain admin restrictions -$admin_username = authentication_get_username(); -$list_admins = array(authentication_get_username()); -$is_superadmin = 0; -$fUsername = ""; - -if (authentication_has_role('global-admin')) { # more permissions? Fine! - $list_admins = array_keys(list_admins()); - $is_superadmin = 1; - - $fUsername = safepost('fUsername', safeget('username', authentication_get_username())); # prefer POST over GET variable - if ($fUsername != "") { - $admin_username = $fUsername; - } -} - -$handler = new DomainHandler(0, $admin_username); -$handler->getList(''); -$domain_properties = $handler->result(); - -$smarty->assign ('domain_properties', $domain_properties); -$smarty->assign ('select_options', select_options($list_admins, array ($fUsername)), false); -if ($is_superadmin) { - $smarty->assign('smarty_template', 'adminlistdomain'); -} else { - $smarty->assign ('smarty_template', 'overview-get'); -} - -$smarty->display ('index.tpl'); - -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ -?> Deleted: trunk/templates/adminlistdomain.tpl =================================================================== --- trunk/templates/adminlistdomain.tpl 2015-02-28 22:44:51 UTC (rev 1746) +++ trunk/templates/adminlistdomain.tpl 2015-02-28 22:45:58 UTC (rev 1747) @@ -1,44 +0,0 @@ -<div id="overview"> -<form name="frmOverview" method="post" action=""> - <select name="fUsername" onchange="this.form.submit();"> - {$select_options} - </select> - <input class="button" type="submit" name="go" value="{$PALANG.go}" /> -</form> -{#form_search#} -</div> -{if $domain_properties} - <table id="admin_table"> - {#tr_header#} - <td>{$PALANG.domain}</td> - <td>{$PALANG.description}</td> - <td>{$PALANG.aliases}</td> - <td>{$PALANG.mailboxes}</td> - {if $CONF.quota==YES}<td>{$PALANG.pOverview_get_quota}</td>{/if} - {if $CONF.domain_quota==YES}<td>{$PALANG.pAdminList_domain_quota}</td>{/if} - {if $CONF.transport==YES}<td>{$PALANG.transport}</td>{/if} - <td>{$PALANG.pAdminList_domain_backupmx}</td> - <td>{$PALANG.last_modified}</td> - <td>{$PALANG.active}</td> - <td colspan="2"> </td> - </tr> -{foreach from=$domain_properties item=domain} - {#tr_hilightoff#} - <td><a href="{#url_list_virtual#}?domain={$domain.domain|escape:"url"}">{$domain.domain}</a></td> - <td>{$domain.description}</td> - <td>{$domain.alias_count} / {$domain.aliases}</td> - <td>{$domain.mailbox_count} / {$domain.mailboxes}</td> - {if $CONF.quota==YES}<td>{$domain.maxquota}</td>{/if} - {if $CONF.domain_quota===YES}<td>{$domain.total_quota} / {$domain.quota}</td>{/if} - {if $CONF.transport==YES}<td>{$domain.transport}</td>{/if} - <td>{$domain._backupmx}</td> - <td>{$domain.modified}</td> - <td><a href="{#url_editactive#}domain&id={$domain.domain|escape:"url"}&active={if ($domain.active==0)}1{else}0{/if}&token={$smarty.session.PFA_token|escape:"url"}">{$domain._active}</a></td> - <td><a href="{#url_edit_domain#}&edit={$domain.domain|escape:"url"}">{$PALANG.edit}</a></td> - <td><a href="{#url_delete#}?table=domain&delete={$domain.domain|escape:"url"}&token={$smarty.session.PFA_token|escape:"url"}" - onclick="return confirm ('{$PALANG.confirm_domain}{$PALANG.domain}: {$domain.domain}')">{$PALANG.del}</a></td> - </tr> -{/foreach} - </table> -{/if} -<br /><a href="{#url_edit_domain#}" class="button">{$PALANG.pAdminMenu_create_domain}</a><br /> Deleted: trunk/templates/overview-get.tpl =================================================================== --- trunk/templates/overview-get.tpl 2015-02-28 22:44:51 UTC (rev 1746) +++ trunk/templates/overview-get.tpl 2015-02-28 22:45:58 UTC (rev 1747) @@ -1,30 +0,0 @@ -<div id="overview"> -<form name="frmOverview" method="get" action=""> - <select name="domain" onchange="this.form.submit();"> - {$select_options} - </select> - <input class="button" type="submit" name="go" value="{$PALANG.go}" /> -</form> -{#form_search#} -</div> -<table id="overview_table"> - <tr> - <th colspan="5">{$PALANG.pOverview_title}</th> - </tr> - {#tr_header#} - <td>{$PALANG.domain}</td> - <td>{$PALANG.aliases}</td> - <td>{$PALANG.mailboxes}</td> - {if $CONF.quota===YES}<td>{$PALANG.pOverview_get_quota}</td>{/if} - {if $CONF.domain_quota===YES}<td>{$PALANG.pAdminList_domain_quota}</td>{/if} - </tr> -{foreach from=$domain_properties item=domain} - {#tr_hilightoff#} - <td><a href="{#url_list_virtual#}?domain={$domain.domain|escape:"url"}">{$domain.domain}</a></td> - <td>{$domain.alias_count} / {$domain.aliases}</td> - <td>{$domain.mailbox_count} / {$domain.mailboxes}</td> - {if $CONF.quota===YES}<td>{$domain.maxquota}</td>{/if} - {if $CONF.domain_quota===YES}<td>{$domain.total_quota} / {$domain.quota}</td>{/if} - </tr> -{/foreach} -</table> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2015-03-17 21:08:02
|
Revision: 1749 http://sourceforge.net/p/postfixadmin/code/1749 Author: christian_boltz Date: 2015-03-17 21:07:59 +0000 (Tue, 17 Mar 2015) Log Message: ----------- *Handler: - add $msg['confirm'] (confirmation message when attemping to delete an item, displayed by list.php) *.lang: - add various confirm_delete_* texts needed by *Handler - rename confirm_domain to confirm_delete_domain Modified Paths: -------------- trunk/languages/bg.lang trunk/languages/ca.lang trunk/languages/cn.lang trunk/languages/cs.lang trunk/languages/da.lang trunk/languages/de.lang trunk/languages/en.lang trunk/languages/es.lang trunk/languages/et.lang trunk/languages/eu.lang trunk/languages/fi.lang trunk/languages/fo.lang trunk/languages/fr.lang trunk/languages/hr.lang trunk/languages/hu.lang trunk/languages/is.lang trunk/languages/it.lang trunk/languages/ja.lang trunk/languages/lt.lang trunk/languages/mk.lang trunk/languages/nb.lang trunk/languages/nl.lang trunk/languages/nn.lang trunk/languages/pl.lang trunk/languages/pt-br.lang trunk/languages/ru.lang trunk/languages/sk.lang trunk/languages/sl.lang trunk/languages/sv.lang trunk/languages/tr.lang trunk/languages/tw.lang trunk/model/AdminHandler.php trunk/model/AdminpasswordHandler.php trunk/model/AliasHandler.php trunk/model/AliasdomainHandler.php trunk/model/DomainHandler.php trunk/model/MailboxHandler.php trunk/model/PFAHandler.php trunk/model/VacationHandler.php Modified: trunk/languages/bg.lang =================================================================== --- trunk/languages/bg.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/bg.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -14,7 +14,13 @@ $PALANG['cancel'] = 'Отказ'; $PALANG['save'] = 'Запази'; # XXX Text change: "Save" -> "Save Changes" $PALANG['confirm'] = 'Сигурни ли сте, че желаете да изтрието това?\n'; -$PALANG['confirm_domain'] = 'Наистина ли искате да изтриете всички записи за този домейн? Това действие е необратимо!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Наистина ли искате да изтриете всички записи за този домейн? Това действие е необратимо!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Check for update'; $PALANG['invalid_parameter'] = 'Невалиден параметър!'; # XXX @@ -202,6 +208,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Не мога да открия логовете!'; Modified: trunk/languages/ca.lang =================================================================== --- trunk/languages/ca.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/ca.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -13,7 +13,13 @@ $PALANG['cancel'] = 'Cancel'; # XXX $PALANG['save'] = 'Save changes'; # XXX $PALANG['confirm'] = '¿Segur que vols esborrar-lo?\n'; -$PALANG['confirm_domain'] = 'Estas segur que vols borrar tots els registres d\'aquest domini? Això no podrà ser desfet!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Estas segur que vols borrar tots els registres d\'aquest domini? Això no podrà ser desfet!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Check for update'; $PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX @@ -200,6 +206,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Imposible trobar els logs!'; Modified: trunk/languages/cn.lang =================================================================== --- trunk/languages/cn.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/cn.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -13,7 +13,13 @@ $PALANG['cancel'] = 'Cancel'; # XXX $PALANG['save'] = 'Save changes'; # XXX $PALANG['confirm'] = '是否确定删除?\n'; -$PALANG['confirm_domain'] = '你是否确定要删除该域中的所有记录? 删除后不可恢复!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = '你是否确定要删除该域中的所有记录? 删除后不可恢复!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = '检查新版本'; $PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX @@ -201,6 +207,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = '未找到相关的日志!'; Modified: trunk/languages/cs.lang =================================================================== --- trunk/languages/cs.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/cs.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -18,7 +18,13 @@ $PALANG['cancel'] = 'Zrušit'; $PALANG['save'] = 'Uložit změny'; $PALANG['confirm'] = 'Jste si jistí?\n'; -$PALANG['confirm_domain'] = 'Opravdu chcete smazat všechny záznamy v této doméně Tohle nelze vrátit!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Opravdu chcete smazat všechny záznamy v této doméně Tohle nelze vrátit!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'Nemáte oprávnění ke smazání! (%s)'; $PALANG['check_update'] = 'Zkontrolovat aktualizace'; $PALANG['invalid_parameter'] = 'Neplatný parametr!'; @@ -210,6 +216,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'změna administrátora'; $PALANG['pViewlog_action_delete_admin'] = 'smazat administrátora'; $PALANG['pViewlog_action_edit_vacation'] = 'změna zprávy o nepřítovmnosti'; +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Nepodařilo se najít záznamy!'; Modified: trunk/languages/da.lang =================================================================== --- trunk/languages/da.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/da.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -16,7 +16,13 @@ $PALANG['cancel'] = 'Annuller'; $PALANG['save'] = 'Gem'; # XXX Text change: "Save" -> "Save changes" $PALANG['confirm'] = 'Er du sikker på du vil slette dette?\n'; -$PALANG['confirm_domain'] = 'Vil du virkelig slette alle adresser for dette domæne? Dette kan ikke fortrydes!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Vil du virkelig slette alle adresser for dette domæne? Dette kan ikke fortrydes!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Søg efter opdateringer'; $PALANG['invalid_parameter'] = 'Ugyldig parameter.'; @@ -209,6 +215,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Loggen kan ikke findes.'; Modified: trunk/languages/de.lang =================================================================== --- trunk/languages/de.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/de.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -14,7 +14,13 @@ $PALANG['cancel'] = 'Abbrechen'; $PALANG['save'] = 'Änderungen speichern'; $PALANG['confirm'] = 'Sind Sie sicher dass Sie das löschen wollen?\n'; -$PALANG['confirm_domain'] = 'Wollen Sie wirklich alle Einträge dieser Domain löschen? Dies kann NICHT rückgängig gemacht werden!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Wollen Sie wirklich alle Einträge der Domain %s löschen? Dies kann NICHT rückgängig gemacht werden!'; +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Auf Updates überprüfen'; $PALANG['invalid_parameter'] = 'Ungültiger Parameter!'; @@ -206,6 +212,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'Admin ändern'; $PALANG['pViewlog_action_delete_admin'] = 'Admin löschen'; $PALANG['pViewlog_action_edit_vacation'] = 'Automatische Antwort ändern'; +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Kann keine Einträge finden!'; Modified: trunk/languages/en.lang =================================================================== --- trunk/languages/en.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/en.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -14,7 +14,13 @@ $PALANG['cancel'] = 'Cancel'; $PALANG['save'] = 'Save changes'; $PALANG['confirm'] = 'Are you sure you want to delete this?\n'; -$PALANG['confirm_domain'] = 'Do you really want to delete all records for this domain? This can not be undone!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; +$PALANG['confirm_delete_domain'] = 'Do you really want to delete all records for the domain %s? This can not be undone!'; +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; $PALANG['check_update'] = 'Check for update'; $PALANG['invalid_parameter'] = 'Invalid parameter!'; @@ -207,6 +213,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; $PALANG['pViewlog_result_error'] = 'Unable to find the logs!'; Modified: trunk/languages/es.lang =================================================================== --- trunk/languages/es.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/es.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -14,7 +14,13 @@ $PALANG['cancel'] = 'Cancelar'; $PALANG['save'] = 'Salvar'; # XXX Text change: "Save" -> "Save changes" $PALANG['confirm'] = '¿Está seguro de que desea borrarlo?\n'; -$PALANG['confirm_domain'] = '¿Está seguro de que desea borrar todos los registros de este dominio? ¡Esto no puede ser deshecho!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = '¿Está seguro de que desea borrar todos los registros de este dominio? ¡Esto no puede ser deshecho!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Check for update'; # XXX $PALANG['invalid_parameter'] = '¡Parámetro inválido!'; @@ -202,6 +208,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = '¡Imposible encontrar los logs!'; Modified: trunk/languages/et.lang =================================================================== --- trunk/languages/et.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/et.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -13,7 +13,13 @@ $PALANG['cancel'] = 'Cancel'; # XXX $PALANG['save'] = 'Save changes'; # XXX $PALANG['confirm'] = 'Oled kindel, et soovid seda kustutada?\n'; -$PALANG['confirm_domain'] = 'Oled tõesti kindel, et tahad kustutada kõik kirjed sellele domeenile? Seda tegevust ei saa tagasi võtta!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Oled tõesti kindel, et tahad kustutada kõik kirjed sellele domeenile? Seda tegevust ei saa tagasi võtta!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Check for update'; # XXX $PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX @@ -201,6 +207,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Logi ei leitud!'; Modified: trunk/languages/eu.lang =================================================================== --- trunk/languages/eu.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/eu.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -13,7 +13,13 @@ $PALANG['cancel'] = 'Cancel'; # XXX $PALANG['save'] = 'Save changes'; # XXX $PALANG['confirm'] = 'Ziur al zaude ezabatu nahi duzula?\n'; -$PALANG['confirm_domain'] = 'Ziur al zaude domeinu honetako erregistro guztiak ezbatu nahi dituzula? Hau ezin izango da desegin!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Ziur al zaude domeinu honetako erregistro guztiak ezbatu nahi dituzula? Hau ezin izango da desegin!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Check for update'; $PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX @@ -199,6 +205,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Ezinezkoa logak aurkitzea!'; Modified: trunk/languages/fi.lang =================================================================== --- trunk/languages/fi.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/fi.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -14,7 +14,13 @@ $PALANG['cancel'] = 'Peruuta'; $PALANG['save'] = 'Tallenna'; # XXX Text change: "Save" -> "Save changes" $PALANG['confirm'] = 'Oletko varma että haluat poistaa tämän?\n'; -$PALANG['confirm_domain'] = 'Oletko varma että haluat poistaa kaikki tietueet tästä domainista? Tätä komentoa ei voi perua!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Oletko varma että haluat poistaa kaikki tietueet tästä domainista? Tätä komentoa ei voi perua!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Tarkista päivitykset'; $PALANG['invalid_parameter'] = 'Viallinen parametri!'; @@ -201,6 +207,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Lokeja ei löydy!'; Modified: trunk/languages/fo.lang =================================================================== --- trunk/languages/fo.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/fo.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -13,7 +13,13 @@ $PALANG['cancel'] = 'Cancel'; # XXX $PALANG['save'] = 'Save changes'; # XXX $PALANG['confirm'] = 'Ert tú vís(ur) í at tú vilt strika hetta?\n'; -$PALANG['confirm_domain'] = 'Vilt tú veruliga strika allar upplýsingar fyri hetta navnaøki? Her kann ikki vendast aftur!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Vilt tú veruliga strika allar upplýsingar fyri hetta navnaøki? Her kann ikki vendast aftur!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Check for update'; # XXX $PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX @@ -201,6 +207,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Finni ikki loggarnar!'; Modified: trunk/languages/fr.lang =================================================================== --- trunk/languages/fr.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/fr.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -15,7 +15,13 @@ $PALANG['cancel'] = 'Annuler'; $PALANG['save'] = 'Enregistrer les modifications'; $PALANG['confirm'] = 'Etes vous sur de vouloir supprimer cet enregistrement\n'; -$PALANG['confirm_domain'] = 'Etes-vous sur de vouloir effacer tous les enregistrements dans ce domaine ? Cette opération ne pourra pas être annulée.\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Etes-vous sur de vouloir effacer tous les enregistrements dans ce domaine ? Cette opération ne pourra pas être annulée.\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Vérifier les mises à jour'; $PALANG['invalid_parameter'] = 'Paramètres invalides!'; @@ -202,6 +208,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'modifier un admin'; $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'modifier le répondeur'; +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Impossible de trouver le journal des événements!'; Modified: trunk/languages/hr.lang =================================================================== --- trunk/languages/hr.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/hr.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -12,7 +12,13 @@ $PALANG['cancel'] = 'Cancel'; # XXX $PALANG['save'] = 'Save changes'; # XXX $PALANG['confirm'] = 'Da li ste sigurni da elite ovo pobrisati?\n'; -$PALANG['confirm_domain'] = 'Da li ste sigurni da elite pobrisati sve zapise za tu domenu? Zapisi ce biti zauvijek pobrisani!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Da li ste sigurni da elite pobrisati sve zapise za tu domenu? Zapisi ce biti zauvijek pobrisani!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Provjeri da li postoji novija inačica'; $PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX @@ -200,6 +206,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Zapise nije bilo moguče naći!'; Modified: trunk/languages/hu.lang =================================================================== --- trunk/languages/hu.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/hu.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -13,7 +13,13 @@ $PALANG['cancel'] = 'Cancel'; # XXX $PALANG['save'] = 'Save changes'; # XXX $PALANG['confirm'] = 'Biztos vagy benne hogy törlöd ezt?\n'; -$PALANG['confirm_domain'] = 'Biztos hogy törölni akarod az összes bejegyzést ez alól a domain alól? Nem lehet visszahozni késõbb!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Biztos hogy törölni akarod az összes bejegyzést ez alól a domain alól? Nem lehet visszahozni késõbb!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Check for update'; # XXX $PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX @@ -206,6 +212,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Nemsikerült megtalálni a napló fájlokat!'; Modified: trunk/languages/is.lang =================================================================== --- trunk/languages/is.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/is.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -13,7 +13,13 @@ $PALANG['cancel'] = 'Cancel'; # XXX $PALANG['save'] = 'Save changes'; # XXX $PALANG['confirm'] = 'Ertu viss um að þú viljir eyða þessu?\n'; -$PALANG['confirm_domain'] = 'Ertu viss um að þú viljir eyða öllu sem tengist þessu léni? Það er ekki hægt að bakka með aðgerðina!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Ertu viss um að þú viljir eyða öllu sem tengist þessu léni? Það er ekki hægt að bakka með aðgerðina!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Check for update'; # XXX $PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX @@ -201,6 +207,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Get ekki fundið log skráningu!'; Modified: trunk/languages/it.lang =================================================================== --- trunk/languages/it.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/it.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -14,7 +14,13 @@ $PALANG['cancel'] = 'Annulla'; $PALANG['save'] = 'registra'; # XXX Text change: "Save" -> "Save changes" $PALANG['confirm'] = 'Sei certo di volerlo cancellare?\n'; -$PALANG['confirm_domain'] = 'Sei sicuro di voler cancellare tutti gli indirizzi di questo dominio? Questa modifica sarà permanente!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Sei sicuro di voler cancellare tutti gli indirizzi di questo dominio? Questa modifica sarà permanente!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Verifica gli aggiornamenti'; $PALANG['invalid_parameter'] = 'Parametro non valido!'; @@ -202,6 +208,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Impossibile trovare i file di log!'; Modified: trunk/languages/ja.lang =================================================================== --- trunk/languages/ja.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/ja.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -14,7 +14,13 @@ $PALANG['cancel'] = 'キャンセル'; $PALANG['save'] = '変更を保存'; $PALANG['confirm'] = '本当に削除してもよろしいですか?\n'; -$PALANG['confirm_domain'] = '本当にこのドメインのすべての情報を削除してもよろしいですか?これを元に戻すことはできません。\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = '本当にこのドメインのすべての情報を削除してもよろしいですか?これを元に戻すことはできません。\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = '更新の確認'; $PALANG['invalid_parameter'] = '無効なパラメータです。'; @@ -206,6 +212,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'ログが見つかりません!'; Modified: trunk/languages/lt.lang =================================================================== --- trunk/languages/lt.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/lt.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -13,7 +13,13 @@ $PALANG['cancel'] = 'Atšaukti'; $PALANG['save'] = 'Išsaugoti'; $PALANG['confirm'] = 'Tikrai norite šalinti?\n'; -$PALANG['confirm_domain'] = 'Tikrai norite šalinti visus šios srities įrašus? Operacija negrįžtama!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Tikrai norite šalinti visus šios srities įrašus? Operacija negrįžtama!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Patikrinti versiją'; $PALANG['invalid_parameter'] = 'Neteisingas parametras!'; @@ -202,6 +208,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'pakeistas adminas'; $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'pakeistas atostogų nust.'; +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Įvykių žurnalas nerastas!'; Modified: trunk/languages/mk.lang =================================================================== --- trunk/languages/mk.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/mk.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -13,7 +13,13 @@ $PALANG['cancel'] = 'Cancel'; # XXX $PALANG['save'] = 'Save changes'; # XXX $PALANG['confirm'] = 'Дали сте сигурни дека сакате да го избришете ова?\n'; -$PALANG['confirm_domain'] = 'Дали сакате да ги избришете сите записи од овој домен? Ова не може да се поправи покасно!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Дали сакате да ги избришете сите записи од овој домен? Ова не може да се поправи покасно!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Check for update'; # XXX $PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX @@ -201,6 +207,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Не можам да ги пронајдам записите!'; Modified: trunk/languages/nb.lang =================================================================== --- trunk/languages/nb.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/nb.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -15,7 +15,13 @@ $PALANG['cancel'] = 'Avbryt'; $PALANG['save'] = 'Lagre'; # XXX Text change: "Save" -> "Save changes" $PALANG['confirm'] = 'Er du sikker på at du ønsker å slette dette?\n'; -$PALANG['confirm_domain'] = 'Ønsker du virkelig å slette alle oppføringer for dette domenet? Dette kan ikke angres!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Ønsker du virkelig å slette alle oppføringer for dette domenet? Dette kan ikke angres!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Se etter oppdatering'; $PALANG['invalid_parameter'] = 'Ugyldig parameter!'; @@ -202,6 +208,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Finner ikke den aktuelle loggen!'; Modified: trunk/languages/nl.lang =================================================================== --- trunk/languages/nl.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/nl.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -14,7 +14,13 @@ $PALANG['cancel'] = 'Annuleren'; $PALANG['save'] = 'Wijzigingen opslaan'; $PALANG['confirm'] = 'Weet u het zeker dat u wilt verwijderen?\n'; -$PALANG['confirm_domain'] = 'Weet u zeker dat u ALLE data van het domein wilt verwijderen? Dit kan niet ongedaan worden gemaakt!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Weet u zeker dat u ALLE data van het domein wilt verwijderen? Dit kan niet ongedaan worden gemaakt!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Zoeken naar nieuwe versie'; $PALANG['invalid_parameter'] = 'ongeldige parameter!'; @@ -203,6 +209,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Mislukt om de logs te vinden!'; Modified: trunk/languages/nn.lang =================================================================== --- trunk/languages/nn.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/nn.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -13,7 +13,13 @@ $PALANG['cancel'] = 'Cancel'; # XXX $PALANG['save'] = 'Save changes'; # XXX $PALANG['confirm'] = 'Vil du slette dette?\n'; -$PALANG['confirm_domain'] = 'Vil du virkelig slette alle poster og domenet?\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Vil du virkelig slette alle poster og domenet?\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Se etter oppdatering'; $PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX @@ -200,6 +206,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Fant ikke loggen!'; Modified: trunk/languages/pl.lang =================================================================== --- trunk/languages/pl.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/pl.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -16,7 +16,13 @@ $PALANG['cancel'] = 'Anuluj'; $PALANG['save'] = 'Zapisz'; # XXX Text change: "Save" -> "Save changes" $PALANG['confirm'] = 'Jesteś przekonany, że chcesz to usunąć?\n'; -$PALANG['confirm_domain'] = 'Czy rzeczywiście chcesz usunąć wszystkie wpisy dla tej domeny? To jest proces nieodwracalny!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Czy rzeczywiście chcesz usunąć wszystkie wpisy dla tej domeny? To jest proces nieodwracalny!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Sprawdź aktualizację'; $PALANG['invalid_parameter'] = 'Błędny parametr!'; @@ -204,6 +210,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Nie można odszukać logów!'; Modified: trunk/languages/pt-br.lang =================================================================== --- trunk/languages/pt-br.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/pt-br.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -14,7 +14,13 @@ $PALANG['cancel'] = 'Cancelar'; $PALANG['save'] = 'Gravar'; # XXX Text change: "Save" -> "Save changes" $PALANG['confirm'] = 'Tem certeza de que deseja remover?\n'; -$PALANG['confirm_domain'] = 'Tem certeza de que deseja remover todos os registros deste domínio? Essa ação não pode ser desfeita!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Tem certeza de que deseja remover todos os registros deste domínio? Essa ação não pode ser desfeita!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Checar por atualização'; $PALANG['invalid_parameter'] = 'Parâmetro inválido!'; @@ -208,6 +214,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Não foi possível encontrar o histórico!'; Modified: trunk/languages/ru.lang =================================================================== --- trunk/languages/ru.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/ru.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -15,7 +15,13 @@ $PALANG['cancel'] = 'Отменить'; $PALANG['save'] = 'Сохранить изменения'; $PALANG['confirm'] = 'Вы уверены, что хотите удалить это?\n'; -$PALANG['confirm_domain'] = 'Вы действительно хотите удалить все настройки для домена? Это действие нельзя будет отменить!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Вы действительно хотите удалить все настройки для домена? Это действие нельзя будет отменить!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Проверить обновление'; $PALANG['invalid_parameter'] = 'Некорректный параметр!'; @@ -208,6 +214,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Невозможно найти журнал!'; Modified: trunk/languages/sk.lang =================================================================== --- trunk/languages/sk.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/sk.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -14,7 +14,13 @@ $PALANG['cancel'] = 'Zrušiť'; $PALANG['save'] = 'Uložiť'; # XXX Text change: "Save" -> "Save changes" $PALANG['confirm'] = 'Ste si istí?\n'; -$PALANG['confirm_domain'] = 'Naozaj chcete zmazať všetky záznamy v tejto doméne? Toto nie je možné vrátiť!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Naozaj chcete zmazať všetky záznamy v tejto doméne? Toto nie je možné vrátiť!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Skontrolovať aktualizácie'; $PALANG['invalid_parameter'] = 'Neplatný parameter!'; @@ -202,6 +208,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Nepodarilo sa nájsť záznamy!'; Modified: trunk/languages/sl.lang =================================================================== --- trunk/languages/sl.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/sl.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -13,7 +13,13 @@ $PALANG['cancel'] = 'Cancel'; # XXX $PALANG['save'] = 'Save'; # XXX # XXX Text change: "Save" -> "Save changes" $PALANG['confirm'] = 'Ali ste prepričani, da želite brisati?\n'; -$PALANG['confirm_domain'] = 'Ali ste prepričani, da želite brisati vse zapise za to domeno? Zapisi bodo izgubljeni za vedno!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Ali ste prepričani, da želite brisati vse zapise za to domeno? Zapisi bodo izgubljeni za vedno!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Preveri, če obstaja novejša različica'; $PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX @@ -201,6 +207,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Dnevnikov ni bilo mogoče najti!'; Modified: trunk/languages/sv.lang =================================================================== --- trunk/languages/sv.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/sv.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -15,7 +15,13 @@ $PALANG['cancel'] = 'Avbryt'; $PALANG['save'] = 'Spara'; # XXX Text change: "Save" -> "Save changes" $PALANG['confirm'] = 'Är du säker på att du vill radera denna?\n'; -$PALANG['confirm_domain'] = 'Vill du verkligen radera all data för denna domän? Kan ej ångras!\n'; +$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX +$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX +$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX +$PALANG['confirm_delete_domain'] = 'Vill du verkligen radera all data för denna domän? Kan ej ångras!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX +$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX +$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = 'Senaste versionen?'; $PALANG['invalid_parameter'] = 'Felaktig parameter!'; @@ -203,6 +209,9 @@ $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX $PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX +$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX +$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX $PALANG['pViewlog_result_error'] = 'Kan inte hitta loggarna!'; Modified: trunk/languages/tr.lang =================================================================== --- trunk/languages/tr.lang 2015-03-15 00:38:23 UTC (rev 1748) +++ trunk/languages/tr.lang 2015-03-17 21:07:59 UTC (rev 1749) @@ -13,7 +13,13 @@ $PALANG['cancel'] = 'Cancel'; # XXX $PALANG['save'] = 'Save changes'; # XXX $PALANG['confirm'] = 'Bunu silmek istediðinizden emin misiniz?\n'; -$PALANG['confirm_domain'] = 'Bu domain için tüm kayýtlarý silmek istediðinizden emin misiniz? Bu iþlem geri alýnamaz!\n'; +$PALAN... [truncated message content] |
From: <chr...@us...> - 2015-03-17 21:19:44
|
Revision: 1750 http://sourceforge.net/p/postfixadmin/code/1750 Author: christian_boltz Date: 2015-03-17 21:19:36 +0000 (Tue, 17 Mar 2015) Log Message: ----------- PFAHandler, editform.tpl: - add support for 'b64p' fields (passwords stored base64-encoded) as preparation to migrate fetchmail.php to FetchmailHandler Modified Paths: -------------- trunk/model/PFAHandler.php trunk/templates/editform.tpl Modified: trunk/model/PFAHandler.php =================================================================== --- trunk/model/PFAHandler.php 2015-03-17 21:07:59 UTC (rev 1749) +++ trunk/model/PFAHandler.php 2015-03-17 21:19:36 UTC (rev 1750) @@ -218,6 +218,7 @@ * text one line of text * *vtxt "virtual" line of text, coming from JOINs etc. * pass password (will be encrypted with pacrypt()) + * b64p password (will be stored with base64_encode()) * num number * txtl text "list" - array of one line texts * *vnum "virtual" number, coming from JOINs etc. @@ -228,7 +229,7 @@ * list like enum, but allow multiple selections * *quot used / total quota ("5 / 10") - for field "quotausage", there must also be a "_quotausage_percent" (type vnum) * You can use custom types, but you'll have to add handling for them in *Handler and the smarty templates - * + * * Field types marked with * will automatically be skipped in store(). * * All database tables should have a 'created' and a 'modified' column. @@ -398,7 +399,12 @@ } } else { # field is editable if (isset($values[$key])) { - if ($row['type'] != "pass" || strlen($values[$key]) > 0 || $this->new == 1 || $this->skip_empty_pass != true) { # skip on empty (aka unchanged) password on edit + if ( + ($row['type'] != "pass" && $row['type'] != 'b64p') || # field type is NOT 'pass' or 'b64p' - or - + strlen($values[$key]) > 0 || # new value is not empty - or - + $this->new == 1 || # create mode - or - + $this->skip_empty_pass != true # skip on empty (aka unchanged) password on edit + ) { # TODO: do not skip "password2" if "password" is filled, but "password2" is empty $valid = true; # trust input unless validator objects @@ -474,6 +480,9 @@ case 'pass': $db_values[$key] = pacrypt($db_values[$key]); break; + case 'b64p': + $db_values[$key] = base64_encode($db_values[$key]); + break; case 'quot': case 'vnum': case 'vtxt': @@ -549,8 +558,10 @@ if (db_pgsql()) { $formatted_date = "TO_DATE(text(###KEY###), '" . escape_string(Config::Lang('dateformat_pgsql')) . "')"; + $base64_decode = "DECODE(###KEY###, 'base64')"; } else { $formatted_date = "DATE_FORMAT(###KEY###, '" . escape_string(Config::Lang('dateformat_mysql')) . "')"; + $base64_decode = "FROM_BASE64(###KEY###)"; } $colformat = array( @@ -559,6 +570,7 @@ # 'bool' fields are always returned as 0/1, additonally _$field contains yes/no (already translated) 'bool' => "CASE ###KEY### WHEN '" . db_get_boolean(true) . "' THEN '1' WHEN '" . db_get_boolean(false) . "' THEN '0' END as ###KEY###," . "CASE ###KEY### WHEN '" . db_get_boolean(true) . "' THEN '$yes' WHEN '" . db_get_boolean(false) . "' THEN '$no' END as _###KEY###", + 'b64p' => "$base64_decode AS ###KEY###", ); # get list of fields to display Modified: trunk/templates/editform.tpl =================================================================== --- trunk/templates/editform.tpl 2015-03-17 21:07:59 UTC (rev 1749) +++ trunk/templates/editform.tpl 2015-03-17 21:19:36 UTC (rev 1750) @@ -45,7 +45,7 @@ {html_checkboxes name="value[{$key}]" output=$struct.{$key}.options values=$struct.{$key}.options selected=$value_{$key} separator="<br />"} </div> --> - {elseif $field.type == 'pass'} + {elseif $field.type == 'pass' || $field.type == 'b64p'} <input class="flat" type="password" name="value[{$key}]" /> {elseif $field.type == 'txtl'} <textarea class="flat" rows="10" cols="35" name="value[{$key}]">{foreach key=key2 item=field2 from=$value_{$key}}{$field2} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2015-03-17 22:37:42
|
Revision: 1754 http://sourceforge.net/p/postfixadmin/code/1754 Author: christian_boltz Date: 2015-03-17 22:37:34 +0000 (Tue, 17 Mar 2015) Log Message: ----------- delete list-admin.php and its template, use list.php instead Modified Paths: -------------- trunk/configs/menu.conf trunk/model/AdminHandler.php Removed Paths: ------------- trunk/list-admin.php trunk/templates/adminlistadmin.tpl Modified: trunk/configs/menu.conf =================================================================== --- trunk/configs/menu.conf 2015-03-17 22:30:47 UTC (rev 1753) +++ trunk/configs/menu.conf 2015-03-17 22:37:34 UTC (rev 1754) @@ -1,7 +1,7 @@ url_main = main.php url_editactive = editactive.php?table= # list_admin -url_list_admin = list-admin.php +url_list_admin = list.php?table=admin url_create_admin = edit.php?table=admin # list-domain url_list_domain = list.php?table=domain Deleted: trunk/list-admin.php =================================================================== --- trunk/list-admin.php 2015-03-17 22:30:47 UTC (rev 1753) +++ trunk/list-admin.php 2015-03-17 22:37:34 UTC (rev 1754) @@ -1,34 +0,0 @@ -<?php -/** - * Postfix Admin - * - * LICENSE - * This source file is subject to the GPL license that is bundled with - * this package in the file LICENSE.TXT. - * - * Further details on the project are available at http://postfixadmin.sf.net - * - * @version $Id$ - * @license GNU GPL v2 or later. - * - * File: list-admin.php - * Lists all administrators - * Template File: list-admin.tpl - * - * Template Variables: -none- - * - * Form POST \ GET Variables: -none- - */ - -require_once("common.php"); - -authentication_require_role('global-admin'); - -$admin_properties = list_admins(); - -$smarty->assign ('admin_properties', $admin_properties); -$smarty->assign ('smarty_template', 'adminlistadmin'); -$smarty->display ('index.tpl'); - -/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ -?> Modified: trunk/model/AdminHandler.php =================================================================== --- trunk/model/AdminHandler.php 2015-03-17 22:30:47 UTC (rev 1753) +++ trunk/model/AdminHandler.php 2015-03-17 22:37:34 UTC (rev 1754) @@ -104,7 +104,7 @@ # various settings 'required_role' => 'global-admin', - 'listview' => 'list-admin.php', + 'listview' => 'list.php?table=admin', 'early_init' => 0, ); } Deleted: trunk/templates/adminlistadmin.tpl =================================================================== --- trunk/templates/adminlistadmin.tpl 2015-03-17 22:30:47 UTC (rev 1753) +++ trunk/templates/adminlistadmin.tpl 2015-03-17 22:37:34 UTC (rev 1754) @@ -1,29 +0,0 @@ -{if $admin_properties} - <table id="admin_table"> - {#tr_header#} - <td>{$PALANG.admin}</td> - <td>{$PALANG.pAdminList_admin_count}</td> - <td>{$PALANG.last_modified}</td> - <td>{$PALANG.active}</td> - <td colspan="2"> </td> - </tr> -{foreach from=$admin_properties item=admin} - {#tr_hilightoff#} - <td><a href="list.php?table=domain&username={$admin.username|escape:"url"}">{$admin.username}</a></td> - <td> - {if $admin.superadmin == 1} - {$PALANG.super_admin} - {else} - {$admin.domain_count} - {/if} - </td> - <td>{$admin.modified}</td> - <td><a href="{#url_editactive#}admin&id={$admin.username|escape:"url"}&active={if ($admin.active==0)}1{else}0{/if}&token={$smarty.session.PFA_token|escape:"url"}">{$admin._active}</a></td> - <td><a href="{#url_edit_admin#}&edit={$admin.username|escape:"url"}">{$PALANG.edit}</a></td> - <td><a href="{#url_delete#}?table=admin&delete={$admin.username|escape:"url"}&token={$smarty.session.PFA_token|escape:"url"}" - onclick="return confirm ('{$PALANG.confirm}{$PALANG.admin}: {$admin.username}');">{$PALANG.del}</a></td> - </tr> -{/foreach} - </table> - <br /><a href="{#url_create_admin#}" class="button">{$PALANG.pAdminMenu_create_admin}</a><br /> -{/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2015-03-19 22:57:30
|
Revision: 1757 http://sourceforge.net/p/postfixadmin/code/1757 Author: christian_boltz Date: 2015-03-19 22:57:23 +0000 (Thu, 19 Mar 2015) Log Message: ----------- PFAHandler.php: - add getPagebrowser() (returns an array of pagebrowser keys) AliasHandler.php: - change getList() to work with empty $condition - add getPagebrowser() to filter out mailboxes list-virtual.php: - replace $alias_pagebrowser_query and the create_page_browser() call with $handler->getPagebrowser() Modified Paths: -------------- trunk/list-virtual.php trunk/model/AliasHandler.php trunk/model/PFAHandler.php Modified: trunk/list-virtual.php =================================================================== --- trunk/list-virtual.php 2015-03-19 22:05:49 UTC (rev 1756) +++ trunk/list-virtual.php 2015-03-19 22:57:23 UTC (rev 1757) @@ -119,14 +119,9 @@ $sql_domain = db_in_clause("$table_alias.domain", $list_domains); } -$alias_pagebrowser_query = " - FROM $table_alias - WHERE $sql_domain AND NOT EXISTS(SELECT 1 FROM $table_mailbox WHERE username=$table_alias.address) AND ( $list_param ) - ORDER BY address -"; - $handler = new AliasHandler(0, $admin_username); $handler->getList($list_param, array(), $page_size, $fDisplay); +$pagebrowser_alias = $handler->getPagebrowser($list_param, array()); $tAlias = $handler->result(); @@ -397,7 +392,7 @@ } } -$pagebrowser_alias = create_page_browser("$table_alias.address", $alias_pagebrowser_query); + $nav_bar_alias = new cNav_bar ($PALANG['pOverview_alias_title'], $fDisplay, $CONF['page_size'], $pagebrowser_alias, $search); $nav_bar_alias->url = '&domain='.$fDomain; Modified: trunk/model/AliasHandler.php =================================================================== --- trunk/model/AliasHandler.php 2015-03-19 22:05:49 UTC (rev 1756) +++ trunk/model/AliasHandler.php 2015-03-19 22:57:23 UTC (rev 1757) @@ -292,9 +292,23 @@ public function getList($condition, $searchmode = array(), $limit=-1, $offset=-1) { # only list aliases that do not belong to mailboxes # TODO: breaks if $condition is an array - return parent::getList( "__mailbox_username IS NULL AND ( $condition )", $searchmode, $limit, $offset); + if ($condition != '') { + $condition = " AND ( $condition ) "; + } + return parent::getList( "__mailbox_username IS NULL $condition", $searchmode, $limit, $offset); } + public function getPagebrowser($condition, $searchmode = array()) { + # only list aliases that do not belong to mailboxes + # TODO: breaks if $condition is an array + if ($condition != '') { + $condition = " AND ( $condition ) "; + } + return parent::getPagebrowser( "__mailbox_username IS NULL $condition", $searchmode); + } + + + protected function _validate_goto($field, $val) { if (count($val) == 0) { # empty is ok for mailboxes - this is checked in setmore() which can clear the error message Modified: trunk/model/PFAHandler.php =================================================================== --- trunk/model/PFAHandler.php 2015-03-19 22:05:49 UTC (rev 1756) +++ trunk/model/PFAHandler.php 2015-03-19 22:57:23 UTC (rev 1757) @@ -613,6 +613,18 @@ } /** + * getPagebrowser + * + * @param array or string condition (see build_select_query() for details) + * @param array searchmode - (see build_select_query() for details) + * @return array - pagebrowser keys ("aa-cz", "de-pf", ...) + */ + public function getPagebrowser($condition, $searchmode) { + $queryparts = $this->build_select_query($condition, $searchmode); + return create_page_browser($this->label_field, $queryparts['from_where_order']); + } + + /** * read_from_db * * reads all fields specified in $this->struct from the database This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2015-04-04 13:58:44
|
Revision: 1762 http://sourceforge.net/p/postfixadmin/code/1762 Author: christian_boltz Date: 2015-04-04 13:58:42 +0000 (Sat, 04 Apr 2015) Log Message: ----------- Add FetchmailHandler.php - uses list.php and edit.php instead of the fetchmail-specific template - replaces fetchmail.php and its template config.inc.php: - add $CONF['fetchmail_struct_hook'] Modified Paths: -------------- trunk/config.inc.php Added Paths: ----------- trunk/model/FetchmailHandler.php Modified: trunk/config.inc.php =================================================================== --- trunk/config.inc.php 2015-04-04 13:55:54 UTC (rev 1761) +++ trunk/config.inc.php 2015-04-04 13:58:42 UTC (rev 1762) @@ -271,6 +271,7 @@ $CONF['alias_struct_hook'] = ''; $CONF['mailbox_struct_hook'] = ''; $CONF['alias_domain_struct_hook'] = ''; +$CONF['fetchmail_struct_hook'] = ''; // Default Domain Values Added: trunk/model/FetchmailHandler.php =================================================================== --- trunk/model/FetchmailHandler.php (rev 0) +++ trunk/model/FetchmailHandler.php 2015-04-04 13:58:42 UTC (rev 1762) @@ -0,0 +1,181 @@ +<?php +# $Id$ + +/** + * Handler for fetchmail jobs + */ +class FetchmailHandler extends PFAHandler { + + protected $db_table = 'fetchmail'; + protected $id_field = 'id'; + protected $domain_field = 'domain'; + protected $order_by = 'domain, mailbox'; + + + protected function initStruct() { + $src_auth_options = array('password','kerberos_v5','kerberos','kerberos_v4','gssapi','cram-md5','otp','ntlm','msn','ssh','any'); + $src_protocol_options = array('POP3','IMAP','POP2','ETRN','AUTO'); + + $extra = Config::intbool('fetchmail_extra_options'); + + $this->struct=array( + # field name allow display in... type $PALANG label $PALANG description default / options / ... + # editing? form list + 'id' => pacol( 0, 0, 1, 'num' , '' , '' ), + 'domain' => pacol( 0, 0, 1, 'text', '' , '' ), + 'mailbox' => pacol( 1, 1, 1, 'enum', 'pFetchmail_field_mailbox' , 'pFetchmail_desc_mailbox' ), # mailbox list + 'src_server' => pacol( 1, 1, 1, 'text', 'pFetchmail_field_src_server' , 'pFetchmail_desc_src_server' ), + 'src_auth' => pacol( 1, 1, 1, 'enum', 'pFetchmail_field_src_auth' , 'pFetchmail_desc_src_auth' , '', $src_auth_options), + 'src_user' => pacol( 1, 1, 1, 'text', 'pFetchmail_field_src_user' , 'pFetchmail_desc_src_user' ), + 'src_password' => pacol( 1, 1, 0, 'b64p', 'pFetchmail_field_src_password' , 'pFetchmail_desc_src_password' ), + 'src_folder' => pacol( 1, 1, 1, 'text', 'pFetchmail_field_src_folder' , 'pFetchmail_desc_src_folder' ), + 'poll_time' => pacol( 1, 1, 1, 'num' , 'pFetchmail_field_poll_time' , 'pFetchmail_desc_poll_time' , 10 ), + 'fetchall' => pacol( 1, 1, 1, 'bool', 'pFetchmail_field_fetchall' , 'pFetchmail_desc_fetchall' ), + 'keep' => pacol( 1, 1, 1, 'bool', 'pFetchmail_field_keep' , 'pFetchmail_desc_keep' ), + 'protocol' => pacol( 1, 1, 1, 'enum', 'pFetchmail_field_protocol' , 'pFetchmail_desc_protocol' , '', $src_protocol_options), + 'usessl' => pacol( 1, 1, 1, 'bool', 'pFetchmail_field_usessl' , 'pFetchmail_desc_usessl' ), + 'sslcertck' => pacol( 1, 1, 1, 'bool', 'pFetchmail_field_sslcertck' , '' ), + 'sslcertpath' => pacol( $extra, $extra, $extra, 'text', 'pFetchmail_field_sslcertpath' , '' ), + 'sslfingerprint'=> pacol( $extra, $extra, $extra, 'text', 'pFetchmail_field_sslfingerprint','' ), + 'extra_options' => pacol( $extra, $extra, $extra, 'text', 'pFetchmail_field_extra_options', 'pFetchmail_desc_extra_options' ), + 'mda' => pacol( $extra, $extra, $extra, 'text', 'pFetchmail_field_mda' , 'pFetchmail_desc_mda' ), + 'date' => pacol( 0, 0, 1, 'text', 'pFetchmail_field_date' , 'pFetchmail_desc_date' , 1 ), + 'returned_text' => pacol( 0, 0, 1, 'text', 'pFetchmail_field_returned_text', 'pFetchmail_desc_returned_text' ), + 'active' => pacol( 1, 1, 1, 'bool', 'active' , '' , 1 ), + 'created' => pacol( 0, 0, 0, 'ts', 'created' , '' ), + 'modified' => pacol( 0, 0, 1, 'ts', 'last_modified' , '' ), + ); + + # get list of mailboxes (for currently logged in user) + $handler = new MailboxHandler(0, $this->admin_username); + $handler->getList('1=1'); + $this->struct['mailbox']['options'] = array_keys($handler->result); + } + + protected function initMsg() { + $this->msg['error_already_exists'] = 'fetchmail_already_exists'; + $this->msg['error_does_not_exist'] = 'fetchmail_does_not_exist'; + $this->msg['confirm_delete'] = 'confirm_delete_fetchmail'; + + if ($this->new) { + $this->msg['logname'] = 'create_fetchmail'; + $this->msg['store_error'] = 'pFetchmail_database_save_error'; + $this->msg['successmessage'] = 'pFetchmail_database_save_success'; + } else { + $this->msg['logname'] = 'edit_fetchmail'; + $this->msg['store_error'] = 'pFetchmail_database_save_error'; + $this->msg['successmessage'] = 'pFetchmail_database_save_success'; + } + } + + public function webformConfig() { + return array( + # $PALANG labels + 'formtitle_create' => 'pMenu_fetchmail', + 'formtitle_edit' => 'pMenu_fetchmail', + 'create_button' => 'pFetchmail_new_entry', + + # various settings + 'required_role' => 'admin', + 'listview' => 'list.php?table=fetchmail', + 'early_init' => 0, + 'prefill' => array('mailbox'), + ); + } + + protected function domain_from_id() { + # do nothing, setmore() does the work + } + + protected function setmore($values) { + # set domain based on the target mailbox + if ($this->new || isset($values['mailbox']) ) { + list(/*NULL*/,$domain) = explode('@', $values['mailbox']); + $this->values['domain'] = $domain; + $this->domain = $domain; + } + } + + protected function validate_new_id() { + # auto_increment - any non-empty ID is an error + if ($this->id != '') { + $this->errormsg[$this->id_field] = 'auto_increment value, you must pass an empty string!'; + return false; + } + + return true; + } + + + + /** + * @return true on success false on failure + */ + public function delete() { + if ( ! $this->view() ) { + $this->errormsg[] = Config::lang($this->msg['error_does_not_exist']); + return false; + } + + db_delete($this->db_table, $this->id_field, $this->id); + + db_log ($this->id, 'delete_fetchmail', $this->result['id']); + $this->infomsg[] = Config::Lang_f('pDelete_delete_success', $this->result['src_user'] . ' -> ' . $this->result['mailbox']); + + return true; + } + + + /* + * validate src_server - must be non-empty and survive check_domain() + */ + protected function _validate_src_server($field, $val) { + if ($val == '') { + $msg = Config::Lang('pFetchmail_server_missing'); + } else { + $msg = check_domain($val); + } + + if ($msg == '') { + return true; + } else { + $this->errormsg[$field] = $msg; + return false; + } + } + + /* + * validate src_user and src_password - must be non-empty + * (we can't assume anything about valid usernames and passwords on remote + * servers, so the validation can't be more strict) + */ + protected function _validate_src_user($field, $val) { + if ($val == '') { + $this->errormsg[$field] = Config::lang('pFetchmail_user_missing'); + return false; + } + return true; + } + protected function _validate_src_password($field, $val) { + if ($val == '') { + $this->errormsg[$field] = Config::lang('pFetchmail_password_missing'); + return false; + } + return true; + } + + /* + * validate poll interval - must be numeri and > 0 + */ + protected function _validate_poll_time($field, $val) { + # must be > 0 + if ($val < 1) { + $this->errormsg[$field] = Config::Lang_f('must_be_numeric_bigger_than_null', $field); + return false; + } + return true; + } + +} + +/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ Property changes on: trunk/model/FetchmailHandler.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2015-04-04 14:23:54
|
Revision: 1765 http://sourceforge.net/p/postfixadmin/code/1765 Author: christian_boltz Date: 2015-04-04 14:23:46 +0000 (Sat, 04 Apr 2015) Log Message: ----------- delete fetchmail.php and templates/fetchmail.tpl (replaced by FetchmailHandler) Removed Paths: ------------- trunk/fetchmail.php trunk/templates/fetchmail.tpl Deleted: trunk/fetchmail.php =================================================================== --- trunk/fetchmail.php 2015-04-04 14:22:28 UTC (rev 1764) +++ trunk/fetchmail.php 2015-04-04 14:23:46 UTC (rev 1765) @@ -1,409 +0,0 @@ -<?php -/** - * Postfix Admin - * - * LICENSE - * This source file is subject to the GPL license that is bundled with - * this package in the file LICENSE.TXT. - * - * Further details on the project are available at http://postfixadmin.sf.net - * - * @version $Id$ - * @license GNU GPL v2 or later. - * - * File: fetchmail.php - * Responsible for setting up fetchmail - * template : fetchmail.tpl - * - * @version $Id$ - * @license GNU GPL v2 or later. - * - * Template Variables: - * - * Form POST \ GET Variables: - * - * GET: - * - edit - * - delete - * - new - * - * POST: - * - save - * - cancel - * - all editable form values, see $fm_struct - */ - -require_once('common.php'); - -authentication_require_role('admin'); - -# workaround for https://sourceforge.net/p/postfixadmin/bugs/322/ -# TODO: convert fetchmail.php to FetchmailHandler -$old_error_reporting = error_reporting(); -error_reporting($old_error_reporting ^ E_NOTICE); - -$extra_options = 0; -if ($CONF['fetchmail_extra_options'] == 'YES') $extra_options = 1; - -# import control GET/POST variables. Form values are imported below. -$new = (int) safeget ("new") == 1 ? 1:0; -$edit = (int) safeget ("edit"); -$delete = (int) safeget ("delete"); -$save = safepost("save") != "" ? 1:0; -$cancel = safepost("cancel") != "" ? 1:0; - -$display_status = 1; -if ($new || $edit) $display_status = 0; - -$fm_struct=array( // list($editible,$view,$type) - # field name allow editing? display field? type - "id" => array(0, 0, 'id' ), - "mailbox" => array(1, 1, 'enum' ), - "src_server" => array(1, 1, 'text' ), - "src_auth" => array(1, 1, 'enum' ), - "src_user" => array(1, 1, 'text' ), - "src_password" => array(1, 0, 'password' ), - "src_folder" => array(1, 1, 'text' ), - "poll_time" => array(1, 1, 'num' ), - "fetchall" => array(1, 1, 'bool' ), - "keep" => array(1, 1, 'bool' ), - "protocol" => array(1, 1, 'enum' ), - "usessl" => array(1, 1, 'bool' ), - "sslcertck" => array(1, 1, 'bool' ), - "sslcertpath" => array($extra_options, $extra_options, 'text' ), # TODO: input validation - "sslfingerprint" => array($extra_options, $extra_options, 'text' ), # TODO: input validation - "extra_options" => array($extra_options, $extra_options, 'longtext' ), - "mda" => array($extra_options, $extra_options, 'longtext' ), - "date" => array(0, $display_status, 'text' ), - "returned_text" => array(0, $display_status, 'longtext' ), -); -# labels and descriptions are taken from $PALANG['pFetchmail_field_xxx'] and $PALANG['pFetchmail_desc_xxx'] - -# TODO: After pressing save or cancel in edit form, date and returned text are not displayed in list view. -# TODO: Reason: $display_status is set before $new and $edit are reset to 0. -# TODO: Fix: split the "display field?" column into "display in list" and "display in edit mode". - -$SESSID_USERNAME = authentication_get_username(); -if (!$SESSID_USERNAME ) - exit; - -$fm_defaults=array( - "id" =>0, - "mailbox" => array($SESSID_USERNAME), - "poll_time" => 10, - "src_auth" => - array('password','kerberos_v5','kerberos','kerberos_v4','gssapi','cram-md5','otp','ntlm','msn','ssh','any'), - "protocol" => - array('POP3','IMAP','POP2','ETRN','AUTO'), -); - -$table_fetchmail = table_by_key('fetchmail'); -$table_mailbox = table_by_key('mailbox'); - -if (authentication_has_role('global-admin')) { - $list_domains = list_domains (); -} else { - $list_domains = list_domains_for_admin(authentication_get_username()); -} - -$user_domains=implode(", ",array_values($list_domains)); # for displaying -$user_domains_sql=implode("','",escape_string(array_values($list_domains))); # for SQL -$sql="SELECT username FROM $table_mailbox WHERE domain in ('".$user_domains_sql."')"; # TODO: replace with domain selection dropdown - -$res = db_query ($sql); -if ($res['rows'] > 0){ - $fm_defaults["mailbox"]=array(); - while ($name = db_array ($res['result'])){ - $fm_defaults["mailbox"][] = $name["username"]; - } -} -else{ - $fm_defaults["mailbox"]=array(); - $fm_defaults["mailbox"][]=$SESSID_USERNAME; # TODO: Does this really make sense? Or should we display a message "please create a mailbox first!"? -} - -$row_id = 0; -if ($delete) { - $row_id = $delete; -} elseif ($edit) { - $row_id = $edit; -} - -$user_mailboxes_sql= "'" . implode("','",escape_string(array_values($fm_defaults["mailbox"]))) . "'"; # mailboxes as SQL -if ($row_id) { - $result = db_query ("SELECT ".implode(",",escape_string(array_keys($fm_struct)))." FROM $table_fetchmail WHERE id=$row_id AND mailbox IN ($user_mailboxes_sql)"); - # TODO: the "AND mailbox IN ..." part should obsolete the check_owner call. Remove it after checking again. - if ($result['rows'] > 0) { - $edit_row = db_array ($result['result']); - $account = $edit_row['src_user'] . " @ " . $edit_row['src_server']; - } - - $edit_row_domain = explode('@', $edit_row['mailbox']); - if ($result['rows'] <= 0 || !check_owner($SESSID_USERNAME, $edit_row_domain[1])) { # owner check for $edit and $delete - flash_error(sprintf($PALANG['pFetchmail_error_invalid_id'], $row_id)); - $edit = 0; $delete = 0; - } -} - - -if ($cancel) { # cancel $new or $edit - $edit=0; - $new=0; -} elseif ($delete) { # delete an entry - $result = db_query ("delete from $table_fetchmail WHERE id=".$delete); - if ($result['rows'] != 1) - { - flash_error($PALANG['pDelete_delete_error']); - } else { - flash_info(sprintf($PALANG['pDelete_delete_success'],$account)); - } - $delete=0; -} elseif ( ($edit || $new) && $save) { # $edit or $new AND save button pressed - $formvars=array(); - foreach($fm_struct as $key=>$row){ - list($editible,$view,$type)=$row; - if ($editible != 0){ - $func="_inp_".$type; - $val=safepost($key); - if ($type!="password" || strlen($val) > 0) { # skip on empty (aka unchanged) password - $formvars[$key]= escape_string( function_exists($func) ?$func($val) :$val); - } - } - } - $formvars['id'] = $edit; # results in 0 on $new - if(db_pgsql() && $new) { - // skip - shouldn't need to specify this as it will default to the next available value anyway. - unset($formvars['id']); - } - - if (!in_array($formvars['mailbox'], $fm_defaults['mailbox'])) { - flash_error($PALANG['pFetchmail_invalid_mailbox']); - $save = 0; - } - if ($formvars['src_server'] == '') { - flash_error($PALANG['pFetchmail_server_missing']); - # TODO: validate domain name - $save = 0; - } - if (empty($formvars['src_user']) ) { - flash_error($PALANG['pFetchmail_user_missing']); - $save = 0; - } - if ($new && empty($formvars['src_password']) ) { - flash_error($PALANG['pFetchmail_password_missing']); - $save = 0; - } - - if ($save) { - if ($new) { - $sql="INSERT INTO $table_fetchmail (".implode(",",escape_string(array_keys($formvars))).") VALUES ('".implode("','",escape_string($formvars))."')"; - } else { # $edit - foreach(array_keys($formvars) as $key) { - $formvars[$key] = escape_string($key) . "='" . escape_string($formvars[$key]) . "'"; - } - $sql="UPDATE $table_fetchmail SET ".implode(",",$formvars).",returned_text='', date=NOW() WHERE id=".$edit; - } - $result = db_query ($sql); - if ($result['rows'] != 1) - { - flash_error($PALANG['pFetchmail_database_save_error']); - } else { - flash_info($PALANG['pFetchmail_database_save_success']); - $edit = 0; $new = 0; # display list after saving - } - } else { - $formvars['src_password'] = ''; # never display password - } - -} elseif ($edit) { # edit entry form - $formvars = $edit_row; - $formvars['src_password'] = ''; - if (db_pgsql()) { - $formvars['fetchall']=('t'==$formvars['fetchall']) ? 1 : 0; - $formvars['keep']=('t'==$formvars['keep']) ? 1 : 0; - $formvars['usessl']=('t'==$formvars['usessl']) ? 1 : 0; - $formvars['sslcertck']=('t'==$formvars['sslcertck']) ? 1: 0; - } -} elseif ($new) { # create entry form - foreach (array_keys($fm_struct) as $value) { - if (isset($fm_defaults[$value])) { - $formvars[$value] = $fm_defaults[$value]; - } else { - $formvars[$value] = ''; - } - } -} - -$tFmail = array(); -if ($edit + $new == 0) { # display list - # TODO: ORDER BY would even be better if it would order by the _domain_ of the target mailbox first - $res = db_query ("SELECT ".implode(",",escape_string(array_keys($fm_struct)))." FROM $table_fetchmail WHERE mailbox IN ($user_mailboxes_sql) ORDER BY mailbox,src_server,src_user"); - if ($res['rows'] > 0) { - while ($row = db_array ($res['result'])) { - if (db_pgsql()) { - //. at least in my database, $row['modified'] already looks like : 2009-04-11 21:38:10.75586+01, - // while gmstrftime expects an integer value. strtotime seems happy though. - //$row['date']=gmstrftime('%c %Z',$row['date']); - $row['date'] = date('Y-m-d H:i:s', strtotime($row['date'])); - $row['fetchall']=('t'==$row['fetchall']) ? 1 : 0; - $row['keep']=('t'==$row['keep']) ? 1 : 0; - $row['usessl']=('t'==$row['usessl']) ? 1 : 0; - $row['sslcertck']=('t'==$row['sslcertck']) ? 1: 0; - } - $tFmail[] = $row; - } - } -} - -function _inp_num($val){ - return (int)($val); -} - -function _inp_bool($val){ - return $val ? db_get_boolean(true): db_get_boolean(false); -} - -function _inp_password($val){ - return base64_encode($val); -} -//***** -$headers=array(); -foreach(array_keys($fm_struct) as $row){ - list($editible,$view,$type)=$fm_struct[$row]; - $title = $PALANG['pFetchmail_field_' . $row]; - $comment = $PALANG['pFetchmail_desc_' . $row]; - if ($view){ - $headers[]=$title; -// $headers[]=array($editible, $view, $type, $title, $comment); - } -} -function fetchmail_edit_row($data=array()) -{ - global $fm_struct,$fm_defaults,$PALANG; - $id = $data["id"]; - $_id = $data["id"] * 100 + 1; - $ret = "<table>"; - $ret .= '<tr><th colspan="3">'.$PALANG['pMenu_fetchmail'] . '</th></tr>'; - # TODO: $formvars possibly contains db-specific boolean values - # TODO: no problems with MySQL, to be tested with PgSQL - # TODO: undefined values may also occour - foreach($fm_struct as $key=>$struct){ - list($editible,$view,$type)=$struct; - $title = $PALANG['pFetchmail_field_' . $key]; - $comment = $PALANG['pFetchmail_desc_' . $key]; - if ($editible){ - $ret.="<tr><td class=\"label\"><label for='${_id}'>${title}:</label></td>"; - $ret.="<td>"; - $func="_edit_".$type; - if (! function_exists($func)) - $func="_edit_text"; - $val=isset($data[$key]) - ?$data[$key] - :(! is_array($fm_defaults[$key]) - ?$fm_defaults[$key] - :'' - ); - $fm_defaults_key = ""; if (isset($fm_defaults[$key])) $fm_defaults_key = $fm_defaults[$key]; - $ret.=$func($_id++,$key,$fm_defaults_key,$val); - $ret.="</td><td><em>${comment}</em></td></tr>\n"; - } - elseif($view){ - $func="_view_".$type; - $val=isset($data[$key]) - ?(function_exists($func) - ?$func($data[$key]) - :nl2br($data[$key]) - ) - :"--x--"; - $ret.="<tr><td class=\"label\">${title}:</label></td>"; - $ret.="<td >".$val; - $ret.="</td><td><em>${comment}</em></td></tr>\n"; - } - } - $ret.="<tr><td> </td><td colspan=2> - <input type=submit class=\"button\" name=save value='" . $PALANG['save'] . "' /> - <input type=submit class=\"button\" name=cancel value='" . $PALANG['cancel'] . "' /> - "; - if ($id){ - $ret.="<input type=hidden name=edit value='${id}'>"; - } - $ret.="</td></tr>\n"; - $ret.="</table>\n"; - $ret.="<br />\n"; - $ret.="</form>\n"; - $ret.="</div>\n"; - return $ret; -} -function _edit_text($id,$key,$def_vals,$val=""){ - $val=htmlspecialchars($val); - return "<input type=text name=${key} id=${id} value='${val}' />"; -} - -function _edit_password($id,$key,$def_vals,$val=""){ - $val=preg_replace("{.}","*",$val); - return "<input type=password name=${key} id=${id} value='${val}' />"; -} - -function _edit_num($id,$key,$def_vals,$val=""){ - $val=(int)($val); - return "<input type=text name=${key} id=${id} value='${val}' />"; -} - -function _edit_bool($id,$key,$def_vals,$val=""){ - $ret="<input type=checkbox name=${key} id=${id}"; - if ($val) - $ret.=' checked="checked"'; - $ret.=" />"; - return $ret; -} - -function _edit_longtext($id,$key,$def_vals,$val=""){ - $val=htmlspecialchars($val); - return "<textarea name=${key} id=${id} rows=2 style='width:20em;'>${val}</textarea>"; -} - -function _edit_enum($id,$key,$def_vals,$val=""){ - $ret="<select name=${key} id=${id}>"; - foreach($def_vals as $opt_val){ - $ret.="<option"; - if ($opt_val==$val) - $ret.=" selected"; - $ret.=">${opt_val}</option>\n"; - } - $ret.="</select>\n"; - return $ret; -} - -function _listview_id($val){ - return "<a href='?edit=${val}'> ${val} </a>"; -} - -function _listview_bool($val){ - return $val?"+":""; -} - -function _listview_longtext($val){ - return strlen($val)?"Text - ".strlen($val)." chars":"--x--"; -} - -function _listview_text($val){ - return sizeof($val)?$val:"--x--"; -} - -function _listview_password($val){ - return preg_replace("{.}","*",$val); -} - -$smarty->assign ('edit', $edit); -$smarty->assign ('new', $new); -$smarty->assign ('fetchmail_edit_row', fetchmail_edit_row($formvars),false); -$smarty->assign ('headers', $headers); -$smarty->assign ('user_domains', $user_domains); -$smarty->assign ('tFmail', $tFmail); -$smarty->assign ('extra_options', $extra_options); - -$smarty->assign ('smarty_template', 'fetchmail'); -$smarty->display ('index.tpl'); - -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ -?> Deleted: trunk/templates/fetchmail.tpl =================================================================== --- trunk/templates/fetchmail.tpl 2015-04-04 14:22:28 UTC (rev 1764) +++ trunk/templates/fetchmail.tpl 2015-04-04 14:23:46 UTC (rev 1765) @@ -1,51 +0,0 @@ -{if $edit || $new} - <div id="edit_form"> - <form name="fetchmail" method="post" action=""> - {$fetchmail_edit_row} -{else} - {assign var="colspan" value=$headers|@count} - <div id="overview"> - <form name="frmOverview" method="post" action=""> - <table id="log_table" border="0"> - <tr> - <th colspan="{$colspan+2}">{$PALANG.pFetchmail_welcome}{$user_domains}</th> - </tr> - {#tr_header#} - {foreach from=$headers item=header} - <td>{$header}</td> - {/foreach} - <td colspan="2"> </td> - </tr> - {if $tFmail} - {foreach from=$tFmail item=row} - {#tr_hilightoff#} - <td nowrap="nowrap">{$row.mailbox} </td> - <td nowrap="nowrap">{$row.src_server} </td> - <td nowrap="nowrap">{$row.src_auth} </td> - <td nowrap="nowrap">{$row.src_user} </td> - <td nowrap="nowrap">{$row.src_folder} </td> - <td nowrap="nowrap">{$row.poll_time} </td> - <td nowrap="nowrap">{$row.fetchall} </td> - <td nowrap="nowrap">{$row.keep} </td> - <td nowrap="nowrap">{$row.protocol} </td> - <td nowrap="nowrap">{$row.usessl} </td> - <td nowrap="nowrap">{$row.sslcertck} </td> -{if $extra_options} - <td nowrap="nowrap">{$row.sslcertpath} </td> - <td nowrap="nowrap">{$row.sslfingerprint} </td> - <td nowrap="nowrap">{$row.extra_options} </td> - <td nowrap="nowrap">{$row.mda} </td> -{/if} - <td nowrap="nowrap">{$row.date} </td> - <td nowrap="nowrap">{$row.returned_text}--x-- </td> <!-- Inhalt mit if auswerten! --> - <td><a href="fetchmail.php?edit={$row.id|escape:"url"}">{$PALANG.edit}</a></td> - <td><a href="fetchmail.php?delete={$row.id|escape:"url"}&token={$smarty.session.PFA_token|escape:"url"}" - onclick="return confirm('{$PALANG.confirm}{$PALANG.pMenu_fetchmail}:{$row.src_user}@{$row.src_server}')">{$PALANG.del}</a></td> - </tr> - {/foreach} - {/if} - </table> -</form> -</div> -<br /><a href='?new=1' class="button">{$PALANG.pFetchmail_new_entry}</a><br /> -{/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2015-04-05 19:21:22
|
Revision: 1769 http://sourceforge.net/p/postfixadmin/code/1769 Author: christian_boltz Date: 2015-04-05 19:21:15 +0000 (Sun, 05 Apr 2015) Log Message: ----------- add 'can_create' flag PFAHandler: - add $msg['can_create'] (true by default) DomainHandler: - set $msg['can_create'] based on is_superadmin list.tpl: - display 'create' button only if $msg['can_create'] is true Note: This is only an optical improvement, not a permission check. Modified Paths: -------------- trunk/model/DomainHandler.php trunk/model/PFAHandler.php trunk/templates/list.tpl Modified: trunk/model/DomainHandler.php =================================================================== --- trunk/model/DomainHandler.php 2015-04-04 14:37:46 UTC (rev 1768) +++ trunk/model/DomainHandler.php 2015-04-05 19:21:15 UTC (rev 1769) @@ -122,6 +122,7 @@ $this->msg['store_error'] = 'pAdminEdit_domain_result_error'; $this->msg['successmessage'] = 'domain_updated'; } + $this->msg['can_create'] = $this->is_superadmin; } public function webformConfig() { Modified: trunk/model/PFAHandler.php =================================================================== --- trunk/model/PFAHandler.php 2015-04-04 14:37:46 UTC (rev 1768) +++ trunk/model/PFAHandler.php 2015-04-05 19:21:15 UTC (rev 1769) @@ -112,6 +112,7 @@ # (stored separately to make the functions reuseable) # filled by initMsg() protected $msg = array( + 'can_create' => True, 'confirm_delete' => 'confirm', ); Modified: trunk/templates/list.tpl =================================================================== --- trunk/templates/list.tpl 2015-04-04 14:37:46 UTC (rev 1768) +++ trunk/templates/list.tpl 2015-04-05 19:21:15 UTC (rev 1769) @@ -106,8 +106,10 @@ </table> +{if $msg.can_create} <br /><a href="edit.php?table={$table|escape:"url"}" class="button">{$PALANG.{$formconf.create_button}}</a><br /> <br /> +{/if} <br /><a href="list.php?table={$table|escape:"url"}&output=csv">{$PALANG.download_csv}</a> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2015-04-05 20:23:45
|
Revision: 1770 http://sourceforge.net/p/postfixadmin/code/1770 Author: christian_boltz Date: 2015-04-05 20:23:38 +0000 (Sun, 05 Apr 2015) Log Message: ----------- PFAHandler: - add protected $searchfields = array(); - list of fields to search by default, if just a search term is given. This will be done with $search['_'], but that code is not implemented yet. - add $this->msg['show_simple_search'] (true if $searchfields is non-empty) list.tpl: - display search input box and search overview only if $searchfields is not empty AliasdomainHandler: - add 'alias_domain' and 'target_domain' to $searchfields MailboxHandler: - add 'username' to $searchfields AliasHandler: - add 'address' and 'goto' to $searchfields This effectively means that the search input box is no longer displayed in list.php for admin, domain and fetchmail listings. Modified Paths: -------------- trunk/model/AliasHandler.php trunk/model/AliasdomainHandler.php trunk/model/MailboxHandler.php trunk/model/PFAHandler.php trunk/templates/list.tpl Modified: trunk/model/AliasHandler.php =================================================================== --- trunk/model/AliasHandler.php 2015-04-05 19:21:15 UTC (rev 1769) +++ trunk/model/AliasHandler.php 2015-04-05 20:23:38 UTC (rev 1770) @@ -11,6 +11,7 @@ protected $db_table = 'alias'; protected $id_field = 'address'; protected $domain_field = 'domain'; + protected $searchfields = array('address', 'goto'); /** * Modified: trunk/model/AliasdomainHandler.php =================================================================== --- trunk/model/AliasdomainHandler.php 2015-04-05 19:21:15 UTC (rev 1769) +++ trunk/model/AliasdomainHandler.php 2015-04-05 20:23:38 UTC (rev 1770) @@ -9,6 +9,7 @@ protected $db_table = 'alias_domain'; protected $id_field = 'alias_domain'; protected $domain_field = 'alias_domain'; + protected $searchfields = array('alias_domain', 'target_domain'); protected function initStruct() { $this->struct=array( Modified: trunk/model/MailboxHandler.php =================================================================== --- trunk/model/MailboxHandler.php 2015-04-05 19:21:15 UTC (rev 1769) +++ trunk/model/MailboxHandler.php 2015-04-05 20:23:38 UTC (rev 1770) @@ -9,6 +9,7 @@ protected $db_table = 'mailbox'; protected $id_field = 'username'; protected $domain_field = 'domain'; + protected $searchfields = array('username'); # init $this->struct, $this->db_table and $this->id_field protected function initStruct() { Modified: trunk/model/PFAHandler.php =================================================================== --- trunk/model/PFAHandler.php 2015-04-05 19:21:15 UTC (rev 1769) +++ trunk/model/PFAHandler.php 2015-04-05 20:23:38 UTC (rev 1770) @@ -46,6 +46,11 @@ # disable for "edit password" forms protected $skip_empty_pass = true; + # fields to search when using simple search ("?search[_]=...") + # array with one or more fields to search (all fields will be OR'ed in the query) + # searchmode is always 'contains' (using LIKE "%searchterm%") + protected $searchfields = array(); + /** * internal variables - filled by methods of *Handler */ @@ -189,6 +194,7 @@ } $this->initMsg(); + $this->msg['show_simple_search'] = count($this->searchfields) > 0; } /** Modified: trunk/templates/list.tpl =================================================================== --- trunk/templates/list.tpl 2015-04-05 19:21:15 UTC (rev 1769) +++ trunk/templates/list.tpl 2015-04-05 20:23:38 UTC (rev 1770) @@ -5,9 +5,12 @@ <input class="button" type="submit" name="go" value="{$PALANG.go}" /> {/if} </form> -{#form_search#} +{if $msg.show_simple_search} + {#form_search#} +{/if} </div> +{if $msg.show_simple_search} {if ($search|count > 0)} <div class='searchparams'> <p>{$PALANG.searchparams} @@ -19,6 +22,7 @@ <span><a href="list.php?table={$table}&reset_search=1">[x]</a></span> </div> {/if} +{/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2015-04-06 13:39:28
|
Revision: 1772 http://sourceforge.net/p/postfixadmin/code/1772 Author: christian_boltz Date: 2015-04-06 13:39:21 +0000 (Mon, 06 Apr 2015) Log Message: ----------- PFAHandler: - build_select_query(): add support for $search['_'] (searching if one of the $this->searchfields contains the search text) - getList(): make sure '_' is kept in the search parameters functions.inc.php: - db_where_clause(): slightly relax checks - if $condition is empty, only error out if $additional_raw_where is also empty Modified Paths: -------------- trunk/functions.inc.php trunk/model/PFAHandler.php Modified: trunk/functions.inc.php =================================================================== --- trunk/functions.inc.php 2015-04-06 13:29:28 UTC (rev 1771) +++ trunk/functions.inc.php 2015-04-06 13:39:21 UTC (rev 1772) @@ -1628,7 +1628,7 @@ die('db_where_cond: parameter $cond is not an array!'); } elseif(!is_array($searchmode)) { die('db_where_cond: parameter $searchmode is not an array!'); - } elseif (count($condition) == 0) { + } elseif (count($condition) == 0 && trim($additional_raw_where) == '') { die("db_where_cond: parameter is an empty array!"); # die() might sound harsh, but can prevent information leaks } elseif(!is_array($struct)) { die('db_where_cond: parameter $struct is not an array!'); Modified: trunk/model/PFAHandler.php =================================================================== --- trunk/model/PFAHandler.php 2015-04-06 13:29:28 UTC (rev 1771) +++ trunk/model/PFAHandler.php 2015-04-06 13:39:21 UTC (rev 1772) @@ -609,6 +609,14 @@ } if (is_array($condition)) { + if (isset($condition['_']) && count($this->searchfields) > 0) { + $simple_search = array(); + foreach ($this->searchfields as $field) { + $simple_search[] = "$field LIKE '%" . escape_string($condition['_']) . "%'"; + } + $additional_where .= " AND ( " . join(" OR ", $simple_search) . " ) "; + unset($condition['_']); + } $where = db_where_clause($condition, $this->struct, $additional_where, $searchmode); } else { if ($condition == "") $condition = '1=1'; @@ -716,6 +724,8 @@ # allow only access to fields the user can access to avoid information leaks via search parameters if (isset($this->struct[$key]) && ($this->struct[$key]['display_in_list'] || $this->struct[$key]['display_in_form']) ) { $real_condition[$key] = $value; + } elseif (($key == '_') && count($this->searchfields)) { + $real_condition[$key] = $value; } else { $this->errormsg[] = "Ignoring unknown search field $key"; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2015-04-06 14:17:33
|
Revision: 1773 http://sourceforge.net/p/postfixadmin/code/1773 Author: christian_boltz Date: 2015-04-06 14:17:25 +0000 (Mon, 06 Apr 2015) Log Message: ----------- migrate search input field to use search[_], and use list.tpl for alias domains User-visible changes: - alias domain list can be downloaded as CSV - no more search highlighting for alias domains list-virtual.php: - expect $search to be an array - change alias domain handling to use list.php instead of list-virtual_alias_domain.tpl, and move some logic from the template to list-virtual.php. (The template file is kept as list.tpl wrapper.) - adopt mailbox and alias search to $search[_] - adopt pagebrowser to $search[_] list-virtual_alias_domain.tpl: - replace custom output generation with {include 'list.php'} and some variable assignments PFAHandler.php: - add $this->id_field to $this->msg (avoids another smarty template variable) configs/menu.conf: - change input name to search[_] list-virtual_alias.tpl, list-virtual_mailbox.tpl: - adopt to $search[_] by setting $search in a backwards-compatible way list.tpl: - add special handling for aliasdomain.target_domain linking Modified Paths: -------------- trunk/configs/menu.conf trunk/list-virtual.php trunk/model/PFAHandler.php trunk/templates/list-virtual_alias.tpl trunk/templates/list-virtual_alias_domain.tpl trunk/templates/list-virtual_mailbox.tpl trunk/templates/list.tpl Modified: trunk/configs/menu.conf =================================================================== --- trunk/configs/menu.conf 2015-04-06 13:39:21 UTC (rev 1772) +++ trunk/configs/menu.conf 2015-04-06 14:17:25 UTC (rev 1773) @@ -39,7 +39,7 @@ url_delete = delete.php url_search = list-virtual.php -form_search = <form name="search" method="post" action="list-virtual.php"><input name="search" size="10" /></form> +form_search = <form name="search" method="post" action="list-virtual.php"><input name="search[_]" size="10" /></form> [adminlistadmin] url_edit_admin = edit.php?table=admin Modified: trunk/list-virtual.php =================================================================== --- trunk/list-virtual.php 2015-04-06 13:39:21 UTC (rev 1772) +++ trunk/list-virtual.php 2015-04-06 14:17:25 UTC (rev 1773) @@ -38,7 +38,10 @@ unset($_SESSION['list-virtual:limit']); } $fDisplay = (int) safepost('limit', safeget('limit', safesession('list-virtual:limit'))); -$search = safepost('search', safeget('search', '')); # not remembered in the session +$search = safepost('search', safeget('search', array())); # not remembered in the session +if (!is_array($search)) { + die(Config::Lang('invalid_parameter')); +} if (count($list_domains) == 0) { if (authentication_has_role('global-admin')) { @@ -85,23 +88,43 @@ # if (Config::bool('alias_domain')) { - if ($search == "") { + $handler = new AliasdomainHandler(0, $admin_username); + $aliasdomain_data = array( + 'struct' => $handler->getStruct(), + 'msg' => $handler->getMsg(), + 'formconf' => $handler->webformConfig(), + ); + $aliasdomain_data['msg']['show_simple_search'] = False; # hide search box + + $aliasdomain_data['msg']['can_create'] = 1; + + # hide create button if all domains (of this admin) are already used as alias domains + $handler->getList(""); + if ( count($handler->result()) + 1 >= count($list_domains) ) $aliasdomain_data['msg']['can_create'] = 0; # all domains (of this admin) are already alias domains + + # get the really requested list + if (count($search) == 0) { $list_param = "alias_domain='$fDomain' OR target_domain='$fDomain'"; } else { - $list_param = "alias_domain LIKE '%$search%' OR target_domain LIKE '%$search%'"; + $list_param = $search; } - $handler = new AliasdomainHandler(0, $admin_username); $handler->getList($list_param); $tAliasDomains = $handler->result(); - $can_create_alias_domain = 1; foreach ($tAliasDomains as $row) { - if ($row['alias_domain'] == $fDomain) $can_create_alias_domain = 0; # domain is already an alias domain + if ($row['alias_domain'] == $fDomain) { + $aliasdomain_data['struct']['target_domain']['linkto'] = 'target'; + if (count($search) == 0) { + $aliasdomain_data['struct']['alias_domain']['linkto'] = ''; + $aliasdomain_data['msg']['can_create'] = 0; # domain is already an alias domain + } + } } - # set $can_create_alias_domain = 0 if all domains (of this admin) are already used as alias domains - $handler->getList(""); - if ( count($handler->result()) + 1 >= count($list_domains) ) $can_create_alias_domain = 0; # all domains (of this admin) are already alias domains + + if (count($search) > 0) { + $aliasdomain_data['struct']['target_domain']['linkto'] = 'target'; + } } # @@ -111,11 +134,12 @@ $table_alias = table_by_key('alias'); $table_mailbox = table_by_key('mailbox'); -if ($search == "") { +if (count($search) == 0 || !isset($search['_'])) { $list_param = "domain='$fDomain'"; $sql_domain = " $table_alias.domain='$fDomain' "; } else { - $list_param = "(address LIKE '%$search%' OR goto LIKE '%$search%')"; + $searchterm = escape_string($search['_']); + $list_param = "(address LIKE '%$searchterm%' OR goto LIKE '%$searchterm%')"; $sql_domain = db_in_clause("$table_alias.domain", $list_domains); } @@ -140,13 +164,14 @@ $sql_order = " ORDER BY $table_mailbox.username "; $sql_limit = " LIMIT $page_size OFFSET $fDisplay"; -if ($search == "") { +if (count($search) == 0 || !isset($search['_'])) { $sql_where .= " $table_mailbox.domain='$fDomain' "; } else { + $searchterm = escape_string($search['_']); $sql_where .= db_in_clause("$table_mailbox.domain", $list_domains) . " "; - $sql_where .= " AND ( $table_mailbox.username LIKE '%$search%' OR $table_mailbox.name LIKE '%$search%' "; + $sql_where .= " AND ( $table_mailbox.username LIKE '%$searchterm%' OR $table_mailbox.name LIKE '%$searchterm%' "; if ($display_mailbox_aliases) { - $sql_where .= " OR $table_alias.goto LIKE '%$search%' "; + $sql_where .= " OR $table_alias.goto LIKE '%$searchterm%' "; } $sql_where .= " ) "; # $search is already escaped } @@ -311,10 +336,10 @@ $this->limit = $aLimit; $this->page_size = $aPage_size; $this->pages = $aPages; - if ($aSearch == "") { + if (is_array($aSearch) && isset($aSearch['_']) && $aSearch['_'] != "") { + $this->search = "&search[_]=" . htmlentities($aSearch['_']); + } else { $this->search = ""; - } else { - $this->search = "&search=" . htmlentities($aSearch); } $this->url = ''; $this->fInit = false; @@ -408,6 +433,7 @@ if(empty($_GET['domain'])) { $_GET['domain'] = ''; } +$smarty->assign ('admin_list', array()); $smarty->assign ('select_options', select_options ($list_domains, array ($fDomain)), false); $smarty->assign ('nav_bar_alias', array ('top' => $nav_bar_alias->display_top (), 'bottom' => $nav_bar_alias->display_bottom ()), false); $smarty->assign ('nav_bar_mailbox', array ('top' => $nav_bar_mailbox->display_top (), 'bottom' => $nav_bar_mailbox->display_bottom ()), false); @@ -425,7 +451,8 @@ $smarty->assign ('tDisplay_next', $tDisplay_next); $smarty->assign ('tAliasDomains', $tAliasDomains); -$smarty->assign ('can_create_alias_domain', $can_create_alias_domain); +$smarty->assign ('aliasdomain_data', $aliasdomain_data); + $smarty->assign ('tAlias', $tAlias); $smarty->assign ('gen_show_status', $gen_show_status, false); $smarty->assign ('check_alias_owner', $check_alias_owner); Modified: trunk/model/PFAHandler.php =================================================================== --- trunk/model/PFAHandler.php 2015-04-06 13:39:21 UTC (rev 1772) +++ trunk/model/PFAHandler.php 2015-04-06 14:17:25 UTC (rev 1773) @@ -194,6 +194,7 @@ } $this->initMsg(); + $this->msg['id_field'] = $this->id_field; $this->msg['show_simple_search'] = count($this->searchfields) > 0; } Modified: trunk/templates/list-virtual_alias.tpl =================================================================== --- trunk/templates/list-virtual_alias.tpl 2015-04-06 13:39:21 UTC (rev 1772) +++ trunk/templates/list-virtual_alias.tpl 2015-04-06 14:17:25 UTC (rev 1773) @@ -1,3 +1,9 @@ +{if isset($search._)} + {assign var="search" value=$search._} +{else} + {assign var="search" value=''} +{/if} + {#tr_header#} {if $CONF.show_status===YES} <td></td> Modified: trunk/templates/list-virtual_alias_domain.tpl =================================================================== --- trunk/templates/list-virtual_alias_domain.tpl 2015-04-06 13:39:21 UTC (rev 1772) +++ trunk/templates/list-virtual_alias_domain.tpl 2015-04-06 14:17:25 UTC (rev 1773) @@ -1,46 +1,9 @@ {*** Domain Aliases ***} -<table id="alias_domain_table"> - <tr> - <th colspan="6">{$PALANG.pOverview_alias_domain_title}</th> - </tr> - {if $tAliasDomains|@count>0} - {if $tAliasDomains|@count>0} {* -> HAT alias-domains *} - {#tr_header#} - <td>{$PALANG.pOverview_alias_address}</td> - <td>{$PALANG.to}</td> - <td>{$PALANG.last_modified}</td> - <td>{$PALANG.active}</td> - <td> </td> - <td> </td> - </tr> - {foreach from=$tAliasDomains item=item} - {#tr_hilightoff#} - <td>{if $item.alias_domain != $fDomain}<a href="{$smarty.config.url_list_virtual}?domain={$item.alias_domain|escape:"url"}">{/if} - {if $search eq ""} - {$item.alias_domain} - {else} - {$item.alias_domain|replace:$search:"<span class='searchresult'>$search</span>"} - {/if} - {if $item.alias_domain != $fDomain}</a>{/if}</td> - <td>{if $item.target_domain != $fDomain}<a href="{$smarty.config.url_list_virtual}?domain={$item.target_domain|escape:"url"}">{/if} - {if $search eq ""} - {$item.target_domain} - {else} - {$item.target_domain|replace:$search:"<span class='searchresult'>$search</span>"} - {/if} - {if $item.target_domain != $fDomain}</a>{/if}</td> - <td>{$item.modified}</td> - <td><a href="{#url_editactive#}aliasdomain&id={$item.alias_domain|escape:"url"}&active={if ($item.active==0)}1{else}0{/if}&token={$smarty.session.PFA_token|escape:"url"}">{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</a></td> - <td><a href="{#url_create_alias_domain#}&edit={$item.alias_domain|escape:"url"}">{$PALANG.edit}</a></td> - <td><a href="{#url_delete#}?table=aliasdomain&delete={$item.alias_domain|escape:"url"}&token={$smarty.session.PFA_token|escape:"url"}" - onclick="return confirm ('{$PALANG.confirm}{$PALANG.pOverview_get_alias_domains}: {$item.alias_domain} -> {$item.target_domain}');">{$PALANG.del}</a></td> - </tr> - {/foreach} - {/if} - {/if} -</table> -{if $can_create_alias_domain} - <br/> - <br /><a href="{#url_create_alias_domain#}&target_domain={$fDomain|escape:"url"}" class="button">{$PALANG.add_alias_domain}</a><br /> -{/if} +{assign var="table" value='aliasdomain'} +{assign var="struct" value=$aliasdomain_data.struct} +{assign var="msg" value=$aliasdomain_data.msg} +{assign var="id_field" value=$msg.id_field} +{assign var="formconf" value=$aliasdomain_data.formconf} +{assign var="items" value=$tAliasDomains} +{include 'list.tpl'} Modified: trunk/templates/list-virtual_mailbox.tpl =================================================================== --- trunk/templates/list-virtual_mailbox.tpl 2015-04-06 13:39:21 UTC (rev 1772) +++ trunk/templates/list-virtual_mailbox.tpl 2015-04-06 14:17:25 UTC (rev 1773) @@ -1,3 +1,9 @@ +{if isset($search._)} + {assign var="search" value=$search._} +{else} + {assign var="search" value=''} +{/if} + {#tr_header#} {if $CONF.show_status===YES}<td></td>{/if} <td>{$PALANG.pOverview_mailbox_username}</td> Modified: trunk/templates/list.tpl =================================================================== --- trunk/templates/list.tpl 2015-04-06 13:39:21 UTC (rev 1772) +++ trunk/templates/list.tpl 2015-04-06 14:17:25 UTC (rev 1773) @@ -58,6 +58,8 @@ <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:"url"}">{$item.target_domain}</a> {* {elseif $table == 'domain' && $key == 'domain'} <a href="list.php?table=domain&domain={$item.domain|escape:"url"}">{$item.domain}</a> *} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2015-04-06 20:35:22
|
Revision: 1774 http://sourceforge.net/p/postfixadmin/code/1774 Author: christian_boltz Date: 2015-04-06 20:35:19 +0000 (Mon, 06 Apr 2015) Log Message: ----------- AliasHandler: - initStruct(): replace (wrong) 'editable' with '_can_edit' and '_can_delete' - read_from_db_postprocess(): disable _can_edit and _can_delete for default aliases if special_alias_control is off and not superadmin list.tpl: - use $item._can_edit instead of $check_alias_owner list-virtual.php: - drop $check_alias_owner variable and check_alias_owner() call (replaced by the code added in AliasHandler) - drop unused $sql_domain functions.inc.php: - delete no longer used check_alias_owner() function Modified Paths: -------------- trunk/functions.inc.php trunk/list-virtual.php trunk/model/AliasHandler.php trunk/templates/list-virtual_alias.tpl Modified: trunk/functions.inc.php =================================================================== --- trunk/functions.inc.php 2015-04-06 14:17:25 UTC (rev 1773) +++ trunk/functions.inc.php 2015-04-06 20:35:19 UTC (rev 1774) @@ -568,23 +568,6 @@ -// -// check_alias_owner -// Action: Checks if the admin is the owner of the alias. -// Call: check_alias_owner (string admin, string alias) -// -function check_alias_owner ($username, $alias) { - global $CONF; - if (authentication_has_role('global-admin')) return true; - $tmp = preg_split('/\@/', $alias); - if (($CONF['special_alias_control'] == 'NO') && array_key_exists($tmp[0], $CONF['default_aliases'])) { - return false; - } else { - return true; - } -} - - /** * List domains for an admin user. * @param String $username Modified: trunk/list-virtual.php =================================================================== --- trunk/list-virtual.php 2015-04-06 14:17:25 UTC (rev 1773) +++ trunk/list-virtual.php 2015-04-06 20:35:19 UTC (rev 1774) @@ -136,11 +136,9 @@ if (count($search) == 0 || !isset($search['_'])) { $list_param = "domain='$fDomain'"; - $sql_domain = " $table_alias.domain='$fDomain' "; } else { $searchterm = escape_string($search['_']); $list_param = "(address LIKE '%$searchterm%' OR goto LIKE '%$searchterm%')"; - $sql_domain = db_in_clause("$table_alias.domain", $list_domains); } $handler = new AliasHandler(0, $admin_username); @@ -290,12 +288,10 @@ } $gen_show_status = array (); -$check_alias_owner = array (); if ((is_array ($tAlias) and sizeof ($tAlias) > 0)) { foreach (array_keys($tAlias) as $i) { $gen_show_status [$i] = gen_show_status($tAlias[$i]['address']); - $check_alias_owner [$i] = check_alias_owner($admin_username, $tAlias[$i]['address']); } } @@ -455,7 +451,6 @@ $smarty->assign ('tAlias', $tAlias); $smarty->assign ('gen_show_status', $gen_show_status, false); -$smarty->assign ('check_alias_owner', $check_alias_owner); $smarty->assign ('tCanAddAlias', $tCanAddAlias); $smarty->assign ('tMailbox', $tMailbox); $smarty->assign ('gen_show_status_mailbox', $gen_show_status_mailbox, false); Modified: trunk/model/AliasHandler.php =================================================================== --- trunk/model/AliasHandler.php 2015-04-06 14:17:25 UTC (rev 1773) +++ trunk/model/AliasHandler.php 2015-04-06 20:35:19 UTC (rev 1774) @@ -56,14 +56,11 @@ 'active' => pacol( 1, 1, 1, 'bool', 'active' , '' , 1 ), 'created' => pacol( 0, 0, 1, 'ts', 'created' , '' ), 'modified' => pacol( 0, 0, 1, 'ts', 'last_modified' , '' ), - 'editable' => pacol( 0, 0, 1, 'int', '' , '' , 0 , + '_can_edit' => pacol( 0, 0, 1, 'vnum', '' , '' , 0 , '', + array('select' => '1 as _can_edit') ), + '_can_delete' => pacol( 0, 0, 1, 'vnum', '' , '' , 0 , '', + array('select' => '1 as _can_delete') ), # read_from_db_postprocess() updates the value # aliases listed in $CONF[default_aliases] are read-only for domain admins if $CONF[special_alias_control] is NO. - # technically 'editable' is bool, but the automatic bool conversion breaks the query. Flagging it as int avoids this problem. - # Maybe having a vbool type (without the automatic conversion) would be cleaner - we'll see if we need it. - /*options*/ '', - /*not_in_db*/ 0, - /*dont_write_to_db*/ 1, - /*select*/ '1 as editable' ), ); } @@ -283,8 +280,12 @@ $db_result[$key]['goto_mailbox'] = 0; } - # TODO: set 'editable' to 0 if not superadmin, $CONF[special_alias_control] == NO and alias is in $CONF[default_aliases] - # TODO: see check_alias_owner() in functions.inc.php + # editing a default alias (postmaster@ etc.) is only allowed if special_alias_control is allowed or if the user is a superadmin + $tmp = preg_split('/\@/', $db_result[$key]['address']); + if (!$this->is_superadmin && !Config::bool('special_alias_control') && array_key_exists($tmp[0], Config::Read('default_aliases'))) { + $db_result[$key]['_can_edit'] = 0; + $db_result[$key]['_can_delete'] = 0; + } } return $db_result; Modified: trunk/templates/list-virtual_alias.tpl =================================================================== --- trunk/templates/list-virtual_alias.tpl 2015-04-06 14:17:25 UTC (rev 1773) +++ trunk/templates/list-virtual_alias.tpl 2015-04-06 20:35:19 UTC (rev 1774) @@ -42,7 +42,7 @@ </td> {/if} <td>{$item.modified}</td> - {if $check_alias_owner[$i]==true} + {if $item._can_edit} <td><a href="{#url_editactive#}alias&id={$item.address|escape:"url"}&active={if ($item.active==0)}1{else}0{/if}&token={$smarty.session.PFA_token|escape:"url"}" >{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</a></td> <td><a href="{#url_create_alias#}&edit={$item.address|escape:"url"}">{$PALANG.edit}</a></td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2015-04-06 21:10:01
|
Revision: 1775 http://sourceforge.net/p/postfixadmin/code/1775 Author: christian_boltz Date: 2015-04-06 21:09:54 +0000 (Mon, 06 Apr 2015) Log Message: ----------- smarty.inc.php: - assign(): additionally provide the unsanitized values as RAW_$key PFAHandler.php: - document 'html' field type (used for raw html), including a big warning list.tpl: - add handling to display raw html fields This is a preparation to use the status markers with list.tpl without introducing too big changes. Modified Paths: -------------- trunk/model/PFAHandler.php trunk/smarty.inc.php trunk/templates/list.tpl Modified: trunk/model/PFAHandler.php =================================================================== --- trunk/model/PFAHandler.php 2015-04-06 20:35:19 UTC (rev 1774) +++ trunk/model/PFAHandler.php 2015-04-06 21:09:54 UTC (rev 1775) @@ -225,6 +225,7 @@ * available values for the "type" column: * text one line of text * *vtxt "virtual" line of text, coming from JOINs etc. + * html raw html (use carefully, won't get auto-escaped by smarty! Don't use with user input!) * pass password (will be encrypted with pacrypt()) * b64p password (will be stored with base64_encode()) * num number Modified: trunk/smarty.inc.php =================================================================== --- trunk/smarty.inc.php 2015-04-06 20:35:19 UTC (rev 1774) +++ trunk/smarty.inc.php 2015-04-06 21:09:54 UTC (rev 1775) @@ -17,6 +17,7 @@ } public function assign($key, $value, $sanitise = true) { + $this->template->assign("RAW_$key", $value); if($sanitise == false) { return $this->template->assign($key, $value); } Modified: trunk/templates/list.tpl =================================================================== --- trunk/templates/list.tpl 2015-04-06 20:35:19 UTC (rev 1774) +++ trunk/templates/list.tpl 2015-04-06 21:09:54 UTC (rev 1775) @@ -96,6 +96,8 @@ {elseif $field.type == 'txtl'} {foreach key=key2 item=field2 from=$item.$key}{$field2}<br> {/foreach} + {elseif $field.type == 'html'} + {$RAW_items.{$item.{$msg.id_field}}.$key} {else} {$linktext} {/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2015-04-06 21:59:00
|
Revision: 1776 http://sourceforge.net/p/postfixadmin/code/1776 Author: christian_boltz Date: 2015-04-06 21:58:58 +0000 (Mon, 06 Apr 2015) Log Message: ----------- list.tpl: - add support for list_header (like ":: Alias" in list-virtual) PFAHandler: - add empty default for $msg['list_header'] Modified Paths: -------------- trunk/model/PFAHandler.php trunk/templates/list.tpl Modified: trunk/model/PFAHandler.php =================================================================== --- trunk/model/PFAHandler.php 2015-04-06 21:09:54 UTC (rev 1775) +++ trunk/model/PFAHandler.php 2015-04-06 21:58:58 UTC (rev 1776) @@ -119,6 +119,7 @@ protected $msg = array( 'can_create' => True, 'confirm_delete' => 'confirm', + 'list_header' => '', # headline used in list view ); # called via another *Handler class? (use calledBy() to set this information) Modified: trunk/templates/list.tpl =================================================================== --- trunk/templates/list.tpl 2015-04-06 21:09:54 UTC (rev 1775) +++ trunk/templates/list.tpl 2015-04-06 21:58:58 UTC (rev 1776) @@ -29,6 +29,18 @@ <div id="list"> <table border=0 id='admin_table'><!-- TODO: 'admin_table' needed because of CSS for table header --> +{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} + <tr> + <th colspan="{$colcount}">{$PALANG.{$msg.list_header}}</th> + </tr> +{/if} + <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 *} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2015-04-06 22:09:25
|
Revision: 1777 http://sourceforge.net/p/postfixadmin/code/1777 Author: christian_boltz Date: 2015-04-06 22:09:18 +0000 (Mon, 06 Apr 2015) Log Message: ----------- Use list.tpl to display the alias list list-virtual.php: - use list.tpl for aliases - move show_gen_status handling for aliases to AliasHandler AliasHandler: - initStruct(): - add 'status' column (hidden by default) - hide 'created' - move 'active' after 'modified' to match old list-virtual.php layout - initMsg: add list_header - webformConfig(): if $CONF[show_status], set display_in_list for 'status' column. Also set a (whitespace) label to make sure it's displayed - db_read_from_db_postprocess(): if 'status' column is requested, call gen_show_status() for each row list-virtual.tpl - remove alias table header and create alias button (which should have been in list-virtual_alias.tpl) list-virtual_alias.tpl: - replace code to generate the alias table with {include 'list.tpl'} (and some variable assignments) Modified Paths: -------------- trunk/list-virtual.php trunk/model/AliasHandler.php trunk/templates/list-virtual.tpl trunk/templates/list-virtual_alias.tpl Modified: trunk/list-virtual.php =================================================================== --- trunk/list-virtual.php 2015-04-06 21:58:58 UTC (rev 1776) +++ trunk/list-virtual.php 2015-04-06 22:09:18 UTC (rev 1777) @@ -89,10 +89,11 @@ if (Config::bool('alias_domain')) { $handler = new AliasdomainHandler(0, $admin_username); + $formconf = $handler->webformConfig(); # might change struct $aliasdomain_data = array( 'struct' => $handler->getStruct(), 'msg' => $handler->getMsg(), - 'formconf' => $handler->webformConfig(), + 'formconf' => $formconf, ); $aliasdomain_data['msg']['show_simple_search'] = False; # hide search box @@ -142,6 +143,16 @@ } $handler = new AliasHandler(0, $admin_username); +$formconf = $handler->webformConfig(); # might change struct +$alias_data = array( + 'formconf' => $formconf, + 'struct' => $handler->getStruct(), + 'msg' => $handler->getMsg(), +); +$alias_data['struct']['goto_mailbox']['display_in_list'] = 0; # not useful/defined for non-mailbox aliases +$alias_data['struct']['on_vacation']['display_in_list'] = 0; +$alias_data['msg']['show_simple_search'] = False; # hide search box + $handler->getList($list_param, array(), $page_size, $fDisplay); $pagebrowser_alias = $handler->getPagebrowser($list_param, array()); $tAlias = $handler->result(); @@ -241,7 +252,7 @@ } } -$tCanAddAlias = false; +$alias_data['msg']['can_create'] = false; $tCanAddMailbox = false; $tDisplay_back = ""; @@ -268,11 +279,12 @@ } if($limit['aliases'] == 0) { - $tCanAddAlias = true; + $alias_data['msg']['can_create'] = true; } elseif($limit['alias_count'] < $limit['aliases']) { - $tCanAddAlias = true; + $alias_data['msg']['can_create'] = true; } + if($limit['mailboxes'] == 0) { $tCanAddMailbox = true; } @@ -287,14 +299,6 @@ } } -$gen_show_status = array (); - -if ((is_array ($tAlias) and sizeof ($tAlias) > 0)) { - foreach (array_keys($tAlias) as $i) { - $gen_show_status [$i] = gen_show_status($tAlias[$i]['address']); - } -} - $gen_show_status_mailbox = array (); $divide_quota = array ('current' => array(), 'quota' => array()); if ((is_array ($tMailbox) and sizeof ($tMailbox) > 0)) { @@ -450,8 +454,8 @@ $smarty->assign ('aliasdomain_data', $aliasdomain_data); $smarty->assign ('tAlias', $tAlias); -$smarty->assign ('gen_show_status', $gen_show_status, false); -$smarty->assign ('tCanAddAlias', $tCanAddAlias); +$smarty->assign ('alias_data', $alias_data); + $smarty->assign ('tMailbox', $tMailbox); $smarty->assign ('gen_show_status_mailbox', $gen_show_status_mailbox, false); $smarty->assign ('boolconf_used_quotas', Config::bool('used_quotas')); Modified: trunk/model/AliasHandler.php =================================================================== --- trunk/model/AliasHandler.php 2015-04-06 21:58:58 UTC (rev 1776) +++ trunk/model/AliasHandler.php 2015-04-06 22:09:18 UTC (rev 1777) @@ -27,6 +27,8 @@ $this->struct=array( # field name allow display in... type $PALANG label $PALANG description default / ... # editing? form list + 'status' => pacol( 0, 0, 0, 'html', '' , '' , '', '', + array('not_in_db' => 1) ), 'address' => pacol( $this->new, 1, 1, 'mail', 'alias' , 'pCreate_alias_catchall_text' ), 'localpart' => pacol( $this->new, 0, 0, 'text', 'alias' , 'pCreate_alias_catchall_text' , '', /*options*/ '', @@ -53,9 +55,9 @@ 'on_vacation' => pacol( 1, 0, 1, 'bool', 'pUsersMenu_vacation' , '' , 0 , /*options*/ '', /*not_in_db*/ 1 ), # read_from_db_postprocess() sets the value - TODO: read active flag from vacation table instead? + 'created' => pacol( 0, 0, 0, 'ts', 'created' , '' ), + 'modified' => pacol( 0, 0, 1, 'ts', 'last_modified' , '' ), 'active' => pacol( 1, 1, 1, 'bool', 'active' , '' , 1 ), - 'created' => pacol( 0, 0, 1, 'ts', 'created' , '' ), - 'modified' => pacol( 0, 0, 1, 'ts', 'last_modified' , '' ), '_can_edit' => pacol( 0, 0, 1, 'vnum', '' , '' , 0 , '', array('select' => '1 as _can_edit') ), '_can_delete' => pacol( 0, 0, 1, 'vnum', '' , '' , 0 , '', @@ -68,6 +70,7 @@ $this->msg['error_already_exists'] = 'email_address_already_exists'; $this->msg['error_does_not_exist'] = 'alias_does_not_exist'; $this->msg['confirm_delete'] = 'confirm_delete_alias'; + $this->msg['list_header'] = 'pOverview_alias_title'; if ($this->new) { $this->msg['logname'] = 'create_alias'; @@ -88,6 +91,11 @@ $this->struct['domain']['display_in_form'] = 1; } + if (Config::bool('show_status')) { + $this->struct['status']['display_in_list'] = 1; + $this->struct['status']['label'] = ' '; + } + return array( # $PALANG labels 'formtitle_create' => 'pMain_create_alias', @@ -286,6 +294,10 @@ $db_result[$key]['_can_edit'] = 0; $db_result[$key]['_can_delete'] = 0; } + + if ($this->struct['status']['display_in_list'] && Config::Bool('show_status')) { + $db_result[$key]['status'] = gen_show_status($db_result[$key]['address']); + } } return $db_result; Modified: trunk/templates/list-virtual.tpl =================================================================== --- trunk/templates/list-virtual.tpl 2015-04-06 21:58:58 UTC (rev 1776) +++ trunk/templates/list-virtual.tpl 2015-04-06 22:09:18 UTC (rev 1777) @@ -35,18 +35,8 @@ {*** Aliases ***} {if $tab=='alias' || $tab=='all'} {$nav_bar_alias.top} - <table id="alias_table"> - <tr> - <th colspan="7">{$PALANG.pOverview_alias_title}</th> - </tr> - {if $tAlias} - {include file="list-virtual_alias.tpl"} - {/if} - </table> + {include file="list-virtual_alias.tpl"} {$nav_bar_alias.bottom} - {if $tCanAddAlias} - <br /><a href="{#url_create_alias#}&domain={$fDomain|escape:"url"}" class="button">{$PALANG.add_alias}</a><br /> - {/if} {/if} {if $tab=='all'}<br />{/if} {if $tab=='mailbox' || $tab=='all'} Modified: trunk/templates/list-virtual_alias.tpl =================================================================== --- trunk/templates/list-virtual_alias.tpl 2015-04-06 21:58:58 UTC (rev 1776) +++ trunk/templates/list-virtual_alias.tpl 2015-04-06 22:09:18 UTC (rev 1777) @@ -1,58 +1,10 @@ -{if isset($search._)} - {assign var="search" value=$search._} -{else} - {assign var="search" value=''} -{/if} +{assign var="table" value='alias'} +{assign var="struct" value=$alias_data.struct} +{assign var="msg" value=$alias_data.msg} +{assign var="id_field" value=$msg.id_field} +{assign var="formconf" value=$alias_data.formconf} +{assign var="items" value=$tAlias} +{assign var="RAW_items" value=$RAW_tAlias} - {#tr_header#} - {if $CONF.show_status===YES} - <td></td> - {/if} - <td>{$PALANG.pOverview_alias_address}</td> - <td>{$PALANG.to}</td> - <td>{$PALANG.last_modified}</td> - <td>{$PALANG.active}</td> - <td colspan="2"> </td> - </tr> - {foreach from=$tAlias item=item key=i} - {#tr_hilightoff#} - {if $CONF.show_status===YES} - <td>{$gen_show_status[$i]}</td> - {/if} - <td> - {if $search eq ""} - {$item.address} - {else} - {$item.address|replace:$search:"<span class='searchresult'>$search</span>"} - {/if} - </td> - {if $CONF.alias_goto_limit>0} - <td><i>sorry, alias_goto_limit > 0 not handled</i></td> - {else} - <td> - {foreach key=key2 item=singlegoto from=$item.goto} +{include 'list.tpl'} - {if $search eq ""} - {$singlegoto}<br /> - {else} - {$singlegoto|replace:$search:"<span class='searchresult'>$search</span>"}<br /> - {/if} - - {/foreach} - </td> - {/if} - <td>{$item.modified}</td> - {if $item._can_edit} - <td><a href="{#url_editactive#}alias&id={$item.address|escape:"url"}&active={if ($item.active==0)}1{else}0{/if}&token={$smarty.session.PFA_token|escape:"url"}" - >{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</a></td> - <td><a href="{#url_create_alias#}&edit={$item.address|escape:"url"}">{$PALANG.edit}</a></td> - <td><a href="delete.php?table=alias&delete={$item.address|escape:"url"}&token={$smarty.session.PFA_token|escape:"url"}" - onclick="return confirm ('{$PALANG.confirm}{$PALANG.aliases}: {$item.address}');">{$PALANG.del}</a></td> - {else} - <td>{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</td> - <td> </td> - <td> </td> - {/if} - </tr> - {/foreach} - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2015-04-06 22:45:01
|
Revision: 1781 http://sourceforge.net/p/postfixadmin/code/1781 Author: christian_boltz Date: 2015-04-06 22:44:51 +0000 (Mon, 06 Apr 2015) Log Message: ----------- broadcast-message.php, sendmail.php, MailboxHandler, *.lang: - include mailbox name in pSendmail_result_error and pSendmail_result_success Modified Paths: -------------- trunk/broadcast-message.php trunk/languages/bg.lang trunk/languages/ca.lang trunk/languages/cn.lang trunk/languages/cs.lang trunk/languages/da.lang trunk/languages/de.lang trunk/languages/en.lang trunk/languages/es.lang trunk/languages/et.lang trunk/languages/eu.lang trunk/languages/fi.lang trunk/languages/fo.lang trunk/languages/fr.lang trunk/languages/hr.lang trunk/languages/hu.lang trunk/languages/is.lang trunk/languages/it.lang trunk/languages/ja.lang trunk/languages/lt.lang trunk/languages/mk.lang trunk/languages/nb.lang trunk/languages/nl.lang trunk/languages/nn.lang trunk/languages/pl.lang trunk/languages/pt-br.lang trunk/languages/ru.lang trunk/languages/sk.lang trunk/languages/sl.lang trunk/languages/sv.lang trunk/languages/tr.lang trunk/languages/tw.lang trunk/model/MailboxHandler.php trunk/sendmail.php Modified: trunk/broadcast-message.php =================================================================== --- trunk/broadcast-message.php 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/broadcast-message.php 2015-04-06 22:44:51 UTC (rev 1781) @@ -73,11 +73,11 @@ if (!smtp_mail ($fTo, $smtp_from_email, $fHeaders)) { - flash_error($PALANG['pSendmail_result_error']); + flash_error(Config::lang_f('pSendmail_result_error', $fTo)); } else { - flash_info($PALANG['pSendmail_result_success']); + flash_info(Config::lang_f('pSendmail_result_success', $fTo)); } } } Modified: trunk/languages/bg.lang =================================================================== --- trunk/languages/bg.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/bg.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -17,7 +17,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Наистина ли искате да изтриете всички записи за този домейн? Това действие е необратимо!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Наистина ли искате да изтриете всички записи за този домейн? Това действие е необратимо!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -223,8 +223,8 @@ $PALANG['pSendmail_subject_text'] = 'Добре дошли'; $PALANG['pSendmail_body'] = 'Текст'; $PALANG['pSendmail_button'] = 'Изпрати'; -$PALANG['pSendmail_result_error'] = 'Не мога да изпратя съобщението!'; -$PALANG['pSendmail_result_success'] = 'Съобщението беше изпратено!'; +$PALANG['pSendmail_result_error'] = 'Не мога да изпратя съобщението! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'Съобщението беше изпратено! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Списък с админите'; $PALANG['pAdminMenu_list_domain'] = 'Списък с домейните'; Modified: trunk/languages/ca.lang =================================================================== --- trunk/languages/ca.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/ca.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -16,7 +16,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Estas segur que vols borrar tots els registres d\'aquest domini? Això no podrà ser desfet!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Estas segur que vols borrar tots els registres d\'aquest domini? Això no podrà ser desfet!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -221,8 +221,8 @@ $PALANG['pSendmail_subject_text'] = 'Benvingut'; $PALANG['pSendmail_body'] = 'Cos'; $PALANG['pSendmail_button'] = 'Enviar missatge'; -$PALANG['pSendmail_result_error'] = 'Imposible crear la bústia!'; # XXX text change - new: Unable to send email! -$PALANG['pSendmail_result_success'] = 'La bústia ha estat creada!'; # XXX text change - new: Email sent! +$PALANG['pSendmail_result_error'] = 'Imposible crear la bústia! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'La bústia ha estat creada! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Llistat d\'administradors'; $PALANG['pAdminMenu_list_domain'] = 'Llistat de dominis'; Modified: trunk/languages/cn.lang =================================================================== --- trunk/languages/cn.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/cn.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -16,7 +16,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = '你是否确定要删除该域中的所有记录? 删除后不可恢复!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = '你是否确定要删除该域中的所有记录? 删除后不可恢复!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -222,8 +222,8 @@ $PALANG['pSendmail_subject_text'] = '欢迎'; $PALANG['pSendmail_body'] = '内容'; $PALANG['pSendmail_button'] = '发送'; -$PALANG['pSendmail_result_error'] = '建立邮箱失败!'; # XXX text change - new: Unable to send email! -$PALANG['pSendmail_result_success'] = '建立邮箱成功!'; # XXX text change - new: Email sent! +$PALANG['pSendmail_result_error'] = '建立邮箱失败! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = '建立邮箱成功! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = '管理员清单'; $PALANG['pAdminMenu_list_domain'] = '域名清单'; Modified: trunk/languages/cs.lang =================================================================== --- trunk/languages/cs.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/cs.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -21,7 +21,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Opravdu chcete smazat všechny záznamy v této doméně Tohle nelze vrátit!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Opravdu chcete smazat všechny záznamy v této doméně Tohle nelze vrátit!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -231,8 +231,8 @@ $PALANG['pSendmail_subject_text'] = 'Vítejte'; $PALANG['pSendmail_body'] = 'Obsah'; $PALANG['pSendmail_button'] = 'Poslat email'; -$PALANG['pSendmail_result_error'] = 'Nepodařilo se odeslat email!'; -$PALANG['pSendmail_result_success'] = 'Email odeslán!'; +$PALANG['pSendmail_result_error'] = 'Nepodařilo se odeslat email! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'Email odeslán! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Administrátoři domén'; $PALANG['pAdminMenu_list_domain'] = 'Domény'; Modified: trunk/languages/da.lang =================================================================== --- trunk/languages/da.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/da.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -19,7 +19,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Vil du virkelig slette alle adresser for dette domæne? Dette kan ikke fortrydes!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Vil du virkelig slette alle adresser for dette domæne? Dette kan ikke fortrydes!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -230,8 +230,8 @@ $PALANG['pSendmail_subject_text'] = 'Velkommen'; $PALANG['pSendmail_body'] = 'Meddelelse'; $PALANG['pSendmail_button'] = 'Send email'; -$PALANG['pSendmail_result_error'] = 'Kan ikke sende email!'; -$PALANG['pSendmail_result_success'] = 'Email sendt!'; +$PALANG['pSendmail_result_error'] = 'Kan ikke sende email! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'Email sendt! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Administratorliste'; $PALANG['pAdminMenu_list_domain'] = 'Domæne-liste'; Modified: trunk/languages/de.lang =================================================================== --- trunk/languages/de.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/de.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -227,8 +227,8 @@ $PALANG['pSendmail_subject_text'] = 'Willkommen'; $PALANG['pSendmail_body'] = 'Text'; $PALANG['pSendmail_button'] = 'Nachricht versenden'; -$PALANG['pSendmail_result_error'] = 'Mail konnte nicht gesendet werden!'; -$PALANG['pSendmail_result_success'] = 'Mail gesendet!'; +$PALANG['pSendmail_result_error'] = 'Mail konnte nicht an %s gesendet werden!'; +$PALANG['pSendmail_result_success'] = 'Mail an %s gesendet.'; $PALANG['pAdminMenu_list_admin'] = 'Admin Liste'; $PALANG['pAdminMenu_list_domain'] = 'Domain Liste'; Modified: trunk/languages/en.lang =================================================================== --- trunk/languages/en.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/en.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -228,8 +228,8 @@ $PALANG['pSendmail_subject_text'] = 'Welcome'; $PALANG['pSendmail_body'] = 'Body'; $PALANG['pSendmail_button'] = 'Send Message'; -$PALANG['pSendmail_result_error'] = 'Unable to send email!'; -$PALANG['pSendmail_result_success'] = 'Email sent!'; +$PALANG['pSendmail_result_error'] = 'Unable to send email to %s!'; +$PALANG['pSendmail_result_success'] = 'Email sent to %s.'; $PALANG['pAdminMenu_list_admin'] = 'Admin List'; $PALANG['pAdminMenu_list_domain'] = 'Domain List'; Modified: trunk/languages/es.lang =================================================================== --- trunk/languages/es.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/es.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -17,7 +17,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = '¿Está seguro de que desea borrar todos los registros de este dominio? ¡Esto no puede ser deshecho!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = '¿Está seguro de que desea borrar todos los registros de este dominio? ¡Esto no puede ser deshecho!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -223,8 +223,8 @@ $PALANG['pSendmail_subject_text'] = 'Bienvenido'; $PALANG['pSendmail_body'] = 'Cuerpo'; $PALANG['pSendmail_button'] = 'Enviar mensaje'; -$PALANG['pSendmail_result_error'] = '¡Imposible enviar el email!'; -$PALANG['pSendmail_result_success'] = '¡Email enviado!'; +$PALANG['pSendmail_result_error'] = '¡Imposible enviar el email! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = '¡Email enviado! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Lista de administradores'; $PALANG['pAdminMenu_list_domain'] = 'Lista de dominios'; Modified: trunk/languages/et.lang =================================================================== --- trunk/languages/et.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/et.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -16,7 +16,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Oled tõesti kindel, et tahad kustutada kõik kirjed sellele domeenile? Seda tegevust ei saa tagasi võtta!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Oled tõesti kindel, et tahad kustutada kõik kirjed sellele domeenile? Seda tegevust ei saa tagasi võtta!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -222,8 +222,8 @@ $PALANG['pSendmail_subject_text'] = 'Tere tulemast'; $PALANG['pSendmail_body'] = 'Põhitekst'; $PALANG['pSendmail_button'] = 'Saada teade'; -$PALANG['pSendmail_result_error'] = 'Postkasti loomine ebaõnnestus!'; # XXX text change - new: Unable to send email! -$PALANG['pSendmail_result_success'] = 'Postkast on loodud!'; # XXX text change - new: Email sent! +$PALANG['pSendmail_result_error'] = 'Postkasti loomine ebaõnnestus! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'Postkast on loodud! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Haldajad'; $PALANG['pAdminMenu_list_domain'] = 'Domeenid'; Modified: trunk/languages/eu.lang =================================================================== --- trunk/languages/eu.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/eu.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -16,7 +16,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Ziur al zaude domeinu honetako erregistro guztiak ezbatu nahi dituzula? Hau ezin izango da desegin!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Ziur al zaude domeinu honetako erregistro guztiak ezbatu nahi dituzula? Hau ezin izango da desegin!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -220,8 +220,8 @@ $PALANG['pSendmail_subject_text'] = 'Ongi etorri'; $PALANG['pSendmail_body'] = 'Gorputza'; $PALANG['pSendmail_button'] = 'Mezua bidali'; -$PALANG['pSendmail_result_error'] = 'Ezinezkoa postontzia sortzea!'; # XXX text change - new: Unable to send email! -$PALANG['pSendmail_result_success'] = 'Postontzia sortuta!'; # XXX text change - new: Email sent! +$PALANG['pSendmail_result_error'] = 'Ezinezkoa postontzia sortzea! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'Postontzia sortuta! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Kudeatzaile zerrenda'; $PALANG['pAdminMenu_list_domain'] = 'Domeinu zerrenda'; Modified: trunk/languages/fi.lang =================================================================== --- trunk/languages/fi.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/fi.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -17,7 +17,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Oletko varma että haluat poistaa kaikki tietueet tästä domainista? Tätä komentoa ei voi perua!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Oletko varma että haluat poistaa kaikki tietueet tästä domainista? Tätä komentoa ei voi perua!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -222,8 +222,8 @@ $PALANG['pSendmail_subject_text'] = 'Tervetuloa'; $PALANG['pSendmail_body'] = 'Viesti'; $PALANG['pSendmail_button'] = 'Lähetä viesti'; -$PALANG['pSendmail_result_error'] = 'Sähköpostin lähetys ei onnistunut!'; -$PALANG['pSendmail_result_success'] = 'Sähköposti lähetetty!'; +$PALANG['pSendmail_result_error'] = 'Sähköpostin lähetys ei onnistunut! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'Sähköposti lähetetty! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Ylläpitäjä Lista'; $PALANG['pAdminMenu_list_domain'] = 'Domain Lista'; Modified: trunk/languages/fo.lang =================================================================== --- trunk/languages/fo.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/fo.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -16,7 +16,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Vilt tú veruliga strika allar upplýsingar fyri hetta navnaøki? Her kann ikki vendast aftur!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Vilt tú veruliga strika allar upplýsingar fyri hetta navnaøki? Her kann ikki vendast aftur!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -222,8 +222,8 @@ $PALANG['pSendmail_subject_text'] = 'Vælkomin'; $PALANG['pSendmail_body'] = 'Boð'; $PALANG['pSendmail_button'] = 'Send boð'; -$PALANG['pSendmail_result_error'] = 'Fái ikki stovnað postkassa!'; # XXX text change - new: Unable to send email! -$PALANG['pSendmail_result_success'] = 'Postkassin er stovnaður!'; # XXX text change - new: Email sent! +$PALANG['pSendmail_result_error'] = 'Fái ikki stovnað postkassa! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'Postkassin er stovnaður! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Umsitara listi'; $PALANG['pAdminMenu_list_domain'] = 'Navnaøkja listi'; Modified: trunk/languages/fr.lang =================================================================== --- trunk/languages/fr.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/fr.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -18,7 +18,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Etes-vous sur de vouloir effacer tous les enregistrements dans ce domaine ? Cette opération ne pourra pas être annulée.\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Etes-vous sur de vouloir effacer tous les enregistrements dans ce domaine ? Cette opération ne pourra pas être annulée.\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -223,8 +223,8 @@ $PALANG['pSendmail_subject_text'] = 'Bienvenue'; $PALANG['pSendmail_body'] = 'Message'; $PALANG['pSendmail_button'] = 'Envoyer le message'; -$PALANG['pSendmail_result_error'] = 'Erreur lors de l\'envoit du message!'; -$PALANG['pSendmail_result_success'] = 'Le message a été envoyé!'; +$PALANG['pSendmail_result_error'] = 'Erreur lors de l\'envoit du message! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'Le message a été envoyé! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Liste Administrateurs'; $PALANG['pAdminMenu_list_domain'] = 'Liste Domaines'; Modified: trunk/languages/hr.lang =================================================================== --- trunk/languages/hr.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/hr.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -15,7 +15,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Da li ste sigurni da elite pobrisati sve zapise za tu domenu? Zapisi ce biti zauvijek pobrisani!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Da li ste sigurni da elite pobrisati sve zapise za tu domenu? Zapisi ce biti zauvijek pobrisani!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -221,8 +221,8 @@ $PALANG['pSendmail_subject_text'] = 'Dobrodoli!'; $PALANG['pSendmail_body'] = 'Tekst'; $PALANG['pSendmail_button'] = 'Poalji poruku'; -$PALANG['pSendmail_result_error'] = 'Potanski ormarić nije bilo moguče stvoriti!'; # XXX text change - new: Unable to send email! -$PALANG['pSendmail_result_success'] = 'Potanski ormarić je uspjeno stvoren!'; # XXX text change - new: Email sent! +$PALANG['pSendmail_result_error'] = 'Potanski ormarić nije bilo moguče stvoriti! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'Potanski ormarić je uspjeno stvoren! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Lista administratora'; $PALANG['pAdminMenu_list_domain'] = 'Lista domena'; Modified: trunk/languages/hu.lang =================================================================== --- trunk/languages/hu.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/hu.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -16,7 +16,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Biztos hogy törölni akarod az összes bejegyzést ez alól a domain alól? Nem lehet visszahozni késõbb!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Biztos hogy törölni akarod az összes bejegyzést ez alól a domain alól? Nem lehet visszahozni késõbb!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -227,8 +227,8 @@ $PALANG['pSendmail_subject_text'] = 'Postafiókja sikeresen elkészült!'; $PALANG['pSendmail_body'] = 'Üzenet'; $PALANG['pSendmail_button'] = 'Üzenet küldése'; -$PALANG['pSendmail_result_error'] = 'Postafiók létrehozása sikertelen!'; # XXX text change - new: Unable to send email! -$PALANG['pSendmail_result_success'] = 'A postafiók sikeresen elkészült!'; # XXX text change - new: Email sent! +$PALANG['pSendmail_result_error'] = 'Postafiók létrehozása sikertelen! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'A postafiók sikeresen elkészült! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Admin Lista'; $PALANG['pAdminMenu_list_domain'] = 'Domain Lista'; Modified: trunk/languages/is.lang =================================================================== --- trunk/languages/is.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/is.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -16,7 +16,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Ertu viss um að þú viljir eyða öllu sem tengist þessu léni? Það er ekki hægt að bakka með aðgerðina!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Ertu viss um að þú viljir eyða öllu sem tengist þessu léni? Það er ekki hægt að bakka með aðgerðina!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -222,8 +222,8 @@ $PALANG['pSendmail_subject_text'] = 'Velkomin'; $PALANG['pSendmail_body'] = 'Meginmál'; $PALANG['pSendmail_button'] = 'Senda skilaboð'; -$PALANG['pSendmail_result_error'] = 'Get ekki búið til nýtt pósthólf!'; # XXX text change - new: Unable to send email! -$PALANG['pSendmail_result_success'] = 'Pósthólfið hefur verið stofnað!'; # XXX text change - new: Email sent! +$PALANG['pSendmail_result_error'] = 'Get ekki búið til nýtt pósthólf! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'Pósthólfið hefur verið stofnað! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Kerfisstjóralisti'; $PALANG['pAdminMenu_list_domain'] = 'Lénalisti'; Modified: trunk/languages/it.lang =================================================================== --- trunk/languages/it.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/it.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -17,7 +17,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Sei sicuro di voler cancellare tutti gli indirizzi di questo dominio? Questa modifica sarà permanente!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Sei sicuro di voler cancellare tutti gli indirizzi di questo dominio? Questa modifica sarà permanente!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -223,8 +223,8 @@ $PALANG['pSendmail_subject_text'] = 'Benvenuto'; $PALANG['pSendmail_body'] = 'Corpo'; $PALANG['pSendmail_button'] = 'Spedisci messaggio'; -$PALANG['pSendmail_result_error'] = 'Impossibile creare la casella di posta!'; # XXX text change - new: Unable to send email! -$PALANG['pSendmail_result_success'] = 'La casella di posta è stata creata!'; # XXX text change - new: Email sent! +$PALANG['pSendmail_result_error'] = 'Impossibile creare la casella di posta! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'La casella di posta è stata creata! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Lista degli amministratori'; $PALANG['pAdminMenu_list_domain'] = 'Lista dei domini'; Modified: trunk/languages/ja.lang =================================================================== --- trunk/languages/ja.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/ja.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -17,7 +17,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = '本当にこのドメインのすべての情報を削除してもよろしいですか?これを元に戻すことはできません。\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = '本当にこのドメインのすべての情報を削除してもよろしいですか?これを元に戻すことはできません。\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -227,8 +227,8 @@ $PALANG['pSendmail_subject_text'] = 'ようこそ'; $PALANG['pSendmail_body'] = '本文'; $PALANG['pSendmail_button'] = 'メッセージ送信'; -$PALANG['pSendmail_result_error'] = 'メールが送信できません!'; -$PALANG['pSendmail_result_success'] = 'メールが送信されました。'; +$PALANG['pSendmail_result_error'] = 'メールが送信できません! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'メールが送信されました。 (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = '管理者一覧'; $PALANG['pAdminMenu_list_domain'] = 'ドメイン一覧'; Modified: trunk/languages/lt.lang =================================================================== --- trunk/languages/lt.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/lt.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -16,7 +16,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Tikrai norite šalinti visus šios srities įrašus? Operacija negrįžtama!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Tikrai norite šalinti visus šios srities įrašus? Operacija negrįžtama!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -223,8 +223,8 @@ $PALANG['pSendmail_subject_text'] = 'Sveiki'; $PALANG['pSendmail_body'] = 'Žinutė'; $PALANG['pSendmail_button'] = 'Siųsti'; -$PALANG['pSendmail_result_error'] = 'Žinutės išsiųsti nepavyko!'; -$PALANG['pSendmail_result_success'] = 'Žinutė išsiųsta!'; +$PALANG['pSendmail_result_error'] = 'Žinutės išsiųsti nepavyko! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'Žinutė išsiųsta! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Administratoriai'; $PALANG['pAdminMenu_list_domain'] = 'Sritys'; Modified: trunk/languages/mk.lang =================================================================== --- trunk/languages/mk.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/mk.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -16,7 +16,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Дали сакате да ги избришете сите записи од овој домен? Ова не може да се поправи покасно!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Дали сакате да ги избришете сите записи од овој домен? Ова не може да се поправи покасно!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -222,8 +222,8 @@ $PALANG['pSendmail_subject_text'] = 'Добро дојдовте'; $PALANG['pSendmail_body'] = 'Содржина'; $PALANG['pSendmail_button'] = 'Прати порака'; -$PALANG['pSendmail_result_error'] = 'Не можам да го креирам сандачето!'; # XXX text change - new: Unable to send email! -$PALANG['pSendmail_result_success'] = 'Сандачето е креирано!'; # XXX text change - new: Email sent! +$PALANG['pSendmail_result_error'] = 'Не можам да го креирам сандачето! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'Сандачето е креирано! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Листа на администратори'; $PALANG['pAdminMenu_list_domain'] = 'Листа на домени'; Modified: trunk/languages/nb.lang =================================================================== --- trunk/languages/nb.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/nb.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -18,7 +18,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Ønsker du virkelig å slette alle oppføringer for dette domenet? Dette kan ikke angres!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Ønsker du virkelig å slette alle oppføringer for dette domenet? Dette kan ikke angres!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -223,8 +223,8 @@ $PALANG['pSendmail_subject_text'] = 'Velkommen'; $PALANG['pSendmail_body'] = 'Meldingstekst'; $PALANG['pSendmail_button'] = 'Send melding'; -$PALANG['pSendmail_result_error'] = 'Kunne ikke sende e-postmeldingen!'; -$PALANG['pSendmail_result_success'] = 'E-postmeldingen er sendt!'; +$PALANG['pSendmail_result_error'] = 'Kunne ikke sende e-postmeldingen! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'E-postmeldingen er sendt! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Administratorer'; $PALANG['pAdminMenu_list_domain'] = 'Domener'; Modified: trunk/languages/nl.lang =================================================================== --- trunk/languages/nl.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/nl.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -17,7 +17,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Weet u zeker dat u ALLE data van het domein wilt verwijderen? Dit kan niet ongedaan worden gemaakt!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Weet u zeker dat u ALLE data van het domein wilt verwijderen? Dit kan niet ongedaan worden gemaakt!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -224,8 +224,8 @@ $PALANG['pSendmail_subject_text'] = 'Welkom'; $PALANG['pSendmail_body'] = 'Inhoud'; $PALANG['pSendmail_button'] = 'Verstuur bericht'; -$PALANG['pSendmail_result_error'] = 'Mislukt om mail te versturen!'; -$PALANG['pSendmail_result_success'] = 'E-mail verstuurd!'; +$PALANG['pSendmail_result_error'] = 'Mislukt om mail te versturen! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'E-mail verstuurd! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Beheerders overzicht'; $PALANG['pAdminMenu_list_domain'] = 'Domein overzicht'; Modified: trunk/languages/nn.lang =================================================================== --- trunk/languages/nn.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/nn.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -16,7 +16,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Vil du virkelig slette alle poster og domenet?\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Vil du virkelig slette alle poster og domenet?\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -221,8 +221,8 @@ $PALANG['pSendmail_subject_text'] = 'Velkommen'; $PALANG['pSendmail_body'] = 'Melding'; $PALANG['pSendmail_button'] = 'Send beskjed'; -$PALANG['pSendmail_result_error'] = 'Klarte ikke å opprette e-postkontoen!'; # XXX text change - new: Unable to send email! -$PALANG['pSendmail_result_success'] = 'E-postkontoen er opprettet!'; # XXX text change - new: Email sent! +$PALANG['pSendmail_result_error'] = 'Klarte ikke å opprette e-postkontoen! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'E-postkontoen er opprettet! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Administrator-liste'; $PALANG['pAdminMenu_list_domain'] = 'Domene-liste'; Modified: trunk/languages/pl.lang =================================================================== --- trunk/languages/pl.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/pl.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -19,7 +19,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Czy rzeczywiście chcesz usunąć wszystkie wpisy dla tej domeny? To jest proces nieodwracalny!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Czy rzeczywiście chcesz usunąć wszystkie wpisy dla tej domeny? To jest proces nieodwracalny!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -225,8 +225,8 @@ $PALANG['pSendmail_subject_text'] = 'Witamy'; $PALANG['pSendmail_body'] = 'Tekst'; $PALANG['pSendmail_button'] = 'Wyślij wiadomość'; -$PALANG['pSendmail_result_error'] = 'Nie można wysłać emaila!'; -$PALANG['pSendmail_result_success'] = 'Email wysłany!'; +$PALANG['pSendmail_result_error'] = 'Nie można wysłać emaila! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'Email wysłany! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Lista administratorów'; $PALANG['pAdminMenu_list_domain'] = 'Lista domen'; Modified: trunk/languages/pt-br.lang =================================================================== --- trunk/languages/pt-br.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/pt-br.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -17,7 +17,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Tem certeza de que deseja remover todos os registros deste domínio? Essa ação não pode ser desfeita!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Tem certeza de que deseja remover todos os registros deste domínio? Essa ação não pode ser desfeita!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -229,8 +229,8 @@ $PALANG['pSendmail_subject_text'] = 'Bem-vindo(a)'; $PALANG['pSendmail_body'] = 'Corpo da Mensagem'; $PALANG['pSendmail_button'] = 'Enviar Mensagem'; -$PALANG['pSendmail_result_error'] = 'Não foi possível enviar a mensagem!'; -$PALANG['pSendmail_result_success'] = 'Mensagem enviada!'; +$PALANG['pSendmail_result_error'] = 'Não foi possível enviar a mensagem! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'Mensagem enviada! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Administradores'; $PALANG['pAdminMenu_list_domain'] = 'Domínios'; Modified: trunk/languages/ru.lang =================================================================== --- trunk/languages/ru.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/ru.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -18,7 +18,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Вы действительно хотите удалить все настройки для домена? Это действие нельзя будет отменить!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Вы действительно хотите удалить все настройки для домена? Это действие нельзя будет отменить!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -229,8 +229,8 @@ $PALANG['pSendmail_subject_text'] = 'Добро пожаловать!'; $PALANG['pSendmail_body'] = 'Текст'; $PALANG['pSendmail_button'] = 'Послать сообщение'; -$PALANG['pSendmail_result_error'] = 'Невозможно отправить сообщение!'; -$PALANG['pSendmail_result_success'] = 'Сообщение отправлено!'; +$PALANG['pSendmail_result_error'] = 'Невозможно отправить сообщение! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'Сообщение отправлено! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Список админов'; $PALANG['pAdminMenu_list_domain'] = 'Список доменов'; Modified: trunk/languages/sk.lang =================================================================== --- trunk/languages/sk.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/sk.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -17,7 +17,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Naozaj chcete zmazať všetky záznamy v tejto doméne? Toto nie je možné vrátiť!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Naozaj chcete zmazať všetky záznamy v tejto doméne? Toto nie je možné vrátiť!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -223,8 +223,8 @@ $PALANG['pSendmail_subject_text'] = 'Vitajte'; $PALANG['pSendmail_body'] = 'Obsah'; $PALANG['pSendmail_button'] = 'Poslať email'; -$PALANG['pSendmail_result_error'] = 'Nepodarilo sa poslať email!'; -$PALANG['pSendmail_result_success'] = 'Email odoslaný!'; +$PALANG['pSendmail_result_error'] = 'Nepodarilo sa poslať email! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'Email odoslaný! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Administrátori'; $PALANG['pAdminMenu_list_domain'] = 'Domény'; Modified: trunk/languages/sl.lang =================================================================== --- trunk/languages/sl.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/sl.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -16,7 +16,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Ali ste prepričani, da želite brisati vse zapise za to domeno? Zapisi bodo izgubljeni za vedno!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Ali ste prepričani, da želite brisati vse zapise za to domeno? Zapisi bodo izgubljeni za vedno!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -222,8 +222,8 @@ $PALANG['pSendmail_subject_text'] = 'Pozdravljeni!'; $PALANG['pSendmail_body'] = 'Besedilo'; $PALANG['pSendmail_button'] = 'Pošlji sporočilo'; -$PALANG['pSendmail_result_error'] = 'Predala ni bilo mogoče ustvariti!'; # XXX text change - new: Unable to send email! -$PALANG['pSendmail_result_success'] = 'Predal je bil uspešno ustvarjen!'; # XXX text change - new: Email sent! +$PALANG['pSendmail_result_error'] = 'Predala ni bilo mogoče ustvariti! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'Predal je bil uspešno ustvarjen! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Seznam administratorjev'; $PALANG['pAdminMenu_list_domain'] = 'Seznam domen'; Modified: trunk/languages/sv.lang =================================================================== --- trunk/languages/sv.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/sv.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -18,7 +18,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Vill du verkligen radera all data för denna domän? Kan ej ångras!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Vill du verkligen radera all data för denna domän? Kan ej ångras!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -224,8 +224,8 @@ $PALANG['pSendmail_subject_text'] = 'Välkommen'; $PALANG['pSendmail_body'] = 'Meddelande'; $PALANG['pSendmail_button'] = 'Skicka'; -$PALANG['pSendmail_result_error'] = 'Mailet kunde inte skickas!'; -$PALANG['pSendmail_result_success'] = 'Mailet har skickats!'; +$PALANG['pSendmail_result_error'] = 'Mailet kunde inte skickas! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'Mailet har skickats! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Administratörer'; $PALANG['pAdminMenu_list_domain'] = 'Domäner'; Modified: trunk/languages/tr.lang =================================================================== --- trunk/languages/tr.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/tr.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -16,7 +16,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = 'Bu domain için tüm kayýtlarý silmek istediðinizden emin misiniz? Bu iþlem geri alýnamaz!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = 'Bu domain için tüm kayýtlarý silmek istediðinizden emin misiniz? Bu iþlem geri alýnamaz!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -222,8 +222,8 @@ $PALANG['pSendmail_subject_text'] = 'Hoþ geldiniz'; $PALANG['pSendmail_body'] = 'Metin'; $PALANG['pSendmail_button'] = 'Mesaj Gönder'; -$PALANG['pSendmail_result_error'] = 'Posta kutusu yaratýlamadý!'; # XXX text change - new: Unable to send email! -$PALANG['pSendmail_result_success'] = 'Posta kutusu yaratýldý!'; # XXX text change - new: Email sent! +$PALANG['pSendmail_result_error'] = 'Posta kutusu yaratýlamadý! (%s)'; # XXX text change - new: Unable to send email to %s! +$PALANG['pSendmail_result_success'] = 'Posta kutusu yaratýldý! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = 'Yönetici Listesi'; $PALANG['pAdminMenu_list_domain'] = 'Domain Listesi'; Modified: trunk/languages/tw.lang =================================================================== --- trunk/languages/tw.lang 2015-04-06 22:27:00 UTC (rev 1780) +++ trunk/languages/tw.lang 2015-04-06 22:44:51 UTC (rev 1781) @@ -16,7 +16,7 @@ $PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX $PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX $PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX -$PALANG['confirm_delete_domain'] = '你是否確定要刪除該網域中的所有記錄? 刪除後不可恢復!\n (%s)'; # XXX XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' +$PALANG['confirm_delete_domain'] = '你是否確定要刪除該網域中的所有記錄? 刪除後不可恢復!\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone' $PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX $PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX $PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX @@ -222,8 +222,8 @@ $PALANG['pSendmail_subject_text'] = '歡迎'; $PALANG['pSendmail_body'] = '內容'; $PALANG['pSendmail_button'] = '發送'; -$PALANG['pSendmail_result_error'] = '建立郵箱失敗!'; # XXX text change - new: Unable to send email! -$PALANG['pSendmail_result_success'] = '建立郵箱成功!'; # XXX text change - new: Email sent! +$PALANG['pSendmail_result_error'] = '建立郵箱失敗! (%s)'; # XXX text change ... [truncated message content] |
From: <chr...@us...> - 2015-09-26 13:11:22
|
Revision: 1801 http://sourceforge.net/p/postfixadmin/code/1801 Author: christian_boltz Date: 2015-09-26 13:11:20 +0000 (Sat, 26 Sep 2015) Log Message: ----------- refresh debian/patches/db_credentials Also update the changelog once more - let's hope this is really the beta3 release now ;-) Modified Paths: -------------- trunk/CHANGELOG.TXT trunk/debian/changelog trunk/debian/patches/db_credentials Modified: trunk/CHANGELOG.TXT =================================================================== --- trunk/CHANGELOG.TXT 2015-09-26 11:02:41 UTC (rev 1800) +++ trunk/CHANGELOG.TXT 2015-09-26 13:11:20 UTC (rev 1801) @@ -9,7 +9,7 @@ # Last update: # $Id$ -Version 3.0 beta3 (2.93) - 2015/09/26 - SVN r1799 +Version 3.0 beta3 (2.93) - 2015/09/26 - SVN r1802 ------------------------------------------------- Summary of major changes: Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2015-09-26 11:02:41 UTC (rev 1800) +++ trunk/debian/changelog 2015-09-26 13:11:20 UTC (rev 1801) @@ -1,8 +1,9 @@ postfixadmin (2.93-1) unstable; urgency=low * New upstream release (effectively beta3 for v3.0) + * update dependencies to allow mariadb as database - -- David Goodwin <da...@pa...> Sat, 26 Sep 2015 12:36:00 +0100 + -- David Goodwin <da...@pa...> Sat, 26 Sep 2015 15:05:00 +0100 postfixadmin (2.92-1) unstable; urgency=low Modified: trunk/debian/patches/db_credentials =================================================================== --- trunk/debian/patches/db_credentials 2015-09-26 11:02:41 UTC (rev 1800) +++ trunk/debian/patches/db_credentials 2015-09-26 13:11:20 UTC (rev 1801) @@ -5,9 +5,9 @@ Index: postfixadmin/config.inc.php =================================================================== ---- postfixadmin.orig/config.inc.php 2011-12-18 05:22:05.000000000 +0100 -+++ postfixadmin/config.inc.php 2011-12-18 05:31:16.000000000 +0100 -@@ -16,6 +16,11 @@ +--- postfixadmin.orig/config.inc.php 2015-09-26 15:03:05.000000000 +0100 ++++ postfixadmin/config.inc.php 2015-09-26 15:03:16.000000000 +0100 +@@ -15,6 +15,11 @@ * Contains configuration options. */ @@ -19,7 +19,7 @@ /***************************************************************** * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! * You have to set $CONF['configured'] = true; before the -@@ -23,7 +28,7 @@ +@@ -22,7 +27,7 @@ * Doing this implies you have changed this file as required. * i.e. configuring database etc; specifying setup.php password etc. */ @@ -28,9 +28,9 @@ // In order to setup Postfixadmin, you MUST specify a hashed password here. // To create the hash, visit setup.php in a browser and type a password into the field, -@@ -85,11 +90,11 @@ +@@ -80,11 +85,11 @@ // mysql = MySQL 3.23 and 4.0, 4.1 or 5 - // mysqli = MySQL 4.1+ + // mysqli = MySQL 4.1+ or MariaDB // pgsql = PostgreSQL -$CONF['database_type'] = 'mysqli'; -$CONF['database_host'] = 'localhost'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2015-12-06 23:27:48
|
Revision: 1822 http://sourceforge.net/p/postfixadmin/code/1822 Author: christian_boltz Date: 2015-12-06 23:27:45 +0000 (Sun, 06 Dec 2015) Log Message: ----------- use smarty html_options instead of select_options() list-virtual and viewlog were the last users of select_options() smarty.inc.php: - drop (now unused) select_options() Modified Paths: -------------- trunk/list-virtual.php trunk/smarty.inc.php trunk/templates/list-virtual.tpl trunk/templates/viewlog.tpl trunk/viewlog.php Modified: trunk/list-virtual.php =================================================================== --- trunk/list-virtual.php 2015-10-20 16:08:17 UTC (rev 1821) +++ trunk/list-virtual.php 2015-12-06 23:27:45 UTC (rev 1822) @@ -434,7 +434,8 @@ $_GET['domain'] = ''; } $smarty->assign ('admin_list', array()); -$smarty->assign ('select_options', select_options ($list_domains, array ($fDomain)), false); +$smarty->assign ('domain_list', $list_domains); +$smarty->assign ('domain_selected', $fDomain); $smarty->assign ('nav_bar_alias', array ('top' => $nav_bar_alias->display_top (), 'bottom' => $nav_bar_alias->display_bottom ()), false); $smarty->assign ('nav_bar_mailbox', array ('top' => $nav_bar_mailbox->display_top (), 'bottom' => $nav_bar_mailbox->display_bottom ()), false); Modified: trunk/smarty.inc.php =================================================================== --- trunk/smarty.inc.php 2015-10-20 16:08:17 UTC (rev 1821) +++ trunk/smarty.inc.php 2015-12-06 23:27:45 UTC (rev 1822) @@ -75,16 +75,6 @@ $smarty->assign ('boolconf_alias_domain', Config::bool('alias_domain')); $smarty->assign ('authentication_has_role', array ('global_admin' => authentication_has_role ('global-admin'), 'admin' => authentication_has_role ('admin'), 'user' => authentication_has_role ('user'))); -function select_options($aValues, $aSelected) { - $ret_val = ''; - foreach ($aValues as $val) { - $ret_val .= '<option value="'.htmlentities($val).'"'; - if (in_array ($val, $aSelected)) - $ret_val .= ' selected="selected"'; - $ret_val .= '>'.htmlentities($val).'</option>'; - } - return $ret_val; -} function eval_size ($aSize) { if ($aSize == 0) {$ret_val = Config::Lang('pOverview_unlimited'); } elseif ($aSize < 0) {$ret_val = Config::Lang('pOverview_disabled'); } Modified: trunk/templates/list-virtual.tpl =================================================================== --- trunk/templates/list-virtual.tpl 2015-10-20 16:08:17 UTC (rev 1821) +++ trunk/templates/list-virtual.tpl 2015-12-06 23:27:45 UTC (rev 1822) @@ -1,9 +1,7 @@ {assign var="file" value=$smarty.config.url_list_virtual} <div id="overview"> <form name="frmOverview" method="get" action="{$smarty.config.url_list_virtual}"> - <select name="domain" onchange="this.form.submit();"> - {$select_options} - </select> + {html_options name='domain' output=$domain_list values=$domain_list selected=$domain_selected onchange="this.form.submit();"} <input type="hidden" name="limit" value="0" /> <noscript><input class="button" type="submit" name="go" value="{$PALANG.go}" /></noscript> </form> Modified: trunk/templates/viewlog.tpl =================================================================== --- trunk/templates/viewlog.tpl 2015-10-20 16:08:17 UTC (rev 1821) +++ trunk/templates/viewlog.tpl 2015-12-06 23:27:45 UTC (rev 1822) @@ -1,6 +1,6 @@ <div id="overview"> <form name="frmOverview" method="post" action=""> - <select name="fDomain" onchange="this.form.submit();">{$select_options}</select> + {html_options name='fDomain' output=$domain_list values=$domain_list selected=$domain_selected onchange="this.form.submit();"} <noscript><input class="button" type="submit" name="go" value="{$PALANG.go}" /></noscript> </form> </div> Modified: trunk/viewlog.php =================================================================== --- trunk/viewlog.php 2015-10-20 16:08:17 UTC (rev 1821) +++ trunk/viewlog.php 2015-12-06 23:27:45 UTC (rev 1822) @@ -77,7 +77,8 @@ for ($i = 0; $i < count ($tLog); $i++) $tLog[$i]['action'] = $PALANG ['pViewlog_action_'.$tLog [$i]['action']]; -$smarty->assign ('select_options', select_options ($list_domains, array ($fDomain)), false); +$smarty->assign ('domain_list', $list_domains); +$smarty->assign ('domain_selected', $fDomain); $smarty->assign ('tLog', $tLog,false); $smarty->assign ('fDomain', $fDomain); $smarty->assign ('smarty_template', 'viewlog'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |