diff --git a/config/copy.config.js b/config/copy.config.js index 2d771a307..1da283e97 100644 --- a/config/copy.config.js +++ b/config/copy.config.js @@ -1,5 +1,10 @@ // New copy task for font files module.exports = { + // Override Ionic copyFonts task to exclude Roboto and Noto fonts. + copyFonts: { + src: ['{{ROOT}}/node_modules/ionicons/dist/fonts/**/*'], + dest: '{{WWW}}/assets/fonts' + }, copyFontAwesome: { src: ['{{ROOT}}/node_modules/font-awesome/fonts/**/*'], dest: '{{WWW}}/assets/fonts' diff --git a/src/assets/fonts/noto/LICENSE.txt b/src/assets/fonts/noto/LICENSE.txt new file mode 100644 index 000000000..75b52484e --- /dev/null +++ b/src/assets/fonts/noto/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/src/assets/fonts/noto/NotoSans-Bold.woff b/src/assets/fonts/noto/NotoSans-Bold.woff new file mode 100644 index 000000000..fe87166b6 Binary files /dev/null and b/src/assets/fonts/noto/NotoSans-Bold.woff differ diff --git a/src/assets/fonts/noto/NotoSans-BoldItalic.woff b/src/assets/fonts/noto/NotoSans-BoldItalic.woff new file mode 100644 index 000000000..f5ac220e8 Binary files /dev/null and b/src/assets/fonts/noto/NotoSans-BoldItalic.woff differ diff --git a/src/assets/fonts/noto/NotoSans-Italic.woff b/src/assets/fonts/noto/NotoSans-Italic.woff new file mode 100644 index 000000000..f9fefea1d Binary files /dev/null and b/src/assets/fonts/noto/NotoSans-Italic.woff differ diff --git a/src/assets/fonts/noto/NotoSans-Regular.woff b/src/assets/fonts/noto/NotoSans-Regular.woff new file mode 100644 index 000000000..07640c159 Binary files /dev/null and b/src/assets/fonts/noto/NotoSans-Regular.woff differ diff --git a/src/assets/fonts/roboto/LICENSE.txt b/src/assets/fonts/roboto/LICENSE.txt new file mode 100644 index 000000000..75b52484e --- /dev/null +++ b/src/assets/fonts/roboto/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/src/assets/fonts/roboto/Roboto-Bold.woff b/src/assets/fonts/roboto/Roboto-Bold.woff new file mode 100644 index 000000000..83a333ad4 Binary files /dev/null and b/src/assets/fonts/roboto/Roboto-Bold.woff differ diff --git a/src/assets/fonts/roboto/Roboto-BoldItalic.woff b/src/assets/fonts/roboto/Roboto-BoldItalic.woff new file mode 100644 index 000000000..7f8c135d1 Binary files /dev/null and b/src/assets/fonts/roboto/Roboto-BoldItalic.woff differ diff --git a/src/assets/fonts/roboto/Roboto-Italic.woff b/src/assets/fonts/roboto/Roboto-Italic.woff new file mode 100644 index 000000000..6e4197d44 Binary files /dev/null and b/src/assets/fonts/roboto/Roboto-Italic.woff differ diff --git a/src/assets/fonts/roboto/Roboto-Light.woff b/src/assets/fonts/roboto/Roboto-Light.woff new file mode 100644 index 000000000..d0158be69 Binary files /dev/null and b/src/assets/fonts/roboto/Roboto-Light.woff differ diff --git a/src/assets/fonts/roboto/Roboto-LightItalic.woff b/src/assets/fonts/roboto/Roboto-LightItalic.woff new file mode 100644 index 000000000..f20dfa795 Binary files /dev/null and b/src/assets/fonts/roboto/Roboto-LightItalic.woff differ diff --git a/src/assets/fonts/roboto/Roboto-Medium.woff b/src/assets/fonts/roboto/Roboto-Medium.woff new file mode 100644 index 000000000..cbac5e5dd Binary files /dev/null and b/src/assets/fonts/roboto/Roboto-Medium.woff differ diff --git a/src/assets/fonts/roboto/Roboto-MediumItalic.woff b/src/assets/fonts/roboto/Roboto-MediumItalic.woff new file mode 100644 index 000000000..3e635c1a2 Binary files /dev/null and b/src/assets/fonts/roboto/Roboto-MediumItalic.woff differ diff --git a/src/assets/fonts/roboto/Roboto-Regular.woff b/src/assets/fonts/roboto/Roboto-Regular.woff new file mode 100644 index 000000000..f43dd1b5f Binary files /dev/null and b/src/assets/fonts/roboto/Roboto-Regular.woff differ diff --git a/src/classes/site.ts b/src/classes/site.ts index 503a6b279..07047aabf 100644 --- a/src/classes/site.ts +++ b/src/classes/site.ts @@ -960,9 +960,10 @@ export class CoreSite { this.logger.debug('Invalidate cache for key starting with: ' + key); - const sql = 'UPDATE ' + this.WS_CACHE_TABLE + ' SET expirationTime=0 WHERE key LIKE ?'; + const sql = 'UPDATE ' + this.WS_CACHE_TABLE + ' SET expirationTime=0 WHERE key LIKE ? ESCAPE ?'; + const params = [this.db.encodeValue(key).replace(/%/g, '\\%') + '%', '\\']; - return this.db.execute(sql, [key + '%']); + return this.db.execute(sql, params); } /** diff --git a/src/classes/sqlitedb.ts b/src/classes/sqlitedb.ts index 8e650767b..e69ee8350 100644 --- a/src/classes/sqlitedb.ts +++ b/src/classes/sqlitedb.ts @@ -259,6 +259,24 @@ export class SQLiteDB { return Promise.all(promises); } + /** + * Decode a value returned from the database if it's a string. + * + * @param {any} value The value. + * @return {any} The decoded string or the original value if it's not a string. + */ + decodeValue(value: any): any { + if (typeof value === 'string') { + try { + value = decodeURI(value); + } catch (ex) { + // Error, use the original value. + } + } + + return value; + } + /** * Delete the records from a table where all the given conditions met. * If conditions not specified, table is truncated. @@ -308,6 +326,16 @@ export class SQLiteDB { return this.execute(`DELETE FROM ${table} ${select}`, params); } + /** + * Encode a value that will be inserted into the database or compared to values in the database. + * + * @param {any} value The value. + * @return {any} The encoded string or the original value if it's not a string. + */ + encodeValue(value: any): any { + return (typeof value === 'string') ? encodeURI(value) : value; + } + /** * Execute a SQL query. * IMPORTANT: Use this function only if you cannot use any of the other functions in this API. Please take into account that @@ -352,6 +380,8 @@ export class SQLiteDB { const value = data[name]; if (typeof value == 'undefined') { delete data[name]; + } else { + data[name] = this.encodeValue(value); } } } @@ -456,7 +486,7 @@ export class SQLiteDB { params = items; } - return [sql, params]; + return [sql, params.map(this.encodeValue)]; } /** @@ -607,7 +637,11 @@ export class SQLiteDB { // Retrieve the records. const records = []; for (let i = 0; i < result.rows.length; i++) { - records.push(result.rows.item(i)); + const record = result.rows.item(i); + for (const key in record) { + record[key] = this.decodeValue(record[key]); + } + records.push(record); } return records; @@ -819,6 +853,8 @@ export class SQLiteDB { * @return {Promise} Promise resolved when updated. */ updateRecordsWhere(table: string, data: any, where?: string, whereParams?: any[]): Promise { + this.formatDataToInsert(data); + if (!data || !Object.keys(data).length) { // No fields to update, consider it's done. return Promise.resolve(); @@ -850,9 +886,10 @@ export class SQLiteDB { * Returns the SQL WHERE conditions. * * @param {object} [conditions] The conditions to build the where clause. Must not contain numeric indexes. + * @param {boolean} [encodeValues=true] Encode condiiton values. True by default. * @return {any[]} An array list containing sql 'where' part and 'params'. */ - whereClause(conditions: any = {}): any[] { + whereClause(conditions: any = {}, encodeValues: boolean = true): any[] { if (!conditions || !Object.keys(conditions).length) { return ['1 = 1', []]; } @@ -861,7 +898,11 @@ export class SQLiteDB { params = []; for (const key in conditions) { - const value = conditions[key]; + let value = conditions[key]; + + if (encodeValues) { + value = this.encodeValue(value); + } if (typeof value == 'undefined' || value === null) { where.push(key + ' IS NULL'); @@ -897,7 +938,7 @@ export class SQLiteDB { if (typeof value == 'undefined' || value === null) { select = field + ' IS NULL'; } else { - params.push(value); + params.push(this.encodeValue(value)); } }); diff --git a/src/config.json b/src/config.json index 80abf6de7..b2f1abf23 100644 --- a/src/config.json +++ b/src/config.json @@ -2,7 +2,7 @@ "app_id" : "com.moodle.moodlemobile", "appname": "Moodle Mobile", "desktopappname": "Moodle Desktop", - "versioncode" : 3510, + "versioncode" : 3520, "versionname" : "3.5.1", "cache_expiration_time" : 300000, "default_lang" : "en", diff --git a/src/providers/update-manager.ts b/src/providers/update-manager.ts index b4017eb1f..ef0a70a9c 100644 --- a/src/providers/update-manager.ts +++ b/src/providers/update-manager.ts @@ -346,6 +346,13 @@ export class CoreUpdateManagerProvider implements CoreInitHandler { // DBs migrated, get the version applied again. return this.configProvider.get(this.VERSION_APPLIED, 0); }); + } else if (versionCode >= 3520 && versionApplied < 3520 && versionApplied > 0) { + // Encode special characters in the contents of all DBs to work around Unicode bugs in the Cordova plugin. + // This is not needed if the DBs are created from scratch, because all content is already encoded. + // We do this before any other update because SQLiteDB methods expect the content to be encoded. + return this.encodeAllDBs().then(() => { + return versionApplied; + }); } else { return versionApplied; } @@ -706,4 +713,68 @@ export class CoreUpdateManagerProvider implements CoreInitHandler { return this.utils.allPromises(promises); }); } + + /** + * Encode all DBs to escape special characters. + * + * @return {Promise} Promise resolved when done. + */ + protected encodeAllDBs(): Promise { + // First encode the app DB. + return this.encodeDB(this.appProvider.getDB()).then(() => { + // Now encode all site DBs. + return this.sitesProvider.getSitesIds(); + }).then((ids) => { + return this.utils.allPromises(ids.map((siteId) => { + return this.sitesProvider.getSiteDb(siteId).then((db) => { + return this.encodeDB(db); + }); + })); + }); + } + + /** + * Encode content of a certain DB to escape special characters. + * + * @param {SQLiteDB} db The DB. + * @return {Promise} Promise resolved when done. + */ + protected encodeDB(db: SQLiteDB): Promise { + const sql = 'SELECT tbl_name FROM sqlite_master WHERE type = ?'; + const params = ['table']; + + return db.execute(sql, params).then((result) => { + const promises = []; + + for (let i = 0; i < result.rows.length; i++) { + const table = result.rows.item(i).tbl_name; + promises.push(this.encodeTable(db, table)); + } + + return this.utils.allPromises(promises); + }); + } + + /** + * Encode content of a certain table to escape special characters. + * + * @param {SQLiteDB} db The DB. + * @param {string} table Name of the table. + * @return {Promise} Promise resolved when done. + */ + protected encodeTable(db: SQLiteDB, table: string): Promise { + const sql = 'SELECT * FROM ' + table; + + return db.execute(sql).then((result) => { + const promises = []; + + for (let i = 0; i < result.rows.length; i++) { + const record = result.rows.item(i); + const selectAndParams = db.whereClause(record, false); + promises.push(db.updateRecordsWhere(table, record, selectAndParams[0], selectAndParams[1])); + } + + return this.utils.allPromises(promises); + }); + } } diff --git a/src/theme/fonts.scss b/src/theme/fonts.scss new file mode 100644 index 000000000..f4423eb75 --- /dev/null +++ b/src/theme/fonts.scss @@ -0,0 +1,117 @@ +// Roboto. + +@font-face { + font-family: "Roboto"; + font-style: normal; + font-weight: 300; + src: local("Roboto Light"), local("Roboto-Light"), url("#{$font-path}/roboto/Roboto-Light.woff") format("woff"); +} + +@font-face { + font-family: "Roboto"; + font-style: italic; + font-weight: 300; + src: local("Roboto Light Italic"), local("Roboto-LightItalic"), url("#{$font-path}/roboto/Roboto-LightItalic.woff") format("woff"); +} + +@font-face { + font-family: "Roboto"; + font-style: normal; + font-weight: 400; + src: local("Roboto"), local("Roboto-Regular"), url("#{$font-path}/roboto//Roboto-Regular.woff") format("woff"); +} + +@font-face { + font-family: "Roboto"; + font-style: italic; + font-weight: 400; + src: local("Roboto Italic"), local("Roboto-Italic"), url("#{$font-path}/roboto/Roboto-Italic.woff") format("woff"); +} + +@font-face { + font-family: "Roboto"; + font-style: normal; + font-weight: 500; + src: local("Roboto Medium"), local("Roboto-Medium"), url("#{$font-path}/roboto/Roboto-Medium.woff") format("woff"); +} + +@font-face { + font-family: "Roboto"; + font-style: italic; + font-weight: 500; + src: local("Roboto Medium Italic"), local("Roboto-MediumItalic"), url("#{$font-path}/roboto/Roboto-MediumItalic.woff") format("woff"); +} + +@font-face { + font-family: "Roboto"; + font-style: normal; + font-weight: 700; + src: local("Roboto Bold"), local("Roboto-Bold"), url("#{$font-path}/roboto/Roboto-Bold.woff") format("woff"); +} + +@font-face { + font-family: "Roboto"; + font-style: italic; + font-weight: 700; + src: local("Roboto Bold Italic"), local("Roboto-BoldItalic"), url("#{$font-path}/roboto/Roboto-BoldItalic.woff") format("woff"); +} + +// Noto Sans Regular, used for 300 (light) and 400 (normal) weights. + +@font-face { + font-family: "Noto Sans"; + font-style: normal; + font-weight: 300; + src: local("Noto Sans"), local("NotoSans-Regular"), url("#{$font-path}/noto/NotoSans-Regular.woff") format("woff"); +} + +@font-face { + font-family: "Noto Sans"; + font-style: italic; + font-weight: 300; + src: local("Noto Sans Italic"), local("NotoSans-Italic"), url("#{$font-path}/noto/NotoSans-Italic.woff") format("woff"); +} + +@font-face { + font-family: "Noto Sans"; + font-style: normal; + font-weight: 400; + src: local("Noto Sans"), local("NotoSans-Regular"), url("#{$font-path}/noto/NotoSans-Regular.woff") format("woff"); +} + +@font-face { + font-family: "Noto Sans"; + font-style: italic; + font-weight: 400; + src: local("Noto Sans Italic"), local("NotoSans-Italic"), url("#{$font-path}/noto/NotoSans-Italic.woff") format("woff"); +} + +// Noto Sans Bold, used for 500 (medium) and 700 (bold) weights. + +@font-face { + font-family: "Noto Sans"; + font-style: normal; + font-weight: 500; + src: local("Noto Sans Bold"), local("NotoSans-Bold"), url("#{$font-path}/noto/NotoSans-Bold.woff") format("woff"); +} + +@font-face { + font-family: "Noto Sans"; + font-style: italic; + font-weight: 500; + src: local("Noto Sans BoldItalic"), local("NotoSans-BoldItalic"), url("#{$font-path}/noto/NotoSans-BoldItalic.woff") format("woff"); +} + +@font-face { + font-family: "Noto Sans"; + font-style: normal; + font-weight: 700; + src: local("Noto Sans Bold"), local("NotoSans-Bold"), url("#{$font-path}/noto/NotoSans-Bold.woff") format("woff"); +} + +@font-face { + font-family: "Noto Sans"; + font-style: italic; + font-weight: 700; + src: local("Noto Sans BoldItalic"), local("NotoSans-BoldItalic"), url("#{$font-path}/noto/NotoSans-BoldItalic.woff") format("woff"); +} diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 710a17c5f..b176ed86c 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -162,6 +162,7 @@ $loading-md-spinner-color: $core-loading-spinner-color; $spinner-md-crescent-color: $core-spinner-color; $tabs-md-tab-color-inactive: $tabs-tab-color-inactive; $button-md-outline-background-color: $core-button-outline-background-color; +$font-family-md-base: "Roboto", "Noto Sans", "Helvetica Neue", sans-serif !default; // App Windows Variables @@ -198,8 +199,7 @@ $button-wp-outline-background-color: $core-button-outline-background-color; // Fonts // -------------------------------------------------- -@import "roboto"; -@import "noto-sans"; +@import "./fonts"; // Moodle Mobile variables // --------------------------------------------------