mbkbucket 3.5.1 → 3.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (42) hide show
  1. package/.env.example +14 -14
  2. package/.mbkbucket.config.example.json +14 -14
  3. package/LICENSE +20 -20
  4. package/README.md +377 -350
  5. package/index.js +30 -30
  6. package/lib/cli.js +5 -4
  7. package/lib/public/bucketadmin.css +1695 -1420
  8. package/lib/public/bucketadmin.js +1229 -1229
  9. package/lib/public/mbkbucket-helper-demo.html +1184 -1184
  10. package/lib/public/mbkbucket-helper.css +1235 -1235
  11. package/lib/public/mbkbucket-helper.js +1557 -1557
  12. package/lib/src/app.js +109 -109
  13. package/lib/src/cli/auth-helper.js +141 -150
  14. package/lib/src/config/index.js +110 -112
  15. package/lib/src/config/validation.js +73 -73
  16. package/lib/src/controllers/api.controller.js +410 -410
  17. package/lib/src/controllers/dashboard.controller.js +49 -48
  18. package/lib/src/controllers/info.controller.js +33 -34
  19. package/lib/src/controllers/view.controller.js +231 -233
  20. package/lib/src/middleware/async-handler.js +19 -23
  21. package/lib/src/middleware/bucket-resolver.js +37 -37
  22. package/lib/src/middleware/error-handler.js +50 -54
  23. package/lib/src/middleware/rate-limiter.js +22 -22
  24. package/lib/src/middleware/security.js +21 -27
  25. package/lib/src/routes/api.routes.js +53 -40
  26. package/lib/src/routes/index.js +60 -21
  27. package/lib/src/routes/info.routes.js +9 -9
  28. package/lib/src/routes/view.routes.js +25 -20
  29. package/lib/src/services/s3.service.js +594 -603
  30. package/lib/src/utils/errors.js +46 -54
  31. package/lib/src/utils/helpers.js +212 -251
  32. package/lib/src/utils/logger.js +17 -17
  33. package/package.json +83 -83
  34. package/views/bucket.handlebars +196 -196
  35. package/views/bucketadmin_alerts.handlebars +15 -15
  36. package/views/bucketadmin_delete_modal.handlebars +36 -36
  37. package/views/bucketadmin_filelist_skeleton.handlebars +32 -32
  38. package/views/bucketadmin_newfolder_modal.handlebars +29 -29
  39. package/views/bucketadmin_preview_modal.handlebars +40 -40
  40. package/views/bucketadmin_upload_modal.handlebars +54 -54
  41. package/views/bucketadmincontent.handlebars +141 -141
  42. package/views/mbkbucket_info.handlebars +232 -232
