stephen-smith wrote on Saturday, February 05, 2011:
Your second commit (111a) it just a “fix” for its parent. At this point in development, you should use git rebase to squash them together into a single commit.
I don’t think the source code is the right place to advertise your services. I’d prefer that comment to be dropped. Especially since the code doesn’t appear to depend on getting service though EHRLive. It does depend on having a merchant account through Authorize.net / CyberSource. That information should be included in a comment describing the CCCharge class in library/cccharge.php, at least. I think “CCCharge” is a bit generic for something that only works with one IPGS, but that name can certainly stay at least until we have code to support more than one way to process cards (with may or may not be a different IPGS).
library/js/jquery.validate.js - Is this not included in library/js/jquery121.js, library/js/jquery-1.2.2.min.js, library/js/jquery-1.3.2.js, or library/js/jquery-1.4.3.min.js? Do we really want to have to track security issue on 4-5 different versions of jQuery? I really like jQuery, but it is simply unsustainable to have each page/patch check in yet another version.
library/js/script.js - This needs a better name. “script.js” is redundant, yet almost entirely information-free. “ccpanel-controller.js” is much more descriptive, but that’s just one example, and I could be reading the code incorrectly. (I haven’t been doing JS / jQuery that long.)
interface/patient_file/front_payment.php - There are a dozen or so untranslated strings. Virtually everything that the user sees needs to go through xl(). Anything that’s not a literal or otherwise known-safe needs to be passed through htmlspecialchars() before being used as the value of an HTML attribute or the textual content of an HTML page.
I hope we can get this cleaned up and included.
Your git tree is mostly okay. Your “master” branch is pointing at the wrong commit - it includes one of the commits from your branch. You should set your master branch to 1ea6, unless you intend to have it diverge from the main development history. After that you can do the rebase I suggested above with
git rebase -i master cccharge
, which will open an editor. You will change the “pick” action on the second commit to “f” (= “fixup”) and close the editor and that will squash the two commits together.