Changeset 1275

Timestamp:

07/18/08 09:28:29 (1 month ago)

Author:

rats

Message:

* Fixed #1423: e-mail as normal mail and e-mail forward not in /etc/courier/userdb
* Fixed #1424: Adminstrator password created by setup is truncated at 8 characters
* Fixed #1428: ispell is needed for webmail

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/docs/Debian/debian-packages-etch (modified) (1 diff)
• trunk/docs/Debian/debian-packages-lenny (modified) (1 diff)
• trunk/docs/Debian/debian-packages-sarge (modified) (1 diff)
• trunk/docs/Ubuntu/ubuntu-packages-edgy (modified) (1 diff)
• trunk/docs/Ubuntu/ubuntu-packages-feisty (modified) (1 diff)
• trunk/docs/Ubuntu/ubuntu-packages-gutsy (modified) (1 diff)
• trunk/docs/Ubuntu/ubuntu-packages-hardy (modified) (1 diff)
• trunk/engine/ispcp-mbox-mngr (modified) (25 diffs)
• trunk/engine/ispcp_common_methods.pl (modified) (1 diff)
• trunk/engine/setup/ispcp-setup (modified) (1 diff)
• trunk/gui/include/login.php (modified) (3 diffs)

trunk/CHANGELOG

@@ -10 +10 @@
-                * Fixed #1420: Missing menu when a client try to edit email: client/mail_edit.php
-                * Fixed #1421: Client can`t change sql password: client/sql_change_password.php (template error)
+                * Fixed #1423: e-mail as normal mail and e-mail forward not in /etc/courier/userdb
+                * Fixed #1424: Adminstrator password created by setup is truncated at 8 characters
+                * Fixed #1428: ispell is needed for webmail
-
-2008-07-16 Benedikt Heintel

trunk/docs/Debian/debian-packages-etch

@@ -18 +18 @@
-gzip
-iptables
+ispell
-libapache2-mod-cband
-libapache2-mod-fastcgi

trunk/docs/Debian/debian-packages-lenny

@@ -18 +18 @@
-gzip
-iptables
+ispell
-libapache2-mod-fastcgi
-libberkeleydb-perl

trunk/docs/Debian/debian-packages-sarge

@@ -16 +16 @@
-gzip
-iptables
+ispell
-libapache2-mod-fastcgi
-libberkeleydb-perl

trunk/docs/Ubuntu/ubuntu-packages-edgy

@@ -14 +14 @@
-gzip
-iptables
+ispell
-libapache2-mod-cband
-libapache2-mod-fastcgi

trunk/docs/Ubuntu/ubuntu-packages-feisty

@@ -16 +16 @@
-gzip
-iptables
+ispell
-libapache2-mod-cband
-libapache2-mod-fastcgi

trunk/docs/Ubuntu/ubuntu-packages-gutsy

@@ -16 +16 @@
-gzip
-iptables
+ispell
-libapache2-mod-cband
-libapache2-mod-fastcgi

trunk/docs/Ubuntu/ubuntu-packages-hardy

@@ -17 +17 @@
-gzip
-iptables
+ispell
-libapache2-mod-fastcgi
-libberkeleydb-perl

trunk/engine/ispcp-mbox-mngr

