SF.net SVN: postfixadmin:[837] branches/postfixadmin-2.3

[<chr...@us...>]

Revision: 837
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=837&view=rev
Author:   christian_boltz
Date:     2010-06-22 22:14:03 +0000 (Tue, 22 Jun 2010)

Log Message:
-----------
- merged r829,830,833-836
- see CHANGELOG.TXT changes for details

This should make the 2.3 branch ready to be released as 2.3.1.
Still missing parts are:
- merge changes in debian/*
- testing - I did the merge without lots of testing
- update version number in functions.inc.php and CHANGELOG.txt ;-)

Modified Paths:
--------------
    branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/functions.inc.php
    branches/postfixadmin-2.3/CHANGELOG.TXT
    branches/postfixadmin-2.3/delete.php
    branches/postfixadmin-2.3/edit-alias.php
    branches/postfixadmin-2.3/functions.inc.php
    branches/postfixadmin-2.3/languages/pl.lang
    branches/postfixadmin-2.3/users/password.php

Property Changed:
----------------
    branches/postfixadmin-2.3/
    branches/postfixadmin-2.3/debian/apache.conf
    branches/postfixadmin-2.3/debian/postfixadmin.docs


Property changes on: branches/postfixadmin-2.3
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:751,800,806,811,817,819,821,825-826
   + /trunk:751,800,806,811,817,819,821,825-826,829-830,833-836

Modified: branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/functions.inc.php
===================================================================
--- branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/functions.inc.php	2010-06-22 20:48:06 UTC (rev 836)
+++ branches/postfixadmin-2.3/ADDITIONS/squirrelmail-plugin/functions.inc.php	2010-06-22 22:14:03 UTC (rev 837)
@@ -51,6 +51,7 @@
             }
             catch(Exception $e) {
                 //var_dump($client->getHttpClient()->getLastResponse()->getBody());
+                error_log("Failed to login to xmlrpc instance - " . $e->getMessage);
                 die('Failed to login to xmlrpc instance');
             }
             if($success) {

Modified: branches/postfixadmin-2.3/CHANGELOG.TXT
===================================================================
--- branches/postfixadmin-2.3/CHANGELOG.TXT	2010-06-22 20:48:06 UTC (rev 836)
+++ branches/postfixadmin-2.3/CHANGELOG.TXT	2010-06-22 22:14:03 UTC (rev 837)
@@ -17,6 +17,9 @@
     The only visible change is displaying the alias target for mailboxes which
     was a longstanding issue/"missing feature".
     The ADDITIONS directory contains some new scripts.
+  - SECURITY: users could bypass checking the old password when changing the
+	password by entering a too short new password. Fortunately only
+	"exploitable" by authentificated users.
   - display alias targets for mailboxes (if $CONF['special_alias_control'] = YES)
   - add hook for custom maildir path generation
   - add import_users_from_csv.py script (by Simone Piccardi)
@@ -33,13 +36,18 @@
     superadmins)
   - add in_array() check to avoid that superadmins can enter invalid domains
   - fix delete link for alias domains (when on target domain)
+  - delete values from quota and quota2 table when deleting a mailbox
   - fix hardcoded table names in list-domain.php
   - fixed edit-alias.php not to drop alias to the mailbox if
     special_alias_control = NO
+  - fix alias handling for mailboxes (special_alias_control vs.
+    alias_control_admin confusion)
   - fix typo in upgrade.php that broke index creation and deletion when using
     non-default table names
   - fix creating 'ALL' domain (dummy for superadmins) when using non-default
     table names
+  - fix: db_query did not return number of SELECTed rows if query starts with
+    with whitespace
   - check for $CONF['encrypt'] = 'dovecot:md5-crypt' (postfixadmin login not
     working because dovecotpw uses a new salt each time), recommend
     internal md5crypt instead


Property changes on: branches/postfixadmin-2.3/debian/apache.conf
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/debian/apache.conf:829-830,833-836


Property changes on: branches/postfixadmin-2.3/debian/postfixadmin.docs
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/debian/postfixadmin.docs:829-830,833-836

Modified: branches/postfixadmin-2.3/delete.php
===================================================================
--- branches/postfixadmin-2.3/delete.php	2010-06-22 20:48:06 UTC (rev 836)
+++ branches/postfixadmin-2.3/delete.php	2010-06-22 22:14:03 UTC (rev 837)
@@ -143,6 +143,14 @@
                 $tMessage.=')</span>';
             }
             db_log ($SESSID_USERNAME, $fDomain, 'delete_mailbox', $fDelete);
+            $result = db_query("SELECT * FROM $table_quota WHERE username='$fDelete'");
+            if($result['rows'] >= 1) {
+                db_query ("DELETE FROM $table_quota WHERE username='$fDelete'");
+            }
+            $result = db_query("SELECT * FROM $table_quota2 WHERE username='$fDelete'");
+            if($result['rows'] == 1) {
+                db_query ("DELETE FROM $table_quota2 WHERE username='$fDelete'");
+            }
         }
         $result = db_query("SELECT * FROM $table_vacation WHERE email = '$fDelete' AND domain = '$fDomain'");
         if($result['rows'] == 1) {

Modified: branches/postfixadmin-2.3/edit-alias.php
===================================================================
--- branches/postfixadmin-2.3/edit-alias.php	2010-06-22 20:48:06 UTC (rev 836)
+++ branches/postfixadmin-2.3/edit-alias.php	2010-06-22 22:14:03 UTC (rev 837)
@@ -63,8 +63,8 @@
 
     $orig_alias_list = explode(',', $tGoto);
     $alias_list = $orig_alias_list;
-    //. if we are not a global admin, and special_alias_control is NO, hide the alias that's the mailbox name.
-    if($CONF['special_alias_control'] == 'NO' && !authentication_has_role('global-admin')) {
+    //. if we are not a global admin, and alias_control_admin is NO, hide the alias that's the mailbox name.
+    if($CONF['alias_control_admin'] == 'NO' && !authentication_has_role('global-admin')) {
         /* Has a mailbox as well? Remove the address from $tGoto in order to edit just the real aliases */
         $result = db_query ("SELECT * FROM $table_mailbox WHERE username='$fAddress' AND domain='$fDomain'");
         if ($result['rows'] == 1)

