Changeset 1281

Timestamp:

07/20/08 15:22:15 (4 months ago)

Author:

rats

Message:

* Fixed #755: Protected areas are not working

Files:

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

trunk/CHANGELOG

@@ -1 +1 @@
-ispCP ω 1.0.0 Changelog
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+2008-07-20 Markus Milkereit
+        - ENGINE:
+                * Fixed #755: Protected areas are not working
-
-2008-07-20 Benedikt Heintel

trunk/engine/ispcp-htuser-mngr

@@ -475 +475 @@
-
-                                if ($size < 2) {
-
-                                        del_file($htaccess_file);
-
-                                }
-
-                        }
-
-                }
-
-
-
+
-
-        return $rs if ($rs != 0);
@@ -547 +541 @@
-        }
-
+        my $hfile = (get_file($htaccess_file))[1];
+        if(!defined($hfile)) {
+                $hfile = "";
+        }
-        my $htaccess_content =
- (get_file($htaccess_file))[1]
+$hfile
-        AuthType $auth_type
-        AuthName \"$auth_name\"
@@ -651 +649 @@
-
-                foreach (split(',', $members)) {
-
-                        my $user_id = $_;
-
-                        $rs = htuser_add_user_to_group($dmn_id, $dmn_name, $ugroup, $user_id);
-
-                        return $rs if ($rs != 0);
-
-                }
-
-                $ugroups .= "$ugroup ";
-
@@ -671 +665 @@
-        my $htaccess_file = "$apache_www_dir/$dmn_name/$path/.htaccess";
-
+        my $hfile = (get_file($htaccess_file))[1];
+        if(!defined($hfile)) {
+                $hfile = "";
+        }
-        my $htaccess_content =
- (get_file($htaccess_file))[1]
+$hfile
-        AuthType $auth_type
-        AuthName \"$auth_name\"

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

@@ -219 +219 @@
-        return $sqlUpd;
-}
+
+/*
+ * Fix for ticket #755 http://www.isp-control.net/ispcp/ticket/755 (Markus Milkereit, 2008-07-20)
+ */
+function _databaseUpdate_6() {
+        $sqlUpd = array();
+
+        $sqlUpd[] = "ALTER IGNORE TABLE `htaccess`
+                                CHANGE `user_id` `user_id` VARCHAR(255) NULL DEFAULT NULL ,
+                                CHANGE `group_id` `group_id` VARCHAR(255) NULL DEFAULT NULL";
+
+        return $sqlUpd;
+}
-?>