diff --git a/dev/initdemo/initdemo.sql b/dev/initdemo/initdemo.sql index 6bbe2b4ce4f..befa67aa826 100644 --- a/dev/initdemo/initdemo.sql +++ b/dev/initdemo/initdemo.sql @@ -1882,7 +1882,7 @@ SET character_set_client = @saved_cs_client; LOCK TABLES `llx_const` WRITE; /*!40000 ALTER TABLE `llx_const` DISABLE KEYS */; -INSERT INTO `llx_const` VALUES (4,'SYSLOG_FILE','DOL_DATA_ROOT/dolibarr.log','chaine',0,'Directory where to write log file','2008-08-07 19:56:01'),(5,'SYSLOG_LEVEL','6','chaine',0,'Level of debug info to show','2008-08-07 19:56:01'),(10,'MAIN_FEATURES_LEVEL','0','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development','2008-08-07 19:56:01'),(11,'MAIN_FASTSEARCH_COMPANY','1','yesno',0,'Show form for quick company search','2008-08-07 19:56:01'),(12,'MAIN_FASTSEARCH_CONTACT','1','yesno',0,'Show form for quick contact search','2008-08-07 19:56:01'),(13,'MAIN_FASTSEARCH_PRODUCT','1','yesno',0,'Show form for quick product search','2008-08-07 19:56:01'),(21,'MAIN_DELAY_ACTIONS_TODO','7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2008-08-07 19:56:01'),(22,'MAIN_DELAY_ORDERS_TO_PROCESS','2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes non traitées','2008-08-07 19:56:01'),(23,'MAIN_DELAY_PROPALS_TO_CLOSE','31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2008-08-07 19:56:01'),(24,'MAIN_DELAY_PROPALS_TO_BILL','7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2008-08-07 19:56:01'),(25,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY','2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2008-08-07 19:56:01'),(26,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED','31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2008-08-07 19:56:01'),(27,'MAIN_DELAY_NOT_ACTIVATED_SERVICES','0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2008-08-07 19:56:01'),(28,'MAIN_DELAY_RUNNING_SERVICES','0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2008-08-07 19:56:01'),(29,'MAIN_DELAY_MEMBERS','31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2008-08-07 19:56:01'),(30,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE','62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2008-08-07 19:56:01'),(31,'SOCIETE_NOLIST_COURRIER','1','yesno',0,'Liste les fichiers du repertoire courrier','2008-08-07 19:56:01'),(32,'SOCIETE_CODECLIENT_ADDON','mod_codeclient_leopard','yesno',0,'Module to control third parties codes','2008-08-07 19:56:01'),(33,'SOCIETE_CODECOMPTA_ADDON','mod_codecompta_panicum','yesno',0,'Module to control third parties codes','2008-08-07 19:56:01'),(34,'FACTURE_DISABLE_RECUR','1','yesno',0,'Desactivation facture recurrentes','2008-08-07 19:56:01'),(35,'ADHERENT_MAIL_REQUIRED','1','yesno',0,'Le mail est obligatoire pour créer un adhérent','2008-08-07 19:56:01'),(36,'ADHERENT_MAIL_FROM','adherents@domain.com','chaine',0,'From des mails adherents','2008-08-07 19:56:02'),(37,'ADHERENT_MAIL_RESIL','Votre adhesion vient d\'etre resiliee.\r\nNous esperons vous revoir tres bientot','texte',0,'Mail de Resiliation','2008-08-07 19:56:02'),(38,'ADHERENT_MAIL_VALID','Votre adhesion vient d\'etre validee. \r\nVoici le rappel de vos coordonnees (toute information erronee entrainera la non validation de votre inscription) :\r\n\r\n%INFOS%\r\n\r\nVous pouvez a tout moment, grace a votre login et mot de passe, modifier vos coordonnees a l\'adresse suivante : \r\n%DOL_MAIN_URL_ROOT%/public/adherents/','texte',0,'Mail de validation','2008-08-07 19:56:02'),(39,'ADHERENT_MAIL_COTIS','Bonjour %PRENOM%,\r\nMerci de votre inscription.\r\nCet email confirme que votre cotisation a ete recue et enregistree.\r\n\r\nVous pouvez a tout moment, grace a votre login et mot de passe, modifier vos coordonnees a l\'adresse suivante :\r\n%DOL_MAIN_URL_ROOT%/public/adherents/','texte',0,'Mail de validation de cotisation','2008-08-07 19:56:02'),(40,'ADHERENT_MAIL_VALID_SUBJECT','Votre adhésion a ete validée','chaine',0,'Sujet du mail de validation','2008-08-07 19:56:02'),(41,'ADHERENT_MAIL_RESIL_SUBJECT','Resiliation de votre adhesion','chaine',0,'Sujet du mail de resiliation','2008-08-07 19:56:02'),(42,'ADHERENT_MAIL_COTIS_SUBJECT','Recu de votre cotisation','chaine',0,'Sujet du mail de validation de cotisation','2008-08-07 19:56:02'),(43,'MAILING_EMAIL_FROM','dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2008-08-07 19:56:02'),(44,'ADHERENT_USE_MAILMAN','0','yesno',0,'Utilisation de Mailman','2008-08-07 19:56:02'),(45,'ADHERENT_MAILMAN_UNSUB_URL','http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%','chaine',0,'Url de desinscription aux listes mailman','2008-08-07 19:56:02'),(46,'ADHERENT_MAILMAN_URL','http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%','chaine',0,'Url pour les inscriptions mailman','2008-08-07 19:56:02'),(47,'ADHERENT_MAILMAN_LISTS','test-test,test-test2','chaine',0,'Listes auxquelles inscrire les nouveaux adherents','2008-08-07 19:56:02'),(48,'ADHERENT_MAILMAN_ADMINPW','','chaine',0,'Mot de passe Admin des liste mailman','2008-08-07 19:56:02'),(49,'ADHERENT_MAILMAN_SERVER','lists.domain.com','chaine',0,'Serveur hebergeant les interfaces d Admin des listes mailman','2008-08-07 19:56:02'),(50,'ADHERENT_MAILMAN_LISTS_COTISANT','','chaine',0,'Liste(s) auxquelles les nouveaux cotisants sont inscris automatiquement','2008-08-07 19:56:02'),(51,'ADHERENT_USE_SPIP','0','yesno',0,'Utilisation de SPIP ?','2008-08-07 19:56:02'),(52,'ADHERENT_USE_SPIP_AUTO','0','yesno',0,'Utilisation de SPIP automatiquement','2008-08-07 19:56:02'),(53,'ADHERENT_SPIP_USER','user','chaine',0,'user spip','2008-08-07 19:56:02'),(54,'ADHERENT_SPIP_PASS','pass','chaine',0,'Pass de connection','2008-08-07 19:56:02'),(55,'ADHERENT_SPIP_SERVEUR','localhost','chaine',0,'serveur spip','2008-08-07 19:56:02'),(56,'ADHERENT_SPIP_DB','spip','chaine',0,'db spip','2008-08-07 19:56:02'),(57,'ADHERENT_CARD_HEADER_TEXT','%ANNEE%','chaine',0,'Texte imprime sur le haut de la carte adherent','2008-08-07 19:56:02'),(58,'ADHERENT_CARD_FOOTER_TEXT','Association AZERTY','chaine',0,'Texte imprime sur le bas de la carte adherent','2008-08-07 19:56:02'),(59,'ADHERENT_CARD_TEXT','%TYPE% n° %ID%\r\n%PRENOM% %NOM%\r\n<%EMAIL%>\r\n%ADRESSE%\r\n%CP% %VILLE%\r\n%PAYS%','texte',0,'Texte imprime sur la carte adherent','2008-08-07 19:56:02'),(60,'FCKEDITOR_ENABLE_USER','1','yesno',0,'Activation fckeditor sur notes utilisateurs','2008-08-07 19:56:02'),(61,'FCKEDITOR_ENABLE_SOCIETE','1','yesno',0,'Activation fckeditor sur notes societe','2008-08-07 19:56:02'),(62,'FCKEDITOR_ENABLE_PRODUCTDESC','1','yesno',0,'Activation fckeditor sur notes produits','2008-08-07 19:56:02'),(63,'FCKEDITOR_ENABLE_MEMBER','1','yesno',0,'Activation fckeditor sur notes adherent','2008-08-07 19:56:02'),(64,'FCKEDITOR_ENABLE_MAILING','1','yesno',0,'Activation fckeditor sur emailing','2008-08-07 19:56:02'),(65,'OSC_DB_HOST','localhost','chaine',0,'Host for OSC database for OSCommerce module 1','2008-08-07 19:56:02'),(66,'DON_ADDON_MODEL','html_cerfafr','chaine',0,NULL,'2008-08-07 19:56:02'),(67,'PROPALE_ADDON','mod_propale_marbre','chaine',0,NULL,'2008-08-07 19:56:02'),(68,'PROPALE_ADDON_PDF','azur','chaine',0,NULL,'2008-08-07 19:56:02'),(69,'COMMANDE_ADDON','mod_commande_marbre','chaine',0,NULL,'2008-08-07 19:56:02'),(70,'COMMANDE_ADDON_PDF','einstein','chaine',0,NULL,'2008-08-07 19:56:02'),(71,'COMMANDE_SUPPLIER_ADDON','mod_commande_fournisseur_muguet','chaine',0,NULL,'2008-08-07 19:56:02'),(72,'COMMANDE_SUPPLIER_ADDON_PDF','muscadet','chaine',0,NULL,'2008-08-07 19:56:02'),(73,'EXPEDITION_ADDON','enlevement','chaine',0,NULL,'2008-08-07 19:56:02'),(74,'EXPEDITION_ADDON_PDF','rouget','chaine',0,NULL,'2008-08-07 19:56:02'),(75,'FICHEINTER_ADDON','pacific','chaine',0,NULL,'2008-08-07 19:56:02'),(76,'FICHEINTER_ADDON_PDF','soleil','chaine',0,NULL,'2008-08-07 19:56:02'),(77,'FACTURE_ADDON','terre','chaine',0,NULL,'2008-08-07 19:56:02'),(78,'FACTURE_ADDON_PDF','crabe','chaine',0,NULL,'2008-08-07 19:56:02'),(79,'MAIN_FORCE_SETLOCALE_LC_ALL','','chaine',1,'Pour forcer LC_ALL si pb de locale','2008-08-07 19:56:02'),(80,'MAIN_FORCE_SETLOCALE_LC_TIME','','chaine',1,'Pour forcer LC_TIME si pb de locale','2008-08-07 19:56:02'),(81,'MAIN_FORCE_SETLOCALE_LC_MONETARY','','chaine',1,'Pour forcer LC_MONETARY si pb de locale','2008-08-07 19:56:02'),(82,'MAIN_FORCE_SETLOCALE_LC_NUMERIC','','chaine',1,'Mettre la valeur C si problème de centimes','2008-08-07 19:56:02'),(83,'PROPALE_VALIDITY_DURATION','15','chaine',0,'Durée de validitée des propales','2008-08-07 19:56:02'),(84,'GENBARCODE_LOCATION','/usr/local/bin/genbarcode','chaine',0,'location of genbarcode','2008-08-07 19:56:02'),(85,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE','1','chaine',0,'','2008-08-07 19:56:03'),(86,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE','1','chaine',0,'','2008-08-07 19:56:03'),(87,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE','1','chaine',0,'','2008-08-07 19:56:03'),(88,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL','1','chaine',0,'','2008-08-07 19:56:03'),(89,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE','1','chaine',0,'','2008-08-07 19:56:03'),(90,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL','1','chaine',0,'','2008-08-07 19:56:03'),(91,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE','1','chaine',0,'','2008-08-07 19:56:03'),(92,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED','1','chaine',0,'','2008-08-07 19:56:03'),(93,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCELED','1','chaine',0,'','2008-08-07 19:56:03'),(94,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL','1','chaine',0,'','2008-08-07 19:56:03'),(95,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE','1','chaine',0,'','2008-08-07 19:56:03'),(96,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE','1','chaine',0,'','2008-08-07 19:56:03'),(98,'MAIN_VERSION_LAST_INSTALL','2.4-beta','chaine',0,'Dolibarr version for last install','2008-08-07 19:57:39'),(110,'MAIN_MODULE_COMMANDE','1',NULL,0,NULL,'2008-08-07 19:59:07'),(113,'MAIN_MODULE_TAX','1',NULL,0,NULL,'2008-08-07 19:59:11'),(114,'MAIN_MODULE_BANQUE','1',NULL,0,NULL,'2008-08-07 19:59:16'),(115,'MAIN_MODULE_FOURNISSEUR','1',NULL,0,NULL,'2008-08-07 19:59:19'),(119,'MAIN_MODULE_STOCK','1',NULL,0,NULL,'2008-08-07 19:59:25'),(123,'MAIN_MODULE_FCKEDITOR','1',NULL,0,NULL,'2008-08-07 19:59:35'),(124,'MAIN_MODULE_SYSLOG','1',NULL,0,NULL,'2008-08-07 19:59:39'),(126,'MAIN_MODULE_ECM','1',NULL,0,NULL,'2008-08-07 20:00:42'),(318,'MAIN_MENUFRONT_BARRELEFT','eldy_frontoffice','chaine',0,NULL,'2008-08-19 19:35:31'),(319,'MAIN_MENUFRONT_BARRETOP','eldy_frontoffice','chaine',0,NULL,'2008-08-19 19:35:31'),(320,'MAIN_MENU_BARRELEFT','eldy_backoffice','chaine',0,NULL,'2008-08-19 19:35:31'),(321,'MAIN_MENU_BARRETOP','eldy_backoffice','chaine',0,NULL,'2008-08-19 19:35:31'),(336,'MAIN_MODULE_FACTURE','1',NULL,0,NULL,'2008-08-19 19:38:19'),(337,'FAC_FORCE_DATE_VALIDATION','0','yesno',0,NULL,'2008-08-19 19:38:19'),(339,'MAIN_MODULE_EXPORT','1',NULL,0,NULL,'2008-08-19 19:38:42'),(340,'MAIN_MODULE_DEPLACEMENT','1',NULL,0,NULL,'2008-08-19 19:38:56'),(341,'MAIN_MODULE_MAILING','1',NULL,0,NULL,'2008-08-19 19:39:13'),(343,'MAIN_SECURITY_DISABLEFORGETPASSLINK','1','chaine',0,'','2008-08-19 19:44:19'),(344,'MAIN_UPLOAD_DOC','0','chaine',0,'','2008-08-19 19:44:39'),(345,'MAIN_LOGEVENTS_USER_LOGIN','1','chaine',0,'','2008-08-19 19:45:17'),(357,'MAIN_MODULE_AGENDA','1',NULL,0,NULL,'2008-08-24 22:03:20'),(359,'MAIN_MODULE_USER','1',NULL,0,NULL,'2008-08-24 22:03:33'),(360,'MAIN_VERSION_LAST_UPGRADE','2.4','chaine',0,'Dolibarr version for last upgrade','2008-08-24 22:03:33'),(361,'MAIN_MODULE_EXPEDITION','1',NULL,0,NULL,'2008-08-25 21:24:45'),(362,'LIVRAISON_ADDON_PDF','typhon','chaine',0,'Nom du gestionnaire de generation des commandes en PDF','2008-08-25 21:24:45'),(363,'LIVRAISON_ADDON','mod_livraison_jade','chaine',0,'Nom du gestionnaire de numerotation des bons de livraison','2008-08-25 21:24:45'),(364,'MAIN_MODULE_PROPALE','1',NULL,0,NULL,'2008-08-25 21:24:45'),(370,'MAIN_MODULE_COMMERCIAL','1',NULL,0,NULL,'2008-08-25 21:24:48'),(371,'MAIN_MODULE_SOCIETE','1',NULL,0,NULL,'2008-08-25 21:24:48'),(372,'MAIN_MODULE_CONTRAT','1',NULL,0,NULL,'2008-08-25 21:24:53'),(373,'MAIN_MODULE_SERVICE','1',NULL,0,NULL,'2008-08-25 21:24:53'),(374,'MAIN_MODULE_PRODUIT','1',NULL,0,NULL,'2008-08-25 21:24:53'),(375,'MAIN_INFO_SOCIETE_NOM','Barridol','chaine',0,'','2008-08-26 08:43:26'),(376,'MAIN_INFO_SOCIETE_ADRESSE','10 road street','chaine',0,'','2008-08-26 08:43:26'),(377,'MAIN_INFO_SOCIETE_VILLE','BigTown','chaine',0,'','2008-08-26 08:43:26'),(378,'MAIN_INFO_SOCIETE_CP','75000','chaine',0,'','2008-08-26 08:43:26'),(379,'MAIN_INFO_SOCIETE_PAYS','1','chaine',0,'','2008-08-26 08:43:26'),(380,'MAIN_MONNAIE','EUR','chaine',0,'','2008-08-26 08:43:26'),(381,'MAIN_INFO_SOCIETE_TEL','01 02 03 04 05','chaine',0,'','2008-08-26 08:43:26'),(382,'MAIN_INFO_SOCIETE_FAX','01 02 03 04 06','chaine',0,'','2008-08-26 08:43:26'),(383,'MAIN_INFO_SOCIETE_MAIL','mycompany@mycompany.com','chaine',0,'','2008-08-26 08:43:26'),(384,'MAIN_INFO_SOCIETE_WEB','www.dolibarr.org','chaine',0,'','2008-08-26 08:43:26'),(385,'MAIN_INFO_SOCIETE_LOGO','dolibarr_logo2.png','chaine',0,'','2008-08-26 08:43:26'),(386,'MAIN_INFO_SOCIETE_LOGO_SMALL','dolibarr_logo2_small.png','chaine',0,'','2008-08-26 08:43:26'),(387,'MAIN_INFO_SOCIETE_LOGO_MINI','dolibarr_logo2_mini.png','chaine',0,'','2008-08-26 08:43:26'),(388,'MAIN_INFO_CAPITAL','15000','chaine',0,'','2008-08-26 08:43:26'),(389,'MAIN_INFO_SOCIETE_FORME_JURIDIQUE','0','chaine',0,'','2008-08-26 08:43:26'),(390,'MAIN_INFO_SIREN','123456789','chaine',0,'','2008-08-26 08:43:26'),(391,'MAIN_INFO_SIRET','123456789001','chaine',0,'','2008-08-26 08:43:26'),(392,'MAIN_INFO_APE','721Z','chaine',0,'','2008-08-26 08:43:26'),(393,'MAIN_INFO_TVAINTRA','12345679012345','chaine',0,'','2008-08-26 08:43:26'),(394,'SOCIETE_FISCAL_MONTH_START','0','chaine',0,'','2008-08-26 08:43:26'),(395,'FACTURE_TVAOPTION','reel','chaine',0,'','2008-08-26 08:43:26'),(407,'MAIN_LANG_DEFAULT','auto','chaine',0,'','2008-08-29 18:29:34'),(408,'MAIN_MULTILANGS','0','chaine',0,'','2008-08-29 18:29:34'),(409,'MAIN_SIZE_LISTE_LIMIT','25','chaine',0,'','2008-08-29 18:29:34'),(410,'MAIN_DISABLE_JAVASCRIPT','0','chaine',0,'','2008-08-29 18:29:34'),(411,'MAIN_POPUP_CALENDAR','eldy','chaine',0,'','2008-08-29 18:29:34'),(412,'MAIN_THEME','eldy','chaine',0,'','2008-08-29 18:29:34'),(413,'MAIN_SEARCHFORM_CONTACT','1','chaine',0,'','2008-08-29 18:29:34'),(414,'MAIN_SEARCHFORM_SOCIETE','1','chaine',0,'','2008-08-29 18:29:34'),(415,'MAIN_SEARCHFORM_PRODUITSERVICE','1','chaine',0,'','2008-08-29 18:29:34'),(416,'MAIN_MOTD','
','chaine',0,'','2008-08-29 18:29:34'),(417,'MAIN_HOME','Login: demo
Password: demo
','chaine',0,'','2008-08-29 18:29:34'),(418,'MAIN_DEMO','1','chaine',1,'','2008-08-29 19:42:33'),(419,'MAIN_MAIL_EMAIL_FROM','dolibarr-robot@domain.com','chaine',0,'','2008-08-29 19:43:20'),(420,'MAIN_DISABLE_ALL_MAILS','1','chaine',0,'','2008-08-29 19:43:20'),(421,'SYSTEMTOOLS_MYSQLDUMP','mysqldump','chaine',0,'','2008-08-29 19:45:42'); +INSERT INTO `llx_const` VALUES (4,'SYSLOG_FILE','dolibarr.log','chaine',0,'Directory where to write log file','2008-08-07 19:56:01'),(5,'SYSLOG_LEVEL','6','chaine',0,'Level of debug info to show','2008-08-07 19:56:01'),(10,'MAIN_FEATURES_LEVEL','0','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development','2008-08-07 19:56:01'),(11,'MAIN_FASTSEARCH_COMPANY','1','yesno',0,'Show form for quick company search','2008-08-07 19:56:01'),(12,'MAIN_FASTSEARCH_CONTACT','1','yesno',0,'Show form for quick contact search','2008-08-07 19:56:01'),(13,'MAIN_FASTSEARCH_PRODUCT','1','yesno',0,'Show form for quick product search','2008-08-07 19:56:01'),(21,'MAIN_DELAY_ACTIONS_TODO','7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2008-08-07 19:56:01'),(22,'MAIN_DELAY_ORDERS_TO_PROCESS','2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes non traitées','2008-08-07 19:56:01'),(23,'MAIN_DELAY_PROPALS_TO_CLOSE','31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2008-08-07 19:56:01'),(24,'MAIN_DELAY_PROPALS_TO_BILL','7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2008-08-07 19:56:01'),(25,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY','2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2008-08-07 19:56:01'),(26,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED','31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2008-08-07 19:56:01'),(27,'MAIN_DELAY_NOT_ACTIVATED_SERVICES','0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2008-08-07 19:56:01'),(28,'MAIN_DELAY_RUNNING_SERVICES','0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2008-08-07 19:56:01'),(29,'MAIN_DELAY_MEMBERS','31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2008-08-07 19:56:01'),(30,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE','62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2008-08-07 19:56:01'),(31,'SOCIETE_NOLIST_COURRIER','1','yesno',0,'Liste les fichiers du repertoire courrier','2008-08-07 19:56:01'),(32,'SOCIETE_CODECLIENT_ADDON','mod_codeclient_leopard','yesno',0,'Module to control third parties codes','2008-08-07 19:56:01'),(33,'SOCIETE_CODECOMPTA_ADDON','mod_codecompta_panicum','yesno',0,'Module to control third parties codes','2008-08-07 19:56:01'),(34,'FACTURE_DISABLE_RECUR','1','yesno',0,'Desactivation facture recurrentes','2008-08-07 19:56:01'),(35,'ADHERENT_MAIL_REQUIRED','1','yesno',0,'Le mail est obligatoire pour créer un adhérent','2008-08-07 19:56:01'),(36,'ADHERENT_MAIL_FROM','adherents@domain.com','chaine',0,'From des mails adherents','2008-08-07 19:56:02'),(37,'ADHERENT_MAIL_RESIL','Votre adhesion vient d\'etre resiliee.\r\nNous esperons vous revoir tres bientot','texte',0,'Mail de Resiliation','2008-08-07 19:56:02'),(38,'ADHERENT_MAIL_VALID','Votre adhesion vient d\'etre validee. \r\nVoici le rappel de vos coordonnees (toute information erronee entrainera la non validation de votre inscription) :\r\n\r\n%INFOS%\r\n\r\nVous pouvez a tout moment, grace a votre login et mot de passe, modifier vos coordonnees a l\'adresse suivante : \r\n%DOL_MAIN_URL_ROOT%/public/adherents/','texte',0,'Mail de validation','2008-08-07 19:56:02'),(39,'ADHERENT_MAIL_COTIS','Bonjour %PRENOM%,\r\nMerci de votre inscription.\r\nCet email confirme que votre cotisation a ete recue et enregistree.\r\n\r\nVous pouvez a tout moment, grace a votre login et mot de passe, modifier vos coordonnees a l\'adresse suivante :\r\n%DOL_MAIN_URL_ROOT%/public/adherents/','texte',0,'Mail de validation de cotisation','2008-08-07 19:56:02'),(40,'ADHERENT_MAIL_VALID_SUBJECT','Votre adhésion a ete validée','chaine',0,'Sujet du mail de validation','2008-08-07 19:56:02'),(41,'ADHERENT_MAIL_RESIL_SUBJECT','Resiliation de votre adhesion','chaine',0,'Sujet du mail de resiliation','2008-08-07 19:56:02'),(42,'ADHERENT_MAIL_COTIS_SUBJECT','Recu de votre cotisation','chaine',0,'Sujet du mail de validation de cotisation','2008-08-07 19:56:02'),(43,'MAILING_EMAIL_FROM','dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2008-08-07 19:56:02'),(44,'ADHERENT_USE_MAILMAN','0','yesno',0,'Utilisation de Mailman','2008-08-07 19:56:02'),(45,'ADHERENT_MAILMAN_UNSUB_URL','http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%','chaine',0,'Url de desinscription aux listes mailman','2008-08-07 19:56:02'),(46,'ADHERENT_MAILMAN_URL','http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%','chaine',0,'Url pour les inscriptions mailman','2008-08-07 19:56:02'),(47,'ADHERENT_MAILMAN_LISTS','test-test,test-test2','chaine',0,'Listes auxquelles inscrire les nouveaux adherents','2008-08-07 19:56:02'),(48,'ADHERENT_MAILMAN_ADMINPW','','chaine',0,'Mot de passe Admin des liste mailman','2008-08-07 19:56:02'),(49,'ADHERENT_MAILMAN_SERVER','lists.domain.com','chaine',0,'Serveur hebergeant les interfaces d Admin des listes mailman','2008-08-07 19:56:02'),(50,'ADHERENT_MAILMAN_LISTS_COTISANT','','chaine',0,'Liste(s) auxquelles les nouveaux cotisants sont inscris automatiquement','2008-08-07 19:56:02'),(51,'ADHERENT_USE_SPIP','0','yesno',0,'Utilisation de SPIP ?','2008-08-07 19:56:02'),(52,'ADHERENT_USE_SPIP_AUTO','0','yesno',0,'Utilisation de SPIP automatiquement','2008-08-07 19:56:02'),(53,'ADHERENT_SPIP_USER','user','chaine',0,'user spip','2008-08-07 19:56:02'),(54,'ADHERENT_SPIP_PASS','pass','chaine',0,'Pass de connection','2008-08-07 19:56:02'),(55,'ADHERENT_SPIP_SERVEUR','localhost','chaine',0,'serveur spip','2008-08-07 19:56:02'),(56,'ADHERENT_SPIP_DB','spip','chaine',0,'db spip','2008-08-07 19:56:02'),(57,'ADHERENT_CARD_HEADER_TEXT','%ANNEE%','chaine',0,'Texte imprime sur le haut de la carte adherent','2008-08-07 19:56:02'),(58,'ADHERENT_CARD_FOOTER_TEXT','Association AZERTY','chaine',0,'Texte imprime sur le bas de la carte adherent','2008-08-07 19:56:02'),(59,'ADHERENT_CARD_TEXT','%TYPE% n° %ID%\r\n%PRENOM% %NOM%\r\n<%EMAIL%>\r\n%ADRESSE%\r\n%CP% %VILLE%\r\n%PAYS%','texte',0,'Texte imprime sur la carte adherent','2008-08-07 19:56:02'),(60,'FCKEDITOR_ENABLE_USER','1','yesno',0,'Activation fckeditor sur notes utilisateurs','2008-08-07 19:56:02'),(61,'FCKEDITOR_ENABLE_SOCIETE','1','yesno',0,'Activation fckeditor sur notes societe','2008-08-07 19:56:02'),(62,'FCKEDITOR_ENABLE_PRODUCTDESC','1','yesno',0,'Activation fckeditor sur notes produits','2008-08-07 19:56:02'),(63,'FCKEDITOR_ENABLE_MEMBER','1','yesno',0,'Activation fckeditor sur notes adherent','2008-08-07 19:56:02'),(64,'FCKEDITOR_ENABLE_MAILING','1','yesno',0,'Activation fckeditor sur emailing','2008-08-07 19:56:02'),(65,'OSC_DB_HOST','localhost','chaine',0,'Host for OSC database for OSCommerce module 1','2008-08-07 19:56:02'),(66,'DON_ADDON_MODEL','html_cerfafr','chaine',0,NULL,'2008-08-07 19:56:02'),(67,'PROPALE_ADDON','mod_propale_marbre','chaine',0,NULL,'2008-08-07 19:56:02'),(68,'PROPALE_ADDON_PDF','azur','chaine',0,NULL,'2008-08-07 19:56:02'),(69,'COMMANDE_ADDON','mod_commande_marbre','chaine',0,NULL,'2008-08-07 19:56:02'),(70,'COMMANDE_ADDON_PDF','einstein','chaine',0,NULL,'2008-08-07 19:56:02'),(71,'COMMANDE_SUPPLIER_ADDON','mod_commande_fournisseur_muguet','chaine',0,NULL,'2008-08-07 19:56:02'),(72,'COMMANDE_SUPPLIER_ADDON_PDF','muscadet','chaine',0,NULL,'2008-08-07 19:56:02'),(73,'EXPEDITION_ADDON','enlevement','chaine',0,NULL,'2008-08-07 19:56:02'),(74,'EXPEDITION_ADDON_PDF','rouget','chaine',0,NULL,'2008-08-07 19:56:02'),(75,'FICHEINTER_ADDON','pacific','chaine',0,NULL,'2008-08-07 19:56:02'),(76,'FICHEINTER_ADDON_PDF','soleil','chaine',0,NULL,'2008-08-07 19:56:02'),(77,'FACTURE_ADDON','terre','chaine',0,NULL,'2008-08-07 19:56:02'),(78,'FACTURE_ADDON_PDF','crabe','chaine',0,NULL,'2008-08-07 19:56:02'),(79,'MAIN_FORCE_SETLOCALE_LC_ALL','','chaine',1,'Pour forcer LC_ALL si pb de locale','2008-08-07 19:56:02'),(80,'MAIN_FORCE_SETLOCALE_LC_TIME','','chaine',1,'Pour forcer LC_TIME si pb de locale','2008-08-07 19:56:02'),(81,'MAIN_FORCE_SETLOCALE_LC_MONETARY','','chaine',1,'Pour forcer LC_MONETARY si pb de locale','2008-08-07 19:56:02'),(82,'MAIN_FORCE_SETLOCALE_LC_NUMERIC','','chaine',1,'Mettre la valeur C si problème de centimes','2008-08-07 19:56:02'),(83,'PROPALE_VALIDITY_DURATION','15','chaine',0,'Durée de validitée des propales','2008-08-07 19:56:02'),(84,'GENBARCODE_LOCATION','/usr/local/bin/genbarcode','chaine',0,'location of genbarcode','2008-08-07 19:56:02'),(85,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE','1','chaine',0,'','2008-08-07 19:56:03'),(86,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE','1','chaine',0,'','2008-08-07 19:56:03'),(87,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE','1','chaine',0,'','2008-08-07 19:56:03'),(88,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL','1','chaine',0,'','2008-08-07 19:56:03'),(89,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE','1','chaine',0,'','2008-08-07 19:56:03'),(90,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL','1','chaine',0,'','2008-08-07 19:56:03'),(91,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE','1','chaine',0,'','2008-08-07 19:56:03'),(92,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED','1','chaine',0,'','2008-08-07 19:56:03'),(93,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCELED','1','chaine',0,'','2008-08-07 19:56:03'),(94,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL','1','chaine',0,'','2008-08-07 19:56:03'),(95,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE','1','chaine',0,'','2008-08-07 19:56:03'),(96,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE','1','chaine',0,'','2008-08-07 19:56:03'),(98,'MAIN_VERSION_LAST_INSTALL','2.4-beta','chaine',0,'Dolibarr version for last install','2008-08-07 19:57:39'),(110,'MAIN_MODULE_COMMANDE','1',NULL,0,NULL,'2008-08-07 19:59:07'),(113,'MAIN_MODULE_TAX','1',NULL,0,NULL,'2008-08-07 19:59:11'),(114,'MAIN_MODULE_BANQUE','1',NULL,0,NULL,'2008-08-07 19:59:16'),(115,'MAIN_MODULE_FOURNISSEUR','1',NULL,0,NULL,'2008-08-07 19:59:19'),(119,'MAIN_MODULE_STOCK','1',NULL,0,NULL,'2008-08-07 19:59:25'),(123,'MAIN_MODULE_FCKEDITOR','1',NULL,0,NULL,'2008-08-07 19:59:35'),(124,'MAIN_MODULE_SYSLOG','1',NULL,0,NULL,'2008-08-07 19:59:39'),(126,'MAIN_MODULE_ECM','1',NULL,0,NULL,'2008-08-07 20:00:42'),(318,'MAIN_MENUFRONT_BARRELEFT','eldy_frontoffice','chaine',0,NULL,'2008-08-19 19:35:31'),(319,'MAIN_MENUFRONT_BARRETOP','eldy_frontoffice','chaine',0,NULL,'2008-08-19 19:35:31'),(320,'MAIN_MENU_BARRELEFT','eldy_backoffice','chaine',0,NULL,'2008-08-19 19:35:31'),(321,'MAIN_MENU_BARRETOP','eldy_backoffice','chaine',0,NULL,'2008-08-19 19:35:31'),(336,'MAIN_MODULE_FACTURE','1',NULL,0,NULL,'2008-08-19 19:38:19'),(337,'FAC_FORCE_DATE_VALIDATION','0','yesno',0,NULL,'2008-08-19 19:38:19'),(339,'MAIN_MODULE_EXPORT','1',NULL,0,NULL,'2008-08-19 19:38:42'),(340,'MAIN_MODULE_DEPLACEMENT','1',NULL,0,NULL,'2008-08-19 19:38:56'),(341,'MAIN_MODULE_MAILING','1',NULL,0,NULL,'2008-08-19 19:39:13'),(343,'MAIN_SECURITY_DISABLEFORGETPASSLINK','1','chaine',0,'','2008-08-19 19:44:19'),(344,'MAIN_UPLOAD_DOC','0','chaine',0,'','2008-08-19 19:44:39'),(345,'MAIN_LOGEVENTS_USER_LOGIN','1','chaine',0,'','2008-08-19 19:45:17'),(357,'MAIN_MODULE_AGENDA','1',NULL,0,NULL,'2008-08-24 22:03:20'),(359,'MAIN_MODULE_USER','1',NULL,0,NULL,'2008-08-24 22:03:33'),(360,'MAIN_VERSION_LAST_UPGRADE','2.4','chaine',0,'Dolibarr version for last upgrade','2008-08-24 22:03:33'),(361,'MAIN_MODULE_EXPEDITION','1',NULL,0,NULL,'2008-08-25 21:24:45'),(362,'LIVRAISON_ADDON_PDF','typhon','chaine',0,'Nom du gestionnaire de generation des commandes en PDF','2008-08-25 21:24:45'),(363,'LIVRAISON_ADDON','mod_livraison_jade','chaine',0,'Nom du gestionnaire de numerotation des bons de livraison','2008-08-25 21:24:45'),(364,'MAIN_MODULE_PROPALE','1',NULL,0,NULL,'2008-08-25 21:24:45'),(370,'MAIN_MODULE_COMMERCIAL','1',NULL,0,NULL,'2008-08-25 21:24:48'),(371,'MAIN_MODULE_SOCIETE','1',NULL,0,NULL,'2008-08-25 21:24:48'),(372,'MAIN_MODULE_CONTRAT','1',NULL,0,NULL,'2008-08-25 21:24:53'),(373,'MAIN_MODULE_SERVICE','1',NULL,0,NULL,'2008-08-25 21:24:53'),(374,'MAIN_MODULE_PRODUIT','1',NULL,0,NULL,'2008-08-25 21:24:53'),(375,'MAIN_INFO_SOCIETE_NOM','Barridol','chaine',0,'','2008-08-26 08:43:26'),(376,'MAIN_INFO_SOCIETE_ADRESSE','10 road street','chaine',0,'','2008-08-26 08:43:26'),(377,'MAIN_INFO_SOCIETE_VILLE','BigTown','chaine',0,'','2008-08-26 08:43:26'),(378,'MAIN_INFO_SOCIETE_CP','75000','chaine',0,'','2008-08-26 08:43:26'),(379,'MAIN_INFO_SOCIETE_PAYS','1','chaine',0,'','2008-08-26 08:43:26'),(380,'MAIN_MONNAIE','EUR','chaine',0,'','2008-08-26 08:43:26'),(381,'MAIN_INFO_SOCIETE_TEL','01 02 03 04 05','chaine',0,'','2008-08-26 08:43:26'),(382,'MAIN_INFO_SOCIETE_FAX','01 02 03 04 06','chaine',0,'','2008-08-26 08:43:26'),(383,'MAIN_INFO_SOCIETE_MAIL','mycompany@mycompany.com','chaine',0,'','2008-08-26 08:43:26'),(384,'MAIN_INFO_SOCIETE_WEB','www.dolibarr.org','chaine',0,'','2008-08-26 08:43:26'),(385,'MAIN_INFO_SOCIETE_LOGO','dolibarr_logo2.png','chaine',0,'','2008-08-26 08:43:26'),(386,'MAIN_INFO_SOCIETE_LOGO_SMALL','dolibarr_logo2_small.png','chaine',0,'','2008-08-26 08:43:26'),(387,'MAIN_INFO_SOCIETE_LOGO_MINI','dolibarr_logo2_mini.png','chaine',0,'','2008-08-26 08:43:26'),(388,'MAIN_INFO_CAPITAL','15000','chaine',0,'','2008-08-26 08:43:26'),(389,'MAIN_INFO_SOCIETE_FORME_JURIDIQUE','0','chaine',0,'','2008-08-26 08:43:26'),(390,'MAIN_INFO_SIREN','123456789','chaine',0,'','2008-08-26 08:43:26'),(391,'MAIN_INFO_SIRET','123456789001','chaine',0,'','2008-08-26 08:43:26'),(392,'MAIN_INFO_APE','721Z','chaine',0,'','2008-08-26 08:43:26'),(393,'MAIN_INFO_TVAINTRA','12345679012345','chaine',0,'','2008-08-26 08:43:26'),(394,'SOCIETE_FISCAL_MONTH_START','0','chaine',0,'','2008-08-26 08:43:26'),(395,'FACTURE_TVAOPTION','reel','chaine',0,'','2008-08-26 08:43:26'),(407,'MAIN_LANG_DEFAULT','auto','chaine',0,'','2008-08-29 18:29:34'),(408,'MAIN_MULTILANGS','0','chaine',0,'','2008-08-29 18:29:34'),(409,'MAIN_SIZE_LISTE_LIMIT','25','chaine',0,'','2008-08-29 18:29:34'),(410,'MAIN_DISABLE_JAVASCRIPT','0','chaine',0,'','2008-08-29 18:29:34'),(411,'MAIN_POPUP_CALENDAR','eldy','chaine',0,'','2008-08-29 18:29:34'),(412,'MAIN_THEME','eldy','chaine',0,'','2008-08-29 18:29:34'),(413,'MAIN_SEARCHFORM_CONTACT','1','chaine',0,'','2008-08-29 18:29:34'),(414,'MAIN_SEARCHFORM_SOCIETE','1','chaine',0,'','2008-08-29 18:29:34'),(415,'MAIN_SEARCHFORM_PRODUITSERVICE','1','chaine',0,'','2008-08-29 18:29:34'),(416,'MAIN_MOTD','
','chaine',0,'','2008-08-29 18:29:34'),(417,'MAIN_HOME','Login: demo
Password: demo
','chaine',0,'','2008-08-29 18:29:34'),(418,'MAIN_DEMO','1','chaine',1,'','2008-08-29 19:42:33'),(419,'MAIN_MAIL_EMAIL_FROM','dolibarr-robot@domain.com','chaine',0,'','2008-08-29 19:43:20'),(420,'MAIN_DISABLE_ALL_MAILS','1','chaine',0,'','2008-08-29 19:43:20'),(421,'SYSTEMTOOLS_MYSQLDUMP','mysqldump','chaine',0,'','2008-08-29 19:45:42'); /*!40000 ALTER TABLE `llx_const` ENABLE KEYS */; UNLOCK TABLES; diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index 403f7d0c1d2..2bce9ac0934 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -62,11 +62,25 @@ if (! empty($_POST["action"]) && $_POST["action"] == 'set') print '
'.$langs->trans("ErrorUnknownSyslogConstant",$_POST["facility"]).'
'; } } + if ($optionlogoutput == "file") { - $filelog=$_POST["filename"]; - $filelog=eregi_replace('DOL_DATA_ROOT',DOL_DATA_ROOT,$filelog); + $filelog = $_POST["filename"]; + + if (eregi('(^[A-Za-z0-9_\-\\/:]+[\\/]+)([A-Za-z0-9_\-]+[.]?[A-Za-z0-9]+)?$', $filelog)) + { + if (eregi('DOL_DATA_ROOT', $filelog)) + { + $filelog = eregi_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $filelog); + } + } + else if ($conf->syslog->dir_output) + { + $filelog = $conf->syslog->dir_output."/".$filelog; + } + $file=fopen($filelog,"a+"); + if ($file) { fclose($file); @@ -88,14 +102,16 @@ if (! empty($_POST["action"]) && $_POST["action"] == 'set') llxHeader(); +$html=new Form($db); + $linkback=''.$langs->trans("BackToModuleList").''; print_fiche_titre($langs->trans("SyslogSetup"),$linkback,'setup'); print '
'; $def = array(); -$syslogfacility=$defaultsyslogfacility=dolibarr_get_const($db,"SYSLOG_FACILITY"); -$syslogfile=$defaultsyslogfile=dolibarr_get_const($db,"SYSLOG_FILE"); +$syslogfacility=$defaultsyslogfacility=dolibarr_get_const($db,"SYSLOG_FACILITY",$conf->entity); +$syslogfile=$defaultsyslogfile=dolibarr_get_const($db,"SYSLOG_FILE",$conf->entity); if (! $defaultsyslogfacility) $defaultsyslogfacility='LOG_USER'; if (! $defaultsyslogfile) $defaultsyslogfile='dolibarr.log'; @@ -109,19 +125,20 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print "\n"; $var=true; $var=!$var; print ""; -print ''; $var=!$var; print ""; -print ''; +$htmltext = $langs->trans("SyslogFilenameDesc",$conf->syslog->dir_output); +print "'; print "
'.$langs->trans("Type").''.$langs->trans("Parameter").'
".$langs->trans("SyslogSyslog")."'.$langs->trans("SyslogFacility").': '; +print ''.$langs->trans("SyslogFacility").': '; print ' '.img_info('Only LOG_USER supported on Windows'); print '
".$langs->trans("SyslogSimpleFile")."'.$langs->trans("SyslogFilename").': '; -print ' '.img_info($langs->trans("YouCanUseDOL_DATA_ROOT")); +print ''.$langs->trans("SyslogFilename").': ".$html->textwithhelp('',$htmltext); print '
\n"; diff --git a/htdocs/core/conf.class.php b/htdocs/core/conf.class.php index 826e0e1ad53..40c1cdf3dc6 100644 --- a/htdocs/core/conf.class.php +++ b/htdocs/core/conf.class.php @@ -109,7 +109,7 @@ class Conf { $module=strtolower($reg[1]); $dir_name="dir_".strtolower($reg[2]); - $this->$module->$dir_name = DOL_DATA_ROOT."/entity_".$this->entity."/".$value; + $this->$module->$dir_name = DOL_DATA_ROOT."/entity_".$this->entity.$value; } // If this is a module constant if (eregi('^MAIN_MODULE_([A-Z]+)$',$key,$reg) && $value) diff --git a/htdocs/includes/modules/modSyslog.class.php b/htdocs/includes/modules/modSyslog.class.php index f97b503a2ae..1642d2b3d47 100644 --- a/htdocs/includes/modules/modSyslog.class.php +++ b/htdocs/includes/modules/modSyslog.class.php @@ -56,8 +56,12 @@ class modSyslog extends DolibarrModules $this->special = 2; //$this->picto='phoning'; - // Dir + // Data directories to create when module is enabled $this->dirs = array(); + $r=0; + + $this->dirs[$r][0] = "output"; + $this->dirs[$r][1] = "/logs"; // Config pages $this->config_page_url = array("syslog.php"); diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index dcaf4cf31b1..a2a0d0d9b44 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -925,7 +925,7 @@ SyslogFacility=Facility SyslogLevel=Level SyslogSimpleFile=File SyslogFilename=File name and path -YouCanUseDOL_DATA_ROOT=You can user DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr documents directory. +SyslogFilenameDesc = This log file is located by default in the directory:
%s

You can set a different path to store this file. ErrorUnknownSyslogConstant=Constant %s is not a known syslog constant ##### Donations ##### DonationsSetup=Donation module setup diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 3d61c0aa337..3bb3fde6210 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -924,7 +924,7 @@ SyslogFacility = Facility SyslogLevel = Niveau SyslogSimpleFile = Fichier SyslogFilename = Nom et chemin du fichier -YouCanUseDOL_DATA_ROOT = Vous pouvez utiliser DOL_DATA_ROOT/dolibarr.log pour une log dans le répertoire 'documents' de Dolibarr. +SyslogFilenameDesc = Ce fichier de log est situé par défaut dans le répertoire:
%s

Vous pouvez néanmoins définir un chemin différent pour stocker ce fichier. ErrorUnknownSyslogConstant = La constante %s n'est pas une constante syslog connue ##### Donations ##### = undefined DonationsSetup = Configuration du module Dons diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index 672de58e24d..a44505251e7 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -183,8 +183,22 @@ function dol_syslog($message, $level=LOG_INFO) // Check if log is to a file (SYSLOG_FILE defined) or to syslog if (defined("SYSLOG_FILE") && SYSLOG_FILE) { - $filelog=SYSLOG_FILE; - $filelog=eregi_replace('DOL_DATA_ROOT',DOL_DATA_ROOT,$filelog); + if (eregi('(^[A-Za-z0-9_\-\\/:]+[\\/]+)([A-Za-z0-9_\-]+[.]?[A-Za-z0-9]+)?$', SYSLOG_FILE)) + { + if (eregi('DOL_DATA_ROOT', SYSLOG_FILE)) + { + $filelog = eregi_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $filelog); + } + else + { + $filelog = SYSLOG_FILE; + } + } + else if ($conf->syslog->dir_output) + { + $filelog = $conf->syslog->dir_output."/".SYSLOG_FILE; + } + if (defined("SYSLOG_FILE_NO_ERROR")) $file=@fopen($filelog,"a+"); else $file=fopen($filelog,"a+"); @@ -2615,10 +2629,10 @@ function dol_textishtml($msg,$option=0) } /** - * \brief Effectue les substitutions des mots cl�s par les donn�es en fonction du tableau + * \brief Effectue les substitutions des mots cles par les donnees en fonction du tableau * \param chaine Chaine dans laquelle faire les substitutions - * \param substitutionarray Tableau cl� substitution => valeur a mettre - * \return string Chaine avec les substitutions effectu�es + * \param substitutionarray Tableau cle substitution => valeur a mettre + * \return string Chaine avec les substitutions effectuees */ function make_substitutions($chaine,$substitutionarray) { diff --git a/htdocs/translate.class.php b/htdocs/translate.class.php index 2e82210ab15..91a553a5078 100644 --- a/htdocs/translate.class.php +++ b/htdocs/translate.class.php @@ -347,30 +347,30 @@ class Translate { */ function trans($key, $param1='', $param2='', $param3='', $param4='', $maxsize=0) { - if ($this->getTransFromTab($key)) - { - // Translation is available - $str=sprintf($this->tab_translate[$key],$param1,$param2,$param3,$param4); - if ($maxsize) $str=dol_trunc($str,$maxsize); - // On remplace les tags HTML par __xx__ pour eviter traduction par htmlentities - $newstr=ereg_replace('<','__lt__',$str); - $newstr=ereg_replace('>','__gt__',$newstr); - $newstr=ereg_replace('"','__quot__',$newstr); + if ($this->getTransFromTab($key)) + { + // Translation is available + $str=sprintf($this->tab_translate[$key],$param1,$param2,$param3,$param4); + if ($maxsize) $str=dol_trunc($str,$maxsize); + // On remplace les tags HTML par __xx__ pour eviter traduction par htmlentities + $newstr=ereg_replace('<','__lt__',$str); + $newstr=ereg_replace('>','__gt__',$newstr); + $newstr=ereg_replace('"','__quot__',$newstr); + + $newstr=$this->convToOutputCharset($newstr); // Convert string to $this->charset_output - $newstr=$this->convToOutputCharset($newstr); // Convert string to $this->charset_output + // Cryptage en html de la chaine + // $newstr est une chaine stockee en memoire au format $this->charset_output + $newstr=htmlentities($newstr,ENT_QUOTES,$this->charset_output); - // Cryptage en html de la chaine - // $newstr est une chaine stockee en memoire au format $this->charset_output - $newstr=htmlentities($newstr,ENT_QUOTES,$this->charset_output); - - // On restaure les tags HTML - $newstr=ereg_replace('__lt__','<',$newstr); - $newstr=ereg_replace('__gt__','>',$newstr); - $newstr=ereg_replace('__quot__','"',$newstr); - return $newstr; - } - else - { + // On restaure les tags HTML + $newstr=ereg_replace('__lt__','<',$newstr); + $newstr=ereg_replace('__gt__','>',$newstr); + $newstr=ereg_replace('__quot__','"',$newstr); + return $newstr; + } + else + { // Translation is not available $newstr=$key; if (eregi('CurrencyShort([A-Z]+)$',$key,$reg)) diff --git a/mysql/data/data.sql b/mysql/data/data.sql index e8bbf3871c1..5907c1b1f60 100644 --- a/mysql/data/data.sql +++ b/mysql/data/data.sql @@ -59,7 +59,7 @@ insert into llx_const (name, value, type, note, visible) values ('MAIN_NOT_INSTA insert into llx_const (name, value, type, note, visible) values ('MAIN_MONNAIE','EUR','chaine','Monnaie',0); insert into llx_const (name, value, type, note, visible) values ('MAIN_POPUP_CALENDAR','eldy','chaine','Popup calendar module',0); -insert into llx_const (name, value, type, note, visible) values ('SYSLOG_FILE','DOL_DATA_ROOT/dolibarr.log','chaine','Directory where to write log file',0); +insert into llx_const (name, value, type, note, visible) values ('SYSLOG_FILE','dolibarr.log','chaine','Directory where to write log file',0); insert into llx_const (name, value, type, note, visible) values ('SYSLOG_LEVEL','6','chaine','Level of debug info to show',0); insert into llx_const (name, value, type, note, visible) values ('MAIN_MAIL_SMTP_SERVER','','chaine','Host or ip address for SMTP server',0);