repositories
/
Project_webapp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy a bit the files structure.
[Project_webapp.git]
/
index.php
diff --git
a/index.php
b/index.php
index 9d22f3e15361790b8c2fe89561b28cc88ebd0cf2..8bceb64bb6702c58fa45b66bb7f4ea744d6415d5 100644
(file)
--- a/
index.php
+++ b/
index.php
@@
-1,5
+1,5
@@
<?php
<?php
-require('header.php');
+require('
includes/
header.php');
include('lib/db.php');
include('lib/utils.php');
include('lib/db.php');
include('lib/utils.php');
@@
-9,6
+9,8
@@
include('lib/utils.php');
*/
session_start();
*/
session_start();
+$connection = new CustomDB($configs['host'], $configs['username'], $configs['password'], $configs['database']);
+
$page = filter_input(INPUT_GET, 'page', FILTER_SANITIZE_URL);
$isPage = true;
if (!isset($page)) {
$page = filter_input(INPUT_GET, 'page', FILTER_SANITIZE_URL);
$isPage = true;
if (!isset($page)) {
@@
-40,17
+42,17
@@
function get_action_type() {
}
}
}
}
-function get_url_action() {
+function get_url_action(
$action_type
) {
global $page, $form;
global $page, $form;
- if (
get_action_type()
=== "page") {
+ if (
$action_type
=== "page") {
return $page;
return $page;
- } elseif (
get_action_type()
=== "form") {
+ } elseif (
$action_type
=== "form") {
return $form;
return $form;
- } elseif (
get_action_type()
=== "empty") {
+ } elseif (
$action_type
=== "empty") {
return "";
return "";
- } elseif (
get_action_type()
=== "unknown") {
- die('Cannot get a valid action from URL parameters');
+ } elseif (
$action_type
=== "unknown") {
+ die('Cannot get a valid action from URL parameters
or form fields
');
}
}
}
}
@@
-74,36
+76,42
@@
function validate_url_action($action_name)
return $configs['actions'][0];
}
return $configs['actions'][0];
}
-function display_action($action_name)
+function display_action($action_name
, $action_type
)
{
{
- global $configs, $isPage, $isForm;
+ global $configs;
+ $includes_rpath = 'includes';
$found_action = false;
foreach ($configs['actions'] as $action) {
if (strcmp($action_name, $action) === 0) {
// HTTP GET case
$found_action = false;
foreach ($configs['actions'] as $action) {
if (strcmp($action_name, $action) === 0) {
// HTTP GET case
- if (
get_action_type() === "page" || get_action_type()
=== "empty") {
- include($action . ".php");
+ if (
$action_type === "page" || $action_type
=== "empty") {
+ include($
includes_rpath . "/" . $
action . ".php");
// HTTP POST case
// HTTP POST case
- } elseif (
get_action_type()
=== "form") {
- include(
"
form" . $action . ".php");
+ } elseif (
$action_type
=== "form") {
+ include(
$includes_rpath . "/
form" . $action . ".php");
} else {
} else {
- echo "Unknown error in action displaying";
+ echo "Unknown error in action displaying
<br>
";
}
$found_action = true;
break;
}
}
if (!$found_action) {
}
$found_action = true;
break;
}
}
if (!$found_action) {
- echo "Action to display do not exist";
+ echo "Action to display do not exist
<br>
";
}
}
}
}
-$url_action = get_url_action();
+//password_hash('12345678', PASSWORD_DEFAULT);
+
+$action_type = get_action_type();
+$url_action = get_url_action($action_type);
$action = validate_url_action($url_action);
$action = validate_url_action($url_action);
-display_action($action);
+display_action($action, $action_type);
+
+$connection->close();
session_destroy();
session_destroy();
-require('footer.html');
+require('
includes/
footer.html');
?>
?>