additional licenses, updated README, remodeled about page

This commit is contained in:
crispycat 2024-05-21 23:38:15 -04:00
parent e96d3f9c1c
commit bee067a898
9 changed files with 101 additions and 16 deletions

View File

@ -1,3 +1,5 @@
# crispage
# Crispage
Crispage is CMS software with a focus on flexibility, modularity and lightness. It is designed for LAMP servers and is compatible with PHP 8.1+.
Crispage is free CMS and web application software designed to be fast, light and modular. It is compatible with PHP 8.1+ and is designed to run on LAMP server stacks.
### [Crispage on crispy.cat](https://crispy.cat/software/crispage) | [Matrix Chat](https://matrix.to/#/#crispage:matrix.calitabby.com) | [Documentation](https://git.calitabby.com/crispage/crispage/wiki)

View File

@ -0,0 +1,21 @@
The MIT License (MIT)
Copyright (c) 2023 Jeremy Thomas
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

View File

@ -0,0 +1,37 @@
Original readme (from author of the icons)
----------
Silk icon set 1.3
_________________________________________
Mark James
http://www.famfamfam.com/lab/icons/silk/
_________________________________________
This work is licensed under a
Creative Commons Attribution 2.5 License.
[ http://creativecommons.org/licenses/by/2.5/ ]
This means you may use it for any purpose,
and make any changes you like.
All I ask is that you include a link back
to this page in your credits.
Are you using this icon set? Send me an email
(including a link or picture if available) to
mjames@gmail.com
Any other questions about this icon set please
contact mjames@gmail.com
About the rest (all this repository but the icons)
----------
All the content of this repository (excepted the icon pack)
is licensed under the [MIT license](http://opensource.org/licenses/MIT).
Though, it is just composed a few trivial json files and a Readme.

View File

@ -31,4 +31,7 @@ cp -rv "$REPO_DIR$LIB_PATH"/* "$WORK_DIR$LIB_PATH";
cp -rv "$REPO_DIR$MEDIALIB_PATH"/* "$WORK_DIR$MEDIALIB_PATH";
cp -rv "$REPO_DIR$LICENSE_PATH"/* "$WORK_DIR$LICENSE_PATH";
echo "Adding .htaccess to lib"
echo "Require all denied" > "$WORK_DIR$LIB_PATH/.htaccess";
echo "Copied";

View File

@ -15,6 +15,16 @@
defined("ROOT") or die();
class AboutAction extends \Crispage\Framework\Action {
public const LICENSES = [
"Crispage" => ROOT . "/_license/Crispage.license.txt",
"PHPMailer" => ROOT . "/_license/PHPMailer.license.txt",
"jQuery" => ROOT . "/_license/jQuery.license.txt",
"CodeMirror" => ROOT . "/_license/CodeMirror.license.txt",
"CKEditor" => ROOT . "/_license/CKEditor.license.txt",
"Bulma" => ROOT . "/_license/Bulma.license.txt",
"Silkicons" => ROOT . "/_license/Silkicons.license.txt"
];
public static function getExtensionInfo(): array {
return [
"id" => "crispage.actions.backend.about",
@ -27,12 +37,16 @@
}
public function run(): void {
$licenses = [];
foreach (self::LICENSES as $lib => $path)
$licenses[$lib] = htmlentities(wordwrap(file_get_contents($path), 80));
// Set title
$this->app->page->data["title"] = $this->app->i18n->getTranslation("ABOUT_CRISPAGE");
// Set main component
$com = $this->app->page->createComponent(
"\\Crispage\\Components\\Backend\\AboutComponent", []
"\\Crispage\\Components\\Backend\\AboutComponent", ["licenses" => $licenses]
);
$this->app->page->setMainComponent($com);

View File

@ -47,18 +47,23 @@
<a class="button is-info" href="https://matrix.to/#/#crispage:matrix.calitabby.com">
<?php ($this->app->i18n)("{%MATRIX_CHAT}"); ?>
</a>
<a class="button is-success" href="https://git.calitabby.com/crispage/crispage/wiki">
<?php ($this->app->i18n)("{%DOCUMENTATION}"); ?>
</a>
</div>
<hr />
<p>
<?php
($this->app->i18n)(
"{%ABOUTTEXT_2}",
"<a href=\"https://www.gnu.org/licenses/\">https://www.gnu.org/licenses/</a>"
);
?>
</p>
<h2 class="title is-3"><?php ($this->app->i18n)("{%LICENSES}"); ?></h2>
<p><?php ($this->app->i18n)("{%ABOUTTEXT_2}"); ?></p>
<br />
<?php foreach ($this->data["licenses"] as $lib => $license) { ?>
<h2 class="title is-4"><?php echo $lib; ?></h2>
<pre style="overflow: scroll; height: 200px;"><?php echo $license; ?></pre>
<br />
<?php } ?>
</div>
<div class="column is-one-third">
<?php
@ -69,9 +74,9 @@
"\\Crispage\\Components\\Backend\\UpdatesComponent", []
);
$this->app->page->renderComponent($com_sysinf);
echo "<br />";
$this->app->page->renderComponent($com_updates);
echo "<br />";
$this->app->page->renderComponent($com_sysinf);
?>
</div>
</div>

View File

@ -65,7 +65,7 @@
<td class="has-text-weight-bold">
<?php ($this->app->i18n)("{%DATABASE}"); ?>
</td>
<td><?php echo $this->app->database->dsn; ?></td>
<td><?php echo preg_replace("/(;|(?<=:))/", "<br />", $this->app->database->dsn); ?></td>
</tr>
<tr>
<td class="has-text-weight-bold">

View File

@ -6,7 +6,7 @@ version = 0.1.0
[Translations]
ABOUT = About
ABOUT_CRISPAGE = About Crispage
ABOUTTEXT_1 = "Crispage is CMS software with a focus on flexibility, modularity and lightness. It is designed for LAMP servers and is compatible with PHP 8.1+."
ABOUTTEXT_1 = "Crispage is free CMS and web application software designed to be fast, light and modular. It is compatible with PHP 8.1+ and is designed to run on LAMP server stacks."
ABOUTTEXT_2 = "Crispage is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
@ -14,7 +14,7 @@ ABOUTTEXT_2 = "Crispage is free software: you can redistribute it and/or modi
Crispage is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br /><br />
You should have received a copy of the GNU General Public License along with Crispage. If not, see %s."
A copy of the GNU General Public License and the licenses for the libraries which Crispage is built on can be found below."
ACCOUNT_CONFIRM_TIMEOUT = "Account confirmation timeout (seconds, 0 ⇒ disable)"
ACCOUNT_CONFIRMED_ = Account confirmed. You may now log in.
ACCOUNT_DISABLED = Account disabled. Please contact the webmaster.
@ -87,6 +87,7 @@ DELETE_OCCUPIED_DIRECTORIES=Delete occupied directories
DISABLED = Disabled
DISPLAY_NAME = Display Name
DOCS = Docs
DOCUMENTATION = Documentation
EDIT = Edit
EDITOR_TITLE_CREATE = New %s
EDITOR_TITLE_EDIT = Edit" '%s'"
@ -139,6 +140,7 @@ LABEL = Label
LAST_LOGIN = Last Login
LAYOUT = Layout
LEAVE_BLANK__PASSWORD = Leave blank if you do not wish to change your password.
LICENSES = Licenses
LINK_EXPIRED = Link expired
LANGUAGE = Language
LOAD_AVERAGE = Load average

1
lib/.htaccess Normal file
View File

@ -0,0 +1 @@
Require all denied