From 4e987794c498de6ec5f73eba1a940a0ca9f41e9e Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Tue, 18 Feb 2020 13:22:16 +0100 Subject: [PATCH 01/11] MOBILE-3344 extensions: Update extensions list --- src/assets/exttomime.json | 119 ++++++++++++++++++-------------- src/assets/img/files/h5p-64.png | Bin 0 -> 2837 bytes src/assets/mimetoext.json | 15 ++-- 3 files changed, 78 insertions(+), 56 deletions(-) create mode 100644 src/assets/img/files/h5p-64.png diff --git a/src/assets/exttomime.json b/src/assets/exttomime.json index bab000445..2728d8b3d 100644 --- a/src/assets/exttomime.json +++ b/src/assets/exttomime.json @@ -6,17 +6,17 @@ "3ds": {"type":"image/x-3ds"}, "3g2": {"type":"video/3gpp2"}, "3gp": {"type":"video/quicktime","icon":"quicktime","string":"video","groups":["video"]}, -"7z": {"type":"application/x-7z-compressed","icon":"archive"}, +"7z": {"type":"application/x-7z-compressed","icon":"archive","string":"archive","groups":["archive"]}, "a": {"type":"application/octet-stream"}, "aab": {"type":"application/x-authorware-bin"}, -"aac": {"type":"audio/aac","icon":"audio","string":"audio","groups":["audio"]}, +"aac": {"type":"audio/aac","icon":"audio","string":"audio","groups":["audio","html_audio","web_audio"]}, "aam": {"type":"application/x-authorware-map"}, "aas": {"type":"application/x-authorware-seg"}, "abc": {"type":"text/vnd.abc"}, "abw": {"type":"application/x-abiword"}, "ac": {"type":"application/pkix-attr-cert"}, "acc": {"type":"application/vnd.americandynamics.acc"}, -"accdb": {"type":"application/msaccess","icon":"database"}, +"accdb": {"type":"application/msaccess","icon":"base"}, "ace": {"type":"application/x-ace-compressed","icon":"archive"}, "acgi": {"type":"text/html"}, "acu": {"type":"application/vnd.acucobol"}, @@ -77,6 +77,7 @@ "bcpio": {"type":"application/x-bcpio"}, "bdf": {"type":"application/x-font-bdf"}, "bdm": {"type":"application/vnd.syncml.dm+wbxml"}, +"bdoc": {"type":"application/x-digidoc","icon":"document","groups":["archive"]}, "bed": {"type":"application/vnd.realvnc.bed"}, "bh2": {"type":"application/vnd.fujitsu.oasysprs"}, "bin": {"type":"application/octet-stream"}, @@ -126,6 +127,7 @@ "cdmid": {"type":"application/cdmi-domain"}, "cdmio": {"type":"application/cdmi-object"}, "cdmiq": {"type":"application/cdmi-queue"}, +"cdoc": {"type":"application/x-digidoc","icon":"document","groups":["archive"]}, "cdx": {"type":"chemical/x-cdx"}, "cdxml": {"type":"application/vnd.chemdraw+xml"}, "cdy": {"type":"application/vnd.cinderella"}, @@ -188,6 +190,7 @@ "dcurl": {"type":"text/vnd.curl.dcurl"}, "dd2": {"type":"application/vnd.oma.dd2+xml"}, "ddd": {"type":"application/vnd.fujixerox.ddd"}, +"ddoc": {"type":"application/x-digidoc","icon":"document","groups":["archive"]}, "deb": {"type":"application/x-debian-package"}, "deepv": {"type":"application/x-deepv"}, "def": {"type":"text/plain"}, @@ -274,7 +277,7 @@ "fbs": {"type":"image/vnd.fastbidsheet"}, "fcdt": {"type":"application/vnd.adobe.formscentral.fcdt"}, "fcs": {"type":"application/vnd.isac.fcs"}, -"fdf": {"type":"application/pdf","icon":"pdf"}, +"fdf": {"type":"application/vnd.fdf","icon":"pdf"}, "fdk": {"type":"application/octet-stream"}, "fe_launch": {"type":"application/vnd.denovo.fcselayout-link"}, "fg5": {"type":"application/vnd.fujitsu.oasysgp"}, @@ -286,7 +289,7 @@ "fhc": {"type":"image/x-freehand"}, "fif": {"type":"application/fractals"}, "fig": {"type":"application/x-xfig"}, -"flac": {"type":"audio/x-flac","icon":"audio","string":"audio","groups":["audio","web_audio"]}, +"flac": {"type":"audio/flac","icon":"audio","string":"audio","groups":["audio","html_audio","web_audio"]}, "fli": {"type":"video/x-fli"}, "flo": {"type":"application/vnd.micrografx.flo"}, "flv": {"type":"video/x-flv","icon":"flash","string":"video","groups":["video","web_video"]}, @@ -295,6 +298,7 @@ "fly": {"type":"text/vnd.fly"}, "fm": {"type":"application/vnd.framemaker"}, "fmf": {"type":"video/x-atomic3d-feature"}, +"fmp4": {"type":"video/mp4","icon":"mpeg","string":"video","groups":["html_video","video","web_video"]}, "fnc": {"type":"application/vnd.frogans.fnc"}, "for": {"type":"text/x-fortran"}, "fpx": {"type":"image/vnd.fpx"}, @@ -314,12 +318,15 @@ "g3": {"type":"image/g3fax"}, "g3w": {"type":"application/vnd.geospace"}, "gac": {"type":"application/vnd.groove-account"}, +"gallery": {"type":"application/x-smarttech-notebook","icon":"archive"}, +"gallerycollection": {"type":"application/x-smarttech-notebook","icon":"archive"}, +"galleryitem": {"type":"application/x-smarttech-notebook","icon":"archive"}, "gam": {"type":"application/x-tads"}, "gbr": {"type":"application/rpki-ghostbusters"}, "gca": {"type":"application/x-gca-compressed"}, "gdl": {"type":"model/vnd.gdl"}, "gdoc": {"type":"application/vnd.google-apps.document","icon":"document","groups":["document"]}, -"gdraw": {"type":"application/vnd.google-apps.drawing","icon":"draw"}, +"gdraw": {"type":"application/vnd.google-apps.drawing","icon":"image","groups":["image"]}, "geo": {"type":"application/vnd.dynageo"}, "gex": {"type":"application/vnd.geometry-explorer"}, "ggb": {"type":"application/vnd.geogebra.file","icon":"archive"}, @@ -359,7 +366,7 @@ "h261": {"type":"video/h261"}, "h263": {"type":"video/h263"}, "h264": {"type":"video/h264"}, -"h5p": {"type":"application/zip","icon":"archive","string":"archive","groups":["archive"]}, +"h5p": {"type":"application/zip","icon":"h5p","string":"archive"}, "hal": {"type":"application/vnd.hal+xml"}, "hbci": {"type":"application/vnd.hbci"}, "hdf": {"type":"application/x-hdf"}, @@ -434,7 +441,7 @@ "ivy": {"type":"application/x-livescreen"}, "jad": {"type":"text/vnd.sun.j2me.app-descriptor"}, "jam": {"type":"application/vnd.jam"}, -"jar": {"type":"application/java-archive"}, +"jar": {"type":"application/java-archive","icon":"archive"}, "jav": {"type":"text/plain"}, "java": {"type":"text/plain","icon":"sourcecode"}, "jcb": {"type":"text/xml","icon":"markup"}, @@ -447,7 +454,7 @@ "jlt": {"type":"application/vnd.hp-jlyt"}, "jmt": {"type":"text/xml","icon":"markup"}, "jmx": {"type":"text/xml","icon":"markup"}, -"jnlp": {"type":"application/x-java-jnlp-file"}, +"jnlp": {"type":"application/x-java-jnlp-file","icon":"markup"}, "joda": {"type":"application/vnd.joost.joda-archive"}, "jpe": {"type":"image/jpeg","icon":"jpeg","string":"image","groups":["image","web_image"]}, "jpeg": {"type":"image/jpeg","icon":"jpeg","string":"image","groups":["image","web_image"]}, @@ -458,7 +465,7 @@ "jps": {"type":"image/x-jps"}, "jqz": {"type":"text/xml","icon":"markup"}, "js": {"type":"application/x-javascript","icon":"text","groups":["web_file"]}, -"json": {"type":"application/json"}, +"json": {"type":"application/json","icon":"text"}, "jsonml": {"type":"application/jsonml+json"}, "jut": {"type":"image/jutvision"}, "kar": {"type":"audio/midi"}, @@ -521,10 +528,10 @@ "m2v": {"type":"video/mpeg"}, "m3a": {"type":"audio/mpeg"}, "m3u": {"type":"audio/x-mpegurl","icon":"mp3","string":"audio","groups":["audio"]}, -"m3u8": {"type":"application/vnd.apple.mpegurl"}, -"m4a": {"type":"audio/mp4","icon":"audio","string":"audio","groups":["audio","web_audio"]}, +"m3u8": {"type":"application/x-mpegURL","icon":"mpeg","groups":["media_source"]}, +"m4a": {"type":"audio/mp4","icon":"mp3","string":"audio","groups":["audio","html_audio","web_audio"]}, "m4u": {"type":"video/vnd.mpegurl"}, -"m4v": {"type":"video/mp4","icon":"mpeg","string":"video","groups":["video","web_video"]}, +"m4v": {"type":"video/mp4","icon":"mpeg","string":"video","groups":["html_video","video","web_video"]}, "ma": {"type":"application/mathematica","string":"math"}, "mads": {"type":"application/mads+xml"}, "mag": {"type":"application/vnd.ecowin.chart"}, @@ -544,7 +551,7 @@ "mcf": {"type":"image/vasa"}, "mcp": {"type":"application/netmc"}, "mcurl": {"type":"text/vnd.curl.mcurl"}, -"mdb": {"type":"application/x-msaccess","icon":"database"}, +"mdb": {"type":"application/x-msaccess","icon":"base"}, "mdi": {"type":"image/vnd.ms-modi"}, "me": {"type":"text/troff"}, "mesh": {"type":"model/mesh"}, @@ -555,8 +562,8 @@ "mft": {"type":"application/rpki-manifest"}, "mgp": {"type":"application/vnd.osgeo.mapguide.package"}, "mgz": {"type":"application/vnd.proteus.magazine"}, -"mht": {"type":"message/rfc822"}, -"mhtml": {"type":"message/rfc822"}, +"mht": {"type":"message/rfc822","icon":"archive"}, +"mhtml": {"type":"message/rfc822","icon":"archive"}, "mid": {"type":"audio/midi"}, "midi": {"type":"audio/midi"}, "mie": {"type":"application/x-mie"}, @@ -582,18 +589,19 @@ "mod": {"type":"audio/mod"}, "mods": {"type":"application/mods+xml"}, "moov": {"type":"video/quicktime"}, -"mov": {"type":"video/quicktime","icon":"quicktime","string":"video","groups":["video","web_video"]}, +"mov": {"type":"video/quicktime","icon":"quicktime","string":"video","groups":["video","web_video","html_video"]}, "movie": {"type":"video/x-sgi-movie","icon":"quicktime","string":"video","groups":["video"]}, "mp2": {"type":"audio/mpeg"}, "mp21": {"type":"application/mp21"}, "mp2a": {"type":"audio/mpeg"}, -"mp3": {"type":"audio/mp3","icon":"mp3","string":"audio","groups":["audio","web_audio"]}, -"mp4": {"type":"video/mp4","icon":"mpeg","string":"video","groups":["video","web_video"]}, -"mp4a": {"type":"audio/mp4","icon":"audio","string":"audio","groups":["audio","web_audio"]}, +"mp3": {"type":"audio/mp3","icon":"mp3","string":"audio","groups":["audio","html_audio","web_audio"]}, +"mp4": {"type":"video/mp4","icon":"mpeg","string":"video","groups":["html_video","video","web_video"]}, +"mp4a": {"type":"audio/mp4","icon":"audio","string":"audio","groups":["audio","html_audio","web_audio"]}, "mp4s": {"type":"application/mp4"}, "mp4v": {"type":"video/mp4","icon":"mpeg","string":"video","groups":["video","web_video"]}, "mpa": {"type":"audio/mpeg"}, "mpc": {"type":"application/vnd.mophun.certificate"}, +"mpd": {"type":"application/dash+xml","icon":"mpeg","groups":["media_source"]}, "mpe": {"type":"video/mpeg","icon":"mpeg","string":"video","groups":["video","web_video"]}, "mpeg": {"type":"video/mpeg","icon":"mpeg","string":"video","groups":["video","web_video"]}, "mpg": {"type":"video/mpeg","icon":"mpeg","string":"video","groups":["video","web_video"]}, @@ -603,6 +611,7 @@ "mpm": {"type":"application/vnd.blueice.multipass"}, "mpn": {"type":"application/vnd.mophun.application"}, "mpp": {"type":"application/vnd.ms-project"}, +"mpr": {"type":"application/vnd.moodle.profiling","icon":"moodle"}, "mpt": {"type":"application/vnd.ms-project"}, "mpv": {"type":"application/x-project"}, "mpx": {"type":"application/x-project"}, @@ -624,7 +633,9 @@ "musicxml": {"type":"application/vnd.recordare.musicxml+xml"}, "mv": {"type":"video/x-sgi-movie"}, "mvb": {"type":"application/x-msmediaview"}, +"mw": {"type":"application/maple","icon":"math"}, "mwf": {"type":"application/vnd.mfer"}, +"mws": {"type":"application/maple","icon":"math"}, "mxf": {"type":"application/mxf"}, "mxl": {"type":"application/vnd.recordare.musicxml"}, "mxml": {"type":"application/xv+xml"}, @@ -637,6 +648,7 @@ "nap": {"type":"image/naplps"}, "naplps": {"type":"image/naplps"}, "nb": {"type":"application/mathematica","string":"math"}, +"nbk": {"type":"application/x-smarttech-notebook","icon":"archive"}, "nbp": {"type":"application/vnd.wolfram.player"}, "nc": {"type":"application/x-netcdf"}, "ncm": {"type":"application/vnd.nokia.configuration-message"}, @@ -652,6 +664,7 @@ "nnd": {"type":"application/vnd.noblenet-directory"}, "nns": {"type":"application/vnd.noblenet-sealer"}, "nnw": {"type":"application/vnd.noblenet-web"}, +"notebook": {"type":"application/x-smarttech-notebook","icon":"archive"}, "npx": {"type":"image/vnd.net-fpx"}, "nsc": {"type":"application/x-conference"}, "nsf": {"type":"application/vnd.lotus-notes"}, @@ -672,12 +685,12 @@ "odg": {"type":"application/vnd.oasis.opendocument.graphics","icon":"draw"}, "odi": {"type":"application/vnd.oasis.opendocument.image","icon":"draw"}, "odm": {"type":"application/vnd.oasis.opendocument.text-master","icon":"writer"}, -"odp": {"type":"application/vnd.oasis.opendocument.presentation","icon":"impress"}, +"odp": {"type":"application/vnd.oasis.opendocument.presentation","icon":"impress","groups":["presentation"]}, "ods": {"type":"application/vnd.oasis.opendocument.spreadsheet","icon":"calc","groups":["spreadsheet"]}, "odt": {"type":"application/vnd.oasis.opendocument.text","icon":"writer","groups":["document"]}, -"oga": {"type":"audio/ogg","icon":"audio","string":"audio","groups":["audio","web_audio"]}, -"ogg": {"type":"audio/ogg","icon":"audio","string":"audio","groups":["audio","web_audio"]}, -"ogv": {"type":"video/ogg","icon":"video","string":"video","groups":["video","web_video"]}, +"oga": {"type":"audio/ogg","icon":"audio","string":"audio","groups":["audio","html_audio","web_audio"]}, +"ogg": {"type":"audio/ogg","icon":"audio","string":"audio","groups":["audio","html_audio","web_audio"]}, +"ogv": {"type":"video/ogg","icon":"video","string":"video","groups":["html_video","video","web_video"]}, "ogx": {"type":"application/ogg"}, "omc": {"type":"application/x-omc"}, "omcd": {"type":"application/x-omcdatamaker"}, @@ -698,7 +711,7 @@ "otg": {"type":"application/vnd.oasis.opendocument.graphics-template","icon":"draw"}, "oth": {"type":"application/vnd.oasis.opendocument.text-web","icon":"oth","groups":["document"]}, "oti": {"type":"application/vnd.oasis.opendocument.image-template"}, -"otp": {"type":"application/vnd.oasis.opendocument.presentation-template","icon":"impress"}, +"otp": {"type":"application/vnd.oasis.opendocument.presentation-template","icon":"impress","groups":["presentation"]}, "ots": {"type":"application/vnd.oasis.opendocument.spreadsheet-template","icon":"calc","groups":["spreadsheet"]}, "ott": {"type":"application/vnd.oasis.opendocument.text-template","icon":"writer","groups":["document"]}, "oxps": {"type":"application/oxps"}, @@ -726,7 +739,7 @@ "pcurl": {"type":"application/vnd.curl.pcurl"}, "pcx": {"type":"image/x-pcx"}, "pdb": {"type":"application/vnd.palm"}, -"pdf": {"type":"application/pdf","icon":"pdf"}, +"pdf": {"type":"application/pdf","icon":"pdf","groups":["document"]}, "pem": {"type":"application/x-pem-file"}, "pfa": {"type":"application/x-font-type1"}, "pfb": {"type":"application/x-font-type1"}, @@ -760,20 +773,20 @@ "png": {"type":"image/png","icon":"png","string":"image","groups":["image","web_image"]}, "pnm": {"type":"image/x-portable-anymap"}, "portpkg": {"type":"application/vnd.macports.portpkg"}, -"pot": {"type":"application/vnd.ms-powerpoint","icon":"powerpoint"}, -"potm": {"type":"application/vnd.ms-powerpoint.template.macroenabled.12","icon":"powerpoint"}, -"potx": {"type":"application/vnd.openxmlformats-officedocument.presentationml.template","icon":"powerpoint"}, +"pot": {"type":"application/vnd.ms-powerpoint","icon":"powerpoint","groups":["presentation"]}, +"potm": {"type":"application/vnd.ms-powerpoint.template.macroenabled.12","icon":"powerpoint","groups":["presentation"]}, +"potx": {"type":"application/vnd.openxmlformats-officedocument.presentationml.template","icon":"powerpoint","groups":["presentation"]}, "pov": {"type":"model/x-pov"}, -"ppa": {"type":"application/vnd.ms-powerpoint","icon":"powerpoint"}, -"ppam": {"type":"application/vnd.ms-powerpoint.addin.macroenabled.12","icon":"powerpoint"}, +"ppa": {"type":"application/vnd.ms-powerpoint","icon":"powerpoint","groups":["presentation"]}, +"ppam": {"type":"application/vnd.ms-powerpoint.addin.macroenabled.12","icon":"powerpoint","groups":["presentation"]}, "ppd": {"type":"application/vnd.cups-ppd"}, "ppm": {"type":"image/x-portable-pixmap"}, "pps": {"type":"application/vnd.ms-powerpoint","icon":"powerpoint","groups":["presentation"]}, -"ppsm": {"type":"application/vnd.ms-powerpoint.slideshow.macroenabled.12","icon":"powerpoint"}, -"ppsx": {"type":"application/vnd.openxmlformats-officedocument.presentationml.slideshow","icon":"powerpoint"}, +"ppsm": {"type":"application/vnd.ms-powerpoint.slideshow.macroenabled.12","icon":"powerpoint","groups":["presentation"]}, +"ppsx": {"type":"application/vnd.openxmlformats-officedocument.presentationml.slideshow","icon":"powerpoint","groups":["presentation"]}, "ppt": {"type":"application/vnd.ms-powerpoint","icon":"powerpoint","groups":["presentation"]}, -"pptm": {"type":"application/vnd.ms-powerpoint.presentation.macroenabled.12","icon":"powerpoint"}, -"pptx": {"type":"application/vnd.openxmlformats-officedocument.presentationml.presentation","icon":"powerpoint"}, +"pptm": {"type":"application/vnd.ms-powerpoint.presentation.macroenabled.12","icon":"powerpoint","groups":["presentation"]}, +"pptx": {"type":"application/vnd.openxmlformats-officedocument.presentationml.presentation","icon":"powerpoint","groups":["presentation"]}, "ppz": {"type":"application/mspowerpoint"}, "pqa": {"type":"application/vnd.palm"}, "prc": {"type":"application/x-mobipocket-ebook"}, @@ -786,11 +799,11 @@ "psf": {"type":"application/x-font-linux-psf"}, "pskcxml": {"type":"application/pskc+xml"}, "ptid": {"type":"application/vnd.pvi.ptid1"}, -"pub": {"type":"application/x-mspublisher","icon":"publisher"}, +"pub": {"type":"application/x-mspublisher","icon":"publisher","groups":["presentation"]}, "pvb": {"type":"application/vnd.3gpp.pic-bw-var"}, "pvu": {"type":"paleovu/x-pv"}, "pwn": {"type":"application/vnd.3m.post-it-notes"}, -"pwz": {"type":"application/vnd.ms-powerpoint","icon":"powerpoint"}, +"pwz": {"type":"application/vnd.ms-powerpoint","icon":"powerpoint","groups":["presentation"]}, "py": {"type":"text/x-script.phyton"}, "pya": {"type":"audio/vnd.ms-playready.media.pya"}, "pyc": {"type":"application/x-bytecode.python"}, @@ -815,7 +828,7 @@ "qxt": {"type":"application/vnd.quark.quarkxpress"}, "ra": {"type":"audio/x-realaudio-plugin","icon":"audio","string":"audio","groups":["audio","web_audio"]}, "ram": {"type":"audio/x-pn-realaudio-plugin","icon":"audio","string":"audio","groups":["audio"]}, -"rar": {"type":"application/x-rar-compressed"}, +"rar": {"type":"application/x-rar-compressed","icon":"archive","string":"archive","groups":["archive"]}, "ras": {"type":"image/x-cmu-raster"}, "rast": {"type":"image/cmu-raster"}, "rb": {"type":"text/plain"}, @@ -872,7 +885,7 @@ "scm": {"type":"application/vnd.lotus-screencam"}, "scq": {"type":"application/scvp-cv-request"}, "scs": {"type":"application/scvp-cv-response"}, -"scss": {"type":"text/x-scss"}, +"scss": {"type":"text/x-scss","icon":"text","groups":["web_file"]}, "scurl": {"type":"text/vnd.curl.scurl"}, "sda": {"type":"application/vnd.stardivision.draw","icon":"draw"}, "sdc": {"type":"application/vnd.stardivision.calc","icon":"calc"}, @@ -917,7 +930,7 @@ "skp": {"type":"application/vnd.koan"}, "skt": {"type":"application/vnd.koan"}, "sl": {"type":"application/x-seelogo"}, -"sldm": {"type":"application/vnd.ms-powerpoint.slide.macroenabled.12","icon":"powerpoint"}, +"sldm": {"type":"application/vnd.ms-powerpoint.slide.macroenabled.12","icon":"powerpoint","groups":["presentation"]}, "sldx": {"type":"application/vnd.openxmlformats-officedocument.presentationml.slide"}, "slt": {"type":"application/vnd.epson.salt"}, "sm": {"type":"application/vnd.stepmania.stepchart"}, @@ -957,7 +970,7 @@ "std": {"type":"application/vnd.sun.xml.draw.template","icon":"draw"}, "step": {"type":"application/step"}, "stf": {"type":"application/vnd.wt.stf"}, -"sti": {"type":"application/vnd.sun.xml.impress.template","icon":"impress"}, +"sti": {"type":"application/vnd.sun.xml.impress.template","icon":"impress","groups":["presentation"]}, "stk": {"type":"application/hyperstudio"}, "stl": {"type":"application/vnd.ms-pki.stl"}, "stp": {"type":"application/step"}, @@ -982,7 +995,7 @@ "sxc": {"type":"application/vnd.sun.xml.calc","icon":"calc"}, "sxd": {"type":"application/vnd.sun.xml.draw","icon":"draw"}, "sxg": {"type":"application/vnd.sun.xml.writer.global","icon":"writer"}, -"sxi": {"type":"application/vnd.sun.xml.impress","icon":"impress"}, +"sxi": {"type":"application/vnd.sun.xml.impress","icon":"impress","groups":["presentation"]}, "sxm": {"type":"application/vnd.sun.xml.math","icon":"math"}, "sxw": {"type":"application/vnd.sun.xml.writer","icon":"writer"}, "t": {"type":"text/troff"}, @@ -1016,6 +1029,7 @@ "tr": {"type":"text/troff"}, "tra": {"type":"application/vnd.trueapp"}, "trm": {"type":"application/x-msterminal"}, +"ts": {"type":"video/MP2T","icon":"mpeg","string":"video","groups":["video","web_video"]}, "tsd": {"type":"application/timestamped-data"}, "tsi": {"type":"audio/tsp-audio"}, "tsp": {"type":"application/dsptype"}, @@ -1028,7 +1042,7 @@ "twds": {"type":"application/vnd.simtech-mindmapper"}, "txd": {"type":"application/vnd.genomatix.tuxedo"}, "txf": {"type":"application/vnd.mobius.txf"}, -"txt": {"type":"text/plain","icon":"text"}, +"txt": {"type":"text/plain","icon":"text","defaulticon":true}, "udeb": {"type":"application/x-debian-package"}, "ufd": {"type":"application/vnd.ufdl"}, "ufdl": {"type":"application/vnd.ufdl"}, @@ -1104,7 +1118,7 @@ "vss": {"type":"application/vnd.visio"}, "vst": {"type":"application/vnd.visio"}, "vsw": {"type":"application/vnd.visio"}, -"vtt": {"type":"text/vtt"}, +"vtt": {"type":"text/vtt","icon":"text","groups":["html_track"]}, "vtu": {"type":"model/vnd.vtu"}, "vxml": {"type":"application/voicexml+xml"}, "w3d": {"type":"application/x-director"}, @@ -1112,7 +1126,7 @@ "w61": {"type":"application/wordperfect6.1"}, "w6w": {"type":"application/msword"}, "wad": {"type":"application/x-doom"}, -"wav": {"type":"audio/wav","icon":"wav","string":"audio","groups":["audio","web_audio"]}, +"wav": {"type":"audio/wav","icon":"wav","string":"audio","groups":["audio","html_audio","web_audio"]}, "wax": {"type":"audio/x-ms-wax"}, "wb1": {"type":"application/x-qpro"}, "wbmp": {"type":"image/vnd.wap.wbmp"}, @@ -1122,8 +1136,8 @@ "wdb": {"type":"application/vnd.ms-works"}, "wdp": {"type":"image/vnd.ms-photo"}, "web": {"type":"application/vnd.xara"}, -"weba": {"type":"audio/webm","icon":"audio","string":"audio","groups":["audio","web_audio"]}, -"webm": {"type":"video/webm","icon":"video","string":"video","groups":["video","web_video"]}, +"weba": {"type":"audio/webm","icon":"audio","string":"audio","groups":["audio","html_audio","web_audio"]}, +"webm": {"type":"video/webm","icon":"video","string":"video","groups":["html_video","video","web_video"]}, "webp": {"type":"image/webp"}, "wg": {"type":"application/vnd.pmi.widget"}, "wgt": {"type":"application/widget"}, @@ -1131,7 +1145,7 @@ "wk1": {"type":"application/x-123"}, "wks": {"type":"application/vnd.ms-works"}, "wm": {"type":"video/x-ms-wm"}, -"wma": {"type":"audio/x-ms-wma"}, +"wma": {"type":"audio/x-ms-wma","icon":"audio","string":"audio","groups":["audio"]}, "wmd": {"type":"application/x-ms-wmd"}, "wmf": {"type":"application/x-msmetafile"}, "wml": {"type":"text/vnd.wap.wml"}, @@ -1173,17 +1187,18 @@ "xar": {"type":"application/vnd.xara"}, "xbap": {"type":"application/x-ms-xbap"}, "xbd": {"type":"application/vnd.fujixerox.docuworks.binder"}, +"xbk": {"type":"application/x-smarttech-notebook","icon":"archive"}, "xbm": {"type":"image/x-xbitmap"}, "xdf": {"type":"application/xcap-diff+xml"}, "xdm": {"type":"application/vnd.syncml.dm+xml"}, -"xdp": {"type":"application/pdf","icon":"pdf"}, +"xdp": {"type":"application/vnd.adobe.xdp+xml","icon":"pdf"}, "xdr": {"type":"video/x-amt-demorun"}, "xdssc": {"type":"application/dssc+xml"}, "xdw": {"type":"application/vnd.fujixerox.docuworks"}, "xenc": {"type":"application/xenc+xml"}, "xer": {"type":"application/patch-ops-error+xml"}, -"xfd": {"type":"application/pdf","icon":"pdf"}, -"xfdf": {"type":"application/pdf","icon":"pdf"}, +"xfd": {"type":"application/vnd.xfdl","icon":"pdf"}, +"xfdf": {"type":"application/vnd.adobe.xfdf","icon":"pdf"}, "xfdl": {"type":"application/vnd.xfdl"}, "xgz": {"type":"xgl/drawing"}, "xht": {"type":"application/xhtml+xml"}, @@ -1203,7 +1218,7 @@ "xls": {"type":"application/vnd.ms-excel","icon":"spreadsheet","groups":["spreadsheet"]}, "xlsb": {"type":"application/vnd.ms-excel.sheet.binary.macroenabled.12","icon":"spreadsheet"}, "xlsm": {"type":"application/vnd.ms-excel.sheet.macroenabled.12","icon":"spreadsheet","groups":["spreadsheet"]}, -"xlsx": {"type":"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet","icon":"spreadsheet"}, +"xlsx": {"type":"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet","icon":"spreadsheet","groups":["spreadsheet"]}, "xlt": {"type":"application/vnd.ms-excel","icon":"spreadsheet"}, "xltm": {"type":"application/vnd.ms-excel.template.macroenabled.12","icon":"spreadsheet"}, "xltx": {"type":"application/vnd.openxmlformats-officedocument.spreadsheetml.template","icon":"spreadsheet"}, diff --git a/src/assets/img/files/h5p-64.png b/src/assets/img/files/h5p-64.png new file mode 100644 index 0000000000000000000000000000000000000000..cdd1c9b1bc657d802771805efb9617cf744654a0 GIT binary patch literal 2837 zcmV+w3+nWVP))|8U!V1 zQHY5OiXlc~2nuSIS5V;}`2$-_Nr6JC#q0!Ho`8T*rr8`p0+I@fB9+;(szjk>vd+wJG}x?a{@wUoBDwjB6zkfI|f zIp4=yWPg|Zev;iCK?nu|az;yI0aL(Ny+n$_|FUb8P0293QXWQABVv2w06H5(L9MAc z-|6K`4SlTZJazB@qWuRuP`0;l9iHrtu_qlIMVCPl6glt~LN z_5D5E=KYV=OD~xg@Wln-IsE*SVcvBtwj_mcQwZ&83{fakV%g{e85xtM%Ww=vNf&=HrAnC50$oa1IC4*l%iE@q$kQ<$-S&vT&3_O)Sy5B=e@9f z{l+1a_Xa)8`Y_rZb8;pcoh1arG-yS`;e*^ApPuj(#`&=Pyt5zsV8B6)AfBV~+_5On za|LlV+8et;tLLGj2f1r>FRKhc-i_qfx%@d~#CY`K;i})c^w!S0kPtkMlA@m|-eZ_aW}l z`?zuGrPF5QMJkyEbb1}{xF9AvErj-t5N2(a5JfVZ`r#=`xtobPYTF^FWM6ZMD2|!!sm9FRUg1K)CBNS6h0hK%xSD) zc75?2&a0n{;A-)QmvW~;r|xP;)Q(aP&({KqIK1)EKQmkaf9vaq*wPa(YlK&vRmX3x znK2IalP&#h*gag(ZtIaGSI)G`g7?(`p6L82f`KUhyK=;T9gGtRZD`)0}x2B<(-x_4sr*_HfFO1ak)QUDb!lo~LMQee{ zz_0IYADe%(ItL8+?e+l%l3tF7K9)%Ej*o-;S2X4u+s~{EuZ-n=kU4uCS$drg>l5jOK=fp+NZ?5rO z*knTCbDL`T+JdH{LC$30%W{I{`hbE6FRRbWId$AIznQr$L1xqi5P_~?n;ZUih*3w= z5Hxspc6{YLM(i;G_`$!| zo50ce+F3b#sb@FJ@c|QUF_&D`0s97RHbzH%*Ym~TMd0DL`%fBtu~^8MGCZZ>Gv)3# zde}3NDm$5R-=;pIBd&kAUFpb61*^eQvAwOORP%x$XEaZLuYEPj5B`0GLnBU6_)XC` zoiBFr#=%%l-?%GNgD;{2zAp|94aLN9y(y)!v-pPPZ**036mBj(46MQ_L zz%bOF3M0YKc++B%@FLn5UJKYMn|LBYV}oU1bip|*CK(AaeU3mQ_p38BMe_*JBuh>pIR$FTZ?|GK{`SM1s``@3=0G9cM;+1QAFiZAM}V;)xW2 zKmZX<^iU7`_D9|4pL=HUs#R+bQqeS6#qcPIMh_CULL?F?Mq>$L@g$z7X=n&znu@Nj z!yNAEb6@+%i;JH7!!tWCUv{xnCV&#*?WvyXM1-Urai$DEfeBP^gqQx|(3Igz%mURO-fBXj;FRGfhy<%Qw%0Ni z08JIXcqCZW@PcjI3=NHP^w`jp;EM}DRqv`Ul}r&&BoGYu)tCRgblbM~_vC4^l$zLz z2_XFw2n@hgivNn{l1vt%YT#{~!J#3}opX-+!-pSS`OZ6U_q&eM#@O4ul2vuq(Mun* z>v-F2@Bk1D1Om19edoTJ4}9;Tzgkv!fp0#gAn}>|Hl}2oQI^*(*sII_U0>$p_^&^6 z1?1QcDcd31b>Pq=>%af#)~)YHwbnWhHXGOloODeA$@DRm{+|nY83CAS0n`GuhGAG* z>x^K6Ku!9*nXX2$WyqL{m4f%upmrKQyV}_TAPd0A z(gxE9IKQea`!n(&RSEF?|A`N%_#Cr8XHw4jLddUPy1G8*AZmh4@kAr2ii~J>TPZT~ nY63?kdDoCKHKvp>3-0rOaJhx8=LF=N00000NkvXXu0mjf$nAFS literal 0 HcmV?d00001 diff --git a/src/assets/mimetoext.json b/src/assets/mimetoext.json index 842fcf09d..438731f8b 100644 --- a/src/assets/mimetoext.json +++ b/src/assets/mimetoext.json @@ -20,6 +20,7 @@ "application/clariscad": ["ccad"], "application/commonground": ["dp"], "application/cu-seeme": ["cu"], +"application/dash+xml": ["mpd"], "application/davmount+xml": ["davmount"], "application/docbook+xml": ["dbk"], "application/drafting": ["drw"], @@ -71,6 +72,7 @@ "application/mac-compactpro": ["cpt"], "application/macbinary": ["bin"], "application/mads+xml": ["mads"], +"application/maple": ["mw","mws"], "application/marc": ["mrc"], "application/marcxml+xml": ["mrcx"], "application/mathematica": ["ma","mb","nb"], @@ -355,6 +357,7 @@ "application/vnd.mobius.plc": ["plc"], "application/vnd.mobius.txf": ["txf"], "application/vnd.moodle.backup": ["mbz"], +"application/vnd.moodle.profiling": ["mpr"], "application/vnd.mophun.application": ["mpn"], "application/vnd.mophun.certificate": ["mpc"], "application/vnd.mozilla.xul+xml": ["xul"], @@ -520,7 +523,7 @@ "application/vnd.wqd": ["wqd"], "application/vnd.wt.stf": ["stf"], "application/vnd.xara": ["xar","web"], -"application/vnd.xfdl": ["xfdl"], +"application/vnd.xfdl": ["xfdl","xfd"], "application/vnd.yamaha.hv-dic": ["hvd"], "application/vnd.yamaha.hv-script": ["hvs"], "application/vnd.yamaha.hv-voice": ["hvp"], @@ -579,6 +582,7 @@ "application/x-debian-package": ["deb","udeb"], "application/x-deepv": ["deepv"], "application/x-dgc-compressed": ["dgc"], +"application/x-digidoc": ["bdoc","cdoc","ddoc"], "application/x-director": ["cct","cst","cxt","dcr","dir","dxr","fgd","swa","w3d"], "application/x-doom": ["wad"], "application/x-dtbncx+xml": ["ncx"], @@ -709,6 +713,7 @@ "application/x-shockwave-flash": ["swf","swfl"], "application/x-silverlight-app": ["xap"], "application/x-sit": ["sit"], +"application/x-smarttech-notebook": ["gallery","gallerycollection","galleryitem","nbk","notebook","xbk"], "application/x-sprite": ["spr","sprite"], "application/x-sql": ["sql"], "application/x-stuffit": ["sit"], @@ -762,13 +767,14 @@ "application/xv+xml": ["mxml","xhvml","xvm","xvml"], "application/yang": ["yang"], "application/yin+xml": ["yin"], -"application/zip": ["zip"], +"application/zip": ["zip","h5p"], "audio/aac": ["aac"], "audio/adpcm": ["adp"], "audio/aiff": ["aif","aifc","aiff"], "audio/amr": ["amr"], "audio/au": ["au"], "audio/basic": ["au","snd"], +"audio/flac": ["flac"], "audio/it": ["it"], "audio/make": ["funk","my","pfunk"], "audio/make.my.funk": ["pfunk"], @@ -816,7 +822,7 @@ "audio/x-mod": ["mod"], "audio/x-mpeg": ["mp2"], "audio/x-mpeg-3": ["mp3"], -"audio/x-mpegurl": ["m3u"], +"audio/x-mpegurl": ["m3u","m3u8"], "audio/x-mpequrl": ["m3u"], "audio/x-ms-wax": ["wax"], "audio/x-ms-wma": ["wma"], @@ -1026,8 +1032,9 @@ "video/jpeg": ["jpgv"], "video/jpm": ["jpgm","jpm"], "video/mj2": ["mj2","mjp2"], -"video/mp4": ["mp4","f4v","m4v","mp4v","mpg4"], +"video/mp4": ["mp4","f4v","m4v","mp4v","mpg4","fmp4"], "video/mpeg": ["mpeg","m1v","m2v","mp2","mp3","mpa","mpe","mpg"], +"video/MP2T": ["ts"], "video/msvideo": ["avi"], "video/ogg": ["ogv"], "video/quicktime": ["mov","3gp","moov","qt"], From ef98b9a19b7f2c547fc56d26dad28364cc1923dc Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Wed, 19 Feb 2020 10:12:11 +0100 Subject: [PATCH 02/11] MOBILE-3344 fileuploader: Accept more types in isInvalidMimetype --- src/core/fileuploader/providers/fileuploader.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/core/fileuploader/providers/fileuploader.ts b/src/core/fileuploader/providers/fileuploader.ts index a061b8e29..d5c2fcda3 100644 --- a/src/core/fileuploader/providers/fileuploader.ts +++ b/src/core/fileuploader/providers/fileuploader.ts @@ -298,12 +298,18 @@ export class CoreFileUploaderProvider { * @return Undefined if file is valid, error message if file is invalid. */ isInvalidMimetype(mimetypes?: string[], path?: string, mimetype?: string): string { - let extension; + let extension: string; if (mimetypes) { // Verify that the mimetype of the file is supported. if (mimetype) { extension = this.mimeUtils.getExtension(mimetype); + + if (mimetypes.indexOf(mimetype) == -1) { + // Get the "main" mimetype of the extension. + // It's possible that the list of accepted mimetypes only includes the "main" mimetypes. + mimetype = this.mimeUtils.getMimeType(extension); + } } else { extension = this.mimeUtils.getFileExtension(path); mimetype = this.mimeUtils.getMimeType(extension); From 841ed8b5312dc50e269fc626c3d18b6cecedf50c Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Wed, 26 Feb 2020 12:57:35 +0100 Subject: [PATCH 03/11] MOBILE-3351 core: Display image viewer in fullscreen --- src/core/emulator/providers/capture-helper.ts | 2 +- src/directives/format-text.ts | 2 +- src/providers/utils/dom.ts | 19 ++++++++++--------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/core/emulator/providers/capture-helper.ts b/src/core/emulator/providers/capture-helper.ts index e20fb64d8..ad09550aa 100644 --- a/src/core/emulator/providers/capture-helper.ts +++ b/src/core/emulator/providers/capture-helper.ts @@ -99,7 +99,7 @@ export class CoreEmulatorCaptureHelperProvider { params.maxTime = options.duration * 1000; } - modal = this.modalCtrl.create('CoreEmulatorCaptureMediaPage', params); + modal = this.modalCtrl.create('CoreEmulatorCaptureMediaPage', params, { cssClass: 'core-modal-fullscreen' }); modal.present(); modal.onDidDismiss((data: any, role: string) => { if (role == 'success') { diff --git a/src/directives/format-text.ts b/src/directives/format-text.ts index dc178bedc..7057b269f 100644 --- a/src/directives/format-text.ts +++ b/src/directives/format-text.ts @@ -221,7 +221,7 @@ export class CoreFormatTextDirective implements OnChanges { anchor.addEventListener('click', (e: Event) => { e.preventDefault(); e.stopPropagation(); - this.domUtils.viewImage(imgSrc, img.getAttribute('alt'), this.component, this.componentId); + this.domUtils.viewImage(imgSrc, img.getAttribute('alt'), this.component, this.componentId, true); }); img.parentNode.appendChild(anchor); diff --git a/src/providers/utils/dom.ts b/src/providers/utils/dom.ts index 748e73923..40b2df79c 100644 --- a/src/providers/utils/dom.ts +++ b/src/providers/utils/dom.ts @@ -1560,25 +1560,26 @@ export class CoreDomUtilsProvider { } /** - * View an image in a new page or modal. + * View an image in a modal. * * @param image URL of the image. * @param title Title of the page or modal. * @param component Component to link the image to if needed. * @param componentId An ID to use in conjunction with the component. + * @param fullScreen Whether the modal should be full screen. */ - viewImage(image: string, title?: string, component?: string, componentId?: string | number): void { + viewImage(image: string, title?: string, component?: string, componentId?: string | number, fullScreen?: boolean): void { if (image) { const params: any = { - title: title, - image: image, - component: component, - componentId: componentId - }, - modal = this.modalCtrl.create('CoreViewerImagePage', params); + title: title, + image: image, + component: component, + componentId: componentId, + }; + const options = fullScreen ? { cssClass: 'core-modal-fullscreen' } : {}; + const modal = this.modalCtrl.create('CoreViewerImagePage', params, options); modal.present(); } - } /** From 94877df150e31c9169fe8c8882ed51c60ccab5ae Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Mon, 30 Mar 2020 12:47:42 +0200 Subject: [PATCH 04/11] MOBILE-3386 core: Pass new editor and search modules to compile --- src/core/compile/providers/compile.ts | 9 +++++++-- src/core/editor/editor.module.ts | 2 +- src/core/search/search.module.ts | 5 +++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/core/compile/providers/compile.ts b/src/core/compile/providers/compile.ts index 8ad107f6a..51cbc8afd 100644 --- a/src/core/compile/providers/compile.ts +++ b/src/core/compile/providers/compile.ts @@ -39,6 +39,8 @@ import { CORE_SITEHOME_PROVIDERS } from '@core/sitehome/sitehome.module'; import { CORE_USER_PROVIDERS } from '@core/user/user.module'; import { CORE_PUSHNOTIFICATIONS_PROVIDERS } from '@core/pushnotifications/pushnotifications.module'; import { IONIC_NATIVE_PROVIDERS } from '@core/emulator/emulator.module'; +import { CORE_EDITOR_PROVIDERS } from '@core/editor/editor.module'; +import { CORE_SEARCH_PROVIDERS } from '@core/search/search.module'; // Import only this provider to prevent circular dependencies. import { CoreSitePluginsProvider } from '@core/siteplugins/providers/siteplugins'; @@ -75,6 +77,8 @@ import { CoreSiteHomeComponentsModule } from '@core/sitehome/components/componen import { CoreUserComponentsModule } from '@core/user/components/components.module'; import { CoreQuestionComponentsModule } from '@core/question/components/components.module'; import { CoreBlockComponentsModule } from '@core/block/components/components.module'; +import { CoreEditorComponentsModule } from '@core/editor/components/components.module'; +import { CoreSearchComponentsModule } from '@core/search/components/components.module'; // Import some components listed in entryComponents so they can be injected dynamically. import { CoreCourseUnsupportedModuleComponent } from '@core/course/components/unsupported-module/unsupported-module'; @@ -144,7 +148,7 @@ export class CoreCompileProvider { IonicModule, TranslateModule.forChild(), CoreComponentsModule, CoreDirectivesModule, CorePipesModule, CoreCourseComponentsModule, CoreCoursesComponentsModule, CoreSiteHomeComponentsModule, CoreUserComponentsModule, CoreCourseDirectivesModule, CoreSitePluginsDirectivesModule, CoreQuestionComponentsModule, AddonModAssignComponentsModule, - AddonModWorkshopComponentsModule, CoreBlockComponentsModule + AddonModWorkshopComponentsModule, CoreBlockComponentsModule, CoreEditorComponentsModule, CoreSearchComponentsModule ]; constructor(protected injector: Injector, logger: CoreLoggerProvider, compilerFactory: JitCompilerFactory) { @@ -237,7 +241,8 @@ export class CoreCompileProvider { .concat(ADDON_MOD_SURVEY_PROVIDERS).concat(ADDON_MOD_URL_PROVIDERS).concat(ADDON_MOD_WIKI_PROVIDERS) .concat(ADDON_MOD_WORKSHOP_PROVIDERS).concat(ADDON_NOTES_PROVIDERS).concat(ADDON_NOTIFICATIONS_PROVIDERS) .concat(CORE_PUSHNOTIFICATIONS_PROVIDERS).concat(ADDON_REMOTETHEMES_PROVIDERS).concat(CORE_BLOCK_PROVIDERS) - .concat(CORE_FILTER_PROVIDERS).concat(CORE_H5P_PROVIDERS); + .concat(CORE_FILTER_PROVIDERS).concat(CORE_H5P_PROVIDERS).concat(CORE_EDITOR_PROVIDERS) + .concat(CORE_SEARCH_PROVIDERS); // We cannot inject anything to this constructor. Use the Injector to inject all the providers into the instance. for (const i in providers) { diff --git a/src/core/editor/editor.module.ts b/src/core/editor/editor.module.ts index e55c88a49..b34cb47e1 100644 --- a/src/core/editor/editor.module.ts +++ b/src/core/editor/editor.module.ts @@ -17,7 +17,7 @@ import { CoreEditorComponentsModule } from './components/components.module'; import { CoreEditorOfflineProvider } from './providers/editor-offline'; // List of providers (without handlers). -export const CORE_GRADES_PROVIDERS: any[] = [ +export const CORE_EDITOR_PROVIDERS: any[] = [ CoreEditorOfflineProvider, ]; diff --git a/src/core/search/search.module.ts b/src/core/search/search.module.ts index 4026fb898..2ea1e8d63 100644 --- a/src/core/search/search.module.ts +++ b/src/core/search/search.module.ts @@ -16,6 +16,11 @@ import { NgModule } from '@angular/core'; import { CoreSearchComponentsModule } from './components/components.module'; import { CoreSearchHistoryProvider } from './providers/search-history'; +// List of providers (without handlers). +export const CORE_SEARCH_PROVIDERS: any[] = [ + CoreSearchHistoryProvider, +]; + @NgModule({ declarations: [ ], From 0d0deedfc3eaefe988b5ef1963e49b7df879db07 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Fri, 27 Mar 2020 12:04:36 +0100 Subject: [PATCH 05/11] MOBILE-3387 login: Remove unneeded call to get public config --- src/core/login/pages/init/init.ts | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/core/login/pages/init/init.ts b/src/core/login/pages/init/init.ts index b7ea64352..baa1218bd 100644 --- a/src/core/login/pages/init/init.ts +++ b/src/core/login/pages/init/init.ts @@ -91,16 +91,7 @@ export class CoreLoginInitPage { }); } - return this.sitesProvider.getCurrentSite().getPublicConfig().catch(() => { - return {}; - }).then((config) => { - return this.sitesProvider.checkRequiredMinimumVersion(config).then(() => { - // User is logged in, go to site initial page. - return this.loginHelper.goToSiteInitialPage(); - }).catch(() => { - return this.loadPage(); - }); - }); + return this.loginHelper.goToSiteInitialPage(); } return this.navCtrl.setRoot('CoreLoginSitesPage'); From c92264794b4fd55648d6c7e3f6bb0c58f7d43496 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Fri, 27 Mar 2020 12:06:34 +0100 Subject: [PATCH 06/11] MOBILE-3387 core: Increase time of fetch site info cron task --- src/providers/handlers/site-info-cron-handler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/providers/handlers/site-info-cron-handler.ts b/src/providers/handlers/site-info-cron-handler.ts index c8e39cd58..32f23b929 100644 --- a/src/providers/handlers/site-info-cron-handler.ts +++ b/src/providers/handlers/site-info-cron-handler.ts @@ -48,7 +48,7 @@ export class CoreSiteInfoCronHandler implements CoreCronHandler { * @return Interval time (in milliseconds). */ getInterval(): number { - return 3600000; // 1 hour. + return 10800000; // 3 hours. } /** From 0538d40ebfd98a1d60a634983eccbcd2aa82aa8d Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Mon, 30 Mar 2020 12:07:07 +0200 Subject: [PATCH 07/11] MOBILE-3387 ws: Prevent duplicate requests in ajax calls --- src/providers/ws.ts | 169 ++++++++++++++++++++++++++------------------ 1 file changed, 99 insertions(+), 70 deletions(-) diff --git a/src/providers/ws.ts b/src/providers/ws.ts index c13af220f..8440316ae 100644 --- a/src/providers/ws.ts +++ b/src/providers/ws.ts @@ -171,6 +171,7 @@ export class CoreWSProvider { /** * Call a Moodle WS using the AJAX API. Please use it if the WS layer is not an option. + * It uses a cache to prevent duplicate requests. * * @param method The WebService method to be called. * @param data Arguments to pass to the method. @@ -181,79 +182,19 @@ export class CoreWSProvider { * - available: 0 if unknown, 1 if available, -1 if not available. */ callAjax(method: string, data: any, preSets: CoreWSAjaxPreSets): Promise { - let promise; + const cacheParams = { + methodname: method, + args: data, + }; - if (typeof preSets.siteUrl == 'undefined') { - return rejectWithError(this.createFakeWSError('core.unexpectederror', true)); - } else if (!this.appProvider.isOnline()) { - return rejectWithError(this.createFakeWSError('core.networkerrormsg', true)); + let promise = this.getPromiseHttp('ajax', preSets.siteUrl, cacheParams); + + if (!promise) { + promise = this.performAjax(method, data, preSets); + promise = this.setPromiseHttp(promise, 'ajax', preSets.siteUrl, cacheParams); } - if (typeof preSets.responseExpected == 'undefined') { - preSets.responseExpected = true; - } - - const script = preSets.noLogin ? 'service-nologin.php' : 'service.php', - ajaxData = JSON.stringify([{ - index: 0, - methodname: method, - args: this.convertValuesToString(data) - }]); - - // The info= parameter has no function. It is just to help with debugging. - // We call it info to match the parameter name use by Moodle's AMD ajax module. - let siteUrl = preSets.siteUrl + '/lib/ajax/' + script + '?info=' + method; - - if (preSets.noLogin && preSets.useGet) { - // Send params using GET. - siteUrl += '&args=' + encodeURIComponent(ajaxData); - promise = this.http.get(siteUrl).timeout(this.getRequestTimeout()).toPromise(); - } else { - promise = this.http.post(siteUrl, ajaxData).timeout(this.getRequestTimeout()).toPromise(); - } - - return promise.then((data: any) => { - // Some moodle web services return null. - // If the responseExpected value is set then so long as no data is returned, we create a blank object. - if (!data && !preSets.responseExpected) { - data = [{}]; - } - - // Check if error. Ajax layer should always return an object (if error) or an array (if success). - if (!data || typeof data != 'object') { - return rejectWithError(this.createFakeWSError('core.serverconnection', true)); - } else if (data.error) { - return rejectWithError(data); - } - - // Get the first response since only one request was done. - data = data[0]; - - if (data.error) { - return rejectWithError(data.exception); - } - - return data.data; - }, (data) => { - const available = data.status == 404 ? -1 : 0; - - return rejectWithError(this.createFakeWSError('core.serverconnection', true), available); - }); - - // Convenience function to return an error. - function rejectWithError(exception: any, available?: number): Promise { - if (typeof available == 'undefined') { - if (exception.errorcode) { - available = exception.errorcode == 'invalidrecord' ? -1 : 1; - } else { - available = 0; - } - } - - exception.available = available; - - return Promise.reject(exception); - } + return promise; } /** @@ -496,6 +437,94 @@ export class CoreWSProvider { return method + '#' + Md5.hashAsciiStr(url); } + /** + * Call a Moodle WS using the AJAX API. + * + * @param method The WebService method to be called. + * @param data Arguments to pass to the method. + * @param preSets Extra settings and information. Only some + * @return Promise resolved with the response data in success and rejected with an object containing: + * - error: Error message. + * - errorcode: Error code returned by the site (if any). + * - available: 0 if unknown, 1 if available, -1 if not available. + */ + protected performAjax(method: string, data: any, preSets: CoreWSAjaxPreSets): Promise { + + let promise; + + if (typeof preSets.siteUrl == 'undefined') { + return rejectWithError(this.createFakeWSError('core.unexpectederror', true)); + } else if (!this.appProvider.isOnline()) { + return rejectWithError(this.createFakeWSError('core.networkerrormsg', true)); + } + + if (typeof preSets.responseExpected == 'undefined') { + preSets.responseExpected = true; + } + + const script = preSets.noLogin ? 'service-nologin.php' : 'service.php', + ajaxData = JSON.stringify([{ + index: 0, + methodname: method, + args: this.convertValuesToString(data) + }]); + + // The info= parameter has no function. It is just to help with debugging. + // We call it info to match the parameter name use by Moodle's AMD ajax module. + let siteUrl = preSets.siteUrl + '/lib/ajax/' + script + '?info=' + method; + + if (preSets.noLogin && preSets.useGet) { + // Send params using GET. + siteUrl += '&args=' + encodeURIComponent(ajaxData); + promise = this.http.get(siteUrl).timeout(this.getRequestTimeout()).toPromise(); + } else { + promise = this.http.post(siteUrl, ajaxData).timeout(this.getRequestTimeout()).toPromise(); + } + + return promise.then((data: any) => { + // Some moodle web services return null. + // If the responseExpected value is set then so long as no data is returned, we create a blank object. + if (!data && !preSets.responseExpected) { + data = [{}]; + } + + // Check if error. Ajax layer should always return an object (if error) or an array (if success). + if (!data || typeof data != 'object') { + return rejectWithError(this.createFakeWSError('core.serverconnection', true)); + } else if (data.error) { + return rejectWithError(data); + } + + // Get the first response since only one request was done. + data = data[0]; + + if (data.error) { + return rejectWithError(data.exception); + } + + return data.data; + }, (data) => { + const available = data.status == 404 ? -1 : 0; + + return rejectWithError(this.createFakeWSError('core.serverconnection', true), available); + }); + + // Convenience function to return an error. + function rejectWithError(exception: any, available?: number): Promise { + if (typeof available == 'undefined') { + if (exception.errorcode) { + available = exception.errorcode == 'invalidrecord' ? -1 : 1; + } else { + available = 0; + } + } + + exception.available = available; + + return Promise.reject(exception); + } + } + /** * Perform a HEAD request and save the promise while waiting to be resolved. * From 8160795c314362b59a6ff93a8471d091df31bba9 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Tue, 31 Mar 2020 11:46:40 +0200 Subject: [PATCH 08/11] MOBILE-3388 core: Bump version numbers --- config.xml | 2 +- desktop/assets/windows/AppXManifest.xml | 2 +- package.json | 4 ++-- src/config.json | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config.xml b/config.xml index b56522924..6f949ffa9 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + Moodle Moodle official app Moodle Mobile team diff --git a/desktop/assets/windows/AppXManifest.xml b/desktop/assets/windows/AppXManifest.xml index f7726e61b..583b9fdc1 100644 --- a/desktop/assets/windows/AppXManifest.xml +++ b/desktop/assets/windows/AppXManifest.xml @@ -6,7 +6,7 @@ + Version="3.8.2.0" /> Moodle Desktop Moodle Pty Ltd. diff --git a/package.json b/package.json index ee8d9a7fc..bd1de5e56 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "moodlemobile", - "version": "3.8.1", + "version": "3.8.2", "description": "The official app for Moodle.", "author": { "name": "Moodle Pty Ltd.", @@ -225,7 +225,7 @@ "category": "public.app-category.education", "icon": "resources/desktop/icon.icns", "target": "mas", - "bundleVersion": "3.8.1", + "bundleVersion": "3.8.2", "extendInfo": { "ElectronTeamID": "2NU57U5PAW" } diff --git a/src/config.json b/src/config.json index 99c9ee8f7..b90656877 100644 --- a/src/config.json +++ b/src/config.json @@ -2,8 +2,8 @@ "app_id": "com.moodle.moodlemobile", "appname": "Moodle Mobile", "desktopappname": "Moodle Desktop", - "versioncode": 3810, - "versionname": "3.8.1-dev", + "versioncode": 3820, + "versionname": "3.8.2", "cache_update_frequency_usually": 420000, "cache_update_frequency_often": 1200000, "cache_update_frequency_sometimes": 3600000, From 9693cda9871cc000ad6853210e93be1181256b66 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Tue, 31 Mar 2020 16:22:34 +0200 Subject: [PATCH 09/11] MOBILE-3389 login: Improve error messages and help in login --- src/assets/img/login/faq_url.png | Bin 0 -> 19328 bytes src/assets/lang/en.json | 15 +++++++-- src/core/login/lang/en.json | 13 ++++++-- src/core/login/pages/site-help/site-help.html | 26 ++++++++++++++- src/core/login/pages/site-help/site-help.ts | 13 +++++++- src/core/login/pages/site/site.html | 31 +++++++++++++++--- src/core/login/pages/site/site.ts | 30 +++++++++++++---- src/lang/en.json | 2 ++ 8 files changed, 112 insertions(+), 18 deletions(-) create mode 100644 src/assets/img/login/faq_url.png diff --git a/src/assets/img/login/faq_url.png b/src/assets/img/login/faq_url.png new file mode 100644 index 0000000000000000000000000000000000000000..13d92cd502b89ec90b482ecf632eeebb5e8a4b84 GIT binary patch literal 19328 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 organisation or school has their own custom address for their Moodle site.

