phyks/bouffeatulm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Install.php looks nicer

Browse Source
This commit is contained in:
Phyks 2013-08-07 23:53:46 +02:00
parent 561af52a31
commit bb664e34a4
3 changed files with 72 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
index.php
View File

@ -1,23 +1,2 @@
<?php <?php
require_once('inc/header.php'); require_once('inc/header.php');
init(true,false) {
global $bdd;
$bdd = new PDO('mysql:host='.MYSQL_HOST.';dbname='.MYSQL_DB, MYSQL_LOGIN, MYSQL_PASSWORD);
$bdd->query("SET NAMES 'utf8'");
session_start();
date_default_timezone_set(TIMEZONE);
if($protect && empty($_SESSION['login'])) {
header('location: connexion.php');
exit();
}
if($admin && $_SESSION['admin']) {
header('location: message.php?id=7');
exit();
}
}

81
install.php
View File

@ -15,50 +15,49 @@
$instance_title = (!empty($_POST['instance_title'])) ? $_POST['instance_title'] : 'Bouffe@Ulm'; $instance_title = (!empty($_POST['instance_title'])) ? $_POST['instance_title'] : 'Bouffe@Ulm';
try { try {
$db = new Storage(array('host'=>$mysql_host, 'login'=>$mysql_login, 'password'=>$mysql_password, 'db'=>$mysql_db); $db = new Storage(array('host'=>$mysql_host, 'login'=>$mysql_login, 'password'=>$mysql_password, 'db'=>$mysql_db));
//TODO : Create tables //TODO : Create tables
} catch (PDOException $e) { } catch (PDOException $e) {
$error = 'Unable to connect to database, check your credentials.'; $error = 'Unable to connect to database, check your credentials.';
} }
if(empty($error)) { if(empty($error)) {
if(function_exists('mcrypt_create_iv')) { if(function_exists('mcrypt_create_iv')) {
$salt = mcrypt_create_iv(16, MCRYPT_DEV_URANDOM); $salt = mcrypt_create_iv(16, MCRYPT_DEV_URANDOM);
}
else {
mt_srand(microtime(true)*100000 + memory_get_usage(true));
$salt = md5(uniqid(mt_rand(), true));
}
define('SALT', $salt);
$config = "
define('VERSION_NUMBER', '2.0');
define('MYSQL_HOST', '".$mysql_host."');
define('MYSQL_LOGIN', '".$mysql_login."');
define('MYSQL_PASSWORD', '".$mysql_password."');
define('MYSQL_DB', '".$mysql_db."');
define('MYSQL_PREFIX', '".$mysql_prefix."');
define('INSTANCE_TITLE', '".$instance_title."');
define('BASE_URL', '".$_POST['base_url']."');
define('SALT', '".$salt."');";
if(file_put_contents("inc/config.php", $config)) {
try {
$admin = new User();
$admin->setLogin($_POST['admin_login']);
$admin->setPassword($_POST['admin_password']);
$admin->setAdmin(true);
$admin->save();
header('location: index.php');
exit();
} catch ($e) {
//TODO
}
}
else
$error = 'Unable to write configuration to config file inc/config.php.';
} }
else {
mt_srand(microtime(true)*100000 + memory_get_usage(true));
$salt = md5(uniqid(mt_rand(), true));
}
define('SALT', $salt);
$config = "
define('VERSION_NUMBER', '2.0');
define('MYSQL_HOST', '".$mysql_host."');
define('MYSQL_LOGIN', '".$mysql_login."');
define('MYSQL_PASSWORD', '".$mysql_password."');
define('MYSQL_DB', '".$mysql_db."');
define('MYSQL_PREFIX', '".$mysql_prefix."');
define('INSTANCE_TITLE', '".$instance_title."');
define('BASE_URL', '".$_POST['base_url']."');
define('SALT', '".$salt."');";
if(file_put_contents("inc/config.php", $config)) {
try {
$admin = new User();
$admin->setLogin($_POST['admin_login']);
$admin->setPassword($_POST['admin_password']);
$admin->setAdmin(true);
$admin->save();
header('location: index.php');
exit();
} catch (Exception $e) {
//TODO
}
}
else
$error = 'Unable to write configuration to config file inc/config.php.';
} }
} }
?> ?>
@ -69,8 +68,8 @@
<title>Bouffe@Ulm - Installation</title> <title>Bouffe@Ulm - Installation</title>
<link rel="stylesheet" media="screen" type="text/css" href="tpl/css/style.css" /> <link rel="stylesheet" media="screen" type="text/css" href="tpl/css/style.css" />
</head> </head>
<body> <body id="install">
<h1>Bouffe@Ulm - Installation</h1> <h1 class="center">Bouffe@Ulm - Installation</h1>
<?php <?php
if(!empty($error)) { if(!empty($error)) {
@ -78,7 +77,7 @@
} }
?> ?>
<p>This small form will guide you through the installation of Bouffe@Ulm.</p> <p class="center">This small form will guide you through the installation of Bouffe@Ulm.</p>
<form action="install.php" method="post"> <form action="install.php" method="post">
<fieldset> <fieldset>
@ -106,7 +105,7 @@
<p><label for="admin_login">Username of the admin : </label><input type="text" name="admin_login" id="admin_login"/></p> <p><label for="admin_login">Username of the admin : </label><input type="text" name="admin_login" id="admin_login"/></p>
<p><label for="admin_mdp">Password for the admin : </label><input type="password" name="admin_pass" id="admin_pass"/></p> <p><label for="admin_mdp">Password for the admin : </label><input type="password" name="admin_pass" id="admin_pass"/></p>
</fieldset> </fieldset>
<p><input <?php echo (!empty($block_form)) ? 'disabled ' : '';?>type="submit" class="center"></p> <p class="center"><input <?php echo (!empty($block_form)) ? 'disabled ' : '';?>type="submit"></p>
</form> </form>
</body> </body>
</html> </html>

32
tpl/css/style.css
View File

@ -1,3 +1,12 @@
body {
font-family: sans-serif;
}
fieldset {
border: 1px solid #999;
margin-bottom: 1em;
}
.center { .center {
text-align: center; text-align: center;
} }
@ -7,3 +16,26 @@
color: red; color: red;
font-weight: bold; font-weight: bold;
} }
input[type=submit] {
background-color: green;
color: white;
border-radius: 10px;
}
#install {
margin: 0;
}
#install form {
width: 67%;
margin: auto;
}
#install h1 {
background-color: #333;
border-bottom: 0.3em solid green;
color: white;
padding: 0.5em;
margin: 0;
}