Changeset 1083

Timestamp:

03/27/08 12:59:40 (8 months ago)

Author:

rats

Message:

Fixed #1139: order settings only for one reseller

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/engine/setup/ispcp-setup (modified) (1 diff)
• trunk/engine/setup/ispcp-update (modified) (1 diff)
• trunk/gui/include/database-update-functions.php (modified) (4 diffs)

trunk/CHANGELOG

@@ -1 +1 @@
-ispCP ω 1.0.0 Changelog
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+2008-03-27 Benedikt Heintel
+        - DATABASE:
+                * Fixed #1139: order settings only for one reseller
-
-2008-03-26 Benedikt Heintel

trunk/engine/setup/ispcp-setup

@@ -282 +282 @@
-\tispCP '$main::cfg{'Version'}' Setup completed successfully!
-
-
+
+
-
-MSG

trunk/engine/setup/ispcp-update

@@ -908 +908 @@
-}
-
+sub update_shut_down {
+        push_el(\@main::el, 'setup_shut_down()', 'Starting...');
+
+        my ($rs, $rdata) = (undef, undef);
+
+        my $cmd = "$main::cfg{'CMD_SHELL'} $main::cfg{'ROOT_DIR'}/engine/setup/set-gui-permissions.sh";
+        $rs = sys_command($cmd);
+        return $rs if ($rs != 0);
+
+        $cmd = "$main::cfg{'CMD_SHELL'} $main::cfg{'ROOT_DIR'}/engine/setup/set-engine-permissions.sh";
+        $rs = sys_command($cmd);
+        return $rs if ($rs != 0);
+
+        my $shut_down_message = <<MSG;
+
+\tCongratulations!
+
+\tispCP '$main::cfg{'Version'}' Update completed successfully!
+
+\tPlease type http://$main::ua{'admin_vhost'} in your browser,
+\tlog in with your Administrator Account and perform Database Updates if exists.
+
+MSG
+        print STDOUT $shut_down_message;
+
+        push_el(\@main::el, 'setup_shut_down()', 'Ending...');
+        return 0;
+}
+
-sub exit_werror {
-    my ($msg, $code) = @_;

trunk/gui/include/database-update-functions.php

@@ -113 +113 @@
-
-        $query = "INSERT INTO config (name, value) VALUES (? , ?)";
-$rs = 
+
-}
-
@@ -142 +142 @@
-        $sqlUpd[] = "UPDATE `mail_users`, `subdomain`, `domain`
-                SET `mail_addr` = CONCAT(`mail_acc`,'@',`subdomain_name`,'.',`domain_name`)
- 
+
-                        AND `mail_users`.`domain_id` = `domain`.`domain_id`
-                        AND (`mail_type` = 'subdom_mail' OR `mail_type` = 'subdom_forward')";
@@ -161 +161 @@
-        $sqlUpd[] = "UPDATE `mail_users`, `subdomain`, `domain`
-                SET `mail_addr` = CONCAT('@',`subdomain_name`,'.',`domain_name`)
- 
+
-                        AND `mail_users`.`domain_id` = `domain`.`domain_id`
-                        AND `mail_type` = 'subdom_catchall'";
-
-foreach($sqlUpd as $s) 
-
+
+foreach($sqlUpd as $s) 
-                $sql->Execute($s);
-        }
@@ -172 +172 @@
-} // end of _databaseUpdate_2
-
+/*
+ * Fix for Ticket #1139 http://www.isp-control.net/ispcp/ticket/1139
+ * written by Benedikt Heintel, 2008-03-27
+ */
+function _databaseUpdate_3() {
+        global $sql; // we need the gloabl database connection
+
+        $query = "ALTER IGNORE TABLE `orders_settings` CHANGE `id` `id` int(10) unsigned NOT NULL auto_increment";
+        $sql->Execute($query);
+
+} // end of _databaseUpdate_3
-?>