[xoops-svn] SF.net SVN: xoops-svn:[10233] XoopsCore/branches/2.6.x/2.6.0/htdocs/modules /xcaptcha

[<du...@us...>]

Revision: 10233
          http://sourceforge.net/p/xoops/svn/10233
Author:   dugris
Date:     2012-10-25 13:35:09 +0000 (Thu, 25 Oct 2012)
Log Message:
-----------
FIX form
xcaptcha 1.00 alpha (Xoops CAPTCHA configuration)
System extensions for xoops 2.6.x

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/xcaptcha.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/image.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/recaptcha.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/text.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/xoops_version.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/xcaptcha.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/xcaptcha.php	2012-10-25 13:05:30 UTC (rev 10232)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/xcaptcha.php	2012-10-25 13:35:09 UTC (rev 10233)
@@ -119,8 +119,8 @@
 
         $button_tray = new XoopsFormElementTray('', '');
         $button_tray->addElement(new XoopsFormHidden('op', 'save'));
-        $button_tray->addElement(new XoopsFormButton('', '', _SUBMIT, 'submit'));
-        $button_tray->addElement(new XoopsFormButton('', '', _CANCEL, 'submit'));
+        $button_tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+        $button_tray->addElement(new XoopsFormButton('', 'reset', _RESET, 'reset'));
         $captcha_form->addElement($button_tray);
 
         ob_start();

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/image.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/image.php	2012-10-25 13:05:30 UTC (rev 10232)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/image.php	2012-10-25 13:35:09 UTC (rev 10233)
@@ -85,8 +85,11 @@
 
         $button_tray = new XoopsFormElementTray('', '');
         $button_tray->addElement(new XoopsFormHidden('op', 'save'));
-        $button_tray->addElement(new XoopsFormButton('', '', _SUBMIT, 'submit'));
-        $button_tray->addElement(new XoopsFormButton('', '', _CANCEL, 'submit'));
+        $button_tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+        $button_tray->addElement(new XoopsFormButton('', 'reset', _RESET, 'reset'));
+        $cancel_send = new XoopsFormButton('', 'cancel', _CANCEL, 'button');
+        $cancel_send->setExtra("onclick='javascript:history.go(-1);'");
+        $button_tray->addElement($cancel_send);
         $captcha_form->addElement($button_tray);
 
         ob_start();

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/recaptcha.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/recaptcha.php	2012-10-25 13:05:30 UTC (rev 10232)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/recaptcha.php	2012-10-25 13:35:09 UTC (rev 10233)
@@ -55,8 +55,11 @@
 
         $button_tray = new XoopsFormElementTray('', '');
         $button_tray->addElement(new XoopsFormHidden('op', 'save'));
-        $button_tray->addElement(new XoopsFormButton('', '', _SUBMIT, 'submit'));
-        $button_tray->addElement(new XoopsFormButton('', '', _CANCEL, 'submit'));
+        $button_tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+        $button_tray->addElement(new XoopsFormButton('', 'reset', _RESET, 'reset'));
+        $cancel_send = new XoopsFormButton('', 'cancel', _CANCEL, 'button');
+        $cancel_send->setExtra("onclick='javascript:history.go(-1);'");
+        $button_tray->addElement($cancel_send);
         $captcha_form->addElement($button_tray);
 
         ob_start();

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/text.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/text.php	2012-10-25 13:05:30 UTC (rev 10232)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/plugins/text.php	2012-10-25 13:35:09 UTC (rev 10233)
@@ -46,8 +46,11 @@
 
         $button_tray = new XoopsFormElementTray('', '');
         $button_tray->addElement(new XoopsFormHidden('op', 'save'));
-        $button_tray->addElement(new XoopsFormButton('', '', _SUBMIT, 'submit'));
-        $button_tray->addElement(new XoopsFormButton('', '', _CANCEL, 'submit'));
+        $button_tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+        $button_tray->addElement(new XoopsFormButton('', 'reset', _RESET, 'reset'));
+        $cancel_send = new XoopsFormButton('', 'cancel', _CANCEL, 'button');
+        $cancel_send->setExtra("onclick='javascript:history.go(-1);'");
+        $button_tray->addElement($cancel_send);
         $captcha_form->addElement($button_tray);
 
         ob_start();

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/xoops_version.php	2012-10-25 13:05:30 UTC (rev 10232)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/xoops_version.php	2012-10-25 13:35:09 UTC (rev 10233)
@@ -30,7 +30,6 @@
 $modversion['image']          = 'images/xcaptcha_logo.png';
 $modversion['dirname']        = 'xcaptcha';
 
-
 //about
 $modversion['release_date']        = '2012/10/01';
 $modversion['module_website_url']  = 'labs.xoofoo.org/modules/news/';