Modified: branches/postfixadmin-2.3/functions.inc.php
===================================================================
--- branches/postfixadmin-2.3/functions.inc.php	2010-06-22 20:48:06 UTC (rev 836)
+++ branches/postfixadmin-2.3/functions.inc.php	2010-06-22 22:14:03 UTC (rev 837)
@@ -1577,7 +1577,7 @@
     if ($error_text != "" && $ignore_errors == 0) die($error_text);
 
     if ($error_text == "") {
-        if (preg_match("/^SELECT/i", $query))
+        if (preg_match("/^SELECT/i", trim($query)))
         {
             // if $query was a SELECT statement check the number of rows with [database_type]_num_rows ().
             if ($CONF['database_type'] == "mysql") $number_rows = mysql_num_rows ($result);

Modified: branches/postfixadmin-2.3/languages/pl.lang
===================================================================
--- branches/postfixadmin-2.3/languages/pl.lang	2010-06-22 20:48:06 UTC (rev 836)
+++ branches/postfixadmin-2.3/languages/pl.lang	2010-06-22 22:14:03 UTC (rev 837)
@@ -5,6 +5,7 @@
 // by Jarek
 // updated by Piotr Meyer <aniou at smutek dot pl>
 // updated by Lukasz Wasikowski <lu...@wa...>
+// updated by Michal Wojcik <michalw-snt @ SF>
 //
 
 $PALANG['YES'] = 'Tak';
@@ -24,13 +25,13 @@
 $PALANG['pLogin_username'] = 'Login (email)';
 $PALANG['pLogin_password'] = 'Hasło';
 $PALANG['pLogin_button'] = 'Zaloguj';
-$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
+$PALANG['pLogin_failed'] = 'Twój adres Email lub hasło jest niepoprawne.';
 $PALANG['pLogin_login_users'] = 'Sekcja przeznaczona dla użytkowników.';
 
 $PALANG['pMenu_main'] = 'Strona główna';
 $PALANG['pMenu_overview'] = 'Dane zbiorcze';
 $PALANG['pMenu_create_alias'] = 'Dodaj alias';
-$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
+$PALANG['pMenu_create_alias_domain'] = 'Dodaj alias domeny';
 $PALANG['pMenu_create_mailbox'] = 'Dodaj konto';
 $PALANG['pMenu_fetchmail'] = 'Pobierz Email';
 $PALANG['pMenu_sendmail'] = 'Wyślij Email';
@@ -53,21 +54,21 @@
 $PALANG['pOverview_up_arrow'] = 'Do góry';
 $PALANG['pOverview_right_arrow'] = 'Następna strona';
 $PALANG['pOverview_left_arrow'] = 'Poprzednia strona';
-$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
+$PALANG['pOverview_alias_domain_title'] = ':: Aliasy domen';
 $PALANG['pOverview_alias_title'] = ':: Aliasy';
-$PALANG['pOverview_mailbox_title'] = ':: Konta pocztowe'; # XXX
+$PALANG['pOverview_mailbox_title'] = ':: Konta pocztowe';
 $PALANG['pOverview_button'] = 'Idź';
 $PALANG['pOverview_welcome'] = 'Dane zbiorcze dla domeny ';
-$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
-$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
+$PALANG['pOverview_alias_domain_aliases'] = 'Domeny aliasowe';
+$PALANG['pOverview_alias_domain_target'] = '%s jest domeną aliasową dla:';
 $PALANG['pOverview_alias_alias_count'] = 'Alias';
 $PALANG['pOverview_alias_mailbox_count'] = 'Konta';
 $PALANG['pOverview_alias_address'] = 'Od';
 $PALANG['pOverview_alias_goto'] = 'Do';
 $PALANG['pOverview_alias_modified'] = 'Ostatnio zmodyfikowany';
-$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
+$PALANG['pOverview_alias_domain_modified'] = 'Ostatnio zmodyfikowane';
 $PALANG['pOverview_alias_active'] = 'Aktywny';
-$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_domain_active'] = 'Aktywny';
 $PALANG['pOverview_alias_edit'] = 'Alias';
 $PALANG['and_x_more'] = '[i %s wiecej...]';
 $PALANG['pOverview_mailbox_username'] = 'Email';
@@ -76,11 +77,11 @@
 $PALANG['pOverview_mailbox_modified'] = 'Ostatnio zmodyfikowany';
 $PALANG['pOverview_mailbox_active'] = 'Aktywny';
 $PALANG['pOverview_vacation_edit'] = 'Auto odpowiedź';
-$PALANG['pOverview_vacation_option'] = 'Ustaw auto odpowiedź';
+$PALANG['pOverview_vacation_option'] = 'Ustaw automatyczną odpowiedź';
 
 $PALANG['pOverview_get_domain'] = 'Domena';
 $PALANG['pOverview_get_aliases'] = 'Aliasy';
-$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
+$PALANG['pOverview_get_alias_domains'] = 'Aliasy domenowe';
 $PALANG['pOverview_get_mailboxes'] = 'Konta';
 $PALANG['pOverview_get_quota'] = 'Udział (MB)';
 $PALANG['pOverview_get_modified'] = 'Ostatnio zmodyfikowany';
@@ -89,20 +90,20 @@
 $PALANG['pDelete_delete_success'] = '%s usunięty.';
 $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Nie można usunąć konta ';
 $PALANG['pDelete_domain_error'] = '<span class="error_msg">Ta domena nie należy do Ciebie ';
-$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">Ten alias domeny nie należy do Ciebie ';
 $PALANG['pDelete_alias_error'] = '<span class="error_msg">Nie można usunąć aliasu ';
-$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
-$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
-$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
-$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
-$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
-$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
-$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
-$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
-$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
-$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
-$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX
-$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
+$PALANG['pCreate_alias_domain_welcome'] = 'Duplikuj adresy z jednej Twojej domeny do innej.';
+$PALANG['pCreate_alias_domain_alias'] = 'Domena aliasowana/źródłowa';
+$PALANG['pCreate_alias_domain_alias_text'] = 'Domena do której przychodzą maile.';
+$PALANG['pCreate_alias_domain_target'] = 'Domena docelowa';
+$PALANG['pCreate_alias_domain_target_text'] = 'Domena do której powinny przychodzić maile.';
+$PALANG['pCreate_alias_domain_active'] = 'Aktywny';
+$PALANG['pCreate_alias_domain_button'] = 'Dodaj alias domeny';
+$PALANG['pCreate_alias_domain_error1'] = 'Nie masz uprawnień do tworzenia takiej konfiguracji.';
+$PALANG['pCreate_alias_domain_error2'] = 'Wybrana konfiguracja jest nieprawidłowa, proszę wybrać inną!';
+$PALANG['pCreate_alias_domain_error3'] = 'Dodanie do bazy nie powiodło się.';
+$PALANG['pCreate_alias_domain_error4'] = 'Wszystkie domeny są już aliasowane.';
+$PALANG['pCreate_alias_domain_success'] = 'Alias domeny został dodany do tabeli aliasów domen!';
 
 $PALANG['pCreate_alias_welcome'] = 'Utwórz nowy alias dla Twojej domeny.';
 $PALANG['pCreate_alias_address'] = 'Alias';
@@ -125,7 +126,7 @@
 $PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Nie podałeś adresu odbiorcy (pole "To")</span>';
 $PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Wpisany adres email jest niepoprawny: ';
 $PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Ta domena nie należy do Ciebie: ';
-$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Nie można zmodyfikować aliasu domeny!</span>';
 $PALANG['pEdit_alias_forward_and_store'] = 'Dostarczaj do mojej skrzynki.';
 $PALANG['pEdit_alias_forward_only'] = 'Prześlij jedynie na podane adresy.';
 $PALANG['pEdit_alias_button'] = 'Edytuj alias';
@@ -179,9 +180,9 @@
 $PALANG['pPassword_result_error'] = '<span class="error_msg">Nie można zmienić Twojego hasła!</span>';
 $PALANG['pPassword_result_success'] = 'Twoje hasło zostało zmienione!';
 
-$PALANG['pEdit_vacation_set'] = 'Zmień / Ustaw wiadomość auto odpowiedzi';
-$PALANG['pEdit_vacation_remove'] = 'Usuń wiadomość auto odpowiedzi';
-$PALANG['pVacation_result_error'] = '<span class="error_msg">Nie można ustawić wiadomości auto odpowiedzi!</span>';
+$PALANG['pEdit_vacation_set'] = 'Zmień / Ustaw wiadomość automatycznej odpowiedzi';
+$PALANG['pEdit_vacation_remove'] = 'Usuń wiadomość automatycznej odpowiedzi';
+$PALANG['pVacation_result_error'] = '<span class="error_msg">Nie można ustawić wiadomości automatycznej odpowiedzi!</span>';
 $PALANG['pVacation_result_removed'] = 'Auto odpowiedź została usunięta!';
 $PALANG['pVacation_result_added'] = 'Auto odpowiedź została dodana!';
 
@@ -191,17 +192,17 @@
 $PALANG['pViewlog_domain'] = 'Domena';
 $PALANG['pViewlog_action'] = 'Działanie';
 $PALANG['pViewlog_data'] = 'Dane';
-$PALANG['pViewlog_action_create_mailbox'] = 'utwórz konto';
-$PALANG['pViewlog_action_delete_mailbox'] = 'usuń konto';
-$PALANG['pViewlog_action_edit_mailbox'] = 'edytuj konto';
-$PALANG['pViewlog_action_edit_mailbox_state'] = 'edytuj aktywne konto';
-$PALANG['pViewlog_action_create_alias'] = 'utwórz alias';
-$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
-$PALANG['pViewlog_action_delete_alias'] = 'usuń alias';
-$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
-$PALANG['pViewlog_action_edit_alias'] = 'edytuj alias';
-$PALANG['pViewlog_action_edit_alias_state'] = 'edytuj aktywny alias';
-$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
+$PALANG['pViewlog_action_create_mailbox'] = 'utworzenie konta';
+$PALANG['pViewlog_action_delete_mailbox'] = 'usunięcie konta';
+$PALANG['pViewlog_action_edit_mailbox'] = 'edycja konta';
+$PALANG['pViewlog_action_edit_mailbox_state'] = 'edycja statusu konta';
+$PALANG['pViewlog_action_create_alias'] = 'utworzenie aliasu';
+$PALANG['pViewlog_action_create_alias_domain'] = 'utworzenie aliasu domeny';
+$PALANG['pViewlog_action_delete_alias'] = 'usunięcie aliasu';
+$PALANG['pViewlog_action_delete_alias_domain'] = 'usunięcie aliasu domeny';
+$PALANG['pViewlog_action_edit_alias'] = 'edycja aliasu';
+$PALANG['pViewlog_action_edit_alias_state'] = 'edycja statusu aliasu';
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edycja statusu aliasu domeny';
 $PALANG['pViewlog_action_edit_password'] = 'zmień hasło';
 
 $PALANG['pViewlog_button'] = 'Idź';
@@ -220,7 +221,7 @@
 
 $PALANG['pAdminMenu_list_admin'] = 'Lista administratorów';
 $PALANG['pAdminMenu_list_domain'] = 'Lista domen';
-$PALANG['pAdminMenu_list_virtual'] = 'Virtual list'; # XXX
+$PALANG['pAdminMenu_list_virtual'] = 'Lista zbiorcza';
 $PALANG['pAdminMenu_viewlog'] = 'Logi';
 $PALANG['pAdminMenu_backup'] = 'Kopia bezpieczeństwa';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Administratorzy domeny';
@@ -278,7 +279,7 @@
 $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Nie można dodać domeny!</span>';
 $PALANG['pAdminCreate_domain_result_success'] = 'Domena została dodana!';
 $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Nie można usunąć domeny!</span>';
-$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Nie można usunąć aliasu domeny!</span>';
 
 $PALANG['pAdminEdit_domain_welcome'] = 'Edytuj domenę';
 $PALANG['pAdminEdit_domain_domain'] = 'Domena';
@@ -331,18 +332,18 @@
 $PALANG['pUsersMenu_edit_alias'] = 'Zmień przekierowania';
 $PALANG['pUsersMenu_password'] = 'Zmień hasło';
 
-$PALANG['pUsersMain_vacation'] = 'Ustaw "out of office" wiadomość lub auto odpowiedź.';
+$PALANG['pUsersMain_vacation'] = 'Ustaw automatyczną odpowiedź.';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' jest WŁACZONA,
 kliknij \'' . $PALANG['pUsersMenu_vacation'] . '\' aby ' . 'edytować/usunąć';
 $PALANG['pUsersMain_edit_alias'] = 'Zmień przekierowania wiadomości.';
 $PALANG['pUsersMain_password'] = 'Zmień aktualne hasło.';
 
 
-$PALANG['pUsersVacation_welcome'] = 'Auto odpowiedź.';
-$PALANG['pUsersVacation_welcome_text'] = 'Masz już skonfigurowaną auto odpowiedź!';
+$PALANG['pUsersVacation_welcome'] = 'Automatyczną odpowiedź.';
+$PALANG['pUsersVacation_welcome_text'] = 'Masz już skonfigurowaną automatyczną odpowiedź!';
 $PALANG['pUsersVacation_subject'] = 'Temat';
 $PALANG['pUsersVacation_subject_text'] = 'Poza biurem';
-$PALANG['pUsersVacation_body'] = 'Tekst'; # XXX text changed to 'Message'
+$PALANG['pUsersVacation_body'] = 'Wiadomość';
 
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 Będę nieobecny od <date> do <date>.
@@ -350,8 +351,8 @@
 EOM;
 $PALANG['pUsersVacation_button_away'] = 'Nieobecny/a';
 $PALANG['pUsersVacation_button_back'] = 'Zaraz wracam';
-$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Nie mogę zaktualizować ustawień Twojej auto odpowiedzi!</span>';
-$PALANG['pUsersVacation_result_success'] = 'Twoja auto odpowiedź została usunięta!';
+$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Nie mogę zaktualizować ustawień Twojej automatycznej odpowiedzi!</span>';
+$PALANG['pUsersVacation_result_success'] = 'Twoja automatyczna odpowiedź została usunięta!';
 $PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX
 $PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX
 
@@ -379,10 +380,10 @@
 $PALANG['pStatus_undeliverable'] = 'może być NIEDOSTARCZALNA ';
 $PALANG['pStatus_custom'] = 'Dostarczyć do ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
-$PALANG['pPasswordTooShort'] = "Hasło jest za krótkie - musi mieć minimum %s znaków";
-$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
-$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
+$PALANG['pPasswordTooShort'] = 'Hasło jest za krótkie - musi mieć minimum %s znaków';
+$PALANG['pInvalidDomainRegex'] = 'Nieprawidłowa nazwa domeny %s';
+$PALANG['pInvalidDomainDNS'] = 'Nieprawidłowa domena %s, nie wykrywana w DNS';
+$PALANG['pInvalidMailRegex'] = 'Nieprawidłowy adres email';
 $PALANG['pFetchmail_welcome'] = 'Pobierz pocztę dla:';
 $PALANG['pFetchmail_new_entry'] = 'Nowy wpis';
 $PALANG['pFetchmail_database_save_error'] = 'Wpis nie może być zapisany w bazie danych!';
@@ -403,7 +404,7 @@
 $PALANG['pFetchmail_field_fetchall']        = 'Pobierz wszystkie';
 $PALANG['pFetchmail_field_keep']            = 'Pozostaw';
 $PALANG['pFetchmail_field_protocol']        = 'Protokół';
-$PALANG['pFetchmail_field_usessl']          = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl']          = 'Aktywne SSL';
 $PALANG['pFetchmail_field_extra_options']   = 'Dodatkowe opcje';
 $PALANG['pFetchmail_field_mda']             = 'MDA';
 $PALANG['pFetchmail_field_date']            = 'Data';
@@ -419,7 +420,7 @@
 $PALANG['pFetchmail_desc_fetchall']         = 'Pobierz zarówno stare (przeczytane) jak i nowe wiadomości';
 $PALANG['pFetchmail_desc_keep']             = 'Pozostaw wiadomości na serwerze';
 $PALANG['pFetchmail_desc_protocol']         = 'Protokół';
-$PALANG['pFetchmail_desc_usessl']           = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl']           = 'szyfrowanie SSL';
 $PALANG['pFetchmail_desc_extra_options']    = 'Dodatkowe opcje dla fetchmail';
 $PALANG['pFetchmail_desc_mda']              = 'Mail Delivery Agent';
 $PALANG['pFetchmail_desc_date']             = 'Data ostatniego sprawdzenia/zmiany konfiguracji';

Modified: branches/postfixadmin-2.3/users/password.php
===================================================================
--- branches/postfixadmin-2.3/users/password.php	2010-06-22 20:48:06 UTC (rev 836)
+++ branches/postfixadmin-2.3/users/password.php	2010-06-22 22:14:03 UTC (rev 837)
@@ -43,8 +43,9 @@
     $fPassword = $_POST['fPassword'];
     $fPassword2 = $_POST['fPassword2'];
 
+    $error = 0;
     if(strlen($fPassword) < $CONF['min_password_length']) {
-        $error = 1;
+        $error += 1;
         flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length']));
     }
     if(!UserHandler::login($username, $fPassword_current)) {
@@ -53,11 +54,11 @@
     }
     if (empty ($fPassword) or ($fPassword != $fPassword2))
     {
-        $error = 1;
+        $error += 1;
         $pPassword_password_text = $PALANG['pPassword_password_text_error'];
     }
 
-    if ($error != 1)
+    if ($error == 0)
     {
         $uh = new UserHandler($username);
         if($uh->change_pass($fPassword_current, $fPassword)) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.