Merge remote-tracking branch 'origin/update_PHP_deps_20240813062630'

.gitignore

@@ -62,3 +62,4 @@ logs/*
 mail.log
 vendor/canary/logs/*
 docker/.env
+.env

app/classes/installer.php

@@ -266,6 +266,7 @@ class Installer {
     }
 
     public function getModelInfo( $filename, $folder = '' ) {
+        Debug::debug( 'getModelInfo filename: ' . $filename . ', folder: ' . $folder);
         $object = self::emptyModule( 'model', $folder, $filename );
 
         if ( ! class_exists( $object->class ) ) {
@@ -363,7 +364,7 @@ class Installer {
             return false;
         }
 
-        $errors[] = [ 'errorInfo' => $module_data['name'] . " has been installed." ];
+        $errors[] = [ 'errorInfo' => $module_data['name'] . " Plugin has been installed." ];
         self::$errors = array_merge( self::$errors, $errors );
         return true;
     }
@@ -393,7 +394,7 @@ class Installer {
         }
 
         $this->removeModule( $module_data->name, true );
-        $errors[] = [ 'errorInfo' => $module_data->name . " has been installed." ];
+        $errors[] = [ 'errorInfo' => $module_data->name . " Plugin has been uninstalled." ];
         self::$errors = array_merge( self::$errors, $errors );
         return true;
     }
@@ -438,7 +439,7 @@ class Installer {
 
                 // exclude any flags we don't have a matric map for
                 if ( empty( $module_data->class_object->$matrix ) ) {
-                    Debug::warn( "$flag_type does not have a proper matrix map and cannot be installed." );
+                    Debug::warn( "$flag_type does not have a proper matrix map and cannot be uninstalled." );
                     $module_data->$flag_type = INSTALL_STATUS_NOT_FOUND;
                 }
             }
@@ -465,7 +466,7 @@ class Installer {
             return false;
         }
 
-        $errors[] = [ 'errorInfo' => $module_data['name'] . " has been installed." ];
+        $errors[] = [ 'errorInfo' => $module_data['name'] . " model has been installed." ];
         self::$errors = array_merge( self::$errors, $errors );
         return true;
     }
@@ -512,7 +513,7 @@ class Installer {
             return false;
         }
 
-        $errors[] = [ 'errorInfo' => $module_data->name . " has been uninstalled." ];
+        $errors[] = [ 'errorInfo' => $module_data->name . " model has been uninstalled." ];
         self::$errors = array_merge( self::$errors, $errors );
         return true;
     }

app/plugins/bookmarks/plugin.php

@@ -32,10 +32,6 @@ class Bookmarks extends Plugin {
             'pretty' => 'Can use the bookmarks feature',
             'default' => false,
         ],
-        'createEvents' => [
-            'pretty' => 'Can add events to bookmarks',
-            'default' => false,
-        ],
     ];
     public $main_links = [
         [
@@ -51,12 +47,4 @@ class Bookmarks extends Plugin {
             'default' => true,
         ],
     ];
-    public $bookmarks;
-    public $folders;
-    
-    public function __construct( $load = false ) {
-        $this->bookmarks = new Bookmark;
-        $this->folders = new Folders;
-        parent::__construct( $load );
-    }
 }

app/plugins/initiativetracker/models/inithistory.php

@@ -22,7 +22,7 @@ use TheTempusProject\Plugins\Feedback as Plugin;
 use TheTempusProject\TheTempusProject as App;
 
 class Inithistory extends DatabaseModel {
-    public $tableName = 'feedback';
+    public $tableName = 'initiative_history';
     public $databaseMatrix = [
         [ 'name', 'varchar', '128' ],
         [ 'time', 'int', '10' ],

composer.lock

@@ -60,11 +60,11 @@
         },
         {
             "name": "thetempusproject/bedrock",
-            "version": "1.0.5",
+            "version": "1.0.7",
             "source": {
                 "type": "git",
                 "url": "https://git.thetempusproject.com/the-tempus-project/bedrock",
-                "reference": "79f21773c66a4b87e6a172cab3da23029c2441fd"
+                "reference": "85ed1def88d29b78f3ef58c06d77766ddda3c3a3"
             },
             "require": {
                 "php": ">=8.1.0",
@@ -101,7 +101,7 @@
                 "framework",
                 "mvc"
             ],
-            "time": "2024-08-09T21:18:24+00:00"
+            "time": "2024-08-13T06:25:11+00:00"
         },
         {
             "name": "thetempusproject/canary",
@@ -191,11 +191,11 @@
         },
         {
             "name": "thetempusproject/houdini",
-            "version": "1.0.6",
+            "version": "1.0.7",
             "source": {
                 "type": "git",
                 "url": "https://git.thetempusproject.com/the-tempus-project/houdini",
-                "reference": "168a9ee805a7ec9df222b77397e8cd8fb74f6cb1"
+                "reference": "4d2ccfb1c5f18dba9886405e7e6e2264e04e1f89"
             },
             "require": {
                 "php": ">=8.1.0",
@@ -231,7 +231,7 @@
                 "thetempusproject",
                 "tools"
             ],
-            "time": "2024-08-13T02:38:33+00:00"
+            "time": "2024-08-13T03:43:46+00:00"
         },
         {
             "name": "twbs/bootstrap",

install.php

@@ -99,18 +99,26 @@ class Install extends Controller {
             Debug::error( 'install hash not found on file.' );
             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.' );
             return false;
         }
-        if ( Cookie::exists( 'installHash' ) && !Session::exists( 'installHash' ) ) {
-            if ( Cookie::get( 'installHash' ) !== $this->installer->getNode('installHash') ) {
+        if ( $cookie && ! $session ) {
+            if ( $cookie !== $file ) {
+                Debug::error( 'install cookie did not match install file.' );
                 Cookie::delete( 'installHash' );
                 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' );
             return false;
         }