Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -r1.279.2.7 -r1.279.2.8
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	17 Feb 2014 18:38:48 -0000	1.279.2.7
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	13 Mar 2014 12:36:03 -0000	1.279.2.8
@@ -1,9 +1,9 @@
 ::xo::library doc {
-    XoWiki - package specific methods
+  XoWiki - package specific methods
 
-    @creation-date 2006-10-10
-    @author Gustaf Neumann
-    @cvs-id $Id$
+  @creation-date 2006-10-10
+  @author Gustaf Neumann
+  @cvs-id $Id$
 }
 
 namespace eval ::xowiki {
@@ -13,8 +13,8 @@
       -pretty_name "XoWiki" \
       -package_key xowiki \
       -parameter {
-	{folder_id 0}
-	{force_refresh_login false}
+        {folder_id 0}
+        {force_refresh_login false}
       }
   # {folder_id "[::xo::cc query_parameter folder_id 0]"}
 
@@ -33,7 +33,7 @@
     } elseif {$item_id} {
       set object_id $item_id
     } else {
-	error "Either item_id or revision_id must be provided"
+      error "Either item_id or revision_id must be provided"
     }
     return [::xo::dc get_value get_pid {select package_id from acs_objects where object_id = :object_id}]
   }
@@ -49,14 +49,14 @@
     when testing e.g. from the developer shell
   } {
     set package_id [my get_package_id_from_page_id \
-			-item_id $item_id \
-			-revision_id $revision_id]
+                        -item_id $item_id \
+                        -revision_id $revision_id]
     ::xo::Package initialize \
-	-export_vars false \
-	-package_id $package_id \
-	-init_url false -actual_query "" \
-	-parameter $parameter \
-	-user_id $user_id
+        -export_vars false \
+        -package_id $package_id \
+        -init_url false -actual_query "" \
+        -parameter $parameter \
+        -user_id $user_id
     set page [::xo::db::CrClass get_instance_from_db -item_id $item_id -revision_id $revision_id]
     ::$package_id set_url -url [$page pretty_link]
     return $page
@@ -128,14 +128,14 @@
         # TODO we should be able to get rid of this by using a canonical /folder/ in 
         # case of potential conflicts, like for file....
 
-	# check if we have a LANG - FOLDER "conflict"
-	set item_id [::xo::db::CrClass lookup -name $lang -parent_id [my folder_id]]
-	if {$item_id} {
-	  my msg "We have a lang-folder 'conflict' (or a two-char folder) with folder: $lang"
-	  set local_name $path
-	  if {$default_lang eq ""} {set default_lang [my default_language]}
-	  set lang $default_lang
-	}
+        # check if we have a LANG - FOLDER "conflict"
+        set item_id [::xo::db::CrClass lookup -name $lang -parent_id [my folder_id]]
+        if {$item_id} {
+          my msg "We have a lang-folder 'conflict' (or a two-char folder) with folder: $lang"
+          set local_name $path
+          if {$default_lang eq ""} {set default_lang [my default_language]}
+          set lang $default_lang
+        }
 
       } elseif {[regexp {^(file|image|swf|download/file|download/..|tag)/(.*)$} $path _ lang local_name]} {
       } else {
@@ -164,12 +164,12 @@
     foreach item_ref $inherit_folders {
       set folder [::xo::cc cache [list $package get_page_from_item_ref $item_ref]]
       if {$folder eq ""} {
-	my log "Error: Could not resolve parameter folder page '$item_ref' of FormPage [self]."
+        my log "Error: Could not resolve parameter folder page '$item_ref' of FormPage [self]."
       } else {
-	set item_id [::xo::db::CrClass lookup -name $name -parent_id [$folder item_id]]
-	if { $item_id != 0 } {
-	  return $item_id
-	}
+        set item_id [::xo::db::CrClass lookup -name $name -parent_id [$folder item_id]]
+        if { $item_id != 0 } {
+          return $item_id
+        }
       }
     }
     return 0
@@ -183,31 +183,31 @@
       # try without a prefix
       set p [my lookup -name $parent -parent_id $parent_id]
       if {$p == 0} {
-	  # check if page is inherited
-	  set p2 [my get_page_from_super -folder_id $parent_id $parent]
-	  if { $p2 != 0 } {
-	      set p $p2
-	  }
+        # check if page is inherited
+        set p2 [my get_page_from_super -folder_id $parent_id $parent]
+        if { $p2 != 0 } {
+          set p $p2
+        }
       }
 
       if {$p == 0} {
         # content pages are stored with a lang prefix
         set p [my lookup -name ${lang}:$parent -parent_id $parent_id]
         #my log "check with prefix '${lang}:$parent' returned $p"
 
-	if {$p == 0 && $lang ne "en"} {
-	  # try again with prefix "en"
-	  set p [my lookup -name en:$parent -parent_id $parent_id]
-	  #my log "check with en 'en:$parent' returned $p"
-	}
+        if {$p == 0 && $lang ne "en"} {
+          # try again with prefix "en"
+          set p [my lookup -name en:$parent -parent_id $parent_id]
+          #my log "check with en 'en:$parent' returned $p"
+        }
       }
 
       if {$p != 0} {
         if {[regexp {^([^/]+)/(.+)$} $local_name _ parent2 local_name2]} {
           set p2 [my get_parent_and_name -path $local_name -lang $lang -parent_id $p parent local_name]
           #my log "recursive call for '$local_name' parent_id=$p returned $p2"
           if {$p2 != 0} {
-           set p $p2
+            set p $p2
           }
         }
       }
@@ -266,31 +266,31 @@
       lappend ids $parent_id
       set fo [::xo::db::CrClass get_instance_from_db -item_id $parent_id]
       if { $context_url ne {} } {
-	set context_name [lindex $parts $index]
-	if {1 && $parent_id in $folder_ids} {
-	  #my msg "---- parent $parent_id in $folder_ids"
-	  set context_id [$context_id item_id]
-	  set fo [::xo::db::CrClass get_instance_from_db -item_id $context_id]
-	} else {
-	  #my msg "context_url $context_url, parts $parts, context_name $context_name // parts $parts // index $index / folder $fo"
-	  
-	  if { [$fo name] ne $context_name } {
-	    set context_folder [my get_page_from_name -parent_id $parent_id -assume_folder true -name $context_name]
-	    if {$context_folder eq ""} {
-	      my msg "my get_page_from_name -parent_id $parent_id -assume_folder true -name $context_name ==> EMPTY"
-	      my msg "Cannot lookup '$context_name' in package folder $parent_id [$parent_id name]"
-	      
-	      set new_path [join [lrange $parts 0 $index] /]
-	      set p2 [my get_parent_and_name -path [join [lrange $parts 0 $index] /] -lang "" -parent_id $parent_id parent local_name]
-	      my msg "p2=$p2 new_path=$new_path '$local_name' ex=[nsf::object::exists $p2] [$p2 name]"
-	      
-	    }
-	    my msg "context_name [$context_folder serialize]"
-	    set context_id [$context_folder item_id]
-	    set fo [::xo::db::CrClass get_instance_from_db -item_id $context_id]
-	  }
-	  incr index -1
-	}
+        set context_name [lindex $parts $index]
+        if {1 && $parent_id in $folder_ids} {
+          #my msg "---- parent $parent_id in $folder_ids"
+          set context_id [$context_id item_id]
+          set fo [::xo::db::CrClass get_instance_from_db -item_id $context_id]
+        } else {
+          #my msg "context_url $context_url, parts $parts, context_name $context_name // parts $parts // index $index / folder $fo"
+          
+          if { [$fo name] ne $context_name } {
+            set context_folder [my get_page_from_name -parent_id $parent_id -assume_folder true -name $context_name]
+            if {$context_folder eq ""} {
+              my msg "my get_page_from_name -parent_id $parent_id -assume_folder true -name $context_name ==> EMPTY"
+              my msg "Cannot lookup '$context_name' in package folder $parent_id [$parent_id name]"
+              
+              set new_path [join [lrange $parts 0 $index] /]
+              set p2 [my get_parent_and_name -path [join [lrange $parts 0 $index] /] -lang "" -parent_id $parent_id parent local_name]
+              my msg "p2=$p2 new_path=$new_path '$local_name' ex=[nsf::object::exists $p2] [$p2 name]"
+              
+            }
+            my msg "context_name [$context_folder serialize]"
+            set context_id [$context_folder item_id]
+            set fo [::xo::db::CrClass get_instance_from_db -item_id $context_id]
+          }
+          incr index -1
+        }
       }
 
       #my get_lang_and_name -name [$fo name] lang stripped_name
@@ -299,26 +299,26 @@
       if {[$fo parent_id] < 0} break
       
       if {[$fo is_link_page]} {
-	set pid [$fo package_id]
-	foreach id $ids {
-	  if {[$id package_id] ne $pid} {
-	    #my msg "SYMLINK ++++ have to fix package_id of $id from [$id package_id] to $pid"
-	    $id set_resolve_context -package_id $pid -parent_id [$id parent_id]
-	  }
-	}
-	set target [$fo get_target_from_link_page]
-	set target_name [$target name]
-	#my msg "----- $path //  target $target [$target name] package_id [$target package_id] path '$path'"
-	regsub "^$target_name/" $path "" path
-	#my msg "----> $path =>  [$fo name]/$path"
+        set pid [$fo package_id]
+        foreach id $ids {
+          if {[$id package_id] ne $pid} {
+            #my msg "SYMLINK ++++ have to fix package_id of $id from [$id package_id] to $pid"
+            $id set_resolve_context -package_id $pid -parent_id [$id parent_id]
+          }
+        }
+        set target [$fo get_target_from_link_page]
+        set target_name [$target name]
+        #my msg "----- $path //  target $target [$target name] package_id [$target package_id] path '$path'"
+        regsub "^$target_name/" $path "" path
+        #my msg "----> $path =>  [$fo name]/$path"
       }
 
       # prepend always the actual name
       set path [$fo name]/$path
       
       if {[my folder_id] == [$fo parent_id]} {
-	#my msg ".... my folder_id [my folder_id] == $fo parentid"
-	break
+        #my msg ".... my folder_id [my folder_id] == $fo parentid"
+        break
       }
 
       set parent_id [$fo parent_id]
@@ -327,7 +327,7 @@
     #my msg ====$path
     return $path
   }
