Permalink
Browse files

Removed license file from inclusion into installation package, remove…

…d license button in installer
  • Loading branch information...
nazar-pc committed Jan 30, 2018
1 parent e99805a commit bef8c5bda60c4698da59d2bf6629d0a5a54cd51b
@@ -21,9 +21,6 @@ RewriteBase /
Header set Cache-Control "max-age=2592000, immutable"
</ifModule>
</FilesMatch>
<Files license.txt>
RewriteEngine Off
</Files>
<Files *.php>
RewriteEngine Off
</Files>
@@ -82,12 +82,6 @@ public function core ($modules = [], $themes = [], $suffix = null) {
$file = substr($file, $length);
}
unset($index, $file);
/**
* Add license under the file `license-cleverstyle-framework.txt` rather than `license.txt`, so that license is not enforced on projects using it and is
* not overridden on framework update
*/
$phar->addFile("$this->root/license.txt", 'fs/'.count($core_files));
$core_files[] = 'license-cleverstyle-framework.txt';
/**
* Addition of separate files into package
*/
@@ -146,7 +140,6 @@ public function core ($modules = [], $themes = [], $suffix = null) {
* Addition of supplementary files, that are needed directly for installation process: installer with GUI interface, readme, license, some additional
* information about available languages, themes, current version of system
*/
$phar->addFile("$this->root/license.txt", 'license.txt');
$phar->addFile("$this->root/modules/System/meta.json", 'meta.json');
$phar->setStub(
/** @lang PHP */
@@ -287,9 +280,6 @@ protected function get_htaccess () {
Header set Cache-Control "max-age=2592000, immutable"
</ifModule>
</FilesMatch>
<Files license.txt>
RewriteEngine Off
</Files>
RewriteRule .* index.php
HTACCESS;

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -108,10 +108,6 @@ section {
padding : 4px 20px;
position : absolute;

&.license {
left : 15px;
}

&[type=submit] {
right : 15px;
}
@@ -105,12 +105,6 @@ function install_form ($phar_path) {
h::{'input[type=password][name=admin_password]'}()
)
).
h::{'button.license'}(
'License',
[
'onclick' => "window.open('license.txt', 'license', 'location=no')"
]
).
h::{'button[type=submit]'}(
'Install'
)
@@ -1,7 +1,7 @@
{
"package" : "System",
"category" : "modules",
"version" : "7.68.3+build-2693",
"version" : "7.69.0+build-2694",
"description" : "Base system module of CleverStyle Framework",
"author" : "Nazar Mokrynskyi",
"website" : "cleverstyle.org/Framework",
@@ -120,7 +120,6 @@ include __DIR__.'/../_clean.php';
</td>
</tr>
</table>
<button class="license" onclick="window.open(&apos;license.txt&apos;, &apos;license&apos;, &apos;location=no&apos;)" type="button">License</button>
<button type="submit">Install</button>
</form>
</section>

0 comments on commit bef8c5b

Please sign in to comment.