Update of /cvsroot/phpwebsite-comm/modules/rolodex/class
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32073/class
Modified Files:
RDX_Forms.php Rolodex.php
Log Message:
fix captch
Index: RDX_Forms.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** RDX_Forms.php 22 Nov 2008 20:54:11 -0000 1.27
--- RDX_Forms.php 24 Nov 2008 04:11:57 -0000 1.28
***************
*** 1297,1303 ****
PHPWS_Error::log($result);
} else {
- $form->addTplTag('CONFIRM_INSTRUCTIONS', dgettext('rolodex', 'Please type the word seen in the image.'));
- $form->addText('confirm_graphic');
- $form->setLabel('confirm_graphic', dgettext('rolodex', 'Confirm Graphic'));
$form->addTplTag('GRAPHIC', $result);
}
--- 1297,1300 ----
Index: Rolodex.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/Rolodex.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Rolodex.php 20 Nov 2008 22:49:33 -0000 1.22
--- Rolodex.php 24 Nov 2008 04:11:57 -0000 1.23
***************
*** 1357,1360 ****
--- 1357,1364 ----
}
+ if (!Rolodex::confirm()) {
+ $errors['CONFIRM_ERROR'] = dgettext('rolodex', 'Confirmation phrase is not correct.');
+ }
+
if (isset($errors)) {
$this->message = implode('<br />', $errors);
***************
*** 1366,1369 ****
--- 1370,1385 ----
+ function confirm()
+ {
+ if (!PHPWS_Settings::get('rolodex', 'use_captcha') ||
+ !extension_loaded('gd')) {
+ return true;
+ }
+
+ PHPWS_Core::initCoreClass('Captcha.php');
+ return Captcha::verify();
+ }
+
+
public function sendMail()
{
|