-    
+  
 
   Package ad_instproc external_name {
     {-parent_id ""}
@@ -403,13 +403,13 @@
       set folder ""
     } else {
       if {$parent_id eq ""} {
-	ns_log notice "pretty_link of $name: you should consider to pass a parent_id to support folders"
-	set parent_id [my folder_id]
+        ns_log notice "pretty_link of $name: you should consider to pass a parent_id to support folders"
+        set parent_id [my folder_id]
       }
       set folder [my folder_path -parent_id $parent_id -folder_ids $folder_ids]
       set pkg [$parent_id package_id]
       if {![my isobject ::$pkg]} {
-	::xowiki::Package initialize -package_id $pkg -init_url false -keep_cc true
+        ::xowiki::Package initialize -package_id $pkg -init_url false -keep_cc true
       }
       set package_prefix [$pkg get_parameter package_prefix [$pkg package_url]]
     }
@@ -479,10 +479,10 @@
           #my msg pp=$pp,page=$page-att=$attribute
 
           if {$page ne "" && [$page exists instance_attributes]} {
-	    set __ia [$page set instance_attributes]
-	    if {[dict exists $__ia $attribute]} {
-	      set value [dict get $__ia $attribute]
-	    }
+            set __ia [$page set instance_attributes]
+            if {[dict exists $__ia $attribute]} {
+              set value [dict get $__ia $attribute]
+            }
           }
         }
       }
@@ -663,16 +663,16 @@
     will be activated, the specified method of the object will be invoked.
     make_link checks in advance, wether the actual user has enough 
     rights to invoke the method. If not, this method returns empty.
-       
+    
     @param Object The object to which the link refers to. If it is a package_id it will base \
         to the root_url of the package_id. If it is a page, it will base to the page_url
     @param method Which method to use. This will be appended as "m=method" to the url. 
 
     Examples for methods:
-     <ul>
-     <li>view: To view and existing page</li>
-     <li>edit: To edit an existing page</li>
-     <li>revisions: To view the revisions of an existing page</li>
+    <ul>
+    <li>view: To view and existing page</li>
+    <li>edit: To edit an existing page</li>
+    <li>revisions: To view the revisions of an existing page</li>
     </ul>
 
     @param args List of attributes to be append to the link. Every element 
@@ -697,7 +697,7 @@
       } else {
         lappend args [list $method 1]
         set computed_link [uplevel export_vars -base [list $base] [list $args]]
-        }
+      }
     } elseif {[$object istype ::xowiki::Page]} {
       if {[info exists link]} {
         set base $link
@@ -723,13 +723,13 @@
       # determine privilege from policy
       #my msg "-- check permissions from $id of object $object $method"
       if {[catch {
-	set granted [my check_permissions \
-			 -user_id $party_id \
-			 -package_id $id \
-			 -link $computed_link $object $method]
+        set granted [my check_permissions \
+                         -user_id $party_id \
+                         -package_id $id \
+                         -link $computed_link $object $method]
       } errorMsg ]} {
-	my log "error in check_permissions: $errorMsg"
-	set granted 0
+        my log "error in check_permissions: $errorMsg"
+        set granted 0
       }
       #my msg "--p $id check_permissions $object $method ==> $granted"
     }
@@ -744,15 +744,15 @@
     my instvar id
     # use the same instantiate_forms as everywhere; TODO: will go to a different namespace
     set form_id [lindex [::xowiki::Weblog instantiate_forms \
-			     -parent_id $parent_id \
-			     -forms $form \
-			     -package_id $id] 0]
+                             -parent_id $parent_id \
+                             -forms $form \
+                             -package_id $id] 0]
     #my log "instantiate_forms -parent_id $parent_id -forms $form => $form_id "
     if {$form_id ne ""} {
       if {$parent_id eq ""} {unset parent_id}
       set form_link [$form_id pretty_link]
       #my msg "$form -> $form_id -> $form_link -> [my make_link -with_entities 0 -link $form_link $form_id \
-      #            create-new return_url title parent_id name nls_language]"
+          #            create-new return_url title parent_id name nls_language]"
       return [my make_link -with_entities 0 -link $form_link $form_id \
                   create-new return_url title parent_id name nls_language]
     }
@@ -780,19 +780,19 @@
     #my log "--r resolve_page => $page_or_package"
     if {$page_or_package ne ""} {
       if {[$page_or_package istype ::xowiki::FormPage]
-	  && [$page_or_package is_link_page]
-	  && [[self class] exists delegate_link_to_target($method)]} {
-	# if the target is a link, we may want to call the method on the target
-	set target [$page_or_package get_target_from_link_page]
-	#my msg "delegate $method from $page_or_package [$page_or_package name] to $target [$target name]"
-	if {$target ne ""} {set page_or_package $target}
+          && [$page_or_package is_link_page]
+          && [[self class] exists delegate_link_to_target($method)]} {
+        # if the target is a link, we may want to call the method on the target
+        set target [$page_or_package get_target_from_link_page]
+        #my msg "delegate $method from $page_or_package [$page_or_package name] to $target [$target name]"
+        if {$target ne ""} {set page_or_package $target}
       }
       if {[$page_or_package procsearch $method] eq ""} {
-	return [my error_msg "Method <b>'$method'</b> is not defined for this object"]
+        return [my error_msg "Method <b>'$method'</b> is not defined for this object"]
       } else {
         #my msg "--invoke [my set object] id=$page_or_package method=$method ([my id] batch_mode $batch_mode)" 
         if {$batch_mode} {[my id] set __batch_mode 1}
-	set r [my call $page_or_package $method ""]
+        set r [my call $page_or_package $method ""]
         if {$batch_mode} {[my id] unset __batch_mode}
         return $r
       }
@@ -802,7 +802,7 @@
       set path [::xowiki::Includelet html_encode [my set object]]
       set edit_snippet [my create_new_snippet $path]
       return [my error_msg -status_code 404 -template_file $error_template \
-		  "Page <b>'$path'</b> is not available. $edit_snippet"]
+                  "Page <b>'$path'</b> is not available. $edit_snippet"]
     }
   }
 
@@ -860,7 +860,7 @@
       #
       set exported [[my set policy] defined_methods Package]
       foreach m $exported {
-	#my log "--QP my exists_query_parameter $m = [my exists_query_parameter $m] || [my exists_form_parameter $m]"
+        #my log "--QP my exists_query_parameter $m = [my exists_query_parameter $m] || [my exists_form_parameter $m]"
         if {[my exists_query_parameter $m] || [my exists_form_parameter $m]} {
           set method $m  ;# determining the method, similar file extensions
           return [self]
@@ -881,16 +881,16 @@
       # package If the method is "view", allow it to be called on the
       # root folder object.
       if {[my query_parameter m] eq "list"} {
-	my instvar folder_id
-	array set "" [list \
-			  name [$folder_id name] \
-			  stripped_name [$folder_id name] \
-			  parent_id [$folder_id parent_id] \
-			  item_id $folder_id \
-			  method [my query_parameter m]]
+        my instvar folder_id
+        array set "" [list \
+                          name [$folder_id name] \
+                          stripped_name [$folder_id name] \
+                          parent_id [$folder_id parent_id] \
+                          item_id $folder_id \
+                          method [my query_parameter m]]
       } else {
-	set object [$id get_parameter index_page "index"]
-	#my log "--o object is now '$object'"
+        set object [$id get_parameter index_page "index"]
+        #my log "--o object is now '$object'"
       }
     }
 
@@ -915,13 +915,13 @@
       # allow for now mapped standard pages just on the toplevel
       #
       set page [my get_page_from_item_ref \
-		    -allow_cross_package_item_refs false \
-		    -use_package_path true \
-		    -use_site_wide_pages true \
-		    -use_prototype_pages true \
-		    -default_lang $lang \
-		    -parent_id [my folder_id] \
-		    $standard_page]
+                    -allow_cross_package_item_refs false \
+                    -use_package_path true \
+                    -use_site_wide_pages true \
+                    -use_prototype_pages true \
+                    -default_lang $lang \
+                    -parent_id [my folder_id] \
+                    $standard_page]
       #my log "--o resolving standard_page '$standard_page' returns $page"
       if {$page ne ""} {
         return $page
@@ -952,8 +952,8 @@
         set page [$package resolve_page -simple true -lang $lang $object method]
         if {$page ne ""} {
           #my msg "set_resolve_context inherited -package_id [my id] -parent_id [my folder_id]"
-	  $page set_resolve_context -package_id [my id] -parent_id [my folder_id]
-	  return $page
+          $page set_resolve_context -package_id [my id] -parent_id [my folder_id]
+          return $page
         }
       }
       #my msg "package path done [array get {}]"
