Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Debug v23

Browse Source
This commit is contained in:
Laurent Destailleur
2025-09-27 18:28:35 +02:00
parent e45fe1f988
commit d3bef6ee32
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dev/build/generate_filelist_xml.php
View File

@@ -50,6 +50,13 @@ $includeconstants = array();
$buildzip = 0; $buildzip = 0;
if (empty($argv[1])) { if (empty($argv[1])) {
print '***** '.$script_file.' *****'."\n";
print "Generate the file filelist-x.y.z[-mybuild].xml with signature of files. ";
print "This includes the 3 sections:\n";
print "- dolibarr_htdocs_dir\n";
print "- dolibarr_scripts_dir\n";
print "- dolibarr_unalterable_files (only files inside the scope of the unalterable module)\n";
print "\n";
print "Usage: ".$script_file." release=auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value] [buildzip=1]\n"; print "Usage: ".$script_file." release=auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value] [buildzip=1]\n";
print "Example: ".$script_file." release=6.0.0 includecustom=1 includeconstant=FR:INVOICE_CAN_ALWAYS_BE_REMOVED:0 includeconstant=all:MAILING_NO_USING_PHPMAIL:1\n"; print "Example: ".$script_file." release=6.0.0 includecustom=1 includeconstant=FR:INVOICE_CAN_ALWAYS_BE_REMOVED:0 includeconstant=all:MAILING_NO_USING_PHPMAIL:1\n";
exit(1); exit(1);
@@ -97,7 +104,7 @@ $savrelease = $release;
$tmpver = explode('-', $release, 2); $tmpver = explode('-', $release, 2);
if ($tmpver[0] == 'auto') { if ($tmpver[0] == 'auto') {
$release = DOL_VERSION; $release = DOL_VERSION;
if ($tmpver[1] && $tmpver[0] == 'auto') { if (!empty($tmpver[1]) && $tmpver[0] == 'auto') {
$release .= '-'.$tmpver[1]; $release .= '-'.$tmpver[1];
} }
} }
@@ -128,8 +135,8 @@ if (empty($includecustom)) {
print "Working on files into : ".DOL_DOCUMENT_ROOT."\n"; print "Working on files into : ".DOL_DOCUMENT_ROOT."\n";
print "Release : ".$release."\n"; print "Release : ".$release."\n";
print "Include custom in signature : ".$includecustom."\n"; print "Include custom dir in signature : ".(empty($includecustom) ? 'no' : 'yes')."\n";
print "Include constants in signature : "; print "Include constants in signature : ".(empty($includeconstants) ? 'none' : '');
foreach ($includeconstants as $countrycode => $tmp) { foreach ($includeconstants as $countrycode => $tmp) {
foreach ($tmp as $constname => $constvalue) { foreach ($tmp as $constname => $constvalue) {
print $constname.'='.$constvalue." "; print $constname.'='.$constvalue." ";
@@ -155,9 +162,12 @@ $gitcommit = 'seetag';
$branchname = preg_replace('/^(\d+\.\d+)\..*$/', '\1', $release); // Keep only x.y into x.y.z $branchname = preg_replace('/^(\d+\.\d+)\..*$/', '\1', $release); // Keep only x.y into x.y.z
$fileforgit = dirname(dirname(dirname(__FILE__))).'/.git/refs/heads/'.$branchname; $fileforgit = dirname(dirname(dirname(__FILE__))).'/.git/refs/heads/'.$branchname;
print "Try to get last commit ID from file ".$fileforgit."\n"; print "Try to get last commit ID from file ".$fileforgit."\n";
$fileforgitcontent = '';
if (file_exists($fileforgit)) {
$fileforgitcontent = file_get_contents($fileforgit); $fileforgitcontent = file_get_contents($fileforgit);
}
if (empty($fileforgitcontent)) { if (empty($fileforgitcontent)) {
print "Failed to get the last commit ID. Are you on the branch for the release (branch name '.$branchname.') ?\n"; print "Failed to get the last commit ID. Are you on the branch for the release (branch name ".$branchname.") ?\n";
} }
$gitcommit = trim($fileforgitcontent); $gitcommit = trim($fileforgitcontent);
@@ -350,7 +360,7 @@ if ($newdir != $dir) {
} }
fputs($fp, ' <dir name="'.$newdir.'">'."\n"); fputs($fp, ' <dir name="'.$newdir.'">'."\n");
$dir = $newdir; $dir = $newdir;
$needtoclose = 1; //$needtoclose = 1; // close will be done in next filethat is in same dir
} }
if (filetype($file) == "file") { if (filetype($file) == "file") {
$md5 = md5_file($file); $md5 = md5_file($file);
@@ -361,7 +371,7 @@ if ($needtoclose) {
fputs($fp, ' </dir>'."\n"); fputs($fp, ' </dir>'."\n");
$needtoclose = 0; $needtoclose = 0;
} }
// Add the interfaces.class.php file // Add the commontrigger.class.php file
$file = dirname(__FILE__).'/../../htdocs/core/class/commontrigger.class.php'; $file = dirname(__FILE__).'/../../htdocs/core/class/commontrigger.class.php';
$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file)); $newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
$newdir = str_replace(dirname(__FILE__).'/../../htdocs', '', dirname($file)); $newdir = str_replace(dirname(__FILE__).'/../../htdocs', '', dirname($file));
@@ -374,6 +384,8 @@ if ($newdir != $dir) {
$dir = $newdir; $dir = $newdir;
$needtoclose = 1; $needtoclose = 1;
} }
$needtoclose = 1; // This is the last file
if (filetype($file) == "file") { if (filetype($file) == "file") {
$md5 = md5_file($file); $md5 = md5_file($file);
$checksumconcat[] = $md5; $checksumconcat[] = $md5;

2
scripts/company/sync_contacts_dolibarr2ldap.php
View File

@@ -52,6 +52,8 @@ require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php";
* @var HookManager $hookmanager * @var HookManager $hookmanager
* @var Translate $langs * @var Translate $langs
* @var User $user * @var User $user
*
* @var string $dolibarr_main_db_readonly
*/ */
// Global variables // Global variables