Index: openacs-4/packages/acs-admin/www/apm/package-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-add-2.tcl,v
diff -u -r1.18 -r1.18.2.1
--- openacs-4/packages/acs-admin/www/apm/package-add-2.tcl 4 Apr 2018 08:11:26 -0000 1.18
+++ openacs-4/packages/acs-admin/www/apm/package-add-2.tcl 14 Feb 2019 16:15:00 -0000 1.18.2.1
@@ -1,6 +1,6 @@
ad_page_contract {
Adds a package to the package manager.
-
+
@author Bryan Quinn (bquinn@arsdigita.com)
@creation-date 17 April 2000
@cvs-id $Id$
@@ -24,64 +24,64 @@
version_id:naturalnum
{ owner_name:multiple }
{ owner_uri:multiple}
- { vendor [db_null] }
- { vendor_uri [db_null] }
+ { vendor ""}
+ { vendor_uri ""}
{ install_p:boolean 0 }
{implements_subsite_p:boolean "f"}
{inherit_templates_p:boolean "f"}
} -validate {
package_key_format -requires {package_key} {
- if { [regexp {[^a-z0-9-]} $package_key] } {
- ad_complain
- }
+ if { [regexp {[^a-z0-9-]} $package_key] } {
+ ad_complain
+ }
}
package_key_unique -requires {package_key} {
- if {[apm_package_registered_p $package_key] } {
- ad_complain "The package key, $package_key, you have requested
-is already registered to another package."
- }
+ if {[apm_package_registered_p $package_key] } {
+ ad_complain "The package key, $package_key, you have requested
+ is already registered to another package."
+ }
}
pretty_plural_unique -requires {pretty_plural} {
- if {[db_string apm_pretty_plural_unique_ck {
- select decode(count(*), 0, 0, 1) from apm_package_types
- where pretty_plural = :pretty_plural
- } -default 0]} {
- ad_complain "A package with the pretty plural of $pretty_plural already exists."
- }
+ if {[db_string apm_pretty_plural_unique_ck {
+ select decode(count(*), 0, 0, 1) from apm_package_types
+ where pretty_plural = :pretty_plural
+ } -default 0]} {
+ ad_complain "A package with the pretty plural of $pretty_plural already exists."
+ }
}
package_name_unique -requires {pretty_name} {
- if { [db_string apm_name_unique_ck {
- select decode(count(*), 0, 0, 1) from apm_package_types
- where pretty_name = :pretty_name
- } -default 0] } {
- ad_complain "A package with the name $pretty_name already exists."
- }
+ if { [db_string apm_name_unique_ck {
+ select decode(count(*), 0, 0, 1) from apm_package_types
+ where pretty_name = :pretty_name
+ } -default 0] } {
+ ad_complain "A package with the name $pretty_name already exists."
+ }
}
package_uri_unique -requires {package_uri} {
- if { [db_string apm_uri_unique_ck {
- select decode(count(*), 0, 0, 1) from apm_package_types
- where package_uri = :package_uri
- } -default 0] } {
- ad_complain "A package with the URL $package_uri already exists."
- }
+ if { [db_string apm_uri_unique_ck {
+ select decode(count(*), 0, 0, 1) from apm_package_types
+ where package_uri = :package_uri
+ } -default 0] } {
+ ad_complain "A package with the URL $package_uri already exists."
+ }
}
version_uri_unique -requires {version_uri} {
- if { [db_string apm_version_uri_unique_ck {
- select decode(count(*), 0, 0, 1) from apm_package_versions
- where version_uri = :version_uri
- } -default 0] } {
- ad_complain "A version with the URL $version_uri already exists."
- }
+ if { [db_string apm_version_uri_unique_ck {
+ select decode(count(*), 0, 0, 1) from apm_package_versions
+ where version_uri = :version_uri
+ } -default 0] } {
+ ad_complain "A version with the URL $version_uri already exists."
+ }
}
- version_name_ck -requires {version_uri} {
- if {![regexp {^[0-9]+((\.[0-9]+)+((d|a|b|)[0-9]?)?)$} $version_name match]} {
- ad_complain
- }
+ version_name_ck -requires {version_uri} {
+ if {![regexp {^[0-9]+((\.[0-9]+)+((d|a|b|)[0-9]?)?)$} $version_name match]} {
+ ad_complain
+ }
}
} -errors {
@@ -105,42 +105,42 @@
db_transaction {
# Register the package.
apm_package_register $package_key $pretty_name $pretty_plural $package_uri \
- $package_type $initial_install_p $singleton_p $implements_subsite_p \
- $inherit_templates_p
- # Insert the version
+ $package_type $initial_install_p $singleton_p $implements_subsite_p \
+ $inherit_templates_p
+ # Insert the version
set version_id [apm_package_install_version \
- -callback apm_dummy_callback \
- -version_id $version_id \
- -array attributes \
- $package_key $version_name $version_uri $summary $description \
- $description_format $vendor $vendor_uri $auto_mount]
+ -callback apm_dummy_callback \
+ -version_id $version_id \
+ -array attributes \
+ $package_key $version_name $version_uri $summary $description \
+ $description_format $vendor $vendor_uri $auto_mount]
apm_version_enable -callback apm_dummy_callback $version_id
apm_build_one_package_relationships $package_key
apm_build_subsite_packages_list
apm_package_install_owners -callback apm_dummy_callback \
- [apm_package_install_owners_prepare $owner_name $owner_uri] $version_id
+ [apm_package_install_owners_prepare $owner_name $owner_uri] $version_id
if { $install_p } {
- if {[catch {
- apm_package_install_spec $version_id
- } errmsg]} {
- ad_return_error "Filesystem Error" \
+ if {[catch {
+ apm_package_install_spec $version_id
+ } errmsg]} {
+ ad_return_error "Filesystem Error" \
"I was unable to create your package for the following reason:
-
[ns_quotehtml $errmsg]
"
+
[ns_quotehtml $errmsg]
"
ad_script_abort
- }
+ }
}
} on_error {
if {[db_string apm_package_add_doubleclick {
- select decode(count(*), 0, 0, 1) from apm_package_versions
- where version_id = :version_id
+ select decode(count(*), 0, 0, 1) from apm_package_versions
+ where version_id = :version_id
} -default 0]} {
- ad_returnredirect "version-view?version_id=$version_id"
- ad_script_abort
+ ad_returnredirect "version-view?version_id=$version_id"
+ ad_script_abort
}
ad_return_error "Database Error" \
"I was unable to create your package for the following reason:
-
[ns_quotehtml $errmsg]
"
+
[ns_quotehtml $errmsg]
"
ad_script_abort
}
Index: openacs-4/packages/acs-admin/www/apm/parameter-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-add-2.tcl,v
diff -u -r1.14 -r1.14.2.1
--- openacs-4/packages/acs-admin/www/apm/parameter-add-2.tcl 16 May 2018 17:08:51 -0000 1.14
+++ openacs-4/packages/acs-admin/www/apm/parameter-add-2.tcl 14 Feb 2019 16:15:00 -0000 1.14.2.1
@@ -13,40 +13,40 @@
description:notnull,nohtml
datatype:notnull
scope:notnull
- {default_value [db_null]}
+ {default_value ""}
{min_n_values:integer 1}
{max_n_values:integer 1}
} -validate {
datatype_type_ck {
- if {$datatype ne "number" && $datatype ne "string" && $datatype ne "text"} {
- ad_complain
- }
+ if {$datatype ne "number" && $datatype ne "string" && $datatype ne "text"} {
+ ad_complain
+ }
}
param_name_unique_ck {
- if {[db_string param_name_unique_ck {
- select decode(count(*), 0, 0, 1)
- from apm_parameters
- where parameter_name = :parameter_name
+ if {[db_string param_name_unique_ck {
+ select decode(count(*), 0, 0, 1)
+ from apm_parameters
+ where parameter_name = :parameter_name
and package_key= :package_key
- }]} {
- ad_complain "The parameter name $parameter_name already exists for this package"
- }
+ }]} {
+ ad_complain "The parameter name $parameter_name already exists for this package"
+ }
}
} -errors {
datatype_type_ck {The datatype must be either a number or a string or text.}
}
db_transaction {
apm_parameter_register -parameter_id $parameter_id -scope $scope $parameter_name $description $package_key \
- $default_value $datatype $section_name $min_n_values $max_n_values
+ $default_value $datatype $section_name $min_n_values $max_n_values
apm_package_install_spec $version_id
} on_error {
if {![db_string apm_parameter_register_doubleclick_p {
- select 1 from apm_parameters where parameter_id = :parameter_id
+ select 1 from apm_parameters where parameter_id = :parameter_id
} -default 0]} {
- ad_return_error "Database Error" "The database is complaining about the parameter you entered:
-
[ns_quotehtml $errmsg]
"
- ad_script_abort
+ ad_return_error "Database Error" "The database is complaining about the parameter you entered:
+
[ns_quotehtml $errmsg]
"
+ ad_script_abort
}
}
Index: openacs-4/packages/acs-admin/www/apm/parameter-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-edit-2.tcl,v
diff -u -r1.12 -r1.12.2.1
--- openacs-4/packages/acs-admin/www/apm/parameter-edit-2.tcl 16 May 2018 17:08:51 -0000 1.12
+++ openacs-4/packages/acs-admin/www/apm/parameter-edit-2.tcl 14 Feb 2019 16:15:00 -0000 1.12.2.1
@@ -12,34 +12,33 @@
section_name
description:notnull,nohtml
datatype:notnull
- {default_value [db_null]}
+ {default_value ""}
{min_n_values:integer 1}
{max_n_values:integer 1}
} -validate {
datatype_type_ck {
- if {$datatype ne "number" && $datatype ne "string" && $datatype ne "text"} {
- ad_complain
- }
+ if {$datatype ne "number" && $datatype ne "string" && $datatype ne "text"} {
+ ad_complain
+ }
}
} -errors {
datatype_type_ck {The datatype must be either a number or a string or text.}
}
-db_transaction {
+db_transaction {
ns_log Debug "APM: Updating Parameter: $parameter_id, $parameter_name $description, $package_key, $default_value, $datatype, $section_name, $min_n_values, $max_n_values"
apm_parameter_update $parameter_id $package_key $parameter_name $description \
- $default_value $datatype $section_name $min_n_values $max_n_values
+ $default_value $datatype $section_name $min_n_values $max_n_values
apm_package_install_spec $version_id
} on_error {
- ad_return_error "Database Error" "The parameter could not be updated.
+ ad_return_error "Database Error" "The parameter could not be updated.
The database returned the following error:
[ns_quotehtml $errmsg]
"
ad_script_abort
-}
+}
-
ad_returnredirect [export_vars -base "version-parameters" { version_id section_name }]
ad_script_abort
Index: openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl,v
diff -u -r1.114 -r1.114.2.1
--- openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl 30 Jan 2019 22:12:34 -0000 1.114
+++ openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl 14 Feb 2019 16:15:00 -0000 1.114.2.1
@@ -1096,18 +1096,6 @@
set user_id [db_nextval acs_object_id_seq]
}
- if { $password_question eq "" } {
- set password_question [db_null]
- }
-
- if { $password_answer eq "" } {
- set password_answer [db_null]
- }
-
- if { $url eq "" } {
- set url [db_null]
- }
-
set creation_user ""
set peeraddr ""
Index: openacs-4/packages/acs-core-docs/www/db-api-detailed.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/db-api-detailed.adp,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/acs-core-docs/www/db-api-detailed.adp 25 Apr 2018 08:38:27 -0000 1.5
+++ openacs-4/packages/acs-core-docs/www/db-api-detailed.adp 14 Feb 2019 16:15:00 -0000 1.5.2.1
@@ -332,22 +332,6 @@
# null, because Oracle has coerced the empty string (even for the
# numeric column "bar") into null in both cases
-
Since databases other than Oracle do not coerce empty strings
-into null, this code has
-different semantics depending on the underlying database (i.e., the
-row that gets inserted may not have null as its column values),
-which defeats the purpose of SQL abstraction.
Therefore, the Database Access API provides a
-database-independent way to represent null (instead of the Oracle-specific idiom
-of the empty string): db_null.
Use it instead of the empty string whenever you want to set a
-column value explicitly to null, e.g.:
-
-set bar [db_null]
-set baz [db_null]
-
-db_dml foo_create {insert into foo(bar, baz) values(:bar, :baz)}
-#
-# sets the values for both the "bar" and "baz" columns to null
-
@@ -707,4 +691,4 @@
Requirements"
homeLink="index" homeLabel="Home"
upLink="kernel-doc" upLabel="Up">
-
\ No newline at end of file
+
Index: openacs-4/packages/acs-core-docs/www/db-api-detailed.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/db-api-detailed.html,v
diff -u -r1.52 -r1.52.2.1
--- openacs-4/packages/acs-core-docs/www/db-api-detailed.html 25 Apr 2018 08:38:27 -0000 1.52
+++ openacs-4/packages/acs-core-docs/www/db-api-detailed.html 14 Feb 2019 16:15:00 -0000 1.52.2.1
@@ -482,36 +482,9 @@
-
-Since databases other than Oracle do not coerce empty strings into
-null, this code has different semantics depending on the
-underlying database (i.e., the row that gets inserted may not have null as
-its column values), which defeats the purpose of SQL abstraction.
-
-
Therefore, the Database Access API provides a database-independent way to
-represent null (instead of the Oracle-specific idiom of the
-empty string): db_null.
-
Use it instead of the empty string whenever you want to set a column value
-explicitly to null, e.g.:
-
-
-
-
-set bar [db_null]
-set baz [db_null]
-
-db_dml foo_create {insert into foo(bar, baz) values(:bar, :baz)}
-#
-# sets the values for both the "bar" and "baz" columns to null
-
-
-
-
-
-
SQL Abstraction
Index: openacs-4/packages/acs-core-docs/www/db-api.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/db-api.adp,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/acs-core-docs/www/db-api.adp 24 May 2018 06:54:57 -0000 1.5
+++ openacs-4/packages/acs-core-docs/www/db-api.adp 14 Feb 2019 16:15:00 -0000 1.5.2.1
@@ -216,19 +216,7 @@
# null, because Oracle has coerced the empty string (even for the
# numeric column "bar") into null in both cases
-
Since databases other than Oracle do not coerce empty strings
-into null, this code has
-different semantics depending on the underlying database (i.e., the
-row that gets inserted may not have null as its column values),
-which defeats the purpose of SQL abstraction.
Therefore, the Database Access API provides a
-database-independent way to represent null (instead of the Oracle-specific idiom
-of the empty string): db_null.
Use it instead of the empty string whenever you want to set a
-column value explicitly to null, e.g.:
set bar [db_null]
-set baz [db_null]
-
-db_dml foo_create "insert into foo(bar, baz) values(:bar, :baz)"
-#
-# sets the values for both the "bar" and "baz" columns to null
+
@@ -332,12 +320,6 @@
Technically it's equivalent to using a code block on the end
of your db_multirow.
-db_null
-
db_null
Returns a value which can be used in a bind variable to
-represent the SQL value null.
-See Nulls and Bind Variables
-above.
For true SQL purists, we provide the convenience function
-db_nullify_empty_string, which
-returns [db_null] if its string argument is the empty
-string and can be used to encapsulate another Oracle quirk:
-
-set baz ""
-
-# Clean out the foo table
-#
-db_dml unused {delete from foo}
-db_dml unused {insert into foo(baz) values(:baz)}
-
-set n_rows [db_string unused "select count(*) from foo where baz is null"]
-#
-# $n_rows is 1; in effect, the "baz is null" criterion is matching
-# the empty string we just inserted (because of Oracle's coercion
-# quirk)
-
-
To balance out this asymmetry, you can explicitly set
-baz to null by writing:
@@ -615,4 +569,4 @@
rightLink="templates" rightLabel="Next" rightTitle="Using Templates in OpenACS"
homeLink="index" homeLabel="Home"
upLink="dev-guide" upLabel="Up">
-
\ No newline at end of file
+
Index: openacs-4/packages/acs-core-docs/www/db-api.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/db-api.html,v
diff -u -r1.53 -r1.53.2.1
--- openacs-4/packages/acs-core-docs/www/db-api.html 25 Apr 2018 08:38:27 -0000 1.53
+++ openacs-4/packages/acs-core-docs/www/db-api.html 14 Feb 2019 16:15:00 -0000 1.53.2.1
@@ -339,27 +339,6 @@
# numeric column "bar") into null in both cases
-
-
- Since databases other than Oracle do not coerce empty strings into
- null, this code has different semantics depending on the
- underlying database (i.e., the row that gets inserted may not have null as
- its column values), which defeats the purpose of SQL abstraction.
-
-
-
Therefore, the Database Access API provides a database-independent way to
- represent null (instead of the Oracle-specific idiom of the
- empty string): db_null.
-
-
Use it instead of the empty string whenever you want to set a column value
- explicitly to null, e.g.:
-
-
set bar [db_null]
-set baz [db_null]
-
-db_dml foo_create "insert into foo(bar, baz) values(:bar, :baz)"
-#
-# sets the values for both the "bar" and "baz" columns to null
@@ -545,25 +524,6 @@
Technically it's equivalent to using a code block on
the end of your db_multirow.
-
-
-
- db_null
-
-
-
-
-
-db_null
-
-
-
- Returns a value which can be used in a bind variable
- to represent the SQL value
- null.
- See Nulls and
- Bind Variables above.
-
@@ -885,51 +845,7 @@
}
-
-
-
- db_nullify_empty_string
-
-
-
-
-db_nullify_empty_string string
-
-
For true SQL purists, we provide the convenience function
- db_nullify_empty_string, which returns
- [db_null] if its string argument is the empty string
- and can be used to encapsulate another Oracle quirk:
-
-
-
-set baz ""
-
-# Clean out the foo table
-#
-db_dml unused {delete from foo}
-db_dml unused {insert into foo(baz) values(:baz)}
-
-set n_rows [db_string unused "select count(*) from foo where baz is null"]
-#
-# $n_rows is 1; in effect, the "baz is null" criterion is matching
-# the empty string we just inserted (because of Oracle's coercion
-# quirk)
-
-
-
-
- To balance out this asymmetry, you can explicitly set baz to
- null by writing:
-
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/db-api.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/db-api.xml,v
diff -u -r1.17 -r1.17.2.1
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/db-api.xml 30 Sep 2018 15:53:28 -0000 1.17
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/db-api.xml 14 Feb 2019 16:15:00 -0000 1.17.2.1
@@ -366,27 +366,6 @@
# numeric column "bar") into null in both cases
-
-
- Since databases other than Oracle do not coerce empty strings into
- null, this code has different semantics depending on the
- underlying database (i.e., the row that gets inserted may not have null as
- its column values), which defeats the purpose of SQL abstraction.
-
-
- Therefore, the Database Access API provides a database-independent way to
- represent null (instead of the Oracle-specific idiom of the
- empty string): db_null.
-
- Use it instead of the empty string whenever you want to set a column value
- explicitly to null, e.g.:
-
- set bar [db_null]
-set baz [db_null]
-
-db_dml foo_create "insert into foo(bar, baz) values(:bar, :baz)"
-#
-# sets the values for both the "bar" and "baz" columns to null
@@ -590,31 +569,6 @@
- db_null
-
-
-
-
-
-
-
-db_null
-
-
-
- Returns a value which can be used in a bind variable
- to represent the SQL value
- null.
- See Nulls and
- Bind Variables above.
-
-
-
-
-
-
-
- db_foreach
@@ -1014,57 +968,6 @@
-
-
-
-
-
- db_nullify_empty_string
-
-
-
-
-
-db_nullify_empty_string string
-
-
- For true SQL purists, we provide the convenience function
- db_nullify_empty_string, which returns
- [db_null] if its string argument is the empty string
- and can be used to encapsulate another Oracle quirk:
-
-
-
-set baz ""
-
-# Clean out the foo table
-#
-db_dml unused {delete from foo}
-db_dml unused {insert into foo(baz) values(:baz)}
-
-set n_rows [db_string unused "select count(*) from foo where baz is null"]
-#
-# $n_rows is 1; in effect, the "baz is null" criterion is matching
-# the empty string we just inserted (because of Oracle's coercion
-# quirk)
-
-
-
-
- To balance out this asymmetry, you can explicitly set baz to
- null by writing:
-
-
-
-
-
-db_dml foo_insert {insert into foo(baz) values(:1)} {[db_nullify_empty_string $baz]}
-
-
-
-
-
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/db-api.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/db-api.xml,v
diff -u -r1.12 -r1.12.2.1
--- openacs-4/packages/acs-core-docs/www/xml/kernel/db-api.xml 7 Aug 2017 23:47:55 -0000 1.12
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/db-api.xml 14 Feb 2019 16:15:00 -0000 1.12.2.1
@@ -515,36 +515,8 @@
-
-Since databases other than Oracle do not coerce empty strings into
-null, this code has different semantics depending on the
-underlying database (i.e., the row that gets inserted may not have null as
-its column values), which defeats the purpose of SQL abstraction.
-
-Therefore, the Database Access API provides a database-independent way to
-represent null (instead of the Oracle-specific idiom of the
-empty string): db_null.
-Use it instead of the empty string whenever you want to set a column value
-explicitly to null, e.g.:
-
-
-
-
-
-set bar [db_null]
-set baz [db_null]
-
-db_dml foo_create {insert into foo(bar, baz) values(:bar, :baz)}
-#
-# sets the values for both the "bar" and "baz" columns to null
-
-
-
-
-
-
Index: openacs-4/packages/acs-datetime/tcl/acs-datetime-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/tcl/acs-datetime-procs.tcl,v
diff -u -r1.19 -r1.19.2.1
--- openacs-4/packages/acs-datetime/tcl/acs-datetime-procs.tcl 24 Jul 2018 08:24:07 -0000 1.19
+++ openacs-4/packages/acs-datetime/tcl/acs-datetime-procs.tcl 14 Feb 2019 16:15:00 -0000 1.19.2.1
@@ -552,6 +552,8 @@
Used to get around Tcl interpreter problems w/ thinking leading
zeros are octal. We could just use validate_integer, but it runs
one extra regexp that we don't need to run.
+
+ @see util::trim_leading_zeros
} {
return [util::trim_leading_zeros $string]
}
Index: openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl,v
diff -u -r1.68 -r1.68.2.1
--- openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl 6 Dec 2018 20:06:00 -0000 1.68
+++ openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl 14 Feb 2019 16:15:00 -0000 1.68.2.1
@@ -287,7 +287,7 @@
[list deleted_p t \
upgrade_status no_upgrade \
conflict_p f \
- sync_time [db_null] \
+ sync_time "" \
]
}
@@ -879,7 +879,7 @@
set i 0
db_foreach select_locale_keys {
- select locale, package_key, message_key, message
+ select locale, package_key, message_key, message
from lang_messages
where deleted_p = 'f'
} {
Index: openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/00-database-procs.tcl,v
diff -u -r1.126 -r1.126.2.1
--- openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 8 Feb 2019 15:04:30 -0000 1.126
+++ openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 14 Feb 2019 16:15:00 -0000 1.126.2.1
@@ -336,11 +336,15 @@
# can't hurt anything to have them defined in when OpenACS is using
# Postgres too. --atp@piskorski.com, 2003/04/08 05:34 EDT
-ad_proc db_null {} {
- @return an empty string, which Oracle thinks is null. This routine was
- invented to provide an RDBMS-specific null value but doesn't actually
- work. I (DRB) left it in to speed porting - we should really clean up
- the code an pull out the calls instead, though.
+ad_proc -deprecated db_null {} {
+
+ @return an empty string, which Oracle thinks is null.
+
+ Deprecated: This routine was invented to provide an RDBMS-specific null
+ value but doesn't actually work. I (DRB) left it in to speed porting - we
+ should really clean up the code an pull out the calls instead, though.
+
+ @see ""
} {
return ""
}
@@ -352,14 +356,14 @@
return $result
}
-ad_proc -public db_nullify_empty_string { string } {
+ad_proc -public -deprecated db_nullify_empty_string { string } {
A convenience function that returns [db_null] if $string is the empty string.
+
+ Deprecated: essentially just returns the passed string.
+
+ @see: db_null
} {
- if { $string eq "" } {
- return [db_null]
- } else {
- return $string
- }
+ return $string
}
ad_proc -public db_boolean { bool } {
Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v
diff -u -r1.126 -r1.126.2.1
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 25 Nov 2018 02:40:16 -0000 1.126
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 14 Feb 2019 16:15:00 -0000 1.126.2.1
@@ -1086,13 +1086,6 @@
} {
upvar $array local_array
- if { $version_id eq "" } {
- set version_id [db_null]
- }
- if { $release_date eq "" } {
- set release_date [db_null]
- }
-
set version_id [db_exec_plsql version_insert {}]
apm::package_version::attributes::store \
@@ -1553,14 +1546,6 @@
Register the package in the system.
} {
- if { $spec_file_path eq "" } {
- set spec_file_path [db_null]
- }
-
- if { $spec_file_mtime eq "" } {
- set spec_file_mtime [db_null]
- }
-
if { $package_type eq "apm_application" } {
db_exec_plsql application_register {}
} elseif { $package_type eq "apm_service" } {
@@ -1580,10 +1565,6 @@
} {
upvar $array local_array
- if { $release_date eq "" } {
- set release_date [db_null]
- }
-
set version_id [db_exec_plsql apm_version_update {}]
apm::package_version::attributes::store \
Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v
diff -u -r1.114 -r1.114.2.1
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 11 Feb 2019 11:50:04 -0000 1.114
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 14 Feb 2019 16:15:00 -0000 1.114.2.1
@@ -1060,10 +1060,6 @@
} {
@return The parameter id that has been updated.
} {
- if {$section_name eq ""} {
- set section_name [db_null]
- }
-
db_dml parameter_update {
update apm_parameters
set parameter_name = :parameter_name,
@@ -1106,14 +1102,6 @@
@return The parameter id of the new parameter.
} {
- if {$parameter_id eq ""} {
- set parameter_id [db_null]
- }
-
- if {$section_name eq ""} {
- set section_name [db_null]
- }
-
ns_log debug "apm_parameter_register: Registering $parameter_name, $section_name, $default_value"
set parameter_id [db_exec_plsql parameter_register {}]
@@ -1168,11 +1156,6 @@
Add a dependency to a version.
@return The id of the new dependency.
} {
-
- if {$dependency_id eq ""} {
- set dependency_id [db_null]
- }
-
return [db_exec_plsql dependency_add {}]
}
@@ -1195,11 +1178,6 @@
Add a interface to a version.
@return The id of the new interface.
} {
-
- if {$interface_id eq ""} {
- set interface_id [db_null]
- }
-
return [db_exec_plsql interface_add {}]
}
@@ -1836,10 +1814,6 @@
}
}
- if { $package_id eq "" } {
- set package_id [db_null]
- }
-
set package_id [db_exec_plsql invoke_new {}]
apm_parameter_sync $package_key $package_id
Index: openacs-4/packages/acs-tcl/tcl/install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/install-procs.tcl,v
diff -u -r1.35 -r1.35.2.1
--- openacs-4/packages/acs-tcl/tcl/install-procs.tcl 11 Jun 2018 09:14:55 -0000 1.35
+++ openacs-4/packages/acs-tcl/tcl/install-procs.tcl 14 Feb 2019 16:15:00 -0000 1.35.2.1
@@ -16,19 +16,19 @@
ad_proc -public install::xml::action::text { node } {
A documentation element which ignores its contents and does no processing.
-} {
+} {
return {}
}
ad_proc -private ::install::xml::action::source { node } {
- Source an install.xml file, sql file or Tcl script during execution of
+ Source an install.xml file, sql file or Tcl script during execution of
the current install.xml.
- If no type attribute is specified then this tag will attempt to guess
- type of the sourced script from the file extension, otherwise it defaults
+ If no type attribute is specified then this tag will attempt to guess
+ type of the sourced script from the file extension, otherwise it defaults
to install.xml.
- The type of the sourced script may be explicitly declared as 'tcl',
+ The type of the sourced script may be explicitly declared as 'tcl',
'sql' or 'install.xml' using the type attribute.
@author Lee Denison lee@xarg.co.uk
@@ -82,7 +82,7 @@
}
}
- return $out
+ return $out
}
ad_proc -public install::xml::action::install { node } {
@@ -101,7 +101,7 @@
Mounts a package on a specified node.
-} {
+} {
set package_key [apm_required_attribute_value $node package]
set instance_name [apm_required_attribute_value $node instance-name]
@@ -138,11 +138,11 @@
set parent_id [site_node::get_node_id -url "/$parent_url"]
# technically this isn't safe - between us checking that the node exists
- # and using it, the node may have been deleted.
+ # and using it, the node may have been deleted.
# We could "select for update" but since it's in a memory cache anyway,
# it won't help us very much!
# Instead we just press on and if there's an error handle it at the top level.
-
+
# create the node and reget iff it doesn't exist
if { [catch { array set site_node [site_node::get_from_url -exact -url "/$mount_point"] } error] } {
set node_id [site_node::new -name $leaf_url -parent_id $parent_id]
@@ -189,7 +189,7 @@
Mounts an existing package on a specified node.
-} {
+} {
set package_id [apm_attribute_value -default "" $node package-id]
set package_key [apm_attribute_value -default "" $node package-key]
set mount_point [apm_attribute_value -default "" $node mount-point]
@@ -216,17 +216,17 @@
set parent_id [site_node::get_node_id -url "/$parent_url"]
# technically this isn't safe - between us checking that the node exists
- # and using it, the node may have been deleted.
+ # and using it, the node may have been deleted.
# We could "select for update" but since it's in a memory cache anyway,
# it won't help us very much!
# Instead we just press on and if there's an error handle it at the top level.
-
+
# create the node and reget iff it doesn't exist
if { [catch { array set site_node [site_node::get_from_url -exact -url "/$mount_point"] } error] } {
set node_id [site_node::new -name $leaf_url -parent_id $parent_id]
array set site_node [site_node::get_from_url -exact -url "/$mount_point"]
}
-
+
# There now definitely a node with that path
if {$site_node(object_id) eq ""} {
# no package mounted - good!
@@ -245,7 +245,7 @@
set package_id [install::xml::util::get_id $package_id]
} elseif {$package_key ne ""} {
set package_id [apm_package_id_from_key $package_key]
- }
+ }
set package_id [site_node::mount \
-node_id $node_id \
@@ -261,7 +261,7 @@
-} {
+} {
set privileges [apm_required_attribute_value $node privilege]
set privilege_list [split $privileges ","]
@@ -419,7 +417,7 @@
foreach grantee $grantees {
set party_id [apm_invoke_install_proc -type object_id -node $grantee]
-
+
set objects_node [xml_node_get_children_by_name [lindex $node 0] object]
set objects [xml_node_get_children [lindex $objects_node 0]]
@@ -438,11 +436,11 @@
}
ad_proc -public install::xml::action::unset-permission { node } {
- Revokes a permissions on an object - has no effect if the permission is not granted directly
+ Revokes a permissions on an object - has no effect if the permission is not granted directly
(ie does not act as negative permissions).
-} {
+} {
set privileges [apm_required_attribute_value $node privilege]
set privilege_list [split $privileges ","]
@@ -452,7 +450,7 @@
foreach grantee $grantees {
set party_id [apm_invoke_install_proc -type object_id -node $grantee]
-
+
set objects_node [xml_node_get_children_by_name [lindex $node 0] object]
set objects [xml_node_get_children [lindex $objects_node 0]]
@@ -491,7 +489,7 @@
Create a new user.
local-p should be set to true when this action is used in
- the bootstrap install.xml - this ensures we call the
+ the bootstrap install.xml - this ensures we call the
auth::local api directly while the service contract has not
been setup.
} {
@@ -578,7 +576,7 @@
WHERE user_id = :user_id
}
}
-
+
if {$id ne ""} {
set ::install::xml::ids($id) $result(user_id)
}
@@ -708,7 +706,7 @@
-extension $extension \
-package_id $package \
-context_id $context]
- }
+ }
if {$id ne ""} {
set ::install::xml::ids($id) $result
@@ -774,7 +772,7 @@
set value [apm_attribute_value -default "" $child value]
set type [apm_attribute_value -default literal $child type]
set subtree_p [apm_attribute_value -default f $child subtree-p]
-
+
set subtree_p [template::util::is_true $subtree_p]
if {$type eq "id"} {
@@ -791,7 +789,7 @@
set url [apm_required_attribute_value $child url]
set exports [apm_attribute_value -default "" $child exports]
set subtree_p [apm_attribute_value -default f $child subtree-p]
-
+
set subtree_p [template::util::is_true $subtree_p]
location::parameter::create -location_id $location_id \
@@ -813,12 +811,12 @@
xml_node_set_attribute $child path-arg $child_arg
}
- if {$package ne ""
+ if {$package ne ""
&& ![xml_node_has_attribute $child package-id]} {
xml_node_set_attribute $child package-id $package
}
- if {$context ne ""
+ if {$context ne ""
&& ![xml_node_has_attribute $child context-id]} {
xml_node_set_attribute $child context-id $parent_id
}
@@ -848,7 +846,7 @@
set title [apm_attribute_value -default "" $node title]
set child_arg [apm_attribute_value -default "" $node child-arg]
set process [apm_attribute_value -default "" $node process]
-
+
if {$context ne ""} {
set context [install::xml::util::get_id $context]
}
@@ -866,14 +864,14 @@
-path_arg "" \
-package_id $package \
-context_id $context]
-
+
if {$process ne ""} {
location::parameter::create -location_id $parent_id \
-name "wizard::process" \
-subtree_p t \
-value $process
}
-
+
set steps [xml_node_get_children [lindex $node 0]]
foreach step $steps {
@@ -890,12 +888,12 @@
xml_node_set_attribute $step path-arg $child_arg
}
- if {$package ne ""
+ if {$package ne ""
&& ![xml_node_has_attribute $step package-id]} {
xml_node_set_attribute $step package-id $package
}
- if {$context ne ""
+ if {$context ne ""
&& ![xml_node_has_attribute $step context-id]} {
xml_node_set_attribute $step context-id $parent_id
}
@@ -993,7 +991,7 @@
Instantiate an object using package_instantiate_object. This will work
for both PostgreSQL and Oracle if the proper object package and new()
function have been defined.
-
+
@author Don Baccus donb@pacifier.com
@creation-date 2008-12-04
@@ -1030,7 +1028,7 @@
ad_proc -public install::xml::object_id::package { node } {
Returns an object_id for a package specified in node.
- The node name is ignored so any node which provides the correct
+ The node name is ignored so any node which provides the correct
attributes may be used.
@@ -1067,14 +1065,14 @@
ad_proc -public install::xml::object_id::group { node } {
Returns an object_id for a group or relational segment.
- The node name is ignored so any node which provides the correct
+ The node name is ignored so any node which provides the correct
attributes may be used.
} {
set group_type [apm_attribute_value -default "group" $node type]
set relation_type [apm_attribute_value -default "membership_rel" $node relation]
-
+
if {$group_type eq "group"} {
set id [apm_required_attribute_value $node group-id]
} elseif {$group_type eq "rel_segment"} {
@@ -1127,7 +1125,7 @@
ad_proc -public install::xml::object_id::object { node } {
Returns a literal object_id for an object.
-
+
use <object id="-100"> to return the literal id -100.
} {
set id [apm_required_attribute_value $node id]
@@ -1148,7 +1146,7 @@
variable ::install::xml::ids
set ids($name) $value
}
-
+
ad_proc -public install::xml::util::get_id { id } {
Returns an id from the global ids variable if it exists and attempts to
find an acs_magic_object if not.
@@ -1166,7 +1164,7 @@
} err]} {
error "$id is not an integer, is not defined in this install.xml, and is not an acs_magic_object"
}
-
+
return $result
}
Index: openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl,v
diff -u -r1.11 -r1.11.2.1
--- openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl 17 Jan 2019 17:02:00 -0000 1.11
+++ openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl 14 Feb 2019 16:15:00 -0000 1.11.2.1
@@ -53,7 +53,7 @@
if { [ad_conn isconnected] } {
set user_id [ad_conn user_id]
} else {
- set user_id [db_null]
+ set user_id ""
}
db_dml update_modifying_user {}
}
Index: openacs-4/packages/ajaxhelper/tcl/ajax-dojo-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/tcl/ajax-dojo-procs.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/ajaxhelper/tcl/ajax-dojo-procs.tcl 26 Apr 2018 08:56:37 -0000 1.5
+++ openacs-4/packages/ajaxhelper/tcl/ajax-dojo-procs.tcl 14 Feb 2019 16:15:00 -0000 1.5.2.1
@@ -191,7 +191,7 @@
@creation-date 2006-11-05
} {
- set objargs {}
+ set objargs [list]
foreach args $argslist {
lappend objargs [join $args ":"]
}
Index: openacs-4/packages/ajaxhelper/tcl/ajax-listbuilder-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/tcl/ajax-listbuilder-procs.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/ajaxhelper/tcl/ajax-listbuilder-procs.tcl 25 Apr 2018 19:47:46 -0000 1.6
+++ openacs-4/packages/ajaxhelper/tcl/ajax-listbuilder-procs.tcl 14 Feb 2019 16:15:00 -0000 1.6.2.1
@@ -33,13 +33,13 @@
if {[info exists _hide_column]} {
set hide_column $_hide_column
} else {
- set hide_column {}
+ set hide_column [list]
}
upvar move _move
if {[info exists _move]} {
set move $_move
} else {
- set move {}
+ set move [list]
}
upvar groupby _groupby
set previous_index 0
@@ -49,7 +49,7 @@
template::list::get_reference -name $list_name
upvar #[template::adp_level] ${list_name}:filter:groupby:properties groupby_ref
- set groupbys {}
+ set groupbys [list]
foreach elm $groupby_ref(values) {
set value [lindex $elm 1]
lappend groupbys [lindex $value 0 1]
@@ -73,16 +73,16 @@
set first_not_checkbox 1
}
- set sortmenuitems {}
+ set sortmenuitems [list]
lappend sortmenuitems [list [list "text" "A-Z"] [list "url" "[filter_url -list_name $list_name -filter_name orderby -filter_value ${element},asc -return_url $return_url]"]]
lappend sortmenuitems [list [list "text" "Z-A"] [list "url" "[filter_url -list_name $list_name -filter_name orderby -filter_value ${element},desc -return_url $return_url]"]]
- set groupmenuitems {}
+ set groupmenuitems [list]
lappend groupmenuitems [list [list "text" "By Exact Value"] [list "url" "[filter_url -list_name $list_name -filter_name groupby -filter_value $element -return_url $return_url]"] ]
# lappend groupmenuitems [list [list "text" "By First Letter"] [list "url" "javascript:void(0)"] ]
- set movemenuitems {}
+ set movemenuitems [list]
set this_move $move
if {[set this_move_index [lsearch $move $element]] > -1} {
set this_move [lreplace $move $this_move_index [expr {$this_move_index + 1}]]
@@ -97,7 +97,7 @@
lappend movemenuitems [list [list "text" "First"] [list "url" "[filter_url -list_name $list_name -filter_name move -filter_value [concat $this_move [list $element $first_not_checkbox]] -return_url $return_url]"]]
}
- set menulist {}
+ set menulist [list]
if {[lsearch $list_properties(orderby_refs) "*${element_properties(name)}*"] > -1} {
lappend menulist [list [list "text" "Sort"] [list "submenu" [list [list "id" "sort-$element_properties(name)"] [list "itemdata" $sortmenuitems] ] ] ]
}
@@ -169,9 +169,8 @@
@param list_name template::list list name
@param allowed_elements List of element names that may appear in add
- column dropdown
- @parma add_url_var Name of URL variable to use to add the chosen column
- @param -hidden_elements List of hidden elements that should be passed in the
+ column dropdown
+ @param add_url_var Name of URL variable to use to add the chosen column
} {
if {$return_url eq ""} {
set return_url [ad_return_url]
@@ -180,9 +179,9 @@
if {[info exists _add_column]} {
set add_column $_add_column
} else {
- set add_column {}
+ set add_column [list]
}
- set addcolumnlist {}
+ set addcolumnlist [list]
template::list::get_reference -name $list_name
lappend list_properties(actions) [_ acs-templating.Add_Column] "javascript:void(0)" [_ acs-templating.Add_Column]
@@ -252,7 +251,7 @@
foreach view $view_names {
set view_name [lindex $view 0]
set value [lindex $view 1]
- set viewmenuitems {}
+ set viewmenuitems [list]
lappend viewlist [list [list "text" $view_name] [list "url" "[filter_url -list_name $list_name -filter_name __list_view -filter_value $value -return_url [ad_conn url]]" ]]
}
@@ -455,7 +454,7 @@
}
if {[info exists hide]} {
- set reset_filters {}
+ set reset_filters [list]
if {[info exists orderby] && [lsearch $hide [lindex [split $orderby ,] 0]] > -1} {
unset orderby
lappend reset_filters orderby
Index: openacs-4/packages/ajaxhelper/tcl/ajax-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/tcl/ajax-procs.tcl,v
diff -u -r1.18 -r1.18.2.1
--- openacs-4/packages/ajaxhelper/tcl/ajax-procs.tcl 25 Apr 2018 19:47:46 -0000 1.18
+++ openacs-4/packages/ajaxhelper/tcl/ajax-procs.tcl 14 Feb 2019 16:15:01 -0000 1.18.2.1
@@ -1,9 +1,9 @@
ad_library {
- Library for Ajax Helper Procs
+ Library for Ajax Helper Procs
- @author Hamilton Chua (ham@solutiongrove.com)
- @creation-date 2006-01-16
+ @author Hamilton Chua (ham@solutiongrove.com)
+ @creation-date 2006-01-16
}
namespace eval ah { }
@@ -19,37 +19,37 @@
global ajax_helper_dojo_js_sources
global ajax_helper_custom_scripts
global ajax_helper_init_scripts
-
+
set js_sources ""
set init_body ""
-
+
if { [info exists ajax_helper_js_sources] } {
append js_sources [ah::load_js_sources -source_list $ajax_helper_js_sources]
}
-
+
if { [info exists ajax_helper_yui_js_sources] } {
-
+
append js_sources [ah::yui::load_js_sources -source_list $ajax_helper_yui_js_sources]
-
+
# Yahoo has implemented a theming system, to make the css work, a class must be added
# to the body of the page before any widget is rendered
append init_body [ah::yui::cssclass \
- -varname "yuiclass" \
- -action "add" \
- -element "document.body" \
- -classname "yui-skin-sam" \
- -element_is_var ]
+ -varname "yuiclass" \
+ -action "add" \
+ -element "document.body" \
+ -classname "yui-skin-sam" \
+ -element_is_var ]
}
-
+
if { [info exists ajax_helper_dojo_js_sources] } {
append js_sources [ah::dojo::load_js_sources -source_list $ajax_helper_dojo_js_sources]
}
-
+
if { ![info exists ajax_helper_custom_scripts] } { set ajax_helper_custom_scripts "" }
- if { [info exists ajax_helper_init_scripts] } { append init_body $ajax_helper_init_scripts }
-
+ if { [info exists ajax_helper_init_scripts] } { append init_body $ajax_helper_init_scripts }
+
set js_init_script [ah::create_js_function -name "ah_page_init" -body ${init_body}]
-
+
set script "
${js_init_script}
${ajax_helper_custom_scripts}
@@ -59,7 +59,7 @@
return $js_sources
-}
+}
# ********* Loading Sources **********
@@ -68,13 +68,13 @@
-sources
} {
This proc should be called by an ajaxhelper proc with a comma separated list of javascript sources
- that the ajaxhelper proc needs in order to work.
+ that the ajaxhelper proc needs in order to work.
- @author Hamilton Chua (ham@solutiongrove.com)
- @creation-date 2006-12-19
- @param sources Comma separated list of sources
+ @author Hamilton Chua (ham@solutiongrove.com)
+ @creation-date 2006-12-19
+ @param sources Comma separated list of sources
} {
- #split up the comma delimited sources into a list
+#split up the comma delimited sources into a list
set source_list [split $sources ","]
set ah_base_url [ah::get_url]
@@ -121,41 +121,41 @@
}
}
-ad_proc -public ah::js_sources {
- {-source "default"}
+ad_proc -deprecated -public ah::js_sources {
+ {-source "default"}
} {
- DEPRECATED. Use ah::requires instead.
+ Will load any of the following javascript sources
+ prototype,
+ scriptaculous,
+ rounder,
+ overlibmws.
+ This will also check global variables.
+ If the sources have already been defined, we will not define them again.
+ Once the js_source has been loaded, the global variable with list of sources will be updated.
+ Calling this function is not necessary anymore as long as the required code to dynamically call
+ javascript functions is in the blank-master template, unless of course you want to write your own javascript.
- Will load any of the following javascript sources
- prototype,
- scriptaculous,
- rounder,
- overlibmws.
- This will also check global variables.
- If the sources have already been defined, we will not define them again.
- Once the js_source has been loaded, the global variable with list of sources will be updated.
- Calling this function is not necessary anymore as long as the required code to dynamically call
- javascript functions is in the blank-master template, unless of course you want to write your own javascript.
+ @author Hamilton Chua (ham@solutiongrove.com)
+ @creation-date 2006-01-16
- @author Hamilton Chua (ham@solutiongrove.com)
- @creation-date 2006-01-16
+ @see ah::requires instead
- @param source The caller can specify which set of javascript source files to load. This can be a comma seprated list
- Valid values include
- "default" : to load prototype and scriptaculous libraries
- "rounder" : to load the rico corner rounder functions only, use this if you are working primarily with scriptaculous,
- "overlibmws" : to load the overlibmws javascript files for dhtml callouts and popups.
- "overlibmws_bubble" : to load the overlibmws javascript files for dhtml callouts and popups.
- "overlibmws_scroll" : to load the overlibmws javascript files for dhtml bubble callouts and popups that scroll.
- "overlibmws_drag" : to load the overlibmws javascript files for draggable dhtml callouts and popups.
+ @param source The caller can specify which set of javascript source files to load. This can be a comma seprated list
+ Valid values include
+ "default" : to load prototype and scriptaculous libraries
+ "rounder" : to load the rico corner rounder functions only, use this if you are working primarily with scriptaculous,
+ "overlibmws" : to load the overlibmws javascript files for dhtml callouts and popups.
+ "overlibmws_bubble" : to load the overlibmws javascript files for dhtml callouts and popups.
+ "overlibmws_scroll" : to load the overlibmws javascript files for dhtml bubble callouts and popups that scroll.
+ "overlibmws_drag" : to load the overlibmws javascript files for draggable dhtml callouts and popups.
"prototype" : to load ONLY the prototype javascript source.
"scriptaculous" : to load all scriptaculous javascript sources.
- @return
- @error
+ @return
+ @error
} {
- set ah_base_url [ah::get_url]
+ set ah_base_url [ah::get_url]
set script ""
set minsuffix ""
@@ -166,50 +166,50 @@
# js_sources was called with no parameters, just load the defaults
if { $source eq "default" } {
if { ![ah::is_js_sources_loaded -js_source "prototype"] } {
- # load prototype
- template::head::add_javascript -src "${ah_base_url}prototype/prototype${minsuffix}.js"
- # make sure helper procs don't load it again
- lappend ajax_helper_js_sources "prototype"
+ # load prototype
+ template::head::add_javascript -src "${ah_base_url}prototype/prototype${minsuffix}.js"
+ # make sure helper procs don't load it again
+ lappend ajax_helper_js_sources "prototype"
}
if { ![ah::is_js_sources_loaded -js_source "scriptaculous"] } {
- # load scriptaculous
- template::head::add_javascript -src "${ah_base_url}scriptaculous/scriptaculous${minsuffix}.js"
- # make sure it doesn't get loaded again
- lappend ajax_helper_js_sources "scriptaculous"
+ # load scriptaculous
+ template::head::add_javascript -src "${ah_base_url}scriptaculous/scriptaculous${minsuffix}.js"
+ # make sure it doesn't get loaded again
+ lappend ajax_helper_js_sources "scriptaculous"
}
}
- set js_file_list [split $source ","]
+ set js_file_list [split $source ","]
- foreach x $js_file_list {
- switch $x {
- "rounder" {
- if { ![ah::is_js_sources_loaded -js_source "rounder"] } {
- template::head::add_javascript -src "${ah_base_url}curvycorners/rounded_corners_lite.inc.js"
- }
- }
- "overlibmws" {
- if { ![ah::is_js_sources_loaded -js_source "overlibmws"] } {
- template::head::add_javascript -src "${ah_base_url}overlibmws/overlibmws${minsuffix}.js"
- template::head::add_javascript -src "${ah_base_url}overlibmws/overlibmws_overtwo${minsuffix}.js"
- }
- }
- "overlibmws_bubble" {
- if { ![ah::is_js_sources_loaded -js_source "overlibmws_bubble"] } {
- template::head::add_javascript -script "var OLbubbleImageDir=\"${ah_base_url}overlibmws\";"
- template::head::add_javascript -src "${ah_base_url}overlibmws/overlibmws_bubble${minsuffix}.js"
- }
- }
- "overlibmws_scroll" {
- if { ![ah::is_js_sources_loaded -js_source "overlibmws_scroll"] } {
- template::head::add_javascript -src "${ah_base_url}overlibmws/overlibmws_scroll${minsuffix}.js"
- }
- }
- "overlibmws_drag" {
- if { ![ah::is_js_sources_loaded -js_source "overlibmws_drag"] } {
- template::head::add_javascript -src "${ah_base_url}overlibmws/overlibmws_draggable${minsuffix}.js"
- }
- }
+ foreach x $js_file_list {
+ switch $x {
+ "rounder" {
+ if { ![ah::is_js_sources_loaded -js_source "rounder"] } {
+ template::head::add_javascript -src "${ah_base_url}curvycorners/rounded_corners_lite.inc.js"
+ }
+ }
+ "overlibmws" {
+ if { ![ah::is_js_sources_loaded -js_source "overlibmws"] } {
+ template::head::add_javascript -src "${ah_base_url}overlibmws/overlibmws${minsuffix}.js"
+ template::head::add_javascript -src "${ah_base_url}overlibmws/overlibmws_overtwo${minsuffix}.js"
+ }
+ }
+ "overlibmws_bubble" {
+ if { ![ah::is_js_sources_loaded -js_source "overlibmws_bubble"] } {
+ template::head::add_javascript -script "var OLbubbleImageDir=\"${ah_base_url}overlibmws\";"
+ template::head::add_javascript -src "${ah_base_url}overlibmws/overlibmws_bubble${minsuffix}.js"
+ }
+ }
+ "overlibmws_scroll" {
+ if { ![ah::is_js_sources_loaded -js_source "overlibmws_scroll"] } {
+ template::head::add_javascript -src "${ah_base_url}overlibmws/overlibmws_scroll${minsuffix}.js"
+ }
+ }
+ "overlibmws_drag" {
+ if { ![ah::is_js_sources_loaded -js_source "overlibmws_drag"] } {
+ template::head::add_javascript -src "${ah_base_url}overlibmws/overlibmws_draggable${minsuffix}.js"
+ }
+ }
"prototype" {
if { ![ah::is_js_sources_loaded -js_source "prototype"] } {
template::head::add_javascript -src "${ah_base_url}prototype/prototype${minsuffix}.js"
@@ -226,10 +226,10 @@
template::head::add_css -href "${ah_base_url}autosuggest/autosuggest.css"
}
}
- }
- }
+ }
+ }
- return $script
+ return $script
}
# ********* UTILS ************
@@ -238,18 +238,18 @@
-lists_of_pairs
} {
Converts a properly structured list of lists into JSON format.
- The list of lists may look something like
+ The list of lists may look something like
- set data {}
- lappend data [list [list "x" "1"] [list "y" "10"] ]
- lappend data [list [list "x" "5"] [list "y" "20"] ]
+ set data [list]
+ lappend data [list [list "x" "1"] [list "y" "10"] ]
+ lappend data [list [list "x" "5"] [list "y" "20"] ]
- each line represents a row composed of lists.
- Each list in the row holds a pair that will be joined by ":".
+ each line represents a row composed of lists.
+ Each list in the row holds a pair that will be joined by ":".
} {
- set rows {}
+ set rows [list]
foreach row $lists_of_pairs {
- set pairs {}
+ set pairs [list]
foreach pair $row {
lappend pairs [join $pair ":"]
}
@@ -261,173 +261,173 @@
ad_proc -private ah::get_package_id {
} {
- Return the package_id of the installed and mounted ajax helper instance
+ Return the package_id of the installed and mounted ajax helper instance
- @author Hamilton Chua (ham@solutiongrove.com)
- @creation-date 2006-01-16
- @return
+ @author Hamilton Chua (ham@solutiongrove.com)
+ @creation-date 2006-01-16
+ @return
- @error
+ @error
} {
- return [apm_package_id_from_key "ajaxhelper"]
+ return [apm_package_id_from_key "ajaxhelper"]
}
ad_proc -private ah::get_url {
} {
- Return the path to the ajaxhelper resource files
+ Return the path to the ajaxhelper resource files
- @author Hamilton Chua (ham@solutiongrove.com)
- @creation-date 2006-01-16
- @return
+ @author Hamilton Chua (ham@solutiongrove.com)
+ @creation-date 2006-01-16
+ @return
- @error
+ @error
} {
- return "/resources/ajaxhelper/"
+ return "/resources/ajaxhelper/"
}
ad_proc -private ah::isnot_js_var {
- element
+ element
} {
- Receives a string and surrounds it with single quotes.
- This is a utility proc used to turn a parameter passed to a proc into a string.
- The assumption is that an element passed as a parameter is a javascript variable.
+ Receives a string and surrounds it with single quotes.
+ This is a utility proc used to turn a parameter passed to a proc into a string.
+ The assumption is that an element passed as a parameter is a javascript variable.
- @author Hamilton Chua (ham@solutiongrove.com)
- @creation-date 2006-01-16
- @return
+ @author Hamilton Chua (ham@solutiongrove.com)
+ @creation-date 2006-01-16
+ @return
} {
- return "'$element'"
+ return "'$element'"
}
ad_proc -private ah::enclose_in_script {
- -script:required
+ -script:required
} {
- Encloses whatever is passed to the script parameter in javascript tags.
- @author Hamilton Chua (ham@solutiongrove.com)
- @creation-date 2006-01-16
+ Encloses whatever is passed to the script parameter in javascript tags.
+ @author Hamilton Chua (ham@solutiongrove.com)
+ @creation-date 2006-01-16
- @param script string to enclose in javascript tags.
+ @param script string to enclose in javascript tags.
} {
- set tag ""
- return $tag
+ set tag ""
+ return $tag
}
ad_proc -public ah::create_js_function {
- -body:required
- {-name ""}
- {-parameters "" }
+ -body:required
+ {-name ""}
+ {-parameters "" }
} {
- Helper procedure to generate a javascript function
- @author Hamilton Chua (ham@solutiongrove.com)
- @creation-date 2006-11-05
+ Helper procedure to generate a javascript function
+ @author Hamilton Chua (ham@solutiongrove.com)
+ @creation-date 2006-11-05
- @param name The name of the javascript function
- @param body The body of the javascript function
- @param parameters The comma separated list of parameters of the javascript function
+ @param name The name of the javascript function
+ @param body The body of the javascript function
+ @param parameters The comma separated list of parameters of the javascript function
} {
- set script "function ${name} ("
- if { $parameters ne "" } { append script [join $parameters ","] }
- append script ") \{ $body \}"
- return $script
+ set script "function ${name} ("
+ if { $parameters ne "" } { append script [join $parameters ","] }
+ append script ") \{ $body \}"
+ return $script
}
ad_proc -public ah::insert {
- -element:required
- -text:required
- {-position "After"}
+ -element:required
+ -text:required
+ {-position "After"}
} {
- Inserts text or html in a position given the element as reference.
- @author Hamilton Chua (ham@solutiongrove.com)
- @creation-date 2006-11-05
+ Inserts text or html in a position given the element as reference.
+ @author Hamilton Chua (ham@solutiongrove.com)
+ @creation-date 2006-11-05
- @param element The element that will be used as reference
- @param text What you want to insert.
- @param position Where you want to insert text. This is case sensitive. Possible values include After, Bottom, Before and Top. Defaults to After.
+ @param element The element that will be used as reference
+ @param text What you want to insert.
+ @param position Where you want to insert text. This is case sensitive. Possible values include After, Bottom, Before and Top. Defaults to After.
} {
- ah::requires -sources "prototype"
+ ah::requires -sources "prototype"
- set script "new Insertion.${position}('${element}','${text}'); "
- return $script
+ set script "new Insertion.${position}('${element}','${text}'); "
+ return $script
}
# ************ Listeners **************
ad_proc -public ah::starteventwatch {
- -element:required
- -event:required
- -obs_function:required
- {-element_is_var:boolean}
- {-useCapture "false"}
+ -element:required
+ -event:required
+ -obs_function:required
+ {-element_is_var:boolean}
+ {-useCapture "false"}
} {
- Use prototype's Event object to watch/listen for a specific event from a specific html element.
- Valid events include click, load, mouseover etc.
- See ah::yui::addlistener for Yahoo's implementation which some say is superior.
- @author Hamilton Chua (ham@solutiongrove.com)
- @creation-date 2006-02-28
+ Use prototype's Event object to watch/listen for a specific event from a specific html element.
+ Valid events include click, load, mouseover etc.
+ See ah::yui::addlistener for Yahoo's implementation which some say is superior.
+ @author Hamilton Chua (ham@solutiongrove.com)
+ @creation-date 2006-02-28
- @param element the element you want to observe
- @param event the event that the observer will wait for
- @param obs_function the function that will be executed when the event is detected
+ @param element the element you want to observe
+ @param event the event that the observer will wait for
+ @param obs_function the function that will be executed when the event is detected
} {
- ah::requires -sources "prototype"
+ ah::requires -sources "prototype"
- if { !$element_is_var_p } {
- set element [ah::isnot_js_var $element]
- }
- set script "Event.observe(${element}, '${event}', ${obs_function}, $useCapture);"
- return $script
+ if { !$element_is_var_p } {
+ set element [ah::isnot_js_var $element]
+ }
+ set script "Event.observe(${element}, '${event}', ${obs_function}, $useCapture);"
+ return $script
}
ad_proc -public ah::stopeventwatch {
- -element:required
- -event:required
- -obs_function:required
- {-useCapture "false"}
- {-element_is_var:boolean}
+ -element:required
+ -event:required
+ -obs_function:required
+ {-useCapture "false"}
+ {-element_is_var:boolean}
} {
- Use prototype's Event object to watch/listen to a specific event from a specific html element.
- Valid events include click, load, mouseover etc.
- @author Hamilton Chua (ham@solutiongrove.com)
- @creation-date 2006-02-28
+ Use prototype's Event object to watch/listen to a specific event from a specific html element.
+ Valid events include click, load, mouseover etc.
+ @author Hamilton Chua (ham@solutiongrove.com)
+ @creation-date 2006-02-28
- @param element the element you want to observe
- @param event the event that the observer will wait for
- @param obs_function the function that will be executed when the event is detected
+ @param element the element you want to observe
+ @param event the event that the observer will wait for
+ @param obs_function the function that will be executed when the event is detected
} {
ah::requires -sources "prototype"
- if { !$element_is_var_p } {
- set element [ah::isnot_js_var $element]
- }
- set script "Event.stopObserving(${element}, '${event}', ${obs_function}, $useCapture);"
- return $script
+ if { !$element_is_var_p } {
+ set element [ah::isnot_js_var $element]
+ }
+ set script "Event.stopObserving(${element}, '${event}', ${obs_function}, $useCapture);"
+ return $script
}
# *********** Ajax Procs *************
ad_proc -public ah::ajaxperiodical {
- -url:required
- -container:required
- {-frequency "5"}
- {-asynchronous "true"}
- {-pars ""}
- {-options ""}
+ -url:required
+ -container:required
+ {-frequency "5"}
+ {-asynchronous "true"}
+ {-pars ""}
+ {-options ""}
} {
- Returns javascript that calls the prototype javascript library's ajax periodic updater object.
- This object makes "polling" possible. Polling is a way by which a website can regularly update itself.
- The ajax script is executed periodically in a set interval.
- It has the same properties as ajax update, the only difference is that it is executed after x number of seconds.
- Parameters and options are case sensitive, refer to scriptaculous documentation
- http://wiki.script.aculo.us/scriptaculous/show/Ajax.PeriodicalUpdater
+ Returns javascript that calls the prototype javascript library's ajax periodic updater object.
+ This object makes "polling" possible. Polling is a way by which a website can regularly update itself.
+ The ajax script is executed periodically in a set interval.
+ It has the same properties as ajax update, the only difference is that it is executed after x number of seconds.
+ Parameters and options are case sensitive, refer to scriptaculous documentation
+ http://wiki.script.aculo.us/scriptaculous/show/Ajax.PeriodicalUpdater
@author Hamilton Chua (ham@solutiongrove.com)
@creation-date 2006-11-05
@@ -439,480 +439,480 @@
ah::requires -sources "prototype"
- set preoptions "asynchronous:${asynchronous},frequency:${frequency},method:'post'"
+ set preoptions "asynchronous:${asynchronous},frequency:${frequency},method:'post'"
- if { $pars ne "" } {
- append preoptions ",parameters:$pars"
- }
- if { $options ne "" } { append preoptions ",$options" }
- set script "new Ajax.PeriodicalUpdater('$container','$url',{$preoptions}); "
+ if { $pars ne "" } {
+ append preoptions ",parameters:$pars"
+ }
+ if { $options ne "" } { append preoptions ",$options" }
+ set script "new Ajax.PeriodicalUpdater('$container','$url',{$preoptions}); "
- return $script
+ return $script
}
ad_proc -public ah::ajaxrequest {
- -url:required
- {-asynchronous "true"}
- {-pars ""}
- {-options ""}
+ -url:required
+ {-asynchronous "true"}
+ {-pars ""}
+ {-options ""}
} {
- Returns javascript that calls the prototype javascript library's ajax request (Ajax.Request) object.
- The Ajax.Request object will only perform an xmlhttp request to a url.
- If you prefer to perform an xmlhttp request and then update the contents of a < div >, look at ah::ajaxupdate.
- Parameters and options are case sensitive, refer to scriptaculous documentation.
- http://wiki.script.aculo.us/scriptaculous/show/Ajax.Request
+ Returns javascript that calls the prototype javascript library's ajax request (Ajax.Request) object.
+ The Ajax.Request object will only perform an xmlhttp request to a url.
+ If you prefer to perform an xmlhttp request and then update the contents of a < div >, look at ah::ajaxupdate.
+ Parameters and options are case sensitive, refer to scriptaculous documentation.
+ http://wiki.script.aculo.us/scriptaculous/show/Ajax.Request
- @author Hamilton Chua (ham@solutiongrove.com)
- @creation-date 2006-01-16
+ @author Hamilton Chua (ham@solutiongrove.com)
+ @creation-date 2006-01-16
- @param url the url that the javascript will call/query
- @param pars the parameters that will be passed to Ajax.Request. these parameters should normally be enclosed in single quotes ('') unless you intend to provide a javascript variable or function as a parameter
- @param options the options that will be passed to the Ajax.Request javascript function
+ @param url the url that the javascript will call/query
+ @param pars the parameters that will be passed to Ajax.Request. these parameters should normally be enclosed in single quotes ('') unless you intend to provide a javascript variable or function as a parameter
+ @param options the options that will be passed to the Ajax.Request javascript function
@param asynchronous the default is true
} {
ah::requires -sources "prototype"
- set preoptions "asynchronous:${asynchronous},method:'post'"
+ set preoptions "asynchronous:${asynchronous},method:'post'"
- if { $pars ne "" } {
- append preoptions ",parameters:$pars"
- }
- if { $options ne "" } { append preoptions ",$options" }
- set script "new Ajax.Request('$url',{$preoptions}); "
+ if { $pars ne "" } {
+ append preoptions ",parameters:$pars"
+ }
+ if { $options ne "" } { append preoptions ",$options" }
+ set script "new Ajax.Request('$url',{$preoptions}); "
- return $script
+ return $script
}
ad_proc -public ah::ajaxupdate {
- -container:required
- -url:required
- {-asynchronous "true"}
- {-pars ""}
- {-options ""}
- {-effect ""}
- {-effectopts ""}
- {-enclose:boolean}
- {-container_is_var:boolean}
+ -container:required
+ -url:required
+ {-asynchronous "true"}
+ {-pars ""}
+ {-options ""}
+ {-effect ""}
+ {-effectopts ""}
+ {-enclose:boolean}
+ {-container_is_var:boolean}
} {
- Generate an Ajax.Updater javascript object.
- The parameters are passed directly to the Ajax.Update script.
- You can optionally specify an effect to use as the container is updated.
- By default it will use the "Appear" effect.
- Parameters and options are case sensitive, refer to scriptaculous documentation.
- http://wiki.script.aculo.us/scriptaculous/show/Ajax.Updater
+ Generate an Ajax.Updater javascript object.
+ The parameters are passed directly to the Ajax.Update script.
+ You can optionally specify an effect to use as the container is updated.
+ By default it will use the "Appear" effect.
+ Parameters and options are case sensitive, refer to scriptaculous documentation.
+ http://wiki.script.aculo.us/scriptaculous/show/Ajax.Updater
-
+
+
+
+
+
Index: openacs-4/packages/chat/www/room.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room.tcl,v
diff -u -r1.11 -r1.11.2.1
--- openacs-4/packages/chat/www/room.tcl 29 May 2018 17:09:02 -0000 1.11
+++ openacs-4/packages/chat/www/room.tcl 14 Feb 2019 16:15:01 -0000 1.11.2.1
@@ -88,6 +88,9 @@
}
}
+set xowiki_includelet_code "\{\{chat_room -chat_id $room_id\}\}"
+set xowiki_includelet_size [string length $xowiki_includelet_code]
+
set actions ""
if { $user_ban_p } {
set actions [list [_ chat.Ban_user] [export_vars -base "search" {room_id {type ban}}]]
@@ -117,3 +120,9 @@
}
ad_return_template
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 2
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat/www/search-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/search-3.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/chat/www/search-3.tcl 20 Jun 2016 08:37:04 -0000 1.6
+++ openacs-4/packages/chat/www/search-3.tcl 14 Feb 2019 16:15:01 -0000 1.6.2.1
@@ -15,3 +15,8 @@
}
ad_returnredirect "room?room_id=$room_id"
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/search.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/chat/www/search.tcl 20 Jun 2016 08:37:04 -0000 1.2
+++ openacs-4/packages/chat/www/search.tcl 14 Feb 2019 16:15:01 -0000 1.2.2.1
@@ -3,8 +3,8 @@
} {
type:notnull
room_id:naturalnum,notnull
-}
-
+}
+
set context [list "Users"]
db_1row users_n_users {}
@@ -13,17 +13,22 @@
set last_registration [lc_time_fmt $last_registration "%q"]
set groups [db_html_select_value_options groups_select {
- select groups.group_id,
- groups.group_name,
- m.num as n_members,
- c.num as n_components
- from groups,
- (select group_id, count(*) as num
- from group_member_map group by group_id) m,
- (select group_id, count(*) as num
- from group_component_map group by group_id) c
- where groups.group_id=m.group_id
+ select groups.group_id,
+ groups.group_name,
+ m.num as n_members,
+ c.num as n_components
+ from groups,
+ (select group_id, count(*) as num
+ from group_member_map group by group_id) m,
+ (select group_id, count(*) as num
+ from group_component_map group by group_id) c
+ where groups.group_id=m.group_id
and groups.group_id = c.group_id
order by group_name
} ]
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat/www/transcript-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-delete-2.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/chat/www/transcript-delete-2.tcl 7 Aug 2017 23:48:07 -0000 1.6
+++ openacs-4/packages/chat/www/transcript-delete-2.tcl 14 Feb 2019 16:15:01 -0000 1.6.2.1
@@ -4,16 +4,20 @@
} {
room_id:naturalnum,notnull
transcript_id:naturalnum,notnull
-
+
}
permission::require_permission -object_id $transcript_id -privilege chat_transcript_delete
-
-
if { [catch {chat_transcript_delete $transcript_id} errmsg] } {
ad_return_complaint 1 "[_ chat.Delete_transcript_failed]: $errmsg"
ad_script_abort
}
ad_returnredirect "room?room_id=$room_id"
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat/www/transcript-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-delete.tcl,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/chat/www/transcript-delete.tcl 7 Aug 2017 23:48:07 -0000 1.8
+++ openacs-4/packages/chat/www/transcript-delete.tcl 14 Feb 2019 16:15:01 -0000 1.8.2.1
@@ -23,3 +23,9 @@
set context [list "[_ chat.Delete_transcript]"]
ad_return_template
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat/www/transcript-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/transcript-edit-2.tcl,v
diff -u -r1.10 -r1.10.2.1
--- openacs-4/packages/chat/www/transcript-edit-2.tcl 20 Jan 2018 22:56:50 -0000 1.10
+++ openacs-4/packages/chat/www/transcript-edit-2.tcl 14 Feb 2019 16:15:01 -0000 1.10.2.1
@@ -22,3 +22,9 @@
ad_returnredirect "transcript-view?transcript_id=$transcript_id&room_id=$room_id"
ad_script_abort
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat/www/transcript-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-edit.tcl,v
diff -u -r1.12 -r1.12.2.1
--- openacs-4/packages/chat/www/transcript-edit.tcl 17 Nov 2018 10:10:02 -0000 1.12
+++ openacs-4/packages/chat/www/transcript-edit.tcl 14 Feb 2019 16:15:01 -0000 1.12.2.1
@@ -24,30 +24,36 @@
ad_form -name "edit-transcription" -edit_buttons [list [list [_ chat.Edit] next]] -has_edit 1 -form {
{room_id:integer(hidden)
- {value $room_id}
+ {value $room_id}
}
{transcript_id:integer(hidden)
- {value $transcript_id}
+ {value $transcript_id}
}
{pretty_name:text(text)
- {label "#chat.Transcript_name#" }
- {value $pretty_name}
+ {label "#chat.Transcript_name#" }
+ {value $pretty_name}
}
{description:text(textarea),optional
- {label "#chat.Description#" }
- {html {rows 6 cols 65}}
- {value $description}
+ {label "#chat.Description#" }
+ {html {rows 6 cols 65}}
+ {value $description}
}
{contents:text(textarea)
- {label "#chat.Transcript#" }
- {html {rows 6 cols 65}}
- {value $contents}
+ {label "#chat.Transcript#" }
+ {html {rows 6 cols 65}}
+ {value $contents}
}
} -on_submit {
if { [catch {chat_transcript_edit $transcript_id $pretty_name $description $contents} errmsg] } {
- ad_return_complaint 1 "[_ chat.Could_not_update_transcript]: $errmsg"
+ ad_return_complaint 1 "[_ chat.Could_not_update_transcript]: $errmsg"
} else {
- ad_returnredirect [export_vars -base "chat-transcript" {transcript_id room_id}]
+ ad_returnredirect [export_vars -base "chat-transcript" {transcript_id room_id}]
}
ad_script_abort
}
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat/www/transcript-new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/transcript-new-2.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/chat/www/transcript-new-2.tcl 20 Jun 2016 08:37:04 -0000 1.5
+++ openacs-4/packages/chat/www/transcript-new-2.tcl 14 Feb 2019 16:15:01 -0000 1.5.2.1
@@ -8,7 +8,7 @@
{delete_messages:optional "off"}
{deactivate_room:optional "off"}
contents:trim,notnull,html
-}
+}
permission::require_permission -object_id $room_id -privilege chat_transcript_create
@@ -36,3 +36,8 @@
ad_returnredirect "chat-transcript?room_id=$room_id&transcript_id=$transcript_id"
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat/www/transcript-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-new.tcl,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/chat/www/transcript-new.tcl 20 Jun 2016 08:37:04 -0000 1.8
+++ openacs-4/packages/chat/www/transcript-new.tcl 14 Feb 2019 16:15:01 -0000 1.8.2.1
@@ -34,3 +34,8 @@
ad_return_template "transcript-entry"
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat/www/transcript-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-view.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/chat/www/transcript-view.tcl 7 Aug 2017 23:48:07 -0000 1.6
+++ openacs-4/packages/chat/www/transcript-view.tcl 14 Feb 2019 16:15:01 -0000 1.6.2.1
@@ -29,3 +29,9 @@
}
ad_return_template
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat/www/unauthorized.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/unauthorized.tcl,v
diff -u -r1.3 -r1.3.14.1
--- openacs-4/packages/chat/www/unauthorized.tcl 14 Mar 2006 12:16:09 -0000 1.3
+++ openacs-4/packages/chat/www/unauthorized.tcl 14 Feb 2019 16:15:01 -0000 1.3.14.1
@@ -11,4 +11,10 @@
set context_bar [list "[_ chat.Unauthorized_privilege]"]
-ad_return_template
\ No newline at end of file
+ad_return_template
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat/www/user-ban-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/user-ban-2.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/chat/www/user-ban-2.tcl 7 Aug 2017 23:48:07 -0000 1.5
+++ openacs-4/packages/chat/www/user-ban-2.tcl 14 Feb 2019 16:15:01 -0000 1.5.2.1
@@ -1,6 +1,6 @@
#/chat/www/user-ban-2.tcl
ad_page_contract {
-
+
Ban user.
@author David Dao (ddao@arsdigita.com)
@@ -16,3 +16,9 @@
chat_user_ban $room_id $party_id
ad_returnredirect "room?room_id=$room_id"
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat/www/user-ban.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/user-ban.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/chat/www/user-ban.tcl 7 Aug 2017 23:48:07 -0000 1.6
+++ openacs-4/packages/chat/www/user-ban.tcl 14 Feb 2019 16:15:01 -0000 1.6.2.1
@@ -1,6 +1,6 @@
#/chat/www/user-ban.tcl
ad_page_contract {
-
+
Explicit ban user from the chat room.
@author David Dao (ddao@arsdigita.com)
@@ -28,3 +28,9 @@
db_multirow parties list_parties {}
ad_return_template grant-entry
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat/www/user-unban-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/user-unban-2.tcl,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/chat/www/user-unban-2.tcl 7 Aug 2017 23:48:07 -0000 1.4
+++ openacs-4/packages/chat/www/user-unban-2.tcl 14 Feb 2019 16:15:01 -0000 1.4.2.1
@@ -16,3 +16,9 @@
chat_user_unban $room_id $party_id
ad_returnredirect "room?room_id=$room_id"
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat/www/user-unban.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/user-unban.tcl,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/chat/www/user-unban.tcl 18 Jun 2018 14:35:33 -0000 1.7
+++ openacs-4/packages/chat/www/user-unban.tcl 14 Feb 2019 16:15:01 -0000 1.7.2.1
@@ -1,6 +1,6 @@
#/chat/www/user-unban.tcl
ad_page_contract {
-
+
Display confirmation before unban user.
@author David Dao (ddao@arsdigita.com)
@@ -20,3 +20,8 @@
set pretty_name [chat_room_name $room_id]
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 2
+# indent-tabs-mode: nil
+# End:
Fisheye: Tag 1.10.2.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/ajax/chat.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.13.2.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/resources/chat.css'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/chat-portlet/tcl/chat-admin-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/tcl/chat-admin-portlet-procs.tcl,v
diff -u -r1.1 -r1.1.14.1
--- openacs-4/packages/chat-portlet/tcl/chat-admin-portlet-procs.tcl 14 Mar 2006 12:23:38 -0000 1.1
+++ openacs-4/packages/chat-portlet/tcl/chat-admin-portlet-procs.tcl 14 Feb 2019 16:15:01 -0000 1.1.14.1
@@ -20,7 +20,7 @@
@author agustin (Agustin.Lopez@uv.es)
@creation-date 2004-10-10
- @version $Id: chat-admin-portlet-procs.tcl,v 0.1 2004/10/10
+ @cvs-id $Id: chat-admin-portlet-procs.tcl,v 0.1 2004/10/10
}
Index: openacs-4/packages/chat-portlet/tcl/chat-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/tcl/chat-portlet-procs.tcl,v
diff -u -r1.1 -r1.1.14.1
--- openacs-4/packages/chat-portlet/tcl/chat-portlet-procs.tcl 14 Mar 2006 12:23:38 -0000 1.1
+++ openacs-4/packages/chat-portlet/tcl/chat-portlet-procs.tcl 14 Feb 2019 16:15:01 -0000 1.1.14.1
@@ -20,7 +20,7 @@
@author agustin (Agustin.Lopez@uv.es)
@creation-date 2004-10-10
- @version $Id: chat-portlet-procs.tcl,v 0.1 2004/10/10
+ @cvs-id $Id: chat-portlet-procs.tcl,v 0.1 2004/10/10
}
Index: openacs-4/packages/chat-portlet/www/chat-admin-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/www/chat-admin-portlet.tcl,v
diff -u -r1.1 -r1.1.14.1
--- openacs-4/packages/chat-portlet/www/chat-admin-portlet.tcl 14 Mar 2006 12:23:38 -0000 1.1
+++ openacs-4/packages/chat-portlet/www/chat-admin-portlet.tcl 14 Feb 2019 16:15:01 -0000 1.1.14.1
@@ -19,7 +19,7 @@
@author agustin (Agustin.Lopez@uv.es)
@creation-date 2004-10-10
- @version $Id: chat-admin-portlet.tcl,v 0.1 2004/10/10
+ @cvs-id $Id: chat-admin-portlet.tcl,v 0.1 2004/10/10
} -properties {
}
Index: openacs-4/packages/chat-portlet/www/chat-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/www/chat-portlet.tcl,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/chat-portlet/www/chat-portlet.tcl 7 Aug 2017 23:48:07 -0000 1.8
+++ openacs-4/packages/chat-portlet/www/chat-portlet.tcl 14 Feb 2019 16:15:01 -0000 1.8.2.1
@@ -19,7 +19,7 @@
@author agustin (Agustin.Lopez@uv.es)
@creation-date 2004-10-10
- @version $Id: chat-portlet.tcl,v 0.1 2004/10/10
+ @cvs-id $Id: chat-portlet.tcl,v 0.1 2004/10/10
} -properties {
context:onevalue
@@ -37,23 +37,20 @@
set user_id [ad_conn user_id]
set community_id [dotlrn_community::get_community_id]
set room_create_p [permission::permission_p -object_id $user_id -privilege chat_room_create]
-set default_mode [parameter::get -parameter DefaultClient -default "ajax"]
set num_rooms 0
if { $community_id eq 0 } {
- set query_name "rooms_list_all"
+ set query_name "rooms_list_all"
} else {
- set query_name "rooms_list"
+ set query_name "rooms_list"
}
-db_multirow -extend { can_see_p room_enter_url room_html_url html_text } rooms $query_name {} {
- set can_see_p 0
- if { $user_p || $admin_p } {
- set can_see_p 1
- set num_rooms [expr {$num_rooms + 1}]
- }
- set room_enter_url [export_vars -base "${base_url}room-enter" {room_id {client $default_mode}}]
- set room_html_url [export_vars -base "${base_url}room-enter" {room_id {client html}}]
- set html_text [_ chat.html_client_msg]
+db_multirow -extend { can_see_p room_enter_url } rooms $query_name {} {
+ set can_see_p 0
+ if { $user_p || $admin_p } {
+ set can_see_p 1
+ incr num_rooms
+ }
+ set room_enter_url [export_vars -base "${base_url}room-enter" {room_id}]
}
template::list::create -name chat_rooms -multirow rooms \
@@ -68,12 +65,6 @@
description {
label "[_ chat.Description]"
}
- html_mode {
- label "[_ chat-portlet.html_mode]"
- link_url_col room_html_url
- display_col html_text
- link_html {title "[_ chat.Enter_html_pretty_name]"}
- }
}
ad_return_template
Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v
diff -u -r1.234 -r1.234.2.1
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl 18 Sep 2018 17:27:14 -0000 1.234
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl 14 Feb 2019 16:15:01 -0000 1.234.2.1
@@ -393,9 +393,9 @@
} {
db_dml update_package_id {}
db_dml update_application_group_package_id {}
-
+
::dotlrn::dotlrn_community_cache flush -partition_key $community_id \
- $community_id-package_id
+ $community_id-package_id
}
ad_proc -public get_url {
@@ -434,7 +434,7 @@
::dotlrn::dotlrn_community_cache eval -partition_key $community_id \
$community_id-default_roles {
dotlrn_community::get_default_roles_not_cached -community_type $community_type
- }
+ }
}
ad_proc -private get_default_roles_not_cached {
@@ -528,10 +528,10 @@
ad_proc -public get_all_roles {} {
Return the list of roles used in dotLRN.
} {
-
+
::dotlrn::dotlrn_cache eval get_all_roles {
dotlrn_community::get_all_roles_not_cached
- }
+ }
}
ad_proc -private get_all_roles_not_cached {} {
@@ -779,12 +779,12 @@
} {
Check membership.
} {
-
+
::dotlrn::dotlrn_community_cache eval -partition_key $community_id \
$community_id-member-$user_id {
db_string select_count_membership {} -default 0
- }
-
+ }
+
}
ad_proc -public member_pending_p {
@@ -885,11 +885,11 @@
#
# Flush all permission checks pertaining to this user.
#
- permission::cache_flush -party_id $user_id
-
+ permission::cache_flush -party_id $user_id
+
# Remove record of this membership in the cache
::dotlrn::dotlrn_community_cache flush -partition_key $community_id \
- $community_id-member-$user_id
+ $community_id-member-$user_id
}
@@ -1063,10 +1063,10 @@
Returns the community type key depending on the node we're at.
} {
set package_id [ad_conn package_id]
-
+
::dotlrn::dotlrn_cache eval pkg_id-$package_id-community_type {
dotlrn_community::get_community_type_not_cached -package_id $package_id
- }
+ }
}
ad_proc -private get_community_type_not_cached {
@@ -1147,7 +1147,7 @@
::dotlrn::dotlrn_cache eval pkg_id-$package_id-parent_community_id {
dotlrn_community::get_parent_community_id_not_cached -package_id $package_id
- }
+ }
}
ad_proc -private get_parent_community_id_not_cached {
@@ -1567,7 +1567,11 @@
} {
Get the key for a community.
} {
- return [db_string select_community_key {} -default ""]
+
+ ::dotlrn::dotlrn_community_cache eval -partition_key $community_id \
+ $community_id-community_key {
+ db_string select_community_key {} -default ""
+ }
}
ad_proc -public not_closed_p {
@@ -1729,6 +1733,10 @@
# Delete from the DB
set applet_id [dotlrn_applet::get_applet_id_from_key -applet_key $applet_key]
db_dml delete_applet_from_community {}
+
+ # flush "applet_active" entry from the cache
+ ::dotlrn::dotlrn_community_cache flush -partition_key $community_id \
+ $community_id-applet_active-$applet_key
}
}
@@ -2155,7 +2163,7 @@
# candidate general cache
::dotlrn::dotlrn_cache eval available_attributes {
dotlrn_community::get_available_attributes_not_cached
- }
+ }
}
ad_proc -private get_available_attributes_not_cached {} {
@@ -2250,7 +2258,7 @@
db_dml update_attribute_value {}
}
- ::dotlrn::dotlrn_community_cache flush -partition_key $community_id $community_id-attributes
+ ::dotlrn::dotlrn_community_cache flush -partition_key $community_id $community_id-attributes
}
ad_proc -public unset_attribute {
@@ -2282,7 +2290,7 @@
} {
db_dml delete_attributes {}
- ::dotlrn::dotlrn_community_cache flush -partition_key $community_id $community_id-attributes
+ ::dotlrn::dotlrn_community_cache flush -partition_key $community_id $community_id-attributes
}
ad_proc -public get_attribute_id {
@@ -2479,7 +2487,7 @@
db_dml update_portal_theme {}
set portal_id [get_admin_portal_id -community_id $community_id]
db_dml update_portal_theme {}
- ::dotlrn::dotlrn_community_cache flush -partition_key $community_id $community_id-site_template
+ ::dotlrn::dotlrn_community_cache flush -partition_key $community_id $community_id-site_template
}
ad_proc -public get_dotlrn_master {
@@ -2553,12 +2561,11 @@
set new_theme_id [db_string select_portal_theme {}]
db_dml update_portal_themes {}
db_dml update_portal_admin_themes {}
-
+
foreach community_id [db_list affected_portals {}] {
::dotlrn::dotlrn_community_cache flush -partition_key $community_id $community_id-site_template
}
}
-
}
# Local variables:
Index: openacs-4/packages/dotlrn/www/register.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/register.tcl,v
diff -u -r1.22 -r1.22.2.1
--- openacs-4/packages/dotlrn/www/register.tcl 29 Jun 2018 17:27:19 -0000 1.22
+++ openacs-4/packages/dotlrn/www/register.tcl 14 Feb 2019 16:15:01 -0000 1.22.2.1
@@ -31,9 +31,9 @@
set redirect_to [parameter::get -parameter SelfRegistrationRedirectTo -package_id [dotlrn::get_package_id] -default ""]
if { $redirect_to ne "" } {
- ad_returnredirect $redirect_to
+ ad_returnredirect $redirect_to
} else {
- ad_returnredirect "not-allowed"
+ ad_returnredirect "not-allowed"
}
ad_script_abort
}
@@ -61,11 +61,11 @@
# This should prevent most double clicks, leaving
# the catch below to trap the rest.
-if { [dotlrn_community::member_p $community_id $user_id] ||
- ($join_policy eq "needs approval"
+if { [dotlrn_community::member_p $community_id $user_id] ||
+ ($join_policy eq "needs approval"
&& [dotlrn_community::member_pending_p -community_id $community_id -user_id $user_id]
)
- } {
+} {
ad_returnredirect $referer
ad_script_abort
}
@@ -75,7 +75,7 @@
switch -exact $join_policy {
"open" {
dotlrn_community::add_user -member_state approved $community_id $user_id
- dotlrn_community::send_member_email -community_id $community_id -to_user $user_id
+ dotlrn_community::send_member_email -community_id $community_id -to_user $user_id
}
"needs approval" {
dotlrn_community::add_user -member_state "needs approval" $community_id $user_id
@@ -95,7 +95,7 @@
set subject "$full_name ($email) has requested to join $community_name."
set message "$full_name ($email) has requested to join $community_name.
-
+
Visit this link to approve or reject this request:
$community_url/members
@@ -111,20 +111,19 @@
-subject $subject \
-message $message \
-query $query
-
}
}
} errmsg]} {
- # Check to see if they are already a member
+ # Check to see if they are already a member
# (in which case this was likely a double click)
-
+
if {[dotlrn_community::member_p $community_id $user_id]} {
ad_returnredirect $referer
ad_script_abort
} else {
ns_log Error "register.tcl failed: $errmsg\n$::errorInfo"
-
+
ad_return_error \
"Error adding user to community" \
"An error occurred while trying to add a user to a community. This error has been logged."
Index: openacs-4/packages/dotlrn-dotlrn/tcl/dotlrn-dotlrn-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-dotlrn/tcl/dotlrn-dotlrn-procs.tcl,v
diff -u -r1.41 -r1.41.2.1
--- openacs-4/packages/dotlrn-dotlrn/tcl/dotlrn-dotlrn-procs.tcl 7 Aug 2017 23:48:10 -0000 1.41
+++ openacs-4/packages/dotlrn-dotlrn/tcl/dotlrn-dotlrn-procs.tcl 14 Feb 2019 16:15:01 -0000 1.41.2.1
@@ -15,12 +15,12 @@
#
ad_library {
-
- Procs to set up the core dotLRN portlets.
+ Procs to set up the core dotLRN portlets.
+
1. the soon-to-be-renamed "dotlrn-main" portlet
(The thing that lists a users communities on their portal)
- 2. the "dotlrn" portlet (aka "subgroups" on comm portals)
+ 2. the "dotlrn" portlet (a.k.a. "subgroups" on comm portals)
3. the "dotlrn-admin portlet" (basic group admin)
and experimentally (so we eliminate these 2 applets):
@@ -33,18 +33,18 @@
}
namespace eval dotlrn_dotlrn {
-
+
ad_proc portal_element_key {
} {
What portlet is this applet associated with?
} {
- return "dotlrn-portlet"
+ return "dotlrn-portlet"
}
ad_proc -public get_pretty_name {
} {
} {
- return "[_ dotlrn-dotlrn.Core_DotLRN_Applets]"
+ return "[_ dotlrn-dotlrn.Core_DotLRN_Applets]"
}
ad_proc -public my_package_key {
@@ -62,30 +62,30 @@
ad_proc -public add_applet {
} {
- Add the applet to dotlrn - one time init - must be repeatable!
+ Add the applet to dotlrn - one time init - must be repeatable!
} {
dotlrn_applet::add_applet_to_dotlrn -applet_key [applet_key] -package_key [my_package_key]
}
ad_proc -public remove_applet {
- package_id
+ package_id
} {
- Remove the applet from dotlrn.
+ Remove the applet from dotlrn.
} {
ad_return_complaint \
1 \
"[applet_key] remove_applet called - this should not happen ever!"
}
ad_proc -public add_applet_to_community {
- community_id
+ community_id
} {
- Add the core dotlrn applets to a specific community
+ Add the core dotlrn applets to a specific community
} {
#
# comm type-specific stuff
#
- # we call add_self_to_page again with the
+ # we call add_self_to_page again with the
# real comm_id, and it gets overwritten
set portal_id [dotlrn_community::get_portal_id \
@@ -138,24 +138,24 @@
dotlrn_dotlrn::add_portlet_helper $portal_id $args
- # return the empty string
- return ""
+ # return the empty string
+ return ""
}
ad_proc -public remove_applet_from_community {
- community_id
+ community_id
} {
- remove the dotlrn applet from a specific community
+ remove the dotlrn applet from a specific community
} {
ad_return_complaint \
1 \
"[applet_key] remove_applet_from_community not implemented!"
}
ad_proc -public add_user {
- user_id
+ user_id
} {
- Called for one time init when this user is added to dotlrn.
+ Called for one time init when this user is added to dotlrn.
Do nothing, since the portal system will copy the dotlrn-main
portal from the user template. that's set up below
} {
@@ -171,35 +171,35 @@
}
ad_proc -public add_user_to_community {
- community_id
- user_id
+ community_id
+ user_id
} {
Add user to a comm
} {
# noop
}
ad_proc -public remove_user_from_community {
- community_id
- user_id
+ community_id
+ user_id
} {
- Remove a user from a community. Since this applet is not shown
- on a user's portal, no action is required here.
+ Remove a user from a community. Since this applet is not shown
+ on a user's portal, no action is required here.
} {
# noop
}
-
+
ad_proc -public add_portlet {
portal_id
} {
- @param portal_id
+ @param portal_id
} {
set community_id 0
set args [ns_set create]
ns_set put $args community_id $community_id
set type [dotlrn::get_type_from_portal_id -portal_id $portal_id]
-
+
switch $type {
user {
dotlrn_main_portlet::add_self_to_page -portal_id $portal_id
@@ -234,10 +234,10 @@
}
ad_proc -private add_portlet_helper {
- portal_id
- args
+ portal_id
+ args
} {
- Does the call to add the portlet to the portal.
+ Does the call to add the portlet to the portal.
Params for the portlet are sent to this proc by the caller.
} {
dotlrn_portlet::add_self_to_page \
@@ -249,8 +249,8 @@
portal_id
args
} {
- A helper proc to remove the underlying portlet from the given portal.
-
+ A helper proc to remove the underlying portlet from the given portal.
+
@param portal_id
@param args
} {
@@ -262,7 +262,7 @@
new_community_id
} {
Clone this applet's content from the old community to the new one.
- Since there's no data to copy, just add the applet to the new
+ Since there's no data to copy, just add the applet to the new
community.
} {
ns_log notice "Cloning: [applet_key]"
@@ -274,10 +274,10 @@
event
old_value
new_value
- } {
- listens for the following events:
- } {
- }
+ } {
+ listens for the following events:
+ } {
+ }
ad_proc -private get_default_page { portal_type } {
The pretty name of the page to add the portlet to.
@@ -303,7 +303,7 @@
}
return $page_name
- }
+ }
}
# Local variables:
Index: openacs-4/packages/dotlrn-portlet/tcl/dotlrn-members-staff-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/tcl/dotlrn-members-staff-portlet-procs.tcl,v
diff -u -r1.12 -r1.12.2.1
--- openacs-4/packages/dotlrn-portlet/tcl/dotlrn-members-staff-portlet-procs.tcl 11 Jul 2018 08:37:54 -0000 1.12
+++ openacs-4/packages/dotlrn-portlet/tcl/dotlrn-members-staff-portlet-procs.tcl 14 Feb 2019 16:15:01 -0000 1.12.2.1
@@ -16,7 +16,7 @@
ad_library {
- Procedures to supports the dotlrn "members staff" portlet aka "Staff List"
+ Procedures to supports the dotlrn "members staff" portlet a.k.a. "Staff List"
@author arjun@openforce.net
@cvs-id $Id$
@@ -38,60 +38,59 @@
} {
Get the pretty name.
} {
- return "#dotlrn-portlet.members_staff_portlet_pretty_name#"
+ return "#dotlrn-portlet.members_staff_portlet_pretty_name#"
}
ad_proc -public link {
} {
Get the link. This is currently empty.
} {
- return ""
+ return ""
}
ad_proc -public add_self_to_page {
- {-portal_id:required}
- {-community_id:required}
+ {-portal_id:required}
+ {-community_id:required}
} {
Add the "dotlrn members staff" portlet to the page.
} {
set force_region [parameter::get_from_package_key \
- -package_key [my_package_key] \
- -parameter "dotlrn_members_staff_portlet_force_region"
+ -package_key [my_package_key] \
+ -parameter "dotlrn_members_staff_portlet_force_region"
]
return [portal::add_element_parameters \
- -portal_id $portal_id \
- -pretty_name [get_pretty_name] \
- -portlet_name [get_my_name] \
- -force_region $force_region \
- -key "community_id" \
- -value $community_id
+ -portal_id $portal_id \
+ -pretty_name [get_pretty_name] \
+ -portlet_name [get_my_name] \
+ -force_region $force_region \
+ -key "community_id" \
+ -value $community_id
]
}
ad_proc -public remove_self_from_page {
{-portal_id:required}
} {
- Removes the PE from the given page.
+ Removes the PE from the given page.
} {
portal::remove_element \
-portal_id $portal_id \
-portlet_name [get_my_name]
}
ad_proc -public show {
- cf
+ cf
} {
- Call the template to display.
+ Call the template to display.
- @param cf A config array
+ @param cf A config array
} {
portal::show_proc_helper \
-package_key [my_package_key] \
-config_list $cf \
-template_src "dotlrn-members-staff-portlet"
}
-
}
# Local variables:
Index: openacs-4/packages/faq/faq.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/faq.info,v
diff -u -r1.31 -r1.31.2.1
--- openacs-4/packages/faq/faq.info 12 Jul 2018 08:51:04 -0000 1.31
+++ openacs-4/packages/faq/faq.info 14 Feb 2019 16:15:01 -0000 1.31.2.1
@@ -6,21 +6,21 @@
FAQsff
-
-
+
+ Nima MazloumiJennie Kim HousmanElizabeth WirthManage simple and categorized Question and Answer style FAQs with WYSIWYG and notification functionalities.
- 2017-08-06
+ 2019-01-18Ybos CorporationHandles frequently asked questions Q&A presentation. Can be one Q&A per page or all presented flat. Straightforward application with room for improvement. Support for notification as well as WYSIQYG Editor and Categories - both optional. Category trees are displayed flat. No multiple filters.2#faq.FAQs#
-
+
-
+
Index: openacs-4/packages/faq/catalog/faq.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/catalog/faq.de_DE.ISO-8859-1.xml,v
diff -u -r1.13 -r1.13.10.1
--- openacs-4/packages/faq/catalog/faq.de_DE.ISO-8859-1.xml 10 Dec 2007 09:12:33 -0000 1.13
+++ openacs-4/packages/faq/catalog/faq.de_DE.ISO-8859-1.xml 14 Feb 2019 16:15:01 -0000 1.13.10.1
@@ -8,7 +8,7 @@
AntwortAntwort im HTML-FormatZur�ck zu FAQs
- Änderungen übernehmen
+ �nderungen �bernehmenKonfigurierenNeues FAQ erstellenNeues FAQ erstellen
@@ -24,6 +24,7 @@
Ein FAQ bearbeitenKategorien aktivieren WYSIWYG aktivieren
+ AktiviertFAQs verwalten%faq_name% verwaltenFAQs
@@ -34,8 +35,10 @@
Keine FAQs vorhandenKeine Fragen vorhandenTitel:
+ TitelNeuen F&A-Eintrag hinzuf�genNein
+ Anzahl von FragenEine FrageEinfacher TextVorformatierter Text
Index: openacs-4/packages/faq/catalog/faq.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/catalog/faq.en_US.ISO-8859-1.xml,v
diff -u -r1.15 -r1.15.10.1
--- openacs-4/packages/faq/catalog/faq.en_US.ISO-8859-1.xml 10 Dec 2007 09:12:33 -0000 1.15
+++ openacs-4/packages/faq/catalog/faq.en_US.ISO-8859-1.xml 14 Feb 2019 16:15:01 -0000 1.15.10.1
@@ -33,6 +33,7 @@
Enable CategoriesEnable FAQ:Enable WYSIWYG
+ EnabledFAQ Administration%faq_name% AdminFAQs
@@ -44,8 +45,10 @@
There are no FAQs available.There are no questions available.Name:
+ NameNewNo
+ Q&AOne QuestionPlainPreformatted
Index: openacs-4/packages/faq/catalog/faq.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/catalog/faq.es_ES.ISO-8859-1.xml,v
diff -u -r1.12 -r1.12.10.1
--- openacs-4/packages/faq/catalog/faq.es_ES.ISO-8859-1.xml 10 Dec 2007 09:12:33 -0000 1.12
+++ openacs-4/packages/faq/catalog/faq.es_ES.ISO-8859-1.xml 14 Feb 2019 16:15:01 -0000 1.12.10.1
@@ -33,6 +33,7 @@
Activar Categor�asActivar FAQ:Activar WYSIWYG
+ Activada�Administraci�n de Preguntas m�s Frecuentes?Administrar %faq_name%Preguntas m�s Frecuentes
@@ -44,8 +45,10 @@
No hay Preguntas m�s Frecuentes disponibles.No hay preguntas disponiblesNombre:
+ NombreNuevoNo
+ N�mero de P&RUna preguntaPlanoPreformateado
Index: openacs-4/packages/faq/catalog/faq.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/catalog/faq.it_IT.ISO-8859-1.xml,v
diff -u -r1.12 -r1.12.2.1
--- openacs-4/packages/faq/catalog/faq.it_IT.ISO-8859-1.xml 22 Jun 2018 08:59:58 -0000 1.12
+++ openacs-4/packages/faq/catalog/faq.it_IT.ISO-8859-1.xml 14 Feb 2019 16:15:01 -0000 1.12.2.1
@@ -33,6 +33,7 @@
Abilita CategorieAbilita FAQ:Abilita WYSIWYG
+ AttivataAmministrazione FAQAmministrazione %faq_name%FAQs
@@ -44,8 +45,10 @@
Nessuna FAQ disponibileNessuna domanda disponibileNome:
+ NomeNuovaNo
+ D&RUna domandaSemplicePreformattato
Index: openacs-4/packages/faq/sql/oracle/faq-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/sql/oracle/faq-create.sql,v
diff -u -r1.5 -r1.5.16.1
--- openacs-4/packages/faq/sql/oracle/faq-create.sql 1 Apr 2004 22:52:45 -0000 1.5
+++ openacs-4/packages/faq/sql/oracle/faq-create.sql 14 Feb 2019 16:15:01 -0000 1.5.16.1
@@ -21,6 +21,7 @@
create table faqs (
faq_id constraint faqs_faq_id_fk
references acs_objects (object_id)
+ on delete cascade
constraint faqs_pk
primary key,
faq_name varchar (250)
@@ -49,9 +50,10 @@
create table faq_q_and_as (
entry_id constraint faq_q_and_as_entry_id_fk
references acs_objects (object_id)
+ on delete cascade
constraint faq_q_sand_a_pk
primary key,
- faq_id integer references faqs not null,
+ faq_id integer not null references faqs on delete cascade,
question varchar (4000) not null,
answer varchar (4000) not null,
-- determines the order of questions in a FAQ
@@ -122,4 +124,4 @@
end;
/
-@@ faq-package-create.sql
\ No newline at end of file
+@@ faq-package-create.sql
Index: openacs-4/packages/faq/sql/postgresql/faq-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/sql/postgresql/faq-create.sql,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/faq/sql/postgresql/faq-create.sql 12 Jul 2018 08:51:04 -0000 1.9
+++ openacs-4/packages/faq/sql/postgresql/faq-create.sql 14 Feb 2019 16:15:01 -0000 1.9.2.1
@@ -30,6 +30,7 @@
create table faqs (
faq_id integer constraint faqs_faq_id_fk
references acs_objects(object_id)
+ on delete cascade
constraint faqs_pk
primary key,
faq_name varchar (250)
@@ -66,9 +67,10 @@
create table faq_q_and_as (
entry_id integer constraint faq_q_and_as_entry_id_fk
references acs_objects (object_id)
+ on delete cascade
constraint faq_q_sand_a_pk
primary key,
- faq_id integer references faqs not null,
+ faq_id integer not null references faqs on delete cascade,
question varchar (4000) not null,
answer varchar (4000) not null,
-- determines the order of questions in a FAQ
Index: openacs-4/packages/faq/sql/postgresql/faq-sc-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/sql/postgresql/faq-sc-create.sql,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/faq/sql/postgresql/faq-sc-create.sql 15 Aug 2018 16:55:08 -0000 1.4
+++ openacs-4/packages/faq/sql/postgresql/faq-sc-create.sql 14 Feb 2019 16:15:01 -0000 1.4.2.1
@@ -31,5 +31,24 @@
$$ language plpgsql;
create trigger faq_sc__itrg after insert on faq_q_and_as for each row execute procedure faq_sc__itrg ();
-create trigger faq_sc__dtrg after delete on faq_q_and_as for each row execute procedure faq_sc__dtrg ();
+-- apisano 2019-01-30: intended purpose of this trigger is to schedule
+-- deletion of faq content from the search package engine indexes by
+-- calling search_observer__enqueue(entry_id, 'DELETE') on the just
+-- deleted entry. However, as this entry depends on the corresponding
+-- q_and_a acs_object, either we keep this object hanging around until
+-- the unindexing happens, or we just delete this as well (e.g. this
+-- happens in faq__delete_q_and_a stored procedure):
+-- -- delete from faq_q_and_as where entry_id = p_entry_id;
+-- -- raise NOTICE 'Deleting FAQ_Q_and_A...';
+-- -- PERFORM acs_object__delete(p_entry_id);
+-- Deleting the object brings the entry in the search queue to be
+-- deleted as well via on delete cascade, de-facto preventing this
+-- tuple from being used at all in the scheduled search indexer.
+-- Furthermore, unindexing will take place anyway via on delete
+-- cascate defined on txt.object_id for tsearch2-driver and apparently
+-- also on site_wide_index.object_id for the intermedia-driver on
+-- Oracle, making all this trigger daydream quite pointless. To make
+-- things worse, this trigger complicates removal of a faq instance,
+-- as long as faqs with entries are there.
+-- create trigger faq_sc__dtrg after delete on faq_q_and_as for each row execute procedure faq_sc__dtrg ();
create trigger faq_sc__utrg after update on faq_q_and_as for each row execute procedure faq_sc__utrg ();
Index: openacs-4/packages/faq/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/tcl/apm-callback-procs.tcl,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/faq/tcl/apm-callback-procs.tcl 12 Jul 2018 12:39:45 -0000 1.4
+++ openacs-4/packages/faq/tcl/apm-callback-procs.tcl 14 Feb 2019 16:15:01 -0000 1.4.2.1
@@ -55,7 +55,6 @@
}
}
-
ad_proc -public faq::apm_callback::delete_one_faq_impl {} {
Unregister the NotificationType implementation for one_faq_qa_notif_type.
} {
Index: openacs-4/packages/faq/www/admin/faq-delete-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-delete-postgresql.xql,v
diff -u -r1.1 -r1.1.26.1
--- openacs-4/packages/faq/www/admin/faq-delete-postgresql.xql 17 Jul 2002 20:20:17 -0000 1.1
+++ openacs-4/packages/faq/www/admin/faq-delete-postgresql.xql 14 Feb 2019 16:15:01 -0000 1.1.26.1
@@ -1,13 +1,15 @@
-
- postgresql7.1
+
+ postgresql
+ 7.1
+
-
-
- select faq__delete_faq (:faq_id);
-
-
+
+
+ select acs_object__delete(faq_id)
+ from faqs where faq_id = :faq_id
+
+
-
Index: openacs-4/packages/faq/www/admin/faq-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-delete.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/faq/www/admin/faq-delete.tcl 19 Jan 2018 14:44:17 -0000 1.5
+++ openacs-4/packages/faq/www/admin/faq-delete.tcl 14 Feb 2019 16:15:01 -0000 1.5.2.1
@@ -16,16 +16,7 @@
permission::require_permission -object_id $package_id -privilege faq_delete_faq
-db_transaction {
- db_exec_plsql delete_faq {
- begin
- faq.delete_faq (
- faq_id => :faq_id
- );
- end;
- }
- db_dml delete_named_object "delete from acs_named_objects where object_id in (select entry_id from faq_q_and_as where faq_id = :faq_id)"
-}
+db_exec_plsql delete_faq {}
ad_returnredirect "index"
ad_script_abort
Index: openacs-4/packages/faq/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/index.tcl,v
diff -u -r1.13 -r1.13.2.1
--- openacs-4/packages/faq/www/admin/index.tcl 19 Jan 2018 14:44:17 -0000 1.13
+++ openacs-4/packages/faq/www/admin/index.tcl 14 Feb 2019 16:15:01 -0000 1.13.2.1
@@ -9,7 +9,7 @@
@author Elizabeth Wirth (wirth@ybos.net)
@author Nima Mazloumi (nima.mazloumi@gmx.de)
@creation-date 2000-10-24
-
+
} {
} -properties {
context:onevalue
@@ -31,40 +31,45 @@
-elements {
edit {
display_template {
-
-
+
+
+
}
sub_class narrow
}
faq_name {
- label "Name"
- display_template {
-
- @faqs.faq_name;noquote@
- }
+ label "#faq.name#"
+ display_template {
+
+ @faqs.faq_name;noquote@
+
+ }
}
num_q_and_as {
- label "# Q&A"
+ label "#faq.number_qa#"
html { align center }
}
disabled_p {
- label "Enabled"
+ label "#faq.enabled#"
display_template {
-
+
+
-
+
+
}
html { align center }
}
delete {
display_template {
-
-
+
+
+
}
sub_class narrow
}
Index: openacs-4/packages/faq/www/admin/q_and_a-delete-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-delete-postgresql.xql,v
diff -u -r1.1 -r1.1.26.1
--- openacs-4/packages/faq/www/admin/q_and_a-delete-postgresql.xql 17 Jul 2002 20:20:17 -0000 1.1
+++ openacs-4/packages/faq/www/admin/q_and_a-delete-postgresql.xql 14 Feb 2019 16:15:01 -0000 1.1.26.1
@@ -1,12 +1,15 @@
-
- postgresql7.1
+
+ postgresql
+ 7.1
+
-
-
- select faq__delete_q_and_a (:entry_id );
-
-
+
+
+ select acs_object__delete(entry_id)
+ from faq_q_and_as where entry_id = :entry_id;
+
+
Index: openacs-4/packages/faq/www/admin/q_and_a-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-delete.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/faq/www/admin/q_and_a-delete.tcl 19 Jan 2018 14:44:17 -0000 1.6
+++ openacs-4/packages/faq/www/admin/q_and_a-delete.tcl 14 Feb 2019 16:15:01 -0000 1.6.2.1
@@ -16,16 +16,7 @@
db_1row get_faq_id "select faq_id from faq_q_and_as where entry_id=:entry_id"
-db_transaction {
- db_exec_plsql delete_q_and_a {
- begin
- faq.delete_q_and_a (
- entry_id => :entry_id
- );
- end;
- }
- db_dml delete_named_object "delete from acs_named_objects where object_id = :entry_id"
-}
+db_exec_plsql delete_entry {}
ad_returnredirect "one-faq?faq_id=$faq_id"
ad_script_abort
Index: openacs-4/packages/faq-portlet/catalog/faq-portlet.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/catalog/faq-portlet.it_IT.ISO-8859-1.xml,v
diff -u -r1.13 -r1.13.10.1
--- openacs-4/packages/faq-portlet/catalog/faq-portlet.it_IT.ISO-8859-1.xml 10 Dec 2007 09:12:33 -0000 1.13
+++ openacs-4/packages/faq-portlet/catalog/faq-portlet.it_IT.ISO-8859-1.xml 14 Feb 2019 16:15:01 -0000 1.13.10.1
@@ -2,13 +2,20 @@
Amministrazione FAQ
+ Crea una nuova FAQDisabilita
+ Disabilita %faqs.faq_name%Disabilitato
+ Mostra domanda e rispostaAbilita
+ Abilita %faqs.faq_name%
+ Vai alla FAQ %faq_name%
+ Vai alla FAQ %faqs.faq_name%
+ Vai all'amministrazione di %faqs.faq_name%GruppoNomeNuova FAQNessuna FAQ
- Ci dovrebbe essere un'unica istanza FAQ per scopi amministrativi
+ Ci dovrebbe essere un'unica istanza FAQ per scopi amministrativiDomande Ricorrenti (FAQ)
Index: openacs-4/packages/faq-portlet/tcl/faq-admin-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/tcl/faq-admin-portlet-procs.tcl,v
diff -u -r1.10 -r1.10.2.1
--- openacs-4/packages/faq-portlet/tcl/faq-admin-portlet-procs.tcl 7 Aug 2017 23:48:11 -0000 1.10
+++ openacs-4/packages/faq-portlet/tcl/faq-admin-portlet-procs.tcl 14 Feb 2019 16:15:01 -0000 1.10.2.1
@@ -34,6 +34,8 @@
ad_proc -public get_pretty_name {
} {
+ Get the pretty name.
+ } {
return "#faq-portlet.admin_pretty_name#"
}
@@ -44,6 +46,8 @@
ad_proc -public link {
} {
+ Get the link. This is currently empty.
+ } {
return ""
}
@@ -52,7 +56,7 @@
{-package_id:required}
} {
Adds a faq admin PE to the given admin portal. There should only
- ever be one of these portals on an admin page with only one faq_package_id
+ ever be one of these portals on an admin page with only one faq_package_id.
@param portal_id The page to add self to
@param package_id the id of the faq package
@@ -70,14 +74,15 @@
ad_proc -public remove_self_from_page {
portal_id
} {
- Removes a faq admin PE from the given portal
+ Removes a faq admin PE from the given portal.
} {
portal::remove_element -portal_id $portal_id -portlet_name [get_my_name]
}
ad_proc -public show {
cf
} {
+ Show the FAQ admin portlet.
} {
portal::show_proc_helper \
-package_key [my_package_key] \
Index: openacs-4/packages/faq-portlet/tcl/faq-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/tcl/faq-portlet-procs.tcl,v
diff -u -r1.34 -r1.34.2.1
--- openacs-4/packages/faq-portlet/tcl/faq-portlet-procs.tcl 7 Aug 2017 23:48:11 -0000 1.34
+++ openacs-4/packages/faq-portlet/tcl/faq-portlet-procs.tcl 14 Feb 2019 16:15:01 -0000 1.34.2.1
@@ -38,11 +38,15 @@
ad_proc -public get_pretty_name {
} {
+ Get pretty name.
+ } {
return "#faq-portlet.pretty_name#"
}
ad_proc -public link {
} {
+ Get link. This is currently empty.
+ } {
return ""
}
@@ -52,10 +56,10 @@
{-param_action:required}
} {
Adds a faq PE to the given portal or appends the given
- faq_package_id to the params of the faq pe already there
+ faq_package_id to the params of the faq pe already there.
@param portal_id The page to add self to
- @param faq_package_id the id of the faq package for this community
+ @param package_id the id of the faq package for this community
@return element_id The new element's id
} {
@@ -78,7 +82,7 @@
} {
Removes a faq PE from the given page or just the passed
in faq_package_id parameter from the portlet
- (that has other faq_package_ids)
+ (that has other faq_package_ids).
@param portal_id The page to remove self from
@param package_id
@@ -93,6 +97,7 @@
ad_proc -public show {
cf
} {
+ Show the FAQ admin portlet.
} {
portal::show_proc_helper \
-package_key [my_package_key] \
Index: openacs-4/packages/faq-portlet/tcl/test/faq-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/tcl/test/faq-portlet-procs.tcl,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/faq-portlet/tcl/test/faq-portlet-procs.tcl 27 Mar 2018 15:54:14 -0000 1.4
+++ openacs-4/packages/faq-portlet/tcl/test/faq-portlet-procs.tcl 14 Feb 2019 16:15:01 -0000 1.4.2.1
@@ -10,178 +10,178 @@
Testing the creation a Faq from the portlet.
} {
- aa_run_with_teardown -test_code {
-
- tclwebtest::cookies clear
- # Login user
- array set user_info [twt::user::create -admin]
- twt::user::login $user_info(email) $user_info(password)
+ aa_run_with_teardown -test_code {
- # Create new Faq
- set faq_name [ad_generate_random_string]
- set response [faq_portlet::twt::new $faq_name]
- aa_display_result -response $response -explanation {Webtest for creating a New Faq from the portlet}
-
- twt::user::logout
- }
-}
+ tclwebtest::cookies clear
+ # Login user
+ array set user_info [twt::user::create -admin]
+ twt::user::login $user_info(email) $user_info(password)
+ # Create new Faq
+ set faq_name [ad_generate_random_string]
+ set response [faq_portlet::twt::new $faq_name]
+ aa_display_result -response $response -explanation {Webtest for creating a New Faq from the portlet}
+
+ twt::user::logout
+ }
+}
+
aa_register_case -cats {web smoke} -libraries tclwebtest tclwebtest_delete_faq_portlet {
Testing the process of creating and deleting a Faq from the portlet.
} {
- aa_run_with_teardown -test_code {
-
- tclwebtest::cookies clear
- # Login user
- array set user_info [twt::user::create -admin]
- twt::user::login $user_info(email) $user_info(password)
+ aa_run_with_teardown -test_code {
- # Create a new Faq
- set faq_name [ad_generate_random_string]
- faq_portlet::twt::new $faq_name
-
- # Delete the faq
- set response [faq_portlet::twt::delete $faq_name]
- aa_display_result -response $response -explanation {Webtest for deleting a Faq}
-
- twt::user::logout
- }
+ tclwebtest::cookies clear
+ # Login user
+ array set user_info [twt::user::create -admin]
+ twt::user::login $user_info(email) $user_info(password)
+
+ # Create a new Faq
+ set faq_name [ad_generate_random_string]
+ faq_portlet::twt::new $faq_name
+
+ # Delete the faq
+ set response [faq_portlet::twt::delete $faq_name]
+ aa_display_result -response $response -explanation {Webtest for deleting a Faq}
+
+ twt::user::logout
+ }
}
aa_register_case -cats {web smoke} -libraries tclwebtest tclwebtest_disable_faq_portlet {
- Testing the process of creating and disableing a Faq.
+ Testing the process of creating and disabling a Faq.
} {
- aa_run_with_teardown -test_code {
-
- tclwebtest::cookies clear
- # Login user
- array set user_info [twt::user::create -admin]
- twt::user::login $user_info(email) $user_info(password)
+ aa_run_with_teardown -test_code {
- # Create new faq
- set faq_name [ad_generate_random_string]
- faq_portlet::twt::new $faq_name
-
- # Disable the Faq
- set option "disable"
- set response [faq_portlet::twt::disable_enable $faq_name $option]
- aa_display_result -response $response -explanation {Webtest for disabling a Faq}
-
- twt::user::logout
- }
+ tclwebtest::cookies clear
+ # Login user
+ array set user_info [twt::user::create -admin]
+ twt::user::login $user_info(email) $user_info(password)
+
+ # Create new faq
+ set faq_name [ad_generate_random_string]
+ faq_portlet::twt::new $faq_name
+
+ # Disable the Faq
+ set option "disable"
+ set response [faq_portlet::twt::disable_enable $faq_name $option]
+ aa_display_result -response $response -explanation {Webtest for disabling a Faq}
+
+ twt::user::logout
+ }
}
aa_register_case -cats {web smoke} -libraries tclwebtest tclwebtest_enable_faq_portlet {
- Testing the process of creating, desableing and enableing Faq.
+ Testing the process of creating, disabling and enabling Faq.
} {
- aa_run_with_teardown -test_code {
+ aa_run_with_teardown -test_code {
- tclwebtest::cookies clear
- # Login user
- array set user_info [twt::user::create -admin]
- twt::user::login $user_info(email) $user_info(password)
+ tclwebtest::cookies clear
+ # Login user
+ array set user_info [twt::user::create -admin]
+ twt::user::login $user_info(email) $user_info(password)
- # Create the Faq
- set faq_name [ad_generate_random_string]
- faq_portlet::twt::new $faq_name
-
- # Disable the faq
- set option "disable"
- faq_portlet::twt::disable_enable $faq_name $option
-
- # Enable the faq
- set option "enable"
- set response [faq_portlet::twt::disable_enable $faq_name $option]
- aa_display_result -response $response -explanation {Webtest for enabling a Faq}
-
- twt::user::logout
- }
+ # Create the Faq
+ set faq_name [ad_generate_random_string]
+ faq_portlet::twt::new $faq_name
+
+ # Disable the faq
+ set option "disable"
+ faq_portlet::twt::disable_enable $faq_name $option
+
+ # Enable the faq
+ set option "enable"
+ set response [faq_portlet::twt::disable_enable $faq_name $option]
+ aa_display_result -response $response -explanation {Webtest for enabling a Faq}
+
+ twt::user::logout
+ }
}
aa_register_case -cats {web smoke} -libraries tclwebtest tclwebtest_edit_faq_portlet {
- Testing the process of creating and editing a Faq.
+ Testing the process of creating and editing a Faq.
} {
- aa_run_with_teardown -test_code {
-
- tclwebtest::cookies clear
- # Login user
- array set user_info [twt::user::create -admin]
- twt::user::login $user_info(email) $user_info(password)
+ aa_run_with_teardown -test_code {
- # Creat a new faq
- set faq_name [ad_generate_random_string]
- faq_portlet::twt::new $faq_name
-
- # Edit the faq
- set new_faq_name [ad_generate_random_string]
- set response [faq_portlet::twt::edit_faq $faq_name $new_faq_name]
- aa_display_result -response $response -explanation {Webtest for editing a Faq}
-
- twt::user::logout
- }
+ tclwebtest::cookies clear
+ # Login user
+ array set user_info [twt::user::create -admin]
+ twt::user::login $user_info(email) $user_info(password)
+
+ # Creat a new faq
+ set faq_name [ad_generate_random_string]
+ faq_portlet::twt::new $faq_name
+
+ # Edit the faq
+ set new_faq_name [ad_generate_random_string]
+ set response [faq_portlet::twt::edit_faq $faq_name $new_faq_name]
+ aa_display_result -response $response -explanation {Webtest for editing a Faq}
+
+ twt::user::logout
+ }
}
aa_register_case -cats {web smoke} -libraries tclwebtest tclwebtest_new_Q_A_faq_portlet {
- Testing the process of create a Faq and create a new Q&A.
+ Testing the process of create a Faq and create a new Q&A.
} {
- aa_run_with_teardown -test_code {
+ aa_run_with_teardown -test_code {
- tclwebtest::cookies clear
- # Login user
- array set user_info [twt::user::create -admin]
- twt::user::login $user_info(email) $user_info(password)
-
- # Creat a new faq
- set faq_name [ad_generate_random_string]
- faq_portlet::twt::new $faq_name
-
- # Create a new Question_Answer
- set question [ad_generate_random_string]
- set answer [ad_generate_random_string]
- set response [faq_portlet::twt::new_Q_A $faq_name $question $answer]
- aa_display_result -response $response -explanation {Webtest for creating a New Question in a dotLRN Faq}
-
- twt::user::logout
- }
+ tclwebtest::cookies clear
+ # Login user
+ array set user_info [twt::user::create -admin]
+ twt::user::login $user_info(email) $user_info(password)
+
+ # Creat a new faq
+ set faq_name [ad_generate_random_string]
+ faq_portlet::twt::new $faq_name
+
+ # Create a new Question_Answer
+ set question [ad_generate_random_string]
+ set answer [ad_generate_random_string]
+ set response [faq_portlet::twt::new_Q_A $faq_name $question $answer]
+ aa_display_result -response $response -explanation {Webtest for creating a New Question in a dotLRN Faq}
+
+ twt::user::logout
+ }
}
aa_register_case -cats {web smoke} -libraries tclwebtest tclwebtest_delete_Q_A_faq_portlet {
- Testing the process of create a faq, create a Q&A and then delete the Q&A.
+ Testing the process of create a faq, create a Q&A and then delete the Q&A.
} {
- aa_run_with_teardown -test_code {
-
- tclwebtest::cookies clear
- # Login user
- array set user_info [twt::user::create -admin]
- twt::user::login $user_info(email) $user_info(password)
-
- # Creat a new faq
- set faq_name [ad_generate_random_string]
- faq_portlet::twt::new $faq_name
-
- # Create a new Question_Answer
- set question [ad_generate_random_string]
- set answer [ad_generate_random_string]
- faq_portlet::twt::new_Q_A $faq_name $question $answer
-
- # Delete the Question_Answer
- set response [faq_portlet::twt::delete_Q_A $faq_name $question]
- aa_display_result -response $response -explanation {Webtest for deleting a Question in a Faq}
-
- twt::user::logout
- }
+ aa_run_with_teardown -test_code {
+
+ tclwebtest::cookies clear
+ # Login user
+ array set user_info [twt::user::create -admin]
+ twt::user::login $user_info(email) $user_info(password)
+
+ # Creat a new faq
+ set faq_name [ad_generate_random_string]
+ faq_portlet::twt::new $faq_name
+
+ # Create a new Question_Answer
+ set question [ad_generate_random_string]
+ set answer [ad_generate_random_string]
+ faq_portlet::twt::new_Q_A $faq_name $question $answer
+
+ # Delete the Question_Answer
+ set response [faq_portlet::twt::delete_Q_A $faq_name $question]
+ aa_display_result -response $response -explanation {Webtest for deleting a Question in a Faq}
+
+ twt::user::logout
+ }
}
# Local variables:
Index: openacs-4/packages/faq-portlet/tcl/test/tclwebtest-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/tcl/test/tclwebtest-procs.tcl,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/faq-portlet/tcl/test/tclwebtest-procs.tcl 29 Mar 2018 00:13:46 -0000 1.4
+++ openacs-4/packages/faq-portlet/tcl/test/tclwebtest-procs.tcl 14 Feb 2019 16:15:01 -0000 1.4.2.1
@@ -3,7 +3,6 @@
@author Mounir Lallali
@author Gerardo Morales
@creation-date 14 June 2005
-
}
@@ -15,216 +14,216 @@
namespace eval faq_portlet::twt {}
-ad_proc faq_portlet::twt::new { faq_name } {
+ad_proc -private faq_portlet::twt::new { faq_name } {
- set response 0
-
- set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
- ::twt::do_request $dotlrn_page_url
- tclwebtest::link follow "Classes"
+ set response 0
- # Create a new FAQ
- tclwebtest::link follow ~u {one-community-admin$}
+ set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
+ ::twt::do_request $dotlrn_page_url
+ tclwebtest::link follow "Classes"
- tclwebtest::link follow "New FAQ"
- tclwebtest::form find ~n "faq"
- tclwebtest::field find ~n "faq_name"
- tclwebtest::field fill "$faq_name"
- tclwebtest::form submit
- aa_log "Faq form submited"
+ # Create a new FAQ
+ tclwebtest::link follow ~u {one-community-admin$}
- set response_url [tclwebtest::response url]
-
- if {[string match "*/dotlrn/classes*/faq/admin*" $response_url] } {
- if {[catch {tclwebtest::link find "$faq_name"} errmsg] } {
- aa_error "faq_portlet::twt::new failed $errmsg : Did't create a New Faq"
- } else {
- aa_log "New faq Created !!"
- set response 1
- }
- } else {
- aa_error "faq_portlet::twt::new failed, bad response url : $response_url"
- }
-
- return $response
+ tclwebtest::link follow "New FAQ"
+ tclwebtest::form find ~n "faq"
+ tclwebtest::field find ~n "faq_name"
+ tclwebtest::field fill "$faq_name"
+ tclwebtest::form submit
+ aa_log "Faq form submitted"
+
+ set response_url [tclwebtest::response url]
+
+ if {[string match "*/dotlrn/classes*/faq/admin*" $response_url] } {
+ if {[catch {tclwebtest::link find "$faq_name"} errmsg] } {
+ aa_error "faq_portlet::twt::new failed $errmsg : Didn't create a New Faq"
+ } else {
+ aa_log "New faq Created !!"
+ set response 1
+ }
+ } else {
+ aa_error "faq_portlet::twt::new failed, bad response url : $response_url"
+ }
+
+ return $response
}
-ad_proc faq_portlet::twt::delete { faq_name} {
+ad_proc -private faq_portlet::twt::delete { faq_name} {
- set response 0
+ set response 0
- set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
- ::twt::do_request $dotlrn_page_url
-
- tclwebtest::link follow "Classes"
+ set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
+ ::twt::do_request $dotlrn_page_url
- # Create a new FAQ
- tclwebtest::link follow ~u {one-community-admin$}
-
- tclwebtest::link follow $faq_name
- tclwebtest::link follow {View All FAQs}
+ tclwebtest::link follow "Classes"
- db_1row faq_id "select faq_id from faqs where faq_name=:faq_name"
- ::twt::do_request [export_vars -base "faq-delete" {faq_id}]
+ # Create a new FAQ
+ tclwebtest::link follow ~u {one-community-admin$}
- set response_url [tclwebtest::response url]
-
- if { [string match "*/faq/admin/index" $response_url] } {
- if {![catch {tclwebtest::link find "$faq_name" } errmsg]} {
- aa_error "faq_portlet::twt::delete failed $errmsg : Did't delete $faq_name Faq"
- } else {
- aa_log "Faq Deleted"
- set response 1
- }
- } else {
- aa_error "faq_portlet::twt::delete failed, bad response url : $response_url"
- }
-
- return $response
+ tclwebtest::link follow $faq_name
+ tclwebtest::link follow {View All FAQs}
+
+ db_1row faq_id "select faq_id from faqs where faq_name=:faq_name"
+ ::twt::do_request [export_vars -base "faq-delete" {faq_id}]
+
+ set response_url [tclwebtest::response url]
+
+ if { [string match "*/faq/admin/index" $response_url] } {
+ if {![catch {tclwebtest::link find "$faq_name" } errmsg]} {
+ aa_error "faq_portlet::twt::delete failed $errmsg : Didn't delete $faq_name Faq"
+ } else {
+ aa_log "Faq Deleted"
+ set response 1
+ }
+ } else {
+ aa_error "faq_portlet::twt::delete failed, bad response url : $response_url"
+ }
+
+ return $response
}
-ad_proc faq_portlet::twt::disable_enable { faq_name option } {
+ad_proc -private faq_portlet::twt::disable_enable { faq_name option } {
- set response 0
+ set response 0
- set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
- ::twt::do_request $dotlrn_page_url
+ set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
+ ::twt::do_request $dotlrn_page_url
- tclwebtest::link follow "Classes"
+ tclwebtest::link follow "Classes"
- # Create a new FAQ
- tclwebtest::link follow ~u {one-community-admin$}
+ # Create a new FAQ
+ tclwebtest::link follow ~u {one-community-admin$}
- tclwebtest::link follow $faq_name
- tclwebtest::link follow {View All FAQs}
+ tclwebtest::link follow $faq_name
+ tclwebtest::link follow {View All FAQs}
- db_1row faq_id "select faq_id from faqs where faq_name=:faq_name"
- set url_option [export_vars -base "faq-$option" {faq_id}]
- ::twt::do_request $url_option
-
- set response_url [tclwebtest::response url]
+ db_1row faq_id "select faq_id from faqs where faq_name=:faq_name"
+ set url_option [export_vars -base "faq-$option" {faq_id}]
+ ::twt::do_request $url_option
- if {[string match "*/dotlrn/classes*/faq/admin*" $response_url] } {
- if {! [catch {tclwebtest::link find ~u $url_option } errmsg]} {
- aa_error "faq_portlet::twt::$option failed $errmsg : Did't $option $faq_name Faq"
- } else {
- aa_log "Faq $option"
- set response 1
- }
- } else {
- aa_error "faq_portlet::twt::$option failed. Bad response url : $response_url "
- }
-
- return $response
+ set response_url [tclwebtest::response url]
+
+ if {[string match "*/dotlrn/classes*/faq/admin*" $response_url] } {
+ if {! [catch {tclwebtest::link find ~u $url_option } errmsg]} {
+ aa_error "faq_portlet::twt::$option failed $errmsg : Didn't $option $faq_name Faq"
+ } else {
+ aa_log "Faq $option"
+ set response 1
+ }
+ } else {
+ aa_error "faq_portlet::twt::$option failed. Bad response url : $response_url "
+ }
+
+ return $response
}
-ad_proc faq_portlet::twt::edit_faq { faq_name faq_new_name } {
+ad_proc -private faq_portlet::twt::edit_faq { faq_name faq_new_name } {
- set response 0
+ set response 0
- db_1row faq_id "select faq_id from faqs where faq_name=:faq_name"
-
- set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
- ::twt::do_request $dotlrn_page_url
- tclwebtest::link follow "Classes"
+ db_1row faq_id "select faq_id from faqs where faq_name=:faq_name"
- tclwebtest::link follow ~u {one-community-admin$}
- tclwebtest::link follow $faq_name
-
- tclwebtest::form find ~n "faq_add_edit"
- tclwebtest::form submit
+ set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
+ ::twt::do_request $dotlrn_page_url
+ tclwebtest::link follow "Classes"
- tclwebtest::form find ~n "faq_add_edit"
- tclwebtest::field find ~n "faq_name"
- tclwebtest::field fill "$faq_new_name"
- tclwebtest::form submit
- aa_log " Faq form submited"
+ tclwebtest::link follow ~u {one-community-admin$}
+ tclwebtest::link follow $faq_name
- set response_url [tclwebtest::response url]
-
- if {[string match "*/faq/admin/one-faq*" $response_url] } {
- if { [catch {tclwebtest::form find ~n "faq_add_edit"} errmsg] || [catch {tclwebtest::field find ~v "$faq_new_name"} errmsg] } {
- aa_error "faq_portlet::twt::edit_faq failed $errmsg : Did't Edit the Faq"
- } else {
- aa_log "Faq Edited"
- set response 1
- }
- } else {
- aa_error "faq_portlet::twt::new failed, bad response url : $response_url"
- }
-
- return $response
+ tclwebtest::form find ~n "faq_add_edit"
+ tclwebtest::form submit
+
+ tclwebtest::form find ~n "faq_add_edit"
+ tclwebtest::field find ~n "faq_name"
+ tclwebtest::field fill "$faq_new_name"
+ tclwebtest::form submit
+ aa_log " Faq form submitted"
+
+ set response_url [tclwebtest::response url]
+
+ if {[string match "*/faq/admin/one-faq*" $response_url] } {
+ if { [catch {tclwebtest::form find ~n "faq_add_edit"} errmsg] || [catch {tclwebtest::field find ~v "$faq_new_name"} errmsg] } {
+ aa_error "faq_portlet::twt::edit_faq failed $errmsg : Didn't Edit the Faq"
+ } else {
+ aa_log "Faq Edited"
+ set response 1
+ }
+ } else {
+ aa_error "faq_portlet::twt::new failed, bad response url : $response_url"
+ }
+
+ return $response
}
-ad_proc faq_portlet::twt::new_Q_A { faq_name question answer} {
+ad_proc -private faq_portlet::twt::new_Q_A { faq_name question answer} {
- set response 0
+ set response 0
- set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
- ::twt::do_request $dotlrn_page_url
- tclwebtest::link follow "Classes"
- tclwebtest::link follow ~u {one-community-admin$}
- tclwebtest::link follow $faq_name
-
- tclwebtest::link follow "Create New Q&A"
-
- tclwebtest::form find ~n "new_quest_answ"
- tclwebtest::field find ~n "question"
- tclwebtest::field fill "$question"
- tclwebtest::field find ~n "answer"
- tclwebtest::field fill "$answer"
- tclwebtest::form submit
- aa_log " Faq Question Form submited"
-
- set response_url [tclwebtest::response url]
+ set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
+ ::twt::do_request $dotlrn_page_url
+ tclwebtest::link follow "Classes"
+ tclwebtest::link follow ~u {one-community-admin$}
+ tclwebtest::link follow $faq_name
- if { [string match "*/faq/admin/one-faq*" $response_url] } {
- if { [catch {tclwebtest::assert text "$question"} errmsg] } {
- aa_error "faq_portlet::twt::new_Q_A : failed $errmsg : Did't Create a New Question"
- } else {
- aa_log "New Faq Question Created"
- set response 1
- }
- } else {
- aa_error "dotlrn_faq::twt::new_Q_A failed. Bad response url : $response_url"
- }
-
- return $response
+ tclwebtest::link follow "Create New Q&A"
+
+ tclwebtest::form find ~n "new_quest_answ"
+ tclwebtest::field find ~n "question"
+ tclwebtest::field fill "$question"
+ tclwebtest::field find ~n "answer"
+ tclwebtest::field fill "$answer"
+ tclwebtest::form submit
+ aa_log " Faq Question Form submitted"
+
+ set response_url [tclwebtest::response url]
+
+ if { [string match "*/faq/admin/one-faq*" $response_url] } {
+ if { [catch {tclwebtest::assert text "$question"} errmsg] } {
+ aa_error "faq_portlet::twt::new_Q_A : failed $errmsg : Didn't Create a New Question"
+ } else {
+ aa_log "New Faq Question Created"
+ set response 1
+ }
+ } else {
+ aa_error "dotlrn_faq::twt::new_Q_A failed. Bad response url : $response_url"
+ }
+
+ return $response
}
-ad_proc faq_portlet::twt::delete_Q_A { faq_name question} {
+ad_proc -private faq_portlet::twt::delete_Q_A { faq_name question} {
- set response 0
+ set response 0
- set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
- ::twt::do_request $dotlrn_page_url
- tclwebtest::link follow "Classes"
- tclwebtest::link follow ~u {one-community-admin$}
- tclwebtest::link follow $faq_name
+ set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
+ ::twt::do_request $dotlrn_page_url
+ tclwebtest::link follow "Classes"
+ tclwebtest::link follow ~u {one-community-admin$}
+ tclwebtest::link follow $faq_name
- tclwebtest::link follow {View All FAQs}
- tclwebtest::link follow $faq_name
+ tclwebtest::link follow {View All FAQs}
+ tclwebtest::link follow $faq_name
- db_1row faq_id "select faq_id from faqs where faq_name=:faq_name"
- tclwebtest::link follow delete
-
- set response_url [tclwebtest::response url]
+ db_1row faq_id "select faq_id from faqs where faq_name=:faq_name"
+ tclwebtest::link follow delete
- if { [string match "*/faq/admin/one-faq*" $response_url] } {
- if { [catch {tclwebtest::assert text -fail "$question"} errmsg] } {
- aa_error "faq_portlet::twt::delete_Q_A : failed $errmsg : Did't Delete a Question"
- } else {
- aa_log "Faq Question Deleted"
- set response 1
- }
+ set response_url [tclwebtest::response url]
+
+ if { [string match "*/faq/admin/one-faq*" $response_url] } {
+ if { [catch {tclwebtest::assert text -fail "$question"} errmsg] } {
+ aa_error "faq_portlet::twt::delete_Q_A : failed $errmsg : Didn't Delete a Question"
} else {
- aa_error "dotlrn_faq::twt::delete_Q_A failed. Bad response url : $response_url"
+ aa_log "Faq Question Deleted"
+ set response 1
}
-
- return $response
+ } else {
+ aa_error "dotlrn_faq::twt::delete_Q_A failed. Bad response url : $response_url"
}
+ return $response
+}
+
# Local variables:
# mode: tcl
# tcl-indent-level: 4
Index: openacs-4/packages/faq-portlet/www/faq-admin-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/faq-admin-portlet.tcl,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/faq-portlet/www/faq-admin-portlet.tcl 7 Aug 2017 23:48:11 -0000 1.9
+++ openacs-4/packages/faq-portlet/www/faq-admin-portlet.tcl 14 Feb 2019 16:15:01 -0000 1.9.2.1
@@ -16,9 +16,9 @@
ad_page_contract {
The display logic for the FAQ admin portlet
-
+
@author Ben Adida (ben@openforce)
- @cvs_id $Id$
+ @cvs-id $Id$
} -properties {
}
Fisheye: Tag 1.10.22.1 refers to a dead (removed) revision in file `openacs-4/packages/faq-portlet/www/faq-portlet-oracle.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.2.22.1 refers to a dead (removed) revision in file `openacs-4/packages/faq-portlet/www/faq-portlet-postgresql.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/file-storage/www/download-zip.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/download-zip.tcl,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/file-storage/www/download-zip.tcl 29 Dec 2017 11:30:40 -0000 1.9
+++ openacs-4/packages/file-storage/www/download-zip.tcl 14 Feb 2019 16:15:01 -0000 1.9.2.1
@@ -1,5 +1,5 @@
ad_page_contract {
- delete items
+ Download items as a ZIP file
} {
object_id:naturalnum,notnull,multiple
{confirm_p:optional,boolean 0}
Index: openacs-4/packages/file-storage/www/folder-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.tcl,v
diff -u -r1.61 -r1.61.2.1
--- openacs-4/packages/file-storage/www/folder-chunk.tcl 20 Dec 2018 18:18:05 -0000 1.61
+++ openacs-4/packages/file-storage/www/folder-chunk.tcl 14 Feb 2019 16:15:01 -0000 1.61.2.1
@@ -99,9 +99,9 @@
if {$delete_p && $root_folder_id ne $folder_id} {
lappend actions \
- "#file-storage.Delete_this_folder#" \
- [export_vars -base "${fs_url}folder-delete" {folder_id}] \
- "#file-storage.Delete_this_folder#"
+ "#file-storage.Delete_this_folder#" \
+ [export_vars -base "${fs_url}folder-delete" {folder_id}] \
+ "#file-storage.Delete_this_folder#"
}
if {$admin_p} {
if { $root_folder_id ne $folder_id } {
@@ -112,8 +112,8 @@
}
lappend actions \
"#file-storage.lt_Modify_permissions_on_1#" \
- [export_vars -base "${fs_url}permissions" -override {{object_id $folder_id}} {{return_url "[ad_conn url]"}}] \
- "#file-storage.lt_Modify_permissions_on_1#"
+ [export_vars -base "${fs_url}permissions" -override {{object_id $folder_id}} {{return_url "[ad_conn url]"}}] \
+ "#file-storage.lt_Modify_permissions_on_1#"
if { $expose_rss_p } {
lappend actions "Configure RSS" [export_vars -base "${fs_url}admin/rss-subscrs" {folder_id}] "Configure RSS"
}
@@ -122,9 +122,9 @@
if { $categories_p } {
if { [permission::permission_p -party_id $viewing_user_id -object_id $package_id -privilege "admin"] } {
lappend actions \
- [_ categories.cadmin] \
- [export_vars -base "/categories/cadmin/object-map" -url {{object_id $package_id}}] \
- [_ categories.cadmin]
+ [_ categories.cadmin] \
+ [export_vars -base "/categories/cadmin/object-map" -url {{object_id $package_id}}] \
+ [_ categories.cadmin]
}
set category_links [fs::category_links -object_id $folder_id -folder_id $folder_id -selected_category_id $category_id -fs_url $fs_url]
}
@@ -403,7 +403,7 @@
set file_url $download_url
} else {
set download_url [export_vars -base ${fs_url}download/[ad_urlencode_path $name] {{file_id $target_object_id}}]
- set file_url ${fs_url}view/${file_url}
+ set file_url ${fs_url}view/${file_url}
}
}
default {
@@ -422,7 +422,7 @@
set file_url [export_vars -base ${fs_url}download/[ad_urlencode_path $title] {{file_id $object_id}}]
} else {
set download_url /file/$object_id/[ad_urlencode_path $name]
- set file_url ${fs_url}view/[ad_urlencode_folder_path $folder_path][ad_urlencode_path $name]
+ set file_url ${fs_url}view/[ad_urlencode_folder_path $folder_path][ad_urlencode_path $name]
}
}
}
@@ -433,11 +433,11 @@
set cat_folder_id $folder_id
}
set categories [fs::category_links \
- -object_id $object_id \
- -folder_id $cat_folder_id \
- -selected_category_id $category_id \
- -fs_url $fs_url \
- -joinwith " "]
+ -object_id $object_id \
+ -folder_id $cat_folder_id \
+ -selected_category_id $category_id \
+ -fs_url $fs_url \
+ -joinwith " "]
}
}
Index: openacs-4/packages/file-storage/www/folder-zip-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-zip-add.tcl,v
diff -u -r1.11 -r1.11.2.1
--- openacs-4/packages/file-storage/www/folder-zip-add.tcl 6 Dec 2018 15:48:10 -0000 1.11
+++ openacs-4/packages/file-storage/www/folder-zip-add.tcl 14 Feb 2019 16:15:01 -0000 1.11.2.1
@@ -1,36 +1,49 @@
ad_page_contract {
- page to add a new file to the system
+ Page to upload and decompress a zip file into the file storage.
+
@author Kevin Scaldeferri (kevin@arsdigita.com)
@creation-date 6 Nov 2000
@cvs-id $Id$
+
} {
+
file_id:naturalnum,optional,notnull
- folder_id:naturalnum,optional,notnull
+ {folder_id:naturalnum,notnull ""}
upload_file:trim,optional,notnull
- return_url:localurl,optional
+ {return_url:localurl ""}
upload_file.tmpfile:tmpfile,optional
{title ""}
{lock_title_p:boolean 0}
} -properties {
+
folder_id:onevalue
context:onevalue
title:onevalue
lock_title_p:onevalue
+
} -validate {
+
file_id_or_folder_id {
- if {[info exists file_id] && $file_id ne ""
- && (![info exists folder_id] || $folder_id eq "")} {
+ #
+ # Get parent folder_id from file_id, if such exists and folder_id is
+ # empty, and complain if the resultant folder is not valid.
+ #
+ if {[info exists file_id] && $file_id ne "" && $folder_id eq ""} {
set folder_id [db_string get_folder_id {
select parent_id as folder_id from cr_items where item_id=:file_id
} -default ""]
}
- if {![info exists folder_id] || ![fs_folder_p $folder_id]} {
+ if {$folder_id eq "" || ![fs_folder_p $folder_id]} {
ad_complain "The specified parent folder is not valid."
}
}
+
max_size -requires {upload_file} {
+ #
+ # Check if the file is larger than fs::max_upload_size.
+ #
set n_bytes [file size ${upload_file.tmpfile}]
set max_bytes [fs::max_upload_size]
if { $n_bytes > $max_bytes } {
@@ -39,203 +52,238 @@
}
}
-set user_id [ad_conn user_id]
-set package_id [ad_conn package_id]
-# check for write permission on the folder or item
+set user_id [ad_conn user_id]
+set package_id [ad_conn package_id]
+set creation_ip [ad_conn peeraddr]
+# Check for write permission on the folder.
permission::require_permission \
-object_id $folder_id \
-party_id $user_id \
-privilege "write"
if {![ad_form_new_p -key file_id]} {
+ #
+ # Check for write permission on the file if we are editing existing data,
+ # adding a file revision in this case, and set the context bar accordingly.
+ #
permission::require_permission \
- -object_id $file_id \
- -party_id $user_id \
- -privilege "write"
+ -object_id $file_id \
+ -party_id $user_id \
+ -privilege "write"
set context [fs_context_bar_list -final "[_ file-storage.Add_Revision]" $folder_id]
-
} else {
set context [fs_context_bar_list -final "[_ file-storage.Add_File]" $folder_id]
}
+# Add file_id and upload_file to the form.
ad_form -name file_add -html { enctype multipart/form-data } -export { folder_id lock_title_p } -form {
file_id:key
{upload_file:file {label \#file-storage.Upload_a_file\#} {html "size 30"}}
}
-if {[info exists return_url] && $return_url ne ""} {
+# Add return_url to the form if is not empty.
+if {$return_url ne ""} {
ad_form -extend -name file_add -form {
- {return_url:text(hidden) {value $return_url}}
+ {return_url:text(hidden) {value $return_url}}
}
}
+# 'Lock' title if lock_title_p.
if {$lock_title_p} {
ad_form -extend -name file_add -form {
- {title:text(hidden) {value $title}}
+ {title:text(hidden) {value $title}}
}
} else {
ad_form -extend -name file_add -form {
- {title:text {label \#file-storage.Title\#} {html {size 30}} }
+ {title:text {label \#file-storage.Title\#} {html {size 30}} }
}
}
-if {[ad_form_new_p -key file_id]} {
+# Add an explanation about the purpose of the form.
+if {[ad_form_new_p -key file_id]} {
ad_form -extend -name file_add -form {
{unpack_message:text(inform) {label "[_ file-storage.Important]"} {value "[_ file-storage.Use_this_form_to_upload_a_ZIP]"}}
}
}
+# Rest of the form.
ad_form -extend -name file_add -form {} -new_data {
-
- # create a new folder to hold the zip contents
- # TODO make sure its name is unique?
-
+ #
+ # new_data block, which unzips the file and uploads its contents to the file
+ # storage, creating the necessary folders.
+ #
+ # Start defining the title if it does not exist already.
+ #
if {$title eq ""} {
- set title [file rootname [list [template::util::file::get_property filename $upload_file]]]
+ set title [file rootname [list [template::util::file::get_property filename $upload_file]]]
}
- set folder_id [content::item::get_id_by_name -name $title -parent_id $folder_id]
+
+ #
+ # Create a new folder to hold the zip contents, if it does not exist already.
+ #
+ set parent_folder_id $folder_id
+ set folder_id [content::item::get_id_by_name -name $title -parent_id $parent_folder_id]
if {$folder_id eq ""} {
- set folder_id [content::folder::new -name $title -parent_id $folder_id -label $title]
+ set folder_id [content::folder::new -name $title -parent_id $parent_folder_id -label $title]
}
-
+
+ #
+ # Uncompress the file.
+ #
set unzip_binary [string trim [parameter::get -parameter UnzipBinary]]
-
if { $unzip_binary ne "" } {
-
+ #
+ # Create temp directory to unzip.
+ #
set unzip_path [ad_tmpnam]
file mkdir $unzip_path
+
+ #
+ # Unzip.
+ #
+ # More flexible parameter design could be:
+ # zip {unzip -jd {out_path} {in_file}} tar {tar xf {in_file} {out_path}} tgz {tar xzf {in_file} {out_path}}
+ #
# save paths! get rid of -j switch --DAVEB 20050628
+ #
catch { exec $unzip_binary -d $unzip_path ${upload_file.tmpfile} } errmsg
-
- # More flexible parameter design could be:
- # zip {unzip -jd {out_path} {in_file}} tar {tar xf {in_file} {out_path}} tgz {tar xzf {in_file} {out_path}}
-
+
+ #
+ # Get two lists of the files to upload, with and without their full path.
+ #
set upload_files [list]
set upload_tmpfiles [list]
-
foreach file [ad_find_all_files "$unzip_path"] {
lappend upload_files [regsub "^$unzip_path\/" $file {}]
lappend upload_tmpfiles $file
}
-
} else {
- set upload_files [list [template::util::file::get_property filename $upload_file]]
+ #
+ # No unzip available, just upload the whole zip file.
+ #
+ set upload_files [list [template::util::file::get_property filename $upload_file]]
set upload_tmpfiles [list [template::util::file::get_property tmp_filename $upload_file]]
}
-
- if { [lindex $upload_files 0] eq ""} {
+ set number_upload_files [llength $upload_files]
+
+ #
+ # Something is quite broken if there are no files to upload.
+ #
+ if {$number_upload_files == 0} {
ad_return_complaint 1 "
You have to upload a file"
ad_script_abort
}
-
- set i 0
- set number_upload_files [llength $upload_files]
- set unzip_path_list_len [llength [file split $unzip_path]]
+ #
+ # Upload the files.
+ #
+ set i 0
foreach upload_file $upload_files tmpfile $upload_tmpfiles {
- set this_file_id $file_id
- set this_title $title
- # upload a new file
- # if the user choose upload from the folder view
- # and the file with the same name already exists
- # we create a new revision
-
- # check if this is in a folder inside the zip and create
- # the folders if they don't exist
- set p_f_id $folder_id
- set file_paths [file split [file dirname $upload_file]]
+ #
+ # Upload a file.
+ #
+ set this_file_id $file_id
+ set p_f_id $folder_id
+ set file_paths [file split [file dirname $upload_file]]
+ if {"." ne $file_paths && [llength $file_paths] > 0} {
+ #
+ # Make sure every folder exists, or create it otherwise.
+ #
+ set path ""
+ foreach p $file_paths {
+ append path /${p}
+ if {![info exists paths($path)]} {
+ set f_id [content::item::get_id -item_path $path -root_folder_id $p_f_id]
+ if {$f_id eq ""} {
+ set p_f_id [content::folder::new -parent_id $p_f_id -name $p -label $p]
+ set paths($path) $p_f_id
+ }
+ } else {
+ set p_f_id $paths($path)
+ }
+ }
+ set upload_file [file tail $upload_file]
+ }
+ set this_title $upload_file
+ set this_folder_id $p_f_id
- # remove unzip_path portion by selecting remaining part of list
- set file_paths [lrange $file_paths $unzip_path_list_len end]
+ #
+ # If the user choose upload from the folder view, and a file with the
+ # same name already exists, we create a new revision.
+ #
+ # Check for permission in the existing file in order to do so.
+ #
+ set existing_item_id [fs::get_item_id -name $upload_file -folder_id $this_folder_id]
+ if {$existing_item_id ne ""} {
+ set this_file_id $existing_item_id
+ permission::require_permission \
+ -object_id $this_file_id \
+ -party_id $user_id \
+ -privilege write
+ }
- if {"." ne $file_paths && [llength $file_paths] > 0} {
- # make sure every folder exists
- set path ""
- foreach p $file_paths {
- append path /${p}
- if {![info exists paths($path)]} {
- set f_id [content::item::get_id -item_path $path -root_folder_id $p_f_id]
- if {$f_id eq ""} {
- set p_f_id [content::folder::new -parent_id $p_f_id -name $p -label $p]
- set paths($path) $p_f_id
- }
- } else {
- set p_f_id $paths($path)
- }
-
- }
- set upload_file [file tail $upload_file]
- }
-
- set this_folder_id $p_f_id
- set this_title $upload_file
-
- set existing_item_id [fs::get_item_id -name $upload_file -folder_id $this_folder_id]
-
- if {$existing_item_id ne ""} {
- # file with the same name already exists
- # in this folder, create a new revision
- set this_file_id $existing_item_id
- permission::require_permission \
- -object_id $this_file_id \
- -party_id $user_id \
- -privilege write
- }
-
- set rev_id [fs::add_file \
- -name $upload_file \
- -item_id $this_file_id \
- -parent_id $this_folder_id \
- -tmp_filename $tmpfile \
- -creation_user $user_id \
- -creation_ip [ad_conn peeraddr] \
- -title $this_title \
- -package_id $package_id]
-
- file delete -- $tmpfile
- incr i
+ #
+ # Add the file.
+ #
+ set rev_id [fs::add_file \
+ -name $upload_file \
+ -item_id $this_file_id \
+ -parent_id $this_folder_id \
+ -tmp_filename $tmpfile \
+ -creation_user $user_id \
+ -creation_ip $creation_ip \
+ -title $this_title \
+ -package_id $package_id]
- if {$rev_id ne ""} {
- set this_file_id [db_string get_item_id {
- select item_id
- from cr_revisions
- where revision_id = :rev_id
- } -default 0]
- }
-
- if {$i < $number_upload_files} {
- set file_id [db_nextval "acs_object_id_seq"]
- }
-
+ #
+ # Increment file_id to the next value of acs_object_id_seq.
+ #
+ incr i
+ if {$i < $number_upload_files} {
+ set file_id [db_nextval "acs_object_id_seq"]
+ }
+
+ #
+ # Cleanup of the tmp file.
+ #
+ file delete -- $tmpfile
}
+
+ #
+ # Cleanup of zip file and tmp directory.
+ #
+ file delete -- $upload_file.tmpfile
if {$unzip_path ne ""} {
- file delete -force -- $unzip_path
+ file delete -force -- $unzip_path
}
- file delete -- $upload_file.tmpfile
+
} -edit_data {
+ #
+ # edit_data block, which just adds a revision of a file.
+ #
fs::add_version \
- -name [template::util::file::get_property filename $upload_file] \
- -tmp_filename [template::util::file::get_property tmp_filename $upload_file] \
- -item_id $file_id \
- -creation_user $user_id \
- -creation_ip [ad_conn peeraddr] \
- -title $title \
- -package_id $package_id
-
+ -name [template::util::file::get_property filename $upload_file] \
+ -tmp_filename [template::util::file::get_property tmp_filename $upload_file] \
+ -item_id $file_id \
+ -creation_user $user_id \
+ -creation_ip $creation_ip \
+ -title $title \
+ -package_id $package_id
+
} -after_submit {
-
- if {[info exists return_url] && $return_url ne ""} {
- ad_returnredirect $return_url
+ #
+ # Code to be executed after new_data or edit_data, just redirecting to
+ # return_url.
+ #
+ if {$return_url ne ""} {
+ ad_returnredirect $return_url
} else {
- ad_returnredirect [export_vars -base ./ {folder_id}]
+ ad_returnredirect [export_vars -base ./ {folder_id}]
}
ad_script_abort
-
}
-set unpack_available_p [expr {[string trim [parameter::get -parameter UnzipBinary]] ne ""}]
-
ad_return_template
# Local variables:
Index: openacs-4/packages/forums/tcl/forums-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-callback-procs.tcl,v
diff -u -r1.12 -r1.12.2.1
--- openacs-4/packages/forums/tcl/forums-callback-procs.tcl 10 Jul 2018 10:20:32 -0000 1.12
+++ openacs-4/packages/forums/tcl/forums-callback-procs.tcl 14 Feb 2019 16:15:01 -0000 1.12.2.1
@@ -1,6 +1,6 @@
ad_library {
Forum callbacks.
-
+
Navigation callbacks.
@author Jeff Davis
@@ -112,15 +112,15 @@
set pm_name [pm::project::name -project_item_id $project_id]
foreach forum_package_id [application_link::get_linked -from_package_id $package_id -to_package_key "forums"] {
- set forum_id [forum::new \
- -name $pm_name \
- -package_id $forum_package_id \
- -no_callback]
+ set forum_id [forum::new \
+ -name $pm_name \
+ -package_id $forum_package_id \
+ -no_callback]
- # Automatically allow new threads on this forum
+ # Automatically allow new threads on this forum
forum::new_questions_allow -forum_id $forum_id
- application_data_link::new -this_object_id $project_id -target_object_id $forum_id
+ application_data_link::new -this_object_id $project_id -target_object_id $forum_id
}
}
@@ -136,7 +136,7 @@
this is the content that will be indexed by the full text
search engine.
- We expect message_id to be a root message of a thread only,
+ We expect message_id to be a root message of a thread only,
and return the text of all the messages below.
} {
@@ -181,23 +181,23 @@
append combined_content "$subject\n\n"
}
- #
- # GN: The standard conversion from "text/enhanced" to
- # "text/plain" converts first from "text/enhanced" to
- # "text/html" and then from "text/html" to "text/plain". This
- # can take for large forums posting a long time (e.g a few
- # minutes on openacs.org). Since this function is used just
- # for the summarizer (when listing a short paragraph in the
- # context of the search result), we can live here with a much
- # simpler version, which computes the same in less than one
- # ms.
- #
- if {$message(format) eq "text/enhanced"} {
- regsub -all {
} $content "\n\n" content
- regsub -all {(]*>)} $content "" content
- } else {
- set content [ad_html_text_convert -from $format -to text/plain -- $content]
- }
+ #
+ # GN: The standard conversion from "text/enhanced" to
+ # "text/plain" converts first from "text/enhanced" to
+ # "text/html" and then from "text/html" to "text/plain". This
+ # can take for large forums posting a long time (e.g a few
+ # minutes on openacs.org). Since this function is used just
+ # for the summarizer (when listing a short paragraph in the
+ # context of the search result), we can live here with a much
+ # simpler version, which computes the same in less than one
+ # ms.
+ #
+ if {$message(format) eq "text/enhanced"} {
+ regsub -all {
} $content "\n\n" content
+ regsub -all {(]*>)} $content "" content
+ } else {
+ set content [ad_html_text_convert -from $format -to text/plain -- $content]
+ }
append combined_content $content
# In case this text is not only used for indexing but also for display, beautify it
@@ -209,11 +209,11 @@
title $message(subject) \
content $combined_content \
relevant_date $relevant_date \
- community_id [db_null] \
+ community_id "" \
keywords {} \
storage_type text \
mime text/plain \
- package_id $package_id]
+ package_id $package_id]
}
ad_proc -public -callback search::url -impl forums_message {} {
@@ -272,12 +272,12 @@
The from_user_id is the user_id of the user
that will be deleted and all the *forums*
of this user will be mapped to the to_user_id.
-
+
} {
set msg "Forums items of $user_id"
ns_log Notice $msg
set result [list $msg]
-
+
set last_poster [db_list_of_lists sel_poster {} ]
set msg "Last Poster of $last_poster"
lappend result $msg
@@ -297,12 +297,12 @@
The from_user_id is the user_id of the user
that will be deleted and all the *forums*
of this user will be mapped to the to_user_id.
-
+
} {
- set msg "Merging forums"
+ set msg "Merging forums"
ns_log Notice $msg
set result [list $msg]
-
+
db_dml upd_poster {}
db_dml upd_user_id {}
@@ -314,64 +314,64 @@
# application-track callbacks
-ad_proc -callback application-track::getApplicationName -impl forums {} {
+ad_proc -callback application-track::getApplicationName -impl forums {} {
Callback implementation.
} {
return "forums"
-}
-
-ad_proc -callback application-track::getGeneralInfo -impl forums {} {
+}
+
+ad_proc -callback application-track::getGeneralInfo -impl forums {} {
Callback implementation.
} {
db_1row my_query {
- select count(f.forum_id) as result
- FROM forums_forums f, dotlrn_communities_full com
- WHERE com.community_id=:comm_id
- and apm_package__parent_id(f.package_id) = com.package_id
+ select count(f.forum_id) as result
+ FROM forums_forums f, dotlrn_communities_full com
+ WHERE com.community_id=:comm_id
+ and apm_package__parent_id(f.package_id) = com.package_id
}
-
+
return $result
}
-
-ad_proc -callback application-track::getSpecificInfo -impl forums {} {
+
+ad_proc -callback application-track::getSpecificInfo -impl forums {} {
Callback implementation.
} {
-
+
upvar $query_name my_query
upvar $elements_name my_elements
set my_query {
- SELECT f.name as name,f.thread_count as threads,
- f.last_post,
- to_char(o.creation_date, 'YYYY-MM-DD HH24:MI:SS') as creation_date
- FROM forums_forums f,dotlrn_communities_full com,acs_objects o
- WHERE com.community_id=:class_instance_id
- and f.forum_id = o.object_id
- and apm_package__parent_id(f.package_id) = com.package_id
+ SELECT f.name as name,f.thread_count as threads,
+ f.last_post,
+ to_char(o.creation_date, 'YYYY-MM-DD HH24:MI:SS') as creation_date
+ FROM forums_forums f,dotlrn_communities_full com,acs_objects o
+ WHERE com.community_id=:class_instance_id
+ and f.forum_id = o.object_id
+ and apm_package__parent_id(f.package_id) = com.package_id
}
-
+
set my_elements {
name {
label "Name"
- display_col name
- html {align center}
-
+ display_col name
+ html {align center}
+
}
threads {
label "Threads"
- display_col threads
- html {align center}
+ display_col threads
+ html {align center}
}
creation_date {
label "creation_date"
- display_col creation_date
- html {align center}
+ display_col creation_date
+ html {align center}
}
last_post {
label "last_post"
- display_col last_post
- html {align center}
- }
+ display_col last_post
+ html {align center}
+ }
}
return "OK"
Index: openacs-4/packages/forums-portlet/www/forums-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/forums-portlet.adp,v
diff -u -r1.24 -r1.24.2.1
--- openacs-4/packages/forums-portlet/www/forums-portlet.adp 19 Jun 2018 15:23:42 -0000 1.24
+++ openacs-4/packages/forums-portlet/www/forums-portlet.adp 14 Feb 2019 16:15:01 -0000 1.24.2.1
@@ -25,7 +25,7 @@
-
+ @forums.name@(@forums.count_unread@)
Index: openacs-4/packages/general-comments/tcl/general-comments-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/tcl/general-comments-procs.tcl,v
diff -u -r1.25 -r1.25.2.1
--- openacs-4/packages/general-comments/tcl/general-comments-procs.tcl 16 May 2018 11:56:59 -0000 1.25
+++ openacs-4/packages/general-comments/tcl/general-comments-procs.tcl 14 Feb 2019 16:15:01 -0000 1.25.2.1
@@ -43,7 +43,8 @@
db_exec_plsql insert_comment {}
db_dml add_entry {}
- db_1row get_revision {}
+ set revision_id [content::item::get_latest_revision \
+ -item_id $comment_id]
db_dml set_content {} -blobs [list $content]
# Grant the user sufficient permissions to
@@ -161,12 +162,12 @@
and (:user_id is null or o.creation_user = :user_id)
order by o.creation_date $sort_dir
}] {
- set author [acs_object_name $author]
-
+ set author [person::name -person_id $author]
+
if {$content ne ""} {
set content [template::util::richtext::get_property html_value [list $content $mime_type]]
}
-
+
set pretty_date [lc_time_fmt $creation_date %x]
set pretty_date2 [lc_time_fmt $creation_date "%q %X"]
Fisheye: Tag 1.1.12.1 refers to a dead (removed) revision in file `openacs-4/packages/general-comments/www/delete-oracle.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1.12.1 refers to a dead (removed) revision in file `openacs-4/packages/general-comments/www/delete-postgresql.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/general-comments/www/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/delete.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/general-comments/www/delete.tcl 20 Jan 2018 22:56:50 -0000 1.5
+++ openacs-4/packages/general-comments/www/delete.tcl 14 Feb 2019 16:15:01 -0000 1.5.2.1
@@ -28,7 +28,7 @@
permission::require_permission -party_id [ad_conn user_id] -object_id $comment_id -privilege "write"
set revision_id [content::item::get_best_revision -item_id $comment_id]
# get data from database
-set sql "
+set sql {
select r.title,
r.content,
r.mime_type,
@@ -39,19 +39,18 @@
general_comments g
where g.comment_id = :comment_id and
g.comment_id = o.object_id and
- r.revision_id = $revision_id"
+ r.revision_id = :revision_id
+}
if { ![db_0or1row get_comment $sql] } {
- ad_return_complaint 1 "[_ general-comments.lt_The_comment_id_does_n]"
+ ad_return_complaint 1 [_ general-comments.lt_The_comment_id_does_n]
ad_script_abort
}
set author [person::name -person_id $creation_user]
-set page_title "[_ general-comments.Delete_a_comment]"
-set context [list "[_ general-comments.Delete_a_comment]"]
+set page_title [_ general-comments.Delete_a_comment]
+set context [list $page_title]
-ad_return_template
-
# Local variables:
# mode: tcl
# tcl-indent-level: 4
Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `openacs-4/packages/general-comments/www/index-oracle.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.5.2.1 refers to a dead (removed) revision in file `openacs-4/packages/general-comments/www/index-postgresql.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/general-comments/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/index.tcl,v
diff -u -r1.10 -r1.10.2.1
--- openacs-4/packages/general-comments/www/index.tcl 7 Aug 2017 23:48:12 -0000 1.10
+++ openacs-4/packages/general-comments/www/index.tcl 14 Feb 2019 16:15:01 -0000 1.10.2.1
@@ -2,12 +2,12 @@
ad_page_contract {
General comments main page
-
+
@author Phong Nguyen (phong@arsdigita.com)
@author Pascal Scheffers (pascal@scheffers.net)
@creation-date 2000-10-12
@cvs-id $Id$
-} -query {
+} -query {
{orderby:token,optional}
{approval "any"}
{modified "any"}
@@ -51,48 +51,47 @@
-no_data "#general-comments.lt_No_comments_available#" \
-html {style "margin: 0 auto"} \
-elements {
- counter {
- label "#general-comments.Num#"
- }
+ counter {
+ label "#general-comments.Num#"
+ display_template {@comments.rownum;literal@}
+ }
comment_id {
- label "#general-comments.ID#"
- display_template {@comments.comment_id@}
- orderby {comment_id}
- }
- title {
- label "#general-comments.Title_1#"
- orderby {title}
- }
- approved_p {
- label "#general-comments.Approved#"
- html {align center}
- orderby {approved_p}
- }
- live_version_p {
- label "#general-comments.Has_live_version#"
- html {align center}
- orderby {approved_p}
- }
- pretty_date {
- label "#general-comments.Last_Modified#"
- orderby {creation_date}
- }
- } -filters {approval {} modified {}}
+ label "#general-comments.ID#"
+ display_template {@comments.comment_id@}
+ orderby {comment_id}
+ }
+ title {
+ label "#general-comments.Title_1#"
+ orderby {title}
+ }
+ approved_p {
+ label "#general-comments.Approved#"
+ html {align center}
+ orderby {approved_p}
+ }
+ live_version_p {
+ label "#general-comments.Has_live_version#"
+ html {align center}
+ orderby {approved_p}
+ }
+ pretty_date {
+ label "#general-comments.Last_Modified#"
+ orderby {creation_date}
+ }
+} -filters {approval {} modified {}}
-set count 0
-db_multirow -extend {user_id return_url counter pretty_date} comments comments_select {} {
- set counter [incr count]
+set yes [_ acs-kernel.common_Yes]
+set no [_ acs-kernel.common_No]
+
+db_multirow -extend {user_id return_url pretty_date} comments comments_select {} {
+ set live_version_p [expr {$live_version_p ? $yes : $no}]
+ set approved_p [expr {$approved_p ? $yes : $no}]
set pretty_date [lc_time_fmt $creation_date "%x %X"]
- set approved_p [util_PrettyTclBoolean $approved_p]
- set live_version_p [util_PrettyTclBoolean $live_version_p]
}
-set page_title "[_ general-comments.General_Comments]"
+set page_title [_ general-comments.General_Comments]
set context {}
-ad_return_template
-
-
# Local variables:
# mode: tcl
# tcl-indent-level: 4
Index: openacs-4/packages/general-comments/www/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/index.xql,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/general-comments/www/index.xql 22 Nov 2017 14:13:32 -0000 1.2
+++ openacs-4/packages/general-comments/www/index.xql 14 Feb 2019 16:15:01 -0000 1.2.2.1
@@ -3,17 +3,15 @@
-
- i.live_revision is not null
-
+ (i.live_revision is not null and
+ i.live_revision = r.revision_id)
-
- i.live_revision is null
-
+ (i.live_revision is null or
+ i.live_revision <> r.revision_id)
@@ -40,5 +38,27 @@
+
+
+
+ select g.comment_id,
+ r.title,
+ i.live_revision is not null as live_version_p,
+ i.live_revision is not null and
+ i.live_revision = r.revision_id as approved_p,
+ o.creation_date
+ from general_comments g,
+ cr_items i,
+ cr_revisions r,
+ acs_objects o
+ where g.comment_id = i.item_id and
+ r.revision_id = o.object_id and
+ r.revision_id = i.latest_revision and
+ o.creation_user = :user_id
+ [ad_dimensional_sql $dimensional]
+ [template::list::orderby_clause -orderby -name comments_list]
+
+
+
Fisheye: Tag 1.3.6.1 refers to a dead (removed) revision in file `openacs-4/packages/general-comments/www/view-comment-oracle.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.3.6.1 refers to a dead (removed) revision in file `openacs-4/packages/general-comments/www/view-comment-postgresql.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/general-comments/www/view-comment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/view-comment.tcl,v
diff -u -r1.12 -r1.12.2.1
--- openacs-4/packages/general-comments/www/view-comment.tcl 20 Jan 2018 22:56:50 -0000 1.12
+++ openacs-4/packages/general-comments/www/view-comment.tcl 14 Feb 2019 16:15:01 -0000 1.12.2.1
@@ -40,29 +40,41 @@
set write_perm_p [permission::permission_p -object_id $comment_id -privilege write]
set admin_p [permission::permission_p -object_id $package_id -privilege admin]
+set live_revision [content::item::get_live_revision -item_id $comment_id]
+
# if the user has write permissions then allow
# viewing of selected revision
-if { $write_perm_p == 1 } {
- if { $revision_id eq "" } {
- # get the latest revision
- set revision_id [db_string get_latest_revision {
- select content_item.get_latest_revision(:comment_id) from dual
- }]
- }
- # get revision data from the database
- if { ![db_0or1row get_revision_comment {}] } {
- ad_return_complaint 1 "[_ general-comments.lt_The_comment_id_does_n]"
- ad_script_abort
- }
+if { !$write_perm_p } {
+ # get live revision
+ set revision_id $live_revision
+} elseif { $revision_id eq "" } {
+ # get the latest revision
+ set revision_id [content::item::get_latest_revision -item_id $comment_id]
+}
-} else {
- # get live revision data from the database
- if { ![db_0or1row get_comment {}] } {
- ad_return_complaint 1 "[_ general-comments.lt_The_comment_id_does_n]"
- ad_script_abort
- }
+# get revision data from the database
+if { ![db_0or1row get_revision_comment {
+ select g.object_id,
+ g.comment_id,
+ r.revision_id,
+ r.title,
+ r.content,
+ r.mime_type as comment_mime_type,
+ o.creation_user,
+ o.creation_date
+ from general_comments g,
+ cr_revisions r,
+ acs_objects o
+ where g.comment_id = o.object_id and
+ g.comment_id = r.item_id and
+ r.revision_id = :revision_id
+}] } {
+ ad_return_complaint 1 "[_ general-comments.lt_The_comment_id_does_n]"
+ ad_script_abort
}
+set author [person::name -person_id $creation_user]
+
db_multirow -extend {file_edit_url delete_attachment_url view_image_url} attachments get_attachments {
select r.title,
r.mime_type,
@@ -90,25 +102,30 @@
set delete_attachment_url [export_vars -base "delete-attachment" {{attach_id $item_id} {parent_id $comment_id} return_url}]
}
-db_multirow -extend {view_comment_url} revisions get_revisions {*SQL*} {
+db_multirow -unclobber -extend {view_comment_url} revisions get_revisions {
+ select r.revision_id,
+ o.creation_date as revision_date
+ from cr_revisions r,
+ acs_objects o
+ where r.item_id = :comment_id and
+ o.object_id = r.revision_id
+ order by o.creation_date desc
+} {
set revision_date [lc_time_fmt $revision_date %c]
set view_comment_url [export_vars -base "view-comment" {comment_id revision_id return_url}]
}
set allow_file_p [parameter::get -parameter AllowFileAttachmentsP -default {t}]
set allow_link_p [parameter::get -parameter AllowLinkAttachmentsP -default {t}]
-set allow_attach_p "t"
-if { $allow_file_p == "f" && $allow_link_p == "f" } {
- set allow_attach_p "f"
-}
-set comment_on_id [db_string get_object_id "select object_id from general_comments where comment_id = :comment_id"]
+set allow_attach_p [expr { !($allow_file_p == "f" && $allow_link_p == "f")}]
+set comment_on_id [db_string get_object_id {
+ select object_id from general_comments
+ where comment_id = :comment_id
+}]
set page_title "[_ general-comments.View_comment_on]: [acs_object_name $comment_on_id]"
set context "\"[_ general-comments.View_comment]\""
set return_url_view "view-comment?[export_ns_set_vars url]"
-set is_creator_p "f"
-if { $user_id == $creation_user } {
- set is_creator_p "t"
-}
+set is_creator_p [expr {$user_id == $creation_user}]
if { $comment_mime_type ne "text/html" } {
set html_content "
$feedback_text" $choice_id]
- } elseif {$pos>-1 && $correct_answer_p == "f" && $show_feedback ne "correct"} {
- lappend choice_list [list "$title 
$feedback_text" $choice_id]
- } else {
- if {[llength $defaults] && $correct_answer_p == "t" && $show_feedback ne "incorrect" && $show_feedback ne "correct"} {
- lappend choice_list [list "$title 
+
+ 
+ 
+ 
+
+