Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed database connection #39

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Fixed database connection #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9e973c3
Fixed database connection
Yohn Jun 28, 2024
72c3ab8
Update install.php
Yohn Jun 28, 2024
8294906
Let the pin stay on the screen a little longer than 5 seconds
Yohn Jun 28, 2024
4302a3d
Clean up database dump.
Yohn Jun 28, 2024
954c6b5
Dashboard loads
Yohn Jun 28, 2024
b5bebcc
space to tab
Yohn Sep 7, 2024
dc3255e
4 space to tab
Yohn Sep 7, 2024
01428c4
space to tab
Yohn Sep 7, 2024
db05675
spaces to tabs
Yohn Sep 7, 2024
a6099fb
space to tab
Yohn Sep 7, 2024
273e088
space to tab
Yohn Sep 7, 2024
b732396
space to tab
Yohn Sep 7, 2024
71549bd
4 space to tab
Yohn Sep 7, 2024
f47f133
4 space to tab
Yohn Sep 7, 2024
28afd6e
4 space to tab
Yohn Sep 7, 2024
6f5e4e8
space to tab
Yohn Sep 7, 2024
2d728c4
4 space to tab
Yohn Sep 7, 2024
c38635d
Fixed errors found from previous space to tab
Yohn Sep 7, 2024
33963d9
fix found space to tab error
Yohn Sep 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 5 additions & 6 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
root = true

[*]
end_of_line = lf
insert_final_newline = true

[*.js]
charset = utf-8
indent_style = space
indent_size = 2
charset = utf-8
end_of_line = lf
indent_style = tab
insert_final_newline = false
trim_trailing_whitespace = true
7 changes: 7 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,10 @@ bower_components/
grapesjs-*.tgz
_index.html
docs/.vuepress/dist

/config/server.php
/installer
config/define.php
.vscode/settings.json
installer/installUser.php
installer/install.php
25 changes: 12 additions & 13 deletions admin/Autoload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,19 @@

class Autoload {

static public function loader($classes) {
static public function loader($classes) {

$filename = "../classes/" . str_replace("\\", '/', $classes) . ".php";
if (file_exists($filename)) {
include($filename);
if (class_exists($classes)) {
return TRUE;
}
} else {
throw new Exception("No existe $classes.");
}
return FALSE;
}
$filename = "../classes/" . str_replace("\\", '/', $classes) . ".php";
if (file_exists($filename)) {
include ($filename);
if (class_exists($classes)) {
return TRUE;
}
} else {
throw new Exception("No existe $classes.");
}
return FALSE;
}
}

