mirror/postfixadmin
0
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2024-09-19 19:22:14 +02:00
Code

languages/nl.lang translation from english for new function such as dkim and password

Browse Source 
public/editactive.php			edit wrong description text it said this module is used for deleting admin domains mailbos etc
					modify templates that it is used

public/list-virtual.php			modify templates that it is used
					modify the remarks behind arguments and internal , the texteditor thought the text after this was still remark text untl is see */

public/vacation.php and
model/VacantionHandel.php		adjust date string actionFrom and activeUntil these are written in the database as e.g. 2020-10-01 15:14:00 and 2020-10-30-15:14:00
					this should be 2020-10-01 00:00:00 and 2020-10-30 23:59:59 so that it contains all day, this happens if no holiday has been set for the account yet
					when adjusting the dates, the seconds of until are set to 00 instead of 59. When the holiday is canceled and then action is taken again, the from time
					to the time when the setting is made.

templates/editform.tpl			remove blank space

templates/list-virtual_mailbox.tpl	remove indent tabs
This commit is contained in:
Jan Kruis 2022-10-12 17:46:15 +02:00
parent ea131a5ea9
commit e279c77ca5
8 changed files with 76 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
languages/nl.lang
View File

@ -55,8 +55,8 @@ $PALANG['add_alias_domain'] = 'Domein alias toevoegen';
$PALANG['add_mailbox'] = 'Mailbox toevoegen';
$PALANG['pMenu_fetchmail'] = 'Externe email ophalen';
$PALANG['pMenu_sendmail'] = 'Verstuur E-mail';
$PALANG['pMenu_dkim'] = 'Domain Keys'; # XXX
$PALANG['pMenu_dkim_signing'] = 'Signing Table'; # XXX
$PALANG['pMenu_dkim'] = 'Domein Sleutels';
$PALANG['pMenu_dkim_signing'] = 'Teken Tabel';
$PALANG['pMenu_password'] = 'Wachtwoord';
$PALANG['pMenu_viewlog'] = 'Laat log zien';
$PALANG['pMenu_logout'] = 'Uitloggen';
@ -84,12 +84,13 @@ $PALANG['pOverview_welcome'] = 'Overzicht voor ';
$PALANG['pOverview_alias_domain_aliases'] = 'Alias domeinen';
$PALANG['pOverview_alias_address'] = 'Van';
$PALANG['active'] = 'Actief';
$PALANG['sendonly'] = 'Alleen zenden';
$PALANG['and_x_more'] = '[en %s meer...]';
$PALANG['pOverview_mailbox_username'] = 'e-mail';
$PALANG['name'] = 'Naam';
$PALANG['pOverview_mailbox_quota'] = 'Quota (MB)';
$PALANG['pOverview_vacation_edit'] = 'AUTOMATISCH BEANTWOORDEN IS ACTIEF';
$PALANG['pOverview_vacation_option'] = 'Activeer automatisch beantwoorden';
$PALANG['pOverview_vacation_edit'] = 'AUTOMATISCH BEANTWOORDER IS ACTIEF';
$PALANG['pOverview_vacation_option'] = 'Activeer automatisch beantwoorder';
$PALANG['no_domains_for_this_admin'] = 'Je hebt voor geen elke domein toesteming.';
$PALANG['no_domains_exist'] = 'Je moet tenminste een domein aanmaken voordat je virtueel overzicht kunt gebruiken.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual']
@ -131,11 +132,11 @@ $PALANG['alias_updated'] = 'De alias %s is bijgewerkt!';
$PALANG['pCreate_alias_catchall_text'] = 'Om een catch-all te gebruiken, dient u een "*" (asteric) in te vullen als alias. Voor domein naar domein forwarding gebruik "*@domein.tld" als naar.';
$PALANG['mailbox_alias_cant_be_deleted'] = 'De alias maakt onderdeel uit van mailbox en kan niet worden verwijderd!';
$PALANG['protected_alias_cant_be_deleted'] = 'De alias %s is beschermd en kan alleen worden verwijderd door een superadministrator';
$PALANG['alias_points_to_itself'] = 'Alias may not point to itself'; # XXX
$PALANG['alias_points_to_itself'] = 'Alias mag niet naar zijzeft verwijzen';
$PALANG['pEdit_alias_welcome'] = 'Bewerk een alias voor uw domein.';
$PALANG['pEdit_alias_welcome'] = 'Bewerk het doosrsturen voor uw account.';
$PALANG['pEdit_alias_help'] = 'Meerdere e-mailadressen toegestaan. Slechts één alias per regel.';
$PALANG['alias'] = 'Alias';
$PALANG['alias'] = 'Doorsturen voor';
$PALANG['to'] = 'Naar';
$PALANG['pEdit_alias_goto_text_error1'] = 'U heeft geen Naar opgegeven.';
$PALANG['pEdit_alias_goto_text_error2'] = 'Het e-mail adres wat u opgaf is niet geldig: ';
@ -145,7 +146,7 @@ $PALANG['pEdit_alias_forward_only'] = 'Alleen op opgegeven email adres afleveren
$PALANG['pEdit_alias_result_error'] = 'Bewerken van de alias %s is mislukt!';
$PALANG['pCreate_mailbox_welcome'] = 'Maak een nieuw lokale mailbox voor uw domein.';
$PALANG['pCreate_mailbox_local_part_error'] = 'Should be the bit before the @ sign.'; # XXX
$PALANG['pCreate_mailbox_local_part_error'] = 'Zou het deel voor het @ teken moeten zijn.';
$PALANG['pCreate_mailbox_username_text_error1'] = 'Het e-mail adres is niet geldig.';
$PALANG['pCreate_mailbox_username_text_error3'] = 'U bezit het maximum aantal mailboxen.';
$PALANG['pCreate_mailbox_password_text'] = 'Wachtwoord voor POP3/IMAP';
@ -167,8 +168,8 @@ $PALANG['pEdit_mailbox_password_text_error'] = 'De wachtwoorden die u opgaf kome
$PALANG['pEdit_mailbox_quota'] = 'Quota';
$PALANG['pEdit_mailbox_quota_text'] = 'MB';
$PALANG['mb_max'] = 'MB (max: %s)';
$PALANG['mb_max_unlimited'] = 'MB (max: unlimited)'; # XXX
$PALANG['mb_max_disabled'] = 'MB (max: disabled)'; # XXX
$PALANG['mb_max_unlimited'] = 'MB (max: ongelimiteerd)';
$PALANG['mb_max_disabled'] = 'MB (max: uitgeschakeld)';
$PALANG['pEdit_mailbox_quota_text_error'] = 'De quota die opgaf is te hoog.';
$PALANG['pEdit_mailbox_domain_error'] = 'Dit domein is niet van nu: ';
$PALANG['pEdit_mailbox_result_error'] = 'Mislukt om het wachtwoord te wijzigen.';
@ -247,7 +248,7 @@ $PALANG['pSendmail_body'] = 'Inhoud';
$PALANG['pSendmail_button'] = 'Verstuur bericht';
$PALANG['pSendmail_result_error'] = 'Mislukt om mail te versturen aan %s!';
$PALANG['pSendmail_result_success'] = 'E-mail verstuurd aan %s.';
$PALANG['pDkim_new_key'] = 'Add Domain Key'; # XXX
$PALANG['pDkim_new_key'] = 'Voeg Domein sleutel toe'; # XXX
$PALANG['pDkim_new_sign'] = 'Add Sign Table Entry'; # XXX
$PALANG['pDkim_edit_key'] = 'Edit Domain Key'; # XXX
$PALANG['pDkim_edit_sign'] = 'Edit Sign Table Entry'; # XXX
@ -288,6 +289,7 @@ $PALANG['description'] = 'Omschrijving';
$PALANG['aliases'] = 'Aliassen';
$PALANG['pAdminList_domain_quota'] = 'Domein quota (MB)';
$PALANG['pAdminList_domain_backupmx'] = 'Back-up MX';
$PALANG['pAdminList-tls_policy'] = 'TLS Policy';
$PALANG['last_modified'] = 'Laatst bewerkt';
$PALANG['pAdminCreate_domain_welcome'] = 'Voeg een nieuw domein toe';
@ -300,13 +302,13 @@ $PALANG['pAdminCreate_domain_result_error'] = 'Het aangemaakt van domein %s is m
$PALANG['pAdminCreate_domain_result_success'] = 'Domein %s is aangemaakt';
$PALANG['domain_updated'] = 'Het domein %s is bijgewerkt.';
$PALANG['pAdminDelete_admin_error'] = 'Niet in staat beheerder te verwijderen!';
$PALANG['domain_postdel_failed'] = 'Het script "domein postdeletion" is mislukt, controleer de log file voor meer informatie!';
$PALANG['domain_postedit_failed'] = 'The domain postedit script failed, check the error log for details!'; # XXX
$PALANG['domain_postcreate_failed'] = 'Het script "domein postcreation" is mislukt, controleer de log file voor meer informatie!';
$PALANG['domain_postdel_failed'] = 'Het script "domain postdeletion" is mislukt, controleer de log file voor meer informatie!';
$PALANG['domain_postedit_failed'] = 'Het script "domain postedit" is mislukt, controleer de log file voor meer informatie!';
$PALANG['domain_postcreate_failed'] = 'Het script "domain postcreation" is mislukt, controleer de log file voor meer informatie!';
$PALANG['mailbox_postdel_failed'] = 'Het script "mailbox postdeletion" is mislukt, controleer de log file voor meer informatie!';
$PALANG['mailbox_postedit_failed'] = 'Het script "mailbox postedit" is mislukt, controleer de log file voor meer informatie';
$PALANG['mailbox_postcreate_failed'] = 'Het script "mailbox postcreation" is mislukt, controleer de log file voor meer informatie!';
$PALANG['mailbox_postpassword_failed'] = 'The mailbox postpassword script failed, check the error log for details!'; # XXX
$PALANG['mailbox_postpassword_failed'] = 'Het script "mailbox postpassword" is mislukt, controleer de log file voor meer informatie!';
$PALANG['pAdminDelete_alias_domain_error'] = 'Niet in staat domein alias te verwijderen!';
$PALANG['domain_conflict_vacation_domain'] = 'Je kunt het vakantie domein niet gebruiken als mail domein!';
@ -316,8 +318,11 @@ $PALANG['pAdminEdit_domain_maxquota'] = 'Max Quota';
$PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = uit | 0 = onbeperkt';
$PALANG['pAdminEdit_domain_quota'] = 'Domein Quota';
$PALANG['transport'] = 'Transport';
$PALANG['tls_policy'] = 'TLS Beleid';
$PALANG['backupmx'] = 'Backup-MX';
$PALANG['pAdminEdit_domain_transport_text'] = 'Definieer transport';
$PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is back-up MX';
$PALANG['pAdminEdit_domain_tls_policy_text'] = 'Definieer TLS beleid';
$PALANG['pAdminEdit_domain_backupmx'] = 'Definieer of deze Mailserver een Backup MX is voor het domain';
$PALANG['pAdminEdit_domain_result_error'] = 'Het bewerken van domein %s is mislukt!';
$PALANG['pAdminCreate_admin_welcome'] = 'Voeg een nieuw domein beheerder toe';
@ -343,11 +348,11 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Uw wachtwoord is niet correct.';
$PALANG['pUsersLogin_password_recover'] = 'Ik ben mijn wachtwoord vergeten';
$PALANG['pUsersMenu_vacation'] = 'Automatisch beantwoorden';
$PALANG['pUsersMenu_edit_alias'] = 'Wijzig uw forward';
$PALANG['pUsersMenu_edit_alias'] = 'Wijzig uw doorstruen';
$PALANG['pUsersMain_vacation'] = 'Stel een "Afwezigheids bericht" bericht of automatisch beantwoorden voor uw e-mail in.';
$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is actief, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/verwijderen';
$PALANG['pUsersMain_edit_alias'] = 'Wijzig uw e-mail forwarding.';
$PALANG['pUsersMain_edit_alias'] = 'Wijzig doorsturen van uw e-mail account.';
$PALANG['pUsersMain_password'] = 'Wijzig uw huidige wachtwoord.';
$PALANG['pUsersVacation_welcome'] = 'Automatisch beantwoorden.';
@ -355,7 +360,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'Automatisch beantwoorden voor %s is ac
$PALANG['pUsersVacation_subject_text'] = 'Afwezigheids bericht';
$PALANG['message'] = 'Bericht';
$PALANG['pUsersVacation_body_text'] = <<<EOM
Ik zal afwezig zijn van %vandatum tot %totdatum.
Ik zal afwezig zijn van <%From_Date> tot <%Until_Date>.
Voor belangrijke punten kunt u contact opnemen met <contact person>.
EOM;
$PALANG['pUsersVacation_activefrom'] = 'Actief vanaf';
@ -364,8 +369,8 @@ $PALANG['pUsersVacation_activeuntil'] = 'Actief t/m';
$PALANG['pEdit_dbLog_editactive'] = 'status verandert';
$PALANG['pSearch'] = 'zoek';
$PALANG['pSearch_welcome'] = 'zoeken naar: ';
$PALANG['pSearch'] = 'Zoek';
$PALANG['pSearch_welcome'] = 'Zoeken naar: ';
$PALANG['pReturn_to'] = 'Ga terug naar';
$PALANG['pBroadcast_title'] = 'Verzend broadcast bericht';
$PALANG['pBroadcast_name'] = 'Uw naam';
@ -375,33 +380,33 @@ $PALANG['pBroadcast_error_empty'] = 'De velden Naam, Onderwerp en Bericht mogen
$PALANG['broadcast_mailboxes_only'] = 'Verstuur alleen aan mailboxen';
$PALANG['broadcast_to_domains'] = 'Verstuur aan de domeinen:';
$PALANG['pStatus_undeliverable'] = 'Misschien niet af te leveren ';
$PALANG['pStatus_disabled'] = 'Account disabled '; # XXX
$PALANG['pStatus_expired'] = 'Password expired '; # XXX
$PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX
$PALANG['pStatus_disabled'] = 'Account uitgeschakeld ';
$PALANG['pStatus_expired'] = 'Wachwoord is verlopen ';
$PALANG['pStatus_vacation'] = 'Vakatie toegestaan ';
$PALANG['pStatus_custom'] = 'Bezorgen op ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['password_too_short'] = "Wachtwoord is te kort - moet minimaal %s karakters bevatten";
$PALANG['password_no_characters'] = "Je wachtwoord moet minimaal %s karakter(s) bevatten."; # XXX text changed to "Your password must contain at least %s letters (A-Z, a-z)."
$PALANG['password_no_characters'] = "Je wachtwoord moet minimaal %s karakter(s) bevatten (A-Z, a-z).";
$PALANG['password_no_digits'] = "Je wachtwoord moet minimaal %s getal(len) bevatten.";
$PALANG['password_no_special'] = "Your password must contain at least %s special character(s)."; # XXX
$PALANG['password_no_special'] = "Je wachtwoord moet minimaal %s speciale leesteken(s) bevatten.";
$PALANG['pInvalidDomainRegex'] = "Ongeldig domein naam %s";
$PALANG['pInvalidDomainDNS'] = "Ongeldig domein %s";
$PALANG['pInvalidMailRegex'] = "Ongeldig email adres %s komt niet door de limietcheck"; # XXX text change to: "Invalid email address %s, fails regexp check"
$PALANG['pFetchmail_welcome'] = 'Haal mail op voor:';
$PALANG['pFetchmail_new_entry'] = 'Nieuw item';
$PALANG['pFetchmail_welcome'] = 'Haal mail op voor:';
$PALANG['pFetchmail_new_entry'] = 'Nieuw item';
$PALANG['fetchmail_already_exists'] = 'Deze "fetchmail job" bestaat al!';
$PALANG['fetchmail_does_not_exist'] = 'Deze "fetchmail job" bestaat niet!';
$PALANG['pFetchmail_database_save_error'] = 'Niet in staat dit item toe te voegen aan database!';
$PALANG['pFetchmail_database_save_error'] = 'Niet in staat dit item toe te voegen aan database!';
$PALANG['pFetchmail_database_save_success'] = 'Item opgeslagen in database.';
$PALANG['pFetchmail_error_invalid_id'] = 'Geen item met ID %s gevonden!';
$PALANG['pFetchmail_invalid_mailbox'] = 'Ongeldige mailbox!';
$PALANG['pFetchmail_server_missing'] = 'Naam van server!';
$PALANG['pFetchmail_user_missing'] = 'Naam van de gebruiker!';
$PALANG['pFetchmail_password_missing'] = 'Wachtwoord!';
$PALANG['pFetchmail_error_invalid_id'] = 'Geen item met ID %s gevonden!';
$PALANG['pFetchmail_invalid_mailbox'] = 'Ongeldige mailbox!';
$PALANG['pFetchmail_server_missing'] = 'Naam van server!';
$PALANG['pFetchmail_user_missing'] = 'Naam van de gebruiker!';
$PALANG['pFetchmail_password_missing'] = 'Wachtwoord!';
$PALANG['pFetchmail_field_id'] = 'ID';
$PALANG['pFetchmail_field_mailbox'] = 'mailbox';
$PALANG['pFetchmail_field_src_server'] = 'server';
$PALANG['pFetchmail_field_src_port'] = 'Port'; # XXX
$PALANG['pFetchmail_field_src_port'] = 'Poort';
$PALANG['pFetchmail_field_src_auth'] = 'authenticatietype';
$PALANG['pFetchmail_field_src_user'] = 'gebruiker';
$PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
@ -411,8 +416,8 @@ $PALANG['pFetchmail_field_fetchall'] = 'alle berichten ophalen';
$PALANG['pFetchmail_field_keep'] = 'behouden';
$PALANG['pFetchmail_field_protocol'] = 'protocol';
$PALANG['pFetchmail_field_usessl'] = 'SSL actief';
$PALANG['pFetchmail_field_sslcertck'] = 'SSL certificate controle'; # XXX
$PALANG['pFetchmail_field_sslcertpath'] = 'SSL path to certificates'; # XXX
$PALANG['pFetchmail_field_sslcertck'] = 'SSL certificate controle';
$PALANG['pFetchmail_field_sslcertpath'] = 'SSL pad naar certificates';
$PALANG['pFetchmail_field_sslfingerprint'] = 'SSL fingerprint (md5)'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'extra opties';
$PALANG['pFetchmail_field_mda'] = 'MD';
@ -421,7 +426,7 @@ $PALANG['pFetchmail_field_returned_text'] = 'teruggegeven tekst';
$PALANG['pFetchmail_desc_id'] = 'record ID';
$PALANG['pFetchmail_desc_mailbox'] = 'Naar welke mailbox sturen we de opgehaalde mail.';
$PALANG['pFetchmail_desc_src_server'] = 'andere server.';
$PALANG['pFetchmail_desc_src_port'] = 'Remote port number, if a non-standard remote port is needed. (0: use default)'; # XXX
$PALANG['pFetchmail_desc_src_port'] = 'Remote poort nummer, als een niet standaard poort nodig is. (0: is standaard)';
$PALANG['pFetchmail_desc_src_auth'] = 'In de meeste gevallen \'password\''; # Translators: Please do NOT translate 'password' here
$PALANG['pFetchmail_desc_src_user'] = 'Gebruiker op andere server.';
$PALANG['pFetchmail_desc_src_password'] = 'Wachtwoord op andere server.';
@ -432,13 +437,13 @@ $PALANG['pFetchmail_desc_keep'] = 'Opgehaalde berichten op de server
$PALANG['pFetchmail_desc_protocol'] = 'het te gebruiken protocol.';
$PALANG['pFetchmail_desc_usessl'] = 'SSL encryptie';
$PALANG['pFetchmail_desc_extra_options'] = 'extra opties voor fetchmail.';
$PALANG['pFetchmail_desc_mda'] = 'mail delivery agent.';
$PALANG['pFetchmail_desc_mda'] = 'mail aflever agent.';
$PALANG['pFetchmail_desc_date'] = 'datum van de laatste berichtencontrole/configuratie verandering.';
$PALANG['pFetchmail_desc_returned_text'] = 'text bericht van de laatste berichtencontrole.';
$PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX
$PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX
$PALANG['password_expiration'] = 'Pass expires'; # XXX
$PALANG['password_expiration_desc'] = 'Date when password will expire'; # XXX
$PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format
$PALANG['dateformat_mysql'] = '%d-%m-%Y'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format
$PALANG['password_expiration'] = 'Wachwoord vervalt';
$PALANG['password_expiration_desc'] = 'Aantal dagen waarnaar het wachtwoord vervalt';
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */

