4888 2009-11-19 10:34:00 -0800 Feature request: Indicate which review form elements are excluded from message to author 2010-07-13 08:44:39 -0700 1 1 1 Unclassified OCS Review 2.3.1 Macintosh Mac OS X 10.3 RESOLVED FIXED P5 enhancement --- 1 W.M.BergmannTiest pkp-support alec jmacgreg 2.1.2 17389 2608 W.M.BergmannTiest 2009-11-19 10:34:12 -0800 Created attachment 2608 patch against ocs 2.1.2 As requested, here is a patch in unified diff form that adds an extrasetting to review form elements. By checking a box, the creator of a review form can indicate which review form elements are not to be included in the message to the author when the director clicks the "Import Peer Review" button. This is useful for confidential comments of the reviewer to the director, or secret recommendations for a Best Paper award. An extra column is needed in table review_form_elements. This should be added when upgrading from a previous version. 17396 2611 W.M.BergmannTiest 2009-11-20 02:51:34 -0800 Created attachment 2611 patch against ocs 2.1.2 17442 jmacgreg 2009-11-24 16:56:29 -0800 Thanks, Wouter! I've scheduled against 2.3.1 as we're in a feature freeze for the upcoming 2.3 release. 18843 alec 2010-03-15 11:23:05 -0700 Committed, with one minor change: there was some inconsistency about whether the "enabled" flag indicated that an element would be included or not. I've made it consistent so "1" = included, "0" = not included, including upgrade scripts. Thanks for contributing! Committed to OJS and OCS. 20026 jmacgreg 2010-07-13 08:44:39 -0700 *** Bug 5567 has been marked as a duplicate of this bug. *** 2608 2009-11-19 10:34:00 -0800 2009-11-20 02:51:34 -0800 patch against ocs 2.1.2 not_included.diff text/plain 6223 W.M.BergmannTiest SW5kZXg6IGNsYXNzZXMvbWFuYWdlci9mb3JtL1Jldmlld0Zvcm1FbGVtZW50Rm9ybS5pbmMucGhw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIGNsYXNzZXMvbWFuYWdlci9mb3JtL1Jldmlld0Zvcm1FbGVtZW50Rm9y bS5pbmMucGhwCTIwMDktMTEtMTkgMTc6MjE6MjEuMDAwMDAwMDAwICswMTAwCisrKyBjbGFzc2Vz L21hbmFnZXIvZm9ybS9SZXZpZXdGb3JtRWxlbWVudEZvcm0uaW5jLnBocAkyMDA5LTExLTE5IDE3 OjM0OjUxLjAwMDAwMDAwMCArMDEwMApAQCAtODAsNiArODAsNyBAQAogCQkJCSR0aGlzLT5fZGF0 YSA9IGFycmF5KAogCQkJCQkncXVlc3Rpb24nID0+ICRyZXZpZXdGb3JtRWxlbWVudC0+Z2V0UXVl c3Rpb24obnVsbCksIC8vIExvY2FsaXplZAogCQkJCQkncmVxdWlyZWQnID0+ICRyZXZpZXdGb3Jt RWxlbWVudC0+Z2V0UmVxdWlyZWQoKSwKKwkJCQkJJ2luY2x1ZGVkJyA9PiAkcmV2aWV3Rm9ybUVs ZW1lbnQtPmdldEluY2x1ZGVkKCksCiAJCQkJCSdlbGVtZW50VHlwZScgPT4gJHJldmlld0Zvcm1F bGVtZW50LT5nZXRFbGVtZW50VHlwZSgpLAogCQkJCQkncG9zc2libGVSZXNwb25zZXMnID0+ICRy ZXZpZXdGb3JtRWxlbWVudC0+Z2V0UG9zc2libGVSZXNwb25zZXMobnVsbCkgLy9Mb2NhbGl6ZWQK IAkJCQkpOwpAQCAtOTEsNyArOTIsNyBAQAogCSAqIEFzc2lnbiBmb3JtIGRhdGEgdG8gdXNlci1z dWJtaXR0ZWQgZGF0YS4KIAkgKi8KIAlmdW5jdGlvbiByZWFkSW5wdXREYXRhKCkgewotCQkkdGhp cy0+cmVhZFVzZXJWYXJzKGFycmF5KCdxdWVzdGlvbicsICdyZXF1aXJlZCcsICdlbGVtZW50VHlw ZScsICdwb3NzaWJsZVJlc3BvbnNlcycpKTsKKwkJJHRoaXMtPnJlYWRVc2VyVmFycyhhcnJheSgn cXVlc3Rpb24nLCAncmVxdWlyZWQnLCAnaW5jbHVkZWQnLCAnZWxlbWVudFR5cGUnLCAncG9zc2li bGVSZXNwb25zZXMnKSk7CiAJfQogCiAJLyoqCkBAIC0xMTIsNiArMTEzLDcgQEAKIAogCQkkcmV2 aWV3Rm9ybUVsZW1lbnQtPnNldFF1ZXN0aW9uKCR0aGlzLT5nZXREYXRhKCdxdWVzdGlvbicpLCBu dWxsKTsgLy8gTG9jYWxpemVkCiAJCSRyZXZpZXdGb3JtRWxlbWVudC0+c2V0UmVxdWlyZWQoJHRo aXMtPmdldERhdGEoJ3JlcXVpcmVkJykgPyAxIDogMCk7CisJCSRyZXZpZXdGb3JtRWxlbWVudC0+ c2V0SW5jbHVkZWQoJHRoaXMtPmdldERhdGEoJ2luY2x1ZGVkJykgPyAxIDogMCk7CiAJCSRyZXZp ZXdGb3JtRWxlbWVudC0+c2V0RWxlbWVudFR5cGUoJHRoaXMtPmdldERhdGEoJ2VsZW1lbnRUeXBl JykpOwogCiAJCWlmIChpbl9hcnJheSgkdGhpcy0+Z2V0RGF0YSgnZWxlbWVudFR5cGUnKSwgUmV2 aWV3Rm9ybUVsZW1lbnQ6OmdldE11bHRpcGxlUmVzcG9uc2VzRWxlbWVudFR5cGVzKCkpKSB7Cklu ZGV4OiBjbGFzc2VzL3Jldmlld0Zvcm0vUmV2aWV3Rm9ybUVsZW1lbnQuaW5jLnBocAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBjbGFzc2VzL3Jldmlld0Zvcm0vUmV2aWV3Rm9ybUVsZW1lbnQuaW5jLnBocAkyMDA5 LTExLTE5IDEzOjI0OjUzLjAwMDAwMDAwMCArMDEwMAorKysgY2xhc3Nlcy9yZXZpZXdGb3JtL1Jl dmlld0Zvcm1FbGVtZW50LmluYy5waHAJMjAwOS0xMS0xOSAxMzoyNjowOC4wMDAwMDAwMDAgKzAx MDAKQEAgLTEzMSw2ICsxMzEsMjIgQEAKIAl9CiAKIAkvKioKKwkgKiBnZXQgaW5jbHVkZWQKKwkg KiBAcmV0dXJuIGJvb2xlYW4KKwkgKi8KKwlmdW5jdGlvbiBnZXRJbmNsdWRlZCgpIHsKKwkJcmV0 dXJuICR0aGlzLT5nZXREYXRhKCdpbmNsdWRlZCcpOworCX0KKworCS8qKgorCSAqIHNldCBpbmNs dWRlZAorCSAqIEBwYXJhbSAkaW5jbHVkZWQgYm9vbGVhbgorCSAqLworCWZ1bmN0aW9uIHNldElu Y2x1ZGVkKCRpbmNsdWRlZCkgeworCQlyZXR1cm4gJHRoaXMtPnNldERhdGEoJ2luY2x1ZGVkJywg JGluY2x1ZGVkKTsKKwl9CisKKwkvKioKIAkgKiBHZXQgcXVlc3Rpb24uCiAJICogQHBhcmFtICRs b2NhbGUgc3RyaW5nCiAJICogQHJldHVybiBzdHJpbmcKSW5kZXg6IGNsYXNzZXMvcmV2aWV3Rm9y bS9SZXZpZXdGb3JtRWxlbWVudERBTy5pbmMucGhwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGNsYXNzZXMvcmV2 aWV3Rm9ybS9SZXZpZXdGb3JtRWxlbWVudERBTy5pbmMucGhwCTIwMDktMTEtMTkgMTU6MDU6MTYu MDAwMDAwMDAwICswMTAwCisrKyBjbGFzc2VzL3Jldmlld0Zvcm0vUmV2aWV3Rm9ybUVsZW1lbnRE QU8uaW5jLnBocAkyMDA5LTExLTE5IDE3OjMwOjM0LjAwMDAwMDAwMCArMDEwMApAQCAtNTAsNiAr NTAsNyBAQAogCQkkcmV2aWV3Rm9ybUVsZW1lbnQtPnNldFNlcXVlbmNlKCRyb3dbJ3NlcSddKTsK IAkJJHJldmlld0Zvcm1FbGVtZW50LT5zZXRFbGVtZW50VHlwZSgkcm93WydlbGVtZW50X3R5cGUn XSk7CiAJCSRyZXZpZXdGb3JtRWxlbWVudC0+c2V0UmVxdWlyZWQoJHJvd1sncmVxdWlyZWQnXSk7 CisJCSRyZXZpZXdGb3JtRWxlbWVudC0+c2V0SW5jbHVkZWQoJHJvd1snaW5jbHVkZWQnXSk7CiAK IAkJJHRoaXMtPmdldERhdGFPYmplY3RTZXR0aW5ncygncmV2aWV3X2Zvcm1fZWxlbWVudF9zZXR0 aW5ncycsICdyZXZpZXdfZm9ybV9lbGVtZW50X2lkJywgJHJvd1sncmV2aWV3X2Zvcm1fZWxlbWVu dF9pZCddLCAkcmV2aWV3Rm9ybUVsZW1lbnQpOwogCkBAIC04MywxNCArODQsMTUgQEAKIAlmdW5j dGlvbiBpbnNlcnRSZXZpZXdGb3JtRWxlbWVudCgmJHJldmlld0Zvcm1FbGVtZW50KSB7CiAJCSR0 aGlzLT51cGRhdGUoCiAJCQknSU5TRVJUIElOVE8gcmV2aWV3X2Zvcm1fZWxlbWVudHMKLQkJCQko cmV2aWV3X2Zvcm1faWQsIHNlcSwgZWxlbWVudF90eXBlLCByZXF1aXJlZCkKKwkJCQkocmV2aWV3 X2Zvcm1faWQsIHNlcSwgZWxlbWVudF90eXBlLCByZXF1aXJlZCwgaW5jbHVkZWQpCiAJCQkJVkFM VUVTCi0JCQkJKD8sID8sID8sID8pJywKKwkJCQkoPywgPywgPywgPywgPyknLAogCQkJYXJyYXko CiAJCQkJJHJldmlld0Zvcm1FbGVtZW50LT5nZXRSZXZpZXdGb3JtSWQoKSwKIAkJCQkkcmV2aWV3 Rm9ybUVsZW1lbnQtPmdldFNlcXVlbmNlKCkgPT0gbnVsbCA/IDAgOiAkcmV2aWV3Rm9ybUVsZW1l bnQtPmdldFNlcXVlbmNlKCksCiAJCQkJJHJldmlld0Zvcm1FbGVtZW50LT5nZXRFbGVtZW50VHlw ZSgpLAotCQkJCSRyZXZpZXdGb3JtRWxlbWVudC0+Z2V0UmVxdWlyZWQoKSA/IDEgOiAwCisJCQkJ JHJldmlld0Zvcm1FbGVtZW50LT5nZXRSZXF1aXJlZCgpID8gMSA6IDAsCisJCQkJJHJldmlld0Zv cm1FbGVtZW50LT5nZXRJbmNsdWRlZCgpID8gMSA6IDAKIAkJCSkKIAkJKTsKIApAQCAtMTEwLDEz ICsxMTIsMTUgQEAKIAkJCQkJcmV2aWV3X2Zvcm1faWQgPSA/LAogCQkJCQlzZXEgPSA/LAogCQkJ CQllbGVtZW50X3R5cGUgPSA/LAotCQkJCQlyZXF1aXJlZCA9ID8KKwkJCQkJcmVxdWlyZWQgPSA/ LAorCQkJCQlpbmNsdWRlZCA9ID8KIAkJCQlXSEVSRSByZXZpZXdfZm9ybV9lbGVtZW50X2lkID0g PycsCiAJCQlhcnJheSgKIAkJCQkkcmV2aWV3Rm9ybUVsZW1lbnQtPmdldFJldmlld0Zvcm1JZCgp LAogCQkJCSRyZXZpZXdGb3JtRWxlbWVudC0+Z2V0U2VxdWVuY2UoKSwKIAkJCQkkcmV2aWV3Rm9y bUVsZW1lbnQtPmdldEVsZW1lbnRUeXBlKCksCiAJCQkJJHJldmlld0Zvcm1FbGVtZW50LT5nZXRS ZXF1aXJlZCgpLAorCQkJCSRyZXZpZXdGb3JtRWxlbWVudC0+Z2V0SW5jbHVkZWQoKSwKIAkJCQkk cmV2aWV3Rm9ybUVsZW1lbnQtPmdldFJldmlld0Zvcm1FbGVtZW50SWQoKQogCQkJKQogCQkpOwpJ bmRleDogZGJzY3JpcHRzL3htbC9vY3Nfc2NoZW1hLnhtbAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBkYnNjcmlw dHMveG1sL29jc19zY2hlbWEueG1sCTIwMDktMTEtMTkgMTY6NDM6MDAuMDAwMDAwMDAwICswMTAw CisrKyBkYnNjcmlwdHMveG1sL29jc19zY2hlbWEueG1sCTIwMDktMTEtMTkgMTY6NDM6MDQuMDAw MDAwMDAwICswMTAwCkBAIC04MCw2ICs4MCw3IEBACiAJCTxmaWVsZCBuYW1lPSJzZXEiIHR5cGU9 IkYiIC8+CiAJCTxmaWVsZCBuYW1lPSJlbGVtZW50X3R5cGUiIHR5cGU9Ikk4IiAvPgogCQk8Zmll bGQgbmFtZT0icmVxdWlyZWQiIHR5cGU9IkkxIiAvPgorCQk8ZmllbGQgbmFtZT0iaW5jbHVkZWQi IHR5cGU9IkkxIiAvPgogCQk8ZGVzY3I+UmV2aWV3IGZvcm0gZWxlbWVudHMuPC9kZXNjcj4KIAk8 L3RhYmxlPgogCQpJbmRleDogbG9jYWxlL2VuX1VTL2xvY2FsZS54bWwKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g bG9jYWxlL2VuX1VTL2xvY2FsZS54bWwJMjAwOS0xMS0xOSAxMzoyMDozMS4wMDAwMDAwMDAgKzAx MDAKKysrIGxvY2FsZS9lbl9VUy9sb2NhbGUueG1sCTIwMDktMTEtMTkgMTM6MjA6NDYuMDAwMDAw MDAwICswMTAwCkBAIC01OSw2ICs1OSw3IEBACiAJPG1lc3NhZ2Uga2V5PSJtYW5hZ2VyLnJldmll d0Zvcm1FbGVtZW50cy5jb3B5VG8iPkNvcHkgdG86PC9tZXNzYWdlPgogCTxtZXNzYWdlIGtleT0i bWFuYWdlci5yZXZpZXdGb3JtRWxlbWVudHMucXVlc3Rpb24iPkl0ZW08L21lc3NhZ2U+CiAJPG1l c3NhZ2Uga2V5PSJtYW5hZ2VyLnJldmlld0Zvcm1FbGVtZW50cy5yZXF1aXJlZCI+UmV2aWV3ZXJz IHJlcXVpcmVkIHRvIGNvbXBsZXRlIGl0ZW08L21lc3NhZ2U+CisJPG1lc3NhZ2Uga2V5PSJtYW5h Z2VyLnJldmlld0Zvcm1FbGVtZW50cy5ub3RJbmNsdWRlZCI+Tm90IGluY2x1ZGVkIGluIG1lc3Nh Z2UgdG8gYXV0aG9yPC9tZXNzYWdlPgogCTxtZXNzYWdlIGtleT0ibWFuYWdlci5yZXZpZXdGb3Jt RWxlbWVudHMuZWxlbWVudFR5cGUiPkl0ZW0gdHlwZTwvbWVzc2FnZT4KIAk8bWVzc2FnZSBrZXk9 Im1hbmFnZXIucmV2aWV3Rm9ybUVsZW1lbnRzLnBvc3NpYmxlUmVzcG9uc2UiPlNlbGVjdGlvbjwv bWVzc2FnZT4KIAk8bWVzc2FnZSBrZXk9Im1hbmFnZXIucmV2aWV3Rm9ybUVsZW1lbnRzLmFkZFJl c3BvbnNlSXRlbSI+QWRkIHNlbGVjdGlvbjwvbWVzc2FnZT4KSW5kZXg6IHRlbXBsYXRlcy9tYW5h Z2VyL3Jldmlld0Zvcm1zL3Jldmlld0Zvcm1FbGVtZW50Rm9ybS50cGwKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g dGVtcGxhdGVzL21hbmFnZXIvcmV2aWV3Rm9ybXMvcmV2aWV3Rm9ybUVsZW1lbnRGb3JtLnRwbAky MDA5LTExLTE5IDEzOjM3OjAzLjAwMDAwMDAwMCArMDEwMAorKysgdGVtcGxhdGVzL21hbmFnZXIv cmV2aWV3Rm9ybXMvcmV2aWV3Rm9ybUVsZW1lbnRGb3JtLnRwbAkyMDA5LTExLTE5IDEzOjM3OjMy LjAwMDAwMDAwMCArMDEwMApAQCAtNjAsNiArNjAsMTMgQEAKIAk8L3RkPgogPC90cj4KIDx0ciB2 YWxpZ249InRvcCI+CisJPHRkPiZuYnNwOzwvdGQ+CisJPHRkIGNsYXNzPSJ2YWx1ZSI+CisJCTxp bnB1dCB0eXBlPSJjaGVja2JveCIgbmFtZT0iaW5jbHVkZWQiIGlkPSJpbmNsdWRlZCIgdmFsdWU9 IjEiIHtpZiAkaW5jbHVkZWR9Y2hlY2tlZD0iY2hlY2tlZCJ7L2lmfSAvPgorCQl7ZmllbGRMYWJl bCBuYW1lPSJpbmNsdWRlZCIga2V5PSJtYW5hZ2VyLnJldmlld0Zvcm1FbGVtZW50cy5ub3RJbmNs dWRlZCJ9CisJPC90ZD4KKzwvdHI+Cis8dHIgdmFsaWduPSJ0b3AiPgogCTx0ZCBjbGFzcz0ibGFi ZWwiPntmaWVsZExhYmVsIG5hbWU9ImVsZW1lbnRUeXBlIiByZXF1aXJlZD0idHJ1ZSIga2V5PSJt YW5hZ2VyLnJldmlld0Zvcm1FbGVtZW50cy5lbGVtZW50VHlwZSJ9PC90ZD4KIAk8dGQgY2xhc3M9 InZhbHVlIj4KIAkJPHNlbGVjdCBuYW1lPSJlbGVtZW50VHlwZSIgaWQ9ImVsZW1lbnRUeXBlIiBj bGFzcz0ic2VsZWN0TWVudSIgc2l6ZT0iMSIgb25jaGFuZ2U9InRvZ2dsZVBvc3NpYmxlUmVzcG9u c2VzKHRoaXMub3B0aW9uc1t0aGlzLnNlbGVjdGVkSW5kZXhdLnZhbHVlLCAneyRtdWx0aXBsZVJl c3BvbnNlc0VsZW1lbnRUeXBlc1N0cmluZ30nKSI+e2h0bWxfb3B0aW9uc190cmFuc2xhdGUgb3B0 aW9ucz0kcmV2aWV3Rm9ybUVsZW1lbnRUeXBlT3B0aW9ucyBzZWxlY3RlZD0kZWxlbWVudFR5cGV9 PC9zZWxlY3Q+Cg== 2611 2009-11-20 02:51:00 -0800 2009-11-20 02:51:34 -0800 patch against ocs 2.1.2 not_included.diff text/plain 8180 W.M.BergmannTiest SW5kZXg6IGNsYXNzZXMvbWFuYWdlci9mb3JtL1Jldmlld0Zvcm1FbGVtZW50Rm9ybS5pbmMucGhw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIGNsYXNzZXMvbWFuYWdlci9mb3JtL1Jldmlld0Zvcm1FbGVtZW50Rm9y bS5pbmMucGhwCTIwMDktMTEtMTkgMTc6MjE6MjEuMDAwMDAwMDAwICswMTAwCisrKyBjbGFzc2Vz L21hbmFnZXIvZm9ybS9SZXZpZXdGb3JtRWxlbWVudEZvcm0uaW5jLnBocAkyMDA5LTExLTE5IDE3 OjM0OjUxLjAwMDAwMDAwMCArMDEwMApAQCAtODAsNiArODAsNyBAQAogCQkJCSR0aGlzLT5fZGF0 YSA9IGFycmF5KAogCQkJCQkncXVlc3Rpb24nID0+ICRyZXZpZXdGb3JtRWxlbWVudC0+Z2V0UXVl c3Rpb24obnVsbCksIC8vIExvY2FsaXplZAogCQkJCQkncmVxdWlyZWQnID0+ICRyZXZpZXdGb3Jt RWxlbWVudC0+Z2V0UmVxdWlyZWQoKSwKKwkJCQkJJ2luY2x1ZGVkJyA9PiAkcmV2aWV3Rm9ybUVs ZW1lbnQtPmdldEluY2x1ZGVkKCksCiAJCQkJCSdlbGVtZW50VHlwZScgPT4gJHJldmlld0Zvcm1F bGVtZW50LT5nZXRFbGVtZW50VHlwZSgpLAogCQkJCQkncG9zc2libGVSZXNwb25zZXMnID0+ICRy ZXZpZXdGb3JtRWxlbWVudC0+Z2V0UG9zc2libGVSZXNwb25zZXMobnVsbCkgLy9Mb2NhbGl6ZWQK IAkJCQkpOwpAQCAtOTEsNyArOTIsNyBAQAogCSAqIEFzc2lnbiBmb3JtIGRhdGEgdG8gdXNlci1z dWJtaXR0ZWQgZGF0YS4KIAkgKi8KIAlmdW5jdGlvbiByZWFkSW5wdXREYXRhKCkgewotCQkkdGhp cy0+cmVhZFVzZXJWYXJzKGFycmF5KCdxdWVzdGlvbicsICdyZXF1aXJlZCcsICdlbGVtZW50VHlw ZScsICdwb3NzaWJsZVJlc3BvbnNlcycpKTsKKwkJJHRoaXMtPnJlYWRVc2VyVmFycyhhcnJheSgn cXVlc3Rpb24nLCAncmVxdWlyZWQnLCAnaW5jbHVkZWQnLCAnZWxlbWVudFR5cGUnLCAncG9zc2li bGVSZXNwb25zZXMnKSk7CiAJfQogCiAJLyoqCkBAIC0xMTIsNiArMTEzLDcgQEAKIAogCQkkcmV2 aWV3Rm9ybUVsZW1lbnQtPnNldFF1ZXN0aW9uKCR0aGlzLT5nZXREYXRhKCdxdWVzdGlvbicpLCBu dWxsKTsgLy8gTG9jYWxpemVkCiAJCSRyZXZpZXdGb3JtRWxlbWVudC0+c2V0UmVxdWlyZWQoJHRo aXMtPmdldERhdGEoJ3JlcXVpcmVkJykgPyAxIDogMCk7CisJCSRyZXZpZXdGb3JtRWxlbWVudC0+ c2V0SW5jbHVkZWQoJHRoaXMtPmdldERhdGEoJ2luY2x1ZGVkJykgPyAxIDogMCk7CiAJCSRyZXZp ZXdGb3JtRWxlbWVudC0+c2V0RWxlbWVudFR5cGUoJHRoaXMtPmdldERhdGEoJ2VsZW1lbnRUeXBl JykpOwogCiAJCWlmIChpbl9hcnJheSgkdGhpcy0+Z2V0RGF0YSgnZWxlbWVudFR5cGUnKSwgUmV2 aWV3Rm9ybUVsZW1lbnQ6OmdldE11bHRpcGxlUmVzcG9uc2VzRWxlbWVudFR5cGVzKCkpKSB7Cklu ZGV4OiBjbGFzc2VzL3Jldmlld0Zvcm0vUmV2aWV3Rm9ybUVsZW1lbnQuaW5jLnBocAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBjbGFzc2VzL3Jldmlld0Zvcm0vUmV2aWV3Rm9ybUVsZW1lbnQuaW5jLnBocAkyMDA5 LTExLTE5IDEzOjI0OjUzLjAwMDAwMDAwMCArMDEwMAorKysgY2xhc3Nlcy9yZXZpZXdGb3JtL1Jl dmlld0Zvcm1FbGVtZW50LmluYy5waHAJMjAwOS0xMS0xOSAxMzoyNjowOC4wMDAwMDAwMDAgKzAx MDAKQEAgLTEzMSw2ICsxMzEsMjIgQEAKIAl9CiAKIAkvKioKKwkgKiBnZXQgaW5jbHVkZWQKKwkg KiBAcmV0dXJuIGJvb2xlYW4KKwkgKi8KKwlmdW5jdGlvbiBnZXRJbmNsdWRlZCgpIHsKKwkJcmV0 dXJuICR0aGlzLT5nZXREYXRhKCdpbmNsdWRlZCcpOworCX0KKworCS8qKgorCSAqIHNldCBpbmNs dWRlZAorCSAqIEBwYXJhbSAkaW5jbHVkZWQgYm9vbGVhbgorCSAqLworCWZ1bmN0aW9uIHNldElu Y2x1ZGVkKCRpbmNsdWRlZCkgeworCQlyZXR1cm4gJHRoaXMtPnNldERhdGEoJ2luY2x1ZGVkJywg JGluY2x1ZGVkKTsKKwl9CisKKwkvKioKIAkgKiBHZXQgcXVlc3Rpb24uCiAJICogQHBhcmFtICRs b2NhbGUgc3RyaW5nCiAJICogQHJldHVybiBzdHJpbmcKSW5kZXg6IGNsYXNzZXMvcmV2aWV3Rm9y bS9SZXZpZXdGb3JtRWxlbWVudERBTy5pbmMucGhwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGNsYXNzZXMvcmV2 aWV3Rm9ybS9SZXZpZXdGb3JtRWxlbWVudERBTy5pbmMucGhwCTIwMDktMTEtMTkgMTU6MDU6MTYu MDAwMDAwMDAwICswMTAwCisrKyBjbGFzc2VzL3Jldmlld0Zvcm0vUmV2aWV3Rm9ybUVsZW1lbnRE QU8uaW5jLnBocAkyMDA5LTExLTE5IDE3OjMwOjM0LjAwMDAwMDAwMCArMDEwMApAQCAtNTAsNiAr NTAsNyBAQAogCQkkcmV2aWV3Rm9ybUVsZW1lbnQtPnNldFNlcXVlbmNlKCRyb3dbJ3NlcSddKTsK IAkJJHJldmlld0Zvcm1FbGVtZW50LT5zZXRFbGVtZW50VHlwZSgkcm93WydlbGVtZW50X3R5cGUn XSk7CiAJCSRyZXZpZXdGb3JtRWxlbWVudC0+c2V0UmVxdWlyZWQoJHJvd1sncmVxdWlyZWQnXSk7 CisJCSRyZXZpZXdGb3JtRWxlbWVudC0+c2V0SW5jbHVkZWQoJHJvd1snaW5jbHVkZWQnXSk7CiAK IAkJJHRoaXMtPmdldERhdGFPYmplY3RTZXR0aW5ncygncmV2aWV3X2Zvcm1fZWxlbWVudF9zZXR0 aW5ncycsICdyZXZpZXdfZm9ybV9lbGVtZW50X2lkJywgJHJvd1sncmV2aWV3X2Zvcm1fZWxlbWVu dF9pZCddLCAkcmV2aWV3Rm9ybUVsZW1lbnQpOwogCkBAIC04MywxNCArODQsMTUgQEAKIAlmdW5j dGlvbiBpbnNlcnRSZXZpZXdGb3JtRWxlbWVudCgmJHJldmlld0Zvcm1FbGVtZW50KSB7CiAJCSR0 aGlzLT51cGRhdGUoCiAJCQknSU5TRVJUIElOVE8gcmV2aWV3X2Zvcm1fZWxlbWVudHMKLQkJCQko cmV2aWV3X2Zvcm1faWQsIHNlcSwgZWxlbWVudF90eXBlLCByZXF1aXJlZCkKKwkJCQkocmV2aWV3 X2Zvcm1faWQsIHNlcSwgZWxlbWVudF90eXBlLCByZXF1aXJlZCwgaW5jbHVkZWQpCiAJCQkJVkFM VUVTCi0JCQkJKD8sID8sID8sID8pJywKKwkJCQkoPywgPywgPywgPywgPyknLAogCQkJYXJyYXko CiAJCQkJJHJldmlld0Zvcm1FbGVtZW50LT5nZXRSZXZpZXdGb3JtSWQoKSwKIAkJCQkkcmV2aWV3 Rm9ybUVsZW1lbnQtPmdldFNlcXVlbmNlKCkgPT0gbnVsbCA/IDAgOiAkcmV2aWV3Rm9ybUVsZW1l bnQtPmdldFNlcXVlbmNlKCksCiAJCQkJJHJldmlld0Zvcm1FbGVtZW50LT5nZXRFbGVtZW50VHlw ZSgpLAotCQkJCSRyZXZpZXdGb3JtRWxlbWVudC0+Z2V0UmVxdWlyZWQoKSA/IDEgOiAwCisJCQkJ JHJldmlld0Zvcm1FbGVtZW50LT5nZXRSZXF1aXJlZCgpID8gMSA6IDAsCisJCQkJJHJldmlld0Zv cm1FbGVtZW50LT5nZXRJbmNsdWRlZCgpID8gMSA6IDAKIAkJCSkKIAkJKTsKIApAQCAtMTEwLDEz ICsxMTIsMTUgQEAKIAkJCQkJcmV2aWV3X2Zvcm1faWQgPSA/LAogCQkJCQlzZXEgPSA/LAogCQkJ CQllbGVtZW50X3R5cGUgPSA/LAotCQkJCQlyZXF1aXJlZCA9ID8KKwkJCQkJcmVxdWlyZWQgPSA/ LAorCQkJCQlpbmNsdWRlZCA9ID8KIAkJCQlXSEVSRSByZXZpZXdfZm9ybV9lbGVtZW50X2lkID0g PycsCiAJCQlhcnJheSgKIAkJCQkkcmV2aWV3Rm9ybUVsZW1lbnQtPmdldFJldmlld0Zvcm1JZCgp LAogCQkJCSRyZXZpZXdGb3JtRWxlbWVudC0+Z2V0U2VxdWVuY2UoKSwKIAkJCQkkcmV2aWV3Rm9y bUVsZW1lbnQtPmdldEVsZW1lbnRUeXBlKCksCiAJCQkJJHJldmlld0Zvcm1FbGVtZW50LT5nZXRS ZXF1aXJlZCgpLAorCQkJCSRyZXZpZXdGb3JtRWxlbWVudC0+Z2V0SW5jbHVkZWQoKSwKIAkJCQkk cmV2aWV3Rm9ybUVsZW1lbnQtPmdldFJldmlld0Zvcm1FbGVtZW50SWQoKQogCQkJKQogCQkpOwpJ bmRleDogZGJzY3JpcHRzL3htbC9vY3Nfc2NoZW1hLnhtbAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBkYnNjcmlw dHMveG1sL29jc19zY2hlbWEueG1sCTIwMDktMTEtMTkgMTY6NDM6MDAuMDAwMDAwMDAwICswMTAw CisrKyBkYnNjcmlwdHMveG1sL29jc19zY2hlbWEueG1sCTIwMDktMTEtMTkgMTY6NDM6MDQuMDAw MDAwMDAwICswMTAwCkBAIC04MCw2ICs4MCw3IEBACiAJCTxmaWVsZCBuYW1lPSJzZXEiIHR5cGU9 IkYiIC8+CiAJCTxmaWVsZCBuYW1lPSJlbGVtZW50X3R5cGUiIHR5cGU9Ikk4IiAvPgogCQk8Zmll bGQgbmFtZT0icmVxdWlyZWQiIHR5cGU9IkkxIiAvPgorCQk8ZmllbGQgbmFtZT0iaW5jbHVkZWQi IHR5cGU9IkkxIiAvPgogCQk8ZGVzY3I+UmV2aWV3IGZvcm0gZWxlbWVudHMuPC9kZXNjcj4KIAk8 L3RhYmxlPgogCQpJbmRleDogbG9jYWxlL2VuX1VTL2xvY2FsZS54bWwKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g bG9jYWxlL2VuX1VTL2xvY2FsZS54bWwJMjAwOS0xMS0xOSAxMzoyMDozMS4wMDAwMDAwMDAgKzAx MDAKKysrIGxvY2FsZS9lbl9VUy9sb2NhbGUueG1sCTIwMDktMTEtMTkgMTM6MjA6NDYuMDAwMDAw MDAwICswMTAwCkBAIC01OSw2ICs1OSw3IEBACiAJPG1lc3NhZ2Uga2V5PSJtYW5hZ2VyLnJldmll d0Zvcm1FbGVtZW50cy5jb3B5VG8iPkNvcHkgdG86PC9tZXNzYWdlPgogCTxtZXNzYWdlIGtleT0i bWFuYWdlci5yZXZpZXdGb3JtRWxlbWVudHMucXVlc3Rpb24iPkl0ZW08L21lc3NhZ2U+CiAJPG1l c3NhZ2Uga2V5PSJtYW5hZ2VyLnJldmlld0Zvcm1FbGVtZW50cy5yZXF1aXJlZCI+UmV2aWV3ZXJz IHJlcXVpcmVkIHRvIGNvbXBsZXRlIGl0ZW08L21lc3NhZ2U+CisJPG1lc3NhZ2Uga2V5PSJtYW5h Z2VyLnJldmlld0Zvcm1FbGVtZW50cy5ub3RJbmNsdWRlZCI+Tm90IGluY2x1ZGVkIGluIG1lc3Nh Z2UgdG8gYXV0aG9yPC9tZXNzYWdlPgogCTxtZXNzYWdlIGtleT0ibWFuYWdlci5yZXZpZXdGb3Jt RWxlbWVudHMuZWxlbWVudFR5cGUiPkl0ZW0gdHlwZTwvbWVzc2FnZT4KIAk8bWVzc2FnZSBrZXk9 Im1hbmFnZXIucmV2aWV3Rm9ybUVsZW1lbnRzLnBvc3NpYmxlUmVzcG9uc2UiPlNlbGVjdGlvbjwv bWVzc2FnZT4KIAk8bWVzc2FnZSBrZXk9Im1hbmFnZXIucmV2aWV3Rm9ybUVsZW1lbnRzLmFkZFJl c3BvbnNlSXRlbSI+QWRkIHNlbGVjdGlvbjwvbWVzc2FnZT4KSW5kZXg6IHRlbXBsYXRlcy9tYW5h Z2VyL3Jldmlld0Zvcm1zL3Jldmlld0Zvcm1FbGVtZW50Rm9ybS50cGwKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g dGVtcGxhdGVzL21hbmFnZXIvcmV2aWV3Rm9ybXMvcmV2aWV3Rm9ybUVsZW1lbnRGb3JtLnRwbAky MDA5LTExLTE5IDEzOjM3OjAzLjAwMDAwMDAwMCArMDEwMAorKysgdGVtcGxhdGVzL21hbmFnZXIv cmV2aWV3Rm9ybXMvcmV2aWV3Rm9ybUVsZW1lbnRGb3JtLnRwbAkyMDA5LTExLTE5IDEzOjM3OjMy LjAwMDAwMDAwMCArMDEwMApAQCAtNjAsNiArNjAsMTMgQEAKIAk8L3RkPgogPC90cj4KIDx0ciB2 YWxpZ249InRvcCI+CisJPHRkPiZuYnNwOzwvdGQ+CisJPHRkIGNsYXNzPSJ2YWx1ZSI+CisJCTxp bnB1dCB0eXBlPSJjaGVja2JveCIgbmFtZT0iaW5jbHVkZWQiIGlkPSJpbmNsdWRlZCIgdmFsdWU9 IjEiIHtpZiAkaW5jbHVkZWR9Y2hlY2tlZD0iY2hlY2tlZCJ7L2lmfSAvPgorCQl7ZmllbGRMYWJl bCBuYW1lPSJpbmNsdWRlZCIga2V5PSJtYW5hZ2VyLnJldmlld0Zvcm1FbGVtZW50cy5ub3RJbmNs dWRlZCJ9CisJPC90ZD4KKzwvdHI+Cis8dHIgdmFsaWduPSJ0b3AiPgogCTx0ZCBjbGFzcz0ibGFi ZWwiPntmaWVsZExhYmVsIG5hbWU9ImVsZW1lbnRUeXBlIiByZXF1aXJlZD0idHJ1ZSIga2V5PSJt YW5hZ2VyLnJldmlld0Zvcm1FbGVtZW50cy5lbGVtZW50VHlwZSJ9PC90ZD4KIAk8dGQgY2xhc3M9 InZhbHVlIj4KIAkJPHNlbGVjdCBuYW1lPSJlbGVtZW50VHlwZSIgaWQ9ImVsZW1lbnRUeXBlIiBj bGFzcz0ic2VsZWN0TWVudSIgc2l6ZT0iMSIgb25jaGFuZ2U9InRvZ2dsZVBvc3NpYmxlUmVzcG9u c2VzKHRoaXMub3B0aW9uc1t0aGlzLnNlbGVjdGVkSW5kZXhdLnZhbHVlLCAneyRtdWx0aXBsZVJl c3BvbnNlc0VsZW1lbnRUeXBlc1N0cmluZ30nKSI+e2h0bWxfb3B0aW9uc190cmFuc2xhdGUgb3B0 aW9ucz0kcmV2aWV3Rm9ybUVsZW1lbnRUeXBlT3B0aW9ucyBzZWxlY3RlZD0kZWxlbWVudFR5cGV9 PC9zZWxlY3Q+CkluZGV4OiBjbGFzc2VzL3N1Ym1pc3Npb24vdHJhY2tEaXJlY3Rvci9UcmFja0Rp cmVjdG9yQWN0aW9uLmluYy5waHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gY2xhc3Nlcy9zdWJtaXNzaW9uL3Ry YWNrRGlyZWN0b3IvVHJhY2tEaXJlY3RvckFjdGlvbi5pbmMucGhwICAgMjAwOS0xMS0yMCAxMTo0 NjoyNS4wMDAwMDAwMDAgKzAxMDAKKysrIGNsYXNzZXMvc3VibWlzc2lvbi90cmFja0RpcmVjdG9y L1RyYWNrRGlyZWN0b3JBY3Rpb24uaW5jLnBocCAgICAyMDA5LTExLTE5IDIyOjUwOjE4LjAwMDAw MDAwMCArMDEwMApAQCAtMTQ4NSw2ICsxNDg1LDcgQEAKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJGJvZHkgLj0g TG9jYWxlOjp0cmFuc2xhdGUoJ3N1Ym1pc3Npb24uY29tbWVudHMuaW1wb3J0UGVlclJldmlld3Mu cmV2aWV3ZXJMZXR0ZXInLCBhcnJheSgncmV2aWV3ZXJMZXR0ZXInID0+IGNocihvcmQoJ0EnKSAr ICRyZXZpZXdJbmRleGVzWyRyZXZpZXdBc3NpZ25tZW50LT5nZXRSZXZpZXdJZCgpXSkpKSAuICJc blxuIjsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGZvcmVhY2ggKCRyZXZpZXdGb3JtRWxlbWVudHMgYXMgJHJl dmlld0Zvcm1FbGVtZW50KSB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoISRyZXZpZXdGb3JtRWxlbWVudC0+Z2V0SW5j bHVkZWQoKSkgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAkYm9keSAuPSAkcmV2aWV3Rm9ybUVsZW1lbnQtPmdl dFJldmlld0Zvcm1FbGVtZW50UXVlc3Rpb24oKSAuICI6IFxuIjsKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJHJl dmlld0Zvcm1SZXNwb25zZSA9ICRyZXZpZXdGb3JtUmVzcG9uc2VEYW8tPmdldFJldmlld0Zvcm1S ZXNwb25zZSgkcmV2aWV3SWQsICRyZXZpZXdGb3JtRWxlbWVudC0+Z2V0UmV2aWV3Rm9ybUVsZW1l bnRJZCgpKTsKIApAQCAtMTUwMyw2ICsxNTA0LDcgQEAKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICRib2R5IC49ICJcdCIgLiBTdHJpbmc6Omh0bWwydXRmKHN0cmlwX3RhZ3MoJHJldmll d0Zvcm1SZXNwb25zZS0+Z2V0VmFsdWUoKSkpIC4gIlxuXG4iOwogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIH0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJGJvZHkgLj0g Ii0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxu XG4iOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgJGhhc0JvZHkgPSB0cnVlOwo=