Commit Graph

551 Commits (a55379adcfc88a3b0738b4ba537716b1ede90b4f)

Author SHA1 Message Date
Frode Petterson 36558b0846 Options are optional. 2015-06-15 16:11:11 +02:00
Frode Petterson d8cf40623e Improved error handling in case upload dir isn't writable, zip isn't enabled or folders are missing. 2015-06-15 14:57:51 +02:00
Frode Petterson b399a68adc Merge branch 'release'
Conflicts:
	h5p.classes.php
2015-06-04 14:47:34 +02:00
Frode Petterson aded8d1f43 Avoid errors. Merged in from D7. 2015-05-27 10:11:01 +02:00
Frode Petterson 3460e400a0 Fixed special case for export/download. 2015-05-22 15:50:00 +02:00
Frode Petterson d85815b3be Keep the content's disable settings when re-saving after global options have changed. (More consistent and reliable) 2015-05-22 15:31:28 +02:00
Frode Petterson 9db33dd61b Merge branch 'release' of github.com:h5p/h5p-php-library into release 2015-05-22 13:29:04 +02:00
Frode Petterson 6ecb15a1d0 There is no disable about for content, it's only a global setting. 2015-05-22 13:28:52 +02:00
Frode Petterson 101d5aab31 There is no disable all option. Disabling frame does the same. 2015-05-22 13:28:45 +02:00
Frode Petterson 52dca53883 There is no disable all option. Disabling frame does the same. 2015-05-22 13:20:44 +02:00
Frode Petterson 7e009d00ca There is no disable about for content, it's only a global setting. 2015-05-22 13:18:13 +02:00
Thomas Marstrander 99522f59bf Skip groups that are null. This is done because groups with only one entry are concatenated with their entry. 2015-05-21 13:02:52 +02:00
Frode Petterson 834764e316 Eliminate warnings. 2015-05-20 10:55:02 +02:00
Frode Petterson ac96408bc9 Merge branch 'release' 2015-05-18 09:41:07 +02:00
Svein-Tore Griff With e2b6f3527e Merge branch 'semantics-font' into release 2015-05-13 14:06:56 +02:00
Svein-Tore Griff With 85d66d52c0 Add DISABLE_ALL constant 2015-05-13 11:48:56 +02:00
Paal Joergensen a8b465adb7 Merge branch 'smart-file-names' 2015-05-13 10:16:13 +02:00
Frode Petterson cee887901b Make sure styles are filtered if they're not specified in the semantics. 2015-05-11 14:15:16 +02:00
Frode Petterson e404c3ac68 Allow certain style tags on spans. 2015-05-08 16:06:04 +02:00
Frode Petterson 467f97c11f Use correct uuid variable 2015-04-28 12:42:36 +02:00
Frode Petterson 31872111eb Use content. 2015-04-27 15:20:40 +02:00
Frode Petterson 4683e61fa7 Delete correct export file. 2015-04-27 13:13:00 +02:00
Frode Petterson ccccec84e7 Use correct path. 2015-04-22 15:19:01 +02:00
Frode Petterson 3eea931332 Merge branch 'release' into smart-file-names 2015-04-22 13:42:17 +02:00
Frode Petterson 9a37a99574 Re-added "Remove empty params." to master.
This reverts commit 31ee0bd51a.
2015-04-22 10:44:16 +02:00
Frode Petterson 31ee0bd51a Removed "Remove empty params." from release.
This reverts commit 8c68f23823.
2015-04-22 10:43:18 +02:00
Frode Petterson 8c68f23823 Remove empty params. 2015-04-20 15:10:31 +02:00
Svein-Tore Griff With cf7ae066ad Add disable support for uploads as well 2015-04-15 13:54:46 +02:00
Svein-Tore Griff With 0b609e882d Add about to disable sources and make sure each source is set 2015-04-13 19:58:41 +02:00
Svein-Tore Griff With 868c06929d Whitespace changes 2015-04-13 18:41:53 +02:00
Svein-Tore Griff With fba425220e Resolve conflicts 2015-04-13 18:32:33 +02:00
Svein-Tore Griff With 5c3620c637 Bubbling for event system 2015-04-07 19:33:21 +02:00
Svein-Tore Griff With efbe56001d User data fixes 2015-04-07 19:32:44 +02:00
Svein-Tore Griff With cfa747f20c Add path fixes 2015-04-07 19:30:46 +02:00
Frode Petterson 5adffcaeb8 Added content id. 2015-04-07 15:36:28 +02:00
Svein-Tore Griff With 61a8e7e9e9 Make view work again as well 2015-03-24 19:36:13 +01:00
Svein-Tore Griff With 065ee4e8a2 Make editor work again 2015-03-24 19:29:28 +01:00
Svein-Tore Griff With ef7a31d2e1 Try to get back the no url branch 2015-03-24 18:55:13 +01:00
Svein-Tore Griff With 44e8cba365 Merge branch 'master' into aggregated-xapi 2015-03-22 13:14:40 +01:00
Svein-Tore Griff With 1c4a5e014b Comment out prefixing that isn't working 2015-03-22 13:12:44 +01:00
Svein-Tore Griff With e76fc9eff3 Merge branch 'no-url-fopen' of https://github.com/h5p/h5p-php-library 2015-03-22 12:46:41 +01:00
Svein-Tore Griff With b79a5b61b8 uuid consists of lowercase letters 2015-03-22 12:42:07 +01:00
Svein-Tore Griff With 313bb757ba Add bubble system and xAPI context 2015-03-21 16:45:38 +01:00
Frode Petterson e6e3ee7559 Allow assets to be relative to another location.
Allow assets to contain external URLs.
2015-03-20 11:28:21 +01:00
Svein-Tore Griff With 8494e85c3e Remove todo items 2015-03-19 19:27:44 +01:00
Frode Petterson 51a1d333e2 Improved packaging. Made sure zip format is followed by always using forward slashes. This will make h5p export work on Windows. 2015-03-19 16:58:48 +01:00
Frode Petterson 1b28c7b128 Use different vars for URL and file path to avoid having allow_url_fopen = On. 2015-03-18 14:25:55 +01:00
Frode Petterson 6541faf8ba Renamed humanId => slug.
Moved most of the slug generating code out of the framework and into core.
Remove old export files.
Use old export file until new slug is generated.
Added support for converting more special chars.
2015-03-13 15:17:19 +01:00
Frode Petterson c35d7f8334 Added support for generating human readable H5P file names. 2015-03-12 14:38:10 +01:00
Frode Petterson 2b1c894307 Merge branch 'master' into settings
Conflicts:
	h5p.classes.php
