Skip to content
Permalink
Browse files

Use SecureImage via Composer instead of Submodule

  • Loading branch information
vboctor committed May 28, 2017
1 parent 9cbc85e commit a001d575a94e2b7e3c506ea8e19229d0812e6913
Showing with 62 additions and 14 deletions.
  1. +0 −1 .gitignore
  2. +0 −4 .gitmodules
  3. +8 −1 composer.json
  4. +53 −2 composer.lock
  5. +0 −2 library/README.md
  6. +0 −1 library/securimage
  7. +0 −2 signup.php
  8. +1 −1 signup_page.php
@@ -36,7 +36,6 @@ nbproject/

# IIS7
web.config
!library/securimage/web.config

# Libraries
library/FirePHPCore
@@ -2,10 +2,6 @@
path = library/phpmailer
url = https://github.com/mantisbt/PHPMailer
branch = mantis
[submodule "library/securimage"]
path = library/securimage
url = https://github.com/mantisbt/securimage.git
branch = mantis
[submodule "api/rest/swagger"]
path = api/rest/swagger
url = https://github.com/mantisbt/swagger-ui.git
@@ -8,8 +8,15 @@
"vboctor/disposable_email_checker": "^3.0",
"adodb/adodb-php": "^5.20",
"phpmailer/phpmailer": "^5.2",
"erusev/parsedown": "^1.6"
"erusev/parsedown": "^1.6",
"dapphp/securimage": "dev-mantis"
},
"repositories": [
{
"type": "vcs",
"url": "https://github.com/mantisbt/securimage"
}
],
"license": "GPL v2",
"authors": [
{

Some generated files are not rendered by default. Learn more.

@@ -11,7 +11,6 @@ directory | project | version | status
----------------|-----------------|-----------|---------------
rssbuilder | RSSBuilder | 2.2.1 | patched [2]
utf8 | phputf8 | 0.5 | unpatched
securimage | PHP Captcha | 3.6.5 | patched [1]


## Javascript/CSS libraries
@@ -44,7 +43,6 @@ project | URL
----------------|--------------------------------------------------------------------
rssbuilder | http://code.google.com/p/flaimo-php/
utf8 | http://sourceforge.net/projects/phputf8
secureimage | http://www.phpcaptcha.org/ - https://github.com/mantisbt/securimage
jquery | https://jquery.com/
bootstrap | http://getbootstrap.com/
fontawesome | http://fontawesome.io/
Submodule securimage deleted from 65d446
@@ -74,8 +74,6 @@
if( ON == config_get( 'signup_use_captcha' ) && get_gd_version() > 0 &&
helper_call_custom_function( 'auth_can_change_password', array() ) ) {
# captcha image requires GD library and related option to ON
require_lib( 'securimage/securimage.php' );

$t_securimage = new Securimage();
if( $t_securimage->check( $f_captcha ) == false ) {
trigger_error( ERROR_SIGNUP_NOT_MATCHING_CAPTCHA, ERROR );
@@ -107,7 +107,7 @@

# captcha image requires GD library and related option to ON
if( ON == config_get( 'signup_use_captcha' ) && get_gd_version() > 0 && $t_allow_passwd_change ) {
$t_securimage_path = 'library/securimage';
$t_securimage_path = 'vendor/dapphp/securimage';
$t_securimage_show = $t_securimage_path . '/securimage_show.php';
$t_securimage_play = $t_securimage_path . '/securimage_play.swf?'
. http_build_query( array(

0 comments on commit a001d57

Please sign in to comment.
You can’t perform that action at this time.