Index: openacs-4/packages/calendar/tcl/cal-item-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/cal-item-procs.tcl,v
diff -u -N -r1.18.2.3 -r1.18.2.4
--- openacs-4/packages/calendar/tcl/cal-item-procs.tcl	30 Jun 2004 16:10:57 -0000	1.18.2.3
+++ openacs-4/packages/calendar/tcl/cal-item-procs.tcl	26 Sep 2005 17:15:57 -0000	1.18.2.4
@@ -59,6 +59,9 @@
         # are going to be inherited from the calendar permissions
         set cal_item_id [db_exec_plsql cal_item_add {}]
 
+        #removing inherited permissions
+        permission::set_not_inherit -object_id $cal_item_id
+
         assign_permission  $cal_item_id  $creation_user read
         assign_permission  $cal_item_id  $creation_user write
         assign_permission  $cal_item_id  $creation_user delete
@@ -91,11 +94,11 @@
 
     db_1row $query_name {} -column_array row
     if {$normalize_time_to_utc} {
-	set row(start_date_ansi) [lc_time_local_to_utc $row(start_date_ansi)]
-	set row(end_date_ansi) [lc_time_local_to_utc $row(end_date_ansi)]
+        set row(start_date_ansi) [lc_time_local_to_utc $row(start_date_ansi)]
+        set row(end_date_ansi) [lc_time_local_to_utc $row(end_date_ansi)]
     } else {
-	set row(start_date_ansi) [lc_time_system_to_conn $row(start_date_ansi)]
-	set row(end_date_ansi) [lc_time_system_to_conn $row(end_date_ansi)]
+        set row(start_date_ansi) [lc_time_system_to_conn $row(start_date_ansi)]
+        set row(end_date_ansi) [lc_time_system_to_conn $row(end_date_ansi)]
     }
 
     if { $row(start_date_ansi) ==  $row(end_date_ansi) && [string equal [lc_time_fmt $row(start_date_ansi) "%T"] "00:00:00"]} {
@@ -233,9 +236,9 @@
     if revoke is set to revoke, then we revoke all permissions
 } {
     if { ![string equal $revoke "revoke"] } {
-	if { ![string equal $permission "cal_item_read"] } {
+        if { ![string equal $permission "cal_item_read"] } {
             permission::grant -object_id $cal_item_id -party_id $party_id -privilege cal_item_read
-	}
+        }
         permission::grant -object_id $cal_item_id -party_id $party_id -privilege $permission
     } elseif { [string equal $revoke "revoke"] } {
         permission::revoke -object_id $cal_item_id -party_id $party_id -privilege $permission
Index: openacs-4/packages/calendar/tcl/calendar-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-procs.tcl,v
diff -u -N -r1.24.2.1 -r1.24.2.2
--- openacs-4/packages/calendar/tcl/calendar-procs.tcl	3 May 2004 10:59:16 -0000	1.24.2.1
+++ openacs-4/packages/calendar/tcl/calendar-procs.tcl	26 Sep 2005 17:19:08 -0000	1.24.2.2
@@ -61,11 +61,11 @@
     }
     
     if {$month < 10} {
-	set month "0$month"
+        set month "0$month"
     }
     
     if {$day < 10} {
-	set day "0$day"
+        set day "0$day"
     }
     
     if {[empty_string_p $event_time]} {
@@ -95,18 +95,22 @@
     }
 
     set calendar_id [db_exec_plsql create_new_calendar {
-	begin
-	:1 := calendar.new(
-	  owner_id      => :owner_id,
-	  private_p     => :private_p,
-	  calendar_name => :calendar_name,
-	  package_id    => :package_id,
-	  creation_user => :creation_user,
-	  creation_ip   => :creation_ip
-	);	
-	end;
+        begin
+        :1 := calendar.new(
+          owner_id      => :owner_id,
+          private_p     => :private_p,
+          calendar_name => :calendar_name,
+          package_id    => :package_id,
+          creation_user => :creation_user,
+          creation_ip   => :creation_ip
+        );      
+        end;
     }
     ]
+
+    #removing inherited permissions
+    permission::set_not_inherit -object_id $calendar_id
+            
     
     return $calendar_id
     
@@ -133,18 +137,18 @@
     # and set permission to read
 
     if { [string equal $cal_privilege "public"] } {
-	
+        
         set party_id [acs_magic_object "the_public"]
-	set cal_privilege "calendar_read"
+        set cal_privilege "calendar_read"
     } elseif { [string equal $cal_privilege "private"] } {
-	set cal_privilege "calendar_read"
+        set cal_privilege "calendar_read"
     } 
 
     if { [empty_string_p $revoke] } {
-	# grant the permissions
+        # grant the permissions
         permission::grant -object_id $calendar_id -party_id $party_id -privilege $cal_privilege
     } elseif { [string equal $revoke "revoke"] } {
-	# revoke the permissions
+        # revoke the permissions
         permission::revoke -object_id $calendar_id -party_id $party_id -privilege $cal_privilege
     }    
 }
@@ -162,7 +166,7 @@
 } {
     # Check whether the user is logged in at all
     if {!$party_id} {
-	return -1
+        return -1
     }
 
     if { [llength $calendar_id_list] > 0 } {
@@ -173,15 +177,15 @@
     
     if { ![string equal $result "0"] } {
 
-	if { [string equal $return_id "1"] } {
-	    return $result
-	} else {
-	    return 1
-	}
+        if { [string equal $return_id "1"] } {
+            return $result
+        } else {
+            return 1
+        }
  
     } else {
-	
-	return 0
+        
+        return 0
     }
 }