Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -r1.182 -r1.183
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	12 Jul 2010 15:13:19 -0000	1.182
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	13 Jul 2010 11:22:23 -0000	1.183
@@ -2131,24 +2131,9 @@
 
   include instproc convert_to_internal {} {
     my instvar object value
-    set page [[$object package_id] get_page_from_item_ref \
-		  -default_lang [$object lang] \
-		  -parent_id [$object parent_id] \
-		  $value]
-    #my msg "$value => $page, o package_id [$object package_id] t [$page object_id]"
 
-    if {$page ne ""} {
-      set item_id [$page item_id]
-      set link_type [expr {[$page is_folder_page] ? "folder_link" : "link"}]
-      set cross_package [expr {[$object package_id] != [$page package_id]}]
-    } else {
-      set item_id 0
-      set link_type "unresolved"
-      set cross_package 0
-    }
-    # rewrite value field
-    set value [list item_ref $value item_id $item_id link_type $link_type cross_package $cross_package]
-    $object set_property -new 1 [my name] $value
+    set props [$object compute_link_properties $value]
+    $object set_property -new 1 [my name] $props
 
   }
   include instproc convert_to_external {value} {
@@ -2185,14 +2170,16 @@
     }
     $object lappend references [list [$page item_id] $(link_type)]
 
-    #my msg "[$object name] ref $(item_ref) change parent from [$page parent_id] to [$object item_id]"
-    #my msg "could switch from [$page item_id] to [$object item_id]"
-    #::xo::cc set queryparm(__object) $object
-
+    #my msg "could switch from [$page item_id] [$page package_id] to [$object item_id] [$object package_id]"
+    #
     # resetting esp. the item-id is dangerous. Therefore we reset it immediately after the rendering
-    $page set_resolve_context -package_id [$object package_id] -parent_id [$object parent_id] -item_id [$object item_id]
+    #
+    $page set_resolve_context \
+	-package_id [$object package_id] -parent_id [$object parent_id] \
+	-item_id [$object item_id]
     set html [$page render]
-    $page set item_id [$page set physical_item_id]
+    #my msg "reset resolve-context"
+    $page reset_resolve_context
 
     return $html
   }
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.230 -r1.231
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	12 Jul 2010 15:13:19 -0000	1.230
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	13 Jul 2010 11:22:23 -0000	1.231
@@ -1306,7 +1306,7 @@
                       -parent_id $search_parent_id \
                       $link]
 
-    #my log  "[my instance_name] (root [my folder_id]) item-ref for '$link' search parent $search_parent_id, parent $parent_id, returns\n[array get {}]"
+    #my msg  "[my instance_name] (root [my folder_id]) item-ref for '$link' search parent $search_parent_id, parent $parent_id, returns\n[array get {}]"
     if {$(item_id)} {
       set page [::xo::db::CrClass get_instance_from_db -item_id $(item_id)]
       if {[$page package_id] ne [my id] || [$page parent_id] != $(parent_id)} {
@@ -1939,21 +1939,22 @@
       set name [my query_parameter name]
     }
 
-    if {$item_id eq "" && $name ne ""} {
-      array set "" [my item_info_from_url $name]
+    if {$item_id eq ""} {
+      array set "" [my item_info_from_url -with_package_prefix false $name]
       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)
       }
-    } elseif {$item_id ne ""} {
+    } else {
+      set name [::xo::db::CrClass get_name -item_id $item_id]
       if {![info exists parent_id]} {
         set parent_id [::xo::db::CrClass get_parent_id -item_id $item_id]
       }
     }
-    #my msg item_id=$item_id
+    #my msg item_id=$item_id/name=$name
 
     if {$item_id ne ""} {
       my log "--D trying to delete $item_id $name"
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.419 -r1.420
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	12 Jul 2010 15:13:19 -0000	1.419
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	13 Jul 2010 11:22:23 -0000	1.420
@@ -881,32 +881,49 @@
   #
   # check certain properties of a page (is_* methods)
   #
+  
+  # 
+  # Check, if page is a folder
+  #
   Page instproc is_folder_page {{-include_folder_links true}} {
-    #
-    # Check, if current page is a folder, or a link to a folder
-    #
-    #my msg "[my name] istype FormPage [my istype ::xowiki::FormPage]"
-    if {![my istype ::xowiki::FormPage]} {return 0}
+    return 0
+  }
+  FormPage instproc is_folder_page {{-include_folder_links true}} {
     set page_template_name [[my page_template] name]
     if {$page_template_name eq "en:folder.form"} {return 1}
     if {$include_folder_links && $page_template_name eq "en:link.form"} {
-      set link [my property link]
-      #my msg link=$link
-      # we are called also by the validator, maybe before convert_to_internal....
-      if {$link eq "" || [llength $link] < 2} {return 0}
-      array set "" $link
-      return [expr {[info exists (link_type)] && $(link_type) eq "folder_link"}]
+      set link_type [my get_property_from_link_page link_type ""]
+      return [expr {$link_type eq "folder_link"}]
     }
     return 0
   }
 
-  Page instproc get_page_from_link_page {} {
-    if {![my is_link_page]} {return ""}
+  #
+  # Check, if a page is a link
+  #
+  Page instproc is_link_page {} {
+    return 0
+  }
+  FormPage instproc is_link_page {} {
+    return [expr {[[my page_template] name] eq "en:link.form"}]
+  }
+
+  #
+  # link properties
+  #
+  Page instproc get_property_from_link_page {property {default ""}} {
+    if {![my is_link_page]} {return $default}
     set link [my property link]
-    if {$link eq "" || [llength $link] < 2} {return ""}
+    if {$link eq "" || [llength $link] < 2} {return $default}
     array set "" $link
-    if {$(item_id) == 0} {return ""}
-    set target [::xo::db::CrClass get_instance_from_db -item_id $(item_id)]
+    if {[info exists ($property)]} {return $($property)}
+    return $default
+  }
+
+  Page instproc get_page_from_link_page {} {
+    set item_id [my get_property_from_link_page item_id 0]
+    if {$item_id == 0} {return ""}
+    set target [::xo::db::CrClass get_instance_from_db -item_id $item_id]
     set target_package_id [$target package_id]
     if {$target_package_id != [my package_id]} {
       ::xowiki::Package require $target_package_id
@@ -915,25 +932,53 @@
     return $target
   }
 
-  Page instproc is_link_page {} {
-    #
-    # Check, if current page is a link
-    #
-    #my msg "[my name] istype FormPage [my istype ::xowiki::FormPage]"
-    if {![my istype ::xowiki::FormPage]} {return 0}
-    set page_template_name [[my page_template] name]
-    if {$page_template_name eq "en:link.form"} {return 1}
-    return 0
+  FormPage instproc get_verified_link_type_from_link_page {} {
+    set link_type [my get_property_from_link_page link_type "unresolved"]
+    if {1 || $link_type eq "unresolved"} {
+      # to to resolve again
+      set props [my compute_link_properties [my get_property_from_link_page item_ref]]
+      array set "" $props
+      # if link_type is now unresolved, update the link properties 
+      if {$(link_type) ne $link_type} {
+	set link_type $(link_type)
+	my set_property -new 1 link $props
+	my save
+	my msg "rewritten"
+      }
+    }
+    return $link_type
   }
 
+  FormPage instproc compute_link_properties {item_ref} {
+    my instvar package_id
+    set page [$package_id get_page_from_item_ref \
+		  -default_lang [my lang] \
+		  -parent_id [my parent_id] \
+		  $item_ref]
+    #my msg "$item_ref => $page, o package_id [my package_id] t [$page object_id]"
+
+    if {$page ne ""} {
+      set item_id [$page item_id]
+      set link_type [expr {[$page is_folder_page] ? "folder_link" : "link"}]
+      set cross_package [expr {$package_id != [$page package_id]}]
+    } else {
+      set item_id 0
+      set link_type "unresolved"
+      set cross_package 0
+    }
+    return [list item_ref $item_ref item_id $item_id link_type $link_type cross_package $cross_package]
+  }
+
+  #
+  # Check, if a page is a form
+  #
+
   Page instproc is_form {} {
     return 0
   }
-
   Form instproc is_form {} {
     return 1
   }
-
   FormPage instproc is_form {} {
     return [my exists_property form_constraints]
   }
@@ -1006,6 +1051,15 @@
       my set item_id $item_id
     }
   }
+  Page instproc reset_resolve_context {} {
+    foreach att {item package parent} {
+      set name physical_${att}_id
+      if {[my exists $name]} {
+	my set ${att}_id [my set $name]
+	my unset $name
+      }
+    }
+  }
 
   Page instproc physical_parent_id {} {
     if {[my exists physical_parent_id]} {
@@ -3085,6 +3139,19 @@
       en:folder.form {
 	return [list text "<img src='/resources/file-storage/folder.gif' width='12'>" is_richtext true]
       }
+      en:link.form {
+	set link_type [my get_verified_link_type_from_link_page]
+	set link_icon "http://www.ejoe.at/typo3/sysext/rtehtmlarea/res/accessibilityicons/img/internal_link.gif"
+	if {$link_type eq "unresolved"} {
+	  return [list text "<img src='$link_icon' width='12'> \
+		<img src='http://www.deeptrawl.com/images/icons/brokenLinks.png' width='15'>" is_richtext true]
+	} 
+	if {$link_type eq "folder_link"} {
+	  return [list text "<img src='$link_icon' width='12'> \
+		<img src='/resources/file-storage/folder.gif' width='12'>" is_richtext true]
+	}
+	return [list text "<img src='$link_icon' width='12'>" is_richtext true]
+      }
       default {
 	return [list text [$page_template title] is_richtext false]
       }