From 54ca645e2cbf0c9f2676f40f86840de5acc7f17b Mon Sep 17 00:00:00 2001 From: Thomas Marstrander Date: Sun, 6 Mar 2016 11:42:24 +0100 Subject: [PATCH 1/5] Whitelisted originalImage attribute when filtering params. HFJ-1645 --- h5p.classes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/h5p.classes.php b/h5p.classes.php index c8662a1..93534f2 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -2906,7 +2906,7 @@ class H5PContentValidator { // Remove attributes that should not exist, they may contain JSON escape // code. - $validkeys = array_merge(array('path', 'mime', 'copyright'), $typevalidkeys); + $validkeys = array_merge(array('path', 'mime', 'copyright', 'originalImage'), $typevalidkeys); if (isset($semantics->extraAttributes)) { $validkeys = array_merge($validkeys, $semantics->extraAttributes); // TODO: Validate extraAttributes } From ee245f9344bbe9827b123dbac6122d6de1c9156f Mon Sep 17 00:00:00 2001 From: Thomas Marstrander Date: Sun, 6 Mar 2016 13:27:10 +0100 Subject: [PATCH 2/5] Whitelisted originalImage and ratio when validating Image. HFJ-1645 --- h5p.classes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/h5p.classes.php b/h5p.classes.php index b58ed11..87a576d 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -2906,7 +2906,7 @@ class H5PContentValidator { // Remove attributes that should not exist, they may contain JSON escape // code. - $validkeys = array_merge(array('path', 'mime', 'copyright', 'originalImage'), $typevalidkeys); + $validkeys = array_merge(array('path', 'mime', 'copyright'), $typevalidkeys); if (isset($semantics->extraAttributes)) { $validkeys = array_merge($validkeys, $semantics->extraAttributes); // TODO: Validate extraAttributes } @@ -2951,7 +2951,7 @@ class H5PContentValidator { * Validate given image data */ public function validateImage(&$image, $semantics) { - $this->_validateFilelike($image, $semantics, array('width', 'height')); + $this->_validateFilelike($image, $semantics, array('ratio', 'width', 'height', 'originalImage')); } /** From 4ed368f5e7ddc258230f917186097a421b956696 Mon Sep 17 00:00:00 2001 From: Thomas Marstrander Date: Sun, 6 Mar 2016 13:40:50 +0100 Subject: [PATCH 3/5] Ratio added as field instead of parameter, removed from whitelist. HFJ-1645 --- h5p.classes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/h5p.classes.php b/h5p.classes.php index 87a576d..bed4260 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -2951,7 +2951,7 @@ class H5PContentValidator { * Validate given image data */ public function validateImage(&$image, $semantics) { - $this->_validateFilelike($image, $semantics, array('ratio', 'width', 'height', 'originalImage')); + $this->_validateFilelike($image, $semantics, array('width', 'height', 'originalImage')); } /** From 4775e3444fc685b7fc68bf99c1cab85b1fd2c2c7 Mon Sep 17 00:00:00 2001 From: Thomas Marstrander Date: Mon, 14 Mar 2016 16:01:45 +0100 Subject: [PATCH 4/5] Added two new icons. HFJ-1716 --- fonts/h5p-core-14.eot | Bin 0 -> 5008 bytes fonts/{h5p.svg => h5p-core-14.svg} | 4 +++- fonts/h5p-core-14.ttf | Bin 0 -> 4828 bytes fonts/h5p-core-14.woff | Bin 0 -> 4904 bytes fonts/h5p.eot | Bin 4160 -> 0 bytes fonts/h5p.ttf | Bin 4012 -> 0 bytes styles/h5p.css | 10 +++++----- 7 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 fonts/h5p-core-14.eot rename fonts/{h5p.svg => h5p-core-14.svg} (78%) create mode 100644 fonts/h5p-core-14.ttf create mode 100644 fonts/h5p-core-14.woff delete mode 100644 fonts/h5p.eot delete mode 100644 fonts/h5p.ttf diff --git a/fonts/h5p-core-14.eot b/fonts/h5p-core-14.eot new file mode 100644 index 0000000000000000000000000000000000000000..9a9081651f51c47bb33af7a875d8b58df4090020 GIT binary patch literal 5008 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 F{{%9tnF9a- literal 0 HcmV?d00001 diff --git a/fonts/h5p.svg b/fonts/h5p-core-14.svg similarity index 78% rename from fonts/h5p.svg rename to fonts/h5p-core-14.svg index 2087153..f66252d 100644 --- a/fonts/h5p.svg +++ b/fonts/h5p-core-14.svg @@ -3,7 +3,7 @@ Generated by IcoMoon - + @@ -20,4 +20,6 @@ + + \ No newline at end of file diff --git a/fonts/h5p-core-14.ttf b/fonts/h5p-core-14.ttf new file mode 100644 index 0000000000000000000000000000000000000000..77aa1c73fcd62368df09dd9e00219130e384c663 GIT binary patch literal 4828 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 literal 0 HcmV?d00001 diff --git a/fonts/h5p.eot b/fonts/h5p.eot deleted file mode 100644 index 2c68dc55cdb186ab2945c9dc4146b61a0bfc6e6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4160 zcmb7H32a=&8J>Ig?fvZCeYWFcy=(6plB_p-7IN4QiBp0tAUL7r5Nr}-6FaeMJ19X7 zMMOX-D2+-2L?TozP^l6{m8u?UQxpM3qO{PWwvYR}l@;oEMz?8UvnPe94J@zKg&eWYiYkia$Im&QTx zc*KXmjeOVm{<%YgFWA2W{tWOflT&*t_8%e%;O`s${>q_g(oTcuO$2!SKxO~vOHJhk z;04&&H9a*u2S1TQ4;en;;-|1I31O$%&q4W0t)_n^d1@KCWr@P=m8qYQ`IG$I`E#V7 zBZIj(*hVgH3fG#k*a}{)=B`vL5ybQ{jL*<1iN8zdzdZlY{K@kR=g)%z4eyfqW1t*& zDfIlGT7+|#bHw=~S}eEZ3WGw?F0_n;MN+=Z6}%w*=`=q*N@DB?-v{q3EQv6me{0#dAX(y`*=}vE=u7!FJ^SM&l ziRIA8Lb^MVDi%ulTr3(#XpJgb>x&x9;A()#UeP z+P0*!BYj<6eIr@a-A;5?K*TS0R0fT}V8yI7FKr_~5q|ap@#Ba{lC|V=vV~krZX~zj zxFEEY>ZJ)4b=qkk)pc)rsf?B2Rw}83v;&i-BA5g?s#UCm=1RRZLqoKjP9;Lru)0$! zsw1&{c@yoWPPtU*rG~}rPP>yL+w^_T#I%%tD*5sVp}F{$VKxRny&rjc8X@jLMkcJ;cWcWw}Mv8vTRRVZ-d=nS=Oqs z4(Q{9UBw35rr~f!H`&Rw?MS7RuKqsUtj98Y?>uzq&Qk%$@`jYM#F%alM>{&AtP%|iOD%C*s|Ye6gbcTv|~#x;i7aOrs%+fdhrU1kg~ zHUWTEX(y6h7mFCf*b8n6*w|R=0aQ4=)+(2EK)#eF!B43WjkxMS0$$FR9HA+r;gsXW zeEAjSGf8fi4fXlQw1*`vsHYbA0$!*y9UH_z@rIV1lwB ze2QNY$3Yy3G1k4k8=FkPK38m2vBe5&<6whML&>TrV>;OkeZfKt*FySK^wO{nd6ZAn zZ#HF`n%6Zm22Utsom&%(^J}zZf+?T!+w}9cMZe7$vm?ej{>+UTDlI9%w!NM(^E!Sm z;JM%NQ>uarBCmO*-`f=CUVot3PkGSiZPd~u@q3vsmTR`-whnofPwJ2k$S?-%*KK|g zcDt%fcQ(M8 zfO6WfJ(}8}pgC$`+@!_4RtRR5A8kCIur~5=%op=gN`IsS3g%TnhuRx|<43f{ng1x_ z%U9j_a@og3m&RBGhi0M|I|D_k(1$gI!i2f98|%P!YC$e-LJoo*>f$je6EY-+hg1+} zhZ-7EDj|bvXxQLV4iA4c6ji^61}+b6AvQd`3^%%PaWnCuhny9X{rD5&gNo&y7*6~` z>LVw(FT(Sa>-Q8X!*OHhyi>q0bXjCK|~C32K*;Y?0RMg3B^@qs%+ z3^0cyVkj_}sD}qj3|u7^Mfv#le(VerN*3nDq9`A~Vn86iAUs@6_g5dL{nhtqBP*{E zFrfyzhCa@0^(91_nps4p{<<#2hnk0~7Qu{%{j~ps4_1hd!WH44K#|pYqK;2Y)^U1nLPvFPjnfMd5-V}o#aJSb`0g0ECA8t6#3#&ZAg}ws@Q>xS z7{o0dZ>XiGAlkTZ5h5=!a$<1VOTZ8av1^)Yh&fsWp+`YmkeAR$ksm|8AGr-0-bS53 zHuN6kS>(gWZ@8_!xa+p#*?156A^984(%-Th_`K*B@5l}EDfvg&vQ7P12__j+7pEY3 zw(ei;U1WM~BsJMkr*qtnF0I1?@U?YV;4~))K=0^9%cOQ;lxo2v4YU)6S47yM5ITFW{d=!sw^AN9)In;YW Z+f5FmyprsJ)G)Gno@X$A<|X+l>AyGuF+%_V diff --git a/fonts/h5p.ttf b/fonts/h5p.ttf deleted file mode 100644 index 81d242f3a543cf9c1e704f0d734b93dc00adf9fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4012 zcmb7H32dCj6`p(c-}|?B_qQF}yWX{T4N2CUJqtN(hr}r%77(1!atJnwv56hqwVf(K z4MjviC@76e0z@KIEl{ZvMU|=^YEu*eMWVFOqPCPuR7FLttBMw>YKw}z={Ntb9fzyx z>_0Q_n)lwkIo>Rxgb*LOi*S;=`ntY+s7W0K6Ll>#W?0CVD^4trITkZL$#kh$F63j;h)VG@ zvk|Aee^*~_*QTDHO}lbETifS^Pb7t?y|#7Fo~@?7GuyExog3-z?(QGSq3>~`a{?lM zv9mg41cs_+r+H}y`LXb`=ZT-h5Z|@ra0`YyUXsP zs5X68(;48aDexr;nN&JcN#R(gY{*3m zS(>STl}?IbrD8fIGT~g})Hj1x%(84xM_-fOWLeg#uny?sL*1n&+os`gRkzrwjO|FJ zl&<|Q+^Wa2`|db&=#EnX$MS}hvc#Bf4M*egD659T!yAQWjM`21nzrU{+itfw(?dzi zA0iQJOdE$bgAbEQCsT-ms>3D__#8I^*k%ST#~g{;Ni|xGznlU#Ks|oJrI0{Z(H-v! zJJ^clN}3BQ#|+oOZleFTbLk=5H%dL7RG-o6}9+pyVD; z*FfAG^>Gi6_s6N=v7Ey=t$BiNJ}>ozqR65?VR2uW3!woRIN^1ABf%EG(v(Z=fk4^^ z)epA^x;@-Z*;rMa7c7d;@!?Zpk1r(QM`AF}1Z6?^l(-^+i#QNttY>=<4w-;`uGp$l zn-$i^!6u!7l2uX0bgC8lg2gtjh4iWDrC}ZND4(X^Xvwy;u4`oso>0cRwk8?p*J#NE zQ$FRl>1S<=ev2_?M~roR*&DM|T2g>*dp%+1b^KhwbHC%KR0S18UiC=7wzA}Gkh@9j`=k-`+bOISAT+Q zsilAqm^a$y05=m)Gl_Y_s9>74l~#E|7Usdbn&3=8IUP72EgewM8nqBNX)&)Af?4Iq z7>_5cjXWIl#k`c#AL@XDc@@y1&gNhHk*#s(KZ5-76*s?J_7T~oITpdCne4;KK$9-^ zV-KM*X|CetIT82 za579PSzHiHqI~>{L4o{&^l&vjP5`uHL&ANBe4jNG=Q*NY1lT2d=gPuB6X56c{%!V_$%mP@-qK6d(vI^4dhC*SFt?qdnBFea*%>ngVI5rB;3aB zmQ%Rf*JWMT>l~!~u6!A8LsG7Mz|enrr8=!_^{7@>?fEwX-fdR!1r-uIL_lhf)-nJv zr0&+1rCE!zEOoT@b$>YQHyZ;<6T%JLg#`HjQ=JfU??NA%%#jb0rqh^>O^eAYH@)G(8>Z7Rlp>{ySTj-OhhTe-hhk6+Gb$7HEZ{1EZL+&O& zAb+Dd`WtowUl0T0ZMi`{DgWSFwy7UG!IUKrU8Ki>((tc|258ya+u*U_a7 zSOC7Z0ZaVbv>LDiz0iQYq>bDFoC?D=oI1?#Kjw-C%t2qgougw1C#$n$ zC&b6dK{83IWOkW5G(9z+7#p1$ovqG~?n~@BoVarD^ziibRF(|6dgq~e3`3_}YgICj cejjLi$YHcslD&``Mm0WU5kK=!@)OE`0U Date: Thu, 31 Mar 2016 16:07:45 +0200 Subject: [PATCH 5/5] Added version number and links to licenses. HFJ-1734 --- h5p.classes.php | 14 +++++++------- js/h5p.js | 23 ++++++++++++++--------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/h5p.classes.php b/h5p.classes.php index e308dc9..a10389d 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -3617,31 +3617,31 @@ class H5PContentValidator { ), (object) array( 'value' => 'CC BY', - 'label' => $this->h5pF->t('Attribution') + 'label' => $this->h5pF->t('Attribution 4.0') ), (object) array( 'value' => 'CC BY-SA', - 'label' => $this->h5pF->t('Attribution-ShareAlike') + 'label' => $this->h5pF->t('Attribution-ShareAlike 4.0') ), (object) array( 'value' => 'CC BY-ND', - 'label' => $this->h5pF->t('Attribution-NoDerivs') + 'label' => $this->h5pF->t('Attribution-NoDerivs 4.0') ), (object) array( 'value' => 'CC BY-NC', - 'label' => $this->h5pF->t('Attribution-NonCommercial') + 'label' => $this->h5pF->t('Attribution-NonCommercial 4.0') ), (object) array( 'value' => 'CC BY-NC-SA', - 'label' => $this->h5pF->t('Attribution-NonCommercial-ShareAlike') + 'label' => $this->h5pF->t('Attribution-NonCommercial-ShareAlike 4.0') ), (object) array( 'value' => 'CC BY-NC-ND', - 'label' => $this->h5pF->t('Attribution-NonCommercial-NoDerivs') + 'label' => $this->h5pF->t('Attribution-NonCommercial-NoDerivs 4.0') ), (object) array( 'value' => 'GNU GPL', - 'label' => $this->h5pF->t('General Public License') + 'label' => $this->h5pF->t('General Public License v3') ), (object) array( 'value' => 'PD', diff --git a/js/h5p.js b/js/h5p.js index df0d9e6..fa2e4c7 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -903,7 +903,12 @@ H5P.Dialog = function (name, title, content, $element) { self.close(); }) .end() - .end(); + .find('a') + .click(function (e) { + e.stopPropagation(); + }) + .end() + .end(); this.open = function () { setTimeout(function () { @@ -1293,15 +1298,15 @@ H5P.MediaCopyright = function (copyright, labels, order, extraFields) { */ H5P.copyrightLicenses = { 'U': 'Undisclosed', - 'CC BY': 'Attribution', - 'CC BY-SA': 'Attribution-ShareAlike', - 'CC BY-ND': 'Attribution-NoDerivs', - 'CC BY-NC': 'Attribution-NonCommercial', - 'CC BY-NC-SA': 'Attribution-NonCommercial-ShareAlike', - 'CC BY-NC-ND': 'Attribution-NonCommercial-NoDerivs', - 'GNU GPL': 'General Public License', + 'CC BY': 'Attribution 4.0', + 'CC BY-SA': 'Attribution-ShareAlike 4.0', + 'CC BY-ND': 'Attribution-NoDerivs 4.0', + 'CC BY-NC': 'Attribution-NonCommercial 4.0', + 'CC BY-NC-SA': 'Attribution-NonCommercial-ShareAlike 4.0', + 'CC BY-NC-ND': 'Attribution-NonCommercial-NoDerivs 4.0', + 'GNU GPL': 'General Public License v3', 'PD': 'Public Domain', - 'ODC PDDL': 'Public Domain Dedication and Licence', + 'ODC PDDL': 'Public Domain Dedication and Licence', 'CC PDM': 'Public Domain Mark', 'C': 'Copyright' };