Hotfix 3.1.6 (#2068)

[egbot]

• 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: [Bug] Sanitizing institution data harvested from GrSciColl breaks functionality BioKIC/Symbiota#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 BioKIC#1702 (comment)

• 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: Missing key length for IX_occurrences_locality in omoccurrences BioKIC/Symbiota#2050

• removed arrow functions and union types

• replaced str_contains with str_pos

---

Pull Request Checklist:

Pre-Approval

• There is a description section in the pull request that details what the proposed changes do. It can be very brief if need be, but it ought to exist.
• Hotfixes should be branched off of the master branch and PR'd using the merge option (not squashed) into the hotfix branch.
• Features and backlog bugs should be merged into the Development branch, NOT master
• All new text is preferably internationalized (i.e., no end-user-visible text is hard-coded on the PHP pages), and the spreadsheet tracking internationalizations has been updated either with a new row or with checkmarks to existing rows.
• There are no linter errors
• New features have responsive design (i.e., look aesthetically pleasing both full screen and with small or mobile screens)
• Symbiota coding standards have been followed
• If any files have been reformatted (e.g., by an autoformatter), the reformat is its own, separate commit in the PR
• Comment which GitHub issue(s), if any does this PR address
• If this PR makes any changes that would require additional configuration of any Symbiota portals outside of the files tracked in this repository, make sure that those changes are detailed in this document.

Post-Approval

• It is the code author's responsibility to merge their own pull request after it has been approved
• If this PR represents a merge into the Development branch, remember to use the squash & merge option
• If this PR represents a merge into the hotfix branch, remember to use the merge option (i.e., no squash).
• If this PR represents a merge from the Development branch into the master branch, remember to use the merge option
• If this PR represents a merge from the hotfix branch into the master branch use the squash & merge option
  • a subsequent PR from master into Development should be made with the merge option (i.e., no squash).
  • Immediately delete the hotfix branch and create a new hotfix branch
  • increment the Symbiota version number in the symbase.php file and commit to the hotfix branch.
• If the dev team has agreed that this PR represents the last PR going into the Development branch before a tagged release (i.e., before an imminent merge into the master branch), make sure to notify the team and lock the Development branch to prevent accidental merges while QA takes place. Follow the release protocol here.
• Don't forget to delete your feature branch upon merge. Ignore this step as required.

Thanks for contributing and keeping it clean!