@@ -1020,24 +1020,24 @@
       # try a direct lookup; ($lang eq "file" needed for links to files)
       set item_id [::xo::db::CrClass lookup -name $stripped_name -parent_id $parent_id]
       if {$item_id != 0} {
-	set name $stripped_name
-	regexp {^(..):(.+)$} $name _ lang stripped_name
-	#my log "direct $stripped_name"
+        set name $stripped_name
+        regexp {^(..):(.+)$} $name _ lang stripped_name
+        #my log "direct $stripped_name"
       }
     }
 
     if { $item_id == 0 } {
-        set item_id [my get_page_from_super -folder_id $parent_id $stripped_name]
+      set item_id [my get_page_from_super -folder_id $parent_id $stripped_name]
+      if { $item_id == 0 } {
+        set item_id [my get_page_from_super -folder_id $parent_id ${lang}:$stripped_name]
         if { $item_id == 0 } {
-            set item_id [my get_page_from_super -folder_id $parent_id ${lang}:$stripped_name]
-            if { $item_id == 0 } {
-                set item_id [my get_page_from_super -folder_id $parent_id file:$stripped_name]
-            }
+          set item_id [my get_page_from_super -folder_id $parent_id file:$stripped_name]
         }
-	
-        if { $item_id != 0 } {
-            set name $stripped_name
-        }
+      }
+      
+      if { $item_id != 0 } {
+        set name $stripped_name
+      }
     }
 
     if {$item_id == 0} {
@@ -1046,7 +1046,7 @@
       #my log "comp $name"
     }
     return [list item_id $item_id parent_id $parent_id \
-		lang $lang stripped_name $stripped_name name $name ]
+                lang $lang stripped_name $stripped_name name $name ]
   }
 
   Package instproc lookup {
@@ -1078,21 +1078,21 @@
       #
       set p [::xo::db::CrClass get_instance_from_db -item_id $parent_id]
       if {[$p istype ::xowiki::FormPage] && [$p is_link_page] && [$p is_folder_page]} {
-	set target [$p get_target_from_link_page]
-	set target_package_id [$target package_id]
-	#my msg "SYMLINK LOOKUP from target-package $target_package_id source package $(package_id)"
-	set target_item_id [$target_package_id lookup \
-				-use_package_path $use_package_path \
-				-use_site_wide_pages $use_site_wide_pages \
-				-default_lang $default_lang \
-				-name $name \
-				-parent_id [$target item_id]]
-	if {$target_item_id != 0} {
-	  #my msg "SYMLINK FIX $target_item_id set_resolve_context -package_id [my id] -parent_id $parent_id"
-	  ::xo::db::CrClass get_instance_from_db -item_id $target_item_id
-	  $target_item_id set_resolve_context -package_id [my id] -parent_id $parent_id
-	}
-	return $target_item_id
+        set target [$p get_target_from_link_page]
+        set target_package_id [$target package_id]
+        #my msg "SYMLINK LOOKUP from target-package $target_package_id source package $(package_id)"
+        set target_item_id [$target_package_id lookup \
+                                -use_package_path $use_package_path \
+                                -use_site_wide_pages $use_site_wide_pages \
+                                -default_lang $default_lang \
+                                -name $name \
+                                -parent_id [$target item_id]]
+        if {$target_item_id != 0} {
+          #my msg "SYMLINK FIX $target_item_id set_resolve_context -package_id [my id] -parent_id $parent_id"
+          ::xo::db::CrClass get_instance_from_db -item_id $target_item_id
+          $target_item_id set_resolve_context -package_id [my id] -parent_id $parent_id
+        }
+        return $target_item_id
       }
     }
 
@@ -1276,8 +1276,8 @@
       # with the following construct we need in most cases just 1 lookup
 
       set item_id [my lookup \
-		       -use_package_path $use_package_path \
-		       -use_site_wide_pages $use_site_wide_pages \
+                       -use_package_path $use_package_path \
+                       -use_site_wide_pages $use_site_wide_pages \
                        -name $name -parent_id $parent_id]
       #my log "[my id] lookup -use_package_path $use_package_path -name $name -parent_id $parent_id => $item_id"
 
@@ -1286,25 +1286,25 @@
         # The first lookup was not successful, so we try again. 
         #
         if {$(link_type) eq "link" && $element eq $(stripped_name)} {
-	  #
-	  # try a direct lookup, in case it is a folder
-	  #
+          #
+          # try a direct lookup, in case it is a folder
+          #
           set item_id [my lookup \
-			   -use_package_path $use_package_path \
-			   -use_site_wide_pages $use_site_wide_pages \
+                           -use_package_path $use_package_path \
+                           -use_site_wide_pages $use_site_wide_pages \
                            -name $(stripped_name) -parent_id $parent_id]
           #my msg "try again direct lookup, parent_id $parent_id $(stripped_name) => $item_id"
           if {$item_id > 0} {array set "" [list prefix ""]}
-	}
+        }
 
         if {$item_id == 0 && $(link_type) eq "link" && $assume_folder && $(prefix) eq ""} {
           set item_id [my lookup \
-			   -use_package_path $use_package_path \
-			   -use_site_wide_pages $use_site_wide_pages \
+                           -use_package_path $use_package_path \
+                           -use_site_wide_pages $use_site_wide_pages \
                            -name $default_lang:$element -parent_id $parent_id]
-	  if {$item_id > 0} {array set "" [list link_type "link" prefix $default_lang stripped_name $element]
-	  }
-	}
+          if {$item_id > 0} {array set "" [list link_type "link" prefix $default_lang stripped_name $element]
+          }
+        }
 
         if {$item_id == 0 && $(link_type) eq "link" && $use_default_lang && $(prefix) ne "en"} {
           #
@@ -1313,8 +1313,8 @@
           # maybe element is folder in a different language
           #
           set item_id [my lookup \
-			   -use_package_path $use_package_path \
-			   -use_site_wide_pages $use_site_wide_pages \
+                           -use_package_path $use_package_path \
+                           -use_site_wide_pages $use_site_wide_pages \
                            -name en:$(stripped_name) -parent_id $parent_id]
           #my msg "try again in en en:$(stripped_name) => $item_id"
           if {$item_id > 0} {array set "" [list link_type "link" prefix en]}
@@ -1334,18 +1334,18 @@
               set name file:$(stripped_name)
               set (link_type) image
             }
-	    application/x-shockwave-flash {
+            application/x-shockwave-flash {
               set name file:$(stripped_name)
               set (link_type) swf
-	    }
+            }
             default {
               set name file:$(stripped_name)
               if {![info exists (link_type)]} {set (link_type) file}
             }
           }
           set item_id [my lookup \
-			   -use_package_path $use_package_path \
-			   -use_site_wide_pages $use_site_wide_pages \
+                           -use_package_path $use_package_path \
+                           -use_site_wide_pages $use_site_wide_pages \
                            -name file:$(stripped_name) -parent_id $parent_id]
         }
       }
