This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.1 has been updated
via ebbbf9a38c4fd63057ccd9bf5e5607cdcba8f2e2 (commit)
from ad18bf00345770995966a7c45e62bb1555bb53aa (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=ebbbf9a38c4fd63057ccd9bf5e5607cdcba8f2e2
commit ebbbf9a38c4fd63057ccd9bf5e5607cdcba8f2e2
Author: Franck Villaume <[email protected]>
Date: Sun Oct 15 19:07:05 2017 +0200
phptextcaptcha: add Mageia font path + fix login form.
diff --git a/src/plugins/phptextcaptcha/common/phptextcaptchaPlugin.class.php
b/src/plugins/phptextcaptcha/common/phptextcaptchaPlugin.class.php
index 1496df7..6b85942 100644
--- a/src/plugins/phptextcaptcha/common/phptextcaptchaPlugin.class.php
+++ b/src/plugins/phptextcaptcha/common/phptextcaptchaPlugin.class.php
@@ -56,10 +56,14 @@ class phptextcaptchaPlugin extends Plugin {
if
(is_file('/usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf')) {
//Debian-like
$font_path = '/usr/share/fonts/truetype/dejavu/';
- } else {
+ } elseif
(is_file('/usr/share/fonts/dejavu/DejaVuSansMono.ttf')) {
//CentOS
$font_path = '/usr/share/fonts/dejavu/';
+ } elseif
(is_file('/usr/share/fonts/TTF/dejavu/DejaVuSansMono.ttf')) {
+ //Mageia
+ $font_path = '/usr/share/fonts/TTF/dejavu/';
}
+
$imageOptions = array(
'font_size' => 24,
'font_path' => $font_path,
@@ -92,7 +96,7 @@ class phptextcaptchaPlugin extends Plugin {
unlink($this->pngdir.'/'.$pngfile);
}
file_put_contents($this->pngdir.'/'.$pngfile, $png);
- $html = '<p>';
+ $html .= '<p>';
$html .= '<img
src="/plugins/'.$this->name.'/'.$pngfile.'?'.time().'" />';
$html .= '</p><p>';
$html .= _('Write captcha here')._(': ').'<br />';
-----------------------------------------------------------------------
Summary of changes:
src/plugins/phptextcaptcha/common/phptextcaptchaPlugin.class.php | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
