From 092c98e6aa0ecb3cc83c61f3941dde4044948a28 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Tue, 5 Nov 2013 20:51:32 +0100
Subject: [PATCH 1/2] Changelog & lang en_US for Skype module

---
 ChangeLog                     | 3 +++
 htdocs/langs/en_US/admin.lang | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 72a1ecf49ba..51a6e2664ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,9 @@ For users:
 - Fix: [ bug #1022 ] correct margin calculation for credit notes.
 - Fix: Better management of using ajax for upload form (to solve problem when enabling ajax jquery multifile upload in some cases).
 
+New experimental module:
+- New: [ task #157 ] Add a Skype button (adherents / third parties / contacts)
+
 For translators:
 - Qual: Normalized sort order of all languages files with English reference files.
 - New: Add language code files for South Africa, France new Caledonia, Vietnam.
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b9b5de0abb3..8fe0d7aabe2 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -487,6 +487,8 @@ Module2700Desc= Use online Gravatar service (www.gravatar.com) to show photo of
 Module2800Desc=FTP Client
 Module2900Name= GeoIPMaxmind
 Module2900Desc= GeoIP Maxmind conversions capabilities
+Module3100Name= Skype
+Module3100Desc= Add a Skype button into card of adherents / third parties / contacts
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow

From 51ad76b6debdc8471a4e78d95d90706524aa6616 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 Nov 2013 12:53:43 +0100
Subject: [PATCH 2/2] fix: minor syntax rules

---
 htdocs/install/mysql/tables/llx_opensurvey_sondage.sql | 10 +++++-----
 htdocs/opensurvey/public/create_survey.php             |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql b/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
index 1704938a6f7..f66fbcf5e79 100644
--- a/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
+++ b/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
@@ -17,17 +17,17 @@
 
 CREATE TABLE llx_opensurvey_sondage (
        id_sondage VARCHAR(16) PRIMARY KEY,
-       id_sondage_admin CHAR(24),
+       id_sondage_admin VARCHAR(24),
        commentaires text,
        mail_admin VARCHAR(128),
        nom_admin VARCHAR(64),
-       titre text,
-       date_fin datetime,
+       titre TEXT,
+       date_fin DATETIME,
        format VARCHAR(2),
        mailsonde varchar(2) DEFAULT '0',
        survey_link_visible integer DEFAULT 1,
 	   canedit integer DEFAULT 0,
-       origin varchar(64),
-       tms timestamp,
+       origin VARCHAR(64),
+       tms TIMESTAMP,
 	   sujet TEXT
 ) ENGINE=InnoDB;
diff --git a/htdocs/opensurvey/public/create_survey.php b/htdocs/opensurvey/public/create_survey.php
index 40a41694732..f601602144c 100644
--- a/htdocs/opensurvey/public/create_survey.php
+++ b/htdocs/opensurvey/public/create_survey.php
@@ -168,7 +168,7 @@ print '<input type="checkbox" name="canedit" '.$cocheplus.'> '. $langs->trans("V
 
 if ($_SESSION["mailsonde"]) $cochemail="checked";
 
-print '<input type=checkbox name=mailsonde '.$cochemail.'> '. $langs->trans("ToReceiveEMailForEachVote") .'<br>'."\n";
+print '<input type="checkbox" name="mailsonde" '.$cochemail.'> '. $langs->trans("ToReceiveEMailForEachVote") .'<br>'."\n";
 
 if (GETPOST('choix_sondage'))
 {