Merge pull request #10 from PlanetTheCloud/1.8

1.8
PlanetTheCloud · Jun 9, 2020 · 3269444 · 3269444
2 parents 56bd457 + 7a5a034
commit 3269444
Show file tree

Hide file tree

Showing 40 changed files with 1,229 additions and 2,055 deletions.
diff --git a/.htaccess b/.htaccess
@@ -2,5 +2,21 @@
 Options -MultiViews
 RewriteEngine on
 
+# Error Pages
+RewriteRule ^auth/error /error.php [NC,L]
+
+# Errors
+ErrorDocument 400 /auth/error?code=400
+ErrorDocument 401 /auth/error?code=401
+ErrorDocument 403 /auth/error?code=403
+ErrorDocument 404 /auth/error?code=404
+ErrorDocument 500 /auth/error?code=500
+
+# Assets
+RewriteRule ^auth/assets/(.*)?$ /sys-auth/assets/$1 [NC,L]
+
+# API
+RewriteRule ^auth/api/(.*)?$ /sys-auth/api/$1.php [NC,L]
+
 # Authentication
-RewriteRule ^auth/(.*)?$ /sys-auth/$1 [NC,L]
+RewriteRule ^auth/(.*)?$ /sys-auth/$1.php [NC,L]
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/README.md b/README.md
@@ -1,24 +1,15 @@
-# MyOwnFreeHost Project LOGGED
-A free and open source Material Design based login, sign up and terms template created by [PlanetCloud](https://www.byet.net/index.php?/profile/528767-planetcloud/).
+# Project LOGGED v1.8
 
-### Important  
-**You have to change the branding to your own company's one!**
+A free and open-sourced authentication template created. Created by [PlanetCloud/PlanetTheCloud](https://www.byet.net/index.php?/profile/528767-planetcloud/) for the MyOwnFreeHost community
 
-Version 1.6r will be the final version available publicly.  
-**Version 1.7x, coming in hot for beta testers of LOGGED Project Family.**  
-More information can be found on our Discord:  
+# Getting Started
+Check the Wiki [Setup Instruction (1.8)](https://github.com/PlanetTheCloud/project-logged/wiki/Setup-Instruction-(1.8)) to get started.
 
+# Support
 <a href="https://discord.gg/j8xSZRF"><img src="https://discordapp.com/api/guilds/399429466566426635/widget.png?style=banner2" alt="Join our Discord Server" title="Planet Dev Network"></a>
 
-**Please read [the license](LICENSE.md) before using any of the code.**
+# Contributions
+All contributions are apreciated. If you want to contribute, please file an issue (for bug report, etc.) or submit a pull request (feature addition or fixing bugs, etc.).
 
-### Versions
-- 1.8 (WIP)
-- [1.6r](https://github.com/PlanetGamingGG/project-logged/tree/master) (Current Master)  
-- [1.6r](https://github.com/PlanetGamingGG/project-logged/releases/tag/1.6r) (Latest Release)
-- [1.6b](https://github.com/PlanetGamingGG/project-logged/releases/tag/1.6b)
-
-Please use [the latest release](https://github.com/PlanetGamingGG/project-logged/releases/latest) as it is more stable than the `master` branch.  
-
-### Setup Instructions
-Please refer to [our Wiki](https://github.com/PlanetGamingGG/project-logged/wiki).
+# License
+This project is licensed under the MIT License.
diff --git a/error.php b/error.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * Project LOGGED v1.8 Error Page
+ * ---
+ * No modifications is necessary in this file.
+ */
+
+define('THIS_DIR', dirname(__FILE__));
+require THIS_DIR . '/sys-auth/app/app.php';
+
+session_start();
+$message = (isset($_SESSION['errorMessage'])) ? $_SESSION['errorMessage'] : 'Something went wrong.';
+$_SESSION['errorMessage'] = null;
+
+?>
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge">
+    <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+    <title><?= config('page.titles.error') . ' - ' . config('company.name'); ?></title>
+
+    <link rel="icon" href="<?= config('company.favicon'); ?>" type="image/x-icon">
+    <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">
+    <link href="/auth/assets/style.css" rel="stylesheet">
+</head>
+
+<body class="login-page">
+    <div class="login-box">
+        <div class="logo">
+            <?php
+            if (config('company.logo_type') == 'text') {
+                echo '<a href="' . config('company.main_domain') . '">' . config('company.name') . '</a>';
+            } else {
+                echo '<p style="text-align:center"><img src="' . config('company.logo') . '" alt="' . config('company.name') . ' logo"/></p>';
+            }
+            ?>
+            <small><?= config('company.slogan'); ?></small>
+        </div>
+        <div class="card">
+            <div class="body">
+                <div class="msg">
+                    <h2>Error!</h2>
+                    <?php
+                    echo $message;
+                    if (config('sys.enable_login_form')) {
+                        $color = config('sys.color_scheme');
+                        echo "<br><br><a href=\"/auth/login\" class=\"btn btn-block bg-{$color} waves-effect\">Back to Login Page</a>";
+                    } else {
+                        echo "<br><br>Login has been disabled on this site.";
+                    }
+                    ?>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script src="/auth/assets/material.js"></script>
+</body>
+
+</html>