Update Weevil to 3.1.6.1 (#2089)

* Hotfix v.3.1.3  (#1821)

* Hotfix v3.1.3 
- Adjusted hotfix merge instructions
- Inventory Management: Bug fix interfering with adding new editors to an inventory project
- Image migration modifications
-- Add option to copy over existing target files
-- Add checks and error handling for non-existent source files and already existing target files
-- Direct log files to be written to /content/logs/
- fix misspelled log directory name, with support still maintained for portals that already have the misspelled directory
- Fix jquery selector to be correct so button is enabled when trait is changed
- Misc language file and wording adjustments

* Hotfix 3.1.4  (#1858)

- Checklist voucher link bug 
-- Resolves issue where checklist link PK is not passed to link function. 
-- Resolves issue: #1828
- Specimen upload bug
-- Add IGNORE to avoid complete failure of insert statement
-- Capture and display warnings to user
-- Fix display of final record process count
- Occurrence Search breadcrumb bug fix 
-- Add comingFrom variable to pagination links within the list and tablelist pages
-- If comingFrom variable is not set, or set to anything other than "newsearch" or "harvestparams", set the variable to what is defined as the default within the symbini file. If default action is not defined within symbini, default to new search form.
-- Add comingFrom variable to harvestparams.php form
-- Resolves issue: #1840
- Occurrence Association Form Validation bug
-- Fix issue with internal association form validation failing and allowing for creation of an association without an internal occurrence being defined
-- Add form validation for external resource and general observation
-- Addresses issue: #1852
-- Add guid omoassociations RecordID on insert within occurrence editor
- Vendor library updates via composer 
-- update phpoffice/phpspreadsheet to v3.3.0
-- updated phpseclib/phpseclib explicitly to v3.0.42
-- update phpoffice/phpword to v1.3.0
- Fix data binding bug associated with searching occurrence via GUID within Occurrence Profile pages 
- Misc language translation issues

* Hotfix 3.1.5 (#1956)

* Add login form button to prevent circular links
* Bump symfony/process from 5.4.19 to 5.4.46 in /api
* Bump symfony/http-foundation from 5.4.20 to 5.4.46 in /api
* Remove non-template contacts and aboutproject files (#1864)
* Add condition for elevation type number in searchform.js, fixed typo for maximum elevation
* Fix typos
* Unify top/northern, bottom/southern usage
* Fix image alignment and button names in flashcards (#1881)
* Fix image alignment and button names
* Add stylesheet, removed in-line styling, added flex classes for games in main.css
* Fix over-translated lang tags (#1911)
* closes #1916 by removing union return type
* Fix parsing issue
* Fix (#1920)
* Resolve editor lock bug
* Resolves issue: #1923
* Collection Profile issue
* Add form value interpolation for EW NS and units values so sessions is loaded correctly
* Update API Vendor Libraries
* Closes #1942 Adjust Language Tags of Cross Portal Results
* Improve Sign-in and Contact Us button layout on <768px wide devices.

---------
Co-authored-by: Edward Gilbert <[email protected]>
Co-authored-by: Katie Pearson <[email protected]>
Co-authored-by: Nikita Salikov <[email protected]>
Co-authored-by: MuchQuak <[email protected]>

* Header render Fixes (#1962)

* Switch header buttons to use HTML button element for better UX
* Adjust styling to restoring honoring header button text color
* Improve header button layout on <768px display

* Update main.css

Setting transparent background for button-tertiary class.

* Hotfix 3.1.6 (#2068)

* Minor editor fix

- Remove head from editor due to causing more disruptions than benefits due to variations within portals central css stylings. Best to integrate head into new redesign of occurrence editor.

* Update hotfix version (3.1.6)

* closes #1954 Fixes use of hidden button and button submit value

Fix transfer taxa form so that action is submited in the request

* Fixing Login Form CSS closes #1975

# Issue #1975

# Summary
input id value for email was "login" and css rule `#login {float:
right}` was being applied to this accidently causing some odd behavior.
Changed id of login so the collid wouldn't happen and bumped the width
of the form so that it will display correctly.

* resolve merge conflict

* Occurrence Profile bugs

- Adjust editor permissions check so that it includes  creator of general research collections (observerUid = active user)
- Avoid double sanitation of identifier and collector

* Update geolocate.php (#1996)

Fixes minor typo that occurs in error message

* hotfix - protection

- If collid input is a number + single quote, assume it's an SQL Inject support and set value to 0, which returns nothing, rather than putting a load on the server

* Institution Sanitation issue

- Remove sanitation off outbound notes content to avoid interfering with embedded html tags that are added when this field is appended with GriSciColl info.
- Remove sanitation notes which were only meant to communicate to internal team when sanitation content was originally added.
Resolves following issue, in part: #1982

* API Annotation Bug

- Fix issue with missing recordID field from SQL statement definition

* added the changes to hotfix

* Bug adding image

- If user is null, user verification code incorrectly checks to see if there is a user with an empty string username or email. Thus, add code that skips checking user table if login details are an empty value
- Don't add empty strings to database. Keep them as null values.
- Comment out user verification check. Just test to make sure it's a number.

* remove associations changes

* Closes #2040 Sorts By Sciname within family (#2052)

# Issue #2040

# Summary
Adds extra sort conditions so that records are sorted by sciname after
being storted by family.

* Closes #2049 Fixes typo on globals variable

# Issues #2049

# Summary
Fixes typo for `IMAGE_ROOT_PATH` and `IMAGE_ROOT_URL` global variables.
Note this will be overritten in the coming 3.2 changes with the
multimedia changes so maybe it would be worth merging.

* Fix country synonyms, some U.S. states, add U.S. state abbreviations (#2059)

* Closes #2064 Fixing String Number multiply

# Issues #2064

# Summary
Adds as is_numeric check on 'page' request variable so that the
`$pageNumber` variable is alwasys a number

* Update geolocate.php per Nelson's suggestion (#2066)

See #1702 (comment)

Co-authored-by: Edward Gilbert <[email protected]>

* Update db_schema_patch-3.1.sql

- Explicitly set the index for omoccurrences.locality to a length of 100, thus avoid DB setting it to a default larger length that is beyond what is needed nor practical.
Addresses issue: #2050

* removed arrow functions and union types

* replaced str_contains with str_pos

---------

Co-authored-by: Edward Gilbert <[email protected]>
Co-authored-by: MuchQuak <[email protected]>
Co-authored-by: Logan Wilt <[email protected]>
Co-authored-by: atticus29 <[email protected]>
Co-authored-by: Lindsay Walker <[email protected]>
Co-authored-by: Nikita Salikov <[email protected]>
Co-authored-by: NikitaSalikov <[email protected]>
Co-authored-by: Katie Pearson <[email protected]>

* Hotfix (#2085)

Hotfix version 3.1.6.1

* Update index.php

Build occurrence array after protections applied

* Adjustment

- Get observeruid value directly from occData class array, thus avoiding occArr needing to exist prior to permission checks

---------

Co-authored-by: Edward Gilbert <[email protected]>
Co-authored-by: Katie Pearson <[email protected]>

* Update symbbase.php

Revert code version to 3.2

* Revert "Update symbbase.php"

This reverts commit 37e7d1a.

---------

Co-authored-by: Edward Gilbert <[email protected]>
Co-authored-by: Greg Post <[email protected]>
Co-authored-by: MuchQuak <[email protected]>
Co-authored-by: Logan Wilt <[email protected]>
Co-authored-by: atticus29 <[email protected]>
Co-authored-by: Lindsay Walker <[email protected]>
Co-authored-by: Nikita Salikov <[email protected]>
Co-authored-by: NikitaSalikov <[email protected]>
Co-authored-by: Greg Post <[email protected]>

api/app/Http/Controllers/OccurrenceAnnotationController.php

@@ -112,7 +112,7 @@ public function showAllAnnotations(Request $request){
 		$fullCnt = 0;
 		$result = null;
 		if($type == 'internal'){
-			$annotation = DB::table('omoccuredits as e')->select('e.*', 'o.occurrenceID')
+			$annotation = DB::table('omoccuredits as e')->select('e.*', 'o.occurrenceID', 'o.recordID')
 				->join('omoccurrences as o', 'e.occid', '=', 'o.occid')
 				->where('o.collid', $collid);
 			if($fieldName){
@@ -129,7 +129,7 @@ public function showAllAnnotations(Request $request){
 			$result = $this->formatInternalResults($result);
 		}
 		elseif($type == 'external'){
-			$annotation = DB::table('omoccurrevisions as r')->select('r.*', 'o.occurrenceID')
+			$annotation = DB::table('omoccurrevisions as r')->select('r.*', 'o.occurrenceID', 'o.recordID')
 				->join('omoccurrences as o', 'o.occid', '=', 'r.occid')
 				->where('o.collid', $collid);
 			if($source){