Changeset 1350 for trunk/engine/setup

Timestamp:

09/15/08 12:36:00 (3 months ago)

Author:

scitech

Message:

Fixed #1396: Wordwrap in ticket system (admin / client). Fixed #1506: Email edit link inconsistent with other pages. Fixed #1534: Setup script fails if the same username is always used

Files:

• trunk/engine/setup/ispcp-setup (modified) (2 diffs)
• trunk/engine/setup/ispcp-setup-methods.pl (modified) (2 diffs)

trunk/engine/setup/ispcp-setup

@@ -156 +156 @@
-        #
-
-
-
+
+
+
-
-        do {
@@ -167 +168 @@
-        #
-
-
-
+
+
+
-
-        do {

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

@@ -234 +234 @@
-                $main::ua{'db_ftp_user'} = $db_user;
-        }
-
+
+
+
+
+
-                $main::ua{'db_ftp_user'} = $rdata;
-        }
@@ -471 +475 @@
-        if (!defined($rdata) || $rdata eq '') {
-                $main::ua{'db_pma_user'} = $db_user;
+        } elsif( $rdata eq $main::ua{'db_user'}){
+                $qmsg = "\n\tphpMyAdmin Control user must not be identical to system SQL user!";
+                print STDOUT $qmsg;
+                return 1;
+        } elsif ($rdata eq $main::ua{'db_ftp_user'}) {
+                $qmsg = "\n\tphpMyAdmin Control user must not be identical to ftp SQL user!";
+                print STDOUT $qmsg;
+                return 1;
-        } else {
-                $main::ua{'db_pma_user'} = $rdata;