the-tempus-project/thetempusproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: the-tempus-project:3.0.9
Branches Tags
the-tempus-project:main
the-tempus-project:5.1.2 the-tempus-project:5.1.1 the-tempus-project:5.1 the-tempus-project:5.0 the-tempus-project:4.1.1 the-tempus-project:4.1 the-tempus-project:4.0.4 the-tempus-project:4.0.3 the-tempus-project:4.0.2 the-tempus-project:4.0.1 the-tempus-project:4.0 the-tempus-project:3.0.17 the-tempus-project:3.0.16 the-tempus-project:3.0.15 the-tempus-project:3.0.14 the-tempus-project:3.0.13 the-tempus-project:3.0.12 the-tempus-project:3.0.11 the-tempus-project:3.0.10 the-tempus-project:3.0.9 the-tempus-project:3.0.8 the-tempus-project:3.0.7 the-tempus-project:3.0.6 the-tempus-project:3.0.5 the-tempus-project:3.0.4 the-tempus-project:3.0.3 the-tempus-project:3.0.2 the-tempus-project:3.0.1 the-tempus-project:3.0
...
compare: the-tempus-project:3.0.11
Branches Tags
the-tempus-project:main
the-tempus-project:5.1.2 the-tempus-project:5.1.1 the-tempus-project:5.1 the-tempus-project:5.0 the-tempus-project:4.1.1 the-tempus-project:4.1 the-tempus-project:4.0.4 the-tempus-project:4.0.3 the-tempus-project:4.0.2 the-tempus-project:4.0.1 the-tempus-project:4.0 the-tempus-project:3.0.17 the-tempus-project:3.0.16 the-tempus-project:3.0.15 the-tempus-project:3.0.14 the-tempus-project:3.0.13 the-tempus-project:3.0.12 the-tempus-project:3.0.11 the-tempus-project:3.0.10 the-tempus-project:3.0.9 the-tempus-project:3.0.8 the-tempus-project:3.0.7 the-tempus-project:3.0.6 the-tempus-project:3.0.5 the-tempus-project:3.0.4 the-tempus-project:3.0.3 the-tempus-project:3.0.2 the-tempus-project:3.0.1 the-tempus-project:3.0

6 Commits
3.0.9 ... 3.0.11

Author SHA1 Message Date
Joey Kimsey
b8c75a128a Merge remote-tracking branch 'origin/update_PHP_deps_20240813063608' 2024-08-13 02:36:31 -04:00
root
e4e72905fc Update PHP dependencies [20240813063608] 2024-08-13 06:36:12 +00:00
Joey Kimsey
74e9af4539 bookmark bugfix 2024-08-13 02:35:55 -04:00
Joey Kimsey
46c0376dfc Merge remote-tracking branch 'origin/update_PHP_deps_20240813062630' 2024-08-13 02:27:10 -04:00
root
90ba704a69 Update PHP dependencies [20240813062630] 2024-08-13 06:26:32 +00:00
Joey Kimsey
fb92682eed install improvements 2024-08-13 02:26:19 -04:00
3 changed files with 17 additions and 9 deletions
Expand all files Collapse all files

2
app/plugins/bookmarks/models/bookmarkViews.php
View File

@ -20,7 +20,7 @@ use TheTempusProject\TheTempusProject as App;
use TheTempusProject\Houdini\Classes\Filters; use TheTempusProject\Houdini\Classes\Filters;
use TheTempusProject\Bedrock\Classes\CustomException; use TheTempusProject\Bedrock\Classes\CustomException;
class BookmarkViews extends DatabaseModel { class Bookmarkviews extends DatabaseModel {
public $tableName = 'bookmark_views'; public $tableName = 'bookmark_views';
public $databaseMatrix = [ public $databaseMatrix = [
[ 'title', 'varchar', '256' ], [ 'title', 'varchar', '256' ],

6
composer.lock generated
View File

@ -60,11 +60,11 @@
}, },
{ {
"name": "thetempusproject/bedrock", "name": "thetempusproject/bedrock",
"version": "1.0.6", "version": "1.0.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://git.thetempusproject.com/the-tempus-project/bedrock", "url": "https://git.thetempusproject.com/the-tempus-project/bedrock",
"reference": "7228e530b87a124d83fb46985829fd7308bb6173" "reference": "ef4818356ce4cb5c4ceaf09e013f5acd606b7e0a"
}, },
"require": { "require": {
"php": ">=8.1.0", "php": ">=8.1.0",
@ -101,7 +101,7 @@
"framework", "framework",
"mvc" "mvc"
], ],
"time": "2024-08-13T05:16:12+00:00" "time": "2024-08-13T06:35:11+00:00"
}, },
{ {
"name": "thetempusproject/canary", "name": "thetempusproject/canary",

18
install.php
View File

@ -99,18 +99,26 @@ class Install extends Controller {
Debug::error( 'install hash not found on file.' ); Debug::error( 'install hash not found on file.' );
return false; return false;
} }
if ( ! Session::exists( 'installHash' ) && ! Cookie::exists( 'installHash' ) ) { $session = Session::get( 'installHash' );
$cookie = Cookie::get( 'installHash' );
$file = $this->installer->getNode('installHash');
if ( ! $session && ! $cookie ) {
Debug::error( 'install hash not found in session or cookie.' ); Debug::error( 'install hash not found in session or cookie.' );
return false; return false;
} }
if ( Cookie::exists( 'installHash' ) && !Session::exists( 'installHash' ) ) { if ( $cookie && ! $session ) {
if ( Cookie::get( 'installHash' ) !== $this->installer->getNode('installHash') ) { if ( $cookie !== $file ) {
Debug::error( 'install cookie did not match install file.' );
Cookie::delete( 'installHash' ); Cookie::delete( 'installHash' );
return false; return false;
} }
Session::put( 'installHash', Cookie::get( 'installHash' ) ); Debug::error( 'cookie matches file, using as session' );
Session::put( 'installHash', $cookie );
return true;
} }
if ( Session::get( 'installHash' ) !== $this->installer->getNode('installHash') ) { if ( $session !== $file ) {
Debug::error( 'session did not match file, deleting session' );
Session::delete( 'installHash' ); Session::delete( 'installHash' );
return false; return false;
} }