Changeset 1043

Timestamp:

03/10/08 02:17:56 (9 months ago)

Author:

joximu

Message:

Fixed #1099, #1100 and some small typos in setup and german language

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/engine/setup/ispcp-setup (modified) (1 diff)
• trunk/engine/setup/ispcp-setup-methods.pl (modified) (2 diffs)
• trunk/language-files/de_DE.po (modified) (1 diff)

trunk/CHANGELOG

@@ -1 +1 @@
-ispCP ω 1.0.0 Changelog
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+2008-03-10 Christian Hernmarck
+        - SETUP:
+                * Fixed #1099: 1042 - ispcp-setup compilation errors
+                * Fixed #1100: authdaemonrc - wrong content
-
-2008-03-08 Benedikt Heintel

trunk/engine/setup/ispcp-setup

@@ -480 +480 @@
-        } else {
-                # change folder permissions and owner
-$prefix$muid, $prefix$mgid
+"$prefix$muid", "$prefix$mgid"
-                return $rs if ($rs != 0);
-        }

trunk/engine/setup/ispcp-setup-methods.pl

@@ -1474 +1474 @@
-                }
-                if ( -e "$main::cfg{'COURIER_CONF_DIR'}/imapd-ssl" ) {
-
+-ssl
-                        $rs = sys_command($cmd);
-                        return $rs if ($rs != 0);
-                }
-                if ( -e "$main::cfg{'COURIER_CONF_DIR'}/pop3d-ssl" ) {
-
+-ssl
-                        $rs = sys_command($cmd);
-                        return $rs if ($rs != 0);
@@ -1485 +1485 @@
-                if ( -e $main::cfg{'AUTHLIB_CONF_DIR'} && $main::cfg{'AUTHLIB_CONF_DIR'}) {
-                        if ( -e "$main::cfg{'AUTHLIB_CONF_DIR'}/authdaemonrc" ) {
+                                ### first make backup, before updating
+                                $cmd = "$main::cfg{'CMD_CP'} -p $main::cfg{'AUTHLIB_CONF_DIR'}/authdaemonrc $bk_dir/authdaemonrc.system";
+                                $rs = sys_command($cmd);
+                                return $rs if ($rs != 0);
+
-                                #### Update authdaemonrc
-
+
+
-                                $rdata =~ s/authmodulelist="/authmodulelist="authuserdb /gi;
-                                $rs = save_file("$main::cfg{'AUTHLIB_CONF_DIR'}/authdaemonrc", $rdata);
-                                return $rs if ($rs != 0);
-
-
+
+
+
+
+
+
-                                $rs = sys_command($cmd);
-                                return $rs if ($rs != 0);
-
-
-
-
+
-                                #### Update authdaemonrc
-
+
+
+
-                                $rdata =~ s/authmodulelist="/authmodulelist="authuserdb /gi;
-                                $rs = save_file("$main::cfg{'COURIER_CONF_DIR'}/authdaemonrc", $rdata);
-                                return $rs if ($rs != 0);
-
-                                $cmd = "$main::cfg{'CMD_CP'} -p $main::cfg{'COURIER_CONF_DIR'}/authdaemonrc $bk_dir/authdaemonrc.system";
-                                $rs = sys_command($cmd);
-                                return $rs if ($rs != 0);
-                        }

trunk/language-files/de_DE.po

@@ -2093 +2093 @@
-
-msgid "Delete CatchAll"
-Konto wird gelöscht
+löschen
-
-msgid "None"