diff --git a/.gitignore b/.gitignore index bf03668..ff7b9e7 100644 --- a/.gitignore +++ b/.gitignore @@ -62,4 +62,4 @@ logs/* mail.log vendor/canary/logs/* docker/.env -.env \ No newline at end of file +.env diff --git a/app/classes/installer.php b/app/classes/installer.php index e433a15..4db019b 100644 --- a/app/classes/installer.php +++ b/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; } diff --git a/app/plugins/bookmarks/plugin.php b/app/plugins/bookmarks/plugin.php index 45b5b43..44e5a62 100644 --- a/app/plugins/bookmarks/plugin.php +++ b/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 ); - } } diff --git a/app/plugins/initiativetracker/models/inithistory.php b/app/plugins/initiativetracker/models/inithistory.php index 678c9f9..76ae078 100644 --- a/app/plugins/initiativetracker/models/inithistory.php +++ b/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' ],