Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: uniformize code

Browse Source
This commit is contained in:
Regis Houssin 2012-03-22 08:33:44 +01:00
parent bf9b7e9090
commit 5d2da2c884
21 changed files with 50 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/admin/dict.php
View File

@ -277,8 +277,8 @@ $tabcond[8] = $conf->societe->enabled;
$tabcond[9] = true;
$tabcond[10]= true;
$tabcond[11]= true;
$tabcond[12]= $conf->commande->enabled||$conf->propale->enabled||$conf->facture->enabled||$conf->fournisseur->enabled;
$tabcond[13]= $conf->commande->enabled||$conf->propale->enabled||$conf->facture->enabled||$conf->fournisseur->enabled;
$tabcond[12]= $conf->commande->enabled||$conf->propal->enabled||$conf->facture->enabled||$conf->fournisseur->enabled;
$tabcond[13]= $conf->commande->enabled||$conf->propal->enabled||$conf->facture->enabled||$conf->fournisseur->enabled;
$tabcond[14]= $conf->product->enabled&&$conf->ecotax->enabled;
$tabcond[15]= true;
$tabcond[16]= $conf->societe->enabled && empty($conf->global->SOCIETE_DISABLE_PROSPECTS);
@ -286,8 +286,8 @@ $tabcond[17]= $conf->deplacement->enabled;
$tabcond[18]= $conf->expedition->enabled;
$tabcond[19]= $conf->societe->enabled;
$tabcond[20]= $conf->fournisseur->enabled;
$tabcond[21]= $conf->propale->enabled;
$tabcond[22]= $conf->commande->enabled||$conf->propale->enabled;
$tabcond[21]= $conf->propal->enabled;
$tabcond[22]= $conf->commande->enabled||$conf->propal->enabled;
complete_dictionnary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,$tabfield,$tabfieldvalue,$tabfieldinsert,$tabrowid,$tabcond);

2
htdocs/admin/propale.php
View File

@ -631,7 +631,7 @@ print "<tr class=\"liste_titre\">\n";
print " <td>".$langs->trans("Name")."</td>\n";
print " <td>".$langs->trans("Value")."</td>\n";
print "</tr>\n";
print "<tr ".$bc[false].">\n <td width=\"140\">".$langs->trans("PathDirectory")."</td>\n <td>".$conf->propale->dir_output."</td>\n</tr>\n";
print "<tr ".$bc[false].">\n <td width=\"140\">".$langs->trans("PathDirectory")."</td>\n <td>".$conf->propal->dir_output."</td>\n</tr>\n";
print "</table>\n<br>";
dol_htmloutput_mesg($mesg);

2
htdocs/comm/index.php
View File

@ -515,7 +515,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
print '</td>';
print '<td width="16" align="center" class="nobordernopadding">';
$filename=dol_sanitizeFileName($obj->ref);
$filedir=$conf->propale->dir_output . '/' . dol_sanitizeFileName($obj->ref);
$filedir=$conf->propal->dir_output . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->propalid;
$formfile->show_documents('propal',$filename,$filedir,$urlsource,'','','',1,'',1);
print '</td></tr></table>';

10
htdocs/comm/propal.php
View File

