Skip to content

I
intranet-dynfield
Commit 1946559e authored by Frank Bergmann's avatar Frank Bergmann
Browse files
Options

- Gustaf changes

parent c0269052
Hide whitespace changes
Inline Side-by-side
Showing with 300 additions and 300 deletions
resources/forms/default-relative.adp
View file @ 1946559e
<table bgcolor=#6699CC cellspacing=0 cellpadding=4 border=0 width="95%">
<table bgcolor="#6699CC" cellspacing="0" cellpadding="4" border="0" width="95%">
<tr bgcolor="#FFFFFF">
<td align=left><b>@form_properties.title@</b></td>
<td align=right>&nbsp;</td>
<td align="left"><b>@form_properties.title@</b></td>
<td align="right">&nbsp;</td>
</tr>
<if @elements:rowcount@ le 0>
<tr><td colspan=2><i>#intranet-dynfield.No_items#</i></td></tr>
<tr><td colspan="2"><i>#intranet-dynfield.No_items#</i></td></tr>
</if>
<else>
<tr>
<td colspan=2>
<td colspan="2">
<table bgcolor=#99CCFF cellspacing=0 cellpadding=2 border=0 width="100%">
<table bgcolor="#99CCFF" cellspacing="0" cellpadding="2" border="0" width="100%">
<tr bgcolor="#99CCFF">
<% set list_tag $form_properties(headers) %>
<list name=list_tag>
<th align=left>@list_tag:item@</th>
<th align="left">@list_tag:item@</th>
</list>
</tr>
......@@ -25,15 +25,15 @@
<if @elements.rownum@ le @elements:rowcount@>
<if @elements.col@ eq 1>
<if @elements.row@ odd><tr bgcolor=#ffffff></if>
<else><tr bgcolor=#dddddd></else>
<if @elements.row@ odd><tr bgcolor="#ffffff"></if>
<else><tr bgcolor="#dddddd"></else>
</if>
<if @elements.widget@ not in "hidden" "submit">
<td nowrap>
<if @elements.widget@ in radio checkbox>
<table cellpadding=4 cellspacing=0 border=0>
<table cellpadding="4" cellspacing="0" border="0">
<tr>
<noparse>
<formgroup id=@elements.id@>
......@@ -75,7 +75,7 @@
<multiple name=elements>
<if @elements.widget@ eq "submit">
<tr bgcolor="#FFFFFF">
<td align=right colspan=2><input type=submit name=@elements.id@ value="@elements.label@"></td>
<td align="right" colspan="2"><input type="submit" name="@elements.id@" value="@elements.label@"></td>
</tr>
</if>
</multiple>
......
resources/forms/person-view.adp
View file @ 1946559e
......@@ -18,7 +18,7 @@
<span class="form-label"> </span>
<div class="standard-form-help-text">
<noparse><formhelptext id="first_names">
<img src=/shared/images/info.gif width=12 height=9 alt=\[i\] title=Help_text border=0></formhelptext></noparse>
<img src=/shared/images/info.gif width=12 height=9 alt=\[i\] title=Help_text border="0"></formhelptext></noparse>
</div>
</div>
</div>
......
tcl/attribute-procs.tcl
View file @ 1946559e
......@@ -129,7 +129,7 @@ ad_proc -public im_dynfield::attribute::add {
# massage parameters
set attribute_name [string tolower $attribute_name]
if {$pretty_plural == ""} { set pretty_plural $pretty_name }
if {$pretty_plural eq ""} { set pretty_plural $pretty_name }
# Get the storage type from the widget.
db_1row select_widget_pretty_and_storage_type {
......@@ -157,7 +157,7 @@ ad_proc -public im_dynfield::attribute::add {
# Right now, we do not support number restrictions for attributes
set max_n_values 1
if { [string eq $required_p "t"] } {
if {$required_p == "t"} {
set min_n_values 1
} else {
set min_n_values 0
......@@ -232,7 +232,7 @@ ad_proc -public im_dynfield::attribute::add {
# Add the column to the table if it doesn't already exist
# and if the attribut's storage type if "value" (not a multimap)
if {[string equal $modify_sql_p "t"] && ![db_column_exists $table_name $attribute_name] && !$multimap_p } {
if {$modify_sql_p == "t" && ![db_column_exists $table_name $attribute_name] && !$multimap_p } {
db_dml add_column "alter table $table_name add column $attribute_name $sql_datatype"
}
return $attribute_id
......@@ -329,7 +329,7 @@ ad_proc im_dynfield::attribute::map {
where attribute_id = :attribute_id and object_type_id = :list_id
"
if {$required_p == ""} {
if {$required_p eq ""} {
# Determine if an attribute should be required in this list by the default value for required.
set required_p [db_string required "select case when aa.min_n_values = 0 then 'f' else 't' end as required_p from acs_attributes aa, im_dynfield_attributes ida where ida.acs_attribute_id = aa.attribute_id and ida.attribute_id = :attribute_id" -default "f"]
}
......@@ -457,7 +457,7 @@ namespace eval attribute {
set column_name $acs_attribute_name
}
if { [empty_string_p $table_name] || [empty_string_p $column_name] } {
if { $table_name eq "" || $column_name eq "" } {
# We have to have both a non-empty table name and column name
error "We do not have enough information to automatically remove this\
attribute. Namely, we are missing either the table name or the column name"
......
tcl/calculated-sql-widget-procs.tcl
View file @ 1946559e
......@@ -28,7 +28,7 @@ ad_proc -public template::widget::calculated_sql { element_reference tag_attribu
set sql_pos [lsearch $params sql]
if { $sql_pos >= 0 } {
set sql_statement [lindex $params [expr $sql_pos + 1]]
set sql_statement [lindex $params $sql_pos+1]
} else {
return "Calculated Sql Widget: Error: Didn't find 'sql' parameter"
}
......
tcl/generic-sql-widget-procs.tcl
View file @ 1946559e
......@@ -28,7 +28,7 @@ ad_proc -public template::widget::generic_sql { element_reference tag_attributes
set sql_pos [lsearch $params sql]
if { $sql_pos >= 0 } {
set sql_statement [lindex $params [expr $sql_pos + 1]]
set sql_statement [lindex $params $sql_pos+1]
} else {
return "Generic SQL Widget: Error: Didn't find 'sql' parameter"
}
......@@ -37,14 +37,14 @@ ad_proc -public template::widget::generic_sql { element_reference tag_attributes
set memoize_max_age [parameter::get_from_package_key -package_key intranet-dynfield -parameter GenericSQLWidgetMemoizeMaxAgeDefault -default 600]
set memoize_max_age_pos [lsearch $params "memoize_max_age"]
if { $memoize_max_age_pos >= 0 } {
set memoize_max_age [lindex $params [expr $memoize_max_age_pos + 1]]
set memoize_max_age [lindex $params $memoize_max_age_pos+1]
}
# The "include_empty_p" adds an empty line
set include_empty_p 1
set include_empty_p_pos [lsearch $params include_empty_p]
if { $include_empty_p_pos >= 0 } {
set include_empty_p [lindex $params [expr $include_empty_p_pos + 1]]
set include_empty_p [lindex $params $include_empty_p_pos+1]
}
# The "include_empty_name" pops up as first line
......@@ -52,7 +52,7 @@ ad_proc -public template::widget::generic_sql { element_reference tag_attributes
# [lang::message::lookup "" intranet-dynfield.no_value]
set include_empty_name_pos [lsearch $params include_empty_name]
if { $include_empty_name_pos >= 0 } {
set include_empty_name [lindex $params [expr $include_empty_name_pos + 1]]
set include_empty_name [lindex $params $include_empty_name_pos+1]
}
......@@ -145,7 +145,7 @@ ad_proc -public template::widget::generic_sql { element_reference tag_attributes
} else {
set sql_html "<select name=\"$element(name)\" id=\"$element(name)\" "
foreach name [array names attributes] {
if { [string equal $attributes($name) {}] } {
if {$attributes($name) eq {}} {
append sql_html " $name"
} else {
append sql_html " $name=\"$attributes($name)\""
......@@ -153,7 +153,7 @@ ad_proc -public template::widget::generic_sql { element_reference tag_attributes
}
set i 0
while {$i < [llength $element(html)]} {
append sql_html " [lindex $element(html) $i]=\"[lindex $element(html) [expr $i + 1]]\""
append sql_html " [lindex $element(html) $i]=\"[lindex $element(html) $i+1]\""
incr i 2
}
append sql_html " >\n"
......
tcl/generic-tcl-widget-procs.tcl
View file @ 1946559e
......@@ -35,14 +35,14 @@ ad_proc -public template::widget::generic_tcl { element_reference tag_attributes
set tcl_pos [lsearch $params tcl]
if { $tcl_pos >= 0 } {
set tcl_code [lindex $params [expr $tcl_pos + 1]]
set tcl_code [lindex $params $tcl_pos+1]
} else {
return "Generic tcl Widget: Error: Didn't find 'tcl' parameter"
}
set switch_pos [lsearch $params switch_p]
if {$switch_pos >= 0} {
set switch_p [lindex $params [expr $switch_pos +1]]
set switch_p [lindex $params $switch_pos+1]
} else {
set switch_p 0
}
......@@ -50,7 +50,7 @@ ad_proc -public template::widget::generic_tcl { element_reference tag_attributes
# Deal with global variables being pushed through
set global_var_pos [lsearch $params global_var]
if {$global_var_pos >= 0} {
set global_var_name [lindex $params [expr $global_var_pos +1]]
set global_var_name [lindex $params $global_var_pos+1]
set $global_var_name [set ::$global_var_name]
}
......@@ -59,13 +59,13 @@ ad_proc -public template::widget::generic_tcl { element_reference tag_attributes
set memoize_max_age [parameter::get_from_package_key -package_key intranet-dynfield -parameter GenericSQLWidgetMemoizeMaxAgeDefault -default 600]
set memoize_max_age_pos [lsearch $params "memoize_max_age"]
if { $memoize_max_age_pos >= 0 } {
set memoize_max_age [lindex $params [expr $memoize_max_age_pos + 1]]
set memoize_max_age [lindex $params $memoize_max_age_pos+1]
}
set switch_pos [lsearch $params switch_p]
if {$switch_pos >= 0} {
set switch_p [lindex $params [expr $switch_pos +1]]
set switch_p [lindex $params $switch_pos+1]
} else {
set switch_p 0
}
......@@ -73,14 +73,14 @@ ad_proc -public template::widget::generic_tcl { element_reference tag_attributes
# Deal with global variables being pushed through
set global_var_pos [lsearch $params global_var]
if {$global_var_pos >= 0} {
set global_var_name [lindex $params [expr $global_var_pos +1]]
set global_var_name [lindex $params $global_var_pos+1]
set $global_var_name [set ::$global_var_name]
ds_comment "$global_var_name [set $global_var_name]"
}
set memoize_pos [lsearch $params memoize_p]
if {$memoize_pos >= 0} {
set memoize_p [lindex $params [expr $memoize_pos +1]]
set memoize_p [lindex $params $memoize_pos+1]
} else {
set memoize_p 1
}
......@@ -90,7 +90,7 @@ ad_proc -public template::widget::generic_tcl { element_reference tag_attributes
set memoize_max_age [parameter::get_from_package_key -package_key intranet-dynfield -parameter GenericSQLWidgetMemoizeMaxAgeDefault -default 600]
set memoize_max_age_pos [lsearch $params "memoize_max_age"]
if { $memoize_max_age_pos >= 0 } {
set memoize_max_age [lindex $params [expr $memoize_max_age_pos + 1]]
set memoize_max_age [lindex $params $memoize_max_age_pos+1]
}
}
......@@ -98,7 +98,7 @@ ad_proc -public template::widget::generic_tcl { element_reference tag_attributes
set include_empty_p 1
set include_empty_p_pos [lsearch $params include_empty_p]
if { $include_empty_p_pos >= 0 } {
set include_empty_p [lindex $params [expr $include_empty_p_pos + 1]]
set include_empty_p [lindex $params $include_empty_p_pos+1]
}
# The "include_empty_name" pops up as first line
......@@ -106,7 +106,7 @@ ad_proc -public template::widget::generic_tcl { element_reference tag_attributes
# [lang::message::lookup "" intranet-dynfield.no_value]
set include_empty_name_pos [lsearch $params include_empty_name]
if { $include_empty_name_pos >= 0 } {
set include_empty_name [lindex $params [expr $include_empty_name_pos + 1]]
set include_empty_name [lindex $params $include_empty_name_pos+1]
}
array set attributes $tag_attributes
......@@ -166,7 +166,7 @@ ad_proc -public template::widget::generic_tcl { element_reference tag_attributes
} else {
set tcl_html "<select name=\"$element(name)\" id=\"$element(name)\" "
foreach name [array names attributes] {
if { [string equal $attributes($name) {}] } {
if {$attributes($name) eq {}} {
append tcl_html " $name"
} else {
append tcl_html " $name=\"$attributes($name)\""
......@@ -174,7 +174,7 @@ ad_proc -public template::widget::generic_tcl { element_reference tag_attributes
}
set i 0
while {$i < [llength $element(html)]} {
append tcl_html " [lindex $element(html) $i]=\"[lindex $element(html) [expr $i + 1]]\""
append tcl_html " [lindex $element(html) $i]=\"[lindex $element(html) $i+1]\""
incr i 2
}
append tcl_html " >\n"
......
tcl/instant-message-widgets-procs.tcl
View file @ 1946559e
......@@ -89,7 +89,7 @@ ad_proc -private template::util::skype::status {
set uri "http://mystatus.skype.com"
#If response_type is image, add to URI the image type to return
if { $response_type == "img" } {
if { $response_type eq "img" } {
switch $image_type {
"balloon" {set image_type "balloon"}
"big_classic" {set image_type "bigclassic"}
......@@ -108,15 +108,15 @@ ad_proc -private template::util::skype::status {
set uri ${uri}/$username
#If response_type is not an image, append it to the URI
if { $response_type != "img" } {
if { $response_type ne "img" } {
set uri ${uri}.$response_type
}
#If response_type is txt, check for language and character set.
if { $response_type == "txt" } {
if { $response_type eq "txt" } {
#If language is specified, check for its availablity and add it to the URI
if { ![empty_string_p $language] } {
if { $language ne "" } {
string tolower $language
switch $language {
"en" {set language "en"}
......@@ -140,7 +140,7 @@ ad_proc -private template::util::skype::status {
}
#If char_set is specified append it to the URI
if { ![empty_string_p $char_set] } {
if { $char_set ne "" } {
string tolower $char_set
switch $char_set {
"utf" {set char_set "utf8"}
......@@ -223,7 +223,7 @@ ad_proc -public template::util::skype::status_xml {
set node [$node firstChild]
set nodelist [$node selectNodes /rdf/status/presence/text()]
if { [empty_string_p $language] } {
if { $language eq "" } {
set language "en"
}
switch $language {
......
tcl/intranet-dynfield-procs.tcl
View file @ 1946559e
......@@ -324,7 +324,7 @@ ad_proc -public im_dynfield::search_sql_criteria_from_form {
set ext_tables [list]
set ext_table_join_where ""
db_foreach ext_tables $ext_table_sql {
if {$ext_table_name == ""} { continue }
if {$ext_table_name eq ""} { continue }
if {$ext_table_name == $main_table_name} { continue }
lappend ext_tables $ext_table_name
......@@ -377,7 +377,7 @@ ad_proc -public im_dynfield::search_sql_criteria_from_form {
}
set where_clause [join $criteria " and\n "]
if { ![empty_string_p $where_clause] } {
if { $where_clause ne "" } {
set where_clause " and $where_clause"
}
......@@ -633,7 +633,7 @@ ad_proc -public im_dynfield::attribute_store {
}
# Empty table name? Ugly, but that's the main table then...
if {[empty_string_p $table_name]} { set table_name $main_table }
if {$table_name eq ""} { set table_name $main_table }
# object_subtype_id can be a list, so go through the list
# and take the highest one (none - display - edit).
......@@ -658,7 +658,7 @@ ad_proc -public im_dynfield::attribute_store {
# Is this a multi-value field?
set multiple_p [template::element::get_property $form_id $attribute_name multiple_p]
if {[empty_string_p $multiple_p]} { set multiple_p 0 }
if {$multiple_p eq ""} { set multiple_p 0 }
if {$storage_type_id == [im_dynfield_storage_type_id_multimap]} { set multiple_p 1 }
if {!$multiple_p} {
......@@ -849,10 +849,10 @@ ad_proc -public im_dynfield::widget_request {
set option_list ""
set options_pos [lsearch $parameter_list "options"]
if {$options_pos >= 0} {
set option_list [lindex $parameter_list [expr $options_pos + 1]]
set option_list [lindex $parameter_list $options_pos+1]
}
if { [string eq $required_p "f"] && ![string eq $widget "checkbox"]} {
if { $required_p == "f" && $widget ne "checkbox" } {
set option_list [linsert $option_list -1 [list " [_ intranet-dynfield.no_value] " ""]]
}
......@@ -957,7 +957,7 @@ ad_proc -public im_dynfield::elements {
<li>widget
<li>html_options</ol>
} {
if {$user_id == ""} {
if {$user_id eq ""} {
set user_id [ad_conn user_id]
}
set attributes [list]
......@@ -1028,7 +1028,7 @@ ad_proc -public im_dynfield::append_attributes_to_form {
}
# add a hidden object_id field to the form
if {[exists_and_not_null object_id]} {
if {([info exists object_id] && $object_id ne "")} {
if {![template::element::exists $form_id "object_id"]} {
if {$debug} { ns_log Notice "im_dynfield::append_attributes_to_form: creating object_id=$object_id" }
template::element create $form_id "object_id" \
......@@ -1217,7 +1217,7 @@ ad_proc -public im_dynfield::append_attributes_to_form {
if {[info exists display_mode_hash($key)]} {
switch $display_mode_hash($key) {
edit { set display_mode "edit" }
display { if {$display_mode == "none"} { set display_mode "display" } }
display { if {$display_mode eq "none"} { set display_mode "display" } }
}
}
}
......@@ -1331,7 +1331,7 @@ ad_proc -public im_dynfield::append_attributes_to_form {
if {[info exists display_mode_hash($key)]} {
switch $display_mode_hash($key) {
edit { set display_mode "edit" }
display { if {$display_mode == "none"} { set display_mode "display" } }
display { if {$display_mode eq "none"} { set display_mode "display" } }
}
}
}
......@@ -1427,9 +1427,9 @@ ad_proc -public im_dynfield::append_attribute_to_form {
# Might translate the datatype into one for which we have a
# validator (e.g. a string datatype would change into text).
set translated_datatype [attribute::translate_datatype $datatype]
if {$datatype == "number"} {
if {$datatype eq "number"} {
set translated_datatype "float"
} elseif {$datatype == "date"} {
} elseif {$datatype eq "date"} {
set translated_datatype "date"
}
......@@ -1446,27 +1446,27 @@ ad_proc -public im_dynfield::append_attribute_to_form {
set custom_pos [lsearch $parameter_list "custom"]
if {$custom_pos >= 0} {
set custom_parameters [lindex $parameter_list [expr $custom_pos + 1]]
set custom_parameters [lindex $parameter_list $custom_pos+1]
}
set html_pos [lsearch $parameter_list "html"]
if {$html_pos >= 0} {
set html_parameters [lindex $parameter_list [expr $html_pos + 1]]
set html_parameters [lindex $parameter_list $html_pos+1]
}
set format_pos [lsearch $parameter_list "format"]
if {$format_pos >= 0} {
set format_parameters [lindex $parameter_list [expr $format_pos + 1]]
set format_parameters [lindex $parameter_list $format_pos+1]
}
set after_html_pos [lsearch $parameter_list "after_html"]
if {$after_html_pos >= 0} {
set after_html_parameters [subst [lindex $parameter_list [expr $after_html_pos + 1]]]
set after_html_parameters [subst [lindex $parameter_list $after_html_pos+1]]
}
set options_pos [lsearch $parameter_list "options"]
if {$options_pos >= 0} {
set option_parameters [lindex $parameter_list [expr $options_pos + 1]]
set option_parameters [lindex $parameter_list $options_pos+1]
}
}
......@@ -1495,7 +1495,7 @@ ad_proc -public im_dynfield::append_attribute_to_form {
switch $widget {
checkbox - radio - select - multiselect - im_category_tree - category_tree {
# These widgets need an additional -options parameter
if { [string eq $required_p "f"] && ![string eq $widget "checkbox"]} {
if { $required_p == "f" && $widget ne "checkbox" } {
set option_parameters [linsert $option_parameters -1 [list " [_ intranet-dynfield.no_value] " ""]]
}
if {![template::element::exists $form_id "$attribute_name"]} {
......
tcl/mobile-number-widget-procs.tcl
View file @ 1946559e
......@@ -42,15 +42,15 @@ ad_proc -public template::util::mobile_number::html_view {
} {
set mobile_number ""
if { [parameter::get_from_package_key -parameter "ForceCountryCodeOneFormatting" -package_key "ams" -default "0"] } {
if { $national_number != "1" } {
if { $national_number != 1 } {
set mobile_number "[_ ams.international_dial_code]${national_number}-"
}
} else {
set mobile_number ${national_number}
if { [exists_and_not_null mobile_number] } { append mobile_number "-" }
if { ([info exists mobile_number] && $mobile_number ne "") } { append mobile_number "-" }
}
append mobile_number $area_city_code
if { [exists_and_not_null mobile_number] } { append mobile_number "-" }
if { ([info exists mobile_number] && $mobile_number ne "") } { append mobile_number "-" }
append mobile_number "$subscriber_number"
......@@ -84,12 +84,12 @@ ad_proc -public template::util::mobile_number::text_view {
} {
set mobile_number ""
if { [parameter::get_from_package_key -parameter "ForceCountryCodeOneFormatting" -package_key "ams" -default "0"] } {
if { $national_number != "1" } {
if { $national_number != 1 } {
set mobile_number "[_ ams.international_dial_code]${national_number}-"
}
} else {
set mobile_number ${national_number}
if { [exists_and_not_null mobile_number] } { append mobile_number "-" }
if { ([info exists mobile_number] && $mobile_number ne "") } { append mobile_number "-" }
}
append mobile_number "$subscriber_number"
......@@ -149,12 +149,12 @@ ad_proc -public template::data::validate::mobile_number { value_ref message_ref
# the number was formatted correctly. If not we need to reply with a message that lets
# users know how they are supposed to format numbers.
if { ![exists_and_not_null area_city_code] || ![exists_and_not_null national_number] } {
if { (![info exists area_city_code] || $area_city_code eq "") || (![info exists national_number] || $national_number eq "") } {
set message [_ ams.lt_Mobile_numbers_in_country_code]
}
}
if { [exists_and_not_null message] } {
if { ([info exists message] && $message ne "") } {
return 0
} else {
return 1
......@@ -205,7 +205,7 @@ ad_proc -public template::data::transform::mobile_number { element_ref } {
regsub -all {^x} $extension {} extension
}
}
if { [empty_string_p $subscriber_number] } {
if { $subscriber_number eq "" } {
# We need to return the empty list in order for form builder to think of it
# as a non-value in case of a required element.
return [list]
......@@ -371,37 +371,37 @@ ad_proc -public template::widget::mobile_number { element_reference tag_attribut
set output {}
if { [string equal $element(mode) "edit"] } {
if {$element(mode) eq "edit"} {
set attributes(id) \"mobile_number__$element(form_id)__$element(id)\"
set summary_number ""
if { [exists_and_not_null national_number] } {
if { $national_number != "1" } {
if { ([info exists national_number] && $national_number ne "") } {
if { $national_number != 1 } {
append summary_number "011-$national_number"
}
}
if { [exists_and_not_null area_city_code] } {
if { [exists_and_not_null summary_number] } { append summary_number "-" }
if { ([info exists area_city_code] && $area_city_code ne "") } {
if { ([info exists summary_number] && $summary_number ne "") } { append summary_number "-" }
append summary_number $area_city_code
}
if { [exists_and_not_null subscriber_number] } {
if { [exists_and_not_null summary_number] } { append summary_number "-" }
if { ([info exists subscriber_number] && $subscriber_number ne "") } {
if { ([info exists summary_number] && $summary_number ne "") } { append summary_number "-" }
append summary_number $subscriber_number
}
if { [exists_and_not_null extension] } {
if { [exists_and_not_null summary_number] } { append summary_number "x" }
if { ([info exists extension] && $extension ne "") } {
if { ([info exists summary_number] && $summary_number ne "") } { append summary_number "x" }
append summary_number $extension
}
# set summary_number "$national_number\-$area_city_code\-$subscriber_number\x$extension"
append output "<input type=\"text\" name=\"$element(id).summary_number\" value=\"[ad_quotehtml $summary_number]\" size=\"20\">"
append output "<input type=\"text\" name=\"$element(id).summary_number\" value=\"[ns_quotehtml $summary_number]\" size=\"20\">"
} else {
# Display mode
if { [info exists element(value)] } {
append output "[template::util::mobile_number::get_property html_view $element(value)]"
append output "<input type=\"hidden\" name=\"$element(id).itu_id\" value=\"[ad_quotehtml $itu_id]\">"
append output "<input type=\"hidden\" name=\"$element(id).national_number\" value=\"[ad_quotehtml $national_number]\">"
append output "<input type=\"hidden\" name=\"$element(id).subscriber_number\" value=\"[ad_quotehtml $subscriber_number]\">"
append output "<input type=\"hidden\" name=\"$element(id).best_contact_time\" value=\"[ad_quotehtml $best_contact_time]\">"
append output "<input type=\"hidden\" name=\"$element(id).itu_id\" value=\"[ns_quotehtml $itu_id]\">"
append output "<input type=\"hidden\" name=\"$element(id).national_number\" value=\"[ns_quotehtml $national_number]\">"
append output "<input type=\"hidden\" name=\"$element(id).subscriber_number\" value=\"[ns_quotehtml $subscriber_number]\">"
append output "<input type=\"hidden\" name=\"$element(id).best_contact_time\" value=\"[ns_quotehtml $best_contact_time]\">"
}
}
......
tcl/recurrence-widget-procs.tcl
View file @ 1946559e
......@@ -38,10 +38,10 @@ ad_proc -public template::util::recurrence::html_view {
{recur_until {}}
} {
set recurrence "Every $every_n $interval_type"
if { [exists_and_not_null days_of_week] } {
if { ([info exists days_of_week] && $days_of_week ne "") } {
append recurrence $days_of_week
}
if { [exists_and_not_null recur_until] } {
if { ([info exists recur_until] && $recur_until ne "") } {
append recurrence $recur_until
}
return [ad_text_to_html $recurrence]
......@@ -75,20 +75,20 @@ ad_proc -public template::data::validate::recurrence { value_ref message_ref } {
# for built in display purposes these characters are not allowed, if you need it
# to be allowed make SURE that retrieval procs in AMS are also updated
# to deal with this change
if { [exists_and_not_null message_temp] } { append message " " }
if { ([info exists message_temp] && $message_temp ne "") } { append message " " }
append message "[_ ams.Your_entry_must_not_contain_the_following_characters]: \{ \}."
}
if { $country_code == "US" } {
if { $country_code eq "US" } {
# this should check a cached list
# this proc cannot for some reason go in the postgresql file...
if { ![db_0or1row validate_state {
select 1 from us_states where abbrev = upper(:region) or state_name = upper(:region)
} ] } {
if { [exists_and_not_null message_temp] } { append message " " }
if { ([info exists message_temp] && $message_temp ne "") } { append message " " }
append message "\"$region\" [_ ams.is_not_a_valid_US_state]."
}
}
if { [exists_and_not_null message_temp] } {
if { ([info exists message_temp] && $message_temp ne "") } {
return 0
} else {
return 1
......@@ -106,7 +106,7 @@ ad_proc -public template::data::transform::recurrence { element_ref } {
set days_of_week [ns_queryget $element_id.region]
set recur_until [ns_queryget $element_id.postal_code]
if { [empty_string_p $every_n] } {
if { $every_n eq "" } {
# We need to return the empty list in order for form builder to think of it
# as a non-value in case of a required element.
return [list]
......@@ -219,7 +219,7 @@ ad_proc -public template::widget::recurrence { element_reference tag_attributes
set output {}
if { [string equal $element(mode) "edit"] } {
if {$element(mode) eq "edit"} {
set every_n_options {
{"Every" 1}
......@@ -254,10 +254,10 @@ ad_proc -public template::widget::recurrence { element_reference tag_attributes
# Display mode
if { [info exists element(value)] } {
append output [template::util::recurrence::get_property html_view $element(value)]
append output "<input type=\"hidden\" name=\"$element(id).every_n\" value=\"[ad_quotehtml $every_n]\">"
append output "<input type=\"hidden\" name=\"$element(id).interval_type\" value=\"[ad_quotehtml $interval_type]\">"
append output "<input type=\"hidden\" name=\"$element(id).days_of_week\" value=\"[ad_quotehtml $days_of_week]\">"
append output "<input type=\"hidden\" name=\"$element(id).recur_until\" value=\"[ad_quotehtml $recur_until]\">"
append output "<input type=\"hidden\" name=\"$element(id).every_n\" value=\"[ns_quotehtml $every_n]\">"
append output "<input type=\"hidden\" name=\"$element(id).interval_type\" value=\"[ns_quotehtml $interval_type]\">"
append output "<input type=\"hidden\" name=\"$element(id).days_of_week\" value=\"[ns_quotehtml $days_of_week]\">"
append output "<input type=\"hidden\" name=\"$element(id).recur_until\" value=\"[ns_quotehtml $recur_until]\">"
}
}
......
tcl/telecom-number-widget-procs.tcl
View file @ 1946559e
......@@ -49,19 +49,19 @@ ad_proc -public template::util::telecom_number::html_view {
} {
set telecom_number ""
if { [parameter::get_from_package_key -parameter "ForceCountryCodeOneFormatting" -package_key "ams" -default "0"] } {
if { $national_number != "1" } {
if { $national_number != 1 } {
set telecom_number "[_ ams.international_dial_code]${national_number}-"
}
} else {
set telecom_number ${national_number}
if { [exists_and_not_null telecom_number] } { append telecom_number "-" }
if { ([info exists telecom_number] && $telecom_number ne "") } { append telecom_number "-" }
}
append telecom_number $area_city_code
if { [exists_and_not_null telecom_number] } { append telecom_number "-" }
if { ([info exists telecom_number] && $telecom_number ne "") } { append telecom_number "-" }
append telecom_number "$subscriber_number"
if { [exists_and_not_null extension] } { append telecom_number "&nbsp;x$extension" }
if { ([info exists extension] && $extension ne "") } { append telecom_number "&nbsp;x$extension" }
set phone_url [parameter::get_from_package_key -parameter "PhoneURL" -package_key "ams" -default ""]
if {[empty_string_p $phone_url]} {
if {$phone_url eq ""} {
return $telecom_number
} else {
return "<a href=\"[eval set foo $phone_url]\">$telecom_number</a>"
......@@ -128,12 +128,12 @@ ad_proc -public template::data::validate::telecom_number { value_ref message_ref
# the number was formatted correctly. If not we need to reply with a message that lets
# users know how they are supposed to format numbers.
if { ![exists_and_not_null area_city_code] || ![exists_and_not_null national_number] } {
if { (![info exists area_city_code] || $area_city_code eq "") || (![info exists national_number] || $national_number eq "") } {
set message [_ ams.lt_Telecom_numbers_in_country_code]
}
}
if { [exists_and_not_null message] } {
if { ([info exists message] && $message ne "") } {
return 0
} else {
return 1
......@@ -185,7 +185,7 @@ ad_proc -public template::data::transform::telecom_number { element_ref } {
regsub -all {^x} $extension {} extension
}
}
if { [empty_string_p $subscriber_number] } {
if { $subscriber_number eq "" } {
# We need to return the empty list in order for form builder to think of it
# as a non-value in case of a required element.
return [list]
......@@ -365,45 +365,45 @@ ad_proc -public template::widget::telecom_number { element_reference tag_attribu
set output {}
if { [string equal $element(mode) "edit"] } {
if {$element(mode) eq "edit"} {
set attributes(id) \"telecom_number__$element(form_id)__$element(id)\"
set summary_number ""
if { [exists_and_not_null national_number] } {
if { $national_number != "1" } {
if { ([info exists national_number] && $national_number ne "") } {
if { $national_number != 1 } {
append summary_number "011-$national_number"
}
}
if { [exists_and_not_null area_city_code] } {
if { [exists_and_not_null summary_number] } { append summary_number "-" }
if { ([info exists area_city_code] && $area_city_code ne "") } {
if { ([info exists summary_number] && $summary_number ne "") } { append summary_number "-" }
append summary_number $area_city_code
}
if { [exists_and_not_null subscriber_number] } {
if { [exists_and_not_null summary_number] } { append summary_number "-" }
if { ([info exists subscriber_number] && $subscriber_number ne "") } {
if { ([info exists summary_number] && $summary_number ne "") } { append summary_number "-" }
append summary_number $subscriber_number
}
if { [exists_and_not_null extension] } {
if { [exists_and_not_null summary_number] } { append summary_number "x" }
if { ([info exists extension] && $extension ne "") } {
if { ([info exists summary_number] && $summary_number ne "") } { append summary_number "x" }
append summary_number $extension
}
# set summary_number "$national_number\-$area_city_code\-$subscriber_number\x$extension"
append output "<input type=\"text\" name=\"$element(id).summary_number\" value=\"[ad_quotehtml $summary_number]\" size=\"20\">"
append output "<input type=\"text\" name=\"$element(id).summary_number\" value=\"[ns_quotehtml $summary_number]\" size=\"20\">"
} else {
# Display mode
if { [info exists element(value)] } {
append output "[template::util::telecom_number::get_property html_view $element(value)]"
append output "<input type=\"hidden\" name=\"$element(id).itu_id\" value=\"[ad_quotehtml $itu_id]\">"
append output "<input type=\"hidden\" name=\"$element(id).national_number\" value=\"[ad_quotehtml $national_number]\">"
append output "<input type=\"hidden\" name=\"$element(id).area_city_code\" value=\"[ad_quotehtml $area_city_code]\">"
append output "<input type=\"hidden\" name=\"$element(id).subscriber_number\" value=\"[ad_quotehtml $subscriber_number]\">"
append output "<input type=\"hidden\" name=\"$element(id).extension\" value=\"[ad_quotehtml $extension]\">"
append output "<input type=\"hidden\" name=\"$element(id).sms_enabled_p\" value=\"[ad_quotehtml $sms_enabled_p]\">"
append output "<input type=\"hidden\" name=\"$element(id).best_contact_time\" value=\"[ad_quotehtml $best_contact_time]\">"
append output "<input type=\"hidden\" name=\"$element(id).location\" value=\"[ad_quotehtml $location]\">"
append output "<input type=\"hidden\" name=\"$element(id).phone_type_id\" value=\"[ad_quotehtml $phone_type_id]\">"
append output "<input type=\"hidden\" name=\"$element(id).itu_id\" value=\"[ns_quotehtml $itu_id]\">"
append output "<input type=\"hidden\" name=\"$element(id).national_number\" value=\"[ns_quotehtml $national_number]\">"
append output "<input type=\"hidden\" name=\"$element(id).area_city_code\" value=\"[ns_quotehtml $area_city_code]\">"
append output "<input type=\"hidden\" name=\"$element(id).subscriber_number\" value=\"[ns_quotehtml $subscriber_number]\">"
append output "<input type=\"hidden\" name=\"$element(id).extension\" value=\"[ns_quotehtml $extension]\">"
append output "<input type=\"hidden\" name=\"$element(id).sms_enabled_p\" value=\"[ns_quotehtml $sms_enabled_p]\">"
append output "<input type=\"hidden\" name=\"$element(id).best_contact_time\" value=\"[ns_quotehtml $best_contact_time]\">"
append output "<input type=\"hidden\" name=\"$element(id).location\" value=\"[ns_quotehtml $location]\">"
append output "<input type=\"hidden\" name=\"$element(id).phone_type_id\" value=\"[ns_quotehtml $phone_type_id]\">"
}
}
......
www/admin/menu-action.tcl
View file @ 1946559e
......@@ -18,7 +18,7 @@ ad_page_contract {
{return_url "/intranet/admin/menus"}
}
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
ad_return_complaint 1 "You have insufficient privileges to use this page"
......
www/admin/new.adp
View file @ 1946559e
<master src="../../../intranet-core/www/admin/master">
<property name="title">@page_title@</property>
<property name="context">@context;noquote@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="context">@context;literal@</property>
<property name="admin_navbar_label">admin_menus</property>
<h2>@page_title@</h2>
......@@ -9,6 +9,6 @@
<div class="general-message">@message@</div>
</if>
<property name="focus">@focus;noquote@</property>
<property name="focus">@focus;literal@</property>
<formtemplate id="menu"></formtemplate>
www/admin/new.tcl
View file @ 1946559e
......@@ -24,7 +24,7 @@ ad_page_contract {
# Default & Security
# ------------------------------------------------------------------
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
ad_return_complaint 1 "You have insufficient privileges to use this page"
......
www/attribute-delete.adp
View file @ 1946559e
<master src="master">
<property name="title">@title@</property>
<property name="context">@context@</property>
<property name="doc(title)">@title;literal@</property>
<property name="context">@context;literal@</property>
#intranet-dynfield.Warning#!!!!!
......@@ -10,4 +10,4 @@
<br/>
#intranet-dynfield.Do_you_want_continue#? <a href="?<%= [export_vars -url -override {{continue_p 1}} {return_url object_type continue_p attribute_ids}]%>"> #intranet-dynfield.Yes#</a>
<a href="@return_url;noquote@"> #intranet-dynfield.No#</a>
\ No newline at end of file
<a href="@return_url@"> #intranet-dynfield.No#</a>
\ No newline at end of file
www/attribute-delete.tcl
View file @ 1946559e
......@@ -21,7 +21,7 @@ ad_page_contract {
# Default & Security
# ******************************************************
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
ad_return_complaint 1 "You have insufficient privileges to use this page"
......@@ -32,7 +32,7 @@ set title "[_ intranet-dynfield.Delete_Warning]"
set context [list [list "object-types" "Object Types"] [list "$return_url" "$object_type"] $title]
set html_warning ""
if {![exists_and_not_null continue_p]} {
if {(![info exists continue_p] || $continue_p eq "")} {
set continue_p "1"
foreach attr_id $attribute_ids {
db_1row "get attribute" "select attribute_name
......
www/attribute-new.adp
View file @ 1946559e
<master src="master">
<property name="title">@title@</property>
<property name="context">@context@</property>
<property name="left_navbar">@left_navbar_html;noquote@</property>
<property name="doc(title)">@title;literal@</property>
<property name="context">@context;literal@</property>
<property name="left_navbar">@left_navbar_html;literal@</property>
<%= [im_box_header "DynField Base Information"] %>
<formtemplate id="attribute_form"></formtemplate>
......
www/attribute-new.tcl
View file @ 1946559e
......@@ -22,7 +22,7 @@ ad_page_contract {
# Initialization, defaults & security
# ******************************************************
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
ad_return_complaint 1 "[_ intranet-dynfield.You_have_insufficient_privileges_to_use_this_page]"
......@@ -39,7 +39,7 @@ if {$acs_attribute_id ne ""} {
" -default "acs_object"]
}
if {[exists_and_not_null attribute_id]} {
if {([info exists attribute_id] && $attribute_id ne "")} {
db_0or1row attribute_info "
select
a.object_type,
......@@ -77,7 +77,7 @@ if {[exists_and_not_null attribute_id]} {
}
if {"" eq $label_style} { set label_style "plain" }
if {$label_style eq ""} { set label_style "plain" }
if {$object_type eq ""} {
ad_return_complaint 1 "[_ intranet-dynfield.No_object_type_found]<br>
......@@ -87,14 +87,14 @@ if {$object_type eq ""} {
acs_object_type::get -object_type $object_type -array "object_info"
if {![exists_and_not_null table_name]} {
if {(![info exists table_name] || $table_name eq "")} {
set table_name [db_string table_name "
select table_name
from acs_object_types
where object_type=:object_type
" -default ""]
}
if {[string equal $action "already_existing"]} {
if {$action eq "already_existing"} {
set title "[_ intranet-dynfield.Add_Attribute]"
} else {
set title "[_ intranet-dynfield.Add_a_completely_new_attribute_modify_DB]"
......@@ -199,7 +199,7 @@ set form_fields {
# Completely new attribute or
# modify an already existing attribute?
if {[string equal $action "already_existing"]} {
if {$action eq "already_existing"} {
lappend form_fields {attribute_name:text(select) {label {Attribute Name}} {options $attribute_name_options} {help_text "<!<li><a href=\"attribute-new?object_type=$object_type&action=completely_new\">[_ intranet-dynfield.lt_Add_a_completely_new_]</a>"}}
set modify_sql_p "f"
......@@ -365,7 +365,7 @@ ad_form \
}
{ attribute_name
{ ![im_dynfield::attribute::exists_p -object_type object_type -attribute_name $attribute_name] }
"Attribute $attribute_name already exists for <a href=\"object-type?[export_vars -url {object_type}]\">$object_info(pretty_name)</a>."
"Attribute $attribute_name already exists for <a href=\"[export_vars -base object-type {object_type}]\">$object_info(pretty_name)</a>."
}
} -on_submit {
# figure out the datatype
......@@ -407,7 +407,7 @@ ad_form \
set min_n_values "1"
}
if {$pretty_plural == ""} {
if {$pretty_plural eq ""} {
set pretty_plural $pretty_name
}
......@@ -489,17 +489,17 @@ ad_form \
#
# ------------------------------------------------------------------
if {$return_url == ""} {
if {$return_url eq ""} {
if {$list_id ne ""} {
set return_url [export_vars -base "list" -url {list_id}]
} else {
set return_url "object-type?[export_vars -url {object_type}]"
set return_url [export_vars -base object-type {object_type}]
}
}
# If we're an enumeration, redirect to start adding possible values.
if { [string equal $datatype "enumeration"] } {
ad_returnredirect enum-add?[export_vars {attribute_id return_url}]
if {$datatype eq "enumeration"} {
ad_returnredirect [export_vars -base enum-add {attribute_id return_url}]
} else {
ad_returnredirect $return_url
}
......
www/attribute-type-map-2.tcl
View file @ 1946559e
......@@ -15,7 +15,7 @@ ad_page_contract {
# --------------------------------------------------------------
# Defaults & Security
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
ad_return_complaint 1 "You have insufficient privileges to use this page"
......
www/attribute-type-map-toggle.tcl
View file @ 1946559e
......@@ -11,7 +11,7 @@ ad_page_contract {
return_url:notnull
}
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
ad_return_complaint 1 "You have insufficient privileges to use this page"
......
www/attribute-type-map.adp
View file @ 1946559e
<if 1 ne @nomaster_p@>
<master src="master">
<property name="title">@page_title;noquote@</property>
<property name="context">@context;noquote@</property>
<property name="left_navbar">@left_navbar_html;noquote@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="context">@context;literal@</property>
<property name="left_navbar">@left_navbar_html;literal@</property>
</if>
<h1>@page_title;noquote@</h1>
......@@ -13,14 +13,14 @@
<form action="attribute-type-map" method=POST>
<%= [export_vars -form {object_type return_url}] %>
<table>
<tr class=rowtitle><td class=rowtitle align=center colspan=2>Filter Subtypes</td></tr>
<tr class=rowtitle><td class=rowtitle align="center" colspan="2">Filter Subtypes</td></tr>
<tr>
<td class=form-label>Object Subtype</td>
<td class=form-widget><%= [im_category_select -include_empty_p 1 $category_type object_subtype_id $object_subtype_id] %></td>
</tr>
<tr>
<td class=form-label></td>
<td class=form-widget><input type=submit></td>
<td class=form-widget><input type="submit"></td>
</tr>
</table>
</form>
......@@ -44,7 +44,7 @@
@body_html;noquote@
<tr>
<td></td>
<td colspan=99><input type=submit></td>
<td colspan="99"><input type="submit"></td>
</tr>
</table>
......
www/attribute-type-map.tcl
View file @ 1946559e
......@@ -36,7 +36,7 @@ if {[info exists attribute_id] && "" != $attribute_id} {
set bgcolor(0) " class=roweven "
set bgcolor(1) " class=rowodd "
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
ad_return_complaint 1 "You have insufficient privileges to use this page"
......@@ -102,12 +102,12 @@ db_foreach top_scale_map "
" {
set col_title ""
foreach c $category {
if {[string length $c] == [expr $max_length+1]} {
if {[string length $c] == [expr {$max_length+1}]} {
append col_title $c
set c ""
}
while {[string length $c] > $max_length} {
append col_title "[string range $c 0 [expr $max_length-1]] "
append col_title "[string range $c 0 $max_length-1] "
set c [string range $c $max_length end]
}
append col_title " $c "
......@@ -199,7 +199,7 @@ set body_html ""
set ctr 0
foreach left $left_scale {
set attribute_id $left
append body_html "<tr $bgcolor([expr $ctr % 2])>\n"
append body_html "<tr $bgcolor([expr {$ctr % 2}])>\n"
append body_html "<td>$left_scale_map($left)</td>\n"
foreach top $top_scale {
......
www/extension-table-delete.tcl
View file @ 1946559e
......@@ -17,7 +17,7 @@ ad_page_contract {
set title "Delete Extension Tables"
set context [list $title]
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
ad_return_complaint 1 "You have insufficient privileges to use this page"
......
www/extension-table-new-2.tcl
View file @ 1946559e
......@@ -14,7 +14,7 @@ ad_page_contract {
# Default & Security
# ------------------------------------------------------------------
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
ad_return_complaint 1 "You have insufficient privileges to use this page"
......
www/extension-table-new.adp
View file @ 1946559e
<master src="master">
<property name="title">@title@</property>
<property name="context">@context@</property>
<property name="left_navbar">@left_navbar_html;noquote@</property>
<property name="doc(title)">@title;literal@</property>
<property name="context">@context;literal@</property>
<property name="left_navbar">@left_navbar_html;literal@</property>
<formtemplate id="extension_table_form"></formtemplate>
......
www/extension-table-new.tcl
View file @ 1946559e
......@@ -14,7 +14,7 @@ ad_page_contract {
# Initialization, defaults & security
# ******************************************************
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
ad_return_complaint 1 "You have insufficient privileges to use this page"
......
www/import.tcl
View file @ 1946559e
......@@ -24,7 +24,7 @@ ad_page_contract {
ad_return_complaint 1 "This feature hasn't been tested after the modifications of DynFields due to CRM"
# security check
set user_id [ad_verify_and_get_user_id]
set user_id [ad_conn user_id]
# create global variables
set caller_id [ad_conn user_id]
......
www/index.adp
View file @ 1946559e
<master src="master">
<property name="title">@page_title@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="context">#intranet-core.context#</property>
<property name="main_navbar_label">admin</property>
<property name="left_navbar">@left_navbar_html;noquote@</property>
<property name="left_navbar">@left_navbar_html;literal@</property>
<if @missing_dynfield_object_types@ ne "">
<p><font color=red>
......@@ -22,7 +22,7 @@ by editing the DynField and specifying a value. You can use '0' as a default.
<li><a href="permissions"><b>Permissions</b></a>:<br>
Defines who can read or write a DynField.
<li><a href="@param_url;noquote@"><b>Parameters</b></a><br>
<li><a href="@param_url@"><b>Parameters</b></a><br>
<li><a href="widgets"><b>Widgets</b></a><br>
DynField-Widgets are pieces of HTML code to display the value of
......
www/index.tcl
View file @ 1946559e
......@@ -13,7 +13,7 @@ set context_bar [im_context_bar $page_title]
set package_id [apm_package_id_from_key "intranet-dynfield"]
set param_url [export_vars -base "/shared/parameters" -url {package_id {return_url "/intranet-dynfield"}}]
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
ad_return_complaint 1 "You have insufficient privileges to use this page"
......
www/layout-adp.adp
View file @ 1946559e
......@@ -4,8 +4,8 @@
%>
<master src="master">
<property name="title">@title@</property>
<property name="context">@context@</property>
<property name="doc(title)">@title;literal@</property>
<property name="context">@context;literal@</property>
<p>
#intranet-dynfield.lt_This_is_the_list_of_a#
......
www/layout-adp.tcl
View file @ 1946559e
......@@ -15,7 +15,7 @@ ad_page_contract {
# Default & Security
# ******************************************************
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
......@@ -73,7 +73,7 @@ if { [form is_request layout-adp] } {
where object_type = :object_type
and page_url = :page_url
} -default ""]
if { ![empty_string_p $file_name] } {
if { $file_name ne "" } {
set action update
element::set_properties layout-adp adp_file \
-help_text "[_ intranet-dynfield.This_file_is_located_in] '${adp_dir}'" -value $file_name \
......@@ -108,7 +108,7 @@ if { ![form is_request layout-adp] && ![form is_valid layout-adp] } {
set action [element get_value layout-adp action]
}
if { [info exists action] && $action == "update" } {
if { [info exists action] && $action eq "update" } {
set title "[_ intranet-dynfield.Edit_the_form_adp_file]"
} else {
set title "[_ intranet-dynfield.Create_a_new_adp_file_for_this_form]"
......@@ -123,10 +123,10 @@ if { [form is_valid layout-adp] } {
form get_values layout-adp
# no duplicated filename
if { [file extension adp_file] != ".adp" } {
if { [file extension adp_file] ne ".adp" } {
append adp_file ".adp"
}
if { $action == "insert" && [file exists "${adp_dir}${adp_file}"]} {
if { $action eq "insert" && [file exists "${adp_dir}${adp_file}"]} {
element::set_error layout-adp adp_file "[_ intranet-dynfield.This_file_already_exists]"
return
}
......@@ -157,7 +157,7 @@ if { [form is_valid layout-adp] } {
# save file
if { $action == "insert" } {
if { $action eq "insert" } {
set adp_stream [open "${adp_dir}${adp_file}" w]
puts -nonewline $adp_stream $content
close $adp_stream
......@@ -170,7 +170,7 @@ if { [form is_valid layout-adp] } {
where object_type = :object_type
and page_url = :page_url
}
} elseif { $action == "update" } {
} elseif { $action eq "update" } {
set adp_stream [open "${adp_dir}${adp_file}" w]
puts -nonewline $adp_stream $content
close $adp_stream
......
www/layout-default.tcl
View file @ 1946559e
......@@ -13,7 +13,7 @@ ad_page_contract {
# Default & Security
# ******************************************************
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
......
www/layout-del.tcl
View file @ 1946559e
......@@ -13,7 +13,7 @@ ad_page_contract {
# Default & Security
# ******************************************************
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
......
www/layout-manager.adp
View file @ 1946559e
<master src="master">
<property name="title">@title@</property>
<property name="context">@context@</property>
<property name="left_navbar">@left_navbar_html;noquote@</property>
<property name="doc(title)">@title;literal@</property>
<property name="context">@context;literal@</property>
<property name="left_navbar">@left_navbar_html;literal@</property>
<p>
<listtemplate name="layout_list"></listtemplate>
......
www/layout-manager.tcl
View file @ 1946559e
......@@ -13,7 +13,7 @@ ad_page_contract {
# Default & Security
# ******************************************************
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
......@@ -100,7 +100,7 @@ db_multirow -extend {details_url edit_url delete_url default_url} layout_pages g
object_type = :object_type
[template::list::orderby_clause -name layout_list -orderby]
" {
if { $layout_type == "relative" } {
if { $layout_type eq "relative" } {
set edit_url [export_vars -base "layout-page" { object_type page_url }]
}
set details_url [export_vars -base "layout-position" { object_type page_url }]
......
www/layout-page.adp
View file @ 1946559e
......@@ -3,8 +3,8 @@
# $Workfile: layout-page.adp $ $Revision$ $Date$
%>
<master src="master">
<property name="title">@title;noquote@</property>
<property name="context">@context;noquote@</property>
<property name="left_navbar">@left_navbar_html;noquote@</property>
<property name="doc(title)">@title;literal@</property>
<property name="context">@context;literal@</property>
<property name="left_navbar">@left_navbar_html;literal@</property>
<formtemplate id="page_layout"></formtemplate>
www/layout-page.tcl
View file @ 1946559e
......@@ -14,7 +14,7 @@ ad_page_contract {
# Default & Security
# ******************************************************
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
......@@ -50,7 +50,7 @@ form::create page_layout
element::create page_layout object_type -datatype text -widget hidden -value $object_type
element::create page_layout action -datatype text -widget hidden -value add
if { [exists_and_not_null page_url] } {
if { ([info exists page_url] && $page_url ne "") } {
element::create page_layout page_url -datatype text -label "Page url" -mode view
element::create page_layout layout_type -datatype text -label "Layout type" -widget select -options $type_list \
-help_text "If you chose relative, please define the number of columns for the form" -mode view
......@@ -63,7 +63,7 @@ if { [exists_and_not_null page_url] } {
element::create page_layout table_width -datatype integer -label "Columns" -html {size 4 maxlength 10} -optional
if { [exists_and_not_null page_url] && [form is_request page_layout] } {
if { ([info exists page_url] && $page_url ne "") && [form is_request page_layout] } {
db_1row get_page_values {
select page_url,
layout_type,
......@@ -88,7 +88,7 @@ if { [exists_and_not_null page_url] && [form is_request page_layout] } {
if { [form is_valid page_layout] } {
form get_values page_layout
if { $action != "update" } {
if { $action ne "update" } {
db_transaction {
db_dml insert_page {
insert into im_dynfield_layout_pages (
......@@ -109,7 +109,7 @@ if { [form is_valid page_layout] } {
}
}
ad_returnredirect "layout-position?[export_vars {object_type page_url}]"
ad_returnredirect [export_vars -base layout-position {object_type page_url}]
}
......
www/layout-position-2.adp
View file @ 1946559e
......@@ -4,8 +4,8 @@
%>
<master src="master">
<property name="title">@title;noquote@</property>
<property name="context">@context;noquote@</property>
<property name="doc(title)">@title;literal@</property>
<property name="context">@context;literal@</property>
<formtemplate id="attrib_layout"></formtemplate>
www/layout-position-2.tcl
View file @ 1946559e
......@@ -14,7 +14,7 @@ ad_page_contract {
# Default & Security
# ******************************************************
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
......@@ -41,7 +41,7 @@ db_1row get_layout_type {
and page_url = :page_url
} -column_array "page"
if { [empty_string_p $attribute_id] } {
if { $attribute_id eq "" } {
set list_sql {
select aa.pretty_name, fa.attribute_id
from acs_attributes aa, im_dynfield_attributes fa
......@@ -69,7 +69,7 @@ element::create attrib_layout object_type -datatype text -widget hidden -value $
element::create attrib_layout page_url -datatype text -widget hidden -value $page_url
element::create attrib_layout attribute_id -label "[_ intranet-dynfield.Attribute]" -datatype integer \
-widget select -options $attribute_list
if { $page(layout_type) == "absolute" } {
if { $page(layout_type) eq "absolute" } {
element::create attrib_layout class -label "[_ intranet-dynfield.Class]" -datatype text \
-html {size 20 maxlength 200} -help_text "[_ intranet-dynfield.Enter_the_css_class_name]"
element::create attrib_layout sort_key -datatype text -widget hidden -value ""
......@@ -98,7 +98,7 @@ element::create attrib_layout div_class -label "[lang::message::lookup "" intran
# -------------------------------------------
if { [form is_request attrib_layout] } {
if { ![empty_string_p $attribute_id] } {
if { $attribute_id ne "" } {
set sql_get_attribute "
select
fl.*,
......@@ -141,7 +141,7 @@ if { [form is_request attrib_layout] } {
# Adp variables
#------------------------------------------------------
if { [info exists action] && $action == "update" } {
if { [info exists action] && $action eq "update" } {
set title "[_ intranet-dynfield.Attribute_update]"
} else {
set title "[_ intranet-dynfield.Add_new_attribute]"
......@@ -156,7 +156,7 @@ set context [list [list "object-types" "[_ intranet-dynfield.Object_Types]"] [li
if { [form is_valid attrib_layout] } {
form get_values attrib_layout
if { $action == "add" } {
if { $action eq "add" } {
db_dml insert_attribute {
insert into im_dynfield_layout
(attribute_id, page_url, pos_x, pos_y, size_x, size_y, label_style, div_class, sort_key)
......@@ -179,5 +179,5 @@ if { [form is_valid attrib_layout] } {
}
}
ad_returnredirect "layout-position?[export_vars {object_type page_url}]"
ad_returnredirect [export_vars -base layout-position {object_type page_url}]
}
www/layout-position-del.tcl
View file @ 1946559e
......@@ -14,7 +14,7 @@ ad_page_contract {
# Default & Security
# ******************************************************
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
......
www/layout-position.adp
View file @ 1946559e
......@@ -3,9 +3,9 @@
# $Workfile: layout-position.adp $ $Revision$ $Date$
%>
<master src="master">
<property name="title">@title@</property>
<property name="context">@context;noquote@</property>
<property name="left_navbar">@left_navbar_html;noquote@</property>
<property name="doc(title)">@title;literal@</property>
<property name="context">@context;literal@</property>
<property name="left_navbar">@left_navbar_html;literal@</property>
<h1>@page_url@ Layout for @object_type@</h1>
......
www/layout-position.tcl
View file @ 1946559e
......@@ -16,7 +16,7 @@ ad_page_contract {
# Default & Security
# ******************************************************
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
......
www/list-form-preview.adp
View file @ 1946559e
<master>
<property name="title">@title@</property>
<property name="context">@context@</property>
<property name="doc(title)">@title;literal@</property>
<property name="context">@context;literal@</property>
<formtemplate id="form_preview"></formtemplate>
......
www/list-order-update.tcl
View file @ 1946559e
......@@ -19,7 +19,7 @@ ad_page_contract {
set doubled_sort_orders [list]
foreach {attribute_id sort_order} [array get sort_key] {
set sort_order [string trim $sort_order]
if { $sort_order == "" } {
if { $sort_order eq "" } {
lappend no_value_supplied $attribute_id
} elseif { [string is false [string is integer $sort_order]] } {
lappend no_integer_supplied $attribute_id $sort_order
......
www/list-text.adp
View file @ 1946559e
<master>
<property name="title">@title;noquote@</property>
<property name="context">@context;noquote@</property>
<property name="doc(title)">@title;literal@</property>
<property name="context">@context;literal@</property>
<formtemplate id="texts"></formtemplate>
www/list.adp
View file @ 1946559e
<master>
<property name="title">@title@</property>
<property name="context">@context@</property>
<property name="doc(title)">@title;literal@</property>
<property name="context">@context;literal@</property>
......
www/list.tcl
View file @ 1946559e
......@@ -23,7 +23,7 @@ ad_page_contract {
set provided_return_url $return_url
set provided_return_url_label $return_url_label
if {$list_id == ""} {
if {$list_id eq ""} {
# Check that the list doesn't exist before
......@@ -145,7 +145,7 @@ template::multirow create mapped_attributes attribute_id attribute_name pretty_n
required_p section_heading attribute_url unmap_url text_url \
required_url optional_url object_type widget_name widget_url
if {$return_url == ""} {
if {$return_url eq ""} {
set return_url [ad_return_url]
}
......@@ -163,7 +163,7 @@ foreach mapped_dynfield_id [::im::dynfield::Attribute dynfield_attributes -list_
set text_url [export_vars -base "list-text" -url {list_id attribute_id return_url return_url_label}]
set required_url [export_vars -base "list-attributes" -url {list_id attribute_id return_url return_url_label {command "required"}}]
set optional_url [export_vars -base "list-attributes" -url {list_id attribute_id return_url return_url_label {command "optional"}}]
if {[exists_and_not_null widget_name]} {
if {([info exists widget_name] && $widget_name ne "")} {
set widget_url [::im::dynfield::Widget widget_url -widget_name $widget_name]
} else {
set widget_url ""
......
www/master.adp
View file @ 1946559e
<master src="/packages/intranet-core/www/admin/master">
<property name="title">@title@</property>
<property name="context">@context@</property>
<property name="navbar_list">@navbar@</property>
<property name="doc(title)">@title;literal@</property>
<property name="context">@context;literal@</property>
<property name="navbar_list">@navbar;literal@</property>
<property name="admin_navbar_label">dynfield_admin</property>
<property name="left_navbar">@left_navbar;noquote@</property>
<property name="left_navbar">@left_navbar;literal@</property>
<if @focus@ not nil><property name="focus">@focus@</property></if>
<if @focus@ not nil><property name="focus">@focus;literal@</property></if>
<slave>
www/master.tcl
View file @ 1946559e
......@@ -24,7 +24,7 @@ set navbar_ul ""
foreach {url label id} $link_list {
set selected_p 0
if {[string equal $page_url $url]} {
if {$page_url eq $url} {
set selected_p 1
if { ${url} == ${package_url} } {
set title [ad_conn instance_name]
......
www/object-new.adp
View file @ 1946559e
<master src="master">
<property name="title">@title@</property>
<property name="context">@context@</property>
<property name="doc(title)">@title;literal@</property>
<property name="context">@context;literal@</property>
<formtemplate id="add_object"></formtemplate>
www/object-new.tcl
View file @ 1946559e
......@@ -27,7 +27,7 @@ ad_page_contract {
# Initialization, security, defaults etc.
# ------------------------------------------------------
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
ad_return_complaint 1 "You have insufficient privileges to use this page"
......@@ -77,7 +77,7 @@ im_dynfield::append_attributes_to_form -object_type $object_type \
# -------------------------------------------
if {[template::form is_valid $form_id]} {
if {![exists_and_not_null object_id]} {
if {(![info exists object_id] || $object_id eq "")} {
# -------------------------------------------
# here you can create new objects
# -------------------------------------------
......
www/object-type.adp
View file @ 1946559e
<master src="master">
<property name="title">@title@</property>
<property name="context">@context@</property>
<property name="left_navbar">@left_navbar_html;noquote@</property>
<property name="doc(title)">@title;literal@</property>
<property name="context">@context;literal@</property>
<property name="left_navbar">@left_navbar_html;literal@</property>
<h1>@title@</h1>
<form method=post action=attribute-delete>
<input type=hidden name=return_url value="@return_url@">
<input type=hidden name=object_type value="@object_type@">
<input type="hidden" name="return_url" value="@return_url@">
<input type="hidden" name="object_type" value="@object_type@">
<table class="list">
<tr class="list-header">
......@@ -58,23 +58,23 @@
@attributes.also_hard_coded_p@
</td>
<td class="list-narrow">
<input type=checkbox name=attribute_ids value="@attributes.im_dynfield_attribute_id@">
<input type="checkbox" name="attribute_ids" value="@attributes.im_dynfield_attribute_id@">
</td>
</tr>
</multiple>
<tr valign=top>
<td colspan=8 align=left>
<tr valign="top">
<td colspan="8" align="left">
<ul>
<li><a href="attribute-new?form_mode=edit&object_type=@object_type@&action=completely_new">#intranet-dynfield.lt_Add_a_completely_new_#</a></li>
<li><a href="attribute-new?form_mode=edit&object_type=@object_type@&action=already_existing">#intranet-dynfield.lt_Add_an_attribute_that#</a></li>
<li><a href="attribute-new?form_mode=edit&amp;object_type=@object_type@&action=completely_new">#intranet-dynfield.lt_Add_a_completely_new_#</a></li>
<li><a href="attribute-new?form_mode=edit&amp;object_type=@object_type@&action=already_existing">#intranet-dynfield.lt_Add_an_attribute_that#</a></li>
</ul>
</td>
<td align=right>
<input type=submit value="Del">
<td align="right">
<input type="submit" value="Del">
</td>
</tr>
</table>
......@@ -85,8 +85,8 @@
<h1>#intranet-dynfield.lt_Extension_Tables_for_#</h1>
<form method=post action=extension-table-delete>
<input type=hidden name=object_type value="@object_type@">
<input type=hidden name=return_url value="@return_url@">
<input type="hidden" name="object_type" value="@object_type@">
<input type="hidden" name="return_url" value="@return_url@">
<table class="list">
<tr class="list-header">
<th class="list-narrow">#intranet-dynfield.Table_Name#</th>
......@@ -106,20 +106,20 @@
@extension_tables.id_column@
</td>
<td class="list-narrow">
<input type=checkbox name=extension_tables value="@extension_tables.table_name@">
<input type="checkbox" name="extension_tables" value="@extension_tables.table_name@">
</td>
</tr>
</multiple>
<tr valign=top>
<td colspan=2 align=right>
<tr valign="top">
<td colspan="2" align="right">
<ul class="action-links">
<li><a href="extension-table-new?object_type=@object_type@&return_url=@return_url_encoded;noquote@">#intranet-dynfield.lt_Add_a_new_extension_t#</a>
<li><a href="extension-table-new?object_type=@object_type@&amp;return_url=@return_url_encoded;noquote@">#intranet-dynfield.lt_Add_a_new_extension_t#</a>
</ul>
</td>
<td colspan=1 align=right>
<input type=submit value="Del">
<td colspan="1" align="right">
<input type="submit" value="Del">
</td>
</tr>
</table>
......
www/object-type.tcl
View file @ 1946559e
......@@ -15,7 +15,7 @@ ad_page_contract {
# Default & Security
# ******************************************************
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
ad_return_complaint 1 "You have insufficient privileges to use this page"
......@@ -58,7 +58,7 @@ set generate_interfaces 0
set show_hidde_link "<a href=\"?[export_vars -base {} -url -override {{show_interfaces_p 0}} {object_type orderby show_interfaces_p}]\"> [_ intranet-dynfield.Hide_interfaces]</a>"
db_multirow attributes attributes_query {} {
if {[empty_string_p $table_name]} {
if {$table_name eq ""} {
set table_name $main_table_name
set id_column $main_id_column
} else {
......@@ -168,7 +168,7 @@ db_multirow -extend {details_url edit_url delete_url default_url} layout_pages g
where object_type = :object_type
[template::list::orderby_clause -name layout_list -orderby]
" {
if { $layout_type == "relative" } {
if { $layout_type eq "relative" } {
set edit_url [export_vars -base "layout-page" { object_type page_url }]
}
set details_url [export_vars -base "layout-position" { object_type page_url }]
......
www/object-type2.adp
View file @ 1946559e
<master src="master">
<property name="title">@title@</property>
<property name="context">@context@</property>
<property name="doc(title)">@title;literal@</property>
<property name="context">@context;literal@</property>
<form method=post action=attribute-delete>
<input type=hidden name=return_url value="@return_url@">
<input type=hidden name=object_type value="@object_type@">
<input type="hidden" name="return_url" value="@return_url@">
<input type="hidden" name="object_type" value="@object_type@">
<table class="list">
<tr class="list-header">
......@@ -43,15 +43,15 @@
</td>
<td class="list-narrow">
<input type=checkbox name=attribute_ids value="@attributes.dynfield_attribute_id@">
<input type="checkbox" name="attribute_ids" value="@attributes.dynfield_attribute_id@">
</td>
</tr>
</multiple>
<tr>
<td colspan=99 align=right>
<input type=submit value="Del">
<td colspan="99" align="right">
<input type="submit" value="Del">
</td>
</tr>
</table>
......@@ -64,8 +64,8 @@
<h1>#intranet-dynfield.lt_Extension_Tables_for_#</h1>
<form method=post action=extension-table-delete>
<input type=hidden name=object_type value="@object_type@">
<input type=hidden name=return_url value="@return_url@">
<input type="hidden" name="object_type" value="@object_type@">
<input type="hidden" name="return_url" value="@return_url@">
<table class="list">
<tr class="list-header">
......@@ -88,21 +88,21 @@
@extension_tables.id_column@
</td>
<td class="list-narrow">
<input type=checkbox name=extension_tables value="@extension_tables.table_name@">
<input type="checkbox" name="extension_tables" value="@extension_tables.table_name@">
</td>
</tr>
</multiple>
<tr>
<td colspan=99 align=right>
<input type=submit value="Del">
<td colspan="99" align="right">
<input type="submit" value="Del">
</td>
</tr>
</table>
</form>
<ul class="action-links">
<li><a href="extension-table-new?object_type=@object_type@&return_url=@return_url_encoded;noquote@">#intranet-dynfield.lt_Add_a_new_extension_t#</a>
<li><a href="extension-table-new?object_type=@object_type@&amp;return_url=@return_url_encoded;noquote@">#intranet-dynfield.lt_Add_a_new_extension_t#</a>
</ul>
......@@ -129,7 +129,7 @@
@objects.object_id@
</td>
<td class="list-narrow">
<a href=object-new?object_type=@object_type@&object_id=@objects.object_id@>
<a href="object-new?object_type=@object_type@&amp;object_id=@objects.object_id@">
@objects.object_name@
</a>
</td>
......
www/object-type2.tcl
View file @ 1946559e
......@@ -15,7 +15,7 @@ ad_page_contract {
# Default & Security
# ******************************************************
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
ad_return_complaint 1 "You have insufficient privileges to use this page"
......@@ -103,7 +103,7 @@ db_multirow attributes attributes_query $attributes_query {
set get_proc_name "dbi::$proc_name\::get_value"
append dbi_interfaces "$get_proc_name <br/>"
if {[empty_string_p $table_name]} {
if {$table_name eq ""} {
set table_name $main_table_name
set id_column $main_id_column
} else {
......@@ -137,7 +137,7 @@ db_multirow attributes attributes_query $attributes_query {
set parameters [lindex $parameters_list 0]
set custom_pos [lsearch $parameters "custom"]
if {$custom_pos > -1} {
set custom_value [lindex $parameters [expr $custom_pos + 1]]
set custom_value [lindex $parameters $custom_pos+1]
set sql_query [lindex $custom_value 1]
#ns_log notice "sql_query $sql_query"
......
www/object-types.adp
View file @ 1946559e
<master src="master">
<property name="title">@page_title@</property>
<property name="context">@context_bar@</property>
<property name="left_navbar">@left_navbar_html;noquote@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="context">@context_bar;literal@</property>
<property name="left_navbar">@left_navbar_html;literal@</property>
<H2>@page_title@</h2>
......
www/object-types.tcl
View file @ 1946559e
......@@ -16,7 +16,7 @@ ad_page_contract {
set page_title "Object Types"
set context_bar [im_context_bar [list /intranet-dynfield/ "DynField"] $page_title]
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
ad_return_complaint 1 "You have insufficient privileges to use this page"
......
www/permissions.adp
View file @ 1946559e
<if 1 ne @nomaster_p@>
<master src="master">
<property name="context">@context_bar@</property>
<property name="title">@page_title@</property>
<property name="context">@context_bar;literal@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="admin_navbar_label">admin_dynfield</property>
<property name="left_navbar">@left_navbar_html;noquote@</property>
<property name="left_navbar">@left_navbar_html;literal@</property>
</if>
<script type="text/javascript">
......
www/permissions.tcl
View file @ 1946559e
......@@ -28,7 +28,7 @@ ad_page_contract {
# Defaults & Security
# ------------------------------------------------------
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
# If used as
......@@ -105,7 +105,7 @@ db_foreach group_list $group_list_sql {
[im_gif -translate_p 1 $profile_gif $group_name]
</A></th>\n"
incr num_groups
append column_selects "<option value='[expr $num_groups+2]' selected='selected'>$group_name</option>"
append column_selects "<option value='[expr {$num_groups+2}]' selected='selected'>$group_name</option>"
}
append table_header "
<th>[im_gif -translate_p 1 del "Delete Dynfield"]</th>
......@@ -166,7 +166,7 @@ set old_package_name ""
db_foreach attributes $attributes_sql {
incr ctr
append table "\n<tr$bgcolor([expr $ctr % 2])>\n"
append table "\n<tr$bgcolor([expr {$ctr % 2}])>\n"
append table "
<td>
<A href=$object_type_url?object_type=$object_type&return_url=$return_url>
......@@ -191,7 +191,7 @@ db_foreach attributes $attributes_sql {
set action "remove_readable"
set letter "<b>R</b>"
}
set read "<A href=$toggle_url?[export_vars -url { horiz_group_id object_id action return_url}]>$letter</A>"
set read "<A href=[export_vars -base $toggle_url { horiz_group_id object_id action return_url}]>$letter</A>"
set action "add_writable"
set letter "w"
......@@ -199,7 +199,7 @@ db_foreach attributes $attributes_sql {
set action "remove_writable"
set letter "<b>W</b>"
}
set write "<A href=$toggle_url?[export_vars -url { horiz_group_id object_id action return_url}]>$letter</A>"
set write "<A href=[export_vars -base $toggle_url { horiz_group_id object_id action return_url}]>$letter</A>"
append table "<td align=center>$read $write</td>"
}
append table "<td><input type=checkbox name=attribute_id.$im_dynfield_attribute_id></td>
......
www/upload.tcl
View file @ 1946559e
......@@ -9,7 +9,7 @@ ad_page_contract {
}
# security check
set user_id [ad_verify_and_get_user_id]
set user_id [ad_conn user_id]
set form_id "flex_upload"
......
www/widget-examples.adp
View file @ 1946559e
<master src="master">
<property name="title">@page_title@</property>
<property name="context">@context_bar@</property>
<property name="left_navbar">@left_navbar_html;noquote@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="context">@context_bar;literal@</property>
<property name="left_navbar">@left_navbar_html;literal@</property>
<formtemplate id="widgets_form"></formtemplate>
......
www/widget-examples.tcl
View file @ 1946559e
......@@ -15,7 +15,7 @@ set page_title "Widget Examples"
set context_bar [im_context_bar [list /intranet-dynfield/ "DynField"] $page_title]
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
ad_return_complaint 1 "You have insufficient privileges to use this page"
......@@ -99,7 +99,7 @@ ad_form -name widgets_form -form {} -on_submit {}
set cnt 0
template::multirow foreach widgets {
# if { [string equal $storage_type_id [im_dynfield_storage_type_id_multimap]] } {
# if {$storage_type_id eq [im_dynfield_storage_type_id_multimap]} {
# append form_element { {options { {"Demo Example One" 1} {"Demo Example Two" 2} {"Demo Example Three" 3} {"Demo Example Four" 4} {"Demo Example Five" 5} {"Demo Example Six" 6} }}}
# }
# lappend form_element [list "label" "<p><strong>$widget_name</strong></p><p>$pretty_plural</p><p><small>widget: $widget<br>datatype: $acs_datatype<br>parameters: $parameters</small></p>"]
......
www/widget-new.adp
View file @ 1946559e
<master src="master">
<property name="title">@title@</property>
<property name="context">@context@</property>
<property name="left_navbar">@left_navbar_html;noquote@</property>
<property name="doc(title)">@title;literal@</property>
<property name="context">@context;literal@</property>
<property name="left_navbar">@left_navbar_html;literal@</property>
<formtemplate id="widget"></formtemplate>
......
www/widget-new.tcl
View file @ 1946559e
......@@ -16,7 +16,7 @@ ad_page_contract {
# Default & Security
# ------------------------------------------------------------------
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
ad_return_complaint 1 "You have insufficient privileges to use this page"
......@@ -88,7 +88,7 @@ ad_form -extend -name widget -on_request {
} -new_data {
if {$pretty_plural == ""} {
if {$pretty_plural eq ""} {
set pretty_plural $pretty_name
}
......@@ -96,7 +96,7 @@ ad_form -extend -name widget -on_request {
} -edit_data {
if {$pretty_plural == ""} {
if {$pretty_plural eq ""} {
set pretty_plural $pretty_name
}
......
www/widgets-delete.tcl
View file @ 1946559e
......@@ -15,7 +15,7 @@ ad_page_contract {
set title "Delete Widgets"
set context [list $title]
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
ad_return_complaint 1 "You have insufficient privileges to use this page"
......
www/widgets.adp
View file @ 1946559e
<master src="master">
<property name="title">@page_title@</property>
<property name="context">@context_bar@</property>
<property name="left_navbar">@left_navbar_html;noquote@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="context">@context_bar;literal@</property>
<property name="left_navbar">@left_navbar_html;literal@</property>
<form action=widgets-delete method=post>
......@@ -27,7 +27,7 @@
</else>
<td class="list-narrow">
<a href=widget-new?widget_id=@widgets.widget_id@>
<a href="widget-new?widget_id=@widgets.widget_id@">
@widgets.widget_name@
</a>
</td>
......@@ -59,8 +59,8 @@
<table width="100%">
<tr>
<td colspan=99 align=right>
<input type=submit value="Delete Selected Widgets">
<td colspan="99" align="right">
<input type="submit" value="Delete Selected Widgets">
</td>
</tr>
</table>
......@@ -69,6 +69,6 @@
<ul>
<li><A href=widget-new>#intranet-dynfield.Create_a_new_Widget#</a>
<li><A href="widget-new">#intranet-dynfield.Create_a_new_Widget#</a>
</ul>
www/widgets.tcl
View file @ 1946559e
......@@ -16,7 +16,7 @@ ad_page_contract {
set page_title "Widgets"
set context_bar [im_context_bar [list /intranet-dynfield/ "DynField"] $page_title]
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_is_admin_p} {
ad_return_complaint 1 "You have insufficient privileges to use this page"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment