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