mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Added support for SMTPS protocol
Added a help center
This commit is contained in:
parent
95d6260e87
commit
69fe8eeefd
|
|
@ -27,6 +27,7 @@ For users:
|
|||
- New: Can create a third party from a member of fundation module.
|
||||
- New: Can set a limit for stock alert to 0.
|
||||
- New: Support SMTPS.
|
||||
- New: Added a page /support to provide a help center service on Dolibarr.
|
||||
- Fix: Handle correctly the comment in status changing of supplier orders.
|
||||
- Fix: Author, title and topic are correctly encoded in PDF.
|
||||
- Fix: Now HTML output is always UTF8, this solve bad PDF encoding on old users.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
|
||||
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
|
||||
* Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.fr>
|
||||
*
|
||||
|
|
@ -53,17 +53,12 @@ print "<br>\n";
|
|||
|
||||
print $langs->trans("Developpers").':';
|
||||
print '<ul>';
|
||||
print '<li><a target="blank" href="http://rodolphe.quiedeville.org">Rodolphe Quiedeville</a> ('.$langs->trans("Author").')';
|
||||
print '<li><a target="blank" href="http://www.ipsyn.net">Jean-Louis Bergamo</a></li>';
|
||||
print '<li><a target="blank" href="http://www.destailleur.fr/">Laurent Destailleur</a> ('.$langs->trans("DolibarrProjectLeader").')</li>';
|
||||
print '<li>Eric Seigne</li>';
|
||||
print '<li>Benoit Mortier</li>';
|
||||
print '<li>Regis Houssin</li>';
|
||||
print '<li>'.$langs->trans("SeeWikiForAllTeam").': <a href="http://wiki.dolibarr.org/index.php/DolibarrProject" target="_blank">http://wiki.dolibarr.org/index.php/DolibarrProject</a></li>';
|
||||
print '</ul>';
|
||||
|
||||
print "<br>\n";
|
||||
|
||||
print $langs->trans("Informations").':';
|
||||
print $langs->trans("OtherInformations").':';
|
||||
|
||||
print '<ul>';
|
||||
print '<li>';
|
||||
|
|
@ -75,12 +70,12 @@ if (eregi('^fr_',$langs->getDefaultLang()))
|
|||
print '<li>';
|
||||
print '<a target="blank" href="http://www.dolibarr.fr/">'.$langs->trans("OfficialWebSiteFr").'</a>';
|
||||
print '</li>';
|
||||
print '<li>';
|
||||
print '<a target="blank" href="http://wiki.dolibarr.org/">'.$langs->trans("OfficialWikiFr").'</a>';
|
||||
print '</li>';
|
||||
}
|
||||
print '<li>';
|
||||
print '<a target="blank" href="http://freshmeat.net/projects/dolibarr/">Freshmeat</a>';
|
||||
print '<a target="blank" href="http://wiki.dolibarr.org/">'.$langs->trans("OfficialWiki").'</a>';
|
||||
print '</li>';
|
||||
print '<li>';
|
||||
print '<a target="blank" href="http://demo.dolibarr.org/public/demo">'.$langs->trans("OfficialDemo").'</a>';
|
||||
print '</li>';
|
||||
|
||||
if (eregi('^fr_',$langs->getDefaultLang()))
|
||||
|
|
@ -88,11 +83,11 @@ if (eregi('^fr_',$langs->getDefaultLang()))
|
|||
print '<li>';
|
||||
print 'Les taches en cours de realisation sur Dolibarr sont consultables dans le <a target="blank" href="http://savannah.nongnu.org/task/?group=dolibarr">gestionnaire de projet</a> sur Savannah.';
|
||||
print '</li>';
|
||||
|
||||
|
||||
print '<li>';
|
||||
print 'Si vous trouvez un bogue dans Dolibarr, vous pouvez en informer les developpeurs sur le <a target="blank" href="http://savannah.nongnu.org/bugs/?group=dolibarr">systeme de gestion des bogues</a> de Savannah.';
|
||||
print '</li>';
|
||||
|
||||
|
||||
print '<li>';
|
||||
print 'Le code source de Dolibarr est consultable par l\'<a target="blank" href="http://savannah.nongnu.org/cgi-bin/viewcvs/dolibarr/dolibarr/">interface web du cvs</a>.';
|
||||
print '</li>';
|
||||
|
|
|
|||
|
|
@ -168,9 +168,15 @@ DolibarrLicense=License
|
|||
DolibarrProjectLeader=Project leader
|
||||
Developpers=Developers/contributors
|
||||
OtherDeveloppers=Other developers/contributors
|
||||
OfficialWebSite=International official web site
|
||||
OfficialWebSite=Dolibarr international official web site
|
||||
OfficialWebSiteFr=French official web site
|
||||
OfficialWikiFr=French wiki
|
||||
OfficialWiki=Dolibarr Wiki
|
||||
OfficialDemo=Dolibarr online demo
|
||||
ForDocumentationSeeWiki=For a user or developer documentation, for FAQs (Frequently Asked Questions), take a lookt at the Dolibarr Wiki: <b><a href="%s" target="_blank">%s</a></b>
|
||||
ForAnswersSeeForum=For other questions, help, you can read/ask questions on Dolibarr forum: <b><a href="%s" target="_blank">%s</a></b>
|
||||
HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
|
||||
HelpCenterDesc2=Some part of this service are available in <b>english only</b>.
|
||||
CurrentTopMenuHandler=Current top menu handler
|
||||
CurrentLeftMenuHandler=Current left menu handler
|
||||
MeasuringUnit=Measuring unit
|
||||
|
|
@ -224,6 +230,7 @@ DoTestSendHTML=Test sending HTML
|
|||
ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't user option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
|
||||
UMask=UMask parameter for new files on Unix/Linux/BSD file system.
|
||||
UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>Ce paramètre ne sert pas sous un serveur Windows.
|
||||
SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
|
||||
|
||||
# Modules
|
||||
Module0Name=Users & groups
|
||||
|
|
|
|||
|
|
@ -170,6 +170,12 @@ OtherDeveloppers=Autres développeurs/contributeurs
|
|||
OfficialWebSite=Site web officiel internationnal
|
||||
OfficialWebSiteFr=Site web officiel francophone
|
||||
OfficialWikiFr=Wiki francophone
|
||||
OfficialWiki=Wiki Dolibarr
|
||||
OfficialDemo=Démo en ligne Dolibarr
|
||||
ForDocumentationSeeWiki=Pour la documentation utilisateur, développeur ou les FAQs (questions-réponses fréquentes), consultez le wiki Dolibarr:<br><b><a href="%s" target="_blank">%s</a></b>
|
||||
ForAnswersSeeForum=Pour d'autres questions ou poser vos propres questions, vous pouvez utiliser le forum Dolibarr:<br><b><a href="%s" target="_blank">%s</a></b>
|
||||
HelpCenterDesc1=Cet espace permet de vous aider à obtenir un service de support sur Dolibarr.
|
||||
HelpCenterDesc2=Certain de ces services ne sont disponibles qu'en <b>anglais</b>.
|
||||
CurrentTopMenuHandler=Gestionnaire menu haut courant
|
||||
CurrentLeftMenuHandler=Gestionnaire menu gauche courant
|
||||
MeasuringUnit=Unité de mesure
|
||||
|
|
@ -223,6 +229,7 @@ DoTestSendHTML=Tester envoi HTML
|
|||
ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Erreur, ne peut utiliser l'option @ si la séquence {yy}{mm} ou {yyyy}{mm} n'est pas dans le masque.
|
||||
UMask=Paramètre UMask des nouveaux fichiers sous Unix/Linux/BSD.
|
||||
UMaskExplanation=Ce paramètre permet de définir les droits des fichiers créés sur le serveur par Dolibarr (lors d'upload par exemple).<br>Ce doit être la valeur octal (par exemple 0666 signifie lecture/ecriture pour tous).<br>Ce paramètre n'a aucun effet sur un serveur Windows.
|
||||
SeeWikiForAllTeam=Voir le wiki pour le détail de tous les acteurs et leur organisation
|
||||
|
||||
# Modules
|
||||
Module0Name=Utilisateurs & groupes
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?php
|
||||
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
|
||||
* Copyright (C) 2004 Sebastien DiCintio <sdicintio@ressource-toi.org>
|
||||
* Copyright (C) 2007-2008 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
|
|
@ -65,10 +65,10 @@ $charset="UTF-8"; // If not output format found in any conf file
|
|||
if (! defined('DONOTLOADCONF') && file_exists($conffile))
|
||||
{
|
||||
$result=include_once($conffile); // Load conf file
|
||||
if ($result)
|
||||
if ($result)
|
||||
{
|
||||
if (empty($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // For backward compatibility
|
||||
|
||||
if (empty($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // For backward compatibility
|
||||
|
||||
// Remove last / or \ on directories or url value
|
||||
if (! empty($dolibarr_main_document_root) && ! ereg('^[\\\/]+$',$dolibarr_main_document_root)) $dolibarr_main_document_root=ereg_replace('[\\\/]+$','',$dolibarr_main_document_root);
|
||||
if (! empty($dolibarr_main_url_root) && ! ereg('^[\\\/]+$',$dolibarr_main_url_root)) $dolibarr_main_url_root=ereg_replace('[\\\/]+$','',$dolibarr_main_url_root);
|
||||
|
|
@ -97,16 +97,16 @@ if (! defined('DONOTLOADCONF') && file_exists($conffile))
|
|||
}
|
||||
else
|
||||
{
|
||||
$includeconferror='ErrorBadValueForDolibarrMainDocumentRoot';
|
||||
$includeconferror='ErrorBadValueForDolibarrMainDocumentRoot';
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$includeconferror='ErrorBadFormatForConfFile';
|
||||
$includeconferror='ErrorBadFormatForConfFile';
|
||||
}
|
||||
}
|
||||
|
||||
if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_main_db_prefix='llx_';
|
||||
if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_main_db_prefix='llx_';
|
||||
define('MAIN_DB_PREFIX',(isset($dolibarr_main_db_prefix)?$dolibarr_main_db_prefix:''));
|
||||
define('DOL_DATA_ROOT',(isset($dolibarr_main_data_root)?$dolibarr_main_data_root:''));
|
||||
if (empty($conf->character_set_client)) $conf->character_set_client=$charset;
|
||||
|
|
@ -172,12 +172,8 @@ function conf($dolibarr_main_document_root)
|
|||
$conf->db->user = trim($dolibarr_main_db_user);
|
||||
$conf->db->pass = trim($dolibarr_main_db_pass);
|
||||
|
||||
if (empty($character_set_client)) $character_set_client=$charset;
|
||||
$conf->character_set_client=strtoupper($character_set_client);
|
||||
if (empty($dolibarr_main_db_charset)) $dolibarr_main_db_charset='latin1';
|
||||
$conf->db->character_set=$dolibarr_main_db_charset;
|
||||
if (empty($dolibarr_main_db_collation)) $dolibarr_main_db_collation='latin1_swedish_ci';
|
||||
$conf->db->dolibarr_main_db_collation=$dolibarr_main_db_collation;
|
||||
if (empty($conf->character_set_client)) $conf->character_set_client="UTF-8";
|
||||
if (empty($conf->db->dolibarr_main_db_collation)) $conf->db->dolibarr_main_db_collation='latin1_swedish_ci';
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -219,10 +215,10 @@ function pFooter($nonext=0,$setuplang='')
|
|||
global $langs;
|
||||
$langs->load("main");
|
||||
$langs->load("admin");
|
||||
|
||||
|
||||
print '</td></tr></table>'."\n";
|
||||
print '</td></tr></table>'."\n";
|
||||
|
||||
|
||||
print '</form>'."\n";
|
||||
print '</body>'."\n";
|
||||
print '</html>'."\n";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?php
|
||||
/* Copyright (C) 2008 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
/* Copyright (C) 2008-2009 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -30,10 +30,10 @@ $langs->load("other");
|
|||
|
||||
pHeader("Dolibarr Help Service Center",$_SERVER["PHP_SELF"]);
|
||||
|
||||
print "This area can be used to get a Help service support.<br>\n";
|
||||
print "This service is available in <b>english only</b>.<br><br>";
|
||||
print $langs->trans("HelpCenterDesc1")."<br>\n";
|
||||
print $langs->trans("HelpCenterDesc2")."<br>\n";
|
||||
|
||||
print '<br><br>';
|
||||
print '<br><br><br>';
|
||||
|
||||
print '<table border="1">';
|
||||
|
||||
|
|
@ -52,22 +52,40 @@ print '</td>';
|
|||
print '</tr>';
|
||||
|
||||
|
||||
// Logo of possible services
|
||||
// Area of support cells
|
||||
print '<tr>';
|
||||
print '<td>';
|
||||
print $langs->trans("FeatureNotYetAvailable").'.';
|
||||
print '<td width="33%" align="center" valign="top">';
|
||||
|
||||
print '<table class="nocellnopadd"><tr><td align="center" valign="top">';
|
||||
print img_picto('','/theme/common/who.png','',1);
|
||||
print '</td></tr><tr><td align="center">';
|
||||
print '<br>'.$langs->trans("ForDocumentationSeeWiki",'http://wiki.dolibarr.org','http://wiki.dolibarr.org').'<br>';
|
||||
print '<br>'.$langs->trans("ForAnswersSeeForum",'http://www.dolibarr.org','http://www.dolibarr.org').'<br>';
|
||||
print '</td></tr></table>';
|
||||
|
||||
print '</td>';
|
||||
print '<td>';
|
||||
print $langs->trans("FeatureNotYetAvailable").'.';
|
||||
print '<td width="34%" align="center" valign="top">';
|
||||
|
||||
print '<table class="nocellnopadd"><tr><td align="center" valign="top">';
|
||||
print img_picto('','/theme/common/pagemaster.png','',1);
|
||||
print '</td></tr><tr><td align="center">';
|
||||
print '<br>'.$langs->trans("FeatureNotYetAvailable").'.';
|
||||
print '</td></tr></table>';
|
||||
|
||||
print '</td>';
|
||||
print '<td>';
|
||||
print $langs->trans("FeatureNotYetAvailable").'.';
|
||||
print '<td width="33%" align="center" valign="top">';
|
||||
|
||||
print '<table class="nocellnopadd"><tr><td align="center" valign="top">';
|
||||
print img_picto('','/theme/common/internet.png','',1);
|
||||
print '</td></tr><tr><td align="center">';
|
||||
print '<br>'.$langs->trans("FeatureNotYetAvailable").'.';
|
||||
print '</td></tr></table>';
|
||||
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
|
||||
|
||||
|
||||
|
||||
print '</table>';
|
||||
|
||||
pFooter();
|
||||
BIN
htdocs/theme/common/internet.png
Normal file
BIN
htdocs/theme/common/internet.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.8 KiB |
BIN
htdocs/theme/common/pagemaster.png
Normal file
BIN
htdocs/theme/common/pagemaster.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
BIN
htdocs/theme/common/who.png
Normal file
BIN
htdocs/theme/common/who.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
Loading…
Reference in New Issue
Block a user