Index: openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl,v
diff -u -N -r1.18 -r1.18.4.1
--- openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl	13 Jul 2009 12:59:59 -0000	1.18
+++ openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl	19 Aug 2014 17:30:25 -0000	1.18.4.1
@@ -160,7 +160,7 @@
 
 set evaluations_orderby [template::list::orderby_clause -orderby -name grade_tasks_${grade_id}]
 
-if { [string equal $evaluations_orderby ""] } {
+if {$evaluations_orderby eq ""} {
     set evaluations_orderby " order by task_name asc"
 }
 
@@ -172,11 +172,11 @@
 	} else {
 	    set task_url [export_vars -base "${base_url}admin/evaluations/student-list" { grade_id task_id return_url }] 
 	}
-	set category_weight [expr $category_weight + $task_weight]
+	set category_weight [expr {$category_weight + $task_weight}]
 	set grade_url  [export_vars -base "${base_url}admin/evaluations/student-list" { grade_id task_id return_url }] 
-	set max_weight [format %0.2f [expr $max_weight + $task_weight]]
+	set max_weight [format %0.2f [expr {$max_weight + $task_weight}]]
 	set task_weight [format %0.2f $task_weight]
-	set max_grade  [expr $max_grade + $perfect_score]
+	set max_grade  [expr {$max_grade + $perfect_score}]
 	set max_grade_label "<span class=blue>$max_grade pts.</span>"
 	set solution_label "[_ evaluation-portlet.weight_possible_of_grade_] <span class=blue>$low_name )</span>"
 	
