Index: openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl,v
diff -u -r1.6.2.3 -r1.6.2.4
--- openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl	29 Sep 2013 20:10:01 -0000	1.6.2.3
+++ openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl	13 Oct 2013 18:15:13 -0000	1.6.2.4
@@ -293,7 +293,7 @@
 			[lindex $elements(main) 0] : ""}]
   set prefix "This file defines the following Objects and Classes"
   set entry [::xotcl::api object_link $scope [self]]
-  if {![string match *$prefix* $oldDoc]} {
+  if {![string match "*$prefix*" $oldDoc]} {
     append oldDoc "<p>$prefix: $entry"
   } else {
     append oldDoc ", $entry"
Index: openacs-4/packages/xotcl-core/tcl/40-thread-mod-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/40-thread-mod-procs.tcl,v
diff -u -r1.12 -r1.12.2.1
--- openacs-4/packages/xotcl-core/tcl/40-thread-mod-procs.tcl	12 Aug 2013 20:01:06 -0000	1.12
+++ openacs-4/packages/xotcl-core/tcl/40-thread-mod-procs.tcl	13 Oct 2013 18:15:14 -0000	1.12.2.1
@@ -262,7 +262,7 @@
 # ::xotcl::THREAD::Proxy configure \
 #     -instproc forward args {
 #       set cp [self calledproc]
-#       if { [string equal $cp "attach"] 
+#       if { $cp eq "attach"
 # 	   || $cp eq "filter" 
 # 	   || $cp eq "detachAll"} {
 # 	next
Index: openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl,v
diff -u -r1.47.2.4 -r1.47.2.5
--- openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl	30 Sep 2013 11:38:40 -0000	1.47.2.4
+++ openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl	13 Oct 2013 18:15:14 -0000	1.47.2.5
@@ -16,7 +16,7 @@
 # catch {ns_conn contentsentlength} alone does not work, since we do not have
 # a connection yet, and the bgdelivery won't be activated
 catch {ns_conn xxxxx} msg
-if {![string match *contentsentlength* $msg]} {
+if {![string match "*contentsentlength*" $msg]} {
   ns_log notice "AOLserver is not patched for bgdelivery, NOT loading bgdelivery"
 
   ad_proc -public ad_returnfile_background {-client_data status_code mime_type filename} {
@@ -230,7 +230,7 @@
 
   ::AsyncDiskWriter instproc close {{-sync false}} {
     my instvar content channel
-    if {$sync || [string length $content] == 0} {
+    if {$sync || $content eq ""} {
       my log "close sync"
       if {$content ne ""} {
 	fconfigure $channel -translation binary -blocking true
@@ -522,7 +522,7 @@
     ::xo::ConnectionContext require
   }
   set query [::xo::cc actual_query]
-  set use_h264 [expr {[string match video/mp4* $mime_type] && $query ne "" 
+  set use_h264 [expr {[string match "video/mp4*" $mime_type] && $query ne "" 
                       && ([string match {*start=[1-9]*} $query] || [string match {*end=[1-9]*} $query])
                       && [info command h264open] ne ""}]
 
Index: openacs-4/packages/xotcl-core/tcl/generic-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/generic-procs.tcl,v
diff -u -r1.94 -r1.94.6.1
--- openacs-4/packages/xotcl-core/tcl/generic-procs.tcl	27 Oct 2009 11:34:44 -0000	1.94
+++ openacs-4/packages/xotcl-core/tcl/generic-procs.tcl	13 Oct 2013 18:15:14 -0000	1.94.6.1
@@ -163,7 +163,7 @@
     if {$link eq "view"} {
       set link [export_vars -base $link {item_id}]
     }
-    #ns_log notice "-- redirect to $link // [string match *\?* $link]"
+    #ns_log notice "-- redirect to $link // [string match "*\?*" $link]"
     ad_returnredirect $link
     ad_script_abort
   }
Index: openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl,v
diff -u -r1.41.2.8 -r1.41.2.9
--- openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl	11 Oct 2013 10:17:22 -0000	1.41.2.8
+++ openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl	13 Oct 2013 18:16:12 -0000	1.41.2.9
@@ -266,7 +266,7 @@
   Throttle instproc add_url_stat {url time_used key pa content_type} {
     catch {my unset running_url($key,$url)}
     #my log "### unset running_url($key,$url) $errmsg"
-    if {[string match text/html* $content_type]} {
+    if {[string match "text/html*" $content_type]} {
       [Users current_object] add_view $key
     }
     response_time_minutes add_url_stat $url $time_used $key
@@ -605,7 +605,7 @@
   } {
     set ip 0; set auth 0
     foreach i [my array names pa] {
-      if {[string match *.* $i]} {incr ip} {incr auth}
+      if {[string match "*.*" $i]} {incr ip} {incr auth}
     }
     return [list $ip $auth]
   }
@@ -802,7 +802,7 @@
       my incr refcount($key)
     } else {
       my set refcount($key) 1
-      if {[string match *.* $key]} {my incr ip24} {my incr auth24}
+      if {[string match "*.*" $key]} {my incr ip24} {my incr auth24}
     }
     my set pa($key) $pa
     my set timestamp($key) [clock seconds]
@@ -831,7 +831,7 @@
     #
     my set ip24 0; my set auth24 0
     foreach i [my array names timestamp] {
-      if {[string match *.* $i]} {my incr ip24} {my incr auth24}
+      if {[string match "*.*" $i]} {my incr ip24} {my incr auth24}
     }
   }
   Users proc nr_users_per_day {} {
@@ -841,7 +841,7 @@
     my instvar timestamp
     set ip [list]; set auth [list]
     foreach i [array names timestamp] {
-      if {[string match *.* $i]} {lappend ip [list $i $timestamp($i)]} {lappend auth [list $i $timestamp($i)]}
+      if {[string match "*.*" $i]} {lappend ip [list $i $timestamp($i)]} {lappend auth [list $i $timestamp($i)]}
     }
     return [list $ip $auth]
   }  
@@ -896,7 +896,7 @@
 	#my log "--- $i expired $d days $h hours $m minutes ago"
 	my unset timestamp($i)
       } else {
-        if {[string match *.* $i]} {my incr ip24} {my incr auth24}
+        if {[string match "*.*" $i]} {my incr ip24} {my incr auth24}
       }
     }
     dump write
Index: openacs-4/packages/xotcl-request-monitor/www/stat-details.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/stat-details.tcl,v
diff -u -r1.5.2.2 -r1.5.2.3
--- openacs-4/packages/xotcl-request-monitor/www/stat-details.tcl	17 Sep 2013 07:19:18 -0000	1.5.2.2
+++ openacs-4/packages/xotcl-request-monitor/www/stat-details.tcl	13 Oct 2013 18:16:13 -0000	1.5.2.3
@@ -181,7 +181,7 @@
     }
     
     t1 add 	-url [string_truncate_middle -len 80 $url] \
-  	        -url.href [expr {[string match *...* $url] ? "" : "[ad_url]$url" }] \
+  	        -url.href [expr {[string match "*...*" $url] ? "" : "[ad_url]$url" }] \
 		-totaltime [lindex $l 1] \
 		-cnt [lindex $l 2] \
 		-avg $avg \
Index: openacs-4/packages/xotcl-request-monitor/www/throttle-statistics.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/throttle-statistics.tcl,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/xotcl-request-monitor/www/throttle-statistics.tcl	17 Sep 2013 19:29:57 -0000	1.2.2.1
+++ openacs-4/packages/xotcl-request-monitor/www/throttle-statistics.tcl	13 Oct 2013 18:16:13 -0000	1.2.2.2
@@ -29,7 +29,7 @@
 multirow create url_statistics type user user_url time IPadress URL
 foreach l [lsort -index 2 $data] {
   lassign $l type user time IPadress URL
-  if {[string match *.* $user]} {
+  if {[string match "*.*" $user]} {
     set user "Anonymous"
     set user_url ""
   } else {
Index: openacs-4/packages/xowiki/tcl/import-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/import-procs.tcl,v
diff -u -r1.27.2.1 -r1.27.2.2
--- openacs-4/packages/xowiki/tcl/import-procs.tcl	29 Sep 2013 16:40:17 -0000	1.27.2.1
+++ openacs-4/packages/xowiki/tcl/import-procs.tcl	13 Oct 2013 18:13:58 -0000	1.27.2.2
@@ -395,7 +395,7 @@
 	set success 1
       }
       application/x-compressed {
-	if {[string match *tar.gz $name]} {
+	if {[string match "*tar.gz" $name]} {
 	  set cmd [::util::which tar]
 	  exec $cmd -xzf $file -C [my set tmpdir]
 	  my import -dir [my set tmpdir] -parent_id [my parent_id]
@@ -417,7 +417,7 @@
       set file_name [::file tail $tmpfile]
       if {[::file isdirectory $tmpfile]} {
 	# ignore mac os x resource fork directories
-	if {[string match *__MACOSX $tmpfile]} continue
+	if {[string match "*__MACOSX" $tmpfile]} continue
 	set folder_object [$package_id get_page_from_name -assume_folder true \
 			       -name $file_name -parent_id $parent_id]
 	if {$folder_object ne ""} {
@@ -441,7 +441,7 @@
 	my import -dir $tmpfile -parent_id [$folder_object item_id]
       } else {
 	set mime_type [::xowiki::guesstype $file_name]
-	if {[string match image/* $mime_type] && [my use_photo_form]} {
+	if {[string match "image/*" $mime_type] && [my use_photo_form]} {
 	  set photo_object [$package_id get_page_from_name -name en:$file_name -parent_id $parent_id]
 	  if {$photo_object ne ""} {
 	    # photo entry exists already, create a new revision
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.2 -r1.279.2.3
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	30 Sep 2013 11:37:18 -0000	1.279.2.2
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	13 Oct 2013 18:13:58 -0000	1.279.2.3
@@ -1017,7 +1017,7 @@
     #
 
     set item_id 0
-    if {$lang eq $default_lang || [string match *:* $stripped_name]} {
+    if {$lang eq $default_lang || [string match "*:*" $stripped_name]} {
       # 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} {
@@ -1147,7 +1147,7 @@
     # A trailing slash says that the last element is a folder. We
     # substitute it to allow easy iteration over the slash separated
     # segments.
-    if {[string match */ $link]} {
+    if {[string match "*/" $link]} {
       set llink [string trimright $link /]\0
     } else {
       set llink $link
@@ -1323,7 +1323,7 @@
 
         # If the item is still unknown, try filename-based lookup,
         # when the entry looks like a filename with an extension.
-        if {$item_id == 0 && [string match *.* $element] && ![regexp {[.](form|wf)$} $element]} {
+        if {$item_id == 0 && [string match "*.*" $element] && ![regexp {[.](form|wf)$} $element]} {
           #
           # Get the mime type to distinguish between images, flash
           # files and ordinary files. 
Index: openacs-4/packages/xowiki/tcl/repeat-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/repeat-procs.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/xowiki/tcl/repeat-procs.tcl	12 Aug 2013 18:22:30 -0000	1.2
+++ openacs-4/packages/xowiki/tcl/repeat-procs.tcl	13 Oct 2013 18:13:58 -0000	1.2.2.1
@@ -152,7 +152,7 @@
       set containerDisabled [expr {[my exists disabled] && [my disabled] ne "false"}]
       foreach c [my components] {
 	set atts [list class $CSSclass]
-	if {$i > $nrItems || [string match *.0 [$c name]]} {
+	if {$i > $nrItems || [string match "*.0" [$c name]]} {
 	  lappend atts style "display: none;"
 	}
 	::html::div $atts {
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.320.2.5 -r1.320.2.6
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	7 Oct 2013 16:44:54 -0000	1.320.2.5
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	13 Oct 2013 18:13:58 -0000	1.320.2.6
@@ -1850,7 +1850,7 @@
            # ns_log notice "FORM_DATA var=$varname, value='$value' s=$s"
            if {$varname eq "text"} {regsub -all "­" $value "" value}
            #ns_log notice "FORM_DATA var=$varname, value='$value'"
-           if {![string match *.* $att]} {my set $varname $value}
+           if {![string match "*.*" $att]} {my set $varname $value}
          }
         default {
            # user form content fields
@@ -1862,12 +1862,12 @@
             set f     [my lookup_form_field -name $att $form_fields]
             set value [$f value [string trim [$cc form_parameter $att]]]
             #my msg "value of $att ($f) = '$value' exists=[$cc exists_form_parameter $att]" 
-            if {![string match *.* $att]} {set __ia($att) $value}
+            if {![string match "*.*" $att]} {set __ia($att) $value}
             if {[$f exists is_category_field]} {foreach v $value {lappend category_ids $v}}
           }
         }
       }
-      if {[string match *.* $att]} {
+      if {[string match "*.*" $att]} {
         lassign [split $att .] container component
         lappend containers($container) $component
       }
@@ -1924,7 +1924,7 @@
             set v [$f value_if_nothing_is_returned_from_form $default]
             set value [$f value $v]
             if {$v ne $default} {
-              if {![string match *.* $att]} {my set $varname $value}
+              if {![string match "*.*" $att]} {my set $varname $value}
             }
 	  }
 	  default {
@@ -1938,7 +1938,7 @@
             set v [$f value_if_nothing_is_returned_from_form $default]
             #my msg "value_if_nothing_is_returned_from_form '$default' => '$v' (type=[$f info class])"
             set value [$f value $v]
-            if {![string match *.* $att]} {set __ia($att) $value}
+            if {![string match "*.*" $att]} {set __ia($att) $value}
 	  }
         }
       }
Index: openacs-4/packages/xowiki/www/ckeditor-images/upload_image.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/ckeditor-images/upload_image.tcl,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/xowiki/www/ckeditor-images/upload_image.tcl	2 Mar 2013 12:15:43 -0000	1.7
+++ openacs-4/packages/xowiki/www/ckeditor-images/upload_image.tcl	13 Oct 2013 18:13:59 -0000	1.7.2.1
@@ -10,9 +10,9 @@
     -html { enctype multipart/form-data } \
     -mode edit \
     -form {
-      {upload_file:file(file),optional {label "Bild zum Hochladen ausw�hlen"}}
+      {upload_file:file(file),optional {label "Bild zum Hochladen auswählen"}}
       {width:text(text),optional {label "Breite in Pixel"}}
-      {height:text(text),optional {label "H�he in Pixel"}}
+      {height:text(text),optional {label "Höhe in Pixel"}}
     } -on_submit {
       set width [template::element::get_values upload_form width]
       set height [template::element::get_values upload_form height]
@@ -26,7 +26,7 @@
       #ds_comment $upload_tmpfile
       if {$size ne ""} {exec convert -resize $size $upload_tmpfile $upload_tmpfile}
 
-      if {![string match image/* $mime_type]} {
+      if {![string match "image/*" $mime_type]} {
 	# File is no image
 	template::form::set_error "upload_image" "upload_file" "[_ acs-templating.HTMLArea_SelectImageUploadNoImage]"
 	break
Index: openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/weblog-mini-calendar.tcl,v
diff -u -r1.17 -r1.17.2.1
--- openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl	13 Sep 2012 16:05:36 -0000	1.17
+++ openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl	13 Oct 2013 18:13:59 -0000	1.17.2.1
@@ -4,13 +4,13 @@
 set parent_id         [$__including_page set parent_id]
 set including_item_id [$__including_page set item_id]
 
-if {![exists_and_not_null base_url]} {
+if {(![info exists base_url] || $base_url eq "")} {
   if {![info exists page]} {set page  [$package_id get_parameter weblog_page]}
   set base_url [$package_id pretty_link -parent_id $parent_id $page]
 }
 
 set date [ns_queryget date]
-if {![exists_and_not_null date]} {
+if {(![info exists date] || $date eq "")} {
   set date [dt_sysdate]
 } 
 
@@ -106,7 +106,7 @@
 
 for {set julian_date $calendar_starts_with_julian_date} {$julian_date <= $last_julian_date + 7} {incr julian_date} {
 
-  if {$julian_date > $last_julian_date_in_month && $end_of_week_p eq "t" } {
+  if {$julian_date > $last_julian_date_in_month && $end_of_week_p == "t" } {
     break
   }
   set today_p f
Index: openacs-4/packages/xowiki/www/xinha/file-selector.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/xinha/file-selector.tcl,v
diff -u -r1.15 -r1.15.2.1
--- openacs-4/packages/xowiki/www/xinha/file-selector.tcl	13 Sep 2012 16:07:08 -0000	1.15
+++ openacs-4/packages/xowiki/www/xinha/file-selector.tcl	13 Oct 2013 18:13:59 -0000	1.15.2.1
@@ -247,7 +247,7 @@
       }
     }
 
-set order_by_clause [expr {[exists_and_not_null orderby] ?
+set order_by_clause [expr {([info exists orderby] && $orderby ne "") ?
                            [template::list::orderby_clause -orderby -name contents] :
                            " order by fs_objects.sort_key, fs_objects.name asc"}]