2015-02-19 15:50:04 +01:00
Svein-Tore Griff With 95a0b000db Remove scary error messages 2015-02-18 19:58:03 +01:00
Svein-Tore Griff With 3d4d72c5a7 Avoid exporting git files 2015-02-18 19:50:23 +01:00
Svein-Tore Griff With c330282351 Refactor xAPI code 2015-02-16 16:47:04 +01:00
Frode Petterson 84f8fb1cff Merge branch 'master' of github.com:h5p/h5p-php-library 2015-02-12 16:00:41 +01:00
Frode Petterson 1d24d073ed Moved "libraries saving" out of savePackage to make it easier to read and handle. Added UI messages when adding and updating libraries. Minor code optimizations. 2015-02-12 15:56:31 +01:00
Svein-Tore Griff With 8d7ce8f4f1 Merge branch 'master' of https://github.com/h5p/h5p-php-library 2015-02-12 15:46:55 +01:00
Svein-Tore Griff With c4aedca522 Resolve conflicts 2015-02-11 18:02:25 +01:00
Frode Petterson 42fbb6ab1f Reverse direction of dependency loading. The libraries used last in the parameters are now loaded first, e.g. summary is now loaded before iv! 2015-02-11 14:40:01 +01:00
Frode Petterson fb77a4d20d bugfix. 2015-02-10 16:40:23 +01:00
Frode Petterson c764d13b32 Moved display options helpers into core. 2015-02-10 16:29:16 +01:00
Svein-Tore Griff With a090468657 Merge branch 'text-editor' 2015-02-05 12:01:16 +01:00
Svein-Tore Griff With fc4f791e6e Bump core api version 2015-02-03 20:15:15 +01:00
Svein-Tore Griff With efdd7f9f7a Moving x-api and Event handling code to separate files and refining it 2015-02-03 20:11:01 +01:00
Svein-Tore Griff With f66e6a3ce9 Merge branch 'manually-move-files' 2015-02-03 14:02:54 +01:00
Svein-Tore Griff With e12ba70b95 Merge branch 'master' into adaptivity 2015-02-03 13:44:52 +01:00
Svein-Tore Griff With daa91b1372 Merge branch 'master' into text-editor 2015-02-02 14:28:52 +01:00
Svein-Tore Griff With ae6329595b Add ordering of libraries 2015-01-30 10:59:40 +01:00
Frode Petterson ead790ae1a Make sure fields in optional groups also becomes optional. 2015-01-20 14:48:22 +01:00
Frode Petterson 8cee9820b0 Merge branch 'master' into text-editor 2015-01-13 13:38:51 +01:00
Frode Petterson ae8609dd86 Replaced another rename function. 2015-01-09 10:00:40 +01:00
git e7b7cd2abe Issue https://www.drupal.org/node/2402099 by drinkdecaf: H5P on Pantheon Environments 2015-01-09 09:59:29 +01:00
Svein-Tore Griff With 7dfab8393f Merge branch 'atomic-dev-mode' into text-editor 2014-12-03 16:10:50 +01:00
falcon fb07f54e35 Make it possible to do the dependency transactions in an atomic way 2014-11-27 23:14:15 +01:00
Frode Petterson 9ed2e48fb5 Fixed parse error. 2014-11-25 10:55:32 +01:00
Pål Jørgensen 60d166c6da Made creation of h5p export file overwrite existing file 2014-11-19 12:43:59 +01:00
Frode Petterson 2bba9a183b Bumped api version. 2014-11-10 11:35:15 +01:00
Frode Petterson bc5159e272 Added event dispatcher. 2014-11-10 11:31:23 +01:00
Pål Jørgensen 2d7824aa93 Fix for language containing empty string in H5P export (h5p.json) 2014-11-06 11:13:24 +01:00
Svein-Tore Griff With 57db1d9926 Revert "Add htmlSpecialChars"
This reverts commit 41ed0c18e4.
2014-11-03 10:15:23 +01:00
Pål Jørgensen 415e217134 Fixed URL to h5p.org 2014-11-03 07:02:45 +01:00
Svein-Tore Griff With 7c3ddea71a Become node_clone compatible again 2014-11-02 19:13:14 +01:00
Svein-Tore Griff With 41ed0c18e4 Add htmlSpecialChars 2014-11-02 17:52:39 +01:00
Pål Jørgensen 48f7969ff9 Whitespaces? 2014-11-02 16:57:57 +01:00
Pål Jørgensen 3d370da1e1 Fixed usage of non-existent function 2014-11-02 16:22:27 +01:00
Pål Jørgensen a2c84189b0 Moving external file fetching out of core 2014-11-02 14:29:13 +01:00
Pål Jørgensen f306d24f23 Moved UUID-generation to backend
Added h5pVersion in platforminfo
Avoiding json beeing cached both locally and on backend
2014-11-02 13:46:09 +01:00
Pål Jørgensen cc40f2316c Merge branch 'master' into fetch-libraries-metadata 2014-11-02 11:08:56 +01:00
Pål Jørgensen f01d002f66 Major post review changes 2014-11-01 17:05:15 +01:00
Svein-Tore Griff With 73c9f2768d Resolve conflict 2014-11-01 12:56:38 +01:00
Frode Petterson 2737f3c721 Merge branch 'without-pal'
Conflicts:
	h5p.classes.php
	js/h5p-library-list.js
