Index: openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl	9 Sep 2013 12:19:56 -0000	1.6
+++ openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl	18 Apr 2014 06:38:28 -0000	1.7
@@ -152,7 +152,7 @@
     contained bookmarks/folders.
 
 } {
-    if { [string equal [bm_delete_permission_p $bookmark_id] "f"] } {
+    if {[bm_delete_permission_p $bookmark_id] == "f"} {
 	set n_errors 1
 	set error_list [list "You either do not have delete permissions on this bookmark/folder, or you are trying to delete a folder that contains at least one bookmarks or folder that you may not delete"]
 	ad_return_template "complaint"
@@ -169,13 +169,13 @@
 } {
     set browsing_user_id [ad_conn user_id]
     
-    if { ![string equal $browsing_user_id $viewed_user_id] && ![empty_string_p $viewed_user_id]} {
+    if { $browsing_user_id ne $viewed_user_id && $viewed_user_id ne ""} {
 	# The user is viewing someone elses bookmarks
 	# and we need the set the context bar so that 
 	# he can go back to viewing his own bookmarks
 	set user_name [db_string user_name "select first_names || ' ' || last_name from cc_users where object_id = :viewed_user_id" -default ""]
 
-	if { [empty_string_p $arg_list] } {
+	if { $arg_list eq "" } {
 	    # We are on the index page
 	    return [list "Bookmarks of $user_name"]
 	} else {
@@ -270,7 +270,7 @@
 		append result "$i_str],\n"
 	}
 	while {$prev_lev > $lev} {
-		set i_str [string repeat "\t" [expr $prev_lev - 1]]
+		set i_str [string repeat "\t" [expr {$prev_lev - 1}]]
 		append result "$i_str],\n"
 		incr prev_lev -1
 	}
Index: openacs-4/packages/bookmarks/www/bookmark-add-import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-import.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/bookmarks/www/bookmark-add-import.tcl	9 Sep 2013 17:51:47 -0000	1.9
+++ openacs-4/packages/bookmarks/www/bookmark-add-import.tcl	18 Apr 2014 06:38:29 -0000	1.10
@@ -43,7 +43,7 @@
 
 # If we we are coming from a Bookmarklet there will be no viewed_user_id
 # supplied, but the browsing_user_id will do
-if { [empty_string_p $viewed_user_id] || $viewed_user_id == 0 } {
+if { $viewed_user_id eq "" || $viewed_user_id == 0 } {
     set viewed_user_id [ad_conn user_id]
 }
 
Index: openacs-4/packages/bookmarks/www/bookmark-add-one-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-one-2.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/bookmarks/www/bookmark-add-one-2.tcl	9 Sep 2013 12:19:56 -0000	1.6
+++ openacs-4/packages/bookmarks/www/bookmark-add-one-2.tcl	18 Apr 2014 06:38:29 -0000	1.7
@@ -79,7 +79,7 @@
 
 # Insert the bookmark
 #------------------------------------------------------------------------------------------
-    if [catch {db_exec_plsql bookmark_add "
+    if {[catch {db_exec_plsql bookmark_add "
     declare
       dummy_var integer;
     begin
@@ -92,7 +92,7 @@
        creation_user => :user_id,
        creation_ip => :creation_ip
 	);       
-    end;"} errmsg] {
+    end;"} errmsg]} {
 	bm_handle_bookmark_double_click $bookmark_id $errmsg $return_url
     }
 #------------------------------------------------------------------------------------------
Index: openacs-4/packages/bookmarks/www/bookmark-add-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-one.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/bookmarks/www/bookmark-add-one.tcl	9 Sep 2013 17:51:47 -0000	1.8
+++ openacs-4/packages/bookmarks/www/bookmark-add-one.tcl	18 Apr 2014 06:38:29 -0000	1.9
@@ -32,7 +32,7 @@
 	# complete url will not be provided but the url to bookmark
 	# is in this case the return_url which is the page that the
 	# user is viewing
-	if { [empty_string_p $complete_url] } {
+	if { $complete_url eq "" } {
 	    set complete_url $return_url
 	}
 
@@ -55,11 +55,11 @@
 	set url_title [bm_get_html_title $url_content]
 
 	# If user did not enter a title for the bookmark, we need to assign remote page title
-	if {[empty_string_p $local_title]} {
+	if {$local_title eq ""} {
 	    set user_provided_title_p "f"
 	    set local_title $url_title
 
-	    if {[empty_string_p $local_title]} {
+	    if {$local_title eq ""} {
 		ad_complain "We're sorry but we can not detect a title for this bookmark, 
 		the host does not provide one.  If you still want to add this bookmark 
 		now, press \[Back\] on your browser and check the URL or type in a title."
@@ -97,10 +97,10 @@
 
 # If this page was called with a bookmarklet some form vars will not be
 # provided and we need to set them here. 
-if { [empty_string_p $viewed_user_id] } {
+if { $viewed_user_id eq "" } {
     set viewed_user_id $user_id
 }
-if { [empty_string_p $bookmark_id] } {
+if { $bookmark_id eq "" } {
     set bookmark_id [db_nextval acs_object_id_seq]
 }
 
Index: openacs-4/packages/bookmarks/www/bookmark-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-delete-2.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bookmarks/www/bookmark-delete-2.tcl	30 Sep 2003 12:10:04 -0000	1.4
+++ openacs-4/packages/bookmarks/www/bookmark-delete-2.tcl	18 Apr 2014 06:38:29 -0000	1.5
@@ -21,12 +21,12 @@
 bm_require_delete_permission $bookmark_id
 
 
-if [catch {db_exec_plsql bookmark_delete "
+if {[catch {db_exec_plsql bookmark_delete "
     begin
       bookmark.del (
        bookmark_id => :bookmark_id
 	);       
- end;"} errmsg] {
+ end;"} errmsg]} {
 
      set n_errors 1
      set error_list [list "We were not able to delete the bookmark from the database, this is the error message: <pre>$errmsg</pre>"]
Index: openacs-4/packages/bookmarks/www/bookmark-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-edit-2.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bookmarks/www/bookmark-edit-2.tcl	9 Sep 2013 12:19:56 -0000	1.4
+++ openacs-4/packages/bookmarks/www/bookmark-edit-2.tcl	18 Apr 2014 06:38:29 -0000	1.5
@@ -25,7 +25,7 @@
     old_private_p
 } -validate {
     valid_url {
-	if { [string equal $folder_p "f"] && [empty_string_p [string trim $complete_url]] } {
+	if { $folder_p == "f" && [empty_string_p [string trim $complete_url]] } {
 	    ad_complain "You must provide a non empty url"
 	}
     }
@@ -42,7 +42,7 @@
 permission::require_permission -object_id $bookmark_id -privilege admin
 
 # We update or insert the url
-if { [string equal $folder_p "f"] } {
+if {$folder_p == "f"} {
 
     set host_url [bm_host_url $complete_url]
     set creation_ip [ad_conn peeraddr]
@@ -83,7 +83,7 @@
 end;"
 
 # Update the private_p status of the bookmark
-if { ![string equal $old_private_p $private_p] } {
+if { $old_private_p ne $private_p } {
     bm_update_bookmark_private_p $bookmark_id $private_p
 }
 
Index: openacs-4/packages/bookmarks/www/bookmark-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-edit.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/bookmarks/www/bookmark-edit.tcl	9 Sep 2013 12:19:56 -0000	1.7
+++ openacs-4/packages/bookmarks/www/bookmark-edit.tcl	18 Apr 2014 06:38:29 -0000	1.8
@@ -51,7 +51,7 @@
     ad_return_template "complaint"
 }
 
-if { [empty_string_p $viewed_user_id] } {
+if { $viewed_user_id eq "" } {
     set viewed_user_id [ad_conn user_id]
 }
 
@@ -74,7 +74,7 @@
 # be set directly for this bookmark
 set security_inherit_p [db_string inheritance_p "select security_inherit_p from acs_objects where object_id = :bookmark_id"]
 
-if { [string equal $old_private_p "t"] && [string equal $security_inherit_p "t"] } {
+if { $old_private_p == "t" && $security_inherit_p == "t" } {
     set public_possible_p "f"
 } else {
     set public_possible_p "t"
Index: openacs-4/packages/bookmarks/www/bookmark-header.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-header.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bookmarks/www/bookmark-header.tcl	9 Sep 2013 17:51:47 -0000	1.4
+++ openacs-4/packages/bookmarks/www/bookmark-header.tcl	18 Apr 2014 06:38:29 -0000	1.5
@@ -42,7 +42,7 @@
 set browsing_user_id [ad_conn user_id]
 
 # Is the user viewing his own bookmarks?
-if { ![info exists viewed_user_id] || [string equal $viewed_user_id $browsing_user_id] } {
+if { ![info exists viewed_user_id] || $viewed_user_id eq $browsing_user_id } {
     # The user is viewing his own bookmarks
     set viewed_user_id $browsing_user_id
     set context {}
@@ -55,7 +55,7 @@
 
 set user_name [db_string user_name "select first_names || ' ' || last_name from cc_users where object_id = :viewed_user_id" -bind "viewed_user_id $viewed_user_id" -default ""]
 
-if { ![string equal $viewed_user_id "0"] } {
+if { $viewed_user_id ne "0" } {
     set root_folder_id [bm_get_root_folder_id [ad_conn package_id] $viewed_user_id]
 } else {
     set root_folder_id 0
Index: openacs-4/packages/bookmarks/www/bookmark-permissions-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-permissions-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bookmarks/www/bookmark-permissions-2.tcl	9 Sep 2013 12:19:56 -0000	1.3
+++ openacs-4/packages/bookmarks/www/bookmark-permissions-2.tcl	18 Apr 2014 06:38:29 -0000	1.4
@@ -31,7 +31,7 @@
 #  connect by prior bookmark_id = parent_id"]
 
 
-if { [info exists reset_all_individual_p] && [string equal $reset_all_individual_p "t"] && [string equal $non_default_permissions_p "t"] } {
+if { [info exists reset_all_individual_p] && $reset_all_individual_p == "t" && $non_default_permissions_p == "t" } {
     ad_returnredirect "permissions-reset-all?public_p=$public_p&viewed_user_id=$viewed_user_id&root_folder_id=$root_folder_id"
 } else {
     ad_returnredirect "index?viewed_user_id=$viewed_user_id"
Index: openacs-4/packages/bookmarks/www/bookmarks-check.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-check.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/bookmarks/www/bookmarks-check.tcl	9 Sep 2013 12:19:57 -0000	1.7
+++ openacs-4/packages/bookmarks/www/bookmarks-check.tcl	18 Apr 2014 06:38:29 -0000	1.8
@@ -31,7 +31,7 @@
 
 set browsing_user_id [ad_conn user_id]
 
-if { [empty_string_p $viewed_user_id] } {
+if { $viewed_user_id eq "" } {
     # Only admins can call this page for all users
     permission::require_permission -object_id $package_id -privilege admin
 
@@ -70,7 +70,7 @@
 <hr>
 "
 
-if { ![empty_string_p $check_list] } {
+if { $check_list ne "" } {
     ns_write "URLs are being checked. This might take some time - so please have some patience...
 
 Links that aren't reachable will appear with a checkbox in front of
@@ -131,7 +131,7 @@
     if { $response != 200 && $response != 302 } {
 	ns_set put $checked_url last_live_date ""
 
-	if { [string equal $form_opened_p "f"] } {
+	if {$form_opened_p == "f"} {
 	    set form_opened_p "t"
 	    ns_write "<form action=delete-dead-links method=post>
 	    <input type=\"hidden\" name=\"return_url\" value=\"$return_url\">
@@ -159,7 +159,7 @@
 		set description [bm_get_html_description $url_content]
 		set keywords [bm_get_html_keywords $url_content]
 	    
-		if { ![empty_string_p $keywords] || ![empty_string_p $description] } {
+		if { $keywords ne "" || $description ne "" } {
 		    set keywords_or_description_p "t"
 		} else {
 		    set keywords_or_description_p "f"
@@ -191,7 +191,7 @@
     set keywords [ns_set get $checked_url keywords]
     set last_live_date [ns_set get $checked_url last_live_date]
 
-    if { ![empty_string_p $last_live_date] } {
+    if { $last_live_date ne "" } {
 	set last_live_clause ", last_live_date = $last_live_date"
     } else {
 	set last_live_clause ""
Index: openacs-4/packages/bookmarks/www/bookmarks-export.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-export.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bookmarks/www/bookmarks-export.tcl	29 Jun 2004 10:17:48 -0000	1.4
+++ openacs-4/packages/bookmarks/www/bookmarks-export.tcl	18 Apr 2014 06:38:29 -0000	1.5
@@ -21,7 +21,7 @@
 } 
 
 # We are currently only supporting export of the users own bookmarks
-if { ![string equal $viewed_user_id [ad_conn user_id]] } {
+if { $viewed_user_id ne [ad_conn user_id] } {
     set n_errors 1
     set error_list [list "We are sorry, but the bookmarks module does not currently support the exporting other users bookmarks."]
     ad_return_template "complaint"
Index: openacs-4/packages/bookmarks/www/bookmarks-import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-import.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/bookmarks/www/bookmarks-import.tcl	9 Sep 2013 17:51:47 -0000	1.10
+++ openacs-4/packages/bookmarks/www/bookmarks-import.tcl	18 Apr 2014 06:38:29 -0000	1.11
@@ -84,7 +84,7 @@
 # connect to the default pool and start a transaction.
 foreach line $lines {
     
-    set depth [expr [llength $folder_list]-1]
+    set depth [expr {[llength $folder_list]-1}]
 
     # checks if the line represents a folder
     if {[regexp {<H3[^>]*>([^<]*)</H3>} $line match local_title]} {
@@ -111,7 +111,7 @@
 
 	    } else {
 		# insert folder into bm_bookmarks
-		if [catch {db_exec_plsql folder_insert "
+		if {[catch {db_exec_plsql folder_insert "
 		declare
 		dummy_var integer;
 		begin
@@ -124,7 +124,7 @@
 		   creation_user => :user_id,
 		   creation_ip => :creation_ip
 		);       
-		end;"} errmsg] {
+		end;"} errmsg]} {
 		    set n_errors 1
 		    set error_list [list "We were unable to create your user record in the database.  Here's what the error looked like:
 		    <blockquote>
@@ -148,7 +148,7 @@
 	
     # check if the line ends the current folder
     if {[regexp {</DL>} $line match]} {
-	set folder_depth [expr [llength $folder_list]-2]
+	set folder_depth [expr {[llength $folder_list]-2}]
 	if {$folder_depth<0} {
 	    set folder_depth 0
 	}
@@ -162,7 +162,7 @@
 
 	set host_url [bm_host_url $complete_url]
 
-	if { [empty_string_p $host_url] } {
+	if { $host_url eq "" } {
 	    continue
 	}
 	
@@ -179,11 +179,11 @@
 	    set url_p 1 
 
 	    # if we don't have the url, then insert the url into the database
-	    if [empty_string_p $url_id] {
+	    if {$url_id eq ""} {
 
 		set url_id [db_nextval acs_object_id_seq]
 
-		if [catch {db_exec_plsql new_url "		
+		if {[catch {db_exec_plsql new_url "		
 		declare
 		   dummy_var integer;
 		begin
@@ -195,7 +195,7 @@
 		   creation_user => :viewed_user_id,
 		   creation_ip => :creation_ip
 		);
-		end;"} errmsg] {
+		end;"} errmsg]} {
 		    lappend import_list "We were unable to insert the url $complete_url into the database due to the following
 		    database error: <pre>$errmsg</pre>"
 		    set url_p 0
@@ -217,7 +217,7 @@
 	    } else {
 	    
 		# try to insert bookmark into user's list	
-		if [catch {db_exec_plsql bookmark_insert  "
+		if {[catch {db_exec_plsql bookmark_insert  "
 		
 		declare
 		   dummy_var integer;
@@ -231,7 +231,7 @@
 		   creation_user => :user_id,
 		   creation_ip => :creation_ip
 		);       
-		end;" } errmsg] {
+		end;" } errmsg]} {
 
 		    # if it was not a double click, produce an error
 		    if { [db_string dbclick  {
Index: openacs-4/packages/bookmarks/www/delete-dead-links.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/delete-dead-links.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bookmarks/www/delete-dead-links.tcl	9 Sep 2013 12:19:57 -0000	1.4
+++ openacs-4/packages/bookmarks/www/delete-dead-links.tcl	18 Apr 2014 06:38:29 -0000	1.5
@@ -27,7 +27,7 @@
 
 set package_id [ad_conn package_id]
 
-if { [empty_string_p $viewed_user_id] } {
+if { $viewed_user_id eq "" } {
     # Only admins can call this page for all users
     permission::require_permission -object_id $package_id -privilege admin
     set root_folder_id $package_id
@@ -50,12 +50,12 @@
     where acs_permission.permission_p(bm.bookmark_id, :browsing_user_id, 'delete') = 't'
     and bm.url_id = :url_id" {
 
-	if [catch {db_exec_plsql delete_dead_link "
+	if {[catch {db_exec_plsql delete_dead_link "
 	begin
 	bookmark.del (
 	bookmark_id => :bookmark_id
 	);       
-        end;"} errmsg] {
+        end;"} errmsg]} {
 
 	    set n_errors 1
 	    set error_list [list "We encountered an error while trying to process this DELETE:
@@ -65,16 +65,16 @@
 	}
     }
 
-    if { [empty_string_p $viewed_user_id] } {
+    if { $viewed_user_id eq "" } {
 	permission::require_permission -object_id $package_id -privilege admin
 
 	# Delete the url it self
-	if [catch {db_exec_plsql delete_dead_link "
+	if {[catch {db_exec_plsql delete_dead_link "
 	begin
 	url.del (
 	url_id => :url_id
 	);       
-        end;"} errmsg] {
+        end;"} errmsg]} {
 
 	    set n_errors 1
 	    set error_list [list "We encountered an error while trying to process this DELETE:
Index: openacs-4/packages/bookmarks/www/folder-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/folder-add-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bookmarks/www/folder-add-2.tcl	9 Sep 2013 12:19:57 -0000	1.3
+++ openacs-4/packages/bookmarks/www/folder-add-2.tcl	18 Apr 2014 06:38:29 -0000	1.4
@@ -31,7 +31,7 @@
 set folder_p "t"
 set closed_p "f"
 
-if [catch {db_exec_plsql bookmark_add "
+if {[catch {db_exec_plsql bookmark_add "
 declare
 dummy_var integer;
 begin
@@ -44,7 +44,7 @@
 creation_user => :user_id,
 creation_ip => :creation_ip
 );       
-end;"} errmsg] {
+end;"} errmsg]} {
 
     bm_handle_bookmark_double_click $bookmark_id $errmsg $return_url
 }
Index: openacs-4/packages/bookmarks/www/folder-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/folder-add.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bookmarks/www/folder-add.tcl	29 Jun 2004 10:17:48 -0000	1.4
+++ openacs-4/packages/bookmarks/www/folder-add.tcl	18 Apr 2014 06:38:29 -0000	1.5
@@ -26,7 +26,7 @@
 
 # If viewed_user_id was not provided the browsing user_id provides
 # a good default
-if { [empty_string_p $viewed_user_id] } {
+if { $viewed_user_id eq "" } {
     set viewed_user_id [ad_conn user_id]
 }
 
Index: openacs-4/packages/bookmarks/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/bookmarks/www/index.adp	9 Sep 2013 12:38:31 -0000	1.13
+++ openacs-4/packages/bookmarks/www/index.adp	18 Apr 2014 06:38:29 -0000	1.14
@@ -1,5 +1,5 @@
 <master>
-  <property name="title">@page_title;noquote@</property>
+  <property name="doc(title)">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   <property name="header_stuff">
     <script runat=client>
@@ -59,10 +59,10 @@
 
     set action_bar ""
 
-    if { ![string equal @bookmark.admin_p@ "0"] } {
+    if { "@bookmark.admin_p@" ne "0" } {
        lappend action_bar "<a href=bookmark-edit?viewed_user_id=@viewed_user_id@&bookmark_id=@bookmark.bookmark_id@&return_url=@return_url_urlenc@>$edit_anchor</a>"
     }
-    if { ![string equal @bookmark.delete_p@ "0"] } {
+    if { "@bookmark.delete_p@" ne "0" } {
        lappend action_bar "<a href=\"bookmark-delete?bookmark_id=@bookmark.bookmark_id@&return_url=@return_url_urlenc@&viewed_user_id=@viewed_user_id@\">$delete_anchor</a>"
     } 
 
@@ -92,7 +92,7 @@
 
     <table bgcolor=@bgcolor@ cellpadding=0 cellspacing=0 border=0 width="100%">
     <tr>
-    <td valign=top><img src="pics/spacer.gif" alt=""  width=<%=[expr [expr @bookmark.indentation@ - 1] * 24]%> height=1></td>
+    <td valign=top><img src="pics/spacer.gif" alt=""  width=<%=[expr {[expr @bookmark.indentation@ - 1] * 24}]%> height=1></td>
 
     <td><a href="@url@"><img width=24 height=22 border=0 src="<%= $image_url %>" align=top></a></td>
     <td width="100%"><a href="@url@">@decoration_open;noquote@@bookmark.bookmark_title;noquote@@decoration_close;noquote@</a> @action_bar;noquote@ @private_text;noquote@</td>
Index: openacs-4/packages/bookmarks/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/bookmarks/www/index.tcl	9 Sep 2013 17:51:47 -0000	1.10
+++ openacs-4/packages/bookmarks/www/index.tcl	18 Apr 2014 06:38:29 -0000	1.11
@@ -43,7 +43,7 @@
 set browsing_user_id [ad_conn user_id]
 
 # Is the user viewing his own bookmarks?
-if { ![info exists viewed_user_id] || [string equal $viewed_user_id $browsing_user_id] } {
+if { ![info exists viewed_user_id] || $viewed_user_id eq $browsing_user_id } {
     # The user is viewing his own bookmarks
     set viewed_user_id $browsing_user_id
     set context {}
@@ -74,7 +74,7 @@
 
 set context [bm_context_bar_args "" $viewed_user_id]
 
-if { ![string equal $viewed_user_id "0"] } {
+if { $viewed_user_id ne "0" } {
     set root_folder_id [bm_get_root_folder_id [ad_conn package_id] $viewed_user_id]
 } else {
     set root_folder_id 0
@@ -107,7 +107,7 @@
 
 # We let the owner of the bookmarks see which bookmarks are private,
 # and use a MUCH less expensive query that doesn't hit permissions
-if { [string equal $browsing_user_id $viewed_user_id] } {
+if {$browsing_user_id eq $viewed_user_id} {
     set private_select [db_map private_select]
 db_multirow bookmark my_bookmarks_select ""
 
Index: openacs-4/packages/bookmarks/www/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index.vuh,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/index.vuh	17 May 2004 15:14:58 -0000	1.2
+++ openacs-4/packages/bookmarks/www/index.vuh	18 Apr 2014 06:38:29 -0000	1.3
@@ -30,7 +30,7 @@
 
 db_foreach bm_info { } {
 
-    if { [string equal $folder_list 0] } {
+    if {$folder_list eq "0"} {
 	lappend folder_list $parent_id
     } else {
 	set previous_parent_id [lindex $folder_list end]	
@@ -43,15 +43,15 @@
 		incr indent
 		set i_str [string repeat $indent_str $indent]
 	    } else {
-		set drop [expr [llength $folder_list]-$parent_location]
+		set drop [expr {[llength $folder_list]-$parent_location}]
 		set folder_list [lrange $folder_list 0 $parent_location]
 		for {set i 1} {$i<$drop} {incr i} {
 		    incr indent -1
 		    set i_str [string repeat $indent_str $indent]
 		    append bookmark_html "$i_str</DL><p>\n\n"
 		}
 	    }
-	} elseif { [string equal $folder_p "t"] && [string equal $previous_folder_p "t"] } {
+	} elseif { $folder_p == "t" && $previous_folder_p == "t" } {
 	    # The previous folder was empty
 	    append bookmark_html "$i_str<DL><p>\n$i_str</DL><p>\n"
 	}
Index: openacs-4/packages/bookmarks/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/search.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/bookmarks/www/search.tcl	13 Jan 2005 13:56:12 -0000	1.8
+++ openacs-4/packages/bookmarks/www/search.tcl	18 Apr 2014 06:38:29 -0000	1.9
@@ -19,7 +19,7 @@
 } -validate {
 
     no_just_wildcard -requires {search_text:notnull} {
-	if [regexp {^%+$} $search_text] {
+	if {[regexp {^%+$} $search_text]} {
 	    ad_complain "Please search for more than just a wildcard."
 	}
     }
@@ -113,7 +113,7 @@
 # Take this "if" statement out once oracle has a bm_bookmarks_get_folder_names equivalent.
 # Until then we won't display the folder_names column when using oracle.
 set db_type [db_rdbms_get_type [db_current_rdbms]]
-if {$db_type != "postgresql"} {
+if {$db_type ne "postgresql"} {
 	template::list::element::set_property -list_name my_list \
 		-element_name folder_names -property hide_p -value 1
 	template::list::element::set_property -list_name others_list \
Index: openacs-4/packages/bookmarks/www/toggle-open-close.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/toggle-open-close.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bookmarks/www/toggle-open-close.tcl	29 Jun 2004 10:17:48 -0000	1.3
+++ openacs-4/packages/bookmarks/www/toggle-open-close.tcl	18 Apr 2014 06:38:29 -0000	1.4
@@ -34,7 +34,7 @@
 # in index.tcl to allow them to open/close folders.
 set in_closed_p_id [ad_decode $browsing_user_id "0" -[ad_conn session_id] $browsing_user_id]
 
-if { ![empty_string_p $bookmark_id] } {
+if { $bookmark_id ne "" } {
     # Toggle one folder
 
     db_exec_plsql toggle_open_close "
@@ -44,7 +44,7 @@
    browsing_user_id => :in_closed_p_id
     );
     end;"
-} elseif { [string equal $action "open_all"] || [string equal $action "close_all"] } {
+} elseif { $action eq "open_all" || $action eq "close_all" } {
     # Toggle all folders
 
     set closed_p [ad_decode $action "open_all" "f" "t"]