diff options
author | YoungMin Park <[email protected]> | 2014-11-04 11:49:43 +0900 |
---|---|---|
committer | YoungMin Park <[email protected]> | 2014-11-04 11:49:43 +0900 |
commit | a5bbb2bec133bdee08b361628f32430ae3884107 (patch) | |
tree | b203105149ec234ebe155d5718d2cbb6390b4a45 /install/index.php | |
parent | 12727ad17d125eb2f3f243231ccca1cb0a5a7b4b (diff) | |
parent | 2f43089de1ead3f164b8b31967d1abbb784319fa (diff) |
Merge pull request #1 from gothfox/master
Update from original
Diffstat (limited to 'install/index.php')
-rw-r--r-- | install/index.php | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/install/index.php b/install/index.php index 83f3d3821..a3f21cbb3 100644 --- a/install/index.php +++ b/install/index.php @@ -3,6 +3,7 @@ <title>Tiny Tiny RSS - Installer</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <link rel="stylesheet" type="text/css" href="../css/utility.css"> + <link rel="stylesheet" type="text/css" href="../css/dijit.css"> <style type="text/css"> textarea { font-size : 12px; } </style> @@ -10,6 +11,12 @@ <body> <?php + + // could be needed because of existing config.php + function define_default($param, $value) { + // + } + function make_password($length = 8) { $password = ""; @@ -80,13 +87,13 @@ } function print_error($msg) { - print "<div class='error'><span><img src='../images/sign_excl.svg'></span> + print "<div class='error'><span><img src='../images/alert.png'></span> <span>$msg</span></div>"; } function print_notice($msg) { print "<div class=\"notice\"> - <span><img src=\"../images/sign_info.svg\"></span><span>$msg</span></div>"; + <span><img src=\"../images/information.png\"></span><span>$msg</span></div>"; } function db_connect($host, $user, $pass, $db, $type, $port = false) { @@ -199,7 +206,7 @@ } function make_self_url_path() { - $url_path = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH); + $url_path = ((!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on") ? 'http://' : 'https://') . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH); return $url_path; } @@ -263,7 +270,7 @@ <fieldset> <label>Password</label> - <input required name="DB_PASS" size="20" type="password" value="<?php echo $DB_PASS ?>"/> + <input name="DB_PASS" size="20" type="password" value="<?php echo $DB_PASS ?>"/> </fieldset> <fieldset> |