4
model/VacationHandler.php
View File

@ -238,8 +238,8 @@ class VacationHandler extends PFAHandler
$activeUntil .= ' 23:59:59';
}
$activeFrom = date("Y-m-d H:i", strtotime($activeFrom)); # TODO check if result looks like a valid date
$activeUntil = date("Y-m-d H:i", strtotime($activeUntil)); # TODO check if result looks like a valid date
$activeFrom = date("Y-m-d H:i:s", strtotime($activeFrom)); # TODO check if result looks like a valid date
$activeUntil = date("Y-m-d H:i:s", strtotime($activeUntil)); # TODO check if result looks like a valid date
list(/*NULL*/, $domain) = explode('@', $this->username);
$vacation_data = array(

10
public/editactive.php
View File

@ -11,10 +11,14 @@
* @version $Id$
* @license GNU GPL v2 or later.
*
* File: delete.php
* Used to delete admins, domains, mailboxes, aliases etc.
* File: editactive.php
* Used to switch active status for admins, domains, mailboxes, aliases and aliasdomains, etc.
*
* Template File: none
* Template File:
* list-virutal.tpl
* list-virutal-alias.tpl which incl list-virutal.tpl
* list-virutal-alias_domains.tpl which incl list-virutal.tpl
* list-virutal_mailbox.tpl
*/
require_once('common.php');

10
public/list-virtual.php
View File

@ -14,7 +14,11 @@
* File: list-virtual.php
* List virtual users for a domain.
*
* Template File: list-virtual.php
* Template File:
* list-virutal.tpl
* list-virutal-alias.tpl which incl list-virutal.tpl
* list-virutal-alias_domains.tpl which incl list-virutal.tpl
* list-virutal_mailbox.tpl
*
* Form POST \ GET Variables:
*
@ -355,7 +359,7 @@ class cNav_bar
protected $limit;
protected $page_size;
protected $pages;
protected $search; //* arguments
protected $search; // arguments
/* @var string - appended to page link href */
public $append_to_url = '';
@ -363,7 +367,7 @@ class cNav_bar
protected $have_run_init = false;
protected $arr_prev;
protected $arr_next;
protected $arr_top; //* internal
protected $arr_top; // internal
protected $anchor;
public function __construct($aTitle, $aLimit, $aPage_size, $aPages, $aSearch)

9
public/vacation.php
View File

@ -154,14 +154,17 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") {
if ($action == 'fChange') {
## check if ActiveUntil is not back in time,
## check if ActiveUntil is not back in time,
## because vacation.pl will report SMTP recipient $smtp_recipient which resolves to $email does not have an active vacation (rv: $rv, email: $email)"
## and will not send message
## set $tActtiveFrom to the begin of the day (00:00:00) and $tActiveUntil to the end of de day (23:59:59)
## time part is now set to entry time
date_modify($tActiveFrom,"00:00:00") ;
date_modify($tActiveUntil,"23:59:59") ;
if (($tActiveUntil >= $now && ($tActiveUntil >= $tActiveFrom))) {
if (!$vh->set_away($fSubject, $fBody, $fInterval_Time, $tActiveFrom->format('Y-m-d H:i'), $tActiveUntil->format('Y-m-d H:i'))) {
if (!$vh->set_away($fSubject, $fBody, $fInterval_Time, $tActiveFrom->format('Y-m-d H:i:s'), $tActiveUntil->format('Y-m-d H:i:s'))) {
$error = 1;
}
} else {

4
templates/editform.tpl
View File

@ -45,7 +45,7 @@
{foreach from=$value_{$key} item=selectedDomain}
{if $domain == $selectedDomain }
<input type="checkbox" checked name="value[{$key}][]" value="{$domain}" id="{$domain}_id" />
<label for="{$domain}_id">{$domain}</label>
<label for="{$domain}_id">{$domain}</label>
{assign var=flag value=$flag+1}
{/if}
{/foreach}
@ -93,7 +93,6 @@
<button class="btn btn-primary" type="submit" name="submit">
<span class="glyphicon glyphicon-edit" aria-hidden="true"></span> {$submitbutton}
</button>
</div>
</div>
</div>
@ -102,7 +101,6 @@
</form>
<script type="text/javascript">
function searchDomains(){
input = document.getElementById("id_searchDomains").value.toLowerCase();
ul = document.getElementById("domainsList");

10
templates/list-virtual_mailbox.tpl
View File

@ -26,11 +26,11 @@
<td>{$gen_show_status_mailbox[$i]}</td>
{/if}
<td>
{if $search eq ""}
{$item.username}
{else}
{$item.username|replace:$search:"<span class='searchresult'>$search</span>"}
{/if}
{if $search eq ""}
{$item.username}
{else}
{$item.username|replace:$search:"<span class='searchresult'>$search</span>"}
{/if}
</td>
{if $display_mailbox_aliases==true}
<td>

1
testfile.php
View File

@ -1 +0,0 @@
dit is test filefile.php