2014-10-23 15:18:03 +02:00
Frode Petterson 072edf55e7 Made it possible to bypass file extension check. 2014-10-21 15:42:47 +02:00
Frode Petterson 6c471529b1 Updated comment 2014-10-17 11:38:35 +02:00
Frode Petterson a8e6854324 Use correct semantics. 2014-10-14 14:06:49 +02:00
Frode Petterson 0a8bd6a5b5 Fixed typos. 2014-10-10 13:57:43 +02:00
Frode Petterson c9914966f3 Space fix. 2014-10-10 13:56:48 +02:00
falcon c131a339a1 Finish up commenting the interface functions 2014-10-09 19:29:20 +02:00
falcon a7939bf5ad Improve comments 2014-10-08 10:16:16 +02:00
Frode Petterson a38a0f1253 Removed old caching system.
Use content variable for filtered parameters.
Added getOption/setOption.
2014-09-26 15:56:42 +02:00
Frode Petterson 09bf13ee8f Merge branch 'without-pal'
Conflicts:
	js/h5p-library-list.js
2014-09-26 12:37:11 +02:00
Frode Petterson 4b8804988e Revert "Merge branch 'adding-htmlspecialchars-to-h5p' into without-pal"
This reverts commit ab1b691a27, reversing
changes made to 2b12bf4441.
2014-09-24 15:34:55 +02:00
Frode Petterson 909fb3aca3 Merge branch 'without-pal' of github.com:h5p/h5p-php-library into without-pal 2014-09-23 15:10:42 +02:00
Frode Petterson 7fd333088b Added missing translation. 2014-09-23 15:10:23 +02:00
Pål Jørgensen ab1b691a27 Merge branch 'adding-htmlspecialchars-to-h5p' into without-pal 2014-09-23 12:59:37 +02:00
Pål Jørgensen 24be95a78e Bumped core version because of the new function added 2014-09-23 12:59:08 +02:00
Pål Jørgensen f207c3be9b Setting language on export to 'und' if not defined 2014-09-23 10:44:22 +02:00
Pål Jørgensen 7cb2ebe17c Fixed bug in validation, which made library-upload on library admin page fail 2014-09-17 15:04:55 +02:00
Pål Jørgensen 764ba2761d Fixed bug in validation, which made library-upload on library admin page fail 2014-09-05 14:12:46 +02:00
Pål Jørgensen 4729287406 Added H5PCore::getLibrariesMetadata and H5PFrameworkInterface::getPlatformInfo 2014-09-05 09:59:16 +02:00
Frode Petterson 68e7c00145 Merge branch 'master' of github.com:h5p/h5p-php-library 2014-08-26 13:24:20 +02:00
Pål Jørgensen f65af6b758 Merge branch 'master' of github.com:h5p/h5p-php-library
Conflicts:
	h5p.classes.php
2014-08-26 12:08:35 +02:00
Pål Jørgensen a75928d5a4 Updates relevant for upgrade-all-libraries feature 2014-08-26 12:00:14 +02:00
Frode Petterson 2ef3b206dc Added missing $this->. 2014-08-26 11:45:00 +02:00
Frode Petterson 4955e9da59 Did some minor refactoring of "minimum version support" to ease implementation of this in other systems. 2014-08-26 11:26:41 +02:00
Pål Jørgensen 86507a456b Changes related to listing unsupported libraries, and upgrade of all installed libraries 2014-08-22 14:03:00 +02:00
Frode Petterson be44d1fac9 Fixed so that filtered params can be stored in the contents table. 2014-08-22 11:39:15 +02:00
Frode Petterson 1da58ef039 Merge branch 'master' of github.com:h5p/h5p-php-library
Conflicts:
	h5p.classes.php
2014-08-22 11:38:10 +02:00
Frode Petterson 1a1e261dd5 Made it possible to delete libraries without having to load them again. 2014-08-22 11:36:58 +02:00
Frode Petterson 89bacfdb88 Made sure main content id isn't required.
Conflicts:
	h5p.classes.php
