Misterzym
/
OpenVPN-Admin
mirror of https://github.com/misterzym/OpenVPN-Admin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

small refactoring, check for non existed env file added

feature/refractoring
Paul Rock 7 years ago committed by Chocobozzz
parent
7ea8840920
commit
d84f6803f7
14 changed files with 273 additions and 305 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 0
      app/config.php
  2. 0
      app/connect.php
  3. 2
      app/functions.php
  4. 0
      app/html/form/configuration.php
  5. 0
      app/html/form/installation.php
  6. 0
      app/html/form/login.php
  7. 0
      app/html/grids.php
  8. 4
      app/html/menu.php
  9. 0
      app/resources/css/index.css
  10. 0
      app/resources/img/icon.png
  11. 0
      app/resources/js/grids.js
  12. 6
      gulpfile.js
  13. 109
      public/grids.php
  14. 155
      public/index.php

0
include/config.php → app/config.php
Unescape View File

0
include/connect.php → app/connect.php
Unescape View File

2
include/functions.php → app/functions.php
Unescape View File

@ -41,5 +41,3 @@
function passEqual($pass, $hash) {
return password_verify($pass, $hash);
}
?>

0
include/html/form/configuration.php → app/html/form/configuration.php
Unescape View File

0
include/html/form/installation.php → app/html/form/installation.php
Unescape View File

0
include/html/form/login.php → app/html/form/login.php
Unescape View File

0
include/html/grids.php → app/html/grids.php
Unescape View File

4
include/html/menu.php → app/html/menu.php
Unescape View File

@ -3,8 +3,8 @@
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li <?php if(!isset($_GET['admin'])) echo 'class="active"'; ?>><a href="index.php">Configurations</a></li>
<li <?php if(isset($_GET['admin'])) echo 'class="active"'; ?>><a href="index.php?admin">Administrator</a></li>
<li <?php if(!isset($_GET['admin'])) echo 'class="active"'; ?>><a href="/">Configurations</a></li>
<li <?php if(isset($_GET['admin'])) echo 'class="active"'; ?>><a href="/?admin">Administrator</a></li>
</ul>
</div>

0
resources/css/index.css → app/resources/css/index.css
Unescape View File

0
resources/img/icon.png → app/resources/img/icon.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
resources/js/grids.js → app/resources/js/grids.js
Unescape View File

6
gulpfile.js
Unescape View File

