mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00
Code Issues Releases Wiki Activity

e107 installation updated for PHP8.1. Bootstrap5 is now the default theme. Acceptance test updated.

Browse Source
This commit is contained in:
Cameron
2021-11-29 13:45:02 -08:00
parent afc0489e8c
commit 6f309bb326
7 changed files with 304 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

473
e107_tests/composer.lock generated
View File

File diff suppressed because it is too large Load Diff

11
e107_tests/tests/acceptance/0000_InstallCest.php
View File

@@ -23,7 +23,7 @@ class InstallCest
public function installDefault(AcceptanceTester $I) public function installDefault(AcceptanceTester $I)
{ {
$I->wantTo("Install e107 with default settings"); $I->wantTo("Install e107 with default settings"); // bootstrap5.
$this->installe107($I); $this->installe107($I);
$this->checkAdminButtonWelcomeMessage($I); $this->checkAdminButtonWelcomeMessage($I);
$this->testNoUpdatesRequired($I); $this->testNoUpdatesRequired($I);
@@ -46,16 +46,15 @@ class InstallCest
$I->see("Blue"); $I->see("Blue");
} }
/*
public function installVoux(AcceptanceTester $I) public function installVoux(AcceptanceTester $I)
{ {
$I->wantTo("Install e107 with Voux theme and db starting with digits"); $I->wantTo("Install e107 with Voux theme");
$this->installe107($I, array('sitetheme'=>'voux', 'db'=>'123xyz')); $this->installe107($I, array('sitetheme'=>'voux'));
$this->checkAdminButtonWelcomeMessage($I); $this->checkAdminButtonWelcomeMessage($I);
$this->testNoUpdatesRequired($I); $this->testNoUpdatesRequired($I);
$this->checkTinyMceIsInstalled($I); $this->checkTinyMceIsInstalled($I);
}
}*/
private function installe107(AcceptanceTester $I, $params = array()) private function installe107(AcceptanceTester $I, $params = array())
{ {

1
e107_themes/bootstrap5/layouts/home_layout.html
View File

@@ -1,6 +1,7 @@
<!-- place for Featurebox or any masthead solution --> <!-- place for Featurebox or any masthead solution -->
{SETSTYLE=bare} {SETSTYLE=bare}
{HERO} {HERO}
{WMESSAGE}
{MENU=1} {MENU=1}
<!-- Page Content --> <!-- Page Content -->

BIN
e107_themes/bootstrap5/preview_frontend.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 79 KiB

6
e107_themes/bootstrap5/style.css
View File

@@ -102,11 +102,11 @@ ul.social-buttons li a {
/* */ /* */
.jumbotron { .jumbotron {
margin-top: 60px; /* margin-top: 60px;*/
padding: 2rem 1rem; padding: 2rem 1rem;
margin-bottom: 2rem; /* margin-bottom: 2rem;*/
background-color: #e9ecef; background-color: #e9ecef;
border-radius: .3rem; /* border-radius: .3rem;*/
} }
/* CUSTOM Responsive Styles */ /* CUSTOM Responsive Styles */

8
e107_themes/bootstrap5/theme.xml
View File

@@ -1,15 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e107Theme name="Bootstrap 5" version="1.0" date="2021-03-22" compatibility="2.3.1"> <e107Theme name="Bootstrap 5" version="1.0" date="2021-03-22" compatibility="2.3.1">
<author name ="e107 Inc" email="e107inc@something.com" url="http://e107.org" /> <author name ="e107 Inc" email="e107inc@something.com" url="https://e107.org" />
<summary>Bootstrap 5 basic theme</summary> <summary>Bootstrap 5 basic theme</summary>
<description>A starter template for bootstrap5 themes.</description> <description>A starter template for bootstrap5 themes.</description>
<category>generic</category> <category>generic</category>
<plugins> <plugins>
<plugin name='gallery' url='core' />
<plugin name='hero' url='core' />
<plugin name='rss_menu' url='core' />
<plugin name='social' url='core' /> <plugin name='social' url='core' />
<plugin name='featurebox' url='core' /> <plugin name='tinymce4' url='core' />
</plugins> </plugins>
<keywords> <keywords>
<word>bootstrap</word> <word>bootstrap</word>
<word>bootstrap5</word>
<word>clean</word> <word>clean</word>
<word>wireframe</word> <word>wireframe</word>
</keywords> </keywords>

8
install.php
View File

@@ -25,7 +25,7 @@ $HANDLERS_DIRECTORY = "e107_handlers/"; // needed for e107 class init
header('Content-type: text/html; charset=utf-8'); header('Content-type: text/html; charset=utf-8');
define("e107_INIT", TRUE); define("e107_INIT", TRUE);
define("DEFAULT_INSTALL_THEME", 'voux'); define("DEFAULT_INSTALL_THEME", 'bootstrap5');
$e107info = array(); $e107info = array();
require_once("e107_admin/ver.php"); require_once("e107_admin/ver.php");
@@ -124,7 +124,7 @@ class installLog
$logFile = __DIR__ .'/'.self::logFile; // e107InstallLog.log'; $logFile = __DIR__ .'/'.self::logFile; // e107InstallLog.log';
$now = time(); $now = time();
$message = $now.', '.gmstrftime('%y-%m-%d %H:%M:%S',$now)."\t".$type."\t".$message."\n"; $message = $now.', '.date('c')."\t".$type."\t".$message."\n";
file_put_contents($logFile, $message, FILE_APPEND); file_put_contents($logFile, $message, FILE_APPEND);
@@ -1505,6 +1505,8 @@ class e_install
\$MEDIA_DIRECTORY = '{$this->e107->e107_dirs['MEDIA_DIRECTORY']}'; \$MEDIA_DIRECTORY = '{$this->e107->e107_dirs['MEDIA_DIRECTORY']}';
\$SYSTEM_DIRECTORY = '{$this->e107->e107_dirs['SYSTEM_DIRECTORY']}'; \$SYSTEM_DIRECTORY = '{$this->e107->e107_dirs['SYSTEM_DIRECTORY']}';
\$E107_CONFIG = ['site_path' => '{$this->previous_steps['paths']['hash']}'];
// -- Optional -- // -- Optional --
// define('e_DEBUG', true); // Enable debug mode to allow displaying of errors // define('e_DEBUG', true); // Enable debug mode to allow displaying of errors
@@ -1655,7 +1657,7 @@ if($this->pdo == true)
global $e_forms; global $e_forms;
$data = array('name'=>$this->previous_steps['prefs']['sitename'], 'theme'=>$this->previous_steps['prefs']['sitetheme'], 'language'=>$this->previous_steps['language'], 'url'=>$_SERVER['HTTP_REFERER']); $data = array('name'=>$this->previous_steps['prefs']['sitename'], 'theme'=>$this->previous_steps['prefs']['sitetheme'], 'language'=>$this->previous_steps['language'], 'url'=>$_SERVER['HTTP_REFERER']);
$base = base64_encode(http_build_query($data, null)); $base = base64_encode(http_build_query($data, ''));
$url = "https://e107.org/e-install/".$base; $url = "https://e107.org/e-install/".$base;
$e_forms->add_plain_html("<img src='".$url."' style='width:1px; height:1px' />"); $e_forms->add_plain_html("<img src='".$url."' style='width:1px; height:1px' />");