Index: openacs-4/packages/accounts-ledger/sql/common/qal_chart_templates.dat =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/accounts-ledger/sql/common/qal_chart_templates.dat,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/accounts-ledger/sql/common/qal_chart_templates.dat 24 Jun 2006 08:25:10 -0000 1.2 +++ openacs-4/packages/accounts-ledger/sql/common/qal_chart_templates.dat 17 Apr 2018 14:47:02 -0000 1.3 @@ -9,7 +9,7 @@ DK,'
sample only


','Default chart of accounts (DK)' US,'
sample only


','Default chart of accounts (US)' NL,'

AJ Hettema\, Mon\, 20 Aug 2001



','Dutch Chart of Accounts (NL)' -NL_standard,'
Nederlandstalig Rekeningschema conform het Decimaal Stelsel.
PDF Tammes\, Fri\, 29 Mar 2002 ( remarks or questions to finance@bermuda-holding.com )
Just delete any accounts not needed after importing the scheme\, beats entering all manually (or add -- at the beginning)
Account groups (first number in accountnumber defines to which group it belongs)
0 : Vaste Activa\, Eigen Vermogen\, Voorzieningen en lang vreemd vermogen => Fixed Assets\, Capital\, Accruals and long term loans
1 : Financiele Rekeningen => Financial Accounts
2 : Tussenrekeningen => Intermediate Accounts
3 : Voorraad grond- en hulpstoffen => Stocks (minerals\, parts not yet assembled etc)
4 : Kostenrekeningen => Costs Accounts
5 : Verdeling Directe kosten => Accounts to recharge several Direct Costs to separate departments
6 : Fabricagekosten => Assembly Costs
7 : Voorraad gereed produkt en product in bewerking => Stocks (Trade Articles\, half-finished assemblies\, projects under construction)
8 : Rekeningen voor vaststelling van het verkoopresultaat => Accounts for dediding Sales Result
9 : Rekeningen voor vaststelling van de resultatenrekening => Accounts for dediding Profit & Loss (P/L)
The general idea is to allocate all costs to the 4/5/6 accounts\, all stock transactions to 7 and sales related to 8. At the end of the
year you clean out the seperate accounts via x999 and kick the result to the relevant 9xxx series. That way you have a specialized
P/L in the seperate accounts and an overview/shirt version of the P/L in the 9 series\, where also various results not related to normal
operations is recorded (tax\, donations\, that kind of thing. Finally the 9999 account is used to kick the result to retained earnings and
related accounts in the balance sheet\, and we are ready for the next year




','Dutch Chart of Accounts following the Decimal Standards as set by the famous Philips Accounting Department (NL)' +NL_standard,'
Nederlandstalig Rekeningschema conform het Decimaal Stelsel.
PDF Tammes\, Fri\, 29 Mar 2002 ( remarks or questions to finance@bermuda-holding.com )
Just delete any accounts not needed after importing the scheme\, beats entering all manually (or add -- at the beginning)
Account groups (first number in accountnumber defines to which group it belongs)
0 : Vaste Activa\, Eigen Vermogen\, Voorzieningen en lang vreemd vermogen => Fixed Assets\, Capital\, Accruals and long term loans
1 : Financiele Rekeningen => Financial Accounts
2 : Tussenrekeningen => Intermediate Accounts
3 : Voorraad grond- en hulpstoffen => Stocks (minerals\, parts not yet assembled etc)
4 : Kostenrekeningen => Costs Accounts
5 : Verdeling Directe kosten => Accounts to recharge several Direct Costs to separate departments
6 : Fabricagekosten => Assembly Costs
7 : Voorraad gereed produkt en product in bewerking => Stocks (Trade Articles\, half-finished assemblies\, projects under construction)
8 : Rekeningen voor vaststelling van het verkoopresultaat => Accounts for dediding Sales Result
9 : Rekeningen voor vaststelling van de resultatenrekening => Accounts for dediding Profit & Loss (P/L)
The general idea is to allocate all costs to the 4/5/6 accounts\, all stock transactions to 7 and sales related to 8. At the end of the
year you clean out the separate accounts via x999 and kick the result to the relevant 9xxx series. That way you have a specialized
P/L in the separate accounts and an overview/shirt version of the P/L in the 9 series\, where also various results not related to normal
operations is recorded (tax\, donations\, that kind of thing. Finally the 9999 account is used to kick the result to retained earnings and
related accounts in the balance sheet\, and we are ready for the next year




','Dutch Chart of Accounts following the Decimal Standards as set by the famous Philips Accounting Department (NL)' EG,'
','Chart of Accounts (EG)' FR,'
From: Oscar Buijten
Mon\, 6 Aug 2001



insert taxes


update defaults

','Chart of Accounts for France (FR)' DE,'
Einfacher Deutscher Kontenrahmen => Very Easy German Default Chart
Vorbereitet von / Prepared by Paul Tammes May 9th\, 2002. Kommentar / Comments : finance@bermuda-holding.com
Englische Texte für eigene Zwecke und um Refernz in SQL-Ledger Dokumentation zu erleichtern.
English terms used mostly for my own reference and to make lookup in SQL-Ledger documentation easier.
GIFI-codes werden benutzt/misbraucht um die art der Rechnung zu deuten\, Fehler nicht ausgeschlossen denn
Ich bin kein Deutscher Steuerberater ;-(
GIFI field codes re-used for following specs:
Link: Achtung\, sehr wenig benutzt da mir die Kentnisse zum Deutschen System fehlen. Sehr gut aufpassen und wenn
Ihr Fehler oder Praktische TIPS hat: gerne!
Link: used to a minimum\, update and customization may well be needed!
A0 = Anlagevermögen / Fixed Assets
A1-1 = Warenbestand / Inventory
A1-2 = Forderungen / Liabilities
A1-3 = Liquide Mittel / Assets
A1-4 = Aktive Rechnungsabgrenzung / Closing Account results
E = Erträge / Income
K0 = Wareneinsatz / COGS
K1 = Personalkosten / Salaries etc
K2 = Raumkosten / Rental etc
K3 = Sonstige Kosten / Various costs
NA = Neutrale Aufwendungen / Neutral Costs
NE - Neutrale Erlöse / Neutral Income
P0 = Eigenkapital / Equity
P1 = Rückstellungen / Reserves
P2 = Fremdkapital Langfristig / Liabilities Long Term
P3 = Fremdkapital Kurzfristig / Liabilities Short Term
P4 = Passive Rechnungsabgrenzung / Closing Account results

A0
A1-1
A1-2
A1-3
A1-4
P0
P1
P2
P3
P4
K0
K1
K2
K3
E
NA
NE

Default settings


','Chart of Accounts (DE)' Index: openacs-4/packages/address-book/doc/requirements.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/doc/requirements.html,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/address-book/doc/requirements.html 5 Apr 2018 14:44:08 -0000 1.2 +++ openacs-4/packages/address-book/doc/requirements.html 17 Apr 2018 14:47:02 -0000 1.3 @@ -38,7 +38,7 @@ places service. It also offers it's data model for storing contact information to other applications, such as intranet, who may wish to store such information in a portable format. The data -model offers storage well-suited to PDA syncronization, particularly +model offers storage well-suited to PDA synchronization, particularly with the PalmOS platform.

Index: openacs-4/packages/ams/ams.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ams/ams.info,v diff -u -N -r1.27 -r1.28 --- openacs-4/packages/ams/ams.info 5 Apr 2018 14:44:08 -0000 1.27 +++ openacs-4/packages/ams/ams.info 17 Apr 2018 14:47:02 -0000 1.28 @@ -28,11 +28,11 @@ - + - - + + Index: openacs-4/packages/ams/tcl/instant-message-widgets-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ams/tcl/instant-message-widgets-procs.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ams/tcl/instant-message-widgets-procs.tcl 28 Mar 2018 21:04:45 -0000 1.3 +++ openacs-4/packages/ams/tcl/instant-message-widgets-procs.tcl 17 Apr 2018 14:47:02 -0000 1.4 @@ -59,7 +59,7 @@ {-language "en"} {-char_set "utf"} } { - This procedure would query the skypeweb database for the status of the provided username. For this procedure to retun the user status, the user should allow his status to be shown on the web in the privacy menu in thier Skype application. This procedure should not be called by the user, instead use the wrapper procedures status_txt, status_xml, status_num, and status_img, unless if you want the raw unprocessed result as it returns from the server. For more information consult the SkypeWeb Technical Whitepaper. + This procedure would query the skypeweb database for the status of the provided username. For this procedure to retun the user status, the user should allow his status to be shown on the web in the privacy menu in their Skype application. This procedure should not be called by the user, instead use the wrapper procedures status_txt, status_xml, status_num, and status_img, unless if you want the raw unprocessed result as it returns from the server. For more information consult the SkypeWeb Technical Whitepaper. @param username The username to check the status for. @param response_type Index: openacs-4/packages/cms/tcl/publish-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/publish-procs.tcl,v diff -u -N -r1.16 -r1.17 --- openacs-4/packages/cms/tcl/publish-procs.tcl 17 May 2005 22:02:38 -0000 1.16 +++ openacs-4/packages/cms/tcl/publish-procs.tcl 17 Apr 2018 14:47:02 -0000 1.17 @@ -96,14 +96,14 @@ ad_proc -public publish::get_template_root {} { @public get_template_root - + Get the template root. All templates are assumed to exist in the filesystem with their URLs relative to this root. The page root is controlled by the TemplateRoot parameter in CMS. The default is /web/yourserver/templates - + @return The template root - + @see content::get_template_root @see publish::get_page_root @@ -124,31 +124,31 @@ # ad_proc -public publish::mkdirs { path } { # @public mkdirs - -# Create all the directories neccessary to save the specified file - -# @param path + +# Create all the directories necessary to save the specified file + +# @param path # The path to the file that is about to be saved - + # } { # set index [string last "/" $path] # if { $index != -1 } { # file mkdir [string range $path 0 [expr $index - 1]] -# } +# } # } ad_proc -private publish::delete_multiple_files { url {root_path ""}} { @private delete_multiple_files - + Delete the specified URL from the filesystem, for all revisions - + @param url Relative URL of the file to write - + @see publish::get_publish_roots @see publish::write_multiple_files @see publish::write_multiple_blobs Index: openacs-4/packages/contacts/contacts.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/contacts.info,v diff -u -N -r1.93 -r1.94 --- openacs-4/packages/contacts/contacts.info 30 Jun 2007 06:59:59 -0000 1.93 +++ openacs-4/packages/contacts/contacts.info 17 Apr 2018 14:47:02 -0000 1.94 @@ -63,7 +63,7 @@ - + Index: openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml,v diff -u -N -r1.102 -r1.103 --- openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml 11 Apr 2018 21:50:05 -0000 1.102 +++ openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml 17 Apr 2018 14:47:02 -0000 1.103 @@ -348,7 +348,7 @@ %contacts@ were deleted country code is not -> created in the last -> - Please choose the file you want to upload. The file should be a CSV file, seperated by ";". Also it is mandatory that the first line is the header line. If your CSV does not contain a header line, create one, otherwise matching will be really hard. + Please choose the file you want to upload. The file should be a CSV file, separated by ";". Also it is mandatory that the first line is the header line. If your CSV does not contain a header line, create one, otherwise matching will be really hard. Currently, the group is able to handle the following types of relationships: Dear ladies and gentlemen Debugging Code - Only SW Admins See This Index: openacs-4/packages/contacts/lib/email-search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/email-search.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/contacts/lib/email-search.tcl 5 Apr 2018 14:44:08 -0000 1.6 +++ openacs-4/packages/contacts/lib/email-search.tcl 17 Apr 2018 14:47:02 -0000 1.7 @@ -326,23 +326,23 @@ util_user_message -html -message $error_message } } - + # We get the attribute_id of the salutation attribute set attribute_id [attribute::id -object_type "person" -attribute_name "salutation"] - - # List to store know wich emails received the message + + # List to store know which emails received the message set recipients_addr [list] - + set from [ad_conn user_id] set from_addr [contact::email -party_id $from] - + # Remove all spaces in cc and bcc regsub -all " " $cc "" cc regsub -all " " $bcc "" bcc - + set cc_list [split $cc ";"] set bcc_list [split $bcc ";"] - + # Send the mail to all parties. set member_size [llength $party_ids] set counter 1 Index: openacs-4/packages/contacts/lib/email.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/email.tcl,v diff -u -N -r1.39 -r1.40 --- openacs-4/packages/contacts/lib/email.tcl 5 Apr 2018 14:44:08 -0000 1.39 +++ openacs-4/packages/contacts/lib/email.tcl 17 Apr 2018 14:47:02 -0000 1.40 @@ -246,7 +246,7 @@ # We get the attribute_id of the salutation attribute set attribute_id [attribute::id -object_type "person" -attribute_name "salutation"] - # List to store know wich emails received the message + # List to store know which emails received the message set recipients_addr [list] set from [ad_conn user_id] Index: openacs-4/packages/contacts/sql/postgresql/contacts-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/sql/postgresql/contacts-create.sql,v diff -u -N -r1.20 -r1.21 --- openacs-4/packages/contacts/sql/postgresql/contacts-create.sql 29 Mar 2018 15:03:01 -0000 1.20 +++ openacs-4/packages/contacts/sql/postgresql/contacts-create.sql 17 Apr 2018 14:47:02 -0000 1.21 @@ -184,7 +184,7 @@ -- although we store deleted by and deleted date -- information there is no need to make this an object -- because this info is related to other objects --- this doesn't warrent permissions or the overhead +-- this doesn't warrant permissions or the overhead -- in the acs_objects table create table contact_deleted_history ( Index: openacs-4/packages/contacts/tcl/contact-search-widget-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contact-search-widget-procs.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/contacts/tcl/contact-search-widget-procs.tcl 28 Oct 2006 16:51:50 -0000 1.5 +++ openacs-4/packages/contacts/tcl/contact-search-widget-procs.tcl 17 Apr 2018 14:47:02 -0000 1.6 @@ -225,7 +225,7 @@ {-party_id:required} } { this returns the contact's name to be returned in the contact search widget. - this exists in a seperate proc so that it can be customized on a per site + this exists in a separate proc so that it can be customized on a per site basis if need be. } { set option "[contact::name -party_id $party_id]" Index: openacs-4/packages/contacts/tcl/contacts-install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-install-procs.tcl,v diff -u -N -r1.28 -r1.29 --- openacs-4/packages/contacts/tcl/contacts-install-procs.tcl 11 Apr 2018 20:52:01 -0000 1.28 +++ openacs-4/packages/contacts/tcl/contacts-install-procs.tcl 17 Apr 2018 14:47:02 -0000 1.29 @@ -576,7 +576,7 @@ set subsite_application_group_id [application_group::group_id_from_package_id -no_complain -package_id $subsite_package_id] if { $subsite_application_group_id ne "-2" } { - error "The upgrade from contacts 1.2b3 to 1.2b4 removes contacts dependence on the registered users group '-2'. It is set to automatically use the nearest subsites application group. Unfortunately since your contacts instance is not mounted directly on the root subsite (i.e. its not mounted at a url similar to /contacts/) this application group is '$subsite_application_group_id'. You either need to manually move all of your contacts and ams::lists associated with the '-2' group to this application group (note the ams::list::copy will come in hand for this) or you may run a custom contacts::default_group_not_cached proc that will return the appropriate_id for your install and keep its functionality for any new contacts instance you create. This proc that corrects your setup should not be part of the offical contacts release since its a hack that is now site specific. Sorry for the significant inconvenience. This was what happens when you live on the bleeding edge of developmental versions of software :(" + error "The upgrade from contacts 1.2b3 to 1.2b4 removes contacts dependence on the registered users group '-2'. It is set to automatically use the nearest subsites application group. Unfortunately since your contacts instance is not mounted directly on the root subsite (i.e. its not mounted at a url similar to /contacts/) this application group is '$subsite_application_group_id'. You either need to manually move all of your contacts and ams::lists associated with the '-2' group to this application group (note the ams::list::copy will come in hand for this) or you may run a custom contacts::default_group_not_cached proc that will return the appropriate_id for your install and keep its functionality for any new contacts instance you create. This proc that corrects your setup should not be part of the official contacts release since its a hack that is now site specific. Sorry for the significant inconvenience. This was what happens when you live on the bleeding edge of developmental versions of software :(" } } Index: openacs-4/packages/courses/tcl/course-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/courses/tcl/course-procs.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/courses/tcl/course-procs.tcl 12 Feb 2005 01:45:31 -0000 1.7 +++ openacs-4/packages/courses/tcl/course-procs.tcl 17 Apr 2018 14:47:02 -0000 1.8 @@ -191,12 +191,12 @@ Revokes admin permission to @party_id@ over @object_id@ and over all assessment_id created by @creation_user@ @party_id@ The user_id to revoke permissions - @object_id@ The course_id over wich @party_id@ has permissions on + @object_id@ The course_id over which @party_id@ has permissions on @creation_user@ The user_id of the user that creates the course_id } { permission::revoke -party_id $party_id -object_id $object_id -privilege "admin" set asm_package_id [apm_package_id_from_key assessment] - + db_foreach assessment { } { if { [permission::permission_p -party_id $creation_user -object_id $assessment_id -privilege admin] == 1 } { permission::revoke -party_id $party_id -object_id $assessment_id -privilege "admin" Index: openacs-4/packages/dbm/catalog/dbm.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dbm/catalog/dbm.de_DE.ISO-8859-1.xml,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/dbm/catalog/dbm.de_DE.ISO-8859-1.xml 7 Jun 2006 10:43:18 -0000 1.1 +++ openacs-4/packages/dbm/catalog/dbm.de_DE.ISO-8859-1.xml 17 Apr 2018 14:47:02 -0000 1.2 @@ -116,7 +116,7 @@ Typ Indexart Benutzer - Vakuum abgeschlossen + Vakuum abgeschlossen Vakuum Variablen Sicht Index: openacs-4/packages/dbm/catalog/dbm.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dbm/catalog/dbm.en_US.ISO-8859-1.xml,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/dbm/catalog/dbm.en_US.ISO-8859-1.xml 7 Jun 2006 10:43:18 -0000 1.1 +++ openacs-4/packages/dbm/catalog/dbm.en_US.ISO-8859-1.xml 17 Apr 2018 14:47:02 -0000 1.2 @@ -116,7 +116,7 @@ Type Type of index Users - Vaccum complete + Vacuum complete Vacuum Variables View Index: openacs-4/packages/dbm/www/vacuum.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dbm/www/vacuum.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/dbm/www/vacuum.tcl 7 Jun 2006 10:43:18 -0000 1.1 +++ openacs-4/packages/dbm/www/vacuum.tcl 17 Apr 2018 14:47:02 -0000 1.2 @@ -21,6 +21,6 @@ } db_dml vacuum "VACUUM $full $freeze $analyze" } -after_submit { - ad_returnredirect "admin?msg=[_ dbm.vaccum_complete]" + ad_returnredirect "admin?msg=[_ dbm.vacuum_complete]" ad_script_abort } Index: openacs-4/packages/ecommerce/tcl/ec-audit-trail-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ec-audit-trail-procs.tcl,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/ecommerce/tcl/ec-audit-trail-procs.tcl 5 Apr 2018 14:44:09 -0000 1.11 +++ openacs-4/packages/ecommerce/tcl/ec-audit-trail-procs.tcl 17 Apr 2018 14:47:02 -0000 1.12 @@ -53,7 +53,7 @@ } { ns_log debug "eatp end_date $end_date" # These values will be part of an audit entry description - # and do not need to be reported seperately + # and do not need to be reported separately lappend columns_not_reported modifying_user_name lappend columns_not_reported last_modifying_user lappend columns_not_reported last_modified Index: openacs-4/packages/ecommerce/tcl/ecds-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecds-procs.tcl,v diff -u -N -r1.15 -r1.16 --- openacs-4/packages/ecommerce/tcl/ecds-procs.tcl 5 Apr 2018 14:44:09 -0000 1.15 +++ openacs-4/packages/ecommerce/tcl/ecds-procs.tcl 17 Apr 2018 14:47:02 -0000 1.16 @@ -169,7 +169,7 @@ } else { ns_log Notice "ecds_get_url: ns_httping $url" set flags "" -# removed -timeout "30" from next statment, because it is unrecognized for this instance.. +# removed -timeout "30" from next statement, because it is unrecognized for this instance.. if { [catch { ns_http wait -result page -status status $get_id } err2 ]} { ns_log Error "ecds_get_url: ns_http wait $err2" } @@ -1976,11 +1976,11 @@ ns_log Error "ecds_file_cache_product: ns_http queue url=$url error: $err" } else { ns_log Notice "ecds_file_cache_product: ns_httping $url" - # removed -timeout "30" from next statment, because it is unrecognized for this instance.. + # removed -timeout "30" from next statement, because it is unrecognized for this instance.. if { [catch { ns_http wait -result page -status status $get_id } err2 ]} { ns_log Error "ecds_file_cache_product: ns_http wait $err2" } - + if { ![info exists status] || $status ne "200" } { # no page info returned, just return error if { ![info exists status] } { @@ -2005,9 +2005,9 @@ } } } - + } else { - + ns_log Notice "ecds_file_cache_product: product_id = $product_id" # create/replace product file using template::adp_include # Index: openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl,v diff -u -N -r1.38 -r1.39 --- openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl 29 Mar 2018 15:03:01 -0000 1.38 +++ openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl 17 Apr 2018 14:47:02 -0000 1.39 @@ -1310,7 +1310,7 @@ ad_proc ec_user_class_display { user_id { link_p "f" } } { - Displays a comma seperated list of the users user classes with a + Displays a comma separated list of the users user classes with a comment on its approval status if approval is required. If link_p is true, then a link is displayed to the \[ec_url_concat \[ec_url] /admin]/user-classes/] page for changing the approval status. Index: openacs-4/packages/ecommerce/www/credit-card-correction.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/credit-card-correction.tcl,v diff -u -N -r1.10 -r1.11 --- openacs-4/packages/ecommerce/www/credit-card-correction.tcl 4 Sep 2008 12:24:06 -0000 1.10 +++ openacs-4/packages/ecommerce/www/credit-card-correction.tcl 17 Apr 2018 14:47:02 -0000 1.11 @@ -27,7 +27,7 @@ # ec_creditcards table shouldn't get too huge. # do all the normal url/cookie surgery checks except don't bother with -# the ones unneccessary for security (like "did they put in an address +# the ones unnecessary for security (like "did they put in an address # for this order?") because finalize-order.tcl (which they'll be going # through to authorize their credit card) will take care of those. Index: openacs-4/packages/ecommerce/www/finalize-order.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/finalize-order.tcl,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/ecommerce/www/finalize-order.tcl 4 Sep 2008 12:24:06 -0000 1.11 +++ openacs-4/packages/ecommerce/www/finalize-order.tcl 17 Apr 2018 14:47:02 -0000 1.12 @@ -216,7 +216,7 @@ set order_shipping_tax [db_string get_order_shipping_tax " select ec_tax(0, :order_shipping, :order_id)"] -# Charge soft goods seperately from hard goods as the hard goods +# Charge soft goods separately from hard goods as the hard goods # transaction will not settled until the goods are shipped while soft # goods can be settled right away. Index: openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl 10 Aug 2008 12:05:58 -0000 1.11 +++ openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl 17 Apr 2018 14:47:02 -0000 1.12 @@ -24,7 +24,7 @@ ad_return_error "A shipping method is required" "

You forgot to select a shipping method.

Please back up your browser and pick a shipping service from the available services.

-

Should no shiping options be available for your shipping address then back up your browser +

Should no shipping options be available for your shipping address then back up your browser further and pick a different shipping address. Or contact [ec_system_owner] to arrange for special delivery.

" } } else { Index: openacs-4/packages/ecommerce/www/admin/products/categories-upload-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/categories-upload-2.tcl,v diff -u -N -r1.9 -r1.10 --- openacs-4/packages/ecommerce/www/admin/products/categories-upload-2.tcl 14 Aug 2008 09:47:43 -0000 1.9 +++ openacs-4/packages/ecommerce/www/admin/products/categories-upload-2.tcl 17 Apr 2018 14:47:02 -0000 1.10 @@ -26,7 +26,7 @@ set context [list [list index Products] $title] -# Get the name of the transfered data file +# Get the name of the transferred data file set unix_file_name ${csv_file.tmpfile} Index: openacs-4/packages/ecommerce/www/admin/products/import-images-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/import-images-2.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/admin/products/import-images-2.tcl 30 Aug 2008 13:45:16 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/products/import-images-2.tcl 17 Apr 2018 14:47:02 -0000 1.6 @@ -26,7 +26,7 @@ set title "Bulk Import Product Images" set context [list [list index Products] $title] -# Get the name of the transfered data file +# Get the name of the transferred data file set unix_file_name ${csv_file.tmpfile} # Check that the file is readable. Index: openacs-4/packages/ecommerce/www/admin/products/upload-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/upload-2.tcl,v diff -u -N -r1.13 -r1.14 --- openacs-4/packages/ecommerce/www/admin/products/upload-2.tcl 5 Apr 2018 14:44:09 -0000 1.13 +++ openacs-4/packages/ecommerce/www/admin/products/upload-2.tcl 17 Apr 2018 14:47:02 -0000 1.14 @@ -26,7 +26,7 @@ set title "Uploading Products" set context [list [list index Products] $title] -# Get the name of the transfered data file +# Get the name of the transferred data file set unix_file_name ${csv_file.tmpfile} # Check that the file is readable. Index: openacs-4/packages/ecommerce/www/admin/products/upload-vendor-imports-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/upload-vendor-imports-2.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/admin/products/upload-vendor-imports-2.tcl 5 Apr 2018 14:44:09 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/products/upload-vendor-imports-2.tcl 17 Apr 2018 14:47:02 -0000 1.5 @@ -23,7 +23,7 @@ set title "Import Vendors Products" set context [list [list index Products] $title] -# Get the name of the transfered data file +# Get the name of the transferred data file set unix_file_name ${csv_file.tmpfile} # Check that the file is readable. Index: openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml,v diff -u -N -r1.33 -r1.34 --- openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml 5 Apr 2018 14:44:09 -0000 1.33 +++ openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml 17 Apr 2018 14:47:02 -0000 1.34 @@ -520,7 +520,7 @@ Yes, I really want to remove this grade Yes, I really want to remove this group Yes, I really want to remove this task - You can also add a student to an existing group by clicking on the "Associate to group..." link. Here you will be asked to select the group to wich you want to add the user. + You can also add a student to an existing group by clicking on the "Associate to group..." link. Here you will be asked to select the group to which you want to add the user. You can associate a link to this task by entering the absolute url here (also optional) You can enter the weight over %grade_weight%% of %grade_plural_name% or you can enter the net value of it in the field below. To sort by student name, total grade, or any of the assignment types, click on the column headers.<br> Index: openacs-4/packages/evaluation/sql/oracle/evaluation-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/sql/oracle/evaluation-create.sql,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/evaluation/sql/oracle/evaluation-create.sql 8 Aug 2006 21:26:41 -0000 1.6 +++ openacs-4/packages/evaluation/sql/oracle/evaluation-create.sql 17 Apr 2018 14:47:02 -0000 1.7 @@ -68,7 +68,7 @@ references cr_revisions, answer_item_id integer constraint evaluation_sans_aiid_fk references cr_items(item_id), - -- person/group to wich the answer belongs + -- person/group to which the answer belongs party_id integer constraint evaluation_sans_pid_nn not null constraint evaluation_sans_pid_fk Index: openacs-4/packages/evaluation/sql/postgresql/evaluation-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/sql/postgresql/evaluation-create.sql,v diff -u -N -r1.27 -r1.28 --- openacs-4/packages/evaluation/sql/postgresql/evaluation-create.sql 23 Mar 2018 23:53:01 -0000 1.27 +++ openacs-4/packages/evaluation/sql/postgresql/evaluation-create.sql 17 Apr 2018 14:47:02 -0000 1.28 @@ -81,7 +81,7 @@ answer_item_id integer constraint evaluation_sans_aiid_fk references cr_items(item_id), - -- person/group to wich the answer belongs + -- person/group to which the answer belongs party_id integer constraint evaluation_sans_pid_nn not null Index: openacs-4/packages/evaluation/tcl/apm-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/apm-callback-procs.tcl,v diff -u -N -r1.26 -r1.27 --- openacs-4/packages/evaluation/tcl/apm-callback-procs.tcl 7 Aug 2017 23:48:10 -0000 1.26 +++ openacs-4/packages/evaluation/tcl/apm-callback-procs.tcl 17 Apr 2018 14:47:02 -0000 1.27 @@ -3,7 +3,7 @@ ad_library { Evaluations Package APM callbacks library - + Procedures that deal with installing, instantiating, mounting. @creation-date Apr 2004 @@ -15,12 +15,12 @@ namespace eval evaluation::apm {} -ad_proc -public evaluation::apm::package_install { +ad_proc -public evaluation::apm::package_install { } { - - Does the integration whith the notifications package. + + Does the integration with the notifications package. } { - db_transaction { + db_transaction { # Create the impl and aliases for one assignment set impl_id [create_one_assignment_impl] @@ -187,10 +187,10 @@ } } -ad_proc -public evaluation::apm::package_uninstall { +ad_proc -public evaluation::apm::package_uninstall { } { - Cleans the integration whith the notifications package. + Cleans the integration with the notifications package. } { db_transaction { Index: openacs-4/packages/evaluation/www/admin/groups/group-member-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-member-add-2.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/evaluation/www/admin/groups/group-member-add-2.tcl 7 Aug 2017 23:48:10 -0000 1.8 +++ openacs-4/packages/evaluation/www/admin/groups/group-member-add-2.tcl 17 Apr 2018 14:47:02 -0000 1.9 @@ -1,22 +1,22 @@ # /packages/evaluation/www/admin/groups/group-member-add-2.tcl ad_page_contract { - Associates a student whith a group + Associates a student with a group - @author jopez@galileo.edu - @creation-date Mar 2004 - @cvs-id $Id$ + @author jopez@galileo.edu + @creation-date Mar 2004 + @cvs-id $Id$ } { - evaluation_group_id:naturalnum,notnull - task_id:naturalnum,notnull - student_id:naturalnum,notnull + evaluation_group_id:naturalnum,notnull + task_id:naturalnum,notnull + student_id:naturalnum,notnull } set creation_user_id [ad_conn user_id] set creation_ip [ad_conn peeraddr] set package_id [ad_conn package_id] -db_exec_plsql associate_student { *SQL* } +db_exec_plsql associate_student { *SQL* } ad_returnredirect [export_vars -base one-task { task_id }] Index: openacs-4/packages/expenses/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/expenses/www/admin/index.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/expenses/www/admin/index.tcl 4 Aug 2005 06:51:55 -0000 1.7 +++ openacs-4/packages/expenses/www/admin/index.tcl 17 Apr 2018 14:47:02 -0000 1.8 @@ -1,7 +1,7 @@ ad_page_contract { List line expenses for all courses - + @author Hamilton Chua (hamilton.chua@gmail.com) @creation-date 2005-05-14 @cvs-id $Id$ @@ -23,7 +23,7 @@ -key exp_id \ -no_data "No expense have been recorded yet." \ -actions { - "Export All Non-Transferred and MARK ALL Transfered" "export-confirm?all=1&mark=1" "Export All Expenses" + "Export All Non-Transferred and MARK ALL Transferred" "export-confirm?all=1&mark=1" "Export All Expenses" "Export All but DO NOT MARK Transferred" "export-confirm?all=1&mark=0" "Export Expenses" } -elements { exp_date { @@ -79,4 +79,4 @@ set expense_types [expenses::list_expense_types -id $exp_id] set terms [expenses::list_terms -id $exp_id] } -} \ No newline at end of file +} Index: openacs-4/packages/ezic-gateway/tcl/ezic-gateway-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ezic-gateway/tcl/ezic-gateway-procs.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/ezic-gateway/tcl/ezic-gateway-procs.tcl 12 Apr 2018 07:47:22 -0000 1.4 +++ openacs-4/packages/ezic-gateway/tcl/ezic-gateway-procs.tcl 17 Apr 2018 14:47:02 -0000 1.5 @@ -8,7 +8,7 @@ # (authorize.net equivalent response_code) # # 1: (1) successful/approved - # T: (1) sucessful Auth-Only + # T: (1) successful Auth-Only # 0: (2) failure/declined # D: duplicate (making this an error) # : (3) error (no ezic gateway equivalent) @@ -34,7 +34,7 @@ # R: (VOID) refund, refund back money from a prior sale. # D: (PRIOR_AUTH_CAPTURE) capture a prior (A) authorization, making i a Sale # : (CAPTURE_ONLY) no ezic gateway equivalent - + # EZIC gateway separates billing last name from billing first name # The authorize.net package uses a combined $card_name # ecommerce and payment-gateway packages need similarly adapted. Index: openacs-4/packages/gatekeeper/www/doc/requirements.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/gatekeeper/www/doc/requirements.html,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/gatekeeper/www/doc/requirements.html 23 Mar 2018 23:53:01 -0000 1.3 +++ openacs-4/packages/gatekeeper/www/doc/requirements.html 17 Apr 2018 14:47:02 -0000 1.4 @@ -32,7 +32,7 @@ installed on Apache+PHP. The AOLServer has to have access to Apache for instance over localhost. -The administrator has sucessfully installed the external authentication +The administrator has successfully installed the external authentication package using pam. The administrator has to do the following to integrate the external @@ -71,7 +71,7 @@ Gatekeeper -------------------------------------------- The Gatekeeper Instance registers itself for auto logon on to that -authority. Thus after a sucessful login the login information is also +authority. Thus after a successful login the login information is also used to login to the webmail client and the cookies are forwarded to the users browser. Thus the authentication package has to be extended for post-login and logout procedure-calls. On request the gatekeeper checks Index: openacs-4/packages/gatekeeper/www/doc/xml/requirements.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/gatekeeper/www/doc/xml/requirements.xml,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/gatekeeper/www/doc/xml/requirements.xml 23 Mar 2018 23:53:01 -0000 1.3 +++ openacs-4/packages/gatekeeper/www/doc/xml/requirements.xml 17 Apr 2018 14:47:02 -0000 1.4 @@ -75,7 +75,7 @@ installed on Apache+PHP. The AOLServer has to have access to Apache for instance over localhost. -The administrator has sucessfully installed the external authentication +The administrator has successfully installed the external authentication package using pam. The administrator has to do the following to integrate the external @@ -114,7 +114,7 @@ Gatekeeper -------------------------------------------- The Gatekeeper Instance registers itself for auto logon on to that -authority. Thus after a sucessful login the login information is also +authority. Thus after a successful login the login information is also used to login to the webmail client and the cookies are forwarded to the users browser. Thus the authentication package has to be extended for post-login and logout procedure-calls. On request the gatekeeper checks Index: openacs-4/packages/glossary/sql/oracle/glossary-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/sql/oracle/glossary-create.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/glossary/sql/oracle/glossary-create.sql 23 Dec 2001 00:58:58 -0000 1.3 +++ openacs-4/packages/glossary/sql/oracle/glossary-create.sql 17 Apr 2018 14:47:02 -0000 1.4 @@ -26,7 +26,7 @@ these act as primary containers for terms (glossary content_item), a term''s context_id will point to its glossary and terms will also be mapped using cr_child_rels table'; -comment on column glossaries.owner_id is 'the creation_user may not always be the owner of a module after is created, so we have a seperate column that references the parties table so that we owner''s can be either individual''s or groups'; +comment on column glossaries.owner_id is 'the creation_user may not always be the owner of a module after is created, so we have a separate column that references the parties table so that we owner''s can be either individual''s or groups'; comment on column glossaries.package_id is 'we use this rather than always counting on context_id to give us the right permissions, because package instances may share grant the same permission to the same party, but they are not the same set of glossaries '; Index: openacs-4/packages/glossary/sql/postgresql/glossary-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/sql/postgresql/glossary-create.sql,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/glossary/sql/postgresql/glossary-create.sql 23 Dec 2001 00:58:58 -0000 1.5 +++ openacs-4/packages/glossary/sql/postgresql/glossary-create.sql 17 Apr 2018 14:47:02 -0000 1.6 @@ -31,7 +31,7 @@ these act as primary containers for terms (glossary content_item), a term''s context_id will point to its glossary and terms will also be mapped using cr_child_rels table'; -comment on column glossaries.owner_id is 'the creation_user may not always be the owner of a module after is created, so we have a seperate column that references the parties table so that we owner''s can be either individual''s or groups'; +comment on column glossaries.owner_id is 'the creation_user may not always be the owner of a module after is created, so we have a separate column that references the parties table so that we owner''s can be either individual''s or groups'; comment on column glossaries.package_id is 'we use this rather than always counting on context_id to give us the right permissions, because package instances may share grant the same permission to the same party, but they are not the same set of glossaries '; Index: openacs-4/packages/imsld/sql/postgresql/imsld-level-a-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/sql/postgresql/imsld-level-a-create.sql,v diff -u -N -r1.14 -r1.15 --- openacs-4/packages/imsld/sql/postgresql/imsld-level-a-create.sql 29 Mar 2018 17:28:50 -0000 1.14 +++ openacs-4/packages/imsld/sql/postgresql/imsld-level-a-create.sql 17 Apr 2018 14:47:02 -0000 1.15 @@ -527,7 +527,7 @@ comment on table imsld_methods is ' This table holds the methods of the unit of learning. The methods are the ones that specifies the sequence of activities. -Theese activities are grouped with their corresponding roles and form a play, which is mapped to the method. +These activities are grouped with their corresponding roles and form a play, which is mapped to the method. The method is completed when all the ''plays to complete method'' mapped to this table are completed or when the time indicated by time_limit has been completed, and may be completed by some contidions explained in the level B of the spec'; @@ -563,7 +563,7 @@ This table stores the plays of the method in the unit of learning. The play is completed when the act (in imsld_acts) referenced by ''when_last_act_completed_id'' is completed or when the time indicated by ''time_limit_id'' has fihished (it may also be completed according to -some conditions explained in the level B of the spec). If theese two fields are empty, the play is ''ulimited.'''; +some conditions explained in the level B of the spec). If these two fields are empty, the play is ''ulimited.'''; create table imsld_acts ( act_id integer Index: openacs-4/packages/imsld/sql/postgresql/imsld-production-delivery-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/sql/postgresql/imsld-production-delivery-create.sql,v diff -u -N -r1.9 -r1.10 --- openacs-4/packages/imsld/sql/postgresql/imsld-production-delivery-create.sql 25 Apr 2007 10:52:30 -0000 1.9 +++ openacs-4/packages/imsld/sql/postgresql/imsld-production-delivery-create.sql 17 Apr 2018 14:47:02 -0000 1.10 @@ -1,6 +1,6 @@ -- -- IMS-LD Status Data Model. --- Theese tables are used to determine the status of the learner, staff or any other "IMS-LD object" +-- These tables are used to determine the status of the learner, staff or any other "IMS-LD object" -- inside the unit of learning. -- -- @author jopez@inv.it.uc3m.es Index: openacs-4/packages/imsld/tcl/imsld-condition-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-condition-procs.tcl,v diff -u -N -r1.32 -r1.33 --- openacs-4/packages/imsld/tcl/imsld-condition-procs.tcl 4 Apr 2018 20:29:49 -0000 1.32 +++ openacs-4/packages/imsld/tcl/imsld-condition-procs.tcl 17 Apr 2018 14:47:02 -0000 1.33 @@ -584,7 +584,7 @@ set returnvalue [expr { [string eq 0 $count] ? 0 : $returnvalue }] return $returnvalue } - {substract} { + {subtract} { set childs [$expressionNode childNodes] return [expr {[imsld::expression::eval -run_id $run_id -expression [lindex $childs 0]] - [imsld::expression::eval -run_id $run_id -user_id $user_id -expression [lindex $childs 1]]}] } Index: openacs-4/packages/imsld/tcl/imsld-export-ld-components-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-export-ld-components-procs.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/imsld/tcl/imsld-export-ld-components-procs.tcl 29 Oct 2009 11:09:59 -0000 1.3 +++ openacs-4/packages/imsld/tcl/imsld-export-ld-components-procs.tcl 17 Apr 2018 14:47:02 -0000 1.4 @@ -304,7 +304,7 @@ if {$identifier != ""} { $la setAttribute identifier $identifier } - #Add parameters if ther are parameters + #Add parameters if there are parameters if {$parameters != ""} { $la setAttribute parameters $parameters } Index: openacs-4/packages/imsld/tcl/imsld-instance-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-instance-procs.tcl,v diff -u -N -r1.16 -r1.17 --- openacs-4/packages/imsld/tcl/imsld-instance-procs.tcl 17 Jun 2009 08:00:01 -0000 1.16 +++ openacs-4/packages/imsld/tcl/imsld-instance-procs.tcl 17 Apr 2018 14:47:02 -0000 1.17 @@ -841,7 +841,7 @@ } } - # 5. service (enviroment) + # 5. service (environment) db_foreach service { select serv.service_id, coalesce(serv.is_visible_p, 't') as is_visible_p, Index: openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl,v diff -u -N -r1.87 -r1.88 --- openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl 5 Apr 2018 14:44:09 -0000 1.87 +++ openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl 17 Apr 2018 14:47:02 -0000 1.88 @@ -434,7 +434,7 @@ Deletes the given directory. For instance, the tmp_dir used to extract the files and parse them. - Returns 1 when succeded, 0 otherwise + Returns 1 when succeeded, 0 otherwise @param dir directory to be deleted. } { @@ -661,13 +661,13 @@ Parses an IMS-LD resource and stores all the information in the database, such as files, dependencies, etc Returns a list with the new resource_id created if there were no errors, or 0 and an error explanation. - + @param manifest Manifest tree @param manifest_id Manifest ID or the manifest being parsed @option activity_name In case the resource forms part of an activity, the name is passed to name the possible acs_object associated @param resource_node Resource tree being parsed @param parent_id Parent folder ID - @tmp_dir Temporary directory where the files were exctracted + @tmp_dir Temporary directory where the files were extracted } { upvar files_struct_list files_struct_list @@ -684,7 +684,7 @@ set resource_type [imsld::parse::get_attribute -node $resource_node -attr_name type] set resource_href [imsld::parse::get_attribute -node $resource_node -attr_name href] set community_id [dotlrn_community::get_community_id] - + if { $resource_type eq "imsqti_xmlv1p0" || $resource_type eq "imsqti_xmlv1p1" || $resource_type eq "imsqti_item_xmlv2p0" } { set resource_id [imsld::parse::get_attribute -node $resource_node -attr_name identifier] set noprop 1 @@ -789,11 +789,11 @@ set extra_vars [util_list_to_ns_set [list displayable_p "t"]] relation_add -extra_vars $extra_vars imsld_res_files_rel $resource_id $link_id } - + set resource_dependencies [$resource_node selectNodes {*[local-name()='dependency']}] - + foreach dependency $resource_dependencies { set dependency_identifierref [imsld::parse::get_attribute -node $dependency -attr_name identifierref] set dependency_id [imsld::cp::dependency_new -resource_id $resource_id \ @@ -802,10 +802,10 @@ # look for the resource in the manifest and add it to the CR set resources [$manifest selectNodes {*[local-name()='resources'] }] - + # there must be at least one reource for the learning objective imsld::parse::validate_multiplicity -tree $resources -multiplicity 0 -element_name "resources (dependency)" -greather_than - + set resourcex [$resources find identifier $dependency_identifierref] # this resourcex must match with exactly one resource imsld::parse::validate_multiplicity -tree $resourcex -multiplicity 1 -element_name "resource ($dependency_identifierref) en $resourcex" -equal @@ -817,15 +817,15 @@ -tmp_dir $tmp_dir \ -resource_handler $resource_handler ] if { ![lindex $dependency_resource_list 0] } { - # return this value and let the user know there was an error (because if succeded, it does nothing here) + # return this value and let the user know there was an error (because if succeeded, it does nothing here) return $dependency_resource_list } } } return [list $resource_id {}] } -ad_proc -public imsld::parse::parse_and_create_item { +ad_proc -public imsld::parse::parse_and_create_item { -manifest -manifest_id {-activity_name ""} @@ -838,14 +838,14 @@ } { Parse IMS-LD item node and stores all the information in the database, such as the resources, resources items, etc. - Returns a list with the new imsld_item_id created if there were no errors, or 0 and an explanation messge if there was an error. - + Returns a list with the new imsld_item_id created if there were no errors, or 0 and an explanation message if there was an error. + @param manifest Manifest tree @param manifest_id Manifest ID or the manifest being parsed - @option activity_name In case the item is associated with an activity, the name is pased to hame the possible associated objects which require pretty names - @param item_node The item node to parse + @option activity_name In case the item is associated with an activity, the name is passed to name the possible associated objects which require pretty names + @param item_node The item node to parse @param parent_id Parent folder ID - @param tmp_dir Temporary directory where the files were exctracted + @param tmp_dir Temporary directory where the files were extracted @option parent_item_id In case it's a nested item. Default null } { upvar files_struct_list files_struct_list @@ -867,7 +867,7 @@ if { ![empty_string_p $item_identifierref] } { # look for the resource in the manifest and add it to the CR set resources [$manifest selectNodes {*[local-name()='resources']}] - + # there must be at least one reource for the learning objective imsld::parse::validate_multiplicity -tree $resources -multiplicity 1 -element_name "resources (referenced from item $item_identifier)" -greather_than @@ -927,15 +927,15 @@ } { Parse IMS-LD role node and stores all the information in the database. - Returns a list with the new role_id (item_id) created if there were no errors, or 0 and an explanation messge if there was an error. - + Returns a list with the new role_id (item_id) created if there were no errors, or 0 and an explanation message if there was an error. + @param role_type staff or learner @param component_id Component identifier which this role belongs to @param manifest Manifest tree @param manifest_id Manifest ID or the manifest being parsed @param roles_node The role node to parse @param parent_id Parent folder ID - @param tmp_dir Temporary directory where the files were exctracted + @param tmp_dir Temporary directory where the files were extracted @option parent_role_id Parent role identifier. Default to null } { upvar files_struct_list files_struct_list @@ -1046,17 +1046,17 @@ } { Parse a restriction and stores all the information in the database. - Returns a list with the new restriction_id (item_id) created if there were no errors, or 0 and an explanation messge if there was an error. - + Returns a list with the new restriction_id (item_id) created if there were no errors, or 0 and an explanation message if there was an error. + @param restriction_node restriction node to parse @param property_id property_id @param manifest Manifest tree @param manifest_id Manifest ID or the manifest being parsed @param parent_id Parent folder ID - @param tmp_dir Temporary directory where the files were exctracted + @param tmp_dir Temporary directory where the files were extracted } { upvar files_struct_list files_struct_list - + set restriction_type [string tolower [imsld::parse::get_attribute -node $restriction_node -attr_name restriction-type]] set restriction_value [imsld::parse::get_element_text -node $restriction_node] set restriction_id [imsld::item_revision_new -attributes [list [list property_id $property_id] \ @@ -1083,8 +1083,8 @@ Returns a list with the new global_definition_id (item_id, actually a property_id) created if there were no errors, or 0 and an explanation - messge if there was an error. - + message if there was an error. + @option global_def_node global_def node to parse @param identifier @param existing_href @@ -1094,7 +1094,7 @@ @param manifest Manifest tree @param manifest_id Manifest ID or the manifest being parsed @param parent_id Parent folder ID - @param tmp_dir Temporary directory where the files were exctracted + @param tmp_dir Temporary directory where the files were extracted } { upvar files_struct_list files_struct_list @@ -1177,17 +1177,17 @@ } { Parse a property group and stores all the information in the database. - Returns a list with the new property_group_id (item_id) created if there were no errors, or 0 and an explanation messge if there was an error. - + Returns a list with the new property_group_id (item_id) created if there were no errors, or 0 and an explanation message if there was an error. + @param property_group_node property_group node to parse @param component_id Component identifier of the one that owns this property @param manifest Manifest tree @param manifest_id Manifest ID or the manifest being parsed @param parent_id Parent folder ID - @param tmp_dir Temporary directory where the files were exctracted + @param tmp_dir Temporary directory where the files were extracted } { upvar files_struct_list files_struct_list - + set identifier [imsld::parse::get_attribute -node $property_group_node -attr_name identifier] set title [imsld::parse::get_title -node $property_group_node -prefix imsld] @@ -1286,15 +1286,15 @@ } { Parse IMS-LD property and stores all the information in the database. - Returns a list with the new property_id (item_id) created if there were no errors, or 0 and an explanation messge if there was an error. - + Returns a list with the new property_id (item_id) created if there were no errors, or 0 and an explanation message if there was an error. + @param role_type staff or learner @param component_id Component identifier which this role belongs to @param manifest Manifest tree @param manifest_id Manifest ID or the manifest being parsed - @param roles_node The role node to parse + @param roles_node The role node to parse @param parent_id Parent folder ID - @param tmp_dir Temporary directory where the files were exctracted + @param tmp_dir Temporary directory where the files were extracted @option parent_role_id Parent role identifier. Default to null } { upvar files_struct_list files_struct_list @@ -1537,14 +1537,14 @@ } { Parse a learning objective and stores all the information in the database. - Returns a list with the new learning_objective_id (item_id) created if there were no errors, or 0 and an explanation messge if there was an error. - + Returns a list with the new learning_objective_id (item_id) created if there were no errors, or 0 and an explanation message if there was an error. + @param learning_objective_node learning objective node to parse @param manifest Manifest tree @param manifest_id Manifest ID or the manifest being parsed @option activity_name In case the learning objective forms part of an activity, the name is provided to be used as the pretty name of the possible associated objects @param parent_id Parent folder ID - @param tmp_dir Temporary directory where the files were exctracted + @param tmp_dir Temporary directory where the files were extracted } { upvar files_struct_list files_struct_list @@ -1554,7 +1554,7 @@ -content_type imsld_learning_objective \ -parent_id $parent_id \ -attributes [list [list pretty_title $learning_objective_title]]] - + # learning objective: imsld_items set learning_objective_items [$learning_objective_node selectNodes "*\[local-name()='item'\]"] if { [llength $learning_objective_items] } { @@ -1588,13 +1588,13 @@ } { Parse a prerequisite and stores all the information in the database. - Returns a list with the new prerequisite_id (item_id) created if there were no errors, or 0 and an explanation messge if there was an error. - + Returns a list with the new prerequisite_id (item_id) created if there were no errors, or 0 and an explanation message if there was an error. + @param prerequisite_node prerequisite node to parse @param manifest Manifest tree @param manifest_id Manifest ID or the manifest being parsed @param parent_id Parent folder ID - @param tmp_dir Temporary directory where the files were exctracted + @param tmp_dir Temporary directory where the files were extracted } { upvar files_struct_list files_struct_list @@ -1604,7 +1604,7 @@ -content_type imsld_prerequisite \ -parent_id $parent_id \ -attributes [list [list pretty_title $prerequisite_title]]] - + # prerequisite: imsld_items set prerequisite_items [$prerequisite_node selectNodes "*\[local-name()='item'\]"] if { [llength $prerequisite_items] } { @@ -1641,14 +1641,14 @@ } { Parse a activity description and stores all the information in the database. - Returns a list with the new activity_description_id (item_id) created if there were no errors, or 0 and an explanation messge if there was an error. - + Returns a list with the new activity_description_id (item_id) created if there were no errors, or 0 and an explanation message if there was an error. + @param activity_description_node activity description node to parse @param manifest Manifest tree @param manifest_id Manifest ID or the manifest being parsed @option activity_name Provided to name the possible objects associated with the activity @param parent_id Parent folder ID - @param tmp_dir Temporary directory where the files were exctracted + @param tmp_dir Temporary directory where the files were extracted } { upvar files_struct_list files_struct_list @@ -1657,12 +1657,12 @@ set activity_description_id [imsld::item_revision_new -title $activity_description_title \ -content_type imsld_activity_desc \ -parent_id $parent_id] - + # activity description: imsld_items set activity_description_items [$activity_description_node selectNodes "*\[local-name()='item'\]"] if { [llength $activity_description_items] } { foreach imsld_item $activity_description_items { - + set item_list [imsld::parse::parse_and_create_item -manifest $manifest \ -manifest_id $manifest_id \ -item_node $imsld_item \ @@ -1695,14 +1695,14 @@ } { Parse a learning object and stores all the information in the database. - Returns a list with the new learning_object_id (item_id) created if there were no errors, or 0 and an explanation messge if there was an error. - + Returns a list with the new learning_object_id (item_id) created if there were no errors, or 0 and an explanation message if there was an error. + @param learning_object_node learning object node to parse @param environment_id environment ID of the one tha owns the learning objective @param manifest Manifest tree @param manifest_id Manifest ID or the manifest being parsed @param parent_id Parent folder ID - @param tmp_dir Temporary directory where the files were exctracted + @param tmp_dir Temporary directory where the files were extracted } { upvar files_struct_list files_struct_list @@ -1782,14 +1782,14 @@ } { Parse a service and stores all the information in the database. - Returns a list with the new service_ids (item_ids) created if there were no errors, or 0 and an explanation messge if there was an error. The service element can have conference or send-mail services (index service is currently not supported in .LRN), and they are created directly as a service, i.e. there is no table for storing the services, they are stored directly in the send-mail or conference tables. - + Returns a list with the new service_ids (item_ids) created if there were no errors, or 0 and an explanation message if there was an error. The service element can have conference or send-mail services (index service is currently not supported in .LRN), and they are created directly as a service, i.e. there is no table for storing the services, they are stored directly in the send-mail or conference tables. + @param service_node service node to parse @param environment_id @param manifest Manifest tree @param manifest_id Manifest ID or the manifest being parsed @param parent_id Parent folder ID - @param tmp_dir Temporary directory where the files were exctracted + @param tmp_dir Temporary directory where the files were extracted } { upvar files_struct_list files_struct_list @@ -1798,7 +1798,7 @@ set identifier [imsld::parse::get_attribute -node $service_node -attr_name identifier] set is_visible_p [imsld::parse::get_bool_attribute -node $service_node -attr_name isvisible -default t] set parameters [imsld::parse::get_attribute -node $service_node -attr_name parameters] - + set component_id [db_string get_component_id { select env.component_id from imsld_environmentsi env @@ -2151,21 +2151,21 @@ } { Parse a environment and stores all the information in the database. - Returns a list with the new environment_id (item_id) created if there were no errors, or 0 and an explanation messge if there was an error. - + Returns a list with the new environment_id (item_id) created if there were no errors, or 0 and an explanation message if there was an error. + @param environment_node environment node to parse @param manifest Manifest tree @param manifest_id Manifest ID or the manifest being parsed @param parent_id Parent folder ID - @param tmp_dir Temporary directory where the files were exctracted + @param tmp_dir Temporary directory where the files were extracted } { upvar files_struct_list files_struct_list upvar warnings warnings # get environment info set identifier [imsld::parse::get_attribute -node $environment_node -attr_name identifier] set title [imsld::parse::get_title -node $environment_node -prefix imsld] - + # check if the environmet hasn't been already created by the reference of another environment previously parsed if { [db_0or1row already_created_environment { select item_id as environment_item_id @@ -2298,7 +2298,7 @@ } { Parse a property value and stores all the information in the database. - Returns a list with the new property_value_id (item_id) created if there were no errors, or 0 and an explanation messge if there was an error. + Returns a list with the new property_value_id (item_id) created if there were no errors, or 0 and an explanation message if there was an error. @param component_id Component identifier which this role belongs to @param manifest Manifest tree @@ -2388,14 +2388,14 @@ } { Parse a learning activity and stores all the information in the database. - Returns a list with the new activity_id (item_id) created if there were no errors, or 0 and an explanation messge if there was an error. - + Returns a list with the new activity_id (item_id) created if there were no errors, or 0 and an explanation message if there was an error. + @param component_id Component identifier which this role belongs to @param manifest Manifest tree @param manifest_id Manifest ID or the manifest being parsed @param activity_node The activity node to parse @param parent_id Parent folder ID - @param tmp_dir Temporary directory where the files were exctracted + @param tmp_dir Temporary directory where the files were extracted } { upvar files_struct_list files_struct_list upvar warnings warnings @@ -2408,7 +2408,7 @@ set is_visible_p [imsld::parse::get_bool_attribute -node $activity_node -attr_name isvisible -default t] set parameters [imsld::parse::get_attribute -node $activity_node -attr_name parameters] set title [imsld::parse::get_title -node $activity_node -prefix imsld] - + # Learning Activity: Learning Objectives (which are really an imsld_item that can have resource associated.) set learning_objectives [$activity_node selectNodes "*\[local-name()='learning-objectives'\]"] if { [llength $learning_objectives] } { @@ -2663,15 +2663,15 @@ } { Parse a support activity and stores all the information in the database. - Returns a list with the new activity_id (item_id) created if there were no errors, or 0 and an explanation messge if there was an error. - + Returns a list with the new activity_id (item_id) created if there were no errors, or 0 and an explanation message if there was an error. + @param role_type staff or learner @param component_id Component identifier which this role belongs to @param manifest Manifest tree @param manifest_id Manifest ID or the manifest being parsed - @param roles_node The role node to parse + @param roles_node The role node to parse @param parent_id Parent folder ID - @param tmp_dir Temporary directory where the files were exctracted + @param tmp_dir Temporary directory where the files were extracted @option parent_role_id Parent role identifier. Default to null } { upvar files_struct_list files_struct_list @@ -2922,14 +2922,14 @@ } { Parse a activity structure and stores all the information in the database. - Returns a list with the new activivty_structure_id (item_id) created if there were no errors, or 0 and an explanation messge if there was an error. - + Returns a list with the new activivty_structure_id (item_id) created if there were no errors, or 0 and an explanation message if there was an error. + @param component_id Component identifier which this role belongs to @param manifest Manifest tree @param manifest_id Manifest ID or the manifest being parsed - @param activity_node The activity structure node to parse + @param activity_node The activity structure node to parse @param parent_id Parent folder ID - @param tmp_dir Temporary directory where the files were exctracted + @param tmp_dir Temporary directory where the files were extracted } { upvar files_struct_list files_struct_list upvar warnings warnings @@ -2941,7 +2941,7 @@ set sort [expr { [string eq "" $sort] ? "as-is" : "[string tolower $sort]" }] set structure_type [imsld::parse::get_attribute -node $activity_node -attr_name structure-type] set title [imsld::parse::get_title -node $activity_node -prefix imsld] - + # because of the complexity of the manifest, the activity structure may be already crated if { [db_0or1row already_crated { select item_id as activity_structure_id @@ -2952,7 +2952,7 @@ }] } { return $activity_structure_id } - + # crete activity structure set activity_structure_id [imsld::item_revision_new \ -attributes [list [list identifier $identifier] \ @@ -3309,14 +3309,14 @@ } { Parse a role part and stores all the information in the database. - Returns a list with the new role_part_id (item_id) created if there were no errors, or 0 and an explanation messge if there was an error. - + Returns a list with the new role_part_id (item_id) created if there were no errors, or 0 and an explanation message if there was an error. + @param act_id Act identifier which this role part belongs to - @param role_part_node The role part node to parse + @param role_part_node The role part node to parse @param manifest Manifest tree @param manifest_id Manifest ID or the manifest being parsed @param parent_id Parent folder ID - @param tmp_dir Temporary directory where the files were exctracted + @param tmp_dir Temporary directory where the files were extracted @param sort_order } { upvar warnings warnings @@ -3541,14 +3541,14 @@ } { Parse a act and stores all the information in the database. - Returns a list with the new act_id (item_id) created if there were no errors, or 0 and an explanation messge if there was an error. - + Returns a list with the new act_id (item_id) created if there were no errors, or 0 and an explanation message if there was an error. + @param play_id Play identifier which this act belongs to - @param act_node The act node to parse + @param act_node The act node to parse @param manifest Manifest tree @param manifest_id Manifest ID or the manifest being parsed @param parent_id Parent folder ID - @param tmp_dir Temporary directory where the files were exctracted + @param tmp_dir Temporary directory where the files were extracted @param sort_order } { upvar files_struct_list files_struct_list @@ -3573,7 +3573,7 @@ and ip.play_id = cr1.revision_id and cr1.item_id = :play_id } - + # helper list for killing temporal dom doc after used set temporal_doc_list [list] @@ -3826,15 +3826,15 @@ } { Parse a play and stores all the information in the database. - Returns a list with the new play_id (item_id) created if there were no errors, or 0 and an explanation messge if there was an error. - + Returns a list with the new play_id (item_id) created if there were no errors, or 0 and an explanation message if there was an error. + @param method_id method identifier which this play belongs to - @param play_node The play node to parse + @param play_node The play node to parse @param manifest Manifest tree @param manifest_id Manifest ID or the manifest being parsed @param parent_id Parent folder ID - @param tmp_dir Temporary directory where the files were exctracted - @param sort_order + @param tmp_dir Temporary directory where the files were extracted + @param sort_order } { upvar files_struct_list files_struct_list upvar warnings warnings @@ -3846,7 +3846,7 @@ set identifier [imsld::parse::get_attribute -node $play_node -attr_name identifier] set is_visible_p [imsld::parse::get_bool_attribute -node $play_node -attr_name isvisible -default t] set title [imsld::parse::get_title -node $play_node -prefix imsld] - + # Play: Complete Play set complete_play [$play_node selectNodes "*\[local-name()='complete-play'\]"] set complete_act_id "" @@ -4031,15 +4031,15 @@ } { Parse a notification and stores all the information in the database. - Returns a list with the new notification_id (item_id) created if there were no errors, or 0 and an explanation messge if there was an error. - + Returns a list with the new notification_id (item_id) created if there were no errors, or 0 and an explanation message if there was an error. + @option component_id Component identifier which the notification belongs @option imsld_id IMS-LD identifier which this notification belongs @param manifest Manifest tree @param manifest_id Manifest ID or the manifest being parsed - @param notification_node The notification node to parse + @param notification_node The notification node to parse @param parent_id Parent folder ID - @param tmp_dir Temporary directory where the files were exctracted + @param tmp_dir Temporary directory where the files were extracted } { upvar files_struct_list files_struct_list upvar warnings warnings @@ -4221,7 +4221,7 @@ } { Parse a condition and stores all the information in the database. - Returns the if_then_else_id (item_id) if there were no errors, or 0 and an explanation messge if there was an error. + Returns the if_then_else_id (item_id) if there were no errors, or 0 and an explanation message if there was an error. @param imsld_id IMS-LD identifier which this play belongs to @param condition_node The condition node to be parsed @@ -4272,7 +4272,7 @@ } { Parse a class and stores all the information in the database. - Returns the class_id (item_id) if there were no errors, or 0 and an explanation messge if there was an error. + Returns the class_id (item_id) if there were no errors, or 0 and an explanation message if there was an error. @param method_id @param class_node @@ -4293,7 +4293,7 @@ } { Parse a condition and stores all the information in the database. - Returns a list with the condition_id (item_id) if there were no errors, or 0 and an explanation messge if there was an error. + Returns a list with the condition_id (item_id) if there were no errors, or 0 and an explanation message if there was an error. @param calculate_node The condition node to be parsed @param manifest Manifest tree Index: openacs-4/packages/imsld/tcl/imsld-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-procs.tcl,v diff -u -N -r1.127 -r1.128 --- openacs-4/packages/imsld/tcl/imsld-procs.tcl 5 Apr 2018 14:44:09 -0000 1.127 +++ openacs-4/packages/imsld/tcl/imsld-procs.tcl 17 Apr 2018 14:47:02 -0000 1.128 @@ -2765,11 +2765,11 @@ @option user_id default ad_conn user_id @return The html list (activity_name, list of associated urls, using tdom) of the activity in the IMS-LD. - It only works whith the learning and support activities, since it will only return the objectives, prerequistes, + It only works with the learning and support activities, since it will only return the objectives, prerequistes, associated resources but not the environments. } { set user_id [expr { [string eq "" $user_id] ? [ad_conn user_id] : $user_id }] - + if { [db_0or1row is_imsld { select 1 from imsld_imsldsi where item_id = :activity_item_id }] } { @@ -4408,10 +4408,10 @@ } -ad_proc -public imsld::get_activity_from_environment { +ad_proc -public imsld::get_activity_from_environment { -environment_item_id - -} { + +} { @return The a list of lists of the activity_id, activity_item_id and activity_type from which the environment is being referenced } { set activities_list [list] @@ -4423,7 +4423,7 @@ }] { set object_id_one [lindex $environment_list 0] set rel_type [lindex $environment_list 1] - # the enviroment may be referenced froma learning activity, support activity or from an enviroment! + # the environment may be referenced froma learning activity, support activity or from an environment! if { [string eq $rel_type imsld_la_env_rel] } { set activities_list [concat $activities_list [db_list_of_lists learning_env_ref { select la.activity_id, Index: openacs-4/packages/imsld/tcl/imsld-roles-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-roles-procs.tcl,v diff -u -N -r1.20 -r1.21 --- openacs-4/packages/imsld/tcl/imsld-roles-procs.tcl 4 Apr 2018 20:29:50 -0000 1.20 +++ openacs-4/packages/imsld/tcl/imsld-roles-procs.tcl 17 Apr 2018 14:47:02 -0000 1.21 @@ -102,7 +102,7 @@ ad_proc -public imsld::roles::get_list_of_roles { -imsld_id:required } { - @param imsld_id identifier of the imsld from wich roles will be searched + @param imsld_id identifier of the imsld from which roles will be searched } { set main_roles [db_list roles_list {}] set roles_list [list] Index: openacs-4/packages/imsld/www/admin/imsld-confirm-finish.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-confirm-finish.tcl,v diff -u -N -r1.10 -r1.11 --- openacs-4/packages/imsld/www/admin/imsld-confirm-finish.tcl 17 Jun 2009 08:00:01 -0000 1.10 +++ openacs-4/packages/imsld/www/admin/imsld-confirm-finish.tcl 17 Apr 2018 14:47:02 -0000 1.11 @@ -34,7 +34,7 @@ } } -# excecute all conditions for all users +# execute all conditions for all users set users_list [list] foreach role_id [imsld::roles::get_list_of_roles -imsld_id $imsld_id] { Index: openacs-4/packages/imsld/www/admin/gsi/imsld-gsi-service-search-results.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/gsi/imsld-gsi-service-search-results.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/imsld/www/admin/gsi/imsld-gsi-service-search-results.adp 23 Jun 2009 17:21:19 -0000 1.1 +++ openacs-4/packages/imsld/www/admin/gsi/imsld-gsi-service-search-results.adp 17 Apr 2018 14:47:02 -0000 1.2 @@ -3,7 +3,7 @@ @context;noquote@ -

Theese are the available alternatives to configure the service

+

These are the available alternatives to configure the service

Index: openacs-4/packages/imsld/www/doc/ar01s01.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/doc/ar01s01.html,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/imsld/www/doc/ar01s01.html 5 Apr 2018 14:44:09 -0000 1.4 +++ openacs-4/packages/imsld/www/doc/ar01s01.html 17 Apr 2018 14:47:02 -0000 1.5 @@ -63,7 +63,7 @@ sequencial mode or for the user to select. The activities are the core of the workflow of the learning design.

  • Environment. Collection of learning objects (for example files to be viewed by the student), - services (like foros, chat, etc.) and sub-environments, in wich + services (like foros, chat, etc.) and sub-environments, in which activities take place. When a student has to complete an activity that have a concrete environment, then he/she can do whichever of the learning objects and services that are defined inside this Index: openacs-4/packages/imsld/www/doc/ch03s01.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/doc/ch03s01.html,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/imsld/www/doc/ch03s01.html 30 Jun 2005 10:43:20 -0000 1.3 +++ openacs-4/packages/imsld/www/doc/ch03s01.html 17 Apr 2018 14:47:02 -0000 1.4 @@ -101,7 +101,7 @@ he/she can move on to the next step. this will be interpreted in our .LRN package and only when this condition is done the student will go to the next step.

    2) Doing a plan: The activity consists of thinking an adequate - strategy for solving the problem. To help tje student, he/she can + strategy for solving the problem. To help the student, he/she can consult an environment during the activity that consists of a set of files that contains the theoretical concepts that helps to understand the problem. With the IMS-LD specification, the professor can indicate Index: openacs-4/packages/imsld/www/doc/ch04s01.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/doc/ch04s01.html,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/imsld/www/doc/ch04s01.html 28 Mar 2018 23:36:17 -0000 1.7 +++ openacs-4/packages/imsld/www/doc/ch04s01.html 17 Apr 2018 14:47:02 -0000 1.8 @@ -84,7 +84,7 @@ mapped using this table. This is just a representation of the acs_rels table, because at the implementation phase, acs_rels will be used with different rel_types

    • imsld_object_one_id - references imsld_* - (acs_objects)

    • imsld_object_one_type - wich can be: learning_object, + (acs_objects)

    • imsld_object_one_type - which can be: learning_object, imsld_item, imsld_role, support_activity, etc

    • imsld_object_two_id - references imsld_* (acs_objects)

    • imsld_object_two_type - same as imsld_object_one_type

  • IMPORTANT NOTES:

    1. The last table will use acs_rels. The rel_types will be Index: openacs-4/packages/imsld/www/doc/users_guide/ch03.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/doc/users_guide/ch03.html,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/imsld/www/doc/users_guide/ch03.html 5 Apr 2018 14:44:09 -0000 1.3 +++ openacs-4/packages/imsld/www/doc/users_guide/ch03.html 17 Apr 2018 14:47:02 -0000 1.4 @@ -7,7 +7,7 @@ win=window.open(mypage,myname,settings);}

      Chapter�3.�Using the package

      There are two main parts of the package, one for the course administrator and the other for the student, and they can be divided in - theese two sections:

      1. Uploading a UoL

      2. Using the player

      Admnistrator's guide

      Uploading a Unit of Learning

      The first thing the administrator of the course has to do is to + these two sections:

      1. Uploading a UoL

      2. Using the player

      Admnistrator's guide

      Uploading a Unit of Learning

      The first thing the administrator of the course has to do is to upload a UoL.

      This is done from the control panel of the course. There you will find the administrator's interface of the package. Click on "Units of Learning Administration" and you will be redirected to the Index: openacs-4/packages/imsld/www/doc/xmlfiles/imsld-data-model.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/doc/xmlfiles/imsld-data-model.xml,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/imsld/www/doc/xmlfiles/imsld-data-model.xml 28 Mar 2018 23:36:17 -0000 1.3 +++ openacs-4/packages/imsld/www/doc/xmlfiles/imsld-data-model.xml 17 Apr 2018 14:47:02 -0000 1.4 @@ -736,7 +736,7 @@ - imsld_object_one_type - wich can be: learning_object, + imsld_object_one_type - which can be: learning_object, imsld_item, imsld_role, support_activity, etc Index: openacs-4/packages/imsld/www/doc/xmlfiles/imsld-short-intro.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/doc/xmlfiles/imsld-short-intro.xml,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/imsld/www/doc/xmlfiles/imsld-short-intro.xml 5 Apr 2018 14:44:09 -0000 1.5 +++ openacs-4/packages/imsld/www/doc/xmlfiles/imsld-short-intro.xml 17 Apr 2018 14:47:02 -0000 1.6 @@ -101,7 +101,7 @@ Environment. Collection of learning objects (for example files to be viewed by the student), - services (like foros, chat, etc.) and sub-environments, in wich + services (like foros, chat, etc.) and sub-environments, in which activities take place. When a student has to complete an activity that have a concrete environment, then he/she can do whichever of the learning objects and services that are defined inside this Index: openacs-4/packages/imsld/www/doc/xmlfiles/imsld-use-cases.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/doc/xmlfiles/imsld-use-cases.xml,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/imsld/www/doc/xmlfiles/imsld-use-cases.xml 30 Jun 2005 10:31:51 -0000 1.1 +++ openacs-4/packages/imsld/www/doc/xmlfiles/imsld-use-cases.xml 17 Apr 2018 14:47:02 -0000 1.2 @@ -167,7 +167,7 @@ the next step. 2) Doing a plan: The activity consists of thinking an adequate - strategy for solving the problem. To help tje student, he/she can + strategy for solving the problem. To help the student, he/she can consult an environment during the activity that consists of a set of files that contains the theoretical concepts that helps to understand the problem. With the IMS-LD specification, the professor can indicate @@ -261,4 +261,4 @@ for both teachers and students, and many different and interesting use cases have been exposed. - \ No newline at end of file + Index: openacs-4/packages/inventory-control/sql/postgresql/catalog-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/inventory-control/sql/postgresql/catalog-create.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/inventory-control/sql/postgresql/catalog-create.sql 9 Jul 2006 22:14:24 -0000 1.2 +++ openacs-4/packages/inventory-control/sql/postgresql/catalog-create.sql 17 Apr 2018 14:47:02 -0000 1.3 @@ -43,7 +43,7 @@ lastcost numeric, -- based on ec_products.ship_satus - -- the useage is split to qci_parts.order_turnaround and qci_parts.onhand + -- the usage is split to qci_parts.order_turnaround and qci_parts.onhand -- q = ships quickly, m = ships moderately quickly, s = ships slowly -- o = special, i = inconsistent/unknown/ask -- messages are changeable Index: openacs-4/packages/invoices/www/invoice-reports.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/invoice-reports.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/invoices/www/invoice-reports.tcl 13 Sep 2005 20:56:28 -0000 1.2 +++ openacs-4/packages/invoices/www/invoice-reports.tcl 17 Apr 2018 14:47:02 -0000 1.3 @@ -50,7 +50,7 @@ } } -# We select wich inlcude we want according to the values present on the +# We select which include we want according to the values present on the # variables year and month set include_src "/packages/invoices/lib/report-year" if { ![empty_string_p $year] } { Index: openacs-4/packages/invoices/www/offer-accepted.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/offer-accepted.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/invoices/www/offer-accepted.tcl 8 Nov 2006 14:42:07 -0000 1.4 +++ openacs-4/packages/invoices/www/offer-accepted.tcl 17 Apr 2018 14:47:02 -0000 1.5 @@ -9,7 +9,7 @@ ad_return_complaint 1 [_ invoices.lt_empty_offer_id] } -# Retrieving the value of the parameter to know wich include to call +# Retrieving the value of the parameter to know which include to call set template_src [parameter::get -parameter "OfferAccept"] if {![db_0or1row check_offer_id {}]} { Index: openacs-4/packages/invoices/www/offer-ae.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/offer-ae.tcl,v diff -u -N -r1.42 -r1.43 --- openacs-4/packages/invoices/www/offer-ae.tcl 6 Nov 2006 15:38:44 -0000 1.42 +++ openacs-4/packages/invoices/www/offer-ae.tcl 17 Apr 2018 14:47:02 -0000 1.43 @@ -605,7 +605,7 @@ set title "[_ invoices.iv_offer_1] $organization_name $today" } set title [lang::util::localize $title] - # We do not want a seperate offer_number but use the project title + # We do not want a separate offer_number but use the project title # set offer_nr [db_nextval iv_offer_seq] set amount_sum "0.00" set amount_total "0.00" Index: openacs-4/packages/invoices/www/offer-send.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/offer-send.tcl,v diff -u -N -r1.25 -r1.26 --- openacs-4/packages/invoices/www/offer-send.tcl 4 Aug 2006 15:29:44 -0000 1.25 +++ openacs-4/packages/invoices/www/offer-send.tcl 17 Apr 2018 14:47:02 -0000 1.26 @@ -38,7 +38,7 @@ } set cc_emails [join $cc_emails ", "] -# We don't want to use a seperate offer number but use the project_title +# We don't want to use a separate offer number but use the project_title set offer_nr $project_title set locale [lang::user::site_wide_locale -user_id $contact_id] Index: openacs-4/packages/jabber/sql/oracle/jabber-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/sql/oracle/jabber-create.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/jabber/sql/oracle/jabber-create.sql 27 Mar 2018 17:08:50 -0000 1.2 +++ openacs-4/packages/jabber/sql/oracle/jabber-create.sql 17 Apr 2018 14:47:02 -0000 1.3 @@ -548,7 +548,7 @@ ---checks if jid_in is in the table of the subscription requests , we store them in ther because we may have to wait +--checks if jid_in is in the table of the subscription requests , we store them in there because we may have to wait --for a while till some one (jid_in) answers the request, it returns 0 in case there is nothing known about jid_in --or n > 0 in case there is something known about jid_in Index: openacs-4/packages/jabber/sql/postgresql/jabber-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/sql/postgresql/jabber-create.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/jabber/sql/postgresql/jabber-create.sql 27 Mar 2018 17:08:50 -0000 1.3 +++ openacs-4/packages/jabber/sql/postgresql/jabber-create.sql 17 Apr 2018 14:47:03 -0000 1.4 @@ -686,7 +686,7 @@ ---checks if jid_in is in the table of the subscription requests , we store them in ther because we may have to wait +--checks if jid_in is in the table of the subscription requests , we store them in there because we may have to wait --for a while till some one (jid_in) answers the request, it returns 0 in case there is nothing known about jid_in --or n > 0 in case there is something known about jid_in Index: openacs-4/packages/jabber/tcl/jabber-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/tcl/jabber-procs.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/jabber/tcl/jabber-procs.tcl 28 Mar 2018 17:00:41 -0000 1.2 +++ openacs-4/packages/jabber/tcl/jabber-procs.tcl 17 Apr 2018 14:47:03 -0000 1.3 @@ -325,10 +325,10 @@ -ad_proc jb_invite_user { room_name version return_url } { This funktion returns the URL (href for a link) to invite the user him self (entering a Room) to a Conference Room , the parameters are the 1. name of the room 2. wich version of the invite shuold be used (1 or2) , 3. the url of the page the user schould be redirected to after the invite has been send , 4. display will be what the browser shows to the user (displayed name of the Link) } { +ad_proc jb_invite_user { room_name version return_url } { This function returns the URL (href for a link) to invite the user him self (entering a Room) to a Conference Room , the parameters are the 1. name of the room 2. which version of the invite shuold be used (1 or2) , 3. the url of the page the user should be redirected to after the invite has been send , 4. display will be what the browser shows to the user (displayed name of the Link) } { set user_id [ad_get_user_id] - set jid_to "" + set jid_to "" if {[db_0or1row get_user_jid "SELECT im_screen_name FROM jb_screens WHERE user_id = :user_id AND service = 'jabber'" ]} { @@ -690,7 +690,7 @@ namespace eval imessage { - ad_proc send_and_email { to_user_id reply_object_id notification_type_id subject content } {This procedure Sends a IM-msg to the user user_id, it figures out wich system to use by User preferences and his current online state (the mesage will be trunct to 500 charackters), and sends an email } { + ad_proc send_and_email { to_user_id reply_object_id notification_type_id subject content } {This procedure Sends a IM-msg to the user user_id, it figures out which system to use by User preferences and his current online state (the message will be trunct to 500 characters), and sends an email } { ns_log notice "notification::imessage::send_and_mail 1" set suc [ notification::imessage::send $to_user_id $reply_object_id $notification_type_id "$subject" "$content"] @@ -704,7 +704,7 @@ } - ad_proc -public send_or_email { to_user_id reply_object_id notification_type_id subject content } { This procedure Sends a IM-msg to the user user_id, it figures out wich system to use by User preferences and his current online state (the content will be trunct to 50 charackters). Or in case the user is offline it will send an email } { + ad_proc -public send_or_email { to_user_id reply_object_id notification_type_id subject content } { This procedure Sends a IM-msg to the user user_id, it figures out which system to use by User preferences and his current online state (the content will be trunct to 50 characters). Or in case the user is offline it will send an email } { ns_log notice "notification::imessage::send_or_mail 1" set suc 0 set suc [ notification::imessage::send $to_user_id $reply_object_id $notification_type_id "$subject" "$content"] @@ -721,7 +721,7 @@ } - ad_proc send { to_user_id reply_object_id notification_type_id subject content } { This procedure Sends a IM-msg to the user user_id, it figures out wich system to use by User preferences and his current online state } { + ad_proc send { to_user_id reply_object_id notification_type_id subject content } { This procedure Sends a IM-msg to the user user_id, it figures out which system to use by User preferences and his current online state } { ns_log notice "notification::imessage::sendbb" set state 0 Index: openacs-4/packages/jabber/www/admin/service-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/admin/service-add.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber/www/admin/service-add.adp 20 Oct 2004 19:36:50 -0000 1.1 +++ openacs-4/packages/jabber/www/admin/service-add.adp 17 Apr 2018 14:47:03 -0000 1.2 @@ -6,7 +6,7 @@ -

      Insert was successfull, new service is now available!

      +

      Insert was successful, new service is now available!

      @@ -18,4 +18,4 @@
      -

      Back to admin-page

      \ No newline at end of file +

      Back to admin-page

      Index: openacs-4/packages/jabber/www/doc/installation.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/doc/installation.adp,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/jabber/www/doc/installation.adp 5 Apr 2018 14:44:09 -0000 1.4 +++ openacs-4/packages/jabber/www/doc/installation.adp 17 Apr 2018 14:47:03 -0000 1.5 @@ -171,10 +171,10 @@
      use the following tcl commands:
      -set conn_state [jb_login] #conn_state will be 0 on succsess -1 on error +set conn_state [jb_login] #conn_state will be 0 on success -1 on error
      -set succsess [jb_message "user@server" "The Message string"] -#will be 0 on succsess -1 when the client isn't logged in +set success [jb_message "user@server" "The Message string"] +#will be 0 on success -1 when the client isn't logged in
      set conn_state [jb_logout]

      @@ -297,7 +297,7 @@ emacs jabber.xml
      you have probably done this before, now go to the '<service>' section and in -ther to the '<load>' section +there to the '<load>' section insert a line saying :

      @@ -410,24 +410,24 @@

      Now you should install the Conference Module for the Jabber Server. - If you have already installed the commen Conference Module you schould change to our one, - it is usaly named like the oficial releas with an '+' at the end, - it offers additional features witch make it more usefull for OpenACS. + If you have already installed the common Conference Module you should change to ours, + it is usually named like the official release with a '+' at the end, + it offers additional features which make it more useful for OpenACS. The extra features are:
      Limit the creation of Rooms with a specific prefix (like 'offical_xyz') to Admins
      - Get the Remote (real) JID's of the Members in a Room. This way we know to wich OpenACS User belongs a Message.
      + Get the Remote (real) JID's of the Members in a Room. This way we know to which OpenACS User belongs a Message.

      The nsjabber module for Aolserver will work with the normal Conference Module, but it's recommended to use the '+' version.

      Download the conference-0.4.1+.tar to your server copy it to your Jabber Server directory and untar it.
      ?- tar -xvf conference-0.4.1+.tar -
      know change to the confererence directory and build the binarys. Type: +
      now change to the confererence directory and build the binaries. Type:
      ?- cd conference-0.4.1+
      ?- make
      -
      if the build was successfull you can now configure the Conference Module. +
      if the build was successful you can now configure the Conference Module.

      Index: openacs-4/packages/jabber/www/doc/jabber-instalation.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/doc/jabber-instalation.adp,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/jabber/www/doc/jabber-instalation.adp 5 Apr 2018 14:44:09 -0000 1.4 +++ openacs-4/packages/jabber/www/doc/jabber-instalation.adp 17 Apr 2018 14:47:03 -0000 1.5 @@ -153,16 +153,16 @@ <!-- The Service section is very important, it tells jabberd wich Transports (lib's) to use, - their two ways to use a Transport 1. load/run it in the main jabberd proccess. - 2. load/run a Transport in a own jabberd proccess, and let the main jabberd proccess + their two ways to use a Transport 1. load/run it in the main jabberd process. + 2. load/run a Transport in a own jabberd process, and let the main jabberd process connect to it via the network (preferred way ) As well the service Section configures the Transports (wich url they use etc.) --> - <!-- 1. To load/run a Transport in the main jabberd proccess, put a <service>-xml (like the example A.) - into the jabber.xml file to let the main jabberd proccess load/configure/run the Transport. + <!-- 1. To load/run a Transport in the main jabberd process, put a <service>-xml (like the example A.) + into the jabber.xml file to let the main jabberd process load/configure/run the Transport. After you entered this Section you can restart your server with:
      >jabberd/jabberd -c /usr/local/jabber/jabber.xml @@ -192,10 +192,10 @@ - <!-- 2. To let the main jabberd proccess connect to a Transport that runs in a seperate proccess. + <!-- 2. To let the main jabberd process connect to a Transport that runs in a seperate process. you need a different styled sektion in your jabber.xml file (Example B) to let the main jabberd - know how to connect to a Transport that runs in a seperate proccess (may even on a seperate server) - , and a seperate Transport-jabber.xml (Example C.) file, to let the seperate jabberd proccess + know how to connect to a Transport that runs in a seperate process (may even on a seperate server) + , and a seperate Transport-jabber.xml (Example C.) file, to let the seperate jabberd process load/configure/run The transport. --> @@ -229,7 +229,7 @@ <jabber> - <!-- This section is to let this proccess know how to connect to the main jabberd proccess --> + <!-- This section is to let this process know how to connect to the main jabberd process --> <service id="yahoo-linker"> <connect> @@ -261,20 +261,20 @@

      -You can now start your main jabberd proccess with: +You can now start your main jabberd process with:

      >jabberd/jabberd -c /usr/local/jabber/jabber.xml

      -and to start the Transport in it's own proccess type: +and to start the Transport in it's own process type:

      >jabberd/jabberd -c /usr/local/jabber/yahoo-jabber.xml

      -It will atomaticly try to connect to the main jabberd proccess via the network, -you can start/stop/crash the seperate Transport proccess without harming the main jabberd proccess. +It will atomaticly try to connect to the main jabberd process via the network, +you can start/stop/crash the seperate Transport process without harming the main jabberd process. In case you run your Transport on a seperate Server you need a Jabber instalation on this Server as well.

      Index: openacs-4/packages/jabber/www/doc/jabber-installation.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/doc/jabber-installation.adp,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/jabber/www/doc/jabber-installation.adp 5 Apr 2018 14:44:09 -0000 1.4 +++ openacs-4/packages/jabber/www/doc/jabber-installation.adp 17 Apr 2018 14:47:03 -0000 1.5 @@ -195,10 +195,10 @@ - <!-- 2. To let the main jabberd process connect to a Transport that runs in a seperate process. + <!-- 2. To let the main jabberd process connect to a Transport that runs in a separate process. you need a different styled sektion in your jabber.xml file (Example B) to let the main jabberd - know how to connect to a Transport that runs in a seperate process (may even on a seperate server) - , and a seperate Transport-jabber.xml (Example C.) file, to let the seperate jabberd process + know how to connect to a Transport that runs in a separate process (may even on a separate server) + , and a separate Transport-jabber.xml (Example C.) file, to let the separate jabberd process load/configure/run The transport. --> @@ -277,8 +277,8 @@

      It will atomaticly try to connect to the main jabberd process via the network, -you can start/stop/crash the seperate Transport process without harming the main jabberd process. -In case you run your Transport on a seperate Server you need a Jabber instalation on this Server as well. +you can start/stop/crash the separate Transport process without harming the main jabberd process. +In case you run your Transport on a separate Server you need a Jabber instalation on this Server as well.

      Index: openacs-4/packages/jabber/www/doc/ns-jabber-documentation.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/doc/ns-jabber-documentation.adp,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/jabber/www/doc/ns-jabber-documentation.adp 12 Apr 2018 07:47:22 -0000 1.6 +++ openacs-4/packages/jabber/www/doc/ns-jabber-documentation.adp 17 Apr 2018 14:47:03 -0000 1.7 @@ -130,7 +130,7 @@

      Syntax

      success jb_login void

      Description

      -

      jb_loginThis function takes no parameters, it logs the community client into the Jabber Server. A call to this function should be done on AOLServer startup, or after a restart of the Jabber Server. It returns (success) 0 on a successfull login and -1 otherwise.

      +

      jb_loginThis function takes no parameters, it logs the community client into the Jabber Server. A call to this function should be done on AOLServer startup, or after a restart of the Jabber Server. It returns (success) 0 on a successful login and -1 otherwise.

      NOTE

      A automatic login on AOLServer startup is in work but not implemented yet

      @@ -186,7 +186,7 @@ The screenname and all information related to it, will be removed from the community db backend , as well as the Jabber account relaeted to the screenname. The user will be imidiatly disconected from the Jabber server.

      NOTE

      -

      We work on a version of this function that returns a un-/successfull unregistration +

      We work on a version of this function that returns a un-/successful unregistration information.


      Index: openacs-4/packages/lamsconf/www/userinfo.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lamsconf/www/userinfo.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lamsconf/www/userinfo.tcl 8 Dec 2005 09:20:21 -0000 1.1 +++ openacs-4/packages/lamsconf/www/userinfo.tcl 17 Apr 2018 14:47:03 -0000 1.2 @@ -1,9 +1,9 @@ # packages/lamsconf/www/userinfo.tcl ad_page_contract { - - This page return user info in CSV format to LAMS server. - + + This page return user info in CSV format to LAMS server. + @author Ernie Ghiglione (ErnieG@melcoe.mq.edu.au) @creation-date 2005-11-23 @arch-tag: d96fffd1-bbf0-479e-9fc0-92cd09a63568 @@ -43,8 +43,8 @@ set last_name [acs_user::get_element -user_id $username -element last_name] set email [acs_user::get_element -user_id $username -element email] -ns_log Notice "LAMSint: userinfo transfered to LAMS (user_id $username)" +ns_log Notice "LAMSint: userinfo transferred to LAMS (user_id $username)" # send it to LAMS ReturnHeaders "text/plain" -ns_write "$username,$first_name,$last_name,'','','','','','','',$email" \ No newline at end of file +ns_write "$username,$first_name,$last_name,'','','','','','','',$email" Index: openacs-4/packages/lamsint/www/admin/add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lamsint/www/admin/add.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lamsint/www/admin/add.adp 8 Dec 2005 09:41:08 -0000 1.1 +++ openacs-4/packages/lamsint/www/admin/add.adp 17 Apr 2018 14:47:03 -0000 1.2 @@ -225,7 +225,7 @@ document.getElementById("refresh").disabled = false; if (req.status == 200) { // OK response var res = req.responseText.replace(/^\s*|\s*$/g,""); //get trimed result - var seqlistStr = res.split(':'); //seperate each set of {sid, workspace,sequence} + var seqlistStr = res.split(':'); //separate each set of {sid, workspace,sequence} var seqlist = new Array(); var workspaceList = new Object(); Index: openacs-4/packages/lamsint/www/admin/list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lamsint/www/admin/list.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lamsint/www/admin/list.tcl 8 Dec 2005 09:41:08 -0000 1.1 +++ openacs-4/packages/lamsint/www/admin/list.tcl 17 Apr 2018 14:47:03 -0000 1.2 @@ -1,9 +1,9 @@ # packages/lamsint/www/list.tcl ad_page_contract { - - send LAMS learning deisgn list as a string seperated by ":" to client - + + send LAMS learning deisgn list as a string separated by ":" to client + @author Ernie Ghiglione (ErnieG@melcoe.mq.edu.au) @creation-date 2005-11-23 @arch-tag: 795e8952-ce5b-4d13-9129-17e3e8ce8174 Index: openacs-4/packages/lars-blogger/tcl/test/lars-blogger-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/test/lars-blogger-procs.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lars-blogger/tcl/test/lars-blogger-procs.tcl 12 Jul 2004 11:33:19 -0000 1.4 +++ openacs-4/packages/lars-blogger/tcl/test/lars-blogger-procs.tcl 17 Apr 2018 14:47:03 -0000 1.5 @@ -8,7 +8,7 @@ aa_register_case -cats {smoke api db} lars_blog_add_entry { Test the lars_blogger::entry::new proc -} { +} { aa_run_with_teardown \ -rollback \ @@ -32,6 +32,6 @@ select 1 from pinds_blog_entries where entry_id = :entry_id } -default "0"] - aa_equals "entry was added succesfully" $success_p 1 + aa_equals "entry was added successfully" $success_p 1 } } Index: openacs-4/packages/layout-managed-subsite/lib/configure-configurability.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-managed-subsite/lib/configure-configurability.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/layout-managed-subsite/lib/configure-configurability.tcl 26 Nov 2008 11:10:23 -0000 1.1 +++ openacs-4/packages/layout-managed-subsite/lib/configure-configurability.tcl 17 Apr 2018 14:47:03 -0000 1.2 @@ -12,12 +12,12 @@ {ShowShadeButton:boolean(radio) {label "Show \"Shade\" button on includelet title bars?"} {options {{Yes 1} {No 0}}} - {help_text "\"No\" will supress the display of \"shade\" widgets in includelet title bars"} + {help_text "\"No\" will suppress the display of \"shade\" widgets in includelet title bars"} } {ShowHideButton:boolean(radio) {label "Show \"Hide\" button on includelet title bars?"} {options {{Yes 1} {No 0}}} - {help_text "\"No\" will supress the display of \"hide\" widgets in includelet title bars"} + {help_text "\"No\" will suppress the display of \"hide\" widgets in includelet title bars"} } {ThemeChangeable:boolean(radio) {label "Allow users to change the includelet decoration theme?"} Index: openacs-4/packages/lors/lib/object-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lors/lib/object-new.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/lors/lib/object-new.tcl 3 Dec 2008 12:36:42 -0000 1.5 +++ openacs-4/packages/lors/lib/object-new.tcl 17 Apr 2018 14:47:03 -0000 1.6 @@ -99,7 +99,7 @@ # already. objects should be # able to be resources # without being tied to one manifest, # since you can use # a resource in more than one course and # it doesn't make - # sense to have a seperate row every time # we reuse an + # sense to have a separate row every time # we reuse an # object DAVEB 2070321 - of course, it adds complexity and # special handling, and this works for now. } @@ -126,7 +126,7 @@ # already. objects should be # able to be resources # without being tied to one manifest, # since you can use # a resource in more than one course and # it doesn't make - # sense to have a seperate row every time # we reuse an + # sense to have a separate row every time # we reuse an # object lors::imscp::item_to_resource_add \ Index: openacs-4/packages/lors/tcl/lors-imscp-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lors/tcl/lors-imscp-procs.tcl,v diff -u -N -r1.23 -r1.24 --- openacs-4/packages/lors/tcl/lors-imscp-procs.tcl 29 Mar 2018 22:49:53 -0000 1.23 +++ openacs-4/packages/lors/tcl/lors-imscp-procs.tcl 17 Apr 2018 14:47:03 -0000 1.24 @@ -1084,7 +1084,7 @@ Create an ims_cp_resource from an acs_object TODO since resources can be used for any course, we don't - need to add a seperate resource for each time an object is + need to add a separate resource for each time an object is used. We should return the existing res_id we just don't do that yet. @author Dave Bauer (dave@thedesignexperience.org) Index: openacs-4/packages/lors-central/tcl/apm-callbacks-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lors-central/tcl/apm-callbacks-procs.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/lors-central/tcl/apm-callbacks-procs.tcl 28 Mar 2018 21:04:45 -0000 1.3 +++ openacs-4/packages/lors-central/tcl/apm-callbacks-procs.tcl 17 Apr 2018 14:47:03 -0000 1.4 @@ -8,7 +8,7 @@ ad_proc -private lors_central::apm_callback::package_install { } { - Does the integration whith the notifications package. + Does the integration with the notifications package. } { db_transaction { Index: openacs-4/packages/lors-central/www/doc/ch01s02.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lors-central/www/doc/ch01s02.html,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lors-central/www/doc/ch01s02.html 29 Sep 2005 20:41:35 -0000 1.1 +++ openacs-4/packages/lors-central/www/doc/ch01s02.html 17 Apr 2018 14:47:03 -0000 1.2 @@ -1,3 +1,3 @@ - 2. Manage Course Associations to DotLRN Classes:

      2. Manage Course Associations to DotLRN Classes:

      One course can be associated to one or multiple dotLRN classes, you must have the lorsm portlet added on your class or the course will not added tothat class.

      To associate one course to one dotLRN class click on the link "Course associations to dotLRN class" on lors-central/one-course page:

      Figure 1.7. 

      A page that has all information about the associations of this course is shown. Here you see wich class is using what course version, enable/disable tracking (more about this later).

      To associate or remove one dotLRN class click on the Associate/Drop button on the botom:

      Check all the classes you want to associate to this course and click the "Associate" button (If you don't have the lors portlet in one of does classes then the course will not be associated):

      Figure 1.8. 

      Once you have associated the course to one or more classes it will appear on the bottom list where you can make the same process to remove the association with this course and using the "drop" button:

      Figure 1.9. 

      You can see the now that the course has 2 associations to dotLRN classes:

      \ No newline at end of file + 2. Manage Course Associations to DotLRN Classes:

      2. Manage Course Associations to DotLRN Classes:

      One course can be associated to one or multiple dotLRN classes, you must have the lorsm portlet added on your class or the course will not added tothat class.

      To associate one course to one dotLRN class click on the link "Course associations to dotLRN class" on lors-central/one-course page:

      Figure 1.7. 

      A page that has all information about the associations of this course is shown. Here you see which class is using what course version, enable/disable tracking (more about this later).

      To associate or remove one dotLRN class click on the Associate/Drop button on the botom:

      Check all the classes you want to associate to this course and click the "Associate" button (If you don't have the lors portlet in one of does classes then the course will not be associated):

      Figure 1.8. 

      Once you have associated the course to one or more classes it will appear on the bottom list where you can make the same process to remove the association with this course and using the "drop" button:

      Figure 1.9. 

      You can see the now that the course has 2 associations to dotLRN classes:

      Index: openacs-4/packages/lors-central/www/doc/ch01s04.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lors-central/www/doc/ch01s04.html,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lors-central/www/doc/ch01s04.html 29 Sep 2005 20:41:35 -0000 1.1 +++ openacs-4/packages/lors-central/www/doc/ch01s04.html 17 Apr 2018 14:47:03 -0000 1.2 @@ -1,3 +1,3 @@ - 4. Pushing different versions of a course to DotLRN Classes:

      4. Pushing different versions of a course to DotLRN Classes:

      Lors-Central has the ability to show one version of one course to one class and another version of the same course to another class. This is managed in the "course associations to dotLRN class" link on one-course page (Section 2):

      Figure 1.13. 

      There are diferent 2 ways to change the wich version of the course is shown in wich class:

      1. With the "Make Live Everywhere" link on the top table, this will set the same version of every course on all classes. i.e. If you click on the "Make Live Everywhere" link on version number 2 then all classes will see that version:

        Figure 1.14. 

      2. With the "Set to" collum on the bottom list, here you can select wich version will be shown on every course ( The version number is the number on the first collumn on the top list). Once you have selected the number click on "Update Versions" button:

        Figure 1.15. 

        Figure 1.16. 

      You can see wich classes are using the course by cliking on the number of the "Live Classes?" column on the top table.

      \ No newline at end of file + 4. Pushing different versions of a course to DotLRN Classes:

      4. Pushing different versions of a course to DotLRN Classes:

      Lors-Central has the ability to show one version of one course to one class and another version of the same course to another class. This is managed in the "course associations to dotLRN class" link on one-course page (Section 2):

      Figure 1.13. 

      There are diferent 2 ways to change the which version of the course is shown in which class:

      1. With the "Make Live Everywhere" link on the top table, this will set the same version of every course on all classes. i.e. If you click on the "Make Live Everywhere" link on version number 2 then all classes will see that version:

        Figure 1.14. 

      2. With the "Set to" collum on the bottom list, here you can select which version will be shown on every course ( The version number is the number on the first collumn on the top list). Once you have selected the number click on "Update Versions" button:

        Figure 1.15. 

        Figure 1.16. 

      You can see which classes are using the course by cliking on the number of the "Live Classes?" column on the top table.

      Index: openacs-4/packages/lors-central/www/doc/ch01s05.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lors-central/www/doc/ch01s05.html,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lors-central/www/doc/ch01s05.html 29 Sep 2005 20:41:35 -0000 1.1 +++ openacs-4/packages/lors-central/www/doc/ch01s05.html 17 Apr 2018 14:47:03 -0000 1.2 @@ -1,3 +1,3 @@ - 5. Manage Course Learning Objects:

      5. Manage Course Learning Objects:

      First we need to know that a Learning Object (LO) is a collection of files (images, text, html, animations, media) and URL'S that are all related as one.

      One Course is a collection of this LO's (Items) as you can see on the one-course page:

      Figure 1.17. 

      5.1. Learnig Object versions:

      The Learning Objects inside one course can also have versions, each one of them can also be assigned to dotLRN classes, i.e. you can have to versions of the same LO but show one version to Class 1 and the other one to Class 2. Lets see one Learning Object. ( For the documentation we will use Overview item). Click on the item name to see the information about this LO:

      Since one LO can have diferent files associated, editing one file or adding one to the LO will create a new version of the item. To do click on the item name, this will lead you to a pege where all the files associated to this item will be shown:

      Figure 1.18. 

      5.1.1. Editing one File:

      To edit one file, click on the pecil image on the left of the file title, this will lead you to a page where you can edit the file (If it's editable) or upload a new one. This will generete a new version of the Learning Object and also a new version of the file itself (we are going to upload a new file):

      Figure 1.19. 

      5.1.2. Pushing and Hidding Learning Objects:

      Now there are two versions of the Learning Object. We can choose, as we did with in section 4, wich version of the item we will show on every dotLRN class. Also we can hide this Learning Object from one class by clicking on "Hide" link on the first list, or by selecting version number 0 from the "Set to" column on the second table:

      Figure 1.20. 

      5.1.3. Sharing Learning Objects:

      The pruopose of sharing one Learning Object is for making it available for adding to another course ( More about on section 5.2). To share one Learning Object click on the "Yes" link on the "Shared?" column, to not share one Learning Object anymore click on the "No" link on the same collumn:

      Figure 1.21. 

      5.2. Adding Learning Objects:

      You can add one Learning Object by clicking on the "Add Child" link, on the "Add Object" column, this will add a new LO under the Add Child link. You can add a Learning Object on one course by:

      1. Adding a New Learning Object by uploading a new file , you can add multiple files by uploading a zip file (make sure to check the checkbox) containting all files that you are goin to upload at the same time, very usefull when adding one html files with various images:

        Figure 1.22. 

      2. Adding an existent Learning Object: You can choose to add to your course one existent LO that is shared across the Lors Central Repository. To add one existent LO click on the "Here" link on the top right corner:

        Figure 1.23. 

        You will be redirected to a page where a list of all shared items will appear, so you can add any of this items by clicking on the "Add This Item" link:

        Figure 1.24. 

        We add "Activity 1" from RDLA125.0 Course:

        Figure 1.25. 

      5.3. Reordering Learning Objects:

      Items can be reorder in one course by making click on the arrows on the left of the "Item Name" column on one-course page:

      Figure 1.26. 

      Figure 1.27. 

      \ No newline at end of file + 5. Manage Course Learning Objects:

      5. Manage Course Learning Objects:

      First we need to know that a Learning Object (LO) is a collection of files (images, text, html, animations, media) and URL'S that are all related as one.

      One Course is a collection of this LO's (Items) as you can see on the one-course page:

      Figure 1.17. 

      5.1. Learnig Object versions:

      The Learning Objects inside one course can also have versions, each one of them can also be assigned to dotLRN classes, i.e. you can have to versions of the same LO but show one version to Class 1 and the other one to Class 2. Lets see one Learning Object. ( For the documentation we will use Overview item). Click on the item name to see the information about this LO:

      Since one LO can have diferent files associated, editing one file or adding one to the LO will create a new version of the item. To do click on the item name, this will lead you to a pege where all the files associated to this item will be shown:

      Figure 1.18. 

      5.1.1. Editing one File:

      To edit one file, click on the pecil image on the left of the file title, this will lead you to a page where you can edit the file (If it's editable) or upload a new one. This will generete a new version of the Learning Object and also a new version of the file itself (we are going to upload a new file):

      Figure 1.19. 

      5.1.2. Pushing and Hidding Learning Objects:

      Now there are two versions of the Learning Object. We can choose, as we did with in section 4, which version of the item we will show on every dotLRN class. Also we can hide this Learning Object from one class by clicking on "Hide" link on the first list, or by selecting version number 0 from the "Set to" column on the second table:

      Figure 1.20. 

      5.1.3. Sharing Learning Objects:

      The pruopose of sharing one Learning Object is for making it available for adding to another course ( More about on section 5.2). To share one Learning Object click on the "Yes" link on the "Shared?" column, to not share one Learning Object anymore click on the "No" link on the same collumn:

      Figure 1.21. 

      5.2. Adding Learning Objects:

      You can add one Learning Object by clicking on the "Add Child" link, on the "Add Object" column, this will add a new LO under the Add Child link. You can add a Learning Object on one course by:

      1. Adding a New Learning Object by uploading a new file , you can add multiple files by uploading a zip file (make sure to check the checkbox) containting all files that you are goin to upload at the same time, very usefull when adding one html files with various images:

        Figure 1.22. 

      2. Adding an existent Learning Object: You can choose to add to your course one existent LO that is shared across the Lors Central Repository. To add one existent LO click on the "Here" link on the top right corner:

        Figure 1.23. 

        You will be redirected to a page where a list of all shared items will appear, so you can add any of this items by clicking on the "Add This Item" link:

        Figure 1.24. 

        We add "Activity 1" from RDLA125.0 Course:

        Figure 1.25. 

      5.3. Reordering Learning Objects:

      Items can be reorder in one course by making click on the arrows on the left of the "Item Name" column on one-course page:

      Figure 1.26. 

      Figure 1.27. 

      Index: openacs-4/packages/lorsm/tcl/lorsm-delivery-scorm-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/tcl/lorsm-delivery-scorm-procs.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/tcl/lorsm-delivery-scorm-procs.tcl 12 Dec 2008 14:25:33 -0000 1.4 +++ openacs-4/packages/lorsm/tcl/lorsm-delivery-scorm-procs.tcl 17 Apr 2018 14:47:03 -0000 1.5 @@ -104,7 +104,7 @@ append todo " WHERE track_id=$block_track_id" db_dml todo $todo if { [db_resultrows] == 1 } { - ns_log debug "SCORM: lesson_status processing UPDATE: '$todo' successfull" + ns_log debug "SCORM: lesson_status processing UPDATE: '$todo' succesful" #POST PROCESSING if { ! [string equal $father_type "ims_manifest_object" ] } { @@ -113,7 +113,7 @@ ns_log debug "SCORM parents: end calling self" } } else { - ns_log warning "SCORM parents: lesson_status processing UPDATE: '$todo' not successfull -> please check" + ns_log warning "SCORM parents: lesson_status processing UPDATE: '$todo' not successful -> please check" } } else { @@ -129,15 +129,15 @@ db_dml lmsinitialize {} if { [db_resultrows] == 1 } { - ns_log debug "SCORM: lesson_status processing INSERT: $block_track_id to $target_status successfull" + ns_log debug "SCORM: lesson_status processing INSERT: $block_track_id to $target_status successful" #POST PROCESSING if { ! [string equal $father_type "ims_manifest_object" ] } { ns_log debug "SCORM parents: calling self" lorsm::delivery::scorm::check_parents -ims_item_id $father ns_log debug "SCORM parents: end calling self" } } else { - ns_log warning "SCORM parents: lesson_status processing INSERT: '$block_track_id' to $target_status not successfull -> please check" + ns_log warning "SCORM parents: lesson_status processing INSERT: '$block_track_id' to $target_status not successful -> please check" } } Index: openacs-4/packages/lorsm/www/delivery/popup.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/popup.adp,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/lorsm/www/delivery/popup.adp 23 Mar 2018 22:56:43 -0000 1.7 +++ openacs-4/packages/lorsm/www/delivery/popup.adp 17 Apr 2018 14:47:03 -0000 1.8 @@ -244,7 +244,7 @@ } try { - var active=this.document.applets[0].isActive(); //mozilla error on this, IE just gives out (doesnt' go in the catch ???) + var active=this.document.applets[0].isActive(); //mozilla error on this, IE just gives out (doesn't go in the catch ???) } catch (err) { try { var active=this.document.applets[0].isActive; //this is mozilla specific, IE is just allergic (we have enough wars not to think of browsers'.... Index: openacs-4/packages/lorsm/www/delivery/servlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/servlet.tcl,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/lorsm/www/delivery/servlet.tcl 5 Apr 2018 14:44:09 -0000 1.11 +++ openacs-4/packages/lorsm/www/delivery/servlet.tcl 17 Apr 2018 14:47:03 -0000 1.12 @@ -204,18 +204,18 @@ #retrieve data other than core if { ![db_0or1row get_adlcp_student_data2 {}] } { - ns_log Error "SCORM recoverying of student data: not successfull on $currenttrackid -> please check" + ns_log Error "SCORM recovering of student data: not successful on $currenttrackid -> please check" set max_time_allowed "" set time_limit_action "" set mastery_score "" } else { - ns_log debug "SCORM recoverying of student data: successfull" + ns_log debug "SCORM recovering of student data: successful" } # THIS CHECK is somehow just a previous bug catcher, shouldn't actually be needed # if { [db_resultrows] == 1 } { - # ns_log debug "SCORM recoverying of student data: successfull" + # ns_log debug "SCORM recovering of student data: successful" # } else { - # ns_log Error "SCORM recoverying of student data: not successfull on $currenttrackid -> please check" + # ns_log Error "SCORM recovering of student data: not successful on $currenttrackid -> please check" # } ns_log $basiclevel "SCORM retrieved track id in lorsm_cmi_core: $currenttrackid" @@ -237,9 +237,9 @@ db_dml todo $todo if { [db_resultrows] == 1 } { - ns_log debug "SCORM time processing UPDATE: '$todo' successfull" + ns_log debug "SCORM time processing UPDATE: '$todo' successful" } else { - ns_log Warning "SCORM time processing UPDATE: '$todo' not successfull -> please check" + ns_log Warning "SCORM time processing UPDATE: '$todo' not successful -> please check" } set todo "UPDATE lorsm_cmi_core SET session_time = '0" @@ -248,9 +248,9 @@ append todo " WHERE track_id=$currenttrackid" db_dml todo $todo if { [db_resultrows] == 1 } { - ns_log debug "SCORM data processing UPDATE: '$todo' successfull" + ns_log debug "SCORM data processing UPDATE: '$todo' successful" } else { - ns_log Warning "SCORM time processing UPDATE: '$todo' not successfull -> please check" + ns_log Warning "SCORM time processing UPDATE: '$todo' not successful -> please check" } #AURALOG HACK #adjust on a per-server basis @@ -421,9 +421,9 @@ db_dml todo $todo if { [db_resultrows] == 1 } { - ns_log debug "SCORM data msecs processing UPDATE: '$todo' successfull" + ns_log debug "SCORM data msecs processing UPDATE: '$todo' successful" } else { - ns_log Warning "SCORM data msecs processing UPDATE: '$todo' not successfull -> please check" + ns_log Warning "SCORM data msecs processing UPDATE: '$todo' not successful -> please check" } #set minutes [string trim [lindex [split $value :] 1]] @@ -438,9 +438,9 @@ db_dml todo $todo if { [db_resultrows] == 1 } { - ns_log debug "SCORM data processing UPDATE: '$todo' successfull" + ns_log debug "SCORM data processing UPDATE: '$todo' successful" } else { - ns_log Warning "SCORM data processing UPDATE: '$todo' not successfull -> please check" + ns_log Warning "SCORM data processing UPDATE: '$todo' not successful -> please check" } #lesson_status postprocessing Index: openacs-4/packages/lorsm/www/delivery-scorm/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-scorm/index.adp,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/lorsm/www/delivery-scorm/index.adp 23 Mar 2018 22:56:43 -0000 1.3 +++ openacs-4/packages/lorsm/www/delivery-scorm/index.adp 17 Apr 2018 14:47:03 -0000 1.4 @@ -119,7 +119,7 @@ } try { - var active=AppletContainerFrame.document.applets[0].isActive(); //mozilla error on this, IE just gives out (doesnt' go in the catch ???) + var active=AppletContainerFrame.document.applets[0].isActive(); //mozilla error on this, IE just gives out (doesn't go in the catch ???) } catch (err) { try { var active=AppletContainerFrame.document.applets[0].isActive; //this is mozilla specific, IE is just allergic (we have enough wars not to think of browsers'.... Index: openacs-4/packages/lorsm/www/delivery-scorm/servlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-scorm/servlet.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/lorsm/www/delivery-scorm/servlet.tcl 5 Apr 2018 14:44:09 -0000 1.3 +++ openacs-4/packages/lorsm/www/delivery-scorm/servlet.tcl 17 Apr 2018 14:47:03 -0000 1.4 @@ -209,18 +209,18 @@ append todo " WHERE track_id=:currenttrackid" db_dml todo $todo if { [db_resultrows] == 1 } { - #ns_log $level "lorsm - time processing UPDATE: '$todo' successfull" + #ns_log $level "lorsm - time processing UPDATE: '$todo' successful" } else { - ns_log Warning "lorsm - time processing UPDATE: '$todo' not successfull -> please check" + ns_log Warning "lorsm - time processing UPDATE: '$todo' not successful -> please check" } set todo "UPDATE lorsm_cmi_core SET session_time = '0" append todo "', session_time_ms ='0' " append todo " WHERE track_id=:currenttrackid" db_dml todo $todo if { [db_resultrows] == 1 } { - #ns_log $level "lorsm - data processing UPDATE: '$todo' successfull" + #ns_log $level "lorsm - data processing UPDATE: '$todo' successful" } else { - ns_log Warning "lorsm - time processing UPDATE: '$todo' not successfull -> please check" + ns_log Warning "lorsm - time processing UPDATE: '$todo' not successful -> please check" } #AURALOG HACK #adjust on a per-server basis @@ -339,9 +339,9 @@ append todo "' WHERE track_id=:currenttrackid" db_dml todo $todo if { [db_resultrows] == 1 } { - ns_log $level "lorsm - data msecs processing UPDATE: '$todo' successfull" + ns_log $level "lorsm - data msecs processing UPDATE: '$todo' successful" } else { - ns_log Warning "lorsm - data msecs processing UPDATE: '$todo' not successfull -> please check" + ns_log Warning "lorsm - data msecs processing UPDATE: '$todo' not successful -> please check" } #set minutes [string trim [lindex [split $value :] 1]] #set seconds [string trim [lindex [split $value :] 2]] @@ -352,9 +352,9 @@ append todo "' WHERE track_id=:currenttrackid" db_dml todo $todo if { [db_resultrows] == 1 } { - ns_log $level "lorsm - data processing UPDATE: '$todo' successfull" + ns_log $level "lorsm - data processing UPDATE: '$todo' successful" } else { - ns_log Warning "lorsm - data processing UPDATE: '$todo' not successfull -> please check" + ns_log Warning "lorsm - data processing UPDATE: '$todo' not successful -> please check" } } } Index: openacs-4/packages/lorsm/www/delivery-scorm/view/index.vuh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery-scorm/view/index.vuh,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/lorsm/www/delivery-scorm/view/index.vuh 5 Apr 2018 14:44:09 -0000 1.3 +++ openacs-4/packages/lorsm/www/delivery-scorm/view/index.vuh 17 Apr 2018 14:47:03 -0000 1.4 @@ -2,10 +2,10 @@ @author Unknown @creation-date Unknown @cvs-id $Id$ -} { +} { { ims_item_id "" } } - + # check if the nsv variable exists if {![nsv_exists delivery_vars [ad_conn session_id]]} { ad_returnredirect [lors::get_community_url] @@ -61,7 +61,7 @@ if { ![empty_string_p $revision_id] } { # We catch the revision id using the_url and content root - ns_log debug "index.vuh SCORM : visting revision_id $item_id for $the_url" + ns_log debug "index.vuh SCORM : visiting revision_id $item_id for $the_url" cr_write_content -revision_id $revision_id } else { # Write the ims_item_id that we receive on the page since this is the one that holds the content Index: openacs-4/packages/mail-tracking/sql/postgresql/mail-tracking-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/mail-tracking/sql/postgresql/mail-tracking-create.sql,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/mail-tracking/sql/postgresql/mail-tracking-create.sql 24 Dec 2006 11:12:24 -0000 1.11 +++ openacs-4/packages/mail-tracking/sql/postgresql/mail-tracking-create.sql 17 Apr 2018 14:47:03 -0000 1.12 @@ -31,7 +31,7 @@ package_id integer, subject varchar(1024), body text, - -- List of CC/BCC E-Mail addresses, seperated by "," as passed in from acs-mail-lite::send prozedures + -- List of CC/BCC E-Mail addresses, separated by "," as passed in from acs-mail-lite::send procedures -- Only used for those emails that do not have a party_id in openacs. cc varchar(4000), bcc varchar(4000), @@ -287,4 +287,4 @@ -- --reate trigger acs_mail_log_tr after delete on acs_mail_lite_queue --or each row execute procedure acs_mail_log_tr(); --- \ No newline at end of file +-- Index: openacs-4/packages/mail-tracking/tcl/mail-tracking-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/mail-tracking/tcl/mail-tracking-procs.tcl,v diff -u -N -r1.9 -r1.10 --- openacs-4/packages/mail-tracking/tcl/mail-tracking-procs.tcl 5 Apr 2018 14:44:09 -0000 1.9 +++ openacs-4/packages/mail-tracking/tcl/mail-tracking-procs.tcl 17 Apr 2018 14:47:03 -0000 1.10 @@ -48,9 +48,9 @@ @param recipient_ids List of party_ids of recipients @param cc_ids List of party_ids for recipients in the "CC" field @param bcc_ids List of party_ids for recipients in the "BCC" field - @param to_addr List of email addresses seperated by "," who received the email in the "to" field but got no party_id - @param cc_addr List of email addresses seperated by "," who received the email in the "cc" field but got no party_id - @param bcc_addr List of email addresses seperated by "," who received the email in the "bcc" field but got no party_id + @param to_addr List of email addresses separated by "," who received the email in the "to" field but got no party_id + @param cc_addr List of email addresses separated by "," who received the email in the "cc" field but got no party_id + @param bcc_addr List of email addresses separated by "," who received the email in the "bcc" field but got no party_id @param body Text of the message @param message_id Message_id of the email @param subject Subject of the email @@ -62,7 +62,7 @@ if {![string eq "" $context_id]} { set object_id $context_id } - + set log_id [db_nextval "acs_object_id_seq"] # First create the message entry db_dml insert_mail_log { Index: openacs-4/packages/messages/www/messages-folders.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/messages/www/messages-folders.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/messages/www/messages-folders.adp 31 Aug 2010 21:30:44 -0000 1.1 +++ openacs-4/packages/messages/www/messages-folders.adp 17 Apr 2018 14:47:03 -0000 1.2 @@ -86,7 +86,7 @@ - + Index: openacs-4/packages/monitoring/www/cassandracle/objects/add-comments.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/monitoring/www/cassandracle/objects/add-comments.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/monitoring/www/cassandracle/objects/add-comments.tcl 29 Mar 2018 15:03:01 -0000 1.3 +++ openacs-4/packages/monitoring/www/cassandracle/objects/add-comments.tcl 17 Apr 2018 14:47:03 -0000 1.4 @@ -43,16 +43,16 @@

      " -# we do two seperate queries: one for the table (0 or 1) +# we do two separate queries: one for the table (0 or 1) # and one for the columns (0, 1, or many) -# note that these same queries are similar to -# those run in /objects/describe-table.tcl, excpet +# note that these same queries are similar to +# those run in /objects/describe-table.tcl, except # I do not have the not null conditions set table_comment_query " -- /objects/add-comments.tcl -- get table comments --- +-- select dtc.comments as table_comment from Index: openacs-4/packages/monitoring/www/cassandracle/objects/describe-table.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/monitoring/www/cassandracle/objects/describe-table.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/monitoring/www/cassandracle/objects/describe-table.tcl 28 Mar 2018 17:00:41 -0000 1.3 +++ openacs-4/packages/monitoring/www/cassandracle/objects/describe-table.tcl 17 Apr 2018 14:47:03 -0000 1.4 @@ -13,9 +13,9 @@ # check arguments ----------------------------------------------------- -# it is not clear to me whey we have one object_name argument here -# of the format OWNER.TABLE_NAME that needs to be parsed, rather than -# two seperate arguments? +# it is not clear to me why we have one object_name argument here +# of the format OWNER.TABLE_NAME that needs to be parsed, rather than +# two separate arguments? # $object_name REQUIRED ARGUMENT set object_info [split $object_name .] @@ -311,7 +311,7 @@ # display comments on tables and columns, if any exist ------------------------------- -# we do two seperate queries: one for the table (0 or 1) +# we do two separate queries: one for the table (0 or 1) # and one for the columns (0, 1, or many) # note that these same queries are run in /objects/add-comments.tcl Index: openacs-4/packages/postal-address/postal-address.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/postal-address/postal-address.info,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/postal-address/postal-address.info 27 May 2007 12:19:10 -0000 1.3 +++ openacs-4/packages/postal-address/postal-address.info 17 Apr 2018 14:47:03 -0000 1.4 @@ -23,7 +23,7 @@ - + Index: openacs-4/packages/project-manager/project-manager.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/project-manager.info,v diff -u -N -r1.58 -r1.59 --- openacs-4/packages/project-manager/project-manager.info 23 Mar 2007 07:53:21 -0000 1.58 +++ openacs-4/packages/project-manager/project-manager.info 17 Apr 2018 14:47:03 -0000 1.59 @@ -6,7 +6,7 @@ Project Managers f f - + Jade Rubick Malte Sussdorff @@ -38,7 +38,7 @@ - + @@ -54,7 +54,7 @@ - + Index: openacs-4/packages/project-manager/tcl/project-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/project-procs.tcl,v diff -u -N -r1.47 -r1.48 --- openacs-4/packages/project-manager/tcl/project-procs.tcl 5 Apr 2018 14:44:09 -0000 1.47 +++ openacs-4/packages/project-manager/tcl/project-procs.tcl 17 Apr 2018 14:47:03 -0000 1.48 @@ -1258,15 +1258,15 @@ if {[string is true $debug]} { ns_log Notice " dependent_item: $dependent_item" } - + if {[exists_and_not_null ongoing_task($dependent_item)]} { set defer_p f set my_latest_start "" if {[string is true $debug]} { ns_log Notice " ongoing_task, no defer" } - + } elseif {![exists_and_not_null latest_start($dependent_item)]} { # we defer the task if the dependent item has no # latest_start date set @@ -1283,7 +1283,7 @@ # be cleaned up better. Defering is necessary # given this algorithm, but there are # times when you don't want to defer. - # This is hackish, and I'm embarrased, but on + # This is hackish, and I'm embarrassed, but on # a deadline. :( if {$defer_count($task_item) > 5} { set defer_p f @@ -1300,13 +1300,13 @@ set defer_p t } - + } else { - + # the dependent item has a deadline - + if {[string is false [exists_and_not_null activity_time($task_item)]]} { set activity_time($task_item) 0 ns_log Notice "setting activity_time($task_item) 0 (location 3)" @@ -1317,7 +1317,7 @@ -end_date_j $latest_start($dependent_item) \ -hours_to_complete $activity_time($task_item) \ -hours_day $hours_day] - + if {[string is true $debug]} { ns_log Notice " my_latest_start: $my_latest_start" } @@ -2907,15 +2907,15 @@ if {[string is true $debug]} { ns_log Notice " dependent_item: $dependent_item" } - + if {[exists_and_not_null ongoing_task($dependent_item)]} { set defer_p f set my_latest_start "" if {[string is true $debug]} { ns_log Notice " ongoing_task, no defer" } - + } elseif {![exists_and_not_null latest_start($dependent_item)]} { # we defer the task if the dependent item has no # latest_start date set @@ -2932,7 +2932,7 @@ # be cleaned up better. Defering is necessary # given this algorithm, but there are # times when you don't want to defer. - # This is hackish, and I'm embarrased, but on + # This is hackish, and I'm embarrassed, but on # a deadline. :( if {$defer_count($task_item) > 5} { set defer_p f @@ -2949,13 +2949,13 @@ set defer_p t } - + } else { - + # the dependent item has a deadline - + if {[string is false [exists_and_not_null activity_time($task_item)]]} { set activity_time($task_item) 0 ns_log Notice "setting activity_time($task_item) 0 (location 3)" @@ -2966,7 +2966,7 @@ -end_date $latest_start($dependent_item) \ -hours_to_complete $activity_time($task_item) \ -hours_day $hours_day] - + if {[string is true $debug]} { ns_log Notice " my_latest_start: $my_latest_start" } Index: openacs-4/packages/ref-currency/sql/common/currencies.dat =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ref-currency/sql/common/currencies.dat,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/ref-currency/sql/common/currencies.dat 16 Jun 2005 17:34:33 -0000 1.2 +++ openacs-4/packages/ref-currency/sql/common/currencies.dat 17 Apr 2018 14:47:03 -0000 1.3 @@ -177,7 +177,7 @@ VUV,548,0,,Vatu WST,882,2,,Tala XAF,950,0,,CFA Franc BEAC -XCD,951,2,,East Carribbean Dollar +XCD,951,2,,East Caribbean Dollar XOF,952,0,,CFA Franc BCEAO XPF,953,0,,CFP Franc YER,886,2,,Yemeni Rial Index: openacs-4/packages/ref-unspsc/catalog/ref-unspsc.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ref-unspsc/catalog/ref-unspsc.en_US.ISO-8859-1.xml,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/ref-unspsc/catalog/ref-unspsc.en_US.ISO-8859-1.xml 29 Mar 2018 17:28:50 -0000 1.4 +++ openacs-4/packages/ref-unspsc/catalog/ref-unspsc.en_US.ISO-8859-1.xml 17 Apr 2018 14:47:03 -0000 1.5 @@ -10022,7 +10022,7 @@ Spectacle fitting sets Vision testing stereoscopes Combination refractor keratometers -Opthalmometer base plates +Ophtalmometer base plates Chart projectors or accessories Ophthalmic instrument pads Ophthalmic lens holders @@ -11066,7 +11066,7 @@ Surgical stabilizers Surgical tissue protectors Orthopedic retractors -Opthalmic retractors +Ophtalmic retractors Cardiovascular or thoracic retractors Vein retractors Oral retractors @@ -13306,7 +13306,7 @@ Gun barrel Watersports equipment Scuba and snorkeling gear -Bouyancy compensators +Buoyancy compensators Scuba tanks Scuba regulators Diving instruments or accessories @@ -15431,7 +15431,7 @@ Aural preparations Dioctyl sodium sulphosuccinate Triethanolamine polypeptide oleate -Opthalmic agents +Ophtalmic agents Acetylcholine chloride Apraclonidine hydrochloride Bimatoprost Index: openacs-4/packages/robot-detection/robot-detection.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/robot-detection/robot-detection.info,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/robot-detection/robot-detection.info 11 Dec 2003 21:40:12 -0000 1.6 +++ openacs-4/packages/robot-detection/robot-detection.info 17 Apr 2018 14:47:03 -0000 1.7 @@ -16,7 +16,7 @@ 2001-01-26 OpenACS With this package, you can automatically redirect web robots from search engines away from areas that require login and into a separate area which provides content suitable for indexing. You should be aware that this is sometimes considered to be -<a href="http://www.google.com/webmasters/faq.html#cloaking">cloaking</a> so excercise care here. +<a href="http://www.google.com/webmasters/faq.html#cloaking">cloaking</a> so exercise care here. Index: openacs-4/packages/scholarship-fund/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/scholarship-fund/www/index.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/scholarship-fund/www/index.tcl 22 Aug 2005 18:29:47 -0000 1.7 +++ openacs-4/packages/scholarship-fund/www/index.tcl 17 Apr 2018 14:47:03 -0000 1.8 @@ -1,15 +1,15 @@ # ad_page_contract { - + List scholarship Funds - + @author Dave Bauer (dave@thedesignexperience.org) @creation-date 2005-05-17 @arch-tag: d8a5f3d7-6fa9-441b-a082-3c8db5eb6c67 @cvs-id $Id$ } { - + } -properties { page_title context @@ -31,7 +31,7 @@ -privilege "admin"] set actions [list "Add Fund" fund-add-edit "Add a new scholarship fund" \ - "Export All Non-Transferred and MARK ALL Transfered" export-confirm?all=1&mark=1 "Export All Expenses" \ + "Export All Non-Transferred and MARK ALL Transferred" export-confirm?all=1&mark=1 "Export All Expenses" \ "Export All but DO NOT MARK Transferred" export-confirm?all=1&mark=0 "Export Expenses"] db_multirow -extend { one_url edit_url delete_url } funds get_funds "" { @@ -64,4 +64,4 @@ set focus "" set header_stuff "" -ad_return_template \ No newline at end of file +ad_return_template Index: openacs-4/packages/simple-survey/www/doc/porting.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/doc/porting.html,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/simple-survey/www/doc/porting.html 20 Apr 2001 20:51:22 -0000 1.1 +++ openacs-4/packages/simple-survey/www/doc/porting.html 17 Apr 2018 14:47:03 -0000 1.2 @@ -79,7 +79,7 @@

      Registering the Package

      -ACS 4.0 provides easy to use package management facilites to associate +ACS 4.0 provides easy to use package management facilities to associate files, watch TCL libraries for changes and mount packages at arbitrary URLs on the client site. This is managed through the admin interface provided at acs-admin/apm under a standard ACS 4.0 install. The Index: openacs-4/packages/simulation/www/doc/permissions-table.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/doc/permissions-table.html,v diff -u -N -r1.10 -r1.11 --- openacs-4/packages/simulation/www/doc/permissions-table.html 18 Dec 2003 09:58:28 -0000 1.10 +++ openacs-4/packages/simulation/www/doc/permissions-table.html 17 Apr 2018 14:47:03 -0000 1.11 @@ -701,7 +701,7 @@ unresolved:
      - I'm a very zealous professor, and would like to create a simulation that i will not run untill next year. I want to create the simulation, upload the documents. And click start a year from now.. I want to create the simulation, upload the documents. And click start a year from now. + I'm a very zealous professor, and would like to create a simulation that i will not run until next year. I want to create the simulation, upload the documents. And click start a year from now.. I want to create the simulation, upload the documents. And click start a year from now.

      Index: openacs-4/packages/soap-db/tcl/example-soap-procs.txt =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/soap-db/tcl/example-soap-procs.txt,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/soap-db/tcl/example-soap-procs.txt 11 Aug 2006 01:50:46 -0000 1.1 +++ openacs-4/packages/soap-db/tcl/example-soap-procs.txt 17 Apr 2018 14:47:03 -0000 1.2 @@ -1,10 +1,10 @@ ad_library { - + Example Library for SOAP-Gateway oacs_server Procs, this is the client implementation of soap-db within openacs. - We use the soap-gateway package to actually make available this procs, + We use the soap-gateway package to actually make available this procs, though you might have this kind of implementation in another environment like .NET or so, - but you have to make it return the same stuff that teh db_* procs does. - + but you have to make it return the same stuff that the db_* procs does. + @author Derick Leony (derickleony@galileo.edu) @creation-date 2006-01-25 } @@ -15,7 +15,7 @@ query } { Permorms a query and returns the row. - + @author Derick Leony (derickleony@galileo.edu) @idl string DBString(string query) } { Index: openacs-4/packages/theme-selva/www/doc/howto/node8.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/doc/howto/node8.html,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/theme-selva/www/doc/howto/node8.html 26 Jul 2005 14:28:30 -0000 1.1 +++ openacs-4/packages/theme-selva/www/doc/howto/node8.html 17 Apr 2018 14:47:03 -0000 1.2 @@ -61,7 +61,7 @@
      One easy way to prevent an information from being displayed is to used the CSS "display:none;" property. Otherwise, you can edit your own DefaultMaster and remove everything you don't want. As this is free software, you can alter the software in any way you want, although it might require a long study of both the API and the data model for OpenACS and the .LRN softwares.
      -As adding or removing functionalities is not really part of the theming, but part of the logic (ie : require changes in the source code of the software) I will not explain that in that document. Nevertheless, you will find usefull information to achieve that goal at http://www.openacs.org/doc/ . +As adding or removing functionalities is not really part of the theming, but part of the logic (ie : require changes in the source code of the software) I will not explain that in that document. Nevertheless, you will find useful information to achieve that goal at http://www.openacs.org/doc/ .



      Index: openacs-4/packages/trackback/tcl/test/trackback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/trackback/tcl/test/trackback-procs.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/trackback/tcl/test/trackback-procs.tcl 14 Nov 2003 15:18:06 -0000 1.3 +++ openacs-4/packages/trackback/tcl/test/trackback-procs.tcl 17 Apr 2018 14:47:03 -0000 1.4 @@ -8,7 +8,7 @@ aa_register_case trackback_new { Test the trackback::new proc. -} { +} { aa_run_with_teardown \ -rollback \ @@ -17,7 +17,7 @@ set tb_url "http://foobar.com" set object_id [ad_conn path_info] set comment_id [db_nextval acs_object_id_seq] - + # Add trackback trackback::new \ -tb_url $tb_url \ @@ -36,6 +36,6 @@ select 1 from trackback_pings where tb_url = :tb_url } -default "0"] - aa_equals "trackback was added succesfully" $success_p 1 + aa_equals "trackback was added successfully" $success_p 1 } } Index: openacs-4/packages/trackback/www/doc/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/trackback/www/doc/index.adp,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/trackback/www/doc/index.adp 12 Sep 2016 06:08:57 -0000 1.4 +++ openacs-4/packages/trackback/www/doc/index.adp 17 Apr 2018 14:47:03 -0000 1.5 @@ -18,8 +18,8 @@ specificaion.

      How it works

      Trackback pings are stored as general-comments. Because -general_comment is anot a content repostiory content_type, -trackback is not a seperate object_type. This will be fixed in a +general_comment is not a content repostiory content_type, +trackback is not a separate object_type. This will be fixed in a future version. Additional information about the weblog that sent the ping is stored in the trackback_pings table.

      Currently any object_id that allows general_comment_create for Index: openacs-4/packages/trackback/www/doc/index.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/trackback/www/doc/index.html,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/trackback/www/doc/index.html 4 Apr 2018 18:51:56 -0000 1.3 +++ openacs-4/packages/trackback/www/doc/index.html 17 Apr 2018 14:47:03 -0000 1.4 @@ -13,7 +13,7 @@

      A good guide to how it all works is A Beginner's Guide to Trackback (opens in new window) by Mena and Ben Trott, the original designers of the Trackback specificaion.

      How it works

      -Trackback pings are stored as general-comments. Because general_comment is anot a content repostiory content_type, trackback is not a seperate object_type. This will be fixed in a future version. Additional information about the weblog that sent the ping is stored in the trackback_pings table. +Trackback pings are stored as general-comments. Because general_comment is not a content repostiory content_type, trackback is not a separate object_type. This will be fixed in a future version. Additional information about the weblog that sent the ping is stored in the trackback_pings table.

      Currently any object_id that allows general_comment_create for the "Unregistered Vistor" user (user_id 0) can receive a trackback ping. That is the only activity required to allow trackback to be sent to an object. Index: openacs-4/packages/value-based-shipping/www/admin/level-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/level-delete.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/value-based-shipping/www/admin/level-delete.tcl 1 Mar 2005 00:01:45 -0000 1.4 +++ openacs-4/packages/value-based-shipping/www/admin/level-delete.tcl 17 Apr 2018 14:47:03 -0000 1.5 @@ -45,7 +45,7 @@ select service_level_id, service_level_code, service_level_description from vbs_service_levels where service_level_id = :service_level_id"]} { - request error invalid_service_level_id "Invalid Sevice Level ID" + request error invalid_service_level_id "Invalid Service Level ID" } else { template::element set_value level_delete service_level_id $service_level_id } Index: openacs-4/packages/value-based-shipping/www/admin/level-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/level-edit.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/value-based-shipping/www/admin/level-edit.tcl 1 Mar 2005 00:01:45 -0000 1.6 +++ openacs-4/packages/value-based-shipping/www/admin/level-edit.tcl 17 Apr 2018 14:47:03 -0000 1.7 @@ -65,7 +65,7 @@ select service_level_id, service_level_code, service_level_description from vbs_service_levels where service_level_id = :service_level_id"]} { - request error invalid_service_level_id "Invalid Sevice Level ID" + request error invalid_service_level_id "Invalid Service Level ID" } else { template::form set_values level_edit service_level } Index: openacs-4/packages/webmail/scripts/webmail-migrate.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/scripts/webmail-migrate.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/scripts/webmail-migrate.sql 20 Apr 2001 20:51:23 -0000 1.1 +++ openacs-4/packages/webmail/scripts/webmail-migrate.sql 17 Apr 2018 14:47:03 -0000 1.2 @@ -1,10 +1,10 @@ --- The following procedure is handy for copying existing mail from --- an old webmail account to a new 4.0 account (in a seperate tablespace). +-- The following procedure is handy for copying existing mail from +-- an old webmail account to a new 4.0 account (in a separate tablespace). -- Note that the new user's account must already have been created. -- This system also uses the old message ids, therefore the migration -- must be done before receiving any new messages into the new tables.. --- After the migration is done, you must start the wm_global_sequence at --- a number greater than the largest msg_id +-- After the migration is done, you must start the wm_global_sequence at +-- a number greater than the largest msg_id -- (i.e. create sequence wm_global_sequence start with 1000000 ) create or replace procedure wm_migrate_user ( Index: openacs-4/packages/webmail/scripts/wm-java-setup =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/scripts/wm-java-setup,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/scripts/wm-java-setup 20 Apr 2001 20:51:23 -0000 1.1 +++ openacs-4/packages/webmail/scripts/wm-java-setup 17 Apr 2018 14:47:03 -0000 1.2 @@ -89,7 +89,7 @@ puts "\nError: There was a problem loading in the Webmail Java files. Please consult the installation guide for troubleshooting details." } else { - puts "Congratulations! You have succesfully loaded the necessary + puts "Congratulations! You have successfully loaded the necessary Java files. Please review jaf-errors.log, javamail-errors.log, and webmail-errors.log to make sure there were no un-detected errors upon install." Index: openacs-4/packages/webmail/scripts/wm-qmail-setup =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/scripts/wm-qmail-setup,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/scripts/wm-qmail-setup 20 Apr 2001 20:51:23 -0000 1.1 +++ openacs-4/packages/webmail/scripts/wm-qmail-setup 17 Apr 2018 14:47:03 -0000 1.2 @@ -12,7 +12,7 @@ on your particular flavor of UNIX. Make sure to verify that you wish to allow the modifications that this script will make to your qmail configuration. Also, be sure to -verify that all changes were succesful afterwards. +verify that all changes were successful afterwards. (return to continue)\n" gets stdin junk Index: openacs-4/packages/webmail/sql/oracle/storage-readme.txt =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/sql/oracle/storage-readme.txt,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/sql/oracle/storage-readme.txt 20 Apr 2001 20:51:23 -0000 1.1 +++ openacs-4/packages/webmail/sql/oracle/storage-readme.txt 17 Apr 2018 14:47:03 -0000 1.2 @@ -3,20 +3,20 @@ # @creation-date 2001-02-07 # @cvs_id $Id$ -Because Webmail is centered around a few heavily used tables, -I thought that giving the dba some idea of the sizes of these +Because Webmail is centered around a few heavily used tables, +I thought that giving the dba some idea of the sizes of these tables would help in setting up appropriate tablespaces -and storage clauses for Webmail. +and storage clauses for Webmail. -I have included a table of all the tables and indexes created by +I have included a table of all the tables and indexes created by the Webmail package, and their approximate sizes PER ROW of data. -Obviously, you must first come up with some expectations on -usage and table size first. +Obviously, you must first come up with some expectations on +usage and table size first. The most important items to pay attention to are WM_MESSAGES,WM_HEADERS, -and WM_HEADERS_BY_MSG_ID_NAME. I highly recommend a suitable storage +and WM_HEADERS_BY_MSG_ID_NAME. I highly recommend a suitable storage clause for these to avoid a large amount of fragmentation. You should -also consider storing the lobs from these tables in seperate tablespaces. +also consider storing the lobs from these tables in separate tablespaces. I haven't really had problems with chained rows using pctfree 10%. Index: openacs-4/packages/webmail/sql/oracle/webmail-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/sql/oracle/webmail-create.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/webmail/sql/oracle/webmail-create.sql 9 Mar 2002 02:00:02 -0000 1.3 +++ openacs-4/packages/webmail/sql/oracle/webmail-create.sql 17 Apr 2018 14:47:03 -0000 1.4 @@ -273,7 +273,7 @@ sent, or already sent). This table is cleaned out periodically by a scheduled proc. Note that saved drafts are not kept in - this table, but are transfered to the main wm_messages table. + this table, but are transferred to the main wm_messages table. '; -- Index the foreign key constraint to allow row-level locking on updates @@ -413,7 +413,7 @@ '; comment on column wm_filter_views.mailbox_ids is ' - Contains comma seperated list of mailboxes which the view applies to. + Contains comma separated list of mailboxes which the view applies to. 0 if it applies to all the user''s mailboxes. '; Index: openacs-4/packages/webmail/tcl/wm-filter-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/tcl/wm-filter-procs.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/webmail/tcl/wm-filter-procs.tcl 18 Sep 2002 14:55:04 -0000 1.3 +++ openacs-4/packages/webmail/tcl/wm-filter-procs.tcl 17 Apr 2018 14:47:03 -0000 1.4 @@ -54,7 +54,7 @@ FROM wm_filter_constraints WHERE filter_view=:view_id}] } - # tabls_string includes the sql for selecting which tables we need + # table_string includes the sql for selecting which tables we need set table_string " FROM wm_messages m " # where string includes the first part of the where clause @@ -69,14 +69,14 @@ set where_string "WHERE mailbox_id in ($mailbox_ids) " } - # where_list is a list of sql conditions which will be joined + # where_list is a list of sql conditions which will be joined # by the variable comb - # where_list will contain comparisons of search strings to + # where_list will contain comparisons of search strings to # different fields (headers, body, etc.) set where_list [list] # "i" is a counter which we append to the name of wm_headers - # to distinguish between seperate references to it + # to distinguish between separate references to it # (i.e. if we join w/ wm_headers twice, we'll refer to the first # as "h1" and the second as "h2" set i 1 Index: openacs-4/packages/webmail/www/folder-index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/folder-index.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/webmail/www/folder-index.tcl 1 Mar 2005 00:01:45 -0000 1.4 +++ openacs-4/packages/webmail/www/folder-index.tcl 17 Apr 2018 14:47:03 -0000 1.5 @@ -24,8 +24,8 @@ set context "[ad_context_bar_ws [list "index?[export_url_vars mailbox_id]" "Webmail"] "Manage Folders"]" -# If you don't do the users_folders query seperately, -# Oracle does it for each row in the second query, +# If you don't do the users_folders query separately, +# Oracle does it for each row in the second query, # thus slowing things down big time set users_folders [join [db_list users_folders " SELECT mailbox_id FROM wm_mailboxes WHERE user_id=:user_id"] ","] Index: openacs-4/packages/webmail/www/template-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/template-master.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/webmail/www/template-master.tcl 1 Mar 2005 00:01:46 -0000 1.3 +++ openacs-4/packages/webmail/www/template-master.tcl 17 Apr 2018 14:47:03 -0000 1.4 @@ -29,8 +29,8 @@ } } } else { - # If you don't do the users_folders query seperately, - # Oracle does it for each row in the second query, + # If you don't do the users_folders query separately, + # Oracle does it for each row in the second query, # thus slowing things down big time set users_folders [join [db_list users_folders " SELECT mailbox_id FROM wm_mailboxes WHERE user_id=:user_id"] ","] Index: openacs-4/packages/webmail/www/doc/acs-admin-guide.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/doc/acs-admin-guide.html,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/webmail/www/doc/acs-admin-guide.html 5 Apr 2018 14:44:09 -0000 1.4 +++ openacs-4/packages/webmail/www/doc/acs-admin-guide.html 17 Apr 2018 14:47:03 -0000 1.5 @@ -746,7 +746,7 @@ It should be run from the /tmp directory, and the zipped JavaMail and JAF jar files should be placed in the /tmp directory before running the script. After the script has - completed succesfully, proceed to Testing the system. @@ -934,7 +934,7 @@ >

      If you don't see any messages (and qmail says it - delivered them succesfully to your webmail address), qmail is not + delivered them successfully to your webmail address), qmail is not delivering mail to the right queue. Manually check the alias files in the qmail directory: @@ -1225,7 +1225,7 @@ CLASS="computeroutput" >index-search - pages thrown in. I tested the sending of messages seperately, but obtained + pages thrown in. I tested the sending of messages separately, but obtained similar performance to the following results.

        We also store the 4 header columns which are needed for the mailbox - index view in the wm_messages table. These were seperated from the - other headers which are stored in a seperate table (see below) + index view in the wm_messages table. These were separated from the + other headers which are stored in a separate table (see below) because previous Webmail installations experienced problems with slow index views. The net effect of this is immediately visible: while index views of @@ -507,7 +507,7 @@ gives up the possibility of mapping messages to multiple mailboxes (which was a feature that was not utilized in the previous Webmail anyhow). One possibility to regain this functionality would be to - have a column in wm_messages which references a seperate table + have a column in wm_messages which references a separate table which would contain "common" messages which multiple users could view as normal messages. Such a feature could save resources for intra-Webmail spam, and may be implemented in the future if deemed Index: openacs-4/packages/webmail/www/doc/xml/design.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/doc/xml/design.xml,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/webmail/www/doc/xml/design.xml 23 Mar 2018 22:56:43 -0000 1.2 +++ openacs-4/packages/webmail/www/doc/xml/design.xml 17 Apr 2018 14:47:03 -0000 1.3 @@ -222,8 +222,8 @@ message may have been received multiple times. We also store the 4 header columns which are needed for the mailbox - index view in the wm_messages table. These were seperated from the - other headers which are stored in a seperate table (see below) + index view in the wm_messages table. These were separated from the + other headers which are stored in a separate table (see below) because previous Webmail installations experienced problems with slow index views. The net effect of this is immediately visible: while index views of @@ -241,7 +241,7 @@ gives up the possibility of mapping messages to multiple mailboxes (which was a feature that was not utilized in the previous Webmail anyhow). One possibility to regain this functionality would be to - have a column in wm_messages which references a seperate table + have a column in wm_messages which references a separate table which would contain "common" messages which multiple users could view as normal messages. Such a feature could save resources for intra-Webmail spam, and may be implemented in the future if deemed Index: openacs-4/packages/webmail/www/doc/xml/install.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/doc/xml/install.xml,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/webmail/www/doc/xml/install.xml 5 Apr 2018 14:44:09 -0000 1.4 +++ openacs-4/packages/webmail/www/doc/xml/install.xml 17 Apr 2018 14:47:03 -0000 1.5 @@ -319,7 +319,7 @@ It should be run from the /tmp directory, and the zipped JavaMail and JAF jar files should be placed in the /tmp directory before running the script. After the script has - completed succesfully, proceed to . + completed successfully, proceed to . Alternatively, you may do it by hand: @@ -414,7 +414,7 @@ If you don't see any messages (and qmail says it - delivered them succesfully to your webmail address), qmail is not + delivered them successfully to your webmail address), qmail is not delivering mail to the right queue. Manually check the alias files in the qmail directory: @@ -544,7 +544,7 @@ preferences, index-view, and index-search - pages thrown in. I tested the sending of messages seperately, but obtained + pages thrown in. I tested the sending of messages separately, but obtained similar performance to the following results. Index: openacs-4/packages/webmail-system/www/folder-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail-system/www/folder-delete.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail-system/www/folder-delete.tcl 6 Jun 2006 14:35:10 -0000 1.1 +++ openacs-4/packages/webmail-system/www/folder-delete.tcl 17 Apr 2018 14:47:03 -0000 1.2 @@ -37,7 +37,7 @@ # ------------------------ SET VARIABLES ------------------------ # -set page_title "#webmail-sytem.Deleting_a_folder#" +set page_title "#webmail-system.Deleting_a_folder#" set submit_label "[_ webmail-system.Delete]" set target "folder-delete-2" Index: openacs-4/packages/webmail-system/www/logout.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail-system/www/logout.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail-system/www/logout.tcl 6 Jun 2006 14:35:11 -0000 1.1 +++ openacs-4/packages/webmail-system/www/logout.tcl 17 Apr 2018 14:47:03 -0000 1.2 @@ -22,7 +22,7 @@ ns_log debug "WEBMAIL: Logout started" -set page_title "#webmail-sytem.Logout#" +set page_title "#webmail-system.Logout#" # -------------------------- PROCESSING ------------------------- # # Close the IMAP connection Index: openacs-4/packages/xcms-ui/lib/page-form.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xcms-ui/lib/page-form.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/xcms-ui/lib/page-form.tcl 30 Aug 2004 07:47:27 -0000 1.3 +++ openacs-4/packages/xcms-ui/lib/page-form.tcl 17 Apr 2018 14:47:03 -0000 1.4 @@ -52,7 +52,7 @@ set mime_type [template::util::richtext_or_file::get_property mime_type $content] set content [template::util::richtext_or_file::get_property text $content] # DAVEB always create a new revision on edit -# have a RENAME function. name shouldn't be edited ususally. it breaks +# have a RENAME function. name shouldn't be edited usually. it breaks # links ns_log notice "DAVEB page-form edit_data" # TODO: DAVEB Fix this to work with file upload!! Index: openacs-4/packages/xcms-ui/lib/sample-index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xcms-ui/lib/sample-index.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/xcms-ui/lib/sample-index.adp 7 Jun 2004 01:14:26 -0000 1.1 +++ openacs-4/packages/xcms-ui/lib/sample-index.adp 17 Apr 2018 14:47:03 -0000 1.2 @@ -1,4 +1,4 @@ -

        Congratulations. You have sucessfully intalled the XCMS-UI content +

        Congratulations. You have successfully intalled the XCMS-UI content management application.

        To access the content management interface click the "Manage Content" button