@ -9,7 +9,7 @@ gulp.task('clean:img', function () {
});
gulp.task('img', ['clean:img'], function () {
return gulp.src('resources/img/**/*')
return gulp.src('app/resources/img/**/*')
.pipe(gulp.dest('public/img'));
});
@ -18,7 +18,7 @@ gulp.task('clean:css', function () {
});
gulp.task('css', ['clean:css'], function () {
gulp.src(['resources/css/**/*.css'])
gulp.src(['app/resources/css/**/*.css'])
.pipe(gulp.dest('public/css'));
gulp
@ -46,7 +46,7 @@ gulp.task('clean:js', function () {
});
gulp.task('js', ['clean:js'], function () {
gulp.src(['resources/js/**/*.js'])
gulp.src(['app/resources/js/**/*.js'])
.pipe(gulp.dest('public/js'));
gulp

109
public/grids.php
Unescape View File

@ -1,27 +1,26 @@
<?php
session_start();
// Enable dotEnv support
require_once __DIR__ . '/../vendor/autoload.php';
$dotenv = new Dotenv\Dotenv(__DIR__ . '/../');
if (file_exists(__DIR__ . '/../.env')) $dotenv->load();
if(!isset($_SESSION['admin_id']))
exit -1;
session_start();
// Enable dotEnv support
require_once __DIR__ . '/../vendor/autoload.php';
(new Dotenv\Dotenv(__DIR__ . '/../'))->load();
if (!isset($_SESSION['admin_id']))
exit - 1;
session_start();
require(dirname(__FILE__) . '/../app/functions.php');
require(dirname(__FILE__) . '/../app/connect.php');
require(dirname(__FILE__) . '/../include/functions.php');
require(dirname(__FILE__) . '/../include/connect.php');
// ---------------- SELECT ----------------
if(isset($_GET['select'])){
// ---------------- SELECT ----------------
if (isset($_GET['select'])) {
// Select the users
if($_GET['select'] == "user"){
if ($_GET['select'] == "user") {
$req = $bdd->prepare('SELECT * FROM user');
$req->execute();
if($data = $req->fetch()) {
if ($data = $req->fetch()) {
do {
$list[] = array("user_id" => $data['user_id'],
"user_pass" => $data['user_pass'],
@ -31,19 +30,16 @@
"user_enable" => $data['user_enable'],
"user_start_date" => $data['user_start_date'],
"user_end_date" => $data['user_end_date']);
} while($data = $req->fetch());
} while ($data = $req->fetch());
echo json_encode($list);
}
// If it is an empty answer, we need to encore an empty json object
else{
} // If it is an empty answer, we need to encore an empty json object
else {
$list = array();
echo json_encode($list);
}
}
// Select the logs
else if($_GET['select'] == "log" && isset($_GET['offset'], $_GET['limit'])){
} // Select the logs
else if ($_GET['select'] == "log" && isset($_GET['offset'], $_GET['limit'])) {
$offset = intval($_GET['offset']);
$limit = intval($_GET['limit']);
@ -59,13 +55,13 @@
$data = $req->fetch();
if($data) {
if ($data) {
$nb = $data['nb'];
do {
// Better in Kb or Mb
$received = ($data['log_received'] > 1000000) ? $data['log_received']/1000000 . " Mo" : $data['log_received']/1000 . " Ko";
$sent = ($data['log_send'] > 1000000) ? $data['log_send']/1000000 . " Mo" : $data['log_send']/1000 . " Ko";
$received = ($data['log_received'] > 1000000) ? $data['log_received'] / 1000000 . " Mo" : $data['log_received'] / 1000 . " Ko";
$sent = ($data['log_send'] > 1000000) ? $data['log_send'] / 1000000 . " Mo" : $data['log_send'] / 1000 . " Ko";
// We add to the array the new line of logs
array_push($list, array(
@ -82,8 +78,7 @@
} while ($data = $req->fetch());
}
else {
} else {
$nb = 0;
}
@ -91,32 +86,27 @@
$result = array('total' => intval($nb), 'rows' => $list);
echo json_encode($result);
}
// Select the admins
else if($_GET['select'] == "admin"){
} // Select the admins
else if ($_GET['select'] == "admin") {
$req = $bdd->prepare('SELECT * FROM admin');
$req->execute();
if($data = $req->fetch()) {
do{
if ($data = $req->fetch()) {
do {
$list[] = array(
"admin_id" => $data['admin_id'],
"admin_pass" => $data['admin_pass']
);
} while($data = $req->fetch());
} while ($data = $req->fetch());
echo json_encode($list);
}
else{
} else {
$list = array();
echo json_encode($list);
}
}
}
// ---------------- ADD USER ----------------
else if(isset($_POST['add_user'], $_POST['user_id'], $_POST['user_pass'])){
} // ---------------- ADD USER ----------------
else if (isset($_POST['add_user'], $_POST['user_id'], $_POST['user_pass'])) {
// Put some default values
$id = $_POST['user_id'];
$pass = hashPass($_POST['user_pass']);
@ -133,7 +123,7 @@
$res = array("user_id" => $id,
"user_pass" => $pass,
"user_mail" => $mail ,
"user_mail" => $mail,
"user_phone" => $phone,
"user_online" => $online,
"user_enable" => $enable,
@ -142,10 +132,8 @@
);
echo json_encode($res);
}
// ---------------- UPDATE USER ----------------
else if(isset($_POST['set_user'])){
} // ---------------- UPDATE USER ----------------
else if (isset($_POST['set_user'])) {
$valid = array("user_id", "user_pass", "user_mail", "user_phone", "user_enable", "user_start_date", "user_end_date");
$field = $_POST['name'];
@ -158,8 +146,7 @@
if ($field === 'user_pass') {
$value = hashPass($value);
}
else if (($field === 'user_start_date' || $field === 'user_end_date') && $value === '') {
} else if (($field === 'user_start_date' || $field === 'user_end_date') && $value === '') {
$value = NULL;
}
@ -167,22 +154,16 @@
$req_string = 'UPDATE user SET ' . $field . ' = ? WHERE user_id = ?';
$req = $bdd->prepare($req_string);
$req->execute(array($value, $pk));
}
// ---------------- REMOVE USER ----------------
else if(isset($_POST['del_user'], $_POST['del_user_id'])){
} // ---------------- REMOVE USER ----------------
else if (isset($_POST['del_user'], $_POST['del_user_id'])) {
$req = $bdd->prepare('DELETE FROM user WHERE user_id = ?');
$req->execute(array($_POST['del_user_id']));
}
// ---------------- ADD ADMIN ----------------
else if(isset($_POST['add_admin'], $_POST['admin_id'], $_POST['admin_pass'])){
} // ---------------- ADD ADMIN ----------------
else if (isset($_POST['add_admin'], $_POST['admin_id'], $_POST['admin_pass'])) {
$req = $bdd->prepare('INSERT INTO admin(admin_id, admin_pass) VALUES (?, ?)');
$req->execute(array($_POST['admin_id'], hashPass($_POST['admin_pass'])));
}
// ---------------- UPDATE ADMIN ----------------
else if(isset($_POST['set_admin'])){
} // ---------------- UPDATE ADMIN ----------------
else if (isset($_POST['set_admin'])) {
$valid = array("admin_id", "admin_pass");
$field = $_POST['name'];
@ -200,12 +181,8 @@
$req_string = 'UPDATE admin SET ' . $field . ' = ? WHERE admin_id = ?';
$req = $bdd->prepare($req_string);
$req->execute(array($value, $pk));
}
// ---------------- REMOVE ADMIN ----------------
else if(isset($_POST['del_admin'], $_POST['del_admin_id'])){
} // ---------------- REMOVE ADMIN ----------------
else if (isset($_POST['del_admin'], $_POST['del_admin_id'])) {
$req = $bdd->prepare('DELETE FROM admin WHERE admin_id = ?');
$req->execute(array($_POST['del_admin_id']));
}
?>
}

155
public/index.php
Unescape View File

@ -1,33 +1,34 @@
<?php
// Enable dotEnv support
require_once __DIR__ . '/../vendor/autoload.php';
(new Dotenv\Dotenv(__DIR__ . '/../'))->load();
// Enable dotEnv support
require_once __DIR__ . '/../vendor/autoload.php';
$dotenv = new Dotenv\Dotenv(__DIR__ . '/../');
if (file_exists(__DIR__ . '/../.env')) $dotenv->load();
session_start();
session_start();
require(dirname(__FILE__) . '/../include/functions.php');
require(dirname(__FILE__) . '/../include/connect.php');
require(dirname(__FILE__) . '/../app/functions.php');
require(dirname(__FILE__) . '/../app/connect.php');
// Disconnecting ?
if(isset($_GET['logout'])){
// Disconnecting ?
if (isset($_GET['logout'])) {
session_destroy();
header("Location: .");
exit(-1);
}
}
// Get the configuration files ?
if(isset($_POST['configuration_get'], $_POST['configuration_username'], $_POST['configuration_pass'], $_POST['configuration_os'])
// Get the configuration files ?
if (isset($_POST['configuration_get'], $_POST['configuration_username'], $_POST['configuration_pass'], $_POST['configuration_os'])
&& !empty($_POST['configuration_pass'])) {
$req = $bdd->prepare('SELECT * FROM user WHERE user_id = ?');
$req->execute(array($_POST['configuration_username']));
$data = $req->fetch();
// Error ?
if($data && passEqual($_POST['configuration_pass'], $data['user_pass'])) {
if ($data && passEqual($_POST['configuration_pass'], $data['user_pass'])) {
// Thanks http://stackoverflow.com/questions/4914750/how-to-zip-a-whole-folder-using-php
if($_POST['configuration_os'] == "gnu_linux") {
if ($_POST['configuration_os'] == "gnu_linux") {
$conf_dir = 'gnu-linux';
} elseif($_POST['configuration_os'] == "osx_viscosity") {
} elseif ($_POST['configuration_os'] == "osx_viscosity") {
$conf_dir = 'osx-viscosity';
} else {
$conf_dir = 'windows';
@ -67,66 +68,62 @@
header("Pragma: no-cache");
header("Expires: 0");
readfile($archive_path);
}
else {
} else {
$error = true;
}
}
// Admin login attempt ?
else if(isset($_POST['admin_login'], $_POST['admin_username'], $_POST['admin_pass']) && !empty($_POST['admin_pass'])){
} // Admin login attempt ?
else if (isset($_POST['admin_login'], $_POST['admin_username'], $_POST['admin_pass']) && !empty($_POST['admin_pass'])) {
$req = $bdd->prepare('SELECT * FROM admin WHERE admin_id = ?');
$req->execute(array($_POST['admin_username']));
$data = $req->fetch();
// Error ?
if($data && passEqual($_POST['admin_pass'], $data['admin_pass'])) {
if ($data && passEqual($_POST['admin_pass'], $data['admin_pass'])) {
$_SESSION['admin_id'] = $data['admin_id'];
header("Location: index.php?admin");
exit(-1);
}
else {
} else {
$error = true;
}
}
}
?>
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<head>
<meta charset="utf-8"/>
<title>OpenVPN-Admin</title>
<link rel="stylesheet" href="/css/bootstrap.min.css" type="text/css" />
<link rel="stylesheet" href="/css/bootstrap-editable.css" type="text/css" />
<link rel="stylesheet" href="/css/bootstrap-table.min.css" type="text/css" />
<link rel="stylesheet" href="/css/bootstrap-datepicker3.css" type="text/css" />
<link rel="stylesheet" href="/css/index.css" type="text/css" />
<link rel="stylesheet" href="/css/bootstrap.min.css" type="text/css"/>
<link rel="stylesheet" href="/css/bootstrap-editable.css" type="text/css"/>
<link rel="stylesheet" href="/css/bootstrap-table.min.css" type="text/css"/>
<link rel="stylesheet" href="/css/bootstrap-datepicker3.css" type="text/css"/>
<link rel="stylesheet" href="/css/index.css" type="text/css"/>
<link rel="icon" type="image/png" href="/img/icon.png">
</head>
<body class='container-fluid'>
<?php
</head>
<body class='container-fluid'>
<?php
// --------------- INSTALLATION ---------------
if(isset($_GET['installation'])) {
if(isInstalled($bdd) == true) {
// --------------- INSTALLATION ---------------
if (isset($_GET['installation'])) {
if (isInstalled($bdd) == true) {
printError('OpenVPN-admin is already installed. Redirection.');
header( "refresh:3;url=index.php?admin" );
header("refresh:3;url=index.php?admin");
exit(-1);
}
// If the user sent the installation form
if(isset($_POST['admin_username'])) {
if (isset($_POST['admin_username'])) {
$admin_username = $_POST['admin_username'];
$admin_pass = $_POST['admin_pass'];
$admin_repeat_pass = $_POST['repeat_admin_pass'];
if($admin_pass != $admin_repeat_pass) {
if ($admin_pass != $admin_repeat_pass) {
printError('The passwords do not correspond. Redirection.');
header( "refresh:3;url=index.php?installation" );
header("refresh:3;url=index.php?installation");
exit(-1);
}
@ -137,8 +134,7 @@
try {
$sql = file_get_contents($sql_file);
$bdd->exec($sql);
}
catch (PDOException $e) {
} catch (PDOException $e) {
printError($e->getMessage());
exit(1);
}
@ -158,63 +154,60 @@
rmdir(dirname(__FILE__) . '/sql');
printSuccess('Well done, OpenVPN-Admin is installed. Redirection.');
header( "refresh:3;url=index.php?admin" );
}
// Print the installation form
header("refresh:3;url=index.php?admin");
} // Print the installation form
else {
require(dirname(__FILE__) . '/../include/html/menu.php');
require(dirname(__FILE__) . '/../include/html/form/installation.php');
require(dirname(__FILE__) . '/../app/html/menu.php');
require(dirname(__FILE__) . '/../app/html/form/installation.php');
}
exit(-1);
}
}
// --------------- CONFIGURATION ---------------
if(!isset($_GET['admin'])) {
if(isset($error) && $error == true)
// --------------- CONFIGURATION ---------------
if (!isset($_GET['admin'])) {
if (isset($error) && $error == true)
printError('Login error');
require(dirname(__FILE__) . '/../include/html/menu.php');
require(dirname(__FILE__) . '/../include/html/form/configuration.php');
}
// --------------- LOGIN ---------------
else if(!isset($_SESSION['admin_id'])){
if(isset($error) && $error == true)
require(dirname(__FILE__) . '/../app/html/menu.php');
require(dirname(__FILE__) . '/../app/html/form/configuration.php');
} // --------------- LOGIN ---------------
else if (!isset($_SESSION['admin_id'])) {
if (isset($error) && $error == true)
printError('Login error');
require(dirname(__FILE__) . '/../include/html/menu.php');
require(dirname(__FILE__) . '/../include/html/form/login.php');
}
// --------------- GRIDS ---------------
else{
require(dirname(__FILE__) . '/../app/html/menu.php');
require(dirname(__FILE__) . '/../app/html/form/login.php');
} // --------------- GRIDS ---------------
else {
?>
<nav class="navbar navbar-default">
<div class="row col-md-12">
<div class="col-md-6">
<p class="navbar-text signed">Signed in as <?php echo $_SESSION['admin_id']; ?>
<p class="navbar-text signed">Signed in as <?php echo $_SESSION['admin_id']; ?> </p>
</div>
<div class="col-md-6">
<a class="navbar-text navbar-right" href="index.php?logout" title="Logout"><button class="btn btn-danger">Logout</button></a>
<a class="navbar-text navbar-right" href="index.php" title="Configuration"><button class="btn btn-default">Configurations</button></a>
</p>
<a class="navbar-text navbar-right" href="index.php?logout" title="Logout">
<button class="btn btn-danger">Logout</button>
</a>
<a class="navbar-text navbar-right" href="index.php" title="Configuration">
<button class="btn btn-default">Configurations</button>
</a>
</div>
</div>
</nav>
<?php
require(dirname(__FILE__) . '/../include/html/grids.php');
}
?>
require(dirname(__FILE__) . '/../app/html/grids.php');
}
?>
<script src="/js/jquery.min.js"></script>
<script src="/js/bootstrap.min.js"></script>
<script src="/js/bootstrap-table.min.js"></script>
<script src="/js/bootstrap-datepicker.js"></script>
<script src="/js/bootstrap-table-editable.min.js"></script>
<script src="/js/bootstrap-editable.js"></script>
<script src="/js/grids.js"></script>
</body>
<script src="/js/jquery.min.js"></script>
<script src="/js/bootstrap.min.js"></script>
<script src="/js/bootstrap-table.min.js"></script>
<script src="/js/bootstrap-datepicker.js"></script>
<script src="/js/bootstrap-table-editable.min.js"></script>
<script src="/js/bootstrap-editable.js"></script>
<script src="/js/grids.js"></script>
</body>
</html>

Write Preview
Loading…
Cancel
Save