package/package.json CHANGED
@@ -1,83 +1,83 @@
1
- {
2
- "name": "mbkbucket",
3
- "version": "3.5.1",
4
- "description": "Flexible S3/R2 bucket management — library, Express router, and CLI for mbktech.org applications. Provides upload, download, listing, multipart utilities, signed URLs, and a command-line interface with built-in configuration validation and health checks",
5
- "author": "Muhammad Bin Khalid",
6
- "homepage": "https://github.com/MIbnEKhalid/mbkbucket#readme",
7
- "license": "MIT",
8
- "main": "index.js",
9
- "type": "module",
10
- "types": "index.d.ts",
11
- "bin": {
12
- "mbkbucket": "./lib/cli.js"
13
- },
14
- "scripts": {
15
- "dev": "cross-env NODE_ENV=dev nodemon index.js",
16
- "test": "vitest run"
17
- },
18
- "imports": {
19
- "#helpers": "./lib/src/utils/helpers.js",
20
- "#logger": "./lib/src/utils/logger.js"
21
- },
22
- "dependencies": {
23
- "@aws-sdk/client-s3": "^3.968.0",
24
- "@aws-sdk/s3-request-presigner": "^3.1000.0",
25
- "compression": "^1.8.0",
26
- "debug": "^4.4.3",
27
- "dotenv": "^16.6.1",
28
- "express": "^5.1.0",
29
- "express-handlebars": "^9.0.1",
30
- "express-rate-limit": "^7.5.0",
31
- "mbkauthe": "^5.7.1",
32
- "multer": "^2.0.2",
33
- "pg": "^8.16.3"
34
- },
35
- "devDependencies": {
36
- "@types/supertest": "^7.2.1",
37
- "cross-env": "^7.0.3",
38
- "nodemon": "^3.1.14",
39
- "supertest": "^7.2.2",
40
- "vitest": "^4.1.11"
41
- },
42
- "overrides": {
43
- "csurf": {
44
- "cookie": "^0.7.0"
45
- }
46
- },
47
- "repository": {
48
- "type": "git",
49
- "url": "git+https://github.com/MIbnEKhalid/mbkbucket.git"
50
- },
51
- "bugs": {
52
- "url": "https://github.com/MIbnEKhalid/mbkbucket/issues"
53
- },
54
- "files": [
55
- "lib",
56
- "views",
57
- ".env.example",
58
- ".mbkbucket.config.example.json",
59
- "cli.js",
60
- "index.js",
61
- "LICENSE",
62
- "package.json",
63
- "README.md"
64
- ],
65
- "keywords": [
66
- "mbkbucket",
67
- "s3-bucket",
68
- "s3",
69
- "bucket",
70
- "r2-bucket",
71
- "bucket-manager",
72
- "aws-sdk",
73
- "cloudflare-r2",
74
- "idrivee2",
75
- "storage",
76
- "mbkauthe",
77
- "mbktech.org",
78
- "cli",
79
- "command-line",
80
- "file-upload",
81
- "file-download"
82
- ]
83
- }
1
+ {
2
+ "name": "mbkbucket",
3
+ "version": "3.7.0",
4
+ "description": "Flexible S3/R2 bucket management — library, Express router, and CLI for mbktech.org applications. Provides upload, download, listing, multipart utilities, signed URLs, and a command-line interface with built-in configuration validation and health checks",
5
+ "author": "Muhammad Bin Khalid",
6
+ "homepage": "https://github.com/MIbnEKhalid/mbkbucket#readme",
7
+ "license": "MIT",
8
+ "main": "index.js",
9
+ "type": "module",
10
+ "types": "index.d.ts",
11
+ "bin": {
12
+ "mbkbucket": "./lib/cli.js"
13
+ },
14
+ "scripts": {
15
+ "dev": "cross-env NODE_ENV=dev nodemon index.js",
16
+ "test": "vitest run"
17
+ },
18
+ "imports": {
19
+ "#helpers": "./lib/src/utils/helpers.js",
20
+ "#logger": "./lib/src/utils/logger.js"
21
+ },
22
+ "dependencies": {
23
+ "@aws-sdk/client-s3": "^3.1127.0",
24
+ "@aws-sdk/s3-request-presigner": "^3.1127.0",
25
+ "compression": "^1.8.0",
26
+ "debug": "^4.4.3",
27
+ "dotenv": "^16.6.1",
28
+ "express": "^5.1.0",
29
+ "express-handlebars": "^9.0.1",
30
+ "express-rate-limit": "^7.5.1",
31
+ "mbkauthe": "^5.10.0",
32
+ "multer": "^2.0.2",
33
+ "pg": "^8.16.3"
34
+ },
35
+ "devDependencies": {
36
+ "@types/supertest": "^7.2.1",
37
+ "cross-env": "^7.0.3",
38
+ "nodemon": "^3.1.14",
39
+ "supertest": "^7.2.2",
40
+ "vitest": "^4.1.11"
41
+ },
42
+ "overrides": {
43
+ "csurf": {
44
+ "cookie": "^0.7.0"
45
+ }
46
+ },
47
+ "repository": {
48
+ "type": "git",
49
+ "url": "git+https://github.com/MIbnEKhalid/mbkbucket.git"
50
+ },
51
+ "bugs": {
52
+ "url": "https://github.com/MIbnEKhalid/mbkbucket/issues"
53
+ },
54
+ "files": [
55
+ "lib",
56
+ "views",
57
+ ".env.example",
58
+ ".mbkbucket.config.example.json",
59
+ "cli.js",
60
+ "index.js",
61
+ "LICENSE",
62
+ "package.json",
63
+ "README.md"
64
+ ],
65
+ "keywords": [
66
+ "mbkbucket",
67
+ "s3-bucket",
68
+ "s3",
69
+ "bucket",
70
+ "r2-bucket",
71
+ "bucket-manager",
72
+ "aws-sdk",
73
+ "cloudflare-r2",
74
+ "idrivee2",
75
+ "storage",
76
+ "mbkauthe",
77
+ "mbktech.org",
78
+ "cli",
79
+ "command-line",
80
+ "file-upload",
81
+ "file-download"
82
+ ]
83
+ }
@@ -1,197 +1,197 @@
1
- <!--
2
- * MBKBucket
3
- * Copyright (c) 2026 Muhammad Bin Khalid, MBKTech.org and contributors
4
- * Licensed under the MIT License.
5
- * Source: https://github.com/MIbnEKhalid/mbkbucket
6
- -->
7
-
8
- <!DOCTYPE html>
9
- <html lang="en">
10
-
11
- <head>
12
- <meta charset="UTF-8">
13
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
14
- <title>{{#if page}}{{page}} - {{/if}}Web Portal</title>
15
- <link rel="preconnect" href="https://fonts.googleapis.com">
16
- <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
17
- <link href="https://fonts.googleapis.com/css2?family=Sora:wght@400;500;600;700;800&family=IBM+Plex+Sans:wght@400;500;600;700&family=JetBrains+Mono:wght@400;500&display=swap" rel="stylesheet">
18
- <script src="/mbkauthe/main.js" defer></script>
19
- <script src="https://portal.mbktech.org/Assets/Scripts/auto-ids.js" defer></script>
20
- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
21
- <link rel="icon" type="image/x-icon" href="/icon.svg">
22
- <style>
23
- :root {
24
- --primary-color-ml: #0f766e;
25
- --primary-light-color-ml: #d7f4ee;
26
- --primary-dark-color-ml: #0b4f4a;
27
- --secondary-color-ml: #1f8f84;
28
- --dark-color-ml: #1f2a2a;
29
- --light-color-ml: #f4f7f3;
30
- --gray-color-ml: #667c79;
31
- --gray-light-color-ml: #dce8e3;
32
- --danger-color-ml: #dc2626;
33
- --warning-color-ml: #d97706;
34
- --success-color-ml: #16a34a;
35
- --info-color-ml: #3b82f6;
36
-
37
- --primary: var(--primary-color-ml);
38
- --primary-lt: var(--primary-light-color-ml);
39
- --primary-dk: var(--primary-dark-color-ml);
40
- --primary-hover: #0d635c;
41
-
42
- --body-bg: var(--light-color-ml);
43
- --bg-surface: rgba(255, 255, 255, 0.88);
44
- --bg-surface-secondary: rgba(244, 247, 243, 0.7);
45
- --bg-surface-tertiary: #e9f2ee;
46
-
47
- --border-color: rgba(15, 118, 110, 0.15);
48
- --border-color-light: rgba(15, 118, 110, 0.08);
49
-
50
- --text: var(--dark-color-ml);
51
- --text-secondary: #4a5c5a;
52
- --text-muted: var(--gray-color-ml);
53
- --text-disabled: #a0b2af;
54
-
55
- --font-family: "IBM Plex Sans", "Segoe UI", sans-serif;
56
- --font-family-headings: "Sora", "Segoe UI", sans-serif;
57
- --font-mono: 'JetBrains Mono', monospace;
58
- }
59
-
60
- * {
61
- margin: 0;
62
- padding: 0;
63
- box-sizing: border-box;
64
- }
65
-
66
- body {
67
- font-family: var(--font-family);
68
- background:
69
- radial-gradient(circle at 12% 14%, rgba(16, 185, 129, 0.12), transparent 44%),
70
- radial-gradient(circle at 86% 8%, rgba(244, 114, 38, 0.12), transparent 40%),
71
- linear-gradient(160deg, #eef7f2 0, #f8fbf7 52%, #eaf2ef 100%);
72
- color: var(--dark-color-ml);
73
- display: flex;
74
- min-height: 100vh;
75
- overflow-x: hidden;
76
- line-height: 1.6;
77
- font-size: 14px;
78
- position: relative;
79
- isolation: isolate;
80
- }
81
-
82
- body::before,
83
- body::after {
84
- content: "";
85
- position: fixed;
86
- border-radius: 999px;
87
- pointer-events: none;
88
- z-index: -1;
89
- }
90
-
91
- body::before {
92
- width: 260px;
93
- height: 260px;
94
- left: -80px;
95
- top: 18vh;
96
- background: radial-gradient(circle, rgba(15, 118, 110, 0.16) 0, rgba(15, 118, 110, 0) 70%);
97
- }
98
-
99
- body::after {
100
- width: 300px;
101
- height: 300px;
102
- right: -120px;
103
- bottom: 10vh;
104
- background: radial-gradient(circle, rgba(251, 146, 60, 0.18) 0, rgba(251, 146, 60, 0) 72%);
105
- }
106
-
107
- .main-content {
108
- flex: 1;
109
- display: flex;
110
- flex-direction: column;
111
- overflow: hidden;
112
- min-height: 100vh;
113
- }
114
-
115
- .top-nav {
116
- background: rgba(255, 255, 255, .85);
117
- backdrop-filter: blur(10px);
118
- padding: .75rem 1.5rem;
119
- display: flex;
120
- align-items: center;
121
- justify-content: space-between;
122
- box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.06), 0 2px 4px -1px rgba(0, 0, 0, 0.04);
123
- z-index: 90;
124
- border-bottom: 1px solid rgba(255, 255, 255, .75);
125
- gap: 1rem;
126
- }
127
-
128
- .logo {
129
- font-family: var(--font-family-headings);
130
- font-size: 1.5rem;
131
- font-weight: 700;
132
- color: #0b4f4a;
133
- display: flex;
134
- align-items: center;
135
- gap: .5rem;
136
- cursor: pointer;
137
- text-decoration: none;
138
- }
139
-
140
- .logo img {
141
- width: 32px;
142
- height: 32px;
143
- }
144
-
145
- .content-area {
146
- flex: 1;
147
- padding: 1.5rem;
148
- overflow-y: auto;
149
- }
150
-
151
- .content-area::-webkit-scrollbar {
152
- width: 8px;
153
- }
154
-
155
- .content-area::-webkit-scrollbar-track {
156
- background: transparent;
157
- }
158
-
159
- .content-area::-webkit-scrollbar-thumb {
160
- background: var(--gray-color-ml);
161
- border-radius: 4px;
162
- }
163
-
164
- .content-area::-webkit-scrollbar-thumb:hover {
165
- background: var(--primary-color-ml);
166
- }
167
-
168
- @media (max-width: 768px) {
169
- .top-nav {
170
- padding: .5rem 1rem;
171
- }
172
- .content-area {
173
- padding: 0.85rem;
174
- }
175
- }
176
- </style>
177
- {{> showmessage }}
178
- </head>
179
-
180
- <body>
181
- <div class="main-content">
182
- <nav class="top-nav">
183
- <div class="logo" onclick="window.location='/mbkbucket'">
184
- <img src="/icon.svg" alt="Logo">
185
- <span>MBKBucket</span>
186
- </div>
187
-
188
- {{> profilemenu }}
189
- </nav>
190
-
191
- <div class="content-area">
192
- {{> bucketadmincontent }}
193
- </div>
194
- </div>
195
- </body>
196
-
1
+ <!--
2
+ * MBKBucket
3
+ * Copyright (c) 2026 Muhammad Bin Khalid, MBKTech.org and contributors
4
+ * Licensed under the MIT License.
5
+ * Source: https://github.com/MIbnEKhalid/mbkbucket
6
+ -->
7
+
8
+ <!DOCTYPE html>
9
+ <html lang="en">
10
+
11
+ <head>
12
+ <meta charset="UTF-8">
13
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
14
+ <title>{{#if page}}{{page}} - {{/if}}Web Portal</title>
15
+ <link rel="preconnect" href="https://fonts.googleapis.com">
16
+ <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
17
+ <link href="https://fonts.googleapis.com/css2?family=Sora:wght@400;500;600;700;800&family=IBM+Plex+Sans:wght@400;500;600;700&family=JetBrains+Mono:wght@400;500&display=swap" rel="stylesheet">
18
+ <script src="/mbkauthe/main.js" defer></script>
19
+ <script src="https://portal.mbktech.org/Assets/Scripts/auto-ids.js" defer></script>
20
+ <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
21
+ <link rel="icon" type="image/x-icon" href="/icon.svg">
22
+ <style>
23
+ :root {
24
+ --primary-color-ml: #0f766e;
25
+ --primary-light-color-ml: #d7f4ee;
26
+ --primary-dark-color-ml: #0b4f4a;
27
+ --secondary-color-ml: #1f8f84;
28
+ --dark-color-ml: #1f2a2a;
29
+ --light-color-ml: #f4f7f3;
30
+ --gray-color-ml: #667c79;
31
+ --gray-light-color-ml: #dce8e3;
32
+ --danger-color-ml: #dc2626;
33
+ --warning-color-ml: #d97706;
34
+ --success-color-ml: #16a34a;
35
+ --info-color-ml: #3b82f6;
36
+
37
+ --primary: var(--primary-color-ml);
38
+ --primary-lt: var(--primary-light-color-ml);
39
+ --primary-dk: var(--primary-dark-color-ml);
40
+ --primary-hover: #0d635c;
41
+
42
+ --body-bg: var(--light-color-ml);
43
+ --bg-surface: rgba(255, 255, 255, 0.88);
44
+ --bg-surface-secondary: rgba(244, 247, 243, 0.7);
45
+ --bg-surface-tertiary: #e9f2ee;
46
+
47
+ --border-color: rgba(15, 118, 110, 0.15);
48
+ --border-color-light: rgba(15, 118, 110, 0.08);
49
+
50
+ --text: var(--dark-color-ml);
51
+ --text-secondary: #4a5c5a;
52
+ --text-muted: var(--gray-color-ml);
53
+ --text-disabled: #a0b2af;
54
+
55
+ --font-family: "IBM Plex Sans", "Segoe UI", sans-serif;
56
+ --font-family-headings: "Sora", "Segoe UI", sans-serif;
57
+ --font-mono: 'JetBrains Mono', monospace;
58
+ }
59
+
60
+ * {
61
+ margin: 0;
62
+ padding: 0;
63
+ box-sizing: border-box;
64
+ }
65
+
66
+ body {
67
+ font-family: var(--font-family);
68
+ background:
69
+ radial-gradient(circle at 12% 14%, rgba(16, 185, 129, 0.12), transparent 44%),
70
+ radial-gradient(circle at 86% 8%, rgba(244, 114, 38, 0.12), transparent 40%),
71
+ linear-gradient(160deg, #eef7f2 0, #f8fbf7 52%, #eaf2ef 100%);
72
+ color: var(--dark-color-ml);
73
+ display: flex;
74
+ min-height: 100vh;
75
+ overflow-x: hidden;
76
+ line-height: 1.6;
77
+ font-size: 14px;
78
+ position: relative;
79
+ isolation: isolate;
80
+ }
81
+
82
+ body::before,
83
+ body::after {
84
+ content: "";
85
+ position: fixed;
86
+ border-radius: 999px;
87
+ pointer-events: none;
88
+ z-index: -1;
89
+ }
90
+
91
+ body::before {
92
+ width: 260px;
93
+ height: 260px;
94
+ left: -80px;
95
+ top: 18vh;
96
+ background: radial-gradient(circle, rgba(15, 118, 110, 0.16) 0, rgba(15, 118, 110, 0) 70%);
97
+ }
98
+
99
+ body::after {
100
+ width: 300px;
101
+ height: 300px;
102
+ right: -120px;
103
+ bottom: 10vh;
104
+ background: radial-gradient(circle, rgba(251, 146, 60, 0.18) 0, rgba(251, 146, 60, 0) 72%);
105
+ }
106
+
107
+ .main-content {
108
+ flex: 1;
109
+ display: flex;
110
+ flex-direction: column;
111
+ overflow: hidden;
112
+ min-height: 100vh;
113
+ }
114
+
115
+ .top-nav {
116
+ background: rgba(255, 255, 255, .85);
117
+ backdrop-filter: blur(10px);
118
+ padding: .75rem 1.5rem;
119
+ display: flex;
120
+ align-items: center;
121
+ justify-content: space-between;
122
+ box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.06), 0 2px 4px -1px rgba(0, 0, 0, 0.04);
123
+ z-index: 90;
124
+ border-bottom: 1px solid rgba(255, 255, 255, .75);
125
+ gap: 1rem;
126
+ }
127
+
128
+ .logo {
129
+ font-family: var(--font-family-headings);
130
+ font-size: 1.5rem;
131
+ font-weight: 700;
132
+ color: #0b4f4a;
133
+ display: flex;
134
+ align-items: center;
135
+ gap: .5rem;
136
+ cursor: pointer;
137
+ text-decoration: none;
138
+ }
139
+
140
+ .logo img {
141
+ width: 32px;
142
+ height: 32px;
143
+ }
144
+
145
+ .content-area {
146
+ flex: 1;
147
+ padding: 1.5rem;
148
+ overflow-y: auto;
149
+ }
150
+
151
+ .content-area::-webkit-scrollbar {
152
+ width: 8px;
153
+ }
154
+
155
+ .content-area::-webkit-scrollbar-track {
156
+ background: transparent;
157
+ }
158
+
159
+ .content-area::-webkit-scrollbar-thumb {
160
+ background: var(--gray-color-ml);
161
+ border-radius: 4px;
162
+ }
163
+
164
+ .content-area::-webkit-scrollbar-thumb:hover {
165
+ background: var(--primary-color-ml);
166
+ }
167
+
168
+ @media (max-width: 768px) {
169
+ .top-nav {
170
+ padding: .5rem 1rem;
171
+ }
172
+ .content-area {
173
+ padding: 0.85rem;
174
+ }
175
+ }
176
+ </style>
177
+ {{> showmessage }}
178
+ </head>
179
+
180
+ <body>
181
+ <div class="main-content">
182
+ <nav class="top-nav">
183
+ <div class="logo" onclick="window.location='/mbkbucket'">
184
+ <img src="/icon.svg" alt="Logo">
185
+ <span>MBKBucket</span>
186
+ </div>
187
+
188
+ {{> profilemenu }}
189
+ </nav>
190
+
191
+ <div class="content-area">
192
+ {{> bucketadmincontent }}
193
+ </div>
194
+ </div>
195
+ </body>
196
+
197
197
  </html>
@@ -1,15 +1,15 @@
1
- {{#if message}}
2
- <div class="alert alert-success alert-dismissible fade show" role="alert" id="successAlert">
3
- <i class="fas fa-check-circle"></i>
4
- <span id="successMessage">{{message}}</span>
5
- <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close">&times;</button>
6
- </div>
7
- {{/if}}
8
-
9
- {{#if error}}
10
- <div class="alert alert-danger alert-dismissible fade show" role="alert" id="errorAlert">
11
- <i class="fas fa-exclamation-triangle"></i>
12
- <span id="errorMessage">{{error}}</span>
13
- <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close">&times;</button>
14
- </div>
15
- {{/if}}
1
+ {{#if message}}
2
+ <div class="alert alert-success alert-dismissible fade show" role="alert" id="successAlert">
3
+ <i class="fas fa-check-circle"></i>
4
+ <span id="successMessage">{{message}}</span>
5
+ <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close">&times;</button>
6
+ </div>
7
+ {{/if}}
8
+
9
+ {{#if error}}
10
+ <div class="alert alert-danger alert-dismissible fade show" role="alert" id="errorAlert">
11
+ <i class="fas fa-exclamation-triangle"></i>
12
+ <span id="errorMessage">{{error}}</span>
13
+ <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close">&times;</button>
14
+ </div>
15
+ {{/if}}