@ -492,7 +492,7 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P
if ($result > 0)
{
// $objectref = dol_sanitizeFileName($object->ref);
// $file = $conf->propale->dir_output . '/' . $objectref . '/' . $objectref . '.pdf';
// $file = $conf->propal->dir_output . '/' . $objectref . '/' . $objectref . '.pdf';
// if (is_readable($file))
// {
@ -1737,7 +1737,7 @@ if ($id > 0 || ! empty($ref))
* Documents generes
*/
$filename=dol_sanitizeFileName($object->ref);
$filedir=$conf->propale->dir_output . "/" . dol_sanitizeFileName($object->ref);
$filedir=$conf->propal->dir_output . "/" . dol_sanitizeFileName($object->ref);
$urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
$genallowed=$user->rights->propale->creer;
$delallowed=$user->rights->propale->supprimer;
@ -1771,7 +1771,7 @@ if ($id > 0 || ! empty($ref))
{
$ref = dol_sanitizeFileName($object->ref);
include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$fileparams = dol_most_recent_file($conf->propale->dir_output . '/' . $ref);
$fileparams = dol_most_recent_file($conf->propal->dir_output . '/' . $ref);
$file=$fileparams['fullname'];
// Build document if it not exists
@ -1794,7 +1794,7 @@ if ($id > 0 || ! empty($ref))
dol_print_error($db,$result);
exit;
}
$fileparams = dol_most_recent_file($conf->propale->dir_output . '/' . $ref);
$fileparams = dol_most_recent_file($conf->propal->dir_output . '/' . $ref);
$file=$fileparams['fullname'];
}
@ -2003,7 +2003,7 @@ else
print '<td width="16" align="right" class="nobordernopadding">';
$filename=dol_sanitizeFileName($objp->ref);
$filedir=$conf->propale->dir_output . '/' . dol_sanitizeFileName($objp->ref);
$filedir=$conf->propal->dir_output . '/' . dol_sanitizeFileName($objp->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$objp->propalid;
$formfile->show_documents('propal',$filename,$filedir,$urlsource,'','','',1,'',1);
print '</td></tr></table>';

2
htdocs/comm/propal/apercu.php
View File

@ -119,7 +119,7 @@ if ($id > 0 || ! empty($ref))
* Documents
*/
$objectref = dol_sanitizeFileName($object->ref);
$dir_output = $conf->propale->dir_output . "/";
$dir_output = $conf->propal->dir_output . "/";
$filepath = $dir_output . $objectref . "/";
$file = $filepath . $objectref . ".pdf";
$filedetail = $filepath . $objectref . "-detail.pdf";

6
htdocs/comm/propal/class/propal.class.php
View File

@ -1801,10 +1801,10 @@ class Propal extends CommonObject
{
// We remove directory
$propalref = dol_sanitizeFileName($this->ref);
if ($conf->propale->dir_output)
if ($conf->propal->dir_output)
{
$dir = $conf->propale->dir_output . "/" . $propalref ;
$file = $conf->propale->dir_output . "/" . $propalref . "/" . $propalref . ".pdf";
$dir = $conf->propal->dir_output . "/" . $propalref ;
$file = $conf->propal->dir_output . "/" . $propalref . "/" . $propalref . ".pdf";
if (file_exists($file))
{
dol_delete_preview($this);

6
htdocs/comm/propal/document.php
View File

@ -70,7 +70,7 @@ if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{
$object->fetch_thirdparty();
$upload_dir = $conf->propale->dir_output . "/" . dol_sanitizeFileName($object->ref);
$upload_dir = $conf->propal->dir_output . "/" . dol_sanitizeFileName($object->ref);
if (dol_mkdir($upload_dir) >= 0)
{
@ -106,7 +106,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
{
$object->fetch_thirdparty();
$upload_dir = $conf->propale->dir_output . "/" . dol_sanitizeFileName($object->ref);
$upload_dir = $conf->propal->dir_output . "/" . dol_sanitizeFileName($object->ref);
$file = $upload_dir . '/' . $_GET['urlfile']; // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
dol_delete_file($file,0,0,0,$object);
$mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>';
@ -128,7 +128,7 @@ if ($id > 0 || ! empty($ref))
{
$object->fetch_thirdparty();
$upload_dir = $conf->propale->dir_output.'/'.dol_sanitizeFileName($object->ref);
$upload_dir = $conf->propal->dir_output.'/'.dol_sanitizeFileName($object->ref);
$head = propal_prepare_head($object);
dol_fiche_head($head, 'document', $langs->trans('Proposal'), 0, 'propal');

4
htdocs/comm/propal/index.php
View File

@ -248,7 +248,7 @@ if ($resql)
print '<td width="16" align="right" class="nobordernopadding">';
$filename=dol_sanitizeFileName($obj->ref);
$filedir=$conf->propale->dir_output . '/' . dol_sanitizeFileName($obj->ref);
$filedir=$conf->propal->dir_output . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
$formfile->show_documents('commande',$filename,$filedir,$urlsource,'','','',1,'',1);
print '</td></tr></table>';
@ -318,7 +318,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
print '</td>';
print '<td width="16" align="center" class="nobordernopadding">';
$filename=dol_sanitizeFileName($obj->ref);
$filedir=$conf->propale->dir_output . '/' . dol_sanitizeFileName($obj->ref);
$filedir=$conf->propal->dir_output . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->propalid;
$formfile->show_documents('propal',$filename,$filedir,$urlsource,'','','',1,'',1);
print '</td></tr></table>';

2
htdocs/comm/propal/stats/index.php
View File

@ -58,7 +58,7 @@ llxHeader();
print_fiche_titre($langs->trans("ProposalsStatistics"), $mesg);
$dir=$conf->propale->dir_temp;
$dir=$conf->propal->dir_temp;
dol_mkdir($dir);

6
htdocs/core/class/conf.class.php
View File

@ -211,6 +211,7 @@ class Conf
elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)$/i',$key,$reg))
{
$modulename=strtolower($reg[1]);
if ($modulename == 'propale') $modulename='propal';
$this->$modulename=(object) array();
$this->$modulename->enabled=true;
$this->modules[]=$modulename; // Add this module in list of enabled modules
@ -258,7 +259,6 @@ class Conf
// For backward compatibility
// TODO Replace this->xxx->enabled by this->modulename->enabled to remove this code
if (isset($this->propale->enabled)) $this->propal->enabled=$this->propale->enabled;
if (isset($this->categorie->enabled)) $this->category->enabled=$this->categorie->enabled;
// Define default dir_output and dir_temp for directories of modules
@ -279,6 +279,10 @@ class Conf
// For user storage
$this->user->dir_output=$rootforuser."/users";
$this->user->dir_temp=$rootforuser."/users/temp";
// For propal storage
$this->propal->dir_output=$rootforuser."/propale";
$this->propal->dir_temp=$rootforuser."/propale/temp";
// Exception: Some dir are not the name of module. So we keep exception here
// for backward compatibility.

11
htdocs/core/lib/files.lib.php
View File

@ -742,16 +742,15 @@ function dol_delete_preview($object)
{
global $langs,$conf;
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$element = $object->element;
$dir = $conf->$element->dir_output;
if ($object->element == 'commande') $dir = $conf->commande->dir_output;
elseif ($object->element == 'propal') $dir = $conf->propale->dir_output;
elseif ($object->element == 'ficheinter') $dir = $conf->ficheinter->dir_output;
elseif ($object->element == 'order_supplier') $dir = $conf->fournisseur->dir_output.'/commande';
if ($object->element == 'order_supplier') $dir = $conf->fournisseur->dir_output.'/commande';
elseif ($object->element == 'invoice_supplier') $dir = $conf->fournisseur->dir_output.'/facture';
elseif ($object->element == 'project') $dir = $conf->projet->dir_output;
elseif ($object->element == 'delivery') $dir = $conf->livraison->dir_output;
elseif ($object->element == 'facture') $dir = $conf->facture->dir_output;
elseif ($object->element == 'don') $dir = $conf->don->dir_output;
if (empty($dir)) return 'ErrorObjectNoSupportedByFunction';
$refsan = dol_sanitizeFileName($object->ref);

2
htdocs/core/lib/propal.lib.php
View File

@ -86,7 +86,7 @@ function propal_prepare_head($object)
}
$head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?id='.$object->id;
/*$filesdir = $conf->propale->dir_output . "/" . dol_sanitizeFileName($propal->ref);
/*$filesdir = $conf->propal->dir_output . "/" . dol_sanitizeFileName($propal->ref);
include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$listoffiles=dol_dir_list($filesdir,'files',1);
$head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/

8
htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
View File

@ -252,7 +252,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
$outputlangs->load("companies");
$outputlangs->load("bills");
if ($conf->propale->dir_output)
if ($conf->propal->dir_output)
{
// If $object is id instead of object
if (! is_object($object))
@ -267,7 +267,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
}
}
$dir = $conf->propale->dir_output;
$dir = $conf->propal->dir_output;
$objectref = dol_sanitizeFileName($object->ref);
if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
$file = $dir . "/" . $objectref . ".odt";
@ -296,7 +296,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
//print "file=".$file;
//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
dol_mkdir($conf->propale->dir_temp);
dol_mkdir($conf->propal->dir_temp);
// If BILLING contact defined on invoice, we use it
@ -343,7 +343,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
$odfHandler = new odf(
$srctemplatepath,
array(
'PATH_TO_TMP' => $conf->propale->dir_temp,
'PATH_TO_TMP' => $conf->propal->dir_temp,
'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
'DELIMITER_LEFT' => '{',
'DELIMITER_RIGHT' => '}'

6
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@ -129,7 +129,7 @@ class pdf_azur extends ModelePDFPropales
$outputlangs->load("propal");
$outputlangs->load("products");
if ($conf->propale->dir_output)
if ($conf->propal->dir_output)
{
$object->fetch_thirdparty();
@ -138,13 +138,13 @@ class pdf_azur extends ModelePDFPropales
// Definition de $dir et $file
if ($object->specimen)
{
$dir = $conf->propale->dir_output;
$dir = $conf->propal->dir_output;
$file = $dir . "/SPECIMEN.pdf";
}
else
{
$objectref = dol_sanitizeFileName($object->ref);
$dir = $conf->propale->dir_output . "/" . $objectref;
$dir = $conf->propal->dir_output . "/" . $objectref;
$file = $dir . "/" . $objectref . ".pdf";
}

6
htdocs/core/modules/propale/doc/pdf_jaune.modules.php
View File

@ -129,7 +129,7 @@ class pdf_jaune extends ModelePDFPropales
$outputlangs->load("propal");
$outputlangs->load("products");
if ($conf->propale->dir_output)
if ($conf->propal->dir_output)
{
$object->fetch_thirdparty();
@ -138,13 +138,13 @@ class pdf_jaune extends ModelePDFPropales
// Definition de $dir et $file
if ($object->specimen)
{
$dir = $conf->propale->dir_output;
$dir = $conf->propal->dir_output;
$file = $dir . "/SPECIMEN.pdf";
}
else
{
$objectref = dol_sanitizeFileName($object->ref);
$dir = $conf->propale->dir_output . "/" . $objectref;
$dir = $conf->propal->dir_output . "/" . $objectref;
$file = $dir . "/" . $objectref . ".pdf";
}

2
htdocs/core/triggers/interface_50_modNotification_Notification.class.php
View File

@ -137,7 +137,7 @@ class InterfaceNotification
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
$ref = dol_sanitizeFileName($object->ref);
$filepdf = $conf->propale->dir_output . '/' . $ref . '/' . $ref . '.pdf';
$filepdf = $conf->propal->dir_output . '/' . $ref . '/' . $ref . '.pdf';
if (! file_exists($filepdf)) $filepdf='';
$filepdf=''; // We can't add PDF as it is not generated yet.
$langs->load("other");

2
htdocs/document.php
View File

@ -183,7 +183,7 @@ if ($modulepart)
$accessallowed=1;
}
$original_file=$conf->propale->dir_output.'/'.$original_file;
$original_file=$conf->propal->dir_output.'/'.$original_file;
$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."propal WHERE ref='".$refname."' AND entity=".$conf->entity;
}

2
htdocs/ecm/index.php
View File

@ -881,7 +881,7 @@ else if ($module == 'invoice_supplier') // Auto area for suppliers invoices
}
else if ($module == 'propal') // Auto area for customers orders
{
$upload_dir = $conf->propale->dir_output;
$upload_dir = $conf->propal->dir_output;
$filearray=dol_dir_list($upload_dir,"files",1,'',array('^SPECIMEN\.pdf$','^\.','\.meta$','^temp$','^payments$','^CVS$','^thumbs$'),$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$param.='&module='.$module;

3
htdocs/install/repair.php
View File

@ -200,14 +200,13 @@ if (GETPOST('purge'))
foreach ($listmodulepart as $modulepart)
{
$filearray=array();
$upload_dir = $conf->$modulepart->dir_output;
if ($modulepart == 'company') $upload_dir = $conf->societe->dir_output;
if ($modulepart == 'invoice') $upload_dir = $conf->facture->dir_output;
if ($modulepart == 'invoice_supplier') $upload_dir = $conf->fournisseur->facture->dir_output;
if ($modulepart == 'propal') $upload_dir = $conf->propale->dir_output;
if ($modulepart == 'order') $upload_dir = $conf->commande->dir_output;
if ($modulepart == 'order_supplier') $upload_dir = $conf->fournisseur->commande->dir_output;
if ($modulepart == 'contract') $upload_dir = $conf->contrat->dir_output;
if ($modulepart == 'tax') $upload_dir = $conf->tax->dir_output;
if (empty($upload_dir)) continue;

4
htdocs/viewimage.php
View File

@ -133,7 +133,7 @@ if ($modulepart)
elseif ($modulepart == 'apercupropal')
{
if ($user->rights->propale->lire) $accessallowed=1;
$original_file=$conf->propale->dir_output.'/'.$original_file;
$original_file=$conf->propal->dir_output.'/'.$original_file;
}
// Wrapping pour les apercu commande
elseif ($modulepart == 'apercucommande')
@ -151,7 +151,7 @@ if ($modulepart)
elseif ($modulepart == 'propalstats')
{
if ($user->rights->propale->lire) $accessallowed=1;
$original_file=$conf->propale->dir_temp.'/'.$original_file;
$original_file=$conf->propal->dir_temp.'/'.$original_file;
}
// Wrapping pour les images des stats commandes
elseif ($modulepart == 'orderstats')

4
test/phpunit/BuildDocTest.php
View File

@ -109,7 +109,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
if (! $conf->facture->enabled) { print __METHOD__." invoice module not enabled\n"; die(); }
if (! $conf->commande->enabled) { print __METHOD__." order module not enabled\n"; die(); }
if (! $conf->propale->enabled) { print __METHOD__." propal module not enabled\n"; die(); }
if (! $conf->propal->enabled) { print __METHOD__." propal module not enabled\n"; die(); }
if (! $conf->projet->enabled) { print __METHOD__." project module not enabled\n"; die(); }
if (! $conf->expedition->enabled) { print __METHOD__." shipment module not enabled\n"; die(); }
@ -294,7 +294,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
$langs=$this->savlangs;
$db=$this->savdb;
$conf->propale->dir_output.='/temp';
$conf->propal->dir_output.='/temp';
$localobject=new Propal($this->savdb);
$localobject->initAsSpecimen();