[Jaws-commits] r12413 - in trunk/jaws/html/gadgets/Contact: . languages resources schema templates

afz at jaws-project.com afz at jaws-project.com
Mon Jan 16 08:13:22 UTC 2012


Author: afz
Date: 2012-01-16 08:13:22 +0000 (Mon, 16 Jan 2012)
New Revision: 12413

Added:
   trunk/jaws/html/gadgets/Contact/schema/0.3.0.xml
Modified:
   trunk/jaws/html/gadgets/Contact/AdminAjax.php
   trunk/jaws/html/gadgets/Contact/AdminHTML.php
   trunk/jaws/html/gadgets/Contact/AdminModel.php
   trunk/jaws/html/gadgets/Contact/HTML.php
   trunk/jaws/html/gadgets/Contact/Info.php
   trunk/jaws/html/gadgets/Contact/LayoutHTML.php
   trunk/jaws/html/gadgets/Contact/languages/ar.php
   trunk/jaws/html/gadgets/Contact/languages/ca.php
   trunk/jaws/html/gadgets/Contact/languages/cs.php
   trunk/jaws/html/gadgets/Contact/languages/de.php
   trunk/jaws/html/gadgets/Contact/languages/en.php
   trunk/jaws/html/gadgets/Contact/languages/es.php
   trunk/jaws/html/gadgets/Contact/languages/fa.php
   trunk/jaws/html/gadgets/Contact/languages/fi.php
   trunk/jaws/html/gadgets/Contact/languages/fr.php
   trunk/jaws/html/gadgets/Contact/languages/he.php
   trunk/jaws/html/gadgets/Contact/languages/it.php
   trunk/jaws/html/gadgets/Contact/languages/ja.php
   trunk/jaws/html/gadgets/Contact/languages/nb.php
   trunk/jaws/html/gadgets/Contact/languages/nl.php
   trunk/jaws/html/gadgets/Contact/languages/pl.php
   trunk/jaws/html/gadgets/Contact/languages/pt-br.php
   trunk/jaws/html/gadgets/Contact/languages/ru.php
   trunk/jaws/html/gadgets/Contact/languages/sv.php
   trunk/jaws/html/gadgets/Contact/languages/tr.php
   trunk/jaws/html/gadgets/Contact/languages/zh.php
   trunk/jaws/html/gadgets/Contact/resources/script.js
   trunk/jaws/html/gadgets/Contact/schema/schema.xml
   trunk/jaws/html/gadgets/Contact/templates/AdminProperties.html
Log:
[Contact]:
- compatible using captcha with new changes in Policy gadget
- removed extra setting for using captcha in Properties
- added user field to contact to detect anonymous than members messages

Modified: trunk/jaws/html/gadgets/Contact/AdminAjax.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/AdminAjax.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/AdminAjax.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -205,15 +205,14 @@
      *
      * @access  public
      * @param   boolean $use_antispam
-     * @param   boolean $use_captcha
      * @param   string  $email_format
      * @param   string  $comments
      * @return  boolean True if change is successful, if not, returns Jaws_Error on any error
      */
-    function UpdateProperties($use_antispam, $use_captcha, $email_format, $comments)
+    function UpdateProperties($use_antispam, $email_format, $comments)
     {
         $this->CheckSession('Contact', 'UpdateProperties');
-        $this->_Model->UpdateProperties($use_antispam, $use_captcha, $email_format, $comments);
+        $this->_Model->UpdateProperties($use_antispam, $email_format, $comments);
         return $GLOBALS['app']->Session->PopLastResponse();
     }
 

Modified: trunk/jaws/html/gadgets/Contact/AdminHTML.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/AdminHTML.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/AdminHTML.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -629,16 +629,6 @@
         $tpl->SetVariable('lbl_use_antispam', _t('CONTACT_PROPERTIES_USE_ANTISPAM'));
         $tpl->SetVariable('use_antispam', $antispamCombo->Get());
 
-        $use_captcha = $GLOBALS['app']->Registry->Get('/gadgets/Contact/use_captcha');
-        $captchaCombo =& Piwi::CreateWidget('Combo', 'use_captcha');
-        $captchaCombo->SetID('use_captcha');
-        $captchaCombo->setStyle('width: 140px;');
-        $captchaCombo->AddOption(_t('GLOBAL_NO'),  'false');
-        $captchaCombo->AddOption(_t('GLOBAL_YES'), 'true');
-        $captchaCombo->SetDefault($use_captcha);
-        $tpl->SetVariable('lbl_use_captcha', _t('CONTACT_PROPERTIES_USE_CAPTCHA'));
-        $tpl->SetVariable('use_captcha', $captchaCombo->Get());
-
         $email_format = $GLOBALS['app']->Registry->Get('/gadgets/Contact/email_format');
         $formatCombo =& Piwi::CreateWidget('Combo', 'email_format');
         $formatCombo->SetID('email_format');