To find the address of the Moodle site you want to connect to, do the following:

  1. Open a web browser and go to your school's or organisation's Moodle site login page
  2. At the top of the page, on the address bar, you will see the URL of your Moodle site. E.g. \"campus.example.edu\".{{$image}}
  3. Copy the address (do not copy the /login and what comes after), paste it into the Moodle App and click \"Connect!\"
  4. Now you can log into your site, using your username and password
    5. ", + "core.login.faqwhatisurlquestion": "What is the URL of my Moodle site? How can I find my school’s site?", "core.login.findyoursite": "Find your site", "core.login.firsttime": "Is this your first time here?", "core.login.forcepasswordchangenotice": "You must change your password to proceed.", @@ -1736,7 +1746,6 @@ "core.login.mobileservicesnotenabled": "Mobile access is not enabled on your site. Please contact your site administrator if you think it should be enabled.", "core.login.mustconfirm": "You need to confirm your account", "core.login.newaccount": "New account", - "core.login.newsitedescription": "Please enter the URL of your Moodle site. Note that it might not be configured to work with this app.", "core.login.notloggedin": "You need to be logged in.", "core.login.password": "Password", "core.login.passwordforgotten": "Forgotten password", @@ -1762,7 +1771,7 @@ "core.login.selectacountry": "Select a country", "core.login.selectsite": "Please select your site:", "core.login.signupplugindisabled": "{{$a}} is not enabled.", - "core.login.siteaddress": "Site address", + "core.login.siteaddress": "Your site address", "core.login.sitehasredirect": "Your site contains at least one HTTP redirect. The app cannot follow redirects, this could be the issue that's preventing the app from connecting to your site.", "core.login.siteinmaintenance": "Your site is in maintenance mode", "core.login.sitepolicynotagreederror": "Site policy not agreed.", @@ -1816,6 +1825,7 @@ "core.more": "more", "core.mygroups": "My groups", "core.name": "Name", + "core.needhelp": "Need help?", "core.networkerroriframemsg": "This content is not available offline. Please connect to the internet and try again.", "core.networkerrormsg": "There was a problem connecting to the site. Please check your connection and try again.", "core.never": "Never", @@ -2090,6 +2100,7 @@ "core.warningofflinedatadeleted": "Offline data from {{component}} '{{name}}' has been deleted. {{error}}", "core.whatisyourage": "What is your age?", "core.wheredoyoulive": "In which country do you live?", + "core.whoissiteadmin": "\"Site Administrators\" are the people who manage the Moodle at your school/university/company or learning organisation. If you don't know how to contact them, please contact your teachers/trainers.", "core.whoops": "Oops!", "core.whyisthishappening": "Why is this happening?", "core.whyisthisrequired": "Why is this required?", diff --git a/src/core/login/lang/en.json b/src/core/login/lang/en.json index 054a51168..e6a0d6e2f 100644 --- a/src/core/login/lang/en.json +++ b/src/core/login/lang/en.json @@ -24,7 +24,17 @@ "emailnotmatch": "Emails do not match", "erroraccesscontrolalloworigin": "The cross-origin call you're trying to perform has been rejected. Please check https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium", "errordeletesite": "An error occurred while deleting this site. Please try again.", + "errorexampleurl": "The URL https://campus.example.edu is only an example URL, it's not a real site. Please use the URL of your school or organization's site.", "errorupdatesite": "An error occurred while updating the site's token.", + "faqcannotconnectanswer": "Please, contact your site administrator.", + "faqcannotconnectquestion": "I typed my site address correctly but I still can't connect.", + "faqsetupsiteanswer": "Visit {{$link}} to check out the different options you have to create your own Moodle site.", + "faqsetupsitelinktitle": "Get started.", + "faqsetupsitequestion": "I want to set up my own Moodle site.", + "faqtestappanswer": "To test the app in a Moodle Demo Site, type \"teacher\" or \"student\" in the \"Your site address\" field and click the \"Connect!\" button.", + "faqtestappquestion": "I just want to test the app, what can I do?", + "faqwhatisurlanswer": "

    Every organisation or school has their own custom address for their Moodle site.

    To find the address of the Moodle site you want to connect to, do the following:

    1. Open a web browser and go to your school's or organisation's Moodle site login page
    2. At the top of the page, on the address bar, you will see the URL of your Moodle site. E.g. \"campus.example.edu\".{{$image}}
    3. Copy the address (do not copy the /login and what comes after), paste it into the Moodle App and click \"Connect!\"
    4. Now you can log into your site, using your username and password
      5. ", + "faqwhatisurlquestion": "What is the URL of my Moodle site? How can I find my school’s site?", "findyoursite": "Find your site", "firsttime": "Is this your first time here?", "forcepasswordchangenotice": "You must change your password to proceed.", @@ -53,7 +63,6 @@ "mobileservicesnotenabled": "Mobile access is not enabled on your site. Please contact your site administrator if you think it should be enabled.", "mustconfirm": "You need to confirm your account", "newaccount": "New account", - "newsitedescription": "Please enter the URL of your Moodle site. Note that it might not be configured to work with this app.", "notloggedin": "You need to be logged in.", "password": "Password", "passwordforgotten": "Forgotten password", @@ -79,7 +88,7 @@ "selectacountry": "Select a country", "selectsite": "Please select your site:", "signupplugindisabled": "{{$a}} is not enabled.", - "siteaddress": "Site address", + "siteaddress": "Your site address", "sitehasredirect": "Your site contains at least one HTTP redirect. The app cannot follow redirects, this could be the issue that's preventing the app from connecting to your site.", "siteinmaintenance": "Your site is in maintenance mode", "sitepolicynotagreederror": "Site policy not agreed.", diff --git a/src/core/login/pages/site-help/site-help.html b/src/core/login/pages/site-help/site-help.html index ae21bace1..48dcf8eb7 100644 --- a/src/core/login/pages/site-help/site-help.html +++ b/src/core/login/pages/site-help/site-help.html @@ -10,5 +10,29 @@ - + + +

      {{ 'core.login.faqwhatisurlquestion' | translate }}

      +       + + + +

      {{ 'core.login.faqcannotconnectquestion' | translate }}

      +       + +

      {{ 'core.login.faqcannotconnectanswer' | translate }} {{ 'core.whoissiteadmin' | translate }}

      +       + +

      {{ 'core.login.faqsetupsitequestion' | translate }}

      +       + +

      +       + +

      {{ 'core.login.faqtestappquestion' | translate }}

      +       + +

      {{ 'core.login.faqtestappanswer' | translate }}

      +       +       diff --git a/src/core/login/pages/site-help/site-help.ts b/src/core/login/pages/site-help/site-help.ts index 90d948b75..eb489e3c2 100644 --- a/src/core/login/pages/site-help/site-help.ts +++ b/src/core/login/pages/site-help/site-help.ts @@ -14,6 +14,7 @@ import { Component } from '@angular/core'; import { IonicPage, ViewController } from 'ionic-angular'; +import { TranslateService } from '@ngx-translate/core'; /** * Component that displays some help regarding the CoreLoginSitePage. @@ -24,7 +25,17 @@ import { IonicPage, ViewController } from 'ionic-angular'; templateUrl: 'site-help.html', }) export class CoreLoginSiteHelpPage { - constructor(private viewCtrl: ViewController) { } + + urlImageHtml: string; + setupLinkHtml: string; + + constructor(protected viewCtrl: ViewController, + protected translate: TranslateService) { + + this.urlImageHtml = ''; + this.setupLinkHtml = 'https://moodle.com/getstarted/'; + } /** * Close help modal. diff --git a/src/core/login/pages/site/site.html b/src/core/login/pages/site/site.html index 8da75c237..8660611f8 100644 --- a/src/core/login/pages/site/site.html +++ b/src/core/login/pages/site/site.html @@ -6,9 +6,6 @@ - @@ -20,9 +17,9 @@
      -

      {{ 'core.login.newsitedescription' | translate }}

      - +

      {{ 'core.login.siteaddress' | translate }}

       +       @@ -50,5 +47,29 @@

      {{ 'core.login.selectsite' | translate }}

      {{site.name}} + + + + +

      {{ 'core.whoops' | translate }}

      + +       +

      +

      {{ 'core.login.problemconnectingerror' | translate }}

      +

      {{ errorUrl }}

      +

      {{ 'core.login.problemconnectingerrorcontinue' | translate }}

      +

      {{ 'core.login.stillcantconnect' | translate }}

      +

      {{ 'core.login.contactyouradministrator' | translate }}

      +

      {{ 'core.whoissiteadmin' | translate }}

      +       + + + + + {{ 'core.needhelp' | translate }} + + diff --git a/src/core/login/pages/site/site.ts b/src/core/login/pages/site/site.ts index 9e44cbd4f..d88fc5bf9 100644 --- a/src/core/login/pages/site/site.ts +++ b/src/core/login/pages/site/site.ts @@ -22,6 +22,7 @@ import { CoreConfigConstants } from '../../../../configconstants'; import { CoreLoginHelperProvider } from '../../providers/helper'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { CoreUrl } from '@classes/utils/url'; +import { TranslateService } from '@ngx-translate/core'; /** * Page to enter or select the site URL to connect to. @@ -41,6 +42,8 @@ export class CoreLoginSitePage { fixedDisplay = 'buttons'; showKeyboard = false; filter = ''; + errorUrl: string; + errorMessage: string; constructor(navParams: NavParams, protected navCtrl: NavController, @@ -50,7 +53,8 @@ export class CoreLoginSitePage { protected loginHelper: CoreLoginHelperProvider, protected modalCtrl: ModalController, protected domUtils: CoreDomUtilsProvider, - protected eventsProvider: CoreEventsProvider) { + protected eventsProvider: CoreEventsProvider, + protected translate: TranslateService) { this.showKeyboard = !!navParams.get('showKeyboard'); @@ -99,6 +103,14 @@ export class CoreLoginSitePage { url = url.trim(); + if (url.match(/^(https?:\/\/)?campus\.example\.edu/)) { + this.showLoginIssue(url, this.translate.instant('core.login.errorexampleurl')); + + return; + } + + this.hideLoginIssue(); + const modal = this.domUtils.showModalLoading(), siteData = this.sitesProvider.getDemoSiteData(url); @@ -164,6 +176,14 @@ export class CoreLoginSitePage { modal.present(); } + /** + * Hide the login error. + */ + hideLoginIssue(): void { + this.errorUrl = null; + this.errorMessage = null; + } + /** * Show an error that aims people to solve the issue. * @@ -171,12 +191,8 @@ export class CoreLoginSitePage { * @param error Error to display. */ protected showLoginIssue(url: string, error: any): void { - const modal = this.modalCtrl.create('CoreLoginSiteErrorPage', { - siteUrl: url, - issue: this.domUtils.getErrorMessage(error) - }); - - modal.present(); + this.errorUrl = url; + this.errorMessage = this.domUtils.getErrorMessage(error); } /** diff --git a/src/lang/en.json b/src/lang/en.json index 876b80259..2e932a7f8 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -167,6 +167,7 @@ "more": "more", "mygroups": "My groups", "name": "Name", + "needhelp": "Need help?", "networkerroriframemsg": "This content is not available offline. Please connect to the internet and try again.", "networkerrormsg": "There was a problem connecting to the site. Please check your connection and try again.", "never": "Never", @@ -293,6 +294,7 @@ "warningofflinedatadeleted": "Offline data from {{component}} '{{name}}' has been deleted. {{error}}", "whatisyourage": "What is your age?", "wheredoyoulive": "In which country do you live?", + "whoissiteadmin": "\"Site Administrators\" are the people who manage the Moodle at your school/university/company or learning organisation. If you don't know how to contact them, please contact your teachers/trainers.", "whoops": "Oops!", "whyisthishappening": "Why is this happening?", "whyisthisrequired": "Why is this required?", From 09e3e00bacc8f17a04613d648d9fba7a565c9539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Tue, 31 Mar 2020 17:24:25 +0200 Subject: [PATCH 10/11] MOBILE-3389 login: Style new errors on login --- src/assets/lang/en.json | 4 +- src/core/login/lang/en.json | 2 +- src/core/login/pages/site-help/site-help.html | 4 +- src/core/login/pages/site-help/site-help.scss | 5 +++ src/core/login/pages/site/site.html | 39 +++++++++++-------- src/core/login/pages/site/site.scss | 16 ++++++++ src/core/login/pages/site/site.ts | 4 +- src/lang/en.json | 2 +- 8 files changed, 53 insertions(+), 23 deletions(-) create mode 100644 src/core/login/pages/site-help/site-help.scss diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json index dc5a9f227..e33e9f8ab 100644 --- a/src/assets/lang/en.json +++ b/src/assets/lang/en.json @@ -1331,7 +1331,7 @@ "core.block.blocks": "Blocks", "core.browser": "Browser", "core.cancel": "Cancel", - "core.cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle {{$a}} or later.", + "core.cannotconnect": "Cannot connect: Verify that you have correctly typed your site address.", "core.cannotdownloadfiles": "File downloading is disabled. Please contact your site administrator.", "core.captureaudio": "Record audio", "core.capturedimage": "Taken picture.", @@ -1707,7 +1707,7 @@ "core.login.emailnotmatch": "Emails do not match", "core.login.erroraccesscontrolalloworigin": "The cross-origin call you're trying to perform has been rejected. Please check https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium", "core.login.errordeletesite": "An error occurred while deleting this site. Please try again.", - "core.login.errorexampleurl": "The URL https://campus.example.edu is only an example URL, it's not a real site. Please use the URL of your school or organization's site.", + "core.login.errorexampleurl": "The URL https://campus.example.edu is only an example URL, it's not a real site. Please use the URL of your school or organization's site.", "core.login.errorupdatesite": "An error occurred while updating the site's token.", "core.login.faqcannotconnectanswer": "Please, contact your site administrator.", "core.login.faqcannotconnectquestion": "I typed my site address correctly but I still can't connect.", diff --git a/src/core/login/lang/en.json b/src/core/login/lang/en.json index e6a0d6e2f..3624b1063 100644 --- a/src/core/login/lang/en.json +++ b/src/core/login/lang/en.json @@ -24,7 +24,7 @@ "emailnotmatch": "Emails do not match", "erroraccesscontrolalloworigin": "The cross-origin call you're trying to perform has been rejected. Please check https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium", "errordeletesite": "An error occurred while deleting this site. Please try again.", - "errorexampleurl": "The URL https://campus.example.edu is only an example URL, it's not a real site. Please use the URL of your school or organization's site.", + "errorexampleurl": "The URL https://campus.example.edu is only an example URL, it's not a real site. Please use the URL of your school or organization's site.", "errorupdatesite": "An error occurred while updating the site's token.", "faqcannotconnectanswer": "Please, contact your site administrator.", "faqcannotconnectquestion": "I typed my site address correctly but I still can't connect.", diff --git a/src/core/login/pages/site-help/site-help.html b/src/core/login/pages/site-help/site-help.html index 48dcf8eb7..2aa5a8247 100644 --- a/src/core/login/pages/site-help/site-help.html +++ b/src/core/login/pages/site-help/site-help.html @@ -14,7 +14,9 @@

      {{ 'core.login.faqwhatisurlquestion' | translate }}

       - + +
      +

      {{ 'core.login.faqcannotconnectquestion' | translate }}

      diff --git a/src/core/login/pages/site-help/site-help.scss b/src/core/login/pages/site-help/site-help.scss new file mode 100644 index 000000000..01699c80f --- /dev/null +++ b/src/core/login/pages/site-help/site-help.scss @@ -0,0 +1,5 @@ +page-core-login-site-help { + .content { + background-color: $white; + } +} \ No newline at end of file diff --git a/src/core/login/pages/site/site.html b/src/core/login/pages/site/site.html index 8660611f8..007e3ecdd 100644 --- a/src/core/login/pages/site/site.html +++ b/src/core/login/pages/site/site.html @@ -49,25 +49,32 @@ - - -

      {{ 'core.whoops' | translate }}

      - -       -

      -

      {{ 'core.login.problemconnectingerror' | translate }}

      -

      {{ errorUrl }}

      -

      {{ 'core.login.problemconnectingerrorcontinue' | translate }}

      -

      {{ 'core.login.stillcantconnect' | translate }}

      -

      {{ 'core.login.contactyouradministrator' | translate }}

      -

      {{ 'core.whoissiteadmin' | translate }}

      -       +
      + + + {{ 'core.whoops' | translate }} + + +

      + +

      {{ 'core.login.problemconnectingerror' | translate }}

      +

      {{ errorUrl }}

      +

      {{ 'core.login.problemconnectingerrorcontinue' | translate }}

      +       +       + + {{ 'core.login.stillcantconnect' | translate }} + + +

      {{ 'core.login.contactyouradministrator' | translate }}

      +

      {{ 'core.whoissiteadmin' | translate }}

      +       +       +
      - + {{ 'core.needhelp' | translate }} diff --git a/src/core/login/pages/site/site.scss b/src/core/login/pages/site/site.scss index 53fafed91..8003ae361 100644 --- a/src/core/login/pages/site/site.scss +++ b/src/core/login/pages/site/site.scss @@ -10,4 +10,20 @@ ion-app.app-root page-core-login-site { background-color: $searchbar-ios-toolbar-input-background; } } + + .core-site-error { + background: $red-light; + margin-left: 0; + margin-right: 0; + width: 100%; + user-select: text; + + p, ion-card-header { + color: $red-dark; + user-select: text; + } + ion-card-header { + font-weight: bold; + } + } } \ No newline at end of file diff --git a/src/core/login/pages/site/site.ts b/src/core/login/pages/site/site.ts index d88fc5bf9..bb007a557 100644 --- a/src/core/login/pages/site/site.ts +++ b/src/core/login/pages/site/site.ts @@ -104,7 +104,7 @@ export class CoreLoginSitePage { url = url.trim(); if (url.match(/^(https?:\/\/)?campus\.example\.edu/)) { - this.showLoginIssue(url, this.translate.instant('core.login.errorexampleurl')); + this.showLoginIssue(null, this.translate.instant('core.login.errorexampleurl')); return; } @@ -179,7 +179,7 @@ export class CoreLoginSitePage { /** * Hide the login error. */ - hideLoginIssue(): void { + protected hideLoginIssue(): void { this.errorUrl = null; this.errorMessage = null; } diff --git a/src/lang/en.json b/src/lang/en.json index 2e932a7f8..3b9ccff0f 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -12,7 +12,7 @@ "back": "Back", "browser": "Browser", "cancel": "Cancel", - "cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle {{$a}} or later.", + "cannotconnect": "Cannot connect: Verify that you have correctly typed your site address.", "cannotdownloadfiles": "File downloading is disabled. Please contact your site administrator.", "captureaudio": "Record audio", "capturedimage": "Taken picture.", From d4e30159c853e58d7588555cee39f571e79113c4 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Wed, 1 Apr 2020 11:22:46 +0200 Subject: [PATCH 11/11] MOBILE-3389 login: Make error URL clickable --- src/core/login/pages/site/site.html | 12 ++++----- src/core/login/pages/site/site.scss | 4 +++ src/core/login/pages/site/site.ts | 40 ++++++++++++++++++++++++----- 3 files changed, 43 insertions(+), 13 deletions(-) diff --git a/src/core/login/pages/site/site.html b/src/core/login/pages/site/site.html index 007e3ecdd..6d13b7507 100644 --- a/src/core/login/pages/site/site.html +++ b/src/core/login/pages/site/site.html @@ -49,16 +49,16 @@ -
      +
      {{ 'core.whoops' | translate }} -

      - +

      +

      {{ 'core.login.problemconnectingerror' | translate }}

      -

      {{ errorUrl }}

      +

      {{ error.url }}

      {{ 'core.login.problemconnectingerrorcontinue' | translate }}

             @@ -73,8 +73,8 @@
      - - + + diff --git a/src/core/login/pages/site/site.scss b/src/core/login/pages/site/site.scss index 8003ae361..0a740cead 100644 --- a/src/core/login/pages/site/site.scss +++ b/src/core/login/pages/site/site.scss @@ -26,4 +26,8 @@ ion-app.app-root page-core-login-site { font-weight: bold; } } + + .core-login-need-help { + text-decoration: underline; + } } \ No newline at end of file diff --git a/src/core/login/pages/site/site.ts b/src/core/login/pages/site/site.ts index bb007a557..ebf6cfcaf 100644 --- a/src/core/login/pages/site/site.ts +++ b/src/core/login/pages/site/site.ts @@ -18,12 +18,33 @@ import { CoreAppProvider } from '@providers/app'; import { CoreEventsProvider } from '@providers/events'; import { CoreSitesProvider, CoreSiteCheckResponse } from '@providers/sites'; import { CoreDomUtilsProvider } from '@providers/utils/dom'; +import { CoreUrlUtilsProvider } from '@providers/utils/url'; import { CoreConfigConstants } from '../../../../configconstants'; import { CoreLoginHelperProvider } from '../../providers/helper'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { CoreUrl } from '@classes/utils/url'; import { TranslateService } from '@ngx-translate/core'; +/** + * Data about an error when connecting to a site. + */ +type CoreLoginSiteError = { + /** + * The error message that ocurred. + */ + message: string; + + /** + * URL the user entered. + */ + url?: string; + + /** + * URL the user entered with protocol added if needed. + */ + fullUrl?: string; +}; + /** * Page to enter or select the site URL to connect to. */ @@ -42,8 +63,7 @@ export class CoreLoginSitePage { fixedDisplay = 'buttons'; showKeyboard = false; filter = ''; - errorUrl: string; - errorMessage: string; + error: CoreLoginSiteError; constructor(navParams: NavParams, protected navCtrl: NavController, @@ -54,7 +74,8 @@ export class CoreLoginSitePage { protected modalCtrl: ModalController, protected domUtils: CoreDomUtilsProvider, protected eventsProvider: CoreEventsProvider, - protected translate: TranslateService) { + protected translate: TranslateService, + protected urlUtils: CoreUrlUtilsProvider) { this.showKeyboard = !!navParams.get('showKeyboard'); @@ -180,8 +201,7 @@ export class CoreLoginSitePage { * Hide the login error. */ protected hideLoginIssue(): void { - this.errorUrl = null; - this.errorMessage = null; + this.error = null; } /** @@ -191,8 +211,14 @@ export class CoreLoginSitePage { * @param error Error to display. */ protected showLoginIssue(url: string, error: any): void { - this.errorUrl = url; - this.errorMessage = this.domUtils.getErrorMessage(error); + this.error = { + url: url, + message: this.domUtils.getErrorMessage(error), + }; + + if (url) { + this.error.fullUrl = this.urlUtils.isAbsoluteURL(url) ? url : 'https://' + url; + } } /**