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

Refactored Session manager to singleton #95

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactored Session manager to singleton #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 42 additions & 42 deletions app/Controllers/FirstTimeSetup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@ public function __construct () {
if (!empty ($_POST)) {
return;
}

\Core\MetaPage::setTitle ('First Time Setup');
\Core\MetaPage::setHead ('');
\Core\MetaPage::setBody ('');

$view = new FirstTimeSetupView ([]);
$view->render ();
}

/**
* AJAX method for first time database setup.
*
*
* @return string JSON en coded status messages & codes
*
*
* @throws TypeError on non-string return
*/
public function ajaxRunSetup () : string {
Expand All @@ -38,67 +38,67 @@ public function ajaxRunSetup () : string {
'message' => 'Invalid user data sent.'
]);
}

$db = Database::getInstance ();

$messages = [];

$messages['database'] = $this->createDatabases ($db);
$messages['config'] = $this->createDefaultConfigs ($db);
$messages['user'] = $this->createAdminUser (
$db,
$_POST['username'],
$_POST['password']
);

return json_encode ($messages);
}

/**
* Creates an admin user with the given credentials.
*
*
* @param Database $db database connection
*
*
* @return array creation status message
*
*
* @throws TypeError on incorrectly typed parameters or return
*/
private function createAdminUser (Database $db, string $username, string $password) : array {
$sm = new \Core\SessionManager ();
$sm = \Core\SessionManager::getInstance();
$status = $sm->createUser ($username, $password, 'admin');

return [
'code' => $status ? 1 : 0,
'message' => ($status ? 'Successfully' : 'Failed').' making admin user.'
];
}

/**
* Creates all the necessary tables for the server.
*
*
* @return array list of status messages
*
*
* @throws TypeError on incorrectly typed parameter or return
*/
private function createDatabases (Database $db) : array {
$messages = [];

$q = 'CREATE DATABASE `server`';
$r = $db->query ($q);

if ($r === false) {
// Error creating database
$messages[] = [
$code => 0,
$msg => 'Failed creating database `server`.'
];

return $messages;
}

$q = 'use `server`';
$r = $db->query ($q);

$q = '
CREATE TABLE IF NOT EXISTS `manga_directories_series` (
`manga_id` INT(10) NOT NULL AUTO_INCREMENT,
Expand All @@ -111,7 +111,7 @@ private function createDatabases (Database $db) : array {
AUTO_INCREMENT = 1';
$r = $db->query ($q);
$messages[] = $this->createMessage ($r, 'manga_directories_series');

$q = '
CREATE TABLE IF NOT EXISTS `manga_directories_volumes` (
`volume_id` INT(10) NOT NULL AUTO_INCREMENT,
Expand All @@ -128,7 +128,7 @@ private function createDatabases (Database $db) : array {
AUTO_INCREMENT = 1';
$r = $db->query ($q);
$messages[] = $this->createMessage ($r, 'manga_directories_volumes');

$q = '
CREATE TABLE IF NOT EXISTS `manga_directories_chapters` (
`chapter_id` INT(10) NOT NULL AUTO_INCREMENT,
Expand All @@ -143,7 +143,7 @@ private function createDatabases (Database $db) : array {
AUTO_INCREMENT = 1';
$r = $db->query ($q);
$messages[] = $this->createMessage ($r, 'manga_directories_chapters');

$q = '
CREATE TABLE IF NOT EXISTS `manga_metadata` (
`manga_id` INT(10) NOT NULL AUTO_INCREMENT,
Expand All @@ -158,7 +158,7 @@ private function createDatabases (Database $db) : array {
AUTO_INCREMENT = 1';
$r = $db->query ($q);
$messages[] = $this->createMessage ($r, 'manga_metadata');

$q = '
CREATE TABLE IF NOT EXISTS `server_configs` (
`config_id` INT(11) NOT NULL AUTO_INCREMENT,
Expand All @@ -172,7 +172,7 @@ private function createDatabases (Database $db) : array {
AUTO_INCREMENT = 1';
$r = $db->query ($q);
$messages[] = $this->createMessage ($r, 'server_configs');

$q = '
CREATE TABLE IF NOT EXISTS `statistics` (
`stat_id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
Expand All @@ -185,7 +185,7 @@ private function createDatabases (Database $db) : array {
AUTO_INCREMENT = 1';
$r = $db->query ($q);
$messages[] = $this->createMessage ($r, 'statistics');

$q = '
CREATE TABLE IF NOT EXISTS `users` (
`user_id` INT(10) NOT NULL AUTO_INCREMENT,
Expand All @@ -200,7 +200,7 @@ private function createDatabases (Database $db) : array {
AUTO_INCREMENT = 1';
$r = $db->query ($q);
$messages[] = $this->createMessage ($r, 'users');

$q = '
CREATE TABLE IF NOT EXISTS `user_types` (
`type_name` VARCHAR(255) NOT NULL,
Expand All @@ -211,17 +211,17 @@ private function createDatabases (Database $db) : array {
ENGINE = InnoDB';
$r = $db->query ($q);
$messages[] = $this->createMessage ($r, 'user_types');

return ($messages);
}

/**
* Creates default config settings.
*
*
* @param Database $db database connection
*
*
* @return array config creation status message
*
*
* @throws TypeError on incorrectly typed parameter or return
*/
private function createDefaultConfigs (Database $db) : array {
Expand All @@ -233,21 +233,21 @@ private function createDefaultConfigs (Database $db) : array {
("manga_directory", ""),
("library_view_type", 1)';
$r = $db->query ($q);

return [
'code' => $r ? 1 : 0,
'message' => ($r ? 'Successfully' : 'Failed').' creating default configs.'
];
}

/**
* Creates a table creation message.
*
*
* @param bool $success status of table creation
* @param string $table table name
*
*
* @return array created message
*
*
* @throws TypeError on:
* - Non-bool success flag
* - Non-string table name
Expand All @@ -261,12 +261,12 @@ private function createMessage (bool $success, string $table) : array {
$code = 0;
$msg = "Failed creating table `{$table}`";
}

$message = [
'code' => $code,
'message' => $msg
];

return ($message);
}
}
6 changes: 3 additions & 3 deletions app/Controllers/Login.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class Login {
* Constructor for page controller Login.
*/
public function __construct () {
if ((new \Core\SessionManager ())->isLoggedIn () === true) {
if ((\Core\SessionManager::getInstance())->isLoggedIn () === true) {
// Route user to home page
\Core\MetaPage::setHead ('
<script>
Expand All @@ -21,11 +21,11 @@ public function __construct () {
\Core\MetaPage::setBody ('');
return;
}

\Core\MetaPage::setTitle ('Login');
\Core\MetaPage::setHead ('');
\Core\MetaPage::setBody ('');

$view = new LoginView ([]);
$view->render ();
}
Expand Down
Loading