Merge branch 'develop' into patch-9

This commit is contained in:
Laurent Destailleur 2024-01-29 00:34:39 +01:00 committed by GitHub
commit 2f3ae43876
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
24 changed files with 899 additions and 39 deletions

View file

@ -187,15 +187,8 @@ NEW: updating for display Help title when try to delete Don (issue #25314)
NEW: Upgrade in module builder in menu section
NEW: use account address in sepa mandate (#23642)
NEW: VAT rate - Add entity
<<<<<<< HEAD
NEW: webportal site account
NEW: When an user unset the batch management of products, transformation of each batch stock movement in global stock movement
FIX: #25828 wrong odt style naming
=======
NEW: When an user unset the batch management of products, transformation of each batch stock mouvement in global stock mouvement
NEW: PDF Generation for each Human Resource Evaluations.
>>>>>>> branch '19.0' of git@github.com:Dolibarr/dolibarr.git
SEC: #25512 applicative anti bruteforce - security on too many login attempts (#25520)
SEC: Add action confirm_... as sensitive to need a CSRF token

View file

@ -2069,6 +2069,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
// Show online payment link
$useonlinepayment = (isModEnabled('paypal') || isModEnabled('stripe') || isModEnabled('paybox'));
$parameters = array();
$reshook = $hookmanager->executeHooks('doShowOnlinePaymentUrl', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) {
setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
} else {
$useonlinepayment = $reshook;
}
if ($useonlinepayment) {
print '<br>';
if (empty($amount)) { // Take the maximum amount among what the member is supposed to pay / has paid in the past

View file

@ -825,6 +825,14 @@ if (($action != 'addsubscription' && $action != 'create_thirdparty')) {
// Shon online payment link
$useonlinepayment = (isModEnabled('paypal') || isModEnabled('stripe') || isModEnabled('paybox'));
$parameters = array();
$reshook = $hookmanager->executeHooks('doShowOnlinePaymentUrl', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
if (isset($hookmanager->resArray['showonlinepaymenturl'])) {
$useonlinepayment = $hookmanager->resArray['showonlinepaymenturl'];
}
}
if ($useonlinepayment) {
print '<br>';

View file

@ -476,12 +476,12 @@ if (getDolGlobalInt('TICKET_ENABLE_PUBLIC_INTERFACE')) {
// Url public interface
$url_interface = getDolGlobalString("TICKET_URL_PUBLIC_INTERFACE");
print '<tr><td>'.$langs->trans("TicketUrlPublicInterfaceLabelAdmin").'</label>';
print '<tr><td>'.$langs->trans("UrlPublicInterfaceLabelAdmin").'</label>';
print '</td><td>';
print '<input type="text" class="minwidth500" name="TICKET_URL_PUBLIC_INTERFACE" value="'.$url_interface.'"></td>';
print '<input type="text" class="minwidth500" name="TICKET_URL_PUBLIC_INTERFACE" value="'.$url_interface.'" placeholder="https://..."></td>';
print '</td>';
print '<td class="center">';
print $form->textwithpicto('', $langs->trans("TicketUrlPublicInterfaceHelpAdmin"), 1, 'help');
print $form->textwithpicto('', $langs->trans("UrlPublicInterfaceHelpAdmin"), 1, 'help');
print '</td></tr>';
print '</table>';

View file

@ -3090,6 +3090,15 @@ if ($action == 'create' && $usercancreate) {
// Show online payment link
$useonlinepayment = (isModEnabled('paypal') || isModEnabled('stripe') || isModEnabled('paybox'));
$parameters = array();
$reshook = $hookmanager->executeHooks('doShowOnlinePaymentUrl', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
if (isset($hookmanager->resArray['showonlinepaymenturl'])) {
$useonlinepayment = $hookmanager->resArray['showonlinepaymenturl'];
}
}
if (getDolGlobalString('ORDER_HIDE_ONLINE_PAYMENT_ON_ORDER')) {
$useonlinepayment = 0;
}

View file

@ -5993,6 +5993,14 @@ if ($action == 'create') {
// Show online payment link
$useonlinepayment = (isModEnabled('paypal') || isModEnabled('stripe') || isModEnabled('paybox'));
$parameters = array();
$reshook = $hookmanager->executeHooks('doShowOnlinePaymentUrl', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
if (isset($hookmanager->resArray['showonlinepaymenturl'])) {
$useonlinepayment = $hookmanager->resArray['showonlinepaymenturl'];
}
}
if ($object->status != Facture::STATUS_DRAFT && $useonlinepayment) {
print '<br><!-- Link to pay -->'."\n";
require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';

View file

@ -2194,9 +2194,8 @@ function dol_convert_file($fileinput, $ext = 'png', $fileoutput = '', $page = ''
*/
function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring = null)
{
global $conf;
$foundhandler = 0;
//var_dump(basename($inputfile)); exit;
try {
dol_syslog("dol_compress_file mode=".$mode." inputfile=".$inputfile." outputfile=".$outputfile);
@ -2265,6 +2264,7 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
$archive = new PclZip($outputfile);
$result = $archive->add($inputfile, PCLZIP_OPT_REMOVE_PATH, dirname($inputfile));
if ($result === 0) {
@ -2439,7 +2439,7 @@ function dol_uncompress($inputfile, $outputdir)
* @param string $inputdir Source dir name
* @param string $outputfile Target file name (output directory must exists and be writable)
* @param string $mode 'zip'
* @param string $excludefiles A regex pattern. For example: '/\.log$|\/temp\//'
* @param string $excludefiles A regex pattern to exclude files. For example: '/\.log$|\/temp\//'
* @param string $rootdirinzip Add a root dir level in zip file
* @param string $newmask Mask for new file (0 by default means $conf->global->MAIN_UMASK). Example: '0666'
* @return int Return integer <0 if KO, >0 if OK
@ -2447,8 +2447,6 @@ function dol_uncompress($inputfile, $outputdir)
*/
function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles = '', $rootdirinzip = '', $newmask = 0)
{
global $conf;
$foundhandler = 0;
dol_syslog("Try to zip dir ".$inputdir." into ".$outputfile." mode=".$mode);

View file

@ -1111,7 +1111,7 @@ class pdf_crabe extends ModelePDFFactures
protected function _tableau_info(&$pdf, $object, $posy, $outputlangs, $outputlangsbis)
{
// phpcs:enable
global $conf, $mysoc;
global $conf, $mysoc, $hookmanager;
$default_font_size = pdf_getPDFFontSize($outputlangs);
@ -1238,6 +1238,14 @@ class pdf_crabe extends ModelePDFFactures
if (isModEnabled('paybox')) {
$useonlinepayment++;
}
$parameters = array();
$action = '';
$reshook = $hookmanager->executeHooks('doShowOnlinePaymentUrl', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
if (isset($hookmanager->resArray['showonlinepaymenturl'])) {
$useonlinepayment += $hookmanager->resArray['showonlinepaymenturl'];
}
}
}
if ($object->statut != Facture::STATUS_DRAFT && $useonlinepayment) {

View file

@ -1204,7 +1204,7 @@ class pdf_sponge extends ModelePDFFactures
*/
protected function drawInfoTable(&$pdf, $object, $posy, $outputlangs, $outputlangsbis)
{
global $conf, $mysoc;
global $conf, $mysoc, $hookmanager;
$default_font_size = pdf_getPDFFontSize($outputlangs);
@ -1333,6 +1333,14 @@ class pdf_sponge extends ModelePDFFactures
if (isModEnabled('paybox')) {
$useonlinepayment++;
}
$parameters = array();
$action = '';
$reshook = $hookmanager->executeHooks('doShowOnlinePaymentUrl', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
if (isset($hookmanager->resArray['showonlinepaymenturl'])) {
$useonlinepayment += $hookmanager->resArray['showonlinepaymenturl'];
}
}
}

View file

@ -280,6 +280,7 @@ class modWebPortal extends DolibarrModules
$this->menu = array();
$r = 0;
// Add here entries to declare new menus
/*
$this->menu[$r++] = array(
'fk_menu' => '', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
'type' => 'top', // This is a Top menu entry
@ -295,6 +296,7 @@ class modWebPortal extends DolibarrModules
'target' => '',
'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
);
*/
/*$this->menu[$r++]=array(
'fk_menu'=>'fk_mainmenu=webportal', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
'type'=>'left', // This is a Left menu entry

View file

@ -974,6 +974,14 @@ if (!empty($id) && $action != 'edit') {
// Show online payment link
$useonlinepayment = (isModEnabled('paypal') || isModEnabled('stripe') || isModEnabled('paybox'));
$parameters = array();
$reshook = $hookmanager->executeHooks('doShowOnlinePaymentUrl', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
if (isset($hookmanager->resArray['showonlinepaymenturl'])) {
$useonlinepayment += $hookmanager->resArray['showonlinepaymenturl'];
}
}
if ($useonlinepayment) { //$object->statut != Facture::STATUS_DRAFT &&
print '<br><!-- Link to pay -->'."\n";
require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';

View file

@ -2437,3 +2437,5 @@ ParametersForTestEnvironment=Parameters for test environment
TryToKeepOnly=Try to keep only %s
RecommendedForProduction=Recommended for Production
RecommendedForDebug=Recommended for Debug
UrlPublicInterfaceLabelAdmin=Alternative URL for public interface
UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the virtual host server must act as a proxy on the standard URL)

View file

@ -107,8 +107,6 @@ TicketsShowProgressionHelp=Enable this option to hide the progress of the ticket
TicketCreateThirdPartyWithContactIfNotExist=Ask name and company name for unknown emails.
TicketCreateThirdPartyWithContactIfNotExistHelp=Check if a third party or a contact exists for the email entered. If not, ask a name and a company name to create a third party with contact.
PublicInterface=Public interface
TicketUrlPublicInterfaceLabelAdmin=Alternative URL for public interface
TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the server must act as a proxy on this new URL)
TicketPublicInterfaceTextHomeLabelAdmin=Welcome text of the public interface
TicketPublicInterfaceTextHome=You can create a support ticket or view existing from its identifier tracking ticket.
TicketPublicInterfaceTextHomeHelpAdmin=The text defined here will appear on the home page of the public interface.

View file

@ -174,8 +174,6 @@ WebPortalSetup = WebPortal setup
WebPortalCSS=Web portal CSS
Settings = Settings
WebPortalSetupPage = WebPortal setup page
WEBPORTAL_ROOT_URL = Alternative virtual host URL
WebPortalRootUrlHelp = Public access url (http or https) if you have a virtual host or keep empty
WEBPORTAL_TITLE = Brand name on header of public page
UserAccountForWebPortalAreInThirdPartyTabHelp = Users accounts for WebPortal can be set on each third party card in Website accounts tab
WebPortalAccessHidden = Hidden
@ -234,3 +232,4 @@ WebPortalErrorFetchLoggedUser = Error when loading user (Id : %s)
WebPortalErrorFetchLoggedThirdParty = Error when loading third-party (Id : %s)
WebPortalErrorFetchLoggedMember = Error when loading member (Id : %s)
WebPortalErrorFetchLoggedPartnership = Error when loading partnership (Third-party Id : %s, Member Id : %s)
ExportIntoGIT=Export into sources

View file

@ -2440,3 +2440,4 @@ ParametersForTestEnvironment=Paramètres pour l'environnement de test
TryToKeepOnly=Essayez de ne conserver que %s
RecommendedForProduction=Recommandé pour la production
RecommendedForDebug=Recommandé pour le débogage
UrlPublicInterfaceHelpAdmin=Il est possible de définir un alias vers le serveur et de rendre ainsi l'interface publique accessible avec une autre URL (le serveur doit agir comme un proxy sur cette nouvelle URL)

View file

@ -108,7 +108,6 @@ TicketCreateThirdPartyWithContactIfNotExist=Demandez le nom et le nom de l'entre
TicketCreateThirdPartyWithContactIfNotExistHelp=Vérifiez s'il existe un tiers ou un contact pour l'e-mail saisi. Sinon, demandez un nom et un nom société pour créer un tiers avec contact.
PublicInterface=Interface publique
TicketUrlPublicInterfaceLabelAdmin=URL alternative pour l'interface publique
TicketUrlPublicInterfaceHelpAdmin=Il est possible de définir un alias vers le serveur et de rendre ainsi l'interface publique accessible avec une autre URL (le serveur doit agir comme un proxy sur cette nouvelle URL)
TicketPublicInterfaceTextHomeLabelAdmin=Texte de bienvenue dans l'interface publique
TicketPublicInterfaceTextHome=Vous pouvez créer un ticket ou consulter à partir d'un ID de ticket existant.
TicketPublicInterfaceTextHomeHelpAdmin=Le texte défini ici apparaîtra sur la page d'accueil de l'interface publique.

View file

@ -3,7 +3,7 @@ Module Web Portal
This is a module to provide a ready to use Web Portal for your customers, suppliers, partners or members of the mebership module.
Accounts (login and pass) to acces this portal can be created for any thirdparty (from the tab "Web site accounts").
Accounts (login and pass) to access this portal can be created for any thirdparty (from the tab "Web site accounts").
It is better to have a standalone web server with its own virtual host and domain name to use this module, so using the web portal does not
reaveal the domain and url of your backoffice installation.
@ -15,8 +15,8 @@ If the Thirdparty module is enabled:
* Read/modify Name, phone, email, addresses of thirdparty
If the Patnership module is enabled:
* Read properties (status, stard date, end date) of its partnership.
* Read properties (status, start date, end date) of its partnership.
If the Proposal module is enabled:
* Read its orders
@ -41,5 +41,3 @@ Documentation
-------------
[Module Web Portal](https://wiki.dolibarr.org/index.php/Module_Web_Portal)

View file

@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
require_once DOL_DOCUMENT_ROOT . "/webportal/lib/webportal.lib.php";
// Translations
$langs->loadLangs(array("admin", "hrm", "other"));
$langs->loadLangs(array("admin", "hrm", "other", "website"));
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$hookmanager->initHooks(array('webportalsetup', 'globalsetup'));

View file

@ -57,15 +57,15 @@ $useFormSetup = 1;
if (!class_exists('FormSetup')) {
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formsetup.class.php';
}
$formSetup = new FormSetup($db);
// root url
$item = $formSetup->newItem('WEBPORTAL_ROOT_URL')->setAsString();
$item->nameText = $langs->transnoentities('UrlPublicInterfaceLabelAdmin');
$item->fieldAttr = array('placeholder' => 'https://');
$item->helpText = $langs->transnoentities('WebPortalRootUrlHelp');
$item->helpText = $langs->transnoentities('UrlPublicInterfaceHelpAdmin');
require_once __DIR__ . '/../class/context.class.php';
$context = Context::getInstance();
//$context = Context::getInstance();
//$item->fieldOutputOverride = '<a target="_blank" href="'.Context::getRootConfigUrl().'" >'.img_picto('', 'globe', 'class="pictofixedwidth"').Context::getRootConfigUrl().'</a>';
@ -270,7 +270,7 @@ print ajax_autoselect('publicurlmember');
// Setup page goes here
print info_admin($langs->trans("UserAccountForWebPortalAreInThirdPartyTabHelp"));
print '<br>';
print '<br><br>';
if ($action == 'edit') {
print $formSetup->generateOutput(true);

View file

@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
require_once DOL_DOCUMENT_ROOT . "/webportal/lib/webportal.lib.php";
// Translations
$langs->loadLangs(array("admin", "webportal"));
$langs->loadLangs(array("admin", "webportal", "website"));
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$hookmanager->initHooks(array('webportalthemesetup', 'globalsetup'));

View file

@ -140,6 +140,10 @@ class Website extends CommonObject
*/
public $lines;
/**
* @var string name of template
*/
public $name_template;
const STATUS_DRAFT = 0;
const STATUS_VALIDATED = 1;
@ -330,7 +334,8 @@ class Website extends CommonObject
$sql .= " t.fk_user_creat,";
$sql .= " t.fk_user_modif,";
$sql .= " t.date_creation,";
$sql .= " t.tms as date_modification";
$sql .= " t.tms as date_modification,";
$sql .= " t.name_template";
$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
$sql .= " WHERE t.entity IN (".getEntity('website').")";
if (!empty($ref)) {
@ -361,6 +366,7 @@ class Website extends CommonObject
$this->fk_user_modif = $obj->fk_user_modif;
$this->date_creation = $this->db->jdate($obj->date_creation);
$this->date_modification = $this->db->jdate($obj->date_modification);
$this->name_template = $obj->name_template;
}
$this->db->free($resql);
@ -952,7 +958,6 @@ class Website extends CommonObject
}
$destdir = $conf->website->dir_temp.'/'.$website->ref;
dol_syslog("Clear temp dir ".$destdir);
$count = 0;
$countreallydeleted = 0;
@ -1149,7 +1154,8 @@ class Website extends CommonObject
$filename = $conf->website->dir_temp.'/'.$website->ref.'/website_'.$website->ref.'-'.dol_print_date(dol_now(), 'dayhourlog').'-V'.((float) DOL_VERSION).'.zip';
dol_delete_file($fileglob, 0);
$result = dol_compress_file($filedir, $filename, 'zip');
$result = dol_compress_dir($filedir, $filename, 'zip');
if ($result > 0) {
return $filename;
@ -1174,7 +1180,6 @@ class Website extends CommonObject
$error = 0;
$pathtofile = dol_sanitizePathName($pathtofile);
$object = $this;
if (empty($object->ref)) {
$this->error = 'Function importWebSite called on object not loaded (object->ref is empty)';
@ -1310,7 +1315,7 @@ class Website extends CommonObject
// Regenerate index page to point to the new index page
$pathofwebsite = $conf->website->dir_output.'/'.$object->ref;
dolSaveIndexPage($pathofwebsite, $pathofwebsite.'/index.php', $pathofwebsite.'/page'.$object->fk_default_home.'.tpl.php', $pathofwebsite.'/wrapper.php', $object);
$this->initFilesStatus($pathofwebsite);
if ($error) {
$this->db->rollback();
return -1;
@ -1602,4 +1607,514 @@ class Website extends CommonObject
return $out;
}
/**
* Overite template by copying all files
*
* @return int <0 if KO, >0 if OK
*/
public function overwriteTemplate()
{
global $conf;
$website = $this;
if (empty($website->id) || empty($website->ref)) {
setEventMessages("Website id or ref is not defined", null, 'errors');
return -1;
}
if (empty($website->name_template)) {
setEventMessages("To export the website template into the GIT sources directory, the name of the directory/template must be know. For this website, the variable 'name_template' is unknown, so export in GIT sources is not possible.", null, 'errors');
return -1;
}
if (!is_writable($conf->website->dir_temp)) {
setEventMessages("Temporary dir ".$conf->website->dir_temp." is not writable", null, 'errors');
return -1;
}
$sourcedir = $conf->website->dir_output."/".$website->ref;
$fichierEtat = $sourcedir . '/filelist-lastwrite-doctemplates.txt';
// Get array with hash of files
$etatPrecedent = $this->checkPreviousState($fichierEtat);
// Get list of all source files of the website
$arraySourcedir = dol_dir_list($sourcedir);
// Get list of modified files
$modifications = [];
foreach ($arraySourcedir as $file) {
if (substr($file['name'], -4) === '.old') {
continue;
}
$hashActuel = hash_file('md5', $file['fullname']);
// Check whether the file is new or has been modified
if (!isset($etatPrecedent[$file['name']]) || $etatPrecedent[$file['name']] !== $hashActuel) {
$modifications[] = $file;
}
$etatPrecedent[$file['name']] = $hashActuel; // we store he new hash to record it later on disk.
}
// Replace modified files into the doctemplates directory.
$destdirrel = 'install/doctemplates/websites/'.$website->name_template;
$destdir = DOL_DOCUMENT_ROOT.'/'.$destdirrel;
$arraydestdir = dol_dir_list($destdir, "all", 1);
$differences = [];
$names = array_column($arraydestdir, 'name');
$namesSource = array_column($arraySourcedir, 'name');
if (count($modifications) > 1) {
foreach ($modifications as $fichierModifie) {
$nomFichierModifie = $fichierModifie['name'];
if ($nomFichierModifie == basename($fichierEtat)) {
continue;
}
$succes = 0;
//check if it is a new file
if ((!preg_match('/^page\d+\.tpl\.php$/', $nomFichierModifie)) && (!in_array($nomFichierModifie, $names))) {
if (file_exists($fichierModifie['fullname']) && dol_is_dir($destdir.'/containers')) {
$cp = dol_copy($fichierModifie['fullname'], $destdir.'/containers/'.$nomFichierModifie, '0664');
if ($cp > 0) {
if (file_exists($destdir.'/containers/'.$nomFichierModifie)) {
$tabnumpage = array();
foreach ($arraydestdir as $fileDest) {
if ($this->extractNumberFromFilename($fileDest['name']) !== -1) {
$tabnumpage[] = $this->extractNumberFromFilename($fileDest['name']);
}
}
$getContentSource = file_get_contents($destdir.'/containers/'.$nomFichierModifie);
$nextpage = max($tabnumpage) + 1;
$chaineModifiee = preg_replace('/page\d+\.tpl\.php/', 'page' . $nextpage . '.tpl.php', $getContentSource);
$write = file_put_contents($destdir.'/containers/'.$nomFichierModifie, $chaineModifiee);
if ($write !== false) {
if (!touch($destdir.'/containers/'."page" . $nextpage . ".tpl.php")) {
setEventMessages("Please check permission to create <b>page" . $nextpage . ".tpl.php</b> in template <b>".$website->name_template."</b>", null, 'errors');
}
$fileFounded = '';
foreach ($arraySourcedir as $file) {
if ($file['name'] == $nomFichierModifie) {
$fileContent = file_get_contents($file['fullname']);
if (preg_match("/page\d+\.tpl\.php/", $fileContent, $matches)) {
$fileFounded = $matches[0];
break;
}
}
}
foreach ($arraySourcedir as $file) {
if ($file['name'] == $fileFounded) {
if (!is_writable($file['fullname'])) {
dolChmod($file['fullname'], '0664');
}
$diff = $this->showDifferences(file_get_contents($destdir.'/containers/'."page" . $nextpage . ".tpl.php"), file_get_contents($file['fullname']), array($nextpage,$this->extractNumberFromFilename($file['name'])));
if ($diff != -1) {
$replace = $this->replaceLignEUsingNum($destdir.'/containers/'."page" . $nextpage . ".tpl.php", $diff);
if ($replace !== false) {
setEventMessages("Copy file <b>page".$nextpage.".tpl.php</b> in template <b>".$this->name_template."</b> with succes", null, 'warnings');
}
}
}
}
}
}
$this->saveState($etatPrecedent, $fichierEtat);
setEventMessages("file <b>".$nomFichierModifie."</b> was created in template <b>".$website->name_template."</b>", null, 'warnings');
header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website->ref);
exit();
}
}
}
// Find the corresponding file in the destination folder
if (in_array($nomFichierModifie, $namesSource)) {
foreach ($arraydestdir as $destFile) {
if ($destFile['name'] == $nomFichierModifie) {
$sourceContent = file_get_contents($fichierModifie['fullname']);
$destContent = file_get_contents($destFile['fullname']);
if ($sourceContent !== $destContent) {
$differences[$nomFichierModifie] = $this->showDifferences($destContent, $sourceContent);
if (count($differences[$nomFichierModifie]) > 0) {
$result = $this->replaceLignEUsingNum($destFile['fullname'], $differences[$nomFichierModifie]);
if ($result !== false) {
if ($result == -2) {
setEventMessages("No permissions to write into file <b>".$destdirrel.'/'.$nomFichierModifie."</b> from the current website <b>".$website->name_template."</b>", null, 'errors');
header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website->ref);
exit();
}
setEventMessages("file <b>".$nomFichierModifie."</b> was modified in template <b>".$website->name_template."</b>", null, 'warnings');
} else {
setEventMessages("file ".$nomFichierModifie." was not modified", null, 'errors');
}
}
}
}
if (preg_match('/page(\d+)\.tpl\.php/', $nomFichierModifie)) {
$differences[$nomFichierModifie] = $this->compareFichierModifie($sourcedir, $destdir, $fichierModifie);
if (count($differences[$nomFichierModifie]) > 0) {
$result = $this->replaceLignEUsingNum($differences[$nomFichierModifie]['file_destination']['fullname'], $differences[$nomFichierModifie]);
if ($result !== false) {
if ($result == -2) {
setEventMessages("No permissions to write into file <b>".$destdirrel.'/'.$differences[$nomFichierModifie]['file_destination']['name']."</b> from the current website <b>".$website->name_template."</b>", null, 'errors');
header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website->ref);
exit();
}
$succes++;
}
}
}
}
}
}
if ($succes>0) {
// Save the state file filelist.txt
$this->saveState($etatPrecedent, $fichierEtat);
setEventMessages("file <b>".$differences[$nomFichierModifie]['file_destination']['name']."</b> was modified in template <b>".$website->name_template."</b>", null, 'warnings');
header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website->ref);
exit();
}
} else {
setEventMessages("No file has been modified", null, 'errors');
}
// save state file
$this->saveState($etatPrecedent, $fichierEtat);
header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website->ref);
exit();
}
/**
* extract num of page
* @param string $filename name of file
* @return int 1 if OK, -1 if KO
*/
protected function extractNumberFromFilename($filename)
{
$matches = [];
if (preg_match('/page(\d+)\.tpl\.php/', $filename, $matches)) {
return (int) $matches[1];
}
return -1;
}
/**
* update name_template in table after import template
* @param string $name_template name of template
* @return int 1 if OK, -1 if KO
*/
public function setTemplateName($name_template)
{
$sql = "UPDATE ".$this->db->prefix()."website SET";
$sql .= " name_template = '".$this->db->escape($name_template)."'";
$sql .= " WHERE rowid = ".(int) $this->id;
$result = $this->db->query($sql);
if ($result) {
$this->db->commit();
return 1;
} else {
$this->db->rollback();
return -1;
}
}
/**
* check previous state for file
* @param string $pathname path of file
* @return array|mixed
*/
public function checkPreviousState($pathname)
{
if (!file_exists($pathname)) {
if (touch($pathname)) {
dolChmod($pathname, '0664');
}
return [];
}
return unserialize(file_get_contents($pathname));
}
/**
* Save state for File
* @param mixed $etat state
* @param mixed $pathname path of file
* @return int|false
*/
public function saveState($etat, $pathname)
{
return file_put_contents($pathname, serialize($etat));
}
/**
* create file for save state of all files in folder
* @param string $sourcedir path of folder
* @return void
*/
public function initFilesStatus($sourcedir)
{
$fichierEtat = $sourcedir . '/filelist-lastwrite-doctemplates.txt';
$etatPrecedent = $this->checkPreviousState($fichierEtat);
// for first save state when ceate file
if (empty($etatPrecedent)) {
$arraySourcedir = dol_dir_list($sourcedir, "files");
$etatFichiers = [];
foreach ($arraySourcedir as $file) {
// Ignore .old files and the status file itself
if (substr($file['name'], -4) === '.old' || $file['name'] === basename($fichierEtat)) {
continue;
}
$hashActuel = hash_file('md5', $file['fullname']);
$etatFichiers[$file['name']] = $hashActuel;
}
$this->saveState($etatFichiers, $fichierEtat);
}
}
/**
* Compare two files has not same name but same content
* @param string $dossierSource filepath of folder source
* @param string $dossierDestination filepath of folder dest
* @param mixed $fichierModifie files modified
* @return array empty if KO, array if OK
*/
public function compareFichierModifie($dossierSource, $dossierDestination, $fichierModifie)
{
$fichiersSource = [];
$fichiersDestination = [];
$fichierWithNoPage = [];
$fichierWithNoPageInDest = [];
// filter files source
foreach (dol_dir_list($dossierSource, "files") as $file) {
if (preg_match('/^page\d+/', $file['name']) && !str_contains($file['name'], '.old')) {
$fichiersSource[] = $file;
} else {
$fichierWithNoPage[] = $file;
}
}
// filter files destination
foreach (dol_dir_list($dossierDestination, "all", 1) as $file) {
if (preg_match('/^page\d+/', $file['name']) && !str_contains($file['name'], '.old')) {
$fichiersDestination[] = $file;
} else {
$fichierWithNoPageInDest[] = $file;
}
}
// find index source and search it in folder destination
$numOfPageSource = 0;
foreach ($fichiersSource as $index => $file) {
if ($file['name'] == basename($fichierModifie['fullname'])) {
$numOfPageSource = $this->extractNumberFromFilename($file['name']);
break;
}
}
//search numPage where was declared
$fileFounded = array();
foreach ($fichierWithNoPage as $filesource) {
$fileContent = file_get_contents($filesource['fullname']);
if (strpos($fileContent, "require './page".$numOfPageSource.".tpl.php'") !== false) {
$fileFounded = $filesource;
break;
}
}
// find file with same name and extract num page in destination folder
$numPageFounded = '';
foreach ($fichierWithNoPageInDest as $filedest) {
if ($filedest['name'] === $fileFounded['name']) {
$fileContent = file_get_contents($filedest['fullname']);
if (preg_match("/page\d+\.tpl\.php/", $fileContent, $matches)) {
$numPageFounded = $matches[0];
break;
}
}
}
//search file with the number of page founded
$fileNeeded = array();
foreach ($fichiersDestination as $index => $file) {
if ($file['name'] == $numPageFounded) {
$fileNeeded = $file;
break;
}
}
if (isset($fileNeeded)) {
$sourceContent = file_get_contents($fichierModifie['fullname']);
if (file_exists($fileNeeded['fullname'])) {
$destContent = file_get_contents($fileNeeded['fullname']);
$numOfPageDest = $this->extractNumberFromFilename($fileNeeded['name']);
$differences = $this->showDifferences($destContent, $sourceContent, array($numOfPageDest,$numOfPageSource));
$differences['file_destination'] = $fileNeeded;
}
return $differences;
}
return array();
}
/**
* remove espace in string
* @param string $str string
* @return string
*/
private function normalizeString($str)
{
$str = str_replace("\r\n", "\n", $str);
$str = str_replace("\r", "\n", $str);
return $str;
}
/**
* show difference between to string
* @param string $str1 first string
* @param string $str2 seconde string
* @param array $exceptNumPge num of page files we dont want to change
* @return array|int -1 if KO, array if OK
*/
protected function showDifferences($str1, $str2, $exceptNumPge = array())
{
$diff = array();
$str1 = $this->normalizeString($str1);
$str2 = $this->normalizeString($str2);
$lines1 = explode("\n", $str1);
$lines2 = explode("\n", $str2);
$linesShouldnChange = array();
$linesShouldnNotChange = array();
$linefound = array();
$countNumPage = count($exceptNumPge);
for ($i = 0;$i< $countNumPage; $i++) {
$linefound[$i]['meta'] = '/content="' . preg_quote($exceptNumPge[$i], '/') . '" \/>/';
$linefound[$i]['output'] = '/dolWebsiteOutput\(\$tmp, "html", ' . preg_quote($exceptNumPge[$i], '/') . '\);/';
}
$maxLines = max(count($lines1), count($lines2));
for ($lineNum = 0; $lineNum < $maxLines; $lineNum++) {
$lineContent1 = $lines1[$lineNum] ?? '';
$lineContent2 = $lines2[$lineNum] ?? '';
if (preg_match($linefound[0]['output'], $lineContent1)) {
$linesShouldnChange[] = $lineContent1;
}
if (preg_match($linefound[0]['meta'], $lineContent1)) {
$linesShouldnChange[] = $lineContent1;
}
if (preg_match($linefound[1]['output'], $lineContent2)) {
$linesShouldnNotChange[] = $lineContent2;
}
if (preg_match($linefound[1]['meta'], $lineContent2)) {
$linesShouldnNotChange[] = $lineContent2;
}
if ($lineContent1 !== $lineContent2) {
if (isset($lines1[$lineNum]) && !isset($lines2[$lineNum])) {
// Ligne deleted de la source
$diff["Supprimée à la ligne " . ($lineNum + 1)] = $lineContent1;
} elseif (!isset($lines1[$lineNum]) && isset($lines2[$lineNum])) {
// Nouvelle ligne added dans la destination
$diff["Ajoutée à la ligne " . ($lineNum + 1)] = $lineContent2;
} else {
// Différence found it
$diff["Modifiée à la ligne " . ($lineNum + 1)] = $lineContent2;
}
}
}
if (empty($linesShouldnChange)) {
$linesShouldnChange[0] = '<meta name="dolibarr:pageid" content="'.$exceptNumPge[0].'" />';
$linesShouldnChange[1] = '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "html", '.$exceptNumPge[0].');';
}
$pairesRemplacement = array();
if (!empty($linesShouldnNotChange)) {
$i =0;
foreach ($linesShouldnNotChange as $numLigne => $ligneRemplacement) {
if (isset($linesShouldnChange[$numLigne])) {
$pairesRemplacement[$ligneRemplacement] = $linesShouldnChange[$numLigne];
} else {
$pairesRemplacement[$ligneRemplacement] = $linesShouldnChange[$i];
}
$i++;
}
$diff['lignes_dont_change'] = $pairesRemplacement;
}
// search path of image and replace it with the correcte path
$pattern = '/medias\/image\/'.$this->ref.'\/([^\'"\s]+)/';
foreach ($diff as $key => $value) {
// Assurez-vous que la valeur est une chaîne
if (is_string($value)) {
if (preg_match($pattern, $value)) {
$newValue = preg_replace($pattern, 'medias/image/'.$this->name_template.'/$1', $value);
$diff[$key] = $newValue;
}
}
}
return $diff;
}
/**
* Replace ligne by ligne in file using num of ligne
* @param string $desfFile path of file dest
* @param array $differences array of differences between files
* @return false|int false if we cant replace
*/
protected function replaceLignEUsingNum($desfFile, $differences)
{
$userId = fileowner($desfFile);
if ($userId !== false) {
// Obtain user information from the ID
if (function_exists('posix_getpwuid')&& function_exists('posix_getpwuid')) {
$uid = posix_geteuid();
$userInfoM = posix_getpwuid($uid);
$userInfo = posix_getpwuid($userId);
if ($userInfo['uid'] !== $userInfoM['uid']) {
return -2;
}
}
}
if (file_exists($desfFile)) {
dolChmod($desfFile, '0664');
}
unset($differences['file_destination']);
$contentDest = file($desfFile, FILE_IGNORE_NEW_LINES);
foreach ($differences as $key => $ligneSource) {
if (preg_match('/(Ajoutée|Modifiée) à la ligne (\d+)/', $key, $matches)) {
$typeModification = $matches[1];
$numLigne = (int) $matches[2] - 1;
if ($typeModification === 'Ajoutée') {
array_splice($contentDest, $numLigne, 0, $ligneSource);
} elseif ($typeModification === 'Modifiée') {
$contentDest[$numLigne] = $ligneSource;
}
} elseif (preg_match('/Supprimée à la ligne (\d+)/', $key, $matches)) {
$numLigne = (int) $matches[1] - 1;
unset($contentDest[$numLigne]);
}
}
//Reindex the table keys
$contentDest = array_values($contentDest);
$stringreplacement = implode("\n", $contentDest);
file_put_contents($desfFile, $stringreplacement);
foreach ($differences['lignes_dont_change'] as $linechanged => $line) {
if (in_array($linechanged, $contentDest)) {
dolReplaceInFile($desfFile, array($linechanged => $line));
}
}
}
}

View file

@ -2405,7 +2405,6 @@ if ($action == 'exportsite' && $user->hasRight('website', 'export')) {
if ($fileofzip) {
$file_name = basename($fileofzip);
header("Content-Type: application/zip");
header("Content-Disposition: attachment; filename=".$file_name);
header("Content-Length: ".filesize($fileofzip));
@ -2418,6 +2417,12 @@ if ($action == 'exportsite' && $user->hasRight('website', 'export')) {
}
}
// Overwrite site
if ($action == 'overwritesite' && $user->hasRight('website', 'export')) {
if (getDolGlobalString('WEBSITE_ALLOW_OVERWRITE_GIT_SOURCE')) {
$fileofzip = $object->overwriteTemplate();
}
}
// Regenerate site
if ($action == 'regeneratesite' && $usercanedit) {
// Check symlink to medias and restore it if ko. Recreate also dir of website if not found.
@ -2518,6 +2523,9 @@ if ($action == 'importsiteconfirm' && $usercanedit) {
}
if (!$error && GETPOSTISSET('templateuserfile')) {
$templatewithoutzip = preg_replace('/\.zip$/i', '', GETPOST('templateuserfile'));
$object->setTemplateName($templatewithoutzip);
$result = $object->importWebSite($fileofzip);
if ($result < 0) {
@ -3014,6 +3022,11 @@ if (!GETPOST('hide_websitemenu')) {
// Export web site
print '<input type="submit" class="button bordertransp"'.$disabledexport.' value="'.dol_escape_htmltag($exportlabel).'" name="exportsite">';
if (getDolGlobalString('WEBSITE_ALLOW_OVERWRITE_GIT_SOURCE')) {
// Overwrite template in sources
print '<a href="'.$_SERVER["PHP_SELF"].'?action=overwritesite&website='.urlencode($website->ref).'" class="button bordertransp">'.dol_escape_htmltag($langs->trans("ExportIntoGIT")).'</a>';
}
// Clone web site
print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("CloneSite")).'" name="createfromclone">';

View file

@ -99,6 +99,8 @@ class AllTests
$suite->addTestSuite('FunctionsLibTest');
require_once dirname(__FILE__).'/Functions2LibTest.php';
$suite->addTestSuite('Functions2LibTest');
require_once dirname(__FILE__).'/ProfidLibTest.php';
$suite->addTestSuite('ProfidLibTest');
require_once dirname(__FILE__).'/XCalLibTest.php';
$suite->addTestSuite('XCalLibTest');

View file

@ -0,0 +1,283 @@
<?php
/* Copyright (C) 2010-2023 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
* or see https://www.gnu.org/
*/
/**
* \file test/phpunit/ProfidLibTest.php
* \ingroup test
* \brief PHPUnit test
* \remarks To run this script as CLI: phpunit filename.php
*/
global $conf,$user,$langs,$db,$mysoc;
//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver
//require_once 'PHPUnit/Autoload.php';
require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
require_once dirname(__FILE__).'/../../htdocs/core/lib/profid.lib.php';
if (! defined('NOREQUIREUSER')) {
define('NOREQUIREUSER', '1');
}
if (! defined('NOREQUIREDB')) {
define('NOREQUIREDB', '1');
}
if (! defined('NOREQUIRESOC')) {
define('NOREQUIRESOC', '1');
}
if (! defined('NOREQUIRETRAN')) {
define('NOREQUIRETRAN', '1');
}
if (! defined('NOCSRFCHECK')) {
define('NOCSRFCHECK', '1');
}
if (! defined('NOTOKENRENEWAL')) {
define('NOTOKENRENEWAL', '1');
}
if (! defined('NOREQUIREMENU')) {
define('NOREQUIREMENU', '1'); // If there is no menu to show
}
if (! defined('NOREQUIREHTML')) {
define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
}
if (! defined('NOREQUIREAJAX')) {
define('NOREQUIREAJAX', '1');
}
if (! defined("NOLOGIN")) {
define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
}
/**
* Class for PHPUnit tests
*
* @backupGlobals disabled
* @backupStaticAttributes enabled
* @remarks backupGlobals must be disabled to have db,conf,user and lang not erased.
*/
class ProfidLibTest extends PHPUnit\Framework\TestCase
{
protected $savconf;
protected $savuser;
protected $savlangs;
protected $savdb;
/**
* Constructor
* We save global variables into local variables
*
* @param string $name Name
* @return CoreTest
*/
public function __construct($name = '')
{
parent::__construct($name);
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
$this->savuser=$user;
$this->savlangs=$langs;
$this->savdb=$db;
print __METHOD__." db->type=".$db->type." user->id=".$user->id;
//print " - db ".$db->db;
print "\n";
}
/**
* setUpBeforeClass
*
* @return void
*/
public static function setUpBeforeClass(): void
{
global $conf,$user,$langs,$db;
//$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
print __METHOD__."\n";
}
/**
* tearDownAfterClass
*
* @return void
*/
public static function tearDownAfterClass(): void
{
global $conf,$user,$langs,$db;
//$db->rollback();
print __METHOD__."\n";
}
/**
* Init phpunit tests. Restore variables before each test.
*
* @return void
*/
protected function setUp(): void
{
global $conf,$user,$langs,$db;
$conf=$this->savconf;
$user=$this->savuser;
$langs=$this->savlangs;
//$db=$this->savdb;
print __METHOD__."\n";
}
/**
* End phpunit tests
*
* @return void
*/
protected function tearDown(): void
{
print __METHOD__."\n";
}
/**
* testIsValidLuhn
*
* @return void
*/
public function testIsValidLuhn()
{
// Tests OK
$this->assertTrue(isValidLuhn(972487086)); // int
$this->assertTrue(isValidLuhn("972487086")); // string
// Tests KO
$this->assertFalse(isValidLuhn(123456789)); // int
$this->assertFalse(isValidLuhn("123456789")); // string
}
/**
* testIsValidSiren
*
* @return void
*/
public function testIsValidSiren()
{
// Tests OK
$this->assertTrue(isValidSiren("732829320"));
$this->assertTrue(isValidSiren(" 732 829 320 ")); // formatted with spaces
// Tests NOK
$this->assertFalse(isValidSiren("123456ABC")); // not numeric
$this->assertFalse(isValidSiren("43336767")); // Luhn test OK but length != 9
$this->assertFalse(isValidSiren("123456789")); // 9 digits but Luhn test KO
}
/**
* testIsValidSiret
*
* @return void
*/
public function testIsValidSiret()
{
// Tests OK
$this->assertTrue(isValidSiret("73282932000074"));
$this->assertTrue(isValidSiret(" 732 829 320 00074 ")); // formatted with spaces
$this->assertTrue(isValidSiret("35600000049837")); // Specific cases of "La Poste" companies
// Tests NOK
$this->assertFalse(isValidSiret("123456ABC12345")); // not numeric
$this->assertFalse(isValidSiret("3624679471379")); // Luhn test OK but length != 14
$this->assertFalse(isValidSiret("12345678912345")); // 14 digits but Luhn test KO
}
/**
* testIsValidTinForPT
*
* @return void
*/
public function testIsValidTinForPT()
{
// Tests OK
$this->assertTrue(isValidTinForPT("123456789"));
$this->assertTrue(isValidTinForPT(" 123 456 789 ")); // formatted with spaces
// Tests NOK
$this->assertFalse(isValidTinForPT("123456ABC")); // not numeric
$this->assertFalse(isValidTinForPT("12345678")); // length != 9
}
/**
* testIsValidTinForDZ
*
* @return void
*/
public function testIsValidTinForDZ()
{
// Tests OK
$this->assertTrue(isValidTinForDZ("123456789123456"));
$this->assertTrue(isValidTinForDZ(" 12345 67891 23456 ")); // formatted with spaces
// Tests NOK
$this->assertFalse(isValidTinForDZ("123456789123ABC")); // not numeric
$this->assertFalse(isValidTinForDZ("123456789123")); // length != 15
}
/**
* testIsValidTinForBE
*
* @return void
*/
public function testIsValidTinForBE()
{
// Tests OK
$this->assertTrue(isValidTinForBE("0123.123.123"));
$this->assertTrue(isValidTinForBE("1234.123.123"));
// Tests NOK
//$this->assertFalse(isValidTinForBE("2345.123.123")); // First digit shall be 0 or 1
$this->assertFalse(isValidTinForBE("1234 123 123")); // formatted with spaces instead of dots
$this->assertFalse(isValidTinForBE("1234123123")); // without dots formatting
$this->assertFalse(isValidTinForBE("ABCD.123.123")); // not digits only
}
// TODO
/**
* testIsValidTinForES
*
* @return void
*/
/*
public function testIsValidTinForES()
{
// Tests for NIF
$this->assertEquals(1, isValidTinForES("")); // valid NIF
$this->assertEquals(-1, isValidTinForES("")); // valid regex, but invalid control key
// Tests for CIF
$this->assertEquals(2, isValidTinForES("")); // valid CIF
$this->assertEquals(-2, isValidTinForES("")); // valid regex, but invalid control key
// Tests for NIE
$this->assertEquals(3, isValidTinForES("")); // valid NIE
$this->assertEquals(-3, isValidTinForES("")); // valid regex, but invalid control key
// Tests for unknown error
$this->assertEquals(-4, isValidTinForES("")); // invalid regex for both NIF, CIF and NIE
}
*/
}