TJ [Fri, 21 Oct 2011 15:49:22 +0000 (16:49 +0100)]
Merge branch 'issue_4892' into master_tj
TJ [Fri, 21 Oct 2011 15:49:22 +0000 (16:49 +0100)]
Merge branch 'issue_4893' into master_tj
TJ [Fri, 21 Oct 2011 15:49:22 +0000 (16:49 +0100)]
Merge branch 'issue_4890' into master_tj
TJ [Fri, 21 Oct 2011 15:49:22 +0000 (16:49 +0100)]
Merge branch 'issue_4889' into master_tj
TJ [Fri, 21 Oct 2011 15:49:22 +0000 (16:49 +0100)]
Merge branch 'issue_4888' into master_tj
TJ [Fri, 21 Oct 2011 15:49:22 +0000 (16:49 +0100)]
Merge branch 'issue_4887' into master_tj
TJ [Fri, 21 Oct 2011 15:49:22 +0000 (16:49 +0100)]
Merge branch 'issue_4886' into master_tj
TJ [Fri, 21 Oct 2011 15:49:22 +0000 (16:49 +0100)]
Merge branch 'issue_4885' into master_tj
TJ [Fri, 21 Oct 2011 15:49:22 +0000 (16:49 +0100)]
Merge branch 'issue_4884' into master_tj
TJ [Fri, 21 Oct 2011 15:49:22 +0000 (16:49 +0100)]
Merge branch 'issue_4883' into master_tj
TJ [Fri, 21 Oct 2011 15:49:21 +0000 (16:49 +0100)]
Merge branch 'issue_4879' into master_tj
TJ [Tue, 11 Oct 2011 14:09:40 +0000 (15:09 +0100)]
4893: Catch and prevent illegal SQL syntax error in ForumsCoursesDAO.Create()
TJ [Sat, 8 Oct 2011 23:56:52 +0000 (00:56 +0100)]
4875: give more useful error message to user
TJ [Sat, 8 Oct 2011 20:30:14 +0000 (21:30 +0100)]
4875: report HTTPRequest errors
TJ [Fri, 7 Oct 2011 19:57:34 +0000 (20:57 +0100)]
4875: add error detection to IMS CC import; set default error values
TJ [Thu, 6 Oct 2011 16:42:29 +0000 (17:42 +0100)]
4875: HTTPRequest: add exception and error reporting
TJ [Fri, 21 Oct 2011 15:09:49 +0000 (16:09 +0100)]
4875: remove HTTPRequest debug logging
TJ [Thu, 6 Oct 2011 11:29:37 +0000 (12:29 +0100)]
4875: Use HTTPRequest class for importing IMS Common Cartridges
TJ [Fri, 21 Oct 2011 15:08:19 +0000 (16:08 +0100)]
4875: add HTTPRequest class that supports cookies and redirects without fopen() or curl
TJ [Sun, 9 Oct 2011 16:42:40 +0000 (17:42 +0100)]
4887: fix missing 'back.gif' in default theme
TJ [Thu, 20 Oct 2011 13:30:51 +0000 (14:30 +0100)]
4892: vitals.inc.php: Fix warnings and errors
* undefined variables: $_content_id, $_sequence_links
TJ [Thu, 20 Oct 2011 13:14:42 +0000 (14:14 +0100)]
4892: ims_import.php: fix several issues that cause import failures
* Weblinks: correctly locate link resource file by replacing incorrect
$content_info['href'] with $content_info['file'][0]
* Weblinks: ensure weblink file has been parsed correctly before assigning variables
* capture and use result from $contentDAO->Create()
* undefined indexes: $items[$current_item_id], $items[$dependency_ref],
$items[$content_info['parent_content_id']], $items[$item_id]['type']
$content_info['type'], $content_info['dependency'], $content_info['href'], $content_info['new_path'],
* undefined variables: $ext, $full_filename, $lti_offset[$content_info['parent_content_id']],
TJ [Thu, 20 Oct 2011 13:06:44 +0000 (14:06 +0100)]
4892: header.tmpl.php: ensure 'previous' and 'resume' keys exist in $this->sequence_links
TJ [Thu, 20 Oct 2011 13:04:09 +0000 (14:04 +0100)]
4892: WeblinksParser.parser() should return a result; endElement() does not use $last_element
TJ [Thu, 20 Oct 2011 12:51:55 +0000 (13:51 +0100)]
4892: ContentDAO.isFieldsValid() return value should not be tied to $msg->containsErrors()
This function would erroneously return 'false' if the $msg array contained errors prior to
entry into the function. This sometimes caused unexplained IMS CC import failures when
inserting new lessons into the database.
Use a local return result to ensure accurate result.
TJ [Thu, 20 Oct 2011 12:48:52 +0000 (13:48 +0100)]
4892: Fix errors and warnings in ContentManager.class.php
* ensure returns by-value rather than by-reference
* ensure array indexes are defined before using them
TJ [Wed, 19 Oct 2011 19:58:46 +0000 (20:58 +0100)]
4892: PHP Undefined warnings: index.php: $is_for_category, index "p"
TJ [Tue, 11 Oct 2011 16:31:32 +0000 (17:31 +0100)]
4892: PHP Undefined warnings: home/ims/ims_import.php
index $content['parent_content_id']
TJ [Tue, 11 Oct 2011 16:22:40 +0000 (17:22 +0100)]
4892: PHP Undefined warnings: include/vitals.inc.php
variables $_content_id
TJ [Tue, 11 Oct 2011 16:18:58 +0000 (17:18 +0100)]
4892: PHP Undefined warnings: home/ims/ims_import.php
variables $common_path, $contains_glossary_terms, $package_base_name, $package_base_name_url, $glossary_path
TJ [Tue, 11 Oct 2011 15:42:02 +0000 (16:42 +0100)]
4892: PHP Strict warnings: include/classes/DAO/DAO.class.php
* fix Accessing static property DAO::$db as non static
TJ [Tue, 11 Oct 2011 11:32:53 +0000 (12:32 +0100)]
4892: PHP Undefined warnings: home/ims/ims_import.php
indexes $parent_item_id, $current_item_id
TJ [Tue, 11 Oct 2011 09:20:50 +0000 (10:20 +0100)]
4892: PHP Undefined warnings: include/classes/Menu.class.php
index 'user_requirement'
TJ [Tue, 11 Oct 2011 09:18:16 +0000 (10:18 +0100)]
4892: PHP Undefined warnings: include/classes/Utility.class.php
* tidy up code to append QueryString to URI
variables $url_param
TJ [Tue, 11 Oct 2011 09:16:26 +0000 (10:16 +0100)]
4892: PHP Undefined warnings: include/sidemenus/category.inc.php
index 'catid'
TJ [Tue, 11 Oct 2011 09:14:35 +0000 (10:14 +0100)]
4892: PHP Undefined warnings: include/page_constants.inc.php
index 'user_requirement'
TJ [Tue, 11 Oct 2011 08:58:44 +0000 (09:58 +0100)]
4892: PHP Undefined warnings: themes/default/include/footer.tmpl.php
* declare global for $starttime to ensure it is in-scope when it is
used to calculate page-rendering elapsed time
TJ [Tue, 11 Oct 2011 08:52:54 +0000 (09:52 +0100)]
4892: PHP Undefined warnings: themes/default/include/header.tmpl.php
* declare global for $starttime to ensure it is in-scope when footer.tmpl.php
needs it to calculate page-rendering elapsed time
* correct $base_href to $base_path in Javascript include for ProgressiveEnhancement.js
indexes 'cid'
properties onload, sequence_links, sub_level_pages
TJ [Tue, 11 Oct 2011 08:47:41 +0000 (09:47 +0100)]
4892: PHP Undefined warnings: include/vitals.inc.php
* Use maximum error reporting to ensure focus on problems
* Use the correct setcookie() function
variables $_custom_head
indexes 'user_id'
TJ [Tue, 11 Oct 2011 08:42:25 +0000 (09:42 +0100)]
4892: PHP Undefined warnings: index_course_tmpl.php:
variables $keywords, $caller_script
indexes 'user_id', 'user_role'
TJ [Mon, 10 Oct 2011 13:59:04 +0000 (14:59 +0100)]
4890: prevent "Undefined index: cid" warning
TJ [Mon, 10 Oct 2011 13:05:58 +0000 (14:05 +0100)]
4889: Remove attempted definition of TR_INCLUDE_PATH
TJ [Mon, 10 Oct 2011 03:06:16 +0000 (04:06 +0100)]
4889: vitals.inc.php - check if variables are set before using
TJ [Mon, 10 Oct 2011 02:28:54 +0000 (03:28 +0100)]
4889: ims_import - ensure $sizeofrp is defined before use
TJ [Mon, 10 Oct 2011 02:25:28 +0000 (03:25 +0100)]
4889: ims_import - ensure $temp_path is defined before use
TJ [Tue, 11 Oct 2011 12:21:38 +0000 (13:21 +0100)]
4888: prog.php: prevent "Undefined index:" frame, done and t
TJ [Mon, 10 Oct 2011 15:42:26 +0000 (16:42 +0100)]
4888: prog.php: prevent "Undefined index: tile and t" and "Undefined variable: size"
TJ [Mon, 10 Oct 2011 15:13:36 +0000 (16:13 +0100)]
4888: ims_import.php: prevent "Undefined index: type in checkResources()
TJ [Mon, 10 Oct 2011 15:10:59 +0000 (16:10 +0100)]
4888: ims_import.php: prevent "Undefined index: -1 in endElement()
TJ [Mon, 10 Oct 2011 15:07:34 +0000 (16:07 +0100)]
4888: ims_import.php: prevent "Undefined index: href in startElement()
TJ [Mon, 10 Oct 2011 14:58:47 +0000 (15:58 +0100)]
4888: ims_import.php: prevent "Undefined index: identifierref and parameters in startElement()
TJ [Mon, 10 Oct 2011 14:41:41 +0000 (15:41 +0100)]
4888: ims_import.php: prevent "Undefined index: -1" warning
TJ [Sun, 9 Oct 2011 15:48:47 +0000 (16:48 +0100)]
4886: add %s format specifier to TR_ERROR_IMPORT_CARTRIDGE_FAILED
TJ [Sun, 9 Oct 2011 15:33:57 +0000 (16:33 +0100)]
4885: Message.printAbstract() should indicate when additional message parameters are not used
TJ [Sun, 9 Oct 2011 00:20:33 +0000 (01:20 +0100)]
4884: Define missing TR_ERROR_IMPORTDIR_IMS_NOTVALID (used in ims_import.php)
TJ [Sun, 9 Oct 2011 00:00:11 +0000 (01:00 +0100)]
4883: Don't write messages prematurely
TJ [Thu, 6 Oct 2011 20:34:35 +0000 (21:34 +0100)]
4879: Fix HTTP 404 in progress iframe
Greg Gay [Mon, 17 Oct 2011 14:01:01 +0000 (10:01 -0400)]
add a readme file to the top level AContent directory
Greg Gay [Mon, 17 Oct 2011 13:06:57 +0000 (09:06 -0400)]
moved code up one level to eliminate the docs subdirectory
Harris Wong [Fri, 14 Oct 2011 16:15:11 +0000 (16:15 -0000)]
AC_4897, AC_4898, AC_4899: Multifile uploader fixes.
Removed an extra letter "u" on the page. Now properly forwards user back to the popup upload page upon successful file upload. Also fixed a vsprinf issue with the Messenger.
Cindy Li [Thu, 13 Oct 2011 16:47:00 +0000 (16:47 -0000)]
http://atutor.ca/atutor/mantis/view.php?id=4894
The proper functioning of flowplayer requires flash to be installed. Coverts the [media] tag into flowplayer type only when the flash is available, otherwise, converts to a plain <a> link instead.
Greg Gay [Thu, 13 Oct 2011 14:29:28 +0000 (14:29 -0000)]
replaced sidemenu selected link colour white with an underline instead.
Cindy Li [Fri, 7 Oct 2011 17:34:32 +0000 (17:34 -0000)]
http://atutor.ca/atutor/mantis/view.php?id=4865
Added in the upgrade step that copies over the content folder from the initial AContent installation that's being upgraded.
Harris Wong [Thu, 6 Oct 2011 16:30:02 +0000 (16:30 -0000)]
AC_4877: Removed extra whitespace at the end of line.
There are extra whitespaces at the end of:
line 544: $package_base_path = array_intersect_assoc($package_base_path, $temp_path);
There extra whitespaces are now removed.
Harris Wong [Wed, 5 Oct 2011 19:58:06 +0000 (19:58 -0000)]
4873: Added a condition in to handle OpenLearn packages.
If "Share" is part of the common path calculation, then skip it. Reason is the "Shared" directory is relative to content directory. We should use content directory as the common path.
Greg Gay [Wed, 5 Oct 2011 19:09:09 +0000 (19:09 -0000)]
test
Greg Gay [Wed, 5 Oct 2011 16:01:04 +0000 (16:01 -0000)]
fix a few typos in AContent howto
Harris Wong [Mon, 3 Oct 2011 21:01:31 +0000 (21:01 -0000)]
AC_4854: Added missing InlineEdit css to header
During infusion 1.4 upgrade, the InlineEdit css needs to be loaded in the header. Added the missing css back to the theme header template.
Harris Wong [Mon, 3 Oct 2011 20:21:15 +0000 (20:21 -0000)]
4854: Infusion uploader integrated into file manager
File Manager within AContent now uses infusion multi file uploader.
Greg Gay [Mon, 3 Oct 2011 19:22:10 +0000 (19:22 -0000)]
updated import CC/CP to accommodate paths in content that use ../
Greg Gay [Mon, 3 Oct 2011 19:21:46 +0000 (19:21 -0000)]
updated import CC/CP to accommodate paths in content that use ../
Greg Gay [Mon, 3 Oct 2011 16:19:24 +0000 (16:19 -0000)]
updated import CC/CP to accommodate paths in content that use ../
Greg Gay [Fri, 30 Sep 2011 20:08:48 +0000 (20:08 -0000)]
updated version number from 1.1 to 1.2
Greg Gay [Fri, 30 Sep 2011 18:38:42 +0000 (18:38 -0000)]
replaced $addslashes() around $token and $token_typewith addslashes() line 156/157
Greg Gay [Fri, 30 Sep 2011 17:44:02 +0000 (17:44 -0000)]
replaced intval() around $web_service_id with $addslashes()
Greg Gay [Fri, 30 Sep 2011 15:36:45 +0000 (15:36 -0000)]
removed some garbage text
Harris Wong [Fri, 30 Sep 2011 15:18:37 +0000 (15:18 -0000)]
861: Added flash detection code in vitals.
Add flash detection code in vitals, and have a flag in SESSION to indicate rather Flash is enabled on this browser or not. This variable is useful for multifile uploader in File Manager.
Harris Wong [Fri, 30 Sep 2011 15:13:20 +0000 (15:13 -0000)]
4854: Upgrade infusion library to 1.4
Upgraded infusion library using the latest daily build from http://build.fluidproject.org/infusionBuilder/html/InfusionBuilder.html.
Harris Wong [Wed, 28 Sep 2011 20:30:43 +0000 (20:30 -0000)]
4854: Removing old infusion library.
Harris Wong [Wed, 28 Sep 2011 14:22:44 +0000 (14:22 -0000)]
4836: side menu inline edit now properly saved after exiting edit mode.
Harris Wong [Tue, 27 Sep 2011 20:32:14 +0000 (20:32 -0000)]
4811: Multiple vulnerabilities fixed as listed on the tracker.
Harris Wong [Fri, 23 Sep 2011 20:37:13 +0000 (20:37 -0000)]
AC-4804: Security fixes for XSS, possible sql injection on multiple scripts within acontent.
Greg Gay [Thu, 22 Sep 2011 17:13:29 +0000 (17:13 -0000)]
#4853 added check to theme_advanced_buttons4 array
Greg Gay [Thu, 22 Sep 2011 17:00:54 +0000 (17:00 -0000)]
fixed typo introduced when var filtering was added
Greg Gay [Thu, 22 Sep 2011 15:57:54 +0000 (15:57 -0000)]
#4826 changed htmlspecialchars() to htmlentities_utf8() for the handbook frame set's title element
Greg Gay [Thu, 22 Sep 2011 14:44:50 +0000 (14:44 -0000)]
#4846 commented out require ContentUtility.class.php
Harris Wong [Tue, 20 Sep 2011 17:23:33 +0000 (17:23 -0000)]
4525: Sanitize all input fields to disallow XSS. All the input field that most likely would introduce a problem is not wrapped around AT_print.
Greg Gay [Mon, 12 Sep 2011 18:29:27 +0000 (18:29 -0000)]
added local xml.xsd
Greg Gay [Mon, 12 Sep 2011 17:24:22 +0000 (17:24 -0000)]
added namespace imswl_v1p0
Greg Gay [Mon, 12 Sep 2011 17:18:44 +0000 (17:18 -0000)]
added namespace imswl_v1p0
Greg Gay [Mon, 12 Sep 2011 16:31:01 +0000 (16:31 -0000)]
added in new IMS CC validation xsds
Greg Gay [Mon, 12 Sep 2011 16:18:41 +0000 (16:18 -0000)]
remove old IMS CC validation xsds
Greg Gay [Mon, 12 Sep 2011 16:15:28 +0000 (16:15 -0000)]
commit initial sql upgrade script to alter table type to engine and set the default charset to utf-8 for the AFA tables
Greg Gay [Mon, 12 Sep 2011 15:41:03 +0000 (15:41 -0000)]
update install sql replacing db type with db Engine
Cindy Li [Thu, 8 Sep 2011 16:09:24 +0000 (16:09 -0000)]
atutor.ca/atutor/mantis/view.php?id=4597 - An ATutor bug report, however, the same issue happens in AContent, which is what this check-in is for.
Cindy Li [Wed, 24 Aug 2011 16:37:18 +0000 (16:37 -0000)]
http://atutor.ca/atutor/mantis/view.php?id=4829
Cindy Li [Wed, 24 Aug 2011 16:14:02 +0000 (16:14 -0000)]
http://atutor.ca/atutor/mantis/view.php?id=4829
Wrap up handbook title with UTF-8 version of htmlspecialchars().
Greg Gay [Wed, 6 Jul 2011 16:50:55 +0000 (16:50 -0000)]
updated main IMS schemas
Greg Gay [Wed, 6 Jul 2011 16:49:03 +0000 (16:49 -0000)]
replace schemas with durrent version
Greg Gay [Wed, 6 Jul 2011 16:45:02 +0000 (16:45 -0000)]
deleting old IMS schemas