- Gustaf changes

tcl/intranet-csv-import-procs.tcl

@@ -205,7 +205,7 @@ ad_proc -public im_csv_import_object_fields {
     set super_types [im_object_super_types -object_type $object_type]
     set s [list]
     foreach t $super_types {
-	if {$t == "acs_object"} { continue }
+	if {$t eq "acs_object"} { continue }
 	lappend s $t
     }
     set super_types $s
@@ -377,7 +377,7 @@ ad_proc -public im_csv_import_guess_parser {
     set super_types [im_object_super_types -object_type $object_type]
     set s [list]
     foreach t $super_types {
-	if {$t == "acs_object"} { continue }
+	if {$t eq "acs_object"} { continue }
 	lappend s $t
     }
     set super_types $s

www/import-2.adp

 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context_bar@</property>
-<property name="main_navbar_label">@main_navbar_label@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context_bar;literal@</property>
+<property name="main_navbar_label">@main_navbar_label;literal@</property>
 
 <form enctype="multipart/form-data" method=POST action="import-@redirect_object_type@.tcl">
 <%= [export_vars -form {object_type return_url import_filename}] %>
@@ -39,12 +39,12 @@
 <!--
      <tr>
      <td>Save Mapping as:</td>
-     <td><input type=text name=mapping_name></td>
+     <td><input type="text" name="mapping_name"></td>
      </tr>
 -->
      <tr>
      <td></td>
-     <td><input type=submit value="<%= [lang::message::lookup "" intranet-csv-import.Import_CSV "Import CSV"] %>"></td>
+     <td><input type="submit" value="<%= [lang::message::lookup "" intranet-csv-import.Import_CSV "Import CSV"] %>"></td>
      </tr>
      </table>
 

www/import-2.tcl

@@ -15,7 +15,7 @@ ad_page_contract {
 # Default & Security
 # ---------------------------------------------------------------------
 
-set current_user_id [ad_maybe_redirect_for_registration]
+set current_user_id [auth::require_login]
 set page_title [lang::message::lookup "" intranet-cvs-import.Upload_Objects "Upload Objects"]
 set context_bar [im_context_bar "" $page_title]
 set admin_p [im_is_user_site_wide_or_intranet_admin $current_user_id]
@@ -50,14 +50,14 @@ if {"" == $return_url} {
 }
 
 # strip off the C:\directories... crud and just get the file name
-if ![regexp {([^//\\]+)$} $upload_file match filename] {
+if {![regexp {([^//\\]+)$} $upload_file match filename]} {
     # couldn't find a match
     set filename $upload_file
 }
 
 if {[regexp {\.\.} $filename]} {
     set error "Filename contains forbidden characters"
-    ad_returnredirect "/error.tcl?[export_vars -url {error}]"
+    ad_returnredirect [export_vars -base /error.tcl {error}]
 }
 
 if {![file readable $tmp_filename]} {

www/import-im_company.tcl

@@ -24,7 +24,7 @@ ad_page_contract {
 # Default & Security
 # ---------------------------------------------------------------------
 
-set current_user_id [ad_maybe_redirect_for_registration]
+set current_user_id [auth::require_login]
 set page_title [lang::message::lookup "" intranet-cvs-import.Upload_Objects "Upload Objects"]
 set context_bar [im_context_bar "" $page_title]
 

www/import-im_conf_item.tcl

@@ -25,7 +25,7 @@ ad_page_contract {
 # Default & Security
 # ---------------------------------------------------------------------
 
-set current_user_id [ad_maybe_redirect_for_registration]
+set current_user_id [auth::require_login]
 set page_title [lang::message::lookup "" intranet-cvs-import.Upload_Objects "Upload Objects"]
 set context_bar [im_context_bar "" $page_title]
 set admin_p [im_is_user_site_wide_or_intranet_admin $current_user_id]
@@ -168,7 +168,7 @@ foreach csv_line_fields $values_list_of_lists {
 
 	set var_value [string trim [lindex $csv_line_fields $j]]
 	set var_value [string map -nocase {"\"" "'" "\[" "(" "\{" "(" "\}" ")" "\]" ")"} $var_value]
-	if {[string equal "NULL" $var_value]} { set var_value ""}
+	if {"NULL" eq $var_value} { set var_value ""}
 
 	# replace unicode characters by non-accented characters
 	# Watch out! Does not work with Latin-1 characters

www/import-im_project.tcl

@@ -27,7 +27,7 @@ ad_page_contract {
 # Default & Security
 # ---------------------------------------------------------------------
 
-set current_user_id [ad_maybe_redirect_for_registration]
+set current_user_id [auth::require_login]
 set page_title [lang::message::lookup "" intranet-cvs-import.Upload_Objects "Upload Objects"]
 set context_bar [im_context_bar "" $page_title]
 set admin_p [im_is_user_site_wide_or_intranet_admin $current_user_id]
@@ -193,7 +193,7 @@ foreach csv_line_fields $values_list_of_lists {
 
 	set var_value [string trim [lindex $csv_line_fields $j]]
 	set var_value [string map -nocase {"\"" "'" "\[" "(" "\{" "(" "\}" ")" "\]" ")"} $var_value]
-	if {[string equal "NULL" $var_value]} { set var_value ""}
+	if {"NULL" eq $var_value} { set var_value ""}
 
 	# replace unicode characters by non-accented characters
 	# Watch out! Does not work with Latin-1 characters

www/import-im_risk.tcl

@@ -25,7 +25,7 @@ ad_page_contract {
 # Default & Security
 # ---------------------------------------------------------------------
 
-set current_user_id [ad_maybe_redirect_for_registration]
+set current_user_id [auth::require_login]
 set page_title [lang::message::lookup "" intranet-cvs-import.Upload_Objects "Upload Objects"]
 set context_bar [im_context_bar "" $page_title]
 

www/index.adp

 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context_bar@</property>
-<property name="main_navbar_label">@main_navbar_label@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context_bar;literal@</property>
+<property name="main_navbar_label">@main_navbar_label;literal@</property>
 
 <form enctype="multipart/form-data" method=POST action="import-2.tcl">
 <%= [export_vars -form {return_url main_navbar_label}] %>
 
-     <table border=0>
+     <table border="0">
      <tr> 
 	<td>#intranet-csv-import.Object_Type#</td>
 	<td> 
@@ -26,7 +26,7 @@
      <tr> 
 	<td><%= [lang::message::lookup "" intranet-csv-import.Filename] %></td>
 	<td> 
-	  <input type=file name=upload_file size=30>
+	  <input type="file" name="upload_file" size="30">
 	<%= [im_gif help "Use the &quot;Browse...&quot; button to locate your file, then click &quot;Open&quot;."] %>
 	</td>
      </tr>
@@ -34,7 +34,7 @@
      <tr> 
 	<td></td>
 	<td> 
-	  <input type=submit>
+	  <input type="submit">
 	</td>
     </tr>
 

www/index.tcl

@@ -22,7 +22,7 @@ ad_page_contract {
     { object_type "" }
 }
 
-set user_id [ad_maybe_redirect_for_registration]
+set user_id [auth::require_login]
 set page_title [lang::message::lookup "" intranet-csv-import.Upload_file "Upload File"]
 set context_bar [im_context_bar "" $page_title]
 set main_navbar_label [im_csv_import_label_from_object_type -object_type $object_type]