Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gacl code cleanup #2894

Merged
merged 2 commits into from Jan 23, 2020
Merged

gacl code cleanup #2894

merged 2 commits into from Jan 23, 2020

Conversation

bradymiller
Copy link
Sponsor Member

@bradymiller bradymiller commented Jan 21, 2020

gacl code cleanup

require_once(dirname(__FILE__) . "/../../../library/sqlconf.php");
require_once(dirname(__FILE__) . "/../../../vendor/adodb/adodb-php/adodb.inc.php");
require_once(dirname(__FILE__) . "/../../../vendor/adodb/adodb-php/drivers/adodb-mysqli.inc.php");
require_once(dirname(__FILE__) . "/../../../library/ADODB_mysqli_mod.php");

This comment was marked as outdated.

@tywrenn
Copy link
Contributor

tywrenn commented Jan 21, 2020

GACL seriously needs a makeover tbh

/*
* Path to ADODB.
*/

if ( !defined('ADODB_DIR') ) {
define('ADODB_DIR', dirname(__FILE__).'/../vendor/adodb/adodb-php');
}
Copy link
Sponsor Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looked into why above is needed and decided to keep as is.

require_once(dirname(__FILE__) . "/../../library/sqlconf.php");
require_once(dirname(__FILE__) . "/../../vendor/adodb/adodb-php/adodb.inc.php");
require_once(dirname(__FILE__) . "/../../vendor/adodb/adodb-php/drivers/adodb-mysqli.inc.php");
require_once(dirname(__FILE__) . "/../../library/ADODB_mysqli_mod.php");
Copy link
Sponsor Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looked into why above is needed and decided to keep as is.

Converted to psr4 classes and codebase changes supporting that.
@bradymiller
Copy link
Sponsor Member Author

This is testing well and plan to bring in soon (crossing fingers it will be easy merge to bootstrap PR :) )

@bradymiller bradymiller merged commit d97d47c into openemr:master Jan 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants