Merge e6f61e297f into 0d5d2b1b7c

.version

@@ -1 +1 @@
-2.12.3
+2.12.2

README.md

@@ -1,7 +1,7 @@
 <p align="center">
 	<img src="https://nginxproxymanager.com/github.png">
 	<br><br>
-	<img src="https://img.shields.io/badge/version-2.12.3-green.svg?style=for-the-badge">
+	<img src="https://img.shields.io/badge/version-2.12.2-green.svg?style=for-the-badge">
 	<a href="https://hub.docker.com/repository/docker/jc21/nginx-proxy-manager">
 		<img src="https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge">
 	</a>

backend/internal/access-list.js

@@ -508,13 +508,8 @@ const internalAccessList = {
 								if (typeof item.password !== 'undefined' && item.password.length) {
 									logger.info('Adding: ' + item.username);
 
-									utils.execFile('openssl', ['passwd', '-apr1', item.password])
+									utils.execFile('/usr/bin/htpasswd', ['-b', htpasswd_file, item.username, item.password])
-										.then((res) => {
+										.then((/*result*/) => {
-											try {
-												fs.appendFileSync(htpasswd_file, item.username + ':' + res + '\n', {encoding: 'utf8'});
-											} catch (err) {
-												reject(err);
-											}
 											next();
 										})
 										.catch((err) => {

frontend/js/app/controller.js

@@ -4,438 +4,444 @@ const Tokens   = require('./tokens');
 
 module.exports = {
 
-	/**
+    /**
-	 * @param {String} route
+     * @param {String} route
-	 * @param {Object} [options]
+     * @param {Object} [options]
-	 * @returns {Boolean}
+     * @returns {Boolean}
-	 */
+     */
-	navigate: function (route, options) {
+    navigate: function (route, options) {
-		options = options || {};
+        options = options || {};
-		Backbone.history.navigate(route.toString(), options);
+        Backbone.history.navigate(route.toString(), options);
-		return true;
+        return true;
-	},
+    },
 
-	/**
+    /**
-	 * Login
+     * Login
-	 */
+     */
-	showLogin: function () {
+    showLogin: function () {
-		window.location = '/login';
+        window.location = '/login';
-	},
+    },
 
-	/**
+    /**
-	 * Users
+     * Users
-	 */
+     */
-	showUsers: function () {
+    showUsers: function () {
-		const controller = this;
+        let controller = this;
-		if (Cache.User.isAdmin()) {
+        if (Cache.User.isAdmin()) {
-			require(['./main', './users/main'], (App, View) => {
+            require(['./main', './users/main'], (App, View) => {
-				controller.navigate('/users');
+                controller.navigate('/users');
-				App.UI.showAppContent(new View());
+                App.UI.showAppContent(new View());
-			});
+            });
-		} else {
+        } else {
-			this.showDashboard();
+            this.showDashboard();
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * User Form
+     * User Form
-	 *
+     *
-	 * @param [model]
+     * @param [model]
-	 */
+     */
-	showUserForm: function (model) {
+    showUserForm: function (model) {
-		if (Cache.User.isAdmin()) {
+        if (Cache.User.isAdmin()) {
-			require(['./main', './user/form'], function (App, View) {
+            require(['./main', './user/form'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * User Permissions Form
+     * User Permissions Form
-	 *
+     *
-	 * @param model
+     * @param model
-	 */
+     */
-	showUserPermissions: function (model) {
+    showUserPermissions: function (model) {
-		if (Cache.User.isAdmin()) {
+        if (Cache.User.isAdmin()) {
-			require(['./main', './user/permissions'], function (App, View) {
+            require(['./main', './user/permissions'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * User Password Form
+     * User Password Form
-	 *
+     *
-	 * @param model
+     * @param model
-	 */
+     */
-	showUserPasswordForm: function (model) {
+    showUserPasswordForm: function (model) {
-		if (Cache.User.isAdmin() || model.get('id') === Cache.User.get('id')) {
+        if (Cache.User.isAdmin() || model.get('id') === Cache.User.get('id')) {
-			require(['./main', './user/password'], function (App, View) {
+            require(['./main', './user/password'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * User Delete Confirm
+     * User Delete Confirm
-	 *
+     *
-	 * @param model
+     * @param model
-	 */
+     */
-	showUserDeleteConfirm: function (model) {
+    showUserDeleteConfirm: function (model) {
-		if (Cache.User.isAdmin() && model.get('id') !== Cache.User.get('id')) {
+        if (Cache.User.isAdmin() && model.get('id') !== Cache.User.get('id')) {
-			require(['./main', './user/delete'], function (App, View) {
+            require(['./main', './user/delete'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * Dashboard
+     * Dashboard
-	 */
+     */
-	showDashboard: function () {
+    showDashboard: function () {
-		const controller = this;
+        let controller = this;
-		require(['./main', './dashboard/main'], (App, View) => {
-			controller.navigate('/');
-			App.UI.showAppContent(new View());
-		});
-	},
 
-	/**
+        require(['./main', './dashboard/main'], (App, View) => {
-	 * Nginx Proxy Hosts
+            controller.navigate('/');
-	 */
+            App.UI.showAppContent(new View());
-	showNginxProxy: function () {
+        });
-		if (Cache.User.isAdmin() || Cache.User.canView('proxy_hosts')) {
+    },
-			const controller = this;
 
-			require(['./main', './nginx/proxy/main'], (App, View) => {
+    /**
-				controller.navigate('/nginx/proxy');
+     * Nginx Proxy Hosts
-				App.UI.showAppContent(new View());
+     */
-			});
+    showNginxProxy: function () {
-		}
+        if (Cache.User.isAdmin() || Cache.User.canView('proxy_hosts')) {
-	},
+            let controller = this;
 
-	/**
+            require(['./main', './nginx/proxy/main'], (App, View) => {
-	 * Nginx Proxy Host Form
+                controller.navigate('/nginx/proxy');
-	 *
+                App.UI.showAppContent(new View());
-	 * @param [model]
+            });
-	 */
+        }
-	showNginxProxyForm: function (model) {
+    },
-		if (Cache.User.isAdmin() || Cache.User.canManage('proxy_hosts')) {
-			require(['./main', './nginx/proxy/form'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
-			});
-		}
-	},
 
-	/**
+    /**
-	 * Proxy Host Delete Confirm
+     * Nginx Proxy Host Form
-	 *
+     *
-	 * @param model
+     * @param [model]
-	 */
+     */
-	showNginxProxyDeleteConfirm: function (model) {
+    showNginxProxyForm: function (model) {
-		if (Cache.User.isAdmin() || Cache.User.canManage('proxy_hosts')) {
+        if (Cache.User.isAdmin() || Cache.User.canManage('proxy_hosts')) {
-			require(['./main', './nginx/proxy/delete'], function (App, View) {
+            require(['./main', './nginx/proxy/form'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * Nginx Redirection Hosts
+     * Proxy Host Delete Confirm
-	 */
+     *
-	showNginxRedirection: function () {
+     * @param model
-		if (Cache.User.isAdmin() || Cache.User.canView('redirection_hosts')) {
+     */
-			const controller = this;
+    showNginxProxyDeleteConfirm: function (model) {
-			require(['./main', './nginx/redirection/main'], (App, View) => {
+        if (Cache.User.isAdmin() || Cache.User.canManage('proxy_hosts')) {
-				controller.navigate('/nginx/redirection');
+            require(['./main', './nginx/proxy/delete'], function (App, View) {
-				App.UI.showAppContent(new View());
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * Nginx Redirection Host Form
+     * Nginx Redirection Hosts
-	 *
+     */
-	 * @param [model]
+    showNginxRedirection: function () {
-	 */
+        if (Cache.User.isAdmin() || Cache.User.canView('redirection_hosts')) {
-	showNginxRedirectionForm: function (model) {
+            let controller = this;
-		if (Cache.User.isAdmin() || Cache.User.canManage('redirection_hosts')) {
-			require(['./main', './nginx/redirection/form'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
-			});
-		}
-	},
 
-	/**
+            require(['./main', './nginx/redirection/main'], (App, View) => {
-	 * Proxy Redirection Delete Confirm
+                controller.navigate('/nginx/redirection');
-	 *
+                App.UI.showAppContent(new View());
-	 * @param model
+            });
-	 */
+        }
-	showNginxRedirectionDeleteConfirm: function (model) {
+    },
-		if (Cache.User.isAdmin() || Cache.User.canManage('redirection_hosts')) {
-			require(['./main', './nginx/redirection/delete'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
-			});
-		}
-	},
 
-	/**
+    /**
-	 * Nginx Stream Hosts
+     * Nginx Redirection Host Form
-	 */
+     *
-	showNginxStream: function () {
+     * @param [model]
-		if (Cache.User.isAdmin() || Cache.User.canView('streams')) {
+     */
-			const controller = this;
+    showNginxRedirectionForm: function (model) {
-			require(['./main', './nginx/stream/main'], (App, View) => {
+        if (Cache.User.isAdmin() || Cache.User.canManage('redirection_hosts')) {
-				controller.navigate('/nginx/stream');
+            require(['./main', './nginx/redirection/form'], function (App, View) {
-				App.UI.showAppContent(new View());
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * Stream Form
+     * Proxy Redirection Delete Confirm
-	 *
+     *
-	 * @param [model]
+     * @param model
-	 */
+     */
-	showNginxStreamForm: function (model) {
+    showNginxRedirectionDeleteConfirm: function (model) {
-		if (Cache.User.isAdmin() || Cache.User.canManage('streams')) {
+        if (Cache.User.isAdmin() || Cache.User.canManage('redirection_hosts')) {
-			require(['./main', './nginx/stream/form'], function (App, View) {
+            require(['./main', './nginx/redirection/delete'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * Stream Delete Confirm
+     * Nginx Stream Hosts
-	 *
+     */
-	 * @param model
+    showNginxStream: function () {
-	 */
+        if (Cache.User.isAdmin() || Cache.User.canView('streams')) {
-	showNginxStreamDeleteConfirm: function (model) {
+            let controller = this;
-		if (Cache.User.isAdmin() || Cache.User.canManage('streams')) {
-			require(['./main', './nginx/stream/delete'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
-			});
-		}
-	},
 
-	/**
+            require(['./main', './nginx/stream/main'], (App, View) => {
-	 * Nginx Dead Hosts
+                controller.navigate('/nginx/stream');
-	 */
+                App.UI.showAppContent(new View());
-	showNginxDead: function () {
+            });
-		if (Cache.User.isAdmin() || Cache.User.canView('dead_hosts')) {
+        }
-			const controller = this;
+    },
-			require(['./main', './nginx/dead/main'], (App, View) => {
-				controller.navigate('/nginx/404');
-				App.UI.showAppContent(new View());
-			});
-		}
-	},
 
-	/**
+    /**
-	 * Dead Host Form
+     * Stream Form
-	 *
+     *
-	 * @param [model]
+     * @param [model]
-	 */
+     */
-	showNginxDeadForm: function (model) {
+    showNginxStreamForm: function (model) {
-		if (Cache.User.isAdmin() || Cache.User.canManage('dead_hosts')) {
+        if (Cache.User.isAdmin() || Cache.User.canManage('streams')) {
-			require(['./main', './nginx/dead/form'], function (App, View) {
+            require(['./main', './nginx/stream/form'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * Dead Host Delete Confirm
+     * Stream Delete Confirm
-	 *
+     *
-	 * @param model
+     * @param model
-	 */
+     */
-	showNginxDeadDeleteConfirm: function (model) {
+    showNginxStreamDeleteConfirm: function (model) {
-		if (Cache.User.isAdmin() || Cache.User.canManage('dead_hosts')) {
+        if (Cache.User.isAdmin() || Cache.User.canManage('streams')) {
-			require(['./main', './nginx/dead/delete'], function (App, View) {
+            require(['./main', './nginx/stream/delete'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * Help Dialog
+     * Nginx Dead Hosts
-	 *
+     */
-	 * @param {String}  title
+    showNginxDead: function () {
-	 * @param {String}  content
+        if (Cache.User.isAdmin() || Cache.User.canView('dead_hosts')) {
-	 */
+            let controller = this;
-	showHelp: function (title, content) {
-		require(['./main', './help/main'], function (App, View) {
-			App.UI.showModalDialog(new View({title: title, content: content}));
-		});
-	},
 
-	/**
+            require(['./main', './nginx/dead/main'], (App, View) => {
-	 * Nginx Access
+                controller.navigate('/nginx/404');
-	 */
+                App.UI.showAppContent(new View());
-	showNginxAccess: function () {
+            });
-		if (Cache.User.isAdmin() || Cache.User.canView('access_lists')) {
+        }
-			const controller = this;
+    },
-			require(['./main', './nginx/access/main'], (App, View) => {
-				controller.navigate('/nginx/access');
-				App.UI.showAppContent(new View());
-			});
-		}
-	},
 
-	/**
+    /**
-	 * Nginx Access List Form
+     * Dead Host Form
-	 *
+     *
-	 * @param [model]
+     * @param [model]
-	 */
+     */
-	showNginxAccessListForm: function (model) {
+    showNginxDeadForm: function (model) {
-		if (Cache.User.isAdmin() || Cache.User.canManage('access_lists')) {
+        if (Cache.User.isAdmin() || Cache.User.canManage('dead_hosts')) {
-			require(['./main', './nginx/access/form'], function (App, View) {
+            require(['./main', './nginx/dead/form'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * Access List Delete Confirm
+     * Dead Host Delete Confirm
-	 *
+     *
-	 * @param model
+     * @param model
-	 */
+     */
-	showNginxAccessListDeleteConfirm: function (model) {
+    showNginxDeadDeleteConfirm: function (model) {
-		if (Cache.User.isAdmin() || Cache.User.canManage('access_lists')) {
+        if (Cache.User.isAdmin() || Cache.User.canManage('dead_hosts')) {
-			require(['./main', './nginx/access/delete'], function (App, View) {
+            require(['./main', './nginx/dead/delete'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * Nginx Certificates
+     * Help Dialog
-	 */
+     *
-	showNginxCertificates: function () {
+     * @param {String}  title
-		if (Cache.User.isAdmin() || Cache.User.canView('certificates')) {
+     * @param {String}  content
-			const controller = this;
+     */
-			require(['./main', './nginx/certificates/main'], (App, View) => {
+    showHelp: function (title, content) {
-				controller.navigate('/nginx/certificates');
+        require(['./main', './help/main'], function (App, View) {
-				App.UI.showAppContent(new View());
+            App.UI.showModalDialog(new View({title: title, content: content}));
-			});
+        });
-		}
+    },
-	},
 
-	/**
+    /**
-	 * Nginx Certificate Form
+     * Nginx Access
-	 *
+     */
-	 * @param [model]
+    showNginxAccess: function () {
-	 */
+        if (Cache.User.isAdmin() || Cache.User.canView('access_lists')) {
-	showNginxCertificateForm: function (model) {
+            let controller = this;
-		if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
-			require(['./main', './nginx/certificates/form'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
-			});
-		}
-	},
 
-	/**
+            require(['./main', './nginx/access/main'], (App, View) => {
-	 * Certificate Renew
+                controller.navigate('/nginx/access');
-	 *
+                App.UI.showAppContent(new View());
-	 * @param model
+            });
-	 */
+        }
-	showNginxCertificateRenew: function (model) {
+    },
-		if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
-			require(['./main', './nginx/certificates/renew'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
-			});
-		}
-	},
 
-	/**
+    /**
-	 * Certificate Delete Confirm
+     * Nginx Access List Form
-	 *
+     *
-	 * @param model
+     * @param [model]
-	 */
+     */
-	showNginxCertificateDeleteConfirm: function (model) {
+    showNginxAccessListForm: function (model) {
-		if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
+        if (Cache.User.isAdmin() || Cache.User.canManage('access_lists')) {
-			require(['./main', './nginx/certificates/delete'], function (App, View) {
+            require(['./main', './nginx/access/form'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * Certificate Test Reachability
+     * Access List Delete Confirm
-	 *
+     *
-	 * @param model
+     * @param model
-	 */
+     */
-	showNginxCertificateTestReachability: function (model) {
+    showNginxAccessListDeleteConfirm: function (model) {
-	  if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
+        if (Cache.User.isAdmin() || Cache.User.canManage('access_lists')) {
-		require(['./main', './nginx/certificates/test'], function (App, View) {
+            require(['./main', './nginx/access/delete'], function (App, View) {
-		  App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-		});
+            });
-	  }
+        }
-	},
+    },
 
-	/**
+    /**
-	 * Audit Log
+     * Nginx Certificates
-	 */
+     */
-	showAuditLog: function () {
+    showNginxCertificates: function () {
-		const controller = this;
+        if (Cache.User.isAdmin() || Cache.User.canView('certificates')) {
-		if (Cache.User.isAdmin()) {
+            let controller = this;
-			require(['./main', './audit-log/main'], (App, View) => {
-				controller.navigate('/audit-log');
-				App.UI.showAppContent(new View());
-			});
-		} else {
-			this.showDashboard();
-		}
-	},
 
-	/**
+            require(['./main', './nginx/certificates/main'], (App, View) => {
-	 * Audit Log Metadata
+                controller.navigate('/nginx/certificates');
-	 *
+                App.UI.showAppContent(new View());
-	 * @param model
+            });
-	 */
+        }
-	showAuditMeta: function (model) {
+    },
-		if (Cache.User.isAdmin()) {
-			require(['./main', './audit-log/meta'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
-			});
-		}
-	},
 
-	/**
+    /**
-	 * Settings
+     * Nginx Certificate Form
-	 */
+     *
-	showSettings: function () {
+     * @param [model]
-		const controller = this;
+     */
-		if (Cache.User.isAdmin()) {
+    showNginxCertificateForm: function (model) {
-			require(['./main', './settings/main'], (App, View) => {
+        if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
-				controller.navigate('/settings');
+            require(['./main', './nginx/certificates/form'], function (App, View) {
-				App.UI.showAppContent(new View());
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		} else {
+        }
-			this.showDashboard();
+    },
-		}
-	},
 
-	/**
+    /**
-	 * Settings Item Form
+     * Certificate Renew
-	 *
+     *
-	 * @param model
+     * @param model
-	 */
+     */
-	showSettingForm: function (model) {
+    showNginxCertificateRenew: function (model) {
-		if (Cache.User.isAdmin()) {
+        if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
-			if (model.get('id') === 'default-site') {
+            require(['./main', './nginx/certificates/renew'], function (App, View) {
-				require(['./main', './settings/default-site/main'], function (App, View) {
+                App.UI.showModalDialog(new View({model: model}));
-					App.UI.showModalDialog(new View({model: model}));
+            });
-				});
+        }
-			}
+    },
-		}
-	},
 
-	/**
+    /**
-	 * Logout
+     * Certificate Delete Confirm
-	 */
+     *
-	logout: function () {
+     * @param model
-		Tokens.dropTopToken();
+     */
-		this.showLogin();
+    showNginxCertificateDeleteConfirm: function (model) {
-	}
+        if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
+            require(['./main', './nginx/certificates/delete'], function (App, View) {
+                App.UI.showModalDialog(new View({model: model}));
+            });
+        }
+    },
+
+    /**
+     * Certificate Test Reachability
+     *
+     * @param model
+     */
+    showNginxCertificateTestReachability: function (model) {
+      if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
+        require(['./main', './nginx/certificates/test'], function (App, View) {
+          App.UI.showModalDialog(new View({model: model}));
+        });
+      }
+    },
+
+    /**
+     * Audit Log
+     */
+    showAuditLog: function () {
+        let controller = this;
+        if (Cache.User.isAdmin()) {
+            require(['./main', './audit-log/main'], (App, View) => {
+                controller.navigate('/audit-log');
+                App.UI.showAppContent(new View());
+            });
+        } else {
+            this.showDashboard();
+        }
+    },
+
+    /**
+     * Audit Log Metadata
+     *
+     * @param model
+     */
+    showAuditMeta: function (model) {
+        if (Cache.User.isAdmin()) {
+            require(['./main', './audit-log/meta'], function (App, View) {
+                App.UI.showModalDialog(new View({model: model}));
+            });
+        }
+    },
+
+    /**
+     * Settings
+     */
+    showSettings: function () {
+        let controller = this;
+        if (Cache.User.isAdmin()) {
+            require(['./main', './settings/main'], (App, View) => {
+                controller.navigate('/settings');
+                App.UI.showAppContent(new View());
+            });
+        } else {
+            this.showDashboard();
+        }
+    },
+
+    /**
+     * Settings Item Form
+     *
+     * @param model
+     */
+    showSettingForm: function (model) {
+        if (Cache.User.isAdmin()) {
+            if (model.get('id') === 'default-site') {
+                require(['./main', './settings/default-site/main'], function (App, View) {
+                    App.UI.showModalDialog(new View({model: model}));
+                });
+            }
+        }
+    },
+
+    /**
+     * Logout
+     */
+    logout: function () {
+        Tokens.dropTopToken();
+        this.showLogin();
+    }
 };

frontend/js/app/dashboard/main.js

@@ -6,85 +6,85 @@ const Helpers    = require('../../lib/helpers');
 const template   = require('./main.ejs');
 
 module.exports = Mn.View.extend({
-	template: template,
+    template: template,
-	id:       'dashboard',
+    id:       'dashboard',
-	columns:  0,
+    columns:  0,
 
-	stats: {},
+    stats: {},
 
-	ui: {
+    ui: {
-		links: 'a'
+        links: 'a'
-	},
+    },
 
-	events: {
+    events: {
-		'click @ui.links': function (e) {
+        'click @ui.links': function (e) {
-			e.preventDefault();
+            e.preventDefault();
-			Controller.navigate($(e.currentTarget).attr('href'), true);
+            Controller.navigate($(e.currentTarget).attr('href'), true);
-		}
+        }
-	},
+    },
 
-	templateContext: function () {
+    templateContext: function () {
-		const view = this;
+        let view = this;
 
-		return {
+        return {
-			getUserName: function () {
+            getUserName: function () {
-				return Cache.User.get('nickname') || Cache.User.get('name');
+                return Cache.User.get('nickname') || Cache.User.get('name');
-			},
+            },
 
-			getHostStat: function (type) {
+            getHostStat: function (type) {
-				if (view.stats && typeof view.stats.hosts !== 'undefined' && typeof view.stats.hosts[type] !== 'undefined') {
+                if (view.stats && typeof view.stats.hosts !== 'undefined' && typeof view.stats.hosts[type] !== 'undefined') {
-					return Helpers.niceNumber(view.stats.hosts[type]);
+                    return Helpers.niceNumber(view.stats.hosts[type]);
-				}
+                }
 
-				return '-';
+                return '-';
-			},
+            },
 
-			canShow: function (perm) {
+            canShow: function (perm) {
-				return Cache.User.isAdmin() || Cache.User.canView(perm);
+                return Cache.User.isAdmin() || Cache.User.canView(perm);
-			},
+            },
 
-			columns: view.columns
+            columns: view.columns
-		};
+        };
-	},
+    },
 
-	onRender: function () {
+    onRender: function () {
-		const view = this;
+        let view = this;
-		if (typeof view.stats.hosts === 'undefined') {
-			Api.Reports.getHostStats()
-				.then(response => {
-					if (!view.isDestroyed()) {
-						view.stats.hosts = response;
-						view.render();
-					}
-				})
-				.catch(err => {
-					console.log(err);
-				});
-		}
-	},
 
-	/**
+        Api.Reports.getHostStats()
-	 * @param {Object}  [model]
+                .then(response => {
-	 */
+                    if (!view.isDestroyed()) {
-	preRender: function (model) {
+                        view.stats.hosts = response;
-		this.columns = 0;
+                        view.render();
+                    }
+                })
+                .catch(err => {
+                    console.log(err);
+                });
+    },
 
-		// calculate the available columns based on permissions for the objects
+    /**
-		// and store as a variable
+     * @param {Object}  [model]
-		const perms = ['proxy_hosts', 'redirection_hosts', 'streams', 'dead_hosts'];
+     */
+    preRender: function (model) {
+        this.columns = 0;
 
-		perms.map(perm => {
+        // calculate the available columns based on permissions for the objects
-			this.columns += Cache.User.isAdmin() || Cache.User.canView(perm) ? 1 : 0;
+        // and store as a variable
-		});
+        //let view = this;
+        let perms = ['proxy_hosts', 'redirection_hosts', 'streams', 'dead_hosts'];
 
-		// Prevent double rendering on initial calls
+        perms.map(perm => {
-		if (typeof model !== 'undefined') {
+            this.columns += Cache.User.isAdmin() || Cache.User.canView(perm) ? 1 : 0;
-			this.render();
+        });
-		}
-	},
 
-	initialize: function () {
+        // Prevent double rendering on initial calls
-		this.preRender();
+        if (typeof model !== 'undefined') {
-		this.listenTo(Cache.User, 'change', this.preRender);
+            this.render();
-	}
+        }
+    },
+
+    initialize: function () {
+        this.preRender();
+        this.listenTo(Cache.User, 'change', this.preRender);
+    }
 });

frontend/js/app/empty/main.ejs

@@ -6,6 +6,10 @@ if (subtitle) { %>
     <p class="h4 text-muted font-weight-normal mb-7"><%- subtitle %></p>
 <% }
 
-if (link) { %>
+if (links && links.length) { %>
-    <a class="btn btn-<%- btn_color %>" href="#"><%- link %></a>
+    <% links.forEach(function(link, index) { %>
+        <div style="margin-bottom: 10px;">
+            <a class="btn btn-<%- btn_color %>" href="#" data-index="<%- index %>"><%- link %></a>
+        </div>
+    <% }); %>
 <% } %>

frontend/js/app/empty/main.js

@@ -6,7 +6,9 @@ module.exports = Mn.View.extend({
     template:  template,
 
     options: {
-        btn_color: 'teal'
+        btn_color: 'teal',
+        links: [],      // Added to accept multiple links
+        actions: []     // Added to accept multiple actions
     },
 
     ui: {
@@ -16,17 +18,19 @@ module.exports = Mn.View.extend({
     events: {
         'click @ui.action': function (e) {
             e.preventDefault();
-            this.getOption('action')();
+            const index = $(e.currentTarget).data('index');
+            this.getOption('actions')[index]();
         }
     },
 
     templateContext: function () {
         return {
-            title:     this.getOption('title'),
+            title:      this.getOption('title'),
-            subtitle:  this.getOption('subtitle'),
+            subtitle:   this.getOption('subtitle'),
-            link:      this.getOption('link'),
+            links:      this.getOption('links'),    // Changed to array
-            action:    typeof this.getOption('action') === 'function',
+            actions:    this.getOption('actions'),  // Changed to array
-            btn_color: this.getOption('btn_color')
+            hasActions: this.getOption('actions').length > 0,
+            btn_color:  this.getOption('btn_color')
         };
     }
 

frontend/js/app/nginx/access/main.js

@@ -45,12 +45,14 @@ module.exports = Mn.View.extend({
         this.showChildView('list_region', new EmptyView({
             title:      App.i18n('access-lists', 'empty'),
             subtitle:   App.i18n('all-hosts', 'empty-subtitle', {manage: manage}),
-            link:       manage ? App.i18n('access-lists', 'add') : null,
+            links:       manage ? [App.i18n('access-lists', 'add')] : [],
             btn_color:  'teal',
             permission: 'access_lists',
-            action:     function () {
+            actions:     [
-                App.Controller.showNginxAccessListForm();
+                function () {
-            }
+                    App.Controller.showNginxAccessListForm();
+                }
+            ]
         }));
     },
 

frontend/js/app/nginx/certificates/main.js

@@ -45,12 +45,16 @@ module.exports = Mn.View.extend({
         this.showChildView('list_region', new EmptyView({
             title:      App.i18n('certificates', 'empty'),
             subtitle:   App.i18n('all-hosts', 'empty-subtitle', {manage: manage}),
-            link:       manage ? App.i18n('certificates', 'add') : null,
+            links:      manage ? [App.i18n('certificates', 'add-letsencrypt'), App.i18n('certificates', 'add-custom')] : [],
+            actions:    [
+                function () {
+                    App.Controller.showNginxCertificateForm();
+                }, 
+                function () {
+                    App.Controller.showNginxCertificateForm(new CertificateModel.Model({provider: 'custom'}));
+            }],
             btn_color:  'pink',
-            permission: 'certificates',
+            permission: 'certificates'
-            action:     function () {
-                App.Controller.showNginxCertificateForm();
-            }
         }));
     },
 

frontend/js/app/nginx/dead/main.js

@@ -45,12 +45,14 @@ module.exports = Mn.View.extend({
         this.showChildView('list_region', new EmptyView({
             title:      App.i18n('dead-hosts', 'empty'),
             subtitle:   App.i18n('all-hosts', 'empty-subtitle', {manage: manage}),
-            link:       manage ? App.i18n('dead-hosts', 'add') : null,
+            links:       manage ? [App.i18n('dead-hosts', 'add')] : [],
             btn_color:  'danger',
             permission: 'dead_hosts',
-            action:     function () {
+            actions:     [
-                App.Controller.showNginxDeadForm();
+                function () {
-            }
+                    App.Controller.showNginxDeadForm();
+                }
+            ]
         }));
     },
 

frontend/js/app/nginx/proxy/main.js

@@ -41,16 +41,17 @@ module.exports = Mn.View.extend({
 
     showEmpty: function() {
         let manage = App.Cache.User.canManage('proxy_hosts');
-
         this.showChildView('list_region', new EmptyView({
             title:      App.i18n('proxy-hosts', 'empty'),
             subtitle:   App.i18n('all-hosts', 'empty-subtitle', {manage: manage}),
-            link:       manage ? App.i18n('proxy-hosts', 'add') : null,
+            links:      manage ? [App.i18n('proxy-hosts', 'add')] : [],
+            actions:    [
+                function () {
+                    App.Controller.showNginxProxyForm();
+                }
+            ],
             btn_color:  'success',
             permission: 'proxy_hosts',
-            action:     function () {
-                App.Controller.showNginxProxyForm();
-            }
         }));
     },
 

frontend/js/app/nginx/redirection/main.js

@@ -44,12 +44,14 @@ module.exports = Mn.View.extend({
         this.showChildView('list_region', new EmptyView({
             title:      App.i18n('redirection-hosts', 'empty'),
             subtitle:   App.i18n('all-hosts', 'empty-subtitle', {manage: manage}),
-            link:       manage ? App.i18n('redirection-hosts', 'add') : null,
+            links:       manage ? [App.i18n('redirection-hosts', 'add')] : [],
             btn_color:  'yellow',
             permission: 'redirection_hosts',
-            action:     function () {
+            actions:     [
-                App.Controller.showNginxRedirectionForm();
+                function () {
-            }
+                    App.Controller.showNginxRedirectionForm();
+                }
+            ]
         }));
     },
 

frontend/js/app/nginx/stream/main.js

@@ -45,12 +45,14 @@ module.exports = Mn.View.extend({
         this.showChildView('list_region', new EmptyView({
             title:      App.i18n('streams', 'empty'),
             subtitle:   App.i18n('all-hosts', 'empty-subtitle', {manage: manage}),
-            link:       manage ? App.i18n('streams', 'add') : null,
+            links:       manage ? [App.i18n('streams', 'add')] : [],
             btn_color:  'blue',
             permission: 'streams',
-            action:     function () {
+            actions:     [
-                App.Controller.showNginxStreamForm();
+                function () {
-            }
+                    App.Controller.showNginxStreamForm();
+                }
+            ]
         }));
     },
 

frontend/js/i18n/messages.json

@@ -187,6 +187,8 @@
       "title": "SSL Certificates",
       "empty": "There are no SSL Certificates",
       "add": "Add SSL Certificate",
+      "add-letsencrypt": "Add SSL Certificate with Let's Encrypt",
+      "add-custom": "Add Custom SSL Certificate",
       "form-title": "Add {provider, select, letsencrypt{Let's Encrypt} other{Custom}} Certificate",
       "delete": "Delete SSL Certificate",
       "delete-confirm": "Are you sure you want to delete this SSL Certificate? Any hosts using it will need to be updated later.",

global/certbot-dns-plugins.json

@@ -161,11 +161,11 @@
 	},
 	"domainoffensive": {
 		"name": "DomainOffensive (do.de)",
-		"package_name": "certbot-dns-domainoffensive",
+		"package_name": "certbot-dns-do",
-		"version": "~=2.0.0",
+		"version": "~=0.31.0",
 		"dependencies": "",
 		"credentials": "dns_do_api_token = YOUR_DO_DE_AUTH_TOKEN",
-		"full_plugin_name": "dns-domainoffensive"
+		"full_plugin_name": "dns-do"
 	},
 	"domeneshop": {
 		"name": "Domeneshop",
@@ -534,13 +534,5 @@
 		"dependencies": "",
 		"credentials": "edgedns_client_secret = as3d1asd5d1a32sdfsdfs2d1asd5=\nedgedns_host = sdflskjdf-dfsdfsdf-sdfsdfsdf.luna.akamaiapis.net\nedgedns_access_token = kjdsi3-34rfsdfsdf-234234fsdfsdf\nedgedns_client_token = dkfjdf-342fsdfsd-23fsdfsdfsdf",
 		"full_plugin_name": "edgedns"
-	},
+	}
-	"zoneedit": {
-		"name": "ZoneEdit",
-		"package_name": "certbot-dns-zoneedit",
-		"version": "~=0.3.2",
-		"dependencies": "--no-deps dnspython",
-		"credentials": "dns_zoneedit_user = <login-user-id>\ndns_zoneedit_token = <dyn-authentication-token>",
-		"full_plugin_name": "dns-zoneedit"
- 	}
 }