Thread: SF.net SVN: postfixadmin:[792] branches/postfixadmin-2.3
Brought to you by:
christian_boltz,
gingerdog
From: <chr...@us...> - 2009-12-28 21:24:51
|
Revision: 792 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=792&view=rev Author: christian_boltz Date: 2009-12-28 21:24:38 +0000 (Mon, 28 Dec 2009) Log Message: ----------- merged most bugfix changes between 2.3 release and SVN r791 to 2.3 branch - merged: SVN r745, r746, r747, r748, r749, r750, r752, r754, r756, r767, r770, r771, r772, r773, r774, r777, r778, r779, r789, r790 - r763 partly merged (except smarty part) - r787 - only part a) merged - see CHANGELOG.txt changes ;-) or SVN log for details ToDo: display alias targets for mailboxes (r751 and r787 part b) Modified Paths: -------------- branches/postfixadmin-2.3/CHANGELOG.TXT branches/postfixadmin-2.3/DOCUMENTS/DOVECOT.txt branches/postfixadmin-2.3/DOCUMENTS/POSTFIX_CONF.txt branches/postfixadmin-2.3/config.inc.php branches/postfixadmin-2.3/edit-alias.php branches/postfixadmin-2.3/functions.inc.php branches/postfixadmin-2.3/languages/bg.lang branches/postfixadmin-2.3/languages/ca.lang branches/postfixadmin-2.3/languages/cn.lang branches/postfixadmin-2.3/languages/cs.lang branches/postfixadmin-2.3/languages/da.lang branches/postfixadmin-2.3/languages/de.lang branches/postfixadmin-2.3/languages/en.lang branches/postfixadmin-2.3/languages/es.lang branches/postfixadmin-2.3/languages/et.lang branches/postfixadmin-2.3/languages/eu.lang branches/postfixadmin-2.3/languages/fi.lang branches/postfixadmin-2.3/languages/fo.lang branches/postfixadmin-2.3/languages/fr.lang branches/postfixadmin-2.3/languages/hr.lang branches/postfixadmin-2.3/languages/hu.lang branches/postfixadmin-2.3/languages/is.lang branches/postfixadmin-2.3/languages/it.lang branches/postfixadmin-2.3/languages/ja.lang branches/postfixadmin-2.3/languages/language-update.sh branches/postfixadmin-2.3/languages/lt.lang branches/postfixadmin-2.3/languages/mk.lang branches/postfixadmin-2.3/languages/nb.lang branches/postfixadmin-2.3/languages/nl.lang branches/postfixadmin-2.3/languages/nn.lang branches/postfixadmin-2.3/languages/pl.lang branches/postfixadmin-2.3/languages/pt-br.lang branches/postfixadmin-2.3/languages/ru.lang branches/postfixadmin-2.3/languages/sk.lang branches/postfixadmin-2.3/languages/sl.lang branches/postfixadmin-2.3/languages/sv.lang branches/postfixadmin-2.3/languages/tr.lang branches/postfixadmin-2.3/languages/tw.lang branches/postfixadmin-2.3/list-virtual.php branches/postfixadmin-2.3/setup.php branches/postfixadmin-2.3/templates/list-virtual.php branches/postfixadmin-2.3/upgrade.php Added Paths: ----------- branches/postfixadmin-2.3/ADDITIONS/import_users_from_csv.py Added: branches/postfixadmin-2.3/ADDITIONS/import_users_from_csv.py =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/import_users_from_csv.py (rev 0) +++ branches/postfixadmin-2.3/ADDITIONS/import_users_from_csv.py 2009-12-28 21:24:38 UTC (rev 792) @@ -0,0 +1,231 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# Script takes a CSV list of users and does a 'bulk' insertion into mysql. +# +# Copyright (C) 2009 Simone Piccardi +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + +import csv +import getopt +import sys +import re +import time +import random, string +from datetime import datetime +from crypt import crypt +try: + import MySQLdb +except ImportError ,e: + print 'Cannot import the needed MySQLdb module, you must install it' + print 'on Debian systems just use the command' + print ' apt-get install python-mysqldb' + +def usage(): + print "Usage: inspostadmusers.py [options] users.csv" + print " -h print this help" + print " -t test run, do not insert, just print" + print " -u DB user" + print " -p DB password" + print " -D DB name" + print " -H DB host" + print " -q Quota in Mb (0 => no limit)" + print " -n char in seed" + print " -d debug info on" + print " -A create default alias for each domain" + print + print "the users.csv file must contains the user list with a line" + print "for each user, first line should be a title line with at least" + print "the following column names: " + print " * user - user part of the email (like user in us...@do...)" + print " * password - cleartext password" + print " * domain - domain name (like 'domain.com')" + print " * name - full user name ('Name Surname')" + print + print "the 'name' column is optional, other columns will be ignored" + print + print "Known restrictions:" + print "* this script only works with MySQL" + print "* mailbox paths are hardcoded to domain/username/" + + +# option parsing +try: + opts, args = getopt.getopt(sys.argv[1:], 'u:p:d:D:H:htdA') + optval={} + for opt, val in opts: + if opt == "-h": + usage() + sys.exit(0) + else: + optval[opt]=val +except getopt.GetoptError: + usage() + sys.exit(2) + +# +# Setup DB connection +# +MYSQLDB="postfixadmin" +MYSQLUSER="postfixadmin" +MYSQLPASSWORD="" +MYSQLHOST="localhost" + +# settings by command line options +if optval.has_key('-u'): + MYSQLUSER = optval['-u'] +if optval.has_key('-p'): + MYSQLPASSWORD = optval['-p'] +if optval.has_key('-D'): + MYSQLDB = optval['-D'] +if optval.has_key('-H'): + MYSQLHOST = optval['-H'] + +if optval.has_key('-q'): + quota = optval['-q'] +else: + quota = 0 + +if optval.has_key('-n'): + seed_len = optval['-n'] +else: + seed_len = 8 + +# check arguments, only the user list file must be present +if len(args) !=1: + print 'Need just one argument' + usage() + sys.exit(1) + +# MySQL connection (skipped in test run) +if optval.has_key('-t'): + print "Test Run" +else: + try: + connection = MySQLdb.connect(host=MYSQLHOST, user=MYSQLUSER, + db=MYSQLDB, passwd=MYSQLPASSWORD) + except MySQLdb.MySQLError, e: + print "Database connection error" + print e + sys.exit(1) + + cursor = connection.cursor() + +# +# Main body +# +NOW = datetime.now().strftime("%Y-%m-%d %H:%M:%S") + +# read and convert CSV data +lista = csv.DictReader(open(args[0])) + +def gen_seed(seed_len, chars): + return '$1$'+''.join([random.choice(chars) for _ in xrange(seed_len)])+'$' + +def insert_record(cursor,table,record): + columns = record.keys() + query = "INSERT INTO " + table + "(" + ','.join(columns) + ") VALUES (" + ','.join(len(columns)*['%s']) + ")" + try: + cursor.execute(query, record.values()) + return 0 + except MySQLdb.MySQLError, e: + print "Database insertion error" + print e + print "Record was:" + print record.values() + print "Query was:" + print query + +# defining default values for tables (mailbox, alias and domain) +mailbox = { + 'created': NOW, + 'modified': NOW, + 'active': 1, + 'quota': quota + } +aliases = { + 'created': NOW, + 'modified': NOW, + 'active': 1 + } +domain = { + 'description': "", + 'aliases': 0, + 'mailboxes': 0, + 'quota': 0, + 'transport': 'virtual', + 'backupmx': 0, + 'created': NOW, + 'modified': NOW, + 'active': 1 +} + +# list of default alias +def_alias = ['abuse','hostmaster','postmaster','webmaster'] + +domain_list = {} +chars = string.letters + string.digits + +# loop over the CSV +for row in lista: + # create domain if it does not exists + if domain_list.has_key(row["domain"]): + if optval.has_key('-d'): + print "Domain " + row["domain"] + "already exixts" + else: + domain_list[row["domain"]] = 1 + domain['domain'] = row["domain"] + if optval.has_key('-t'): + print "Inserting domain" + print domain + else: + insert_record(cursor,'domain',domain) + if optval.has_key('-A'): + for i in def_alias: + aliases['address']= i+'@'+row["domain"] + aliases['goto']= aliases['address'] + aliases['domain'] = row["domain"] + if optval.has_key('-t'): + print "Inserting alias" + print aliases + else: + insert_record(cursor,'alias',aliases) + + # build query data for mailbox table + mailbox['username']=row["user"]+'@'+row["domain"] + encpass=crypt(row["password"], gen_seed(seed_len,chars)) + mailbox['password'] = encpass + mailbox['name'] = row["name"] + mailbox['maildir'] = row["domain"]+'/'+row["user"]+'/' + mailbox['local_part'] =row["user"] + mailbox['domain'] = row["domain"] + + # build query data for alias table + aliases['address']= mailbox['username'] + aliases['goto']= mailbox['username'] + aliases['domain'] = row["domain"] + + # inserting data for mailbox (and relate alias) + if optval.has_key('-t'): + print "Inserting mailbox" + print mailbox + print aliases + else: + insert_record(cursor,'mailbox',mailbox) + insert_record(cursor,'alias',aliases) + + +sys.exit(0) Modified: branches/postfixadmin-2.3/CHANGELOG.TXT =================================================================== --- branches/postfixadmin-2.3/CHANGELOG.TXT 2009-12-24 14:58:01 UTC (rev 791) +++ branches/postfixadmin-2.3/CHANGELOG.TXT 2009-12-28 21:24:38 UTC (rev 792) @@ -10,6 +10,25 @@ # Last update: # $Id$ +Version ***svn 2.3 branch*** - 2009/12/26 - SVN r*** +----------------------------------- + + - NOTE: this release is based on the 2.3 branch + - NOTE: this is a bugfix-only release for Postfix Admin 2.3 + - add import_users_from_csv.py script (by Simone Piccardi) + - handle dovecot passwords without any tempfile (prevents safe_mode issues) + - fix MySQL 6.0 compatibility + - fix quota display (for dovecot >= 1.2) + - fix short open tags ("<?") + - translation updates and fixes + - documentation updates and fixes + - document commandline parameters for $CONF[*_script] options in config.inc.php + - list-virtual: added error message if the check_owner query returns more + than one result (can happen with pre-2.3 databases and prevents access for + superadmins) + - add in_array() check to avoid that superadmins can enter invalid domains + - fix delete link for alias domains (when on target domain) + Version 2.3 - 2009/10/24 - SVN r739 ----------------------------------- Modified: branches/postfixadmin-2.3/DOCUMENTS/DOVECOT.txt =================================================================== --- branches/postfixadmin-2.3/DOCUMENTS/DOVECOT.txt 2009-12-24 14:58:01 UTC (rev 791) +++ branches/postfixadmin-2.3/DOCUMENTS/DOVECOT.txt 2009-12-28 21:24:38 UTC (rev 792) @@ -21,9 +21,10 @@ 1. Dovecot setup ----------------- -default_mail_env = maildir:/usr/local/virtual/%u/ +default_mail_env = maildir:/var/mail/vmail/%u/ auth default { + mechanisms plain userdb sql { # Path for SQL configuration file, see doc/dovecot-sql-example.conf args = /etc/dovecot-mysql.conf @@ -44,7 +45,9 @@ Below you'll find the relevant part of dovecot-mysql.conf file regarding our setup. Things you may need to change are db_password, uid and gid: + connect = host=localhost dbname=postfix user=postfix password=postfix +driver = mysql # Default password scheme. # depends on your $CONF['encrypt'] setting: @@ -102,9 +105,13 @@ Change dovecot-mysql.conf to return quota values: -user_query = SELECT maildir, 1001 AS uid, 1001 AS gid, CONCAT('dict:storage=',floor(quota/1000),' proxy::quota') as quota FROM mailbox WHERE username = '%u' +for MySQL: +user_query = SELECT maildir, 1001 AS uid, 1001 AS gid, CONCAT('dict:storage=',floor(quota/1000),' proxy::quota') as quota FROM mailbox WHERE username = '%u' AND active='1' +for PostgreSQL: +user_query = SELECT maildir, 1001 AS uid, 1001 AS gid, 'dict:storage=' || floor(quota/1000) || '::proxy::quota' as quota FROM mailbox WHERE username = '%u' AND active='1' + Create file dovecot-dict-quota.conf: driver = mysql Modified: branches/postfixadmin-2.3/DOCUMENTS/POSTFIX_CONF.txt =================================================================== --- branches/postfixadmin-2.3/DOCUMENTS/POSTFIX_CONF.txt 2009-12-24 14:58:01 UTC (rev 791) +++ branches/postfixadmin-2.3/DOCUMENTS/POSTFIX_CONF.txt 2009-12-28 21:24:38 UTC (rev 792) @@ -40,7 +40,7 @@ Contents of the files These are examples only, you will likely have to and want to make some -cumtomizations. You will also want to consider the config.inc.php +customizations. You will also want to consider the config.inc.php settings for domain_path and domain_in_mailbox. These examples use values of domain_path=YES and domain_in_mailbox=NO Modified: branches/postfixadmin-2.3/config.inc.php =================================================================== --- branches/postfixadmin-2.3/config.inc.php 2009-12-24 14:58:01 UTC (rev 791) +++ branches/postfixadmin-2.3/config.inc.php 2009-12-28 21:24:38 UTC (rev 792) @@ -314,6 +314,7 @@ // Note that this may fail if PHP is run in "safe mode", or if // operating system features (such as SELinux) or limitations // prevent the web-server from executing external scripts. +// Parameters: (1) username (2) domain (3) maildir (4) quota // $CONF['mailbox_postcreation_script']='sudo -u courier /usr/local/bin/postfixadmin-mailbox-postcreation.sh'; // Optional: @@ -321,6 +322,7 @@ // Note that this may fail if PHP is run in "safe mode", or if // operating system features (such as SELinux) or limitations // prevent the web-server from executing external scripts. +// Parameters: (1) username (2) domain (3) maildir (4) quota // $CONF['mailbox_postedit_script']='sudo -u courier /usr/local/bin/postfixadmin-mailbox-postedit.sh'; // Optional: @@ -328,6 +330,7 @@ // Note that this may fail if PHP is run in "safe mode", or if // operating system features (such as SELinux) or limitations // prevent the web-server from executing external scripts. +// Parameters: (1) username (2) domain // $CONF['mailbox_postdeletion_script']='sudo -u courier /usr/local/bin/postfixadmin-mailbox-postdeletion.sh'; // Optional: @@ -335,6 +338,7 @@ // Note that this may fail if PHP is run in "safe mode", or if // operating system features (such as SELinux) or limitations // prevent the web-server from executing external scripts. +// Parameters: (1) username //$CONF['domain_postcreation_script']='sudo -u courier /usr/local/bin/postfixadmin-domain-postcreation.sh'; // Optional: @@ -342,6 +346,7 @@ // Note that this may fail if PHP is run in "safe mode", or if // operating system features (such as SELinux) or limitations // prevent the web-server from executing external scripts. +// Parameters: (1) username // $CONF['domain_postdeletion_script']='sudo -u courier /usr/local/bin/postfixadmin-domain-postdeletion.sh'; // Optional: Modified: branches/postfixadmin-2.3/edit-alias.php =================================================================== --- branches/postfixadmin-2.3/edit-alias.php 2009-12-24 14:58:01 UTC (rev 791) +++ branches/postfixadmin-2.3/edit-alias.php 2009-12-28 21:24:38 UTC (rev 792) @@ -39,16 +39,10 @@ } /* retrieve existing alias record for the user first... may be via GET or POST */ - -if(isset($_GET['address']) && isset($_GET['domain'])) { - $fAddress = escape_string($_GET['address']); - $fDomain = escape_string($_GET['domain']); -} -elseif(isset($_POST['address']) && isset($_POST['domain'])) { - $fAddress = escape_string($_POST['address']); - $fDomain = escape_string($_POST['domain']); -} -else { +$fAddress = safepost('address', safeget('address')); # escaped below +$fDomain = escape_string(preg_replace("/.*@/", "", $fAddress)); +$fAddress = escape_string($fAddress); # escaped now +if ($fAddress == "") { die("Required parameters not present"); } @@ -88,7 +82,7 @@ } } else { - die("Invalid alias / domain combination"); + die("Invalid alias"); } if ($_SERVER['REQUEST_METHOD'] == "POST") Modified: branches/postfixadmin-2.3/functions.inc.php =================================================================== --- branches/postfixadmin-2.3/functions.inc.php 2009-12-24 14:58:01 UTC (rev 791) +++ branches/postfixadmin-2.3/functions.inc.php 2009-12-28 21:24:38 UTC (rev 792) @@ -733,6 +733,10 @@ $result = db_query ("SELECT 1 FROM $table_domain_admins WHERE username='$username' AND (domain='$domain' OR domain='ALL') AND active='1'"); if ($result['rows'] != 1) { + if ($result['rows'] > 1) { # "ALL" + specific domain permissions. 2.3 doesn't create such entries, but they are available as leftover from older versions + flash_error("Permission check returned more than one result. Please go to 'edit admin' for your username and press the save " + . "button once to fix the database. If this doesn't help, open a bugreport."); + } return false; } else @@ -1199,22 +1203,30 @@ $dovecotpw = "dovecotpw"; if (!empty($CONF['dovecotpw'])) $dovecotpw = $CONF['dovecotpw']; - // prevent showing plain password in process table - $prefix = "postfixadmin-"; - $tmpfile = tempnam('/tmp', $prefix); - $pipe = popen("'$dovecotpw' -s '$method' > '$tmpfile'", 'w'); # TODO: replace tempfile usage with proc_open call + # Use proc_open call to avoid safe_mode problems and to prevent showing plain password in process table + $spec = array( + 0 => array("pipe", "r"), // stdin + 1 => array("pipe", "w") // stdout + ); + $pipe = proc_open("$dovecotpw '-s' $method", $spec, $pipes); + if (!$pipe) { - unlink($tmpfile); + die("can't proc_open $dovecotpw"); } else { // use dovecot's stdin, it uses getpass() twice - fwrite($pipe, $pw . "\n", 1+strlen($pw)); usleep(1000); - fwrite($pipe, $pw . "\n", 1+strlen($pw)); - pclose($pipe); - $password = file_get_contents($tmpfile); + // Write pass in pipe stdin + fwrite($pipes[0], $pw . "\n", 1+strlen($pw)); usleep(1000); + fwrite($pipes[0], $pw . "\n", 1+strlen($pw)); + fclose($pipes[0]); + + // Read hash from pipe stdout + $password = fread($pipes[1], "200"); + fclose($pipes[1]); + proc_close($pipe); + if ( !preg_match('/^\{' . $method . '\}/', $password)) { die("can't encrypt password with dovecotpw"); } $password = trim(str_replace('{' . $method . '}', '', $password)); - unlink($tmpfile); } } Modified: branches/postfixadmin-2.3/languages/bg.lang =================================================================== --- branches/postfixadmin-2.3/languages/bg.lang 2009-12-24 14:58:01 UTC (rev 791) +++ branches/postfixadmin-2.3/languages/bg.lang 2009-12-28 21:24:38 UTC (rev 792) @@ -348,6 +348,8 @@ $PALANG['pUsersVacation_button_back'] = 'Връщам се от ваканция'; $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Не мога да обновя настройките за вашият автоматичен отговор!</span>'; $PALANG['pUsersVacation_result_success'] = 'Вашият автоматичен отговор беше премахнат!'; +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox'; # XXX $PALANG['pCreate_dbLog_createalias'] = 'create alias'; # XXX Modified: branches/postfixadmin-2.3/languages/ca.lang =================================================================== --- branches/postfixadmin-2.3/languages/ca.lang 2009-12-24 14:58:01 UTC (rev 791) +++ branches/postfixadmin-2.3/languages/ca.lang 2009-12-28 21:24:38 UTC (rev 792) @@ -347,6 +347,8 @@ $PALANG['pUsersVacation_button_back'] = 'De tornada'; $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Imposible actualitzar la configuració de la seva resposta automàtica!</span>'; $PALANG['pUsersVacation_result_success'] = 'La seva resposta automàtica ha estat esborrada!'; +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox'; # XXX $PALANG['pCreate_dbLog_createalias'] = 'create alias'; # XXX Modified: branches/postfixadmin-2.3/languages/cn.lang =================================================================== --- branches/postfixadmin-2.3/languages/cn.lang 2009-12-24 14:58:01 UTC (rev 791) +++ branches/postfixadmin-2.3/languages/cn.lang 2009-12-28 21:24:38 UTC (rev 792) @@ -347,6 +347,8 @@ $PALANG['pUsersVacation_button_back'] = '关闭自动回复'; $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">更新自动回复失败!</span>'; $PALANG['pUsersVacation_result_success'] = '你的自动回复已经关闭!'; +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pCreate_dbLog_createmailbox'] = '新建邮箱'; $PALANG['pCreate_dbLog_createalias'] = '新建别名'; Modified: branches/postfixadmin-2.3/languages/cs.lang =================================================================== --- branches/postfixadmin-2.3/languages/cs.lang 2009-12-24 14:58:01 UTC (rev 791) +++ branches/postfixadmin-2.3/languages/cs.lang 2009-12-28 21:24:38 UTC (rev 792) @@ -356,6 +356,8 @@ $PALANG['pUsersVacation_button_back'] = 'Vrátit se'; $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Nepodařilo se upravit nastavení!</span>'; $PALANG['pUsersVacation_result_success'] = 'Nastavení bylo upraveno!'; +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pCreate_dbLog_createmailbox'] = 'vytvořil schránku'; $PALANG['pCreate_dbLog_createalias'] = 'vytvořil alias'; Modified: branches/postfixadmin-2.3/languages/da.lang =================================================================== --- branches/postfixadmin-2.3/languages/da.lang 2009-12-24 14:58:01 UTC (rev 791) +++ branches/postfixadmin-2.3/languages/da.lang 2009-12-28 21:24:38 UTC (rev 792) @@ -354,6 +354,8 @@ $PALANG['pUsersVacation_button_back'] = 'Kommer tilbage'; $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Kan ikke opdatere indstillinger for dit autosvar!</span>'; $PALANG['pUsersVacation_result_success'] = 'Dit autosvar er fjernet!'; +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pCreate_dbLog_createmailbox'] = 'tilføj postboks'; $PALANG['pCreate_dbLog_createalias'] = 'tilføj alias'; Modified: branches/postfixadmin-2.3/languages/de.lang =================================================================== --- branches/postfixadmin-2.3/languages/de.lang 2009-12-24 14:58:01 UTC (rev 791) +++ branches/postfixadmin-2.3/languages/de.lang 2009-12-28 21:24:38 UTC (rev 792) @@ -166,7 +166,7 @@ $PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Das angegebene Quota ist zu hoch!</span>'; $PALANG['pEdit_mailbox_domain_error'] = '<span class="error_msg">Diese Domain gehört nicht Ihnen: '; $PALANG['pEdit_mailbox_button'] = 'Mailbox editieren'; -$PALANG['pEdit_mailbox_result_error'] = '<span class="error_msg">Unmöglich das Passwort zu ändern!</span>'; +$PALANG['pEdit_mailbox_result_error'] = '<span class="error_msg">Mailbox kann nicht geändert werden!</span>'; $PALANG['pPassword_welcome'] = 'Ändern Sie Ihr Login-Passwort.'; $PALANG['pPassword_admin'] = 'Login'; @@ -354,6 +354,8 @@ $PALANG['pUsersVacation_button_back'] = 'Ich bin zurück'; $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Konnte Ihre Automatische Antwort nicht einstellen!</span>'; $PALANG['pUsersVacation_result_success'] = 'Ihre Automatische Antwort wurde gelöscht!'; +$PALANG['pUsersVacation_activefrom'] = 'Aktiv ab dem'; +$PALANG['pUsersVacation_activeuntil'] = 'Aktiv bis zum'; $PALANG['pCreate_dbLog_createmailbox'] = 'Mailbox hinzufügen'; $PALANG['pCreate_dbLog_createalias'] = 'Alias hinzuü\xBCgen'; Modified: branches/postfixadmin-2.3/languages/en.lang =================================================================== --- branches/postfixadmin-2.3/languages/en.lang 2009-12-24 14:58:01 UTC (rev 791) +++ branches/postfixadmin-2.3/languages/en.lang 2009-12-28 21:24:38 UTC (rev 792) @@ -355,6 +355,8 @@ $PALANG['pUsersVacation_button_back'] = 'Coming Back'; $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Unable to update your auto response settings!</span>'; $PALANG['pUsersVacation_result_success'] = 'Your auto response has been removed!'; +$PALANG['pUsersVacation_activefrom'] = 'Active from'; +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox'; $PALANG['pCreate_dbLog_createalias'] = 'create alias'; Modified: branches/postfixadmin-2.3/languages/es.lang =================================================================== --- branches/postfixadmin-2.3/languages/es.lang 2009-12-24 14:58:01 UTC (rev 791) +++ branches/postfixadmin-2.3/languages/es.lang 2009-12-28 21:24:38 UTC (rev 792) @@ -4,32 +4,33 @@ // Language file Spanish // by Alvaro // +// by Iñaki Rodríguez (iro...@ac... / iro...@vi...) $PALANG['YES'] = 'SI'; $PALANG['NO'] = 'NO'; $PALANG['edit'] = 'editar'; $PALANG['del'] = 'borrar'; -$PALANG['exit'] = 'Exit'; # XXX -$PALANG['cancel'] = 'Cancel'; # XXX -$PALANG['save'] = 'Save'; # XXX +$PALANG['exit'] = 'Salir'; +$PALANG['cancel'] = 'Cancelar'; +$PALANG['save'] = 'Salvar'; $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['check_update'] = 'Check for update'; -$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX -$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX +$PALANG['check_update'] = 'Check for update'; # XXX +$PALANG['invalid_parameter'] = '¡Parámetro inválido!'; +$PALANG['pFooter_logged_as'] = 'Autenticado como %s'; $PALANG['pLogin_welcome'] = 'Login de administrador para administración de dominios.'; $PALANG['pLogin_username'] = 'Usuario (e-mail)'; $PALANG['pLogin_password'] = 'Contraseña'; $PALANG['pLogin_button'] = 'Usuario'; -$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX +$PALANG['pLogin_failed'] = 'La cuenta de email o la contraseña no son correctas.'; $PALANG['pLogin_login_users'] = 'Login para ir a la sección de usuarios.'; -$PALANG['pMenu_main'] = 'Main'; # XXX +$PALANG['pMenu_main'] = 'Principal'; $PALANG['pMenu_overview'] = 'Resumen'; $PALANG['pMenu_create_alias'] = 'Añadir alias'; -$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX +$PALANG['pMenu_create_alias_domain'] = 'Añadir alias de dominio'; $PALANG['pMenu_create_mailbox'] = 'Añadir buzón'; -$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX +$PALANG['pMenu_fetchmail'] = 'Obtener Emails'; $PALANG['pMenu_sendmail'] = 'Enviar e-mail'; $PALANG['pMenu_password'] = 'Contraseña'; $PALANG['pMenu_viewlog'] = 'Ver Logs'; @@ -44,62 +45,62 @@ $PALANG['pMain_viewlog'] = 'Ver Logs.'; $PALANG['pMain_logout'] = 'Salir.'; -$PALANG['pOverview_disabled'] = 'Disabled'; # XXX -$PALANG['pOverview_unlimited'] = 'Unlimited'; # XXX -$PALANG['pOverview_title'] = ':: Defined Domains'; # XXX -$PALANG['pOverview_up_arrow'] = 'Go Top'; # XXX -$PALANG['pOverview_right_arrow'] = 'Next Page'; # XXX -$PALANG['pOverview_left_arrow'] = 'Previous Page'; # XXX -$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX -$PALANG['pOverview_alias_title'] = ':: Alias'; # XXX -$PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX +$PALANG['pOverview_disabled'] = 'Deshabilitado'; +$PALANG['pOverview_unlimited'] = 'Ilimitado'; +$PALANG['pOverview_title'] = ':: Dominios Definidos'; +$PALANG['pOverview_up_arrow'] = 'Arriba'; +$PALANG['pOverview_right_arrow'] = 'Página siguiente'; +$PALANG['pOverview_left_arrow'] = 'Página anterior'; +$PALANG['pOverview_alias_domain_title'] = ':: Alias de Dominios'; +$PALANG['pOverview_alias_title'] = ':: Alias'; +$PALANG['pOverview_mailbox_title'] = ':: Buzones'; $PALANG['pOverview_button'] = 'Ir'; $PALANG['pOverview_welcome'] = 'Resumen de '; -$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX -$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX -$PALANG['pOverview_alias_alias_count'] = 'Alias'; # XXX +$PALANG['pOverview_alias_domain_aliases'] = 'Alias de Dominios'; +$PALANG['pOverview_alias_domain_target'] = '%s es un alias de dominio para:'; +$PALANG['pOverview_alias_alias_count'] = 'Alias'; $PALANG['pOverview_alias_mailbox_count'] = 'Buzones'; $PALANG['pOverview_alias_address'] = 'De'; $PALANG['pOverview_alias_goto'] = 'Destino'; $PALANG['pOverview_alias_modified'] = 'Última modificación'; -$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX -$PALANG['pOverview_alias_active'] = 'Active'; # XXX -$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX -$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX -$PALANG['and_x_more'] = '[and %s more...]'; # XXX +$PALANG['pOverview_alias_domain_modified'] = 'Última modificación'; +$PALANG['pOverview_alias_active'] = 'Activo'; +$PALANG['pOverview_alias_domain_active'] = 'Activo'; +$PALANG['pOverview_alias_edit'] = 'Alias'; +$PALANG['and_x_more'] = '[y %s más...]'; $PALANG['pOverview_mailbox_username'] = 'E-mail'; $PALANG['pOverview_mailbox_name'] = 'Nombre'; $PALANG['pOverview_mailbox_quota'] = 'Cuota (MB)'; $PALANG['pOverview_mailbox_modified'] = 'Última modificación'; $PALANG['pOverview_mailbox_active'] = 'Activo'; -$PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX -$PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX +$PALANG['pOverview_vacation_edit'] = 'VACATION ESTÁ ACTIVADO'; +$PALANG['pOverview_vacation_option'] = 'Establecer Vacation'; $PALANG['pOverview_get_domain'] = 'Dominio'; $PALANG['pOverview_get_aliases'] = 'Alias'; -$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX +$PALANG['pOverview_get_alias_domains'] = 'Alias de Dominios'; $PALANG['pOverview_get_mailboxes'] = 'Buzones'; $PALANG['pOverview_get_quota'] = 'Cuota de buzón (MB)'; $PALANG['pOverview_get_modified'] = 'Última Modificación'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">Imposible borrar el registro '; -$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX -$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX +$PALANG['pDelete_delete_success'] = '%s borrado.'; +$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">No se pudo eliminar el buzón '; $PALANG['pDelete_domain_error'] = '<span class="error_msg">Este dominio no le pertenece '; -$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX -$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX -$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX -$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX -$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX -$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX -$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX -$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX -$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX -$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX -$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX -$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX -$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX +$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">Este dominio no te pertenece '; +$PALANG['pDelete_alias_error'] = '<span class="error_msg">No se pudo eliminar el alias '; +$PALANG['pCreate_alias_domain_welcome'] = 'Sincronizar direcciones de un dominio a otro.'; +$PALANG['pCreate_alias_domain_alias'] = 'Alias de Dominio'; +$PALANG['pCreate_alias_domain_alias_text'] = 'El dominio al que llega el email.'; +$PALANG['pCreate_alias_domain_target'] = 'Dominio de destino'; +$PALANG['pCreate_alias_domain_target_text'] = 'El dominio al que deberían ir los emails.'; +$PALANG['pCreate_alias_domain_active'] = 'Activo'; +$PALANG['pCreate_alias_domain_button'] = 'Añadir Alias de Dominio'; +$PALANG['pCreate_alias_domain_error1'] = 'No estás autorizado a crear la configuración que has elegido.'; +$PALANG['pCreate_alias_domain_error2'] = '¡La configuración seleccionada no es válida, por favor elige una diferente!'; +$PALANG['pCreate_alias_domain_error3'] = 'Falló la inserción en la base de datos.'; +$PALANG['pCreate_alias_domain_error4'] = 'Ya están todos los dominios asignados.'; +$PALANG['pCreate_alias_domain_success'] = '¡El alias de dominio se insertó en la tabla!'; $PALANG['pCreate_alias_welcome'] = 'Crear un nuevo alias para el dominio.'; $PALANG['pCreate_alias_address'] = 'Alias'; @@ -107,7 +108,7 @@ $PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">¡Esta dirección ya existe, elija otra diferente por favor!</span>'; $PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">¡Ha llegado a su límite de creación de alias!</span>'; $PALANG['pCreate_alias_goto'] = 'Destino'; -$PALANG['pCreate_alias_active'] = 'Active'; # XXX +$PALANG['pCreate_alias_active'] = 'Activo'; $PALANG['pCreate_alias_button'] = 'Añadir alias'; $PALANG['pCreate_alias_goto_text'] = 'A donde debe de ser enviado el e-mail.'; $PALANG['pCreate_alias_goto_text_error'] = 'A donde debe de ser enviado el e-mail.<br /><span class="error_msg">¡El PARA no es válido!</span>'; @@ -119,13 +120,13 @@ $PALANG['pEdit_alias_address'] = 'Alias'; $PALANG['pEdit_alias_address_error'] = '<span class="error_msg">¡Imposible de localizar el alias!</span>'; $PALANG['pEdit_alias_goto'] = 'Destino'; -$PALANG['pEdit_alias_active'] = 'Active'; # XXX +$PALANG['pEdit_alias_active'] = 'Activo'; $PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">No ha introducido nada en el destino</span>'; $PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">La dirección de e-mail introducida no es válida: '; $PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Este dominio no le pertenece: '; -$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX -$PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX -$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX +$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">¡No se pudo modificar el alias de dominio!</span>'; +$PALANG['pEdit_alias_forward_and_store'] = 'Entregar al buzón local.'; +$PALANG['pEdit_alias_forward_only'] = 'Reenviar sólo al email especificado.'; $PALANG['pEdit_alias_button'] = 'Editar alias'; $PALANG['pEdit_alias_result_error'] = '<span class="error_msg">¡Imposible modificar el alias!</span>'; @@ -177,11 +178,11 @@ $PALANG['pPassword_result_error'] = '<span class="error_msg">¡Imposible cambiar la contraseña!</span>'; $PALANG['pPassword_result_success'] = '¡Su contraseña ha sido cambiada!'; -$PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX -$PALANG['pEdit_vacation_remove'] = 'Remove away message'; # XXX +$PALANG['pEdit_vacation_set'] = 'Cambiar / Establecer mensaje de ausencia'; +$PALANG['pEdit_vacation_remove'] = 'Quitar mensaje de ausencia'; $PALANG['pVacation_result_error'] = '<span class="error_msg">¡Imposible actualizar la configuracióne la respuesta automática!</span>'; -$PALANG['pVacation_result_removed'] = 'Auto response has been removed!'; # XXX -$PALANG['pVacation_result_added'] = 'Auto response has been enabled!'; # XXX +$PALANG['pVacation_result_removed'] = '¡Autorespuesta eliminada!'; +$PALANG['pVacation_result_added'] = '¡Autorespuesta habilitada!'; $PALANG['pViewlog_welcome'] = 'Ver las últimas 10 acciones para '; $PALANG['pViewlog_timestamp'] = 'Fecha/Hora'; @@ -189,18 +190,18 @@ $PALANG['pViewlog_domain'] = 'Dominio'; $PALANG['pViewlog_action'] = 'Acción'; $PALANG['pViewlog_data'] = 'Datos'; -$PALANG['pViewlog_action_create_mailbox'] = 'create mailbox'; # XXX -$PALANG['pViewlog_action_delete_mailbox'] = 'delete mailbox'; # XXX -$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX -$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX -$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX -$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX -$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX -$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX -$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX -$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX -$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX -$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX +$PALANG['pViewlog_action_create_mailbox'] = 'crear buzón'; +$PALANG['pViewlog_action_delete_mailbox'] = 'borrar buzón'; +$PALANG['pViewlog_action_edit_mailbox'] = 'editar buzón'; +$PALANG['pViewlog_action_edit_mailbox_state'] = 'editar buzón activo'; +$PALANG['pViewlog_action_create_alias'] = 'crear alias'; +$PALANG['pViewlog_action_create_alias_domain'] = 'crear alias de dominio'; +$PALANG['pViewlog_action_delete_alias'] = 'borrar alias'; +$PALANG['pViewlog_action_delete_alias_domain'] = 'borrar alias de dominio'; +$PALANG['pViewlog_action_edit_alias'] = 'editar alias'; +$PALANG['pViewlog_action_edit_alias_state'] = 'editar alias activo'; +$PALANG['pViewlog_action_edit_alias_domain_state'] = 'editar alias de dominio activo'; +$PALANG['pViewlog_action_edit_password'] = 'cambiar contraseña'; $PALANG['pViewlog_button'] = 'Ir'; $PALANG['pViewlog_result_error'] = '<span class="error_msg">¡Imposible encontrar los logs!</span>'; @@ -213,8 +214,8 @@ $PALANG['pSendmail_subject_text'] = 'Bienvenido'; $PALANG['pSendmail_body'] = 'Cuerpo'; $PALANG['pSendmail_button'] = 'Enviar mensaje'; -$PALANG['pSendmail_result_error'] = '<span class="error_msg">¡Imposible crear el buzón!</span>'; # XXX text change - new: <span class="error_msg">Unable to send email!</span> -$PALANG['pSendmail_result_success'] = '¡El buzón ha sido creado!'; # XXX text change - new: Email sent! +$PALANG['pSendmail_result_error'] = '<span class="error_msg">¡Imposible enviar el email!</span>'; +$PALANG['pSendmail_result_success'] = '¡Email enviado!'; $PALANG['pAdminMenu_list_admin'] = 'Lista de administradores'; $PALANG['pAdminMenu_list_domain'] = 'Lista de dominios'; @@ -238,7 +239,7 @@ $PALANG['pAdminList_domain_aliases'] = 'Alias'; $PALANG['pAdminList_domain_mailboxes'] = 'Buzones'; $PALANG['pAdminList_domain_maxquota'] = 'Cuota Máxima (MB)'; -$PALANG['pAdminList_domain_transport'] = 'Transport'; # XXX +$PALANG['pAdminList_domain_transport'] = 'Transporte'; $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX $PALANG['pAdminList_domain_modified'] = 'Última Modificación'; $PALANG['pAdminList_domain_active'] = 'Activo'; @@ -259,7 +260,7 @@ $PALANG['pAdminCreate_domain_welcome'] = 'Añadir nuevo dominio'; $PALANG['pAdminCreate_domain_domain'] = 'Dominio'; $PALANG['pAdminCreate_domain_domain_text_error'] = '<span class="error_msg">¡El dominio ya existe!</span>'; -$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">The domain is invalid!</span>'; # XXX +$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">!El dominio no es válido!</span>'; $PALANG['pAdminCreate_domain_description'] = 'Descripción'; $PALANG['pAdminCreate_domain_aliases'] = 'Alias'; $PALANG['pAdminCreate_domain_aliases_text'] = '-1 = deshabilitar | 0 = ilimitado'; @@ -268,15 +269,15 @@ $PALANG['pAdminCreate_domain_maxquota'] = 'Cuota máxima'; $PALANG['pAdminCreate_domain_maxquota_text'] = 'MB<br /> -1 = deshabilitar | 0 = ilimitado'; $PALANG['pAdminCreate_domain_transport'] = 'Transport'; # XXX -$PALANG['pAdminCreate_domain_transport_text'] = 'Define transport'; # XXX +$PALANG['pAdminCreate_domain_transport_text'] = 'Definir transport'; # XXX $PALANG['pAdminCreate_domain_defaultaliases'] = 'Añadir alias por defecto'; $PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; -$PALANG['pAdminCreate_domain_backupmx'] = 'Mail server is backup MX'; # XXX +$PALANG['pAdminCreate_domain_backupmx'] = 'El servidor de correo es backup MX'; # XXX $PALANG['pAdminCreate_domain_button'] = 'Añadir dominio'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">¡Imposible añadir el dominio!</span>'; $PALANG['pAdminCreate_domain_result_success'] = '¡El dominio ha sido añadido!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX +$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">¡No se pudo eliminar el dominio!</span>'; +$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">¡No se pudo eliminar el alias de dominio!</span>'; $PALANG['pAdminEdit_domain_welcome'] = 'Editar un dominio'; $PALANG['pAdminEdit_domain_domain'] = 'Dominio'; @@ -288,8 +289,8 @@ $PALANG['pAdminEdit_domain_maxquota'] = 'Cuota máxima'; $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB<br /> -1 = deshabilitar | 0 = ilimitado'; $PALANG['pAdminEdit_domain_transport'] = 'Transport'; -$PALANG['pAdminEdit_domain_transport_text'] = 'Define transport'; # XXX -$PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX'; # XXX +$PALANG['pAdminEdit_domain_transport_text'] = 'Definir transport'; # XXX +$PALANG['pAdminEdit_domain_backupmx'] = 'El servidor de correo es backup MX'; # XXX $PALANG['pAdminEdit_domain_active'] = 'Activo'; $PALANG['pAdminEdit_domain_button'] = 'Editar dominio'; $PALANG['pAdminEdit_domain_result_error'] = '<span class="error_msg">¡Imposible modificar el dominio!</span>'; @@ -331,7 +332,7 @@ $PALANG['pUsersMenu_password'] = 'Cambiar la contraseña'; $PALANG['pUsersMain_vacation'] = 'Configure un mensaje de "fuera del trabajo" o una respuesta automática para su correo.'; -$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX +$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' está ACTIVADO, click \'' . $PALANG['pUsersMenu_vacation'] . '\' para ' . $PALANG['edit'] . '/eliminar'; $PALANG['pUsersMain_edit_alias'] = 'Cambie su redirección de correo.'; $PALANG['pUsersMain_password'] = 'Cambie su contraseña.'; @@ -339,7 +340,7 @@ $PALANG['pUsersVacation_welcome_text'] = '¡Ya dispone de una respuesta automática configurada!'; $PALANG['pUsersVacation_subject'] = 'Asunto'; $PALANG['pUsersVacation_subject_text'] = 'Fuera del trabajo'; -$PALANG['pUsersVacation_body'] = 'Cuerpo'; # XXX text changed to 'Message' +$PALANG['pUsersVacation_body'] = 'Mensaje'; $PALANG['pUsersVacation_body_text'] = <<<EOM Estaré fuera desde <date> hasta <date>. Para asuntos urgentes, puede contactar conmigo en <contact person>. @@ -348,76 +349,78 @@ $PALANG['pUsersVacation_button_back'] = 'De vuelta'; $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">¡Imposible actualizar la configuración de su respuesta automática!</span>'; $PALANG['pUsersVacation_result_success'] = '¡Su respuesta automática ha sido borrada!'; +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX -$PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox'; # XXX -$PALANG['pCreate_dbLog_createalias'] = 'create alias'; # XXX -$PALANG['pDelete_dbLog_deletealias'] = 'delete alias'; # XXX -$PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox'; # XXX +$PALANG['pCreate_dbLog_createmailbox'] = 'crear buzón'; +$PALANG['pCreate_dbLog_createalias'] = 'crear alias'; +$PALANG['pDelete_dbLog_deletealias'] = 'borrar alias'; +$PALANG['pDelete_dbLog_deletemailbox'] = 'borrar buzón'; -$PALANG['pEdit_dbLog_editactive'] = 'change active state'; # XXX -$PALANG['pEdit_dbLog_editalias'] = 'edit alias'; # XXX -$PALANG['pEdit_dbLog_editmailbox'] = 'edit mailbox'; # XXX +$PALANG['pEdit_dbLog_editactive'] = 'cambiar estado activo'; +$PALANG['pEdit_dbLog_editalias'] = 'editar alias'; +$PALANG['pEdit_dbLog_editmailbox'] = 'editar buzón'; -$PALANG['pSearch'] = 'search'; # XXX -$PALANG['pSearch_welcome'] = 'Searching for: '; # XXX -$PALANG['pReturn_to'] = 'Return to'; # XXX -$PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX -$PALANG['pBroadcast_from'] = 'From'; # XXX -$PALANG['pBroadcast_name'] = 'Your name'; # XXX -$PALANG['pBroadcast_subject'] = 'Subject'; # XXX -$PALANG['pBroadcast_message'] = 'Message'; # XXX -$PALANG['pBroadcast_send'] = 'Send message'; # XXX -$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX +$PALANG['pSearch'] = 'buscar'; +$PALANG['pSearch_welcome'] = 'Buscando: '; +$PALANG['pReturn_to'] = 'Volver a'; +$PALANG['pBroadcast_title'] = 'Enviar mensaje a todos'; # XXX +$PALANG['pBroadcast_from'] = 'De'; +$PALANG['pBroadcast_name'] = 'Tu nombre'; +$PALANG['pBroadcast_subject'] = 'Asunto'; +$PALANG['pBroadcast_message'] = 'Mensaje'; +$PALANG['pBroadcast_send'] = 'Enviar mensaje'; +$PALANG['pBroadcast_success'] = 'Se ha enviado el mensaje.'; $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX -$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX -$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX -$PALANG['pStatus_custom'] = 'Delivers to '; # XXX +$PALANG['pBroadcast_error_empty'] = '¡Los campos Nombre, Asunto y Mensaje no pueden estar vacíos!'; +$PALANG['pStatus_undeliverable'] = 'posiblemente NO SE ENTREGÓ'; +$PALANG['pStatus_custom'] = 'Enviado a '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX -$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX -$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX -$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX -$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX -$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX -$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX -$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX -$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX +$PALANG['pPasswordTooShort'] = "La contraseña es demasiado corta - se necesitan %s caracteres"; +$PALANG['pInvalidDomainRegex'] = "El nombre de dominio %s es inválido, no se ajusta a la expresión regular"; +$PALANG['pInvalidDomainDNS'] = "El dominio %s no es válido, y/o no tiene resolución DNS"; +$PALANG['pInvalidMailRegex'] = "La dirección de email no es válidas, no se ajusta a la expresión regular"; +$PALANG['pFetchmail_welcome'] = 'Obtener mail para:'; +$PALANG['pFetchmail_new_entry'] = 'Nueva entrada'; +$PALANG['pFetchmail_database_save_error'] = '¡No se pudo salvar la entrada en la base de datos!'; +$PALANG['pFetchmail_database_save_success'] = 'Entrada salvada en la base de datos.'; $PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX -$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX -$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX -$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX -$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX +$PALANG['pFetchmail_invalid_mailbox'] = '¡Buzón inválido!'; +$PALANG['pFetchmail_server_missing'] = '¡Por favor introduzca el nombre del servidor remoto!'; +$PALANG['pFetchmail_user_missing'] = '¡Por favor introduzca el usuario remoto!'; +$PALANG['pFetchmail_password_missing'] = '¡Por favor introduzca la contraseña remota!'; $PALANG['pFetchmail_field_id'] = 'ID'; # XXX -$PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX -$PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX -$PALANG['pFetchmail_field_src_auth'] = 'Auth Type'; # XXX -$PALANG['pFetchmail_field_src_user'] = 'User'; # XXX -$PALANG['pFetchmail_field_src_password'] = 'Password'; # XXX -$PALANG['pFetchmail_field_src_folder'] = 'Folder'; # XXX +$PALANG['pFetchmail_field_mailbox'] = 'Buzón'; +$PALANG['pFetchmail_field_src_server'] = 'Servidor'; +$PALANG['pFetchmail_field_src_auth'] = 'Tipo Autenticación'; +$PALANG['pFetchmail_field_src_user'] = 'Usuario'; +$PALANG['pFetchmail_field_src_password'] = 'Contraseña'; +$PALANG['pFetchmail_field_src_folder'] = 'Carpeta'; $PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX -$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX -$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX -$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX -$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX +$PALANG['pFetchmail_field_fetchall'] = 'Obtener todo'; +$PALANG['pFetchmail_field_keep'] = 'Conservar'; +$PALANG['pFetchmail_field_protocol'] = 'Protocolo'; +$PALANG['pFetchmail_field_usessl'] = 'SSL activado'; +$PALANG['pFetchmail_field_extra_options'] = 'Opciones extras'; $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX -$PALANG['pFetchmail_field_date'] = 'Date'; # XXX -$PALANG['pFetchmail_field_returned_text'] = 'Returned Text'; # XXX +$PALANG['pFetchmail_field_date'] = 'Fecha'; +$PALANG['pFetchmail_field_returned_text'] = 'Texto Devuelto'; $PALANG['pFetchmail_desc_id'] = 'Record ID'; # XXX -$PALANG['pFetchmail_desc_mailbox'] = 'Local mailbox'; # XXX -$PALANG['pFetchmail_desc_src_server'] = 'Remote Server'; # XXX +$PALANG['pFetchmail_desc_mailbox'] = 'Buzón local'; +$PALANG['pFetchmail_desc_src_server'] = 'Servidor Remoto'; $PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here # XXX -$PALANG['pFetchmail_desc_src_user'] = 'Remote User'; # XXX -$PALANG['pFetchmail_desc_src_password'] = 'Remote Password'; # XXX -$PALANG['pFetchmail_desc_src_folder'] = 'Remote Folder'; # XXX -$PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX -$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX -$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX -$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX -$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX +$PALANG['pFetchmail_desc_src_user'] = 'Usuario Remoto'; +$PALANG['pFetchmail_desc_src_password'] = 'Contraseña Remota'; +$PALANG['pFetchmail_desc_src_folder'] = 'Carpeta Remota'; +$PALANG['pFetchmail_desc_poll_time'] = 'Obtener cada ... minutos'; +$PALANG['pFetchmail_desc_fetchall'] = 'Obtener los mensajes leídos y nuevos'; +$PALANG['pFetchmail_desc_keep'] = 'Guardar una copia de los mensajes en el servidor remoto'; +$PALANG['pFetchmail_desc_protocol'] = 'Protocolo a usar'; +$PALANG['pFetchmail_desc_usessl'] = 'Cifrado SSL'; +$PALANG['pFetchmail_desc_extra_options'] = 'Opciones extras para fetchmail'; $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX -$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX -$PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX +$PALANG['pFetchmail_desc_date'] = 'Fecha del último sondeo/cambio en la configuración'; +$PALANG['pFetchmail_desc_returned_text'] = 'Mensaje del último sondeo'; $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ Modified: branches/postfixadmin-2.3/languages/et.lang =================================================================== --- branches/postfixadmin-2.3/languages/et.lang 2009-12-24 14:58:01 UTC (rev 791) +++ branches/postfixadmin-2.3/languages/et.lang 2009-12-28 21:24:38 UTC (rev 792) @@ -350,6 +350,8 @@ $PALANG['pUsersVacation_button_back'] = 'Tulen tagasi'; $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Automaatse vastuse uuendamine ebaõnnestus!</span>'; $PALANG['pUsersVacation_result_success'] = 'Automaatne vastus on eemaldatud!'; +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pCreate_dbLog_createmailbox'] = 'postkasti loomine'; $PALANG['pCreate_dbLog_createalias'] = 'aliase loomine'; Modified: branches/postfixadmin-2.3/languages/eu.lang =================================================================== --- branches/postfixadmin-2.3/languages/eu.lang 2009-12-24 14:58:01 UTC (rev 791) +++ branches/postfixadmin-2.3/languages/eu.lang 2009-12-28 21:24:38 UTC (rev 792) @@ -346,6 +346,8 @@ $PALANG['pUsersVacation_button_back'] = 'Itzulita'; $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Ezinezkoa zure erantzun atomatikoaren konfigurazioa eguneratzea!</span>'; $PALANG['pUsersVacation_result_success'] = 'Zure erantzun automatikoa borratu da!'; +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox'; # XXX $PALANG['pCreate_dbLog_createalias'] = 'create alias'; # XXX Modified: branches/postfixadmin-2.3/languages/fi.lang =================================================================== --- branches/postfixadmin-2.3/languages/fi.lang 2009-12-24 14:58:01 UTC (rev 791) +++ branches/postfixadmin-2.3/languages/fi.lang 2009-12-28 21:24:38 UTC (rev 792) @@ -347,6 +347,8 @@ $PALANG['pUsersVacation_button_back'] = 'Takaisin lomalta'; $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Automaattivastauksen asettaminen epäonnistui!</span>'; $PALANG['pUsersVacation_result_success'] = 'Automaattivastaus on poistettu käytöstä!'; +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pCreate_dbLog_createmailbox'] = 'luo sähköpostilaatikko'; $PALANG['pCreate_dbLog_createalias'] = 'luo alias'; Modified: branches/postfixadmin-2.3/languages/fo.lang =================================================================== --- branches/postfixadmin-2.3/languages/fo.lang 2009-12-24 14:58:01 UTC (rev 791) +++ branches/postfixadmin-2.3/languages/fo.lang 2009-12-28 21:24:38 UTC (rev 792) @@ -352,6 +352,8 @@ $PALANG['pUsersVacation_button_back'] = 'Heima'; $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Fái ikki broytt tínar frítíðarboð uppsetingar!</span>'; $PALANG['pUsersVacation_result_success'] = 'Títt frítíðarboð er strikað!'; +$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX +$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox'; # XXX $PALANG['pCreate_dbLog_createalias'] = 'create alias'; # XXX Modified: branches/postfixadmin-2.3/languages/fr.lang =================================================================== --- branches/postfixadmin-2.3/languages/fr.lang 2009-12-24 14:58:01 UTC (rev 791) +++ branches/postfixadmin-2.3/languages/fr.lang 2009-12-28 21:24:38 UTC (rev 792) @@ -24,13 +24,13 @@ $PALANG['pLogin_username'] = 'Adresse courriel'; $PALANG['pLogin_password'] = 'Mot de passe'; $PALANG['pLogin_button'] = 'Entrer'; -$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX +$PALANG['pLogin_failed'] = 'Votre email ou mot de passe est incorrect.'; $PALANG['pLogin_login_users'] = 'Utilisateurs, cliquez ici pour rejoindre votre section.'; $PALANG['pMenu_main'] = 'Menu principal'; $PALANG['pMenu_overview'] = 'Vue d\'ensemble'; $PALANG['pMenu_create_alias'] = 'Ajouter un alias'; -$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX +$PALANG['pMenu_create_alias_domain'] = 'Ajouter un alias de domaine'; $PALANG['pMenu_create_mailbox'] = 'Ajouter un compte courriel'; $PALANG['pMenu_fetchmail'] = 'Récupérer le courrier'; $PALANG['pMenu_sendmail'] = 'Envoyer un courriel'; @@ -53,21 +53,21 @@ $PALANG['pOverview_up_arrow'] = 'Remonter'; $PALANG['pOverview_right_arrow'] = 'Page suivante'; $PALANG['pOverview_left_arrow'] = 'Page précédente'; -$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX +$PALANG['pOverview_alias_domain_title'] = ':: Alias Domaine'; $PALANG['pOverview_alias_title'] = ':: Alias'; $PALANG['pOverview_mailbox_title'] = ':: Comptes courriels'; $PALANG['pOverview_button'] = 'Aller'; $PALANG['pOverview_welcome'] = 'Vue d\'ensemble pour '; -$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX -$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX +$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domaines'; +$PALANG['pOverview_alias_domain_target'] = '%s est un alias de domaine pour:'; $PALANG['pOverview_alias_alias_count'] = 'Alias'; $PALANG['pOverview_alias_mailbox_count'] = 'Comptes courriels'; $PALANG['pOverview_alias_address'] = 'De'; $PALANG['pOverview_alias_goto'] = 'A'; $PALANG['pOverview_alias_modified'] = 'Dernière Modification'; -$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX +$PALANG['pOverview_alias_domain_modified'] = 'Dernière Modification'; $PALANG['pOverview_alias_active'] = 'Activé'; -$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX +$PALANG['pOverview_alias_domain_active'] = 'Activé'; $PALANG['pOverview_alias_edit'] = 'Alias'; $PALANG['and_x_more'] = '[et %s en plus...]'; $PALANG['pOverview_mailbox_username'] = 'courriel'; @@ -80,7 +80,7 @@ $PALANG['pOverview_get_domain'] = 'Domaine'; $PALANG['pOverview_get_aliases'] = 'Alias'; -$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX +$PALANG['pOverview_get_alias_domains'] = 'Alias Domaine'; $PALANG['pOverview_get_mailboxes'] = 'Comptes courriels'; $PALANG['pOverview_get_quota'] = 'Limite compte courriels (MB)'; $PALANG['pOverview_get_modified'] = 'Dernière Modification'; @@ -89,20 +89,20 @@ $PALANG['pDelete_delete_success'] = '%s supprimé.'; $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Impossible ... [truncated message content] |
From: <chr...@us...> - 2010-05-16 22:55:25
|
Revision: 824 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=824&view=rev Author: christian_boltz Date: 2010-05-16 22:55:19 +0000 (Sun, 16 May 2010) Log Message: ----------- merged more fixes (between r793 and r823) from trunk to 2.3 branch - merged SVN r794, r801 (only md5crypt part), r803, r808, r810, r814, r815 (only functions.inc.php), r822 to 2.3 branch - see CHANGELOG.TXT changes for details not yet merged and/or to be discussed: - r805 - debian/* - normes or GingerDog, can you merge this part, please? I don't want to change stuff that I don't understand ;-) - display alias targets for mailboxes (r751 and r787 part b) (yes, that's still a leftover from the first merge round - and IMHO the only blocker for the 2.3.1 release) - r800, r806, r821 - Squirrelmail Plugin - r811, r812 - Squirrelmail Plugin / Zend - not sure if we really should include the whole Zend framework in the tarball, it's laaaaaarge and only useful for squirrelmail users. I'd vote for a "Requires: Zend" in the documentation. - r815: the change in users/index.php makes access to users/ too easy if someone forgot to logout (security by obscurity, but still...) - r817 - ADDITIONS/cyrus (config file path?) - r819 - maildir path hook (BTW: the example function should be moved to config.inc.php) Modified Paths: -------------- branches/postfixadmin-2.3/CHANGELOG.TXT branches/postfixadmin-2.3/DOCUMENTS/DOVECOT.txt branches/postfixadmin-2.3/INSTALL.TXT branches/postfixadmin-2.3/edit-alias.php branches/postfixadmin-2.3/functions.inc.php branches/postfixadmin-2.3/languages/nl.lang branches/postfixadmin-2.3/list-domain.php branches/postfixadmin-2.3/setup.php branches/postfixadmin-2.3/upgrade.php branches/postfixadmin-2.3/viewlog.php Modified: branches/postfixadmin-2.3/CHANGELOG.TXT =================================================================== --- branches/postfixadmin-2.3/CHANGELOG.TXT 2010-05-16 22:21:38 UTC (rev 823) +++ branches/postfixadmin-2.3/CHANGELOG.TXT 2010-05-16 22:55:19 UTC (rev 824) @@ -28,6 +28,16 @@ superadmins) - add in_array() check to avoid that superadmins can enter invalid domains - fix delete link for alias domains (when on target domain) + - fix hardcoded table names in list-domain.php + - fixed edit-alias.php not to drop alias to the mailbox if + special_alias_control = NO + - fix typo in upgrade.php that broke index creation and deletion when using + non-default table names + - fix creating 'ALL' domain (dummy for superadmins) when using non-default + table names + - check for $CONF['encrypt'] = 'dovecot:md5-crypt' (postfixadmin login not + working because dovecotpw uses a new salt each time), recommend + internal md5crypt instead Version 2.3 - 2009/10/24 - SVN r739 ----------------------------------- Modified: branches/postfixadmin-2.3/DOCUMENTS/DOVECOT.txt =================================================================== --- branches/postfixadmin-2.3/DOCUMENTS/DOVECOT.txt 2010-05-16 22:21:38 UTC (rev 823) +++ branches/postfixadmin-2.3/DOCUMENTS/DOVECOT.txt 2010-05-16 22:55:19 UTC (rev 824) @@ -65,6 +65,11 @@ user_query = SELECT maildir, 1001 AS uid, 1001 AS gid FROM mailbox WHERE username = '%u' AND active='1' +for dovecot 1.2: (for PostgreSQL, replace 'CONCAT(a, b)' with 'a || b') +user_query = SELECT CONCAT('/home/vmail/', maildir) AS home, 1001 AS uid, 1001 AS gid, + CONCAT('*:bytes=', quota) AS quota_rule FROM mailbox WHERE username = '%u' AND active='1' + + NB! The GID and UID are for postfix user and group ID, NOT MySQL user and group ID. Modified: branches/postfixadmin-2.3/INSTALL.TXT =================================================================== --- branches/postfixadmin-2.3/INSTALL.TXT 2010-05-16 22:21:38 UTC (rev 823) +++ branches/postfixadmin-2.3/INSTALL.TXT 2010-05-16 22:55:19 UTC (rev 824) @@ -117,7 +117,17 @@ This is all that is needed. Fire up your browser and go to the site that you specified to host Postfix Admin. -6. More information +6. Integration with Postfix, Dovecot etc. +----------------------------------------- + +Now that PostfixAdmin is working, you need to do some configuration in Postfix, +Dovecot etc. so that they use the domains, mailboxes and aliases you setup in +PostfixAdmin. + +The files in the DOCUMENTS/ directory explain which settings you need to +do/change. + +7. More information ------------------- As of March 2007, PostfixAdmin moved to SourceForge. For the forum posts and source updates, see: Modified: branches/postfixadmin-2.3/edit-alias.php =================================================================== --- branches/postfixadmin-2.3/edit-alias.php 2010-05-16 22:21:38 UTC (rev 823) +++ branches/postfixadmin-2.3/edit-alias.php 2010-05-16 22:55:19 UTC (rev 824) @@ -135,7 +135,7 @@ { if($CONF['alias_control_admin'] == 'NO' && !authentication_has_role('global-admin')) { // if original record had a mailbox alias, so ensure the updated one does too. - if(in_array($orig_alias_list, $fAddress)) { + if(in_array($fAddress, $orig_alias_list)) { $new_aliases[] = $fAddress; } } Modified: branches/postfixadmin-2.3/functions.inc.php =================================================================== --- branches/postfixadmin-2.3/functions.inc.php 2010-05-16 22:21:38 UTC (rev 823) +++ branches/postfixadmin-2.3/functions.inc.php 2010-05-16 22:55:19 UTC (rev 824) @@ -81,7 +81,12 @@ if(authentication_has_role($role)) { return True; } - header("Location: " . $CONF['postfix_admin_url'] . "/login.php"); + if($role === 'user') { + header("Location: " . $CONF['postfix_admin_url'] . '/users/login.php'); + } + else { + header("Location: " . $CONF['postfix_admin_url'] . "/login.php"); + } exit(0); } /** @@ -1199,6 +1204,7 @@ $split_method = preg_split ('/:/', $CONF['encrypt']); $method = strtoupper($split_method[1]); if (! preg_match("/^[A-Z0-9-]+$/", $method)) { die("invalid dovecot encryption method"); } # TODO: check against a fixed list? + if (strtolower($method) == md5-crypt) die("\$CONF[encrypt] = dovecot:md5-crypt will not work because dovecotpw generates a random salt each time. Please use \$CONF[encrypt] = md5crypt instead."); $dovecotpw = "dovecotpw"; if (!empty($CONF['dovecotpw'])) $dovecotpw = $CONF['dovecotpw']; Modified: branches/postfixadmin-2.3/languages/nl.lang =================================================================== --- branches/postfixadmin-2.3/languages/nl.lang 2010-05-16 22:21:38 UTC (rev 823) +++ branches/postfixadmin-2.3/languages/nl.lang 2010-05-16 22:55:19 UTC (rev 824) @@ -85,7 +85,7 @@ $PALANG['pOverview_get_modified'] = 'Laatst bewerkt'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">Mislukt te verwijderen '; -$PALANG['pDelete_delete_success'] = '%s verwijdert.'; +$PALANG['pDelete_delete_success'] = '%s verwijderd.'; $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Niet in staat mailbox te verwijderen '; $PALANG['pDelete_domain_error'] = '<span class="error_msg">Dit is niet uw domein '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">Dit is niet uw domein '; @@ -191,12 +191,12 @@ $PALANG['pViewlog_action'] = 'Actie'; $PALANG['pViewlog_data'] = 'Aanpassing'; $PALANG['pViewlog_action_create_mailbox'] = 'Mailbox toegevoegd'; -$PALANG['pViewlog_action_delete_mailbox'] = 'Mailbox verwijdert'; +$PALANG['pViewlog_action_delete_mailbox'] = 'Mailbox verwijderd'; $PALANG['pViewlog_action_edit_mailbox'] = 'Mailbox bewerkt'; $PALANG['pViewlog_action_edit_mailbox_state'] = 'status actieve mailbox bewerkt'; $PALANG['pViewlog_action_create_alias'] = 'alias toegevoegd'; $PALANG['pViewlog_action_create_alias_domain'] = 'maak domein alias'; -$PALANG['pViewlog_action_delete_alias'] = 'alias verwijdert'; +$PALANG['pViewlog_action_delete_alias'] = 'alias verwijderd'; $PALANG['pViewlog_action_delete_alias_domain'] = 'verwijder alias domein'; $PALANG['pViewlog_action_edit_alias'] = 'alias bewerkt'; $PALANG['pViewlog_action_edit_alias_state'] = 'status actieve alias bewerkt'; @@ -331,7 +331,7 @@ $PALANG['pUsersMenu_password'] = 'Wijzig wachtwoord'; $PALANG['pUsersMain_vacation'] = 'Stel een "out of office" bericht of automatisch beantwoorden voor uw e-mail in.'; -$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is actief, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/verweideren'; +$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_password'] = 'Wijzig uw huidige wachtwoord.'; @@ -353,8 +353,8 @@ $PALANG['pCreate_dbLog_createmailbox'] = 'mailbox aangemaakt'; $PALANG['pCreate_dbLog_createalias'] = 'alias aangemaakt'; -$PALANG['pDelete_dbLog_deletealias'] = 'alias verwijdert'; -$PALANG['pDelete_dbLog_deletemailbox'] = 'mailbox verwijdert'; +$PALANG['pDelete_dbLog_deletealias'] = 'alias verwijderd'; +$PALANG['pDelete_dbLog_deletemailbox'] = 'mailbox verwijderd'; $PALANG['pEdit_dbLog_editactive'] = 'status verandert'; $PALANG['pEdit_dbLog_editalias'] = 'bewerk alias'; Modified: branches/postfixadmin-2.3/list-domain.php =================================================================== --- branches/postfixadmin-2.3/list-domain.php 2010-05-16 22:21:38 UTC (rev 823) +++ branches/postfixadmin-2.3/list-domain.php 2010-05-16 22:55:19 UTC (rev 824) @@ -51,24 +51,28 @@ $list_domains = list_domains_for_admin(authentication_get_username()); } +$table_domain = table_by_key('domain'); +$table_mailbox = table_by_key('mailbox'); +$table_alias = table_by_key('alias'); + if ($list_all_domains == 1) { - $where = " WHERE domain.domain != 'ALL' "; # TODO: the ALL dummy domain is annoying... + $where = " WHERE $table_domain.domain != 'ALL' "; # TODO: the ALL dummy domain is annoying... } else { $list_domains = escape_string($list_domains); - $where = " WHERE domain.domain IN ('" . join("','", $list_domains) . "') "; + $where = " WHERE $table_domain.domain IN ('" . join("','", $list_domains) . "') "; } # fetch domain data and number of mailboxes # (PgSQL requires the extensive GROUP BY statement, https://sourceforge.net/forum/message.php?msg_id=7386240) $query = " - SELECT domain.* , COUNT( DISTINCT mailbox.username ) AS mailbox_count - FROM domain - LEFT JOIN mailbox ON domain.domain = mailbox.domain + SELECT $table_domain.* , COUNT( DISTINCT $table_mailbox.username ) AS mailbox_count + FROM $table_domain + LEFT JOIN $table_mailbox ON $table_domain.domain = $table_mailbox.domain $where - GROUP BY domain.domain, domain.description, domain.aliases, domain.mailboxes, - domain.maxquota, domain.quota, domain.transport, domain.backupmx, domain.created, - domain.modified, domain.active - ORDER BY domain.domain + GROUP BY $table_domain.domain, $table_domain.description, $table_domain.aliases, $table_domain.mailboxes, + $table_domain.maxquota, $table_domain.quota, $table_domain.transport, $table_domain.backupmx, $table_domain.created, + $table_domain.modified, $table_domain.active + ORDER BY $table_domain.domain "; $result = db_query($query); @@ -80,12 +84,12 @@ # fetch number of aliases # doing this separate is much faster than doing it in one "big" query $query = " - SELECT domain.domain, COUNT( DISTINCT alias.address ) AS alias_count - FROM domain - LEFT JOIN alias ON domain.domain = alias.domain + SELECT $table_domain.domain, COUNT( DISTINCT $table_alias.address ) AS alias_count + FROM $table_domain + LEFT JOIN $table_alias ON $table_domain.domain = $table_alias.domain $where - GROUP BY domain.domain - ORDER BY domain.domain + GROUP BY $table_domain.domain + ORDER BY $table_domain.domain "; $result = db_query($query); Modified: branches/postfixadmin-2.3/setup.php =================================================================== --- branches/postfixadmin-2.3/setup.php 2010-05-16 22:21:38 UTC (rev 823) +++ branches/postfixadmin-2.3/setup.php 2010-05-16 22:55:19 UTC (rev 824) @@ -336,7 +336,7 @@ $table_domain = table_by_key('domain'); $r = db_query("SELECT * FROM $table_domain WHERE domain = 'ALL'"); if($r['rows'] == 0) { - db_insert($table_domain, array('domain' => 'ALL')); // all other fields should default through the schema. + db_insert('domain', array('domain' => 'ALL')); // all other fields should default through the schema. } list ($error, $tMessage, $pAdminCreate_admin_username_text, $pAdminCreate_admin_password_text) = create_admin($fUsername, $fPassword, $fPassword2, array('ALL'), TRUE); Modified: branches/postfixadmin-2.3/upgrade.php =================================================================== --- branches/postfixadmin-2.3/upgrade.php 2010-05-16 22:21:38 UTC (rev 823) +++ branches/postfixadmin-2.3/upgrade.php 2010-05-16 22:55:19 UTC (rev 824) @@ -217,7 +217,7 @@ function _drop_index ($table, $index) { global $CONF; - $tabe = table_by_key ($table); + $table = table_by_key ($table); if ($CONF['database_type'] == 'mysql' || $CONF['database_type'] == 'mysqli' ) { return "ALTER TABLE $table DROP INDEX $index"; @@ -231,7 +231,7 @@ function _add_index($table, $indexname, $fieldlist) { global $CONF; - $tabe = table_by_key ($table); + $table = table_by_key ($table); if ($CONF['database_type'] == 'mysql' || $CONF['database_type'] == 'mysqli' ) { return "ALTER TABLE $table ADD INDEX `$indexname` ( `$fieldlist` )"; Modified: branches/postfixadmin-2.3/viewlog.php =================================================================== --- branches/postfixadmin-2.3/viewlog.php 2010-05-16 22:21:38 UTC (rev 823) +++ branches/postfixadmin-2.3/viewlog.php 2010-05-16 22:55:19 UTC (rev 824) @@ -53,6 +53,9 @@ $tMessage = $PALANG['pViewlog_result_error']; } +// we need to initialize $tLog as an array! +$tLog = array(); + if ($error != 1) { $query = "SELECT timestamp,username,domain,action,data FROM $table_log WHERE domain='$fDomain' ORDER BY timestamp DESC LIMIT 10"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2010-05-17 22:56:31
|
Revision: 828 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=828&view=rev Author: christian_boltz Date: 2010-05-17 22:56:23 +0000 (Mon, 17 May 2010) Log Message: ----------- more merging: - display alias targets for mailboxes (r751 and most of r787) - r819, r826 - maildir path hook, error_log IMAP mailbox creation errors - CHANGELOG.txt update Modified Paths: -------------- branches/postfixadmin-2.3/CHANGELOG.TXT branches/postfixadmin-2.3/config.inc.php branches/postfixadmin-2.3/create-mailbox.php branches/postfixadmin-2.3/functions.inc.php branches/postfixadmin-2.3/list-virtual.php branches/postfixadmin-2.3/templates/list-virtual.php Property Changed: ---------------- branches/postfixadmin-2.3/ Property changes on: branches/postfixadmin-2.3 ___________________________________________________________________ Modified: svn:mergeinfo - /trunk:800,806,811,817,821,825 + /trunk:751,800,806,811,817,819,821,825-826 Modified: branches/postfixadmin-2.3/CHANGELOG.TXT =================================================================== --- branches/postfixadmin-2.3/CHANGELOG.TXT 2010-05-17 22:04:17 UTC (rev 827) +++ branches/postfixadmin-2.3/CHANGELOG.TXT 2010-05-17 22:56:23 UTC (rev 828) @@ -10,11 +10,15 @@ # Last update: # $Id$ -Version ***svn 2.3 branch*** - 2009/12/26 - SVN r*** ------------------------------------ +Version 2.3.1 - 2010/05/18 - SVN r*** (postfixadmin-2.3 branch) +--------------------------------------------------------------- - - NOTE: this release is based on the 2.3 branch - - NOTE: this is a bugfix-only release for Postfix Admin 2.3 + - SUMMARY: PostfixAdmin 2.3.1 is a bugfix-only release for Postfix Admin 2.3. + The only visible change is displaying the alias target for mailboxes which + was a longstanding issue/"missing feature". + The ADDITIONS directory contains some new scripts. + - display alias targets for mailboxes (if $CONF['special_alias_control'] = YES) + - add hook for custom maildir path generation - add import_users_from_csv.py script (by Simone Piccardi) - add mailbox_post* scripts for cyrus - handle dovecot passwords without any tempfile (prevents safe_mode issues) @@ -117,8 +121,8 @@ - added support for domain aliases (from lenix) (can be disabled with $CONF['alias_domain']) Important: If you update from a previous version, you'll have to adapt your postfix - configuration (see DOCUMENTS/POSTFIX_CONF.txt) - or just disable alias domain support, - your postfix configuration will continue to work + configuration (see DOCUMENTS/POSTFIX_CONF.txt) - or just disable alias domain support, + your postfix configuration will continue to work - updated postfix example configuration for domain aliases and to use the new mysql map format - vacation.pl: - add option for re-notification after definable timeout (patch from Luxten) Modified: branches/postfixadmin-2.3/config.inc.php =================================================================== --- branches/postfixadmin-2.3/config.inc.php 2010-05-17 22:04:17 UTC (rev 827) +++ branches/postfixadmin-2.3/config.inc.php 2010-05-17 22:56:23 UTC (rev 828) @@ -149,7 +149,37 @@ // NO: /usr/local/virtual/domain.tld/username // Note: If $CONF['domain_path'] is set to NO, this setting will be forced to YES. $CONF['domain_in_mailbox'] = 'YES'; +// If you want to define your own function to generate a maildir path set this to the name of the function. +// Notes: +// - this configuration directive will override both domain_path and domain_in_mailbox +// - the maildir_name_hook() function example is present below, commented out +// - if the function does not exist the program will default to the above domain_path and domain_in_mailbox settings +$CONF['maildir_name_hook'] = 'NO'; +/* + maildir_name_hook example function + + Called by create-mailbox.php if $CONF['maildir_name_hook'] == '<name_of_the_function>' + - allows for customized maildir paths determined by a custom function + - the example below will prepend a single-character directory to the + beginning of the maildir, splitting domains more or less evenly over + 36 directories for improved filesystem performance with large numbers + of domains. + + Returns: maildir path + ie. I/example.com/user/ +*/ +/* +function maildir_name_hook($domain, $user) { + $chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + + $dir_index = hexdec(substr(md5($domain), 28)) % strlen($chars); + $dir = substr($chars, $dir_index, 1); + return sprintf("%s/%s/%s/", $dir, $domain, $user); +} +*/ + + // Default Domain Values // Specify your default values below. Quota in MB. $CONF['aliases'] = '10'; Modified: branches/postfixadmin-2.3/create-mailbox.php =================================================================== --- branches/postfixadmin-2.3/create-mailbox.php 2010-05-17 22:04:17 UTC (rev 827) +++ branches/postfixadmin-2.3/create-mailbox.php 2010-05-17 22:56:23 UTC (rev 828) @@ -159,7 +159,11 @@ { $password = pacrypt ($fPassword); - if ($CONF['domain_path'] == "YES") + if($CONF['maildir_name_hook'] != 'NO' && function_exists($CONF['maildir_name_hook'])) { + $hook_func = $CONF['maildir_name_hook']; + $maildir = $hook_func ($fDomain, $fUsername); + } + else if ($CONF['domain_path'] == "YES") { if ($CONF['domain_in_mailbox'] == "YES") { Modified: branches/postfixadmin-2.3/functions.inc.php =================================================================== --- branches/postfixadmin-2.3/functions.inc.php 2010-05-17 22:04:17 UTC (rev 827) +++ branches/postfixadmin-2.3/functions.inc.php 2010-05-17 22:56:23 UTC (rev 828) @@ -1774,8 +1774,17 @@ } } +/** + * db_in_clause + * Action: builds and returns the "field in(x, y)" clause for database queries + * Call: db_in_clause (string field, array values) + */ +function db_in_clause($field, $values) { + return " $field IN ('" + . implode("','",escape_string(array_values($values))) + . "') "; +} - // // table_by_key // Action: Return table name for given key @@ -2099,6 +2108,7 @@ $f='{'.$s_host.'}'.$s_prefix.$f; $res=imap_createmailbox($i,$f); if (!$res) { + error_log('Could not create IMAP folder $f: '.imap_last_error()); @imap_close($i); return FALSE; } @@ -2358,8 +2368,6 @@ } } - - $table_admin = table_by_key ('admin'); $table_alias = table_by_key ('alias'); $table_alias_domain = table_by_key ('alias_domain'); Modified: branches/postfixadmin-2.3/list-virtual.php =================================================================== --- branches/postfixadmin-2.3/list-virtual.php 2010-05-17 22:04:17 UTC (rev 827) +++ branches/postfixadmin-2.3/list-virtual.php 2010-05-17 22:56:23 UTC (rev 828) @@ -53,11 +53,13 @@ { if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']); if (isset ($_GET['limit'])) $fDisplay = intval ($_GET['limit']); + $search = escape_string(safeget('search')); } else { if (isset ($_POST['fDomain'])) $fDomain = escape_string ($_POST['fDomain']); if (isset ($_POST['limit'])) $fDisplay = intval ($_POST['limit']); + $search = escape_string(safepost('search')); } if (count($list_domains) == 0) { @@ -91,6 +93,11 @@ $_SESSION['list_virtual_sticky_domain'] = $fDomain; } +# +# alias domain +# + +# TODO: add search support for alias domains if (boolconf('alias_domain')) { # Alias-Domains # first try to get a list of other domains pointing @@ -136,23 +143,36 @@ } } +# +# aliases +# + +if ($search == "") { + $sql_domain = " $table_alias.domain='$fDomain' "; + $sql_where = ""; +} else { + $sql_domain = db_in_clause("$table_alias.domain", $list_domains); + $sql_where = " AND ( address LIKE '%$search%' OR goto LIKE '%$search%' ) "; +} $query = "SELECT $table_alias.address, $table_alias.goto, $table_alias.modified, $table_alias.active FROM $table_alias LEFT JOIN $table_mailbox ON $table_alias.address=$table_mailbox.username - WHERE ($table_alias.domain='$fDomain' AND $table_mailbox.maildir IS NULL) + WHERE ($sql_domain AND $table_mailbox.maildir IS NULL $sql_where) ORDER BY $table_alias.address LIMIT $fDisplay, $page_size"; if ('pgsql'==$CONF['database_type']) { + # TODO: is the different query for pgsql really needed? The mailbox query below also works with both... $query = "SELECT address, goto, extract(epoch from modified) as modified, active FROM $table_alias - WHERE domain='$fDomain' AND NOT EXISTS(SELECT 1 FROM $table_mailbox WHERE username=$table_alias.address) + WHERE $sql_domain AND NOT EXISTS(SELECT 1 FROM $table_mailbox WHERE username=$table_alias.address $sql_where) ORDER BY address LIMIT $page_size OFFSET $fDisplay"; } + $result = db_query ($query); if ($result['rows'] > 0) { @@ -170,66 +190,76 @@ } } -# TODO: reduce number of different queries by not depending on too much config options -# (it probably won't hurt to include a field in the resultset that is not displayed later) -if ($CONF['vacation_control_admin'] == 'YES') -{ - if (boolconf('used_quotas')) - { - if (boolconf('new_quota_table')) - { - $query = "SELECT $table_mailbox.*, $table_vacation.active AS v_active, $table_quota2.bytes as current FROM $table_mailbox - LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email - LEFT JOIN $table_quota2 ON $table_mailbox.username=$table_quota2.username - WHERE $table_mailbox.domain='$fDomain' - ORDER BY $table_mailbox.username LIMIT $page_size OFFSET $fDisplay"; - } - else - { - $query = "SELECT $table_mailbox.*, $table_vacation.active AS v_active, $table_quota.current FROM $table_mailbox - LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email - LEFT JOIN $table_quota ON $table_mailbox.username=$table_quota.username - WHERE $table_mailbox.domain='$fDomain' AND - ( $table_quota.path='quota/storage' OR $table_quota.path IS NULL ) - ORDER BY $table_mailbox.username LIMIT $page_size OFFSET $fDisplay"; - } - } - else # $CONF[used_quotas] = NO - { - $query = "SELECT $table_mailbox.*, $table_vacation.active AS v_active FROM $table_mailbox - LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email - WHERE $table_mailbox.domain='$fDomain' ORDER BY $table_mailbox.username LIMIT $page_size OFFSET $fDisplay"; - } + +# +# mailboxes +# + +$display_mailbox_aliases = boolconf('special_alias_control'); # TODO: is this condition correct? - I'm slightly confused with alias_control, alias_control_admin and special_alias_control + +# build the sql query +$sql_select = " SELECT $table_mailbox.* "; +$sql_from = " FROM $table_mailbox "; +$sql_join = ""; +$sql_where = " WHERE "; +$sql_order = " ORDER BY $table_mailbox.username "; +$sql_limit = " LIMIT $page_size OFFSET $fDisplay"; + +if ($search == "") { + $sql_where .= " $table_mailbox.domain='$fDomain' "; +} else { + $sql_where .= db_in_clause("$table_mailbox.domain", $list_domains) . " "; + $sql_where .= " AND ( $table_mailbox.username LIKE '%$search%' OR $table_mailbox.name LIKE '%$search%' "; + if ($display_mailbox_aliases) { + $sql_where .= " OR $table_alias.goto LIKE '%$search%' "; + } + $sql_where .= " ) "; # $search is already escaped } -else # $CONF['vacation_control_admin'] == 'NO' -{ - if (boolconf('used_quotas')) - { - if (boolconf('new_quota_table')) - { - $query = "SELECT $table_mailbox.*, $table_quota2.bytes as current FROM $table_mailbox - LEFT JOIN $table_quota2 ON $table_mailbox.username=$table_quota2.username - WHERE $table_mailbox.domain='$fDomain' ORDER BY $table_mailbox.username LIMIT $page_size OFFSET $fDisplay"; - } - else - { - $query = "SELECT $table_mailbox.*, $table_quota.current FROM $table_mailbox - LEFT JOIN $table_quota ON $table_mailbox.username=$table_quota.username - WHERE $table_mailbox.domain='$fDomain' AND - ( $table_quota.path='quota/storage' OR $table_quota.path IS NULL ) - ORDER BY $table_mailbox.username LIMIT $page_size OFFSET $fDisplay"; - } - } - else # $CONF[used_quotas] = NO - { - $query = "SELECT * FROM $table_mailbox WHERE domain='$fDomain' ORDER BY username LIMIT $page_size OFFSET $fDisplay"; - } + +if ($display_mailbox_aliases) { + $sql_select .= ", $table_alias.goto "; + $sql_join .= " LEFT JOIN $table_alias ON $table_mailbox.username=$table_alias.address "; } + +if (boolconf('vacation_control_admin')) { + $sql_select .= ", $table_vacation.active AS v_active "; + $sql_join .= " LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email "; +} + +if (boolconf('used_quotas') && boolconf('new_quota_table')) { + $sql_select .= ", $table_quota2.bytes as current "; + $sql_join .= " LEFT JOIN $table_quota2 ON $table_mailbox.username=$table_quota2.username "; +} + +if (boolconf('used_quotas') && ( ! boolconf('new_quota_table') ) ) { + $sql_select .= ", $table_quota.current "; + $sql_join .= " LEFT JOIN $table_quota ON $table_mailbox.username=$table_quota.username "; + $sql_where .= " ( $table_quota.path='quota/storage' OR $table_quota.path IS NULL ) "; +} + +$query = "$sql_select\n$sql_from\n$sql_join\n$sql_where\n$sql_order\n$sql_limit"; + $result = db_query ($query); + if ($result['rows'] > 0) { while ($row = db_array ($result['result'])) { + if ($display_mailbox_aliases) { + $goto_split = split(",", $row['goto']); + $row['goto_mailbox'] = 0; + $row['goto_other'] = array(); + + foreach ($goto_split as $goto_single) { + if ($goto_single == $row['username']) { # delivers to mailbox + $row['goto_mailbox'] = 1; + } elseif (boolconf('vacation') && strstr($goto_single, '@' . $CONF['vacation_domain']) ) { # vacation alias - TODO: check for full vacation alias + # skip the vacation alias, vacation status is detected otherwise + } else { # forwarding to other alias + $row['goto_other'][] = $goto_single; + } + } + } if ('pgsql'==$CONF['database_type']) { // XXX @@ -248,6 +278,7 @@ $tCanAddAlias = false; $tCanAddMailbox = false; +# TODO: needs reworking for $search... $limit = get_domain_properties($fDomain); if (isset ($limit)) { if ($fDisplay >= $page_size) { Modified: branches/postfixadmin-2.3/templates/list-virtual.php =================================================================== --- branches/postfixadmin-2.3/templates/list-virtual.php 2010-05-17 22:04:17 UTC (rev 827) +++ branches/postfixadmin-2.3/templates/list-virtual.php 2010-05-17 22:56:23 UTC (rev 828) @@ -6,6 +6,17 @@ $file = 'list-virtual.php'; +# search highlighting +function searchhl($text) { + global $search; + if ($search == "") { + return $text; + } else { + return str_ireplace($search, "<span class='searchresult' style='background:lightgreen'>" . $search . "</span>", $text); + # TODO: find out why .searchresult class in css file doesn't work + } +} + if ($limit['aliases'] < 0) $limit['aliases'] = $PALANG['pOverview_disabled']; if ($limit['mailboxes'] < 0) $limit['mailboxes'] = $PALANG['pOverview_disabled']; if ($limit['maxquota'] < 0) $limit['maxquota'] = $PALANG['pOverview_disabled']; @@ -94,6 +105,9 @@ print " <td><a href=\"$file?domain=" . urlencode ($tAliasDomains[$i]['alias_domain']) . "&limit=" . $current_limit . "\">" . $tAliasDomains[$i]['alias_domain'] . "</a></td>\n"; print " <td>" . $tAliasDomains[$i]['modified'] . "</td>\n"; $active = ($tAliasDomains[$i]['active'] == 1) ? $PALANG['YES'] : $PALANG['NO']; + +# TODO: change all edit-*.php scripts not to require the domain parameter (and extract it from the address). This avoids superflous problems when using search. + print " <td><a href=\"edit-active.php?alias_domain=true&domain=" . urlencode ($tAliasDomains[$i]['alias_domain']) . "&return=$file" . urlencode ( "?domain=" . $fDomain . "&limit=" . $current_limit) . "\">" . $active . "</a></td>\n"; print " <td><a href=\"delete.php?table=alias_domain&delete=" . urlencode ($tAliasDomains[$i]['alias_domain']) . "&domain=" . urlencode ($tAliasDomains[$i]['alias_domain']) @@ -153,10 +167,9 @@ { print " <td>" . gen_show_status($tAlias[$i]['address']) . "</td>\n"; } - - print " <td>" . $tAlias[$i]['address'] . "</td>\n"; + print " <td>" . searchhl($tAlias[$i]['address']) . "</td>\n"; if ($CONF['alias_goto_limit'] > 0) { - print " <td>" . preg_replace ( + print " <td>" . searchhl(preg_replace ( "/,/", "<br>", preg_replace( @@ -167,9 +180,9 @@ ), $tAlias[$i]['goto'] ) - ) . "</td>\n"; + )) . "</td>\n"; } else { - print " <td>" . preg_replace ("/,/", "<br>", $tAlias[$i]['goto']) . "</td>\n"; + print " <td>" . searchhl(preg_replace ("/,/", "<br>", $tAlias[$i]['goto'])) . "</td>\n"; } print " <td>" . $tAlias[$i]['modified'] . "</td>\n"; @@ -179,7 +192,7 @@ # superadmin code $active = ($tAlias[$i]['active'] == 1) ? $PALANG['YES'] : $PALANG['NO']; print " <td><a href=\"edit-active.php?alias=" . urlencode ($tAlias[$i]['address']) . "&domain=$fDomain&return=$file?domain=$fDomain" . urlencode ("&limit=" . $current_limit) . "\">" . $active . "</a></td>\n"; - print " <td><a href=\"edit-alias.php?address=" . urlencode ($tAlias[$i]['address']) . "&domain=$fDomain" . "\">" . $PALANG['edit'] . "</a></td>\n"; + print " <td><a href=\"edit-alias.php?address=" . urlencode ($tAlias[$i]['address']) . "\">" . $PALANG['edit'] . "</a></td>\n"; print " <td><a href=\"delete.php?table=alias" . "&delete=" . urlencode ($tAlias[$i]['address']) . "&domain=$fDomain" . "\"onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_aliases'] . ": ". $tAlias[$i]['address'] . "')\">" . $PALANG['del'] . "</a></td>\n"; } else { @@ -188,7 +201,7 @@ { $active = ($tAlias[$i]['active'] == 1) ? $PALANG['YES'] : $PALANG['NO']; print " <td><a href=\"edit-active.php?alias=" . urlencode ($tAlias[$i]['address']) . "&domain=$fDomain" . "\">" . $active . "</a></td>\n"; - print " <td><a href=\"edit-alias.php?address=" . urlencode ($tAlias[$i]['address']) . "&domain=$fDomain" . "\">" . $PALANG['edit'] . "</a></td>\n"; + print " <td><a href=\"edit-alias.php?address=" . urlencode ($tAlias[$i]['address']) . "\">" . $PALANG['edit'] . "</a></td>\n"; print " <td><a href=\"delete.php?table=alias&delete=" . urlencode ($tAlias[$i]['address']) . "&domain=$fDomain" . "\"onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_aliases'] . ": ". $tAlias[$i]['address'] . "')\">" . $PALANG['del'] . "</a></td>\n"; } else @@ -197,7 +210,7 @@ { $active = ($tAlias[$i]['active'] == 1) ? $PALANG['YES'] : $PALANG['NO']; print " <td><a href=\"edit-active.php?alias=" . urlencode ($tAlias[$i]['address']) . "&domain=$fDomain" . "\">" . $active . "</a></td>\n"; - print " <td><a href=\"edit-alias.php?address=" . urlencode ($tAlias[$i]['address']) . "&domain=$fDomain" . "\">" . $PALANG['edit'] . "</a></td>\n"; + print " <td><a href=\"edit-alias.php?address=" . urlencode ($tAlias[$i]['address']) . "\">" . $PALANG['edit'] . "</a></td>\n"; print " <td><a href=\"delete.php?table=alias&delete=" . urlencode ($tAlias[$i]['address']) . "&domain=$fDomain" . "\"onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_aliases'] . ": ". $tAlias[$i]['address'] . "')\">" . $PALANG['del'] . "</a></td>\n"; } else @@ -256,6 +269,8 @@ $colspan=8; if ($CONF['vacation_control_admin'] == 'YES') $colspan=$colspan+1; if ($CONF['alias_control_admin'] == 'YES') $colspan=$colspan+1; + if ($display_mailbox_aliases) $colspan=$colspan+1; + print "<table id=\"mailbox_table\">\n"; print " <tr>\n"; print " <td colspan=\"$colspan\"><h3>" . $PALANG['pOverview_mailbox_title'] . "</h3></td>"; @@ -263,6 +278,7 @@ print " <tr class=\"header\">\n"; if ($CONF['show_status'] == 'YES') { print "<td></td>\n"; } print " <td>" . $PALANG['pOverview_mailbox_username'] . "</td>\n"; + if ($display_mailbox_aliases) print " <td>" . $PALANG['pOverview_alias_goto'] . "</td>\n"; print " <td>" . $PALANG['pOverview_mailbox_name'] . "</td>\n"; if ($CONF['quota'] == 'YES') print " <td>" . $PALANG['pOverview_mailbox_quota'] . "</td>\n"; print " <td>" . $PALANG['pOverview_mailbox_modified'] . "</td>\n"; @@ -282,7 +298,22 @@ print " <td>" . gen_show_status($tMailbox[$i]['username']) . "</td>\n"; } - print " <td>" . $tMailbox[$i]['username'] . "</td>\n"; + print " <td>" . searchhl($tMailbox[$i]['username']) . "</td>\n"; + + if ($display_mailbox_aliases) { + # print " <td>" . searchhl($tMailbox[$i]['goto']) . "</td>\n"; + print " <td>"; + if ($tMailbox[$i]['goto_mailbox'] == 1) { + print "Mailbox"; # TODO: make translatable + } else { + print "Forward only"; # TODO: make translatable + } + if (count($tMailbox[$i]['goto_other']) > 0) print "<br>"; + print searchhl(join("<br>", $tMailbox[$i]['goto_other'])); # TODO: honor $CONF['alias_goto_limit'] + print "</td>\n"; + } + + print " <td>" . $tMailbox[$i]['name'] . "</td>\n"; if ($CONF['quota'] == 'YES') { @@ -331,7 +362,7 @@ if ($edit_aliases == 1) { - print " <td><a href=\"edit-alias.php?address=" . urlencode ($tMailbox[$i]['username']) . "&domain=$fDomain" . "\">" . $PALANG['pOverview_alias_edit'] . "</a></td>\n"; + print " <td><a href=\"edit-alias.php?address=" . urlencode ($tMailbox[$i]['username']) . "\">" . $PALANG['pOverview_alias_edit'] . "</a></td>\n"; } print " <td><a href=\"edit-mailbox.php?username=" . urlencode ($tMailbox[$i]['username']) . "&domain=$fDomain" . "\">" . $PALANG['edit'] . "</a></td>\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2010-05-17 22:04:26
|
Revision: 827 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=827&view=rev Author: christian_boltz Date: 2010-05-17 22:04:17 +0000 (Mon, 17 May 2010) Log Message: ----------- more merging from trunk: - r800, r806, r821 - Squirrelmail Plugin (without the Zend framework) - remove old squirrelmail plugin - r817, r825 - ADDITIONS/cyrus Modified Paths: -------------- branches/postfixadmin-2.3/CHANGELOG.TXT Added Paths: ----------- branches/postfixadmin-2.3/ADDITIONS/cyrus/ branches/postfixadmin-2.3/ADDITIONS/cyrus/Changelog branches/postfixadmin-2.3/ADDITIONS/cyrus/README-ES.txt branches/postfixadmin-2.3/ADDITIONS/cyrus/README.txt branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus-mailbox-postcreation.pl branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus-mailbox-postdelete.pl branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus-mailbox-postedit.pl branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus.conf branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/INSTALL branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/LICENSE.txt branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/README branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/common.php branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/config.php.sample branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/README.Debian branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/changelog branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/conffiles branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/control branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/copyright branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/docs branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/files branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/postfixadmin-squirrelmail.dirs branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/postinst branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/rules branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/functions.inc.php branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/index.php branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/build.sh branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/cs_CZ/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/cs_CZ/LC_MESSAGES/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/cs_CZ/LC_MESSAGES/postfixadmin.mo branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/cs_CZ/LC_MESSAGES/postfixadmin.po branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/da_DK/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/da_DK/LC_MESSAGES/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/da_DK/LC_MESSAGES/postfixadmin.mo branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/da_DK/LC_MESSAGES/postfixadmin.po branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/de_DE/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/de_DE/LC_MESSAGES/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/de_DE/LC_MESSAGES/postfixadmin.mo branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/de_DE/LC_MESSAGES/postfixadmin.po branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/hu_HU/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/hu_HU/LC_MESSAGES/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/hu_HU/LC_MESSAGES/postfixadmin.mo branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/hu_HU/LC_MESSAGES/postfixadmin.po branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/it_IT/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/it_IT/LC_MESSAGES/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/it_IT/LC_MESSAGES/postfixadmin.po branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/nl_NL/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/nl_NL/LC_MESSAGES/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/nl_NL/LC_MESSAGES/postfixadmin.mo branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/nl_NL/LC_MESSAGES/postfixadmin.po branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/pl_PL/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/pl_PL/LC_MESSAGES/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/pl_PL/LC_MESSAGES/postfixadmin.mo branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/pl_PL/LC_MESSAGES/postfixadmin.po branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/pt_BR/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/pt_BR/LC_MESSAGES/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/pt_BR/LC_MESSAGES/postfixadmin.mo branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/pt_BR/LC_MESSAGES/postfixadmin.po branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/po/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/po/postfixadmin.po branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/postfixadmin_changepass.php branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/postfixadmin_forward.php branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/postfixadmin_vacation.php branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/setup.php branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/version Removed Paths: ------------- branches/postfixadmin-2.3/ADDITIONS/cyrus/Changelog branches/postfixadmin-2.3/ADDITIONS/cyrus/README-ES.txt branches/postfixadmin-2.3/ADDITIONS/cyrus/README.txt branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus-mailbox-postcreation.pl branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus-mailbox-postdelete.pl branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus-mailbox-postedit.pl branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus.conf branches/postfixadmin-2.3/ADDITIONS/postfixadmin-0.3-1.4.tar.gz branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/INSTALL branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/LICENSE.txt branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/README branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/common.php branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/config.php.sample branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/README.Debian branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/changelog branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/conffiles branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/control branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/copyright branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/docs branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/files branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/postfixadmin-squirrelmail.dirs branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/postinst branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/rules branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/functions.inc.php branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/index.php branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/build.sh branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/cs_CZ/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/cs_CZ/LC_MESSAGES/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/cs_CZ/LC_MESSAGES/postfixadmin.mo branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/cs_CZ/LC_MESSAGES/postfixadmin.po branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/da_DK/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/da_DK/LC_MESSAGES/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/da_DK/LC_MESSAGES/postfixadmin.mo branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/da_DK/LC_MESSAGES/postfixadmin.po branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/de_DE/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/de_DE/LC_MESSAGES/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/de_DE/LC_MESSAGES/postfixadmin.mo branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/de_DE/LC_MESSAGES/postfixadmin.po branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/hu_HU/LC_MESSAGES/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/hu_HU/LC_MESSAGES/postfixadmin.mo branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/hu_HU/LC_MESSAGES/postfixadmin.po branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/it_IT/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/it_IT/LC_MESSAGES/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/it_IT/LC_MESSAGES/postfixadmin.po branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/nl_NL/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/nl_NL/LC_MESSAGES/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/nl_NL/LC_MESSAGES/postfixadmin.mo branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/nl_NL/LC_MESSAGES/postfixadmin.po branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/pl_PL/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/pl_PL/LC_MESSAGES/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/pl_PL/LC_MESSAGES/postfixadmin.mo branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/pl_PL/LC_MESSAGES/postfixadmin.po branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/pt_BR/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/pt_BR/LC_MESSAGES/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/pt_BR/LC_MESSAGES/postfixadmin.mo branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/locale/pt_BR/LC_MESSAGES/postfixadmin.po branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/po/ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/po/postfixadmin.po branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/postfixadmin_changepass.php branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/postfixadmin_forward.php branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/postfixadmin_vacation.php branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/setup.php branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/version Property Changed: ---------------- branches/postfixadmin-2.3/ Property changes on: branches/postfixadmin-2.3 ___________________________________________________________________ Added: svn:mergeinfo + /trunk:800,806,811,817,821,825 Deleted: branches/postfixadmin-2.3/ADDITIONS/cyrus/Changelog =================================================================== --- trunk/ADDITIONS/cyrus/Changelog 2010-03-24 14:07:20 UTC (rev 817) +++ branches/postfixadmin-2.3/ADDITIONS/cyrus/Changelog 2010-05-17 22:04:17 UTC (rev 827) @@ -1,8 +0,0 @@ - -Version 0.1 -- 26/10/2009 ---------------------------- - - * Public Release. - * Postcreation, Postdeletion and Postedit hooks. - - Copied: branches/postfixadmin-2.3/ADDITIONS/cyrus/Changelog (from rev 817, trunk/ADDITIONS/cyrus/Changelog) =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/cyrus/Changelog (rev 0) +++ branches/postfixadmin-2.3/ADDITIONS/cyrus/Changelog 2010-05-17 22:04:17 UTC (rev 827) @@ -0,0 +1,8 @@ + +Version 0.1 -- 26/10/2009 +--------------------------- + + * Public Release. + * Postcreation, Postdeletion and Postedit hooks. + + Deleted: branches/postfixadmin-2.3/ADDITIONS/cyrus/README-ES.txt =================================================================== --- trunk/ADDITIONS/cyrus/README-ES.txt 2010-03-24 14:07:20 UTC (rev 817) +++ branches/postfixadmin-2.3/ADDITIONS/cyrus/README-ES.txt 2010-05-17 22:04:17 UTC (rev 827) @@ -1,7 +0,0 @@ - -Configuración -------------- - - - Edita el fichero cyrus.conf y modifica las variables $cyrus_*. El usuario debe tener permisos sobre todas las cuentas. - - Edita los ficheros cyrus-*.pl y cambia la ruta de cyrus.conf (linea require '/path/to/cyrus.conf';) - Copied: branches/postfixadmin-2.3/ADDITIONS/cyrus/README-ES.txt (from rev 817, trunk/ADDITIONS/cyrus/README-ES.txt) =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/cyrus/README-ES.txt (rev 0) +++ branches/postfixadmin-2.3/ADDITIONS/cyrus/README-ES.txt 2010-05-17 22:04:17 UTC (rev 827) @@ -0,0 +1,7 @@ + +Configuración +------------- + + - Edita el fichero cyrus.conf y modifica las variables $cyrus_*. El usuario debe tener permisos sobre todas las cuentas. + - Edita los ficheros cyrus-*.pl y cambia la ruta de cyrus.conf (linea require '/path/to/cyrus.conf';) + Deleted: branches/postfixadmin-2.3/ADDITIONS/cyrus/README.txt =================================================================== --- trunk/ADDITIONS/cyrus/README.txt 2010-03-24 14:07:20 UTC (rev 817) +++ branches/postfixadmin-2.3/ADDITIONS/cyrus/README.txt 2010-05-17 22:04:17 UTC (rev 827) @@ -1,7 +0,0 @@ - -Configuration -------------- - - - Edit cyrus.conf and set $cyrus_* variables correctly. User must have permission over all accounts. - - Edit cyrus-*.pl and change path to cyrus.conf (require '/path/to/cyrus.conf'; line) - Copied: branches/postfixadmin-2.3/ADDITIONS/cyrus/README.txt (from rev 817, trunk/ADDITIONS/cyrus/README.txt) =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/cyrus/README.txt (rev 0) +++ branches/postfixadmin-2.3/ADDITIONS/cyrus/README.txt 2010-05-17 22:04:17 UTC (rev 827) @@ -0,0 +1,7 @@ + +Configuration +------------- + + - Edit cyrus.conf and set $cyrus_* variables correctly. User must have permission over all accounts. + - Edit cyrus-*.pl and change path to cyrus.conf (require '/path/to/cyrus.conf'; line) + Deleted: branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus-mailbox-postcreation.pl =================================================================== --- trunk/ADDITIONS/cyrus/cyrus-mailbox-postcreation.pl 2010-03-24 14:07:20 UTC (rev 817) +++ branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus-mailbox-postcreation.pl 2010-05-17 22:04:17 UTC (rev 827) @@ -1,36 +0,0 @@ -#!/usr/bin/perl - -# Cyrus Mailbox creation -# -# Iñaki Rodriguez (iro...@vi... / iro...@ac...) -# -# LICENSE -# This source file is subject to the GPL license that is bundled with -# this package in the file LICENSE.TXT. -# -# (26/10/2009) - -use Cyrus::IMAP::Admin; -require '/var/www/postfixadmin/ADDITIONS/cyrus/cyrus.conf'; -use strict; -use vars qw($cyrus_user $cyrus_password $cyrus_host); - -my %opts; - -my $mailbox = mailbox_name($ARGV[0]); - -my $client = Cyrus::IMAP::Admin->new($cyrus_host); -die_on_error($client); - -$opts{-user} = $cyrus_user; -$opts{-password} = $cyrus_password; - -$client->authenticate(%opts); -die_on_error($client); - -$client->create($mailbox); -die_on_error($client); - -$client->setquota($mailbox,'STORAGE',scalar $ARGV[3]) if ($ARGV[3] > 0); -die_on_error($client); - Copied: branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus-mailbox-postcreation.pl (from rev 817, trunk/ADDITIONS/cyrus/cyrus-mailbox-postcreation.pl) =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus-mailbox-postcreation.pl (rev 0) +++ branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus-mailbox-postcreation.pl 2010-05-17 22:04:17 UTC (rev 827) @@ -0,0 +1,36 @@ +#!/usr/bin/perl + +# Cyrus Mailbox creation +# +# Iñaki Rodriguez (iro...@vi... / iro...@ac...) +# +# LICENSE +# This source file is subject to the GPL license that is bundled with +# this package in the file LICENSE.TXT. +# +# (26/10/2009) + +use Cyrus::IMAP::Admin; +require '/etc/mail/postfixadmin/cyrus.conf'; +use strict; +use vars qw($cyrus_user $cyrus_password $cyrus_host); + +my %opts; + +my $mailbox = mailbox_name($ARGV[0]); + +my $client = Cyrus::IMAP::Admin->new($cyrus_host); +die_on_error($client); + +$opts{-user} = $cyrus_user; +$opts{-password} = $cyrus_password; + +$client->authenticate(%opts); +die_on_error($client); + +$client->create($mailbox); +die_on_error($client); + +$client->setquota($mailbox,'STORAGE',scalar $ARGV[3]) if ($ARGV[3] > 0); +die_on_error($client); + Deleted: branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus-mailbox-postdelete.pl =================================================================== --- trunk/ADDITIONS/cyrus/cyrus-mailbox-postdelete.pl 2010-03-24 14:07:20 UTC (rev 817) +++ branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus-mailbox-postdelete.pl 2010-05-17 22:04:17 UTC (rev 827) @@ -1,37 +0,0 @@ -#!/usr/bin/perl - -# Cyrus Mailbox deletion -# -# Iñaki Rodriguez (iro...@vi... / iro...@ac...) -# -# LICENSE -# This source file is subject to the GPL license that is bundled with -# this package in the file LICENSE.TXT. -# -# (26/10/2009) - -use Cyrus::IMAP::Admin; -require '/var/www/postfixadmin/ADDITIONS/cyrus/cyrus.conf'; -use strict; -use vars qw($cyrus_user $cyrus_password $cyrus_host); - -my %opts; - - -my $mailbox = mailbox_name($ARGV[0]); - -my $client = Cyrus::IMAP::Admin->new($cyrus_host); -die_on_error($client); - -$opts{-user} = $cyrus_user; -$opts{-password} = $cyrus_password; - -$client->authenticate(%opts); -die_on_error($client); - -$client->setacl($mailbox,$cyrus_user => 'all'); -die_on_error($client); - -$client->deletemailbox($mailbox); -die_on_error($client); - Copied: branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus-mailbox-postdelete.pl (from rev 817, trunk/ADDITIONS/cyrus/cyrus-mailbox-postdelete.pl) =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus-mailbox-postdelete.pl (rev 0) +++ branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus-mailbox-postdelete.pl 2010-05-17 22:04:17 UTC (rev 827) @@ -0,0 +1,36 @@ +#!/usr/bin/perl + +# Cyrus Mailbox deletion +# +# Iñaki Rodriguez (iro...@vi... / iro...@ac...) +# +# LICENSE +# This source file is subject to the GPL license that is bundled with +# this package in the file LICENSE.TXT. +# +# (26/10/2009) + +use Cyrus::IMAP::Admin; +require '/etc/mail/postfixadmin/cyrus.conf'; +use strict; +use vars qw($cyrus_user $cyrus_password $cyrus_host); + +my %opts; + +my $mailbox = mailbox_name($ARGV[0]); + +my $client = Cyrus::IMAP::Admin->new($cyrus_host); +die_on_error($client); + +$opts{-user} = $cyrus_user; +$opts{-password} = $cyrus_password; + +$client->authenticate(%opts); +die_on_error($client); + +$client->setacl($mailbox,$cyrus_user => 'all'); +die_on_error($client); + +$client->deletemailbox($mailbox); +die_on_error($client); + Deleted: branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus-mailbox-postedit.pl =================================================================== --- trunk/ADDITIONS/cyrus/cyrus-mailbox-postedit.pl 2010-03-24 14:07:20 UTC (rev 817) +++ branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus-mailbox-postedit.pl 2010-05-17 22:04:17 UTC (rev 827) @@ -1,34 +0,0 @@ -#!/usr/bin/perl - -# Cyrus Mailbox edition -# -# Iñaki Rodriguez (iro...@vi... / iro...@ac...) -# -# LICENSE -# This source file is subject to the GPL license that is bundled with -# this package in the file LICENSE.TXT. -# -# (26/10/2009) - -use Cyrus::IMAP::Admin; -require '/var/www/postfixadmin/ADDITIONS/cyrus/cyrus.conf'; -use strict; -use vars qw($cyrus_user $cyrus_password $cyrus_host); - -my %opts; - - -my $mailbox = mailbox_name($ARGV[0]); - -my $client = Cyrus::IMAP::Admin->new($cyrus_host); -die_on_error($client); - -$opts{-user} = $cyrus_user; -$opts{-password} = $cyrus_password; - -$client->authenticate(%opts); -die_on_error($client); - -$client->setquota($mailbox,'STORAGE',scalar $ARGV[3]) if ($ARGV[3] > 0); -die_on_error($client); - Copied: branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus-mailbox-postedit.pl (from rev 817, trunk/ADDITIONS/cyrus/cyrus-mailbox-postedit.pl) =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus-mailbox-postedit.pl (rev 0) +++ branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus-mailbox-postedit.pl 2010-05-17 22:04:17 UTC (rev 827) @@ -0,0 +1,33 @@ +#!/usr/bin/perl + +# Cyrus Mailbox edition +# +# Iñaki Rodriguez (iro...@vi... / iro...@ac...) +# +# LICENSE +# This source file is subject to the GPL license that is bundled with +# this package in the file LICENSE.TXT. +# +# (26/10/2009) + +use Cyrus::IMAP::Admin; +require '/etc/mail/postfixadmin/cyrus.conf'; +use strict; +use vars qw($cyrus_user $cyrus_password $cyrus_host); + +my %opts; + +my $mailbox = mailbox_name($ARGV[0]); + +my $client = Cyrus::IMAP::Admin->new($cyrus_host); +die_on_error($client); + +$opts{-user} = $cyrus_user; +$opts{-password} = $cyrus_password; + +$client->authenticate(%opts); +die_on_error($client); + +$client->setquota($mailbox,'STORAGE',scalar $ARGV[3]) if ($ARGV[3] > 0); +die_on_error($client); + Deleted: branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus.conf =================================================================== --- trunk/ADDITIONS/cyrus/cyrus.conf 2010-03-24 14:07:20 UTC (rev 817) +++ branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus.conf 2010-05-17 22:04:17 UTC (rev 827) @@ -1,31 +0,0 @@ -#!/usr/bin/perl - -# Config - -$cyrus_user = 'cyrus'; -$cyrus_password = 'cyruspass'; -$cyrus_host = 'localhost'; - -# unixhierarchysep => 1 (yes) / 0 (no) -$unixhierarchysep = 1; - -# Common routines - -sub mailbox_name { - my $mailbox = shift; - - if($unixhierarchysep) { - $mailbox = 'user/'.$ARGV[0]; - } else { - $mailbox = 'user.'.$ARGV[0]; - } - - return $mailbox; -} - -sub die_on_error { - my $cyradm = shift; - if($cyradm->error) { die $cyradm->error; } -} -1; - Copied: branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus.conf (from rev 817, trunk/ADDITIONS/cyrus/cyrus.conf) =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus.conf (rev 0) +++ branches/postfixadmin-2.3/ADDITIONS/cyrus/cyrus.conf 2010-05-17 22:04:17 UTC (rev 827) @@ -0,0 +1,31 @@ +#!/usr/bin/perl + +# Config + +$cyrus_user = 'cyrus'; +$cyrus_password = 'cyruspass'; +$cyrus_host = 'localhost'; + +# unixhierarchysep => 1 (yes) / 0 (no) +$unixhierarchysep = 1; + +# Common routines + +sub mailbox_name { + my $mailbox = shift; + + if($unixhierarchysep) { + $mailbox = 'user/'.$ARGV[0]; + } else { + $mailbox = 'user.'.$ARGV[0]; + } + + return $mailbox; +} + +sub die_on_error { + my $cyradm = shift; + if($cyradm->error) { die $cyradm->error; } +} +1; + Deleted: branches/postfixadmin-2.3/ADDITIONS/postfixadmin-0.3-1.4.tar.gz =================================================================== (Binary files differ) Deleted: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/INSTALL =================================================================== --- trunk/ADDITIONS/squirrelmail-plugin/INSTALL 2010-02-10 22:49:21 UTC (rev 800) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/INSTALL 2010-05-17 22:04:17 UTC (rev 827) @@ -1,37 +0,0 @@ -Installing the postfixadmin Plugin -====================================== - -Requirements: -============= - - - PHP 5.2.x with php5-xmlrpc installed (if available; it should be available by default anyway) - - http access to a local/remote postfixadmin interface - - -Installation : -============== - -- Check out this code (svn co http://squirrelmail-postfixadmin.palepurple.co.uk/svn/trunk postfixadmin) - into the Squirrelmail plugins directory. - -- Edit config.php and specify the remote URL for the Postfixadmin XmlRpc service. There isn't much more to change. - -- Edit the remote Postfixadmin's XmlRpc service config file and ensure 'xmlrpc_enable' is set to boolean true. - -- Enable the plugin through 'squirrelmail-configure' or 'config/conf.pl'. - Choose option 8 and move the plugin from the "Available Plugins" - category to the "Installed Plugins" category. Save and exit. - - -Security : -========== - -- The XmlRpc client needs to get the user's mailbox password before it will be able to connect to the - XmlRpc server (postfixadmin). The plugin prompts the user for their mailbox password, and caches it in their session - ($_SESSION['password']). This password is then sent once on every page load to the remote XmlRpc server. - -- You should consider doing any of the following : - - - Using https if the server and client are on seperate servers. This will probably require a signed certificate etc, and may require changes to the Zend_XmlRpc_Client's HttpClient. - - Using something like stunnel to encrypt traffic between server(s). - Copied: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/INSTALL (from rev 800, trunk/ADDITIONS/squirrelmail-plugin/INSTALL) =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/INSTALL (rev 0) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/INSTALL 2010-05-17 22:04:17 UTC (rev 827) @@ -0,0 +1,37 @@ +Installing the postfixadmin Plugin +====================================== + +Requirements: +============= + + - PHP 5.2.x with php5-xmlrpc installed (if available; it should be available by default anyway) + - http access to a local/remote postfixadmin interface + + +Installation : +============== + +- Check out this code (svn co http://squirrelmail-postfixadmin.palepurple.co.uk/svn/trunk postfixadmin) + into the Squirrelmail plugins directory. + +- Edit config.php and specify the remote URL for the Postfixadmin XmlRpc service. There isn't much more to change. + +- Edit the remote Postfixadmin's XmlRpc service config file and ensure 'xmlrpc_enable' is set to boolean true. + +- Enable the plugin through 'squirrelmail-configure' or 'config/conf.pl'. + Choose option 8 and move the plugin from the "Available Plugins" + category to the "Installed Plugins" category. Save and exit. + + +Security : +========== + +- The XmlRpc client needs to get the user's mailbox password before it will be able to connect to the + XmlRpc server (postfixadmin). The plugin prompts the user for their mailbox password, and caches it in their session + ($_SESSION['password']). This password is then sent once on every page load to the remote XmlRpc server. + +- You should consider doing any of the following : + + - Using https if the server and client are on seperate servers. This will probably require a signed certificate etc, and may require changes to the Zend_XmlRpc_Client's HttpClient. + - Using something like stunnel to encrypt traffic between server(s). + Deleted: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/LICENSE.txt =================================================================== --- trunk/ADDITIONS/squirrelmail-plugin/LICENSE.txt 2010-02-10 22:49:21 UTC (rev 800) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/LICENSE.txt 2010-05-17 22:04:17 UTC (rev 827) @@ -1,40 +0,0 @@ - -2007/03/29 : - Before I (David Goodwin) customised this plugin, it contained the following within all - files as a header. - - /**************************************************************************************** - - Author ......... Florian Kimmerl - Contact ........ in...@sp... - Home Site ...... http://www.spacekoeln.de/ - Program ........ postfixadmin - Purpose ........ Allows you to change your postfixadmin settings within squirrelmail - - ************************************************************************************* - - The Original Code is Postfix Admin. - The Initial Developer of the Original Code is Mischa Peters . - Portions created by Mischa Peters are Copyright (c) 2002, 2003, 2004. - All Rights Reserved. - Contributor(s): - This project includes work by Mischa Peters and others that is: - Copyright (c) 2002,2003,2004 Mischa Peters - All rights reserved. - - ****************************************************************************************/ - - - Contacting the author provided no success, so I took over maintainership. - - Please note: - - 1) Changes made by myself (David Goodwin) will be licensed under the GPL - 2) PostfixAdmin has itself been relicensed under the GPL; however this took place _after_ - this plugin was written. - 3) Squirrelmail itself is released under http://squirrelmail.org/wiki/SquirrelMailGPL (GPL) - - -The GNU public license can be found online at : - - http://www.gnu.org/licenses/gpl.txt Copied: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/LICENSE.txt (from rev 800, trunk/ADDITIONS/squirrelmail-plugin/LICENSE.txt) =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/LICENSE.txt (rev 0) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/LICENSE.txt 2010-05-17 22:04:17 UTC (rev 827) @@ -0,0 +1,40 @@ + +2007/03/29 : + Before I (David Goodwin) customised this plugin, it contained the following within all + files as a header. + + /**************************************************************************************** + + Author ......... Florian Kimmerl + Contact ........ in...@sp... + Home Site ...... http://www.spacekoeln.de/ + Program ........ postfixadmin + Purpose ........ Allows you to change your postfixadmin settings within squirrelmail + + ************************************************************************************* + + The Original Code is Postfix Admin. + The Initial Developer of the Original Code is Mischa Peters . + Portions created by Mischa Peters are Copyright (c) 2002, 2003, 2004. + All Rights Reserved. + Contributor(s): + This project includes work by Mischa Peters and others that is: + Copyright (c) 2002,2003,2004 Mischa Peters + All rights reserved. + + ****************************************************************************************/ + + + Contacting the author provided no success, so I took over maintainership. + + Please note: + + 1) Changes made by myself (David Goodwin) will be licensed under the GPL + 2) PostfixAdmin has itself been relicensed under the GPL; however this took place _after_ + this plugin was written. + 3) Squirrelmail itself is released under http://squirrelmail.org/wiki/SquirrelMailGPL (GPL) + + +The GNU public license can be found online at : + + http://www.gnu.org/licenses/gpl.txt Deleted: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/README =================================================================== --- trunk/ADDITIONS/squirrelmail-plugin/README 2010-02-10 22:49:21 UTC (rev 800) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/README 2010-05-17 22:04:17 UTC (rev 827) @@ -1,70 +0,0 @@ -Squirrelmail Plugin Postfixadmin -******************************** - -The Postfixadmin SquirrelMail plugin let users change their virtual alias, -vacation status/message and password if you are using the great postfixadmin -tool from http://high5.net/postfixadmin - -Version 0.4.3 2007/08/14 - -Postfixadmin - Postfixadmin+MySQL/PgSQL plugin for Squirrelmail - - -Author: Florian Kimmerl <in...@sp...> -Author: Sam Brookes <sam at pale purple.co.uk> - - Initial conversion to MDB2 - - Fix SQL Injections etc -Author: David Goodwin <david at pale purple.co.uk> - - Subsequent tidyup + testing etc -Author: Krzysztof 'Mad Max' Laska - <madmax at riders.pl> - - Polish Translation. - - - -The Initial Developer of the Original postfixadmin Code is Mischa Peters. -Portions created by Mischa Peters are Copyright (c) 2002, 2003, 2004. -All Rights Reserved. - -REQUIREMENTS - -o SquirrelMail 1.4x - -o A working Mail-System "Virtual Domains and Users with postfix+Courier-IMAP+MySQL" (or PostgreSQL) See http://high5.net/howto/ - -o POSTFIXADMIN version 2.2.0 or higher. See http://sf.net/projects/postfixadmin - -o This plugin only uses the postfixadmin database - -o Pear MDB2 database abstraction layer - see http://pear.php.net - -o PHP installation with register globals TURNED OFF (huraren on IRC reports that the MDB2 driver isn't happy with it turned on) - -INSTALLATION - -See the included file INSTALL - -BUGS - -o Probably vulnerable to cross site scripting, certainly when setting the vacation message. - -o There may be some remaining SQL injection holes. - -TODO - --Code Cleanup --Tranlation - - -TRANSLATIONS - -Translations are welcome! Send the *.po-File to: david@NO.codepoets.SPAM.co.uk - - -ACKNOWLEDGMENTS - -Thanks to the SquirrelMail team for building such a great app and -for all the work they do to keep it running. - -Thanks to high5.net for writing the great Postfixadmin tool - - Copied: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/README (from rev 800, trunk/ADDITIONS/squirrelmail-plugin/README) =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/README (rev 0) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/README 2010-05-17 22:04:17 UTC (rev 827) @@ -0,0 +1,70 @@ +Squirrelmail Plugin Postfixadmin +******************************** + +The Postfixadmin SquirrelMail plugin let users change their virtual alias, +vacation status/message and password if you are using the great postfixadmin +tool from http://high5.net/postfixadmin + +Version 0.4.3 2007/08/14 + +Postfixadmin - Postfixadmin+MySQL/PgSQL plugin for Squirrelmail + + +Author: Florian Kimmerl <in...@sp...> +Author: Sam Brookes <sam at pale purple.co.uk> + - Initial conversion to MDB2 + - Fix SQL Injections etc +Author: David Goodwin <david at pale purple.co.uk> + - Subsequent tidyup + testing etc +Author: Krzysztof 'Mad Max' Laska - <madmax at riders.pl> + - Polish Translation. + + + +The Initial Developer of the Original postfixadmin Code is Mischa Peters. +Portions created by Mischa Peters are Copyright (c) 2002, 2003, 2004. +All Rights Reserved. + +REQUIREMENTS + +o SquirrelMail 1.4x + +o A working Mail-System "Virtual Domains and Users with postfix+Courier-IMAP+MySQL" (or PostgreSQL) See http://high5.net/howto/ + +o POSTFIXADMIN version 2.2.0 or higher. See http://sf.net/projects/postfixadmin + +o This plugin only uses the postfixadmin database + +o Pear MDB2 database abstraction layer - see http://pear.php.net + +o PHP installation with register globals TURNED OFF (huraren on IRC reports that the MDB2 driver isn't happy with it turned on) + +INSTALLATION + +See the included file INSTALL + +BUGS + +o Probably vulnerable to cross site scripting, certainly when setting the vacation message. + +o There may be some remaining SQL injection holes. + +TODO + +-Code Cleanup +-Tranlation + + +TRANSLATIONS + +Translations are welcome! Send the *.po-File to: david@NO.codepoets.SPAM.co.uk + + +ACKNOWLEDGMENTS + +Thanks to the SquirrelMail team for building such a great app and +for all the work they do to keep it running. + +Thanks to high5.net for writing the great Postfixadmin tool + + Deleted: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/common.php =================================================================== --- trunk/ADDITIONS/squirrelmail-plugin/common.php 2010-02-10 22:49:21 UTC (rev 800) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/common.php 2010-05-17 22:04:17 UTC (rev 827) @@ -1,39 +0,0 @@ -<?php -// vim:ts=4:sw=4:et -ini_set('include_path', get_include_path() . ':' . dirname(__FILE__)); -chdir(".."); - - -if (!defined('SM_PATH')) -{ - define('SM_PATH','../'); -} -include_once(SM_PATH . 'plugins/postfixadmin/config.php'); -include_once(SM_PATH . 'plugins/postfixadmin/functions.inc.php'); -include_if_exists(SM_PATH . 'include/validate.php'); -if (file_exists(SM_PATH . 'include/validate.php')) -{ - include_once(SM_PATH . 'include/validate.php'); -} -else { - include_if_exists(SM_PATH . 'src/validate.php'); -} -include_once(SM_PATH . 'functions/page_header.php'); -include_once(SM_PATH . 'functions/display_messages.php'); -include_once(SM_PATH . 'functions/imap.php'); -include_if_exists(SM_PATH . 'functions/array.php'); -if (file_exists(SM_PATH . 'src/load_prefs.php')) -{ - include_once(SM_PATH . 'src/load_prefs.php'); -} -else { - include_if_exists(SM_PATH . 'include/load_prefs.php'); -} -// overwrite squirrelmail's content type to utf8... -header("Content-Type: text/html; charset=utf8"); - - -//global $VACCONFMESSAGE; -bindtextdomain('postfixadmin', SM_PATH . 'plugins/postfixadmin/locale'); -textdomain('postfixadmin'); - Copied: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/common.php (from rev 800, trunk/ADDITIONS/squirrelmail-plugin/common.php) =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/common.php (rev 0) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/common.php 2010-05-17 22:04:17 UTC (rev 827) @@ -0,0 +1,39 @@ +<?php +// vim:ts=4:sw=4:et +ini_set('include_path', get_include_path() . ':' . dirname(__FILE__)); +chdir(".."); + + +if (!defined('SM_PATH')) +{ + define('SM_PATH','../'); +} +include_once(SM_PATH . 'plugins/postfixadmin/config.php'); +include_once(SM_PATH . 'plugins/postfixadmin/functions.inc.php'); +include_if_exists(SM_PATH . 'include/validate.php'); +if (file_exists(SM_PATH . 'include/validate.php')) +{ + include_once(SM_PATH . 'include/validate.php'); +} +else { + include_if_exists(SM_PATH . 'src/validate.php'); +} +include_once(SM_PATH . 'functions/page_header.php'); +include_once(SM_PATH . 'functions/display_messages.php'); +include_once(SM_PATH . 'functions/imap.php'); +include_if_exists(SM_PATH . 'functions/array.php'); +if (file_exists(SM_PATH . 'src/load_prefs.php')) +{ + include_once(SM_PATH . 'src/load_prefs.php'); +} +else { + include_if_exists(SM_PATH . 'include/load_prefs.php'); +} +// overwrite squirrelmail's content type to utf8... +header("Content-Type: text/html; charset=utf8"); + + +//global $VACCONFMESSAGE; +bindtextdomain('postfixadmin', SM_PATH . 'plugins/postfixadmin/locale'); +textdomain('postfixadmin'); + Deleted: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/config.php.sample =================================================================== --- trunk/ADDITIONS/squirrelmail-plugin/config.php.sample 2010-02-10 22:49:21 UTC (rev 800) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/config.php.sample 2010-05-17 22:04:17 UTC (rev 827) @@ -1,22 +0,0 @@ -<?php - -$CONF = array(); -$CONF['xmlrpc_url'] = 'http://postfixadmin.local/postfixadmin/xmlrpc.php'; - -// Virtual Vacation -// If you use virtual vacation for you mailbox users set this to 'true'. -// NOTE: Make sure that you install the vacation module!! - -//$AllowVacation = true; // true or false -global $AllowVacation; -$AllowVacation = true; - -// Change Password -// Enables user to change the POP3/IMAP Password. -//$AllowChangePass = true; // true or false -global $AllowChangePass; -$AllowChangePass = true; - -// Minimum password length - set to Zero to not care, otherwise the number of -// characters a password must be longer than. -$CONF['min_password_length'] = 5; Copied: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/config.php.sample (from rev 800, trunk/ADDITIONS/squirrelmail-plugin/config.php.sample) =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/config.php.sample (rev 0) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/config.php.sample 2010-05-17 22:04:17 UTC (rev 827) @@ -0,0 +1,22 @@ +<?php + +$CONF = array(); +$CONF['xmlrpc_url'] = 'http://postfixadmin.local/postfixadmin/xmlrpc.php'; + +// Virtual Vacation +// If you use virtual vacation for you mailbox users set this to 'true'. +// NOTE: Make sure that you install the vacation module!! + +//$AllowVacation = true; // true or false +global $AllowVacation; +$AllowVacation = true; + +// Change Password +// Enables user to change the POP3/IMAP Password. +//$AllowChangePass = true; // true or false +global $AllowChangePass; +$AllowChangePass = true; + +// Minimum password length - set to Zero to not care, otherwise the number of +// characters a password must be longer than. +$CONF['min_password_length'] = 5; Deleted: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/README.Debian =================================================================== --- trunk/ADDITIONS/squirrelmail-plugin/debian/README.Debian 2010-02-10 22:49:21 UTC (rev 800) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/README.Debian 2010-05-17 22:04:17 UTC (rev 827) @@ -1,20 +0,0 @@ -Squirrelmail PostfixAdmin Plugin for Debian -=========================================== - -After installing the package, you will need to : - -1) Edit the config.inc.php file to point to the PostfixAdmin server. - -2) Ensure the xmlrpc interface is available and enabled on the Postfixadmin server - -3) Run the squirrelmail-configure script. - -Where to get help -================= - -See http://squirrelmail-postfixadmin.palepurple.co.uk - -Try also : david [at] pale purple dot co dot uk - -Or #postfixadmin on irc.freenode.net might be a good bet. - Copied: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/README.Debian (from rev 800, trunk/ADDITIONS/squirrelmail-plugin/debian/README.Debian) =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/README.Debian (rev 0) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/README.Debian 2010-05-17 22:04:17 UTC (rev 827) @@ -0,0 +1,20 @@ +Squirrelmail PostfixAdmin Plugin for Debian +=========================================== + +After installing the package, you will need to : + +1) Edit the config.inc.php file to point to the PostfixAdmin server. + +2) Ensure the xmlrpc interface is available and enabled on the Postfixadmin server + +3) Run the squirrelmail-configure script. + +Where to get help +================= + +See http://squirrelmail-postfixadmin.palepurple.co.uk + +Try also : david [at] pale purple dot co dot uk + +Or #postfixadmin on irc.freenode.net might be a good bet. + Deleted: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/changelog =================================================================== --- trunk/ADDITIONS/squirrelmail-plugin/debian/changelog 2010-02-10 22:49:21 UTC (rev 800) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/changelog 2010-05-17 22:04:17 UTC (rev 827) @@ -1,27 +0,0 @@ -squirrelmail-postfixadmin (2.3.0) stable; urgency=low - - * Using XMLRPC backend (no SQL here) - - -- David Goodwin <dav...@pa...> Mon, 01 Feb 2010 09:56:00 +0000 - -squirrelmail-postfixadmin (2.2.0) stable; urgency=low - - * Changed DB backend to use prepared statements - * Changed vacation handling to match that of Postfixadmin (vacation.active - etc) - * Changed vacation page to support UTF8 - - -- David Goodwin <dav...@pa...> Wed, 20 Aug 2008 15:25:00 +0000 - -squirrelmail-postfixadmin (2.1.1-1) stable; urgency=low - - * Add NL language support - * Better db error logging (e.g. if wrong mdb2 driver specified etc) - - -- David Goodwin <dav...@pa...> Wed, 12 Dec 2007 16:00:00 +0000 - -squirrelmail-postfixadmin (2.1.0-1) stable; urgency=low - - * Initial release. - - -- David Goodwin <dav...@pa...> Thu, 8 Nov 2007 20:00:00 +0000 Copied: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/changelog (from rev 800, trunk/ADDITIONS/squirrelmail-plugin/debian/changelog) =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/changelog (rev 0) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/changelog 2010-05-17 22:04:17 UTC (rev 827) @@ -0,0 +1,27 @@ +squirrelmail-postfixadmin (2.3.0) stable; urgency=low + + * Using XMLRPC backend (no SQL here) + + -- David Goodwin <dav...@pa...> Mon, 01 Feb 2010 09:56:00 +0000 + +squirrelmail-postfixadmin (2.2.0) stable; urgency=low + + * Changed DB backend to use prepared statements + * Changed vacation handling to match that of Postfixadmin (vacation.active + etc) + * Changed vacation page to support UTF8 + + -- David Goodwin <dav...@pa...> Wed, 20 Aug 2008 15:25:00 +0000 + +squirrelmail-postfixadmin (2.1.1-1) stable; urgency=low + + * Add NL language support + * Better db error logging (e.g. if wrong mdb2 driver specified etc) + + -- David Goodwin <dav...@pa...> Wed, 12 Dec 2007 16:00:00 +0000 + +squirrelmail-postfixadmin (2.1.0-1) stable; urgency=low + + * Initial release. + + -- David Goodwin <dav...@pa...> Thu, 8 Nov 2007 20:00:00 +0000 Deleted: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/conffiles =================================================================== --- trunk/ADDITIONS/squirrelmail-plugin/debian/conffiles 2010-02-10 22:49:21 UTC (rev 800) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/conffiles 2010-05-17 22:04:17 UTC (rev 827) @@ -1 +0,0 @@ -/etc/squirrelmail/plugins/postfixadmin-config.php Copied: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/conffiles (from rev 800, trunk/ADDITIONS/squirrelmail-plugin/debian/conffiles) =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/conffiles (rev 0) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/conffiles 2010-05-17 22:04:17 UTC (rev 827) @@ -0,0 +1 @@ +/etc/squirrelmail/plugins/postfixadmin-config.php Deleted: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/control =================================================================== --- trunk/ADDITIONS/squirrelmail-plugin/debian/control 2010-02-10 22:49:21 UTC (rev 800) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/control 2010-05-17 22:04:17 UTC (rev 827) @@ -1,19 +0,0 @@ -Source: squirrelmail-postfixadmin -Section: mail -Priority: optional -Maintainer: David Goodwin <dav...@pa...> -Standards-Version: 3.6.1 - -Package: squirrelmail-postfixadmin -Architecture: all -Depends: squirrelmail, php-pear -Suggests: postfixadmin -Description: Plugin for Squirrelmail to integrate with Postfixadmin - Postfixadmin is a web based interface for managing mail domains - and users. This package integrates Squirrelmail with it. - Users can change their password, forwarding and vacation settings - from within Squirrelmail when this package is installed, and - enabled through the ./squirrelmail-configure command. - . - For further information see - http://squirrelmail-postfixadmin.palepurple.co.uk Copied: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/control (from rev 800, trunk/ADDITIONS/squirrelmail-plugin/debian/control) =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/control (rev 0) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/control 2010-05-17 22:04:17 UTC (rev 827) @@ -0,0 +1,19 @@ +Source: squirrelmail-postfixadmin +Section: mail +Priority: optional +Maintainer: David Goodwin <dav...@pa...> +Standards-Version: 3.6.1 + +Package: squirrelmail-postfixadmin +Architecture: all +Depends: squirrelmail, php-pear +Suggests: postfixadmin +Description: Plugin for Squirrelmail to integrate with Postfixadmin + Postfixadmin is a web based interface for managing mail domains + and users. This package integrates Squirrelmail with it. + Users can change their password, forwarding and vacation settings + from within Squirrelmail when this package is installed, and + enabled through the ./squirrelmail-configure command. + . + For further information see + http://squirrelmail-postfixadmin.palepurple.co.uk Deleted: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/copyright =================================================================== --- trunk/ADDITIONS/squirrelmail-plugin/debian/copyright 2010-02-10 22:49:21 UTC (rev 800) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/copyright 2010-05-17 22:04:17 UTC (rev 827) @@ -1,11 +0,0 @@ -This package was debianized by David Goodwin <da...@pa...> -2007/11/08 - -It was downloaded from: http://squirremail-postfixadmin.palepurple.co.uk - -Upstream Author(s): n/a - -Copyright: - Copyright (C) 2007+ by David Goodwin <da...@pa...> - -License: GPL v2+ Copied: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/copyright (from rev 800, trunk/ADDITIONS/squirrelmail-plugin/debian/copyright) =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/copyright (rev 0) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/copyright 2010-05-17 22:04:17 UTC (rev 827) @@ -0,0 +1,11 @@ +This package was debianized by David Goodwin <da...@pa...> +2007/11/08 + +It was downloaded from: http://squirremail-postfixadmin.palepurple.co.uk + +Upstream Author(s): n/a + +Copyright: + Copyright (C) 2007+ by David Goodwin <da...@pa...> + +License: GPL v2+ Deleted: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/docs =================================================================== --- trunk/ADDITIONS/squirrelmail-plugin/debian/docs 2010-02-10 22:49:21 UTC (rev 800) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/docs 2010-05-17 22:04:17 UTC (rev 827) @@ -1,4 +0,0 @@ -LICENSE.txt -README -INSTALL -debian/README.Debian Copied: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/docs (from rev 800, trunk/ADDITIONS/squirrelmail-plugin/debian/docs) =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/docs (rev 0) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/docs 2010-05-17 22:04:17 UTC (rev 827) @@ -0,0 +1,4 @@ +LICENSE.txt +README +INSTALL +debian/README.Debian Deleted: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/files =================================================================== --- trunk/ADDITIONS/squirrelmail-plugin/debian/files 2010-02-10 22:49:21 UTC (rev 800) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/files 2010-05-17 22:04:17 UTC (rev 827) @@ -1 +0,0 @@ -squirrelmail-postfixadmin_2.2.0_all.deb mail optional Copied: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/files (from rev 800, trunk/ADDITIONS/squirrelmail-plugin/debian/files) =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/files (rev 0) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/files 2010-05-17 22:04:17 UTC (rev 827) @@ -0,0 +1 @@ +squirrelmail-postfixadmin_2.2.0_all.deb mail optional Deleted: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/postfixadmin-squirrelmail.dirs =================================================================== --- trunk/ADDITIONS/squirrelmail-plugin/debian/postfixadmin-squirrelmail.dirs 2010-02-10 22:49:21 UTC (rev 800) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/postfixadmin-squirrelmail.dirs 2010-05-17 22:04:17 UTC (rev 827) @@ -1,3 +0,0 @@ -usr/share/squirrelmail/plugins/postfixadmin -usr/share/doc/squirrelmail-postfixadmin -etc/squirrelmail/plugins Copied: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/postfixadmin-squirrelmail.dirs (from rev 800, trunk/ADDITIONS/squirrelmail-plugin/debian/postfixadmin-squirrelmail.dirs) =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/postfixadmin-squirrelmail.dirs (rev 0) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/postfixadmin-squirrelmail.dirs 2010-05-17 22:04:17 UTC (rev 827) @@ -0,0 +1,3 @@ +usr/share/squirrelmail/plugins/postfixadmin +usr/share/doc/squirrelmail-postfixadmin +etc/squirrelmail/plugins Deleted: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/postinst =================================================================== --- trunk/ADDITIONS/squirrelmail-plugin/debian/postinst 2010-02-10 22:49:21 UTC (rev 800) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/postinst 2010-05-17 22:04:17 UTC (rev 827) @@ -1,5 +0,0 @@ -#!/bin/sh - -echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" -echo "WARNING: You need to read /usr/share/doc/squirrelmail-postfixadmin/README.Debian!" -echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" Copied: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/postinst (from rev 800, trunk/ADDITIONS/squirrelmail-plugin/debian/postinst) =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/postinst (rev 0) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/postinst 2010-05-17 22:04:17 UTC (rev 827) @@ -0,0 +1,5 @@ +#!/bin/sh + +echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" +echo "WARNING: You need to read /usr/share/doc/squirrelmail-postfixadmin/README.Debian!" +echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" Deleted: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/rules =================================================================== --- trunk/ADDITIONS/squirrelmail-plugin/debian/rules 2010-02-10 22:49:21 UTC (rev 800) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/rules 2010-05-17 22:04:17 UTC (rev 827) @@ -1,56 +0,0 @@ -#!/usr/bin/make -f -# debian/rules makefile for squirrelmail - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -build: build-stamp -build-stamp: - dh_testdir - -clean: - dh_testdir - dh_testroot - dh_clean - -install: build - $(checkdir) - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - dh_install - mkdir -p debian/tmp/usr/share/squirrelmail/plugins/postfixadmin - cp -a *.php version debian/tmp/usr/share/squirrelmail/plugins/postfixadmin - cp -a locale debian/tmp/usr/share/squirrelmail/plugins/postfixadmin - cp -a po debian/tmp/usr/share/squirrelmail/plugins/postfixadmin - mkdir -p debian/tmp/etc/squirrelmail/plugins/ - cp -a *.sample debian/tmp/etc/squirrelmail/plugins/postfixadmin-config.php - mkdir -p debian/tmp/DEBIAN - cp debian/postinst debian/tmp/DEBIAN/postinst - chmod 555 debian/tmp/DEBIAN/postinst - ln -s /etc/squirrelmail/plugins/postfixadmin-config.php debian/tmp/usr/share/squirrelmail/plugins/postfixadmin/config.php - find debian/tmp -name .svn | xargs -r rm -r - -# Build architecture-independent files here. -binary-indep: build install - dh_testdir - dh_testroot - dh_installdebconf - dh_installdocs -X.svn - dh_installexamples - dh_installman - dh_installcron - dh_link - dh_compress - dh_fixperms -X/var - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -# Build architecture-dependent files here. -binary-arch: - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install Copied: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/rules (from rev 800, trunk/ADDITIONS/squirrelmail-plugin/debian/rules) =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/rules (rev 0) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/debian/rules 2010-05-17 22:04:17 UTC (rev 827) @@ -0,0 +1,56 @@ +#!/usr/bin/make -f +# debian/rules makefile for squirrelmail + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +build: build-stamp +build-stamp: + dh_testdir + +clean: + dh_testdir + dh_testroot + dh_clean + +install: build + $(checkdir) + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + dh_install + mkdir -p debian/tmp/usr/share/squirrelmail/plugins/postfixadmin + cp -a *.php version debian/tmp/usr/share/squirrelmail/plugins/postfixadmin + cp -a locale debian/tmp/usr/share/squirrelmail/plugins/postfixadmin + cp -a po debian/tmp/usr/share/squirrelmail/plugins/postfixadmin + mkdir -p debian/tmp/etc/squirrelmail/plugins/ + cp -a *.sample debian/tmp/etc/squirrelmail/plugins/postfixadmin-config.php + mkdir -p debian/tmp/DEBIAN + cp debian/postinst debian/tmp/DEBIAN/postinst + chmod 555 debian/tmp/DEBIAN/postinst + ln -s /etc/squirrelmail/plugins/postfixadmin-config.php debian/tmp/usr/share/squirrelmail/plugins/postfixadmin/config.php + find debian/tmp -name .svn | xargs -r rm -r + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + dh_installdebconf + dh_installdocs -X.svn + dh_installexamples + dh_installman + dh_installcron + dh_link + dh_compress + dh_fixperms -X/var + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-dependent files here. +binary-arch: + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install Deleted: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/functions.inc.php =================================================================== --- trunk/ADDITIONS/squirrelmail-plugin/functions.inc.php 2010-02-10 22:49:21 UTC (rev 800) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/functions.inc.php 2010-05-17 22:04:17 UTC (rev 827) @@ -1,101 +0,0 @@ -<?php -/** - * Postfixadmin (http://postfixadmin.sf.net) integration with Squirrelmail. - * See http://squirrelmail-postfixadmin.palepurple.co.uk - * @author David Goodwin and many others - */ - - -function do_header() { - global $color; - displayPageHeader($color, 'None'); -} - -function do_footer() { - echo "</body></html>"; -} - -function _display_password_form() { - bindtextdomain('postfixadmin', SM_PATH . 'plugins/postfixadmin/locale'); - textdomain('postfixadmin'); - do_header('Postfixadmin Squirrelmail - Login'); - echo _('The PostfixAdmin plugin needs your current mailbox password'); - echo "<form action='' method='post'>"; - echo _('Password for'); - echo " " . $_SESSION['username'] . " :"; - echo "<input type='password' name='password' value=''>"; - echo "<input type='submit' value='" . _('Submit') . "'></form>"; - do_footer(); -} - -/** - * This returns a Zend_XmlRpc_Client instance - unless we can't log you in... - */ -function get_xmlrpc() { - global $CONF; - require_once('Zend/XmlRpc/Client.php'); - $client = new Zend_XmlRpc_Client($CONF['xmlrpc_url']); - $http_client = $client->getHttpClient(); - $http_client->setCookieJar(); - - $login_object ... [truncated message content] |
From: <chr...@us...> - 2010-06-22 22:14:09
|
Revision: 837 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=837&view=rev Author: christian_boltz Date: 2010-06-22 22:14:03 +0000 (Tue, 22 Jun 2010) Log Message: ----------- - merged r829,830,833-836 - see CHANGELOG.TXT changes for details This should make the 2.3 branch ready to be released as 2.3.1. Still missing parts are: - merge changes in debian/* - testing - I did the merge without lots of testing - update version number in functions.inc.php and CHANGELOG.txt ;-) Modified Paths: -------------- branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/functions.inc.php branches/postfixadmin-2.3/CHANGELOG.TXT branches/postfixadmin-2.3/delete.php branches/postfixadmin-2.3/edit-alias.php branches/postfixadmin-2.3/functions.inc.php branches/postfixadmin-2.3/languages/pl.lang branches/postfixadmin-2.3/users/password.php Property Changed: ---------------- branches/postfixadmin-2.3/ branches/postfixadmin-2.3/debian/apache.conf branches/postfixadmin-2.3/debian/postfixadmin.docs Property changes on: branches/postfixadmin-2.3 ___________________________________________________________________ Modified: svn:mergeinfo - /trunk:751,800,806,811,817,819,821,825-826 + /trunk:751,800,806,811,817,819,821,825-826,829-830,833-836 Modified: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/functions.inc.php =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/functions.inc.php 2010-06-22 20:48:06 UTC (rev 836) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/functions.inc.php 2010-06-22 22:14:03 UTC (rev 837) @@ -51,6 +51,7 @@ } catch(Exception $e) { //var_dump($client->getHttpClient()->getLastResponse()->getBody()); + error_log("Failed to login to xmlrpc instance - " . $e->getMessage); die('Failed to login to xmlrpc instance'); } if($success) { Modified: branches/postfixadmin-2.3/CHANGELOG.TXT =================================================================== --- branches/postfixadmin-2.3/CHANGELOG.TXT 2010-06-22 20:48:06 UTC (rev 836) +++ branches/postfixadmin-2.3/CHANGELOG.TXT 2010-06-22 22:14:03 UTC (rev 837) @@ -17,6 +17,9 @@ The only visible change is displaying the alias target for mailboxes which was a longstanding issue/"missing feature". The ADDITIONS directory contains some new scripts. + - SECURITY: users could bypass checking the old password when changing the + password by entering a too short new password. Fortunately only + "exploitable" by authentificated users. - display alias targets for mailboxes (if $CONF['special_alias_control'] = YES) - add hook for custom maildir path generation - add import_users_from_csv.py script (by Simone Piccardi) @@ -33,13 +36,18 @@ superadmins) - add in_array() check to avoid that superadmins can enter invalid domains - fix delete link for alias domains (when on target domain) + - delete values from quota and quota2 table when deleting a mailbox - fix hardcoded table names in list-domain.php - fixed edit-alias.php not to drop alias to the mailbox if special_alias_control = NO + - fix alias handling for mailboxes (special_alias_control vs. + alias_control_admin confusion) - fix typo in upgrade.php that broke index creation and deletion when using non-default table names - fix creating 'ALL' domain (dummy for superadmins) when using non-default table names + - fix: db_query did not return number of SELECTed rows if query starts with + with whitespace - check for $CONF['encrypt'] = 'dovecot:md5-crypt' (postfixadmin login not working because dovecotpw uses a new salt each time), recommend internal md5crypt instead Property changes on: branches/postfixadmin-2.3/debian/apache.conf ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/debian/apache.conf:829-830,833-836 Property changes on: branches/postfixadmin-2.3/debian/postfixadmin.docs ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/debian/postfixadmin.docs:829-830,833-836 Modified: branches/postfixadmin-2.3/delete.php =================================================================== --- branches/postfixadmin-2.3/delete.php 2010-06-22 20:48:06 UTC (rev 836) +++ branches/postfixadmin-2.3/delete.php 2010-06-22 22:14:03 UTC (rev 837) @@ -143,6 +143,14 @@ $tMessage.=')</span>'; } db_log ($SESSID_USERNAME, $fDomain, 'delete_mailbox', $fDelete); + $result = db_query("SELECT * FROM $table_quota WHERE username='$fDelete'"); + if($result['rows'] >= 1) { + db_query ("DELETE FROM $table_quota WHERE username='$fDelete'"); + } + $result = db_query("SELECT * FROM $table_quota2 WHERE username='$fDelete'"); + if($result['rows'] == 1) { + db_query ("DELETE FROM $table_quota2 WHERE username='$fDelete'"); + } } $result = db_query("SELECT * FROM $table_vacation WHERE email = '$fDelete' AND domain = '$fDomain'"); if($result['rows'] == 1) { Modified: branches/postfixadmin-2.3/edit-alias.php =================================================================== --- branches/postfixadmin-2.3/edit-alias.php 2010-06-22 20:48:06 UTC (rev 836) +++ branches/postfixadmin-2.3/edit-alias.php 2010-06-22 22:14:03 UTC (rev 837) @@ -63,8 +63,8 @@ $orig_alias_list = explode(',', $tGoto); $alias_list = $orig_alias_list; - //. if we are not a global admin, and special_alias_control is NO, hide the alias that's the mailbox name. - if($CONF['special_alias_control'] == 'NO' && !authentication_has_role('global-admin')) { + //. if we are not a global admin, and alias_control_admin is NO, hide the alias that's the mailbox name. + if($CONF['alias_control_admin'] == 'NO' && !authentication_has_role('global-admin')) { /* Has a mailbox as well? Remove the address from $tGoto in order to edit just the real aliases */ $result = db_query ("SELECT * FROM $table_mailbox WHERE username='$fAddress' AND domain='$fDomain'"); if ($result['rows'] == 1) Modified: branches/postfixadmin-2.3/functions.inc.php =================================================================== --- branches/postfixadmin-2.3/functions.inc.php 2010-06-22 20:48:06 UTC (rev 836) +++ branches/postfixadmin-2.3/functions.inc.php 2010-06-22 22:14:03 UTC (rev 837) @@ -1577,7 +1577,7 @@ if ($error_text != "" && $ignore_errors == 0) die($error_text); if ($error_text == "") { - if (preg_match("/^SELECT/i", $query)) + if (preg_match("/^SELECT/i", trim($query))) { // if $query was a SELECT statement check the number of rows with [database_type]_num_rows (). if ($CONF['database_type'] == "mysql") $number_rows = mysql_num_rows ($result); Modified: branches/postfixadmin-2.3/languages/pl.lang =================================================================== --- branches/postfixadmin-2.3/languages/pl.lang 2010-06-22 20:48:06 UTC (rev 836) +++ branches/postfixadmin-2.3/languages/pl.lang 2010-06-22 22:14:03 UTC (rev 837) @@ -5,6 +5,7 @@ // by Jarek // updated by Piotr Meyer <aniou at smutek dot pl> // updated by Lukasz Wasikowski <lu...@wa...> +// updated by Michal Wojcik <michalw-snt @ SF> // $PALANG['YES'] = 'Tak'; @@ -24,13 +25,13 @@ $PALANG['pLogin_username'] = 'Login (email)'; $PALANG['pLogin_password'] = 'Hasło'; $PALANG['pLogin_button'] = 'Zaloguj'; -$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX +$PALANG['pLogin_failed'] = 'Twój adres Email lub hasło jest niepoprawne.'; $PALANG['pLogin_login_users'] = 'Sekcja przeznaczona dla użytkowników.'; $PALANG['pMenu_main'] = 'Strona główna'; $PALANG['pMenu_overview'] = 'Dane zbiorcze'; $PALANG['pMenu_create_alias'] = 'Dodaj alias'; -$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX +$PALANG['pMenu_create_alias_domain'] = 'Dodaj alias domeny'; $PALANG['pMenu_create_mailbox'] = 'Dodaj konto'; $PALANG['pMenu_fetchmail'] = 'Pobierz Email'; $PALANG['pMenu_sendmail'] = 'Wyślij Email'; @@ -53,21 +54,21 @@ $PALANG['pOverview_up_arrow'] = 'Do góry'; $PALANG['pOverview_right_arrow'] = 'Następna strona'; $PALANG['pOverview_left_arrow'] = 'Poprzednia strona'; -$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX +$PALANG['pOverview_alias_domain_title'] = ':: Aliasy domen'; $PALANG['pOverview_alias_title'] = ':: Aliasy'; -$PALANG['pOverview_mailbox_title'] = ':: Konta pocztowe'; # XXX +$PALANG['pOverview_mailbox_title'] = ':: Konta pocztowe'; $PALANG['pOverview_button'] = 'Idź'; $PALANG['pOverview_welcome'] = 'Dane zbiorcze dla domeny '; -$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX -$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX +$PALANG['pOverview_alias_domain_aliases'] = 'Domeny aliasowe'; +$PALANG['pOverview_alias_domain_target'] = '%s jest domeną aliasową dla:'; $PALANG['pOverview_alias_alias_count'] = 'Alias'; $PALANG['pOverview_alias_mailbox_count'] = 'Konta'; $PALANG['pOverview_alias_address'] = 'Od'; $PALANG['pOverview_alias_goto'] = 'Do'; $PALANG['pOverview_alias_modified'] = 'Ostatnio zmodyfikowany'; -$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX +$PALANG['pOverview_alias_domain_modified'] = 'Ostatnio zmodyfikowane'; $PALANG['pOverview_alias_active'] = 'Aktywny'; -$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX +$PALANG['pOverview_alias_domain_active'] = 'Aktywny'; $PALANG['pOverview_alias_edit'] = 'Alias'; $PALANG['and_x_more'] = '[i %s wiecej...]'; $PALANG['pOverview_mailbox_username'] = 'Email'; @@ -76,11 +77,11 @@ $PALANG['pOverview_mailbox_modified'] = 'Ostatnio zmodyfikowany'; $PALANG['pOverview_mailbox_active'] = 'Aktywny'; $PALANG['pOverview_vacation_edit'] = 'Auto odpowiedź'; -$PALANG['pOverview_vacation_option'] = 'Ustaw auto odpowiedź'; +$PALANG['pOverview_vacation_option'] = 'Ustaw automatyczną odpowiedź'; $PALANG['pOverview_get_domain'] = 'Domena'; $PALANG['pOverview_get_aliases'] = 'Aliasy'; -$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX +$PALANG['pOverview_get_alias_domains'] = 'Aliasy domenowe'; $PALANG['pOverview_get_mailboxes'] = 'Konta'; $PALANG['pOverview_get_quota'] = 'Udział (MB)'; $PALANG['pOverview_get_modified'] = 'Ostatnio zmodyfikowany'; @@ -89,20 +90,20 @@ $PALANG['pDelete_delete_success'] = '%s usunięty.'; $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Nie można usunąć konta '; $PALANG['pDelete_domain_error'] = '<span class="error_msg">Ta domena nie należy do Ciebie '; -$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX +$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">Ten alias domeny nie należy do Ciebie '; $PALANG['pDelete_alias_error'] = '<span class="error_msg">Nie można usunąć aliasu '; -$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX -$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX -$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX -$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX -$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX -$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX -$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX -$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX -$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX -$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX -$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX -$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX +$PALANG['pCreate_alias_domain_welcome'] = 'Duplikuj adresy z jednej Twojej domeny do innej.'; +$PALANG['pCreate_alias_domain_alias'] = 'Domena aliasowana/źródłowa'; +$PALANG['pCreate_alias_domain_alias_text'] = 'Domena do której przychodzą maile.'; +$PALANG['pCreate_alias_domain_target'] = 'Domena docelowa'; +$PALANG['pCreate_alias_domain_target_text'] = 'Domena do której powinny przychodzić maile.'; +$PALANG['pCreate_alias_domain_active'] = 'Aktywny'; +$PALANG['pCreate_alias_domain_button'] = 'Dodaj alias domeny'; +$PALANG['pCreate_alias_domain_error1'] = 'Nie masz uprawnień do tworzenia takiej konfiguracji.'; +$PALANG['pCreate_alias_domain_error2'] = 'Wybrana konfiguracja jest nieprawidłowa, proszę wybrać inną!'; +$PALANG['pCreate_alias_domain_error3'] = 'Dodanie do bazy nie powiodło się.'; +$PALANG['pCreate_alias_domain_error4'] = 'Wszystkie domeny są już aliasowane.'; +$PALANG['pCreate_alias_domain_success'] = 'Alias domeny został dodany do tabeli aliasów domen!'; $PALANG['pCreate_alias_welcome'] = 'Utwórz nowy alias dla Twojej domeny.'; $PALANG['pCreate_alias_address'] = 'Alias'; @@ -125,7 +126,7 @@ $PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Nie podałeś adresu odbiorcy (pole "To")</span>'; $PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Wpisany adres email jest niepoprawny: '; $PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Ta domena nie należy do Ciebie: '; -$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX +$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Nie można zmodyfikować aliasu domeny!</span>'; $PALANG['pEdit_alias_forward_and_store'] = 'Dostarczaj do mojej skrzynki.'; $PALANG['pEdit_alias_forward_only'] = 'Prześlij jedynie na podane adresy.'; $PALANG['pEdit_alias_button'] = 'Edytuj alias'; @@ -179,9 +180,9 @@ $PALANG['pPassword_result_error'] = '<span class="error_msg">Nie można zmienić Twojego hasła!</span>'; $PALANG['pPassword_result_success'] = 'Twoje hasło zostało zmienione!'; -$PALANG['pEdit_vacation_set'] = 'Zmień / Ustaw wiadomość auto odpowiedzi'; -$PALANG['pEdit_vacation_remove'] = 'Usuń wiadomość auto odpowiedzi'; -$PALANG['pVacation_result_error'] = '<span class="error_msg">Nie można ustawić wiadomości auto odpowiedzi!</span>'; +$PALANG['pEdit_vacation_set'] = 'Zmień / Ustaw wiadomość automatycznej odpowiedzi'; +$PALANG['pEdit_vacation_remove'] = 'Usuń wiadomość automatycznej odpowiedzi'; +$PALANG['pVacation_result_error'] = '<span class="error_msg">Nie można ustawić wiadomości automatycznej odpowiedzi!</span>'; $PALANG['pVacation_result_removed'] = 'Auto odpowiedź została usunięta!'; $PALANG['pVacation_result_added'] = 'Auto odpowiedź została dodana!'; @@ -191,17 +192,17 @@ $PALANG['pViewlog_domain'] = 'Domena'; $PALANG['pViewlog_action'] = 'Działanie'; $PALANG['pViewlog_data'] = 'Dane'; -$PALANG['pViewlog_action_create_mailbox'] = 'utwórz konto'; -$PALANG['pViewlog_action_delete_mailbox'] = 'usuń konto'; -$PALANG['pViewlog_action_edit_mailbox'] = 'edytuj konto'; -$PALANG['pViewlog_action_edit_mailbox_state'] = 'edytuj aktywne konto'; -$PALANG['pViewlog_action_create_alias'] = 'utwórz alias'; -$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX -$PALANG['pViewlog_action_delete_alias'] = 'usuń alias'; -$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX -$PALANG['pViewlog_action_edit_alias'] = 'edytuj alias'; -$PALANG['pViewlog_action_edit_alias_state'] = 'edytuj aktywny alias'; -$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX +$PALANG['pViewlog_action_create_mailbox'] = 'utworzenie konta'; +$PALANG['pViewlog_action_delete_mailbox'] = 'usunięcie konta'; +$PALANG['pViewlog_action_edit_mailbox'] = 'edycja konta'; +$PALANG['pViewlog_action_edit_mailbox_state'] = 'edycja statusu konta'; +$PALANG['pViewlog_action_create_alias'] = 'utworzenie aliasu'; +$PALANG['pViewlog_action_create_alias_domain'] = 'utworzenie aliasu domeny'; +$PALANG['pViewlog_action_delete_alias'] = 'usunięcie aliasu'; +$PALANG['pViewlog_action_delete_alias_domain'] = 'usunięcie aliasu domeny'; +$PALANG['pViewlog_action_edit_alias'] = 'edycja aliasu'; +$PALANG['pViewlog_action_edit_alias_state'] = 'edycja statusu aliasu'; +$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edycja statusu aliasu domeny'; $PALANG['pViewlog_action_edit_password'] = 'zmień hasło'; $PALANG['pViewlog_button'] = 'Idź'; @@ -220,7 +221,7 @@ $PALANG['pAdminMenu_list_admin'] = 'Lista administratorów'; $PALANG['pAdminMenu_list_domain'] = 'Lista domen'; -$PALANG['pAdminMenu_list_virtual'] = 'Virtual list'; # XXX +$PALANG['pAdminMenu_list_virtual'] = 'Lista zbiorcza'; $PALANG['pAdminMenu_viewlog'] = 'Logi'; $PALANG['pAdminMenu_backup'] = 'Kopia bezpieczeństwa'; $PALANG['pAdminMenu_create_domain_admins'] = 'Administratorzy domeny'; @@ -278,7 +279,7 @@ $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Nie można dodać domeny!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domena została dodana!'; $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Nie można usunąć domeny!</span>'; -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX +$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Nie można usunąć aliasu domeny!</span>'; $PALANG['pAdminEdit_domain_welcome'] = 'Edytuj domenę'; $PALANG['pAdminEdit_domain_domain'] = 'Domena'; @@ -331,18 +332,18 @@ $PALANG['pUsersMenu_edit_alias'] = 'Zmień przekierowania'; $PALANG['pUsersMenu_password'] = 'Zmień hasło'; -$PALANG['pUsersMain_vacation'] = 'Ustaw "out of office" wiadomość lub auto odpowiedź.'; +$PALANG['pUsersMain_vacation'] = 'Ustaw automatyczną odpowiedź.'; $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' jest WŁACZONA, kliknij \'' . $PALANG['pUsersMenu_vacation'] . '\' aby ' . 'edytować/usunąć'; $PALANG['pUsersMain_edit_alias'] = 'Zmień przekierowania wiadomości.'; $PALANG['pUsersMain_password'] = 'Zmień aktualne hasło.'; -$PALANG['pUsersVacation_welcome'] = 'Auto odpowiedź.'; -$PALANG['pUsersVacation_welcome_text'] = 'Masz już skonfigurowaną auto odpowiedź!'; +$PALANG['pUsersVacation_welcome'] = 'Automatyczną odpowiedź.'; +$PALANG['pUsersVacation_welcome_text'] = 'Masz już skonfigurowaną automatyczną odpowiedź!'; $PALANG['pUsersVacation_subject'] = 'Temat'; $PALANG['pUsersVacation_subject_text'] = 'Poza biurem'; -$PALANG['pUsersVacation_body'] = 'Tekst'; # XXX text changed to 'Message' +$PALANG['pUsersVacation_body'] = 'Wiadomość'; $PALANG['pUsersVacation_body_text'] = <<<EOM Będę nieobecny od <date> do <date>. @@ -350,8 +351,8 @@ EOM; $PALANG['pUsersVacation_button_away'] = 'Nieobecny/a'; $PALANG['pUsersVacation_button_back'] = 'Zaraz wracam'; -$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Nie mogę zaktualizować ustawień Twojej auto odpowiedzi!</span>'; -$PALANG['pUsersVacation_result_success'] = 'Twoja auto odpowiedź została usunięta!'; +$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Nie mogę zaktualizować ustawień Twojej automatycznej odpowiedzi!</span>'; +$PALANG['pUsersVacation_result_success'] = 'Twoja automatyczna odpowiedź została usunięta!'; $PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX $PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX @@ -379,10 +380,10 @@ $PALANG['pStatus_undeliverable'] = 'może być NIEDOSTARCZALNA '; $PALANG['pStatus_custom'] = 'Dostarczyć do '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; -$PALANG['pPasswordTooShort'] = "Hasło jest za krótkie - musi mieć minimum %s znaków"; -$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX -$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX -$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX +$PALANG['pPasswordTooShort'] = 'Hasło jest za krótkie - musi mieć minimum %s znaków'; +$PALANG['pInvalidDomainRegex'] = 'Nieprawidłowa nazwa domeny %s'; +$PALANG['pInvalidDomainDNS'] = 'Nieprawidłowa domena %s, nie wykrywana w DNS'; +$PALANG['pInvalidMailRegex'] = 'Nieprawidłowy adres email'; $PALANG['pFetchmail_welcome'] = 'Pobierz pocztę dla:'; $PALANG['pFetchmail_new_entry'] = 'Nowy wpis'; $PALANG['pFetchmail_database_save_error'] = 'Wpis nie może być zapisany w bazie danych!'; @@ -403,7 +404,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Pobierz wszystkie'; $PALANG['pFetchmail_field_keep'] = 'Pozostaw'; $PALANG['pFetchmail_field_protocol'] = 'Protokół'; -$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'Aktywne SSL'; $PALANG['pFetchmail_field_extra_options'] = 'Dodatkowe opcje'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Data'; @@ -419,7 +420,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Pobierz zarówno stare (przeczytane) jak i nowe wiadomości'; $PALANG['pFetchmail_desc_keep'] = 'Pozostaw wiadomości na serwerze'; $PALANG['pFetchmail_desc_protocol'] = 'Protokół'; -$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'szyfrowanie SSL'; $PALANG['pFetchmail_desc_extra_options'] = 'Dodatkowe opcje dla fetchmail'; $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; $PALANG['pFetchmail_desc_date'] = 'Data ostatniego sprawdzenia/zmiany konfiguracji'; Modified: branches/postfixadmin-2.3/users/password.php =================================================================== --- branches/postfixadmin-2.3/users/password.php 2010-06-22 20:48:06 UTC (rev 836) +++ branches/postfixadmin-2.3/users/password.php 2010-06-22 22:14:03 UTC (rev 837) @@ -43,8 +43,9 @@ $fPassword = $_POST['fPassword']; $fPassword2 = $_POST['fPassword2']; + $error = 0; if(strlen($fPassword) < $CONF['min_password_length']) { - $error = 1; + $error += 1; flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length'])); } if(!UserHandler::login($username, $fPassword_current)) { @@ -53,11 +54,11 @@ } if (empty ($fPassword) or ($fPassword != $fPassword2)) { - $error = 1; + $error += 1; $pPassword_password_text = $PALANG['pPassword_password_text_error']; } - if ($error != 1) + if ($error == 0) { $uh = new UserHandler($username); if($uh->change_pass($fPassword_current, $fPassword)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2010-07-08 21:39:54
|
Revision: 846 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=846&view=rev Author: GingerDog Date: 2010-07-08 21:39:48 +0000 (Thu, 08 Jul 2010) Log Message: ----------- 2.3.1 is almost here Modified Paths: -------------- branches/postfixadmin-2.3/CHANGELOG.TXT branches/postfixadmin-2.3/functions.inc.php Modified: branches/postfixadmin-2.3/CHANGELOG.TXT =================================================================== --- branches/postfixadmin-2.3/CHANGELOG.TXT 2010-07-08 21:33:30 UTC (rev 845) +++ branches/postfixadmin-2.3/CHANGELOG.TXT 2010-07-08 21:39:48 UTC (rev 846) @@ -10,7 +10,7 @@ # Last update: # $Id$ -Version 2.3.1 - 2010/05/18 - SVN r*** (postfixadmin-2.3 branch) +Version 2.3.1 - 2010/07/08 - SVN r846 (postfixadmin-2.3 branch) --------------------------------------------------------------- - SUMMARY: PostfixAdmin 2.3.1 is a bugfix-only release for Postfix Admin 2.3. @@ -20,6 +20,7 @@ - SECURITY: users could bypass checking the old password when changing the password by entering a too short new password. Fortunately only "exploitable" by authentificated users. + - merge in changes to /debain (thanks normes) from trunk - display alias targets for mailboxes (if $CONF['special_alias_control'] = YES) - add hook for custom maildir path generation - add import_users_from_csv.py script (by Simone Piccardi) Modified: branches/postfixadmin-2.3/functions.inc.php =================================================================== --- branches/postfixadmin-2.3/functions.inc.php 2010-07-08 21:33:30 UTC (rev 845) +++ branches/postfixadmin-2.3/functions.inc.php 2010-07-08 21:39:48 UTC (rev 846) @@ -16,7 +16,7 @@ * Contains re-usable code. */ -$version = '2.3'; +$version = '2.3.1'; /** * check_session This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2010-07-09 13:16:14
|
Revision: 847 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=847&view=rev Author: christian_boltz Date: 2010-07-09 13:16:08 +0000 (Fri, 09 Jul 2010) Log Message: ----------- list-virtual.php: - displaying mailbox aliases based on wrong $CONF option (special_alias_control, has to be alias_control_admin CHANGELOG.TXT: - updated date and revision number for release Modified Paths: -------------- branches/postfixadmin-2.3/CHANGELOG.TXT branches/postfixadmin-2.3/list-virtual.php Modified: branches/postfixadmin-2.3/CHANGELOG.TXT =================================================================== --- branches/postfixadmin-2.3/CHANGELOG.TXT 2010-07-08 21:39:48 UTC (rev 846) +++ branches/postfixadmin-2.3/CHANGELOG.TXT 2010-07-09 13:16:08 UTC (rev 847) @@ -10,7 +10,7 @@ # Last update: # $Id$ -Version 2.3.1 - 2010/07/08 - SVN r846 (postfixadmin-2.3 branch) +Version 2.3.1 - 2010/07/09 - SVN r847 (postfixadmin-2.3 branch) --------------------------------------------------------------- - SUMMARY: PostfixAdmin 2.3.1 is a bugfix-only release for Postfix Admin 2.3. Modified: branches/postfixadmin-2.3/list-virtual.php =================================================================== --- branches/postfixadmin-2.3/list-virtual.php 2010-07-08 21:39:48 UTC (rev 846) +++ branches/postfixadmin-2.3/list-virtual.php 2010-07-09 13:16:08 UTC (rev 847) @@ -195,7 +195,7 @@ # mailboxes # -$display_mailbox_aliases = boolconf('special_alias_control'); # TODO: is this condition correct? - I'm slightly confused with alias_control, alias_control_admin and special_alias_control +$display_mailbox_aliases = boolconf('alias_control_admin'); # build the sql query $sql_select = " SELECT $table_mailbox.* "; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2010-08-22 12:18:49
|
Revision: 857 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=857&view=rev Author: christian_boltz Date: 2010-08-22 12:18:43 +0000 (Sun, 22 Aug 2010) Log Message: ----------- login.php, templates/login.php - SECURITY: attackers could find out if an admin exists (login pre-filled the username if "only" a wrong password was entered) Thanks to Sebastian Schinzel for pointing this out (via private mail to me). TODO for trunk: simplify the login code - use the password from the first query's $result or only use the second query that includes the password Modified Paths: -------------- branches/postfixadmin-2.3/login.php branches/postfixadmin-2.3/templates/login.php Modified: branches/postfixadmin-2.3/login.php =================================================================== --- branches/postfixadmin-2.3/login.php 2010-08-17 18:20:35 UTC (rev 856) +++ branches/postfixadmin-2.3/login.php 2010-08-22 12:18:43 UTC (rev 857) @@ -19,7 +19,6 @@ * Template Variables: * * tMessage - * tUsername * * Form POST \ GET Variables: * @@ -65,7 +64,6 @@ { $error = 1; $tMessage = '<span class="error_msg">' . $PALANG['pLogin_failed'] . '</span>'; - $tUsername = htmlentities($fUsername, ENT_QUOTES, 'UTF-8'); } } else Modified: branches/postfixadmin-2.3/templates/login.php =================================================================== --- branches/postfixadmin-2.3/templates/login.php 2010-08-17 18:20:35 UTC (rev 856) +++ branches/postfixadmin-2.3/templates/login.php 2010-08-22 12:18:43 UTC (rev 857) @@ -7,7 +7,7 @@ </tr> <tr> <td><?php print $PALANG['pLogin_username'] . ":"; ?></td> - <td><input class="flat" type="text" name="fUsername" value="<?php print $tUsername; ?>" /></td> + <td><input class="flat" type="text" name="fUsername" value="" /></td> </tr> <tr> <td><?php print $PALANG['pLogin_password'] . ":"; ?></td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2012-06-26 18:57:17
|
Revision: 1404 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1404&view=rev Author: christian_boltz Date: 2012-06-26 18:57:11 +0000 (Tue, 26 Jun 2012) Log Message: ----------- templates/login.php: - typo fix - focus the username input field https://sourceforge.net/tracker/?func=detail&atid=937964&aid=3538192&group_id=191583 templates/users_login.php: - focus username input field in login form Modified Paths: -------------- branches/postfixadmin-2.3/CHANGELOG.TXT branches/postfixadmin-2.3/templates/login.php branches/postfixadmin-2.3/templates/users_login.php Modified: branches/postfixadmin-2.3/CHANGELOG.TXT =================================================================== --- branches/postfixadmin-2.3/CHANGELOG.TXT 2012-06-21 22:12:07 UTC (rev 1403) +++ branches/postfixadmin-2.3/CHANGELOG.TXT 2012-06-26 18:57:11 UTC (rev 1404) @@ -15,6 +15,7 @@ - display domain and mailbox description with correct encoding - fix footer link + - focus username input field in login form Version 2.3.5 - 2012/01/16 - SVN r1335 (postfixadmin-2.3 branch) ---------------------------------------------------------------- Modified: branches/postfixadmin-2.3/templates/login.php =================================================================== --- branches/postfixadmin-2.3/templates/login.php 2012-06-21 22:12:07 UTC (rev 1403) +++ branches/postfixadmin-2.3/templates/login.php 2012-06-26 18:57:11 UTC (rev 1404) @@ -30,7 +30,7 @@ </table> </form> -<script tyle="text/javascript"><!-- +<script type="text/javascript"><!-- document.login.fUsername.focus(); // --> </script> Modified: branches/postfixadmin-2.3/templates/users_login.php =================================================================== --- branches/postfixadmin-2.3/templates/users_login.php 2012-06-21 22:12:07 UTC (rev 1403) +++ branches/postfixadmin-2.3/templates/users_login.php 2012-06-26 18:57:11 UTC (rev 1404) @@ -26,4 +26,9 @@ </tr> </table> </form> +<script type="text/javascript"><!-- + document.login.fUsername.focus(); +// --> +</script> + </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2013-06-16 17:31:41
|
Revision: 1480 http://sourceforge.net/p/postfixadmin/code/1480 Author: christian_boltz Date: 2013-06-16 17:31:38 +0000 (Sun, 16 Jun 2013) Log Message: ----------- da.lang - Translation update by Titanus <titanus AT aptget.dk>, via mailinglist Modified Paths: -------------- branches/postfixadmin-2.3/CHANGELOG.TXT branches/postfixadmin-2.3/languages/da.lang Modified: branches/postfixadmin-2.3/CHANGELOG.TXT =================================================================== --- branches/postfixadmin-2.3/CHANGELOG.TXT 2013-06-16 16:39:36 UTC (rev 1479) +++ branches/postfixadmin-2.3/CHANGELOG.TXT 2013-06-16 17:31:38 UTC (rev 1480) @@ -12,7 +12,7 @@ Changes since 2.3.6 release ---------------------------------------------------------------- - - lt.lang translation update + - lt.lang, da.lang translation update - when enabling/disabling a mailbox, also update the corresponding alias Version 2.3.6 - 2013/01/02 - SVN r1417 (postfixadmin-2.3 branch) Modified: branches/postfixadmin-2.3/languages/da.lang =================================================================== --- branches/postfixadmin-2.3/languages/da.lang 2013-06-16 16:39:36 UTC (rev 1479) +++ branches/postfixadmin-2.3/languages/da.lang 2013-06-16 17:31:38 UTC (rev 1480) @@ -5,6 +5,8 @@ // by Lars // updated by Jesper R. Meyer <jrm at upthere dot dk> // +// titanus <ti...@ap...>, 2013 +// $PALANG['YES'] = 'JA'; $PALANG['NO'] = 'NEJ'; @@ -16,21 +18,21 @@ $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['check_update'] = 'Søg efter opdateringer'; -$PALANG['invalid_parameter'] = 'Ugyldig parameter!'; +$PALANG['invalid_parameter'] = 'Ugyldig parameter.'; -$PALANG['pFooter_logged_as'] = 'Indlogget som %s'; +$PALANG['pFooter_logged_as'] = 'Logget ind som %s'; $PALANG['pLogin_welcome'] = 'Postadministrator: Log ind for at administrere dine domæner.'; $PALANG['pLogin_username'] = 'Brugernavn (email)'; $PALANG['pLogin_password'] = 'Adgangskode'; -$PALANG['pLogin_button'] = 'Login'; -$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX -$PALANG['pLogin_login_users'] = 'Bruger: Log ind på brugersektionen her.'; +$PALANG['pLogin_button'] = 'Log ind'; +$PALANG['pLogin_failed'] = 'Dit brugernavn eller adgangskode var ikke korrekt.'; +$PALANG['pLogin_login_users'] = 'Log ind på brugersektionen her.'; $PALANG['pMenu_main'] = 'Start'; $PALANG['pMenu_overview'] = 'Oversigt'; $PALANG['pMenu_create_alias'] = 'Tilføj alias'; -$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX +$PALANG['pMenu_create_alias_domain'] = 'Tilføje alias domæne'; $PALANG['pMenu_create_mailbox'] = 'Tilføj postboks'; $PALANG['pMenu_fetchmail'] = 'Hent email'; $PALANG['pMenu_sendmail'] = 'Send email'; @@ -38,14 +40,14 @@ $PALANG['pMenu_viewlog'] = 'Vis log'; $PALANG['pMenu_logout'] = 'Log ud'; -$PALANG['pMain_welcome'] = 'Velkommen til Postfix Admin!'; -$PALANG['pMain_overview'] = 'Vis alle alias og postbokse. Du kan redigere/slette dem herfra.'; -$PALANG['pMain_create_alias'] = 'Tilføj nyt alias til dit domæne.'; -$PALANG['pMain_create_mailbox'] = 'Tilføj ny postboks til dit domæne.'; -$PALANG['pMain_sendmail'] = 'Send en email til en af dine nyoprettede postbokse.'; +$PALANG['pMain_welcome'] = 'Velkommen til postfixAdmin'; +$PALANG['pMain_overview'] = 'Vis alle aliases og postbokse. Du kan redigere/slette dem herfra.'; +$PALANG['pMain_create_alias'] = 'Tilføj et nyt alias til et domæne.'; +$PALANG['pMain_create_mailbox'] = 'Tilføj en ny postboks til et domæne.'; +$PALANG['pMain_sendmail'] = 'Send en email til en eksisterende postboks.'; $PALANG['pMain_password'] = 'Ændre adgangskoden til din administratorkonto.'; $PALANG['pMain_viewlog'] = 'Vis logfiler.'; -$PALANG['pMain_logout'] = 'Log ud fra systemet.'; +$PALANG['pMain_logout'] = 'Log af systemet.'; $PALANG['pOverview_disabled'] = 'Deaktiveret'; $PALANG['pOverview_unlimited'] = 'Ubegrænset'; @@ -53,21 +55,21 @@ $PALANG['pOverview_up_arrow'] = 'Gå til top'; $PALANG['pOverview_right_arrow'] = 'Næste side'; $PALANG['pOverview_left_arrow'] = 'Foregående side'; -$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX +$PALANG['pOverview_alias_domain_title'] = ':: Domæne aliases'; $PALANG['pOverview_alias_title'] = ':: Alias'; $PALANG['pOverview_mailbox_title'] = ':: Postbokse'; $PALANG['pOverview_button'] = 'Vis'; $PALANG['pOverview_welcome'] = 'Oversigt for '; -$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX -$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX +$PALANG['pOverview_alias_domain_aliases'] = 'Alias domæner'; +$PALANG['pOverview_alias_domain_target'] = '%s er et alias domæne for:'; $PALANG['pOverview_alias_alias_count'] = 'Alias'; $PALANG['pOverview_alias_mailbox_count'] = 'Postbokse'; $PALANG['pOverview_alias_address'] = 'Alias'; $PALANG['pOverview_alias_goto'] = 'Modtager'; $PALANG['pOverview_alias_modified'] = 'Senest ændret'; -$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX +$PALANG['pOverview_alias_domain_modified'] = 'Senest ændret'; $PALANG['pOverview_alias_active'] = 'Aktiveret'; -$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX +$PALANG['pOverview_alias_domain_active'] = 'Aktiveret'; $PALANG['pOverview_alias_edit'] = 'Alias'; $PALANG['and_x_more'] = '[og %s til...]'; $PALANG['pOverview_mailbox_username'] = 'Emailadresse'; @@ -81,7 +83,7 @@ $PALANG['pOverview_get_domain'] = 'Domæne'; $PALANG['pOverview_get_aliases'] = 'Alias'; -$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX +$PALANG['pOverview_get_alias_domains'] = 'Domæne aliases'; $PALANG['pOverview_get_mailboxes'] = 'Postbokse'; $PALANG['pOverview_get_quota'] = 'Postboks Kvota (MB)'; $PALANG['pOverview_get_modified'] = 'Senest ændret'; @@ -90,34 +92,34 @@ $PALANG['pDelete_delete_success'] = '%s er slettet.'; $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Kunne ikke fjerne postkassen '; $PALANG['pDelete_domain_error'] = '<span class="error_msg">Dette domæne er ikke dit '; -$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX +$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">Dette domæne er ikke dit '; $PALANG['pDelete_alias_error'] = '<span class="error_msg">Kunne ikke slette aliaset '; -$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX -$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX -$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX -$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX -$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX -$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX -$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX -$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX -$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX -$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX -$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX -$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX +$PALANG['pCreate_alias_domain_welcome'] = 'Spejl adresser fra et domæne til et andet.'; +$PALANG['pCreate_alias_domain_alias'] = 'Alias-domæne'; +$PALANG['pCreate_alias_domain_alias_text'] = 'Domæne som emails kommer fra.'; +$PALANG['pCreate_alias_domain_target'] = 'Modtager-domæne'; +$PALANG['pCreate_alias_domain_target_text'] = 'Domæne hvor emails skal sendes til.'; +$PALANG['pCreate_alias_domain_active'] = 'Aktiv'; +$PALANG['pCreate_alias_domain_button'] = 'Tilføj alias domæne'; +$PALANG['pCreate_alias_domain_error1'] = 'Du har ikke tilladelse til at lave den valgte konfiguration'; +$PALANG['pCreate_alias_domain_error2'] = 'Den valgte konfiguration er ikke korrekt, vælg venligst en anden.'; +$PALANG['pCreate_alias_domain_error3'] = 'Indsætning i databasen fejlede.'; +$PALANG['pCreate_alias_domain_error4'] = 'Alle domænerne har allerede aliases.'; +$PALANG['pCreate_alias_domain_success'] = 'Domæne-alias blev tilføjet alias-tabellen.'; -$PALANG['pCreate_alias_welcome'] = 'Tilføj nyt alias til dit domæne.'; +$PALANG['pCreate_alias_welcome'] = 'Tilføj et nyt alias til domænet.'; $PALANG['pCreate_alias_address'] = 'Alias'; -$PALANG['pCreate_alias_address_text_error1'] = '<br /><span class="error_msg">Aliaset er ikke gyldigt!</span>'; -$PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">Emailadressen eksisterer allerede. Vælg venligst en anden!</span>'; -$PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">Du har nået grænsen for antallet af alias til dit domæne!</span>'; +$PALANG['pCreate_alias_address_text_error1'] = '<br /><span class="error_msg">Aliaset er ikke gyldigt.</span>'; +$PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">Emailadressen eksisterer allerede, vælg venligst en anden.</span>'; +$PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">Du har nået grænsen for antallet af aliases til domænet.</span>'; $PALANG['pCreate_alias_goto'] = 'Modtager'; $PALANG['pCreate_alias_active'] = 'Aktiv'; $PALANG['pCreate_alias_button'] = 'Tilføj alias'; $PALANG['pCreate_alias_goto_text'] = 'Hvor emailen skal videresendes til.'; -$PALANG['pCreate_alias_goto_text_error'] = 'Hvor emailen skal videresendes til.<br /><span class="error_msg">Modtageradressen er ikke gyldig!</span>'; -$PALANG['pCreate_alias_result_error'] = '<span class="error_msg">Kan ikke tilføje aliaset til alias-tabellen!</span>'; -$PALANG['pCreate_alias_result_success'] = 'Aliaset er blevet tilføjet til alias-tabellen!'; -$PALANG['pCreate_alias_catchall_text'] = 'For at tilføje et stjerne-alias, brug en "*" som alias.<br />For domæne til domæne-videresending brug "*@domain.tld" som modtager.'; +$PALANG['pCreate_alias_goto_text_error'] = 'Hvor emailen skal videresendes til.<br /><span class="error_msg">Modtageradressen er ikke gyldig.</span>'; +$PALANG['pCreate_alias_result_error'] = '<span class="error_msg">Kan ikke tilføje aliaset til alias-tabellen.</span>'; +$PALANG['pCreate_alias_result_success'] = 'Aliaset er blevet tilføjet alias-tabellen.'; +$PALANG['pCreate_alias_catchall_text'] = 'For at tilføje et stjerne-alias, brug en "*" som alias.<br />For domæne til domæne-videresending brug "*@domæne.tld" som modtager.'; $PALANG['pEdit_alias_welcome'] = 'Rediger alias.<br />En modtager pr. linje.'; $PALANG['pEdit_alias_address'] = 'Alias'; @@ -127,66 +129,66 @@ $PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Du udfyldte ikke noget i Modtager(e)</span>'; $PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Den tilføjede emailadresse er ikke gyldig: '; $PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Dette domæne tilhører ikke dig: '; -$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX -$PALANG['pEdit_alias_forward_and_store'] = 'Lever email til den lokale postboks.'; -$PALANG['pEdit_alias_forward_only'] = 'Videresend til angiven emailadresse uden lokal kopi.'; +$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Kan ikke ændre alias-domænet.</span>'; +$PALANG['pEdit_alias_forward_and_store'] = 'Aflever email til den lokale postboks.'; +$PALANG['pEdit_alias_forward_only'] = 'Videresend til angivene emailadresse uden lokal kopi.'; $PALANG['pEdit_alias_button'] = 'Ret alias'; -$PALANG['pEdit_alias_result_error'] = '<span class="error_msg">Kan ikke redigere aliaset!</span>'; +$PALANG['pEdit_alias_result_error'] = '<span class="error_msg">Kan ikke redigere aliaset.</span>'; -$PALANG['pCreate_mailbox_welcome'] = 'Tilføj en ny lokal postboks til dit domæne.'; +$PALANG['pCreate_mailbox_welcome'] = 'Tilføj en ny lokal postboks til domænet.'; $PALANG['pCreate_mailbox_username'] = 'Brugernavn'; -$PALANG['pCreate_mailbox_username_text_error1'] = '<br /><span class="error_msg">Emailadressen er ikke gyldig!</span>'; -$PALANG['pCreate_mailbox_username_text_error2'] = '<br /><span class="error_msg">Emailadressen eksisterer allerede. Vælg venligst en anden!</span>'; -$PALANG['pCreate_mailbox_username_text_error3'] = '<br /><span class="error_msg">Du har nået grænsen for antallet af postbokse til dit domæne!</span>'; +$PALANG['pCreate_mailbox_username_text_error1'] = '<br /><span class="error_msg">Emailadressen er ikke gyldig.</span>'; +$PALANG['pCreate_mailbox_username_text_error2'] = '<br /><span class="error_msg">Emailadressen eksisterer allerede. Vælg venligst en anden.</span>'; +$PALANG['pCreate_mailbox_username_text_error3'] = '<br /><span class="error_msg">Du har nået grænsen for antallet af postbokse til domæne.</span>'; $PALANG['pCreate_mailbox_password'] = 'Adgangskode'; $PALANG['pCreate_mailbox_password2'] = 'Adgangskode (igen)'; $PALANG['pCreate_mailbox_password_text'] = 'Adgangskode til POP3/IMAP'; -$PALANG['pCreate_mailbox_password_text_error'] = 'Adgangskode til POP3/IMAP<br /><span class="error_msg">Adgangskoderne er ikke ens!<br />Eller er tomme!</span>'; +$PALANG['pCreate_mailbox_password_text_error'] = 'Adgangskode til POP3/IMAP<br /><span class="error_msg">Adgangskoderne er ikke ens.<br />Eller tomme.</span>'; $PALANG['pCreate_mailbox_name'] = 'Navn'; $PALANG['pCreate_mailbox_name_text'] = 'Fulde navn'; $PALANG['pCreate_mailbox_quota'] = 'Kvota'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; -$PALANG['pCreate_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Den ønskede kvota er for høj!</span>'; +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Den valgte kvota er for høj.</span>'; $PALANG['pCreate_mailbox_active'] = 'Aktiv'; $PALANG['pCreate_mailbox_mail'] = 'Send velkomsthilsen'; $PALANG['pCreate_mailbox_button'] = 'Tilføj postboks'; -$PALANG['pCreate_mailbox_result_error'] = '<span class="error_msg">Kan ikke tilføje postboksen til postboks-tabellen!</span>'; -$PALANG['pCreate_mailbox_result_success'] = 'Postboksen er tilføjet til postboks-tabellen!'; +$PALANG['pCreate_mailbox_result_error'] = '<span class="error_msg">Kan ikke tilføje postboksen til postboks-tabellen.</span>'; +$PALANG['pCreate_mailbox_result_success'] = 'Postboksen er tilføjet til postboks-tabellen.'; $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Postkassen er tilføjet, men ingen (eller kun dele) af de foruddefinerede undermapper kunne oprettes.'; $PALANG['pEdit_mailbox_welcome'] = 'Rediger postboks.'; $PALANG['pEdit_mailbox_username'] = 'Brugernavn'; -$PALANG['pEdit_mailbox_username_error'] = '<span class="error_msg">Kan ikke finde postboksen!</span>'; +$PALANG['pEdit_mailbox_username_error'] = '<span class="error_msg">Kan ikke finde postboksen.</span>'; $PALANG['pEdit_mailbox_password'] = 'Ny adgangskode'; $PALANG['pEdit_mailbox_password2'] = 'Ny adgangskode (igen)'; -$PALANG['pEdit_mailbox_password_text_error'] = '<span class="error_msg">Adgangskoderne er ikke ens!</span>'; +$PALANG['pEdit_mailbox_password_text_error'] = '<span class="error_msg">Adgangskoderne er ikke ens.</span>'; $PALANG['pEdit_mailbox_name'] = 'Navn'; $PALANG['pEdit_mailbox_name_text'] = 'Fulde navn'; $PALANG['pEdit_mailbox_quota'] = 'Kvota'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; -$PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Den ønskede kvota er for høj!</span>'; +$PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Den valgte kvota er for høj.</span>'; $PALANG['pEdit_mailbox_domain_error'] = '<span class="error_msg">Dette domæne er ikke dit: '; $PALANG['pEdit_mailbox_button'] = 'Ret postboks'; -$PALANG['pEdit_mailbox_result_error'] = '<span class="error_msg">Kan ikke ændre adgangskoden!</span>'; +$PALANG['pEdit_mailbox_result_error'] = '<span class="error_msg">Kan ikke ændre adgangskoden.</span>'; -$PALANG['pPassword_welcome'] = 'Ændre din adgangskode.'; +$PALANG['pPassword_welcome'] = 'Ændr din adgangskode.'; $PALANG['pPassword_admin'] = 'Adgangskode'; -$PALANG['pPassword_admin_text_error'] = '<span class="error_msg">Brugernavnet kunne ikke findes!</span>'; +$PALANG['pPassword_admin_text_error'] = '<span class="error_msg">Brugernavnet kunne ikke findes.</span>'; $PALANG['pPassword_password_current'] = 'Nuværende adgangskode'; -$PALANG['pPassword_password_current_text_error'] = '<span class="error_msg">Du glemte at skrive din nuværende adgangskode!</span>'; +$PALANG['pPassword_password_current_text_error'] = '<span class="error_msg">Du glemte at skrive din nuværende adgangskode.</span>'; $PALANG['pPassword_password'] = 'Ny adgangskode'; $PALANG['pPassword_password2'] = 'Ny adgangskode (igen)'; -$PALANG['pPassword_password_text_error'] = '<span class="error_msg">Adgangskoderne er ikke ens!<br />Eller er tomme!</span>'; -$PALANG['pPassword_button'] = 'Ændre adgangskode'; -$PALANG['pPassword_result_error'] = '<span class="error_msg">Kan ikke ændre adgangskoden!</span>'; -$PALANG['pPassword_result_success'] = 'Din adgangskode er ændret!'; +$PALANG['pPassword_password_text_error'] = '<span class="error_msg">Adgangskoderne er ikke ens.<br />Eller tomme.</span>'; +$PALANG['pPassword_button'] = 'Ændr adgangskode'; +$PALANG['pPassword_result_error'] = '<span class="error_msg">Kan ikke ændre adgangskoden.</span>'; +$PALANG['pPassword_result_success'] = 'Din adgangskode er ændret.'; -$PALANG['pEdit_vacation_set'] = 'Ændre / Angiv autosvar'; +$PALANG['pEdit_vacation_set'] = 'Ændr / Angiv autosvar'; $PALANG['pEdit_vacation_remove'] = 'Fjern autosvar'; -$PALANG['pVacation_result_error'] = '<span class="error_msg">Autosvarindstillinger kunne ikke opdateres!</span>'; -$PALANG['pVacation_result_removed'] = 'Autosvar er fjernet!'; -$PALANG['pVacation_result_added'] = 'Autosvar er aktiveret!'; +$PALANG['pVacation_result_error'] = '<span class="error_msg">Indstillingerne til autosvar kunne ikke opdateres.</span>'; +$PALANG['pVacation_result_removed'] = 'Autosvar er fjernet.'; +$PALANG['pVacation_result_added'] = 'Autosvar er aktiveret.'; $PALANG['pViewlog_welcome'] = 'Vis de sidste 10 poster for '; $PALANG['pViewlog_timestamp'] = 'Tidsstempel'; @@ -198,40 +200,40 @@ $PALANG['pViewlog_action_create_mailbox'] = 'tilføj postboks'; $PALANG['pViewlog_action_delete_mailbox'] = 'slet postboks'; $PALANG['pViewlog_action_edit_mailbox'] = 'rediger postboks'; -$PALANG['pViewlog_action_edit_mailbox_state'] = 'ændre postboks aktiv'; +$PALANG['pViewlog_action_edit_mailbox_state'] = 'ændr postboks status'; $PALANG['pViewlog_action_create_alias'] = 'tilføj alias'; -$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX +$PALANG['pViewlog_action_create_alias_domain'] = 'lav domæne-alias'; $PALANG['pViewlog_action_delete_alias'] = 'slet alias'; -$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX +$PALANG['pViewlog_action_delete_alias_domain'] = 'slet domæne-alias'; $PALANG['pViewlog_action_edit_alias'] = 'rediger alias'; -$PALANG['pViewlog_action_edit_alias_state'] = 'ændre alias aktiv'; -$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX -$PALANG['pViewlog_action_edit_password'] = 'ændre adgangskode'; +$PALANG['pViewlog_action_edit_alias_state'] = 'ændr alias status'; +$PALANG['pViewlog_action_edit_alias_domain_state'] = 'ændr domæne-alias status'; +$PALANG['pViewlog_action_edit_password'] = 'ændr adgangskode'; $PALANG['pViewlog_button'] = 'Vis'; -$PALANG['pViewlog_result_error'] = '<span class="error_msg">Kan ikke finde loggen!</span>'; +$PALANG['pViewlog_result_error'] = '<span class="error_msg">Loggen kan ikke findes.</span>'; $PALANG['pSendmail_welcome'] = 'Send en email.'; $PALANG['pSendmail_admin'] = 'Afsender'; $PALANG['pSendmail_to'] = 'Modtager'; -$PALANG['pSendmail_to_text_error'] = '<span class="error_msg">Modtager er tom eller en ugyldig emailadresse!</span>'; +$PALANG['pSendmail_to_text_error'] = '<span class="error_msg">Modtager er tom, eller har en ugyldig emailadresse.</span>'; $PALANG['pSendmail_subject'] = 'Emne'; $PALANG['pSendmail_subject_text'] = 'Velkommen'; $PALANG['pSendmail_body'] = 'Meddelelse'; $PALANG['pSendmail_button'] = 'Send email'; -$PALANG['pSendmail_result_error'] = '<span class="error_msg">Kan ikke sende email!</span>'; -$PALANG['pSendmail_result_success'] = 'Email sendt!'; +$PALANG['pSendmail_result_error'] = '<span class="error_msg">Kan ikke sende email.</span>'; +$PALANG['pSendmail_result_success'] = 'Email sendt.'; $PALANG['pAdminMenu_list_admin'] = 'Administratorliste'; -$PALANG['pAdminMenu_list_domain'] = 'Domæneliste'; +$PALANG['pAdminMenu_list_domain'] = 'Domæne-liste'; $PALANG['pAdminMenu_list_virtual'] = 'Virtuel Liste'; $PALANG['pAdminMenu_viewlog'] = 'Vis Log'; $PALANG['pAdminMenu_backup'] = 'Backup'; -$PALANG['pAdminMenu_create_domain_admins'] = 'Domæneadministrator'; +$PALANG['pAdminMenu_create_domain_admins'] = 'Domæne-administrator'; $PALANG['pAdminMenu_create_admin'] = 'Ny administrator'; $PALANG['pAdminMenu_create_domain'] = 'Nyt domæne'; -$PALANG['pAdminMenu_create_alias'] = 'Tilføj alias'; -$PALANG['pAdminMenu_create_mailbox'] = 'Tilføj postboks'; +$PALANG['pAdminMenu_create_alias'] = 'Nyt alias'; +$PALANG['pAdminMenu_create_mailbox'] = 'Ny postboks'; $PALANG['pAdminList_admin_domain'] = 'Domæne'; $PALANG['pAdminList_admin_username'] = 'Administrator'; @@ -243,7 +245,7 @@ $PALANG['pAdminList_domain_description'] = 'Beskrivelse'; $PALANG['pAdminList_domain_aliases'] = 'Alias'; $PALANG['pAdminList_domain_mailboxes'] = 'Postbokse'; -$PALANG['pAdminList_domain_maxquota'] = 'Maks. kvota (MB)'; +$PALANG['pAdminList_domain_maxquota'] = 'Maksimal kvota (MB)'; $PALANG['pAdminList_domain_transport'] = 'Transport'; $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; $PALANG['pAdminList_domain_modified'] = 'Senest ændret'; @@ -264,108 +266,108 @@ $PALANG['pAdminCreate_domain_welcome'] = 'Tilføj et nyt domæne'; $PALANG['pAdminCreate_domain_domain'] = 'Domæne'; -$PALANG['pAdminCreate_domain_domain_text_error'] = '<span class="error_msg">Domænet eksisterer allerede!</span>'; -$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">Domænet er ugyldigt!</span>'; +$PALANG['pAdminCreate_domain_domain_text_error'] = '<span class="error_msg">Domænet eksisterer allerede.</span>'; +$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">Domænet er ikke gyldigt.</span>'; $PALANG['pAdminCreate_domain_description'] = 'Beskrivelse'; $PALANG['pAdminCreate_domain_aliases'] = 'Alias'; -$PALANG['pAdminCreate_domain_aliases_text'] = '-1 = annuller | 0 = uendeligt'; +$PALANG['pAdminCreate_domain_aliases_text'] = '-1 = annullér | 0 = uendeligt'; $PALANG['pAdminCreate_domain_mailboxes'] = 'Postbokse'; -$PALANG['pAdminCreate_domain_mailboxes_text'] = '-1 = annuller | 0 = uendeligt'; -$PALANG['pAdminCreate_domain_maxquota'] = 'Maks. kvota'; -$PALANG['pAdminCreate_domain_maxquota_text'] = 'MB<br /> -1 = annuller | 0 = uendeligt'; +$PALANG['pAdminCreate_domain_mailboxes_text'] = '-1 = annullér | 0 = uendeligt'; +$PALANG['pAdminCreate_domain_maxquota'] = 'Maksimal kvota'; +$PALANG['pAdminCreate_domain_maxquota_text'] = 'MB<br /> -1 = annullér | 0 = uendeligt'; $PALANG['pAdminCreate_domain_transport'] = 'Transport'; -$PALANG['pAdminCreate_domain_transport_text'] = 'Præciser transport'; -$PALANG['pAdminCreate_domain_defaultaliases'] = 'Tilføj standard alias'; +$PALANG['pAdminCreate_domain_transport_text'] = 'Præcisér transport'; +$PALANG['pAdminCreate_domain_defaultaliases'] = 'Tilføj standard alias(es)'; $PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; $PALANG['pAdminCreate_domain_backupmx'] = 'Mailserveren er backup MX'; $PALANG['pAdminCreate_domain_button'] = 'Tilføj domæne'; -$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Kan ikke tilføje domæne!</span>'; -$PALANG['pAdminCreate_domain_result_success'] = 'Domænet er tilføjet!'; -$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX +$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Kan ikke tilføje domænet.</span>'; +$PALANG['pAdminCreate_domain_result_success'] = 'Domænet er tilføjet.'; +$PALANG['pAdminDelete_admin_error'] = 'Administratoren kunne ikke slettes.'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Domænet kunne ikke slettes!</span>'; -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX +$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Domænet kunne ikke slettes.</span>'; +$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Domæne-aliaset kunne ikke slettes.</span>'; -$PALANG['pAdminEdit_domain_welcome'] = 'Rediger et domæne'; +$PALANG['pAdminEdit_domain_welcome'] = 'Redigér et domæne'; $PALANG['pAdminEdit_domain_domain'] = 'Domæne'; $PALANG['pAdminEdit_domain_description'] = 'Beskrivelse'; $PALANG['pAdminEdit_domain_aliases'] = 'Alias'; -$PALANG['pAdminEdit_domain_aliases_text'] = '-1 = annuller | 0 = uendeligt'; +$PALANG['pAdminEdit_domain_aliases_text'] = '-1 = annullér | 0 = uendeligt'; $PALANG['pAdminEdit_domain_mailboxes'] = 'Postbokse'; -$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = annuller | 0 = uendeligt'; -$PALANG['pAdminEdit_domain_maxquota'] = 'Maks. kvota'; -$PALANG['pAdminEdit_domain_maxquota_text'] = 'MB<br /> -1 = annuller | 0 = uendeligt'; +$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = annullér | 0 = uendeligt'; +$PALANG['pAdminEdit_domain_maxquota'] = 'Maksimal kvota'; +$PALANG['pAdminEdit_domain_maxquota_text'] = 'MB<br /> -1 = annullér | 0 = uendeligt'; $PALANG['pAdminEdit_domain_transport'] = 'Transport'; -$PALANG['pAdminEdit_domain_transport_text'] = 'Præciser transport'; +$PALANG['pAdminEdit_domain_transport_text'] = 'Præcisér transport'; $PALANG['pAdminEdit_domain_backupmx'] = 'Mailserveren er backup MX'; $PALANG['pAdminEdit_domain_active'] = 'Aktiv'; $PALANG['pAdminEdit_domain_button'] = 'Rediger domæne'; -$PALANG['pAdminEdit_domain_result_error'] = '<span class="error_msg">Kan ikke rette domæne!</span>'; +$PALANG['pAdminEdit_domain_result_error'] = '<span class="error_msg">Kan ikke rette domænet.</span>'; -$PALANG['pAdminCreate_admin_welcome'] = 'Tilføj ny domæneadministrator'; +$PALANG['pAdminCreate_admin_welcome'] = 'Tilføj en ny domæneadministrator'; $PALANG['pAdminCreate_admin_username'] = 'Administrator'; $PALANG['pAdminCreate_admin_username_text'] = 'Emailadresse'; -$PALANG['pAdminCreate_admin_username_text_error1'] = 'Emailadresse<br /><span class="error_msg">Administrator er ikke en gyldig emailadresse!</span>'; +$PALANG['pAdminCreate_admin_username_text_error1'] = 'Emailadresse<br /><span class="error_msg">Administrator er ikke en gyldig emailadresse.</span>'; $PALANG['pAdminCreate_admin_username_text_error2'] = 'Emailadresse<br /><span class="error_msg">Aministratoren findes allerede eller er ikke gyldig</span>'; $PALANG['pAdminCreate_admin_password'] = 'Adgangskode'; $PALANG['pAdminCreate_admin_password2'] = 'Adgangskode (igen)'; -$PALANG['pAdminCreate_admin_password_text_error'] = '<span class="error_msg">Adgangskoderne er ikke ens!<br />Eller er tomme!</span>'; +$PALANG['pAdminCreate_admin_password_text_error'] = '<span class="error_msg">Adgangskoderne er ikke ens.<br />Eller tomme.</span>'; $PALANG['pAdminCreate_admin_button'] = 'Tilføj administrator'; -$PALANG['pAdminCreate_admin_result_error'] = '<span class="error_msg">Kan ikke tilføje administrator!</span>'; -$PALANG['pAdminCreate_admin_result_success'] = 'Administrator er tilføjet!'; +$PALANG['pAdminCreate_admin_result_error'] = '<span class="error_msg">Administratoren kunne ikke tilføjes.</span>'; +$PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er tilføjet.'; $PALANG['pAdminCreate_admin_address'] = 'Domæne'; -$PALANG['pAdminEdit_admin_welcome'] = 'Rediger en domæneadministrator'; +$PALANG['pAdminEdit_admin_welcome'] = 'Redigér en domæneadministrator'; $PALANG['pAdminEdit_admin_username'] = 'Administrator'; $PALANG['pAdminEdit_admin_password'] = 'Adgangskode'; $PALANG['pAdminEdit_admin_password2'] = 'Adgangskode (igen)'; -$PALANG['pAdminEdit_admin_password_text_error'] = '<span class="error_msg">Adgangskoderne er ikke ens!<br />Eller er tomme!</span>'; +$PALANG['pAdminEdit_admin_password_text_error'] = '<span class="error_msg">Adgangskoderne er ikke ens.<br />Eller tomme.</span>'; $PALANG['pAdminEdit_admin_active'] = 'Aktiv'; $PALANG['pAdminEdit_admin_super_admin'] = 'Superadministrator'; -$PALANG['pAdminEdit_admin_button'] = 'Rediger administrator'; -$PALANG['pAdminEdit_admin_result_error'] = '<span class="error_msg">Kan ikke rette administrator!</span>'; -$PALANG['pAdminEdit_admin_result_success'] = 'Administrator er rettet!'; +$PALANG['pAdminEdit_admin_button'] = 'Redigér administrator'; +$PALANG['pAdminEdit_admin_result_error'] = '<span class="error_msg">Kunne ikke rette administrator.</span>'; +$PALANG['pAdminEdit_admin_result_success'] = 'Administrator er rettet.'; -$PALANG['pUsersLogin_welcome'] = 'Postboksbruger: Login for at ændre adgangskode og videresending.'; +$PALANG['pUsersLogin_welcome'] = 'Postboksbruger: Log ind for at ændre adgangskode og videresending.'; $PALANG['pUsersLogin_username'] = 'Brugernavn (email)'; $PALANG['pUsersLogin_password'] = 'Adgangskode'; $PALANG['pUsersLogin_button'] = 'Log ind'; -$PALANG['pUsersLogin_username_incorrect'] = 'Dit brugernavn er forkert. Tjek at du bruger din emailadresse som brugernavn!'; -$PALANG['pUsersLogin_password_incorrect'] = 'Din adgangskode er ikke korrekt!'; +$PALANG['pUsersLogin_username_incorrect'] = 'Dit brugernavn er forkert. Tjek at du bruger din emailadresse som brugernavn.'; +$PALANG['pUsersLogin_password_incorrect'] = 'Din adgangskode er ikke korrekt.'; $PALANG['pUsersMenu_vacation'] = 'Autosvar'; -$PALANG['pUsersMenu_edit_alias'] = 'Rediger videresending'; -$PALANG['pUsersMenu_password'] = 'Ændre adgangskode'; +$PALANG['pUsersMenu_edit_alias'] = 'Redigér videresending'; +$PALANG['pUsersMenu_password'] = 'Ændr adgangskode'; $PALANG['pUsersMain_vacation'] = 'Tilføj en "ikke tilstede" besked eller et autosvar til din emailadresse.'; $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' er AKTIVERET, klik \'' . $PALANG['pUsersMenu_vacation'] . '\' for at ' . $PALANG['edit'] . '/fjerne'; -$PALANG['pUsersMain_edit_alias'] = 'Ændre levering/videresending af email.'; -$PALANG['pUsersMain_password'] = 'Ændre din nuværende adgangskode.'; +$PALANG['pUsersMain_edit_alias'] = 'Ændr levering/videresending af email.'; +$PALANG['pUsersMain_password'] = 'Ændr din nuværende adgangskode.'; $PALANG['pUsersVacation_welcome'] = 'Autosvar.'; -$PALANG['pUsersVacation_welcome_text'] = 'Du har allerede et autosvar indstillet!'; +$PALANG['pUsersVacation_welcome_text'] = 'Du har allerede autosvar indstillet!'; $PALANG['pUsersVacation_subject'] = 'Emne'; $PALANG['pUsersVacation_subject_text'] = 'Ikke tilstede'; -$PALANG['pUsersVacation_body'] = 'Meddelelse'; # XXX text changed to 'Message' +$PALANG['pUsersVacation_body'] = 'Meddelelse'; $PALANG['pUsersVacation_body_text'] = <<<EOM Jeg er ikke tilstede i perioden <dato> til <dato>. I nødstilfælde kan <kontaktperson> kontaktes. EOM; $PALANG['pUsersVacation_button_away'] = 'Tager afsted'; $PALANG['pUsersVacation_button_back'] = 'Kommer tilbage'; -$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Kan ikke opdatere indstillinger for dit autosvar!</span>'; -$PALANG['pUsersVacation_result_success'] = 'Dit autosvar er fjernet!'; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX +$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Kan ikke opdatere indstillingerne for autosvar.</span>'; +$PALANG['pUsersVacation_result_success'] = 'Autosvar fjernet.'; +$PALANG['pUsersVacation_activefrom'] = 'Aktiv fra'; +$PALANG['pUsersVacation_activeuntil'] = 'Aktiv til'; $PALANG['pCreate_dbLog_createmailbox'] = 'tilføj postboks'; $PALANG['pCreate_dbLog_createalias'] = 'tilføj alias'; $PALANG['pDelete_dbLog_deletealias'] = 'slet alias'; $PALANG['pDelete_dbLog_deletemailbox'] = 'slet postboks'; -$PALANG['pEdit_dbLog_editactive'] = 'ændre aktivtilstand'; -$PALANG['pEdit_dbLog_editalias'] = 'rediger alias'; -$PALANG['pEdit_dbLog_editmailbox'] = 'rediger postboks'; +$PALANG['pEdit_dbLog_editactive'] = 'ændr aktivtilstand'; +$PALANG['pEdit_dbLog_editalias'] = 'redigér alias'; +$PALANG['pEdit_dbLog_editmailbox'] = 'redigér postboks'; $PALANG['pSearch'] = 'søg'; $PALANG['pSearch_welcome'] = 'Søg efter: '; @@ -380,26 +382,26 @@ $PALANG['pBroadcast_send'] = 'Send meddelelse'; $PALANG['pBroadcast_success'] = 'Din meddelelse er rundsendt.'; $PALANG['pAdminMenu_broadcast_message'] = 'Rundsend meddelse'; -$PALANG['pBroadcast_error_empty'] = 'Felterne Dit navn, Emne og Meddelelse skal udfyldes!'; +$PALANG['pBroadcast_error_empty'] = 'Felterne "Dit navn", "Emne" og "Meddelelse" skal alle udfyldes.'; $PALANG['pStatus_undeliverable'] = 'kan måske ikke leveres '; $PALANG['pStatus_custom'] = 'Leveres til '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; -$PALANG['pPasswordTooShort'] = "Adgangskoden er for kort - mindst %s tegn kræves"; -$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX -$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX -$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX +$PALANG['pPasswordTooShort'] = "Adgangskoden er for kort. Der kræves mindst %s tegn"; +$PALANG['pInvalidDomainRegex'] = "Ugyldigt domæne-navn %s. Fejlede regulært udtryks-tjek"; +$PALANG['pInvalidDomainDNS'] = "Ugyldigt domæne %s, og/eller ikke fundet i DNS"; +$PALANG['pInvalidMailRegex'] = "Ugyldig emailadresse. Fejlede regulært udtryks-tjek"; $PALANG['pFetchmail_welcome'] = 'Hent post for:'; $PALANG['pFetchmail_new_entry'] = 'Ny regel'; -$PALANG['pFetchmail_database_save_error'] = 'Reglen kunne ikke gemmes in databasen!'; +$PALANG['pFetchmail_database_save_error'] = 'Reglen kunne ikke gemmes i databasen.'; $PALANG['pFetchmail_database_save_success'] = 'Reglen er gemt i databasen.'; -$PALANG['pFetchmail_error_invalid_id'] = 'Reglen med ID %s eksisterer ikke!'; -$PALANG['pFetchmail_invalid_mailbox'] = 'Ugyldig postboks!'; -$PALANG['pFetchmail_server_missing'] = 'Angiv navnet på fjernserveren!'; -$PALANG['pFetchmail_user_missing'] = 'Angiv brugernavnet til fjernserveren!'; -$PALANG['pFetchmail_password_missing'] = 'Angiv adgangskoden til fjernserveren!'; +$PALANG['pFetchmail_error_invalid_id'] = "Reglen med ID %s eksisterer ikke."; +$PALANG['pFetchmail_invalid_mailbox'] = 'Ugyldig postboks.'; +$PALANG['pFetchmail_server_missing'] = 'Angiv navnet på fjernserveren.'; +$PALANG['pFetchmail_user_missing'] = 'Angiv brugernavnet til fjernserveren.'; +$PALANG['pFetchmail_password_missing'] = 'Angiv adgangskoden til fjernserveren.'; $PALANG['pFetchmail_field_id'] = 'ID'; $PALANG['pFetchmail_field_mailbox'] = 'Postboks'; $PALANG['pFetchmail_field_src_server'] = 'Server'; @@ -411,7 +413,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Hent alle'; $PALANG['pFetchmail_field_keep'] = 'Behold'; $PALANG['pFetchmail_field_protocol'] = 'Protokol'; -$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL aktiv'; $PALANG['pFetchmail_field_extra_options'] = 'Ekstra tilvalg'; $PALANG['pFetchmail_field_mda'] = 'MDA (Mail Delivery Agent)'; $PALANG['pFetchmail_field_date'] = 'Dato'; @@ -420,15 +422,15 @@ $PALANG['pFetchmail_desc_mailbox'] = 'Lokal postboks'; $PALANG['pFetchmail_desc_src_server'] = 'Fjernserver'; $PALANG['pFetchmail_desc_src_auth'] = 'Somregel \'password\''; # Translators: Please do NOT translate 'password' here -$PALANG['pFetchmail_desc_src_user'] = 'Ekstern brugernavn'; +$PALANG['pFetchmail_desc_src_user'] = 'Eksternt brugernavn'; $PALANG['pFetchmail_desc_src_password'] = 'Ekstern adgangskode'; $PALANG['pFetchmail_desc_src_folder'] = 'Ekstern mappe'; -$PALANG['pFetchmail_desc_poll_time'] = 'Prøv hver ... minut'; -$PALANG['pFetchmail_desc_fetchall'] = 'Hent både gamle (sete) og nye beskeder'; +$PALANG['pFetchmail_desc_poll_time'] = 'Prøv hvert ... minut'; +$PALANG['pFetchmail_desc_fetchall'] = 'Hent både læste og nye beskeder'; $PALANG['pFetchmail_desc_keep'] = 'Gem hentede beskeder på den eksterne postserver'; $PALANG['pFetchmail_desc_protocol'] = 'Brug protokol'; -$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX -$PALANG['pFetchmail_desc_extra_options'] = 'Ekstra fetchmail flag'; +$PALANG['pFetchmail_desc_usessl'] = 'SSL-kryptering'; +$PALANG['pFetchmail_desc_extra_options'] = 'Ekstra flag til fetchmail'; $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; $PALANG['pFetchmail_desc_date'] = 'Dato for seneste prøve/konfigurationsændring'; $PALANG['pFetchmail_desc_returned_text'] = 'Tekstbesked fra seneste prøve'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2015-10-02 17:48:44
|
Revision: 1810 http://sourceforge.net/p/postfixadmin/code/1810 Author: christian_boltz Date: 2015-10-02 17:48:42 +0000 (Fri, 02 Oct 2015) Log Message: ----------- functions.inc.php: - gen_show_status(): escape mail addresses in query. Fixes https://sourceforge.net/p/postfixadmin/bugs/356/ (mostly - the edit/delete/... links in list-virtual are double-escaped) In theory this could allow SQL injection, in practise the mail address regex limits this issue to a DOS (creating a mail address with ' caused an invalid query that broke list-virtual) Modified Paths: -------------- branches/postfixadmin-2.3/CHANGELOG.TXT branches/postfixadmin-2.3/functions.inc.php Modified: branches/postfixadmin-2.3/CHANGELOG.TXT =================================================================== --- branches/postfixadmin-2.3/CHANGELOG.TXT 2015-10-02 17:45:16 UTC (rev 1809) +++ branches/postfixadmin-2.3/CHANGELOG.TXT 2015-10-02 17:48:42 UTC (rev 1810) @@ -15,6 +15,7 @@ - fix query to enable/disable alias in edit-mailbox for PostgreSQL (#311) - don't prefill username in users/ login on failed logins - fixes (probably harmless) XSS + - fix show_gen_status() to properly escape mail addresses in query (#356) - allow MariaDB in Debian package dependencies Version 2.3.7 - 2014/02/20 - SVN r1651 (postfixadmin-2.3 branch) Modified: branches/postfixadmin-2.3/functions.inc.php =================================================================== --- branches/postfixadmin-2.3/functions.inc.php 2015-10-02 17:45:16 UTC (rev 1809) +++ branches/postfixadmin-2.3/functions.inc.php 2015-10-02 17:48:42 UTC (rev 1810) @@ -2201,9 +2201,9 @@ if (!empty($CONF['recipient_delimiter'])) { $delimiter = preg_quote($CONF['recipient_delimiter'], "/"); $stat_delimiter = preg_replace('/' .$delimiter. '[^' .$delimiter. ']*@/', "@", $g); - $stat_delimiter = "OR address = '$stat_delimiter'"; + $stat_delimiter = "OR address = '" . escape_string($stat_delimiter) . "'"; } - $stat_result = db_query ("SELECT address FROM $table_alias WHERE address = '$g' OR address = '$stat_catchall' $stat_delimiter"); + $stat_result = db_query ("SELECT address FROM $table_alias WHERE address = '" . escape_string($g) . "' OR address = '" . escape_string($stat_catchall) . "' $stat_delimiter"); if ($stat_result['rows'] == 0) { $stat_ok = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2015-10-07 11:08:24
|
Revision: 1814 http://sourceforge.net/p/postfixadmin/code/1814 Author: christian_boltz Date: 2015-10-07 11:08:22 +0000 (Wed, 07 Oct 2015) Log Message: ----------- update changelog date and revision for the 2.3.8 release Modified Paths: -------------- branches/postfixadmin-2.3/CHANGELOG.TXT branches/postfixadmin-2.3/debian/changelog Modified: branches/postfixadmin-2.3/CHANGELOG.TXT =================================================================== --- branches/postfixadmin-2.3/CHANGELOG.TXT 2015-10-03 09:40:37 UTC (rev 1813) +++ branches/postfixadmin-2.3/CHANGELOG.TXT 2015-10-07 11:08:22 UTC (rev 1814) @@ -10,7 +10,7 @@ # Last update: # $Id$ -Version 2.3.8 - 2015/09/29 - SVN r1808 (postfixadmin-2.3 branch) +Version 2.3.8 - 2015/10/07 - SVN r1814 (postfixadmin-2.3 branch) ---------------------------------------------------------------- - fix query to enable/disable alias in edit-mailbox for PostgreSQL (#311) - don't prefill username in users/ login on failed logins - fixes (probably Modified: branches/postfixadmin-2.3/debian/changelog =================================================================== --- branches/postfixadmin-2.3/debian/changelog 2015-10-03 09:40:37 UTC (rev 1813) +++ branches/postfixadmin-2.3/debian/changelog 2015-10-07 11:08:22 UTC (rev 1814) @@ -3,7 +3,7 @@ * New upstream release (v2.3.8) * update dependencies to allow mariadb as database - -- David Goodwin (PalePurple) <da...@pa...> Tue, 29 Sep 2015 09:30:00 +0100 + -- David Goodwin (PalePurple) <da...@pa...> Tue, 7 Oct 2015 13:05:00 +0100 postfixadmin (2.3.7-1) unstable; urgency=low This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2010-08-22 21:41:37
|
Revision: 858 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=858&view=rev Author: christian_boltz Date: 2010-08-22 21:41:31 +0000 (Sun, 22 Aug 2010) Log Message: ----------- CHANGELOG.TXT: - changelog for 2.3.2 functions.inc.php: - updated version number to 2.3.2 Modified Paths: -------------- branches/postfixadmin-2.3/CHANGELOG.TXT branches/postfixadmin-2.3/functions.inc.php Modified: branches/postfixadmin-2.3/CHANGELOG.TXT =================================================================== --- branches/postfixadmin-2.3/CHANGELOG.TXT 2010-08-22 12:18:43 UTC (rev 857) +++ branches/postfixadmin-2.3/CHANGELOG.TXT 2010-08-22 21:41:31 UTC (rev 858) @@ -10,6 +10,20 @@ # Last update: # $Id$ +Version 2.3.2 - 2010/08/23 - SVN r858 (postfixadmin-2.3 branch) +--------------------------------------------------------------- + + - SUMMARY: PostfixAdmin 2.3.2 is a bugfix-only release for Postfix Admin 2.3.1 + - SECURITY: attackers could find out if a admin exists (login pre-filled the + username after "only" a wrong password was entered) + - alias targets in users/edit-alias are now validated + - invalid alias targets in users/edit-alias are shown to the user again + instead of dropping them + - fix dovecot:* password encryption (was broken in 2.3.1) + - fix displaying used quota for dovecot <= 1.1 (was broken in 2.3.1) + - when deleting a domain that is an alias domain (on the "from" side), the + alias domain is deleted + Version 2.3.1 - 2010/07/09 - SVN r847 (postfixadmin-2.3 branch) --------------------------------------------------------------- Modified: branches/postfixadmin-2.3/functions.inc.php =================================================================== --- branches/postfixadmin-2.3/functions.inc.php 2010-08-22 12:18:43 UTC (rev 857) +++ branches/postfixadmin-2.3/functions.inc.php 2010-08-22 21:41:31 UTC (rev 858) @@ -16,7 +16,7 @@ * Contains re-usable code. */ -$version = '2.3.1'; +$version = '2.3.2'; /** * check_session This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2010-08-23 22:06:49
|
Revision: 860 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=860&view=rev Author: christian_boltz Date: 2010-08-23 22:06:43 +0000 (Mon, 23 Aug 2010) Log Message: ----------- list-domain.php: - fix sql injection in list-domain (only exploitable by superadmins) found by sezjan, http://sourceforge.net/projects/postfixadmin/forums/forum/676076/topic/3822301 This is a reason to re-create the 2.3.2 release, therefore... CHANGELOG.TXT: - change SVN release number for 2.3.2 Modified Paths: -------------- branches/postfixadmin-2.3/CHANGELOG.TXT branches/postfixadmin-2.3/list-domain.php Modified: branches/postfixadmin-2.3/CHANGELOG.TXT =================================================================== --- branches/postfixadmin-2.3/CHANGELOG.TXT 2010-08-23 10:25:17 UTC (rev 859) +++ branches/postfixadmin-2.3/CHANGELOG.TXT 2010-08-23 22:06:43 UTC (rev 860) @@ -10,12 +10,13 @@ # Last update: # $Id$ -Version 2.3.2 - 2010/08/23 - SVN r858 (postfixadmin-2.3 branch) +Version 2.3.2 - 2010/08/24 - SVN r860 (postfixadmin-2.3 branch) --------------------------------------------------------------- - SUMMARY: PostfixAdmin 2.3.2 is a bugfix-only release for Postfix Admin 2.3.1 - SECURITY: attackers could find out if a admin exists (login pre-filled the username after "only" a wrong password was entered) + - SECURITY: fix sql injection in list-domain (only exploitable by superadmins) - alias targets in users/edit-alias are now validated - invalid alias targets in users/edit-alias are shown to the user again instead of dropping them Modified: branches/postfixadmin-2.3/list-domain.php =================================================================== --- branches/postfixadmin-2.3/list-domain.php 2010-08-23 10:25:17 UTC (rev 859) +++ branches/postfixadmin-2.3/list-domain.php 2010-08-23 22:06:43 UTC (rev 860) @@ -32,7 +32,7 @@ if (authentication_has_role('global-admin')) { $list_admins = list_admins (); $is_superadmin = 1; - $fUsername = safepost('fUsername', safeget('username')); # prefer POST over GET variable + $fUsername = escape_string(safepost('fUsername', safeget('username'))); # prefer POST over GET variable if ($fUsername != "") $admin_properties = get_admin_properties($fUsername); } else { $list_admins = array(authentication_get_username()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2010-12-15 23:41:48
|
Revision: 893 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=893&view=rev Author: christian_boltz Date: 2010-12-15 23:41:40 +0000 (Wed, 15 Dec 2010) Log Message: ----------- Backport of various fixes from trunk to the 2.3 branch - list-virtual: fix displaying of 'modified' column for aliases when using postgres - replaced deprecated split() with preg_split() or explode() - functions.inc.php: better error messages when database functions are missing - create domain: fixed typo in variable name that broke the default value for default aliases - create domain: backup MX checkbox is now XHTML compliant - vacation.pl logged literal $variable instead of the variable content at two places - POSTFIX_CONF.txt: fixed filename for quota map - config.inc.php: removed double $CONF['database_prefix'] - config.inc.php: fixed comments about domain_post* script parameters - CHANGELOG.TXT: add new section for 2.3.3, include all the above Modified Paths: -------------- branches/postfixadmin-2.3/CHANGELOG.TXT branches/postfixadmin-2.3/DOCUMENTS/POSTFIX_CONF.txt branches/postfixadmin-2.3/VIRTUAL_VACATION/vacation.pl branches/postfixadmin-2.3/config.inc.php branches/postfixadmin-2.3/create-domain.php branches/postfixadmin-2.3/functions.inc.php branches/postfixadmin-2.3/list-virtual.php branches/postfixadmin-2.3/templates/admin_create-domain.php Modified: branches/postfixadmin-2.3/CHANGELOG.TXT =================================================================== --- branches/postfixadmin-2.3/CHANGELOG.TXT 2010-12-15 23:17:08 UTC (rev 892) +++ branches/postfixadmin-2.3/CHANGELOG.TXT 2010-12-15 23:41:40 UTC (rev 893) @@ -10,6 +10,22 @@ # Last update: # $Id$ +Version 2.3.3 - 2010/**/** - SVN r*** (postfixadmin-2.3 branch) +--------------------------------------------------------------- + + - list-virtual: fix displaying of 'modified' column for aliases when using + postgres + - replaced deprecated split() with preg_split() or explode() + - functions.inc.php: better error messages when database functions are missing + - create domain: fixed typo in variable name that broke the default value for + default aliases + - create domain: backup MX checkbox is now XHTML compliant + - vacation.pl logged literal $variable instead of the variable content at two + places + - POSTFIX_CONF.txt: fixed filename for quota map + - config.inc.php: removed double $CONF['database_prefix'] + - config.inc.php: fixed comments about domain_post* script parameters + Version 2.3.2 - 2010/08/24 - SVN r860 (postfixadmin-2.3 branch) --------------------------------------------------------------- Modified: branches/postfixadmin-2.3/DOCUMENTS/POSTFIX_CONF.txt =================================================================== --- branches/postfixadmin-2.3/DOCUMENTS/POSTFIX_CONF.txt 2010-12-15 23:17:08 UTC (rev 892) +++ branches/postfixadmin-2.3/DOCUMENTS/POSTFIX_CONF.txt 2010-12-15 23:41:40 UTC (rev 893) @@ -102,7 +102,7 @@ # For quota support -mysql-virtual-mailbox-limit-maps.cf: +mysql_virtual_mailbox_limit_maps.cf: user = postfix password = password hosts = localhost Modified: branches/postfixadmin-2.3/VIRTUAL_VACATION/vacation.pl =================================================================== --- branches/postfixadmin-2.3/VIRTUAL_VACATION/vacation.pl 2010-12-15 23:17:08 UTC (rev 892) +++ branches/postfixadmin-2.3/VIRTUAL_VACATION/vacation.pl 2010-12-15 23:41:40 UTC (rev 893) @@ -324,12 +324,12 @@ # Recipient has vacation if ($rv == 1) { $realemail = $email; - $logger->debug("Found '\$email'\ has vacation active"); + $logger->debug("Found '$email' has vacation active"); } else { my $vemail = $email; $vemail =~ s/\@/#/g; $vemail = $vemail . "\@" . $vacation_domain; - $logger->debug("Looking for alias records that \'$email\' resolves to with vacation turned on"); + $logger->debug("Looking for alias records that '$email' resolves to with vacation turned on"); $query = qq{SELECT goto FROM alias WHERE address=? AND (goto LIKE ? OR goto LIKE ? OR goto LIKE ? OR goto = ?)}; $stm = $dbh->prepare($query) or panic_prepare($query); $stm->execute($email,"$vemail,%","%,$vemail","%,$vemail,%", "$vemail") or panic_execute($query,"address='$email'"); Modified: branches/postfixadmin-2.3/config.inc.php =================================================================== --- branches/postfixadmin-2.3/config.inc.php 2010-12-15 23:17:08 UTC (rev 892) +++ branches/postfixadmin-2.3/config.inc.php 2010-12-15 23:41:40 UTC (rev 893) @@ -51,7 +51,6 @@ $CONF['database_user'] = 'postfix'; $CONF['database_password'] = 'postfixadmin'; $CONF['database_name'] = 'postfix'; -$CONF['database_prefix'] = ''; // If you need to specify a different port for a MYSQL database connection, use e.g. // $CONF['database_host'] = '172.30.33.66:3308'; // If you need to specify a different port for POSTGRESQL database connection @@ -368,7 +367,7 @@ // Note that this may fail if PHP is run in "safe mode", or if // operating system features (such as SELinux) or limitations // prevent the web-server from executing external scripts. -// Parameters: (1) username +// Parameters: (1) domain //$CONF['domain_postcreation_script']='sudo -u courier /usr/local/bin/postfixadmin-domain-postcreation.sh'; // Optional: @@ -376,7 +375,7 @@ // Note that this may fail if PHP is run in "safe mode", or if // operating system features (such as SELinux) or limitations // prevent the web-server from executing external scripts. -// Parameters: (1) username +// Parameters: (1) domain // $CONF['domain_postdeletion_script']='sudo -u courier /usr/local/bin/postfixadmin-domain-postdeletion.sh'; // Optional: Modified: branches/postfixadmin-2.3/create-domain.php =================================================================== --- branches/postfixadmin-2.3/create-domain.php 2010-12-15 23:17:08 UTC (rev 892) +++ branches/postfixadmin-2.3/create-domain.php 2010-12-15 23:41:40 UTC (rev 893) @@ -78,7 +78,7 @@ $tAliases = $fAliases; $tMaxquota = $fMaxquota; $tMailboxes = $fMailboxes; - $tDefaultAliases = $fDefaultaliases; + $tDefaultaliases = $fDefaultaliases; $tBackupmx = $fBackupmx; } Modified: branches/postfixadmin-2.3/functions.inc.php =================================================================== --- branches/postfixadmin-2.3/functions.inc.php 2010-12-15 23:17:08 UTC (rev 892) +++ branches/postfixadmin-2.3/functions.inc.php 2010-12-15 23:41:40 UTC (rev 893) @@ -1183,7 +1183,7 @@ $salt = substr(create_salt(), 0, 2); # courier-authlib supports only two-character salts if(preg_match('/^{.*}/', $pw_db)) { // we have a flavor in the db -> use it instead of default flavor - $result = split('{|}', $pw_db, 3); + $result = preg_split('/[{}]/', $pw_db, 3); # split at { and/or } $flavor = $result[1]; $salt = substr($result[2], 0, 2); } @@ -1457,7 +1457,7 @@ } else { - $error_text .= "<p />DEBUG INFORMATION:<br />MySQL 3.x / 4.0 functions not available!<br />database_type = 'mysql' in config.inc.php, are you using a different database? $DEBUG_TEXT"; + $error_text .= "<p />DEBUG INFORMATION:<br />MySQL 3.x / 4.0 functions not available! (php5-mysql installed?)<br />database_type = 'mysql' in config.inc.php, are you using a different database? $DEBUG_TEXT"; } } elseif ($CONF['database_type'] == "mysqli") @@ -1473,7 +1473,7 @@ } else { - $error_text .= "<p />DEBUG INFORMATION:<br />MySQL 4.1 functions not available!<br />database_type = 'mysqli' in config.inc.php, are you using a different database? $DEBUG_TEXT"; + $error_text .= "<p />DEBUG INFORMATION:<br />MySQL 4.1 functions not available! (php5-mysqli installed?)<br />database_type = 'mysqli' in config.inc.php, are you using a different database? $DEBUG_TEXT"; } } elseif ($CONF['database_type'] == "pgsql") @@ -1489,7 +1489,7 @@ } else { - $error_text .= "<p />DEBUG INFORMATION:<br />PostgreSQL functions not available!<br />database_type = 'pgsql' in config.inc.php, are you using a different database? $DEBUG_TEXT"; + $error_text .= "<p />DEBUG INFORMATION:<br />PostgreSQL functions not available! (php5-pgsql installed?)<br />database_type = 'pgsql' in config.inc.php, are you using a different database? $DEBUG_TEXT"; } } else Modified: branches/postfixadmin-2.3/list-virtual.php =================================================================== --- branches/postfixadmin-2.3/list-virtual.php 2010-12-15 23:17:08 UTC (rev 892) +++ branches/postfixadmin-2.3/list-virtual.php 2010-12-15 23:41:40 UTC (rev 893) @@ -166,7 +166,7 @@ # TODO: is the different query for pgsql really needed? The mailbox query below also works with both... $query = "SELECT address, goto, - extract(epoch from modified) as modified, + modified, active FROM $table_alias WHERE $sql_domain AND NOT EXISTS(SELECT 1 FROM $table_mailbox WHERE username=$table_alias.address $sql_where) @@ -246,7 +246,7 @@ while ($row = db_array ($result['result'])) { if ($display_mailbox_aliases) { - $goto_split = split(",", $row['goto']); + $goto_split = explode(",", $row['goto']); $row['goto_mailbox'] = 0; $row['goto_other'] = array(); Modified: branches/postfixadmin-2.3/templates/admin_create-domain.php =================================================================== --- branches/postfixadmin-2.3/templates/admin_create-domain.php 2010-12-15 23:17:08 UTC (rev 892) +++ branches/postfixadmin-2.3/templates/admin_create-domain.php 2010-12-15 23:41:40 UTC (rev 893) @@ -62,7 +62,7 @@ </tr> <tr> <td><?php print $PALANG['pAdminCreate_domain_backupmx'] . ":"; ?></td> - <td><?php $checked = ($tBackupmx == 'on') ? 'checked' : ''; ?> + <td><?php $checked = ($tBackupmx == 'on') ? 'checked="checked"' : ''; ?> <input class="flat" type="checkbox" value='on' name="fBackupmx" <?php print $checked; ?> /> </td> <td> </td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2010-12-25 14:11:23
|
Revision: 898 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=898&view=rev Author: christian_boltz Date: 2010-12-25 14:11:16 +0000 (Sat, 25 Dec 2010) Log Message: ----------- create-alias: support multiple alias targets - support multiple alias targets, patch by anexius@SF, http://sourceforge.net/projects/postfixadmin/forums/forum/676076/topic/4004442 The patch fixes https://sourceforge.net/tracker/?func=detail&aid=2706290&group_id=191583&atid=937964 additional small fixes: - replace spaces only at the start and end of a line, not in the middle of an (BTW: invalid) mail address - allow multiple error messages (separated by <br /> - prevent input data loss on validation errors (I'll port this to trunk.) Modified Paths: -------------- branches/postfixadmin-2.3/create-alias.php branches/postfixadmin-2.3/templates/create-alias.php Modified: branches/postfixadmin-2.3/create-alias.php =================================================================== --- branches/postfixadmin-2.3/create-alias.php 2010-12-23 01:12:56 UTC (rev 897) +++ branches/postfixadmin-2.3/create-alias.php 2010-12-25 14:11:16 UTC (rev 898) @@ -75,9 +75,10 @@ $fDomain = escape_string ($_POST['fDomain']); } - if(!preg_match ('/@/',$fGoto)) { - $fGoto = $fGoto . "@" . escape_string ($_POST['fDomain']); - } +# TODO: Doesn't work with multiple aliases - fix or discard... +# if(!preg_match ('/@/',$fGoto)) { +# $fGoto = $fGoto . "@" . escape_string ($_POST['fDomain']); +# } if(!(authentication_has_role('global-admin') || check_owner ($SESSID_USERNAME, $fDomain) )) @@ -105,7 +106,42 @@ $pCreate_alias_address_text = $PALANG['pCreate_alias_address_text_error1']; } - if (empty($fGoto) || !check_email ($fGoto)) { + // Begin check alias email + $goto = preg_replace ('/\\\r\\\n/', ',', $fGoto); + $goto = preg_replace ('/\r\n/', ',', $goto); + $goto = preg_replace ('/,[\s]+/i', ',', $goto); + $goto = preg_replace ('/[\s]+,/i', ',', $goto); + $goto = preg_replace ('/,*$|^,*/', '', $goto); + $goto = preg_replace ('/,,*/', ',', $goto); + + if (empty ($goto) && !authentication_has_role('global-admin')) { + $error = 1; + $tGoto = $_POST['fGoto']; + $tMessage = $PALANG['pEdit_alias_goto_text_error1']; + } + + $new_aliases = array(); + if ($error != 1) { + $new_aliases = explode(',', $goto); + } + $new_aliases = array_unique($new_aliases); + + foreach($new_aliases as $address) { + if (in_array($address, $CONF['default_aliases'])) continue; + if (empty($address)) continue; # TODO: should never happen - remove after 2.2 release + if (!check_email($address)) { + $error = 1; + $tGoto = $goto; + if (!empty($tMessage)) $tMessage .= "<br />"; + $tMessage .= $PALANG['pEdit_alias_goto_text_error2'] . "$address</span>"; + } + } + + $goto = implode(',', $new_aliases); + $fGoto = escape_string($goto); + // End check alias mail + + if (empty($fGoto)) { $error = 1; $tAddress = escape_string ($_POST['fAddress']); $tGoto = $fGoto; @@ -150,6 +186,11 @@ $tDomain = $fDomain; $tMessage = $PALANG['pCreate_alias_result_success'] . "<br />($fAddress -> $fGoto)<br />\n"; } + } else { # on error + $tAddress = htmlentities($_POST['fAddress']); + $tGoto = htmlentities($_POST['fGoto']); + $tDomain = htmlentities($_POST['fDomain']); + } } Modified: branches/postfixadmin-2.3/templates/create-alias.php =================================================================== --- branches/postfixadmin-2.3/templates/create-alias.php 2010-12-23 01:12:56 UTC (rev 897) +++ branches/postfixadmin-2.3/templates/create-alias.php 2010-12-25 14:11:16 UTC (rev 898) @@ -30,8 +30,7 @@ </tr> <tr> <td><?php print $PALANG['pCreate_alias_goto'] . ":"; ?></td> - <td><input class="flat" type="text" name="fGoto" value="<?php print $tGoto; ?>" /></td> - <td><?php print $pCreate_alias_goto_text; ?></td> + <td colspan="2"><textarea class="flat" rows="10" cols="60" name="fGoto"><?php print $tGoto; ?></textarea></td> </tr> <tr> <td><?php print $PALANG['pCreate_alias_active'] . ":"; ?></td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2010-12-25 14:16:18
|
Revision: 899 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=899&view=rev Author: christian_boltz Date: 2010-12-25 14:16:11 +0000 (Sat, 25 Dec 2010) Log Message: ----------- edit-alias: some small fixes that came up while integrating the multiple alias target patch from anexius (r898): - replace spaces only at the start and end of a line, not in the middle of an (BTW: invalid) mail address - prevent input data loss on validation errors - allow multiple error messages (separated by <br /> (I'll port that to trunk also.) Modified Paths: -------------- branches/postfixadmin-2.3/edit-alias.php branches/postfixadmin-2.3/templates/edit-alias.php Modified: branches/postfixadmin-2.3/edit-alias.php =================================================================== --- branches/postfixadmin-2.3/edit-alias.php 2010-12-25 14:11:16 UTC (rev 898) +++ branches/postfixadmin-2.3/edit-alias.php 2010-12-25 14:16:11 UTC (rev 899) @@ -62,6 +62,7 @@ $tGoto = $row['goto']; $orig_alias_list = explode(',', $tGoto); + $tGoto = str_replace(',', "\n", $tGoto); $alias_list = $orig_alias_list; //. if we are not a global admin, and alias_control_admin is NO, hide the alias that's the mailbox name. if($CONF['alias_control_admin'] == 'NO' && !authentication_has_role('global-admin')) { @@ -101,7 +102,8 @@ $goto = preg_replace ('/\\\r\\\n/', ',', $fGoto); $goto = preg_replace ('/\r\n/', ',', $goto); - $goto = preg_replace ('/[\s]+/i', '', $goto); + $goto = preg_replace ('/,[\s]+/i', ',', $goto); + $goto = preg_replace ('/[\s]+,/i', ',', $goto); $goto = preg_replace ('/,*$|^,*/', '', $goto); $goto = preg_replace ('/,,*/', ',', $goto); @@ -126,7 +128,8 @@ { $error = 1; $tGoto = $goto; - $tMessage = $PALANG['pEdit_alias_goto_text_error2'] . "$address</span>"; + if (!empty($tMessage)) $tMessage .= "<br />"; + $tMessage .= $PALANG['pEdit_alias_goto_text_error2'] . "$address</span>"; } } @@ -159,6 +162,8 @@ header ("Location: list-virtual.php?domain=$fDomain"); exit; } + } else { # on error + $tGoto = htmlentities($_POST['fGoto']); } } Modified: branches/postfixadmin-2.3/templates/edit-alias.php =================================================================== --- branches/postfixadmin-2.3/templates/edit-alias.php 2010-12-25 14:11:16 UTC (rev 898) +++ branches/postfixadmin-2.3/templates/edit-alias.php 2010-12-25 14:16:11 UTC (rev 899) @@ -15,12 +15,7 @@ <td><?php print $PALANG['pEdit_alias_goto'] . ":"; ?></td> <td> <textarea class="flat" rows="10" cols="60" name="fGoto"> -<?php - -foreach($alias_list as $alias) { - print "$alias\n"; -} -?> +<?php print $tGoto; ?> </textarea> </td> <td> </td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2011-02-01 22:50:59
|
Revision: 943 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=943&view=rev Author: christian_boltz Date: 2011-02-01 22:50:50 +0000 (Tue, 01 Feb 2011) Log Message: ----------- Merging in various fixes from trunk. INSTALL.TXT - add a warning about external HOWTOs - mention config.local.php - various small changes DOCUMENTS/UPGRADE.txt: - add note about upgrading postfix config for alias domains - various small additions functions.inc.php: - fix db_delete to use table_by_key (didn't work with non-default table names before) - use db_insert for logging languages/sk.lang: - big translation update by Ondrej Zary (rnbw @sf) CHANGELOG.TXT: - updated with the most important changes from above Modified Paths: -------------- branches/postfixadmin-2.3/CHANGELOG.TXT branches/postfixadmin-2.3/DOCUMENTS/UPGRADE.txt branches/postfixadmin-2.3/INSTALL.TXT branches/postfixadmin-2.3/functions.inc.php branches/postfixadmin-2.3/languages/sk.lang Modified: branches/postfixadmin-2.3/CHANGELOG.TXT =================================================================== --- branches/postfixadmin-2.3/CHANGELOG.TXT 2011-02-01 22:35:54 UTC (rev 942) +++ branches/postfixadmin-2.3/CHANGELOG.TXT 2011-02-01 22:50:50 UTC (rev 943) @@ -10,7 +10,7 @@ # Last update: # $Id$ -Version 2.3.3 - 2010/**/** - SVN r*** (postfixadmin-2.3 branch) +Version 2.3.3 - 2011/**/** - SVN r*** (postfixadmin-2.3 branch) --------------------------------------------------------------- - create-alias: allow multiple alias targets @@ -21,12 +21,15 @@ - functions.inc.php: better error messages when database functions are missing - create domain: fixed typo in variable name that broke the default value for default aliases - - create domain: backup MX checkbox is now XHTML compliant - vacation.pl logged literal $variable instead of the variable content at two places - POSTFIX_CONF.txt: fixed filename for quota map - config.inc.php: removed double $CONF['database_prefix'] - config.inc.php: fixed comments about domain_post* script parameters + - fixed db_delete() to use table_by_key() so that it works with non-default + table names + - updated INSTALL.TXT and UPGRADE.TXT + - sk translation update - some more minor fixes Version 2.3.2 - 2010/08/24 - SVN r860 (postfixadmin-2.3 branch) Modified: branches/postfixadmin-2.3/DOCUMENTS/UPGRADE.txt =================================================================== --- branches/postfixadmin-2.3/DOCUMENTS/UPGRADE.txt 2011-02-01 22:35:54 UTC (rev 942) +++ branches/postfixadmin-2.3/DOCUMENTS/UPGRADE.txt 2011-02-01 22:50:50 UTC (rev 943) @@ -66,8 +66,8 @@ Comparing config.inc.php with your previous using "diff" might save you some time. -You can use a config.local.php file to contain your local settings - these will override any -defined in config.inc.php +You can use a config.local.php file to contain your local settings. These will override any +defined in config.inc.php - and save some time when upgrading to a new version of PostfixAdmin ;-) 5. Run setup.php ---------------------------------------- @@ -75,6 +75,7 @@ Access setup.php through a web browser. It will attempt to upgrade your database, and also allow you to create a superadmin user. +(In case the database upgrade fails, you can run setup.php?debug=1 to see the last executed query.) From version 2.3, you need to specify a setup_password in config.inc.php - setup.php should guide you through this process. If you do not have a setup_password, type one @@ -89,9 +90,14 @@ Note that admin/ has been merged into the main directory. Login with the superadmin account to setup domains and domain admins. +6. Upgrade your postfix config +------------------------------ +Since version 2.3, PostfixAdmin supports alias domains ($CONF['alias_domain']). +If you want to use them, you have to add some queries to your postfix config - +see POSTFIX_CONF for details. -6. Done +7. Done ------- This is all that is needed. Fire up your browser and go to the site that you specified to host Postfix Admin. Modified: branches/postfixadmin-2.3/INSTALL.TXT =================================================================== --- branches/postfixadmin-2.3/INSTALL.TXT 2011-02-01 22:35:54 UTC (rev 942) +++ branches/postfixadmin-2.3/INSTALL.TXT 2011-02-01 22:50:50 UTC (rev 943) @@ -15,15 +15,23 @@ READ THIS FIRST! ---------------- -When this is an upgrade from Postfix Admin 1.5.4 please read DOCUMENTS/UPGRADE.TXT!! +When this is an upgrade from a previous version of Postfix Admin, please read +DOCUMENTS/UPGRADE.TXT also! If you need to setup Postfix to be able to handle Virtual Domains and Virtual -Users check out : +Users check out: - - http://high5.net/howto/ + - the PostfixAdmin documentation in the DOCUMENTS/ directory + - our wiki at http://sourceforge.net/apps/mediawiki/postfixadmin/ + +There are also lots of HOWTOs around the web. Be warned that many of them +(even those listed below) may be outdated or incomplete. +Please stick to the PostfixAdmin documentation, and use those HOWTOs only if +you need some additional information that is missing in the PostfixAdmin +DOCUMENTS/ folder. - http://codepoets.co.uk/postfixadmin-postgresql-courier-squirrelmail-debian-etch-howto-tutorial (Debian+Courier+PostgreSQL+Postfix+Postfixadmin) - http://bliki.rimuhosting.com/space/knowledgebase/linux/mail/postfixadmin+on+debian+sarge (Postfix+MySQL+Postfixadmin+Dovecot) - - http://gentoo-wiki.com/HOWTO_Setup_a_Virtual_Postfix/Courier_Mail_System_with_PostfixAdmin (Postfix+MySQL+Postfixadmin+Courier) + - http://en.gentoo-wiki.com/wiki/Virtual_mail_server_using_Postfix,_Courier_and_PostfixAdmin (Postfix+MySQL+Postfixadmin+Courier) 1. Unarchive new Postfix Admin @@ -61,7 +69,7 @@ 3. Configure PostfixAdmin so it can find the database ----------------------------------------------------- -Edit the config.inc.php file. +Edit the config.inc.php file - or - create config.local.php and add your settings there. The most important settings are those for your database server. Modified: branches/postfixadmin-2.3/functions.inc.php =================================================================== --- branches/postfixadmin-2.3/functions.inc.php 2011-02-01 22:35:54 UTC (rev 942) +++ branches/postfixadmin-2.3/functions.inc.php 2011-02-01 22:50:50 UTC (rev 943) @@ -1660,6 +1660,7 @@ // function db_delete ($table,$where,$delete) { + $table = table_by_key($table); $query = "DELETE FROM $table WHERE " . escape_string($where) . "='" . escape_string($delete) . "'"; $result = db_query ($query); if ($result['rows'] >= 1) @@ -1763,8 +1764,15 @@ if ($CONF['logging'] == 'YES') { - $result = db_query ("INSERT INTO $table_log (timestamp,username,domain,action,data) VALUES (NOW(),'$username ($REMOTE_ADDR)','$domain','$action','$data')"); - if ($result['rows'] != 1) + $logdata = array( + 'username' => "$username ($REMOTE_ADDR)", + 'domain' => $domain, + 'action' => $action, + 'data' => $data, + ); + $result = db_insert('log', $logdata, array('timestamp') ); + #$result = db_query ("INSERT INTO $table_log (timestamp,username,domain,action,data) VALUES (NOW(),'$username ($REMOTE_ADDR)','$domain','$action','$data')"); + if ($result != 1) { return false; } Modified: branches/postfixadmin-2.3/languages/sk.lang =================================================================== --- branches/postfixadmin-2.3/languages/sk.lang 2011-02-01 22:35:54 UTC (rev 942) +++ branches/postfixadmin-2.3/languages/sk.lang 2011-02-01 22:50:50 UTC (rev 943) @@ -3,422 +3,423 @@ // // Language file Slovak // by bajk (eszabo @sf) +// updated by Ondrej Zary (rnbw @sf) // -$PALANG['YES'] = 'ÁNO'; +$PALANG['YES'] = 'ÁNO'; $PALANG['NO'] = 'NIE'; -$PALANG['edit'] = 'upraviť'; -$PALANG['del'] = 'zmazať'; -$PALANG['exit'] = 'Exit'; # XXX -$PALANG['cancel'] = 'Cancel'; # XXX -$PALANG['save'] = 'Save'; # XXX -$PALANG['confirm'] = 'Ste si istí?\n'; -$PALANG['confirm_domain'] = 'Naozaj chcete zmazať všetky záznamy v tejto doméně? Toto nie je možné vrátiť!\n'; -$PALANG['check_update'] = 'Zkontrolovať aktualizácie'; -$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX -$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX +$PALANG['edit'] = 'upraviť'; +$PALANG['del'] = 'zmazať'; +$PALANG['exit'] = 'Naspäť'; +$PALANG['cancel'] = 'Zrušiť'; +$PALANG['save'] = 'Uložiť'; +$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['check_update'] = 'Skontrolovať aktualizácie'; +$PALANG['invalid_parameter'] = 'Neplatný parameter!'; +$PALANG['pFooter_logged_as'] = 'Prihlásený ako %s'; -$PALANG['pLogin_welcome'] = 'Tu sa prihlasujú emailoví administrátori pre administráciu svojich domén.'; -$PALANG['pLogin_username'] = 'Užívateľské meno (email)'; +$PALANG['pLogin_welcome'] = 'Prihlásenie administrátorov pre správu domén'; +$PALANG['pLogin_username'] = 'Užívateľské meno (email)'; $PALANG['pLogin_password'] = 'Heslo'; -$PALANG['pLogin_button'] = 'Prihlásiť'; -$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX -$PALANG['pLogin_login_users'] = 'Vstup do užívateľskej sekcie.'; +$PALANG['pLogin_button'] = 'Prihlásiť'; +$PALANG['pLogin_failed'] = 'Váš email alebo heslo nie je správne.'; +$PALANG['pLogin_login_users'] = 'Vstup do užívateľskej sekcie'; -$PALANG['pMenu_main'] = 'Main'; # XXX -$PALANG['pMenu_overview'] = 'Prehľad'; -$PALANG['pMenu_create_alias'] = 'Pridať alias'; -$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX -$PALANG['pMenu_create_mailbox'] = 'Pridať schránku'; -$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX -$PALANG['pMenu_sendmail'] = 'Poslať email'; -$PALANG['pMenu_password'] = 'Zmniť heslo'; -$PALANG['pMenu_viewlog'] = 'Prehliadať záznamy'; -$PALANG['pMenu_logout'] = 'Odhlásiť.'; +$PALANG['pMenu_main'] = 'Hlavné'; +$PALANG['pMenu_overview'] = 'Prehľad'; +$PALANG['pMenu_create_alias'] = 'Nový alias'; +$PALANG['pMenu_create_alias_domain'] = 'Nový alias domény'; +$PALANG['pMenu_create_mailbox'] = 'Nová schránka'; +$PALANG['pMenu_fetchmail'] = 'Sťahovanie emailu'; +$PALANG['pMenu_sendmail'] = 'Poslať email'; +$PALANG['pMenu_password'] = 'Zmeniť heslo'; +$PALANG['pMenu_viewlog'] = 'Prehliadať log'; +$PALANG['pMenu_logout'] = 'Odhlásiť'; -$PALANG['pMain_welcome'] = 'Vítajte v Postfix Adminu!'; -$PALANG['pMain_overview'] = 'Výpis aliasov a schránok. Môžete ich tu upravovať a mazať.'; -$PALANG['pMain_create_alias'] = 'Vytvoriť alias v tejto doméne.'; -$PALANG['pMain_create_mailbox'] = 'Vytvoriť schránku v tejto doméne.'; -$PALANG['pMain_sendmail'] = 'Poslať email do jednej z novo vytvorených schránok.'; -$PALANG['pMain_password'] = 'Zmeniť heslo administrátorského účtu.'; -$PALANG['pMain_viewlog'] = 'Prehliadať záznamy zmien v doméne.'; -$PALANG['pMain_logout'] = 'Odhlásiť zo systému.'; +$PALANG['pMain_welcome'] = 'Vitajte v Postfix Admine!'; +$PALANG['pMain_overview'] = 'Výpis aliasov a schránok. Môžete ich tu upravovať a mazať.'; +$PALANG['pMain_create_alias'] = 'Vytvoriť alias v tejto doméne.'; +$PALANG['pMain_create_mailbox'] = 'Vytvoriť schránku v tejto doméne.'; +$PALANG['pMain_sendmail'] = 'Poslať email do jednej zo schránok.'; +$PALANG['pMain_password'] = 'Zmeniť heslo administrátorského účtu.'; +$PALANG['pMain_viewlog'] = 'Prehliadať logy zmien v doméne.'; +$PALANG['pMain_logout'] = 'Odhlásiť sa zo systému.'; -$PALANG['pOverview_disabled'] = 'Vypnuté'; -$PALANG['pOverview_unlimited'] = 'Neobmedzene'; -$PALANG['pOverview_title'] = ':: Definované domény'; -$PALANG['pOverview_up_arrow'] = 'Go Top'; # XXX -$PALANG['pOverview_right_arrow'] = 'Nasledujúca strana'; -$PALANG['pOverview_left_arrow'] = 'Predchádzajúca strana'; -$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX +$PALANG['pOverview_disabled'] = 'Vypnuté'; +$PALANG['pOverview_unlimited'] = 'Neobmedzené'; +$PALANG['pOverview_title'] = ':: Definované domény'; +$PALANG['pOverview_up_arrow'] = 'Na začiatok'; +$PALANG['pOverview_right_arrow'] = 'Nasledujúca strana'; +$PALANG['pOverview_left_arrow'] = 'Predchádzajúca strana'; +$PALANG['pOverview_alias_domain_title'] = ':: Aliasy domén'; $PALANG['pOverview_alias_title'] = ':: Aliasy'; -$PALANG['pOverview_mailbox_title'] = ':: Mailové schránky (Mailboxes)'; -$PALANG['pOverview_button'] = 'Prejsť'; -$PALANG['pOverview_welcome'] = 'Prehľad pre doménu '; -$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX -$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX +$PALANG['pOverview_mailbox_title'] = ':: Mailové schránky'; +$PALANG['pOverview_button'] = 'Prejsť'; +$PALANG['pOverview_welcome'] = 'Prehľad pre doménu '; +$PALANG['pOverview_alias_domain_aliases'] = 'Aliasy domén'; +$PALANG['pOverview_alias_domain_target'] = '%s je alias domény:'; $PALANG['pOverview_alias_alias_count'] = 'Aliasov'; -$PALANG['pOverview_alias_mailbox_count'] = 'Schránok'; +$PALANG['pOverview_alias_mailbox_count'] = 'Schránok'; $PALANG['pOverview_alias_address'] = 'Od'; -$PALANG['pOverview_alias_goto'] = 'Pre'; -$PALANG['pOverview_alias_modified'] = 'Naposledy zmenené'; -$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX -$PALANG['pOverview_alias_active'] = 'Active'; # XXX -$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX -$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX -$PALANG['and_x_more'] = '[and %s more...]'; # XXX +$PALANG['pOverview_alias_goto'] = 'Doručenie'; +$PALANG['pOverview_alias_modified'] = 'Posledná zmena'; +$PALANG['pOverview_alias_domain_modified'] = 'Posledná zmena'; +$PALANG['pOverview_alias_active'] = 'Aktívny'; +$PALANG['pOverview_alias_domain_active'] = 'Aktívny'; +$PALANG['pOverview_alias_edit'] = 'aliasy'; +$PALANG['and_x_more'] = '[a %s ďalších...]'; $PALANG['pOverview_mailbox_username'] = 'Email'; $PALANG['pOverview_mailbox_name'] = 'Meno'; -$PALANG['pOverview_mailbox_quota'] = 'Miesto (MB)'; -$PALANG['pOverview_mailbox_modified'] = 'Naposledy zmenené'; -$PALANG['pOverview_mailbox_active'] = 'Aktívny'; -$PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX -$PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX +$PALANG['pOverview_mailbox_quota'] = 'Kvóta (MB)'; +$PALANG['pOverview_mailbox_modified'] = 'Posledná zmena'; +$PALANG['pOverview_mailbox_active'] = 'Aktívna'; +$PALANG['pOverview_vacation_edit'] = 'AUT. ODPOVEĎ'; +$PALANG['pOverview_vacation_option'] = 'aut. odpoveď'; -$PALANG['pOverview_get_domain'] = 'Doména'; +$PALANG['pOverview_get_domain'] = 'Doména'; $PALANG['pOverview_get_aliases'] = 'Aliasy'; -$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX -$PALANG['pOverview_get_mailboxes'] = 'Schránky'; -$PALANG['pOverview_get_quota'] = 'Miesto pre schránku (MB)'; -$PALANG['pOverview_get_modified'] = 'Naposledy zmenené'; +$PALANG['pOverview_get_alias_domains'] = 'Aliasy domén'; +$PALANG['pOverview_get_mailboxes'] = 'Schránky'; +$PALANG['pOverview_get_quota'] = 'Kvóta (MB)'; +$PALANG['pOverview_get_modified'] = 'Posledná zmena'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Nie je možné zmazať položku '; -$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX -$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Táto doména nie je vaša '; -$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX -$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX -$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX -$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX -$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX -$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX -$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX -$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX -$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX -$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX -$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX -$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX -$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX -$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX +$PALANG['pDelete_delete_error'] = '<span class="error_msg">Nie je možné zmazať položku '; +$PALANG['pDelete_delete_success'] = '%s zmazané.'; +$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Nie je možné odstrániť schránku '; +$PALANG['pDelete_domain_error'] = '<span class="error_msg">Táto doména nie je vaša '; +$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">Táto doména nie je vaša '; +$PALANG['pDelete_alias_error'] = '<span class="error_msg">Nie je možné odstrániť alias '; +$PALANG['pCreate_alias_domain_welcome'] = 'Zrkadliť adresy z jednej domény na druhú'; +$PALANG['pCreate_alias_domain_alias'] = 'Alias'; +$PALANG['pCreate_alias_domain_alias_text'] = 'Kam príde email'; +$PALANG['pCreate_alias_domain_target'] = 'Cieľová doména'; +$PALANG['pCreate_alias_domain_target_text'] = 'Kam sa email presmeruje'; +$PALANG['pCreate_alias_domain_active'] = 'Aktívny'; +$PALANG['pCreate_alias_domain_button'] = 'Vytvoriť alias domény'; +$PALANG['pCreate_alias_domain_error1'] = 'Nie ste oprávnení vytvoriť zvolenú konfiguráciu.'; +$PALANG['pCreate_alias_domain_error2'] = 'Zvolená konfigurácia nie je platná, zvoľte inú!'; +$PALANG['pCreate_alias_domain_error3'] = 'Chyba pri vkladaní do databázy.'; +$PALANG['pCreate_alias_domain_error4'] = 'Všetky domény už majú aliasy.'; +$PALANG['pCreate_alias_domain_success'] = 'Alias domény bol pridaný do tabuľky!'; -$PALANG['pCreate_alias_welcome'] = 'Vytvoriť nový alias vo vašej doméne.'; +$PALANG['pCreate_alias_welcome'] = 'Vytvoriť nový alias v doméne'; $PALANG['pCreate_alias_address'] = 'Alias'; -$PALANG['pCreate_alias_address_text_error1'] = '<br /><span class="error_msg">Adresa nie je platná!</span>'; -$PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">Takáto emailová adresa už existuje!</span>'; -$PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">Dosiahli ste limit, nemôžete vytvárať dalšie aliasy!</span>'; -$PALANG['pCreate_alias_goto'] = 'Cieľ'; -$PALANG['pCreate_alias_active'] = 'Active'; # XXX -$PALANG['pCreate_alias_button'] = 'Pridať'; -$PALANG['pCreate_alias_goto_text'] = 'Kam má pošta chodiť.'; -$PALANG['pCreate_alias_goto_text_error'] = 'Kam má pošta chodit.<br /><span class="error_msg">Cieľ nie je platný!</span>'; -$PALANG['pCreate_alias_result_error'] = '<span class="error_msg">Nepodarilo sa pridať alias do tabulky aliasov!</span>'; -$PALANG['pCreate_alias_result_success'] = 'Alias bol úspešne pridaný do tabulky aliasov!'; -$PALANG['pCreate_alias_catchall_text'] = 'Pre vytvorenie "všetko bracieho" aliasu (doménového koša) použite * ako alias.<br />Pre alias doména-doména použite *@domain.tld ako cieľ.'; +$PALANG['pCreate_alias_address_text_error1'] = '<br /><span class="error_msg">Adresa nie je platná!</span>'; +$PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">Takáto emailová adresa už existuje!</span>'; +$PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">Dosiahli ste limit, nemôžete vytvárať ďalšie aliasy!</span>'; +$PALANG['pCreate_alias_goto'] = 'Cieľ'; +$PALANG['pCreate_alias_active'] = 'Aktívny'; +$PALANG['pCreate_alias_button'] = 'Vytvoriť alias'; +$PALANG['pCreate_alias_goto_text'] = 'Kam má pošta chodiť'; +$PALANG['pCreate_alias_goto_text_error'] = 'Kam má pošta chodiť<br /><span class="error_msg">Cieľ nie je platný!</span>'; +$PALANG['pCreate_alias_result_error'] = '<span class="error_msg">Nepodarilo sa pridať alias do tabuľky!</span>'; +$PALANG['pCreate_alias_result_success'] = 'Alias bol pridaný do tabuľky!'; +$PALANG['pCreate_alias_catchall_text'] = 'Pre vytvorenie doménového koša použite * ako alias.<br />Pre alias doména-doména použite *@domain.tld ako cieľ.'; -$PALANG['pEdit_alias_welcome'] = 'Upraviť aliasy.<br />Jeden záznam na riadku.'; +$PALANG['pEdit_alias_welcome'] = 'Upraviť aliasy<br />Jeden záznam na riadku'; $PALANG['pEdit_alias_address'] = 'Alias'; -$PALANG['pEdit_alias_address_error'] = '<span class="error_msg">Niel je možné nájsť alias!</span>'; -$PALANG['pEdit_alias_goto'] = 'Cieľ'; -$PALANG['pEdit_alias_active'] = 'Active'; # XXX -$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Nezadali ste cieľ</span>'; -$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Emailová adresa ktorú ste zadali nie je platná: '; -$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Táto doména nie je vaša: '; -$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX -$PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX -$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX -$PALANG['pEdit_alias_button'] = 'Upravit'; -$PALANG['pEdit_alias_result_error'] = '<span class="error_msg">Nepodarilo se upraviť alias!</span>'; +$PALANG['pEdit_alias_address_error'] = '<span class="error_msg">Nie je možné nájsť alias!</span>'; +$PALANG['pEdit_alias_goto'] = 'Cieľ'; +$PALANG['pEdit_alias_active'] = 'Aktívny'; +$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Nezadali ste cieľ</span>'; +$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Zadaná emailová adresa nie je platná: '; +$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Táto doména nie je vaša: '; +$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Nepodarilo sa zmeniť alias domény!</span>'; +$PALANG['pEdit_alias_forward_and_store'] = 'Doručiť aj do lokálnej schránky'; +$PALANG['pEdit_alias_forward_only'] = 'Len presmerovať na zadané emailové adresy'; +$PALANG['pEdit_alias_button'] = 'Upraviť'; +$PALANG['pEdit_alias_result_error'] = '<span class="error_msg">Nepodarilo se upraviť alias!</span>'; -$PALANG['pCreate_mailbox_welcome'] = 'Vytvoriť novú lokálnu schránku v doméne.'; -$PALANG['pCreate_mailbox_username'] = 'Užívateľské meno'; -$PALANG['pCreate_mailbox_username_text_error1'] = '<br /><span class="error_msg">Adresa nie je platná!</span>'; -$PALANG['pCreate_mailbox_username_text_error2'] = '<br /><span class="error_msg">Takáto emailová adresa už¸ existuje!</span>'; -$PALANG['pCreate_mailbox_username_text_error3'] = '<br /><span class="error_msg">Dosiahli ste limit, nemôžete vytváratť ďalšie schránky!</span>'; +$PALANG['pCreate_mailbox_welcome'] = 'Vytvoriť novú schránku v doméne'; +$PALANG['pCreate_mailbox_username'] = 'Užívateľské meno'; +$PALANG['pCreate_mailbox_username_text_error1'] = '<br /><span class="error_msg">Adresa nie je platná!</span>'; +$PALANG['pCreate_mailbox_username_text_error2'] = '<br /><span class="error_msg">Takáto emailová adresa už¸ existuje!</span>'; +$PALANG['pCreate_mailbox_username_text_error3'] = '<br /><span class="error_msg">Dosiahli ste limit, nemôžete vytvárať ďalšie schránky!</span>'; $PALANG['pCreate_mailbox_password'] = 'Heslo'; $PALANG['pCreate_mailbox_password2'] = 'Heslo (znovu)'; $PALANG['pCreate_mailbox_password_text'] = 'Heslo pre POP3/IMAP/SMTP'; -$PALANG['pCreate_mailbox_password_text_error'] = 'Heslo pre POP3/IMAP/SMTP<br /><span class="error_msg">Zadaná heslá sú rozdielne alebo prázdne!</span>'; +$PALANG['pCreate_mailbox_password_text_error'] = 'Heslo pre POP3/IMAP/SMTP<br /><span class="error_msg">Zadaná heslá sú rozdielne alebo prázdne!</span>'; $PALANG['pCreate_mailbox_name'] = 'Meno'; -$PALANG['pCreate_mailbox_name_text'] = 'Celé meno'; -$PALANG['pCreate_mailbox_quota'] = 'Miesto'; +$PALANG['pCreate_mailbox_name_text'] = 'Celé meno'; +$PALANG['pCreate_mailbox_quota'] = 'Kvóta'; $PALANG['pCreate_mailbox_quota_text'] = 'MB'; -$PALANG['pCreate_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Zadané miesto je príliš velké!</span>'; -$PALANG['pCreate_mailbox_active'] = 'Aktívny'; -$PALANG['pCreate_mailbox_mail'] = 'Vytvoriť schránku na disku'; -$PALANG['pCreate_mailbox_button'] = 'Pridať schránku'; -$PALANG['pCreate_mailbox_result_error'] = '<span class="error_msg">Nepodarilo sa pridať schránku do tabulky schránok!</span>'; -$PALANG['pCreate_mailbox_result_success'] = 'Schránka bola pridaná do tabulky schránok!'; -$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX +$PALANG['pCreate_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Zadané miesto je príliš velké!</span>'; +$PALANG['pCreate_mailbox_active'] = 'Aktívna'; +$PALANG['pCreate_mailbox_mail'] = 'Poslať uvítací email'; +$PALANG['pCreate_mailbox_button'] = 'Vytvoriť schránku'; +$PALANG['pCreate_mailbox_result_error'] = '<span class="error_msg">Nepodarilo sa pridať schránku do tabuľky!</span>'; +$PALANG['pCreate_mailbox_result_success'] = 'Schránka bola pridaná do tabuľky!'; +$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Schránka bola pridaná do tabuľky, ale nepodarilo sa vytvoriť (niektoré) definované adresáre'; -$PALANG['pEdit_mailbox_welcome'] = 'Upraviť lokálnu chránku v doméne.'; -$PALANG['pEdit_mailbox_username'] = 'Uživateľské meno'; -$PALANG['pEdit_mailbox_username_error'] = '<span class="error_msg">Nepodarilo sa nájsť schránku!</span>'; -$PALANG['pEdit_mailbox_password'] = 'Nové heslo'; -$PALANG['pEdit_mailbox_password2'] = 'Nové heslo (znovu)'; -$PALANG['pEdit_mailbox_password_text_error'] = '<span class="error_msg">Zadaná heslá se nezhodujú!</span>'; +$PALANG['pEdit_mailbox_welcome'] = 'Upraviť schránku v doméne'; +$PALANG['pEdit_mailbox_username'] = 'Užívateľské meno'; +$PALANG['pEdit_mailbox_username_error'] = '<span class="error_msg">Nepodarilo sa nájsť schránku!</span>'; +$PALANG['pEdit_mailbox_password'] = 'Nové heslo'; +$PALANG['pEdit_mailbox_password2'] = 'Nové heslo (znovu)'; +$PALANG['pEdit_mailbox_password_text_error'] = '<span class="error_msg">Zadaná heslá se nezhodujú!</span>'; $PALANG['pEdit_mailbox_name'] = 'Meno'; -$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX -$PALANG['pEdit_mailbox_quota'] = 'Miesto'; +$PALANG['pEdit_mailbox_name_text'] = 'Celé meno'; +$PALANG['pEdit_mailbox_quota'] = 'Kvóta'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; -$PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Zadané miesto je príliš velké!</span>'; -$PALANG['pEdit_mailbox_domain_error'] = '<span class="error_msg">Táto doména nie je vaša: '; -$PALANG['pEdit_mailbox_button'] = 'Upraviť schránku'; -$PALANG['pEdit_mailbox_result_error'] = '<span class="error_msg">Nepodarilo sa upraviť schránku!</span>'; +$PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Zadané miesto je príliš veľké!</span>'; +$PALANG['pEdit_mailbox_domain_error'] = '<span class="error_msg">Táto doména nie je vaša: '; +$PALANG['pEdit_mailbox_button'] = 'Upraviť schránku'; +$PALANG['pEdit_mailbox_result_error'] = '<span class="error_msg">Nepodarilo sa upraviť schránku!</span>'; -$PALANG['pPassword_welcome'] = 'Zmeniť heslo.'; -$PALANG['pPassword_admin'] = 'Uživateľské meno'; -$PALANG['pPassword_admin_text_error'] = '<span class="error_msg">Uživateľské meno sa nezhoduje so žiadnou schránkou!</span>'; -$PALANG['pPassword_password_current'] = 'Súčasné heslo'; -$PALANG['pPassword_password_current_text_error'] = '<span class="error_msg">Nezadal(i) ste súčasné heslo!</span>'; -$PALANG['pPassword_password'] = 'Nové heslo'; -$PALANG['pPassword_password2'] = 'Nové heslo (znovu)'; -$PALANG['pPassword_password_text_error'] = '<span class="error_msg">Zadané heslá sú rozdielne alebo prázdne!</span>'; -$PALANG['pPassword_button'] = 'Zeniť heslo'; -$PALANG['pPassword_result_error'] = '<span class="error_msg">Nepodarilo sa zmeniť heslo!</span>'; -$PALANG['pPassword_result_success'] = 'Heslo bolo zmenené!'; -$PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX -$PALANG['pEdit_vacation_remove'] = 'Remove away message'; # XXX -$PALANG['pVacation_result_error'] = '<span class="error_msg">Unable to update auto response settings!</span>'; # XXX -$PALANG['pVacation_result_removed'] = 'Auto response has been removed!'; # XXX -$PALANG['pVacation_result_added'] = 'Auto response has been enabled!'; # XXX +$PALANG['pPassword_welcome'] = 'Zmeniť heslo'; +$PALANG['pPassword_admin'] = 'Užívateľské meno'; +$PALANG['pPassword_admin_text_error'] = '<span class="error_msg">Užívateľské meno sa nezhoduje so žiadnou schránkou!</span>'; +$PALANG['pPassword_password_current'] = 'Súčasné heslo'; +$PALANG['pPassword_password_current_text_error'] = '<span class="error_msg">Nezadali ste súčasné heslo!</span>'; +$PALANG['pPassword_password'] = 'Nové heslo'; +$PALANG['pPassword_password2'] = 'Nové heslo (znovu)'; +$PALANG['pPassword_password_text_error'] = '<span class="error_msg">Zadané heslá sú rozdielne alebo prázdne!</span>'; +$PALANG['pPassword_button'] = 'Zmeniť heslo'; +$PALANG['pPassword_result_error'] = '<span class="error_msg">Nepodarilo sa zmeniť heslo!</span>'; +$PALANG['pPassword_result_success'] = 'Heslo bolo zmenené!'; +$PALANG['pEdit_vacation_set'] = 'Zmeniť/nastaviť aut. odpoveď'; +$PALANG['pEdit_vacation_remove'] = 'Odstrániť aut. odpoveď'; +$PALANG['pVacation_result_error'] = '<span class="error_msg">Neopdarilo sa zmeniť automatickú odpoveď!</span>'; +$PALANG['pVacation_result_removed'] = 'Automatická odpoveď bola odstránená!'; +$PALANG['pVacation_result_added'] = 'Automatická odpoveď bola nastavená!'; -$PALANG['pViewlog_welcome'] = 'Prehliadať 10 posledných akcií pre '; -$PALANG['pViewlog_timestamp'] = 'Časová značka'; -$PALANG['pViewlog_username'] = 'Užívateľ'; -$PALANG['pViewlog_domain'] = 'Doména'; +$PALANG['pViewlog_welcome'] = 'Prehľad 10 posledných akcií pre '; +$PALANG['pViewlog_timestamp'] = 'Časová značka'; +$PALANG['pViewlog_username'] = 'Užívateľ'; +$PALANG['pViewlog_domain'] = 'Doména'; $PALANG['pViewlog_action'] = 'Akcia'; -$PALANG['pViewlog_data'] = 'Poznámka'; -$PALANG['pViewlog_action_create_mailbox'] = 'create mailbox'; # XXX -$PALANG['pViewlog_action_delete_mailbox'] = 'delete mailbox'; # XXX -$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX -$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX -$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX -$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX -$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX -$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX -$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX -$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX -$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX -$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX +$PALANG['pViewlog_data'] = 'Podrobnosti'; +$PALANG['pViewlog_action_create_mailbox'] = 'vytvorenie schránky'; +$PALANG['pViewlog_action_delete_mailbox'] = 'zrušenie schránky'; +$PALANG['pViewlog_action_edit_mailbox'] = 'zmena schránky'; +$PALANG['pViewlog_action_edit_mailbox_state'] = 'zmena aktivity schránky'; +$PALANG['pViewlog_action_create_alias'] = 'vytvorenie aliasu'; +$PALANG['pViewlog_action_create_alias_domain'] = 'vytvorenie aliasu domény'; +$PALANG['pViewlog_action_delete_alias'] = 'zrušenie aliasu'; +$PALANG['pViewlog_action_delete_alias_domain'] = 'zrušenie aliasu domény'; +$PALANG['pViewlog_action_edit_alias'] = 'zmena aliasu'; +$PALANG['pViewlog_action_edit_alias_state'] = 'zmena aktivity aliasu'; +$PALANG['pViewlog_action_edit_alias_domain_state'] = 'zmena aktivity aliasu domény'; +$PALANG['pViewlog_action_edit_password'] = 'zmena hesla'; -$PALANG['pViewlog_button'] = 'Prejsť'; -$PALANG['pViewlog_result_error'] = '<span class="error_msg">Nepodarilo sa nájsť záznamy!</span>'; +$PALANG['pViewlog_button'] = 'Prejsť'; +$PALANG['pViewlog_result_error'] = '<span class="error_msg">Nepodarilo sa nájsť záznamy!</span>'; -$PALANG['pSendmail_welcome'] = 'Poslať email.'; +$PALANG['pSendmail_welcome'] = 'Poslať email'; $PALANG['pSendmail_admin'] = 'Od'; -$PALANG['pSendmail_to'] = 'Cieľ'; -$PALANG['pSendmail_to_text_error'] = '<span class="error_msg">Cieľ nie je platná emailová adresa!</span>'; +$PALANG['pSendmail_to'] = 'Komu'; +$PALANG['pSendmail_to_text_error'] = '<span class="error_msg">Cieľ nie je platná emailová adresa!</span>'; $PALANG['pSendmail_subject'] = 'Predmet'; -$PALANG['pSendmail_subject_text'] = 'Vítajte'; +$PALANG['pSendmail_subject_text'] = 'Vitajte'; $PALANG['pSendmail_body'] = 'Obsah'; -$PALANG['pSendmail_button'] = 'Poslať email'; -$PALANG['pSendmail_result_error'] = '<span class="error_msg">Nepodarilo sa vytvoriť schránku!</span>'; # XXX text change - new: <span class="error_msg">Unable to send email!</span> -$PALANG['pSendmail_result_success'] = 'Schránka bola vytvorená!'; # XXX text change - new: Email sent! +$PALANG['pSendmail_button'] = 'Poslať email'; +$PALANG['pSendmail_result_error'] = '<span class="error_msg">Nepodarilo sa poslať email!</span>'; +$PALANG['pSendmail_result_success'] = 'Email odoslaný!'; -$PALANG['pAdminMenu_list_admin'] = 'Administrátory'; -$PALANG['pAdminMenu_list_domain'] = 'Domény'; +$PALANG['pAdminMenu_list_admin'] = 'Administrátori'; +$PALANG['pAdminMenu_list_domain'] = 'Domény'; $PALANG['pAdminMenu_list_virtual'] = 'Aliasy'; -$PALANG['pAdminMenu_viewlog'] = 'Záznamy'; -$PALANG['pAdminMenu_backup'] = 'Zálohovať'; -$PALANG['pAdminMenu_create_domain_admins'] = 'Doménoví administrátori'; -$PALANG['pAdminMenu_create_admin'] = 'Nový admin'; -$PALANG['pAdminMenu_create_domain'] = 'Nová doména'; -$PALANG['pAdminMenu_create_alias'] = 'Pridať alias'; -$PALANG['pAdminMenu_create_mailbox'] = 'Pridať schránku'; +$PALANG['pAdminMenu_viewlog'] = 'Záznamy'; +$PALANG['pAdminMenu_backup'] = 'Zálohovať'; +$PALANG['pAdminMenu_create_domain_admins'] = 'Doménoví administrátori'; +$PALANG['pAdminMenu_create_admin'] = 'Nový admin'; +$PALANG['pAdminMenu_create_domain'] = 'Nová doména'; +$PALANG['pAdminMenu_create_alias'] = 'Pridať alias'; +$PALANG['pAdminMenu_create_mailbox'] = 'Pridať schránku'; -$PALANG['pAdminList_admin_domain'] = 'Doména'; -$PALANG['pAdminList_admin_username'] = 'Administrátor'; -$PALANG['pAdminList_admin_count'] = 'Domény'; -$PALANG['pAdminList_admin_modified'] = 'Naposledy zmenené'; -$PALANG['pAdminList_admin_active'] = 'Aktívny'; +$PALANG['pAdminList_admin_domain'] = 'Doména'; +$PALANG['pAdminList_admin_username'] = 'Administrátor'; +$PALANG['pAdminList_admin_count'] = 'Domény'; +$PALANG['pAdminList_admin_modified'] = 'Posledná zmena'; +$PALANG['pAdminList_admin_active'] = 'Aktívny'; -$PALANG['pAdminList_domain_domain'] = 'Doména'; +$PALANG['pAdminList_domain_domain'] = 'Doména'; $PALANG['pAdminList_domain_description'] = 'Popis'; $PALANG['pAdminList_domain_aliases'] = 'Aliasov'; -$PALANG['pAdminList_domain_mailboxes'] = 'Schránok'; -$PALANG['pAdminList_domain_maxquota'] = 'Maximálne miesto (MB)'; -$PALANG['pAdminList_domain_transport'] = 'Transport'; # XXX -$PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX -$PALANG['pAdminList_domain_modified'] = 'Naposledy zmenené'; -$PALANG['pAdminList_domain_active'] = 'Aktívny'; +$PALANG['pAdminList_domain_mailboxes'] = 'Schránok'; +$PALANG['pAdminList_domain_maxquota'] = 'Max. kvóta (MB)'; +$PALANG['pAdminList_domain_transport'] = 'Transport'; +$PALANG['pAdminList_domain_backupmx'] = 'Záložný MX'; +$PALANG['pAdminList_domain_modified'] = 'Posledná zmena'; +$PALANG['pAdminList_domain_active'] = 'Aktívna'; -$PALANG['pAdminList_virtual_button'] = 'Prejsť'; -$PALANG['pAdminList_virtual_welcome'] = 'Prehľad pre '; +$PALANG['pAdminList_virtual_button'] = 'Prejsť'; +$PALANG['pAdminList_virtual_welcome'] = 'Prehľad pre '; $PALANG['pAdminList_virtual_alias_alias_count'] = 'Aliasov'; -$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Schránok'; +$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Schránok'; $PALANG['pAdminList_virtual_alias_address'] = 'Od'; -$PALANG['pAdminList_virtual_alias_goto'] = 'Cieľ'; -$PALANG['pAdminList_virtual_alias_modified'] = 'Naposledy zmenené'; -$PALANG['pAdminList_virtual_mailbox_username'] = 'Emailová adresa'; +$PALANG['pAdminList_virtual_alias_goto'] = 'Cieľ'; +$PALANG['pAdminList_virtual_alias_modified'] = 'Posledná zmena'; +$PALANG['pAdminList_virtual_mailbox_username'] = 'Emailová adresa'; $PALANG['pAdminList_virtual_mailbox_name'] = 'Meno'; -$PALANG['pAdminList_virtual_mailbox_quota'] = 'Miesto (MB)'; -$PALANG['pAdminList_virtual_mailbox_modified'] = 'Naposledy zmenené'; -$PALANG['pAdminList_virtual_mailbox_active'] = 'Aktívny'; +$PALANG['pAdminList_virtual_mailbox_quota'] = 'Kvóta (MB)'; +$PALANG['pAdminList_virtual_mailbox_modified'] = 'Posledná zmena'; +$PALANG['pAdminList_virtual_mailbox_active'] = 'Aktívny'; -$PALANG['pAdminCreate_domain_welcome'] = 'Pridať novú doménu'; -$PALANG['pAdminCreate_domain_domain'] = 'Doména'; -$PALANG['pAdminCreate_domain_domain_text_error'] = '<span class="error_msg">Takáto doména už existuje!</span>'; -$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">The domain is invalid!</span>'; # XXX +$PALANG['pAdminCreate_domain_welcome'] = 'Pridať novú doménu'; +$PALANG['pAdminCreate_domain_domain'] = 'Doména'; +$PALANG['pAdminCreate_domain_domain_text_error'] = '<span class="error_msg">Takáto doména už existuje!</span>'; +$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">Doména nie je platná!</span>'; $PALANG['pAdminCreate_domain_description'] = 'Popis'; $PALANG['pAdminCreate_domain_aliases'] = 'Aliasov'; -$PALANG['pAdminCreate_domain_aliases_text'] = '-1 = zneprístupniť | 0 = neobmedzene'; -$PALANG['pAdminCreate_domain_mailboxes'] = 'Schránok'; -$PALANG['pAdminCreate_domain_mailboxes_text'] = '-1 = zneprístupniť | 0 = neobmedzene'; -$PALANG['pAdminCreate_domain_maxquota'] = 'Maximálne miesto'; -$PALANG['pAdminCreate_domain_maxquota_text'] = 'MB<br /> -1 = zneprístupniť | 0 = neobmedzene'; -$PALANG['pAdminCreate_domain_transport'] = 'Transport'; # XXX -$PALANG['pAdminCreate_domain_transport_text'] = 'Define transport'; # XXX -$PALANG['pAdminCreate_domain_defaultaliases'] = 'Pridať implicitné; aliasy'; -$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX -$PALANG['pAdminCreate_domain_backupmx'] = 'Mail server je záložný MX'; -$PALANG['pAdminCreate_domain_button'] = 'Pridať doménu'; -$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Nepodarilo sa pridať doménu!</span>'; -$PALANG['pAdminCreate_domain_result_success'] = 'Doména bola pridaná!'; -$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX +$PALANG['pAdminCreate_domain_aliases_text'] = '-1 = zakázať | 0 = neobmedzene'; +$PALANG['pAdminCreate_domain_mailboxes'] = 'Schránok'; +$PALANG['pAdminCreate_domain_mailboxes_text'] = '-1 = zakázať | 0 = neobmedzene'; +$PALANG['pAdminCreate_domain_maxquota'] = 'Maximálna kvóta'; +$PALANG['pAdminCreate_domain_maxquota_text'] = 'MB<br /> -1 = vypnúť | 0 = neobmedzená'; +$PALANG['pAdminCreate_domain_transport'] = 'Transport'; +$PALANG['pAdminCreate_domain_transport_text'] = 'Použiť transport'; +$PALANG['pAdminCreate_domain_defaultaliases'] = 'Vytvoriť implicitné aliasy'; +$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; +$PALANG['pAdminCreate_domain_backupmx'] = 'Mail server je záložný MX'; +$PALANG['pAdminCreate_domain_button'] = 'Vytvoriť doménu'; +$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Nepodarilo sa pridať doménu!</span>'; +$PALANG['pAdminCreate_domain_result_success'] = 'Doména bola pridaná!'; +$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Nepodarilo sa odstrániť doménu!</span>'; +$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Nepodario sa odstrániť alias domény!</span>'; -$PALANG['pAdminEdit_domain_welcome'] = 'Upraviť doménu'; -$PALANG['pAdminEdit_domain_domain'] = 'Doména'; +$PALANG['pAdminEdit_domain_welcome'] = 'Upraviť doménu'; +$PALANG['pAdminEdit_domain_domain'] = 'Doména'; $PALANG['pAdminEdit_domain_description'] = 'Popis'; $PALANG['pAdminEdit_domain_aliases'] = 'Aliasov'; -$PALANG['pAdminEdit_domain_aliases_text'] = '-1 = zneprístupniť | 0 = neobmedzene'; -$PALANG['pAdminEdit_domain_mailboxes'] = 'Schránok'; -$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = zneprístupniť | 0 = neobmedzene'; -$PALANG['pAdminEdit_domain_maxquota'] = 'Maximálne miesto'; -$PALANG['pAdminEdit_domain_maxquota_text'] = 'MB<br /> -1 = zneprístupniť | 0 = neobmedzene'; -$PALANG['pAdminEdit_domain_transport'] = 'Transport'; # XXX -$PALANG['pAdminEdit_domain_transport_text'] = 'Define transport'; # XXX -$PALANG['pAdminEdit_domain_backupmx'] = 'Mail server je záložný MX'; -$PALANG['pAdminEdit_domain_active'] = 'Aktívny'; -$PALANG['pAdminEdit_domain_button'] = 'Upraviť doménu'; -$PALANG['pAdminEdit_domain_result_error'] = '<span class="error_msg">Nepodarilo sa upraviť doménu!</span>'; +$PALANG['pAdminEdit_domain_aliases_text'] = '-1 = zakázať | 0 = neobmedzene'; +$PALANG['pAdminEdit_domain_mailboxes'] = 'Schránok'; +$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = zakázať | 0 = neobmedzene'; +$PALANG['pAdminEdit_domain_maxquota'] = 'Maximálna kvóta'; +$PALANG['pAdminEdit_domain_maxquota_text'] = 'MB<br /> -1 = vypnúť | 0 = neobmedzene'; +$PALANG['pAdminEdit_domain_transport'] = 'Transport'; +$PALANG['pAdminEdit_domain_transport_text'] = 'Použiť transport'; +$PALANG['pAdminEdit_domain_backupmx'] = 'Mail server je záložný MX'; +$PALANG['pAdminEdit_domain_active'] = 'Aktívna'; +$PALANG['pAdminEdit_domain_button'] = 'Upraviť doménu'; +$PALANG['pAdminEdit_domain_result_error'] = '<span class="error_msg">Nepodarilo sa upraviť doménu!</span>'; -$PALANG['pAdminCreate_admin_welcome'] = 'Pridať nového administrátora'; -$PALANG['pAdminCreate_admin_username'] = 'Uživateľské meno'; -$PALANG['pAdminCreate_admin_username_text'] = 'Emailová adresa'; -$PALANG['pAdminCreate_admin_username_text_error1'] = 'Emailová adresa<br /><span class="error_msg">Táto adresa nie je platná!</span>'; -$PALANG['pAdminCreate_admin_username_text_error2'] = 'Email address<br /><span class="error_msg">Takáto adresa už existuje!</span>'; +$PALANG['pAdminCreate_admin_welcome'] = 'Pridať nového administrátora'; +$PALANG['pAdminCreate_admin_username'] = 'Užívateľské meno'; +$PALANG['pAdminCreate_admin_username_text'] = 'Emailová adresa'; +$PALANG['pAdminCreate_admin_username_text_error1'] = 'Emailová adresa<br /><span class="error_msg">Táto adresa nie je platná!</span>'; +$PALANG['pAdminCreate_admin_username_text_error2'] = 'Email address<br /><span class="error_msg">Takáto adresa už existuje!</span>'; $PALANG['pAdminCreate_admin_password'] = 'Heslo'; $PALANG['pAdminCreate_admin_password2'] = 'Heslo (znovu)'; -$PALANG['pAdminCreate_admin_password_text_error'] = '<span class="error_msg">Zadané heslá sú rozdielne alebo prázdne!</span>'; -$PALANG['pAdminCreate_admin_button'] = 'Pridať administrátora'; -$PALANG['pAdminCreate_admin_result_error'] = '<span class="error_msg">Nepodarilo sa pridať administrátora!</span>'; -$PALANG['pAdminCreate_admin_result_success'] = 'Administrátor bol pidaný!'; -$PALANG['pAdminCreate_admin_address'] = 'Doména'; +$PALANG['pAdminCreate_admin_password_text_error'] = '<span class="error_msg">Zadané heslá sú rozdielne alebo prázdne!</span>'; +$PALANG['pAdminCreate_admin_button'] = 'Vytvoriť administrátora'; +$PALANG['pAdminCreate_admin_result_error'] = '<span class="error_msg">Nepodarilo sa pridať administrátora!</span>'; +$PALANG['pAdminCreate_admin_result_success'] = 'Administrátor bol pridaný!'; +$PALANG['pAdminCreate_admin_address'] = 'Domény'; -$PALANG['pAdminEdit_admin_welcome'] = 'Upraviť doménového administrátora'; -$PALANG['pAdminEdit_admin_username'] = 'Uživateľské meno'; +$PALANG['pAdminEdit_admin_welcome'] = 'Upraviť doménového administrátora'; +$PALANG['pAdminEdit_admin_username'] = 'Užívateľské meno'; $PALANG['pAdminEdit_admin_password'] = 'Heslo'; $PALANG['pAdminEdit_admin_password2'] = 'Heslo (znovu)'; -$PALANG['pAdminEdit_admin_password_text_error'] = '<span class="error_msg">Zadané heslá sú rozdielne alebo prázdne!</span>'; -$PALANG['pAdminEdit_admin_active'] = 'Aktívny'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX -$PALANG['pAdminEdit_admin_button'] = 'Upraviť administrátora'; -$PALANG['pAdminEdit_admin_result_error'] = '<span class="error_msg">Nepodarilo sa upraviť administrátora!</span>'; -$PALANG['pAdminEdit_admin_result_success'] = 'Administrátor bol upravený!'; +$PALANG['pAdminEdit_admin_password_text_error'] = '<span class="error_msg">Zadané heslá sú rozdielne alebo prázdne!</span>'; +$PALANG['pAdminEdit_admin_active'] = 'Aktívny'; +$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; +$PALANG['pAdminEdit_admin_button'] = 'Upraviť administrátora'; +$PALANG['pAdminEdit_admin_result_error'] = '<span class="error_msg">Nepodarilo sa upraviť administrátora!</span>'; +$PALANG['pAdminEdit_admin_result_success'] = 'Administrátor bol upravený!'; -$PALANG['pUsersLogin_welcome'] = 'Tu sa prihlasujú užívatelia pre zmenu hesla alebo presmerovanie.'; -$PALANG['pUsersLogin_username'] = 'Uživateľské meno (email)'; +$PALANG['pUsersLogin_welcome'] = 'Prihlásenie užívateľov pre zmenu hesla alebo presmerovanie'; +$PALANG['pUsersLogin_username'] = 'Užívateľské meno (email)'; $PALANG['pUsersLogin_password'] = 'Heslo'; -$PALANG['pUsersLogin_button'] = 'Prihlásiť'; -$PALANG['pUsersLogin_username_incorrect'] = 'Nesprávné uživateľské meno. Prihlasujte sa svojou emailovou adresou!'; -$PALANG['pUsersLogin_password_incorrect'] = 'Nesprávne heslo!'; +$PALANG['pUsersLogin_button'] = 'Prihlásiť'; +$PALANG['pUsersLogin_username_incorrect'] = 'Nesprávné užívateľské meno. Prihlasujte sa svojou emailovou adresou!'; +$PALANG['pUsersLogin_password_incorrect'] = 'Nesprávne heslo!'; -$PALANG['pUsersMenu_vacation'] = 'Automatická odpoveď'; +$PALANG['pUsersMenu_vacation'] = 'Automatická odpoveď'; $PALANG['pUsersMenu_edit_alias'] = 'Presmerovanie'; $PALANG['pUsersMenu_password'] = 'Zmena hesla'; -$PALANG['pUsersMain_vacation'] = 'Nastaviť ,,som preč`` alebo podobnú automatickú odpoveď.'; -$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX -$PALANG['pUsersMain_edit_alias'] = 'Nastaviť / zmeniť presmerovanie'; -$PALANG['pUsersMain_password'] = 'Zmeniť heslo'; +$PALANG['pUsersMain_vacation'] = 'Nastaviť automatickú odpoveď (dovolenka a pod.).'; +$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' zapnutá, kliknite na \'' . $PALANG['pUsersMenu_vacation'] . '\', ak ju chcete ' . $PALANG['edit'] . '/odstrániť'; +$PALANG['pUsersMain_edit_alias'] = 'Nastaviť/zmeniť presmerovanie'; +$PALANG['pUsersMain_password'] = 'Zmeniť heslo'; -$PALANG['pUsersVacation_welcome'] = 'Automatická odpoveď'; -$PALANG['pUsersVacation_welcome_text'] = 'Už máate nastavenú automatickú odpoveď!'; +$PALANG['pUsersVacation_welcome'] = 'Automatická odpoveď'; +$PALANG['pUsersVacation_welcome_text'] = 'Automatická odpoveď je zapnutá!'; $PALANG['pUsersVacation_subject'] = 'Predmet'; $PALANG['pUsersVacation_subject_text'] = 'Dovolenka'; -$PALANG['pUsersVacation_body'] = 'Obsah'; # XXX text changed to 'Message' +$PALANG['pUsersVacation_body'] = 'Správa'; $PALANG['pUsersVacation_body_text'] = <<<EOM Som na dovolenke od <date> od <date>. -S neodkladnými zprávami kontaktujte <contact person>. +S neodkladnými vecami kontaktujte <contact person>. EOM; -$PALANG['pUsersVacation_button_away'] = 'Odísť'; -$PALANG['pUsersVacation_button_back'] = 'Vrátiť sa'; -$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Nepodarilo sa upraviť nastavenie!</span>'; -$PALANG['pUsersVacation_result_success'] = 'Nastavenie bolo upravené!'; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX +$PALANG['pUsersVacation_button_away'] = 'Zmeniť/nastaviť aut. odpoveď'; +$PALANG['pUsersVacation_button_back'] = 'Odstrániť aut. odpoveď'; +$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Nepodarilo sa upraviť nastavenie!</span>'; +$PALANG['pUsersVacation_result_success'] = 'Nastavenie bolo upravené!'; +$PALANG['pUsersVacation_activefrom'] = 'Aktívna od'; +$PALANG['pUsersVacation_activeuntil'] = 'Aktívna do'; -$PALANG['pCreate_dbLog_createmailbox'] = 'vytvoriť mailbox'; -$PALANG['pCreate_dbLog_createalias'] = 'vytvoriť alias'; -$PALANG['pDelete_dbLog_deletealias'] = 'zmazať alias'; -$PALANG['pDelete_dbLog_deletemailbox'] = 'zmazať mailbox'; +$PALANG['pCreate_dbLog_createmailbox'] = 'vytvoriť mailbox'; +$PALANG['pCreate_dbLog_createalias'] = 'vytvoriť alias'; +$PALANG['pDelete_dbLog_deletealias'] = 'zmazať alias'; +$PALANG['pDelete_dbLog_deletemailbox'] = 'zmazať mailbox'; -$PALANG['pEdit_dbLog_editactive'] = 'change active state'; # XXX -$PALANG['pEdit_dbLog_editalias'] = 'upraviť alias'; -$PALANG['pEdit_dbLog_editmailbox'] = 'upraviť mailbox'; +$PALANG['pEdit_dbLog_editactive'] = 'zmena aktivity'; +$PALANG['pEdit_dbLog_editalias'] = 'upraviť alias'; +$PALANG['pEdit_dbLog_editmailbox'] = 'upraviť mailbox'; -$PALANG['pSearch'] = 'search'; # XXX -$PALANG['pSearch_welcome'] = 'Hladať: '; -$PALANG['pReturn_to'] = 'Return to'; # XXX -$PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX -$PALANG['pBroadcast_from'] = 'From'; # XXX -$PALANG['pBroadcast_name'] = 'Your name'; # XXX -$PALANG['pBroadcast_subject'] = 'Subject'; # XXX -$PALANG['pBroadcast_message'] = 'Message'; # XXX -$PALANG['pBroadcast_send'] = 'Send message'; # XXX -$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX -$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX -$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX -$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX -$PALANG['pStatus_custom'] = 'Delivers to '; # XXX -$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX -$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX -$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX -$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX -$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX -$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX -$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX -$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX -$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX -$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX -$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX -$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX -$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX -$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX -$PALANG['pFetchmail_field_id'] = 'ID'; # XXX -$PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX -$PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX -$PALANG['pFetchmail_field_src_auth'] = 'Auth Type'; # XXX -$PALANG['pFetchmail_field_src_user'] = 'User'; # XXX -$PALANG['pFetchmail_field_src_password'] = 'Password'; # XXX -$PALANG['pFetchmail_field_src_folder'] = 'Folder'; # XXX -$PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX -$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX -$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX -$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX -$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX -$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX -$PALANG['pFetchmail_field_date'] = 'Date'; # XXX -$PALANG['pFetchmail_field_returned_text'] = 'Returned Text'; # XXX -$PALANG['pFetchmail_desc_id'] = 'Record ID'; # XXX -$PALANG['pFetchmail_desc_mailbox'] = 'Local mailbox'; # XXX -$PALANG['pFetchmail_desc_src_server'] = 'Remote Server'; # XXX -$PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here # XXX -$PALANG['pFetchmail_desc_src_user'] = 'Remote User'; # XXX -$PALANG['pFetchmail_desc_src_password'] = 'Remote Password'; # XXX -$PALANG['pFetchmail_desc_src_folder'] = 'Remote Folder'; # XXX -$PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX -$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX -$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX -$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX -$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX -$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX -$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX -$PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX +$PALANG['pSearch'] = 'Hľadanie'; +$PALANG['pSearch_welcome'] = 'Hľadanie: '; +$PALANG['pReturn_to'] = 'Návrat na'; +$PALANG['pBroadcast_title'] = 'Poslať hromadnú správu všetkým používateľom'; +$PALANG['pBroadcast_from'] = 'Od'; +$PALANG['pBroadcast_name'] = 'Vaše meno'; +$PALANG['pBroadcast_subject'] = 'Predmet'; +$PALANG['pBroadcast_message'] = 'Obsah'; +$PALANG['pBroadcast_send'] = 'Poslať správu'; +$PALANG['pBroadcast_success'] = 'Hromadná správa bola odoslaná.'; +$PALANG['pAdminMenu_broadcast_message'] = 'Hromadná správa'; +$PALANG['pBroadcast_error_empty'] = 'Polie Vaše meno, Predmet a Obsah nemôžu byť prázdne!'; +$PALANG['pStatus_undeliverable'] = 'možno NEDORUČITEĽNÉ '; +$PALANG['pStatus_custom'] = 'Doručuje sa na '; +$PALANG['pStatus_popimap'] = 'POP/IMAP '; +$PALANG['pPasswordTooShort'] = "Heslo je príliš krátke - musí mať aspoň %s znakov"; +$PALANG['pInvalidDomainRegex'] = "Neplatný názov domény %s"; +$PALANG['pInvalidDomainDNS'] = "Neplatná doména %s alebo neexistuje jej DNS záznam"; +$PALANG['pInvalidMailRegex'] = "Neplatná emailová adresa"; +$PALANG['pFetchmail_welcome'] = 'Sťahovanie emailu pre:'; +$PALANG['pFetchmail_new_entry'] = 'Nová položka'; +$PALANG['pFetchmail_database_save_error'] = 'Nepodarilo sa uložiť položku do databázy!'; +$PALANG['pFetchmail_database_save_success'] = 'Položka uložená do databázy.'; +$PALANG['pFetchmail_error_invalid_id'] = 'Položka s ID %s neexistuje!'; +$PALANG['pFetchmail_invalid_mailbox'] = 'Neplatná schránka!'; +$PALANG['pFetchmail_server_missing'] = 'Zadajte názov vzdialeného servera!'; +$PALANG['pFetchmail_user_missing'] = 'Zadajte meno vzdialeného používateľa!'; +$PALANG['pFetchmail_password_missing'] = 'Zadajte heslo vzdialeného používateľa!'; +$PALANG['pFetchmail_field_id'] = 'ID'; +$PALANG['pFetchmail_field_mailbox'] = 'Schránka'; +$PALANG['pFetchmail_field_src_server'] = 'Server'; +$PALANG['pFetchmail_field_src_auth'] = 'Autentifikácia'; +$PALANG['pFetchmail_field_src_user'] = 'Meno'; +$PALANG['pFetchmail_field_src_password'] = 'Heslo'; +$PALANG['pFetchmail_field_src_folder'] = 'Adresár'; +$PALANG['pFetchmail_field_poll_time'] = 'Opakovanie'; +$PALANG['pFetchmail_field_fetchall'] = 'Staré'; +$PALANG['pFetchmail_field_keep'] = 'Ponechať'; +$PALANG['pFetchmail_field_protocol'] = 'Protokol'; +$PALANG['pFetchmail_field_usessl'] = 'SSL'; +$PALANG['pFetchmail_field_extra_options'] = 'Parametre'; +$PALANG['pFetchmail_field_mda'] = 'MDA'; +$PALANG['pFetchmail_field_date'] = 'Dátum'; +$PALANG['pFetchmail_field_returned_text'] = 'Výsledok'; +$PALANG['pFetchmail_desc_id'] = 'ID záznamu'; +$PALANG['pFetchmail_desc_mailbox'] = 'Lokálna schránka'; +$PALANG['pFetchmail_desc_src_server'] = 'Vzdialený server'; +$PALANG['pFetchmail_desc_src_auth'] = 'Väčšinou \'password\''; # Translators: Please do NOT translate 'password' here +$PALANG['pFetchmail_desc_src_user'] = 'Vzdialené meno používateľa'; +$PALANG['pFetchmail_desc_src_password'] = 'Vzdialené heslo'; +$PALANG['pFetchmail_desc_src_folder'] = 'Vzdialený adresár'; +$PALANG['pFetchmail_desc_poll_time'] = 'Sťahovať každých ... minút'; +$PALANG['pFetchmail_desc_fetchall'] = 'Sťahovať staré (prečítané) aj nové správy'; +$PALANG['pFetchmail_desc_keep'] = 'Ponechať stiahnuté správy na vzdialenom serveri'; +$PALANG['pFetchmail_desc_protocol'] = 'Použiť protokol'; +$PALANG['pFetchmail_desc_usessl'] = 'Šifrovanie SSL'; +$PALANG['pFetchmail_desc_extra_options'] = 'Ďalšie parametre pre fetchmail'; +$PALANG['pFetchmail_desc_mda'] = 'Doručovací program (Mail Delivery Agent)'; +$PALANG['pFetchmail_desc_date'] = 'Dátum... [truncated message content] |
From: <chr...@us...> - 2011-02-19 20:10:31
|
Revision: 969 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=969&view=rev Author: christian_boltz Date: 2011-02-19 20:10:22 +0000 (Sat, 19 Feb 2011) Log Message: ----------- Merging in various fixes from trunk. upgrade.php: - change domain.quota, domain.maxquota and mailbox.quota to bigint in PostgreSQL setup.php: - strict boolean check for $CONF['configured'] - similar to the check in login.php Modified Paths: -------------- branches/postfixadmin-2.3/CHANGELOG.TXT branches/postfixadmin-2.3/setup.php branches/postfixadmin-2.3/upgrade.php Modified: branches/postfixadmin-2.3/CHANGELOG.TXT =================================================================== --- branches/postfixadmin-2.3/CHANGELOG.TXT 2011-02-18 21:59:42 UTC (rev 968) +++ branches/postfixadmin-2.3/CHANGELOG.TXT 2011-02-19 20:10:22 UTC (rev 969) @@ -21,6 +21,8 @@ - functions.inc.php: better error messages when database functions are missing - create domain: fixed typo in variable name that broke the default value for default aliases + - postgres: changed mailbox.quota, domain.quota and domain.maxquota fields + to bigint to allow mailboxes >4 GB (run setup.php to upgrade your database) - vacation.pl logged literal $variable instead of the variable content at two places - POSTFIX_CONF.txt: fixed filename for quota map Modified: branches/postfixadmin-2.3/setup.php =================================================================== --- branches/postfixadmin-2.3/setup.php 2011-02-18 21:59:42 UTC (rev 968) +++ branches/postfixadmin-2.3/setup.php 2011-02-19 20:10:22 UTC (rev 969) @@ -125,7 +125,7 @@ require($incpath.'/config.inc.php'); if(isset($CONF['configured'])) { - if($CONF['configured'] == TRUE) { + if($CONF['configured'] === TRUE) { print "<li>Checking \$CONF['configured'] - OK\n"; } else { print "<li><b>Warning: \$CONF['configured'] is 'false'.<br>\n"; Modified: branches/postfixadmin-2.3/upgrade.php =================================================================== --- branches/postfixadmin-2.3/upgrade.php 2011-02-18 21:59:42 UTC (rev 968) +++ branches/postfixadmin-2.3/upgrade.php 2011-02-19 20:10:22 UTC (rev 969) @@ -108,7 +108,7 @@ function _do_upgrade($current_version) { global $CONF; # $target_version = preg_replace('/[^0-9]/', '', '$Revision$'); - $target_version = 739; # hardcoded target version for 2.3 branch - increase (by one) if database changes in the branch are necessary + $target_version = 740; # hardcoded target version for 2.3 branch - increase (by one) if database changes in the branch are necessary if ($current_version >= $target_version) { # already up to date @@ -1182,3 +1182,13 @@ FOR EACH ROW EXECUTE PROCEDURE merge_quota2(); "); } + +function upgrade_740_pgsql() { # upgrade_968_pgsql() in SVN trunk + # pgsql counterpart for upgrade_169_mysql() - allow really big quota + $table_domain = table_by_key ('domain'); + $table_mailbox = table_by_key('mailbox'); + db_query_parsed("ALTER TABLE $table_domain ALTER COLUMN quota type bigint"); + db_query_parsed("ALTER TABLE $table_domain ALTER COLUMN maxquota type bigint"); + db_query_parsed("ALTER TABLE $table_mailbox ALTER COLUMN quota type bigint"); +} + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2011-03-03 20:57:14
|
Revision: 980 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=980&view=rev Author: christian_boltz Date: 2011-03-03 20:57:08 +0000 (Thu, 03 Mar 2011) Log Message: ----------- functions.inc.php: - db_delete(): revert table_by_key() call - otherwise I would have to merge the changes from r977 to delete.php which is the only file calling db_delete in 2.3.x and expects that db_delete does not run table_by_key(). That's a risk we can avoid because (interesting math follows...) buggy db_delete() + buggy delete.php = working code :-) Modified Paths: -------------- branches/postfixadmin-2.3/CHANGELOG.TXT branches/postfixadmin-2.3/functions.inc.php Modified: branches/postfixadmin-2.3/CHANGELOG.TXT =================================================================== --- branches/postfixadmin-2.3/CHANGELOG.TXT 2011-03-02 22:47:14 UTC (rev 979) +++ branches/postfixadmin-2.3/CHANGELOG.TXT 2011-03-03 20:57:08 UTC (rev 980) @@ -28,8 +28,6 @@ - POSTFIX_CONF.txt: fixed filename for quota map - config.inc.php: removed double $CONF['database_prefix'] - config.inc.php: fixed comments about domain_post* script parameters - - fixed db_delete() to use table_by_key() so that it works with non-default - table names - updated INSTALL.TXT and UPGRADE.TXT - sk translation update - some more minor fixes Modified: branches/postfixadmin-2.3/functions.inc.php =================================================================== --- branches/postfixadmin-2.3/functions.inc.php 2011-03-02 22:47:14 UTC (rev 979) +++ branches/postfixadmin-2.3/functions.inc.php 2011-03-03 20:57:08 UTC (rev 980) @@ -1660,7 +1660,8 @@ // function db_delete ($table,$where,$delete) { - $table = table_by_key($table); + # $table = table_by_key($table); # intentionally disabled to avoid breaking delete.php in 2.3.x + # This makes the behaviour of this function incorrect, but delete.php is the only file in 2.3.x calling db_delete and expects this (wrong) behaviour. $query = "DELETE FROM $table WHERE " . escape_string($where) . "='" . escape_string($delete) . "'"; $result = db_query ($query); if ($result['rows'] >= 1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2011-03-06 21:31:01
|
Revision: 987 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=987&view=rev Author: christian_boltz Date: 2011-03-06 21:30:55 +0000 (Sun, 06 Mar 2011) Log Message: ----------- edit-vacation: - db_log vacation changes Known bug: enabling vacation causes two log entries if the user used vacation before. Better than not logging vacation changes at all. trunk already has a different fix - it uses VacationHandler which does indirect logging via AliasHandler. Modified Paths: -------------- branches/postfixadmin-2.3/CHANGELOG.TXT branches/postfixadmin-2.3/edit-vacation.php Modified: branches/postfixadmin-2.3/CHANGELOG.TXT =================================================================== --- branches/postfixadmin-2.3/CHANGELOG.TXT 2011-03-06 20:40:41 UTC (rev 986) +++ branches/postfixadmin-2.3/CHANGELOG.TXT 2011-03-06 21:30:55 UTC (rev 987) @@ -25,6 +25,7 @@ to bigint to allow mailboxes >4 GB (run setup.php to upgrade your database) - vacation.pl logged literal $variable instead of the variable content at two places + - edit-vacation: log enabling/disabling vacation if done by admins - POSTFIX_CONF.txt: fixed filename for quota map - config.inc.php: removed double $CONF['database_prefix'] - config.inc.php: fixed comments about domain_post* script parameters Modified: branches/postfixadmin-2.3/edit-vacation.php =================================================================== --- branches/postfixadmin-2.3/edit-vacation.php 2011-03-06 20:40:41 UTC (rev 986) +++ branches/postfixadmin-2.3/edit-vacation.php 2011-03-06 21:30:55 UTC (rev 987) @@ -55,6 +55,7 @@ $fUsername = $SESSID_USERNAME; $fDomain = $USERID_DOMAIN; } +list (/*NULL*/, $domain) = explode('@', $fUsername); $vacation_domain = $CONF['vacation_domain']; $vacation_goto = preg_replace('/@/', '#', $fUsername); @@ -140,6 +141,7 @@ { $error = 1; } + db_log($SESSID_USERNAME, $domain, 'edit_alias', "$fUsername -> $goto"); } } } @@ -184,6 +186,7 @@ { $error = 1; } + db_log($SESSID_USERNAME, $domain, 'edit_alias', "$fUsername -> $goto"); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2011-03-13 20:36:30
|
Revision: 999 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=999&view=rev Author: christian_boltz Date: 2011-03-13 20:36:24 +0000 (Sun, 13 Mar 2011) Log Message: ----------- r999 is the 2.3.3 release :-) update CHANGELOG and functions.inc.php Modified Paths: -------------- branches/postfixadmin-2.3/CHANGELOG.TXT branches/postfixadmin-2.3/functions.inc.php Modified: branches/postfixadmin-2.3/CHANGELOG.TXT =================================================================== --- branches/postfixadmin-2.3/CHANGELOG.TXT 2011-03-09 20:50:13 UTC (rev 998) +++ branches/postfixadmin-2.3/CHANGELOG.TXT 2011-03-13 20:36:24 UTC (rev 999) @@ -10,7 +10,7 @@ # Last update: # $Id$ -Version 2.3.3 - 2011/**/** - SVN r*** (postfixadmin-2.3 branch) +Version 2.3.3 - 2011/03/13 - SVN r999 (postfixadmin-2.3 branch) --------------------------------------------------------------- - create-alias: allow multiple alias targets Modified: branches/postfixadmin-2.3/functions.inc.php =================================================================== --- branches/postfixadmin-2.3/functions.inc.php 2011-03-09 20:50:13 UTC (rev 998) +++ branches/postfixadmin-2.3/functions.inc.php 2011-03-13 20:36:24 UTC (rev 999) @@ -16,7 +16,7 @@ * Contains re-usable code. */ -$version = '2.3.2'; +$version = '2.3.3'; /** * check_session This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2011-04-10 13:13:18
|
Revision: 1025 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1025&view=rev Author: christian_boltz Date: 2011-04-10 13:13:12 +0000 (Sun, 10 Apr 2011) Log Message: ----------- fix typo in variable name Reported by Gabriele Vivinetto (gabrielev@SF), https://sourceforge.net/tracker/?func=detail&aid=3266862&group_id=191583&atid=937964 Modified Paths: -------------- branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/functions.inc.php branches/postfixadmin-2.3/CHANGELOG.TXT Modified: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/functions.inc.php =================================================================== --- branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/functions.inc.php 2011-04-10 13:09:48 UTC (rev 1024) +++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/functions.inc.php 2011-04-10 13:13:12 UTC (rev 1025) @@ -92,7 +92,7 @@ // Call: check_email (string email) // function check_email ($email) { - $return = filter_var('validate_email', $emai); + $return = filter_var('validate_email', $email); if($return === false) { return false; } Modified: branches/postfixadmin-2.3/CHANGELOG.TXT =================================================================== --- branches/postfixadmin-2.3/CHANGELOG.TXT 2011-04-10 13:09:48 UTC (rev 1024) +++ branches/postfixadmin-2.3/CHANGELOG.TXT 2011-04-10 13:13:12 UTC (rev 1025) @@ -10,6 +10,11 @@ # Last update: # $Id$ +Changes after 2.3.3 release (postfixadmin-2.3 branch) +--------------------------------------------------------------- + + - fix typo in variable name in squirrelmail plugin + Version 2.3.3 - 2011/03/14 - SVN r1010 (postfixadmin-2.3 branch) --------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2011-04-10 14:27:54
|
Revision: 1027 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1027&view=rev Author: christian_boltz Date: 2011-04-10 14:27:48 +0000 (Sun, 10 Apr 2011) Log Message: ----------- functions.inc.php: - generate_password(): generate more secure random password Based on a patch from Pierre Fagrell (mrfrenzy@SF), https://sourceforge.net/tracker/?func=detail&aid=2958698&group_id=191583&atid=937964 (with some modifications) Modified Paths: -------------- branches/postfixadmin-2.3/CHANGELOG.TXT branches/postfixadmin-2.3/functions.inc.php Modified: branches/postfixadmin-2.3/CHANGELOG.TXT =================================================================== --- branches/postfixadmin-2.3/CHANGELOG.TXT 2011-04-10 14:16:17 UTC (rev 1026) +++ branches/postfixadmin-2.3/CHANGELOG.TXT 2011-04-10 14:27:48 UTC (rev 1027) @@ -13,7 +13,8 @@ Changes after 2.3.3 release (postfixadmin-2.3 branch) --------------------------------------------------------------- - - fix typo in variable name in squirrelmail plugin + - generate more secure random passwords + - squirrelmail plugin: fix typo in variable name Version 2.3.3 - 2011/03/14 - SVN r1010 (postfixadmin-2.3 branch) --------------------------------------------------------------- Modified: branches/postfixadmin-2.3/functions.inc.php =================================================================== --- branches/postfixadmin-2.3/functions.inc.php 2011-04-10 14:16:17 UTC (rev 1026) +++ branches/postfixadmin-2.3/functions.inc.php 2011-04-10 14:27:48 UTC (rev 1027) @@ -1107,9 +1107,30 @@ // Action: Generates a random password // Call: generate_password () // -function generate_password () -{ - $password = substr (md5 (mt_rand ()), 0, 8); +function generate_password () { + global $CONF; + + //check that password length is sensible + $length = (int) $CONF['min_password_length']; + if ($length < 5 || $length > 32) { + $length = 8; + } + + // define possible characters + $possible = "2345678923456789abcdefghijkmnpqrstuvwxyzABCDEFGHIJKLMNPQRSTUVWXYZ"; # skip 0 and 1 to avoid confusion with O and l + + // add random characters to $password until $length is reached + $password = ""; + while (strlen($password) < $length) { + // pick a random character from the possible ones + $char = substr($possible, mt_rand(0, strlen($possible)-1), 1); + + // we don't want this character if it's already in the password + if (!strstr($password, $char)) { + $password .= $char; + } + } + return $password; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2011-04-10 14:46:49
|
Revision: 1029 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1029&view=rev Author: christian_boltz Date: 2011-04-10 14:46:43 +0000 (Sun, 10 Apr 2011) Log Message: ----------- list-domain.php: - add explicit field list in SELECT to avoid PgSQL problems with custom columns Reported by ksb (ksb4ever@SF), https://sourceforge.net/tracker/?func=detail&aid=2859165&group_id=191583&atid=937964 Modified Paths: -------------- branches/postfixadmin-2.3/CHANGELOG.TXT branches/postfixadmin-2.3/list-domain.php Modified: branches/postfixadmin-2.3/CHANGELOG.TXT =================================================================== --- branches/postfixadmin-2.3/CHANGELOG.TXT 2011-04-10 14:42:08 UTC (rev 1028) +++ branches/postfixadmin-2.3/CHANGELOG.TXT 2011-04-10 14:46:43 UTC (rev 1029) @@ -15,6 +15,7 @@ - generate more secure random passwords - squirrelmail plugin: fix typo in variable name + - list-domain: fix SELECT query to work with PgSQL even when using custom fields Version 2.3.3 - 2011/03/14 - SVN r1010 (postfixadmin-2.3 branch) --------------------------------------------------------------- Modified: branches/postfixadmin-2.3/list-domain.php =================================================================== --- branches/postfixadmin-2.3/list-domain.php 2011-04-10 14:42:08 UTC (rev 1028) +++ branches/postfixadmin-2.3/list-domain.php 2011-04-10 14:46:43 UTC (rev 1029) @@ -63,15 +63,21 @@ } # fetch domain data and number of mailboxes -# (PgSQL requires the extensive GROUP BY statement, https://sourceforge.net/forum/message.php?msg_id=7386240) +# PgSQL requires the extensive GROUP BY statement (https://sourceforge.net/forum/message.php?msg_id=7386240) +# and also in the field list (https://sourceforge.net/tracker/?func=detail&aid=2859165&group_id=191583&atid=937964) +# Note: future versions should auto-generate the field list based on $struct in DomainHandler (use all fields from the domain table) +$table_domain_fieldlist = " + $table_domain.domain, $table_domain.description, $table_domain.aliases, $table_domain.mailboxes, + $table_domain.maxquota, $table_domain.quota, $table_domain.transport, $table_domain.backupmx, $table_domain.created, + $table_domain.modified, $table_domain.active +"; + $query = " - SELECT $table_domain.* , COUNT( DISTINCT $table_mailbox.username ) AS mailbox_count + SELECT $table_domain_fieldlist , COUNT( DISTINCT $table_mailbox.username ) AS mailbox_count FROM $table_domain LEFT JOIN $table_mailbox ON $table_domain.domain = $table_mailbox.domain $where - GROUP BY $table_domain.domain, $table_domain.description, $table_domain.aliases, $table_domain.mailboxes, - $table_domain.maxquota, $table_domain.quota, $table_domain.transport, $table_domain.backupmx, $table_domain.created, - $table_domain.modified, $table_domain.active + GROUP BY $table_domain_fieldlist ORDER BY $table_domain.domain "; $result = db_query($query); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |