Index: openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl	5 May 2007 13:07:35 -0000	1.9
+++ openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl	22 Mar 2008 18:16:10 -0000	1.10
@@ -132,12 +132,12 @@
     set image_name "email${user_id}.gif"
     set email_length [string length $email]
     set dest_path "/tmp/$image_name"
-    set width [expr [expr $email_length * [expr $font_size / 2]] + 2]
+    set width [expr [expr {$email_length * [expr {$font_size / 2}]}] + 2]
     set height $font_size
-    set ypos [expr [expr $height / 2] + 3 ]
+    set ypos [expr {[expr {$height / 2}] + 3 }]
     set size "${width}x$height"
 
-    if { [string equal $bgcolor ""]} {
+    if {$bgcolor eq ""} {
         set bgcolor "\#ffffff"
     }
 
@@ -154,7 +154,7 @@
 	return ""
     }
 
-    if { [string equal $transparent ""] || [string equal $transparent "1"] } {
+    if { $transparent eq "" || $transparent eq "1" } {
 	# Making the bg color transparent
 	if {[catch {exec convert $dest_path -transparent $bgcolor $dest_path} errmsg]} {
 	    return ""
@@ -216,12 +216,12 @@
     set image_name "email${user_id}.gif"
     set email_length [string length $new_email]
     set dest_path "/tmp/$image_name"
-    set width [expr [expr $email_length * [expr $font_size / 2]] + 2]
+    set width [expr [expr {$email_length * [expr {$font_size / 2}]}] + 2]
     set height $font_size
-    set ypos [expr [expr $height / 2] + 3 ]
+    set ypos [expr {[expr {$height / 2}] + 3 }]
     set size "${width}x$height"
 
-    if { [string equal $bgcolor ""]} {
+    if {$bgcolor eq ""} {
         set bgcolor "\#ffffff"
     }
 
@@ -237,7 +237,7 @@
     exec convert -font $font_type -fill blue -pointsize $font_size -draw "text 0,$ypos $new_email" \
         $dest_path $dest_path
 
-    if { [string equal $transparent ""] || [string equal $transparent "1"] } {
+    if { $transparent eq "" || $transparent eq "1" } {
         # Making the bg color transparent
         exec convert $dest_path -transparent $bgcolor $dest_path
     }
Index: openacs-4/packages/acs-subsite/www/group-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/group-master.tcl,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/acs-subsite/www/group-master.tcl	3 Dec 2007 20:17:35 -0000	1.15
+++ openacs-4/packages/acs-subsite/www/group-master.tcl	22 Mar 2008 18:16:11 -0000	1.16
@@ -19,7 +19,7 @@
 # But for now - kludge city.
 
 set system_name [ad_system_name]
-if { [string equal [ad_conn url] "/"] } {
+if {[ad_conn url] eq "/"} {
     set system_url ""
 } else {
     set system_url [ad_url]
@@ -79,7 +79,7 @@
 set acs_lang_url [apm_package_url_from_key "acs-lang"]
 set num_of_locales [llength [lang::system::get_locales]]
 
-if {[empty_string_p $acs_lang_url]} {
+if {$acs_lang_url eq ""} {
     set lang_admin_p 0
 } else {
     set lang_admin_p [permission::permission_p \
Index: openacs-4/packages/acs-subsite/www/shared/parameters.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/parameters.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/acs-subsite/www/shared/parameters.tcl	4 Jan 2008 16:34:01 -0000	1.16
+++ openacs-4/packages/acs-subsite/www/shared/parameters.tcl	22 Mar 2008 18:16:11 -0000	1.17
@@ -89,7 +89,7 @@
     if { $file_val ne "" } { 
         set display_warning_p 1 
         lappend elm [list after_html "<br><span style=\"color: red; font-weight: bold;\">$file_val (*)</span>"]
-    } 
+    }
     
     ad_form -extend -name parameters -form [list $elm]
 
Index: openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl	27 Nov 2007 19:29:27 -0000	1.11
+++ openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl	22 Mar 2008 18:16:11 -0000	1.12
@@ -91,12 +91,12 @@
 
     {upload_file
         
-        { [empty_string_p $mime_types] || [lsearch $mime_types [ns_guesstype $upload_file]] > -1 }
+        { $mime_types eq "" || [lsearch $mime_types [ns_guesstype $upload_file]] > -1 }
         {Your image wasn't one of the acceptable MIME types: $mime_types}
     }
     {upload_file
 
-        { [empty_string_p $max_bytes] || [file size [ns_queryget upload_file.tmpfile]] <= $max_bytes } 
+        { $max_bytes eq "" || [file size [ns_queryget upload_file.tmpfile]] <= $max_bytes } 
         {Your file is too large.  The publisher of [ad_system_name] has chosen to limit portraits to [util_commify_number $max_bytes] bytes.  You can use PhotoShop or the GIMP (free) to shrink your image}
     }