Qual : PHP Code_Sniffer

This commit is contained in:
fhenry 2013-04-10 19:55:21 +02:00
parent 2c51b51a88
commit 98ddd02a32
13 changed files with 64 additions and 51 deletions

View File

@ -2783,7 +2783,6 @@ class Commande extends CommonOrder
* Update value of extrafields on the proposal * Update value of extrafields on the proposal
* *
* @param User $user Object user that modify * @param User $user Object user that modify
* @param double $remise Amount discount
* @return int <0 if ko, >0 if ok * @return int <0 if ko, >0 if ok
*/ */
function update_extrafields($user) function update_extrafields($user)

View File

@ -175,6 +175,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
* For example if this selector is used to extract 500 different * For example if this selector is used to extract 500 different
* emails from a text file, this function must return 500. * emails from a text file, this function must return 500.
* *
* @param string $sql SQL request to get recipitien
* @param int $filter Filter * @param int $filter Filter
* @param string $option Option * @param string $option Option
* @return int Number of recipients * @return int Number of recipients

View File

@ -384,6 +384,14 @@ class doc_generic_project_odt extends ModelePDFProjects
return -1; return -1;
} }
// Add odtgeneration hook
if (! is_object($hookmanager))
{
include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
$hookmanager=new HookManager($this->db);
}
$hookmanager->initHooks(array('odtgeneration'));
global $action;
if (! is_object($outputlangs)) $outputlangs=$langs; if (! is_object($outputlangs)) $outputlangs=$langs;
$sav_charset_output=$outputlangs->charset_output; $sav_charset_output=$outputlangs->charset_output;
$outputlangs->charset_output='UTF-8'; $outputlangs->charset_output='UTF-8';
@ -534,6 +542,9 @@ class doc_generic_project_odt extends ModelePDFProjects
// Replace tags of object + external modules // Replace tags of object + external modules
$tmparray=$this->get_substitutionarray_object($object,$outputlangs); $tmparray=$this->get_substitutionarray_object($object,$outputlangs);
complete_substitutions_array($tmparray, $outputlangs, $object); complete_substitutions_array($tmparray, $outputlangs, $object);
// Call the ODTSubstitution hook
$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
foreach($tmparray as $key=>$value) foreach($tmparray as $key=>$value)
{ {
try { try {
@ -958,6 +969,11 @@ class doc_generic_project_odt extends ModelePDFProjects
return -1; return -1;
} }
// Call the beforeODTSave hook
$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
$reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
// Write new file // Write new file
$odfHandler->saveToDisk($file); $odfHandler->saveToDisk($file);

View File

@ -146,6 +146,7 @@ class ProductFournisseur extends Product
* @param string $charges costs affering to product * @param string $charges costs affering to product
* @param float $remise_percent Discount regarding qty (percent) * @param float $remise_percent Discount regarding qty (percent)
* @param float $remise Discount regarding qty (amount) * @param float $remise Discount regarding qty (amount)
* @param float $newnpr new infobit tva npr
* @return int <0 if KO, >=0 if OK * @return int <0 if KO, >=0 if OK
*/ */
function update_buyprice($qty, $buyprice, $user, $price_base_type, $fourn, $availability, $ref_fourn, $tva_tx, $charges=0, $remise_percent=0, $remise=0, $newnpr=0) function update_buyprice($qty, $buyprice, $user, $price_base_type, $fourn, $availability, $ref_fourn, $tva_tx, $charges=0, $remise_percent=0, $remise=0, $newnpr=0)

View File

@ -202,7 +202,7 @@ if (isset($_POST["ajoutercolonne"]) && ($object->format == "D" || $object->forma
//on rajoute la valeur dans les valeurs //on rajoute la valeur dans les valeurs
$datesbase = explode(",",$object->sujet); $datesbase = explode(",",$object->sujet);
$taillebase = sizeof($datesbase); $taillebase = count($datesbase);
//recherche de l'endroit de l'insertion de la nouvelle date dans les dates deja entrées dans le tableau //recherche de l'endroit de l'insertion de la nouvelle date dans les dates deja entrées dans le tableau
if ($nouvelledate < $datesbase[0]) { if ($nouvelledate < $datesbase[0]) {

View File

@ -120,7 +120,7 @@ function get_server_name()
/** /**
* is_error * is_error
* *
* @param unknown_type $cerr * @param unknown_type $cerr error number
* @return boolean * @return boolean
*/ */
function is_error($cerr) function is_error($cerr)

View File

@ -257,9 +257,9 @@ if (issetAndNoEmpty('choixjourajout')) {
// Si le test est passé, alors on insere la valeur dans la variable de session qui contient les dates // Si le test est passé, alors on insere la valeur dans la variable de session qui contient les dates
if ($journeuf && issetAndNoEmpty('choixjourajout') === true) { if ($journeuf && issetAndNoEmpty('choixjourajout') === true) {
array_push ($_SESSION["totalchoixjour"],mktime (0,0,0, $_SESSION["mois"], $_POST["choixjourajout"][0], $_SESSION["annee"])); array_push($_SESSION["totalchoixjour"],mktime (0,0,0, $_SESSION["mois"], $_POST["choixjourajout"][0], $_SESSION["annee"]));
sort ($_SESSION["totalchoixjour"]); sort($_SESSION["totalchoixjour"]);
$cle=array_search (mktime (0,0,0, $_SESSION["mois"], $_POST["choixjourajout"][0], $_SESSION["annee"]), $_SESSION["totalchoixjour"]); $cle=array_search(mktime (0,0,0, $_SESSION["mois"], $_POST["choixjourajout"][0], $_SESSION["annee"]), $_SESSION["totalchoixjour"]);
//On sauvegarde les heures deja entrées //On sauvegarde les heures deja entrées
for ($i = 0; $i < $cle; $i++) { for ($i = 0; $i < $cle; $i++) {

View File

@ -162,7 +162,7 @@ print '</script>'."\n";
print '<br>'."\n"; print '<br>'."\n";
#affichage du cochage par défaut //affichage du cochage par défaut
$cocheplus=''; $cocheplus='';
if ($_SESSION["canedit"]) $cocheplus="checked"; if ($_SESSION["canedit"]) $cocheplus="checked";

View File

@ -64,7 +64,7 @@ $now=dol_now();
$nbcolonnes=substr_count($object->sujet,',')+1; $nbcolonnes=substr_count($object->sujet,',')+1;
$toutsujet=explode(",",$object->sujet); $toutsujet=explode(",",$object->sujet);
#$toutsujet=str_replace("°","'",$toutsujet); //$toutsujet=str_replace("°","'",$toutsujet);
// affichage des sujets du sondage // affichage des sujets du sondage
$input.=$langs->trans("Name").";"; $input.=$langs->trans("Name").";";
@ -139,15 +139,15 @@ if ($resql)
else dol_print_error($db); else dol_print_error($db);
$filesize = strlen( $input ); $filesize = strlen($input);
$filename=$numsondage."_".dol_print_date($now,'%Y%m%d%H%M').".csv"; $filename=$numsondage."_".dol_print_date($now,'%Y%m%d%H%M').".csv";
header( 'Content-Type: text/csv; charset=utf-8' ); header('Content-Type: text/csv; charset=utf-8');
header( 'Content-Length: '.$filesize ); header('Content-Length: '.$filesize);
header( 'Content-Disposition: attachment; filename="'.$filename.'"' ); header('Content-Disposition: attachment; filename="'.$filename.'"');
header( 'Cache-Control: max-age=10' ); header('Cache-Control: max-age=10');
echo $input; echo $input;
exit; exit;

View File

@ -73,8 +73,7 @@ if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fu
'New subscription payed', 'New subscription payed',
$sendto, $sendto,
$from, $from,
'New subscription payed '.$fulltag 'New subscription payed '.$fulltag);
);
$result=$mailfile->sendfile(); $result=$mailfile->sendfile();
if ($result) if ($result)

View File

@ -103,8 +103,7 @@ if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fu
'New subscription payed', 'New subscription payed',
$sendto, $sendto,
$from, $from,
'New subscription payed '.$fulltag 'New subscription payed '.$fulltag);
);
$result=$mailfile->sendfile(); $result=$mailfile->sendfile();
if ($result) if ($result)

View File

@ -81,8 +81,7 @@ if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fu
'New subscription payed', 'New subscription payed',
$sendto, $sendto,
$from, $from,
'New subscription payed '.$fulltag 'New subscription payed '.$fulltag);
);
$result=$mailfile->sendfile(); $result=$mailfile->sendfile();
if ($result) if ($result)

View File

@ -140,8 +140,7 @@ if ($PAYPALTOKEN)
'New subscription payed', 'New subscription payed',
$sendto, $sendto,
$from, $from,
'New subscription payed '.$fulltag 'New subscription payed '.$fulltag);
);
$result=$mailfile->sendfile(); $result=$mailfile->sendfile();
if ($result) if ($result)