2014-08-22 11:36:54 +02:00
Pål Jørgensen e97fc0ae12 Merge branch 'master' of github.com:h5p/h5p-php-library 2014-08-19 10:15:14 +02:00
Pål Jørgensen 426a08e33e Added loadLibraries() to interface 2014-08-19 10:14:55 +02:00
Frode Petterson 89d437774e Added 7.x-1.x changes. 2014-08-18 14:09:38 +02:00
Frode Petterson 9adc12ea37 Added function to help convert object and array properties after getting them from the database. 2014-07-18 11:26:46 +02:00
Frode Petterson db5243383d Added support for sub-libraries in content upgrade. Also made upgrades async. 2014-06-13 15:02:26 +02:00
Frode Petterson dc2c092bc7 Added content upgrade. 2014-06-03 16:07:50 +02:00
Frode Petterson 27a5c4e2a7 Fixed cache invalidation bug. 2014-05-27 14:12:54 +02:00
Frode Petterson 2053b43024 Recreate .h5p when content cache is rebuilt. Avoid loading content dependencies multiple times. 2014-05-27 14:05:20 +02:00
Frode Petterson 43d239c6f1 Temporarily disabled content development mode until we can work out how it should work. 2014-05-27 13:07:53 +02:00
Frode Petterson c5b32fb621 Moved content cache control to core. Made sure updating a library invalidates caches for all content who uses it. All saving of content and filtering of parameters is now handled by core.
ContentValidator now collects a flat list of content dependencies.
2014-05-27 10:55:46 +02:00
Frode Petterson 4a32f976e5 Bumped api version. 2014-05-23 16:15:15 +02:00
Frode Petterson 08f8c46544 Changed getDependenciesFiles format to make it easier to use on all systems. 2014-05-09 10:48:05 +02:00
Frode Petterson 86441f4bec Be able to skip cache busting on dependency files.
Renamed tmp to temp.
Suppress errors when moving content folder.
Made sure loaded development libraries bring their semantics.
2014-05-08 16:28:36 +02:00
Frode Petterson 48b07c46f5 Adapted and simplified export, makes it easier to implement on new systems and improves performance. 2014-05-07 16:43:48 +02:00
Frode Petterson 34d65b9601 Changed savePackage so it's easier to send along extra content data. 2014-05-06 16:52:43 +02:00
Frode Petterson 700fc1c67b Added individual cache busting to dependency files. Improves performance and is useful for systems without a cache buster string / js aggr. 2014-05-06 11:48:36 +02:00
Frode Petterson fd9a41f957 Quickfix so WP can get the id of new content. (used for redirect) 2014-04-28 15:09:07 +02:00
Frode Petterson 568637a718 Merge branch 'master' of github.com:h5p/h5p-php-library 2014-04-22 16:34:55 +02:00
Frode Petterson ea6a226069 Added support for auto increment on content id when saving packages.
Made core create directories if they doesn't exist.
Added md and textile to file whitelist.
2014-04-22 16:33:01 +02:00
Frode Petterson c83092f747 Imported changes from 7.x-1.x 2014-04-14 10:50:37 +02:00
Frode Petterson 9e01bbfb81 Imported changes from Drupal 6.x. 2014-04-13 15:52:12 +02:00
Frode Petterson c77b6ee19e Fixed some notices by setting default values. 2014-03-26 08:47:56 +01:00
Frode Petterson 81feec677d Synced library with module 6.x-1.x. 2014-03-26 08:43:29 +01:00
Frode Petterson c06123a21e Revert "BUGFIX: Replace str_replace with preg_quote"
This reverts commit ec10ce034e.
2014-02-11 13:47:24 +01:00
Frode Petterson 7d8d85f450 Merged in library changes. 2014-02-11 13:45:40 +01:00
Frode Petterson ced3f8e711 Moved css into library. 2014-01-29 16:03:51 +01:00
Frode Petterson b3c3aed32a Removed deprecated js. 2014-01-02 15:41:56 +01:00
Frode Petterson cca335b731 Merge branch 'master' of ssh://stash.amendor.com:7999/h5p/h5p-core-php 2013-12-20 13:34:18 +01:00
Frode Petterson 7a3888a367 Prevent copy of trees that does not exist. 2013-12-20 13:31:08 +01:00
Frank Ronny Larsen ec10ce034e BUGFIX: Replace str_replace with preg_quote 2013-12-18 11:32:57 +01:00
Frank Ronny Larsen e893086931 BUGFIX: Unknown regexp modifier 'k' removed 2013-12-18 11:32:18 +01:00
Frank Ronny Larsen 691a1c8be5 Merge branch 'master' of ssh://stash.amendor.com:7999/h5p/h5p-core-php 2013-12-05 12:17:25 +01:00
Frank Ronny Larsen b7f14a4c44 HFJ-59: Renamed coreVersion to coreApi.
Removes annoying double naming (coreVersion.majorVersion become coreApi.majorVersion)
Explicitly states that the versioning is one the API.
Explicitly states that this is the core version. (apiVersion could mean API of the library)
2013-12-05 12:15:17 +01:00
Frode Petterson 0884bf369a Added more attrs for videos. 2013-12-03 11:36:31 +01:00
Frank Ronny Larsen 6bb9c9a9b6 HFJ-59: Added coreVersion check for libraries, and explicitly set H5PCore version to 1.0 2013-11-27 10:09:57 +01:00
Frank Ronny Larsen 47dcb931e9 Fix regexp slashes and FontAwesome dependency 2013-11-26 14:40:38 +01:00
Svein-Tore Griff With 563a5f2674 Use / instead of pipe as regexp fence in order to make pipe work inside the regexp. Needs testing 2013-11-25 23:44:45 +01:00
Svein-Tore Griff With e4c268612f Documentation updates 2013-11-18 18:03:01 +01:00
Svein-Tore Griff With 7aef062810 Clean up deletion and make sure export is deleted when node is deleted 2013-11-18 17:57:32 +01:00
Svein-Tore Griff With bdb508c877 Make export work 2013-11-18 17:45:31 +01:00
Svein-Tore Griff With f32ae3a4d4 We save the file instead of returning it for performance reasons 2013-11-17 18:26:39 +01:00
Svein-Tore Griff With 7695850799 Make sure content.json and editor libraries are included in export 2013-11-17 18:04:39 +01:00
Svein-Tore Griff With cab8e258be Export improvements 2013-11-15 01:13:00 +01:00
Svein-Tore Griff With 9dd710a8fb Renaming functions 2013-11-14 23:42:10 +01:00
Svein-Tore Griff With f98cce49a6 Make sure we only use camel case in the H5P php library 2013-11-14 14:10:55 +01:00
Svein-Tore Griff With 99ee7a47ae Documentation improvements 2013-11-14 14:05:34 +01:00
Svein-Tore Griff With 5ca6a5f39a Issue #2120227 by gafolini, Ellinokon and falcon: Add export feature to H5P 2013-11-14 13:48:07 +01:00
Frank Ronny Larsen 1d46204ac0 Merge branch 'master' of ssh://stash.amendor.com:7999/h5p/h5p-core-php
Conflicts:
	h5p.classes.php