@@ -1389,9 +1389,9 @@
     if {$default_lang eq ""} {set default_lang [my default_language]}
     my get_lang_and_name -default_lang $default_lang -path $url (lang) stripped_url
     set (parent_id) [my get_parent_and_name \
-			 -lang $(lang) -path $stripped_url \
-			 -parent_id [my folder_id] \
-			 parent (stripped_name)]
+                         -lang $(lang) -path $stripped_url \
+                         -parent_id [my folder_id] \
+                         parent (stripped_name)]
     
     #my msg "get_parent_and_name '$stripped_url' returns [array get {}]"
 
@@ -1403,41 +1403,41 @@
       # the url and query parameters and update the connection
       # context.
       if {$(lang) eq "tag"} {
-	# todo: missing: tag links to subdirectories, also on url generation
-	set tag $stripped_url
-	set summary [::xo::cc query_parameter summary 0]
-	set popular [::xo::cc query_parameter popular 0]
-	if {$summary eq ""} {set summary 0}
-	if {$popular eq ""} {set popular 0}
-	if {![string is boolean -strict $summary]} {error "summary must be boolean"}
-	if {![string is boolean -strict $popular]} {error "popular must be boolean"}
-	set tag_kind [expr {$popular ? "ptag" :"tag"}]
-	set weblog_page [my get_parameter weblog_page]
-	my get_lang_and_name -default_lang $default_lang -name $weblog_page (lang) (stripped_name)
-	#set name $(lang):$(stripped_name)
-	my set object $weblog_page
-	::xo::cc set actual_query $tag_kind=$tag&summary=$summary
+        # todo: missing: tag links to subdirectories, also on url generation
+        set tag $stripped_url
+        set summary [::xo::cc query_parameter summary 0]
+        set popular [::xo::cc query_parameter popular 0]
+        if {$summary eq ""} {set summary 0}
+        if {$popular eq ""} {set popular 0}
+        if {![string is boolean -strict $summary]} {error "summary must be boolean"}
+        if {![string is boolean -strict $popular]} {error "popular must be boolean"}
+        set tag_kind [expr {$popular ? "ptag" :"tag"}]
+        set weblog_page [my get_parameter weblog_page]
+        my get_lang_and_name -default_lang $default_lang -name $weblog_page (lang) (stripped_name)
+        #set name $(lang):$(stripped_name)
+        my set object $weblog_page
+        ::xo::cc set actual_query $tag_kind=$tag&summary=$summary
       }
     }
     array set "" [my prefixed_lookup -parent_id $(parent_id) \
-		      -default_lang $default_lang -lang $(lang) -stripped_name $(stripped_name)]
+                      -default_lang $default_lang -lang $(lang) -stripped_name $(stripped_name)]
     #my msg "prefixed_lookup '$(stripped_name)' returns [array get {}]"
 
     if {$(item_id) == 0} {
       # check symlink (todo should happen in package->lookup?)
       ::xo::db::CrClass get_instance_from_db -item_id $(parent_id)
       if {[$(parent_id) is_link_page] && [$(parent_id) is_folder_page]} {
-	set target [$(parent_id) get_target_from_link_page]
-	$target set_resolve_context -package_id [my id] -parent_id $(parent_id)
-	#my msg "SYMLINK PREFIXED $target ([$target name]) set_resolve_context -package_id [my id] -parent_id $(parent_id)"
-	array set "" [[$target package_id] prefixed_lookup -parent_id [$target item_id] \
-			  -default_lang $default_lang -lang $(lang) -stripped_name $(stripped_name)]
+        set target [$(parent_id) get_target_from_link_page]
+        $target set_resolve_context -package_id [my id] -parent_id $(parent_id)
+        #my msg "SYMLINK PREFIXED $target ([$target name]) set_resolve_context -package_id [my id] -parent_id $(parent_id)"
+        array set "" [[$target package_id] prefixed_lookup -parent_id [$target item_id] \
+                          -default_lang $default_lang -lang $(lang) -stripped_name $(stripped_name)]
       }
     }
 
     return [array get ""]
   }
-    
+  
 
 
   Package instproc get_page_from_item_ref {
@@ -1469,13 +1469,13 @@
         # TODO: we have still to check, whether or not we want
         # site-wide-pages etc.  in cross package links, and if, under
         # which parent we would like to create newly importage pages.
-	#
-	# For now, we do not want to create pages this way, we pass
-	# the root folder of the referenced package as start
-	# parent_page for the search and turn off all page creation
-	# facilities.
-	
-	#my log cross-package
+        #
+        # For now, we do not want to create pages this way, we pass
+        # the root folder of the referenced package as start
+        # parent_page for the search and turn off all page creation
+        # facilities.
+        
+        #my log cross-package
         return [$referenced_package_id get_page_from_item_ref \
                     -allow_cross_package_item_refs false \
                     -use_package_path false \
@@ -1532,8 +1532,8 @@
                     -package_id [my id] ]
       #my msg "import_prototype_page for '$(stripped_name)' => '$page'"
       if {$page ne ""} {
-	# we want to be able to address the page via ::$item_id
-	set page [::xo::db::CrClass get_instance_from_db -item_id [$page item_id]]
+        # we want to be able to address the page via ::$item_id
+        set page [::xo::db::CrClass get_instance_from_db -item_id [$page item_id]]
       }
       return $page
     }