Modified: trunk/jaws/html/gadgets/Contact/AdminModel.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/AdminModel.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/AdminModel.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -28,7 +28,6 @@
 
         //registry keys.
         $GLOBALS['app']->Registry->NewKeyEx(array('/gadgets/Contact/use_antispam',      'true'),
-                                            array('/gadgets/Contact/use_captcha',       'true'),
                                             array('/gadgets/Contact/email_format',      'html'),
                                             array('/gadgets/Contact/enable_attachment', 'false'),
                                             array('/gadgets/Contact/comments',          '')
@@ -58,7 +57,6 @@
 
         // Registry keys
         $GLOBALS['app']->Registry->DeleteKey('/gadgets/Contact/use_antispam');
-        $GLOBALS['app']->Registry->DeleteKey('/gadgets/Contact/use_captcha');
         $GLOBALS['app']->Registry->DeleteKey('/gadgets/Contact/email_format');
         $GLOBALS['app']->Registry->DeleteKey('/gadgets/Contact/enable_attachment');
         $GLOBALS['app']->Registry->DeleteKey('/gadgets/Contact/comments');
@@ -77,7 +75,7 @@
     function UpdateGadget($old, $new)
     {
         if (version_compare($old, '0.3.0', '<')) {
-            $result = $this->installSchema('schema.xml', '', "$old.xml");
+            $result = $this->installSchema('schema.xml', '', '0.2.0.xml');
             if (Jaws_Error::IsError($result)) {
                 return $result;
             }
@@ -93,9 +91,20 @@
             $GLOBALS['app']->Registry->DeleteKey('/gadgets/Contact/send_html');
         }
 
-        $GLOBALS['app']->Registry->NewKey('/gadgets/Contact/comments', '');
-        $GLOBALS['app']->Registry->DeleteKey('/gadgets/Contact/comment');
+        if (version_compare($old, '0.3.1', '<')) {
+            $GLOBALS['app']->Registry->NewKey('/gadgets/Contact/comments', '');
+            $GLOBALS['app']->Registry->DeleteKey('/gadgets/Contact/comment');
+        }
 
+        if (version_compare($old, '0.3.2', '<')) {
+            $result = $this->installSchema('schema.xml', '', '0.3.0.xml');
+            if (Jaws_Error::IsError($result)) {
+                return $result;
+            }
+
+            $GLOBALS['app']->Registry->DeleteKey('/gadgets/Contact/use_captcha');
+        }
+
         return true;
     }
 
@@ -440,15 +449,13 @@
      *
      * @access  public
      * @param   boolean $use_antispam
-     * @param   boolean $use_captcha
      * @param   string  $email_format
      * @return  boolean True if change is successful, if not, returns Jaws_Error on any error
      */
-    function UpdateProperties($use_antispam, $use_captcha, $email_format, $comments)
+    function UpdateProperties($use_antispam, $email_format, $comments)
     {
         $rs = array();
         $rs[] = $GLOBALS['app']->Registry->Set('/gadgets/Contact/use_antispam', $use_antispam);
-        $rs[] = $GLOBALS['app']->Registry->Set('/gadgets/Contact/use_captcha',  $use_captcha);
         $rs[] = $GLOBALS['app']->Registry->Set('/gadgets/Contact/email_format', $email_format);
         $rs[] = $GLOBALS['app']->Registry->Set('/gadgets/Contact/comments',     $comments);
 

Modified: trunk/jaws/html/gadgets/Contact/HTML.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/HTML.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/HTML.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -102,20 +102,12 @@
             Jaws_Header::Referrer();
         }
 
-        if (!$GLOBALS['app']->Session->Logged()) {
-            if ($GLOBALS['app']->Registry->Get('/gadgets/Contact/use_captcha') == 'true') {
-                $GLOBALS['app']->Registry->LoadFile('Policy');
-                $_captcha = $GLOBALS['app']->Registry->Get('/gadgets/Policy/captcha');
-                if ($_captcha != 'DISABLED') {
-                    require_once JAWS_PATH . 'gadgets/Policy/captchas/' . $_captcha . '.php';
-                    $captcha = new $_captcha();
-                    if (!$captcha->Check()) {
-                        $GLOBALS['app']->Session->PushSimpleResponse(_t('GLOBAL_CAPTCHA_ERROR_DOES_NOT_MATCH'), 'Contact');
-                        $GLOBALS['app']->Session->PushSimpleResponse($post, 'Contact_Data');
-                        Jaws_Header::Referrer();
-                    }
-                }
-            }
+        $mPolicy = $GLOBALS['app']->LoadGadget('Policy', 'Model');
+        $resCheck = $mPolicy->CheckCaptcha();
+        if (Jaws_Error::IsError($resCheck)) {
+            $GLOBALS['app']->Session->PushSimpleResponse($resCheck->getMessage(), 'Contact');
+            $GLOBALS['app']->Session->PushSimpleResponse($post, 'Contact_Data');
+            Jaws_Header::Referrer();
         }
 
         if ($GLOBALS['app']->Registry->Get('/gadgets/Contact/use_antispam') == 'true') {

Modified: trunk/jaws/html/gadgets/Contact/Info.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/Info.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/Info.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -16,7 +16,7 @@
         parent::Init('Contact');
         $this->GadgetName(_t('CONTACT_NAME'));
         $this->GadgetDescription(_t('CONTACT_DESCRIPTION'));
-        $this->GadgetVersion('0.3.1');
+        $this->GadgetVersion('0.3.2');
         $this->Doc('gadget/Contact');
 
         $acls = array(

Modified: trunk/jaws/html/gadgets/Contact/LayoutHTML.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/LayoutHTML.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/LayoutHTML.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -88,24 +88,18 @@
                 $tpl->SetVariable('url', isset($url)? $xss->filter($url) : 'http://');
                 $tpl->ParseBlock('contact/url');
             }
+        }
 
-            if ($GLOBALS['app']->Registry->Get('/gadgets/Contact/use_captcha') == 'true') {
-                 $GLOBALS['app']->Registry->LoadFile('Policy');
-                 $_captcha = $GLOBALS['app']->Registry->Get('/gadgets/Policy/captcha');
-                 if ($_captcha != 'DISABLED') {
-                    require_once JAWS_PATH . 'gadgets/Policy/captchas/' . $_captcha . '.php';
-                    $captcha = new $_captcha();
-                    $captchaRes = $captcha->Get();
-                    $tpl->SetBlock('contact/captcha');
-                    $tpl->SetVariable('lbl_captcha', _t('GLOBAL_CAPTCHA_CODE'));
-                    $tpl->SetVariable('captcha', $captchaRes['captcha']->Get());
-                    if (!empty($captchaRes['entry'])) {
-                        $tpl->SetVariable('captchavalue', $captchaRes['entry']->Get());
-                    }
-                    $tpl->SetVariable('captcha_msg', _t('GLOBAL_CAPTCHA_CODE_DESC'));
-                    $tpl->ParseBlock('contact/captcha');
-                }
+        $mPolicy = $GLOBALS['app']->LoadGadget('Policy', 'Model');
+        if ($mPolicy->LoadCaptcha($captcha, $entry, $description)) {
+            $tpl->SetBlock('contact/captcha');
+            $tpl->SetVariable('lbl_captcha', _t('GLOBAL_CAPTCHA_CODE'));
+            $tpl->SetVariable('captcha', $captcha);
+            if (!empty($entry)) {
+                $tpl->SetVariable('captchavalue', $entry);
             }
+            $tpl->SetVariable('captcha_msg', $description);
+            $tpl->ParseBlock('contact/captcha');
         }
 
         //company

Modified: trunk/jaws/html/gadgets/Contact/languages/ar.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/languages/ar.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/languages/ar.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -29,7 +29,6 @@
 define('_AR_CONTACT_RECIPIENT_ID', "الرقم المسلسل");
 define('_AR_CONTACT_RECIPIENT_NAME', "أسم المستلم");
 define('_AR_CONTACT_RECIPIENT_VISIBLE', "معروض");
-define('_AR_CONTACT_PROPERTIES_USE_CAPTCHA', "Captcha");
 define('_AR_CONTACT_PROPERTIES_USE_ANTISPAM', "مكافح التطفل والأزعاج");
 define('_AR_CONTACT_PROPERTIES_SEND_HTML', "ارسال بصيغة HTML");
 define('_AR_CONTACT_INCOMPLETE_FIELDS', "بعض الحقول لم يتم تعبئتها بصورة سليمة.");

Modified: trunk/jaws/html/gadgets/Contact/languages/ca.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/languages/ca.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/languages/ca.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -55,7 +55,6 @@
 define('_CA_CONTACT_ERROR_RECIPIENT_NOT_DELETED', "S'ha produït un problema en esborrar el destinatari.");
 define('_CA_CONTACT_ERROR_RECIPIENT_DOES_NOT_EXISTS', "El destinari no existeix.");
 define('_CA_CONTACT_PROPERTIES_USE_ANTISPAM', "Anti brossa");
-define('_CA_CONTACT_PROPERTIES_USE_CAPTCHA', "Captcha");
 define('_CA_CONTACT_PROPERTIES_EMAIL_FORMAT', "Format del correu electrònic");
 define('_CA_CONTACT_PROPERTIES_EMAIL_FORMAT_PLAINTEXT', "Text pla");
 define('_CA_CONTACT_PROPERTIES_EMAIL_FORMAT_HTML', "HTML");

Modified: trunk/jaws/html/gadgets/Contact/languages/cs.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/languages/cs.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/languages/cs.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -46,7 +46,6 @@
 define('_CS_CONTACT_ERROR_RECIPIENT_NOT_DELETED', "Nastaly problémy při mazaání příjemce");
 define('_CS_CONTACT_ERROR_RECIPIENT_DOES_NOT_EXISTS', "Příjemce neexistuje");
 define('_CS_CONTACT_PROPERTIES_USE_ANTISPAM', "Anti Spam");
-define('_CS_CONTACT_PROPERTIES_USE_CAPTCHA', "Captcha");
 define('_CS_CONTACT_PROPERTIES_EMAIL_FORMAT', "Formát emailu");
 define('_CS_CONTACT_PROPERTIES_EMAIL_FORMAT_PLAINTEXT', "Prostý text");
 define('_CS_CONTACT_PROPERTIES_EMAIL_FORMAT_HTML', "HTML");

Modified: trunk/jaws/html/gadgets/Contact/languages/de.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/languages/de.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/languages/de.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -55,7 +55,6 @@
 define('_DE_CONTACT_ERROR_RECIPIENT_NOT_DELETED', "Es gab ein Problem beim Löschen des Empfängers");
 define('_DE_CONTACT_ERROR_RECIPIENT_DOES_NOT_EXISTS', "Empfänger exsistiert nicht");
 define('_DE_CONTACT_PROPERTIES_USE_ANTISPAM', "Anti Spam");
-define('_DE_CONTACT_PROPERTIES_USE_CAPTCHA', "Captcha");
 define('_DE_CONTACT_PROPERTIES_EMAIL_FORMAT', "E-Mail-Format");
 define('_DE_CONTACT_PROPERTIES_EMAIL_FORMAT_PLAINTEXT', "Einfacher Text");
 define('_DE_CONTACT_PROPERTIES_EMAIL_FORMAT_HTML', "HTML");

Modified: trunk/jaws/html/gadgets/Contact/languages/en.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/languages/en.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/languages/en.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -73,7 +73,6 @@
 
 /* Properties */
 define('_EN_CONTACT_PROPERTIES_USE_ANTISPAM', "AntiSpam");
-define('_EN_CONTACT_PROPERTIES_USE_CAPTCHA', "Captcha");
 define('_EN_CONTACT_PROPERTIES_EMAIL_FORMAT', "Email Format");
 define('_EN_CONTACT_PROPERTIES_EMAIL_FORMAT_PLAINTEXT', "Plain Text");
 define('_EN_CONTACT_PROPERTIES_EMAIL_FORMAT_HTML', "HTML");

Modified: trunk/jaws/html/gadgets/Contact/languages/es.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/languages/es.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/languages/es.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -55,7 +55,6 @@
 define('_ES_CONTACT_ERROR_RECIPIENT_NOT_DELETED', "Hubo un problema al borrar el recipiente.");
 define('_ES_CONTACT_ERROR_RECIPIENT_DOES_NOT_EXISTS', "El recipiente no existe.");
 define('_ES_CONTACT_PROPERTIES_USE_ANTISPAM', "Anti-spam");
-define('_ES_CONTACT_PROPERTIES_USE_CAPTCHA', "Captcha");
 define('_ES_CONTACT_PROPERTIES_EMAIL_FORMAT', "Formato de Email");
 define('_ES_CONTACT_PROPERTIES_EMAIL_FORMAT_PLAINTEXT', "Texto Plano");
 define('_ES_CONTACT_PROPERTIES_EMAIL_FORMAT_HTML', "HTML");

Modified: trunk/jaws/html/gadgets/Contact/languages/fa.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/languages/fa.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/languages/fa.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -55,7 +55,6 @@
 define('_FA_CONTACT_ERROR_RECIPIENT_NOT_DELETED', "خطا هنگام حذف گیرنده مورد نظر");
 define('_FA_CONTACT_ERROR_RECIPIENT_DOES_NOT_EXISTS', "گیرنده مورد نظر وجود ندارد");
 define('_FA_CONTACT_PROPERTIES_USE_ANTISPAM', "ضد هرزنامه");
-define('_FA_CONTACT_PROPERTIES_USE_CAPTCHA', "تصویر امنیتی");
 define('_FA_CONTACT_PROPERTIES_EMAIL_FORMAT', "فرمت ارسال ایمیل");
 define('_FA_CONTACT_PROPERTIES_EMAIL_FORMAT_PLAINTEXT', "متن ساده");
 define('_FA_CONTACT_PROPERTIES_EMAIL_FORMAT_HTML', "HTML");

Modified: trunk/jaws/html/gadgets/Contact/languages/fi.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/languages/fi.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/languages/fi.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -55,7 +55,6 @@
 define('_FI_CONTACT_ERROR_RECIPIENT_NOT_DELETED', "Tapahtui virhe poistaessa vastaanottajaa");
 define('_FI_CONTACT_ERROR_RECIPIENT_DOES_NOT_EXISTS', "Vastaanottajaa ei ole olemassa");
 define('_FI_CONTACT_PROPERTIES_USE_ANTISPAM', "Anti Spam");
-define('_FI_CONTACT_PROPERTIES_USE_CAPTCHA', "Captcha");
 define('_FI_CONTACT_PROPERTIES_EMAIL_FORMAT', "Email muoto");
 define('_FI_CONTACT_PROPERTIES_EMAIL_FORMAT_PLAINTEXT', "Teksti");
 define('_FI_CONTACT_PROPERTIES_EMAIL_FORMAT_HTML', "HTML");

Modified: trunk/jaws/html/gadgets/Contact/languages/fr.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/languages/fr.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/languages/fr.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -55,7 +55,6 @@
 define('_FR_CONTACT_ERROR_RECIPIENT_NOT_DELETED', "Un problème est survenu lors de la suppression du destinataire");
 define('_FR_CONTACT_ERROR_RECIPIENT_DOES_NOT_EXISTS', "Le destinataire n'existe pas");
 define('_FR_CONTACT_PROPERTIES_USE_ANTISPAM', "Antispam");
-define('_FR_CONTACT_PROPERTIES_USE_CAPTCHA', "Captcha");
 define('_FR_CONTACT_PROPERTIES_EMAIL_FORMAT', "Format d'email");
 define('_FR_CONTACT_PROPERTIES_EMAIL_FORMAT_PLAINTEXT', "Texte brut");
 define('_FR_CONTACT_PROPERTIES_EMAIL_FORMAT_HTML', "HTML");

Modified: trunk/jaws/html/gadgets/Contact/languages/he.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/languages/he.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/languages/he.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -55,7 +55,6 @@
 define('_HE_CONTACT_ERROR_RECIPIENT_NOT_DELETED', "אירעה תקלה במחיקת המען");
 define('_HE_CONTACT_ERROR_RECIPIENT_DOES_NOT_EXISTS', "הנמען לא קיים");
 define('_HE_CONTACT_PROPERTIES_USE_ANTISPAM', "אנטי ספאם");
-define('_HE_CONTACT_PROPERTIES_USE_CAPTCHA', "Captcha");
 define('_HE_CONTACT_PROPERTIES_EMAIL_FORMAT', "תבנית דוא\"ל");
 define('_HE_CONTACT_PROPERTIES_EMAIL_FORMAT_PLAINTEXT', "טקסט פשוט");
 define('_HE_CONTACT_PROPERTIES_EMAIL_FORMAT_HTML', "HTML");

Modified: trunk/jaws/html/gadgets/Contact/languages/it.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/languages/it.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/languages/it.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -55,7 +55,6 @@
 define('_IT_CONTACT_ERROR_RECIPIENT_NOT_DELETED', "Si e' verificato un errore eliminando il destinatario");
 define('_IT_CONTACT_ERROR_RECIPIENT_DOES_NOT_EXISTS', "Il destinatario non esiste");
 define('_IT_CONTACT_PROPERTIES_USE_ANTISPAM', "AntiSpam");
-define('_IT_CONTACT_PROPERTIES_USE_CAPTCHA', "Captcha");
 define('_IT_CONTACT_PROPERTIES_EMAIL_FORMAT', "Formato E-Mail");
 define('_IT_CONTACT_PROPERTIES_EMAIL_FORMAT_PLAINTEXT', "Solo Testo");
 define('_IT_CONTACT_PROPERTIES_EMAIL_FORMAT_HTML', "HTML");

Modified: trunk/jaws/html/gadgets/Contact/languages/ja.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/languages/ja.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/languages/ja.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -55,7 +55,6 @@
 define('_JA_CONTACT_ERROR_RECIPIENT_NOT_DELETED', "受信者の削除中にエラーです。");
 define('_JA_CONTACT_ERROR_RECIPIENT_DOES_NOT_EXISTS', "受信者が存在しません。");
 define('_JA_CONTACT_PROPERTIES_USE_ANTISPAM', "スパム対策");
-define('_JA_CONTACT_PROPERTIES_USE_CAPTCHA', "Captcha");
 define('_JA_CONTACT_PROPERTIES_EMAIL_FORMAT', "電子メールの形式");
 define('_JA_CONTACT_PROPERTIES_EMAIL_FORMAT_PLAINTEXT', "通常のテキスト");
 define('_JA_CONTACT_PROPERTIES_EMAIL_FORMAT_HTML', "HTML");

Modified: trunk/jaws/html/gadgets/Contact/languages/nb.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/languages/nb.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/languages/nb.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -55,7 +55,6 @@
 define('_NB_CONTACT_ERROR_RECIPIENT_NOT_DELETED', "Kunne ikke slette mottageren");
 define('_NB_CONTACT_ERROR_RECIPIENT_DOES_NOT_EXISTS', "Mottageren eksisterer ikke");
 define('_NB_CONTACT_PROPERTIES_USE_ANTISPAM', "Søppelpostvern");
-define('_NB_CONTACT_PROPERTIES_USE_CAPTCHA', "Captcha");
 define('_NB_CONTACT_PROPERTIES_EMAIL_FORMAT', "E-postformat");
 define('_NB_CONTACT_PROPERTIES_EMAIL_FORMAT_PLAINTEXT', "Ren tekst");
 define('_NB_CONTACT_PROPERTIES_EMAIL_FORMAT_HTML', "HTML");

Modified: trunk/jaws/html/gadgets/Contact/languages/nl.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/languages/nl.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/languages/nl.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -55,7 +55,6 @@
 define('_NL_CONTACT_ERROR_RECIPIENT_NOT_DELETED', "Er was een probleem bij het verwijderen van de ontvanger");
 define('_NL_CONTACT_ERROR_RECIPIENT_DOES_NOT_EXISTS', "De ontvanger bestaat niet");
 define('_NL_CONTACT_PROPERTIES_USE_ANTISPAM', "AntiSpam");
-define('_NL_CONTACT_PROPERTIES_USE_CAPTCHA', "Captcha");
 define('_NL_CONTACT_PROPERTIES_EMAIL_FORMAT', "Email formaat");
 define('_NL_CONTACT_PROPERTIES_EMAIL_FORMAT_PLAINTEXT', "Gewone Tekst");
 define('_NL_CONTACT_PROPERTIES_EMAIL_FORMAT_HTML', "HTML");

Modified: trunk/jaws/html/gadgets/Contact/languages/pl.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/languages/pl.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/languages/pl.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -55,7 +55,6 @@
 define('_PL_CONTACT_ERROR_RECIPIENT_NOT_DELETED', "Wystąpił problem podczas kasowania odbiorcy");
 define('_PL_CONTACT_ERROR_RECIPIENT_DOES_NOT_EXISTS', "Odbiorca nie istnieje");
 define('_PL_CONTACT_PROPERTIES_USE_ANTISPAM', "AntySpam");
-define('_PL_CONTACT_PROPERTIES_USE_CAPTCHA', "Captcha");
 define('_PL_CONTACT_PROPERTIES_EMAIL_FORMAT', "Format Emaila");
 define('_PL_CONTACT_PROPERTIES_EMAIL_FORMAT_PLAINTEXT', "Czysty tekst");
 define('_PL_CONTACT_PROPERTIES_EMAIL_FORMAT_HTML', "HTML");

Modified: trunk/jaws/html/gadgets/Contact/languages/pt-br.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/languages/pt-br.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/languages/pt-br.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -55,7 +55,6 @@
 define('_PT-BR_CONTACT_ERROR_RECIPIENT_NOT_DELETED', "Houve um erro ao excluir o destinatário");
 define('_PT-BR_CONTACT_ERROR_RECIPIENT_DOES_NOT_EXISTS', "Destinatário não encontrado");
 define('_PT-BR_CONTACT_PROPERTIES_USE_ANTISPAM', "Anti-Spam");
-define('_PT-BR_CONTACT_PROPERTIES_USE_CAPTCHA', "Captcha");
 define('_PT-BR_CONTACT_PROPERTIES_EMAIL_FORMAT', "Formato de email");
 define('_PT-BR_CONTACT_PROPERTIES_EMAIL_FORMAT_PLAINTEXT', "Texto puro");
 define('_PT-BR_CONTACT_PROPERTIES_EMAIL_FORMAT_HTML', "HTML");

Modified: trunk/jaws/html/gadgets/Contact/languages/ru.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/languages/ru.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/languages/ru.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -55,7 +55,6 @@
 define('_RU_CONTACT_ERROR_RECIPIENT_NOT_DELETED', "Ошибка удаления получателя");
 define('_RU_CONTACT_ERROR_RECIPIENT_DOES_NOT_EXISTS', "Получатель не существует");
 define('_RU_CONTACT_PROPERTIES_USE_ANTISPAM', "АнтиСпам");
-define('_RU_CONTACT_PROPERTIES_USE_CAPTCHA', "Captcha");
 define('_RU_CONTACT_PROPERTIES_EMAIL_FORMAT', "Формат письма");
 define('_RU_CONTACT_PROPERTIES_EMAIL_FORMAT_PLAINTEXT', "Текст");
 define('_RU_CONTACT_PROPERTIES_EMAIL_FORMAT_HTML', "HTML");

Modified: trunk/jaws/html/gadgets/Contact/languages/sv.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/languages/sv.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/languages/sv.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -55,7 +55,6 @@
 define('_SV_CONTACT_ERROR_RECIPIENT_NOT_DELETED', "Ett problem uppstod när mottagaren skulle raderas");
 define('_SV_CONTACT_ERROR_RECIPIENT_DOES_NOT_EXISTS', "Mottagaren existerar inte");
 define('_SV_CONTACT_PROPERTIES_USE_ANTISPAM', "Antispam");
-define('_SV_CONTACT_PROPERTIES_USE_CAPTCHA', "Captcha");
 define('_SV_CONTACT_PROPERTIES_EMAIL_FORMAT', "Epost-format");
 define('_SV_CONTACT_PROPERTIES_EMAIL_FORMAT_PLAINTEXT', "Oformaterad text");
 define('_SV_CONTACT_PROPERTIES_EMAIL_FORMAT_HTML', "Html");

Modified: trunk/jaws/html/gadgets/Contact/languages/tr.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/languages/tr.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/languages/tr.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -55,7 +55,6 @@
 define('_TR_CONTACT_ERROR_RECIPIENT_NOT_DELETED', "Alıcı silinirken bir sorun oluştu");
 define('_TR_CONTACT_ERROR_RECIPIENT_DOES_NOT_EXISTS', "Alıcı oluşturulmamış");
 define('_TR_CONTACT_PROPERTIES_USE_ANTISPAM', "İstenmeyen Posta Savar");
-define('_TR_CONTACT_PROPERTIES_USE_CAPTCHA', "Captcha");
 define('_TR_CONTACT_PROPERTIES_EMAIL_FORMAT', "E-İleti Biçimi");
 define('_TR_CONTACT_PROPERTIES_EMAIL_FORMAT_PLAINTEXT', "Düz Metin");
 define('_TR_CONTACT_PROPERTIES_EMAIL_FORMAT_HTML', "HTML");

Modified: trunk/jaws/html/gadgets/Contact/languages/zh.php
===================================================================
--- trunk/jaws/html/gadgets/Contact/languages/zh.php	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/languages/zh.php	2012-01-16 08:13:22 UTC (rev 12413)
@@ -35,7 +35,6 @@
 define('_ZH_CONTACT_RECIPIENT_ID', "ID");
 define('_ZH_CONTACT_RECIPIENT_NAME', "收件人名字");
 define('_ZH_CONTACT_RECIPIENT_VISIBLE', "可见的");
-define('_ZH_CONTACT_PROPERTIES_USE_CAPTCHA', "Captcha");
 define('_ZH_CONTACT_PROPERTIES_USE_ANTISPAM', "反对垃圾");
 define('_ZH_CONTACT_PROPERTIES_SEND_HTML', "发送 HTML");
 define('_ZH_CONTACT_INCOMPLETE_FIELDS', "一些区域没有被(正确)填写.");

Modified: trunk/jaws/html/gadgets/Contact/resources/script.js
===================================================================
--- trunk/jaws/html/gadgets/Contact/resources/script.js	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/resources/script.js	2012-01-16 08:13:22 UTC (rev 12413)
@@ -349,7 +349,6 @@
 {
     contactAsync.updateproperties(
                         $('use_antispam').value,
-                        $('use_captcha').value,
                         $('email_format').value,
                         getEditorValue('comments'));
 }

Added: trunk/jaws/html/gadgets/Contact/schema/0.3.0.xml
===================================================================
--- trunk/jaws/html/gadgets/Contact/schema/0.3.0.xml	                        (rev 0)
+++ trunk/jaws/html/gadgets/Contact/schema/0.3.0.xml	2012-01-16 08:13:22 UTC (rev 12413)
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<database>
+
+ <name><variable>database</variable></name>
+
+ <table>
+    <name><variable>table_prefix</variable>contacts</name>
+    <declaration>
+
+        <field>
+            <name>id</name>
+            <type>integer</type>
+            <notnull>true</notnull>
+            <autoincrement>true</autoincrement>
+        </field>
+
+        <field>
+            <name>name</name>
+            <type>text</type>
+            <length>128</length>
+            <notnull>true</notnull>
+        </field>
+
+        <field>
+            <name>company</name>
+            <type>text</type>
+            <length>128</length>
+        </field>
+
+        <field>
+            <name>email</name>
+            <type>text</type>
+            <length>128</length>
+            <notnull>true</notnull>
+        </field>
+
+        <field>
+            <name>url</name>
+            <type>text</type>
+            <length>128</length>
+        </field>
+
+        <field>
+            <name>tel</name>
+            <type>text</type>
+            <length>64</length>
+        </field>
+
+        <field>
+            <name>fax</name>
+            <type>text</type>
+            <length>64</length>
+        </field>
+
+        <field>
+            <name>mobile</name>
+            <type>text</type>
+            <length>32</length>
+        </field>
+
+        <field>
+            <name>address</name>
+            <type>text</type>
+            <length>255</length>
+        </field>
+
+        <field>
+            <name>recipient</name>
+            <type>integer</type>
+            <notnull>true</notnull>
+            <default>0</default>
+        </field>
+
+        <field>
+            <name>subject</name>
+            <type>text</type>
+            <length>255</length>
+            <notnull>true</notnull>
+        </field>
+
+        <field>
+            <name>msg_txt</name>
+            <was>message</was>
+            <type>text</type>
+            <notnull>false</notnull>
+        </field>
+
+        <field>
+            <name>attachment</name>
+            <type>text</type>
+            <length>255</length>
+            <notnull>false</notnull>
+        </field>
+
+        <field>
+            <name>reply</name>
+            <type>text</type>
+            <notnull>false</notnull>
+        </field>
+
+        <field>
+            <name>reply_sent</name>
+            <type>integer</type>
+            <length>1</length>
+            <default>0</default>
+        </field>
+
+        <field>
+            <name>createtime</name>
+            <type>timestamp</type>
+        </field>
+
+        <field>
+            <name>updatetime</name>
+            <type>timestamp</type>
+        </field>
+
+    </declaration>
+ </table>
+
+ <table>
+    <name><variable>table_prefix</variable>contacts_recipients</name>
+    <declaration>
+
+        <field>
+            <name>id</name>
+            <type>integer</type>
+            <notnull>true</notnull>
+            <autoincrement>true</autoincrement>
+        </field>
+
+        <field>
+            <name>name</name>
+            <type>text</type>
+            <length>128</length>
+            <notnull>true</notnull>
+        </field>
+
+        <field>
+            <name>email</name>
+            <type>text</type>
+            <length>128</length>
+            <notnull>false</notnull>
+        </field>
+
+        <field>
+            <name>tel</name>
+            <type>text</type>
+            <length>64</length>
+        </field>
+
+        <field>
+            <name>fax</name>
+            <type>text</type>
+            <length>64</length>
+        </field>
+
+        <field>
+            <name>mobile</name>
+            <type>text</type>
+            <length>32</length>
+        </field>
+
+        <field>
+            <name>inform_type</name>
+            <type>integer</type>
+            <length>1</length>
+            <default>1</default>
+        </field>
+
+        <field>
+            <name>visible</name>
+            <type>integer</type>
+            <length>1</length>
+            <default>0</default>
+        </field>
+
+        </declaration>
+ </table>
+
+</database>

Modified: trunk/jaws/html/gadgets/Contact/schema/schema.xml
===================================================================
--- trunk/jaws/html/gadgets/Contact/schema/schema.xml	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/schema/schema.xml	2012-01-16 08:13:22 UTC (rev 12413)
@@ -15,6 +15,13 @@
         </field>
 
         <field>
+            <name>user</name>
+            <type>integer</type>
+            <notnull>false</notnull>
+            <default>0</default>
+        </field>
+
+        <field>
             <name>name</name>
             <type>text</type>
             <length>128</length>
@@ -80,7 +87,6 @@
 
         <field>
             <name>msg_txt</name>
-            <was>message</was>
             <type>text</type>
             <notnull>false</notnull>
         </field>

Modified: trunk/jaws/html/gadgets/Contact/templates/AdminProperties.html
===================================================================
--- trunk/jaws/html/gadgets/Contact/templates/AdminProperties.html	2012-01-16 08:11:32 UTC (rev 12412)
+++ trunk/jaws/html/gadgets/Contact/templates/AdminProperties.html	2012-01-16 08:13:22 UTC (rev 12413)
@@ -5,7 +5,6 @@
   <tr><td align="center">
     <table id="settings" cellpadding="2" cellspacing="2">
       <tr><td class="title_label"><label for="use_antispam">{lbl_use_antispam}:</label></td><td>{use_antispam}</td></tr>
-      <tr><td class="title_label"><label for="use_captcha">{lbl_use_captcha}:</label></td><td>{use_captcha}</td></tr>
       <tr><td class="title_label"><label for="email_format">{lbl_email_format}:</label></td><td>{email_format}</td></tr>
       <tr><td class="title_label"><label for="comments">{lbl_comments}:</label></td><td>{comments}</td></tr>
     </table>



More information about the Jaws-commits mailing list