Menu
▾
▴
postfixadmin-svn — Postfix Admin SVN commit messages - READ ONLY!
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(13) |
Oct
(63) |
Nov
(79) |
Dec
(34) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(15) |
Feb
(8) |
Mar
(8) |
Apr
(44) |
May
(18) |
Jun
(20) |
Jul
(35) |
Aug
(21) |
Sep
(8) |
Oct
(9) |
Nov
(21) |
Dec
(14) |
| 2009 |
Jan
(53) |
Feb
(13) |
Mar
(36) |
Apr
(40) |
May
(22) |
Jun
(10) |
Jul
(18) |
Aug
(18) |
Sep
(7) |
Oct
(26) |
Nov
(32) |
Dec
(13) |
| 2010 |
Jan
(6) |
Feb
(7) |
Mar
(12) |
Apr
(2) |
May
(12) |
Jun
(8) |
Jul
(9) |
Aug
(12) |
Sep
(12) |
Oct
(7) |
Nov
(9) |
Dec
(42) |
| 2011 |
Jan
(10) |
Feb
(35) |
Mar
(43) |
Apr
(39) |
May
(8) |
Jun
(8) |
Jul
(83) |
Aug
(20) |
Sep
(20) |
Oct
(63) |
Nov
(33) |
Dec
(20) |
| 2012 |
Jan
(28) |
Feb
(3) |
Mar
(1) |
Apr
(37) |
May
(16) |
Jun
(7) |
Jul
(3) |
Aug
|
Sep
|
Oct
(3) |
Nov
(1) |
Dec
(4) |
| 2013 |
Jan
(6) |
Feb
(16) |
Mar
(9) |
Apr
(11) |
May
(9) |
Jun
(30) |
Jul
(17) |
Aug
(6) |
Sep
(2) |
Oct
(30) |
Nov
(41) |
Dec
(26) |
| 2014 |
Jan
(16) |
Feb
(20) |
Mar
(5) |
Apr
(4) |
May
(14) |
Jun
(4) |
Jul
(1) |
Aug
|
Sep
(8) |
Oct
(18) |
Nov
(26) |
Dec
|
| 2015 |
Jan
(4) |
Feb
(9) |
Mar
(12) |
Apr
(26) |
May
(3) |
Jun
(3) |
Jul
(2) |
Aug
|
Sep
(15) |
Oct
(13) |
Nov
|
Dec
(1) |
| 2016 |
Jan
(1) |
Feb
(5) |
Mar
(4) |
Apr
(3) |
May
(19) |
Jun
|
Jul
|
Aug
(3) |
Sep
(16) |
Oct
(4) |
Nov
(5) |
Dec
(5) |
| 2017 |
Jan
(1) |
Feb
(8) |
Mar
|
Apr
(7) |
May
(3) |
Jun
(16) |
Jul
(13) |
Aug
(16) |
Sep
(6) |
Oct
(4) |
Nov
(10) |
Dec
(7) |
| 2018 |
Jan
(16) |
Feb
(17) |
Mar
(11) |
Apr
(13) |
May
(20) |
Jun
(3) |
Jul
(10) |
Aug
|
Sep
(3) |
Oct
(1) |
Nov
(6) |
Dec
(18) |
| 2019 |
Jan
(18) |
Feb
(31) |
Mar
(4) |
Apr
(4) |
May
(1) |
Jun
(8) |
Jul
(7) |
Aug
(10) |
Sep
(23) |
Oct
(6) |
Nov
(3) |
Dec
(5) |
| 2020 |
Jan
(10) |
Feb
(18) |
Mar
(34) |
Apr
(19) |
May
(6) |
Jun
(9) |
Jul
|
Aug
(10) |
Sep
(16) |
Oct
(6) |
Nov
(3) |
Dec
(11) |
| 2021 |
Jan
(118) |
Feb
(22) |
Mar
(13) |
Apr
(12) |
May
(48) |
Jun
(21) |
Jul
(17) |
Aug
(12) |
Sep
(19) |
Oct
(25) |
Nov
(16) |
Dec
(7) |
| 2022 |
Jan
(6) |
Feb
(7) |
Mar
(14) |
Apr
(4) |
May
|
Jun
(16) |
Jul
(18) |
Aug
(5) |
Sep
(12) |
Oct
(8) |
Nov
(10) |
Dec
(13) |
| 2023 |
Jan
|
Feb
(3) |
Mar
(2) |
Apr
(1) |
May
(2) |
Jun
(6) |
Jul
(3) |
Aug
(3) |
Sep
(3) |
Oct
(2) |
Nov
(7) |
Dec
(13) |
| 2024 |
Jan
(8) |
Feb
(6) |
Mar
(5) |
Apr
(10) |
May
(8) |
Jun
(6) |
Jul
(2) |
Aug
(1) |
Sep
(2) |
Oct
(4) |
Nov
(15) |
Dec
(10) |
| 2025 |
Jan
(3) |
Feb
(12) |
Mar
(3) |
Apr
(7) |
May
(18) |
Jun
(10) |
Jul
(10) |
Aug
(6) |
Sep
(16) |
Oct
(3) |
Nov
|
Dec
|
|
From: <Gin...@us...> - 2008-04-10 10:19:28
|
Revision: 328
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=328&view=rev
Author: GingerDog
Date: 2008-04-10 03:19:35 -0700 (Thu, 10 Apr 2008)
Log Message:
-----------
setup.php - call upgrade.php to undertake DB upgrade/table creation as necessary (revert previous change to $CONF[configured] too)
Modified Paths:
--------------
trunk/setup.php
Modified: trunk/setup.php
===================================================================
--- trunk/setup.php 2008-04-10 10:18:46 UTC (rev 327)
+++ trunk/setup.php 2008-04-10 10:19:35 UTC (rev 328)
@@ -121,8 +121,8 @@
if($CONF['configured'] == TRUE) {
print "<li>Checking \$CONF['configured'] - OK\n";
} else {
- print "<li><b>Error: \$CONF['configured'] is 'false'.<br>\n";
- print "Please edit your config.inc.php settings and then change it.</b>\n";
+ print "<li><b>Warning: \$CONF['configured'] is 'false'.<br>\n";
+ print "You must edit your config.inc.php and change this to true (this indicates you've created the database and user)</b>\n";
}
}
}
@@ -269,7 +269,8 @@
}
else
{
- print "<p>Everything seems fine... you are ready to rock & roll!</p>\n";
+ print "<p>Everything seems fine... attempting to create/update database structure</p>\n";
+ require_once('upgrade.php');
$pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text'];
$pAdminCreate_admin_password_text = "";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-04-10 10:18:39
|
Revision: 327
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=327&view=rev
Author: GingerDog
Date: 2008-04-10 03:18:46 -0700 (Thu, 10 Apr 2008)
Log Message:
-----------
DATABASE_MYSQL.TXT - see upgrade.php
Removed Paths:
-------------
trunk/DATABASE_MYSQL.TXT
Deleted: trunk/DATABASE_MYSQL.TXT
===================================================================
--- trunk/DATABASE_MYSQL.TXT 2008-04-10 10:18:11 UTC (rev 326)
+++ trunk/DATABASE_MYSQL.TXT 2008-04-10 10:18:46 UTC (rev 327)
@@ -1,177 +0,0 @@
-#
-# Postfix Admin
-# Licensed under GPL for more info check LICENSE.TXT
-#
-#
-# To setup the MySQL database, do the following steps:
-# - create a MySQL database
-# CREATE DATABASE postfix;
-# - create a MySQL user that has all permissions on this database:
-# CREATE USER 'postfix'@'localhost' IDENTIFIED BY 'choose_a_password';
-# GRANT ALL PRIVILEGES ON `postfix` . * TO 'postfix'@'localhost';
-# - edit config.inc.php to suit your needs
-# - run upgrade.php to create the needed tables (yes, the filename is chosen
-# badly in this case ;-)
-# - run setup.php
-
-
-
-
-
-/*
-
- ***********************************************************************
- * everything below is probably outdated and should no longer be used. *
- * Therefore it is commented out ;-) *
- ***********************************************************************
-
-
-
-
-
-
-# This is the complete MySQL database structure for Postfix Admin.
-# If you are installing from scratch you can use this file otherwise you
-# need to use the TABLE_CHANGES.TXT or TABLE_BACKUP_MX.TXT that comes with Postfix Admin.
-# You can find these in DOCUMENTS/
-
-#
-# There are 2 entries for a database user in the file.
-# One you can use for Postfix and one for Postfix Admin.
-#
-# If you run this file twice (2x) you will get an error on the user creation in MySQL.
-# To go around this you can either comment the lines below "USE MySQL" until "USE postfix".
-# Or you can remove the users from the database and run it again.
-#
-# You can create the database from the shell with:
-#
-# mysql -u root [-p] < DATABASE_MYSQL.TXT
-
-#
-# Postfix / MySQL
-#
-
-USE mysql;
-CREATE DATABASE IF NOT EXISTS postfix;
-# Postfix user & password
-#INSERT INTO user (Host, User, Password) VALUES ('localhost','postfix',password('postfix'));
-# Postfix Admin user & password
-#INSERT INTO user (Host, User, Password) VALUES ('localhost','postfixadmin',password('postfixadmin'));
-# Priviledges
-#INSERT INTO db (Host, Db, User, Select_priv) VALUES ('localhost','postfix','postfix','Y');
-#INSERT INTO db (Host, Db, User, Select_priv, Insert_priv, Update_priv, Delete_priv) VALUES ('localhost', 'postfix', 'postfixadmin', 'Y', 'Y', 'Y', 'Y');
-FLUSH PRIVILEGES;
-GRANT USAGE ON postfix.* TO postfix@localhost;
-GRANT SELECT, INSERT, DELETE, UPDATE ON postfix.* TO postfix@localhost;
-GRANT USAGE ON postfix.* TO postfixadmin@localhost;
-GRANT SELECT, INSERT, DELETE, UPDATE ON postfix.* TO postfixadmin@localhost;
-USE postfix;
-
-#
-# Table structure for table admin
-#
-CREATE TABLE `admin` (
- `username` varchar(255) NOT NULL default '',
- `password` varchar(255) NOT NULL default '',
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- `modified` datetime NOT NULL default '0000-00-00 00:00:00',
- `active` tinyint(1) NOT NULL default '1',
- PRIMARY KEY (`username`)
-) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Admins';
-
-#
-# Table structure for table alias
-#
-CREATE TABLE `alias` (
- `address` varchar(255) NOT NULL default '',
- `goto` text NOT NULL,
- `domain` varchar(255) NOT NULL default '',
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- `modified` datetime NOT NULL default '0000-00-00 00:00:00',
- `active` tinyint(1) NOT NULL default '1',
- PRIMARY KEY (`address`)
-) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Aliases';
-
-#
-# Table structure for table domain
-#
-CREATE TABLE `domain` (
- `domain` varchar(255) NOT NULL default '',
- `description` varchar(255) NOT NULL default '',
- `aliases` int(10) NOT NULL default '0',
- `mailboxes` int(10) NOT NULL default '0',
- `maxquota` bigint(20) NOT NULL default '0',
- `quota` bigint(20) NOT NULL default '0',
- `transport` varchar(255) default NULL,
- `backupmx` tinyint(1) NOT NULL default '0',
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- `modified` datetime NOT NULL default '0000-00-00 00:00:00',
- `active` tinyint(1) NOT NULL default '1',
- PRIMARY KEY (`domain`)
-) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Domains';
-
-#
-# Table structure for table domain_admins
-#
-CREATE TABLE `domain_admins` (
- `username` varchar(255) NOT NULL default '',
- `domain` varchar(255) NOT NULL default '',
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- `active` tinyint(1) NOT NULL default '1',
- KEY username (`username`)
-) TYPE=MyISAM COMMENT='Postfix Admin - Domain Admins';
-
-#
-# Table structure for table log
-#
-CREATE TABLE `log` (
- `timestamp` datetime NOT NULL default '0000-00-00 00:00:00',
- `username` varchar(255) NOT NULL default '',
- `domain` varchar(255) NOT NULL default '',
- `action` varchar(255) NOT NULL default '',
- `data` varchar(255) NOT NULL default '',
- KEY timestamp (`timestamp`)
-) TYPE=MyISAM COMMENT='Postfix Admin - Log';
-
-#
-# Table structure for table mailbox
-#
-CREATE TABLE `mailbox` (
- `username` varchar(255) NOT NULL default '',
- `password` varchar(255) NOT NULL default '',
- `name` varchar(255) NOT NULL default '',
- `maildir` varchar(255) NOT NULL default '',
- `quota` bigint(20) NOT NULL default '0',
- `domain` varchar(255) NOT NULL default '',
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- `modified` datetime NOT NULL default '0000-00-00 00:00:00',
- `active` tinyint(1) NOT NULL default '1',
- PRIMARY KEY (`username`)
-) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Mailboxes';
-
-
-#
-# Vacation stuff ...
-#
-CREATE TABLE vacation (
- email varchar(255) NOT NULL default '',
- subject varchar(255) NOT NULL default '',
- body text NOT NULL,
- cache text NOT NULL,
- domain varchar(255) NOT NULL default '',
- created datetime NOT NULL default '0000-00-00 00:00:00',
- active tinyint(4) NOT NULL default '1',
- PRIMARY KEY (email),
- KEY email (email)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci TYPE=InnoDB COMMENT='Postfix Admin - Virtual Vacation' ;
-
-# vacation_notification table
-
-CREATE TABLE vacation_notification (
- on_vacation varchar(255) NOT NULL,
- notified varchar(255) NOT NULL,
- notified_at timestamp NOT NULL default now(),
- CONSTRAINT vacation_notification_pkey PRIMARY KEY(on_vacation, notified),
- FOREIGN KEY (on_vacation) REFERENCES vacation(email) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci TYPE=InnoDB COMMENT='Postfix Admin - Virtual Vacation Notifications';
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-04-10 10:18:05
|
Revision: 326
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=326&view=rev
Author: GingerDog
Date: 2008-04-10 03:18:11 -0700 (Thu, 10 Apr 2008)
Log Message:
-----------
INSTALL.TXT: Updated (a lot)
Modified Paths:
--------------
trunk/INSTALL.TXT
Modified: trunk/INSTALL.TXT
===================================================================
--- trunk/INSTALL.TXT 2008-04-10 10:17:50 UTC (rev 325)
+++ trunk/INSTALL.TXT 2008-04-10 10:18:11 UTC (rev 326)
@@ -34,56 +34,87 @@
$ tar -zxvf postfixadmin-2.2.0.tgz
-2. Change permissions
-----------------------
-Since the database password is stored in the config.inc.php it's a good idea
-to have change the permissions for Postfix Admin (the following assumes the files
-are owned by the same user as the web server is running as - e.g. www-data).
+2. Setup a Database
+-------------------
- $ cd /var/www/postfixadmin
- $ chmod 640 *.php *.css
- $ cd /var/www/postfixadmin/admin/
- $ chmod 640 *.php .ht*
- $ cd /var/www/postfixadmin/images/
- $ chmod 640 *.gif *.png
- $ cd /var/www/postfixadmin/languages/
- $ chmod 640 *.lang
- $ cd /var/www/postfixadmin/templates/
- $ chmod 640 *.tpl
- $ cd /var/www/postfixadmin/users/
- $ chmod 640 *.php
-
+With your chosen/preferred database server (i.e. MySQL or PostgreSQL),
+you need to create a new database. A good name for this could be :
-3. Create the Database Tables
---------------------------
-In DATABASE_MYSQL.TXT you can find the table structure for MySQL that you need
-in order to configure Postfix Admin and Postfix in general to work with
-Virtual Domains and Users.
+ postfix
-In DATABASE_PGSQL.TXT you can find the table structure for PostgreSQL.
+The mechanics of creating the database vary depending on which server
+you are using. Most users will find using phpMyAdmin or phpPgAdmin the
+easiest route.
-Check out the file first to see what you are about to do, then for MySQL do
-something like this:
+If you wish to use the command line, you'll need to do something like :
- mysql -u root < DATABASE_MYSQL.TXT
+For MySQL:
+ CREATE DATABASE postfix;
+ CREATE USER 'postfix'@'localhost' IDENTIFIED BY 'choose_a_password';
+ GRANT ALL PRIVILEGES ON `postfix` . * TO 'postfix'@'localhost';
-4. Configure
-------------
-Check the config.inc.php file. There you can specify settings that are
-relevant to your setup.
+For PostgreSQL:
+ CREATE USER postfix WITH PASSWORD 'whatever';
+ CREATE DATABASE postfix OWNER postfix ENCODING 'unicode';
-Postfix Admin contains 3 views of administration.
- - Site Admin (aka superadmin) view, located at http://domain.tld/postfixadmin/admin/.
- - Domain Admin view, located at http://domain.tld/postfixadmin/.
- - User Admin View, located at http://domain.tld/postfixadmin/users/.
+3. Configure PostfixAdmin so it can find the database
+-----------------------------------------------------
-In order to do the initial configuration you have to go to the Site Admin view.
+Edit the config.inc.php file.
-The default user/password for the Site Admin view of Postfix Admin is ad...@do...d/admin
+The most important settings are those for your database server.
-5. Done
--------
+You must also change the line that says :
+
+$CONF['configured'] = false;
+
+to
+
+$CONF['configured'] = true;
+
+
+PostfixAdmin does not require write access to any files. You can therefore
+leave the files owned as root (or a.n.other user); as long as the web server
+user (e.g. www-data) can read them, it will be fine.
+
+The next 'step', is optional. Only do it, if other non-trusted users have access
+to your user:
+
+ Depending on your environment, you may want to protect the database username
+ and password stored in config.inc.php - if so, you could move them into the
+ Apache configuration file (which can be set to be visible only by root) using
+ something like the following in your VirtualHost definition :
+
+ SetVar DB_USER "postfix"
+ SetVar DB_PASS "opensesame"
+
+ config.inc.php would then be able to access these through :
+
+ $CONF['database_user'] = $_SERVER['DB_USER']
+
+
+4. Check settings, and create Admin user
+----------------------------------------
+
+Hit http://yourserver.tld/postfixadmin/setup.php in a web browser.
+
+You should see a list of 'OK' messages.
+
+The setup.php script will attempt to create the database structure
+(or upgrade it if you're coming from a previous version).
+
+Assuming everything is OK you can create the admin user using the form displayed.
+
+Once you submit the form, all that's left to do is to delete "setup.php"
+
+e.g.
+
+mv setup.php setup.php.disabled
+
+5. Use PostfixAdmin
+-------------------
+
This is all that is needed. Fire up your browser and go to the site that you
specified to host Postfix Admin.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-04-10 10:17:44
|
Revision: 325
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=325&view=rev
Author: GingerDog
Date: 2008-04-10 03:17:50 -0700 (Thu, 10 Apr 2008)
Log Message:
-----------
common.php: ensure we only start a session once
Modified Paths:
--------------
trunk/common.php
Modified: trunk/common.php
===================================================================
--- trunk/common.php 2008-04-10 10:17:23 UTC (rev 324)
+++ trunk/common.php 2008-04-10 10:17:50 UTC (rev 325)
@@ -17,6 +17,9 @@
* environment and ensures other functions are loaded.
*/
+if(!defined('POSTFIXADMIN')) {
+ session_start();
+}
define('POSTFIXADMIN', 1); # checked in included files
function incorrect_setup() {
@@ -53,6 +56,5 @@
require_once("$incpath/functions.inc.php");
require_once("$incpath/languages/" . check_language () . ".lang");
-session_start();
/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-04-10 10:17:20
|
Revision: 324
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=324&view=rev
Author: GingerDog
Date: 2008-04-10 03:17:23 -0700 (Thu, 10 Apr 2008)
Log Message:
-----------
upgrade.php: support creating PG db if it does nto exist; this means DATABASE_PGSQL.TXT is now obsolete
Modified Paths:
--------------
trunk/upgrade.php
Removed Paths:
-------------
trunk/DATABASE_PGSQL.TXT
Deleted: trunk/DATABASE_PGSQL.TXT
===================================================================
--- trunk/DATABASE_PGSQL.TXT 2008-04-10 09:02:37 UTC (rev 323)
+++ trunk/DATABASE_PGSQL.TXT 2008-04-10 10:17:23 UTC (rev 324)
@@ -1,169 +0,0 @@
--- Postfix Admin Release 2.x --
-----------------------------------------------------------
---
--- Copyright (c) 2002 - 2005 High5!
--- Created by: Mischa Peters <mischa at high5 dot net>
---
--- This is the complete database structure for Postfix Admin.
--- If you are installing from scratch you can use this file otherwise you
--- need to use the TABLE_CHANGES.TXT or TABLE_BACKUP_MX.TXT that comes with Postfix Admin.
--- You can find these in DOCUMENTS/
---
--- There are 2 entries for a database user in the file.
--- One you can use for Postfix and one for Postfix Admin.
---
--- You can create the database from the shell with:
--- createuser -P postfix
--- createuser -P postfixadmin
--- createuser -P vacation
--- createdb postfix
--- psql postfix
--- postfix=# \i postfix.sql
--- postfix=# \q
--- exit
---
--- Postfix / PgSQL
-
---
-DROP TABLE admin,alias,domain,domain_admins,log,mailbox CASCADE;
---
-
---
--- Table structure for table domain
---
-CREATE TABLE domain (
- domain character varying(255) NOT NULL,
- description character varying(255) NOT NULL default '',
- aliases integer NOT NULL default 0,
- mailboxes integer NOT NULL default 0,
- maxquota integer NOT NULL default 0,
- quota integer NOT NULL default 0,
- transport character varying(255) default NULL,
- backupmx boolean NOT NULL default false,
- created timestamp with time zone default now(),
- modified timestamp with time zone default now(),
- active boolean NOT NULL default true,
- Constraint "domain_key" Primary Key ("domain")
-);
-CREATE INDEX domain_domain_active ON domain(domain,active);
-COMMENT ON TABLE domain IS 'Postfix Admin - Virtual Domains';
-
---
--- Table structure for table admin
---
-CREATE TABLE "admin" (
- "username" character varying(255) NOT NULL,
- "password" character varying(255) NOT NULL default '',
- "created" timestamp with time zone default now(),
- "modified" timestamp with time zone default now(),
- "active" boolean NOT NULL default true,
- Constraint "admin_key" Primary Key ("username")
-);
-COMMENT ON TABLE admin IS 'Postfix Admin - Virtual Admins';
---
--- Table structure for table alias
---
-CREATE TABLE alias (
- address character varying(255) NOT NULL,
- goto text NOT NULL,
- domain character varying(255) NOT NULL REFERENCES domain,
- created timestamp with time zone default now(),
- modified timestamp with time zone default now(),
- active boolean NOT NULL default true,
- Constraint "alias_key" Primary Key ("address")
-);
-CREATE INDEX alias_address_active ON alias(address,active);
-COMMENT ON TABLE alias IS 'Postfix Admin - Virtual Aliases';
-
---
--- Table structure for table domain_admins
---
-CREATE TABLE domain_admins (
- username character varying(255) NOT NULL,
- domain character varying(255) NOT NULL REFERENCES domain,
- created timestamp with time zone default now(),
- active boolean NOT NULL default true
-);
-COMMENT ON TABLE domain_admins IS 'Postfix Admin - Domain Admins';
-
---
--- Table structure for table log
---
-CREATE TABLE log (
- timestamp timestamp with time zone default now(),
- username character varying(255) NOT NULL default '',
- domain character varying(255) NOT NULL default '',
- action character varying(255) NOT NULL default '',
- data text NOT NULL default ''
-);
-COMMENT ON TABLE log IS 'Postfix Admin - Log';
-
---
--- Table structure for table mailbox
---
-CREATE TABLE mailbox (
- username character varying(255) NOT NULL,
- password character varying(255) NOT NULL default '',
- name character varying(255) NOT NULL default '',
- maildir character varying(255) NOT NULL default '',
- quota integer NOT NULL default 0,
- domain character varying(255) NOT NULL REFERENCES domain,
- created timestamp with time zone default now(),
- modified timestamp with time zone default now(),
- active boolean NOT NULL default true,
- Constraint "mailbox_key" Primary Key ("username")
-);
-CREATE INDEX mailbox_username_active ON mailbox(username,active);
-COMMENT ON TABLE mailbox IS 'Postfix Admin - Virtual Mailboxes';
-
-
-
-GRANT
- SELECT,INSERT,UPDATE,DELETE
-ON
- admin,
- alias,
- domain,
- domain_admins,
- log,
- mailbox
-TO postfixadmin;
-
-GRANT SELECT ON alias,domain,mailbox TO postfix;
-
--- Vacation Stuff ...
-
-DROP TABLE vacation,vacation_notification CASCADE;
-
-CREATE TABLE vacation (
- email character varying(255) PRIMARY KEY,
- subject character varying(255) NOT NULL DEFAULT '',
- body text NOT NULL DEFAULT '',
- cache text NOT NULL DEFAULT '',
- "domain" character varying(255) NOT NULL REFERENCES "domain",
- created timestamp with time zone DEFAULT now(),
- active boolean DEFAULT true NOT NULL
-);
-CREATE INDEX vacation_email_active ON vacation(email,active);
-
-CREATE TABLE vacation_notification (
- on_vacation character varying(255) NOT NULL REFERENCES vacation(email) ON DELETE CASCADE,
- notified character varying(255) NOT NULL,
- notified_at timestamp with time zone NOT NULL DEFAULT now(),
- CONSTRAINT vacation_notification_pkey primary key(on_vacation,notified)
-);
--- Note: It's important that the primary key constraint on vacation_notification
--- be given a name which includes the '_pkey' substring (default PostgreSQL naming
--- for primary keys). The vacation-script looks for this substring to
--- distinguish between an acceptable and non-acceptable error.
-
-
-GRANT
- SELECT,INSERT,UPDATE,DELETE
-ON
- vacation
-TO postfixadmin;
-
-GRANT SELECT ON vacation TO vacation;
-GRANT SELECT,INSERT,DELETE ON vacation_notification TO vacation;
-
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-04-10 09:02:37 UTC (rev 323)
+++ trunk/upgrade.php 2008-04-10 10:17:23 UTC (rev 324)
@@ -97,7 +97,7 @@
if ($current_version >= $target_version) {
# already up to date
- echo "up to date";
+ echo "Database is up to date";
return true;
}
@@ -232,14 +232,135 @@
}
function upgrade_2_pgsql() {
+
+ if(!_pgsql_object_exists(table_by_key('domain'))) {
+ db_query_parsed("
+ CREATE TABLE " . table_by_key('domain') . " (
+ domain character varying(255) NOT NULL,
+ description character varying(255) NOT NULL default '',
+ aliases integer NOT NULL default 0,
+ mailboxes integer NOT NULL default 0,
+ maxquota integer NOT NULL default 0,
+ quota integer NOT NULL default 0,
+ transport character varying(255) default NULL,
+ backupmx boolean NOT NULL default false,
+ created timestamp with time zone default now(),
+ modified timestamp with time zone default now(),
+ active boolean NOT NULL default true,
+ Constraint \"domain_key\" Primary Key (\"domain\")
+ );
+ CREATE INDEX domain_domain_active ON " . table_by_key('domain') . "(domain,active);
+ COMMENT ON TABLE " . table_by_key('domain') . " IS 'Postfix Admin - Virtual Domains';
+ ");
+ }
+ if(!_pgsql_object_exists(table_by_key('admin'))) {
+ db_query_parsed('
+ CREATE TABLE ' . table_by_key("admin") . ' (
+ "username" character varying(255) NOT NULL,
+ "password" character varying(255) NOT NULL default \'\',
+ "created" timestamp with time zone default now(),
+ "modified" timestamp with time zone default now(),
+ "active" boolean NOT NULL default true,
+ Constraint "admin_key" Primary Key ("username")
+ );' . "
+ COMMENT ON TABLE " . table_by_key('admin') . " IS 'Postfix Admin - Virtual Admins';
+ ");
+ }
+
+ if(!_pgsql_object_exists(table_by_key('alias'))) {
+ db_query_parsed('
+ CREATE TABLE ' . table_by_key('alias') . ' (
+ address character varying(255) NOT NULL,
+ goto text NOT NULL,
+ domain character varying(255) NOT NULL REFERENCES domain,
+ created timestamp with time zone default now(),
+ modified timestamp with time zone default now(),
+ active boolean NOT NULL default true,
+ Constraint "alias_key" Primary Key ("address")
+ );
+ CREATE INDEX alias_address_active ON ' . table_by_key('alias') . '(address,active);
+ COMMENT ON TABLE ' . table_by_key('alias') . ' IS \'Postfix Admin - Virtual Aliases\';
+ ');
+ }
+
+ if(!_pgsql_object_exists(table_by_key('domain_admins'))) {
+ db_query_parsed('
+ CREATE TABLE ' . table_by_key('domain_admins') . ' (
+ username character varying(255) NOT NULL,
+ domain character varying(255) NOT NULL REFERENCES domain,
+ created timestamp with time zone default now(),
+ active boolean NOT NULL default true
+ );
+ COMMENT ON TABLE ' . table_by_key('domain_admins') . ' IS \'Postfix Admin - Domain Admins\';
+ ');
+ }
+
+ if(!_pgsql_object_exists(table_by_key('log'))) {
+ db_query_parsed('
+ CREATE TABLE ' . table_by_key('log') . ' (
+ timestamp timestamp with time zone default now(),
+ username character varying(255) NOT NULL default \'\',
+ domain character varying(255) NOT NULL default \'\',
+ action character varying(255) NOT NULL default \'\',
+ data text NOT NULL default \'\'
+ );
+ COMMENT ON TABLE ' . table_by_key('log') . ' IS \'Postfix Admin - Log\';
+ ');
+ }
+
+ if(!_pgsql_object_exists(table_by_key('mailbox'))) {
+ db_query_parsed('
+ CREATE TABLE mailbox (
+ username character varying(255) NOT NULL,
+ password character varying(255) NOT NULL default \'\',
+ name character varying(255) NOT NULL default \'\',
+ maildir character varying(255) NOT NULL default \'\',
+ quota integer NOT NULL default 0,
+ domain character varying(255) NOT NULL REFERENCES domain,
+ created timestamp with time zone default now(),
+ modified timestamp with time zone default now(),
+ active boolean NOT NULL default true,
+ Constraint "mailbox_key" Primary Key ("username")
+ );
+ CREATE INDEX mailbox_username_active ON ' . table_by_key('mailbox') . '(username,active);
+ COMMENT ON TABLE ' . table_by_key('mailbox') . ' IS \'Postfix Admin - Virtual Mailboxes\';
+ ');
+ }
+
+ if(!_pgsql_object_exists(table_by_key('vacation'))) {
+ db_query_parsed('
+ CREATE TABLE ' . table_by_key('vacation') . ' (
+ email character varying(255) PRIMARY KEY,
+ subject character varying(255) NOT NULL DEFAULT \'\',
+ body text NOT NULL DEFAULT \'\',
+ cache text NOT NULL DEFAULT \'\',
+ "domain" character varying(255) NOT NULL REFERENCES "domain",
+ created timestamp with time zone DEFAULT now(),
+ active boolean DEFAULT true NOT NULL
+ );
+ CREATE INDEX vacation_email_active ON ' . table_by_key('vacation') . '(email,active);');
+ }
+
+ if(!_pgsql_object_exists(table_by_key('vacation_notification'))) {
+ db_query_parsed('
+ CREATE TABLE ' . table_by_key('vacation_notification') . ' (
+ on_vacation character varying(255) NOT NULL REFERENCES vacation(email) ON DELETE CASCADE,
+ notified character varying(255) NOT NULL,
+ notified_at timestamp with time zone NOT NULL DEFAULT now(),
+ CONSTRAINT vacation_notification_pkey primary key(on_vacation,notified)
+ );
+ ');
+ }
+
+ // this handles anyone who is upgrading... (and should have no impact on new installees)
$table_domain = table_by_key ('domain');
$result = db_query_parsed("ALTER TABLE $table_domain ADD COLUMN transport VARCHAR(255)", TRUE);
$result = db_query_parsed("ALTER TABLE $table_domain ADD COLUMN backupmx BOOLEAN DEFAULT false", TRUE);
}
function upgrade_3_mysql() {
-# upgrade pre-2.1 database
-# from TABLE_CHANGES.TXT
+ # upgrade pre-2.1 database
+ # from TABLE_CHANGES.TXT
$table_admin = table_by_key ('admin');
$table_alias = table_by_key ('alias');
$table_domain = table_by_key ('domain');
@@ -249,26 +370,26 @@
// these will not work on PostgreSQL; syntax is :
// ALTER TABLE foo RENAME f1 TO f2
$all_sql = split("\n", trim("
- ALTER TABLE $table_admin {RENAME_COLUMN} create_date created DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
- ALTER TABLE $table_admin {RENAME_COLUMN} change_date modified DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
- ALTER TABLE $table_alias {RENAME_COLUMN} create_date created DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
- ALTER TABLE $table_alias {RENAME_COLUMN} change_date modified DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
- ALTER TABLE $table_domain {RENAME_COLUMN} create_date created DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
- ALTER TABLE $table_domain {RENAME_COLUMN} change_date modified DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
- ALTER TABLE $table_domain ADD COLUMN aliases INT(10) DEFAULT '-1' NOT NULL AFTER description;
- ALTER TABLE $table_domain ADD COLUMN mailboxes INT(10) DEFAULT '-1' NOT NULL AFTER aliases;
- ALTER TABLE $table_domain ADD COLUMN maxquota INT(10) DEFAULT '-1' NOT NULL AFTER mailboxes;
- ALTER TABLE $table_domain ADD COLUMN transport VARCHAR(255) AFTER maxquota;
- ALTER TABLE $table_domain ADD COLUMN backupmx TINYINT(1) DEFAULT '0' NOT NULL AFTER transport;
- ALTER TABLE $table_mailbox {RENAME_COLUMN} create_date created DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
- ALTER TABLE $table_mailbox {RENAME_COLUMN} change_date modified DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
- ALTER TABLE $table_mailbox ADD COLUMN quota INT(10) DEFAULT '-1' NOT NULL AFTER maildir;
- ALTER TABLE $table_vacation ADD COLUMN domain VARCHAR(255) DEFAULT '' NOT NULL AFTER cache;
- ALTER TABLE $table_vacation ADD COLUMN created DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL AFTER domain;
- ALTER TABLE $table_vacation ADD COLUMN active TINYINT(1) DEFAULT '1' NOT NULL AFTER created;
- ALTER TABLE $table_vacation DROP PRIMARY KEY
- ALTER TABLE $table_vacation ADD PRIMARY KEY(email)
- UPDATE $table_vacation SET domain=SUBSTRING_INDEX(email, '@', -1) WHERE email=email;
+ ALTER TABLE $table_admin {RENAME_COLUMN} create_date created DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
+ ALTER TABLE $table_admin {RENAME_COLUMN} change_date modified DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
+ ALTER TABLE $table_alias {RENAME_COLUMN} create_date created DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
+ ALTER TABLE $table_alias {RENAME_COLUMN} change_date modified DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
+ ALTER TABLE $table_domain {RENAME_COLUMN} create_date created DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
+ ALTER TABLE $table_domain {RENAME_COLUMN} change_date modified DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
+ ALTER TABLE $table_domain ADD COLUMN aliases INT(10) DEFAULT '-1' NOT NULL AFTER description;
+ ALTER TABLE $table_domain ADD COLUMN mailboxes INT(10) DEFAULT '-1' NOT NULL AFTER aliases;
+ ALTER TABLE $table_domain ADD COLUMN maxquota INT(10) DEFAULT '-1' NOT NULL AFTER mailboxes;
+ ALTER TABLE $table_domain ADD COLUMN transport VARCHAR(255) AFTER maxquota;
+ ALTER TABLE $table_domain ADD COLUMN backupmx TINYINT(1) DEFAULT '0' NOT NULL AFTER transport;
+ ALTER TABLE $table_mailbox {RENAME_COLUMN} create_date created DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
+ ALTER TABLE $table_mailbox {RENAME_COLUMN} change_date modified DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
+ ALTER TABLE $table_mailbox ADD COLUMN quota INT(10) DEFAULT '-1' NOT NULL AFTER maildir;
+ ALTER TABLE $table_vacation ADD COLUMN domain VARCHAR(255) DEFAULT '' NOT NULL AFTER cache;
+ ALTER TABLE $table_vacation ADD COLUMN created DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL AFTER domain;
+ ALTER TABLE $table_vacation ADD COLUMN active TINYINT(1) DEFAULT '1' NOT NULL AFTER created;
+ ALTER TABLE $table_vacation DROP PRIMARY KEY
+ ALTER TABLE $table_vacation ADD PRIMARY KEY(email)
+ UPDATE $table_vacation SET domain=SUBSTRING_INDEX(email, '@', -1) WHERE email=email;
"));
foreach ($all_sql as $sql) {
@@ -279,7 +400,7 @@
}
function upgrade_4_mysql() { # MySQL only
-# changes between 2.1 and moving to sourceforge
+ # changes between 2.1 and moving to sourceforge
$table_domain = table_by_key ('domain');
$result = db_query_parsed("ALTER TABLE $table_domain ADD COLUMN quota int(10) NOT NULL default '0' AFTER maxquota", TRUE);
# Possible errors that can be ignored:
@@ -306,7 +427,7 @@
if(!_pgsql_object_exists('domain_domain_active')) {
$result = db_query_parsed("CREATE INDEX domain_domain_active ON domain(domain,active)");
}
-
+
$result = db_query_parsed("ALTER TABLE $table_domain_admins ALTER COLUMN domain DROP DEFAULT");
$result = db_query_parsed("ALTER TABLE $table_alias ALTER COLUMN address DROP DEFAULT");
$result = db_query_parsed("ALTER TABLE $table_alias ALTER COLUMN domain DROP DEFAULT");
@@ -319,57 +440,57 @@
$result = db_query_parsed("ALTER TABLE $table_domain_admins ALTER COLUMN domain DROP DEFAULT");
$result = db_query_parsed("
- BEGIN;
- ALTER TABLE $table_log RENAME COLUMN data TO data_old;
- ALTER TABLE $table_log ADD COLUMN data text NOT NULL default '';
- UPDATE $table_log SET data = CAST(data_old AS text);
- ALTER TABLE $table_log DROP COLUMN data_old;
- COMMIT;");
+BEGIN;
+ALTER TABLE $table_log RENAME COLUMN data TO data_old;
+ALTER TABLE $table_log ADD COLUMN data text NOT NULL default '';
+UPDATE $table_log SET data = CAST(data_old AS text);
+ALTER TABLE $table_log DROP COLUMN data_old;
+COMMIT;");
- $result = db_query_parsed("ALTER TABLE $table_mailbox ALTER COLUMN username DROP DEFAULT");
- $result = db_query_parsed("ALTER TABLE $table_mailbox ALTER COLUMN domain DROP DEFAULT");
+$result = db_query_parsed("ALTER TABLE $table_mailbox ALTER COLUMN username DROP DEFAULT");
+$result = db_query_parsed("ALTER TABLE $table_mailbox ALTER COLUMN domain DROP DEFAULT");
- $result = db_query_parsed("
- BEGIN;
- ALTER TABLE $table_mailbox RENAME COLUMN domain TO domain_old;
- ALTER TABLE $table_mailbox ADD COLUMN domain varchar(255) REFERENCES domain (domain);
- UPDATE $table_mailbox SET domain = domain_old;
- ALTER TABLE $table_mailbox DROP COLUMN domain_old;
- COMMIT;"
- );
- if(!_pgsql_object_exists('mailbox_username_active')) {
- db_query_parsed('CREATE INDEX mailbox_username_active ON mailbox(username,active)');
- }
+$result = db_query_parsed("
+BEGIN;
+ALTER TABLE $table_mailbox RENAME COLUMN domain TO domain_old;
+ALTER TABLE $table_mailbox ADD COLUMN domain varchar(255) REFERENCES domain (domain);
+UPDATE $table_mailbox SET domain = domain_old;
+ALTER TABLE $table_mailbox DROP COLUMN domain_old;
+COMMIT;"
+);
+if(!_pgsql_object_exists('mailbox_username_active')) {
+ db_query_parsed('CREATE INDEX mailbox_username_active ON mailbox(username,active)');
+}
- $result = db_query_parsed("ALTER TABLE $table_vacation ALTER COLUMN body SET DEFAULT ''");
- if(_pgsql_field_exists($table_vacation, 'cache')) {
- $result = db_query_parsed("ALTER TABLE $table_vacation DROP COLUMN cache");
- }
+$result = db_query_parsed("ALTER TABLE $table_vacation ALTER COLUMN body SET DEFAULT ''");
+if(_pgsql_field_exists($table_vacation, 'cache')) {
+ $result = db_query_parsed("ALTER TABLE $table_vacation DROP COLUMN cache");
+}
- $result = db_query_parsed("
- BEGIN;
- ALTER TABLE $table_vacation RENAME COLUMN domain to domain_old;
- ALTER TABLE $table_vacation ADD COLUMN domain varchar(255) REFERENCES domain;
- UPDATE $table_vacation SET domain = domain_old;
- ALTER TABLE $table_vacation DROP COLUMN domain_old;
- COMMIT;
- ");
+$result = db_query_parsed("
+BEGIN;
+ALTER TABLE $table_vacation RENAME COLUMN domain to domain_old;
+ALTER TABLE $table_vacation ADD COLUMN domain varchar(255) REFERENCES domain;
+UPDATE $table_vacation SET domain = domain_old;
+ALTER TABLE $table_vacation DROP COLUMN domain_old;
+COMMIT;
+");
- if(!_pgsql_object_exists('vacation_email_active')) {
- $result = db_query_parsed("CREATE INDEX vacation_email_active ON vacation(email,active)");
- }
+if(!_pgsql_object_exists('vacation_email_active')) {
+ $result = db_query_parsed("CREATE INDEX vacation_email_active ON vacation(email,active)");
+}
- if(!_pgsql_object_exists('vacation_notification')) {
- $result = db_query_parsed("
- CREATE TABLE vacation_notification (
+if(!_pgsql_object_exists('vacation_notification')) {
+ $result = db_query_parsed("
+ CREATE TABLE vacation_notification (
on_vacation character varying(255) NOT NULL REFERENCES vacation(email) ON DELETE CASCADE,
notified character varying(255) NOT NULL,
notified_at timestamp with time zone NOT NULL DEFAULT now(),
- CONSTRAINT vacation_notification_pkey primary key(on_vacation,notified)
- );");
- }
+ CONSTRAINT vacation_notification_pkey primary key(on_vacation,notified)
+);");
}
+}
# Possible errors that can be ignored:
@@ -389,97 +510,97 @@
$result = db_query_parsed("
CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('admin') . "` (
- `username` varchar(255) NOT NULL default '',
- `password` varchar(255) NOT NULL default '',
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- `modified` datetime NOT NULL default '0000-00-00 00:00:00',
- `active` tinyint(1) NOT NULL default '1',
- PRIMARY KEY (`username`),
- KEY username (`username`)
- ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Virtual Admins';
- ");
+ `username` varchar(255) NOT NULL default '',
+ `password` varchar(255) NOT NULL default '',
+ `created` datetime NOT NULL default '0000-00-00 00:00:00',
+ `modified` datetime NOT NULL default '0000-00-00 00:00:00',
+ `active` tinyint(1) NOT NULL default '1',
+ PRIMARY KEY (`username`),
+ KEY username (`username`)
+) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Virtual Admins';
+");
- $result = db_query_parsed("
- CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('alias') . "` (
- `address` varchar(255) NOT NULL default '',
- `goto` text NOT NULL,
- `domain` varchar(255) NOT NULL default '',
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- `modified` datetime NOT NULL default '0000-00-00 00:00:00',
- `active` tinyint(1) NOT NULL default '1',
- PRIMARY KEY (`address`),
- KEY address (`address`)
+$result = db_query_parsed("
+ CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('alias') . "` (
+ `address` varchar(255) NOT NULL default '',
+ `goto` text NOT NULL,
+ `domain` varchar(255) NOT NULL default '',
+ `created` datetime NOT NULL default '0000-00-00 00:00:00',
+ `modified` datetime NOT NULL default '0000-00-00 00:00:00',
+ `active` tinyint(1) NOT NULL default '1',
+ PRIMARY KEY (`address`),
+KEY address (`address`)
) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Virtual Aliases';
- ");
+");
- $result = db_query_parsed("
- CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('domain') . "` (
- `domain` varchar(255) NOT NULL default '',
- `description` varchar(255) NOT NULL default '',
- `aliases` int(10) NOT NULL default '0',
- `mailboxes` int(10) NOT NULL default '0',
- `maxquota` int(10) NOT NULL default '0',
- `quota` int(10) NOT NULL default '0',
- `transport` varchar(255) default NULL,
- `backupmx` tinyint(1) NOT NULL default '0',
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- `modified` datetime NOT NULL default '0000-00-00 00:00:00',
- `active` tinyint(1) NOT NULL default '1',
- PRIMARY KEY (`domain`),
- KEY domain (`domain`)
+$result = db_query_parsed("
+ CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('domain') . "` (
+ `domain` varchar(255) NOT NULL default '',
+ `description` varchar(255) NOT NULL default '',
+ `aliases` int(10) NOT NULL default '0',
+ `mailboxes` int(10) NOT NULL default '0',
+ `maxquota` int(10) NOT NULL default '0',
+ `quota` int(10) NOT NULL default '0',
+ `transport` varchar(255) default NULL,
+ `backupmx` tinyint(1) NOT NULL default '0',
+ `created` datetime NOT NULL default '0000-00-00 00:00:00',
+ `modified` datetime NOT NULL default '0000-00-00 00:00:00',
+ `active` tinyint(1) NOT NULL default '1',
+ PRIMARY KEY (`domain`),
+KEY domain (`domain`)
) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Virtual Domains';
- ");
+");
- $result = db_query_parsed("
- CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('domain_admins') . "` (
- `username` varchar(255) NOT NULL default '',
- `domain` varchar(255) NOT NULL default '',
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- `active` tinyint(1) NOT NULL default '1',
- KEY username (`username`)
- ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Domain Admins';
- ");
+$result = db_query_parsed("
+ CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('domain_admins') . "` (
+ `username` varchar(255) NOT NULL default '',
+ `domain` varchar(255) NOT NULL default '',
+ `created` datetime NOT NULL default '0000-00-00 00:00:00',
+ `active` tinyint(1) NOT NULL default '1',
+ KEY username (`username`)
+ ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Domain Admins';
+");
- $result = db_query_parsed("
- CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('log') . "` (
- `timestamp` datetime NOT NULL default '0000-00-00 00:00:00',
- `username` varchar(255) NOT NULL default '',
- `domain` varchar(255) NOT NULL default '',
- `action` varchar(255) NOT NULL default '',
- `data` varchar(255) NOT NULL default '',
- KEY timestamp (`timestamp`)
- ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Log';
- ");
+$result = db_query_parsed("
+ CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('log') . "` (
+ `timestamp` datetime NOT NULL default '0000-00-00 00:00:00',
+ `username` varchar(255) NOT NULL default '',
+ `domain` varchar(255) NOT NULL default '',
+ `action` varchar(255) NOT NULL default '',
+ `data` varchar(255) NOT NULL default '',
+ KEY timestamp (`timestamp`)
+ ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Log';
+");
- $result = db_query_parsed("
- CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('mailbox') . "` (
- `username` varchar(255) NOT NULL default '',
- `password` varchar(255) NOT NULL default '',
- `name` varchar(255) NOT NULL default '',
- `maildir` varchar(255) NOT NULL default '',
- `quota` int(10) NOT NULL default '0',
- `domain` varchar(255) NOT NULL default '',
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- `modified` datetime NOT NULL default '0000-00-00 00:00:00',
- `active` tinyint(1) NOT NULL default '1',
- PRIMARY KEY (`username`),
- KEY username (`username`)
+$result = db_query_parsed("
+ CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('mailbox') . "` (
+ `username` varchar(255) NOT NULL default '',
+ `password` varchar(255) NOT NULL default '',
+ `name` varchar(255) NOT NULL default '',
+ `maildir` varchar(255) NOT NULL default '',
+ `quota` int(10) NOT NULL default '0',
+ `domain` varchar(255) NOT NULL default '',
+ `created` datetime NOT NULL default '0000-00-00 00:00:00',
+ `modified` datetime NOT NULL default '0000-00-00 00:00:00',
+ `active` tinyint(1) NOT NULL default '1',
+ PRIMARY KEY (`username`),
+KEY username (`username`)
) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Virtual Mailboxes';
- ");
+");
- $result = db_query_parsed("
- CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('vacation') . "` (
- `email` varchar(255) NOT NULL default '',
- `subject` varchar(255) NOT NULL default '',
- `body` text NOT NULL default '',
- `cache` text NOT NULL default '',
- `domain` varchar(255) NOT NULL default '',
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- `active` tinyint(1) NOT NULL default '1',
- PRIMARY KEY (`email`),
- KEY email (`email`)
+$result = db_query_parsed("
+ CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('vacation') . "` (
+ `email` varchar(255) NOT NULL default '',
+ `subject` varchar(255) NOT NULL default '',
+ `body` text NOT NULL default '',
+ `cache` text NOT NULL default '',
+ `domain` varchar(255) NOT NULL default '',
+ `created` datetime NOT NULL default '0000-00-00 00:00:00',
+ `active` tinyint(1) NOT NULL default '1',
+ PRIMARY KEY (`email`),
+KEY email (`email`)
) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Virtual Vacation';
- ");
+");
}
/**
@@ -497,14 +618,14 @@
$table_vacation_notification = table_by_key('vacation_notification');
$all_sql = split("\n", trim("
- ALTER TABLE `$table_vacation` CHANGE `email` `email` VARCHAR( 255 ) {LATIN1} NOT NULL
- ALTER TABLE `$table_vacation` CHANGE `subject` `subject` VARCHAR( 255 ) {UTF-8} NOT NULL
- ALTER TABLE `$table_vacation` CHANGE `body` `body` TEXT {UTF-8} NOT NULL
- ALTER TABLE `$table_vacation` CHANGE `cache` `cache` TEXT {LATIN1} NOT NULL
- ALTER TABLE `$table_vacation` CHANGE `domain` `domain` VARCHAR( 255 ) {LATIN1} NOT NULL
- ALTER TABLE `$table_vacation` CHANGE `active` `active` TINYINT( 1 ) NOT NULL DEFAULT '1'
- ALTER TABLE `$table_vacation` DEFAULT {LATIN1}
- ALTER TABLE `$table_vacation` ENGINE = INNODB
+ ALTER TABLE `$table_vacation` CHANGE `email` `email` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_vacation` CHANGE `subject` `subject` VARCHAR( 255 ) {UTF-8} NOT NULL
+ ALTER TABLE `$table_vacation` CHANGE `body` `body` TEXT {UTF-8} NOT NULL
+ ALTER TABLE `$table_vacation` CHANGE `cache` `cache` TEXT {LATIN1} NOT NULL
+ ALTER TABLE `$table_vacation` CHANGE `domain` `domain` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_vacation` CHANGE `active` `active` TINYINT( 1 ) NOT NULL DEFAULT '1'
+ ALTER TABLE `$table_vacation` DEFAULT {LATIN1}
+ ALTER TABLE `$table_vacation` ENGINE = INNODB
"));
foreach ($all_sql as $sql) {
@@ -550,34 +671,34 @@
on_vacation varchar(255) NOT NULL,
notified varchar(255) NOT NULL,
notified_at timestamp NOT NULL default now(),
- PRIMARY KEY on_vacation (`on_vacation`, `notified`),
- CONSTRAINT `vacation_notification_pkey`
- FOREIGN KEY (`on_vacation`) REFERENCES vacation(`email`) ON DELETE CASCADE
- )
- ENGINE=InnoDB DEFAULT {LATIN1} TYPE=InnoDB
- COMMENT='Postfix Admin - Virtual Vacation Notifications'
- ");
+ PRIMARY KEY on_vacation (`on_vacation`, `notified`),
+ CONSTRAINT `vacation_notification_pkey`
+ FOREIGN KEY (`on_vacation`) REFERENCES vacation(`email`) ON DELETE CASCADE
+)
+ENGINE=InnoDB DEFAULT {LATIN1} TYPE=InnoDB
+COMMENT='Postfix Admin - Virtual Vacation Notifications'
+");
- # in case someone has manually created the table with utf8 fields before:
- $all_sql = split("\n", trim("
- ALTER TABLE `$table_vacation_notification` DROP FOREIGN KEY `vacation_notification_pkey`
- ALTER TABLE `$table_vacation_notification` CHANGE `on_vacation` `on_vacation` VARCHAR( 255 ) {LATIN1} NOT NULL
- ALTER TABLE `$table_vacation_notification` CHANGE `notified` `notified` VARCHAR( 255 ) {LATIN1} NOT NULL
- ALTER TABLE `$table_vacation_notification` DEFAULT {LATIN1}
- "));
- # Possible errors that can be ignored:
- # None.
- # If something goes wrong, the user should drop the vacation_notification table
- # (not a great loss) and re-create it using this function.
+# in case someone has manually created the table with utf8 fields before:
+$all_sql = split("\n", trim("
+ ALTER TABLE `$table_vacation_notification` DROP FOREIGN KEY `vacation_notification_pkey`
+ ALTER TABLE `$table_vacation_notification` CHANGE `on_vacation` `on_vacation` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_vacation_notification` CHANGE `notified` `notified` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_vacation_notification` DEFAULT {LATIN1}
+"));
+# Possible errors that can be ignored:
+# None.
+# If something goes wrong, the user should drop the vacation_notification table
+# (not a great loss) and re-create it using this function.
- foreach ($all_sql as $sql) {
- $result = db_query_parsed($sql);
- }
+foreach ($all_sql as $sql) {
+ $result = db_query_parsed($sql);
+}
- # create constraint...
- $result = db_query_parsed("
- ALTER TABLE $table_vacation_notification ADD CONSTRAINT `vacation_notification_pkey`
- FOREIGN KEY (`on_vacation`) REFERENCES vacation(`email`) ON DELETE CASCADE
+# create constraint...
+$result = db_query_parsed("
+ ALTER TABLE $table_vacation_notification ADD CONSTRAINT `vacation_notification_pkey`
+ FOREIGN KEY (`on_vacation`) REFERENCES vacation(`email`) ON DELETE CASCADE
");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-04-10 09:02:34
|
Revision: 323
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=323&view=rev
Author: GingerDog
Date: 2008-04-10 02:02:37 -0700 (Thu, 10 Apr 2008)
Log Message:
-----------
FAQ.txt: updating following aldin\'s questions on #postfixadmin
Modified Paths:
--------------
trunk/DOCUMENTS/FAQ.txt
Modified: trunk/DOCUMENTS/FAQ.txt
===================================================================
--- trunk/DOCUMENTS/FAQ.txt 2008-04-09 21:05:16 UTC (rev 322)
+++ trunk/DOCUMENTS/FAQ.txt 2008-04-10 09:02:37 UTC (rev 323)
@@ -8,3 +8,12 @@
In a normal setup, sending the 'Welcome' email accomplishes this task -
as Courier/Cyrus/etc do it (and have permission to do so)
+
+2) I've deleted the mailbox from PostfixAdmin, yet it still exists on disk? Why?
+
+ - This is related to #1 above - namely, PostfixAdmin (which is a php web
+ application) does not have permission to modify the mailbox files on disk.
+ You need to either manually remove the directories
+ (e.g. rm -Rf /var/spool/mail/vmail/som...@ex...)
+ or install the postfixadmin-mailbox-postdeletion.sh script (See ADDITIONS/)
+ and modify config.inc.php appropriately.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-04-09 21:05:12
|
Revision: 322
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=322&view=rev
Author: GingerDog
Date: 2008-04-09 14:05:16 -0700 (Wed, 09 Apr 2008)
Log Message:
-----------
DOC updates
Modified Paths:
--------------
trunk/INSTALL.TXT
Modified: trunk/INSTALL.TXT
===================================================================
--- trunk/INSTALL.TXT 2008-04-09 21:04:57 UTC (rev 321)
+++ trunk/INSTALL.TXT 2008-04-09 21:05:16 UTC (rev 322)
@@ -10,7 +10,7 @@
- You are using Postfix 2.0 or higher.
- You are using Apache 1.3.27 / Lighttpd 1.3.15 or higher.
- You are using PHP 4.1 or higher (5.X recommended)
-- You are using MySQL 3.23 or higher (5.x recommended)
+- You are using MySQL 3.23 or higher (5.x recommended) OR PostgreSQL 7.4 (or higher)
READ THIS FIRST!
@@ -21,7 +21,7 @@
Users check out :
- http://high5.net/howto/
- - http://codepoets.co.uk/docs/postfix_postgresql_postfixadmin_courier_howto (Postfix+PostgreSQL+Courier+Postfixadmin)
+ - 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)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-04-09 21:04:59
|
Revision: 321
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=321&view=rev
Author: GingerDog
Date: 2008-04-09 14:04:57 -0700 (Wed, 09 Apr 2008)
Log Message:
-----------
updates to docs
Modified Paths:
--------------
trunk/DOCUMENTS/UPGRADE.txt
Added Paths:
-----------
trunk/DOCUMENTS/FAQ.txt
Added: trunk/DOCUMENTS/FAQ.txt
===================================================================
--- trunk/DOCUMENTS/FAQ.txt (rev 0)
+++ trunk/DOCUMENTS/FAQ.txt 2008-04-09 21:04:57 UTC (rev 321)
@@ -0,0 +1,10 @@
+Frequently Asked Questions:
+
+
+1) Why isn't PostfixAdmin creating my mailbox?
+
+ - PostfixAdmin is only a web interface for storing configuration settings.
+ It does not (by default!) have the ability to create mail folders on disk.
+ In a normal setup, sending the 'Welcome' email accomplishes this task -
+ as Courier/Cyrus/etc do it (and have permission to do so)
+
Modified: trunk/DOCUMENTS/UPGRADE.txt
===================================================================
--- trunk/DOCUMENTS/UPGRADE.txt 2008-04-06 23:33:48 UTC (rev 320)
+++ trunk/DOCUMENTS/UPGRADE.txt 2008-04-09 21:04:57 UTC (rev 321)
@@ -10,7 +10,7 @@
- You are using Postfix 2.0 or higher.
- You are using Apache 1.3.27 / Lighttpd 1.3.15 or higher.
- You are using PHP 4.1 or higher.
-- You are using MySQL 3.23 or higher.
+- You are using MySQL 3.23 or higher OR PostgreSQL v7.4+
READ THIS FIRST!
@@ -19,8 +19,9 @@
This document describes upgrading from an older PostfixAdmin version
(>= v1.5x)
-It's recommened that you install Postfix Admin in a new folder and not
-on-top of the old install!!
+It's recommend that you install Postfix Admin in a new folder and not
+on-top of the old install!! (At the very least, make sure you have backups of
+the database and relevant filesystem!)
When upgrading Postfix Admin, make sure you backup your database before
running upgrade.php.
@@ -33,6 +34,8 @@
1.5.4.
$ mysqldump -a -u root -p > /tmp/postfixadmin-backup.sql
+or
+ $ pg_dump -ad -u postfix postfix > /tmp/postfixadmin-backup.sql
2. Unarchive new Postfix Admin
@@ -64,8 +67,12 @@
time.
-5. Modify the MySQL Tables
---------------------------
+5. Perform appropriate database upgrades
+----------------------------------------
+
+Since version 2.2 of Postfixadmin, upgrade.php has existed which should do the below
+for you automatically.
+
Open upgrade.php in your browser to update your database scheme.
If you update from 2.1 or older, also open setup.php to create a superadmin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-04-06 23:33:42
|
Revision: 320
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=320&view=rev
Author: christian_boltz
Date: 2008-04-06 16:33:48 -0700 (Sun, 06 Apr 2008)
Log Message:
-----------
setup.php:
- added hardcoded $CONF['theme_logo'] and $CONF['theme_css'] to fix the
layout
Modified Paths:
--------------
trunk/setup.php
Modified: trunk/setup.php
===================================================================
--- trunk/setup.php 2008-04-06 23:28:40 UTC (rev 319)
+++ trunk/setup.php 2008-04-06 23:33:48 UTC (rev 320)
@@ -29,6 +29,8 @@
require_once("functions.inc.php");
$CONF['show_header_text'] = 'NO';
+$CONF['theme_logo'] = 'images/logo-default.png';
+$CONF['theme_css'] = 'css/default.css';
require('templates/header.php');
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-04-06 23:28:36
|
Revision: 319
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=319&view=rev
Author: christian_boltz
Date: 2008-04-06 16:28:40 -0700 (Sun, 06 Apr 2008)
Log Message:
-----------
upgrade.php:
- print query (debug mode) _before_ executing it
- upgrade_318_mysql: include CONSTRAINT in CREATE TABLE - otherwise
dropping it afterwards fails...
Modified Paths:
--------------
trunk/upgrade.php
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-04-06 23:12:29 UTC (rev 318)
+++ trunk/upgrade.php 2008-04-06 23:28:40 UTC (rev 319)
@@ -184,9 +184,11 @@
$replace['{BOOL_FALSE}'] = db_get_boolean(False);
$query = trim(str_replace(array_keys($replace), $replace, $sql));
+ if (safeget('debug') != "") {
+ print "<p style='color:#999'>$query";
+ }
$result = db_query($query, $ignore_errors);
if (safeget('debug') != "") {
- print "<p style='color:#999'>$query";
print "<div style='color:#f00'>" . $result['error'] . "</div>";
}
return $result;
@@ -543,13 +545,14 @@
function upgrade_318_mysql() {
$table_vacation_notification = table_by_key('vacation_notification');
- # create table without constraint for now...
db_query_parsed( "
CREATE TABLE {IF_NOT_EXISTS} $table_vacation_notification (
on_vacation varchar(255) NOT NULL,
notified varchar(255) NOT NULL,
notified_at timestamp NOT NULL default now(),
- PRIMARY KEY on_vacation (`on_vacation`, `notified`)
+ PRIMARY KEY on_vacation (`on_vacation`, `notified`),
+ CONSTRAINT `vacation_notification_pkey`
+ FOREIGN KEY (`on_vacation`) REFERENCES vacation(`email`) ON DELETE CASCADE
)
ENGINE=InnoDB DEFAULT {LATIN1} TYPE=InnoDB
COMMENT='Postfix Admin - Virtual Vacation Notifications'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-04-06 23:12:32
|
Revision: 318
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=318&view=rev
Author: christian_boltz
Date: 2008-04-06 16:12:29 -0700 (Sun, 06 Apr 2008)
Log Message:
-----------
upgrade.php:
- creation of vacation_notification table moved to upgrade_318_mysql
because the query in upgrade_81_mysql was broken (key length vs. utf8
charset)
- added upgrade_318_mysql which finally creates a working
vacation_notification table
NOTE: Users who used workarounds to create this table before might
need to drop it manually before upgrade works.
This should fix
http://sourceforge.net/tracker/index.php?func=detail&aid=1828857&group_id=191583&atid=937964
and probably also
http://sourceforge.net/tracker/index.php?func=detail&aid=1875897&group_id=191583&atid=937964
additional minor fixes:
- "create table config" for pgsql now uses table_by_key()
- some whitespace changes
- set default charset (latin1) in upgrade_5_mysql (instead of using
the system default)
Modified Paths:
--------------
trunk/upgrade.php
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-04-06 21:33:30 UTC (rev 317)
+++ trunk/upgrade.php 2008-04-06 23:12:29 UTC (rev 318)
@@ -53,7 +53,7 @@
$r = db_query("SELECT relname FROM pg_class WHERE relname = 'config'");
if($r['rows'] == 0) {
$pgsql = "
- CREATE TABLE config (
+ CREATE TABLE " . table_by_key ('config') . " (
id SERIAL,
name VARCHAR(20) NOT NULL UNIQUE,
value VARCHAR(20) NOT NULL,
@@ -69,8 +69,8 @@
`name` VARCHAR(20) {LATIN1} NOT NULL DEFAULT '',
`value` VARCHAR(20) {LATIN1} NOT NULL DEFAULT '',
UNIQUE name ( `name` )
- )
- ";
+ )
+ ";
db_query_parsed($mysql, 0, " ENGINE = MYISAM COMMENT = 'PostfixAdmin settings'");
}
@@ -369,6 +369,13 @@
}
}
+
+# Possible errors that can be ignored:
+#
+# NO MySQL errors should be ignored below this line!
+
+
+
/**
* create tables
* version: Sourceforge SVN r1 of DATABASE_MYSQL.txt
@@ -387,7 +394,7 @@
`active` tinyint(1) NOT NULL default '1',
PRIMARY KEY (`username`),
KEY username (`username`)
- ) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Admins';
+ ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Virtual Admins';
");
$result = db_query_parsed("
@@ -400,7 +407,7 @@
`active` tinyint(1) NOT NULL default '1',
PRIMARY KEY (`address`),
KEY address (`address`)
- ) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Aliases';
+ ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Virtual Aliases';
");
$result = db_query_parsed("
@@ -418,7 +425,7 @@
`active` tinyint(1) NOT NULL default '1',
PRIMARY KEY (`domain`),
KEY domain (`domain`)
- ) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Domains';
+ ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Virtual Domains';
");
$result = db_query_parsed("
@@ -428,7 +435,7 @@
`created` datetime NOT NULL default '0000-00-00 00:00:00',
`active` tinyint(1) NOT NULL default '1',
KEY username (`username`)
- ) TYPE=MyISAM COMMENT='Postfix Admin - Domain Admins';
+ ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Domain Admins';
");
$result = db_query_parsed("
@@ -439,7 +446,7 @@
`action` varchar(255) NOT NULL default '',
`data` varchar(255) NOT NULL default '',
KEY timestamp (`timestamp`)
- ) TYPE=MyISAM COMMENT='Postfix Admin - Log';
+ ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Log';
");
$result = db_query_parsed("
@@ -455,7 +462,7 @@
`active` tinyint(1) NOT NULL default '1',
PRIMARY KEY (`username`),
KEY username (`username`)
- ) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Mailboxes';
+ ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Virtual Mailboxes';
");
$result = db_query_parsed("
@@ -469,10 +476,8 @@
`active` tinyint(1) NOT NULL default '1',
PRIMARY KEY (`email`),
KEY email (`email`)
- ) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Vacation';
+ ) TYPE=MyISAM DEFAULT {LATIN1} COMMENT='Postfix Admin - Virtual Vacation';
");
- # Possible errors that can be ignored:
- # - (none)
}
/**
@@ -498,26 +503,14 @@
ALTER TABLE `$table_vacation` CHANGE `active` `active` TINYINT( 1 ) NOT NULL DEFAULT '1'
ALTER TABLE `$table_vacation` DEFAULT {LATIN1}
ALTER TABLE `$table_vacation` ENGINE = INNODB
- "));
+ "));
foreach ($all_sql as $sql) {
$result = db_query_parsed($sql, TRUE);
}
- db_query_parsed(
- " CREATE TABLE {IF_NOT_EXISTS} $table_vacation_notification (
- on_vacation varchar(255) NOT NULL,
- notified varchar(255) NOT NULL,
- notified_at timestamp NOT NULL default now(),
- CONSTRAINT vacation_notification_pkey PRIMARY KEY(on_vacation, notified),
- FOREIGN KEY (on_vacation) REFERENCES vacation(email) ON DELETE CASCADE
- )
- ",
- TRUE,
- " ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci TYPE=InnoDB
- COMMENT='Postfix Admin - Virtual Vacation Notifications'
- "
- );
+ # creation of vacation_notification table moved to upgrade_318_mysql because
+ # the query in this function was broken (key length vs. utf8 charset)
}
/**
@@ -542,6 +535,49 @@
}
+/**
+ * Create / modify vacation_notification table.
+ * Note: This might not work if users used workarounds to create the table before.
+ * In this case, dropping the table is the easiest solution.
+ */
+function upgrade_318_mysql() {
+ $table_vacation_notification = table_by_key('vacation_notification');
+
+ # create table without constraint for now...
+ db_query_parsed( "
+ CREATE TABLE {IF_NOT_EXISTS} $table_vacation_notification (
+ on_vacation varchar(255) NOT NULL,
+ notified varchar(255) NOT NULL,
+ notified_at timestamp NOT NULL default now(),
+ PRIMARY KEY on_vacation (`on_vacation`, `notified`)
+ )
+ ENGINE=InnoDB DEFAULT {LATIN1} TYPE=InnoDB
+ COMMENT='Postfix Admin - Virtual Vacation Notifications'
+ ");
+
+ # in case someone has manually created the table with utf8 fields before:
+ $all_sql = split("\n", trim("
+ ALTER TABLE `$table_vacation_notification` DROP FOREIGN KEY `vacation_notification_pkey`
+ ALTER TABLE `$table_vacation_notification` CHANGE `on_vacation` `on_vacation` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_vacation_notification` CHANGE `notified` `notified` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_vacation_notification` DEFAULT {LATIN1}
+ "));
+ # Possible errors that can be ignored:
+ # None.
+ # If something goes wrong, the user should drop the vacation_notification table
+ # (not a great loss) and re-create it using this function.
+
+ foreach ($all_sql as $sql) {
+ $result = db_query_parsed($sql);
+ }
+
+ # create constraint...
+ $result = db_query_parsed("
+ ALTER TABLE $table_vacation_notification ADD CONSTRAINT `vacation_notification_pkey`
+ FOREIGN KEY (`on_vacation`) REFERENCES vacation(`email`) ON DELETE CASCADE
+ ");
+}
+
/*
TODO
@@ -549,15 +585,10 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
MySQL:
- * vacation:
+* vacation:
- DROP INDEX email
- 'cache' field might be obsolete with vacation_notification - needs to be checked!
- * vacation_notification:
- - DEFAULT CHARSET and COLLATE should be changed
- - change all varchar fields to latin1 (email addresses don't contain utf8 characters)
* charset of equal fields MUST be the same (see bugreport)
-* if necessary, delete the CONSTRAINT before changing field type and create it again
- http://dev.mysql.com/doc/refman/5.0/en/innodb-foreign-key-constraints.html
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-04-06 21:33:31
|
Revision: 317
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=317&view=rev
Author: christian_boltz
Date: 2008-04-06 14:33:30 -0700 (Sun, 06 Apr 2008)
Log Message:
-----------
upgrade.php:
- integrated table creation, based on SVN r1 DATABASE_MYSQL.txt
- added some comments about possible errors that can be ignored
(I'm dreaming of having an error "whitelist" and displaying
all other errors - but not for 2.2 ;-)
DATABASE_MYSQL.TXT
- added up-to-date database setup instructions
- disabled all SQL code (will be deleted later)
Modified Paths:
--------------
trunk/DATABASE_MYSQL.TXT
trunk/upgrade.php
Modified: trunk/DATABASE_MYSQL.TXT
===================================================================
--- trunk/DATABASE_MYSQL.TXT 2008-04-03 22:16:15 UTC (rev 316)
+++ trunk/DATABASE_MYSQL.TXT 2008-04-06 21:33:30 UTC (rev 317)
@@ -2,7 +2,34 @@
# Postfix Admin
# Licensed under GPL for more info check LICENSE.TXT
#
+#
+# To setup the MySQL database, do the following steps:
+# - create a MySQL database
+# CREATE DATABASE postfix;
+# - create a MySQL user that has all permissions on this database:
+# CREATE USER 'postfix'@'localhost' IDENTIFIED BY 'choose_a_password';
+# GRANT ALL PRIVILEGES ON `postfix` . * TO 'postfix'@'localhost';
+# - edit config.inc.php to suit your needs
+# - run upgrade.php to create the needed tables (yes, the filename is chosen
+# badly in this case ;-)
+# - run setup.php
+
+
+
+
+/*
+
+ ***********************************************************************
+ * everything below is probably outdated and should no longer be used. *
+ * Therefore it is commented out ;-) *
+ ***********************************************************************
+
+
+
+
+
+
# This is the complete MySQL database structure for Postfix Admin.
# If you are installing from scratch you can use this file otherwise you
# need to use the TABLE_CHANGES.TXT or TABLE_BACKUP_MX.TXT that comes with Postfix Admin.
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-04-03 22:16:15 UTC (rev 316)
+++ trunk/upgrade.php 2008-04-06 21:33:30 UTC (rev 317)
@@ -225,6 +225,8 @@
$result = db_query_parsed("ALTER TABLE $table_domain ADD COLUMN transport VARCHAR(255) AFTER maxquota;", TRUE);
// don't think PGSQL supports 'AFTER transport'
$result = db_query_parsed("ALTER TABLE $table_domain ADD COLUMN backupmx {BOOLEAN} DEFAULT {BOOL_FALSE} AFTER transport;", TRUE);
+ # possible errors that can be ignored:
+ # - Invalid query: Table 'postfix.domain' doesn't exist
}
function upgrade_2_pgsql() {
@@ -265,17 +267,21 @@
ALTER TABLE $table_vacation DROP PRIMARY KEY
ALTER TABLE $table_vacation ADD PRIMARY KEY(email)
UPDATE $table_vacation SET domain=SUBSTRING_INDEX(email, '@', -1) WHERE email=email;
- "));
+ "));
- foreach ($all_sql as $sql) {
- $result = db_query_parsed($sql, TRUE);
- }
+ foreach ($all_sql as $sql) {
+ $result = db_query_parsed($sql, TRUE);
+ }
+ # Possible errors that can be ignored:
+ # - Invalid query: Table 'postfix.*' doesn't exist
}
function upgrade_4_mysql() { # MySQL only
# changes between 2.1 and moving to sourceforge
$table_domain = table_by_key ('domain');
$result = db_query_parsed("ALTER TABLE $table_domain ADD COLUMN quota int(10) NOT NULL default '0' AFTER maxquota", TRUE);
+ # Possible errors that can be ignored:
+ # - Invalid query: Table 'postfix.domain' doesn't exist
}
/**
@@ -364,6 +370,112 @@
}
/**
+ * create tables
+ * version: Sourceforge SVN r1 of DATABASE_MYSQL.txt
+ * changes compared to DATABASE_MYSQL.txt:
+ * - removed MySQL user and database creation
+ * - removed creation of default superadmin
+ */
+function upgrade_5_mysql() {
+
+ $result = db_query_parsed("
+ CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('admin') . "` (
+ `username` varchar(255) NOT NULL default '',
+ `password` varchar(255) NOT NULL default '',
+ `created` datetime NOT NULL default '0000-00-00 00:00:00',
+ `modified` datetime NOT NULL default '0000-00-00 00:00:00',
+ `active` tinyint(1) NOT NULL default '1',
+ PRIMARY KEY (`username`),
+ KEY username (`username`)
+ ) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Admins';
+ ");
+
+ $result = db_query_parsed("
+ CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('alias') . "` (
+ `address` varchar(255) NOT NULL default '',
+ `goto` text NOT NULL,
+ `domain` varchar(255) NOT NULL default '',
+ `created` datetime NOT NULL default '0000-00-00 00:00:00',
+ `modified` datetime NOT NULL default '0000-00-00 00:00:00',
+ `active` tinyint(1) NOT NULL default '1',
+ PRIMARY KEY (`address`),
+ KEY address (`address`)
+ ) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Aliases';
+ ");
+
+ $result = db_query_parsed("
+ CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('domain') . "` (
+ `domain` varchar(255) NOT NULL default '',
+ `description` varchar(255) NOT NULL default '',
+ `aliases` int(10) NOT NULL default '0',
+ `mailboxes` int(10) NOT NULL default '0',
+ `maxquota` int(10) NOT NULL default '0',
+ `quota` int(10) NOT NULL default '0',
+ `transport` varchar(255) default NULL,
+ `backupmx` tinyint(1) NOT NULL default '0',
+ `created` datetime NOT NULL default '0000-00-00 00:00:00',
+ `modified` datetime NOT NULL default '0000-00-00 00:00:00',
+ `active` tinyint(1) NOT NULL default '1',
+ PRIMARY KEY (`domain`),
+ KEY domain (`domain`)
+ ) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Domains';
+ ");
+
+ $result = db_query_parsed("
+ CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('domain_admins') . "` (
+ `username` varchar(255) NOT NULL default '',
+ `domain` varchar(255) NOT NULL default '',
+ `created` datetime NOT NULL default '0000-00-00 00:00:00',
+ `active` tinyint(1) NOT NULL default '1',
+ KEY username (`username`)
+ ) TYPE=MyISAM COMMENT='Postfix Admin - Domain Admins';
+ ");
+
+ $result = db_query_parsed("
+ CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('log') . "` (
+ `timestamp` datetime NOT NULL default '0000-00-00 00:00:00',
+ `username` varchar(255) NOT NULL default '',
+ `domain` varchar(255) NOT NULL default '',
+ `action` varchar(255) NOT NULL default '',
+ `data` varchar(255) NOT NULL default '',
+ KEY timestamp (`timestamp`)
+ ) TYPE=MyISAM COMMENT='Postfix Admin - Log';
+ ");
+
+ $result = db_query_parsed("
+ CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('mailbox') . "` (
+ `username` varchar(255) NOT NULL default '',
+ `password` varchar(255) NOT NULL default '',
+ `name` varchar(255) NOT NULL default '',
+ `maildir` varchar(255) NOT NULL default '',
+ `quota` int(10) NOT NULL default '0',
+ `domain` varchar(255) NOT NULL default '',
+ `created` datetime NOT NULL default '0000-00-00 00:00:00',
+ `modified` datetime NOT NULL default '0000-00-00 00:00:00',
+ `active` tinyint(1) NOT NULL default '1',
+ PRIMARY KEY (`username`),
+ KEY username (`username`)
+ ) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Mailboxes';
+ ");
+
+ $result = db_query_parsed("
+ CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('vacation') . "` (
+ `email` varchar(255) NOT NULL default '',
+ `subject` varchar(255) NOT NULL default '',
+ `body` text NOT NULL default '',
+ `cache` text NOT NULL default '',
+ `domain` varchar(255) NOT NULL default '',
+ `created` datetime NOT NULL default '0000-00-00 00:00:00',
+ `active` tinyint(1) NOT NULL default '1',
+ PRIMARY KEY (`email`),
+ KEY email (`email`)
+ ) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Vacation';
+ ");
+ # Possible errors that can be ignored:
+ # - (none)
+}
+
+/**
* drop useless indicies (already available as primary key)
*/
function upgrade_79_mysql() { # MySQL only
@@ -443,7 +555,9 @@
* vacation_notification:
- DEFAULT CHARSET and COLLATE should be changed
- change all varchar fields to latin1 (email addresses don't contain utf8 characters)
-
+* charset of equal fields MUST be the same (see bugreport)
+* if necessary, delete the CONSTRAINT before changing field type and create it again
+ http://dev.mysql.com/doc/refman/5.0/en/innodb-foreign-key-constraints.html
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-04-03 22:16:10
|
Revision: 316
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=316&view=rev
Author: christian_boltz
Date: 2008-04-03 15:16:15 -0700 (Thu, 03 Apr 2008)
Log Message:
-----------
fetchmail.php:
- initialize $tFmail to avoid warning on empty list
https://sourceforge.net/tracker/?func=detail&atid=937964&aid=1927707&group_id=191583
Modified Paths:
--------------
trunk/fetchmail.php
Modified: trunk/fetchmail.php
===================================================================
--- trunk/fetchmail.php 2008-04-03 21:57:44 UTC (rev 315)
+++ trunk/fetchmail.php 2008-04-03 22:16:15 UTC (rev 316)
@@ -229,6 +229,7 @@
}
}
+$tFmail = array();
if ($edit + $new == 0) { # display list
$res = db_query ("SELECT ".implode(",",escape_string(array_keys($fm_struct)))." FROM fetchmail order by id desc");
if ($res['rows'] > 0) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-04-03 21:57:39
|
Revision: 315
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=315&view=rev
Author: christian_boltz
Date: 2008-04-03 14:57:44 -0700 (Thu, 03 Apr 2008)
Log Message:
-----------
- added notice about and link to openSUSE and Fedora RPM packages
Modified Paths:
--------------
website/index.php
Modified: website/index.php
===================================================================
--- website/index.php 2008-03-24 13:40:48 UTC (rev 314)
+++ website/index.php 2008-04-03 21:57:44 UTC (rev 315)
@@ -35,10 +35,12 @@
<h3>Download - Not so stable release</h3>
<p>We've created a .deb package to make installation slightly easier, based on revision 207 of Subversion (11th November 2007). </p>
+<p>RPM packages for Fedora and openSUSE are available via openSUSE buildservice and usually contain the latest Subversion version.</p>
<p>This should be judged as being a <b>snapshot</b>, and although it <u>should work</u> - it may not - or some features may be lacking suitable documentation.</p>
<p>As this is based on the development branch, it's setup is slightly different from that for v2.1.0; but you should be able to figure that out when you visit http://yoursever/postfixadmin after installing it. Note, the .deb does not setup your database in any useful way - so you'll need to do this manually (see /usr/share/doc/postfixadmin)</p>
<p><a href="http://downloads.sourceforge.net/postfixadmin/postfixadmin_2.2.0-1rc1_all.deb?use_mirror=osdn">GingerDog's experimental .deb</a> for installation (based on Subversion revision 207).</p>
+<p><a href="http://software.opensuse.org/search?q=postfixadmin">RPM packages for openSUSE and Fedora</a> (usually latest Subversion revision).</p>
<h3>Download - Development release</h3>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-03-24 13:44:25
|
Revision: 314
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=314&view=rev
Author: christian_boltz
Date: 2008-03-24 06:40:48 -0700 (Mon, 24 Mar 2008)
Log Message:
-----------
fetchmail.pl:
- disable (forgotten?) Data::Dumper inclusion
Modified Paths:
--------------
trunk/ADDITIONS/fetchmail.pl
Modified: trunk/ADDITIONS/fetchmail.pl
===================================================================
--- trunk/ADDITIONS/fetchmail.pl 2008-03-20 12:03:23 UTC (rev 313)
+++ trunk/ADDITIONS/fetchmail.pl 2008-03-24 13:40:48 UTC (rev 314)
@@ -2,7 +2,7 @@
use DBI;
use MIME::Base64;
-use Data::Dumper;
+# use Data::Dumper;
# the home dir of vmail user:
$vmail_dir="/home/maildirs";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-03-20 12:03:34
|
Revision: 313
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=313&view=rev
Author: christian_boltz
Date: 2008-03-20 05:03:23 -0700 (Thu, 20 Mar 2008)
Log Message:
-----------
nl.lang:
- translation update by Johan Hendriks (sylhouette @SF)
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1910916&group_id=191583
Modified Paths:
--------------
trunk/languages/nl.lang
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2008-03-20 11:15:46 UTC (rev 312)
+++ trunk/languages/nl.lang 2008-03-20 12:03:23 UTC (rev 313)
@@ -14,7 +14,7 @@
$PALANG['cancel'] = 'Annuleren';
$PALANG['save'] = 'Opslaan';
$PALANG['confirm'] = 'Weet u het zeker dat u wilt verwijderen?\n';
-$PALANG['confirm_domain'] = 'Weet u zeker dat u ALLE waardes van het domein wilt verwijderen? Dit kan niet ongedaan worden gemaakt!\n';
+$PALANG['confirm_domain'] = 'Weet u zeker dat u ALLE data van het domein wilt verwijderen? Dit kan niet ongedaan worden gemaakt!\n';
$PALANG['check_update'] = 'Zoeken naar nieuwe versie';
$PALANG['invalid_parameter'] = 'ongeldige parameter!';
$PALANG['pFooter_logged_as'] = 'aangemeld als %s';
@@ -41,7 +41,7 @@
$PALANG['pMain_overview'] = 'Laat uw aliassen en mailboxen zien. U kunt ze vanaf hier bewerken / verwijderen.';
$PALANG['pMain_create_alias'] = 'Maak een nieuwe alias aan voor uw domein.';
$PALANG['pMain_create_mailbox'] = 'Maak een nieuwe mailbox aan voor uw domein.';
-$PALANG['pMain_sendmail'] = 'Verstuur een e-mail naar 1 van de nieuwe mailboxen.';
+$PALANG['pMain_sendmail'] = 'Verstuur een e-mail naar \xE9\xE9n van de nieuwe mailboxen.';
$PALANG['pMain_password'] = 'Wijzig uw wachtwoord.';
$PALANG['pMain_viewlog'] = 'Laat de log files zien';
$PALANG['pMain_logout'] = 'Uitloggen';
@@ -69,7 +69,7 @@
$PALANG['pOverview_mailbox_quota'] = 'Quota (MB)';
$PALANG['pOverview_mailbox_modified'] = 'Laatst Bewerkt';
$PALANG['pOverview_mailbox_active'] = 'Actief';
-$PALANG['pOverview_vacation_edit'] = 'AUTOMATISCH BEANTWOORDEN IS GEACTIVEERD';
+$PALANG['pOverview_vacation_edit'] = 'AUTOMATISCH BEANTWOORDEN IS ACTIEF';
$PALANG['pOverview_vacation_option'] = 'Activeer automatisch beantwoorden';
$PALANG['pOverview_get_domain'] = 'Domein';
@@ -360,35 +360,35 @@
$PALANG['pFetchmail_user_missing'] = 'Naam van de gebruiker!';
$PALANG['pFetchmail_password_missing'] = 'Wachtwoord!';
$PALANG['pFetchmail_field_id'] = 'ID';
-$PALANG['pFetchmail_field_mailbox'] = 'Mailbox';
-$PALANG['pFetchmail_field_src_server'] = 'Server';
-$PALANG['pFetchmail_field_src_auth'] = 'Autorisatie Type';
-$PALANG['pFetchmail_field_src_user'] = 'Gebruiker';
-$PALANG['pFetchmail_field_src_password'] = 'Wachtwoord';
-$PALANG['pFetchmail_field_src_folder'] = 'Folder';
-$PALANG['pFetchmail_field_poll_time'] = 'Interval';
-$PALANG['pFetchmail_field_fetchall'] = 'Alle mail ophalen';
-$PALANG['pFetchmail_field_keep'] = 'Mail laten staan';
-$PALANG['pFetchmail_field_protocol'] = 'Protocol';
-$PALANG['pFetchmail_field_extra_options'] = 'Extra Opties';
-$PALANG['pFetchmail_field_mda'] = 'MDA';
-$PALANG['pFetchmail_field_date'] = 'Datum';
-$PALANG['pFetchmail_field_returned_text'] = 'Teruggestuurd bericht';
-$PALANG['pFetchmail_desc_id'] = 'Record ID';
+$PALANG['pFetchmail_field_mailbox'] = 'mailbox';
+$PALANG['pFetchmail_field_src_server'] = 'server';
+$PALANG['pFetchmail_field_src_auth'] = 'authenticatietype';
+$PALANG['pFetchmail_field_src_user'] = 'gebruiker';
+$PALANG['pFetchmail_field_src_password'] = 'wachtwoord';
+$PALANG['pFetchmail_field_src_folder'] = 'map';
+$PALANG['pFetchmail_field_poll_time'] = 'controle';
+$PALANG['pFetchmail_field_fetchall'] = 'alle berichten ophalen';
+$PALANG['pFetchmail_field_keep'] = 'behouden';
+$PALANG['pFetchmail_field_protocol'] = 'protocol';
+$PALANG['pFetchmail_field_extra_options'] = 'extra opties';
+$PALANG['pFetchmail_field_mda'] = 'MD';
+$PALANG['pFetchmail_field_date'] = 'datum';
+$PALANG['pFetchmail_field_returned_text'] = 'teruggegeven tekst';
+$PALANG['pFetchmail_desc_id'] = 'record ID';
$PALANG['pFetchmail_desc_mailbox'] = 'Naar welke mailbox sturen we de opgehaalde mail.';
-$PALANG['pFetchmail_desc_src_server'] = 'Andere Server.';
+$PALANG['pFetchmail_desc_src_server'] = 'andere server.';
$PALANG['pFetchmail_desc_src_auth'] = 'In de meeste gevallen \'password\''; # Translators: Please do NOT translate 'password' here
$PALANG['pFetchmail_desc_src_user'] = 'Gebruiker op andere server.';
$PALANG['pFetchmail_desc_src_password'] = 'Wachtwoord op andere server.';
-$PALANG['pFetchmail_desc_src_folder'] = 'Folder op andere server.';
+$PALANG['pFetchmail_desc_src_folder'] = 'folder op andere server.';
$PALANG['pFetchmail_desc_poll_time'] = 'Check iedere ... minuten.';
$PALANG['pFetchmail_desc_fetchall'] = 'Haal zowel oude (gelezen) als nieuwe berichten op.';
-$PALANG['pFetchmail_desc_keep'] = 'Laat opgehaalde berichten op de andere server staan.';
-$PALANG['pFetchmail_desc_protocol'] = 'Het te gebruiken protocol.';
-$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Opties.';
-$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent.';
-$PALANG['pFetchmail_desc_date'] = 'Datum van de laatste polling/configuratie verandering.';
-$PALANG['pFetchmail_desc_returned_text'] = 'Text bericht van de laatste polling.';
+$PALANG['pFetchmail_desc_keep'] = 'Opgehaalde berichten op de server achterlaten.';
+$PALANG['pFetchmail_desc_protocol'] = 'het te gebruiken protocol.';
+$PALANG['pFetchmail_desc_extra_options'] = 'extra opties voor fetchmail.';
+$PALANG['pFetchmail_desc_mda'] = 'mail delivery agent.';
+$PALANG['pFetchmail_desc_date'] = 'datum van de laatste berichtencontrole/configuratie verandering.';
+$PALANG['pFetchmail_desc_returned_text'] = 'text bericht van de laatste berichtencontrole.';
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-03-20 11:15:44
|
Revision: 312
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=312&view=rev
Author: christian_boltz
Date: 2008-03-20 04:15:46 -0700 (Thu, 20 Mar 2008)
Log Message:
-----------
sv.lang:
- translation update (received via mail)
thanks to Bachman Kharazmi <bachman AT tor.lindesign.se>
Modified Paths:
--------------
trunk/languages/sv.lang
Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang 2008-03-08 21:23:24 UTC (rev 311)
+++ trunk/languages/sv.lang 2008-03-20 11:15:46 UTC (rev 312)
@@ -5,7 +5,7 @@
// by Stefan Jakobsson <stefan at katrinet dot se>
// updated by Bjorne <bjorne at gah dot se>
// updated by Jan Örnstedt (ornstedt @sf)
-//
+// updated by Bachman Kharazmi ba...@to...
$PALANG['YES'] = 'JA';
$PALANG['NO'] = 'NEJ';
@@ -28,11 +28,11 @@
$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Du angav fel lösenord!</span>';
$PALANG['pLogin_login_users'] = 'Användare klickar här för att logga in på användardelen.';
-$PALANG['pMenu_main'] = 'Main'; # XXX
+$PALANG['pMenu_main'] = 'Huvudmeny';
$PALANG['pMenu_overview'] = 'Sammanfattning';
$PALANG['pMenu_create_alias'] = 'Lägg till alias';
$PALANG['pMenu_create_mailbox'] = 'Lägg till brevlåda';
-$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
+$PALANG['pMenu_fetchmail'] = 'Hämta mail';
$PALANG['pMenu_sendmail'] = 'Skicka mail';
$PALANG['pMenu_password'] = 'Lösenord';
$PALANG['pMenu_viewlog'] = 'Visa logg';
@@ -49,7 +49,7 @@
$PALANG['pOverview_disabled'] = 'Avstängd';
$PALANG['pOverview_unlimited'] = 'Obegränsat';
-$PALANG['pOverview_title'] = ':: Defined Domains'; # XXX
+$PALANG['pOverview_title'] = ':: Deklarerade domäner';
$PALANG['pOverview_up_arrow'] = 'Tillbaka till början';
$PALANG['pOverview_right_arrow'] = 'Nästa sida';
$PALANG['pOverview_left_arrow'] = 'Föregående sida';
@@ -64,26 +64,26 @@
$PALANG['pOverview_alias_modified'] = 'Senast Ändrad';
$PALANG['pOverview_alias_active'] = 'Aktiv';
$PALANG['pOverview_alias_edit'] = 'Alias';
-$PALANG['and_x_more'] = '[and %s more...]'; # XXX
+$PALANG['and_x_more'] = '[och %s mer...]';
$PALANG['pOverview_mailbox_username'] = 'Epost';
$PALANG['pOverview_mailbox_name'] = 'Namn';
$PALANG['pOverview_mailbox_quota'] = 'Quota (MB)';
$PALANG['pOverview_mailbox_modified'] = 'Senast Ändrad';
$PALANG['pOverview_mailbox_active'] = 'Aktiv';
-$PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
-$PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
+$PALANG['pOverview_vacation_edit'] = 'LEDIGHET ÄR AKTIVERAT';
+$PALANG['pOverview_vacation_option'] = 'Aktivera ledighet';
$PALANG['pOverview_get_domain'] = 'Domän';
$PALANG['pOverview_get_aliases'] = 'Alias';
$PALANG['pOverview_get_mailboxes'] = 'Brevlåda';
-$PALANG['pOverview_get_quota'] = 'Mailbox Quota (MB)'; # XXX
+$PALANG['pOverview_get_quota'] = 'Kvot för brevlåda (MB)';
$PALANG['pOverview_get_modified'] = 'Senast Ändrad';
$PALANG['pDelete_delete_error'] = '<span class="error_msg">Kan inte radera data för ';
-$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 borttagen.';
+$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Kunde inte tabort brevlåda ';
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Detta är inte din domän ';
-$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
+$PALANG['pDelete_alias_error'] = '<span class="error_msg">Kunde inte tabort alias ';
$PALANG['pCreate_alias_welcome'] = 'Skapa nytt alias för din domän.';
$PALANG['pCreate_alias_address'] = 'Alias';
@@ -107,8 +107,8 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Du angav inget i Till</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Epost adressen du angivit är felaktig: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Detta är inte din domän: ';
-$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_forward_and_store'] = 'Leverera till lokal brevlåda.';
+$PALANG['pEdit_alias_forward_only'] = 'Vidarebefodra till angiven epost endast.';
$PALANG['pEdit_alias_button'] = 'Ändra alias';
$PALANG['pEdit_alias_result_error'] = '<span class="error_msg">Kan inte modifiera detta alias!</span>';
@@ -131,7 +131,7 @@
$PALANG['pCreate_mailbox_button'] = 'Lägg till brevlåda';
$PALANG['pCreate_mailbox_result_error'] = '<span class="error_msg">Kan ej lägga till brevlådat i tabellen för konton!</span>';
$PALANG['pCreate_mailbox_result_success'] = 'Mailkontot har lagts till!';
-$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_result_succes_nosubfolders'] = 'Brevlådan har lagts till i tabellen mailbox, men inga (eller få) av de fördefinierade underkatalogerna kunde skapas';
$PALANG['pEdit_mailbox_welcome'] = 'Ändra ett brevlåda i din domän.';
$PALANG['pEdit_mailbox_username'] = 'Epostadress';
@@ -159,11 +159,11 @@
$PALANG['pPassword_button'] = 'Ändra Lösenord';
$PALANG['pPassword_result_error'] = '<span class="error_msg">Kan inte ändra ditt lösenord!</span>';
$PALANG['pPassword_result_success'] = 'Ditt lösenord har ändrats!';
-$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['pEdit_vacation_set'] = 'Ändra / Aktivera meddelande för ledighet';
+$PALANG['pEdit_vacation_remove'] = 'Tabort meddelande för ledighet';
+$PALANG['pVacation_result_error'] = '<span class="error_msg">Kunde inte uppdatera autosvar inställningar!</span>';
+$PALANG['pVacation_result_removed'] = 'Autosvar meddelande har tagits bort!';
+$PALANG['pVacation_result_added'] = 'Autosvar meddelande har aktiverats!';
$PALANG['pViewlog_welcome'] = 'Visa dom senaste 10 åtgärderna för ';
$PALANG['pViewlog_timestamp'] = 'Tidpunkt';
@@ -192,8 +192,8 @@
$PALANG['pSendmail_subject_text'] = 'Välkommen';
$PALANG['pSendmail_body'] = 'Meddelande';
$PALANG['pSendmail_button'] = 'Skicka';
-$PALANG['pSendmail_result_error'] = '<span class="error_msg">Mailet kunde inte skickas!</span>'; # XXX text change - new: <span class="error_msg">Unable to send email!</span>
-$PALANG['pSendmail_result_success'] = 'Mailet har skickats!'; # XXX text change - new: Email sent!
+$PALANG['pSendmail_result_error'] = '<span class="error_msg">Mailet kunde inte skickas!</span>';
+$PALANG['pSendmail_result_success'] = 'Mailet har skickats!';
$PALANG['pAdminMenu_list_admin'] = 'Administratörer';
$PALANG['pAdminMenu_list_domain'] = 'Domäner';
@@ -238,7 +238,7 @@
$PALANG['pAdminCreate_domain_welcome'] = 'Lägg till ny domän';
$PALANG['pAdminCreate_domain_domain'] = 'Domän';
$PALANG['pAdminCreate_domain_domain_text_error'] = '<span class="error_msg">Den domänen finns redan!</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">Domänen är ogiltig!</span>';
$PALANG['pAdminCreate_domain_description'] = 'Beskrivning';
$PALANG['pAdminCreate_domain_aliases'] = 'Alias';
$PALANG['pAdminCreate_domain_aliases_text'] = '-1 = avaktivera | 0 = obegränsat';
@@ -246,15 +246,15 @@
$PALANG['pAdminCreate_domain_mailboxes_text'] = '-1 = avaktivera | 0 = obegränsat';
$PALANG['pAdminCreate_domain_maxquota'] = 'Max Quota';
$PALANG['pAdminCreate_domain_maxquota_text'] = 'MB<br /> -1 = avaktivera | 0 = obegränsat';
-$PALANG['pAdminCreate_domain_transport'] = 'Transport'; # XXX
-$PALANG['pAdminCreate_domain_transport_text'] = 'Define transport'; # XXX
+$PALANG['pAdminCreate_domain_transport'] = 'Transport';
+$PALANG['pAdminCreate_domain_transport_text'] = 'Definiera transport';
$PALANG['pAdminCreate_domain_defaultaliases'] = 'Skapa standard alias';
-$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX
-$PALANG['pAdminCreate_domain_backupmx'] = 'Mail server is backup MX'; # XXX
+$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
+$PALANG['pAdminCreate_domain_backupmx'] = 'Mailserver är backup MX';
$PALANG['pAdminCreate_domain_button'] = 'Lägg till domän';
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Kan inte skapa domänen!</span>';
$PALANG['pAdminCreate_domain_result_success'] = 'Domänen har skapats!';
-$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX
+$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Kunde inte tabort domän!</span>';
$PALANG['pAdminEdit_domain_welcome'] = 'Ändra en domän';
$PALANG['pAdminEdit_domain_domain'] = 'Domän';
@@ -265,8 +265,8 @@
$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = avaktivera | 0 = obegränsat';
$PALANG['pAdminEdit_domain_maxquota'] = 'Max Quota';
$PALANG['pAdminEdit_domain_maxquota_text'] = 'MB<br /> -1 = avaktivera | 0 = obegränsat';
-$PALANG['pAdminEdit_domain_transport'] = 'Transport'; # XXX
-$PALANG['pAdminEdit_domain_transport_text'] = 'Define transport'; # XXX
+$PALANG['pAdminEdit_domain_transport'] = 'Transport';
+$PALANG['pAdminEdit_domain_transport_text'] = 'Definiera transport';
$PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX';
$PALANG['pAdminEdit_domain_active'] = 'Aktiv';
$PALANG['pAdminEdit_domain_button'] = 'Ändra domän';
@@ -291,7 +291,7 @@
$PALANG['pAdminEdit_admin_password2'] = 'Lösenord (igen)';
$PALANG['pAdminEdit_admin_password_text_error'] = '<span class="error_msg">Lösenorden du angav är olika!<br />Eller är tomma!</span>';
$PALANG['pAdminEdit_admin_active'] = 'Aktiv';
-$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX
+$PALANG['pAdminEdit_admin_super_admin'] = 'Super administratör';
$PALANG['pAdminEdit_admin_button'] = 'Ändra admin';
$PALANG['pAdminEdit_admin_result_error'] = '<span class="error_msg">Kan inte ändra admin!</span>';
$PALANG['pAdminEdit_admin_result_success'] = 'Admin har ändrats!';
@@ -308,7 +308,7 @@
$PALANG['pUsersMenu_password'] = 'Ändra Lösenord';
$PALANG['pUsersMain_vacation'] = 'Ställ in ett "out of office" meddelande eller autosvar för din epost.';
-$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX
+$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' är AKTIVERAT, klicka \'' . $PALANG['pUsersMenu_vacation'] . '\' för att ' . $PALANG['edit'] . '/tabort';
$PALANG['pUsersMain_edit_alias'] = 'Ändra din epost forwardadress.';
$PALANG['pUsersMain_password'] = 'Ändra ditt nuvarande lösenord.';
@@ -346,50 +346,50 @@
$PALANG['pBroadcast_send'] = 'Skicka';
$PALANG['pBroadcast_success'] = 'Ditt grupputskick har sänts.';
$PALANG['pAdminMenu_broadcast_message'] = 'Grupputskick';
-$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'] = 'Fälten namn, ämne och meddelande skall inte vara tomma!';
+$PALANG['pStatus_undeliverable'] = 'kanske misslyckades leverera ';
+$PALANG['pStatus_custom'] = 'Levereras till ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
-$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # 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['pPasswordTooShort'] = "För kort lösenord - ett lösenord på %s tecken krävs";
+$PALANG['pFetchmail_welcome'] = 'Hämta mail för:';
+$PALANG['pFetchmail_new_entry'] = 'Ny anteckning';
+$PALANG['pFetchmail_database_save_error'] = 'Misslyckades med att spara anteckningen i databasen!';
+$PALANG['pFetchmail_database_save_success'] = 'Anteckning sparad i databasen.';
+$PALANG['pFetchmail_error_invalid_id'] = 'Ingen anteckning med ID %s hittades!';
+$PALANG['pFetchmail_invalid_mailbox'] = 'Felaktig brevlåda!';
+$PALANG['pFetchmail_server_missing'] = 'Var snäll och fyll i namnet till värddatorn!';
+$PALANG['pFetchmail_user_missing'] = 'Var snäll och fyll i användarnamnet till värddatorn!';
+$PALANG['pFetchmail_password_missing'] = 'Var snäll och fyll i lösenordet till värddatorn!';
$PALANG['pFetchmail_field_id'] = 'ID';
$PALANG['pFetchmail_field_mailbox'] = 'Mailkonto';
-$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_src_server'] = 'Värddator';
+$PALANG['pFetchmail_field_src_auth'] = 'Autentiseringstyp';
+$PALANG['pFetchmail_field_src_user'] = 'Användarnamn';
+$PALANG['pFetchmail_field_src_password'] = 'Lösenord';
+$PALANG['pFetchmail_field_src_folder'] = 'Katalog';
+$PALANG['pFetchmail_field_poll_time'] = 'Kontrollera';
+$PALANG['pFetchmail_field_fetchall'] = 'Hämta samtliga';
+$PALANG['pFetchmail_field_keep'] = 'Behåll';
$PALANG['pFetchmail_field_protocol'] = 'Protokoll';
-$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
-$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
+$PALANG['pFetchmail_field_extra_options'] = 'Extra inställningsmöjligheter';
+$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Datum';
-$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_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['pFetchmail_field_returned_text'] = 'Retur text';
+$PALANG['pFetchmail_desc_id'] = 'Händelse ID';
+$PALANG['pFetchmail_desc_mailbox'] = 'Lokal brevlåda';
+$PALANG['pFetchmail_desc_src_server'] = 'Värddator';
+$PALANG['pFetchmail_desc_src_auth'] = 'Oftast \'password\'';
+$PALANG['pFetchmail_desc_src_user'] = 'Användarnamn';
+$PALANG['pFetchmail_desc_src_password'] = 'Lösenord';
+$PALANG['pFetchmail_desc_src_folder'] = 'Katalog';
+$PALANG['pFetchmail_desc_poll_time'] = 'Kontrollera varje ... minut';
+$PALANG['pFetchmail_desc_fetchall'] = 'Hämta både gamla lästa (visade) brev och nya';
+$PALANG['pFetchmail_desc_keep'] = 'Behåll hämtade brev på mailservern';
+$PALANG['pFetchmail_desc_protocol'] = 'Använd följande protokoll';
+$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail inställningar';
+$PALANG['pFetchmail_desc_mda'] = 'Mailserveragent (MDA)';
+$PALANG['pFetchmail_desc_date'] = 'Datum för senaste kontroll/konfigurationsändring';
+$PALANG['pFetchmail_desc_returned_text'] = 'Textmeddelande från senaste kontroll';
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-03-08 21:23:20
|
Revision: 311
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=311&view=rev
Author: GingerDog
Date: 2008-03-08 13:23:24 -0800 (Sat, 08 Mar 2008)
Log Message:
-----------
functions.inc.php: fix urls
Modified Paths:
--------------
trunk/functions.inc.php
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2008-03-07 18:38:22 UTC (rev 310)
+++ trunk/functions.inc.php 2008-03-08 21:23:24 UTC (rev 311)
@@ -1321,8 +1321,8 @@
<p />\n
Please check the documentation and website for more information.\n
<p />\n
- <a href=\"http://high5.net/postfixadmin/\">Postfix Admin</a><br />\n
- <a href=\"http://forums.high5.net/index.php?showforum=7\">Knowledge Base</a>\n
+ <a href=\"http://postfixadmin.sf.net/\">Postfix Admin</a><br />\n
+ <a href='https://sourceforge.net/forum/forum.php?forum_id=676076'>Forums</a>
";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <agr...@us...> - 2008-03-07 18:38:23
|
Revision: 310
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=310&view=rev
Author: agregc32
Date: 2008-03-07 10:38:22 -0800 (Fri, 07 Mar 2008)
Log Message:
-----------
simplification and (hopefully) bug free fix for POP/IMAP box marking
Modified Paths:
--------------
trunk/functions.inc.php
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2008-03-05 00:09:46 UTC (rev 309)
+++ trunk/functions.inc.php 2008-03-07 18:38:22 UTC (rev 310)
@@ -1984,9 +1984,7 @@
if ( $CONF['show_popimap'] == 'YES' )
{
//if the address passed in appears in its own goto field, its POP/IMAP
- if (preg_match ('/^' . $show_alias . '$/', $stat_goto) ||
- preg_match ('/' . $show_alias . ',/', $stat_goto) ||
- preg_match ('/,' . $show_alias . '$/', $stat_goto) )
+ if ( preg_match ('/,' . $show_alias . ',/', ',' . $stat_goto . ',') )
{
$stat_string .= "<span style='background-color:" . $CONF['show_popimap_color'] .
"'>" . $CONF['show_status_text'] . "</span> ";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-03-05 00:09:42
|
Revision: 309
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=309&view=rev
Author: christian_boltz
Date: 2008-03-04 16:09:46 -0800 (Tue, 04 Mar 2008)
Log Message:
-----------
config.inc.php:
- better description for $CONF['domain_path'] and $CONF['domain_in_mailbox']
http://sourceforge.net/tracker/index.php?func=detail&aid=1875950&group_id=191583&atid=937964
Modified Paths:
--------------
trunk/config.inc.php
Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php 2008-03-04 22:02:20 UTC (rev 308)
+++ trunk/config.inc.php 2008-03-05 00:09:46 UTC (rev 309)
@@ -117,10 +117,15 @@
// Mailboxes
// If you want to store the mailboxes per domain set this to 'YES'.
-// Example: /usr/local/virtual/domain.tld/use...@do...d
+// Examples:
+// YES: /usr/local/virtual/domain.tld/use...@do...d
+// NO: /usr/local/virtual/use...@do...d
$CONF['domain_path'] = 'NO';
// If you don't want to have the domain in your mailbox set this to 'NO'.
-// Example: /usr/local/virtual/domain.tld/username
+// Examples:
+// YES: /usr/local/virtual/domain.tld/use...@do...d
+// 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';
// Default Domain Values
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <agr...@us...> - 2008-03-04 22:02:32
|
Revision: 308
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=308&view=rev
Author: agregc32
Date: 2008-03-04 14:02:20 -0800 (Tue, 04 Mar 2008)
Log Message:
-----------
fixed an error that would not identify POP/IMAP accounts when a mailbox forwards to other destinations as well.
Modified Paths:
--------------
trunk/functions.inc.php
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2008-03-02 22:17:39 UTC (rev 307)
+++ trunk/functions.inc.php 2008-03-04 22:02:20 UTC (rev 308)
@@ -1985,7 +1985,7 @@
{
//if the address passed in appears in its own goto field, its POP/IMAP
if (preg_match ('/^' . $show_alias . '$/', $stat_goto) ||
- preg_match ('/.*,' . $show_alias . ',.*$/', $stat_goto) ||
+ preg_match ('/' . $show_alias . ',/', $stat_goto) ||
preg_match ('/,' . $show_alias . '$/', $stat_goto) )
{
$stat_string .= "<span style='background-color:" . $CONF['show_popimap_color'] .
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-03-02 22:17:35
|
Revision: 307
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=307&view=rev
Author: christian_boltz
Date: 2008-03-02 14:17:39 -0800 (Sun, 02 Mar 2008)
Log Message:
-----------
functions.inc.php:
- check_language(): use global $supported_languages so that we don't
have to maintain the list of supported languages at different places
(this finally enables users to choose japanese language at login)
Modified Paths:
--------------
trunk/functions.inc.php
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2008-02-28 12:04:51 UTC (rev 306)
+++ trunk/functions.inc.php 2008-03-02 22:17:39 UTC (rev 307)
@@ -147,9 +147,9 @@
function check_language ($use_post = 1)
{
global $CONF;
+ global $supported_languages; # from languages/languages.php
+
$lang = $CONF['default_language'];
- $supported_languages = array ('bg', 'ca', 'cn', 'cs', 'da', 'de', 'en', 'es', 'et', 'eu', 'fi', 'fo', 'fr', 'hu', 'is', 'it', 'mk', 'nl', 'nn', 'pl', 'pt-br', 'ru', 'sl', 'sv', 'tr', 'tw');
- # TODO: use global $supported_languages (from languages/languages.php) instead
if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
{
@@ -165,7 +165,7 @@
{
$lang_next = $lang_array[$i];
$lang_next = strtolower(trim($lang_next));
- if(in_array($lang_next, $supported_languages))
+ if(array_key_exists($lang_next, $supported_languages))
{
$lang = $lang_next;
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-02-28 12:04:55
|
Revision: 306
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=306&view=rev
Author: GingerDog
Date: 2008-02-28 04:04:51 -0800 (Thu, 28 Feb 2008)
Log Message:
-----------
debian: fix rules file (stylesheet moved)
Modified Paths:
--------------
trunk/debian/files
trunk/debian/rules
Modified: trunk/debian/files
===================================================================
--- trunk/debian/files 2008-02-28 12:00:56 UTC (rev 305)
+++ trunk/debian/files 2008-02-28 12:04:51 UTC (rev 306)
@@ -1 +1 @@
-postfixadmin_2.2.0-1rc2_all.deb web optional
+postfixadmin_2.2.0-1rc3_all.deb web optional
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2008-02-28 12:00:56 UTC (rev 305)
+++ trunk/debian/rules 2008-02-28 12:04:51 UTC (rev 306)
@@ -30,7 +30,8 @@
cp -a languages debian/postfixadmin/usr/share/postfixadmin
cp -a templates debian/postfixadmin/usr/share/postfixadmin
cp -a users debian/postfixadmin/usr/share/postfixadmin
- cp stylesheet.css debian/postfixadmin/usr/share/postfixadmin
+ mkdir -p debian/postfixadmin/usr/share/postfixadmin/css
+ cp css/default.css debian/postfixadmin/usr/share/postfixadmin/css
mkdir -p debian/postfixadmin/etc/apache2/conf.d
cp debian/apache-conf debian/postfixadmin/etc/apache2/conf.d/postfixadmin
find debian/postfixadmin -name .svn | xargs -r rm -r
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-02-28 12:00:50
|
Revision: 305
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=305&view=rev
Author: GingerDog
Date: 2008-02-28 04:00:56 -0800 (Thu, 28 Feb 2008)
Log Message:
-----------
bump changelog up
Modified Paths:
--------------
trunk/debian/changelog
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-02-28 11:58:52 UTC (rev 304)
+++ trunk/debian/changelog 2008-02-28 12:00:56 UTC (rev 305)
@@ -1,3 +1,9 @@
+postfixadmin (2.2.0-1rc3) unstable; urgency=low
+
+ * Various bug fixes
+
+ -- David Goodwin <dav...@pa...> Thu, 28 Feb 2008 12:00:00 +0000
+
postfixadmin (2.2.0-1rc2) unstable; urgency=low
* Improved CSS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-02-28 11:58:52
|
Revision: 304
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=304&view=rev
Author: GingerDog
Date: 2008-02-28 03:58:52 -0800 (Thu, 28 Feb 2008)
Log Message:
-----------
edit-mailbox.php- if the user clicks on cancel, forward them to somewhere else, and not save stuff - see https://sourceforge.net/tracker/index.php?func=detail&aid=1888847&group_id=191583&atid=937964
Modified Paths:
--------------
trunk/edit-mailbox.php
Modified: trunk/edit-mailbox.php
===================================================================
--- trunk/edit-mailbox.php 2008-02-26 20:31:25 UTC (rev 303)
+++ trunk/edit-mailbox.php 2008-02-28 11:58:52 UTC (rev 304)
@@ -85,6 +85,11 @@
}
}
+if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['cancel'])) {
+ header("Location: list-virtual.php?domain=$fDomain");
+ exit(0);
+}
+
if ($_SERVER['REQUEST_METHOD'] == "POST")
{
if (isset ($_POST['fPassword'])) $fPassword = escape_string ($_POST['fPassword']);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
8 messages has been excluded from this view by a project administrator.
