Skip to content

Commit 8f4fd33

Browse files
papacarlopapacarlo
committed
Merge branch release/v8.3.0 into master
2 parents f2bdece + 2cfc936 commit 8f4fd33

28 files changed

Lines changed: 577 additions & 584 deletions

‎3DPARTY.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@
5555
- pg 8.11.3 ([MIT](https://raw.githubusercontent.com/brianc/node-postgres/master/LICENSE))
5656
- redis 4.6.11 ([MIT](https://raw.githubusercontent.com/redis/node-redis/master/LICENSE))
5757
- retry 0.12.0 ([MIT](https://raw.githubusercontent.com/tim-kos/node-retry/master/License))
58-
- socket.io 4.7.1 ([MIT](https://raw.githubusercontent.com/socketio/socket.io/main/LICENSE))
58+
- socket.io 4.8.1 ([MIT](https://raw.githubusercontent.com/socketio/socket.io/main/LICENSE))
5959
- underscore 1.13.1 ([MIT](https://raw.githubusercontent.com/jashkenas/underscore/master/LICENSE))
6060
- utf7 1.0.2 ([BSD](https://www.npmjs.com/package/utf7))
6161
- windows-locale 1.0.1 ([MIT](https://raw.githubusercontent.com/TiagoDanin/Windows-Locale/master/LICENSE))
6262
- xmlbuilder2 3.0.2 ([MIT](https://raw.githubusercontent.com/oozcitak/xmlbuilder2/master/LICENSE))
63-
- @expo/spawn-async 1.3.0 ([MIT](https://raw.githubusercontent.com/TritonDataCenter/node-spawn-async/master/LICENSE))
63+
- @expo/spawn-async 1.7.2 ([MIT](https://raw.githubusercontent.com/TritonDataCenter/node-spawn-async/master/LICENSE))
6464
- bytes 3.0.0 ([MIT](https://raw.githubusercontent.com/visionmedia/bytes.js/master/LICENSE))
6565
- co 4.6.0 ([MIT](https://raw.githubusercontent.com/tj/co/master/LICENSE))
6666
- config 2.0.1 ([MIT](https://github.com/node-config/node-config/blob/master/LICENSE))

‎Common/config/default.json‎

Lines changed: 75 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"host": "localhost",
2222
"port": 587,
2323
"auth": {
24-
"user": "onlyoffice",
25-
"pass": "onlyoffice"
24+
"user": "",
25+
"pass": ""
2626
}
2727
},
2828
"connectionConfiguration": {
@@ -112,14 +112,67 @@
112112
"persistentStorage": {
113113
},
114114
"rabbitmq": {
115-
"url": "amqp://guest:guest@localhost:5672",
115+
"url": "amqp://localhost:5672",
116116
"socketOptions": {},
117-
"exchangepubsub": "ds.pubsub",
118-
"queueconverttask": "ds.converttask",
119-
"queueconvertresponse": "ds.convertresponse",
120-
"exchangeconvertdead": "ds.exchangeconvertdead",
121-
"queueconvertdead": "ds.convertdead",
122-
"queuedelayed": "ds.delayed"
117+
"exchangepubsub": {
118+
"name": "ds.pubsub",
119+
"options": {
120+
"durable": true
121+
}
122+
},
123+
"queuepubsub": {
124+
"name": "",
125+
"options": {
126+
"autoDelete": true,
127+
"exclusive": true,
128+
"arguments": {
129+
"x-queue-type": "classic"
130+
}
131+
}
132+
},
133+
"queueconverttask": {
134+
"name": "ds.converttask6",
135+
"options": {
136+
"durable": true,
137+
"maxPriority": 6,
138+
"arguments": {
139+
"x-queue-type": "classic"
140+
}
141+
}
142+
},
143+
"queueconvertresponse": {
144+
"name": "ds.convertresponse",
145+
"options": {
146+
"durable": true,
147+
"arguments": {
148+
"x-queue-type": "classic"
149+
}
150+
}
151+
},
152+
"exchangeconvertdead": {
153+
"name": "ds.exchangeconvertdead",
154+
"options": {
155+
"durable": true
156+
}
157+
},
158+
"queueconvertdead": {
159+
"name": "ds.convertdead",
160+
"options": {
161+
"durable": true,
162+
"arguments": {
163+
"x-queue-type": "classic"
164+
}
165+
}
166+
},
167+
"queuedelayed": {
168+
"name": "ds.delayed",
169+
"options": {
170+
"durable": true,
171+
"arguments": {
172+
"x-queue-type": "classic"
173+
}
174+
}
175+
}
123176
},
124177
"activemq": {
125178
"connectOptions": {
@@ -173,24 +226,27 @@
173226
"favIconUrlCell" : "/web-apps/apps/spreadsheeteditor/main/resources/img/favicon.ico",
174227
"favIconUrlSlide" : "/web-apps/apps/presentationeditor/main/resources/img/favicon.ico",
175228
"favIconUrlPdf" : "/web-apps/apps/pdfeditor/main/resources/img/favicon.ico",
229+
"favIconUrlDiagram" : "/web-apps/apps/visioeditor/main/resources/img/favicon.ico",
176230
"fileInfoBlockList" : ["FileUrl"],
177231
"pdfView": ["djvu", "xps", "oxps"],
178232
"pdfEdit": ["pdf"],
179233
"forms": ["pdf"],
180-
"wordView": ["doc", "dotm", "dot", "fodt", "ott", "rtf", "mht", "mhtml", "html", "htm", "xml", "epub", "fb2", "sxw", "stw", "wps", "wpt", "docxf", "oform"],
234+
"wordView": ["doc", "dotm", "dot", "fodt", "ott", "rtf", "mht", "mhtml", "html", "htm", "xml", "epub", "fb2", "sxw", "stw", "wps", "wpt", "pages", "docxf", "oform"],
181235
"wordEdit": ["docx", "dotx", "docm", "odt", "txt"],
182-
"cellView": ["xls", "xlsb", "xltm", "xlt", "fods", "ots", "sxc", "xml", "et", "ett"],
236+
"cellView": ["xls", "xlsb", "xltm", "xlt", "fods", "ots", "sxc", "xml", "et", "ett", "numbers"],
183237
"cellEdit": ["xlsx", "xltx", "xlsm", "ods", "csv"],
184-
"slideView": ["ppt", "ppsx", "ppsm", "pps", "potm", "pot", "fodp", "otp", "sxi", "dps", "dpt"],
238+
"slideView": ["ppt", "ppsx", "ppsm", "pps", "potm", "pot", "fodp", "otp", "sxi", "dps", "dpt", "key"],
185239
"slideEdit": ["pptx", "potx", "pptm", "odp"],
186-
"publicKey": "BgIAAACkAABSU0ExAAgAAAEAAQBpTpiJQ2hD8plpGTfEEmcq4IKyr31HikXpuVSBraMfqyodn2PGXBJ3daNSmdPOc0Nz4HO9Auljn8YYXDPBdpiABptSKvEDPF23Q+Qytg0+vCRyondyBcW91w7KLzXce3fnk8ZfJ8QtbZPL9m11wJIWZueQF+l0HKYx4lty+nccbCanytFTADkGQ3SnmExGEF3rBz6I9+OcrDDK9NKPJgEmCiuyei/d4XbPgKls3EIG0h38X5mVF2VytfWm2Yu850B6z3N4MYhj4b4vsYT62zEC4pMRUeb8dIBy4Jsmr3avtmeO00MUH6DVyPC8nirixj2YIOPKk13CdVqGDSXA3cvl",
187-
"modulus": "5cvdwCUNhlp1wl2TyuMgmD3G4iqevPDI1aAfFEPTjme2r3avJpvgcoB0/OZREZPiAjHb+oSxL77hY4gxeHPPekDnvIvZpvW1cmUXlZlf/B3SBkLcbKmAz3bh3S96sisKJgEmj9L0yjCsnOP3iD4H610QRkyYp3RDBjkAU9HKpyZsHHf6clviMaYcdOkXkOdmFpLAdW32y5NtLcQnX8aT53d73DUvyg7XvcUFcneiciS8Pg22MuRDt108A/EqUpsGgJh2wTNcGMafY+kCvXPgc0NzztOZUqN1dxJcxmOfHSqrH6OtgVS56UWKR32vsoLgKmcSxDcZaZnyQ2hDiZhOaQ==",
240+
"diagramView": [],
241+
"diagramEdit": [],
242+
"publicKey": "",
243+
"modulus": "",
188244
"exponent": 65537,
189-
"privateKey": "-----BEGIN PRIVATE KEY-----\nMIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDly93AJQ2GWnXC\nXZPK4yCYPcbiKp688MjVoB8UQ9OOZ7avdq8mm+BygHT85lERk+ICMdv6hLEvvuFj\niDF4c896QOe8i9mm9bVyZReVmV/8HdIGQtxsqYDPduHdL3qyKwomASaP0vTKMKyc\n4/eIPgfrXRBGTJindEMGOQBT0cqnJmwcd/pyW+Ixphx06ReQ52YWksB1bfbLk20t\nxCdfxpPnd3vcNS/KDte9xQVyd6JyJLw+DbYy5EO3XTwD8SpSmwaAmHbBM1wYxp9j\n6QK9c+BzQ3PO05lSo3V3ElzGY58dKqsfo62BVLnpRYpHfa+yguAqZxLENxlpmfJD\naEOJmE5pAgMBAAECggEALiL+RKOr0Xu8BOgQ0j1DwA03LxVrhXe6etmJI+JySTcd\ngKENjWziZVrRIi2DvUm5qMMl7WhSwslKK1eexxZJY7xASqSxcEoIwgz17T07/jxm\nfIdUBiUKDZ1Kv8PWmIr3oKW+fkXWi/m1zlIe0qXRpTmsGNEsHQLEqi0rmaiXTXOR\n/2Ldwi6kZR3sWFx97YS4Mx/pueGJTXEai6AVEZzN5Gog6xD8HXR1Rvq+hhd+MocG\nfnU4HgilKRfoJlWd9FOscgSufKG0L3ViO4fSKU46l5aullDYUk5ECMWiwuKSqSE7\nqD45jI3mbOre7S4u3S3TWdD3lzwiXL49LdwKlEC4mQKBgQD0sLr0GH4Wr+QX2xJE\nuA/Cb8QW41l8iSCBTRZZR/sJOd+o3rbcVidlzO/EbZblXG4ZPDmRjgBCGKIP5EZi\n0DsL+Wv32WOo44LpxJGhqExbm0H1iZ1zZ97l0P8fvIhHE42gmaLToOIGDhPSXGvv\nzlqOHbGbq4jsERc1jp1bej5q6wKBgQDwaueIc4pRchH98QYidcyr8Vwg9KhbnfYX\ny3W4RPlZtBdF34iJaio+ASzugo/zy1RTcVrsCskYWXyKDUQz1yu0iCng+fDCUnTm\nXGmEoEGNhk4vTJOt7hBav1/Ja/dUipGf6mXUuanwJ0e+1/Et/B0ah5X1Um5AyNZI\nM+SyRz3u+wKBgQCjvtUNXoqaghCBCmB6TjZ1prexnWkYFugCv2SSUMIk1W7gIlJ6\ntsjcrj1R1Qii6qzfBFd+GWoA0V06h0e2/qRVCg//p6GytrW33IycgvS+ZPLJ7tLI\nFR2r66WfRlpoPiSL8eRt/P7kkG0hXCn7K7ub2TEu/Ka/W1yNwad6PR8iCwKBgQC8\nXcZSrtQsxAc8w99emJVoEo9wcsCGJ9ltA0iUu9XyZpvlbyJ3J+s48YrWxQ0sop7L\nUgE+96Rfo51kPMi3JVtk81p8ntf4KMrWwokaFMXHsPcJMCJ1IBVIRLE0C5eZcYhv\nlyN57I4tT1lzOZYJxYK4Cot/zrn7oF/j6mTBGfh4iQKBgQCiJMUxRz01/czH/XSX\ngo3dVbHQ4FEOufWnE3Eb93S8r0/eq1RM118rb0TqzuiadW2xYDU4nucWQlrlmq0d\nFY/m+Hy97pqyk6jmoU5I/D+ssBIoYHWLnH9/xfvDEk2JGSJSHtzu0D4EDC/rgQ49\nMbYsO5oUrF8tPlhj5vzbf3GKLA==\n-----END PRIVATE KEY-----\n",
190-
"publicKeyOld": "BgIAAACkAABSU0ExAAgAAAEAAQBpTpiJQ2hD8plpGTfEEmcq4IKyr31HikXpuVSBraMfqyodn2PGXBJ3daNSmdPOc0Nz4HO9Auljn8YYXDPBdpiABptSKvEDPF23Q+Qytg0+vCRyondyBcW91w7KLzXce3fnk8ZfJ8QtbZPL9m11wJIWZueQF+l0HKYx4lty+nccbCanytFTADkGQ3SnmExGEF3rBz6I9+OcrDDK9NKPJgEmCiuyei/d4XbPgKls3EIG0h38X5mVF2VytfWm2Yu850B6z3N4MYhj4b4vsYT62zEC4pMRUeb8dIBy4Jsmr3avtmeO00MUH6DVyPC8nirixj2YIOPKk13CdVqGDSXA3cvl",
191-
"modulusOld": "5cvdwCUNhlp1wl2TyuMgmD3G4iqevPDI1aAfFEPTjme2r3avJpvgcoB0/OZREZPiAjHb+oSxL77hY4gxeHPPekDnvIvZpvW1cmUXlZlf/B3SBkLcbKmAz3bh3S96sisKJgEmj9L0yjCsnOP3iD4H610QRkyYp3RDBjkAU9HKpyZsHHf6clviMaYcdOkXkOdmFpLAdW32y5NtLcQnX8aT53d73DUvyg7XvcUFcneiciS8Pg22MuRDt108A/EqUpsGgJh2wTNcGMafY+kCvXPgc0NzztOZUqN1dxJcxmOfHSqrH6OtgVS56UWKR32vsoLgKmcSxDcZaZnyQ2hDiZhOaQ==",
245+
"privateKey": "",
246+
"publicKeyOld": "",
247+
"modulusOld": "",
192248
"exponentOld": 65537,
193-
"privateKeyOld": "-----BEGIN PRIVATE KEY-----\nMIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDly93AJQ2GWnXC\nXZPK4yCYPcbiKp688MjVoB8UQ9OOZ7avdq8mm+BygHT85lERk+ICMdv6hLEvvuFj\niDF4c896QOe8i9mm9bVyZReVmV/8HdIGQtxsqYDPduHdL3qyKwomASaP0vTKMKyc\n4/eIPgfrXRBGTJindEMGOQBT0cqnJmwcd/pyW+Ixphx06ReQ52YWksB1bfbLk20t\nxCdfxpPnd3vcNS/KDte9xQVyd6JyJLw+DbYy5EO3XTwD8SpSmwaAmHbBM1wYxp9j\n6QK9c+BzQ3PO05lSo3V3ElzGY58dKqsfo62BVLnpRYpHfa+yguAqZxLENxlpmfJD\naEOJmE5pAgMBAAECggEALiL+RKOr0Xu8BOgQ0j1DwA03LxVrhXe6etmJI+JySTcd\ngKENjWziZVrRIi2DvUm5qMMl7WhSwslKK1eexxZJY7xASqSxcEoIwgz17T07/jxm\nfIdUBiUKDZ1Kv8PWmIr3oKW+fkXWi/m1zlIe0qXRpTmsGNEsHQLEqi0rmaiXTXOR\n/2Ldwi6kZR3sWFx97YS4Mx/pueGJTXEai6AVEZzN5Gog6xD8HXR1Rvq+hhd+MocG\nfnU4HgilKRfoJlWd9FOscgSufKG0L3ViO4fSKU46l5aullDYUk5ECMWiwuKSqSE7\nqD45jI3mbOre7S4u3S3TWdD3lzwiXL49LdwKlEC4mQKBgQD0sLr0GH4Wr+QX2xJE\nuA/Cb8QW41l8iSCBTRZZR/sJOd+o3rbcVidlzO/EbZblXG4ZPDmRjgBCGKIP5EZi\n0DsL+Wv32WOo44LpxJGhqExbm0H1iZ1zZ97l0P8fvIhHE42gmaLToOIGDhPSXGvv\nzlqOHbGbq4jsERc1jp1bej5q6wKBgQDwaueIc4pRchH98QYidcyr8Vwg9KhbnfYX\ny3W4RPlZtBdF34iJaio+ASzugo/zy1RTcVrsCskYWXyKDUQz1yu0iCng+fDCUnTm\nXGmEoEGNhk4vTJOt7hBav1/Ja/dUipGf6mXUuanwJ0e+1/Et/B0ah5X1Um5AyNZI\nM+SyRz3u+wKBgQCjvtUNXoqaghCBCmB6TjZ1prexnWkYFugCv2SSUMIk1W7gIlJ6\ntsjcrj1R1Qii6qzfBFd+GWoA0V06h0e2/qRVCg//p6GytrW33IycgvS+ZPLJ7tLI\nFR2r66WfRlpoPiSL8eRt/P7kkG0hXCn7K7ub2TEu/Ka/W1yNwad6PR8iCwKBgQC8\nXcZSrtQsxAc8w99emJVoEo9wcsCGJ9ltA0iUu9XyZpvlbyJ3J+s48YrWxQ0sop7L\nUgE+96Rfo51kPMi3JVtk81p8ntf4KMrWwokaFMXHsPcJMCJ1IBVIRLE0C5eZcYhv\nlyN57I4tT1lzOZYJxYK4Cot/zrn7oF/j6mTBGfh4iQKBgQCiJMUxRz01/czH/XSX\ngo3dVbHQ4FEOufWnE3Eb93S8r0/eq1RM118rb0TqzuiadW2xYDU4nucWQlrlmq0d\nFY/m+Hy97pqyk6jmoU5I/D+ssBIoYHWLnH9/xfvDEk2JGSJSHtzu0D4EDC/rgQ49\nMbYsO5oUrF8tPlhj5vzbf3GKLA==\n-----END PRIVATE KEY-----\n",
249+
"privateKeyOld": "",
194250
"refreshLockInterval": "10m",
195251
"dummy" : {
196252
"enable": false,
@@ -427,7 +483,7 @@
427483
},
428484
"binaryChanges": false,
429485
"websocketMaxPayloadSize": "1.5MB",
430-
"maxChangesSize": "0mb"
486+
"maxChangesSize": "150MB"
431487
},
432488
"sockjs": {
433489
"sockjs_url": "",

‎Common/sources/commondefines.js‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ function InputCommand(data, copyExplicit) {
5050
this['username'] = data['username'];
5151
this['tokenSession'] = data['tokenSession'];
5252
this['tokenDownload'] = data['tokenDownload'];
53-
this['tokenHistory'] = data['tokenHistory'];
5453
this['data'] = data['data'];
5554
this['editorid'] = data['editorid'];
5655
this['format'] = data['format'];
@@ -84,7 +83,6 @@ function InputCommand(data, copyExplicit) {
8483
this['savekey'] = data['savekey'];
8584
this['userconnectionid'] = data['userconnectionid'];
8685
this['responsekey'] = data['responsekey'];
87-
this['docconnectionid'] = data['docconnectionid'];
8886
this['jsonparams'] = data['jsonparams'];
8987
this['lcid'] = data['lcid'];
9088
this['useractionid'] = data['useractionid'];
@@ -101,7 +99,6 @@ function InputCommand(data, copyExplicit) {
10199
this['savepassword'] = data['savepassword'];
102100
this['withoutPassword'] = data['withoutPassword'];
103101
this['outputurls'] = data['outputurls'];
104-
this['closeonerror'] = data['closeonerror'];
105102
this['serverVersion'] = data['serverVersion'];
106103
this['rediskey'] = data['rediskey'];
107104
this['nobase64'] = data['nobase64'];
@@ -127,7 +124,6 @@ function InputCommand(data, copyExplicit) {
127124
this['username'] = undefined;
128125
this['tokenSession'] = undefined;//string validate
129126
this['tokenDownload'] = undefined;//string validate
130-
this['tokenHistory'] = undefined;//string validate
131127
this['data'] = undefined;//string
132128
//to open
133129
this['editorid'] = undefined;//int
@@ -152,7 +148,6 @@ function InputCommand(data, copyExplicit) {
152148
this['savekey'] = undefined;//int document id to save
153149
this['userconnectionid'] = undefined;//string internal
154150
this['responsekey'] = undefined;
155-
this['docconnectionid'] = undefined;//string internal
156151
this['jsonparams'] = undefined;//string
157152
this['lcid'] = undefined;
158153
this['useractionid'] = undefined;
@@ -165,7 +160,6 @@ function InputCommand(data, copyExplicit) {
165160
this['savepassword'] = undefined;
166161
this['withoutPassword'] = undefined;
167162
this['outputurls'] = undefined;
168-
this['closeonerror'] = undefined;
169163
this['serverVersion'] = undefined;
170164
this['rediskey'] = undefined;
171165
this['nobase64'] = true;
@@ -218,9 +212,6 @@ InputCommand.prototype = {
218212
getTokenDownload: function() {
219213
return this['tokenDownload'];
220214
},
221-
getTokenHistory: function() {
222-
return this['tokenHistory'];
223-
},
224215
getData: function() {
225216
return this['data'];
226217
},
@@ -359,12 +350,6 @@ InputCommand.prototype = {
359350
setResponseKey: function(data) {
360351
this['responsekey'] = data;
361352
},
362-
getDocConnectionId: function() {
363-
return this['docconnectionid'];
364-
},
365-
setDocConnectionId: function(data) {
366-
this['docconnectionid'] = data;
367-
},
368353
getJsonParams: function() {
369354
return this['jsonparams'];
370355
},
@@ -447,12 +432,6 @@ InputCommand.prototype = {
447432
getOutputUrls: function() {
448433
return this['outputurls'];
449434
},
450-
getCloseOnError: function() {
451-
return this['closeonerror'];
452-
},
453-
setCloseOnError: function(data) {
454-
this['closeonerror'] = data;
455-
},
456435
getServerVersion: function() {
457436
return this['serverVersion'];
458437
},

‎Common/sources/constants.js‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ exports.CONVERT_ICU = -92;
233233
exports.CONVERT_LIMITS = -93;
234234
exports.CONVERT_TEMPORARY = -94;
235235
exports.CONVERT_DETECT = -95;
236+
exports.CONVERT_CELLLIMITS = -96;
236237
exports.CONVERT_DEAD_LETTER = -99;
237238
exports.UPLOAD = -100;
238239
exports.UPLOAD_CONTENT_LENGTH = -101;
@@ -248,11 +249,14 @@ exports.VKEY_TIME_INCORRECT = -125;
248249
exports.EDITOR_CHANGES = -160;
249250
exports.PASSWORD = -180;
250251

251-
exports.QUEUE_PRIORITY_VERY_LOW = 0;
252-
exports.QUEUE_PRIORITY_LOW = 1;
253-
exports.QUEUE_PRIORITY_NORMAL = 2;
254-
exports.QUEUE_PRIORITY_HIGH = 3;
255-
exports.QUEUE_PRIORITY_VERY_HIGH = 4;
252+
//Quorum queues internally only support two priorities: high and normal.
253+
//Messages without a priority set will be mapped to normal as will priorities 0 - 4.
254+
//Messages with a priority higher than 4 will be mapped to high.
255+
exports.QUEUE_PRIORITY_VERY_LOW = 2;
256+
exports.QUEUE_PRIORITY_LOW = 3;
257+
exports.QUEUE_PRIORITY_NORMAL = 4;
258+
exports.QUEUE_PRIORITY_HIGH = 5;
259+
exports.QUEUE_PRIORITY_VERY_HIGH = 6;
256260

257261
exports.EDITOR_TYPE_WORD = 0;
258262
exports.EDITOR_TYPE_SPREADSHEET = 1;

‎Common/sources/license.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ exports.readLicense = async function () {
5959
startDate: startDate,
6060
endDate: null,
6161
customerId: "",
62-
alias: ""
62+
alias: "",
63+
multitenancy: false
6364
}, null];
6465
};
6566

0 commit comments

Comments
 (0)