@@ -212,7 +212,7 @@
 	set grade_url  [export_vars -base "${base_url}admin/evaluations/student-list" { grade_id task_id return_url }] 
 	if { [db_0or1row get_evaluation_info { *SQL* }] } {
 	    
-	    if { ![empty_string_p $comments] } {
+	    if { $comments ne "" } {
 		set comments "[_ evaluation-portlet.View_comments_]"
 		set comments_url "[export_vars -base "${base_url}evaluation-view" { evaluation_id return_url }]"
 	    } else {
@@ -223,18 +223,18 @@
 
 	    
 	    set over_weight ""
-	    if { [string eq $show_student_p "t"] } {
-		if { ![empty_string_p $grade] } {
+	    if {$show_student_p == "t"} {
+		if { $grade ne "" } {
 		    set grade [lc_numeric $grade]
 		    set over_weight "[lc_numeric $task_grade]/"
 		    if { $simple_p } {
 			set task_grade [format %0.2f [expr ($grade*$perfect_score/100.0)]]
 		    } 
-		    set total_grade [expr $total_grade + $task_grade] 
+		    set total_grade [expr {$total_grade + $task_grade}] 
 		    if { $simple_p } {
-			set max_grade [expr $task_grade + $max_grade] 
+			set max_grade [expr {$task_grade + $max_grade}] 
 		    } else {
-			set max_grade [expr $task_weight + $max_grade] 
+			set max_grade [expr {$task_weight + $max_grade}] 
 		    }
 		} else {
 		    set grade "[_ evaluation-portlet.Not_evaluated_]"
@@ -259,7 +259,7 @@
 	if { [db_0or1row get_answer_info { *SQL* }] } {
 	    set submitted_date $creation_date
 	    # working with answer stuff (if it has a file/url attached)
-	    if { [string eq $answer_title "link"] } {
+	    if {$answer_title eq "link"} {
 		# there is a bug in the template::list, if the url does not has a http://, ftp://, the url is not absolute,
 		# so we have to deal with this case
 		array set community_info [site_node::get -url "[dotlrn_community::get_community_url [dotlrn_community::get_community_id]][evaluation::package_key]"]
@@ -274,7 +274,7 @@
 		set answer "[_ evaluation-portlet.View_my_answer_]"
 	    }
 	    
-	    if { $number_of_members > 1 && [string eq [db_string get_group_id { *SQL* }] 0] } {
+	    if { $number_of_members > 1 && [string equal [db_string get_group_id { *SQL* }] "0"] } {
 		set answer ""
 		set answer_url ""
 		set grade "[_ evaluation-portlet.No_group_for_task_]"
@@ -283,12 +283,12 @@
 	    set answer_url ""
 	    set answer ""
 	}
-	set max_weight [expr $max_weight + $perfect_score]
+	set max_weight [expr {$max_weight + $perfect_score}]
 	set max_grade_label "<span class=blue>$max_grade pts.</span>"
 	set max_weight_label "<span class=blue>$max_weight %</span>"
-	if { [empty_string_p $submitted_date]} {
+	if { $submitted_date eq ""} {
 	    
-	    if { [string eq $online_p "t"] } {
+	    if {$online_p == "t"} {
 		if { [db_string compare_due_date { *SQL* } -default 0] } {
 		    if { ![db_0or1row answer_info { *SQL* }] } {
 			set submitted_date "[_ evaluation-portlet.submit_answer_]"
@@ -299,7 +299,7 @@
 			set submitted_date_mode display
 			set submitted_date_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id answer_id return_url answer_mode }]"
 		    }
-		} elseif { [string eq $late_submit_p "t"] } {
+		} elseif {$late_submit_p == "t"} {
 		    if { ![db_0or1row answer_info { *SQL* }] } {
 			set submitted_date "[_ evaluation-portlet.lt_submit_answer_style_f]"
 			set submitted_date_mode edit
@@ -310,14 +310,14 @@
 			set submitted_date_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id answer_id return_url answer_mode }]"
 		    }
 		}
-		if { $number_of_members > 1 && [string eq [db_string get_group_id { *SQL* }] 0] } {
+		if { $number_of_members > 1 && [string equal [db_string get_group_id { *SQL* }] "0"] } {
 		    set submitted_date "[_ evaluation-portlet.No_group_for_task_]"
 		    set submitted_date_url ""
 		}
 	    }
 	} else {
 	    set submitted_date_url "[export_vars -base "${base_url}answer-view" { grade_id task_id return_url answer_mode {answer_id}}]"
-	    if { $number_of_members > 1 && [string eq [db_string get_group_id { *SQL* }] 0] } {
+	    if { $number_of_members > 1 && [string equal [db_string get_group_id { *SQL* }] "0"] } {
 		
 		set submitted_date "[_ evaluation-portlet.No_group_for_task_]"
 		set submitted_date_url ""
Index: openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl,v
diff -u -N -r1.16 -r1.16.4.1
--- openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl	9 Nov 2008 23:29:25 -0000	1.16
+++ openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl	19 Aug 2014 17:30:25 -0000	1.16.4.1
@@ -88,7 +88,7 @@
 
 set assignments_orderby [template::list::orderby_clause -orderby -name tasks_${grade_id}]
 
-if {[string equal $assignments_orderby ""]} {
+if {$assignments_orderby eq ""} {
     set assignments_orderby " order by task_name asc"
 }
 
@@ -99,10 +99,10 @@
 	set due_date_pretty [lc_time_fmt $due_date_ansi "%q %X"]
 
 	# working with task stuff (if it has a file/url attached)
-	if { [empty_string_p $task_data] } {
+	if { $task_data eq "" } {
 	    set task_url "[export_vars -base "${base_url}task-view" { grade_id task_id return_url }]"
 	    set task_name "[_ evaluation-portlet.task_name_No_data_]"
-	} elseif { [string eq $task_title "link"] } {
+	} elseif {$task_title eq "link"} {
 
 	    # there is a bug in the template::list, if the url does not has a http://, ftp://, the url is not absolute,
 	    # so we have to deal with this case
@@ -129,7 +129,7 @@
 	    set solution "[_ evaluation-portlet.Upload_Solution_]"
 	}
 
-	if { ![string eq $number_of_members 1] } {
+	if { $number_of_members ne "1" } {
 	    set groups_admin_url "[export_vars -base "${base_url}admin/groups/one-task" { grade_id task_id }]"
 	    set groups_admin "[_ evaluation-portlet.Groups_Admin_]"		
 	}
@@ -141,10 +141,10 @@
 	set answer_mode display
 	set due_date_pretty [lc_time_fmt $due_date_ansi "%q %r"]
 	# working with task stuff (if it has a file/url attached)
-	if { [empty_string_p $task_data] } {
+	if { $task_data eq "" } {
 	    set task_url "[export_vars -base "${base_url}task-view" { grade_id task_id return_url }]"
 	    set task_name "[_ evaluation-portlet.task_name_No_data_]"
-	} elseif { [string eq $task_title "link"] } {
+	} elseif {$task_title eq "link"} {
 
 	    # there is a bug in the template::list, if the url does not has a http://, ftp://, the url is not absolute,
 	    # so we have to deal with this case
@@ -161,7 +161,7 @@
 	    set task_name "$task_name ([lc_numeric $content_length] Kb - ${pretty_mime_type})"
 	}
 
-	if { [string eq $online_p "t"] } {
+	if {$online_p == "t"} {
 	    if { [db_string compare_due_date { *SQL* } -default 0] } {
 		if { ![db_0or1row answer_info { *SQL* }] } {
 		    set answer "[_ evaluation-portlet.submit_answer_]"
@@ -172,7 +172,7 @@
 		    set answer_mode display
 		    set answer_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id answer_id return_url answer_mode }]"
 		}
-	    } elseif { [string eq $late_submit_p "t"] } {
+	    } elseif {$late_submit_p == "t"} {
 		if { ![db_0or1row answer_info { *SQL* }] } {
 		    set answer "[_ evaluation-portlet.lt_submit_answer_style_f]"
 		    set answer_mode edit
@@ -183,7 +183,7 @@
 		    set answer_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id answer_id return_url answer_mode }]"
 		}
 	    }
-	    if { $number_of_members > 1 && [string eq [db_string get_group_id { *SQL* }] 0] } {
+	    if { $number_of_members > 1 && [string equal [db_string get_group_id { *SQL* }] "0"] } {
 		set answer "[_ evaluation-portlet.No_group_for_task_]"
 		set answer_url ""
 	    }
Index: openacs-4/packages/evaluation-portlet/tcl/test/tclwebtest-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/tcl/test/tclwebtest-procs.tcl,v
diff -u -N -r1.2 -r1.2.8.1
--- openacs-4/packages/evaluation-portlet/tcl/test/tclwebtest-procs.tcl	8 Aug 2006 21:26:44 -0000	1.2
+++ openacs-4/packages/evaluation-portlet/tcl/test/tclwebtest-procs.tcl	19 Aug 2014 17:30:26 -0000	1.2.8.1
@@ -179,7 +179,7 @@
     if { [string match  "*/classes/*/evaluation/admin/tasks/solution-add-edit*" $response_url] } {
 
 	set list_words [split "$file_name" /]
-	set short_file_name [lindex $list_words [expr [llength $list_words]-1]]
+	set short_file_name [lindex $list_words [expr {[llength $list_words]-1}]]
 	
 	if { [catch {tclwebtest::assert text "$short_file_name" } errmsg] } {
 	    aa_error  "evaluation::twt::view_task_solution failed $errmsg : Didn't view a Task Solution"
@@ -255,7 +255,7 @@
     if {[string match  "*task-add-edit*$task_id*$grade_id" $response_url] } {
 
 	set list_words [split "$file_name" /]
-        set short_file_name [lindex $list_words [expr [llength $list_words]-1]]
+        set short_file_name [lindex $list_words [expr {[llength $list_words]-1}]]
 
         if { [catch {tclwebtest::assert text "$task_name" } errmsg] || [catch {tclwebtest::assert text "$task_description" } errmsg] || [catch {tclwebtest::assert text "$short_file_name" } errmsg] } {
 	    
@@ -305,7 +305,7 @@
     if {[string match $class_material_url $response_url] } {
 
 	set list_words [split "$file_name" /]
-	set short_file_name [lindex $list_words [expr [llength $list_words]-1]]
+	set short_file_name [lindex $list_words [expr {[llength $list_words]-1}]]
 
 	if {[catch {tclwebtest::assert text "$task_name" } errmsg]} {
 	    aa_error  "evaluation::twt::edit_task failed $errmsg : Didn't edit a Task"
@@ -450,7 +450,7 @@
     if { [string match  "*/classes/*/evaluation/admin/tasks/solution-add-edit*"  $response_url] } {
 
         set list_words [split "$file_name" /]
-        set short_file_name [lindex $list_words [expr [llength $list_words]-1]]
+        set short_file_name [lindex $list_words [expr {[llength $list_words]-1}]]
 	aa_log $short_file_name
         if { [catch {tclwebtest::assert text "$short_file_name" } errmsg] } {
             aa_error  "evaluation::twt::view_project_solution failed $errmsg : Didn't view a Project Solution"
@@ -526,7 +526,7 @@
     if {[string match  "*/dotlrn/classes*/evaluation/admin/tasks/task-add-edit*" $response_url] } {
 
         set list_words [split "$file_name" /]
-        set short_file_name [lindex $list_words [expr [llength $list_words]-1]]
+        set short_file_name [lindex $list_words [expr {[llength $list_words]-1}]]
 
         if { [catch {tclwebtest::assert text "$project_name" } errmsg] || [catch {tclwebtest::assert text "$project_description" } errmsg] || [catch {tclwebtest::assert text "$short_file_name" } errmsg] } {
 
@@ -577,7 +577,7 @@
     if {[string match  "$class_material_url" $response_url] } {
 
         set list_words [split "$file_name" /]
-        set short_file_name [lindex $list_words [expr [llength $list_words]-1]]
+        set short_file_name [lindex $list_words [expr {[llength $list_words]-1}]]
 
         if {[catch {tclwebtest::assert text "$project_name" } errmsg]} {
             aa_error  "evaluation::twt::edit_project failed $errmsg : Didn't edit a Project"
@@ -722,7 +722,7 @@
     if { [string match  "*/classes/*/evaluation/admin/tasks/solution-add-edit*"  $response_url] } {
 
         set list_words [split "$file_name" /]
-        set short_file_name [lindex $list_words [expr [llength $list_words]-1]]
+        set short_file_name [lindex $list_words [expr {[llength $list_words]-1}]]
 
         if { [catch {tclwebtest::assert text "$short_file_name" } errmsg] } {
             aa_error  "evaluation::twt::view_exam_solution failed $errmsg : Didn't view an Exam Solution"
@@ -798,7 +798,7 @@
     if {[string match  "*/dotlrn/classes*/evaluation/admin/tasks/task-add-edit*" $response_url] } {
 
         set list_words [split "$file_name" /]
-        set short_file_name [lindex $list_words [expr [llength $list_words]-1]]
+        set short_file_name [lindex $list_words [expr {[llength $list_words]-1}]]
 
         if { [catch {tclwebtest::assert text "$exam_name" } errmsg] || [catch {tclwebtest::assert text "$exam_description" } errmsg] || [catch {tclwebtest::assert text "$short_file_name" } errmsg] } {
 
@@ -849,7 +849,7 @@
     if {[string match  "$class_material_url" $response_url] } {
 
         set list_words [split "$file_name" /]
-        set short_file_name [lindex $list_words [expr [llength $list_words]-1]]
+        set short_file_name [lindex $list_words [expr {[llength $list_words]-1}]]
 
         if {[catch {tclwebtest::assert text "$exam_name" } errmsg]} {
             aa_error  "evaluation::twt::edit_exam failed $errmsg : Didn't edit an Exam"
Index: openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.tcl,v
diff -u -N -r1.7 -r1.7.8.1
--- openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.tcl	8 Aug 2006 21:26:45 -0000	1.7
+++ openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.tcl	19 Aug 2014 17:30:26 -0000	1.7.8.1
@@ -35,7 +35,7 @@
 db_multirow grades get_grades { *SQL* } {
 }
 
-if { [string eq $one_instance_p 1] && [string eq $admin_p 0] } {
+if { $one_instance_p eq "1" && $admin_p eq "0" } {
     set total_class_grade [lc_numeric [db_string get_total_grade { *SQL* }]]
     set max_possible_grade [lc_numeric [db_string max_possible_grade { *SQL* }]]
 }