openprivacy
/
lockbox-web
3
1
Fork 1
Code Issues Pull Requests 2 Releases Wiki Activity

Changes to Decrypt.php #1

Open
norman wants to merge 1 commits from norman/lockbox-web:n/decrypt-fix into master
pull from: norman/lockbox-web:n/decrypt-fix
merge into: openprivacy:master
Conversation 0 Commits 1 Files Changed 1 +1 -3
norman commented 2020-12-06 01:23:08 +00:00
Member
Copy Link

Two small changes to the decrypt.php file:

  • Removed reference to config.inc.php - There didn't seem to be any dependency on the config.inc.php file and the decryption ran fine without this line. Removed to make easier/clearer for standalone use of the decrypr script

  • Changed how json was parsed - During initial test setup, the decrypt script gave errors based on eval('$vars = '.$decryptedData.';'); with PHP 7.4.3 due to the decrypted data being in JSON format. I changed the eval() to json_decode() function.

Two small changes to the decrypt.php file: * Removed reference to config.inc.php - There didn't seem to be any dependency on the config.inc.php file and the decryption ran fine without this line. Removed to make easier/clearer for standalone use of the decrypr script * Changed how json was parsed - During initial test setup, the decrypt script gave errors based on `eval('$vars = '.$decryptedData.';');` with PHP 7.4.3 due to the decrypted data being in JSON format. I changed the eval() to json_decode() function.
norman changed title from WIP: Changes to Decrypt.php to Changes to Decrypt.php 2020-12-07 22:11:54 +00:00
norman changed title from Changes to Decrypt.php to WIP: Changes to Decrypt.php 2020-12-07 22:12:07 +00:00
norman changed title from WIP: Changes to Decrypt.php to Changes to Decrypt.php 2020-12-17 01:41:56 +00:00
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b norman-n/decrypt-fix master
git pull n/decrypt-fix

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff norman-n/decrypt-fix
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: openprivacy/lockbox-web#1
No description provided.
Delete Branch "norman/lockbox-web:n/decrypt-fix"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?