@@ -1568,11 +1568,11 @@
   }
 
   Package proc import_prototype_page { 
-            -package_key:required 
-            -name:required 
-            -parent_id:required 
-            -package_id:required
-          } {
+                                      -package_key:required 
+                                      -name:required 
+                                      -parent_id:required 
+                                      -package_id:required
+                                    } {
     set page ""
     set fn [get_server_root]/packages/$package_key/www/prototypes/$name.page
     my log "--W check $fn"
@@ -1594,7 +1594,7 @@
       # derive the "name" from a file-name. This is not important for
       # prototype pages, so we skip it
       if {![$page istype ::xowiki::File]} {
-	$page name [$page build_name]
+        $page name [$page build_name]
       }
       if {![$page exists title]} {
         $page set title $object
@@ -1619,16 +1619,16 @@
         set page $p
       }
       if {$page ne ""} {
-	# we want to be able to address the page via the canonical name ::$item_id
-	set page [::xo::db::CrClass get_instance_from_db -item_id [$page item_id]]
+        # we want to be able to address the page via the canonical name ::$item_id
+        set page [::xo::db::CrClass get_instance_from_db -item_id [$page item_id]]
       }
     }
     return $page
   }
 
   Package proc require_site_wide_pages {
-    {-refetch:boolean false}
-  } {
+                                        {-refetch:boolean false}
+                                      } {
     set parent_id -100
     set package_id [::xowiki::Package first_instance]
     ::xowiki::Package require $package_id
@@ -1644,7 +1644,7 @@
                       -package_key $package_key \
                       -parent_id $parent_id \
                       -package_id $package_id ]
-	my log "Page en:$n loaded as '$page'"
+        my log "Page en:$n loaded as '$page'"
       }
     }
   }
@@ -1708,16 +1708,16 @@
         $f save_new
         set folder_id [$f item_id]
 
-	::xo::db::sql::acs_object set_attribute -object_id_in $folder_id \
-	    -attribute_name_in context_id -value_in $id
+        ::xo::db::sql::acs_object set_attribute -object_id_in $folder_id \
+            -attribute_name_in context_id -value_in $id
 
         my log "CREATED folder '$name' and parent $parent_id ==> $folder_id"
       }
 
       # register all specified content types
       #::xo::db::CrFolder register_content_types \
-      #    -folder_id $folder_id \
-      #    -content_types $content_types
+          #    -folder_id $folder_id \
+          #    -content_types $content_types
       #my log "returning from cache folder_id $folder_id"
       return $folder_id
     }]
@@ -1822,7 +1822,7 @@
       # compute rename rename commands for it
       #
       set gap_renames [::xowiki::utility page_order_renames -parent_id $folder_id \
-                       -start [lindex $clean 0] -from $remaining -to $remaining]
+                           -start [lindex $clean 0] -from $remaining -to $remaining]
       foreach {page_id item_id name old_page_order new_page_order} $gap_renames {
         my log "--cpo gap $page_id (name) rename $old_page_order to $new_page_order"
       }
@@ -1845,7 +1845,7 @@
     db_transaction {
       foreach {page_id item_id name old_page_order new_page_order} [concat $drop_renames $gap_renames] {
         #my log "--cpo UPDATE $page_id new_page_order $new_page_order"
-	$temp_obj item_id $item_id
+        $temp_obj item_id $item_id
         $temp_obj update_attribute_from_slot -revision_id $page_id $slot $new_page_order
         ::xo::clusterwide ns_cache flush xotcl_object_cache ::$item_id
         ::xo::clusterwide ns_cache flush xotcl_object_cache ::$page_id
@@ -1899,13 +1899,13 @@
     }
     
     set r [RSS new -destroy_on_cleanup \
-	       -package_id [my id] \
-	       -parent_ids [my query_parameter parent_ids ""] \
-	       -name_filter $name_filter \
+               -package_id [my id] \
+               -parent_ids [my query_parameter parent_ids ""] \
+               -name_filter $name_filter \
                -entries_of $entries_of \
-	       -title $title \
-	       -description $description \
-	       -days $days]
+               -title $title \
+               -description $description \
+               -days $days]
     
     #set t text/plain
     set t text/xml
