Index: openacs-4/packages/contacts-lite/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts-lite/www/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts-lite/www/index.tcl	20 Jan 2021 18:35:37 -0000	1.1
+++ openacs-4/packages/contacts-lite/www/index.tcl	20 Jan 2021 21:17:08 -0000	1.2
@@ -41,7 +41,7 @@
     default { set ordering "family_name" }
 }
 
-if { ![empty_string_p $starts_with] } {
+if { $starts_with ne "" } {
        switch $starts_with {
 	"all" { set starts_with_clause "" }
         "other" { set starts_with_clause "and family_name is null" }
@@ -53,7 +53,7 @@
 }
 
 
-if { $search_p == 1 && ![string equal $search_string ""]} {
+if { $search_p == 1 && $search_string ne "" } {
     switch $search_in {
 	"fname" { set search_clause "and lower(given_name) like '%' || lower(:search_string) || '%'" }
 	"lname" { set search_clause "and lower(family_name) like '%' || lower(:search_string) || '%'" }
@@ -89,7 +89,7 @@
     order by $ordering" {
 	incr count
 	if { $count < $start } continue
-	if { $count >= [expr $start + $max_dspl] } break
+	if { $count >= ($start + $max_dspl)] } break
 }
 
 #    and o.context_id = :package_id
@@ -104,36 +104,36 @@
 #                                                  and o.context_id = :package_id
 
 # make paging links
-if { $count < [expr $start + $max_dspl] } {
+if { $count < ($start + $max_dspl) } {
     set next_start ""
 } else {
-    if {[expr $start + 2 * $max_dspl - $total_contacts] < 0 } {
+    if {($start + 2 * $max_dspl - $total_contacts) < 0 } {
 	set next_val $max_dspl
     } else {
-	set next_val [expr $total_contacts - $start - $max_dspl + 1]
+	set next_val [expr {$total_contacts - $start - $max_dspl + 1}]
     }
 
-    set next_start "<a href=index?start=[expr $start + $max_dspl]&search_p=${search_p}&search_string=${search_string}&search_in=${search_in}&starts_with=${starts_with}&sort=${sort}>NEXT $next_val<a/>"
+    set next_start "<a href=index?start=[expr {$start + $max_dspl}]&search_p=${search_p}&search_string=${search_string}&search_in=${search_in}&starts_with=${starts_with}&sort=${sort}>NEXT $next_val<a/>"
 }
 
 if { $start == 1 } {
     set prev_start ""
 } else {
-    set prev_start "<a href=index?start=[expr $start - $max_dspl]&search_p=${search_p}&search_string=${search_string}&search_in=${search_in}&starts_with=${starts_with}&sort=${sort}>PREV $max_dspl</a>"
+    set prev_start "<a href=index?start=[expr {$start - $max_dspl}]&search_p=${search_p}&search_string=${search_string}&search_in=${search_in}&starts_with=${starts_with}&sort=${sort}>PREV $max_dspl</a>"
 }
 
-if { ![empty_string_p $next_start] && ![empty_string_p $prev_start] } {
+if { $next_start ne "" && $prev_start ne "" } {
     set divider " | "
 } else {
     set divider ""
 }
 
-if { [expr $start + $max_dspl - 1] > $total_contacts } {
+if { ($start + $max_dspl - 1) > $total_contacts } {
     if { $total_contacts == 0 } {
 	set start 0 }
     set showing "Showing: $start - $total_contacts"
 } else {
-    set showing "Showing: $start - [expr $start + $max_dspl - 1]"
+    set showing "Showing: $start - [expr {$start + $max_dspl - 1}]"
 }
 
 set pagination_link " $prev_start$divider$next_start "