spl_Autoload_register('Autoload::loader');
?>
168 changes: 84 additions & 84 deletions admin/adduser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,87 +1,87 @@
<div class="container-fluid">
<div class="row">
<?php
$form = new Form();
$newuser = new NewUser();
if (isset($_SESSION['regsuccess'])) {
/* Registration was successful */
if ($_SESSION['regsuccess']) {
echo "<h1>Registered!</h1>";
if (EMAIL_WELCOME) {
echo "<p>Thank you <b>" . $_SESSION['username'] . "</b>, you have been sent a confirmation email which should be arriving shortly. Please confirm your registration before you continue.<br />Volver a <a href='index.php'>Principal</a></p>";
} else {
echo "<p>Thank you <b>" . $_SESSION['username'] . "</b>, your information has been added to the database, "
. "you may now <a href=\"index.php\">log in</a>.</p>";
}
}
/* Registration failed */ else {
echo "<h1>Registration Failed</h1>";
echo "<p>We're sorry, but an error has occurred and your registration for the username <b>" . $_SESSION['username'] . "</b>, "
. "could not be completed.<br />Please try again at a later time.</p>";
}
}
/**
* The user has not filled out the registration form yet.
* Below is the page with the sign-up form, the names
* of the input fields are important and should not
* be changed.
*/ else {
?>
<div class="row">
<?php
$form = new Form();
$newuser = new NewUser();
if (isset($_SESSION['regsuccess'])) {
/* Registration was successful */
if ($_SESSION['regsuccess']) {
echo "<h1>Registered!</h1>";
if (EMAIL_WELCOME) {
echo "<p>Thank you <b>" . $_SESSION['username'] . "</b>, you have been sent a confirmation email which should be arriving shortly. Please confirm your registration before you continue.<br />Volver a <a href='index.php'>Principal</a></p>";
} else {
echo "<p>Thank you <b>" . $_SESSION['username'] . "</b>, your information has been added to the database, "
. "you may now <a href=\"index.php\">log in</a>.</p>";
}
}
/* Registration failed */ else {
echo "<h1>Registration Failed</h1>";
echo "<p>We're sorry, but an error has occurred and your registration for the username <b>" . $_SESSION['username'] . "</b>, "
. "could not be completed.<br />Please try again at a later time.</p>";
}
}
/**
* The user has not filled out the registration form yet.
* Below is the page with the sign-up form, the names
* of the input fields are important and should not
* be changed.
*/ else {
?>

<h1>Add new user</h1>
<?php
if ($form->num_errors > 0) {
echo "<td><font size=\"2\" color=\"#ff0000\">" . $form->num_errors . " error(es) econtrados</font></td>";
}
?>
<div class="card">
<div class="card-body register-card-body">
<p class="login-box-msg">Add a new user</p>
<form method="post" class="form-inline d-flex justify-content-center">
<div class="input-group mb-3">
<input type="text" name="username" id="username" class="form-control" placeholder="Username" value="<?php echo $form->value("username"); ?>"><?php echo $form->error("username"); ?>
<div class="input-group-append">
<div class="input-group-text">
<span class="fas fa-user"></span>
</div>
</div>
</div>
<div class="input-group mb-3">
<input type="email" name="email" id="email" class="form-control" placeholder="Email" value="<?php echo $form->value("email"); ?>"><?php echo $form->error("email"); ?>>
<div class="input-group-append">
<div class="input-group-text">
<span class="fas fa-envelope"></span>
</div>
</div>
</div>
<div class="input-group mb-3">
<input type="password" name="password" id="password" class="form-control" placeholder="Password" value="<?php echo $form->value("password"); ?>"><?php echo $form->error("password"); ?>
<div class="input-group-append">
<div class="input-group-text">
<span class="fas fa-lock"></span>
</div>
</div>
</div>
<div class="input-group mb-3">
<input type="password" name="password2" id="password2" class="form-control" placeholder="Retype password" value="<?php echo $form->value("password2"); ?>"><?php echo $form->error("password2"); ?>
<div class="input-group-append">
<div class="input-group-text">
<span class="fas fa-lock"></span>
</div>
</div>
</div>
<div class="row">
<!-- /.col -->
<div class="mb-3">
<button type="submit" name="register" class="btn btn-primary btn-block">Register</button>
</div>
<!-- /.col -->
</div>
</form>
</div>
</div>
<?php
<h1>Add new user</h1>
<?php
if ($form->num_errors > 0) {
echo "<td><font size=\"2\" color=\"#ff0000\">" . $form->num_errors . " error(es) econtrados</font></td>";
}
?>
<div class="card">
<div class="card-body register-card-body">
<p class="login-box-msg">Add a new user</p>
<form method="post" class="form-inline d-flex justify-content-center">
<div class="input-group mb-3">
<input type="text" name="username" id="username" class="form-control" placeholder="Username" value="<?php echo $form->value("username"); ?>"><?php echo $form->error("username"); ?>
<div class="input-group-append">
<div class="input-group-text">
<span class="fas fa-user"></span>
</div>
</div>
</div>
<div class="input-group mb-3">
<input type="email" name="email" id="email" class="form-control" placeholder="Email" value="<?php echo $form->value("email"); ?>"><?php echo $form->error("email"); ?>>
<div class="input-group-append">
<div class="input-group-text">
<span class="fas fa-envelope"></span>
</div>
</div>
</div>
<div class="input-group mb-3">
<input type="password" name="password" id="password" class="form-control" placeholder="Password" value="<?php echo $form->value("password"); ?>"><?php echo $form->error("password"); ?>
<div class="input-group-append">
<div class="input-group-text">
<span class="fas fa-lock"></span>
</div>
</div>
</div>
<div class="input-group mb-3">
<input type="password" name="password2" id="password2" class="form-control" placeholder="Retype password" value="<?php echo $form->value("password2"); ?>"><?php echo $form->error("password2"); ?>
<div class="input-group-append">
<div class="input-group-text">
<span class="fas fa-lock"></span>
</div>
</div>
</div>
<div class="row">
<!-- /.col -->
<div class="mb-3">
<button type="submit" name="register" class="btn btn-primary btn-block">Register</button>
</div>
<!-- /.col -->
</div>
</form>
</div>
</div>
<?php
}
?>
</div>
</div>
?>
</div>
</div>
Loading