2013-11-13 15:38:32 +01:00
Frank Ronny Larsen d9532a44ed Escape '|' characters in regexp 2013-11-13 15:36:00 +01:00
Svein-Tore Griff With 2454bcfa2a BUGFIX: The strikethrough was removed when an H5P was saved 2013-11-08 18:46:47 +01:00
Svein-Tore Griff With 1a6ef6f0fa Why are we using | instead of / around the regex? Change to / so that we may use | inside the regex 2013-11-08 18:24:42 +01:00
Svein-Tore Griff With 0d97f6952c Add iframe support and more license types 2013-11-08 18:16:41 +01:00
Frode Petterson 2720ec5f16 Added iframe support (by: Frank Ronny Larsen). 2013-10-25 15:10:50 +02:00
Svein-Tore Griff With f939e00f44 Fix styling issues for sites that has uncleard floating blocks 2013-10-21 13:22:13 +02:00
Svein-Tore Griff With ece7b5bcde Add support for GPL license in libraries 2013-09-17 15:57:13 +02:00
Svein-Tore Griff With 1549075a57 From ICC, allow extra params 2013-09-17 15:53:37 +02:00
Svein-Tore Griff With 7d989c648d Merge branch 'master' of ssh://stash.amendor.com:7999/h_core/h5p-core-php 2013-09-10 22:43:37 +02:00
Svein-Tore Griff With 6f46c5a5fa Move H5P content to top of body 2013-09-10 22:43:31 +02:00
Frank Ronny Larsen 676edc5eec BUGFIX: The saveLibraryData method is assumed to have a argument, include in Interface 2013-08-13 14:16:56 +02:00
Svein-Tore Griff With 2187777720 Add development mode 2013-08-12 08:11:11 +02:00
Svein-Tore Griff With 9a4f57fa7d Make sure that texts are texts 2013-07-24 18:01:07 +02:00
Frank Ronny Larsen 7736506b39 Avoid double encoding of htmlspecialchars, we get them encoded from editor 2013-07-17 15:11:37 +02:00
Frank Ronny Larsen 67cfc1d333 OPPG-470: More potential threats in validator 2013-07-17 12:55:51 +02:00
Svein-Tore Griff With db388d9a14 OPPG-470: Fixed several (potential) security problems
The biggest problem was that no filtering was done on lists because list values wasn't passed by referende through foreach
Also made sure lists where lists and keys where numbers
Made sure libraries only have library and semantics properties
2013-07-17 11:41:23 +02:00
Frank Ronny Larsen 46e4d67c06 Merge branch 'master' of b.amendor.com:h5p 2013-07-16 08:56:10 +02:00
Svein-Tore Griff With b69ee7c2e3 OPPG-436: Rewrote logic so that the entire library processing is skipped if the user doesn't have access to update libraries 2013-07-15 17:36:56 +02:00
Frank Ronny Larsen 6d231499e3 OPPG-459: "multiple" option for semantic type "select"
Specifies that the select shall handle multiple options.
Used by dynamicCheckboxes widget.
2013-07-15 16:25:10 +02:00
Frank Ronny Larsen fcc9ed4e24 Merge branch 'master' of b.amendor.com:h5p 2013-07-15 15:12:51 +02:00
Frank Ronny Larsen ca8aca2678 Validator fixes...
Added better handling of select widget for multiple selects:
 - Test for array, checks each element if found.
 - Tests if valid options are set in semantics, enters "strict" mode if set (allows only said options)
 - Non strict mode allows any option.
 - All set values are htmlspecialcharred, even if strict.
