JWT
This commit is contained in:
parent
62f67967ba
commit
f4ed99fc72
1
core/Configuration/.gitignore
vendored
1
core/Configuration/.gitignore
vendored
@ -1,4 +1,3 @@
|
||||
Mail\.class\.php
|
||||
JWT\.class\.php
|
||||
Database\.class\.php
|
||||
Google\.class\.php
|
||||
|
@ -7,7 +7,6 @@ class Configuration {
|
||||
private $database;
|
||||
private $mail;
|
||||
private $jwt;
|
||||
private $google;
|
||||
|
||||
function __construct() {
|
||||
}
|
||||
@ -18,8 +17,7 @@ class Configuration {
|
||||
$classes = array(
|
||||
\Configuration\Database::class => &$this->database,
|
||||
\Configuration\Mail::class => &$this->mail,
|
||||
\Configuration\JWT::class => &$this->jwt,
|
||||
\Configuration\Google::class => &$this->google,
|
||||
\Configuration\JWT::class => &$this->jwt
|
||||
);
|
||||
|
||||
$success = true;
|
||||
@ -54,35 +52,57 @@ class Configuration {
|
||||
$path = getClassPath("\\Configuration\\$className");
|
||||
|
||||
if($data) {
|
||||
if(is_string($data)) {
|
||||
$key = addslashes($data);
|
||||
$code = intendCode(
|
||||
"<?php
|
||||
|
||||
// TODO: Generalize this...
|
||||
$superClass = get_class($data);
|
||||
$host = addslashes($data->getHost());
|
||||
$port = intval($data->getPort());
|
||||
$login = addslashes($data->getLogin());
|
||||
$password = addslashes($data->getPassword());
|
||||
namespace Configuration;
|
||||
|
||||
$properties = "";
|
||||
foreach($data->getProperties() as $key => $val) {
|
||||
$key = addslashes($key);
|
||||
$val = is_string($val) ? "'" . addslashes($val) . "'" : $val;
|
||||
$properties .= "\n\$this->setProperty('$key', $val);";
|
||||
}
|
||||
class $className {
|
||||
|
||||
$code = intendCode(
|
||||
"<?php
|
||||
private \$key;
|
||||
|
||||
namespace Configuration;
|
||||
|
||||
class $className extends \\$superClass {
|
||||
|
||||
public function __construct() {
|
||||
parent::__construct('$host', $port, '$login', '$password');$properties
|
||||
public function __construct() {
|
||||
\$this->key = '$key';
|
||||
}
|
||||
|
||||
public function getKey() {
|
||||
return \$this->key;
|
||||
}
|
||||
}
|
||||
|
||||
?>", false
|
||||
);
|
||||
} else {
|
||||
$superClass = get_class($data);
|
||||
$host = addslashes($data->getHost());
|
||||
$port = intval($data->getPort());
|
||||
$login = addslashes($data->getLogin());
|
||||
$password = addslashes($data->getPassword());
|
||||
|
||||
$properties = "";
|
||||
foreach($data->getProperties() as $key => $val) {
|
||||
$key = addslashes($key);
|
||||
$val = is_string($val) ? "'" . addslashes($val) . "'" : $val;
|
||||
$properties .= "\n\$this->setProperty('$key', $val);";
|
||||
}
|
||||
|
||||
?>", false
|
||||
);
|
||||
$code = intendCode(
|
||||
"<?php
|
||||
|
||||
namespace Configuration;
|
||||
|
||||
class $className extends \\$superClass {
|
||||
|
||||
public function __construct() {
|
||||
parent::__construct('$host', $port, '$login', '$password');$properties
|
||||
}
|
||||
}
|
||||
|
||||
?>", false
|
||||
);
|
||||
}
|
||||
} else {
|
||||
$code = intendCode(
|
||||
"<?php
|
||||
|
@ -59,11 +59,12 @@ namespace Documents\Install {
|
||||
const DATABASE_CONFIGURATION = 2;
|
||||
const CREATE_USER = 3;
|
||||
const ADD_MAIL_SERVICE = 4;
|
||||
const ADD_GOOGLE_SERVICE = 5;
|
||||
const FINISH_INSTALLATION = 5;
|
||||
|
||||
//
|
||||
private $configDirectory;
|
||||
private $databaseScript;
|
||||
private $errorString;
|
||||
|
||||
function __construct($document) {
|
||||
parent::__construct($document);
|
||||
@ -71,6 +72,7 @@ namespace Documents\Install {
|
||||
// TODO: make better
|
||||
$this->configDirectory = getWebRoot() . '/core/Configuration';
|
||||
$this->databaseScript = getWebRoot() . '/core/Configuration/database.sql';
|
||||
$this->errorString = "";
|
||||
}
|
||||
|
||||
private function getParameter($name) {
|
||||
@ -98,7 +100,6 @@ namespace Documents\Install {
|
||||
$query = "SELECT * FROM User";
|
||||
$sql = $user->getSQL();
|
||||
if(!is_null($sql) && $sql->isConnected()) {
|
||||
$this->getDocument()->getUser()->setSql($sql);
|
||||
$res = $sql->query($query);
|
||||
if($res) {
|
||||
if($res->num_rows === 0) {
|
||||
@ -112,7 +113,10 @@ namespace Documents\Install {
|
||||
}
|
||||
|
||||
if($step == self::ADD_MAIL_SERVICE && $config->isFilePresent("Mail")) {
|
||||
$step = self::ADD_GOOGLE_SERVICE;
|
||||
$step = self::FINISH_INSTALLATION;
|
||||
if(!$config->isFilePresent("JWT") && $config->create("JWT", generateRandomString(32))) {
|
||||
$this->errorString = "Unable to create jwt file";
|
||||
}
|
||||
}
|
||||
|
||||
return $step;
|
||||
@ -120,7 +124,7 @@ namespace Documents\Install {
|
||||
|
||||
private function checkRequirements() {
|
||||
|
||||
$msg = "";
|
||||
$msg = $this->errorString;
|
||||
$success = true;
|
||||
$failedRequirements = array();
|
||||
|
||||
@ -243,7 +247,7 @@ namespace Documents\Install {
|
||||
$password = $this->getParameter("password");
|
||||
$confirmPassword = $this->getParameter("confirmPassword");
|
||||
|
||||
$msg = "";
|
||||
$msg = $this->errorString;
|
||||
$success = true;
|
||||
$missingInputs = array();
|
||||
|
||||
@ -297,7 +301,7 @@ namespace Documents\Install {
|
||||
}
|
||||
|
||||
$success = true;
|
||||
$msg = "";
|
||||
$msg = $this->errorString;
|
||||
if($this->getParameter("skip") === "true") {
|
||||
if(!$user->getConfiguration()->create("Mail", null)) {
|
||||
$success = false;
|
||||
@ -378,10 +382,6 @@ namespace Documents\Install {
|
||||
return array("success" => $success, "msg" => $msg);
|
||||
}
|
||||
|
||||
private function addGoogleService() {
|
||||
// return array("success" => $success, "msg" => $msg);
|
||||
}
|
||||
|
||||
private function performStep() {
|
||||
|
||||
switch($this->currentStep) {
|
||||
@ -398,9 +398,6 @@ namespace Documents\Install {
|
||||
case self::ADD_MAIL_SERVICE:
|
||||
return $this->addMailService();
|
||||
|
||||
case self::ADD_GOOGLE_SERVICE:
|
||||
return $this->addGoogleService();
|
||||
|
||||
default:
|
||||
return array(
|
||||
"success" => false,
|
||||
@ -555,8 +552,9 @@ namespace Documents\Install {
|
||||
),
|
||||
"skip" => true
|
||||
),
|
||||
self::ADD_GOOGLE_SERVICE => array(
|
||||
"title" => "Optional: Add Google Services",
|
||||
self::FINISH_INSTALLATION => array(
|
||||
"title" => "Finish Installation",
|
||||
"text" => "Installation finished, you can now customize your own website, check the source code and stuff."
|
||||
)
|
||||
);
|
||||
|
||||
@ -571,6 +569,11 @@ namespace Documents\Install {
|
||||
|
||||
$html = "<h4 class=\"mb-3\">$title</h4><hr class=\"mb-4\">";
|
||||
|
||||
if(isset($currentView["text"])) {
|
||||
$text = $currentView["text"];
|
||||
$html .= "<div class=\"my-3\">$text</i></div>";
|
||||
}
|
||||
|
||||
if(isset($currentView["progressText"])) {
|
||||
$progressText = $currentView["progressText"];
|
||||
$html .= "<div id=\"progressText\" class=\"my-3\">$progressText$spinnerIcon</i></div>";
|
||||
@ -597,10 +600,15 @@ namespace Documents\Install {
|
||||
}
|
||||
|
||||
$buttons = array(
|
||||
array("title" => "Go Back", "type" => "info", "id" => "btnPrev", "float" => "left", "disabled" => $prevDisabled),
|
||||
array("title" => "Submit", "type" => "success", "id" => "btnSubmit", "float" => "right")
|
||||
array("title" => "Go Back", "type" => "info", "id" => "btnPrev", "float" => "left", "disabled" => $prevDisabled)
|
||||
);
|
||||
|
||||
if($this->currentStep != self::FINISH_INSTALLATION) {
|
||||
$buttons[] = array("title" => "Submit", "type" => "success", "id" => "btnSubmit", "float" => "right");
|
||||
} else {
|
||||
$buttons[] = array("title" => "Finish", "type" => "success", "id" => "btnFinish", "float" => "right");
|
||||
}
|
||||
|
||||
if(isset($currentView["skip"])) {
|
||||
$buttons[] = array("title" => "Skip", "type" => "secondary", "id" => "btnSkip", "float" => "right");
|
||||
}
|
||||
@ -653,8 +661,8 @@ namespace Documents\Install {
|
||||
"title" => "Add Mail Service",
|
||||
"status" => self::NOT_STARTED
|
||||
),
|
||||
self::ADD_GOOGLE_SERVICE => array(
|
||||
"title" => "Add Google Services",
|
||||
self::FINISH_INSTALLATION => array(
|
||||
"title" => "Finish Installation",
|
||||
"status" => self::NOT_STARTED
|
||||
),
|
||||
);
|
||||
@ -666,6 +674,10 @@ namespace Documents\Install {
|
||||
$this->steps[$step]["status"] = self::SUCCESFULL;
|
||||
}
|
||||
|
||||
if($this->currentStep == self::FINISH_INSTALLATION) {
|
||||
$this->steps[$this->currentStep]["status"] = self::SUCCESFULL;
|
||||
}
|
||||
|
||||
// POST
|
||||
if($_SERVER['REQUEST_METHOD'] == 'POST') {
|
||||
$response = $this->performStep();
|
||||
@ -682,6 +694,7 @@ namespace Documents\Install {
|
||||
|
||||
$progressSidebar = $this->createProgressSidebar();
|
||||
$progressMainview = $this->createProgessMainview();
|
||||
$errorStyle = ($this->errorString ? '' : ' style="display:none"');
|
||||
|
||||
$html .= "
|
||||
<body class=\"bg-light\">
|
||||
@ -705,7 +718,7 @@ namespace Documents\Install {
|
||||
</div>
|
||||
<div class=\"col-md-8 order-md-1\">
|
||||
$progressMainview
|
||||
<div class=\"alert margin-top-m\" id=\"status\" style=\"display:none\"></div>
|
||||
<div class=\"alert margin-top-m\" id=\"status\"$errorStyle>$this->errorString</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -33,7 +33,6 @@ class User extends ApiObject {
|
||||
}
|
||||
}
|
||||
|
||||
public function setSql($sql) { $this->sql = $sql; }
|
||||
public function getId() { return $this->uid; }
|
||||
public function isLoggedIn() { return $this->loggedIn; }
|
||||
public function getUsername() { return $this->username; }
|
||||
|
25
index.php
25
index.php
@ -1,12 +1,5 @@
|
||||
<?php
|
||||
|
||||
// Autoload function
|
||||
// function __autoload($class) {
|
||||
// $parts = explode('\\', $class);
|
||||
// $path = implode(DIRECTORY_SEPERATOR, $parts);
|
||||
// require "$path.php";
|
||||
// }
|
||||
|
||||
function getClassPath($class, $suffix=true) {
|
||||
$path = str_replace('\\', '/', $class);
|
||||
$suffix = ($suffix ? ".class" : "");
|
||||
@ -41,22 +34,4 @@ if ($installation) {
|
||||
}
|
||||
|
||||
die($document->getCode());
|
||||
|
||||
// if(!file_exists($configPath)) {
|
||||
// require_once 'core/objects/User.php';
|
||||
// require_once 'core/documents/install.php';
|
||||
//
|
||||
// // $user = new CUser(null);
|
||||
// // $installPage = new CDocumentInstall($user);
|
||||
// // die($installPage->getCode());
|
||||
// } else {
|
||||
// $perms = fileperms($configPath);
|
||||
// if($perms != 0x8600) {
|
||||
// die("<b>Invalid conf file permissions</b>. expected permissions: 8600, got: $perms");
|
||||
// }
|
||||
//
|
||||
// require_once $configPath;
|
||||
// // require_once realpath($_SERVER['DOCUMENT_ROOT']) . '/php/pages/home.php';
|
||||
// // CDocument::createDocument(CDocumentHome::class);
|
||||
// }
|
||||
?>
|
||||
|
@ -120,6 +120,10 @@ $(document).ready(function() {
|
||||
});
|
||||
});
|
||||
|
||||
$("#btnFinish").click(function() {
|
||||
window.location.reload();
|
||||
});
|
||||
|
||||
$("#btnRetry").click(function() {
|
||||
retry();
|
||||
});
|
||||
|
Loading…
Reference in New Issue
Block a user