From 4b62701974b8ef28e5c2e7a312e8c408f8a57459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20Sajdl?= Date: Sat, 10 Mar 2018 00:32:06 +0100 Subject: [PATCH] Fix #21 - ability to change title Add define("TITLE", "") to your config.php file if you're updating and want to use this feature. --- config.php.template | 1 + install.php | 86 ++++++++++++++++++++++++++------------------- template.php | 2 +- 3 files changed, 51 insertions(+), 38 deletions(-) diff --git a/config.php.template b/config.php.template index 97c4c69..34ae910 100644 --- a/config.php.template +++ b/config.php.template @@ -3,6 +3,7 @@ session_start(); //You can change these: define("NAME", '##name##'); //Website name +define("TITLE", "##title##"); define("WEB_URL", "##url##"); //Used for links define("MAILER_NAME", "##mailer##"); //Mailer name define("MAILER_ADDRESS", "##mailer_email##"); //Mailer address diff --git a/install.php b/install.php index 54b1518..5e17024 100644 --- a/install.php +++ b/install.php @@ -23,7 +23,7 @@ if (isset($_POST['server'])) $mysqli = new mysqli($_POST['server'],$_POST['dbuser'],$_POST['dbpassword'],$_POST['database']); if ($mysqli->connect_errno) { - $message .= sprintf(_("Connection failed: %s\n"), $mysqli->connect_error); + $message .= sprintf(_("Connection failed: %s\n"), $mysqli->connect_error); } if (isset($_POST['url']) && filter_var($_POST['url'], FILTER_VALIDATE_URL) === false) @@ -44,6 +44,10 @@ if (isset($_POST['server'])) $messages[] = _("Mailer name"); } + if (0 == strlen(trim($_POST['title']))){ + $messages[] = _("Title"); + } + if (0 == strlen(trim($_POST['mailer_email']))){ $messages[] = _("Mailer email"); } @@ -66,7 +70,7 @@ if (isset($_POST['server'])) } if (isset($messages)) { - $message .= _("Please set"); + $message .= _("Please enter"); $message .= implode(", ", $messages); } } @@ -108,6 +112,7 @@ if(isset($_POST['server']) && empty($message)) //Create config $config = file_get_contents("config.php.template"); $config = str_replace("##name##", $_POST['servername'], $config); + $config = str_replace("##title##", $_POST['title'], $config); $config = str_replace("##url##", $_POST['url'], $config); $config = str_replace("##mailer##", $_POST['mailer'], $config); $config = str_replace("##mailer_email##", $_POST['mailer_email'], $config); @@ -131,57 +136,64 @@ Template::render_header(_("Install")); <?php if (!empty($message)) { -?> -<p class="alert alert-danger"><?php echo $message; ?></p> -<?php + ?> + <p class="alert alert-danger"><?php echo $message; ?></p> + <?php } ?> +<summary><?php echo _("We will ask you some basic questions about your website. Most of the settings can be later edited in the config.php file.");?></summary> + <form method="post" action="." class="clearfix install"> <section class="install-section clearfix"> <h2><?php echo _("Website details");?></h2> - <summary><?php echo _("We need a name for your status page and a url, so we can mail users link for forgotten password etc.");?></summary> + <summary><?php echo _("We need a name for your status page (shown behind page title after the dash) and a url of your server status installation (i.e. <a href='#'>https://example.com/status</a> - without the trailing slash), so we can mail users link for forgotten password etc...");?></summary> - <div class="form-group clearfix"> - <div class="col-sm-6"><label for="servername"><?php echo _("Name");?>: </label><input type="text" name="servername" value="<?php echo ((isset($_POST['servername']))?htmlspecialchars($_POST['servername'], ENT_QUOTES):'');?>" id="servername" placeholder="<?php echo _("Name");?>" class="form-control" required></div> - <div class="col-sm-6"><label for="url"><?php echo _("Url");?>: </label><input type="url" name="url" value="<?php echo ((isset($_POST['url']))?htmlspecialchars($_POST['url'], ENT_QUOTES):'');?>" id="url" placeholder="<?php echo _("Url");?>" class="form-control" required></div> - </div> - <summary><?php echo _("Also an email address for mailer would be nice :)");?></summary> - <div class="form-group clearfix"> - <div class="col-sm-6"><label for="mailer"><?php echo _("Name");?>: </label><input type="text" name="mailer" value="<?php echo ((isset($_POST['mailer']))?htmlspecialchars($_POST['mailer'], ENT_QUOTES):'');?>" id="mailer" placeholder="<?php echo _("Name");?>" class="form-control" required></div> - <div class="col-sm-6"><label for="mailer_email"><?php echo _("Email");?>: </label><input type="email" name="mailer_email" value="<?php echo ((isset($_POST['mailer_email']))?htmlspecialchars($_POST['mailer_email'], ENT_QUOTES):'');?>" id="mailer_email" placeholder="<?php echo _("Email");?>" class="form-control" required></div> - </div> + <div class="form-group clearfix"> + <div class="col-sm-6"><label for="servername"><?php echo _("Name");?>: </label><input type="text" name="servername" value="<?php echo ((isset($_POST['servername']))?htmlspecialchars($_POST['servername'], ENT_QUOTES):'');?>" id="servername" placeholder="<?php echo _("Name");?>" class="form-control" required></div> + <div class="col-sm-6"><label for="url"><?php echo _("Url");?>: </label><input type="url" name="url" value="<?php echo ((isset($_POST['url']))?htmlspecialchars($_POST['url'], ENT_QUOTES):'');?>" id="url" placeholder="<?php echo _("Url");?>" class="form-control" required></div> + </div> + <summary><?php echo _("A title that you want to be shown on the top of the page.");?></summary> + <div class="form-group clearfix"> + <div class="col-sm-6"><label for="title"><?php echo _("Title");?>: </label><input type="text" name="title" value="<?php echo ((isset($_POST['title']))?htmlspecialchars($_POST['title'], ENT_QUOTES):'Server Status');?>" id="title" placeholder="<?php echo _("Title");?>" class="form-control" required></div> + <div class="col-sm-6"></div> + </div> + <summary><?php echo _("Also an email address for mailer would be nice :)");?></summary> + <div class="form-group clearfix"> + <div class="col-sm-6"><label for="mailer"><?php echo _("Name");?>: </label><input type="text" name="mailer" value="<?php echo ((isset($_POST['mailer']))?htmlspecialchars($_POST['mailer'], ENT_QUOTES):'');?>" id="mailer" placeholder="<?php echo _("Name");?>" class="form-control" required></div> + <div class="col-sm-6"><label for="mailer_email"><?php echo _("Email");?>: </label><input type="email" name="mailer_email" value="<?php echo ((isset($_POST['mailer_email']))?htmlspecialchars($_POST['mailer_email'], ENT_QUOTES):'');?>" id="mailer_email" placeholder="<?php echo _("Email");?>" class="form-control" required></div> + </div> </section> <section class="install-section clearfix"> <h2><?php echo _("Database connection");?></h2> <summary><?php echo _("We need database connection to be able to create tables. Please check that your account has the permission needed to do that.");?></summary> - <div class="form-group clearfix"> - <div class="col-sm-6"><label for="server"><?php echo _("Server");?>: </label><input type="text" name="server" value="<?php echo ((isset($_POST['server']))?htmlspecialchars($_POST['server'], ENT_QUOTES):'');?>" id="server" placeholder="<?php echo _("Server");?>" class="form-control" required></div> - <div class="col-sm-6"><label for="database"><?php echo _("Database");?>: </label><input type="text" name="database" value="<?php echo ((isset($_POST['database']))?htmlspecialchars($_POST['database'], ENT_QUOTES):'');?>" id="database" placeholder="<?php echo _("Database");?>" class="form-control" required></div> - </div> - <div class="form-group clearfix"> - <div class="col-sm-6"><label for="dbuser"><?php echo _("User");?>: </label><input type="text" name="dbuser" value="<?php echo ((isset($_POST['dbuser']))?htmlspecialchars($_POST['dbuser'], ENT_QUOTES):'');?>" id="dbuser" placeholder="<?php echo _("User");?>" class="form-control" required></div> - <div class="col-sm-6"><label for="dbpassword"><?php echo _("Password");?>: </label><input type="password" name="dbpassword" value="<?php echo ((isset($_POST['dbpassword']))?htmlspecialchars($_POST['dbpassword'], ENT_QUOTES):'');?>" id="dbpassword" placeholder="<?php echo _("Password");?>" class="form-control" required></div> - </div> + <div class="form-group clearfix"> + <div class="col-sm-6"><label for="server"><?php echo _("Server");?>: </label><input type="text" name="server" value="<?php echo ((isset($_POST['server']))?htmlspecialchars($_POST['server'], ENT_QUOTES):'');?>" id="server" placeholder="<?php echo _("Server");?>" class="form-control" required></div> + <div class="col-sm-6"><label for="database"><?php echo _("Database");?>: </label><input type="text" name="database" value="<?php echo ((isset($_POST['database']))?htmlspecialchars($_POST['database'], ENT_QUOTES):'');?>" id="database" placeholder="<?php echo _("Database");?>" class="form-control" required></div> + </div> + <div class="form-group clearfix"> + <div class="col-sm-6"><label for="dbuser"><?php echo _("User");?>: </label><input type="text" name="dbuser" value="<?php echo ((isset($_POST['dbuser']))?htmlspecialchars($_POST['dbuser'], ENT_QUOTES):'');?>" id="dbuser" placeholder="<?php echo _("User");?>" class="form-control" required></div> + <div class="col-sm-6"><label for="dbpassword"><?php echo _("Password");?>: </label><input type="password" name="dbpassword" value="<?php echo ((isset($_POST['dbpassword']))?htmlspecialchars($_POST['dbpassword'], ENT_QUOTES):'');?>" id="dbpassword" placeholder="<?php echo _("Password");?>" class="form-control" required></div> + </div> </section> <section class="install-section clearfix"> <h2><?php echo _("User");?></h2> <summary><?php echo _("And finally, we need info to create a new user. You don't have to provide it, but then... No status page admin...");?></summary> -<div class="form-group"> - <div class="col-sm-6"><label for="name"><?php echo _("Name");?>: </label><input type="text" maxlength="50" name="name" value="<?php echo ((isset($_POST['name']))?htmlspecialchars($_POST['name'], ENT_QUOTES):'');?>" id="name" placeholder="<?php echo _("Name");?>" class="form-control" required></div> - <div class="col-sm-6"><label for="surname"><?php echo _("Surname");?>: </label><input type="text" maxlength="50" name="surname" value="<?php echo ((isset($_POST['surname']))?htmlspecialchars($_POST['surname'], ENT_QUOTES):'');?>" id="surname" placeholder="<?php echo _("Surname");?>" class="form-control" required></div> - </div> - <div class="form-group"> - <div class="col-sm-6"><label for="username"><?php echo _("Username");?>:</label><input type="text" maxlength="50" name="username" value="<?php echo ((isset($_POST['username']))?htmlspecialchars($_POST['username'], ENT_QUOTES):'');?>" id="username" placeholder="<?php echo _("Username");?>" class="form-control" required></div> - <div class="col-sm-6"><label for="email"><?php echo _("Email");?>:</label><input type="email" maxlength="60" name="email" value="<?php echo ((isset($_POST['email']))?htmlspecialchars($_POST['email'], ENT_QUOTES):'');?>" id="email" placeholder="<?php echo _("Email");?>" class="form-control" required><input type="hidden" name="permission" value="0"></div> - </div> - <div class="form-group"> - <div class="col-sm-6"><label for="password"><?php echo _("Password");?>:</label><input type="password" name="password" value="<?php echo ((isset($_POST['password']))?htmlspecialchars($_POST['password'], ENT_QUOTES):'');?>" id="password" placeholder="<?php echo _("Password");?>" class="form-control" required></div> - <div class="col-sm-6"> - <input type="hidden" value="0" name="permission"> - <button type="submit" class="btn btn-success pull-right"><?php echo _("Run install!");?></button> + <div class="form-group"> + <div class="col-sm-6"><label for="name"><?php echo _("Name");?>: </label><input type="text" maxlength="50" name="name" value="<?php echo ((isset($_POST['name']))?htmlspecialchars($_POST['name'], ENT_QUOTES):'');?>" id="name" placeholder="<?php echo _("Name");?>" class="form-control" required></div> + <div class="col-sm-6"><label for="surname"><?php echo _("Surname");?>: </label><input type="text" maxlength="50" name="surname" value="<?php echo ((isset($_POST['surname']))?htmlspecialchars($_POST['surname'], ENT_QUOTES):'');?>" id="surname" placeholder="<?php echo _("Surname");?>" class="form-control" required></div> + </div> + <div class="form-group"> + <div class="col-sm-6"><label for="username"><?php echo _("Username");?>:</label><input type="text" maxlength="50" name="username" value="<?php echo ((isset($_POST['username']))?htmlspecialchars($_POST['username'], ENT_QUOTES):'');?>" id="username" placeholder="<?php echo _("Username");?>" class="form-control" required></div> + <div class="col-sm-6"><label for="email"><?php echo _("Email");?>:</label><input type="email" maxlength="60" name="email" value="<?php echo ((isset($_POST['email']))?htmlspecialchars($_POST['email'], ENT_QUOTES):'');?>" id="email" placeholder="<?php echo _("Email");?>" class="form-control" required><input type="hidden" name="permission" value="0"></div> + </div> + <div class="form-group"> + <div class="col-sm-6"><label for="password"><?php echo _("Password");?>:</label><input type="password" name="password" value="<?php echo ((isset($_POST['password']))?htmlspecialchars($_POST['password'], ENT_QUOTES):'');?>" id="password" placeholder="<?php echo _("Password");?>" class="form-control" required></div> + <div class="col-sm-6"> + <input type="hidden" value="0" name="permission"> + <button type="submit" class="btn btn-success pull-right"><?php echo _("Run install!");?></button> + </div> </div> - </div> </section> </form> <?php diff --git a/template.php b/template.php index 6a2f818..f3a7806 100644 --- a/template.php +++ b/template.php @@ -50,7 +50,7 @@ class Template{ </div> <div class="navbar-left hidden-xs"> <ul class="nav navbar-nav"> - <li><a href="<?php echo WEB_URL;?>/"><h1><?php echo _("Service Status");?></h1></a></li> + <li><a href="<?php echo WEB_URL;?>/"><h1><?php echo _((defined('TITLE')?TITLE:"Service Status"));?></h1></a></li> </ul> </div><!--/.nav-collapse -->