2013-07-15 15:07:53 +02:00
Svein-Tore Griff With 4dfb80a8d9 Move whitelist logic out of drupal and into H5P core 2013-07-13 22:25:18 +02:00
Frank Ronny Larsen 706c61bfe8 Replaced PHP strip_tags with D7 filter_xss. Good thing we cache this.. 2013-07-12 14:49:37 +02:00
Frank Ronny Larsen 7af599ae0d OPPG-413: Merge file handlers, better htmlspecialchars
Filelike objects are now handled by the same code, not 4 copies of it.
htmlspecialchars are now specified as UTF-8 and will encode ALL quotes.
2013-07-11 15:17:26 +02:00
Frank Ronny Larsen fb1b9fc719 OPPG-413: Fixed security hole inserted by validator itself.. 2013-07-11 15:13:15 +02:00
Frank Ronny Larsen 4509626a0d OPPG-413: Changed how HTML is handled for text. Any text widget with tags specified will now be treated as HTML 2013-07-11 14:36:31 +02:00
Frank Ronny Larsen 27345e22f8 BUGFIX: Use , not semantics tags after preprocessing tags, fixes in_array bugs 2013-07-11 13:12:17 +02:00
Frank Ronny Larsen b487f452d6 BUGFIX: Regexp from semantics does not contain delimiters. Add in PHP 2013-07-10 11:02:17 +02:00
Frank Ronny Larsen ec5c3ae1d5 BUGFIX: -> 2013-07-10 10:34:41 +02:00
Frank Ronny Larsen 7ab0309d0c OPPG-413: If using defaults, add extra tags for table etc. too. + Extra validation for image/video/audio 2013-07-10 09:59:35 +02:00
Frank Ronny Larsen ca1e84293a OPPG-413: Use default tag list if no tags are set. 2013-07-09 15:42:30 +02:00
Frank Ronny Larsen d57f4cb109 Merge branch 'master' of b.amendor.com:h5p
Conflicts:
	library/h5p.classes.php
2013-07-09 15:16:36 +02:00
Frank Ronny Larsen ab316a163c OPPG-425: Add hook_alter_h5p_semantics
Also re-adds getLibrarySemantics in core, used by the validator to fetch decoded semantics.
This function is also responsible for calling the hook.
2013-07-09 15:13:09 +02:00
Frode Petterson 9a12f49aea OPPG-413: Added this. 2013-07-09 14:43:22 +02:00
Frank Ronny Larsen 938b38c6f6 Comment fix 2013-07-09 11:01:29 +02:00
Frank Ronny Larsen d3953475f0 Whitespace 2013-07-09 10:14:42 +02:00
Frank Ronny Larsen a247ca470c OPPG-413: Validator just got a little more annoying. Gives warning if mandatory fields are missing in group 2013-07-09 10:10:32 +02:00
Frank Ronny Larsen 6e99a052e2 OPPG-413: BUGFIX: Use isset() to check for existence 2013-07-09 09:41:57 +02:00
Frank Ronny Larsen 1548ebaf94 OPPG-172: Added library whitelist extension
Adds js and css as allowed extensions for library.
Manually add swf if wanted.
2013-07-08 18:22:38 +02:00
Pål Jørgensen 112e1e1108 Merge branch 'master' of b.amendor.com:h5p 2013-07-08 17:12:48 +02:00
Pål Jørgensen 118024d479 Only clearing cache if at least one library was created or updated 2013-07-08 17:12:40 +02:00
Frank Ronny Larsen a7aeefc367 OPPG-414: Removed just in case-code. 2013-07-08 17:02:05 +02:00
Frank Ronny Larsen d2e3558927 OPPG-413: Enable caching, fill default tag list for HTML validation 2013-07-08 16:15:54 +02:00
Frank Ronny Larsen 35e2623e1b OPPG-413: Validation of specific limitations from semantics. 2013-07-08 15:28:45 +02:00
Frank Ronny Larsen 1ca9eff064 OPPG-413: Validation fixes 2013-07-08 14:59:15 +02:00
Frank Ronny Larsen 5f0ba2f2a0 OPPG-413: Validator mostly ready. Huge problems with lists. 2013-07-05 17:35:59 +02:00
Frank Ronny Larsen d1036e9a5a OPPG-172: Added File extentension white list for content
Scan content files to ensure all files comply with the configured
set of valid extensions.
Disallows adding htaccess or php to allowed extension too.
2013-06-30 22:14:16 +02:00
Frank Ronny Larsen 312bd0f8b5 OPPG-414: Specific permission for updating libraries
Added a permission.
Added a new function to H5PFrameworkInterface for testing if allowed to update library
Added apropriate tests.
2013-06-30 16:39:17 +02:00
Frank Ronny Larsen a34d0ea3e7 BUGFIX: Use DIRECTORY_SEPARATOR instead of '/' 2013-06-30 15:32:38 +02:00
Svein-Tore Griff With 0eb3051ca2 Add storage for the extra h5p.json data 2013-05-07 20:55:44 +02:00
Svein-Tore Griff With 8a94973852 Removing external resources 2013-05-07 19:38:52 +02:00
Svein-Tore Griff With da99000fe8 Translation of semantics now working 2013-05-03 11:21:08 +02:00
Svein-Tore Griff With 1a9a9b8b0b Add code for supporting language files. The code doesn't work but doesn't seem to break anything either. 2013-05-02 17:09:48 +02:00
Svein-Tore Griff With 7d25f28a6d Fix bugs after refactoring library validation. Also added camelcase on a variable. 2013-05-01 23:24:58 +02:00
Svein-Tore Griff With 252cb01573 refactoring, not stable 2013-05-01 17:22:09 +02:00
Svein-Tore Griff With 0ab794f67b Allow dots in filenames 2013-04-14 15:31:29 +02:00
Svein-Tore Griff With 1cb36af66e Use '-' instead of '_' in folder names 2013-04-13 15:03:04 +02:00
Svein-Tore Griff With 995e56cf60 Save h5p libraries in folders with understandable names 2013-04-13 14:55:33 +02:00
Svein-Tore Griff With 18b2475918 Do not attempt to save library dependencies for libraries that have already been saved, and also remove previous dependencies for libraries that are beeing patched 2013-04-13 14:11:25 +02:00
Svein-Tore Griff With d51e6e8d01 Fix dependency checking 2013-04-13 13:28:48 +02:00
Frode Petterson 57cc64f28c Added checking for fullscreen. 2013-04-11 14:59:33 +02:00
Frode Petterson 16767e690d Added responsive design to CP.
Added fullscreen option to H5P module.
2013-04-10 17:08:57 +02:00
Frode Petterson 64eda45a14 Added autoload so other modules easily may use our classes.
Moved H5P scripts to library array.
Fixed editor dependencies.
2013-04-03 15:39:59 +02:00
Svein-Tore Griff With 526b2f4042 Add documentation 2013-03-29 16:35:54 +01:00
Svein-Tore Griff With 556b92f438 Add documentation 2013-03-29 16:10:29 +01:00
Svein-Tore Griff With d790299326 Revert "Merge branch 'master' of b.amendor.com:h5p"
This reverts commit 87c44d7d041fbc7b74eee20f70db17bf053bc1e4, reversing
changes made to fc545475b1dc2d699e76392bb8b3ae4ce01a8e1c.
2013-03-09 01:20:55 +01:00
Svein-Tore Griff With 18d3798ec1 Revert "Merged in changes."
This reverts commit 801234f263adc38b91f845019ef114fa65af370a.
2013-03-08 18:30:53 +01:00
Svein-Tore Griff With ec3b36037c Revert "Tried to make H5P work again.."
This reverts commit afcf767628591dbcc4f2a48868d994edfb39209d.
2013-03-08 18:30:38 +01:00
Frode Petterson 98c06da4e6 Tried to make H5P work again.. 2013-03-08 11:51:55 +01:00
Frode Petterson 8177e0a251 Merged in changes. 2013-03-07 17:14:41 +01:00
Frode Petterson 9c934a752a Merge branch 'master' of b.amendor.com:h5p
Conflicts:
	example_content/boardgame/H5P.Boardgame
	example_content/boardgame/H5P.MultiChoice
	example_content/boardgame/H5P.QuestionSet
	example_content/boardgame/h5p.json
	example_content/summary/h5p.json
	h5p.classes.inc
	h5p.install
	h5p.module
