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