From 6d407e72ea7ef9874ebc884ad8799491fdcefcf9 Mon Sep 17 00:00:00 2001
From: root <aleksprm777@gmail.com>
Date: Sun, 16 Apr 2017 10:42:40 +0500
Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=BE=20=D0=B2=D0=B5=D1=80=D1=81?=
 =?UTF-8?q?=D0=B8=D0=B8=20v1.2.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                         |   6 ++++--
 contactsnew/class.contactsnew.php |   8 +++++++-
 contactsnew/demo.php              |  24 ++++++++++++++++--------
 contactsnew/images/ref.png        | Bin 0 -> 5090 bytes
 contactsnew/module.php            |   4 ++--
 5 files changed, 29 insertions(+), 13 deletions(-)
 create mode 100644 contactsnew/images/ref.png

diff --git a/README.md b/README.md
index ecb4e4a..d0976a4 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 ## contactsnew
 
-# Модуль Контакты New v1.2.2
+# Модуль Контакты New v1.2.3
 
 ![Module Contacts new](https://gitget.ru/img/module_con_new.png "Module Contacts new")
 
-### адаптирован для AVE.CMS v3.1.5
+### адаптирован для AVE.CMS v3.1.х
 
 ## Модуль предназначен для создания веб-форм (например, обратной связи или простейшего оформления заказа), которые могут состоять из любого набора полей. 
 
@@ -14,6 +14,8 @@
 
 ## Changelog:
 
+19.09.2016 - Версия 1.2.3 - исправление ошибок, в демоверсии включен пример обновление капчи по клику
+
 19.09.2016 - Версия 1.2.2 - изменения в административной части модуля
 
 18.09.2016 - Версия 1.2.1 - добавлена возможность удаления сообщений
diff --git a/contactsnew/class.contactsnew.php b/contactsnew/class.contactsnew.php
index aa29978..3599698 100755
--- a/contactsnew/class.contactsnew.php
+++ b/contactsnew/class.contactsnew.php
@@ -976,7 +976,7 @@ class ContactsNew
 		// парсим теги полей и названий
 		$tpl = preg_replace_callback('/\[tag:fld:(\d+)]/', array($this,'_parse_tag_fld_form'), $tpl);
 		$tpl = preg_replace_callback('/\[tag:title:([A-Za-z0-9-_]+)]/', array($this,'_parse_tag_title'),$tpl);
-
+		
 		// выполняем код после валидации
 		eval('?>' . $this->form['code_onvalidate'] . '<?');
 
@@ -1038,6 +1038,12 @@ class ContactsNew
 				);
 			}
 			$history['email'] = $email;
+		} else // если чекбоксы - отправить копию неактивные 
+		{
+           $email = '';
+           if ($form['is_email'] === true) $email = $_POST['form-' . $alias_id][$form['fields_main']['email']];
+           if (empty($email)) $email = $_SESSION['user_email'];
+           $history['email'] = $email;
 		}
 
 		// главные получатели
diff --git a/contactsnew/demo.php b/contactsnew/demo.php
index c2ce8bb..06a9105 100644
--- a/contactsnew/demo.php
+++ b/contactsnew/demo.php
@@ -72,6 +72,7 @@ $form_tpl = array(
 		</div>
 	</form>
 	<script>
+	    $(document).on(\\\'click\\\', \\\'#captcha-ref\\\', function(){$(\\\'#captcha img\\\').attr(\\\'src\\\', \\\'[tag:path][tag:captcha]?refresh=\\\' + new Date().getTime());});
 		function form_popover (action) {
 			var _action = (action == undefined || !action) ? \\\'show\\\' : action;
 			$(\\\'#[tag:formalias] .form-control.invalid\\\').each(function(index, element) {
@@ -315,16 +316,23 @@ $demo = array(
 			'setting' => '',
 			'required' => 1,
 			'defaultval' => '',
-			'attributes' => 'id="fld[[tag:id]]" class="form-control [tag:if_invalid]invalid[/tag:if_invalid]" placeholder="[tag:title]" data-placement="right" data-content="Неверный код!" data-container="body" autocomplete="off" data-trigger="manual"',
+			'attributes' => 'id="fld[[tag:id]]" class="form-control [tag:if_invalid]invalid[/tag:if_invalid]" placeholder="Введите защитный код" data-placement="right" data-content="Неверный код!" data-container="body" autocomplete="off" data-trigger="manual"',
 			'tpl' => '<div class="form-group [tag:if_invalid]has-feedback has-error[/tag:if_invalid]">
-	<label for="fld[[tag:id]]" class="col-sm-4 control-label">
-		<img src="[tag:path][tag:captcha]" alt="Капча">
-	</label>
-	<div class="col-sm-4">
+	<div class="col-sm-offset-4 col-sm-4">
+		<div class="checkbox" style="text-align:center">
+		<span id="captcha">	
+		<img src="[tag:path][tag:captcha]" alt="Капча"></span><br>
+		</div>
+		<div style="text-align:center">
+			<img id="captcha-ref" style="cursor: pointer; margin:10px 0 10px 0px;" src="[tag:path]modules/contactsnew/images/ref.png" alt="" title="Обновить код" width="30" height="30" border="0" />
+		</div>
+			<div class="col-sm-offset-2 col-sm-8">
 		[tag:fld]
-		[tag:if_invalid]<span class="glyphicon glyphicon-remove form-control-feedback"></span>[/tag:if_invalid]
-	</div>
-</div>'
+		[tag:if_invalid]<span class="glyphicon glyphicon-remove form-control-feedback"></span>
+		[/tag:if_invalid]
+			</div>
+		</div>
+	</div>'
 		),
 		6 => array(
 			'new' => true,
diff --git a/contactsnew/images/ref.png b/contactsnew/images/ref.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdcd6be0a291878031302386a9c9d11780fc6a2e
GIT binary patch
literal 5090
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

literal 0
HcmV?d00001

diff --git a/contactsnew/module.php b/contactsnew/module.php
index 95815b0..fc51342 100644
--- a/contactsnew/module.php
+++ b/contactsnew/module.php
@@ -16,10 +16,10 @@ if (defined('ACP'))
 {
 	$modul['ModuleName'] = 'Контакты New';
 	$modul['ModuleSysName'] = 'contactsnew';
-	$modul['ModuleVersion'] = '1.2.2';
+	$modul['ModuleVersion'] = '1.2.3';
 	$modul['ModuleDescription'] = 'Данный модуль предназначен для создания веб-форм (например, обратной связи или простейшего оформления заказа), которые могут состоять из любого набора полей. Для вывода в публичной части сайта используйте тег <strong>[mod_contactsnew:XXX]</strong>, где XXX - это id или алиас формы.';
 	$modul['ModuleAutor'] = 'vudaltsov UPD Repellent';
-	$modul['ModuleCopyright'] = '&copy; 2007-2016 AVE.CMS Team';
+	$modul['ModuleCopyright'] = '&copy; 2007-2017 AVE.CMS Team';
 	$modul['ModuleIsFunction'] = 1;
 	$modul['ModuleAdminEdit'] = 1;
 	$modul['ModuleFunction'] = 'mod_contactsnew';