postfixadmin-svn Mailing List for PostfixAdmin (Page 110)
Brought to you by:
christian_boltz,
gingerdog
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
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <Gin...@us...> - 2007-12-02 16:53:51
|
Revision: 253
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=253&view=rev
Author: GingerDog
Date: 2007-12-02 08:53:56 -0800 (Sun, 02 Dec 2007)
Log Message:
-----------
fix possible XSS hole (security fix)
Modified Paths:
--------------
trunk/edit-alias.php
Modified: trunk/edit-alias.php
===================================================================
--- trunk/edit-alias.php 2007-12-02 16:02:50 UTC (rev 252)
+++ trunk/edit-alias.php 2007-12-02 16:53:56 UTC (rev 253)
@@ -127,6 +127,8 @@
}
}
+$fAddress = htmlentities($fAddress, ENT_QUOTES);
+$fDomain = htmlentities($fDomain, ENT_QUOTES);
include ("templates/header.php");
include ("templates/menu.php");
include ("templates/edit-alias.php");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-12-02 16:02:45
|
Revision: 252
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=252&view=rev
Author: GingerDog
Date: 2007-12-02 08:02:50 -0800 (Sun, 02 Dec 2007)
Log Message:
-----------
try and stop it (the browser) remembering stuff
Modified Paths:
--------------
trunk/templates/create-mailbox.php
Modified: trunk/templates/create-mailbox.php
===================================================================
--- trunk/templates/create-mailbox.php 2007-12-02 15:09:39 UTC (rev 251)
+++ trunk/templates/create-mailbox.php 2007-12-02 16:02:50 UTC (rev 252)
@@ -6,7 +6,7 @@
</tr>
<tr>
<td><?php print $PALANG['pCreate_mailbox_username'] . ":"; ?></td>
- <td><input class="flat" type="text" name="fUsername" value="<?php print $tUsername; ?>" /></td>
+ <td><input class="flat" type="text" name="fUsername" value="<?php print $tUsername; ?>" autocomplete="off"/></td>
<td>
<select name="fDomain">
<?php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-12-02 15:09:39
|
Revision: 251
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=251&view=rev
Author: GingerDog
Date: 2007-12-02 07:09:39 -0800 (Sun, 02 Dec 2007)
Log Message:
-----------
config.inc.php: update - use dirname(__FILE__) for path resolution
Modified Paths:
--------------
trunk/config.inc.php
Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php 2007-12-02 13:59:33 UTC (rev 250)
+++ trunk/config.inc.php 2007-12-02 15:09:39 UTC (rev 251)
@@ -33,12 +33,14 @@
// Postfix Admin Path
// Set the location of your Postfix Admin installation here.
-// You must enter complete url (http://domain.tld/) and full path (/var/www/postfixadmin)
+// You must enter complete url (http://domain.tld/)
$CONF['postfix_admin_url'] = '';
+
+// leave this alone...
$CONF['postfix_admin_path'] = dirname(__FILE__);
// Language config
-// Language files are located in './languages'.
+// Language files are located in './languages', change as required..
$CONF['default_language'] = 'en';
// Database Config
@@ -314,15 +316,11 @@
// that future updates work without problems, you can use a separate config
// file (config.local.php) instead of editing this file and override some
// settings there.
-if (file_exists (realpath ("./config.local.php"))) { # for /
- include('config.local.php');
-} elseif (file_exists (realpath ("../config.local.php"))) { # for /users/
- include('../config.local.php');
-};
+if (file_exists(dirname(__FILE__) . '/config.local.php')) { # for /
+ include(dirname(__FILE__) . '/config.local.php');
+}
-
//
// END OF CONFIG FILE
//
/* 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...> - 2007-12-02 13:59:31
|
Revision: 250
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=250&view=rev
Author: GingerDog
Date: 2007-12-02 05:59:33 -0800 (Sun, 02 Dec 2007)
Log Message:
-----------
rename templates to .php instead of .tpl
Modified Paths:
--------------
trunk/backup.php
trunk/broadcast-message.php
trunk/create-admin.php
trunk/create-alias.php
trunk/create-domain.php
trunk/create-mailbox.php
trunk/delete.php
trunk/edit-active-admin.php
trunk/edit-active-domain.php
trunk/edit-active.php
trunk/edit-admin.php
trunk/edit-alias.php
trunk/edit-domain.php
trunk/edit-mailbox.php
trunk/edit-vacation.php
trunk/fetchmail.php
trunk/list-admin.php
trunk/list-domain.php
trunk/list-virtual.php
trunk/login.php
trunk/main.php
trunk/password.php
trunk/search.php
trunk/sendmail.php
trunk/setup.php
trunk/users/edit-alias.php
trunk/users/login.php
trunk/users/main.php
trunk/users/password.php
trunk/users/vacation.php
trunk/viewlog.php
Added Paths:
-----------
trunk/templates/admin_create-admin.php
trunk/templates/admin_create-domain.php
trunk/templates/admin_edit-admin.php
trunk/templates/admin_edit-domain.php
trunk/templates/admin_list-admin.php
trunk/templates/admin_list-domain.php
trunk/templates/admin_search.php
trunk/templates/broadcast-message.php
trunk/templates/create-alias.php
trunk/templates/create-mailbox.php
trunk/templates/edit-alias.php
trunk/templates/edit-mailbox.php
trunk/templates/edit-vacation.php
trunk/templates/fetchmail.php
trunk/templates/footer.php
trunk/templates/header.php
trunk/templates/list-virtual.php
trunk/templates/login.php
trunk/templates/main.php
trunk/templates/menu.php
trunk/templates/message.php
trunk/templates/overview-get.php
trunk/templates/password.php
trunk/templates/search.php
trunk/templates/sendmail.php
trunk/templates/users_edit-alias.php
trunk/templates/users_login.php
trunk/templates/users_main.php
trunk/templates/users_menu.php
trunk/templates/users_password.php
trunk/templates/users_vacation.php
trunk/templates/viewlog.php
Removed Paths:
-------------
trunk/templates/admin_create-admin.tpl
trunk/templates/admin_create-domain.tpl
trunk/templates/admin_edit-admin.tpl
trunk/templates/admin_edit-domain.tpl
trunk/templates/admin_list-admin.tpl
trunk/templates/admin_list-domain.tpl
trunk/templates/admin_search.tpl
trunk/templates/broadcast-message.tpl
trunk/templates/create-alias.tpl
trunk/templates/create-mailbox.tpl
trunk/templates/edit-alias.tpl
trunk/templates/edit-mailbox.tpl
trunk/templates/edit-vacation.tpl
trunk/templates/fetchmail.tpl
trunk/templates/footer.tpl
trunk/templates/header.tpl
trunk/templates/list-virtual.tpl
trunk/templates/login.tpl
trunk/templates/main.tpl
trunk/templates/menu.tpl
trunk/templates/message.tpl
trunk/templates/overview-get.tpl
trunk/templates/password.tpl
trunk/templates/search.tpl
trunk/templates/sendmail.tpl
trunk/templates/users_edit-alias.tpl
trunk/templates/users_login.tpl
trunk/templates/users_main.tpl
trunk/templates/users_menu.tpl
trunk/templates/users_password.tpl
trunk/templates/users_vacation.tpl
trunk/templates/viewlog.tpl
Modified: trunk/backup.php
===================================================================
--- trunk/backup.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/backup.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -63,10 +63,10 @@
if (!$fh = fopen ($backup, 'w'))
{
$tMessage = "<div class=\"error_msg\">Cannot open file ($backup)</div>";
- include ("templates/header.tpl");
- include ("templates/menu.tpl");
- include ("templates/message.tpl");
- include ("templates/footer.tpl");
+ include ("templates/header.php");
+ include ("templates/menu.php");
+ include ("templates/message.php");
+ include ("templates/footer.php");
}
else
{
Modified: trunk/broadcast-message.php
===================================================================
--- trunk/broadcast-message.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/broadcast-message.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -15,7 +15,7 @@
* File: broadcast-message.php
* Used to send a message to _ALL_ users with mailboxes on this server.
*
- * Template File: broadcast-message.tpl
+ * Template File: broadcast-message.php
*
* Template Variables: -none-
*
@@ -78,19 +78,19 @@
}
}
}
- include ("templates/header.tpl");
- include ("templates/menu.tpl");
+ include ("templates/header.php");
+ include ("templates/menu.php");
echo '<p>'.$PALANG['pBroadcast_success'].'</p>';
- include ("templates/footer.tpl");
+ include ("templates/footer.php");
}
}
if ($_SERVER['REQUEST_METHOD'] == "GET" || $error == 1)
{
- include ("templates/header.tpl");
- include ("templates/menu.tpl");
- include ("templates/broadcast-message.tpl");
- include ("templates/footer.tpl");
+ include ("templates/header.php");
+ include ("templates/menu.php");
+ include ("templates/broadcast-message.php");
+ include ("templates/footer.php");
}
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/create-admin.php
===================================================================
--- trunk/create-admin.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/create-admin.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
*
* File: create-admin.php
* Used to create new administrators.
- * Template File: admin_create-admin.tpl
+ * Template File: admin_create-admin.php
*
*
* Template Variables:
@@ -60,10 +60,10 @@
}
}
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/admin_create-admin.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/admin_create-admin.php");
+include ("templates/footer.php");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/create-alias.php
===================================================================
--- trunk/create-alias.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/create-alias.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -11,7 +11,7 @@
* http://www.postfixadmin.com or http://postfixadmin.sf.net
*
* File: create-alias.php
- * Template File: create-alias.tpl
+ * Template File: create-alias.php
* Responsible for allowing for the creation of mail aliases.
*
* @version $Id$
@@ -152,8 +152,8 @@
}
}
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/create-alias.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/create-alias.php");
+include ("templates/footer.php");
?>
Modified: trunk/create-domain.php
===================================================================
--- trunk/create-domain.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/create-domain.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
*
* File: create-domain.php
* Allows administrators to create new domains.
- * Template File: admin_create-domain.tpl
+ * Template File: admin_create-domain.php
*
* Template Variables:
*
@@ -120,10 +120,10 @@
}
}
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/admin_create-domain.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/admin_create-domain.php");
+include ("templates/footer.php");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/create-mailbox.php
===================================================================
--- trunk/create-mailbox.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/create-mailbox.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -330,10 +330,10 @@
}
}
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/create-mailbox.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/create-mailbox.php");
+include ("templates/footer.php");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/delete.php
===================================================================
--- trunk/delete.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/delete.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -17,7 +17,7 @@
* Note: if a domain is deleted, all mailboxes and aliases belonging
* to the domain are also removed.
*
- * Template File: message.tpl
+ * Template File: message.php
*
* Template Variables:
*
@@ -164,10 +164,10 @@
}
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/message.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/message.php");
+include ("templates/footer.php");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/edit-active-admin.php
===================================================================
--- trunk/edit-active-admin.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/edit-active-admin.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -15,7 +15,7 @@
* File: edit-active-admin.php
* Edit an active administrator. This is used as a 'toggle' page from list-admin.
*
- * Template File: message.tpl
+ * Template File: message.php
*
* Template Variables:
*
@@ -51,10 +51,10 @@
}
}
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/message.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/message.php");
+include ("templates/footer.php");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/edit-active-domain.php
===================================================================
--- trunk/edit-active-domain.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/edit-active-domain.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
*
* File: edit-active-domain.php
* Responsible for toggling the status of a domain
- * Template File: message.tpl
+ * Template File: message.php
*
* Template Variables:
*
@@ -50,10 +50,10 @@
}
}
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/message.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/message.php");
+include ("templates/footer.php");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/edit-active.php
===================================================================
--- trunk/edit-active.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/edit-active.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -15,7 +15,7 @@
* File: edit-active.php
* Responsible for toggling the active status of a mailbox.
*
- * Template File: message.tpl
+ * Template File: message.php
*
* Template Variables:
*
@@ -91,9 +91,9 @@
}
}
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/message.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/message.php");
+include ("templates/footer.php");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/edit-admin.php
===================================================================
--- trunk/edit-admin.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/edit-admin.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -15,7 +15,7 @@
* File: edit-admin.php
* Edits a normal administrator's details.
*
- * Template File: admin_edit-admin.tpl
+ * Template File: admin_edit-admin.php
*
* Template Variables:
*
@@ -150,10 +150,10 @@
}
}
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/admin_edit-admin.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/admin_edit-admin.php");
+include ("templates/footer.php");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/edit-alias.php
===================================================================
--- trunk/edit-alias.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/edit-alias.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -15,7 +15,7 @@
* File: edit-alias.php
* Used to update an alias.
*
- * Template File: edit-alias.tpl
+ * Template File: edit-alias.php
*
* Template Variables:
*
@@ -127,10 +127,10 @@
}
}
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/edit-alias.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/edit-alias.php");
+include ("templates/footer.php");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/edit-domain.php
===================================================================
--- trunk/edit-domain.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/edit-domain.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
*
* File: edit-domain.php
* Updates the properties of a domain.
- * Template File: admin_edit-domain.tpl
+ * Template File: admin_edit-domain.php
*
* Template Variables:
*
@@ -104,10 +104,10 @@
}
}
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/admin_edit-domain.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/admin_edit-domain.php");
+include ("templates/footer.php");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/edit-mailbox.php
===================================================================
--- trunk/edit-mailbox.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/edit-mailbox.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
*
* File: edit-mailbox.php
* Used to update an existing mailboxes settings.
- * Template File: edit-mailbox.tpl
+ * Template File: edit-mailbox.php
*
* Template Variables:
*
@@ -157,9 +157,9 @@
}
}
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/edit-mailbox.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/edit-mailbox.php");
+include ("templates/footer.php");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/edit-vacation.php
===================================================================
--- trunk/edit-vacation.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/edit-vacation.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -15,7 +15,7 @@
* File: edit-vacation.php
* Responsible for allowing users to update their vacation status.
*
- * Template File: edit-vacation.tpl
+ * Template File: edit-vacation.php
*
* Template Variables:
*
@@ -191,9 +191,9 @@
$tMessage = $PALANG['pVacation_result_error'];
}
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/edit-vacation.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/edit-vacation.php");
+include ("templates/footer.php");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/fetchmail.php
===================================================================
--- trunk/fetchmail.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/fetchmail.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -250,10 +250,10 @@
return base64_encode($val);
}
-include ("./templates/header.tpl");
-include ("./templates/menu.tpl");
-include ("./templates/fetchmail.tpl");
-include ("./templates/footer.tpl");
+include ("./templates/header.php");
+include ("./templates/menu.php");
+include ("./templates/fetchmail.php");
+include ("./templates/footer.php");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/list-admin.php
===================================================================
--- trunk/list-admin.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/list-admin.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
*
* File: list-admin.php
* Lists all administrators
- * Template File: list-admin.tpl
+ * Template File: list-admin.php
*
* Template Variables: -none-
*
@@ -32,9 +32,9 @@
}
}
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/admin_list-admin.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/admin_list-admin.php");
+include ("templates/footer.php");
?>
Modified: trunk/list-domain.php
===================================================================
--- trunk/list-domain.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/list-domain.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
*
* File: list-domain.php
* List all domains as a quick overview.
- * Template File: admin_list-domain.tpl
+ * Template File: admin_list-domain.php
*
* Template Variables:
*
@@ -59,15 +59,15 @@
}
#}
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
if ($is_superadmin) {
- include ("templates/admin_list-domain.tpl");
+ include ("templates/admin_list-domain.php");
} else {
- include ("templates/overview-get.tpl");
+ include ("templates/overview-get.php");
}
-include ("templates/footer.tpl");
+include ("templates/footer.php");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/list-virtual.php
===================================================================
--- trunk/list-virtual.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/list-virtual.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -15,7 +15,7 @@
* File: list-virtual.php
* List virtual users for a domain.
*
- * Template File: list-virtual.tpl
+ * Template File: list-virtual.php
*
* Template Variables:
*
@@ -165,10 +165,10 @@
}
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/list-virtual.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/list-virtual.php");
+include ("templates/footer.php");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/login.php
===================================================================
--- trunk/login.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/login.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
*
* File: login.php
* Authenticates a user, and populates their $_SESSION as appropriate.
- * Template File: login.tpl
+ * Template File: login.php
*
* Template Variables:
*
@@ -43,9 +43,9 @@
if ($_SERVER['REQUEST_METHOD'] == "GET")
{
- include ("./templates/header.tpl");
- include ("./templates/login.tpl");
- include ("./templates/footer.tpl");
+ include ("./templates/header.php");
+ include ("./templates/login.php");
+ include ("./templates/footer.php");
}
if ($_SERVER['REQUEST_METHOD'] == "POST")
@@ -94,8 +94,8 @@
exit(0);
}
- include ("./templates/header.tpl");
- include ("./templates/login.tpl");
- include ("./templates/footer.tpl");
+ include ("./templates/header.php");
+ include ("./templates/login.php");
+ include ("./templates/footer.php");
}
?>
Modified: trunk/main.php
===================================================================
--- trunk/main.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/main.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
*
* File: main.php
* Displays a menu/home page.
- * Template File: main.tpl
+ * Template File: main.php
*
* Template Variables: -none-
*
@@ -27,8 +27,8 @@
authentication_require_role('admin');
-include ("./templates/header.tpl");
-include ("./templates/menu.tpl");
-include ("./templates/main.tpl");
-include ("./templates/footer.tpl");
+include ("./templates/header.php");
+include ("./templates/menu.php");
+include ("./templates/main.php");
+include ("./templates/footer.php");
?>
Modified: trunk/password.php
===================================================================
--- trunk/password.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/password.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
*
* File: password.php
* Allows admins to change their own password.
- * Template File: password.tpl
+ * Template File: password.php
*
* Template Variables:
*
@@ -35,10 +35,10 @@
if ($_SERVER['REQUEST_METHOD'] == "GET")
{
- include ("./templates/header.tpl");
- include ("./templates/menu.tpl");
- include ("./templates/password.tpl");
- include ("./templates/footer.tpl");
+ include ("./templates/header.php");
+ include ("./templates/menu.php");
+ include ("./templates/password.php");
+ include ("./templates/footer.php");
}
if ($_SERVER['REQUEST_METHOD'] == "POST")
@@ -88,9 +88,9 @@
}
}
- include ("./templates/header.tpl");
- include ("./templates/menu.tpl");
- include ("./templates/password.tpl");
- include ("./templates/footer.tpl");
+ include ("./templates/header.php");
+ include ("./templates/menu.php");
+ include ("./templates/password.php");
+ include ("./templates/footer.php");
}
?>
Modified: trunk/search.php
===================================================================
--- trunk/search.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/search.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
*
* File: search.php
* Provides a method for searching for a user/mailbox
- * Template File: search.tpl
+ * Template File: search.php
*
* Template Variables:
*
@@ -116,9 +116,9 @@
}
}
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/search.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/search.php");
+include ("templates/footer.php");
?>
Modified: trunk/sendmail.php
===================================================================
--- trunk/sendmail.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/sendmail.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
*
* File: sendmail.php
* Used to send an email to a user.
- * Template File: sendmail.tpl
+ * Template File: sendmail.php
*
* Template Variables:
*
@@ -74,10 +74,10 @@
}
}
-include ("./templates/header.tpl");
-include ("./templates/menu.tpl");
-include ("./templates/sendmail.tpl");
-include ("./templates/footer.tpl");
+include ("./templates/header.php");
+include ("./templates/menu.php");
+include ("./templates/sendmail.php");
+include ("./templates/footer.php");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/setup.php
===================================================================
--- trunk/setup.php 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/setup.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -27,7 +27,7 @@
require_once("functions.inc.php");
$CONF['show_header_text'] = 'NO';
-require('templates/header.tpl');
+require('templates/header.php');
?>
<div class='setup'>
Added: trunk/templates/admin_create-admin.php
===================================================================
--- trunk/templates/admin_create-admin.php (rev 0)
+++ trunk/templates/admin_create-admin.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -0,0 +1,51 @@
+<div id="edit_form">
+<form name="create_admin" method="post">
+<table>
+ <tr>
+ <td colspan="3"><h3><?php print $PALANG['pAdminCreate_admin_welcome']; ?></h3></td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pAdminCreate_admin_username'] . ":"; ?></td>
+ <td><input class="flat" type="text" name="fUsername" value="<?php print $tUsername; ?>" /></td>
+ <td><?php print $pAdminCreate_admin_username_text; ?></td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pAdminCreate_admin_password'] . ":"; ?></td>
+ <td><input class="flat" type="password" name="fPassword" /></td>
+ <td><?php print $pAdminCreate_admin_password_text; ?></td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pAdminCreate_admin_password2'] . ":"; ?></td>
+ <td><input class="flat" type="password" name="fPassword2" /></td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pAdminCreate_admin_address'] . ":"; ?></td>
+ <td>
+ <select name="fDomains[]" size="10" multiple="multiple">
+ <?php
+ for ($i = 0; $i < sizeof ($list_domains); $i++)
+ {
+ if (in_array ($list_domains[$i], $tDomains))
+ {
+ print "<option value=\"" . $list_domains[$i] . "\" selected=\"selected\">" . $list_domains[$i] . "</option>\n";
+ }
+ else
+ {
+ print "<option value=\"" . $list_domains[$i] . "\">" . $list_domains[$i] . "</option>\n";
+ }
+ }
+ ?>
+ </select>
+ </td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pAdminCreate_admin_button']; ?>" /></td>
+ </tr>
+ <tr>
+ <td colspan="3" class="standout"><?php print $tMessage; ?></td>
+ </tr>
+</table>
+</form>
+</div>
Deleted: trunk/templates/admin_create-admin.tpl
===================================================================
--- trunk/templates/admin_create-admin.tpl 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/templates/admin_create-admin.tpl 2007-12-02 13:59:33 UTC (rev 250)
@@ -1,51 +0,0 @@
-<div id="edit_form">
-<form name="create_admin" method="post">
-<table>
- <tr>
- <td colspan="3"><h3><?php print $PALANG['pAdminCreate_admin_welcome']; ?></h3></td>
- </tr>
- <tr>
- <td><?php print $PALANG['pAdminCreate_admin_username'] . ":"; ?></td>
- <td><input class="flat" type="text" name="fUsername" value="<?php print $tUsername; ?>" /></td>
- <td><?php print $pAdminCreate_admin_username_text; ?></td>
- </tr>
- <tr>
- <td><?php print $PALANG['pAdminCreate_admin_password'] . ":"; ?></td>
- <td><input class="flat" type="password" name="fPassword" /></td>
- <td><?php print $pAdminCreate_admin_password_text; ?></td>
- </tr>
- <tr>
- <td><?php print $PALANG['pAdminCreate_admin_password2'] . ":"; ?></td>
- <td><input class="flat" type="password" name="fPassword2" /></td>
- <td> </td>
- </tr>
- <tr>
- <td><?php print $PALANG['pAdminCreate_admin_address'] . ":"; ?></td>
- <td>
- <select name="fDomains[]" size="10" multiple="multiple">
- <?php
- for ($i = 0; $i < sizeof ($list_domains); $i++)
- {
- if (in_array ($list_domains[$i], $tDomains))
- {
- print "<option value=\"" . $list_domains[$i] . "\" selected=\"selected\">" . $list_domains[$i] . "</option>\n";
- }
- else
- {
- print "<option value=\"" . $list_domains[$i] . "\">" . $list_domains[$i] . "</option>\n";
- }
- }
- ?>
- </select>
- </td>
- <td> </td>
- </tr>
- <tr>
- <td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pAdminCreate_admin_button']; ?>" /></td>
- </tr>
- <tr>
- <td colspan="3" class="standout"><?php print $tMessage; ?></td>
- </tr>
-</table>
-</form>
-</div>
Added: trunk/templates/admin_create-domain.php
===================================================================
--- trunk/templates/admin_create-domain.php (rev 0)
+++ trunk/templates/admin_create-domain.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -0,0 +1,77 @@
+<div id="edit_form">
+<form name="create_domain" method="post">
+<table>
+ <tr>
+ <td colspan="3"><h3><?php print $PALANG['pAdminCreate_domain_welcome']; ?></h3></td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pAdminCreate_domain_domain'] . ":"; ?></td>
+ <td><input class="flat" type="text" name="fDomain" value="<?php print $tDomain; ?>" /></td>
+ <td><?php print $pAdminCreate_domain_domain_text; ?></td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pAdminCreate_domain_description'] . ":"; ?></td>
+ <td><input class="flat" type="text" name="fDescription" value="<?php print $tDescription; ?>" /></td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pAdminCreate_domain_aliases'] . ":"; ?></td>
+ <td><input class="flat" type="text" name="fAliases" value="<?php print $tAliases; ?>" /></td>
+ <td><?php print $PALANG['pAdminCreate_domain_aliases_text']; ?></td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pAdminCreate_domain_mailboxes'] . ":"; ?></td>
+ <td><input class="flat" type="text" name="fMailboxes" value="<?php print $tMailboxes; ?>" /></td>
+ <td><?php print $PALANG['pAdminCreate_domain_mailboxes_text']; ?></td>
+ </tr>
+ <?php if ($CONF['quota'] == 'YES') { ?>
+ <tr>
+ <td><?php print $PALANG['pAdminCreate_domain_maxquota'] . ":"; ?></td>
+ <td><input class="flat" type="text" name="fMaxquota" value="<?php print $tMaxquota; ?>" /></td>
+ <td><?php print $PALANG['pAdminCreate_domain_maxquota_text']; ?></td>
+ </tr>
+ <?php } if ($CONF['transport'] == 'YES') { ?>
+ <tr>
+ <td><?php print $PALANG['pAdminCreate_domain_transport'] . ":"; ?></td>
+ <td><select class="flat" name="fTransport">
+ <?php
+ for ($i = 0; $i < sizeof ($CONF['transport_options']); $i++)
+ {
+ if ($CONF['transport_options'][$i] == $tTransport)
+ {
+ print "<option value=\"" . $CONF['transport_options'][$i] . "\" selected>" . $CONF['transport_options'][$i] . "</option>\n";
+ }
+ else
+ {
+ print "<option value=\"" . $CONF['transport_options'][$i] . "\">" . $CONF['transport_options'][$i] . "</option>\n";
+ }
+ }
+ ?>
+ </select>
+ </td>
+ <td><?php print $PALANG['pAdminCreate_domain_transport_text']; ?></td>
+ </tr>
+ <?php } ?>
+ <tr>
+ <td><?php print $PALANG['pAdminCreate_domain_defaultaliases'] . ":"; ?></td>
+ <td><?php $checked = (!empty ($tDefaultaliases)) ? 'checked' : ''; ?>
+ <input class="flat" type="checkbox" name="fDefaultaliases" <?php print $checked; ?> />
+ </td>
+ <td><?php print $PALANG['pAdminCreate_domain_defaultaliases_text']; ?></td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pAdminCreate_domain_backupmx'] . ":"; ?></td>
+ <td><?php $checked = (!empty ($tBackupmx)) ? 'checked' : ''; ?>
+ <input class="flat" type="checkbox" name="fBackupmx" <?php print $checked; ?> />
+ </td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pAdminCreate_domain_button']; ?>" /></td>
+ </tr>
+ <tr>
+ <td colspan="3" class="standout"><?php print $tMessage; ?></td>
+ </tr>
+</table>
+</form>
+</div>
Deleted: trunk/templates/admin_create-domain.tpl
===================================================================
--- trunk/templates/admin_create-domain.tpl 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/templates/admin_create-domain.tpl 2007-12-02 13:59:33 UTC (rev 250)
@@ -1,77 +0,0 @@
-<div id="edit_form">
-<form name="create_domain" method="post">
-<table>
- <tr>
- <td colspan="3"><h3><?php print $PALANG['pAdminCreate_domain_welcome']; ?></h3></td>
- </tr>
- <tr>
- <td><?php print $PALANG['pAdminCreate_domain_domain'] . ":"; ?></td>
- <td><input class="flat" type="text" name="fDomain" value="<?php print $tDomain; ?>" /></td>
- <td><?php print $pAdminCreate_domain_domain_text; ?></td>
- </tr>
- <tr>
- <td><?php print $PALANG['pAdminCreate_domain_description'] . ":"; ?></td>
- <td><input class="flat" type="text" name="fDescription" value="<?php print $tDescription; ?>" /></td>
- <td> </td>
- </tr>
- <tr>
- <td><?php print $PALANG['pAdminCreate_domain_aliases'] . ":"; ?></td>
- <td><input class="flat" type="text" name="fAliases" value="<?php print $tAliases; ?>" /></td>
- <td><?php print $PALANG['pAdminCreate_domain_aliases_text']; ?></td>
- </tr>
- <tr>
- <td><?php print $PALANG['pAdminCreate_domain_mailboxes'] . ":"; ?></td>
- <td><input class="flat" type="text" name="fMailboxes" value="<?php print $tMailboxes; ?>" /></td>
- <td><?php print $PALANG['pAdminCreate_domain_mailboxes_text']; ?></td>
- </tr>
- <?php if ($CONF['quota'] == 'YES') { ?>
- <tr>
- <td><?php print $PALANG['pAdminCreate_domain_maxquota'] . ":"; ?></td>
- <td><input class="flat" type="text" name="fMaxquota" value="<?php print $tMaxquota; ?>" /></td>
- <td><?php print $PALANG['pAdminCreate_domain_maxquota_text']; ?></td>
- </tr>
- <?php } if ($CONF['transport'] == 'YES') { ?>
- <tr>
- <td><?php print $PALANG['pAdminCreate_domain_transport'] . ":"; ?></td>
- <td><select class="flat" name="fTransport">
- <?php
- for ($i = 0; $i < sizeof ($CONF['transport_options']); $i++)
- {
- if ($CONF['transport_options'][$i] == $tTransport)
- {
- print "<option value=\"" . $CONF['transport_options'][$i] . "\" selected>" . $CONF['transport_options'][$i] . "</option>\n";
- }
- else
- {
- print "<option value=\"" . $CONF['transport_options'][$i] . "\">" . $CONF['transport_options'][$i] . "</option>\n";
- }
- }
- ?>
- </select>
- </td>
- <td><?php print $PALANG['pAdminCreate_domain_transport_text']; ?></td>
- </tr>
- <?php } ?>
- <tr>
- <td><?php print $PALANG['pAdminCreate_domain_defaultaliases'] . ":"; ?></td>
- <td><?php $checked = (!empty ($tDefaultaliases)) ? 'checked' : ''; ?>
- <input class="flat" type="checkbox" name="fDefaultaliases" <?php print $checked; ?> />
- </td>
- <td><?php print $PALANG['pAdminCreate_domain_defaultaliases_text']; ?></td>
- </tr>
- <tr>
- <td><?php print $PALANG['pAdminCreate_domain_backupmx'] . ":"; ?></td>
- <td><?php $checked = (!empty ($tBackupmx)) ? 'checked' : ''; ?>
- <input class="flat" type="checkbox" name="fBackupmx" <?php print $checked; ?> />
- </td>
- <td> </td>
- </tr>
- <tr>
- <td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pAdminCreate_domain_button']; ?>" /></td>
- </tr>
- <tr>
- <td colspan="3" class="standout"><?php print $tMessage; ?></td>
- </tr>
-</table>
-</form>
-</div>
Added: trunk/templates/admin_edit-admin.php
===================================================================
--- trunk/templates/admin_edit-admin.php (rev 0)
+++ trunk/templates/admin_edit-admin.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -0,0 +1,55 @@
+<div id="edit_form">
+<form name="alias" method="post">
+<table>
+ <tr>
+ <td colspan="3"><h3><?php print $PALANG['pAdminEdit_admin_welcome']; ?></h3></td></tr>
+ <tr>
+ <td><?php print $PALANG['pAdminEdit_admin_username']; ?>:</td>
+ <td><?php print $username; ?></td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pAdminEdit_admin_password']; ?>:</td>
+ <td><input class="flat" type="password" autocomplete="off" name="fPassword" value=""/></td>
+ <td><?php print $pAdminEdit_admin_password_text; ?></td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pAdminEdit_admin_password2']; ?>:</td>
+ <td><input class="flat" type="password" name="fPassword2" value="" /></td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pAdminEdit_admin_active']; ?>:</td>
+ <td><input class="flat" type="checkbox" name="fActive" <?php print (!empty ($tActive)) ? 'checked' : ''; ?> /></td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pAdminEdit_admin_super_admin']; ?>:</td>
+ <td><input class="flat" type="checkbox" name="fSadmin" <?php print (!empty ($tSadmin)) ? 'checked' : ''; ?> /></td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td colspan=3 align=center>
+ <select name="fDomains[]" size="10" multiple="multiple">
+ <?php
+ foreach($tAllDomains as $domain) {
+ // should escape $domain here to stop xss etc.
+ $selected = '';
+ if (in_array ($domain, $tDomains)) {
+ $selected = "selected='selected'";
+ }
+ print "<option value='$domain' $selected>$domain</option>\n";
+ }
+ ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pAdminEdit_admin_button']; ?>" /></td>
+ </tr>
+ <tr>
+ <td colspan="3" class="standout"><?php print $tMessage; ?></td>
+ </tr>
+</table>
+</form>
+</div>
Deleted: trunk/templates/admin_edit-admin.tpl
===================================================================
--- trunk/templates/admin_edit-admin.tpl 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/templates/admin_edit-admin.tpl 2007-12-02 13:59:33 UTC (rev 250)
@@ -1,55 +0,0 @@
-<div id="edit_form">
-<form name="alias" method="post">
-<table>
- <tr>
- <td colspan="3"><h3><?php print $PALANG['pAdminEdit_admin_welcome']; ?></h3></td></tr>
- <tr>
- <td><?php print $PALANG['pAdminEdit_admin_username']; ?>:</td>
- <td><?php print $username; ?></td>
- <td> </td>
- </tr>
- <tr>
- <td><?php print $PALANG['pAdminEdit_admin_password']; ?>:</td>
- <td><input class="flat" type="password" autocomplete="off" name="fPassword" value=""/></td>
- <td><?php print $pAdminEdit_admin_password_text; ?></td>
- </tr>
- <tr>
- <td><?php print $PALANG['pAdminEdit_admin_password2']; ?>:</td>
- <td><input class="flat" type="password" name="fPassword2" value="" /></td>
- <td> </td>
- </tr>
- <tr>
- <td><?php print $PALANG['pAdminEdit_admin_active']; ?>:</td>
- <td><input class="flat" type="checkbox" name="fActive" <?php print (!empty ($tActive)) ? 'checked' : ''; ?> /></td>
- <td> </td>
- </tr>
- <tr>
- <td><?php print $PALANG['pAdminEdit_admin_super_admin']; ?>:</td>
- <td><input class="flat" type="checkbox" name="fSadmin" <?php print (!empty ($tSadmin)) ? 'checked' : ''; ?> /></td>
- <td> </td>
- </tr>
- <tr>
- <td colspan=3 align=center>
- <select name="fDomains[]" size="10" multiple="multiple">
- <?php
- foreach($tAllDomains as $domain) {
- // should escape $domain here to stop xss etc.
- $selected = '';
- if (in_array ($domain, $tDomains)) {
- $selected = "selected='selected'";
- }
- print "<option value='$domain' $selected>$domain</option>\n";
- }
- ?>
- </select>
- </td>
- </tr>
- <tr>
- <td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pAdminEdit_admin_button']; ?>" /></td>
- </tr>
- <tr>
- <td colspan="3" class="standout"><?php print $tMessage; ?></td>
- </tr>
-</table>
-</form>
-</div>
Added: trunk/templates/admin_edit-domain.php
===================================================================
--- trunk/templates/admin_edit-domain.php (rev 0)
+++ trunk/templates/admin_edit-domain.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -0,0 +1,75 @@
+<div id="edit_form">
+<form name="edit_domain" method="post">
+<table>
+ <tr>
+ <td colspan="3"><h3><?php print $PALANG['pAdminEdit_domain_welcome']; ?></h3></td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pAdminEdit_domain_domain'] . ":"; ?></td>
+ <td><?php print $domain; ?></td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pAdminEdit_domain_description'] . ":"; ?></td>
+ <td><input class="flat" type="text" name="fDescription" value="<?php print htmlspecialchars($tDescription, ENT_QUOTES); ?>" /></td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pAdminEdit_domain_aliases'] . ":"; ?></td>
+ <td><input class="flat" type="text" name="fAliases" value="<?php print $tAliases; ?>" /></td>
+ <td><?php print $PALANG['pAdminEdit_domain_aliases_text']; ?></td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pAdminEdit_domain_mailboxes'] . ":"; ?></td>
+ <td><input class="flat" type="text" name="fMailboxes" value="<?php print $tMailboxes; ?>" /></td>
+ <td><?php print $PALANG['pAdminEdit_domain_mailboxes_text']; ?></td>
+ </tr>
+ <?php if ($CONF['quota'] == 'YES') { ?>
+ <tr>
+ <td><?php print $PALANG['pAdminEdit_domain_maxquota'] . ":"; ?></td>
+ <td><input class="flat" type="text" name="fMaxquota" value="<?php print $tMaxquota; ?>" /></td>
+ <td><?php print $PALANG['pAdminEdit_domain_maxquota_text']; ?></td>
+ </tr>
+ <?php } if ($CONF['transport'] == 'YES') { ?>
+ <tr>
+ <td><?php print $PALANG['pAdminEdit_domain_transport'] . ":"; ?></td>
+ <td><select class="flat" name="fTransport">
+ <?php
+ for ($i = 0; $i < sizeof ($CONF['transport_options']); $i++)
+ {
+ if ($CONF['transport_options'][$i] == $tTransport)
+ {
+ print "<option value=\"" . $CONF['transport_options'][$i] . "\" selected>" . $CONF['transport_options'][$i] . "</option>\n";
+ }
+ else
+ {
+ print "<option value=\"" . $CONF['transport_options'][$i] . "\">" . $CONF['transport_options'][$i] . "</option>\n";
+ }
+ }
+ ?>
+ </select>
+ </td>
+ <td><?php print $PALANG['pAdminEdit_domain_transport_text']; ?></td>
+ </tr>
+ <?php } ?>
+ <tr>
+ <td><?php print $PALANG['pAdminEdit_domain_backupmx'] . ":"; ?></td>
+ <td><?php $checked = (!empty ($tBackupmx)) ? 'checked' : ''; ?>
+ <input class="flat" type="checkbox" name="fBackupmx" <?php print $checked; ?> /></td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pAdminEdit_domain_active'] . ":"; ?></td>
+ <td><?php $checked = (!empty ($tActive)) ? 'checked' : ''; ?>
+ <input class="flat" type="checkbox" name="fActive" <?php print $checked; ?> /></td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td colspan="3" class="hlp_center"><input type="submit" class="button" name="submit" value="<?php print $PALANG['pAdminEdit_domain_button']; ?>" /></td>
+ </tr>
+ <tr>
+ <td colspan="3" class="standout"><?php print $tMessage; ?></td>
+ </tr>
+</table>
+</form>
+</div>
Deleted: trunk/templates/admin_edit-domain.tpl
===================================================================
--- trunk/templates/admin_edit-domain.tpl 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/templates/admin_edit-domain.tpl 2007-12-02 13:59:33 UTC (rev 250)
@@ -1,75 +0,0 @@
-<div id="edit_form">
-<form name="edit_domain" method="post">
-<table>
- <tr>
- <td colspan="3"><h3><?php print $PALANG['pAdminEdit_domain_welcome']; ?></h3></td>
- </tr>
- <tr>
- <td><?php print $PALANG['pAdminEdit_domain_domain'] . ":"; ?></td>
- <td><?php print $domain; ?></td>
- <td> </td>
- </tr>
- <tr>
- <td><?php print $PALANG['pAdminEdit_domain_description'] . ":"; ?></td>
- <td><input class="flat" type="text" name="fDescription" value="<?php print htmlspecialchars($tDescription, ENT_QUOTES); ?>" /></td>
- <td> </td>
- </tr>
- <tr>
- <td><?php print $PALANG['pAdminEdit_domain_aliases'] . ":"; ?></td>
- <td><input class="flat" type="text" name="fAliases" value="<?php print $tAliases; ?>" /></td>
- <td><?php print $PALANG['pAdminEdit_domain_aliases_text']; ?></td>
- </tr>
- <tr>
- <td><?php print $PALANG['pAdminEdit_domain_mailboxes'] . ":"; ?></td>
- <td><input class="flat" type="text" name="fMailboxes" value="<?php print $tMailboxes; ?>" /></td>
- <td><?php print $PALANG['pAdminEdit_domain_mailboxes_text']; ?></td>
- </tr>
- <?php if ($CONF['quota'] == 'YES') { ?>
- <tr>
- <td><?php print $PALANG['pAdminEdit_domain_maxquota'] . ":"; ?></td>
- <td><input class="flat" type="text" name="fMaxquota" value="<?php print $tMaxquota; ?>" /></td>
- <td><?php print $PALANG['pAdminEdit_domain_maxquota_text']; ?></td>
- </tr>
- <?php } if ($CONF['transport'] == 'YES') { ?>
- <tr>
- <td><?php print $PALANG['pAdminEdit_domain_transport'] . ":"; ?></td>
- <td><select class="flat" name="fTransport">
- <?php
- for ($i = 0; $i < sizeof ($CONF['transport_options']); $i++)
- {
- if ($CONF['transport_options'][$i] == $tTransport)
- {
- print "<option value=\"" . $CONF['transport_options'][$i] . "\" selected>" . $CONF['transport_options'][$i] . "</option>\n";
- }
- else
- {
- print "<option value=\"" . $CONF['transport_options'][$i] . "\">" . $CONF['transport_options'][$i] . "</option>\n";
- }
- }
- ?>
- </select>
- </td>
- <td><?php print $PALANG['pAdminEdit_domain_transport_text']; ?></td>
- </tr>
- <?php } ?>
- <tr>
- <td><?php print $PALANG['pAdminEdit_domain_backupmx'] . ":"; ?></td>
- <td><?php $checked = (!empty ($tBackupmx)) ? 'checked' : ''; ?>
- <input class="flat" type="checkbox" name="fBackupmx" <?php print $checked; ?> /></td>
- <td> </td>
- </tr>
- <tr>
- <td><?php print $PALANG['pAdminEdit_domain_active'] . ":"; ?></td>
- <td><?php $checked = (!empty ($tActive)) ? 'checked' : ''; ?>
- <input class="flat" type="checkbox" name="fActive" <?php print $checked; ?> /></td>
- <td> </td>
- </tr>
- <tr>
- <td colspan="3" class="hlp_center"><input type="submit" class="button" name="submit" value="<?php print $PALANG['pAdminEdit_domain_button']; ?>" /></td>
- </tr>
- <tr>
- <td colspan="3" class="standout"><?php print $tMessage; ?></td>
- </tr>
-</table>
-</form>
-</div>
Added: trunk/templates/admin_list-admin.php
===================================================================
--- trunk/templates/admin_list-admin.php (rev 0)
+++ trunk/templates/admin_list-admin.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -0,0 +1,35 @@
+<?php
+if (sizeof ($list_admins) > 0)
+{
+ print "<table id=\"admin_table\">\n";
+ print " <tr class=\"header\">\n";
+ print " <td>" . $PALANG['pAdminList_admin_username'] . "</td>\n";
+ print " <td>" . $PALANG['pAdminList_admin_count'] . "</td>\n";
+ print " <td>" . $PALANG['pAdminList_admin_modified'] . "</td>\n";
+ print " <td>" . $PALANG['pAdminList_admin_active'] . "</td>\n";
+ print " <td colspan=\"2\"> </td>\n";
+ print " </tr>\n";
+
+ for ($i = 0; $i < sizeof ($list_admins); $i++)
+ {
+ if ((is_array ($list_admins) and sizeof ($list_admins) > 0))
+ {
+ print " <tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
+ print " <td><a href=\"list-domain.php?username=" . $list_admins[$i] . "\">" . $list_admins[$i] . "</a></td>";
+ if ($admin_properties[$i]['domain_count'] == 'ALL') $admin_properties[$i]['domain_count'] = $PALANG['pAdminEdit_admin_super_admin'];
+ print " <td>" . $admin_properties[$i]['domain_count'] . "</td>";
+ print " <td>" . $admin_properties[$i]['modified'] . "</td>";
+ $active = ($admin_properties[$i]['active'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
+ print " <td><a href=\"edit-active-admin.php?username=" . $list_admins[$i] . "\">" . $active . "</a></td>";
+ print " <td><a href=\"edit-admin.php?username=" . $list_admins[$i] . "\">" . $PALANG['edit'] . "</a></td>";
+ print " <td><a href=\"delete.php?table=admin&delete=" . $list_admins[$i] . "\" onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pAdminList_admin_username'] . ": " . $list_admins[$i] . "')\">" . $PALANG['del'] . "</a></td>";
+ print " </tr>\n";
+ }
+ }
+
+ print "</table>\n";
+ print "<p><a href=\"create-admin.php\">" . $PALANG['pAdminMenu_create_admin'] . "</a>\n";
+}
+
+/* vim: set ft=php expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
+?>
Deleted: trunk/templates/admin_list-admin.tpl
===================================================================
--- trunk/templates/admin_list-admin.tpl 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/templates/admin_list-admin.tpl 2007-12-02 13:59:33 UTC (rev 250)
@@ -1,35 +0,0 @@
-<?php
-if (sizeof ($list_admins) > 0)
-{
- print "<table id=\"admin_table\">\n";
- print " <tr class=\"header\">\n";
- print " <td>" . $PALANG['pAdminList_admin_username'] . "</td>\n";
- print " <td>" . $PALANG['pAdminList_admin_count'] . "</td>\n";
- print " <td>" . $PALANG['pAdminList_admin_modified'] . "</td>\n";
- print " <td>" . $PALANG['pAdminList_admin_active'] . "</td>\n";
- print " <td colspan=\"2\"> </td>\n";
- print " </tr>\n";
-
- for ($i = 0; $i < sizeof ($list_admins); $i++)
- {
- if ((is_array ($list_admins) and sizeof ($list_admins) > 0))
- {
- print " <tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
- print " <td><a href=\"list-domain.php?username=" . $list_admins[$i] . "\">" . $list_admins[$i] . "</a></td>";
- if ($admin_properties[$i]['domain_count'] == 'ALL') $admin_properties[$i]['domain_count'] = $PALANG['pAdminEdit_admin_super_admin'];
- print " <td>" . $admin_properties[$i]['domain_count'] . "</td>";
- print " <td>" . $admin_properties[$i]['modified'] . "</td>";
- $active = ($admin_properties[$i]['active'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
- print " <td><a href=\"edit-active-admin.php?username=" . $list_admins[$i] . "\">" . $active . "</a></td>";
- print " <td><a href=\"edit-admin.php?username=" . $list_admins[$i] . "\">" . $PALANG['edit'] . "</a></td>";
- print " <td><a href=\"delete.php?table=admin&delete=" . $list_admins[$i] . "\" onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pAdminList_admin_username'] . ": " . $list_admins[$i] . "')\">" . $PALANG['del'] . "</a></td>";
- print " </tr>\n";
- }
- }
-
- print "</table>\n";
- print "<p><a href=\"create-admin.php\">" . $PALANG['pAdminMenu_create_admin'] . "</a>\n";
-}
-
-/* vim: set ft=php expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
-?>
Added: trunk/templates/admin_list-domain.php
===================================================================
--- trunk/templates/admin_list-domain.php (rev 0)
+++ trunk/templates/admin_list-domain.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -0,0 +1,86 @@
+<div id="overview">
+<form name="overview" method="post">
+<select name="fUsername" onChange="this.form.submit();">
+<?php
+if (!empty ($list_admins))
+{
+ for ($i = 0; $i < sizeof ($list_admins); $i++)
+ {
+ if ($fUsername == $list_admins[$i])
+ {
+ print "<option value=\"" . $list_admins[$i] . "\" selected>" . $list_admins[$i] . "</option>\n";
+ }
+ else
+ {
+ print "<option value=\"" . $list_admins[$i] . "\">" . $list_admins[$i] . "</option>\n";
+ }
+ }
+}
+?>
+</select>
+<input class="button" type="submit" name="go" value="<?php print $PALANG['pOverview_button']; ?>" />
+</form>
+<form name="search" method="post" action="search.php">
+<input type="textbox" name="search" size="10" />
+</form>
+</div>
+
+<?php
+if (sizeof ($list_domains) > 0)
+{
+ print "<table id=\"admin_table\">\n";
+ print " <tr class=\"header\">\n";
+ print " <td>" . $PALANG['pAdminList_domain_domain'] . "</td>\n";
+ print " <td>" . $PALANG['pAdminList_domain_description'] . "</td>\n";
+ print " <td>" . $PALANG['pAdminList_domain_aliases'] . "</td>\n";
+ print " <td>" . $PALANG['pAdminList_domain_mailboxes'] . "</td>\n";
+ if ($CONF['quota'] == 'YES') print " <td>" . $PALANG['pAdminList_domain_maxquota'] . "</td>\n";
+ if ($CONF['transport'] == 'YES') print " <td>" . $PALANG['pAdminList_domain_transport'] . "</td>\n";
+ print " <td>" . $PALANG['pAdminList_domain_backupmx'] . "</td>\n";
+ print " <td>" . $PALANG['pAdminList_domain_modified'] . "</td>\n";
+ print " <td>" . $PALANG['pAdminList_domain_active'] . "</td>\n";
+ print " <td colspan=\"2\"> </td>\n";
+ print " </tr>\n";
+
+ for ($i = 0; $i < sizeof ($list_domains); $i++)
+ {
+ if ((is_array ($list_domains) and sizeof ($list_domains) > 0))
+ {
+ print " <tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
+ print "<td><a href=\"list-virtual.php?domain=" . $list_domains[$i] . "\">" . $list_domains[$i] . "</a></td>";
+ print "<td>" . $domain_properties[$i]['description'] . "</td>";
+ print "<td>" . $domain_properties[$i]['alias_count'] . " / " . $domain_properties[$i]['aliases'] . "</td>";
+ print "<td>" . $domain_properties[$i]['mailbox_count'] . " / " . $domain_properties[$i]['mailboxes'] . "</td>";
+ if ($CONF['quota'] == 'YES')
+ {
+ print " <td>";
+ if ($domain_properties[$i]['maxquota'] == 0)
+ {
+ print $PALANG['pOverview_unlimited'];
+ }
+ elseif ($domain_properties[$i]['maxquota'] < 0)
+ {
+ print $PALANG['pOverview_disabled'];
+ }
+ else
+ {
+ print $domain_properties[$i]['maxquota'];
+ }
+ print "</td>\n";
+ }
+ if ($CONF['transport'] == 'YES') print "<td>" . $domain_properties[$i]['transport'] . "</td>";
+ $backupmx = ($domain_properties[$i]['backupmx'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
+ print "<td>$backupmx</td>";
+ print "<td>" . $domain_properties[$i]['modified'] . "</td>";
+ $active = ($domain_properties[$i]['active'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
+ print "<td><a href=\"edit-active-domain.php?domain=" . $list_domains[$i] . "\">" . $active . "</a></td>";
+ print "<td><a href=\"edit-domain.php?domain=" . $list_domains[$i] . "\">" . $PALANG['edit'] . "</a></td>";
+ print "<td><a href=\"delete.php?table=domain&delete=" . $list_domains[$i] . "\" onclick=\"return confirm ('" . $PALANG['confirm_domain'] . $PALANG['pAdminList_admin_domain'] . ": " . $list_domains[$i] . "')\">" . $PALANG['del'] . "</a></td>";
+ print "</tr>\n";
+ }
+ }
+
+ print "</table>\n";
+}
+echo "<p><a href='create-domain.php'>{$PALANG['pAdminMenu_create_domain']}</a>";
+?>
Deleted: trunk/templates/admin_list-domain.tpl
===================================================================
--- trunk/templates/admin_list-domain.tpl 2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/templates/admin_list-domain.tpl 2007-12-02 13:59:33 UTC (rev 250)
@@ -1,86 +0,0 @@
-<div id="overview">
-<form name="overview" method="post">
-<select name="fUsername" onChange="this.form.submit();">
-<?php
-if (!empty ($list_admins))
-{
- for ($i = 0; $i < sizeof ($list_admins); $i++)
- {
- if ($fUsername == $list_admins[$i])
- {
- print "<option value=\"" . $list_admins[$i] . "\" selected>" . $list_admins[$i] . "</option>\n";
- }
- else
- {
- print "<option value=\"" . $list_admins[$i] . "\">" . $list_admins[$i] . "</option>\n";
- }
- }
-}
-?>
-</select>
-<input class="button" type="submit" name="go" value="<?php print $PALANG['pOverview_button']; ?>" />
-</form>
-<form name="search" method="post" action="search.php">
-<input type="textbox" name="search" size="10" />
-</form>
-</div>
-
-<?php
-if (sizeof ($list_domains) > 0)
-{
- print "<table id=\"admin_table\">\n";
- print " <tr class=\"header\">\n";
- print " <td>" . $PALANG['pAdminList_domain_domain'] . "</td>\n";
- print " <td>" . $PALANG['pAdminList_domain_description'] . "</td>\n";
- print " <td>" . $PALANG['pAdminList_domain_aliases'] . "</td>\n";
- print " <td>" . $PALANG['pAdminList_domain_mailboxes'] . "</td>\n";
- if ($CONF['quota'] == 'YES') print " <td>" . $PALANG['pAdminList_domain_maxquota'] . "</td>\n";
- if ($CONF['transport'] == 'YES') print " <td>" . $PALANG['pAdminList_domain_transport'] . "</td>\n";
- print " <td>" . $PALANG['pAdminList_domain_backupmx'] . "</td>\n";
- print " <td>" . $PALANG['pAdminList_domain_modified'] . "</td>\n";
- print " <td>" . $PALANG['pAdminList_domain_active'] . "</td>\n";
- print " <td colspan=\"2\"> </td>\n";
- print " </tr>\n";
-
- for ($i = 0; $i < sizeof ($list_domains); $i++)
- {
- if ((is_array ($list_domains) and sizeof ($list_domains) > 0))
- {
- print " <tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
- print "<td><a href=\"list-virtual.php?domain=" . $list_domains[$i] . "\">" . $list_domains[$i] . "</a></td>";
- print "<td>" . $domain_properties[$i]['description'] . "</td>";
- print "<td>" . $domain_properties[$i]['alias_count'] . " / " . $domain_properties[$i]['aliases'] . "</td>";
- print "<td>" . $domain_properties[$i]['mailbox_count'] . " / " . $domain_properties[$i]['mailboxes'] . "</td>";
- if ($CONF['quota'] == 'YES')
- {
- print " <td>";
- if ($domain_properties[$i]['maxquota'] == 0)
- {
- print $PALANG['pOverview_unlimited'];
- }
- elseif ($domain_properties[$i]['maxquota'] < 0)
- {
- print $PALANG['pOverview_disabled'];
- }
- else
- {
- print $domain_properties[$i]['maxquota'];
- }
- print "</td>\n";
- }
- if ($CONF['transport'] == 'YES') print "<td>" . $domain_properties[$i]['transport'] . "</td>";
- $backupmx = ($domain_properties[$i]['backupmx'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
- print "<td>$backupmx</td>";
- print "<td>" . $domain_properties[$i]['modified'] . "</td>";
- $active = ($domain_properties[$i]['active'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
- print "<td><a href=\"edit-active-domain.php?domain=" . $list_domains[$i] . "\">" . $active . "</a></td>";
- print "<td><a href=\"edit-domain.php?domain=" . $list_domains[$i] . "\">" . $PALANG['edit'] . "</a></td>";
- print "<td><a href=\"delete.php?table=domain&delete=" . $list_domains[$i] . "\" onclick=\"return confirm ('" . $PALANG['confirm_domain'] . $PALANG['pAdminList_admin_domain'] . ": " . $list_domains[$i] . "')\">" . $PALANG['del'] . "</a></td>";
- print "</tr>\n";
- }
- }
-
- print "</table>\n";
-}
-echo "<p><a href='create-domain.php'>{$PALANG['pAdminMenu_create_domain']}</a>";
-?>
Added: trunk/templates/admin_search.php
===================================================================
--- trunk/templates/admin_search.php (rev 0)
+++ trunk/templates/admin_search.php 2007-12-02 13:59:33 UTC (rev 250)
@@ -0,0 +1,110 @@
+<?php
+require(dirname(__FILE__) . '/search.tpl');
+
+/* old code, should be deleted after testing the merge with templates/search.php
+?>
+
+<div id="overview">
+<form name="search" method="post" action="search.php">
+<table width=750><tr>
+<td>
+ <h4><?php print $PALANG['pSearch_welcome'] . $fSearch; ?></h4>
+</td>
+<td>
+ <?php print $PALANG['pSearch']; ?>:<input type="textbox" name="search">
+</td>
+<td align=right><select class="flat" name...
[truncated message content] |
|
From: <chr...@us...> - 2007-11-27 23:24:32
|
Revision: 249
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=249&view=rev
Author: christian_boltz
Date: 2007-11-27 15:24:37 -0800 (Tue, 27 Nov 2007)
Log Message:
-----------
stylesheet.css:
- fixed some syntax errors
Thanks to Jan ?\195?\150rnstedt (ornstedt) for the patch
https://sourceforge.net/tracker/index.php?func=detail&aid=1839084&group_id=191583&atid=937964
Modified Paths:
--------------
trunk/stylesheet.css
Modified: trunk/stylesheet.css
===================================================================
--- trunk/stylesheet.css 2007-11-27 22:20:13 UTC (rev 248)
+++ trunk/stylesheet.css 2007-11-27 23:24:37 UTC (rev 249)
@@ -1,7 +1,7 @@
body {
background: #ffffff;
color: #000000;
- font-family: BitStream Vera Sans, Verdana, Arial, Helvetica, sans-serif;
+ font-family: "BitStream Vera Sans", Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
font-weight: normal;
text-align: center;
@@ -22,9 +22,9 @@
}
table {
- // border-spacing: 0;
- // padding: 0;
- border-collapse: collapse; //for IE
+ /* border-spacing: 0; */
+ /* padding: 0; */
+ border-collapse: collapse; /* for IE */
}
.button {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-27 22:20:08
|
Revision: 248
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=248&view=rev
Author: christian_boltz
Date: 2007-11-27 14:20:13 -0800 (Tue, 27 Nov 2007)
Log Message:
-----------
edit-alias.php:
- correctly recognize empty input (first cleanup whitespace, then check).
Before this fix, aliases with empty goto could be created by entering
some spaces or newlines.
https://sourceforge.net/tracker/index.php?func=detail&aid=1839061&group_id=191583&atid=937964
Modified Paths:
--------------
trunk/edit-alias.php
Modified: trunk/edit-alias.php
===================================================================
--- trunk/edit-alias.php 2007-11-27 21:53:02 UTC (rev 247)
+++ trunk/edit-alias.php 2007-11-27 22:20:13 UTC (rev 248)
@@ -76,7 +76,14 @@
$tGoto = $fGoto;
$tMessage = $PALANG['pEdit_alias_result_error'];
}
- elseif (empty ($fGoto))
+
+ $goto = preg_replace ('/\\\r\\\n/', ',', $fGoto);
+ $goto = preg_replace ('/\r\n/', ',', $goto);
+ $goto = preg_replace ('/[\s]+/i', '', $goto);
+ $goto = preg_replace ('/,*$|^,*/', '', $goto);
+ $goto = preg_replace ('/,,*/', ',', $goto);
+
+ if (empty ($goto))
{
$error = 1;
$tGoto = $_POST['fGoto'];
@@ -85,10 +92,6 @@
if ($error != 1)
{
- $goto = preg_replace ('/\\\r\\\n/', ',', $fGoto);
- $goto = preg_replace ('/\r\n/', ',', $goto);
- $goto = preg_replace ('/[\s]+/i', '', $goto);
- $goto = preg_replace ('/\,*$/', '', $goto);
$array = preg_split ('/,/', $goto);
}
else
@@ -98,7 +101,7 @@
for ($i = 0; $i < sizeof ($array); $i++) {
if (in_array ("$array[$i]", $CONF['default_aliases'])) continue;
- if (empty ($array[$i])) continue;
+ if (empty ($array[$i])) continue; # TODO: should never happen - remove after 2.2 release
if (!check_email ($array[$i]))
{
$error = 1;
@@ -128,4 +131,6 @@
include ("templates/menu.tpl");
include ("templates/edit-alias.tpl");
include ("templates/footer.tpl");
+
+/* vim: set expandtab 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...> - 2007-11-27 21:52:59
|
Revision: 247
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=247&view=rev
Author: christian_boltz
Date: 2007-11-27 13:53:02 -0800 (Tue, 27 Nov 2007)
Log Message:
-----------
users/edit-alias.php:
- trim() goto targets to avoid wrong messages about empty goto field
if first line is empty
https://sourceforge.net/tracker/index.php?func=detail&aid=1839061&group_id=191583&atid=937964
Modified Paths:
--------------
trunk/users/edit-alias.php
Modified: trunk/users/edit-alias.php
===================================================================
--- trunk/users/edit-alias.php 2007-11-27 21:42:03 UTC (rev 246)
+++ trunk/users/edit-alias.php 2007-11-27 21:53:02 UTC (rev 247)
@@ -72,7 +72,7 @@
$pEdit_alias_goto = $PALANG['pEdit_alias_goto'];
if (isset ($_POST['fVacation'])) $fVacation = $_POST['fVacation'];
- if (isset ($_POST['fGoto'])) $fGoto = escape_string ($_POST['fGoto']);
+ if (isset ($_POST['fGoto'])) $fGoto = escape_string (trim($_POST['fGoto']));
if (isset ($_POST['fForward_and_store'])) $fForward_and_store = escape_string ($_POST['fForward_and_store']);
$goto = strtolower ($fGoto);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-27 21:42:05
|
Revision: 246
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=246&view=rev
Author: christian_boltz
Date: 2007-11-27 13:42:03 -0800 (Tue, 27 Nov 2007)
Log Message:
-----------
users_edit-alias.tpl:
- fix: mailbox not removed from alias targets
https://sourceforge.net/tracker/index.php?func=detail&aid=1839063&group_id=191583&atid=937964
- don't list mailbox in "to" field. We have option fields for this
below the textarea.
Modified Paths:
--------------
trunk/templates/users_edit-alias.tpl
Modified: trunk/templates/users_edit-alias.tpl
===================================================================
--- trunk/templates/users_edit-alias.tpl 2007-11-27 20:26:45 UTC (rev 245)
+++ trunk/templates/users_edit-alias.tpl 2007-11-27 21:42:03 UTC (rev 246)
@@ -15,14 +15,7 @@
<?php
$array = preg_split ('/,/', $tGoto);
-if (!in_array($USERID_USERNAME,$array))
-{
- $just_forward="YES";
-}
-else
-{
- $just_forward="NO";
-}
+$just_forward="YES"; # unless changed below
for ($i = 0 ; $i < sizeof ($array) ; $i++)
{
@@ -32,6 +25,10 @@
$vacation = "YES";
continue;
}
+ if ($array[$i] == $USERID_USERNAME) {
+ $just_forward="NO";
+ continue;
+ }
print "$array[$i]\n";
}
?>
@@ -61,3 +58,5 @@
</table>
</form>
</div>
+
+<?php /* vim: set ft=php expandtab 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...> - 2007-11-27 20:26:40
|
Revision: 245
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=245&view=rev
Author: christian_boltz
Date: 2007-11-27 12:26:45 -0800 (Tue, 27 Nov 2007)
Log Message:
-----------
sv.lang:
- more translations by Jan ?\195?\150rnstedt (ornstedt)
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1834023&group_id=191583
Modified Paths:
--------------
trunk/languages/sv.lang
Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang 2007-11-27 00:12:48 UTC (rev 244)
+++ trunk/languages/sv.lang 2007-11-27 20:26:45 UTC (rev 245)
@@ -41,7 +41,7 @@
$PALANG['pMain_welcome'] = 'Välkommen till Postfix Admin!';
$PALANG['pMain_overview'] = 'Lista dina alias och brevlådan. Du kan ändra / radera dem här.';
$PALANG['pMain_create_alias'] = 'Skapa nytt alias i din domän.';
-$PALANG['pMain_create_mailbox'] = 'Skapa nytt brevlåda i din domän.';
+$PALANG['pMain_create_mailbox'] = 'Skapa ny brevlåda i din domän.';
$PALANG['pMain_sendmail'] = 'Skicka ett mail till en av mailadresserna.';
$PALANG['pMain_password'] = 'Ändra lösenord för adminkontot.';
$PALANG['pMain_viewlog'] = 'Visa loggfiler.';
@@ -174,12 +174,12 @@
$PALANG['pViewlog_action_create_mailbox'] = 'skapa brevlåda';
$PALANG['pViewlog_action_delete_mailbox'] = 'radera brevlåda';
$PALANG['pViewlog_action_edit_mailbox'] = 'ändra brevlåda';
-$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
+$PALANG['pViewlog_action_edit_mailbox_state'] = 'ändra brevlåde status';
$PALANG['pViewlog_action_create_alias'] = 'skapa alias';
$PALANG['pViewlog_action_delete_alias'] = 'radera alias';
$PALANG['pViewlog_action_edit_alias'] = 'ändra alias';
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
-$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'ändra alias status';
+$PALANG['pViewlog_action_edit_password'] = 'ändra lösenord';
$PALANG['pViewlog_button'] = 'Kör';
$PALANG['pViewlog_result_error'] = '<span class="error_msg">Kan inte hitta loggarna!</span>';
@@ -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">Kan inte skapa mail inkorg!</span>';
-$PALANG['pSendmail_result_success'] = 'Mail inkorg har skapats!';
+$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';
@@ -338,14 +338,14 @@
$PALANG['pSearch'] = 'sök';
$PALANG['pSearch_welcome'] = 'Söker efter: ';
$PALANG['pReturn_to'] = 'Återvänd till';
-$PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
+$PALANG['pBroadcast_title'] = 'Grupputskick till alla';
$PALANG['pBroadcast_from'] = 'Från';
$PALANG['pBroadcast_name'] = 'Ditt namn';
$PALANG['pBroadcast_subject'] = 'Ämne';
$PALANG['pBroadcast_message'] = 'Meddelande';
$PALANG['pBroadcast_send'] = 'Skicka';
-$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
+$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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-27 00:12:45
|
Revision: 244
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=244&view=rev
Author: christian_boltz
Date: 2007-11-26 16:12:48 -0800 (Mon, 26 Nov 2007)
Log Message:
-----------
da.lang:
- language upate by Jesper R. Meyer (jespermeyer) - thanks!
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1839068&group_id=191583
sv.lang:
- fixed an Ö that was accidently inserted by my editor
Modified Paths:
--------------
trunk/languages/da.lang
trunk/languages/sv.lang
Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang 2007-11-26 23:30:16 UTC (rev 243)
+++ trunk/languages/da.lang 2007-11-27 00:12:48 UTC (rev 244)
@@ -11,8 +11,8 @@
$PALANG['edit'] = 'redigere';
$PALANG['del'] = 'slet';
$PALANG['exit'] = 'Log af';
-$PALANG['cancel'] = 'Cancel'; # XXX
-$PALANG['save'] = 'Save'; # XXX
+$PALANG['cancel'] = 'Annuller';
+$PALANG['save'] = 'Gem';
$PALANG['confirm'] = 'Er du sikker på du vil slette dette?\n';
$PALANG['confirm_domain'] = 'Vil du virkelig slette alle adresser for dette domæne? Dette kan ikke fortrydes!\n';
$PALANG['check_update'] = 'Søg efter opdateringer';
@@ -39,9 +39,9 @@
$PALANG['pMenu_logout'] = 'Log ud';
$PALANG['pMain_welcome'] = 'Velkommen til Postfix Admin!';
-$PALANG['pMain_overview'] = 'Vis alle aliaser og postbokse. Du kan redigere/slette dem herfra.';
-$PALANG['pMain_create_alias'] = 'Opret nyt alias til dit domæne.';
-$PALANG['pMain_create_mailbox'] = 'Opret nu postboks til dit domæne.';
+$PALANG['pMain_overview'] = 'Vis alle alias og postbokse. Du kan redigere/slette dem herfra.';
+$PALANG['pMain_create_alias'] = 'Tilføj nyt alias til dit domæne.';
+$PALANG['pMain_create_mailbox'] = 'Tilføj ny postboks til dit domæne.';
$PALANG['pMain_sendmail'] = 'Send en email til en af dine nyoprettede postbokse.';
$PALANG['pMain_password'] = 'Ændre adgangskoden til din administratorkonto.';
$PALANG['pMain_viewlog'] = 'Vis logfiler.';
@@ -57,25 +57,25 @@
$PALANG['pOverview_mailbox_title'] = ':: Postbokse';
$PALANG['pOverview_button'] = 'Vis';
$PALANG['pOverview_welcome'] = 'Oversigt for ';
-$PALANG['pOverview_alias_alias_count'] = 'Aliaser';
+$PALANG['pOverview_alias_alias_count'] = 'Alias';
$PALANG['pOverview_alias_mailbox_count'] = 'Postbokse';
-$PALANG['pOverview_alias_address'] = 'Fra';
-$PALANG['pOverview_alias_goto'] = 'Til';
+$PALANG['pOverview_alias_address'] = 'Alias';
+$PALANG['pOverview_alias_goto'] = 'Modtager';
$PALANG['pOverview_alias_modified'] = 'Senest ændret';
$PALANG['pOverview_alias_active'] = 'Aktiveret';
$PALANG['pOverview_alias_edit'] = 'Alias';
-$PALANG['and_x_more'] = '[and %s more...]'; # XXX
+$PALANG['and_x_more'] = '[og %s til...]';
$PALANG['pOverview_mailbox_username'] = 'Emailadresse';
$PALANG['pOverview_mailbox_name'] = 'Navn';
$PALANG['pOverview_mailbox_quota'] = 'Kvota (MB)';
$PALANG['pOverview_mailbox_modified'] = 'Senest ændret';
$PALANG['pOverview_mailbox_active'] = 'Aktiv';
$PALANG['pOverview_vacation_edit'] = 'Autosvar er aktiveret';
-$PALANG['pOverview_vacation_option'] = 'Opret autosvar';
+$PALANG['pOverview_vacation_option'] = 'Angiv autosvar';
$PALANG['pOverview_get_domain'] = 'Domæne';
-$PALANG['pOverview_get_aliases'] = 'Aliaser';
+$PALANG['pOverview_get_aliases'] = 'Alias';
$PALANG['pOverview_get_mailboxes'] = 'Postbokse';
$PALANG['pOverview_get_quota'] = 'Postboks Kvota (MB)';
$PALANG['pOverview_get_modified'] = 'Senest ændret';
@@ -86,21 +86,21 @@
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Dette domæne er ikke dit ';
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Kunne ikke slette aliaset ';
-$PALANG['pCreate_alias_welcome'] = 'Opret nyt alias til dit domæne.';
+$PALANG['pCreate_alias_welcome'] = 'Tilføj nyt alias til dit domæne.';
$PALANG['pCreate_alias_address'] = 'Alias';
$PALANG['pCreate_alias_address_text_error1'] = '<br /><span class="error_msg">Aliaset er ikke gyldigt!</span>';
$PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">Emailadressen eksisterer allerede. Vælg venligst en anden!</span>';
-$PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">Du har nået grænsen for antallet af aliaser til dit domæne!</span>';
+$PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">Du har nået grænsen for antallet af alias til dit domæne!</span>';
$PALANG['pCreate_alias_goto'] = 'Modtager';
$PALANG['pCreate_alias_active'] = 'Aktiv';
-$PALANG['pCreate_alias_button'] = 'Tilføj Alias';
+$PALANG['pCreate_alias_button'] = 'Tilføj alias';
$PALANG['pCreate_alias_goto_text'] = 'Hvor emailen skal videresendes til.';
$PALANG['pCreate_alias_goto_text_error'] = 'Hvor emailen skal videresendes til.<br /><span class="error_msg">Modtageradressen er ikke gyldig!</span>';
$PALANG['pCreate_alias_result_error'] = '<span class="error_msg">Kan ikke tilføje aliaset til alias-tabellen!</span>';
$PALANG['pCreate_alias_result_success'] = 'Aliaset er blevet tilføjet til alias-tabellen!';
-$PALANG['pCreate_alias_catchall_text'] = 'For at oprette et stjerne-alias, brug en "*" som alias.<br />For domæne til domæne-videresending brug "*@domain.tld" som modtager.';
+$PALANG['pCreate_alias_catchall_text'] = 'For at tilføje et stjerne-alias, brug en "*" som alias.<br />For domæne til domæne-videresending brug "*@domain.tld" som modtager.';
-$PALANG['pEdit_alias_welcome'] = 'Rediger et alias for dit domæne.<br />En modtager pr. linje.';
+$PALANG['pEdit_alias_welcome'] = 'Rediger alias.<br />En modtager pr. linje.';
$PALANG['pEdit_alias_address'] = 'Alias';
$PALANG['pEdit_alias_address_error'] = '<span class="error_msg">Kan ikke finde aliaset!</span>';
$PALANG['pEdit_alias_goto'] = 'Modtager(e)';
@@ -110,10 +110,10 @@
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Dette domæne tilhører ikke dig: ';
$PALANG['pEdit_alias_forward_and_store'] = 'Lever email til den lokale postboks.';
$PALANG['pEdit_alias_forward_only'] = 'Videresend til angiven emailadresse uden lokal kopi.';
-$PALANG['pEdit_alias_button'] = 'Ret Alias';
+$PALANG['pEdit_alias_button'] = 'Ret alias';
$PALANG['pEdit_alias_result_error'] = '<span class="error_msg">Kan ikke redigere aliaset!</span>';
-$PALANG['pCreate_mailbox_welcome'] = 'Opret en ny lokal postboks til dit domæne.';
+$PALANG['pCreate_mailbox_welcome'] = 'Tilføj en ny lokal postboks til dit domæne.';
$PALANG['pCreate_mailbox_username'] = 'Brugernavn';
$PALANG['pCreate_mailbox_username_text_error1'] = '<br /><span class="error_msg">Emailadressen er ikke gyldig!</span>';
$PALANG['pCreate_mailbox_username_text_error2'] = '<br /><span class="error_msg">Emailadressen eksisterer allerede. Vælg venligst en anden!</span>';
@@ -132,9 +132,9 @@
$PALANG['pCreate_mailbox_button'] = 'Tilføj postboks';
$PALANG['pCreate_mailbox_result_error'] = '<span class="error_msg">Kan ikke tilføje postboksen til postboks-tabellen!</span>';
$PALANG['pCreate_mailbox_result_success'] = 'Postboksen er tilføjet til postboks-tabellen!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Postkassen er tilføjet, men ingen (eller kun dele) af de foruddefinerede underfoldere kunne oprettes.';
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Postkassen er tilføjet, men ingen (eller kun dele) af de foruddefinerede undermapper kunne oprettes.';
-$PALANG['pEdit_mailbox_welcome'] = 'Rediger en postboks til dit domæne.';
+$PALANG['pEdit_mailbox_welcome'] = 'Rediger postboks.';
$PALANG['pEdit_mailbox_username'] = 'Brugernavn';
$PALANG['pEdit_mailbox_username_error'] = '<span class="error_msg">Kan ikke finde postboksen!</span>';
$PALANG['pEdit_mailbox_password'] = 'Ny adgangskode';
@@ -161,7 +161,7 @@
$PALANG['pPassword_result_error'] = '<span class="error_msg">Kan ikke ændre adgangskoden!</span>';
$PALANG['pPassword_result_success'] = 'Din adgangskode er ændret!';
-$PALANG['pEdit_vacation_set'] = 'Ændre / Opret autosvar';
+$PALANG['pEdit_vacation_set'] = 'Ændre / Angiv autosvar';
$PALANG['pEdit_vacation_remove'] = 'Fjern autosvar';
$PALANG['pVacation_result_error'] = '<span class="error_msg">Autosvarindstillinger kunne ikke opdateres!</span>';
@@ -175,11 +175,11 @@
$PALANG['pViewlog_action'] = 'Handling';
$PALANG['pViewlog_data'] = 'Data';
-$PALANG['pViewlog_action_create_mailbox'] = 'opret postboks';
+$PALANG['pViewlog_action_create_mailbox'] = 'tilføj postboks';
$PALANG['pViewlog_action_delete_mailbox'] = 'slet postboks';
$PALANG['pViewlog_action_edit_mailbox'] = 'rediger postboks';
$PALANG['pViewlog_action_edit_mailbox_state'] = 'ændre postboks aktiv';
-$PALANG['pViewlog_action_create_alias'] = 'opret alias';
+$PALANG['pViewlog_action_create_alias'] = 'tilføj alias';
$PALANG['pViewlog_action_delete_alias'] = 'slet alias';
$PALANG['pViewlog_action_edit_alias'] = 'rediger alias';
$PALANG['pViewlog_action_edit_alias_state'] = 'ændre alias aktiv';
@@ -196,8 +196,8 @@
$PALANG['pSendmail_subject_text'] = 'Velkommen';
$PALANG['pSendmail_body'] = 'Meddelelse';
$PALANG['pSendmail_button'] = 'Send email';
-$PALANG['pSendmail_result_error'] = '<span class="error_msg">Kan ikke oprette postboks!</span>';
-$PALANG['pSendmail_result_success'] = 'Postboksen er oprettet!';
+$PALANG['pSendmail_result_error'] = '<span class="error_msg">Kan ikke tilføje postboks!</span>';
+$PALANG['pSendmail_result_success'] = 'Postboksen er tilføjet!';
$PALANG['pAdminMenu_list_admin'] = 'Administratorliste';
$PALANG['pAdminMenu_list_domain'] = 'Domæneliste';
@@ -218,7 +218,7 @@
$PALANG['pAdminList_domain_domain'] = 'Domæne';
$PALANG['pAdminList_domain_description'] = 'Beskrivelse';
-$PALANG['pAdminList_domain_aliases'] = 'Aliaser';
+$PALANG['pAdminList_domain_aliases'] = 'Alias';
$PALANG['pAdminList_domain_mailboxes'] = 'Postbokse';
$PALANG['pAdminList_domain_maxquota'] = 'Maks. kvota (MB)';
$PALANG['pAdminList_domain_transport'] = 'Transport';
@@ -228,7 +228,7 @@
$PALANG['pAdminList_virtual_button'] = 'Vis';
$PALANG['pAdminList_virtual_welcome'] = 'Oversigt for ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Aliaser';
+$PALANG['pAdminList_virtual_alias_alias_count'] = 'Alias';
$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Postbokse';
$PALANG['pAdminList_virtual_alias_address'] = 'Fra';
$PALANG['pAdminList_virtual_alias_goto'] = 'Til';
@@ -244,7 +244,7 @@
$PALANG['pAdminCreate_domain_domain_text_error'] = '<span class="error_msg">Domænet eksisterer allerede!</span>';
$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">Domænet er ugyldigt!</span>';
$PALANG['pAdminCreate_domain_description'] = 'Beskrivelse';
-$PALANG['pAdminCreate_domain_aliases'] = 'Aliaser';
+$PALANG['pAdminCreate_domain_aliases'] = 'Alias';
$PALANG['pAdminCreate_domain_aliases_text'] = '-1 = annuller | 0 = uendeligt';
$PALANG['pAdminCreate_domain_mailboxes'] = 'Postbokse';
$PALANG['pAdminCreate_domain_mailboxes_text'] = '-1 = annuller | 0 = uendeligt';
@@ -252,7 +252,7 @@
$PALANG['pAdminCreate_domain_maxquota_text'] = 'MB<br /> -1 = annuller | 0 = uendeligt';
$PALANG['pAdminCreate_domain_transport'] = 'Transport';
$PALANG['pAdminCreate_domain_transport_text'] = 'Præciser transport';
-$PALANG['pAdminCreate_domain_defaultaliases'] = 'Tilføj standard aliaser';
+$PALANG['pAdminCreate_domain_defaultaliases'] = 'Tilføj standard alias';
$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
$PALANG['pAdminCreate_domain_backupmx'] = 'Mailserveren er backup MX';
$PALANG['pAdminCreate_domain_button'] = 'Tilføj domæne';
@@ -264,7 +264,7 @@
$PALANG['pAdminEdit_domain_welcome'] = 'Rediger et domæne';
$PALANG['pAdminEdit_domain_domain'] = 'Domæne';
$PALANG['pAdminEdit_domain_description'] = 'Beskrivelse';
-$PALANG['pAdminEdit_domain_aliases'] = 'Aliaser';
+$PALANG['pAdminEdit_domain_aliases'] = 'Alias';
$PALANG['pAdminEdit_domain_aliases_text'] = '-1 = annuller | 0 = uendeligt';
$PALANG['pAdminEdit_domain_mailboxes'] = 'Postbokse';
$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = annuller | 0 = uendeligt';
@@ -309,12 +309,12 @@
$PALANG['pUsersLogin_password_incorrect'] = 'Din adgangskode er ikke korrekt!';
$PALANG['pUsersMenu_vacation'] = 'Autosvar';
-$PALANG['pUsersMenu_edit_alias'] = 'Rediger dine videresendinger';
+$PALANG['pUsersMenu_edit_alias'] = 'Rediger videresending';
$PALANG['pUsersMenu_password'] = 'Ændre adgangskode';
$PALANG['pUsersMain_vacation'] = 'Tilføj en "ikke tilstede" besked eller et autosvar til din emailadresse.';
$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' er AKTIVERET, klik \'' . $PALANG['pUsersMenu_vacation'] . '\' for at ' . $PALANG['edit'] . '/fjerne';
-$PALANG['pUsersMain_edit_alias'] = 'Ændre dine videresendinger for email.';
+$PALANG['pUsersMain_edit_alias'] = 'Ændre levering/videresending af email.';
$PALANG['pUsersMain_password'] = 'Ændre din nuværende adgangskode.';
$PALANG['pUsersVacation_welcome'] = 'Autosvar.';
@@ -331,8 +331,8 @@
$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Kan ikke opdatere indstillinger for dit autosvar!</span>';
$PALANG['pUsersVacation_result_success'] = 'Dit autosvar er fjernet!';
-$PALANG['pCreate_dbLog_createmailbox'] = 'opret postboks';
-$PALANG['pCreate_dbLog_createalias'] = 'opret alias';
+$PALANG['pCreate_dbLog_createmailbox'] = 'tilføj postboks';
+$PALANG['pCreate_dbLog_createalias'] = 'tilføj alias';
$PALANG['pDelete_dbLog_deletealias'] = 'slet alias';
$PALANG['pDelete_dbLog_deletemailbox'] = 'slet postboks';
@@ -370,37 +370,37 @@
$PALANG['pFetchmail_server_missing'] = 'Angiv navnet på fjernserveren!';
$PALANG['pFetchmail_user_missing'] = 'Angiv brugernavnet til fjernserveren!';
$PALANG['pFetchmail_password_missing'] = 'Angiv adgangskoden til fjernserveren!';
-$PALANG['pFetchmail_field_id'] = 'ID'; # XXX
-$PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX
-$PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX
-$PALANG['pFetchmail_field_src_auth'] = 'Auth Type'; # XXX
-$PALANG['pFetchmail_field_src_user'] = 'User'; # XXX
-$PALANG['pFetchmail_field_src_password'] = 'Password'; # XXX
-$PALANG['pFetchmail_field_src_folder'] = 'Folder'; # XXX
-$PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX
-$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
-$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
-$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
-$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
-$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
-$PALANG['pFetchmail_field_returned_text'] = 'Returned Text'; # XXX
-$PALANG['pFetchmail_desc_id'] = 'Record ID'; # XXX
-$PALANG['pFetchmail_desc_mailbox'] = 'Local mailbox'; # XXX
-$PALANG['pFetchmail_desc_src_server'] = 'Remote Server'; # XXX
-$PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here # XXX
-$PALANG['pFetchmail_desc_src_user'] = 'Remote User'; # XXX
-$PALANG['pFetchmail_desc_src_password'] = 'Remote Password'; # XXX
-$PALANG['pFetchmail_desc_src_folder'] = 'Remote Folder'; # XXX
-$PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX
-$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX
-$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX
-$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_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_id'] = 'ID';
+$PALANG['pFetchmail_field_mailbox'] = 'Postboks';
+$PALANG['pFetchmail_field_src_server'] = 'Server';
+$PALANG['pFetchmail_field_src_auth'] = 'Godkendelsesmetode';
+$PALANG['pFetchmail_field_src_user'] = 'Brugernavn';
+$PALANG['pFetchmail_field_src_password'] = 'Adgangskode';
+$PALANG['pFetchmail_field_src_folder'] = 'Mappe';
+$PALANG['pFetchmail_field_poll_time'] = 'Prøve';
+$PALANG['pFetchmail_field_fetchall'] = 'Hent alle';
+$PALANG['pFetchmail_field_keep'] = 'Behold';
+$PALANG['pFetchmail_field_protocol'] = 'Protokol';
+$PALANG['pFetchmail_field_extra_options'] = 'Ekstra tilvalg';
+$PALANG['pFetchmail_field_mda'] = 'MDA (Mail Delivery Agent)';
+$PALANG['pFetchmail_field_date'] = 'Dato';
+$PALANG['pFetchmail_field_returned_text'] = 'Returneret tekst';
+$PALANG['pFetchmail_desc_id'] = 'Post ID';
+$PALANG['pFetchmail_desc_mailbox'] = 'Lokal postboks';
+$PALANG['pFetchmail_desc_src_server'] = 'Fjernserver';
+$PALANG['pFetchmail_desc_src_auth'] = 'Somregel \'password\''; # Translators: Please do NOT translate 'password' here
+$PALANG['pFetchmail_desc_src_user'] = 'Ekstern brugernavn';
+$PALANG['pFetchmail_desc_src_password'] = 'Ekstern adgangskode';
+$PALANG['pFetchmail_desc_src_folder'] = 'Ekstern mappe';
+$PALANG['pFetchmail_desc_poll_time'] = 'Prøv hver ... minut';
+$PALANG['pFetchmail_desc_fetchall'] = 'Hent både gamle (sete) og nye beskeder';
+$PALANG['pFetchmail_desc_keep'] = 'Gem hentede beskeder på den eksterne postserver';
+$PALANG['pFetchmail_desc_protocol'] = 'Brug protokol';
+$PALANG['pFetchmail_desc_extra_options'] = 'Ekstra fetchmail flag';
+$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent';
+$PALANG['pFetchmail_desc_date'] = 'Dato for seneste prøve/konfigurationsændring';
+$PALANG['pFetchmail_desc_returned_text'] = 'Tekstbesked fra seneste prøve';
+
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang 2007-11-26 23:30:16 UTC (rev 243)
+++ trunk/languages/sv.lang 2007-11-27 00:12:48 UTC (rev 244)
@@ -4,7 +4,7 @@
// Language file Swedish
// by Stefan Jakobsson <stefan at katrinet dot se>
// updated by Bjorne <bjorne at gah dot se>
-// updated by Jan Örnstedt (ornstedt @sf)
+// updated by Jan Örnstedt (ornstedt @sf)
//
$PALANG['YES'] = 'JA';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-26 23:30:14
|
Revision: 243
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=243&view=rev
Author: christian_boltz
Date: 2007-11-26 15:30:16 -0800 (Mon, 26 Nov 2007)
Log Message:
-----------
several *.php files:
- no longer use $incpath - merging admin/ is done
http://sourceforge.net/tracker/index.php?func=detail&aid=1838327&group_id=191583&atid=937964
Note that $incpath is still used by common.php - removing it would break users/
Modified Paths:
--------------
trunk/create-alias.php
trunk/create-mailbox.php
trunk/delete.php
trunk/edit-active.php
trunk/edit-alias.php
trunk/edit-mailbox.php
trunk/edit-vacation.php
trunk/search.php
trunk/viewlog.php
Modified: trunk/create-alias.php
===================================================================
--- trunk/create-alias.php 2007-11-26 07:38:56 UTC (rev 242)
+++ trunk/create-alias.php 2007-11-26 23:30:16 UTC (rev 243)
@@ -152,8 +152,8 @@
}
}
-include ("$incpath/templates/header.tpl");
-include ("$incpath/templates/menu.tpl");
-include ("$incpath/templates/create-alias.tpl");
-include ("$incpath/templates/footer.tpl");
+include ("templates/header.tpl");
+include ("templates/menu.tpl");
+include ("templates/create-alias.tpl");
+include ("templates/footer.tpl");
?>
Modified: trunk/create-mailbox.php
===================================================================
--- trunk/create-mailbox.php 2007-11-26 07:38:56 UTC (rev 242)
+++ trunk/create-mailbox.php 2007-11-26 23:30:16 UTC (rev 243)
@@ -330,10 +330,10 @@
}
}
-include ("$incpath/templates/header.tpl");
-include ("$incpath/templates/menu.tpl");
-include ("$incpath/templates/create-mailbox.tpl");
-include ("$incpath/templates/footer.tpl");
+include ("templates/header.tpl");
+include ("templates/menu.tpl");
+include ("templates/create-mailbox.tpl");
+include ("templates/footer.tpl");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/delete.php
===================================================================
--- trunk/delete.php 2007-11-26 07:38:56 UTC (rev 242)
+++ trunk/delete.php 2007-11-26 23:30:16 UTC (rev 243)
@@ -164,10 +164,10 @@
}
-include ("$incpath/templates/header.tpl");
-include ("$incpath/templates/menu.tpl");
-include ("$incpath/templates/message.tpl");
-include ("$incpath/templates/footer.tpl");
+include ("templates/header.tpl");
+include ("templates/menu.tpl");
+include ("templates/message.tpl");
+include ("templates/footer.tpl");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/edit-active.php
===================================================================
--- trunk/edit-active.php 2007-11-26 07:38:56 UTC (rev 242)
+++ trunk/edit-active.php 2007-11-26 23:30:16 UTC (rev 243)
@@ -91,9 +91,9 @@
}
}
-include ("$incpath/templates/header.tpl");
-include ("$incpath/templates/menu.tpl");
-include ("$incpath/templates/message.tpl");
-include ("$incpath/templates/footer.tpl");
+include ("templates/header.tpl");
+include ("templates/menu.tpl");
+include ("templates/message.tpl");
+include ("templates/footer.tpl");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/edit-alias.php
===================================================================
--- trunk/edit-alias.php 2007-11-26 07:38:56 UTC (rev 242)
+++ trunk/edit-alias.php 2007-11-26 23:30:16 UTC (rev 243)
@@ -124,8 +124,8 @@
}
}
-include ("$incpath/templates/header.tpl");
-include ("$incpath/templates/menu.tpl");
-include ("$incpath/templates/edit-alias.tpl");
-include ("$incpath/templates/footer.tpl");
+include ("templates/header.tpl");
+include ("templates/menu.tpl");
+include ("templates/edit-alias.tpl");
+include ("templates/footer.tpl");
?>
Modified: trunk/edit-mailbox.php
===================================================================
--- trunk/edit-mailbox.php 2007-11-26 07:38:56 UTC (rev 242)
+++ trunk/edit-mailbox.php 2007-11-26 23:30:16 UTC (rev 243)
@@ -157,9 +157,9 @@
}
}
-include ("$incpath/templates/header.tpl");
-include ("$incpath/templates/menu.tpl");
-include ("$incpath/templates/edit-mailbox.tpl");
-include ("$incpath/templates/footer.tpl");
+include ("templates/header.tpl");
+include ("templates/menu.tpl");
+include ("templates/edit-mailbox.tpl");
+include ("templates/footer.tpl");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/edit-vacation.php
===================================================================
--- trunk/edit-vacation.php 2007-11-26 07:38:56 UTC (rev 242)
+++ trunk/edit-vacation.php 2007-11-26 23:30:16 UTC (rev 243)
@@ -191,9 +191,9 @@
$tMessage = $PALANG['pVacation_result_error'];
}
-include ("$incpath/templates/header.tpl");
-include ("$incpath/templates/menu.tpl");
-include ("$incpath/templates/edit-vacation.tpl");
-include ("$incpath/templates/footer.tpl");
+include ("templates/header.tpl");
+include ("templates/menu.tpl");
+include ("templates/edit-vacation.tpl");
+include ("templates/footer.tpl");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/search.php
===================================================================
--- trunk/search.php 2007-11-26 07:38:56 UTC (rev 242)
+++ trunk/search.php 2007-11-26 23:30:16 UTC (rev 243)
@@ -116,9 +116,9 @@
}
}
-include ("$incpath/templates/header.tpl");
-include ("$incpath/templates/menu.tpl");
-include ("$incpath/templates/search.tpl");
-include ("$incpath/templates/footer.tpl");
+include ("templates/header.tpl");
+include ("templates/menu.tpl");
+include ("templates/search.tpl");
+include ("templates/footer.tpl");
?>
Modified: trunk/viewlog.php
===================================================================
--- trunk/viewlog.php 2007-11-26 07:38:56 UTC (rev 242)
+++ trunk/viewlog.php 2007-11-26 23:30:16 UTC (rev 243)
@@ -74,10 +74,10 @@
}
}
-include ("$incpath/templates/header.tpl");
-include ("$incpath/templates/menu.tpl");
-include ("$incpath/templates/viewlog.tpl");
-include ("$incpath/templates/footer.tpl");
+include ("templates/header.tpl");
+include ("templates/menu.tpl");
+include ("templates/viewlog.tpl");
+include ("templates/footer.tpl");
/* vim: set expandtab 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...> - 2007-11-26 07:38:54
|
Revision: 242
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=242&view=rev
Author: GingerDog
Date: 2007-11-25 23:38:56 -0800 (Sun, 25 Nov 2007)
Log Message:
-----------
common.php: ensure register_globals are not enabled
Modified Paths:
--------------
trunk/common.php
Modified: trunk/common.php
===================================================================
--- trunk/common.php 2007-11-25 17:35:29 UTC (rev 241)
+++ trunk/common.php 2007-11-26 07:38:56 UTC (rev 242)
@@ -20,6 +20,9 @@
(ini_get('magic_quotes_gpc') ? ini_set('magic_quotes_runtime', '0') : '1');
(ini_get('magic_quotes_gpc') ? ini_set('magic_quotes_sybase', '0') : '1');
+if(ini_get('register_globals')) {
+ die("Please turn off register_globals; edit your php.ini");
+}
require_once("$incpath/variables.inc.php");
if(!is_file("$incpath/config.inc.php")) {
// incorrectly setup...
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-25 17:35:26
|
Revision: 241
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=241&view=rev
Author: christian_boltz
Date: 2007-11-25 09:35:29 -0800 (Sun, 25 Nov 2007)
Log Message:
-----------
it.lang:
- italian language update by Luca Accomazzi (luca AT accomazzi DOT it)
Modified Paths:
--------------
trunk/languages/it.lang
Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang 2007-11-25 00:35:13 UTC (rev 240)
+++ trunk/languages/it.lang 2007-11-25 17:35:29 UTC (rev 241)
@@ -3,20 +3,21 @@
//
// Language file Italian
// by Massimiliano Stucchi <max at gufi dot org>
+// updated by Luca Accomazzi (luca chiocciola accomazzi punto it)
//
$PALANG['YES'] = 'SI';
$PALANG['NO'] = 'NO';
$PALANG['edit'] = 'modifica';
$PALANG['del'] = 'cancella';
-$PALANG['exit'] = 'Exit'; # XXX
-$PALANG['cancel'] = 'Cancel'; # XXX
-$PALANG['save'] = 'Save'; # XXX
-$PALANG['confirm'] = 'Sei sicuro di volerlo cancellare?\n';
+$PALANG['exit'] = 'Esci';
+$PALANG['cancel'] = 'Annulla';
+$PALANG['save'] = 'registra';
+$PALANG['confirm'] = 'Sei certo di volerlo cancellare?\n';
$PALANG['confirm_domain'] = 'Sei sicuro di voler cancellare tutti gli indirizzi di questo dominio? Questa modifica sarà permanente!\n';
-$PALANG['check_update'] = 'Check for update'; # XXX
-$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
-$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
+$PALANG['check_update'] = 'Verifica gli aggiornamenti';
+$PALANG['invalid_parameter'] = 'Parametro non valido!';
+$PALANG['pFooter_logged_as'] = 'Collegato come %s';
$PALANG['pLogin_welcome'] = 'GLi amministratori di posta devono effettuare il login qui per amministrare il proprio dominio.';
$PALANG['pLogin_username'] = 'Nome utente (email)';
@@ -26,11 +27,11 @@
$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">La tua password non è corretta!</span>';
$PALANG['pLogin_login_users'] = 'GLi utenti devono cliccare qui per entrare nella propria sezione.';
-$PALANG['pMenu_main'] = 'Main'; # XXX
+$PALANG['pMenu_main'] = 'Principale';
$PALANG['pMenu_overview'] = 'Resoconto';
$PALANG['pMenu_create_alias'] = 'Aggiungi Alias';
$PALANG['pMenu_create_mailbox'] = 'Aggiungi casella di posta';
-$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
+$PALANG['pMenu_fetchmail'] = 'Ricevi Email';
$PALANG['pMenu_sendmail'] = 'Spedisci Email';
$PALANG['pMenu_password'] = 'Password';
$PALANG['pMenu_viewlog'] = 'Vedi Log';
@@ -48,7 +49,7 @@
$PALANG['pOverview_disabled'] = 'Disabilitato';
$PALANG['pOverview_unlimited'] = 'Illimitato';
$PALANG['pOverview_title'] = ':: Domini definiti';
-$PALANG['pOverview_up_arrow'] = 'Go top'; # XXX
+$PALANG['pOverview_up_arrow'] = 'Torna in cima';
$PALANG['pOverview_right_arrow'] = 'Pagina successiva';
$PALANG['pOverview_left_arrow'] = 'Pagina precedente';
$PALANG['pOverview_alias_title'] = ':: Alias';
@@ -60,16 +61,16 @@
$PALANG['pOverview_alias_address'] = 'Da';
$PALANG['pOverview_alias_goto'] = 'a';
$PALANG['pOverview_alias_modified'] = 'Ultima modifica';
-$PALANG['pOverview_alias_active'] = 'Active'; # XXX
-$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
-$PALANG['and_x_more'] = '[and %s more...]'; # XXX
+$PALANG['pOverview_alias_active'] = 'Attivo';
+$PALANG['pOverview_alias_edit'] = 'Alias';
+$PALANG['and_x_more'] = '[più %s altri...]';
$PALANG['pOverview_mailbox_username'] = 'Email';
$PALANG['pOverview_mailbox_name'] = 'Nome';
$PALANG['pOverview_mailbox_quota'] = 'Quota (MB)';
$PALANG['pOverview_mailbox_modified'] = 'Ultima modifica';
$PALANG['pOverview_mailbox_active'] = 'Attivo';
-$PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
-$PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
+$PALANG['pOverview_vacation_edit'] = 'AUTORISPONDITORE ATTIVO';
+$PALANG['pOverview_vacation_option'] = 'Attiva autoresponditore';
$PALANG['pOverview_get_domain'] = 'Dominio';
$PALANG['pOverview_get_aliases'] = 'Alias';
@@ -78,35 +79,35 @@
$PALANG['pOverview_get_modified'] = 'Ultima modifica';
$PALANG['pDelete_delete_error'] = '<span class="error_msg">Impossibile cancellare ';
-$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 cancellati.';
+$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Impossibile cancellare la casella ';
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Questo dominio non è tuo ';
-$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
+$PALANG['pDelete_alias_error'] = '<span class="error_msg">Impossibile cancellate lo alias ';
$PALANG['pCreate_alias_welcome'] = 'Crea un nuovo alias per il tuo dominio.';
$PALANG['pCreate_alias_address'] = 'Alias';
$PALANG['pCreate_alias_address_text_error1'] = '<br /><span class="error_msg">L\' Alias non è valido!</span>';
-$PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">Questo indirizzo di post esiste già, perfavore sceglierne uno diverso!</span>';
-$PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">Hai raggiunto il tuo limite per creare alias.!</span>';
+$PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">Questo indirizzo di post esiste già, per favore sceglierne uno diverso!</span>';
+$PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">Hai raggiunto il tuo limite per creare alias!</span>';
$PALANG['pCreate_alias_goto'] = 'A';
-$PALANG['pCreate_alias_active'] = 'Active'; # XXX
+$PALANG['pCreate_alias_active'] = 'Attivo';
$PALANG['pCreate_alias_button'] = 'Aggiungi Alias';
$PALANG['pCreate_alias_goto_text'] = 'Dove la mail deve essere spedita.';
$PALANG['pCreate_alias_goto_text_error'] = 'Dove l\'email deve andare.<br /><span class="error_msg">Il campo A non è valido!</span>';
$PALANG['pCreate_alias_result_error'] = '<span class="error_msg">Non sono riuscito ad aggiungere l\'alias alla tabella degli alias!</span>';
$PALANG['pCreate_alias_result_success'] = 'L\'alias è stato aggiunto alla tabella degli alias!';
-$PALANG['pCreate_alias_catchall_text'] = 'Per creare un account universale, usare "*" come alias.<br />Per fare forwarding da dominio a dominio, usare "*@domain.tld" come campo \"a\".';
+$PALANG['pCreate_alias_catchall_text'] = 'Per creare un account universale, usare "*" come alias.<br />Per inoltri da dominio a dominio, usare "*@domain.tld" come campo \"a\".';
$PALANG['pEdit_alias_welcome'] = 'Modifica un alias per il tuo dominio.<br />Un indirizzo per linea.';
$PALANG['pEdit_alias_address'] = 'Alias';
$PALANG['pEdit_alias_address_error'] = '<span class="error_msg">Impossibile allocare alias!</span>';
$PALANG['pEdit_alias_goto'] = 'A';
-$PALANG['pEdit_alias_active'] = 'Active'; # XXX
+$PALANG['pEdit_alias_active'] = 'Attivo';
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Non hai inserito nulla nel campo To</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">L\'indirizzo email che hai inserito non è valido : ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Questo dominio non è tuo: ';
-$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'] = 'Consegna anche a una casella su questo server.';
+$PALANG['pEdit_alias_forward_only'] = 'Inoltra solo a un altro server.';
$PALANG['pEdit_alias_button'] = 'Modifica Alias';
$PALANG['pEdit_alias_result_error'] = '<span class="error_msg">Impossibile modificare alias!</span>';
@@ -129,7 +130,7 @@
$PALANG['pCreate_mailbox_button'] = 'Aggiungi casella di posta';
$PALANG['pCreate_mailbox_result_error'] = '<span class="error_msg">Impossibile aggiungere la casella di posta alla tabella delle caselle di posta!</span>';
$PALANG['pCreate_mailbox_result_success'] = 'La casella di posta è stata aggiunta alla tabella!';
-$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'] = 'La casella è stata aggiunta, ma non sono riuscito ad aggiungere (tutte) le sottocartelle definite';
$PALANG['pEdit_mailbox_welcome'] = 'Modifica una casella di posta per il tuo dominio.';
$PALANG['pEdit_mailbox_username'] = 'Nome utente';
@@ -138,7 +139,7 @@
$PALANG['pEdit_mailbox_password2'] = 'Nuova Password (ripeti)';
$PALANG['pEdit_mailbox_password_text_error'] = '<span class="error_msg">Le password che hai fornito non sono uguali!</span>';
$PALANG['pEdit_mailbox_name'] = 'Nome';
-$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX
+$PALANG['pEdit_mailbox_name_text'] = 'Nome e cognome';
$PALANG['pEdit_mailbox_quota'] = 'Quota';
$PALANG['pEdit_mailbox_quota_text'] = 'MB';
$PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">La quota che hai specificato è troppo alta!</span>';
@@ -157,27 +158,27 @@
$PALANG['pPassword_button'] = 'Cambia Password';
$PALANG['pPassword_result_error'] = '<span class="error_msg">Impossibile cambiare password!</span>';
$PALANG['pPassword_result_success'] = 'La tua password è stata modificata!';
-$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'] = 'Cambia / inserisci messaggio';
+$PALANG['pEdit_vacation_remove'] = 'Rimuovi messaggio';
+$PALANG['pVacation_result_error'] = '<span class="error_msg">Impossibile registrare le modifiche!</span>';
+$PALANG['pVacation_result_removed'] = 'Autoresponditore disabilitato!';
+$PALANG['pVacation_result_added'] = 'Autoresponditore abilitato!';
-$PALANG['pViewlog_welcome'] = 'Vedi le ultime dieci azioni di ';
+$PALANG['pViewlog_welcome'] = 'Elenca gli ultimi dieci eventi per ';
$PALANG['pViewlog_timestamp'] = 'Orario';
$PALANG['pViewlog_username'] = 'Amministratore';
$PALANG['pViewlog_domain'] = 'Dominio';
$PALANG['pViewlog_action'] = 'Azione';
$PALANG['pViewlog_data'] = 'Dati';
-$PALANG['pViewlog_action_create_mailbox'] = 'create mailbox'; # XXX
-$PALANG['pViewlog_action_delete_mailbox'] = 'delete mailbox'; # XXX
-$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX
-$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
-$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
-$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
-$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
-$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
+$PALANG['pViewlog_action_create_mailbox'] = 'crea casella';
+$PALANG['pViewlog_action_delete_mailbox'] = 'distruggi casella';
+$PALANG['pViewlog_action_edit_mailbox'] = 'modifica casella';
+$PALANG['pViewlog_action_edit_mailbox_state'] = 'cambia stato casella';
+$PALANG['pViewlog_action_create_alias'] = 'crea alias';
+$PALANG['pViewlog_action_delete_alias'] = 'distruggi alias';
+$PALANG['pViewlog_action_edit_alias'] = 'modifica alias';
+$PALANG['pViewlog_action_edit_alias_state'] = 'cambia stato alias';
+$PALANG['pViewlog_action_edit_password'] = 'cambia password';
$PALANG['pViewlog_button'] = 'Vai';
$PALANG['pViewlog_result_error'] = '<span class="error_msg">Impossibile trovare i file di log!</span>';
@@ -215,8 +216,8 @@
$PALANG['pAdminList_domain_aliases'] = 'Alias';
$PALANG['pAdminList_domain_mailboxes'] = 'Caselle di posta';
$PALANG['pAdminList_domain_maxquota'] = 'Quota massima (MB)';
-$PALANG['pAdminList_domain_transport'] = 'Transport'; # XXX
-$PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
+$PALANG['pAdminList_domain_transport'] = 'Trasporto';
+$PALANG['pAdminList_domain_backupmx'] = 'MX secondario';
$PALANG['pAdminList_domain_modified'] = 'Ultima modifica';
$PALANG['pAdminList_domain_active'] = 'Attivo';
@@ -235,24 +236,24 @@
$PALANG['pAdminCreate_domain_welcome'] = 'Aggiungi nuovo dominio';
$PALANG['pAdminCreate_domain_domain'] = 'Dominio';
-$PALANG['pAdminCreate_domain_domain_text_error'] = '<span class="error_msg">Il dominio esiste di già!</span>';
-$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">The domain is invalid!</span>'; # XXX
-$PALANG['pAdminCreate_domain_description'] = 'Descri<ione'; # XXX - is the '<' correct? Probably not...
+$PALANG['pAdminCreate_domain_domain_text_error'] = '<span class="error_msg">Il dominio esiste già!</span>';
+$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">Dominio non valido!</span>';
+$PALANG['pAdminCreate_domain_description'] = 'Descrizione';
$PALANG['pAdminCreate_domain_aliases'] = 'Alias';
$PALANG['pAdminCreate_domain_aliases_text'] = '-1 = disabilita | 0 = illimitati';
$PALANG['pAdminCreate_domain_mailboxes'] = 'Caselle di posta';
$PALANG['pAdminCreate_domain_mailboxes_text'] = '-1 = disabilita | 0 = illimitate';
$PALANG['pAdminCreate_domain_maxquota'] = 'Quota Massima';
$PALANG['pAdminCreate_domain_maxquota_text'] = 'MB<br /> -1 = disabilita | 0 = illimitata';
-$PALANG['pAdminCreate_domain_transport'] = 'Transport'; # XXX
-$PALANG['pAdminCreate_domain_transport_text'] = 'Define transport'; # XXX
+$PALANG['pAdminCreate_domain_transport'] = 'Trasporto';
+$PALANG['pAdminCreate_domain_transport_text'] = 'Definisci trasporto';
$PALANG['pAdminCreate_domain_defaultaliases'] = 'Aggiungi gli alias di default';
-$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'] = 'Questo server è un MX secondario';
$PALANG['pAdminCreate_domain_button'] = 'Aggiungi dominio';
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Impossibile aggiungere il dominio!</span>';
$PALANG['pAdminCreate_domain_result_success'] = 'Il dominio è stato aggiunto!';
-$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX
+$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Impossibile cancellare il dominio!</span>';
$PALANG['pAdminEdit_domain_welcome'] = 'Modifica un domain';
$PALANG['pAdminEdit_domain_domain'] = 'Dominio';
@@ -263,9 +264,9 @@
$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = disabilita | 0 = illimitate';
$PALANG['pAdminEdit_domain_maxquota'] = 'Quota massima';
$PALANG['pAdminEdit_domain_maxquota_text'] = 'MB<br /> -1 = disabilita | 0 = illimitato';
-$PALANG['pAdminEdit_domain_transport'] = 'Transport'; # XXX
-$PALANG['pAdminEdit_domain_transport_text'] = 'Define transport'; # XXX
-$PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX'; # XXX
+$PALANG['pAdminEdit_domain_transport'] = 'Trasporto';
+$PALANG['pAdminEdit_domain_transport_text'] = 'Definisci il trasporto';
+$PALANG['pAdminEdit_domain_backupmx'] = 'Questo server è un MX secondario';
$PALANG['pAdminEdit_domain_active'] = 'Attivo';
$PALANG['pAdminEdit_domain_button'] = 'Modifica dominio';
$PALANG['pAdminEdit_domain_result_error'] = '<span class="error_msg">Impossibile modificare il dominio!</span>';
@@ -273,11 +274,11 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Aggiungi un nuovo amministratore per il dominio';
$PALANG['pAdminCreate_admin_username'] = 'Amministratore';
$PALANG['pAdminCreate_admin_username_text'] = 'Indirizzo email';
-$PALANG['pAdminCreate_admin_username_text_error1'] = 'Email address<br /><span class="error_msg">Admin is not a valid email address!</span>';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Indirizzo Email<br /><span class="error_msg">L\'amministatore esiste di già, oppure non è valido</span>';
+$PALANG['pAdminCreate_admin_username_text_error1'] = 'Indirizzo Email<br /><span class="error_msg">L\'indirizzo dell\'amministratore non è valido!</span>';
+$PALANG['pAdminCreate_admin_username_text_error2'] = 'Indirizzo Email<br /><span class="error_msg">L\'amministratore esiste di già, oppure non è valido</span>';
$PALANG['pAdminCreate_admin_password'] = 'Password';
$PALANG['pAdminCreate_admin_password2'] = 'Password (ancora)';
-$PALANG['pAdminCreate_admin_password_text_error'] = '<span class="error_msg">Le password che hai fornito non sono uguali!<br />Oppure sono vuote!</span>';
+$PALANG['pAdminCreate_admin_password_text_error'] = '<span class="error_msg">Le password che hai digitato non sono uguali!<br />Oppure sono vuote!</span>';
$PALANG['pAdminCreate_admin_button'] = 'Aggiungi amministratore';
$PALANG['pAdminCreate_admin_result_error'] = '<span class="error_msg">Impossibile aggiungere amministratore!</span>';
$PALANG['pAdminCreate_admin_result_success'] = 'L\'amministratore è stato aggiunto!';
@@ -289,7 +290,7 @@
$PALANG['pAdminEdit_admin_password2'] = 'Password (ancora)';
$PALANG['pAdminEdit_admin_password_text_error'] = '<span class="error_msg">Le password che hai fornito non sono uguali!<br />Oppure sono vuote!</span>';
$PALANG['pAdminEdit_admin_active'] = 'Attivo';
-$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX
+$PALANG['pAdminEdit_admin_super_admin'] = 'Superutente';
$PALANG['pAdminEdit_admin_button'] = 'Modifica amministratore';
$PALANG['pAdminEdit_admin_result_error'] = '<span class="error_msg">Impossibile modificare amministratore!</span>';
$PALANG['pAdminEdit_admin_result_success'] = 'L\'amministratore è stato modificato!';
@@ -305,89 +306,89 @@
$PALANG['pUsersMenu_edit_alias'] = 'Cambia il tuo inoltro';
$PALANG['pUsersMenu_password'] = 'Cambia password';
-$PALANG['pUsersMain_vacation'] = 'Setta un messaggio di "Fuori ufficio" o un risponditore automatico per la tua email';
-$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX
+$PALANG['pUsersMain_vacation'] = 'Setta un messaggio di "Fuori ufficio" o un autoresponditore per la tua posta';
+$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' è attivo, fai clic su \'' . $PALANG['pUsersMenu_vacation'] . '\' per ' . $PALANG['edit'] . '/rimuovere';
$PALANG['pUsersMain_edit_alias'] = 'Cambia le impostazioni di inoltro della tua email.';
$PALANG['pUsersMain_password'] = 'Cambia la tua password corrente.';
-$PALANG['pUsersVacation_welcome'] = 'Risposta automatica.';
-$PALANG['pUsersVacation_welcome_text'] = 'Hai gi$agrave; una risposta automatica configurata';
+$PALANG['pUsersVacation_welcome'] = 'Autoresponditore.';
+$PALANG['pUsersVacation_welcome_text'] = 'Hai gi$agrave; un autoresponditore configurato';
$PALANG['pUsersVacation_subject'] = 'Soggetto';
-$PALANG['pUsersVacation_subject_text'] = 'Fuori dall\'ufficio';
+$PALANG['pUsersVacation_subject_text'] = 'Assente dall\'ufficio';
$PALANG['pUsersVacation_body'] = 'Corpo';
$PALANG['pUsersVacation_body_text'] = <<<EOM
-Sarò via dal <data> al <data>.
+Sarò assente dal <data> al <data>.
Per problemi urgenti potete contattare <persona da contattare>.
EOM;
$PALANG['pUsersVacation_button_away'] = 'Imposta autorisponditore';
$PALANG['pUsersVacation_button_back'] = 'Rimuovi autorisponditore';
-$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Impossibile aggiornare i tuoi dettagli di away!</span>';
+$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Impossibile registrare i valori per l\'autorisponditore!</span>';
$PALANG['pUsersVacation_result_success'] = 'La tua risposta automatica è stata tolta!';
-$PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox'; # XXX
-$PALANG['pCreate_dbLog_createalias'] = 'create alias'; # XXX
-$PALANG['pDelete_dbLog_deletealias'] = 'delete alias'; # XXX
-$PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox'; # XXX
+$PALANG['pCreate_dbLog_createmailbox'] = 'crea casella';
+$PALANG['pCreate_dbLog_createalias'] = 'crea alias';
+$PALANG['pDelete_dbLog_deletealias'] = 'distruggi alias';
+$PALANG['pDelete_dbLog_deletemailbox'] = 'distruggi casella';
-$PALANG['pEdit_dbLog_editactive'] = 'change active state'; # XXX
-$PALANG['pEdit_dbLog_editalias'] = 'edit alias'; # XXX
-$PALANG['pEdit_dbLog_editmailbox'] = 'edit mailbox'; # XXX
+$PALANG['pEdit_dbLog_editactive'] = 'attiva o disattiva';
+$PALANG['pEdit_dbLog_editalias'] = 'modifica alias';
+$PALANG['pEdit_dbLog_editmailbox'] = 'modifica casella';
-$PALANG['pSearch'] = 'search'; # XXX
-$PALANG['pSearch_welcome'] = 'Searching for: '; # XXX
-$PALANG['pReturn_to'] = 'Return to'; # XXX
-$PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
-$PALANG['pBroadcast_from'] = 'From'; # XXX
-$PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_subject'] = 'Subject'; # XXX
-$PALANG['pBroadcast_message'] = 'Message'; # XXX
-$PALANG['pBroadcast_send'] = 'Send message'; # XXX
-$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
-$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
-$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
-$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
-$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
-$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
-$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
-$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
-$PALANG['pFetchmail_field_id'] = 'ID'; # XXX
-$PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX
-$PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX
-$PALANG['pFetchmail_field_src_auth'] = 'Auth Type'; # XXX
-$PALANG['pFetchmail_field_src_user'] = 'User'; # XXX
-$PALANG['pFetchmail_field_src_password'] = 'Password'; # XXX
-$PALANG['pFetchmail_field_src_folder'] = 'Folder'; # XXX
-$PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX
-$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
-$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
-$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
-$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
-$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
-$PALANG['pFetchmail_field_returned_text'] = 'Returned Text'; # XXX
-$PALANG['pFetchmail_desc_id'] = 'Record ID'; # XXX
-$PALANG['pFetchmail_desc_mailbox'] = 'Local mailbox'; # XXX
-$PALANG['pFetchmail_desc_src_server'] = 'Remote Server'; # XXX
-$PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here # XXX
-$PALANG['pFetchmail_desc_src_user'] = 'Remote User'; # XXX
-$PALANG['pFetchmail_desc_src_password'] = 'Remote Password'; # XXX
-$PALANG['pFetchmail_desc_src_folder'] = 'Remote Folder'; # XXX
-$PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX
-$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX
-$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX
-$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX
-$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
-$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
-$PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX
+$PALANG['pSearch'] = 'cerca';
+$PALANG['pSearch_welcome'] = 'Stiamo cercando: ';
+$PALANG['pReturn_to'] = 'Ritorna a';
+$PALANG['pBroadcast_title'] = 'Invio di gruppo';
+$PALANG['pBroadcast_from'] = 'Da';
+$PALANG['pBroadcast_name'] = 'Il tuo nome';
+$PALANG['pBroadcast_subject'] = 'Oggetto';
+$PALANG['pBroadcast_message'] = 'Messaggio';
+$PALANG['pBroadcast_send'] = 'Invia';
+$PALANG['pBroadcast_success'] = 'Il tuo messaggio è stato inoltrato a tutto il gruppo.';
+$PALANG['pAdminMenu_broadcast_message'] = 'Invio di gruppo';
+$PALANG['pBroadcast_error_empty'] = 'Nome, oggetto e testo del messaggio non possono restare vuoti!';
+$PALANG['pStatus_undeliverable'] = 'presumibilmente NON CONSEGNABILE ';
+$PALANG['pStatus_custom'] = 'In consegna a ';
+$PALANG['pStatus_popimap'] = 'POP/IMAP ';
+$PALANG['pPasswordTooShort'] = "Password troppo breve - minimo %s caratteri";
+$PALANG['pFetchmail_welcome'] = 'Ricevi posta per:';
+$PALANG['pFetchmail_new_entry'] = 'Nuova voce';
+$PALANG['pFetchmail_database_save_error'] = 'Impossibile registrare nel database!';
+$PALANG['pFetchmail_database_save_success'] = 'Registrato nel database.';
+$PALANG['pFetchmail_error_invalid_id'] = 'Impossibile trovare i dati per l\'ID %s!';
+$PALANG['pFetchmail_invalid_mailbox'] = 'Casella non valida!';
+$PALANG['pFetchmail_server_missing'] = 'Digita il nome del server remoto!';
+$PALANG['pFetchmail_user_missing'] = 'Digita il nome dell\'utente remoto!';
+$PALANG['pFetchmail_password_missing'] = 'Digita la password per il server remoto!';
+$PALANG['pFetchmail_field_id'] = 'ID';
+$PALANG['pFetchmail_field_mailbox'] = 'Casella';
+$PALANG['pFetchmail_field_src_server'] = 'Server';
+$PALANG['pFetchmail_field_src_auth'] = 'Autenticazione';
+$PALANG['pFetchmail_field_src_user'] = 'Utente';
+$PALANG['pFetchmail_field_src_password'] = 'Password';
+$PALANG['pFetchmail_field_src_folder'] = 'Cartella';
+$PALANG['pFetchmail_field_poll_time'] = 'Scansione';
+$PALANG['pFetchmail_field_fetchall'] = 'Ricevi tutto';
+$PALANG['pFetchmail_field_keep'] = 'Conserva';
+$PALANG['pFetchmail_field_protocol'] = 'Protocollo';
+$PALANG['pFetchmail_field_extra_options'] = 'Extra';
+$PALANG['pFetchmail_field_mda'] = 'MDA';
+$PALANG['pFetchmail_field_date'] = 'Data';
+$PALANG['pFetchmail_field_returned_text'] = 'Risultato ottenuto';
+$PALANG['pFetchmail_desc_id'] = 'Record ID';
+$PALANG['pFetchmail_desc_mailbox'] = 'Casella locale';
+$PALANG['pFetchmail_desc_src_server'] = 'Server remoto';
+$PALANG['pFetchmail_desc_src_auth'] = 'Sostanzialmente \'password\''; # Translators: Please do NOT translate 'password' here
+$PALANG['pFetchmail_desc_src_user'] = 'Utente remoto';
+$PALANG['pFetchmail_desc_src_password'] = 'Pasword remota';
+$PALANG['pFetchmail_desc_src_folder'] = 'Casella remota';
+$PALANG['pFetchmail_desc_poll_time'] = 'Recupera ogni ... minuti';
+$PALANG['pFetchmail_desc_fetchall'] = 'Recupera anche i messaggi già letti';
+$PALANG['pFetchmail_desc_keep'] = 'Conserva una copia del messaggi sul server remoto';
+$PALANG['pFetchmail_desc_protocol'] = 'Protocollo da usare';
+$PALANG['pFetchmail_desc_extra_options'] = 'Opzioni extra';
+$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent';
+$PALANG['pFetchmail_desc_date'] = 'Data dell\'ultima modifica o attività';
+$PALANG['pFetchmail_desc_returned_text'] = 'Risultato dell\'ultima attività';
$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...> - 2007-11-25 00:35:10
|
Revision: 240
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=240&view=rev
Author: GingerDog
Date: 2007-11-24 16:35:13 -0800 (Sat, 24 Nov 2007)
Log Message:
-----------
list-virtual.php: fix ticket 1837766
Modified Paths:
--------------
trunk/list-virtual.php
Modified: trunk/list-virtual.php
===================================================================
--- trunk/list-virtual.php 2007-11-21 00:12:37 UTC (rev 239)
+++ trunk/list-virtual.php 2007-11-25 00:35:13 UTC (rev 240)
@@ -33,6 +33,8 @@
authentication_require_role('admin');
+$SESSID_USERNAME = authentication_get_username();
+
if (authentication_has_role('global-admin')) {
$list_domains = list_domains ();
$is_superadmin = 1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-21 00:12:36
|
Revision: 239
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=239&view=rev
Author: christian_boltz
Date: 2007-11-20 16:12:37 -0800 (Tue, 20 Nov 2007)
Log Message:
-----------
fr.lang
- updated by Francois Grange (rumbaya @sf) - thanks!
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1835209&group_id=191583
Modified Paths:
--------------
trunk/languages/fr.lang
Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang 2007-11-19 00:51:20 UTC (rev 238)
+++ trunk/languages/fr.lang 2007-11-21 00:12:37 UTC (rev 239)
@@ -12,12 +12,12 @@
$PALANG['edit'] = 'Modifier';
$PALANG['del'] = 'Effacer';
$PALANG['exit'] = 'Quitter';
-$PALANG['cancel'] = 'Cancel'; # XXX
-$PALANG['save'] = 'Save'; # XXX
+$PALANG['cancel'] = 'Annuler';
+$PALANG['save'] = 'Enregistrer';
$PALANG['confirm'] = 'Etes vous sur de vouloir supprimer cet enregistrement\n';
$PALANG['confirm_domain'] = 'Etes-vous sur de vouloir effacer tous les enregistrements dans ce domaine ? Cette opération ne pourra pas être annulée.\n';
$PALANG['check_update'] = 'Vérifiez les mises à jour';
-$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
+$PALANG['invalid_parameter'] = 'Paramètres invalides!';
$PALANG['pFooter_logged_as'] = 'Bonjour %s';
$PALANG['pLogin_welcome'] = 'Entrez votre adresse courriel pour administrer votre domaine.';
@@ -64,7 +64,7 @@
$PALANG['pOverview_alias_modified'] = 'Dernière Modification';
$PALANG['pOverview_alias_active'] = 'Activé';
$PALANG['pOverview_alias_edit'] = 'Alias';
-$PALANG['and_x_more'] = '[and %s more...]'; # XXX
+$PALANG['and_x_more'] = '[et %s en plus...]';
$PALANG['pOverview_mailbox_username'] = 'courriel';
$PALANG['pOverview_mailbox_name'] = 'Nom';
$PALANG['pOverview_mailbox_quota'] = 'Limite (MB)';
@@ -80,7 +80,7 @@
$PALANG['pOverview_get_modified'] = 'Dernière Modification';
$PALANG['pDelete_delete_error'] = '<span class="error_msg">Impossible d\'effacer cette entrée ';
-$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX
+$PALANG['pDelete_delete_success'] = '%s supprimé.';
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Impossible d\'effacer ce compte courriel';
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Ce domaine n\'est pas le votre ';
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Impossible d\'effacer cet alias ';
@@ -353,43 +353,43 @@
$PALANG['pPasswordTooShort'] = "Mot de passe trop court. - %s caractères minimum";
$PALANG['pFetchmail_welcome'] = 'Récupérer le courrier pour :';
$PALANG['pFetchmail_new_entry'] = 'Nouvelle entrée';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Impossible d\'enregistrer cette entrée dans la base!';
+$PALANG['pFetchmail_database_save_success'] = 'Entrée enregistrée dans la base.';
+$PALANG['pFetchmail_error_invalid_id'] = 'Aucune entrée trouvée avec l\'ID %s!';
+$PALANG['pFetchmail_invalid_mailbox'] = 'Compte courriel incorrect!';
+$PALANG['pFetchmail_server_missing'] = 'Merci d\'entrer le nom du serveur distant!';
+$PALANG['pFetchmail_user_missing'] = 'Merci d\'entrer le nom de l\'utilisateur distant!';
+$PALANG['pFetchmail_password_missing'] = 'Merci d\'entrer le mot de passe distant!';
$PALANG['pFetchmail_field_id'] = 'ID'; # XXX
-$PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX
-$PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX
-$PALANG['pFetchmail_field_src_auth'] = 'Auth Type'; # XXX
-$PALANG['pFetchmail_field_src_user'] = 'User'; # XXX
-$PALANG['pFetchmail_field_src_password'] = 'Password'; # XXX
-$PALANG['pFetchmail_field_src_folder'] = 'Folder'; # XXX
-$PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX
-$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
-$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
-$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
+$PALANG['pFetchmail_field_mailbox'] = 'Compte courriel';
+$PALANG['pFetchmail_field_src_server'] = 'Serveur';
+$PALANG['pFetchmail_field_src_auth'] = 'Type Auth';
+$PALANG['pFetchmail_field_src_user'] = 'Utilisateur';
+$PALANG['pFetchmail_field_src_password'] = 'Mot de passe';
+$PALANG['pFetchmail_field_src_folder'] = 'Dossier';
+$PALANG['pFetchmail_field_poll_time'] = 'Fréquence';
+$PALANG['pFetchmail_field_fetchall'] = 'Tout récupérer';
+$PALANG['pFetchmail_field_keep'] = 'Conserver';
+$PALANG['pFetchmail_field_protocol'] = 'Protocole';
+$PALANG['pFetchmail_field_extra_options'] = 'Options supplémentaires';
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
-$PALANG['pFetchmail_field_returned_text'] = 'Returned Text'; # XXX
-$PALANG['pFetchmail_desc_id'] = 'Record ID'; # XXX
-$PALANG['pFetchmail_desc_mailbox'] = 'Local mailbox'; # XXX
-$PALANG['pFetchmail_desc_src_server'] = 'Remote Server'; # XXX
-$PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here # XXX
-$PALANG['pFetchmail_desc_src_user'] = 'Remote User'; # XXX
-$PALANG['pFetchmail_desc_src_password'] = 'Remote Password'; # XXX
-$PALANG['pFetchmail_desc_src_folder'] = 'Remote Folder'; # XXX
-$PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX
-$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX
-$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX
-$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX
+$PALANG['pFetchmail_field_returned_text'] = 'Message retour';
+$PALANG['pFetchmail_desc_id'] = 'Identifiant';
+$PALANG['pFetchmail_desc_mailbox'] = 'Compte courriel local';
+$PALANG['pFetchmail_desc_src_server'] = 'Serveur distant';
+$PALANG['pFetchmail_desc_src_auth'] = 'Surtout \'password\''; # Translators: Please do NOT translate 'password' here
+$PALANG['pFetchmail_desc_src_user'] = 'Utilisateur distant';
+$PALANG['pFetchmail_desc_src_password'] = 'Mot de passe distant';
+$PALANG['pFetchmail_desc_src_folder'] = 'Dossier distant';
+$PALANG['pFetchmail_desc_poll_time'] = 'Vérifier toutes les ... minutes';
+$PALANG['pFetchmail_desc_fetchall'] = 'Récupérer tous les messages, nouveaux et déjà lus';
+$PALANG['pFetchmail_desc_keep'] = 'Conserver une copie des messages sur le serveur';
+$PALANG['pFetchmail_desc_protocol'] = 'Protocole à utiliser';
+$PALANG['pFetchmail_desc_extra_options'] = 'Options supplémentaires de Fetchmail';
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
-$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
-$PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX
+$PALANG['pFetchmail_desc_date'] = 'Date dernière vérification/changement configuration';
+$PALANG['pFetchmail_desc_returned_text'] = 'Message dernière vérification';
$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...> - 2007-11-19 00:51:15
|
Revision: 238
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=238&view=rev
Author: christian_boltz
Date: 2007-11-18 16:51:20 -0800 (Sun, 18 Nov 2007)
Log Message:
-----------
UPGRADE.txt:
- removed references to TABLE_CHANGES.txt and TABLE_BACKUP_MX.txt
- added reference to setup.php (superadmin creation) and upgrade.php
- made the "change permissions" section easier
- swapped "configure" and "database update" sections
- added "delete setup.php"
- several small changes
TABLE_CHANGES.txt, TABLE_BACKUP_MX.txt:
- obsoleted by upgrade.php - DELETED
Modified Paths:
--------------
trunk/DOCUMENTS/UPGRADE.txt
Removed Paths:
-------------
trunk/DOCUMENTS/TABLE_BACKUP_MX.txt
trunk/DOCUMENTS/TABLE_CHANGES.txt
Deleted: trunk/DOCUMENTS/TABLE_BACKUP_MX.txt
===================================================================
--- trunk/DOCUMENTS/TABLE_BACKUP_MX.txt 2007-11-18 22:12:41 UTC (rev 237)
+++ trunk/DOCUMENTS/TABLE_BACKUP_MX.txt 2007-11-19 00:51:20 UTC (rev 238)
@@ -1,19 +0,0 @@
-#
-# Postfix Admin
-# by Mischa Peters <mischa at high5 dot net>
-# Copyright (c) 2002 - 2005 High5!
-# Licensed under GPL for more info check GPL-LICENSE.TXT
-#
-
-# mysql -u root [-p] < DOCUMENTS/TABLE_BACKUP_MX.TXT
-
-#
-# Table structure for table domain_admins
-#
-USE postfix;
-
-#
-# Modify table structure for table domain
-#
-ALTER TABLE domain ADD transport VARCHAR(255) AFTER maxquota;
-ALTER TABLE domain ADD backupmx TINYINT(1) DEFAULT '0' NOT NULL AFTER transport;
Deleted: trunk/DOCUMENTS/TABLE_CHANGES.txt
===================================================================
--- trunk/DOCUMENTS/TABLE_CHANGES.txt 2007-11-18 22:12:41 UTC (rev 237)
+++ trunk/DOCUMENTS/TABLE_CHANGES.txt 2007-11-19 00:51:20 UTC (rev 238)
@@ -1,104 +0,0 @@
-#
-# Postfix Admin
-# by Mischa Peters <mischa at high5 dot net>
-# Copyright (c) 2002 - 2005 High5!
-# Licensed under GPL for more info check GPL-LICENSE.TXT
-#
-
-# mysql -u root [-p] < TABLE_CHANGES.TXT
-
-#
-# Table structure for table domain_admins
-#
-USE postfix;
-CREATE TABLE IF NOT EXISTS 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 IF NOT EXISTS 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 vacation
-#
-CREATE TABLE IF NOT EXISTS 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(1) NOT NULL default '1',
- PRIMARY KEY (email),
- KEY email (email)
-) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Vacation';
-
-#
-# Modify table structure for table admin
-#
-ALTER TABLE admin CHANGE create_date created DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
-ALTER TABLE admin CHANGE change_date modified DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
-ALTER TABLE admin ADD INDEX (username);
-
-#
-# Modify table structure for table alias
-#
-ALTER TABLE alias CHANGE create_date created DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
-ALTER TABLE alias CHANGE change_date modified DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
-ALTER TABLE alias ADD INDEX (address);
-
-#
-# Modify table structure for table domain
-#
-ALTER TABLE domain CHANGE create_date created DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
-ALTER TABLE domain CHANGE change_date modified DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
-ALTER TABLE domain ADD aliases INT(10) DEFAULT '-1' NOT NULL AFTER description;
-ALTER TABLE domain ADD mailboxes INT(10) DEFAULT '-1' NOT NULL AFTER aliases;
-ALTER TABLE domain ADD maxquota INT(10) DEFAULT '-1' NOT NULL AFTER mailboxes;
-ALTER TABLE domain ADD transport VARCHAR(255) AFTER maxquota;
-ALTER TABLE domain ADD backupmx TINYINT(1) DEFAULT '0' NOT NULL AFTER transport;
-ALTER TABLE domain ADD INDEX (domain);
-
-#
-# Modify table structure for table mailbox
-#
-ALTER TABLE mailbox CHANGE create_date created DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
-ALTER TABLE mailbox CHANGE change_date modified DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL;
-ALTER TABLE mailbox ADD quota INT(10) DEFAULT '-1' NOT NULL AFTER maildir;
-ALTER TABLE mailbox ADD INDEX (username);
-
-#
-# Modify table structure for table vacation
-#
-ALTER TABLE vacation ADD domain VARCHAR(255) DEFAULT '' NOT NULL AFTER cache;
-ALTER TABLE vacation ADD created DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL AFTER domain;
-ALTER TABLE vacation ADD active TINYINT(1) DEFAULT '1' NOT NULL AFTER created;
-ALTER TABLE vacation DROP PRIMARY KEY, ADD PRIMARY KEY(email);
-
-#
-# Dumping data for table domain_admins
-#
-INSERT INTO domain_admins (username,domain,created) SELECT admin.username,admin.domain,domain.created FROM admin LEFT JOIN domain ON domain.domain=admin.domain;
-
-#
-# Modify data for table vacation
-#
-UPDATE vacation SET domain=SUBSTRING_INDEX(email, '@', -1) WHERE email=email;
-
-#
-# Modify table structure for table domain
-#
-ALTER TABLE admin DROP domain;
Modified: trunk/DOCUMENTS/UPGRADE.txt
===================================================================
--- trunk/DOCUMENTS/UPGRADE.txt 2007-11-18 22:12:41 UTC (rev 237)
+++ trunk/DOCUMENTS/UPGRADE.txt 2007-11-19 00:51:20 UTC (rev 238)
@@ -16,19 +16,16 @@
READ THIS FIRST!
----------------
-Note: !!This document describes upgrading from v1.5x to 2.0. Only
-items 3 and 5 apply to general PostfixAdmin installs!! See SVN.TXT
-for how to update versions 2.1.0 and higher.
+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!!
-When you are upgrading from Postfix Admin 1.5x (or older), make sure you
-backup your database before you run the DOCUMENTS/TABLE_CHANGES.TXT on your database.
+When upgrading Postfix Admin, make sure you backup your database before
+running upgrade.php.
-When you are upgrading from Postfix Admin 2.0.x, please read the DOCUMENTS/BACKUP_MX.TXT.
-
1. Backup the Database
----------------------
When you install from a previous version make sure you backup your database
@@ -43,42 +40,48 @@
Make sure that you are in your WWW directory and then unarchive the
Postfix Admin archive (whatever the filename is):
- $ tar -zxvf postfixadmin-2.0.0.tgz
+ $ tar -zxvf postfixadmin-2.2.tgz
3. Change permissions
----------------------
-Since the database password is stored in the config.inc.php it's a good idea
+Since the database password is stored in the config.inc.php it's a good idea
to have change the permissions for Postfix Admin.
- $ cd /usr/local/www/postfixadmin-2.0.0
- $ chmod 640 *.php *.css
- $ cd /usr/local/www/postfixadmin-2.0.0/admin/
- $ chmod 640 *.php .ht*
- $ cd /usr/local/www/postfixadmin-2.0.0/images/
- $ chmod 640 *.gif *.png
- $ cd /usr/local/www/postfixadmin-2.0.0/languages/
- $ chmod 640 *.lang
- $ cd /usr/local/www/postfixadmin-2.0.0/templates/
- $ chmod 640 *.tpl
- $ cd /usr/local/www/postfixadmin-2.0.0/users/
- $ chmod 640 *.php
-
+ $ cd /usr/local/www/postfixadmin
+ $ find -type f -print0 | xargs -0 chmod 640
+ $ find -type f -print0 | xargs -0 chown root:www
-4. Modify the MySQL Tables
---------------------------
-In TABLE_CHANGES.TXT or TABLE_BACKUP_MX.TXT you can find the table structure that you need in order
-to configure Postfix Admin 2.0.0 and Postfix in general to work with Virtual
-Domains and Users. You can find these in DOCUMENTS/
+(the last command assumes your Apache is running with group "www")
-5. Configure
+4. Configure
------------
Check the config.inc.php file. There you can specify settings that are
relevant to your setup.
+Comparing config.inc.php with your previous using "diff" might save you some
+time.
-6. Done
+
+5. Modify the MySQL Tables
+--------------------------
+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
+account.
+
+Note that admin/ has been merged into the main directory. Login with the
+superadmin account to setup domains and domain admins.
+
+
+6. Delete setup.php
+-------------------
+Delete setup.php - it allown non-authorized users to create a superadmin
+account!
+
+
+7. Done
-------
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: <chr...@us...> - 2007-11-18 22:12:44
|
Revision: 237
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=237&view=rev
Author: christian_boltz
Date: 2007-11-18 14:12:41 -0800 (Sun, 18 Nov 2007)
Log Message:
-----------
*.lang:
- now that broadcast is in a submenu, there's no need to use "BC"
instead of "broadcast".
Changed in en.lang and all languages where it isn't translated yet.
Modified Paths:
--------------
trunk/languages/bg.lang
trunk/languages/ca.lang
trunk/languages/cn.lang
trunk/languages/en.lang
trunk/languages/es.lang
trunk/languages/et.lang
trunk/languages/eu.lang
trunk/languages/fi.lang
trunk/languages/fo.lang
trunk/languages/hr.lang
trunk/languages/hu.lang
trunk/languages/is.lang
trunk/languages/it.lang
trunk/languages/lt.lang
trunk/languages/mk.lang
trunk/languages/nl.lang
trunk/languages/nn.lang
trunk/languages/pl.lang
trunk/languages/pt-br.lang
trunk/languages/sk.lang
trunk/languages/sl.lang
trunk/languages/sv.lang
trunk/languages/tr.lang
trunk/languages/tw.lang
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/bg.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -343,7 +343,7 @@
$PALANG['pBroadcast_message'] = 'Message'; # XXX
$PALANG['pBroadcast_send'] = 'Send message'; # XXX
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/ca.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -343,7 +343,7 @@
$PALANG['pBroadcast_message'] = 'Message'; # XXX
$PALANG['pBroadcast_send'] = 'Send message'; # XXX
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/cn.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -343,7 +343,7 @@
$PALANG['pBroadcast_message'] = 'Message'; # XXX
$PALANG['pBroadcast_send'] = 'Send message'; # XXX
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/en.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -352,7 +352,7 @@
$PALANG['pBroadcast_message'] = 'Message';
$PALANG['pBroadcast_send'] = 'Send message';
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.';
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message';
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message';
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !';
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE ';
Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/es.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -344,7 +344,7 @@
$PALANG['pBroadcast_message'] = 'Message'; # XXX
$PALANG['pBroadcast_send'] = 'Send message'; # XXX
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/et.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -346,7 +346,7 @@
$PALANG['pBroadcast_message'] = 'Message'; # XXX
$PALANG['pBroadcast_send'] = 'Send message'; # XXX
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/eu.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -342,7 +342,7 @@
$PALANG['pBroadcast_message'] = 'Message'; # XXX
$PALANG['pBroadcast_send'] = 'Send message'; # XXX
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/fi.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -345,7 +345,7 @@
$PALANG['pBroadcast_message'] = 'Message'; # XXX
$PALANG['pBroadcast_send'] = 'Send message'; # XXX
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/fo.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -348,7 +348,7 @@
$PALANG['pBroadcast_message'] = 'Message'; # XXX
$PALANG['pBroadcast_send'] = 'Send message'; # XXX
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/hr.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -341,7 +341,7 @@
$PALANG['pBroadcast_message'] = 'Message'; # XXX
$PALANG['pBroadcast_send'] = 'Send message'; # XXX
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/hu.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -353,7 +353,7 @@
$PALANG['pBroadcast_message'] = 'Üzenet';
$PALANG['pBroadcast_send'] = 'Üzenet küldése';
$PALANG['pBroadcast_success'] = 'Broadcast üzeneted elküldve.';
-$PALANG['pAdminMenu_broadcast_message'] = 'BC üzenet';
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast üzenet'; # XXX partly translated
$PALANG['pBroadcast_error_empty'] = 'A név, téma és üzenet mezők nem lehetnek üresek !';
$PALANG['pStatus_undeliverable'] = 'lehet hogy nem kézbesíthető ';
Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/is.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -342,7 +342,7 @@
$PALANG['pBroadcast_message'] = 'Message'; # XXX
$PALANG['pBroadcast_send'] = 'Send message'; # XXX
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/it.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -343,7 +343,7 @@
$PALANG['pBroadcast_message'] = 'Message'; # XXX
$PALANG['pBroadcast_send'] = 'Send message'; # XXX
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/lt.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -343,7 +343,7 @@
$PALANG['pBroadcast_message'] = 'Message'; # XXX
$PALANG['pBroadcast_send'] = 'Send message'; # XXX
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/mk.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -344,7 +344,7 @@
$PALANG['pBroadcast_message'] = 'Message'; # XXX
$PALANG['pBroadcast_send'] = 'Send message'; # XXX
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/nl.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -344,7 +344,7 @@
$PALANG['pBroadcast_message'] = 'Bericht';
$PALANG['pBroadcast_send'] = 'Verzend bericht';
$PALANG['pBroadcast_success'] = 'Uw broadcast bericht is verzonden.';
-$PALANG['pAdminMenu_broadcast_message'] = 'BC bericht';
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast bericht'; # XXX partly translated
$PALANG['pBroadcast_error_empty'] = 'De velden Naam, Onderwerp en Bericht mogen niet leeg zijn !';
$PALANG['pStatus_undeliverable'] = 'Misschien niet af te leveren ';
$PALANG['pStatus_custom'] = 'Bezorgen op ';
Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/nn.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -339,7 +339,7 @@
$PALANG['pBroadcast_message'] = 'Message'; # XXX
$PALANG['pBroadcast_send'] = 'Send message'; # XXX
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/pl.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -346,7 +346,7 @@
$PALANG['pBroadcast_message'] = 'Message'; # XXX
$PALANG['pBroadcast_send'] = 'Send message'; # XXX
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/pt-br.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -343,7 +343,7 @@
$PALANG['pBroadcast_message'] = 'Message'; # XXX
$PALANG['pBroadcast_send'] = 'Send message'; # XXX
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/sk.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -343,7 +343,7 @@
$PALANG['pBroadcast_message'] = 'Message'; # XXX
$PALANG['pBroadcast_send'] = 'Send message'; # XXX
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/sl.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -343,7 +343,7 @@
$PALANG['pBroadcast_message'] = 'Message'; # XXX
$PALANG['pBroadcast_send'] = 'Send message'; # XXX
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/sv.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -345,7 +345,7 @@
$PALANG['pBroadcast_message'] = 'Meddelande';
$PALANG['pBroadcast_send'] = 'Skicka';
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/tr.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -343,7 +343,7 @@
$PALANG['pBroadcast_message'] = 'Message'; # XXX
$PALANG['pBroadcast_send'] = 'Send message'; # XXX
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang 2007-11-18 21:46:20 UTC (rev 236)
+++ trunk/languages/tw.lang 2007-11-18 22:12:41 UTC (rev 237)
@@ -343,7 +343,7 @@
$PALANG['pBroadcast_message'] = 'Message'; # XXX
$PALANG['pBroadcast_send'] = 'Send message'; # XXX
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-18 21:46:18
|
Revision: 236
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=236&view=rev
Author: christian_boltz
Date: 2007-11-18 13:46:20 -0800 (Sun, 18 Nov 2007)
Log Message:
-----------
broadcast-message.php:
- exit if $CONF['sendmail'] != 'YES'
Modified Paths:
--------------
trunk/broadcast-message.php
Modified: trunk/broadcast-message.php
===================================================================
--- trunk/broadcast-message.php 2007-11-18 21:45:34 UTC (rev 235)
+++ trunk/broadcast-message.php 2007-11-18 21:46:20 UTC (rev 236)
@@ -30,6 +30,11 @@
authentication_require_role('global-admin');
+if ($CONF['sendmail'] != 'YES') {
+ header("Location: " . $CONF['postfix_admin_url'] . "/main.php");
+ exit;
+}
+
$SESSID_USERNAME = authentication_get_username();
if ($_SERVER['REQUEST_METHOD'] == "POST")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-18 21:45:31
|
Revision: 235
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=235&view=rev
Author: christian_boltz
Date: 2007-11-18 13:45:34 -0800 (Sun, 18 Nov 2007)
Log Message:
-----------
menu.tpl:
- make broadcast a submenu of send "Send Email"
Thanks to Jan ?\195?\150rnstedt (ornstedt @sf) for the suggestion
Modified Paths:
--------------
trunk/templates/menu.tpl
Modified: trunk/templates/menu.tpl
===================================================================
--- trunk/templates/menu.tpl 2007-11-18 21:43:10 UTC (rev 234)
+++ trunk/templates/menu.tpl 2007-11-18 21:45:34 UTC (rev 235)
@@ -22,11 +22,12 @@
if (authentication_has_role('global-admin')) {
$submenu_domain = _menulink("create-domain.php", $PALANG['pAdminMenu_create_domain']);
+ $submenu_sendmail = _menulink("broadcast-message.php", $PALANG['pAdminMenu_broadcast_message']);
} else {
$submenu_domain = "";
+ $submenu_sendmail = "";
}
-
if (authentication_has_role('global-admin')) {
print _menulink("list-admin.php", $PALANG['pAdminMenu_list_admin'], $submenu_admin);
} else {
@@ -41,7 +42,7 @@
}
if ($CONF['sendmail'] == 'YES') {
- print _menulink("sendmail.php", $PALANG['pMenu_sendmail']);
+ print _menulink("sendmail.php", $PALANG['pMenu_sendmail'], $submenu_sendmail);
}
# not really useful in the admin menu
@@ -49,10 +50,6 @@
# print _menulink("edit-vacation.php", $PALANG['pUsersMenu_vacation']);
#}
-if (authentication_has_role('global-admin')) {
- print _menulink("broadcast-message.php", $PALANG['pAdminMenu_broadcast_message']);
-}
-
print _menulink("password.php", $PALANG['pMenu_password']);
if (authentication_has_role('global-admin') && 'pgsql'!=$CONF['database_type'] && $CONF['backup'] == 'YES') {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-18 21:43:21
|
Revision: 234
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=234&view=rev
Author: christian_boltz
Date: 2007-11-18 13:43:10 -0800 (Sun, 18 Nov 2007)
Log Message:
-----------
config.inc.php:
- listed "md5" for $CONF['encrypt']
Modified Paths:
--------------
trunk/config.inc.php
Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php 2007-11-18 19:27:46 UTC (rev 233)
+++ trunk/config.inc.php 2007-11-18 21:43:10 UTC (rev 234)
@@ -80,6 +80,7 @@
// Encrypt
// In what way do you want the passwords to be crypted?
// md5crypt = internal postfix admin md5
+// md5 = md5 sum of the password
// system = whatever you have set as your PHP system default
// cleartext = clear text passwords (ouch!)
$CONF['encrypt'] = 'md5crypt';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-18 19:27:44
|
Revision: 233
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=233&view=rev
Author: christian_boltz
Date: 2007-11-18 11:27:46 -0800 (Sun, 18 Nov 2007)
Log Message:
-----------
sv.lang:
- translation update by Jan ?\195?\150rnstedt (ornstedt) - thanks!
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1834023&group_id=191583
Modified Paths:
--------------
trunk/languages/sv.lang
Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang 2007-11-17 00:38:41 UTC (rev 232)
+++ trunk/languages/sv.lang 2007-11-18 19:27:46 UTC (rev 233)
@@ -4,20 +4,21 @@
// Language file Swedish
// by Stefan Jakobsson <stefan at katrinet dot se>
// updated by Bjorne <bjorne at gah dot se>
+// updated by Jan Örnstedt (ornstedt @sf)
//
$PALANG['YES'] = 'JA';
$PALANG['NO'] = 'NEJ';
-$PALANG['edit'] = 'editera';
+$PALANG['edit'] = 'ändra';
$PALANG['del'] = 'radera';
-$PALANG['exit'] = 'Exit'; # XXX
-$PALANG['cancel'] = 'Cancel'; # XXX
-$PALANG['save'] = 'Save'; # XXX
+$PALANG['exit'] = 'Avbryt';
+$PALANG['cancel'] = 'Avbryt';
+$PALANG['save'] = 'Spara';
$PALANG['confirm'] = 'Är du säker på att du vill radera denna?\n';
$PALANG['confirm_domain'] = 'Vill du verkligen radera all data för denna domän? Kan ej ångras!\n';
-$PALANG['check_update'] = 'Check for update';
-$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
-$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
+$PALANG['check_update'] = 'Senaste versionen?';
+$PALANG['invalid_parameter'] = 'Felaktig parameter!';
+$PALANG['pFooter_logged_as'] = 'Inloggad som %s';
$PALANG['pLogin_welcome'] = 'Mail administratörer loggar in här för att sköta er domän.';
$PALANG['pLogin_username'] = 'Login (epost)';
@@ -29,40 +30,40 @@
$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = 'Sammanfattning';
-$PALANG['pMenu_create_alias'] = 'Lägg till Alias';
-$PALANG['pMenu_create_mailbox'] = 'Lägg till mailadress';
+$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_sendmail'] = 'Skicka Mail';
+$PALANG['pMenu_sendmail'] = 'Skicka mail';
$PALANG['pMenu_password'] = 'Lösenord';
-$PALANG['pMenu_viewlog'] = 'Visa Logg';
+$PALANG['pMenu_viewlog'] = 'Visa logg';
$PALANG['pMenu_logout'] = 'Logga ut';
$PALANG['pMain_welcome'] = 'Välkommen till Postfix Admin!';
-$PALANG['pMain_overview'] = 'Lista dina alias och mailadresser. Du kan editera / radera dem här.';
+$PALANG['pMain_overview'] = 'Lista dina alias och brevlådan. Du kan ändra / radera dem här.';
$PALANG['pMain_create_alias'] = 'Skapa nytt alias i din domän.';
-$PALANG['pMain_create_mailbox'] = 'Skapa ny mailadress för din domän.';
+$PALANG['pMain_create_mailbox'] = 'Skapa nytt brevlåda i din domän.';
$PALANG['pMain_sendmail'] = 'Skicka ett mail till en av mailadresserna.';
$PALANG['pMain_password'] = 'Ändra lösenord för adminkontot.';
$PALANG['pMain_viewlog'] = 'Visa loggfiler.';
$PALANG['pMain_logout'] = 'Logga ut från systemet';
-$PALANG['pOverview_disabled'] = 'Disabled';
-$PALANG['pOverview_unlimited'] = 'Unlimited';
-$PALANG['pOverview_title'] = ':: Defined Domains';
-$PALANG['pOverview_up_arrow'] = 'Go Top';
-$PALANG['pOverview_right_arrow'] = 'Next Page';
-$PALANG['pOverview_left_arrow'] = 'Previous Page';
+$PALANG['pOverview_disabled'] = 'Avstängd';
+$PALANG['pOverview_unlimited'] = 'Obegränsat';
+$PALANG['pOverview_title'] = ':: Defined Domains'; # XXX
+$PALANG['pOverview_up_arrow'] = 'Tillbaka till början';
+$PALANG['pOverview_right_arrow'] = 'Nästa sida';
+$PALANG['pOverview_left_arrow'] = 'Föregående sida';
$PALANG['pOverview_alias_title'] = ':: Alias';
-$PALANG['pOverview_mailbox_title'] = ':: Mailboxes';
+$PALANG['pOverview_mailbox_title'] = ':: Brevlådor';
$PALANG['pOverview_button'] = 'Visa';
$PALANG['pOverview_welcome'] = 'Sammanfattning för ';
$PALANG['pOverview_alias_alias_count'] = 'Alias';
-$PALANG['pOverview_alias_mailbox_count'] = 'Mailadresser';
+$PALANG['pOverview_alias_mailbox_count'] = 'Brevlådor';
$PALANG['pOverview_alias_address'] = 'Från';
$PALANG['pOverview_alias_goto'] = 'Till';
$PALANG['pOverview_alias_modified'] = 'Senast Ändrad';
-$PALANG['pOverview_alias_active'] = 'Active'; # XXX
-$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
+$PALANG['pOverview_alias_active'] = 'Aktiv';
+$PALANG['pOverview_alias_edit'] = 'Alias';
$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'Epost';
$PALANG['pOverview_mailbox_name'] = 'Namn';
@@ -74,8 +75,8 @@
$PALANG['pOverview_get_domain'] = 'Domän';
$PALANG['pOverview_get_aliases'] = 'Alias';
-$PALANG['pOverview_get_mailboxes'] = 'Mailadresser';
-$PALANG['pOverview_get_quota'] = 'Mailbox Quota (MB)';
+$PALANG['pOverview_get_mailboxes'] = 'Brevlåda';
+$PALANG['pOverview_get_quota'] = 'Mailbox Quota (MB)'; # XXX
$PALANG['pOverview_get_modified'] = 'Senast Ändrad';
$PALANG['pDelete_delete_error'] = '<span class="error_msg">Kan inte radera data för ';
@@ -90,32 +91,32 @@
$PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">Denna epostadress existerar redan, välj en annan epostadress!</span>';
$PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">Du har redan högsta tillåtna antal alias definierade!</span>';
$PALANG['pCreate_alias_goto'] = 'Till';
-$PALANG['pCreate_alias_active'] = 'Active'; # XXX
-$PALANG['pCreate_alias_button'] = 'Lägg till Alias';
+$PALANG['pCreate_alias_active'] = 'Aktiv';
+$PALANG['pCreate_alias_button'] = 'Lägg till alias';
$PALANG['pCreate_alias_goto_text'] = 'Vart skall mailen skickas.';
$PALANG['pCreate_alias_goto_text_error'] = 'Vart mailen skall skickas.<br /><span class="error_msg">TILL data är felaktigt!</span>';
$PALANG['pCreate_alias_result_error'] = '<span class="error_msg">Kan inte lägga till detta alias i aliastabellen!</span>';
$PALANG['pCreate_alias_result_success'] = 'Aliaset har lagts till i aliastabellen!';
$PALANG['pCreate_alias_catchall_text'] = 'För att skapa en catch-all ange ett "*" som alias.<br />För domän till domän forwarding använd "*@domän.tld" som till.';
-$PALANG['pEdit_alias_welcome'] = 'Editera ett alias för din domän.<br />Ett alias per rad.';
+$PALANG['pEdit_alias_welcome'] = 'Ändra ett alias för din domän.<br />Ett alias per rad.';
$PALANG['pEdit_alias_address'] = 'Alias';
$PALANG['pEdit_alias_address_error'] = '<span class="error_msg">Kan inte hitta detta alias!</span>';
$PALANG['pEdit_alias_goto'] = 'Till';
-$PALANG['pEdit_alias_active'] = 'Active'; # XXX
+$PALANG['pEdit_alias_active'] = 'Aktiv';
$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.';
-$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.';
-$PALANG['pEdit_alias_button'] = 'Editera Alias';
+$PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
+$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
+$PALANG['pEdit_alias_button'] = 'Ändra alias';
$PALANG['pEdit_alias_result_error'] = '<span class="error_msg">Kan inte modifiera detta alias!</span>';
-$PALANG['pCreate_mailbox_welcome'] = 'Skapa en ny lokal mailadress för din domän.';
-$PALANG['pCreate_mailbox_username'] = 'Användarnamn';
+$PALANG['pCreate_mailbox_welcome'] = 'Skapa ett nytt lokalt brevlåda i din domän.';
+$PALANG['pCreate_mailbox_username'] = 'Epostadress';
$PALANG['pCreate_mailbox_username_text_error1'] = '<br /><span class="error_msg">EPOSTADRESSEN är inte korrekt!</span>';
$PALANG['pCreate_mailbox_username_text_error2'] = '<br /><span class="error_msg">Denna epostadress finns redan, ange en annan adress!</span>';
-$PALANG['pCreate_mailbox_username_text_error3'] = '<br /><span class="error_msg">Du har redan skapat max tillåtet antal mailadresser!</span>';
+$PALANG['pCreate_mailbox_username_text_error3'] = '<br /><span class="error_msg">Du har redan skapat max tillåtet antal brevlådan!</span>';
$PALANG['pCreate_mailbox_password'] = 'Lösenord';
$PALANG['pCreate_mailbox_password2'] = 'Lösenord (igen)';
$PALANG['pCreate_mailbox_password_text'] = 'Lösenord för POP3/IMAP';
@@ -126,25 +127,25 @@
$PALANG['pCreate_mailbox_quota_text'] = 'MB';
$PALANG['pCreate_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Quotan du angivit är för stor!</span>';
$PALANG['pCreate_mailbox_active'] = 'Aktiv';
-$PALANG['pCreate_mailbox_mail'] = 'Skapa mailadress';
-$PALANG['pCreate_mailbox_button'] = 'Lägg till mailadress';
-$PALANG['pCreate_mailbox_result_error'] = '<span class="error_msg">Kan ej lägga till mailadress i tabellen för adresser!</span>';
-$PALANG['pCreate_mailbox_result_success'] = 'Mailadressen har lagts till!';
+$PALANG['pCreate_mailbox_mail'] = 'Skicka välkomstbrev';
+$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['pEdit_mailbox_welcome'] = 'Editera en mailadress i din domän.';
-$PALANG['pEdit_mailbox_username'] = 'Användarnamn';
+$PALANG['pEdit_mailbox_welcome'] = 'Ändra ett brevlåda i din domän.';
+$PALANG['pEdit_mailbox_username'] = 'Epostadress';
$PALANG['pEdit_mailbox_username_error'] = '<span class="error_msg">Kan inte hitta den adressen!</span>';
$PALANG['pEdit_mailbox_password'] = 'Nytt Lösenord';
$PALANG['pEdit_mailbox_password2'] = 'Nytt Lösenord (igen)';
$PALANG['pEdit_mailbox_password_text_error'] = '<span class="error_msg">Lösenorden du angav är olika!</span>';
$PALANG['pEdit_mailbox_name'] = 'Namn';
-$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX
+$PALANG['pEdit_mailbox_name_text'] = 'Fullständigt namn';
$PALANG['pEdit_mailbox_quota'] = 'Quota';
$PALANG['pEdit_mailbox_quota_text'] = 'MB';
$PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Quotagränsen du angett är för stor!</span>';
$PALANG['pEdit_mailbox_domain_error'] = '<span class="error_msg">Detta är inte din domän: ';
-$PALANG['pEdit_mailbox_button'] = 'Editera Mailadress';
+$PALANG['pEdit_mailbox_button'] = 'Ändra brevlåda';
$PALANG['pEdit_mailbox_result_error'] = '<span class="error_msg">Kan inte ändra lösenordet!</span>';
$PALANG['pPassword_welcome'] = 'Ändra ditt lösenord.';
@@ -170,13 +171,13 @@
$PALANG['pViewlog_domain'] = 'Domän';
$PALANG['pViewlog_action'] = 'Åtgärd';
$PALANG['pViewlog_data'] = 'Data';
-$PALANG['pViewlog_action_create_mailbox'] = 'create mailbox'; # XXX
-$PALANG['pViewlog_action_delete_mailbox'] = 'delete mailbox'; # XXX
-$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX
+$PALANG['pViewlog_action_create_mailbox'] = 'skapa brevlåda';
+$PALANG['pViewlog_action_delete_mailbox'] = 'radera brevlåda';
+$PALANG['pViewlog_action_edit_mailbox'] = 'ändra brevlåda';
$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
-$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
-$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
-$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
+$PALANG['pViewlog_action_create_alias'] = 'skapa alias';
+$PALANG['pViewlog_action_delete_alias'] = 'radera alias';
+$PALANG['pViewlog_action_edit_alias'] = 'ändra alias';
$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
@@ -190,35 +191,35 @@
$PALANG['pSendmail_subject'] = 'Ämne';
$PALANG['pSendmail_subject_text'] = 'Välkommen';
$PALANG['pSendmail_body'] = 'Meddelande';
-$PALANG['pSendmail_button'] = 'Skicka meddelande';
-$PALANG['pSendmail_result_error'] = '<span class="error_msg">Kan inte skapa mailadress!</span>';
-$PALANG['pSendmail_result_success'] = 'Mailadressen har skapats!';
+$PALANG['pSendmail_button'] = 'Skicka';
+$PALANG['pSendmail_result_error'] = '<span class="error_msg">Kan inte skapa mail inkorg!</span>';
+$PALANG['pSendmail_result_success'] = 'Mail inkorg har skapats!';
-$PALANG['pAdminMenu_list_admin'] = 'Admin Lista';
-$PALANG['pAdminMenu_list_domain'] = 'Domän Lista';
-$PALANG['pAdminMenu_list_virtual'] = 'Virtuell Lista';
-$PALANG['pAdminMenu_viewlog'] = 'Visa Loggfil';
+$PALANG['pAdminMenu_list_admin'] = 'Administratörer';
+$PALANG['pAdminMenu_list_domain'] = 'Domäner';
+$PALANG['pAdminMenu_list_virtual'] = 'Epostadresser';
+$PALANG['pAdminMenu_viewlog'] = 'Visa loggfil';
$PALANG['pAdminMenu_backup'] = 'Backup';
-$PALANG['pAdminMenu_create_domain_admins'] = 'Domän Admins';
-$PALANG['pAdminMenu_create_admin'] = 'Ny Admin';
-$PALANG['pAdminMenu_create_domain'] = 'Ny Domän';
-$PALANG['pAdminMenu_create_alias'] = 'Lägg till Alias';
-$PALANG['pAdminMenu_create_mailbox'] = 'Lägg till Mailbox';
+$PALANG['pAdminMenu_create_domain_admins'] = 'Domän admins';
+$PALANG['pAdminMenu_create_admin'] = 'Ny admin';
+$PALANG['pAdminMenu_create_domain'] = 'Ny domän';
+$PALANG['pAdminMenu_create_alias'] = 'Lägg till alias';
+$PALANG['pAdminMenu_create_mailbox'] = 'Lägg till brevlåda';
$PALANG['pAdminList_admin_domain'] = 'Domän';
$PALANG['pAdminList_admin_username'] = 'Admin';
$PALANG['pAdminList_admin_count'] = 'Domäner';
-$PALANG['pAdminList_admin_modified'] = 'Senast Ändrad';
+$PALANG['pAdminList_admin_modified'] = 'Senast ändrad';
$PALANG['pAdminList_admin_active'] = 'Aktiv';
$PALANG['pAdminList_domain_domain'] = 'Domän';
$PALANG['pAdminList_domain_description'] = 'Beskrivning';
$PALANG['pAdminList_domain_aliases'] = 'Alias';
-$PALANG['pAdminList_domain_mailboxes'] = 'Mailboxar';
+$PALANG['pAdminList_domain_mailboxes'] = 'Brevlåda';
$PALANG['pAdminList_domain_maxquota'] = 'Max Quota (MB)';
$PALANG['pAdminList_domain_transport'] = 'Transport';
$PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
-$PALANG['pAdminList_domain_modified'] = 'Senast Modifierad';
+$PALANG['pAdminList_domain_modified'] = 'Senast modifierad';
$PALANG['pAdminList_domain_active'] = 'Aktiv';
$PALANG['pAdminList_virtual_button'] = 'Kör';
@@ -227,11 +228,11 @@
$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Mailboxar';
$PALANG['pAdminList_virtual_alias_address'] = 'Från';
$PALANG['pAdminList_virtual_alias_goto'] = 'Till';
-$PALANG['pAdminList_virtual_alias_modified'] = 'Senast Ändrad';
+$PALANG['pAdminList_virtual_alias_modified'] = 'Senast ändrad';
$PALANG['pAdminList_virtual_mailbox_username'] = 'Epostadress';
$PALANG['pAdminList_virtual_mailbox_name'] = 'Namn';
$PALANG['pAdminList_virtual_mailbox_quota'] = 'Quota (MB)';
-$PALANG['pAdminList_virtual_mailbox_modified'] = 'Senast Ändrad';
+$PALANG['pAdminList_virtual_mailbox_modified'] = 'Senast ändrad';
$PALANG['pAdminList_virtual_mailbox_active'] = 'Aktiv';
$PALANG['pAdminCreate_domain_welcome'] = 'Lägg till ny domän';
@@ -240,58 +241,58 @@
$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">The domain is invalid!</span>'; # XXX
$PALANG['pAdminCreate_domain_description'] = 'Beskrivning';
$PALANG['pAdminCreate_domain_aliases'] = 'Alias';
-$PALANG['pAdminCreate_domain_aliases_text'] = '0 = avaktivera | -1 = obegränsat';
-$PALANG['pAdminCreate_domain_mailboxes'] = 'Mailboxes';
-$PALANG['pAdminCreate_domain_mailboxes_text'] = '0 = avaktivera | -1 = obegränsat';
+$PALANG['pAdminCreate_domain_aliases_text'] = '-1 = avaktivera | 0 = obegränsat';
+$PALANG['pAdminCreate_domain_mailboxes'] = 'Brevlåda';
+$PALANG['pAdminCreate_domain_mailboxes_text'] = '-1 = avaktivera | 0 = obegränsat';
$PALANG['pAdminCreate_domain_maxquota'] = 'Max Quota';
-$PALANG['pAdminCreate_domain_maxquota_text'] = 'MB<br /> 0 = avaktivera | -1 = obegränsat';
-$PALANG['pAdminCreate_domain_transport'] = 'Transport';
-$PALANG['pAdminCreate_domain_transport_text'] = 'Define transport';
+$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_defaultaliases'] = 'Skapa standard alias';
$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX
-$PALANG['pAdminCreate_domain_backupmx'] = 'Mail server is backup MX';
+$PALANG['pAdminCreate_domain_backupmx'] = 'Mail server is backup MX'; # XXX
$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['pAdminEdit_domain_welcome'] = 'Editera en domän';
+$PALANG['pAdminEdit_domain_welcome'] = 'Ändra en domän';
$PALANG['pAdminEdit_domain_domain'] = 'Domän';
$PALANG['pAdminEdit_domain_description'] = 'Beskrivning';
$PALANG['pAdminEdit_domain_aliases'] = 'Alias';
-$PALANG['pAdminEdit_domain_aliases_text'] = '0 = avaktivera | -1 = obegränsat';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Mailboxes';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '0 = avaktivera | -1 = obegränsat';
+$PALANG['pAdminEdit_domain_aliases_text'] = '-1 = avaktivera | 0 = obegränsat';
+$PALANG['pAdminEdit_domain_mailboxes'] = 'Brevlåda';
+$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = avaktivera | 0 = obegränsat';
$PALANG['pAdminEdit_domain_maxquota'] = 'Max Quota';
-$PALANG['pAdminEdit_domain_maxquota_text'] = 'MB<br /> 0 = avaktivera | -1 = obegränsat';
-$PALANG['pAdminEdit_domain_transport'] = 'Transport';
-$PALANG['pAdminEdit_domain_transport_text'] = 'Define transport';
+$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_backupmx'] = 'Mail server is backup MX';
$PALANG['pAdminEdit_domain_active'] = 'Aktiv';
-$PALANG['pAdminEdit_domain_button'] = 'Editera Domän';
+$PALANG['pAdminEdit_domain_button'] = 'Ändra domän';
$PALANG['pAdminEdit_domain_result_error'] = '<span class="error_msg">Kan inte modifiera domänen!</span>';
$PALANG['pAdminCreate_admin_welcome'] = 'Lägg till ny domänadmin';
$PALANG['pAdminCreate_admin_username'] = 'Admin';
$PALANG['pAdminCreate_admin_username_text'] = 'Epostadress';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Epostadress<br /><span class="error_msg">Admin är inte en giltig epostadress!</span>';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Email address<br /><span class="error_msg">Denna admin finns redan eller är inte giltig</span>';
+$PALANG['pAdminCreate_admin_username_text_error2'] = 'Epostadress<br /><span class="error_msg">Denna admin finns redan eller är inte giltig</span>';
$PALANG['pAdminCreate_admin_password'] = 'Lösenord';
$PALANG['pAdminCreate_admin_password2'] = 'Lösenord (igen)';
$PALANG['pAdminCreate_admin_password_text_error'] = '<span class="error_msg">Lösenorden du angav är olika!<br />Eller är tomma!</span>';
-$PALANG['pAdminCreate_admin_button'] = 'Lägg till Admin';
-$PALANG['pAdminCreate_admin_result_error'] = '<span class="error_msg">Kan inte lägga till Admin!</span>';
+$PALANG['pAdminCreate_admin_button'] = 'Lägg till admin';
+$PALANG['pAdminCreate_admin_result_error'] = '<span class="error_msg">Kan inte lägga till admin!</span>';
$PALANG['pAdminCreate_admin_result_success'] = 'Admin har lagts till!';
$PALANG['pAdminCreate_admin_address'] = 'Domän';
-$PALANG['pAdminEdit_admin_welcome'] = 'Editera en domänadmin';
+$PALANG['pAdminEdit_admin_welcome'] = 'Ändra en domänadmin';
$PALANG['pAdminEdit_admin_username'] = 'Admin';
$PALANG['pAdminEdit_admin_password'] = 'Lösenord';
$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_button'] = 'Editera Admin';
+$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!';
@@ -311,7 +312,7 @@
$PALANG['pUsersMain_edit_alias'] = 'Ändra din epost forwardadress.';
$PALANG['pUsersMain_password'] = 'Ändra ditt nuvarande lösenord.';
-$PALANG['pUsersVacation_welcome'] = 'Auto Svar.';
+$PALANG['pUsersVacation_welcome'] = 'Autosvar.';
$PALANG['pUsersVacation_welcome_text'] = 'Du har redan ett autosvar meddelande definierat!';
$PALANG['pUsersVacation_subject'] = 'Ärende';
$PALANG['pUsersVacation_subject_text'] = 'Out of Office';
@@ -321,34 +322,34 @@
För brådskande ärenden kan ni kontakta <kontakt person>.
EOM;
$PALANG['pUsersVacation_button_away'] = 'Försvinner';
-$PALANG['pUsersVacation_button_back'] = 'Kommer Tillbaka';
+$PALANG['pUsersVacation_button_back'] = 'Kommer tillbaka';
$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Kan inte uppdatera dina autosvar inställningar!</span>';
$PALANG['pUsersVacation_result_success'] = 'Ditt autosvar har taqits bort!';
-$PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox';
-$PALANG['pCreate_dbLog_createalias'] = 'create alias';
-$PALANG['pDelete_dbLog_deletealias'] = 'delete alias';
-$PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox';
+$PALANG['pCreate_dbLog_createmailbox'] = 'skapa brevlåda';
+$PALANG['pCreate_dbLog_createalias'] = 'skapa alias';
+$PALANG['pDelete_dbLog_deletealias'] = 'radera alias';
+$PALANG['pDelete_dbLog_deletemailbox'] = 'radera brevlåda';
-$PALANG['pEdit_dbLog_editactive'] = 'change active state';
-$PALANG['pEdit_dbLog_editalias'] = 'edit alias';
-$PALANG['pEdit_dbLog_editmailbox'] = 'edit mailbox';
+$PALANG['pEdit_dbLog_editactive'] = 'ändra aktiv status';
+$PALANG['pEdit_dbLog_editalias'] = 'ändra alias';
+$PALANG['pEdit_dbLog_editmailbox'] = 'ändra brevlåda';
-$PALANG['pSearch'] = 'search'; # XXX
-$PALANG['pSearch_welcome'] = 'Searching for: ';
-$PALANG['pReturn_to'] = 'Return to'; # XXX
+$PALANG['pSearch'] = 'sök';
+$PALANG['pSearch_welcome'] = 'Söker efter: ';
+$PALANG['pReturn_to'] = 'Återvänd till';
$PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
-$PALANG['pBroadcast_from'] = 'From'; # XXX
-$PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_subject'] = 'Subject'; # XXX
-$PALANG['pBroadcast_message'] = 'Message'; # XXX
-$PALANG['pBroadcast_send'] = 'Send message'; # XXX
+$PALANG['pBroadcast_from'] = 'Från';
+$PALANG['pBroadcast_name'] = 'Ditt namn';
+$PALANG['pBroadcast_subject'] = 'Ämne';
+$PALANG['pBroadcast_message'] = 'Meddelande';
+$PALANG['pBroadcast_send'] = 'Skicka';
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
-$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
+$PALANG['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
@@ -359,8 +360,8 @@
$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
-$PALANG['pFetchmail_field_id'] = 'ID'; # XXX
-$PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX
+$PALANG['pFetchmail_field_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
@@ -369,10 +370,10 @@
$PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX
$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
-$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
+$PALANG['pFetchmail_field_protocol'] = 'Protokoll';
$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
-$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
+$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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-17 00:38:38
|
Revision: 232
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=232&view=rev
Author: christian_boltz
Date: 2007-11-16 16:38:41 -0800 (Fri, 16 Nov 2007)
Log Message:
-----------
backup.php:
- also backup config table
Modified Paths:
--------------
trunk/backup.php
Modified: trunk/backup.php
===================================================================
--- trunk/backup.php 2007-11-15 20:55:01 UTC (rev 231)
+++ trunk/backup.php 2007-11-17 00:38:41 UTC (rev 232)
@@ -72,7 +72,7 @@
{
fwrite ($fh, $header);
- $tables = array('admin','alias','domain','domain_admins','log','mailbox','vacation');
+ $tables = array('admin','alias','config','domain','domain_admins','log','mailbox','vacation');
for ($i = 0 ; $i < sizeof ($tables) ; ++$i)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-15 20:55:05
|
Revision: 231
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=231&view=rev
Author: christian_boltz
Date: 2007-11-15 12:55:01 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
upgrade.php:
- change "edit_alias_state" to "edit_alias_active" in log table (was changed in r90)
https://sourceforge.net/tracker/index.php?func=detail&aid=1830376&group_id=191583&atid=937964
Modified Paths:
--------------
trunk/upgrade.php
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2007-11-15 20:47:42 UTC (rev 230)
+++ trunk/upgrade.php 2007-11-15 20:55:01 UTC (rev 231)
@@ -333,6 +333,8 @@
# old format: "create alias"
# new format: "create_alias"
$result = db_query_parsed("UPDATE " . table_by_key ('log') . " SET action = REPLACE(action,' ','_')", TRUE);
+ # change edit_alias_state to edit_alias_active
+ $result = db_query_parsed("UPDATE " . table_by_key ('log') . " SET action = 'edit_alias_state' WHERE action = 'edit_alias_active'", TRUE);
}
function upgrade_169_mysql() { # MySQL only
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-15 20:47:54
|
Revision: 230
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=230&view=rev
Author: christian_boltz
Date: 2007-11-15 12:47:42 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
*.lang
- rename $PALANG['pViewlog_action_edit_alias_active']
to $PALANG['pViewlog_action_edit_alias_state']
https://sourceforge.net/tracker/index.php?func=detail&aid=1830376&group_id=191583&atid=937964
Modified Paths:
--------------
trunk/languages/bg.lang
trunk/languages/ca.lang
trunk/languages/cn.lang
trunk/languages/cs.lang
trunk/languages/da.lang
trunk/languages/de.lang
trunk/languages/en.lang
trunk/languages/es.lang
trunk/languages/et.lang
trunk/languages/eu.lang
trunk/languages/fi.lang
trunk/languages/fo.lang
trunk/languages/fr.lang
trunk/languages/hr.lang
trunk/languages/hu.lang
trunk/languages/is.lang
trunk/languages/it.lang
trunk/languages/lt.lang
trunk/languages/mk.lang
trunk/languages/nl.lang
trunk/languages/nn.lang
trunk/languages/pl.lang
trunk/languages/pt-br.lang
trunk/languages/ru.lang
trunk/languages/sk.lang
trunk/languages/sl.lang
trunk/languages/sv.lang
trunk/languages/tr.lang
trunk/languages/tw.lang
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/bg.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -176,7 +176,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Íàïðåä';
Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/ca.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -175,7 +175,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Ves';
Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/cn.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -176,7 +176,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = '执行';
Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/cs.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -182,7 +182,7 @@
$PALANG['pViewlog_action_create_alias'] = 'vytvořeno přesměrování';
$PALANG['pViewlog_action_delete_alias'] = 'smazáno přesměrování';
$PALANG['pViewlog_action_edit_alias'] = 'úprava přesměrování';
-$PALANG['pViewlog_action_edit_alias_active'] = 'změna stavu přesměrování';
+$PALANG['pViewlog_action_edit_alias_state'] = 'změna stavu přesměrování';
$PALANG['pViewlog_action_edit_password'] = 'změna hesla';
$PALANG['pViewlog_button'] = 'Jít';
Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/da.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -182,7 +182,7 @@
$PALANG['pViewlog_action_create_alias'] = 'opret alias';
$PALANG['pViewlog_action_delete_alias'] = 'slet alias';
$PALANG['pViewlog_action_edit_alias'] = 'rediger alias';
-$PALANG['pViewlog_action_edit_alias_active'] = 'ændre alias aktiv';
+$PALANG['pViewlog_action_edit_alias_state'] = 'ændre alias aktiv';
$PALANG['pViewlog_action_edit_password'] = 'ændre adgangskode';
$PALANG['pViewlog_button'] = 'Vis';
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/de.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -181,7 +181,7 @@
$PALANG['pViewlog_action_create_alias'] = 'Alias erstellen';
$PALANG['pViewlog_action_delete_alias'] = 'Alias löschen';
$PALANG['pViewlog_action_edit_alias'] = 'Alias bearbeiten';
-$PALANG['pViewlog_action_edit_alias_active'] = 'Alias Aktiv bearbeiten';
+$PALANG['pViewlog_action_edit_alias_state'] = 'Alias Aktiv bearbeiten';
$PALANG['pViewlog_action_edit_password'] = 'Passwort ändern';
$PALANG['pViewlog_button'] = 'Los';
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/en.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -182,7 +182,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias';
$PALANG['pViewlog_action_delete_alias'] = 'delete alias';
$PALANG['pViewlog_action_edit_alias'] = 'edit alias';
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active';
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active';
$PALANG['pViewlog_action_edit_password'] = 'change password';
$PALANG['pViewlog_button'] = 'Go';
Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/es.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -176,7 +176,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Ir';
Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/et.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -176,7 +176,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Mine';
Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/eu.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -174,7 +174,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Joan';
Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/fi.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -178,7 +178,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Siirry';
Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/fo.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -176,7 +176,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Vel';
Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/fr.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -177,7 +177,7 @@
$PALANG['pViewlog_action_create_alias'] = 'créer un alias';
$PALANG['pViewlog_action_delete_alias'] = 'supprimer un alias';
$PALANG['pViewlog_action_edit_alias'] = 'éditer un alias';
-$PALANG['pViewlog_action_edit_alias_active'] = 'activer un alias';
+$PALANG['pViewlog_action_edit_alias_state'] = 'activer un alias';
$PALANG['pViewlog_action_edit_password'] = 'changer le mot de passe';
$PALANG['pViewlog_button'] = 'Aller';
Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/hr.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -175,7 +175,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Idi';
Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/hu.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -181,7 +181,7 @@
$PALANG['pViewlog_action_create_alias'] = 'alias létrehozása';
$PALANG['pViewlog_action_delete_alias'] = 'alias törlése';
$PALANG['pViewlog_action_edit_alias'] = 'alias módosítása';
-$PALANG['pViewlog_action_edit_alias_active'] = 'alias aktivitás módosítása';
+$PALANG['pViewlog_action_edit_alias_state'] = 'alias aktivitás módosítása';
$PALANG['pViewlog_action_edit_password'] = 'jelszó módosítása';
$PALANG['pViewlog_button'] = 'Gyerünk';
Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/is.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -175,7 +175,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Áfram';
Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/it.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -176,7 +176,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Vai';
Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/lt.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -175,7 +175,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Eiti';
Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/mk.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -176,7 +176,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Оди';
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/nl.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -177,7 +177,7 @@
$PALANG['pViewlog_action_create_alias'] = 'alias toegevoegd';
$PALANG['pViewlog_action_delete_alias'] = 'alias verwijdert';
$PALANG['pViewlog_action_edit_alias'] = 'alias bewerkt';
-$PALANG['pViewlog_action_edit_alias_active'] = 'status actieve alias bewerkt';
+$PALANG['pViewlog_action_edit_alias_state'] = 'status actieve alias bewerkt';
$PALANG['pViewlog_action_edit_password'] = 'wachtwoord aangepast';
$PALANG['pViewlog_button'] = 'Ga';
Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/nn.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -174,7 +174,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Vis';
Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/pl.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -177,7 +177,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Idź';
Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/pt-br.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -176,7 +176,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Ir';
Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/ru.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -183,7 +183,7 @@
$PALANG['pViewlog_action_create_alias'] = 'создание алиаса';
$PALANG['pViewlog_action_delete_alias'] = 'удаление алиаса';
$PALANG['pViewlog_action_edit_alias'] = 'редактирование алиаса';
-$PALANG['pViewlog_action_edit_alias_active'] = 'изменение активности алиаса';
+$PALANG['pViewlog_action_edit_alias_state'] = 'изменение активности алиаса';
$PALANG['pViewlog_action_edit_password'] = 'изменение пароля';
$PALANG['pViewlog_button'] = 'Выбрать';
Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/sk.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -176,7 +176,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Prejsť';
Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/sl.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -176,7 +176,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Pojdi';
Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/sv.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -177,7 +177,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Kör';
Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/tr.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -176,7 +176,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Git';
Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang 2007-11-15 20:44:15 UTC (rev 229)
+++ trunk/languages/tw.lang 2007-11-15 20:47:42 UTC (rev 230)
@@ -176,7 +176,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = '°õ¦æ';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-15 20:44:24
|
Revision: 229
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=229&view=rev
Author: christian_boltz
Date: 2007-11-15 12:44:15 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
- added --rename to rename a $PALANG string
- put most code into functions
- lots of whitespace changes and code reordering - this makes the diff
nearly useless, sorry
Modified Paths:
--------------
trunk/languages/language-update.sh
Modified: trunk/languages/language-update.sh
===================================================================
--- trunk/languages/language-update.sh 2007-11-15 18:16:17 UTC (rev 228)
+++ trunk/languages/language-update.sh 2007-11-15 20:44:15 UTC (rev 229)
@@ -14,38 +14,153 @@
#
# File: language-update.sh
# Lists missing translations in language files and optionally patches the
- # english texts into the language file
+ # english texts into the language file.
+ # Can also rename a $PALANG string.
#
# written by Christian Boltz
-notext=0 # output full lines by default
-patch=0 # do not patch by default
-nocleanup=0 # don't delete tempfiles
-filelist="en.lang" # always needed for comparison
+function update_string_list() {
+ for file in en.lang $filelist ; do
+ echo "<?php include('$file'); print join(\"\\n\", array_keys(\$PALANG)) . \"\\n\"; ?>" | php > $file.strings
+ done
-while [ -n "$1" ] ; do
- case "$1" in
- --help)
- echo '
-Lists missing translations in language files and optionally patches the
-english texts into the language file
+ for file in $filelist ; do
+ test "$file" = "en.lang" && continue
+ LANG=C diff -U2 $file.strings en.lang.strings > $file.diff && echo "*** $file: no difference ***"
+ test $notext = 1 && cat $file.diff && continue
+
+ grep -v 'No newline at end of file' "$file.diff" | while read line ; do
+ greptext="$(echo $line | sed 's/^[+ -]//')"
+ grepresult=$(grep "'$greptext'" en.lang) || grepresult="***DEFAULT*** $line"
+ grepresult2=$(grep "'$greptext'" $file) || grepresult2="$grepresult"
+ case "$line" in
+ ---*)
+ echo "$line"
+ ;;
+ +++*)
+ echo "$line"
+ ;;
+ @*)
+ echo "$line"
+ ;;
+ -*)
+ echo "-$grepresult"
+ ;;
+ +*)
+ # needs translation
+ # already added as comment?
+ test "$grepresult" = "$grepresult2" && {
+ echo "+$grepresult # XXX" # english
+ } || {
+ echo " $grepresult2" # translated
+ echo "keeping line $grepresult2" >&2
+ echo "This will result in a malformed patch." >&2
+ }
+ ;;
+ *)
+ echo " $grepresult2"
+ ;;
+ esac
+ done > $file.patch
+
+ test $patch = 0 && cat $file.patch
+ test $patch = 1 && patch --fuzz=1 $file < $file.patch
+ done
+} # end update_string_list()
+
+
+function rename_string() {
+ for file in $filelist ; do
+ line="$(grep "PALANG\['$rename_old'\]" "$file")" || {
+ echo "*** $file does not contain \$PALANG['$rename_old'] ***" >&2
+ continue
+ }
+
+ newline="$(echo "$line" | sed "s/'$rename_old'/'$rename_new'/")"
+
+ # create patch
+ echo "
+--- $file.old
++++ $file
+@@ -1,1 +1,1 @@
+-$line
++$newline
+ " > "$file.patch"
+
+ test $patch = 0 && cat $file.patch
+ test $patch = 1 && patch $file < $file.patch
+ done
+} # end rename_string()
+
+
+function cleanup() {
+ # check for duplicated strings
+ for file in $filelist ; do
+ sed -n "/PALANG/ s/[ ]*\$PALANG\['// ; s/'.*//p" $file |sort |uniq -c |grep -v " *1 " >&2 && \
+ echo "*** duplicated string in $file, see above for details ***" >&2
+ done
+
+ # cleanup tempfiles
+ test $nocleanup = 0 && for file in $filelist ; do
+ rm -f $file.patch $file.strings $file.diff
+ done
+} # end cleanup()
+
+
+usage() {
+ echo '
Usage:
+ ~~~~~~
- '"$0"' [--notext | --patch] [--nocleanup] [foo.lang [bar.lang [...] ] ]
- --notext will only list the translation keys (useful for a quick overview)
- --patch will patch the language file directly
- --nocleanup will keep all temp files (for debugging only)
+'"$0"' [--notext | --patch] [--nocleanup] [foo.lang [bar.lang [...] ] ]
- You can give any number of langugage files as parameter.
- If no files are given, all *.lang files will be used.
+ List missing translations in language files and optionally patch the
+ english texts into the language file
+ --notext
+ only list the translation keys (useful for a quick overview)
+
Note for translators: untranslated entries have a comment
# XXX
attached.
+
+
+'"$0"' --rename old_string new_string [--patch] [--nocleanup] [foo.lang [bar.lang [...] ] ]
+
+ Rename $PALANG['"'"'old_string'"'"'] to $PALANG['"'"'new_string'"'"']
+
+
+Common parameters:
+
+ --patch
+ patch the language file directly (instead of displaying the patch)
+ --nocleanup
+ keep all temp files (for debugging)
+
+ You can give any number of langugage files as parameter.
+ If no files are given, all *.lang files will be used.
+
'
+} # end usage()
+
+
+# main script
+
+notext=0 # output full lines by default
+patch=0 # do not patch by default
+nocleanup=0 # don't delete tempfiles
+rename=0 # rename a string
+rename_old=''
+renane_new=''
+filelist=''
+
+while [ -n "$1" ] ; do
+ case "$1" in
+ --help)
+ usage
exit 0;
;;
--notext)
@@ -57,6 +172,14 @@
--nocleanup)
nocleanup=1
;;
+ --rename)
+ rename=1
+ shift ; rename_old="$1"
+ shift ; rename_new="$1"
+ echo "$rename_old" | grep '^[a-z_-]*\.lang$' && rename_new='' # error out on *.lang - probably a filename
+ echo "$rename_new" | grep '^[a-z_-]*\.lang$' && rename_new='' # error out on *.lang - probably a filename
+ test -z "$rename_new" && { echo '--rename needs two parameters' >&2 ; exit 1 ; }
+ ;;
-*)
echo 'unknown option. Try --help ;-)' >&2
exit 1
@@ -66,68 +189,13 @@
;;
esac
shift
-done
+done # end $@ loop
test $notext = 1 && test $patch = 1 && echo "ERROR: You can't use --notext AND --patch at the same time." >&2 && exit 2
+test $notext = 1 && test $rename = 1 && echo "ERROR: You can't use --notext AND --rename at the same time." >&2 && exit 2
-test "$filelist" = "en.lang" && filelist="`ls -1 *.lang`"
+test "$filelist" = "" && filelist="`ls -1 *.lang`"
-for file in $filelist ; do
- echo "<?php include('$file'); print join(\"\\n\", array_keys(\$PALANG)) . \"\\n\"; ?>" | php > $file.strings
-done
+test "$rename" = 1 && { rename_string ; cleanup ; exit 0 ; }
-
-for file in $filelist ; do
- test "$file" = "en.lang" && continue
- LANG=C diff -U2 $file.strings en.lang.strings > $file.diff && echo "*** $file: no difference ***"
-
- test $notext = 1 && cat $file.diff && continue
-
- grep -v 'No newline at end of file' "$file.diff" | while read line ; do
- greptext="$(echo $line | sed 's/^[+ -]//')"
- grepresult=$(grep "'$greptext'" en.lang) || grepresult="***DEFAULT*** $line"
- grepresult2=$(grep "'$greptext'" $file) || grepresult2="$grepresult"
- case "$line" in
- ---*)
- echo "$line"
- ;;
- +++*)
- echo "$line"
- ;;
- @*)
- echo "$line"
- ;;
- -*)
- echo "-$grepresult"
- ;;
- +*)
- # needs translation
- # already added as comment?
- test "$grepresult" = "$grepresult2" && {
- echo "+$grepresult # XXX" # english
- } || {
- echo " $grepresult2" # translated
- echo "keeping line $grepresult2" >&2
- echo "This will result in a malformed patch." >&2
- }
- ;;
- *)
- echo " $grepresult2"
- ;;
- esac
- done > $file.patch
-
- test $patch = 0 && cat $file.patch
- test $patch = 1 && patch --fuzz=1 $file < $file.patch
-done
-###############################################################################
-
-# check for duplicated strings
-for file in $filelist ; do
- sed -n "/PALANG/ s/[ ]*\$PALANG\['// ; s/'.*//p" $file |sort |uniq -c |grep -v " *1 " >&2 && \
- echo "*** duplicated string in $file, see above for details ***" >&2
-done
-
-test $nocleanup = 0 && for file in $filelist ; do
- rm -f $file.patch $file.strings $file.diff
-done
+update_string_list ; cleanup # default operation
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.