2013-03-07 12:39:30 +01:00
Frode Petterson f71bf70561 Added class to libraries. 2013-03-07 12:34:29 +01:00
Svein-Tore Griff With 678f62d10a Fix problem with h5peditor changes not beeing saved when a node is beeing revisioned 2013-03-07 05:31:30 +01:00
Svein-Tore Griff With c5f3b92245 Merge conflicts 2013-03-07 04:19:22 +01:00
Svein-Tore Griff With c996a7b5ea Adding versioning support 2013-03-07 04:12:59 +01:00
Frank Ronny Larsen bf15f46d82 DEVEL: Changed CSS drop procedure 2013-02-28 20:06:18 +01:00
Svein-Tore Griff With 517f7e6e9d Resolve conflicts 2013-02-27 22:49:56 +01:00
Frode Petterson ad828c1984 Fixed php notice. 2013-02-25 15:45:34 +01:00
Svein-Tore Griff With 71763222e2 Save dependencies by library id instead of by machine_name and version 2013-02-24 00:12:57 +01:00
Frank Ronny Larsen 027a32baf1 Fixes for defaultStyles, adds boolean requirement parsing too 2013-02-23 23:29:41 +01:00
Frank Ronny Larsen 4a41265a23 DEVEL: Added defaultStyles setting to library dependencies 2013-02-23 22:51:47 +01:00
Svein-Tore Griff With b1bc724578 Remove already fixed todo item 2013-02-17 15:40:07 +01:00
Svein-Tore Griff With c656710889 Rename H5PFramework to H5PFrameworkInterface (Adopting drupals naming convention for interfaces) 2013-02-17 15:39:26 +01:00
Svein-Tore Griff With a5cb1db6d4 Rename classes and interfaces 2013-02-17 15:04:30 +01:00
Svein-Tore Griff With a2f1798173 Rename store -> save 2013-02-17 14:05:02 +01:00
Svein-Tore Griff With ab90fa41ce Add doc 2013-02-15 11:38:49 +01:00
Svein-Tore Griff With ef00e707ad Working proof of concept for editorLibraries 2013-02-08 04:38:27 +01:00
Svein-Tore Griff With 4e7a445198 Add validation for editor dependencies 2013-02-06 17:39:45 +01:00
Svein-Tore Griff With 7db3def124 Fix undefined function bug 2013-02-05 15:36:39 +01:00
Svein-Tore Griff With a5acd003d0 Rename init to main_library and remove init from libraries, add schema to db 2013-01-27 23:08:48 +01:00
Svein-Tore Griff With 905afe7dde Add the schema to the database 2013-01-25 15:14:29 +01:00
Svein-Tore Griff With c4b3c420fd Minor bug fixes 2013-01-20 16:13:11 +01:00
Svein-Tore Griff With bf286eb664 Merge branch 'master' of intern.amendor.com:h5p 2013-01-20 14:51:01 +01:00
Svein-Tore Griff With 62b6c498c3 Begin adding support for external resources 2013-01-17 23:39:24 +01:00
Svein-Tore Griff With a5e031d81f Store whether or not a library is runnable 2013-01-17 23:21:10 +01:00
Frode Petterson ec7214bc60 Merge branch 'master' of b.amendor.com:h5p 2013-01-17 10:14:03 +01:00
Frode Petterson d7340fad8a Constructive comment. 2013-01-17 10:13:58 +01:00
Svein-Tore Griff With decfb609ab Ignore files starting with . or _ 2013-01-16 22:00:12 +01:00
Frank Ronny Larsen 2d3abae249 Fixes to H5P module
Regex for library names changed to be a lot less restrictive.
Fixes to validation code that assumed stuff. Less strict now too.
Allow multiple JS/CSS files per library.

Attach H5P JS object to targets
2013-01-16 19:39:49 +01:00
Svein-Tore Griff With c283cd83b8 Add comments to the code 2013-01-14 23:47:50 +01:00
Svein-Tore Griff With b364664b27 Adding support for updating nodes 2012-12-22 08:04:09 +01:00
Svein-Tore Griff With 4bc3ea8bf2 Added support for deleting nodes 2012-12-22 07:09:17 +01:00
Svein-Tore Griff With e2bcec52a1 Remove dpm 2012-12-22 06:36:42 +01:00
Svein-Tore Griff With 53bf7fd8a0 Adding support for patching files 2012-12-22 06:35:16 +01:00
falcon 1fa56fad90 Add todo items 2012-12-15 15:45:29 +01:00
falcon a6c118e298 Add todo items 2012-12-04 22:46:15 +01:00
falcon bd3d755ba7 Use library id instead of machine_name to name library folders 2012-12-04 22:35:54 +01:00
falcon 19665aba5a Reconsider versioning system, use major, minor and patch versions 2012-12-04 22:26:20 +01:00
falcon a3045646cb subVersion -> minorVersion 2012-12-04 20:59:44 +01:00
falcon c595c1147a mainVersion -> majorVersion 2012-12-04 20:56:16 +01:00
falcon af6475609e lisence -> license 2012-12-04 20:47:55 +01:00
Svein-Tore Griff With 9f87cf561c Fixed so that node_insert, node_load and node_view works 2012-12-04 15:52:03 +01:00
Svein-Tore Griff With 686df63e9a Fixing spelling error 2012-12-04 09:19:42 +01:00
Svein-Tore Griff With c793e7ce99 Fixing spelling error 2012-12-04 09:19:16 +01:00
falcon 7220b097c1 Fix some bugs 2012-12-03 00:19:25 +01:00
falcon bed42d335a Reconsider main json file and library json files 2012-12-02 21:55:51 +01:00
falcon cff341c984 Finish storage 2012-12-01 22:18:48 +01:00
Svein-Tore Griff With 655a8cd144 Incremental changes 2012-12-01 10:54:15 +01:00
falcon b3caa84446 Fix function naming issue 2012-11-30 23:39:44 +01:00
Svein-Tore Griff With 7984c1bcf5 Incremental work on saving packages 2012-11-30 15:51:39 +01:00
falcon 1e49f83daa Adjustments to validation, and start on insert and update 2012-11-29 22:52:41 +01:00
Svein-Tore Griff With 21c86d02dd Add documentation and also validation of the dependencies in the main h5p.json file 2012-11-29 15:41:06 +01:00
Svein-Tore Griff With 032da68702 Make sure required files and folders exists 2012-11-29 08:57:01 +01:00
Svein-Tore Griff With 8737c75ea3 Validate the main h5p.json file 2012-11-29 08:51:36 +01:00
falcon 9a1cabff9d Add dependency validation 2012-11-28 23:29:22 +01:00
Svein-Tore Griff With 75661ada39 Store library info and prepare for dependency check 2012-11-28 15:31:55 +01:00
Svein-Tore Griff With 6a21c3101b Fix consistence in error reporting 2012-11-28 15:21:34 +01:00
Svein-Tore Griff With 44dfbbc4f6 Validate requirements on the option form 2012-11-28 14:45:54 +01:00
Svein-Tore Griff With 2413be911c Add slashes to regexp 2012-11-28 14:06:55 +01:00
Svein-Tore Griff With d41b47637b Validation functions added 2012-11-28 13:56:42 +01:00
falcon bbddd1be53 Incremental update to library file 2012-11-26 22:48:51 +01:00
Svein-Tore Griff With 692993b00f Add schemas for validating json 2012-11-24 01:09:25 +01:00
Svein-Tore Griff With adcf4288a9 Starting to rewrite the validation according to new content specification 2012-11-23 17:06:03 +01:00
Svein-Tore Griff With 269339228e Move h5p functionality to the library 2012-11-22 14:00:06 +01:00