From 08699959f1b3955feb706186f559647bed2920b1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 18 Dec 2004 20:02:00 +0000
Subject: [PATCH] New: Ajout option pour choisir le mode de syncronisation avec
 webcalendar.

---
 htdocs/admin/webcalendar.php  | 31 ++++++++++++++++++++++++-------
 htdocs/langs/en_US/admin.lang |  7 ++++++-
 htdocs/langs/fr_FR/admin.lang |  7 ++++++-
 htdocs/master.inc.php         |  1 +
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/webcalendar.php b/htdocs/admin/webcalendar.php
index 54b4c8f4325..a813bdf5338 100644
--- a/htdocs/admin/webcalendar.php
+++ b/htdocs/admin/webcalendar.php
@@ -49,6 +49,7 @@ $phpwebcalendar_dbname=trim($_POST["phpwebcalendar_dbname"]);
 $phpwebcalendar_user=trim($_POST["phpwebcalendar_user"]);
 $phpwebcalendar_pass=trim($_POST["phpwebcalendar_pass"]);
 $phpwebcalendar_pass2=trim($_POST["phpwebcalendar_pass2"]);
+$phpwebcalendar_syncro=trim($_POST["phpwebcalendar_syncro"]);
 $actionsave=$_POST["save"];
 $actiontest=$_POST["test"];
 
@@ -87,7 +88,13 @@ if ($actionsave)
 			$sql4 = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('PHPWEBCALENDAR_PASS','".$phpwebcalendar_pass."',0);";
 			$result4=$db->query($sql4);
 
-            if ($result && $result1 && $result2 && $result3 && $result4)
+			$sql5 = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'PHPWEBCALENDAR_SYNCRO';";
+			$db->query($sql5);
+			
+			$sql5 = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('PHPWEBCALENDAR_SYNCRO','".$phpwebcalendar_syncro."',0);";
+			$result5=$db->query($sql5);
+
+            if ($result && $result1 && $result2 && $result3 && $result4 && $result5)
             {
                 $ok = "<br><font class=\"ok\">Les identifiants Webcalendar ont été sauvegardés avec succès.</font>";
             }
@@ -103,7 +110,8 @@ if (! $phpwebcalendar_host)     { $phpwebcalendar_host=PHPWEBCALENDAR_HOST; }
 if (! $phpwebcalendar_dbname)   { $phpwebcalendar_dbname=PHPWEBCALENDAR_DBNAME; }
 if (! $phpwebcalendar_user)     { $phpwebcalendar_user=PHPWEBCALENDAR_USER; }
 if (! $phpwebcalendar_pass)     { $phpwebcalendar_pass=PHPWEBCALENDAR_PASS; }
-if (! $phpwebcalendar_pass2)     { $phpwebcalendar_pass2=PHPWEBCALENDAR_PASS; }
+if (! $phpwebcalendar_pass2)    { $phpwebcalendar_pass2=PHPWEBCALENDAR_PASS; }
+if (! $phpwebcalendar_syncro)   { $phpwebcalendar_syncro="nobydefault"; }
 
 
 /**
@@ -140,19 +148,28 @@ print "<table class=\"noborder\">
 <td><input type=\"password\" name=\"phpwebcalendar_pass2\" value=\"" . $phpwebcalendar_pass2 ."\" size=\"45\"></td>
 </tr>
 <tr class=\"impair\">
+<td>".$langs->trans("WebCalSyncro")."</td>
+<td>";
+print '<select name="phpwebcalendar_syncro">';
+print '<option value="always"'.($phpwebcalendar_syncro=='always'?' selected':'').'>'.$langs->trans("WebCalAllways");
+print '<option value="yesbydefault"'.($phpwebcalendar_syncro=='yesbydefault'?' selected':'').'>'.$langs->trans("WebCalYesByDefault");
+print '<option value="nobydefault"'.(!$phpwebcalendar_syncro || $phpwebcalendar_syncro=='nobydefault'?' selected':'').'>'.$langs->trans("WebCalNoByDefault");
+print '<option value="never"'.($phpwebcalendar_syncro=='never'?' selected':'').'>'.$langs->trans("WebCalNever");
+print '</select>';
+print "</td>
+</tr>
+<tr class=\"pair\">
 <td colspan=\"2\" align=\"center\">
 <input type=\"submit\" name=\"test\" value=\"".$langs->trans("TestConnection")."\">
 <input type=\"submit\" name=\"save\" value=\"".$langs->trans("Save")."\">
 </td>
-</tr>\n";
-
-clearstatcache();
-
-print "
+</tr>
 </table>
 </form>\n";
 
 
+clearstatcache();
+
 if ($ok) print "$ok<br>";
 
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 99ab448fb28..5a436331a57 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -73,4 +73,9 @@ MaxSizeList=Max length for list
 MenuTopManager=Top menu manager
 MessageOfDay=Message of day
 DefaultLanguage=Default language to use (language code)
-SystemSuccessfulyUpdated=Your sustem has been updated successfully
\ No newline at end of file
+SystemSuccessfulyUpdated=Your sustem has been updated successfully
+WebCalSyncro=Add Dolibarr Event to WebCalendar
+WebCalAllways=Always, no asking
+WebCalYesByDefault=On demand (yes by default)
+WebCalNoByDefault=On demand (no by default)
+WebCalNever=Never
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 01007c6c03f..24219624f70 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -73,4 +73,9 @@ MaxSizeList=Longueur maximale des listes
 MenuTopManager=Gestionnaire du menu du haut
 MessageOfDay=Message du jour
 DefaultLanguage=Langue par défaut à utiliser (code langue)
-SystemSuccessfulyUpdated=Votre système a été mis à jour avec succès
\ No newline at end of file
+SystemSuccessfulyUpdated=Votre système a été mis à jour avec succès
+WebCalSyncro=Intégrer les évênements Dolibarr dans WebCalendar
+WebCalAllways=Toujours, sans demander
+WebCalYesByDefault=Sur demande (oui par défaut)
+WebCalNoByDefault=Sur demande (non par défaut)
+WebCalNever=Jamais
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 3b2ede44215..6715dbc4e70 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -292,6 +292,7 @@ if (defined("MAIN_MODULE_WEBCALENDAR"))
   $conf->webcal->db->user=PHPWEBCALENDAR_USER;
   $conf->webcal->db->pass=PHPWEBCALENDAR_PASS;
   $conf->webcal->db->name=PHPWEBCALENDAR_DBNAME;
+  $conf->webcal->syncro=PHPWEBCALENDAR_SYNCRO;
 }
 if (defined("MAIN_MODULE_FACTURE"))
 {