Skip to content

get rid of models/captcha.php and replace with base64 captcha function.#143

Merged
r3wt merged 3 commits intouserfrosting:masterfrom
r3wt:master
Nov 4, 2014
Merged

get rid of models/captcha.php and replace with base64 captcha function.#143
r3wt merged 3 commits intouserfrosting:masterfrom
r3wt:master

Conversation

@r3wt
Copy link

@r3wt r3wt commented Nov 2, 2014

addresses #142 by eliminating the need for models/captcha.php

@r3wt
Copy link
Author

r3wt commented Nov 4, 2014

@alexweissman whats up? if you want, i can squash the obfuscation commit, although to me it seems to be damn near the perfect amount of obfuscation. i think we should probably go ahead and extend this captcha system to have an ajax method to get a new token, similar to how recaptcha works, because sometimes there are those captchas that are too hard for the human eye to interpret.

i see there is another open pull from @lilfade too. been busy with work lately?

@lilfade
Copy link
Contributor

lilfade commented Nov 4, 2014

I think he's busy as shit with school atm, i think both commits are fine you wanna give the upgrade pull a test on hhvm and see how it works out it seems to work fine on apache2/php. The steps to test are on the pull request.

r3wt pushed a commit that referenced this pull request Nov 4, 2014
get rid of models/captcha.php and replace with base64 captcha function.
@r3wt r3wt merged commit e31199e into userfrosting:master Nov 4, 2014
@r3wt
Copy link
Author

r3wt commented Nov 4, 2014

@lilfade Confirmed working in hhvm. i merged the pull(didn't know i was allowed to merge, cool). if we see problems we will revert it.

@lilfade
Copy link
Contributor

lilfade commented Nov 4, 2014

Yea when we were added as contributors the other day it add those permissions to the repo to us. Thanks for testing it out for me ^_^

@alexweissman
Copy link
Member

Yeah, my classes are ramping up, plus I'm getting a ton of work from my business.

I'm delegating more responsibility to you guys, first because you guys are great and have contributed a lot, but also because its getting to the point where its more than I can handle alone ;-)

@r3wt thanks for merging the commits. @lilfade, I know you still have an outstanding pull request. Do you want to manually merge that in?

I also have some outstanding commits. Its actually a pretty cool feature, I just haven't had time to fully test it...

@lilfade
Copy link
Contributor

lilfade commented Nov 4, 2014

Yea it's no huge change just changes the file list to be from the configuration file to the db to be easier for plugin to add to the file array, another field to the settings array for version for the update system to use and anyone else that needs a versions (again maybe plugins?) And of course the update folder for people on 0.2.1 to goto 0.2.2. I can merge it though if you want to test your changes you can create a new branch to test mergability for your changes and we can test it as well.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants