fix modal, refactor captcha

livestreet · Jan 25, 2014 · dead633 · dead633
1 parent ce32f1e
commit dead633
Show file tree

Hide file tree

Showing 6 changed files with 87 additions and 9 deletions.
diff --git a/classes/modules/validate/entity/ValidatorCaptcha.entity.class.php b/classes/modules/validate/entity/ValidatorCaptcha.entity.class.php
@@ -28,6 +28,12 @@ class ModuleValidate_EntityValidatorCaptcha extends ModuleValidate_EntityValidat
 	 * @var bool
 	 */
 	public $allowEmpty=false;
+	/**
+	 * Название каптчи для возможности создавать несколько независимых каптч на странице
+	 *
+	 * @var string
+	 */
+	public $name='';
 
 	/**
 	 * Запуск валидации
@@ -44,7 +50,8 @@ public function validate($sValue) {
 			return true;
 		}
 
-		if (!isset($_SESSION['captcha_keystring']) or $_SESSION['captcha_keystring']!=strtolower($sValue)) {
+		$sSessionName='captcha_keystring'.($this->name ? '_'.$this->name : '');
+		if (!isset($_SESSION[$sSessionName]) or $_SESSION[$sSessionName]!=strtolower($sValue)) {
 			return $this->getMessage($this->Lang_Get('validate_captcha_not_valid',null,false),'msg');
 		}
 		return true;

diff --git a/config/config.php b/config/config.php
@@ -273,6 +273,7 @@
 	"___path.framework.frontend.web___/js/ui/autocomplete.js",
 	"___path.framework.frontend.web___/js/ui/notification.js",
 	"___path.framework.frontend.web___/js/ui/alert.js",
+	"___path.framework.frontend.web___/js/ui/captcha.js",
 );
 
 $config['head']['default']['css'] = array(

diff --git a/frontend/framework/js/ui/captcha.js b/frontend/framework/js/ui/captcha.js
@@ -0,0 +1,67 @@
+/**
+ * Captcha
+ *
+ * @module captcha
+ * 
+ * @license   GNU General Public License, version 2
+ * @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com}
+ * @author    Denis Shakhov <denis.shakhov@gmail.com>
+ */
+
+(function($) {
+    "use strict";
+
+    var _selectors = {
+        // Элемент с каптчей
+		captcha:  '[data-type=captcha]'
+    };
+
+    $.widget( "livestreet.captcha", {
+        /**
+         * Дефолтные опции
+         */
+        options: {
+            name: ''
+        },
+
+        /**
+         * Конструктор
+         *
+         * @constructor
+         * @private
+         */
+        _create: function() {
+			this.options = $.extend({}, this.options, ls.utilities.getDataOptions(this.element, 'captcha'));
+
+            this._on({
+                click: function (e) {
+                    this.update();
+                    e.preventDefault();
+                }
+            });
+        },
+
+		/**
+		 * Получает url каптчи
+		 */
+		getUrl: function () {
+			return PATH_FRAMEWORK_LIBS_VENDOR + '/kcaptcha/index.php?' + SESSION_NAME + '=' + SESSION_ID + '&n=' + Math.random()+'&name='+this.options.name;
+		},
+
+		/**
+		 * Обновляет каптчу
+		 */
+		update: function () {
+			this.element.css('background-image', 'url(' + this.getUrl() + ')');
+		}
+    });
+
+	// Инициализация
+	$(document).on('ready', function (e) {
+		$(document).on('click', '[data-type=captcha]', function (e) {
+			$(this).captcha();
+			$(this).captcha('update');
+			e.preventDefault();
+		});
+	});
+})(jQuery);
diff --git a/frontend/framework/js/ui/modal.js b/frontend/framework/js/ui/modal.js
@@ -296,7 +296,7 @@ var ls = ls || {};
                 if (result.bStateError) {
                     _loader.hide();
                     _overlay.hide();
-                    //ls.msg.error('Error', result.sMsg);
+                    ls.msg.error('Error', result.sMsg);
                 } else {
                     _loader.hide();
                     $( $.trim( result['sText'] ) ).modal( options ).modal('show');
@@ -305,7 +305,7 @@ var ls = ls || {};
                 error: function () {
                     _loader.hide();
                     _overlay.hide();
-                    //ls.msg.error('Error', result.sMsg);
+                    ls.msg.error('Error');
                 }
             });
         };
@@ -358,7 +358,8 @@ var ls = ls || {};
             var options = ls.utilities.getDataOptions($(this), 'modal');
             var params = ls.utilities.getDataOptions($(this), 'param') || {};
 
-            ls.modal.load(options.url, options.params, options);
+            ls.modal.load(options.url, params, options);
+			e.preventDefault();
         });
     });
 

diff --git a/frontend/framework/js/vendor/parsley/parsley.js b/frontend/framework/js/vendor/parsley/parsley.js
@@ -171,6 +171,7 @@
             value: val
           }
         };
+		data.params=ls.utilities.getDataOptions(self.$element, 'remoteParam') || {};
 
         data.security_ls_key = LIVESTREET_SECURITY_KEY;
         /* @livestreet end */

diff --git a/libs/vendor/kcaptcha/index.php b/libs/vendor/kcaptcha/index.php
@@ -40,10 +40,11 @@
 	}
 }
 
-$captcha = new KCAPTCHA();
-
-
-$_SESSION['captcha_keystring'] = $captcha->getKeyString();
+$name='';
+if (isset($_GET['name']) and is_string($_GET['name']) and $_GET['name']) {
+	$name=$_GET['name'];
+}
 
+$captcha = new KCAPTCHA();
 
-?>
+$_SESSION['captcha_keystring'.($name ? '_'.$name : '')] = $captcha->getKeyString();