@@ -1932,15 +1932,15 @@
   } {
     set package_id [my id]
     set folder_id [::$package_id folder_id]
-   
+    
     set timerange_clause ""
     
     set content {<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.google.com/schemas/sitemap/0.84"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.google.com/schemas/sitemap/0.84
-	http://www.google.com/schemas/sitemap/0.84/sitemap.xsd">
-}
+      <urlset xmlns="http://www.google.com/schemas/sitemap/0.84"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.google.com/schemas/sitemap/0.84
+    http://www.google.com/schemas/sitemap/0.84/sitemap.xsd">
+    }
 
     set sql [::xo::dc select \
                  -vars "ci.parent_id, s.body, p.name, p.creator, p.title, p.page_id,\
@@ -1988,19 +1988,19 @@
     @param priority priority as defined by google
     
   } {
-  
+    
     set content {<?xml version="1.0" encoding="UTF-8"?>
-<sitemapindex xmlns="http://www.google.com/schemas/sitemap/0.84">
-}
+      <sitemapindex xmlns="http://www.google.com/schemas/sitemap/0.84">
+    }
     foreach package_id  [::xowiki::Package instances] {
       if {![::xo::parameter get -package_id $package_id \
-	       -parameter include_in_google_sitemap_index -default 1]} {
-	continue
+                -parameter include_in_google_sitemap_index -default 1]} {
+        continue
       } 
       set last_modified [::xo::dc get_value get_newest_modification_date \
                              {select last_modified from acs_objects 
-			       where package_id = :package_id 
-			       order by last_modified desc limit 1}]
+                               where package_id = :package_id 
+                               order by last_modified desc limit 1}]
 
       set time [::xo::db::tcl_date $last_modified tz]
       set time "[clock format [clock scan $time] -format {%Y-%m-%dT%T}]${tz}:00"
@@ -2165,9 +2165,9 @@
       if {$(item_id) == 0} {
         ns_log notice "lookup of '$name' with parent_id $parent_id failed"
       } else {
-	set parent_id $(parent_id)
-	set item_id $(item_id)
-	set name $(name)
+        set parent_id $(parent_id)
+        set item_id $(item_id)
+        set name $(name)
       }
     } else {
       set name [::xo::db::CrClass get_name -item_id $item_id]
@@ -2184,20 +2184,20 @@
       # for pages using this template
       set classes [concat $object_type [$object_type info heritage]]
       if {"::xowiki::PageTemplate" in $classes} {
-	set count [::xowiki::PageTemplate count_usages -item_id $item_id -publish_status all]
-	if {$count > 0} {
-	  return [$id error_msg \
-		      [_ xowiki.error-delete_entries_first [list count $count]]]
-	}
+        set count [::xowiki::PageTemplate count_usages -item_id $item_id -publish_status all]
+        if {$count > 0} {
+          return [$id error_msg \
+                      [_ xowiki.error-delete_entries_first [list count $count]]]
+        }
       }
       if {[my get_parameter "with_general_comments" 0]} {
         #
         # We have general comments. In a first step, we have to delete
         # these, before we are able to delete the item.
         #
         set comment_ids [::xo::dc list get_comments {
-	  select comment_id from general_comments where object_id = :item_id
-	}]
+          select comment_id from general_comments where object_id = :item_id
+        }]
         foreach comment_id $comment_ids { 
           my log "-- deleting comment $comment_id"
           ::xo::db::sql::content_item del -item_id $comment_id 
@@ -2264,7 +2264,7 @@
   Class create Policy -superclass ::xo::Policy
 
   Policy policy1 -contains {
-  
+    
     Class Package -array set require_permission {
       reindex             swa
       change-page-order   {{id admin}}
@@ -2277,10 +2277,10 @@
       edit-category-tree  {{id admin}}
       delete              {{id admin}}
       edit-new            {
-	{{has_class ::xowiki::Object} swa} 
-	{{has_class ::xowiki::FormPage} nobody} 
-	{{has_name {[.](js|css)$}} id admin}
-	{id create}
+        {{has_class ::xowiki::Object} swa} 
+        {{has_class ::xowiki::FormPage} nobody} 
+        {{has_name {[.](js|css)$}} id admin}
+        {id create}
       }
     }
 
@@ -2337,10 +2337,10 @@
       edit-category-tree  {{id admin}}
       delete              swa
       edit-new            {
-	{{has_class ::xowiki::Object} swa} 
-	{{has_class ::xowiki::FormPage} nobody} 
-	{{has_name {[.](js|css)$}} swa}
-	{id create}
+        {{has_class ::xowiki::Object} swa} 
+        {{has_class ::xowiki::FormPage} nobody} 
+        {{has_name {[.](js|css)$}} swa}
+        {id create}
       }
     }
     
@@ -2392,10 +2392,10 @@
       edit-category-tree  {{id admin}}
       delete              swa
       edit-new            {
-	{{has_class ::xowiki::Object} swa} 
-	{{has_class ::xowiki::FormPage} nobody} 
-	{{has_name {[.](js|css)$}} swa}
-	{id create}
+        {{has_class ::xowiki::Object} swa} 
+        {{has_class ::xowiki::FormPage} nobody} 
+        {{has_name {[.](js|css)$}} swa}
+        {id create}
       }
     }
     
@@ -2425,12 +2425,12 @@
       edit              admin
       list              {{item_id read}}
     }
-#     Class FormPage -array set require_permission {
-#       view              {
-#         {{is_true {_creation_user = @current_user@}} item_id read}
-#         swa
-#       }
-#     }
+    #     Class FormPage -array set require_permission {
+    #       view              {
+    #         {{is_true {_creation_user = @current_user@}} item_id read}
+    #         swa
+    #       }
+    #     }
   }
 
   #Policy policy4 -contains {