@@ -330 +330 @@
-        my ($hash_key, $hash_value, $dmn_name) = (undef, undef, undef);
-
-^
+.*
-
-                $dmn_name = $main::domain_id_name{$mail_dmn_id};
@@ -338 +338 @@
-                $hash_value = "$mail_acc\@$dmn_name$mail_forward_list,$mail_acc\@ispcp-arpl.$dmn_name";
-
-^
+.*
-
-                $dmn_name = $main::als_id_name{$mail_sub_id};
@@ -346 +346 @@
-                $hash_value = "$mail_acc\@$dmn_name$mail_forward_list,$mail_acc\@ispcp-arpl.$dmn_name";
-
-^
+.*
-
-                my $sub_pref = $main::sub_id_name{$mail_sub_id};
@@ -394 +394 @@
-        return $rs if ($rs != 0);
-
-^normal_mail.*/ || $mail_type =~ /^alias_mail.*/ || $mail_type  =~ /^
+.*normal_mail.*/ || $mail_type =~ /.*alias_mail.*/ || $mail_type  =~ /.*
-
-    do {
@@ -462 +462 @@
-        return $rs if ($rs != 0);
-
-eq 'normal_forward' || $mail_type eq 'alias_forward'
+=~ /.*normal_forward.*/ || $mail_type =~ /.*alias_forward.*/
-
-    do {
@@ -519 +519 @@
-        return $rs if ($rs != 0);
-
-eq 'subdom_forward'
+=~ /.*subdom_forward.*/
-
-    $rs = sys_command("$cmd_postmap $transport_cfg");
@@ -553 +553 @@
-    my $mail_type = @$mbox_data[5];
-
-eq 'alias_mail' || $mail_type eq 'alias_forward'
+=~ /.*alias_mail.*/ || $mail_type =~ /.*alias_forward.*/
-
-        $sql = "select count(mail_id) as cnt from mail_users where (status = 'ok' or status = 'change') and mail_auto_respond != '_no_' and domain_id = $mail_dmn_id and sub_id = $mail_sub_id and mail_type != 'normal_catchall' and mail_type != 'alias_catchall';";
@@ -610 +610 @@
-    my $hash_key = "ispcp-arpl.$dmn_name";
-
-eq 'alias_mail' || $mail_type eq 'alias_forward'
+=~ /.*alias_mail.*/ || $mail_type =~ /.*alias_forward.*/
-
-        my $als_name = $main::als_id_name{$mail_sub_id};
@@ -736 +736 @@
-    do {
-
-^
+.*
-
-                $dmn_name = $main::domain_id_name{$mail_dmn_id};
@@ -742 +742 @@
-                $hash_key = "$mail_acc\@$dmn_name";
-
-^
+.*
-
-                $dmn_name = $main::als_id_name{$mail_sub_id};
@@ -748 +748 @@
-                $hash_key = "$mail_acc\@$dmn_name";
-
-^
+.*
-
-            my $sub_pref = $main::sub_id_name{$mail_sub_id};
@@ -1156 +1156 @@
-        }
-
-eq 'normal_forward' || $mail_type eq 'alias_forward' || $mail_type eq 'subdom_forward'
+=~ /.*normal_forward.*/ || $mail_type =~ /.*alias_forward.*/ || $mail_type =~ /.*subdom_forward.*/
-
-    do {
@@ -1492 +1492 @@
-        }
-
-eq 'normal_forward' || $mail_type eq 'alias_forward' || $mail_type eq 'subdom_forward'
+=~ /.*normal_forward.*/ || $mail_type =~ /.*alias_forward.*/ || $mail_type =~ /.*subdom_forward.*/
-
-    do {
@@ -1891 +1891 @@
-
-
-eq 'normal_mail'
+=~ /^normal_mail.*/
-
-    do {
@@ -1910 +1910 @@
-
-
-eq 'alias_mail'
+=~ /^alias_mail.*/
-
-    do {
@@ -1933 +1933 @@
-
-
-eq 'subdom_mail'
+=~ /^subdom_mail.*/
-
-    ($rs, $working) = get_file($userdb_working_cfg);
@@ -2036 +2036 @@
-
-
-eq 'normal_mail'
+=~ /.*normal_mail.*/
-
-    do {
@@ -2049 +2049 @@
-
-
-eq 'alias_mail'
+=~ /.*alias_mail.*/
-
-    do {
@@ -2066 +2066 @@
-
-
-eq 'subdom_mail'
+=~ /.*subdom_mail.*/
-
-    ($rs, $working) = get_file($userdb_working_cfg);
@@ -2197 +2197 @@
-        $hash_value = "OK";
-
-eq 'normal_mail'
+=~ /.*normal_mail.*/
-
-    do {
@@ -2219 +2219 @@
-        $hash_value = "OK";
-
-eq 'alias_mail'
+=~ /.*alias_mail.*/
-
-    do {
@@ -2245 +2245 @@
-        $hash_value = "OK";
-
-eq 'subdom_mail'
-
- eq 'normal_mail' || $mail_type eq 'subdom_mail' || $mail_type eq 'alias_mail'
+=~ /.*subdom_mail.*/
+
+=~ /.*normal_mail.*/ || $mail_type=~ /.*subdom_mail.*/ || $mail_type=~ /.*alias_mail.*/
-
-
@@ -2369 +2369 @@
-        $hash_value = "OK";
-
-eq 'normal_mail'
+=~ /.*normal_mail.*/
-
-    do {
@@ -2391 +2391 @@
-        $hash_value = "OK";
-
-eq 'alias_mail'
+=~ /.*alias_mail.*/
-
-    do {
@@ -2417 +2417 @@
-        $hash_value = "OK";
-
-eq 'subdom_mail'
+=~ /.*subdom_mail.*/
-
-    if ($mail_type eq 'normal_mail' || $mail_type eq 'subdom_mail' || $mail_type eq 'alias_mail') {

trunk/engine/ispcp_common_methods.pl

@@ -1041 +1041 @@
-    }
-
-2
+8
-
-    return (-1, '') if ($rs != 0);

trunk/engine/setup/ispcp-setup

@@ -717 +717 @@
-        #
-
-
+md5_
-
-        $sql = "INSERT INTO admin (admin_id, admin_name, admin_pass, admin_type, email) VALUES  (1, '$main::ua{'admin'}','$admin_password', 'admin','$main::ua{'admin_email'}')";

trunk/gui/include/login.php

@@ -50 +50 @@
-
-            if (isset($_SESSION['user_logged'])) {
-$uname." user already logged or session sharing problem! Aborting..."
+tr("%s user already logged or session sharing problem! Aborting...", $uname)
-                system_message(tr('User already logged or session sharing problem! Aborting...'));
-                unset_user_login_data();
@@ -57 +57 @@
-
-            if (!is_userdomain_ok($uname)) {
-$uname." Domain status is not OK - user cannot login"
+tr("%s's account status is not ok!", $uname)
-                system_message(tr("%s's account status is not ok!", $uname));
-                return false;
@@ -88 +88 @@
-        } else {
-                $backButtonDestination = 'http://' . Config::get('BASE_SERVER_VHOST');
-
+
-                write_log($uname . ' entered incorrect password.');
-                system_message(tr('You entered an incorrect password.'), $backButtonDestination);