From 161f5eadd4b17948bcae1c25085881a1d01d2608 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 21 Jul 2014 19:07:56 +0200 Subject: [PATCH] Revert "Scrutinizer Auto-Fixes" --- htdocs/adherents/class/adherent.class.php | 2 +- htdocs/cashdesk/class/Facturation.class.php | 6 +-- htdocs/categories/categorie.php | 2 +- htdocs/categories/class/categorie.class.php | 4 +- .../comm/action/class/cactioncomm.class.php | 2 +- htdocs/comm/action/class/ical.class.php | 2 +- htdocs/comm/propal/class/propal.class.php | 16 +++---- htdocs/commande/class/commande.class.php | 20 ++++---- htdocs/compta/bank/class/account.class.php | 4 +- htdocs/compta/bank/class/bankcateg.class.php | 2 +- .../facture/class/facture-rec.class.php | 4 +- htdocs/compta/facture/class/facture.class.php | 18 +++---- .../facture/class/paymentterm.class.php | 2 +- .../compta/localtax/class/localtax.class.php | 2 +- .../cheque/class/remisecheque.class.php | 2 +- .../class/bonprelevement.class.php | 7 ++- .../class/ligneprelevement.class.php | 2 +- .../class/rejetprelevement.class.php | 2 +- .../salaries/class/paymentsalary.class.php | 4 +- .../sociales/class/chargesociales.class.php | 6 +-- .../class/paymentsocialcontribution.class.php | 2 +- htdocs/compta/tva/class/tva.class.php | 4 +- htdocs/contact/class/contact.class.php | 6 +-- htdocs/contrat/class/contrat.class.php | 8 ++-- htdocs/core/class/CMailFile.class.php | 10 ++-- .../core/class/commondocgenerator.class.php | 4 +- htdocs/core/class/commoninvoice.class.php | 6 +-- htdocs/core/class/commonobject.class.php | 20 ++++---- htdocs/core/class/cookie.class.php | 2 +- htdocs/core/class/cpays.class.php | 2 +- htdocs/core/class/ctypent.class.php | 2 +- htdocs/core/class/doleditor.class.php | 2 +- htdocs/core/class/dolgeoip.class.php | 2 +- htdocs/core/class/dolgraph.class.php | 10 ++-- htdocs/core/class/events.class.php | 4 +- htdocs/core/class/extrafields.class.php | 2 +- htdocs/core/class/fileupload.class.php | 14 +++--- htdocs/core/class/html.form.class.php | 36 +++++++------- htdocs/core/class/html.formactions.class.php | 6 +-- htdocs/core/class/html.formadmin.class.php | 6 +-- htdocs/core/class/html.formbank.class.php | 2 +- htdocs/core/class/html.formcompany.class.php | 6 +-- htdocs/core/class/html.formcron.class.php | 4 +- htdocs/core/class/html.formfile.class.php | 16 +++---- htdocs/core/class/html.formmailing.class.php | 2 +- htdocs/core/class/html.formorder.class.php | 2 +- htdocs/core/class/html.formother.class.php | 15 +++--- htdocs/core/class/ldap.class.php | 6 +-- htdocs/core/class/menu.class.php | 4 +- htdocs/core/class/menubase.class.php | 6 +-- htdocs/core/class/openid.class.php | 13 ++--- htdocs/core/class/rssparser.class.php | 2 +- htdocs/core/class/smtps.class.php | 26 +++++----- htdocs/core/class/translate.class.php | 8 ++-- htdocs/core/class/vcard.class.php | 2 +- htdocs/core/datepicker.php | 2 +- htdocs/core/db/Database.interface.php | 8 ++-- htdocs/core/db/DoliDB.class.php | 6 +-- htdocs/core/db/mssql.class.php | 16 +++---- htdocs/core/db/mysql.class.php | 6 +-- htdocs/core/db/mysqli.class.php | 8 ++-- htdocs/core/db/pgsql.class.php | 22 ++++----- htdocs/core/db/sqlite.class.php | 8 ++-- .../filemanagerdol/connectors/php/basexml.php | 5 +- .../connectors/php/commands.php | 12 ----- .../core/filemanagerdol/connectors/php/io.php | 19 ++------ .../filemanagerdol/connectors/php/util.php | 4 +- htdocs/core/lib/ajax.lib.php | 4 +- htdocs/core/lib/bank.lib.php | 2 +- htdocs/core/lib/barcode.lib.php | 6 +-- htdocs/core/lib/company.lib.php | 20 ++++---- htdocs/core/lib/date.lib.php | 12 ++--- htdocs/core/lib/files.lib.php | 6 +-- htdocs/core/lib/functions.lib.php | 48 +++++++++---------- htdocs/core/lib/functions2.lib.php | 8 ++-- htdocs/core/lib/geturl.lib.php | 4 +- htdocs/core/lib/json.lib.php | 2 +- htdocs/core/lib/pdf.lib.php | 10 ++-- htdocs/core/lib/product.lib.php | 4 +- htdocs/core/lib/project.lib.php | 1 - htdocs/core/lib/treeview.lib.php | 2 +- htdocs/core/lib/ws.lib.php | 3 -- htdocs/core/menus/standard/empty.php | 2 +- htdocs/core/modules/action/rapport.pdf.php | 2 +- .../barcode/doc/phpbarcode.modules.php | 4 +- .../barcode/mod_barcode_product_standard.php | 2 +- .../modules/barcode/modules_barcode.class.php | 2 +- .../cheque/pdf/modules_chequereceipts.php | 2 +- .../modules/cheque/pdf/pdf_blochet.class.php | 2 +- .../modules/commande/mod_commande_marbre.php | 2 +- .../modules/commande/mod_commande_saphir.php | 2 +- .../modules/commande/modules_commande.php | 4 +- .../contract/doc/pdf_strato.modules.php | 6 +-- .../modules/contract/modules_contract.php | 2 +- htdocs/core/modules/dons/modules_don.php | 2 +- .../expedition/doc/pdf_merou.modules.php | 2 +- .../expedition/doc/pdf_rouget.modules.php | 4 +- .../modules/expedition/modules_expedition.php | 2 +- .../modules/export/export_csv.modules.php | 2 +- .../modules/export/export_excel.modules.php | 2 +- .../modules/export/export_tsv.modules.php | 2 +- htdocs/core/modules/export/modules_export.php | 2 +- .../core/modules/facture/modules_facture.php | 4 +- .../fichinter/doc/pdf_soleil.modules.php | 6 +-- htdocs/core/modules/fichinter/mod_arctic.php | 2 +- htdocs/core/modules/fichinter/mod_pacific.php | 2 +- .../modules/fichinter/modules_fichinter.php | 2 +- .../modules/import/import_csv.modules.php | 4 +- htdocs/core/modules/import/modules_import.php | 2 +- .../modules/livraison/mod_livraison_jade.php | 2 +- .../livraison/mod_livraison_saphir.php | 2 +- .../modules/livraison/modules_livraison.php | 2 +- .../modules/mailings/contacts1.modules.php | 2 +- .../core/modules/mailings/example.modules.php | 2 +- .../core/modules/mailings/fraise.modules.php | 2 +- .../modules/mailings/modules_mailings.php | 2 +- .../core/modules/mailings/pomme.modules.php | 2 +- .../modules/mailings/xinputfile.modules.php | 2 +- .../modules/mailings/xinputuser.modules.php | 2 +- htdocs/core/modules/member/modules_cards.php | 2 +- .../modules/printsheet/modules_labels.php | 2 +- .../product/mod_codeproduct_elephant.php | 4 +- .../product/mod_codeproduct_leopard.php | 2 +- .../modules/product/modules_product.class.php | 4 +- .../modules/project/mod_project_simple.php | 2 +- .../modules/project/mod_project_universal.php | 2 +- .../core/modules/project/modules_project.php | 2 +- .../pdf/doc_generic_project_odt.modules.php | 2 +- .../project/pdf/pdf_baleine.modules.php | 6 +-- .../modules/project/task/mod_task_simple.php | 2 +- .../project/task/mod_task_universal.php | 2 +- .../modules/project/task/modules_task.php | 2 +- .../task/pdf/doc_generic_task_odt.modules.php | 2 +- .../core/modules/propale/modules_propale.php | 4 +- .../societe/mod_codeclient_elephant.php | 4 +- .../societe/mod_codeclient_leopard.php | 2 +- .../modules/societe/mod_codeclient_monkey.php | 4 +- .../societe/mod_codecompta_aquarium.php | 2 +- .../societe/mod_codecompta_panicum.php | 2 +- .../modules/societe/modules_societe.class.php | 8 ++-- .../mod_facture_fournisseur_cactus.php | 2 +- .../mod_facture_fournisseur_tulip.php | 2 +- .../modules_facturefournisseur.php | 2 +- .../pdf/pdf_canelle.modules.php | 6 +-- .../mod_commande_fournisseur_muguet.php | 4 +- .../mod_commande_fournisseur_orchidee.php | 4 +- .../modules_commandefournisseur.php | 2 +- .../pdf/pdf_muscadet.modules.php | 10 ++-- htdocs/core/modules/syslog/logHandler.php | 2 +- .../modules/syslog/logHandlerInterface.php | 2 +- .../modules/syslog/mod_syslog_chromephp.php | 4 +- .../core/modules/syslog/mod_syslog_file.php | 2 +- .../modules/syslog/mod_syslog_firephp.php | 4 +- .../core/modules/syslog/mod_syslog_syslog.php | 2 +- htdocs/cron/class/cronjob.class.php | 4 +- htdocs/ecm/class/ecmdirectory.class.php | 2 +- htdocs/expedition/class/expedition.class.php | 2 +- .../class/fournisseur.commande.class.php | 14 +++--- .../fourn/class/fournisseur.facture.class.php | 16 +++---- .../fourn/class/fournisseur.product.class.php | 6 +-- htdocs/ftp/index.php | 2 +- htdocs/holiday/class/holiday.class.php | 14 +++--- htdocs/imports/import.php | 2 +- htdocs/install/etape1.php | 2 +- htdocs/install/inc.php | 4 +- htdocs/install/upgrade2.php | 2 +- htdocs/livraison/class/livraison.class.php | 8 ++-- .../mailmanspip/class/mailmanspip.class.php | 8 ++-- htdocs/main.inc.php | 4 +- .../class/opensurveysondage.class.php | 2 +- htdocs/opensurvey/fonctions.php | 2 +- htdocs/paypal/lib/paypal.lib.php | 10 ---- .../product/actions_card_product.class.php | 2 +- .../service/actions_card_service.class.php | 2 +- .../product/class/html.formproduct.class.php | 2 +- htdocs/product/class/product.class.php | 26 +++++----- htdocs/product/class/productbatch.class.php | 2 +- .../class/productcustomerprice.class.php | 2 +- .../product/stock/lib/replenishment.lib.php | 2 +- htdocs/projet/class/project.class.php | 2 +- htdocs/projet/class/task.class.php | 12 ++--- htdocs/resource/class/resource.class.php | 4 +- .../canvas/actions_card_common.class.php | 2 +- .../company/actions_card_company.class.php | 2 +- .../actions_card_individual.class.php | 2 +- htdocs/societe/class/address.class.php | 4 +- htdocs/societe/class/societe.class.php | 12 ++--- htdocs/support/inc.php | 2 +- htdocs/user/class/user.class.php | 4 +- 189 files changed, 479 insertions(+), 530 deletions(-) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index bc91f9bdeede3..38032741330d7 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -1241,7 +1241,7 @@ function fetch_subscriptions() * @param string $num_chq Numero cheque (if Id bank account provided) * @param string $emetteur_nom Name of cheque writer * @param string $emetteur_banque Name of bank of cheque - * @param integer $datesubend Date end subscription + * @param timestamp $datesubend Date end subscription * @return int rowid of record added, <0 if KO */ function cotisation($date, $montant, $accountid=0, $operation='', $label='', $num_chq='', $emetteur_nom='', $emetteur_banque='', $datesubend=0) diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php index 0e6c2fdd2cb6a..296ced0f17224 100644 --- a/htdocs/cashdesk/class/Facturation.class.php +++ b/htdocs/cashdesk/class/Facturation.class.php @@ -266,7 +266,7 @@ private function razPers() * Getter for id * * @param int $aId Id - * @return null|integer + * @return id */ public function id($aId=null) { @@ -390,7 +390,7 @@ public function remisePercent($aRemisePercent=null) * Getter for montant_remise * * @param int $aMontantRemise Amount - * @return null|integer Amount + * @return string Amount */ public function montantRemise($aMontantRemise=null) { @@ -415,7 +415,7 @@ public function montantRemise($aMontantRemise=null) * Getter for prix * * @param int $aPrix Price - * @return null|integer Stock + * @return string Stock */ public function prix ( $aPrix=null ) { diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index 3e6dfffdddb5a..7f8ceac853ef7 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -609,7 +609,7 @@ * @param Object $object Object we want to see categories it can be classified into * @param int $typeid Type of category (0, 1, 2, 3) * @param int $socid Id thirdparty - * @param integer $showclassifyform 1=Add form to 'Classify', 0=Do not show form to 'Classify' + * @param string $showclassifyform 1=Add form to 'Classify', 0=Do not show form to 'Classify' * @return int 0 */ function formCategory($db,$object,$typeid,$socid=0,$showclassifyform=1) diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 04f7fa0dacac9..915a141093368 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -327,7 +327,7 @@ function update($user='') * Delete a category from database * * @param User $user Object user that ask to delete - * @return integer + * @return void */ function delete($user) { @@ -980,7 +980,7 @@ function get_nb_categories() /** * Check if no category with same label already exists for this cat's parent or root and for this cat's type * - * @return integer 1 if already exist, 0 otherwise, -1 if error + * @return boolean 1 if already exist, 0 otherwise, -1 if error */ function already_exists() { diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php index 04ea49dc43ed1..8908b4e2a4688 100644 --- a/htdocs/comm/action/class/cactioncomm.class.php +++ b/htdocs/comm/action/class/cactioncomm.class.php @@ -100,7 +100,7 @@ function fetch($id) * @param int $active 1 or 0 to filter on event state active or not ('' by default = no filter) * @param string $idorcode 'id' or 'code' * @param string $excludetype Type to exclude - * @param integer $onlyautoornot Group list by auto events or not + * @param string $onlyautoornot Group list by auto events or not * @return array Array of all event types if OK, <0 if KO */ function liste_array($active='',$idorcode='id',$excludetype='',$onlyautoornot=0) diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php index 9bb1e8889f80a..717d7269fa269 100644 --- a/htdocs/comm/action/class/ical.class.php +++ b/htdocs/comm/action/class/ical.class.php @@ -257,7 +257,7 @@ function retun_key_value($text) * Parse RRULE return array * * @param string $value string - * @return string + * @return array */ function ical_rrule($value) { diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 3bf4c639122ff..5a70aa99cbc32 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -292,12 +292,12 @@ function insert_discount($idremise) * @param double $pu_ht Prix unitaire * @param double $qty Quantite * @param double $txtva Taux de tva - * @param integer $txlocaltax1 Local tax 1 rate - * @param integer $txlocaltax2 Local tax 2 rate + * @param double $txlocaltax1 Local tax 1 rate + * @param double $txlocaltax2 Local tax 2 rate * @param int $fk_product Id du produit/service predefini - * @param integer $remise_percent Pourcentage de remise de la ligne + * @param double $remise_percent Pourcentage de remise de la ligne * @param string $price_base_type HT or TTC - * @param integer $pu_ttc Prix unitaire TTC + * @param double $pu_ttc Prix unitaire TTC * @param int $info_bits Bits de type de lignes * @param int $type Type of line (product, service) * @param int $rang Position of line @@ -308,7 +308,7 @@ function insert_discount($idremise) * @param string $label ??? * @param int $date_start Start date of the line * @param int $date_end End date of the line - * @param integer $array_option extrafields array + * @param array $array_option extrafields array * @return int >0 if OK, <0 if KO * * @see add_product @@ -466,8 +466,8 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $f * @param double $qty Quantity * @param double $remise_percent Remise effectuee sur le produit * @param double $txtva Taux de TVA - * @param integer $txlocaltax1 Local tax 1 rate - * @param integer $txlocaltax2 Local tax 2 rate + * @param double $txlocaltax1 Local tax 1 rate + * @param double $txlocaltax2 Local tax 2 rate * @param string $desc Description * @param double $price_base_type HT ou TTC * @param int $info_bits Miscellaneous informations @@ -480,7 +480,7 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $f * @param int $type 0/1=Product/service * @param int $date_start Start date of the line * @param int $date_end End date of the line - * @param integer $array_option extrafields array + * @param array $array_option extrafields array * @return int 0 if OK, <0 if KO */ function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $desc='', $price_base_type='HT', $info_bits=0, $special_code=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=0, $pa_ht=0, $label='', $type=0, $date_start='', $date_end='', $array_option=0) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index b13e4dae42496..6c1b5eeed90e1 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -1037,14 +1037,14 @@ function createFromProposal($object) * @param double $pu_ht Unit price (without tax) * @param double $qty Quantite * @param double $txtva Taux de tva force, sinon -1 - * @param integer $txlocaltax1 Local tax 1 rate - * @param integer $txlocaltax2 Local tax 2 rate + * @param double $txlocaltax1 Local tax 1 rate + * @param double $txlocaltax2 Local tax 2 rate * @param int $fk_product Id du produit/service predefini - * @param integer $remise_percent Pourcentage de remise de la ligne + * @param double $remise_percent Pourcentage de remise de la ligne * @param int $info_bits Bits de type de lignes * @param int $fk_remise_except Id remise * @param string $price_base_type HT or TTC - * @param integer $pu_ttc Prix unitaire TTC + * @param double $pu_ttc Prix unitaire TTC * @param timestamp $date_start Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html) * @param timestamp $date_end End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html) * @param int $type Type of line (0=product, 1=service) @@ -1054,7 +1054,7 @@ function createFromProposal($object) * @param int $fk_fournprice Id supplier price * @param int $pa_ht Buying price (without tax) * @param string $label Label - * @param integer $array_option extrafields array + * @param array $array_option extrafields array * @return int >0 if OK, <0 if KO * * @see add_product @@ -1233,7 +1233,7 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $f * * @param int $idproduct Product Id * @param double $qty Quantity - * @param integer $remise_percent Product discount relative + * @param double $remise_percent Product discount relative * @param timestamp $date_start Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html) * @param timestamp $date_end End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html) * @return void @@ -2273,8 +2273,8 @@ function classer_facturee() * @param double $qty Quantity * @param double $remise_percent Pourcentage de remise de la ligne * @param double $txtva Taux TVA - * @param integer $txlocaltax1 Local tax 1 rate - * @param integer $txlocaltax2 Local tax 2 rate + * @param double $txlocaltax1 Local tax 1 rate + * @param double $txlocaltax2 Local tax 2 rate * @param string $price_base_type HT or TTC * @param int $info_bits Miscellaneous informations on line * @param timestamp $date_start Start date of the line @@ -2286,7 +2286,7 @@ function classer_facturee() * @param int $pa_ht Price (without tax) of product when it was bought * @param string $label Label * @param int $special_code Special code (also used by externals modules!) - * @param integer $array_option extrafields array + * @param array $array_option extrafields array * @return int < 0 if KO, > 0 if OK */ function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0,$txlocaltax2=0, $price_base_type='HT', $info_bits=0, $date_start='', $date_end='', $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_option=0) @@ -2932,7 +2932,7 @@ function update_extrafields($user) /** * Return an array of order lines * - * @return integer Lines of order + * @return array Lines of order */ function getLinesArray() { diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index 663acd15f6312..e50c7bb34f66b 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -1142,7 +1142,7 @@ function fetch($rowid,$ref='',$num='') /** * Delete transaction bank line record * - * @param integer $user User object that delete + * @param User $user User object that delete * @return int <0 if KO, >0 if OK */ function delete($user=0) @@ -1191,7 +1191,7 @@ function delete($user=0) /** * Delete bank line records * - * @param integer $user User object that delete + * @param User $user User object that delete * @return int <0 if KO, >0 if OK */ function delete_urls($user=0) diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php index f6e6adf2a04f1..a1bc0191175d5 100644 --- a/htdocs/compta/bank/class/bankcateg.class.php +++ b/htdocs/compta/bank/class/bankcateg.class.php @@ -168,7 +168,7 @@ function fetch($id) /** * Update database * - * @param integer $user User that modify + * @param User $user User that modify * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index 6bef070b22d9c..f6c0ab1a48146 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -401,11 +401,11 @@ function delete() * @param double $qty Quantite * @param double $txtva Taux de tva force, sinon -1 * @param int $fk_product Id du produit/service predefini - * @param integer $remise_percent Pourcentage de remise de la ligne + * @param double $remise_percent Pourcentage de remise de la ligne * @param string $price_base_type HT or TTC * @param int $info_bits Bits de type de lignes * @param int $fk_remise_except Id remise - * @param integer $pu_ttc Prix unitaire TTC (> 0 even for credit note) + * @param double $pu_ttc Prix unitaire TTC (> 0 even for credit note) * @param int $type Type of line (0=product, 1=service) * @param int $rang Position of line * @param int $special_code Special code diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 5f68e2a0263dc..7e5af4412804b 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1018,7 +1018,7 @@ function fetch_lines() /** * Update database * - * @param integer $user User that modify + * @param User $user User that modify * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ @@ -1885,17 +1885,17 @@ function set_draft($user,$idwarehouse=-1) * @param double $pu_ht Unit price without tax (> 0 even for credit note) * @param double $qty Quantity * @param double $txtva Force vat rate, -1 for auto - * @param integer $txlocaltax1 Local tax 1 rate - * @param integer $txlocaltax2 Local tax 2 rate + * @param double $txlocaltax1 Local tax 1 rate + * @param double $txlocaltax2 Local tax 2 rate * @param int $fk_product Id of predefined product/service - * @param integer $remise_percent Percent of discount on line + * @param double $remise_percent Percent of discount on line * @param timestamp $date_start Date start of service * @param timestamp $date_end Date end of service * @param int $ventil Code of dispatching into accountancy * @param int $info_bits Bits de type de lignes * @param int $fk_remise_except Id discount used * @param string $price_base_type 'HT' or 'TTC' - * @param integer $pu_ttc Unit price with tax (> 0 even for credit note) + * @param double $pu_ttc Unit price with tax (> 0 even for credit note) * @param int $type Type of line (0=product, 1=service) * @param int $rang Position of line * @param int $special_code Special code (also used by externals modules!) @@ -1905,7 +1905,7 @@ function set_draft($user,$idwarehouse=-1) * @param int $fk_fournprice Supplier price id (to calculate margin) or '' * @param int $pa_ht Buying price of line (to calculate margin) or '' * @param string $label Label of the line (deprecated, do not use) - * @param integer $array_option extrafields array + * @param array $array_option extrafields array * @return int <0 if KO, Id of line if OK */ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=self::TYPE_STANDARD, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='', $array_option=0) @@ -2068,8 +2068,8 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $f * @param date $date_start Date de debut de validite du service * @param date $date_end Date de fin de validite du service * @param double $txtva VAT Rate - * @param integer $txlocaltax1 Local tax 1 rate - * @param integer $txlocaltax2 Local tax 2 rate + * @param double $txlocaltax1 Local tax 1 rate + * @param double $txlocaltax2 Local tax 2 rate * @param string $price_base_type HT or TTC * @param int $info_bits Miscellaneous informations * @param int $type Type of line (0=product, 1=service) @@ -2079,7 +2079,7 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $f * @param int $pa_ht Price (without tax) of product when it was bought * @param string $label Label of the line (deprecated, do not use) * @param int $special_code Special code (also used by externals modules!) - * @param integer $array_option extrafields array + * @param array $array_option extrafields array * @return int < 0 if KO, > 0 if OK */ function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type= self::TYPE_STANDARD, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_option=0) diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php index b86e1328736d7..cdc935cde013c 100644 --- a/htdocs/compta/facture/class/paymentterm.class.php +++ b/htdocs/compta/facture/class/paymentterm.class.php @@ -257,7 +257,7 @@ function getDefaultId() /** * Update database * - * @param integer $user User that modify + * @param User $user User that modify * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php index fde25befbae40..72ce346abaddb 100644 --- a/htdocs/compta/localtax/class/localtax.class.php +++ b/htdocs/compta/localtax/class/localtax.class.php @@ -123,7 +123,7 @@ function create($user) /** * Update database * - * @param integer $user User that modify + * @param User $user User that modify * @param int $notrigger 0=no, 1=yes (no update trigger) * @return int <0 if KO, >0 if OK */ diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php index 7f5b8e737a40b..39b8f209247e7 100644 --- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php @@ -274,7 +274,7 @@ function create($user, $account_id, $limit, $toRemise) * Supprime la remise en base * * @param User $user Utilisateur qui effectue l'operation - * @return integer + * @return void */ function delete($user='') { diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index b9e82724eb836..60b056babf4e7 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -172,7 +172,6 @@ function AddFacture($facture_id, $client_id, $client_nom, $amount, $code_banque, * @param string $code_guichet code of bank's office * @param string $number bank account number * @param string $number_key number key of account number - * @param integer $line_id * @return int >0 if OK, <0 if KO */ function addline(&$line_id, $client_id, $client_nom, $amount, $code_banque, $code_guichet, $number, $number_key) @@ -248,7 +247,7 @@ function addline(&$line_id, $client_id, $client_nom, $amount, $code_banque, $cod * Read errors * * @param int $error id of error - * @return string Array of errors + * @return array Array of errors */ function ReadError($error) { @@ -1505,7 +1504,7 @@ function EnregDestinataire($rowid, $client_nom, $rib_banque, $rib_guichet, $rib_ * @param string $row_bic rib.bic AS bic, * @param string $row_datec soc.datec, * @param string $row_drum soc.rowid AS drum - * @return string + * @return void */ function EnregDestinataireSEPA($row_code_client, $row_nom, $row_address, $row_zip, $row_town, $row_country_code, $row_cb, $row_cg, $row_cc, $row_somme, $row_facnumber, $row_idfac, $row_iban, $row_bic, $row_datec, $row_drum) { @@ -1627,7 +1626,7 @@ function EnregEmetteur() * @param int $nombre 0 or 1 * @param float $total Total * @param string $CrLf End of line character - * @return string + * @return SEPA */ function EnregEmetteurSEPA($configuration, $ladate, $nombre, $total, $CrLf='\n') { // SEPA INITIALISATION diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php index 1e078ac8c79f2..9c4bf96e8b30c 100644 --- a/htdocs/compta/prelevement/class/ligneprelevement.class.php +++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php @@ -61,7 +61,7 @@ function __construct($db, $user) * Recupere l'objet prelevement * * @param int $rowid id de la facture a recuperer - * @return integer + * @return void */ function fetch($rowid) { diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php index 5ebd4542096ee..51f9a83ed3c7b 100644 --- a/htdocs/compta/prelevement/class/rejetprelevement.class.php +++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php @@ -317,7 +317,7 @@ private function getListInvoices() * Retrieve withdrawal object * * @param int $rowid id of invoice to retrieve - * @return integer + * @return void */ function fetch($rowid) { diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php index 9801c1d7cda5f..5e728b0cc6409 100644 --- a/htdocs/compta/salaries/class/paymentsalary.class.php +++ b/htdocs/compta/salaries/class/paymentsalary.class.php @@ -69,7 +69,7 @@ function __construct($db) /** * Update database * - * @param integer $user User that modify + * @param User $user User that modify * @param int $notrigger 0=no, 1=yes (no update trigger) * @return int <0 if KO, >0 if OK */ @@ -141,7 +141,7 @@ function update($user=0, $notrigger=0) * Load object in memory from database * * @param int $id id object - * @param integer $user User that load + * @param User $user User that load * @return int <0 if KO, >0 if OK */ function fetch($id, $user=0) diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index ad3833848d215..09e4ebaef0c1d 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -63,7 +63,7 @@ function __construct($db) * Retrouve et charge une charge sociale * * @param int $id 1 si trouve, 0 sinon - * @return integer|null + * @return void */ function fetch($id) { @@ -320,7 +320,7 @@ function set_paid($user) * Retourne le libelle du statut d'une charge (impaye, payee) * * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long - * @param integer $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) + * @param double $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) * @return string Label */ function getLibStatut($mode=0,$alreadypaid=-1) @@ -333,7 +333,7 @@ function getLibStatut($mode=0,$alreadypaid=-1) * * @param int $statut Id statut * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto - * @param integer $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) + * @param double $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) * @return string Label */ function LibStatut($statut,$mode=0,$alreadypaid=-1) diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php index 78d63fc2f71e8..972fa762b9677 100644 --- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php +++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php @@ -216,7 +216,7 @@ function fetch($id) /** * Update database * - * @param integer $user User that modify + * @param User $user User that modify * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php index f5a8c00b6d1d1..312da55f13892 100644 --- a/htdocs/compta/tva/class/tva.class.php +++ b/htdocs/compta/tva/class/tva.class.php @@ -139,7 +139,7 @@ function create($user) /** * Update database * - * @param integer $user User that modify + * @param User $user User that modify * @param int $notrigger 0=no, 1=yes (no update trigger) * @return int <0 if KO, >0 if OK */ @@ -202,7 +202,7 @@ function update($user=0, $notrigger=0) * Load object in memory from database * * @param int $id id object - * @param integer $user User that load + * @param User $user User that load * @return int <0 if KO, >0 if OK */ function fetch($id, $user=0) diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 24b33c3c7c84a..7858f81dcf9f4 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -215,7 +215,7 @@ function create($user) * Update informations into database * * @param int $id Id of contact/address to update - * @param integer $user Objet user making change + * @param User $user Objet user making change * @param int $notrigger 0=no, 1=yes * @param string $action Current action for hookmanager * @return int <0 if KO, >0 if OK @@ -424,7 +424,7 @@ function _load_ldap_info() * Update field alert birthday * * @param int $id Id of contact - * @param integer $user User asking to change alert or birthday + * @param User $user User asking to change alert or birthday * @return int <0 if KO, >=0 if OK */ function update_perso($id, $user=0) @@ -489,7 +489,7 @@ function update_perso($id, $user=0) * Load object contact * * @param int $id id du contact - * @param integer $user Utilisateur (abonnes aux alertes) qui veut les alertes de ce contact + * @param User $user Utilisateur (abonnes aux alertes) qui veut les alertes de ce contact * @return int -1 if KO, 0 if OK but not found, 1 if OK */ function fetch($id, $user=0) diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 1c0eeaa86b096..9c57ff9f5709c 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -953,7 +953,7 @@ function delete($user) /** * Update object into database * - * @param integer $user User that modifies + * @param User $user User that modifies * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ @@ -1061,7 +1061,7 @@ function update($user=0, $notrigger=0) * @param timestamp $date_start Date de debut prevue * @param timestamp $date_end Date de fin prevue * @param float $price_base_type HT or TTC - * @param integer $pu_ttc Prix unitaire TTC + * @param float $pu_ttc Prix unitaire TTC * @param int $info_bits Bits de type de lignes * @param int $fk_fournprice Fourn price id * @param int $pa_ht Buying price HT @@ -1218,8 +1218,8 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_pr * @param timestamp $date_start Date de debut prevue * @param timestamp $date_end Date de fin prevue * @param float $tvatx Taux TVA - * @param integer $localtax1tx Local tax 1 rate - * @param integer $localtax2tx Local tax 2 rate + * @param float $localtax1tx Local tax 1 rate + * @param float $localtax2tx Local tax 2 rate * @param timestamp $date_debut_reel Date de debut reelle * @param timestamp $date_fin_reel Date de fin reelle * @param float $price_base_type HT or TTC diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index 072a2fa7bbeb4..c16af4c5b2493 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -356,7 +356,7 @@ function __construct($subject,$to,$from,$msg, /** * Send mail that was prepared by constructor * - * @return string|boolean True if mail sent, false otherwise + * @return boolean True if mail sent, false otherwise */ function sendfile() { @@ -518,10 +518,6 @@ function sendfile() // Encode subject according to RFC 2822 - http://en.wikipedia.org/wiki/MIME#Encoded-Word - - /** - * @param string $stringtoencode - */ function encodetorfc2822($stringtoencode) { global $conf; @@ -645,7 +641,7 @@ function buildCSS() /** * Create SMTP headers (mode = 'mail') * - * @return string headers + * @return smtp headers */ function write_smtpheaders() { @@ -696,7 +692,7 @@ function write_smtpheaders() * * @param array $filename_list Array of filenames * @param array $mimefilename_list Array of mime types - * @return string mime headers + * @return array mime headers */ function write_mimeheaders($filename_list, $mimefilename_list) { diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index e6cfa7a3f55a7..882e0780ed4d3 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -207,7 +207,7 @@ function get_substitutionarray_thirdparty($object,$outputlangs) /** * Define array with couple subtitution key => subtitution value * - * @param Contact $object contact + * @param Object $object contact * @param Translate $outputlangs object for output * @param array_key $array_key Name of the key for return array * @return array of substitution key->code @@ -426,7 +426,7 @@ function get_substitutionarray_lines($line,$outputlangs) /** * Define array with couple substitution key => substitution value * - * @param Expedition $object Main object to use as data source + * @param Object $object Main object to use as data source * @param Translate $outputlangs Lang object to use for output * @param array_key $array_key Name of the key for return array * @return array Array of substitution diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php index 7563b71d9a49c..fdc4a35a58583 100644 --- a/htdocs/core/class/commoninvoice.class.php +++ b/htdocs/core/class/commoninvoice.class.php @@ -155,7 +155,7 @@ function getLibType() * Return label of object status * * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto - * @param integer $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) + * @param double $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) * @return string Label */ function getLibStatut($mode=0,$alreadypaid=-1) @@ -169,7 +169,7 @@ function getLibStatut($mode=0,$alreadypaid=-1) * @param int $paye Status field paye * @param int $status Id status * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto - * @param integer $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) + * @param double $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) * @param int $type Type facture * @return string Libelle du statut */ @@ -293,7 +293,7 @@ function LibStatut($paye,$status,$mode=0,$alreadypaid=-1,$type=0) * Renvoi une date limite de reglement de facture en fonction des * conditions de reglements de la facture et date de facturation * - * @param integer $cond_reglement Condition of payment (code or id) to use. If 0, we use current condition. + * @param string $cond_reglement Condition of payment (code or id) to use. If 0, we use current condition. * @return date Date limite de reglement si ok, <0 si ko */ function calculate_date_lim_reglement($cond_reglement=0) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 711152f79b40b..307164556c77d 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -476,8 +476,8 @@ function swapContactStatus($rowid) * * @param string $source 'internal', 'external' or 'all' * @param string $order Sort order by : 'code' or 'rowid' - * @param integer $option 0=Return array id->label, 1=Return array code->label - * @param integer $activeonly 0=all type of contact, 1=only the active + * @param string $option 0=Return array id->label, 1=Return array code->label + * @param string $activeonly 0=all type of contact, 1=only the active * @return array Array list of type of contacts (id->label if option=0, code->label if option=1) */ function liste_type_contact($source='internal', $order='code', $option=0, $activeonly=0) @@ -1117,7 +1117,7 @@ function setBankAccount($fk_account) * @param boolean $renum true to renum all already ordered lines, false to renum only not already ordered lines. * @param string $rowidorder ASC or DESC * @param boolean $fk_parent_line Table with fk_parent_line field or not - * @return integer|null + * @return void */ function line_order($renum=false, $rowidorder='ASC', $fk_parent_line=true) { @@ -2293,7 +2293,7 @@ function insertExtraFields() * * @param object $extrafields Extrafield Object * @param string $mode Show output (view) or input (edit) for extrafield - * @param integer $params Optionnal parameters + * @param array $params Optionnal parameters * @param string $keyprefix Prefix string to add into name and id of field (can be used to avoid duplicate names) * * @return string @@ -2525,7 +2525,7 @@ function getTotalDiscount() /** * Set extra parameters * - * @return integer + * @return void */ function setExtraParameters() { @@ -2612,7 +2612,7 @@ function isInEEC() * TODO Move this into html.class.php * But for the moment we don't know if it's possible as we keep a method available on overloaded objects. * - * @return integer|null + * @return void */ function showLinkedObjectBlock() { @@ -2731,7 +2731,7 @@ function formAddObjectLine($dateSelector,$seller,$buyer) * @param string $action Action code * @param string $seller Object of seller third party * @param string $buyer Object of buyer third party - * @param integer $selected Object line selected + * @param string $selected Object line selected * @param int $dateSelector 1=Show also date range input fields * @return void */ @@ -2829,8 +2829,8 @@ function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0 * @param int $dateSelector 1=Show also date range input fields * @param string $seller Object of seller third party * @param string $buyer Object of buyer third party - * @param integer $selected Object line selected - * @param integer $extrafieldsline Object of extrafield line attribute + * @param string $selected Object line selected + * @param object $extrafieldsline Object of extrafield line attribute * @return void */ function printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected=0,$extrafieldsline=0) @@ -3105,7 +3105,7 @@ function printOriginLine($line,$var) * get Margin info * * @param string $force_price True of not - * @return integer Array with info + * @return mixed Array with info */ function getMarginInfos($force_price=false) { diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php index 150d52fae62b1..bcca9fcfa73c2 100644 --- a/htdocs/core/class/cookie.class.php +++ b/htdocs/core/class/cookie.class.php @@ -109,7 +109,7 @@ function decryptCookie() * * @param string $cookie Cookie name * @param string $value Cookie value - * @param integer $expire Expiration + * @param string $expire Expiration * @param string $path Path of cookie * @param string $domain Domain name * @param int $secure 0 or 1 diff --git a/htdocs/core/class/cpays.class.php b/htdocs/core/class/cpays.class.php index e75746f2f6642..e75f8a75a1a9c 100644 --- a/htdocs/core/class/cpays.class.php +++ b/htdocs/core/class/cpays.class.php @@ -187,7 +187,7 @@ function fetch($id,$code='') /** * Update object into database * - * @param integer $user User that modify + * @param User $user User that modify * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php index 79a919658b6dd..eea64ed10ace4 100644 --- a/htdocs/core/class/ctypent.class.php +++ b/htdocs/core/class/ctypent.class.php @@ -194,7 +194,7 @@ function fetch($id,$code='') /** * Update object into database * - * @param integer $user User that modify + * @param User $user User that modify * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php index 17ea290137c38..6dc726b084e08 100644 --- a/htdocs/core/class/doleditor.class.php +++ b/htdocs/core/class/doleditor.class.php @@ -142,7 +142,7 @@ function __construct($htmlname,$content,$width='',$height=200,$toolbarname='Basi * * @param int $noprint 1=Return HTML string instead of printing it to output * @param string $morejs Add more js. For example: ".on( \'saveSnapshot\', function(e) { alert(\'ee\'); });" - * @return string|null + * @return void */ function Create($noprint=0,$morejs='') { diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php index 81c4b38510d9a..9844e6b74c98b 100644 --- a/htdocs/core/class/dolgeoip.class.php +++ b/htdocs/core/class/dolgeoip.class.php @@ -40,7 +40,7 @@ class DolGeoIP * * @param string $type 'country' or 'city' * @param string $datfile Data file - * @return integer|null + * @return GeoIP */ function __construct($type,$datfile) { diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php index afb42b82d8221..33888b057b736 100644 --- a/htdocs/core/class/dolgraph.class.php +++ b/htdocs/core/class/dolgraph.class.php @@ -115,7 +115,7 @@ function __construct() * Set Y precision * * @param float $which_prec Precision - * @return boolean + * @return string */ function SetPrecisionY($which_prec) { @@ -187,7 +187,7 @@ function SetHideYGrid($bool) * Set y label * * @param string $label Y label - * @return boolean|null True + * @return boolean True */ function SetYLabel($label) { @@ -198,7 +198,7 @@ function SetYLabel($label) * Set width * * @param int $w Width - * @return boolean|null True + * @return boolean True */ function SetWidth($w) { @@ -554,7 +554,7 @@ function GetCeilMaxValue() /** * Return min value of all data * - * @return double Max value of all data + * @return int Max value of all data */ function GetFloorMinValue() { @@ -578,7 +578,7 @@ function GetFloorMinValue() * * @param string $file Image file name to use to save onto disk (also used as javascript unique id) * @param string $fileurl Url path to show image if saved onto disk - * @return integer|null + * @return void */ function draw($file,$fileurl='') { diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php index 5fa639d15601f..ba4dcfb94f626 100644 --- a/htdocs/core/class/events.class.php +++ b/htdocs/core/class/events.class.php @@ -150,7 +150,7 @@ function create($user) /** * Update database * - * @param integer $user User that modify + * @param User $user User that modify * @param int $notrigger 0=no, 1=yes (no update trigger) * @return int <0 if KO, >0 if OK */ @@ -188,7 +188,7 @@ function update($user=0, $notrigger=0) * Load object in memory from database * * @param int $id Id object - * @param integer $user User that load + * @param User $user User that load * @return int <0 if KO, >0 if OK */ function fetch($id, $user=0) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 34ca247a96f98..c9aa1405ff727 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -102,7 +102,7 @@ function __construct($db) * @param int $unique Is field unique or not * @param int $required Is field required or not * @param string $default_value Defaulted value - * @param integer $param Params for field + * @param array $param Params for field * @return int <=0 if KO, >0 if OK */ function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0,$default_value='', $param=0) diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php index b17bf166dd477..520ab7634be6b 100644 --- a/htdocs/core/class/fileupload.class.php +++ b/htdocs/core/class/fileupload.class.php @@ -261,7 +261,7 @@ protected function getFileObjects() * * @param string $file_name Filename * @param string $options is array('max_width', 'max_height') - * @return boolean + * @return void */ protected function createScaledImage($file_name, $options) { @@ -296,7 +296,7 @@ protected function createScaledImage($file_name, $options) * @param string $file File * @param string $error Error * @param string $index Index - * @return boolean + * @return unknown|string */ protected function validate($uploaded_file, $file, $error, $index) { @@ -378,10 +378,10 @@ protected function upcountName($name) /** * Enter description here ... * - * @param string $name Filename - * @param string $type ??? - * @param string $index ??? - * @return string + * @param unknown_type $name Filename + * @param unknown_type $type ??? + * @param unknown_type $index ??? + * @return void */ protected function trimFileName($name, $type, $index) { @@ -408,7 +408,7 @@ protected function trimFileName($name, $type, $index) * Enter description here ... * * @param unknown_type $file_path ??? - * @return boolean Success or not + * @return int Success or not */ protected function orientImage($file_path) { diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index cf6ae5ed94175..010e023b2851f 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -468,7 +468,7 @@ function select_pays($selected='',$htmlname='country_id',$htmloption='') * @param string $selected Id or Code or Label of preselected country * @param string $htmlname Name of html select object * @param string $htmloption Options html on select object - * @param integer $maxlength Max length for labels (0=no limit) + * @param string $maxlength Max length for labels (0=no limit) * @return string HTML string with select */ function select_country($selected='',$htmlname='country_id',$htmloption='',$maxlength=0) @@ -544,7 +544,7 @@ function select_country($selected='',$htmlname='country_id',$htmloption='',$maxl * @param string $htmlname Name of field in html form * @param int $showempty Add an empty field * @param int $hidetext Do not show label 'Type' before combo box (used only if there is at least 2 choices to select) - * @param integer $forceall 1=Force to show products and services in combo list, whatever are activated modules, 0=No force, -1=Force none (and set hidden field to 'service') + * @param string $forceall 1=Force to show products and services in combo list, whatever are activated modules, 0=No force, -1=Force none (and set hidden field to 'service') * @return void */ function select_type_of_lines($selected='',$htmlname='type',$showempty=0,$hidetext=0,$forceall=0) @@ -947,9 +947,9 @@ function select_remises($selected, $htmlname, $filter, $socid, $maxvalue=0) * @param int $showempty 0=no empty value, 1=add an empty value * @param string $exclude List of contacts id to exclude * @param string $limitto Disable answers that are not id in this array list - * @param integer $showfunction Add function into label + * @param string $showfunction Add function into label * @param string $moreclass Add more class to class style - * @param integer $showsoc Add company into label + * @param string $showsoc Add company into label * @param int $forcecombo Force to use combo box * @param array $events Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled'))) * @param bool $options_only Return options only (for ajax treatment) @@ -970,10 +970,10 @@ function select_contacts($socid,$selected='',$htmlname='contactid',$showempty=0, * @param int $showempty 0=no empty value, 1=add an empty value, 2=add line 'Internal' (used by user edit) * @param string $exclude List of contacts id to exclude * @param string $limitto Disable answers that are not id in this array list - * @param integer $showfunction Add function into label + * @param string $showfunction Add function into label * @param string $moreclass Add more class to class style * @param bool $options_only Return options only (for ajax treatment) - * @param integer $showsoc Add company into label + * @param string $showsoc Add company into label * @param int $forcecombo Force to use combo box * @param array $events Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled'))) * @return int <0 if KO, Nb of contact in list if OK @@ -1907,7 +1907,7 @@ function select_produits_fournisseurs_list($socid,$selected='',$htmlname='produc * * @param int $productid Id of product * @param string $htmlname Name of HTML field - * @return string|null + * @return void */ function select_product_fourn_price($productid,$htmlname='productfournpriceid') { @@ -2001,7 +2001,7 @@ function select_product_fourn_price($productid,$htmlname='productfournpriceid') * @param int $socid Id of company * @param string $htmlname Name of HTML field * @param int $showempty Add an empty field - * @return integer|null + * @return void */ function select_address($selected, $socid, $htmlname='address_id',$showempty=0) { @@ -2286,7 +2286,7 @@ function load_cache_types_paiements() * * @param string $selected Id du type de paiement pre-selectionne * @param string $htmlname Nom de la zone select - * @param integer $filtertype Pour filtre + * @param string $filtertype Pour filtre * @param int $addempty Ajoute entree vide * @return void */ @@ -2389,7 +2389,7 @@ function select_PriceBaseType($selected='',$htmlname='price_base_type') * * @param string $selected Id pre-selectionne * @param string $htmlname Nom de la zone select - * @return string + * @return void */ function load_PriceBaseType($selected='',$htmlname='price_base_type') { @@ -2527,7 +2527,7 @@ function formSelectAccount($page, $selected='', $htmlname='fk_account', $addempt * @param string $htmlname HTML field name * @param int $maxlength Maximum length for labels * @param int $excludeafterid Exclude all categories after this leaf in category tree. - * @return string + * @return void */ function select_all_categories($type, $selected='', $htmlname="parent", $maxlength=64, $excludeafterid=0) { @@ -3299,7 +3299,7 @@ function select_currency($selected='',$htmlname='currency_id') * * @param string $selected preselected currency code * @param string $htmlname name of HTML select list - * @return string + * @return void */ function selectCurrency($selected='',$htmlname='currency_id') { @@ -3398,7 +3398,7 @@ function load_cache_vatrates($country_code) * Si vendeur et acheteur dans Communauté européenne et acheteur= entreprise alors TVA par défaut=0. Fin de règle. * Sinon la TVA proposee par defaut=0. Fin de regle. * @param bool $options_only Return options only (for ajax treatment) - * @return string + * @return void */ function load_tva($htmlname='tauxtva', $selectedrate='', $societe_vendeuse='', $societe_acheteuse='', $idprod=0, $info_bits=0, $type='', $options_only=false) { @@ -3550,7 +3550,7 @@ function load_tva($htmlname='tauxtva', $selectedrate='', $societe_vendeuse='', $ * @param int $nooutput Do not output html string but return it * @param int $disabled Disable input fields * @param int $fullday When a checkbox with this html name is on, hour and day are set with 00:00 or 23:59 - * @return string|null Nothing or string if nooutput is 1 + * @return mixed Nothing or string if nooutput is 1 * @see form_date */ function select_date($set_time='', $prefix='re', $h=0, $m=0, $empty=0, $form_name="", $d=1, $addnowbutton=0, $nooutput=0, $disabled=0, $fullday='') @@ -3777,7 +3777,7 @@ function select_date($set_time='', $prefix='re', $h=0, $m=0, $empty=0, $form_nam * @param int $iSecond Default preselected duration (number of seconds) * @param int $disabled Disable the combo box * @param string $typehour If 'select' then input hour and input min is a combo, if 'text' input hour is in text and input min is a combo - * @param integer $minunderhours If 1, show minutes selection under the hours + * @param string $minunderhours If 1, show minutes selection under the hours * @return void */ function select_duration($prefix, $iSecond='', $disabled=0, $typehour='select', $minunderhours=0) @@ -3977,7 +3977,7 @@ function multiselectarray($htmlname, $array, $selected=array(), $key_in_label=0, * @param string $value Pre-selected value * @param int $option 0 return yes/no, 1 return 1/0 * @param bool $disabled true or false - * @return string See option + * @return mixed See option */ function selectyesno($htmlname,$value='',$option=0,$disabled=false) { @@ -4072,7 +4072,7 @@ function select_export_model($selected='',$htmlname='exportmodelid',$type='',$us * @param string $morehtmlref Code html supplementaire a afficher apres ref * @param string $moreparam More param to add in nav link url. * @param int $nodbprefix Do not include DB prefix to forge table name - * @return string Portion HTML avec ref + boutons nav + * @return tring Portion HTML avec ref + boutons nav */ function showrefnav($object,$paramid,$morehtml='',$shownav=1,$fieldid='rowid',$fieldref='ref',$morehtmlref='',$moreparam='',$nodbprefix=0) { @@ -4235,7 +4235,7 @@ function showphoto($modulepart,$object,$width=100) * @param string $include Array list of groups id to include * @param int $enableonly Array list of groups id to be enabled. All other must be disabled * @param int $force_entity 0 or Id of environment to force - * @return string + * @return void * @see select_dolusers */ function select_dolgroups($selected='', $htmlname='groupid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity=0) diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php index b35e290e9d555..ed32fcc9f0dfb 100644 --- a/htdocs/core/class/html.formactions.class.php +++ b/htdocs/core/class/html.formactions.class.php @@ -52,8 +52,8 @@ function __construct($db) * @param string $selected Preselected value (-1..100) * @param int $canedit 1=can edit, 0=read only * @param string $htmlname Name of html prefix for html fields (selectX and valX) - * @param integer $showempty Show an empty line if select is used - * @param integer $onlyselect 0=Standard, 1=Hide percent of completion and force usage of a select list, 2=Same than 1 and add "Incomplete (Todo+Running) + * @param string $showempty Show an empty line if select is used + * @param string $onlyselect 0=Standard, 1=Hide percent of completion and force usage of a select list, 2=Same than 1 and add "Incomplete (Todo+Running) * @return void */ function form_select_status_action($formname,$selected,$canedit=1,$htmlname='complete',$showempty=0,$onlyselect=0) @@ -229,7 +229,7 @@ function showactions($object,$typeelement,$socid=0,$forceshowtitle=0) * @param string $selected Type pre-selected (can be 'manual', 'auto' or 'AC_xxx' * @param string $htmlname Nom champ formulaire * @param string $excludetype Type to exclude - * @param integer $onlyautoornot Group list by auto events or not: We keep only the 2 generic lines (AC_OTH and AC_OTH_AUTO) + * @param string $onlyautoornot Group list by auto events or not: We keep only the 2 generic lines (AC_OTH and AC_OTH_AUTO) * @param int $hideinfohelp 1=Do not show info help * @return void */ diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php index b632bda4b80fb..f7a6154706f4c 100644 --- a/htdocs/core/class/html.formadmin.class.php +++ b/htdocs/core/class/html.formadmin.class.php @@ -50,7 +50,7 @@ function __construct($db) * @param string $selected Langue pre-selectionnee * @param string $htmlname Nom de la zone select * @param int $showauto Affiche choix auto - * @param integer $filter Array of keys to exclude in list + * @param array $filter Array of keys to exclude in list * @param int $showempty Add empty value * @param int $showwarning Show a warning if language is not complete * @return string Return HTML select string with list of languages @@ -114,7 +114,7 @@ function select_language($selected='',$htmlname='lang_id',$showauto=0,$filter=0, * @param string $htmlname Name of html select * @param array $dirmenuarray Array of directories to scan * @param string $moreattrib More attributes on html select tag - * @return integer|null + * @return void */ function select_menu($selected, $htmlname, $dirmenuarray, $moreattrib='') { @@ -324,7 +324,7 @@ function select_timezone($selected,$htmlname) * * @param string $selected Paper format pre-selected * @param string $htmlname Name of HTML select field - * @param integer $filter Value to filter on code + * @param string $filter Value to filter on code * @param int $showempty Add empty value * @return string Return HTML output */ diff --git a/htdocs/core/class/html.formbank.class.php b/htdocs/core/class/html.formbank.class.php index c666c759fadc9..647688bb64120 100644 --- a/htdocs/core/class/html.formbank.class.php +++ b/htdocs/core/class/html.formbank.class.php @@ -44,7 +44,7 @@ public function __construct($db) /** * Retourne la liste des types de comptes financiers * - * @param integer $selected Type pre-selectionne + * @param string $selected Type pre-selectionne * @param string $htmlname Nom champ formulaire * @return void */ diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php index ad0064b0a98a3..fd7db5fa94fce 100644 --- a/htdocs/core/class/html.formcompany.class.php +++ b/htdocs/core/class/html.formcompany.class.php @@ -207,7 +207,7 @@ function select_departement($selected='',$country_codeid=0, $htmlname='state_id' * Ainsi les liens avec les departements se font sur un departement independemment de son nom. * * @param string $selected Code state preselected (mus be state id) - * @param integer $country_codeid Country code or id: 0=list for all countries, otherwise country code or country rowid to show + * @param string $country_codeid Country code or id: 0=list for all countries, otherwise country code or country rowid to show * @param string $htmlname Id of department * @return string String with HTML select */ @@ -413,7 +413,7 @@ function select_civility($selected='',$htmlname='civility_id') * Dans le cas d'une liste tous pays confondu, on affiche une rupture sur le pays. * * @param string $selected Code forme juridique a pre-selectionne - * @param integer $country_codeid 0=liste tous pays confondus, sinon code du pays a afficher + * @param mixed $country_codeid 0=liste tous pays confondus, sinon code du pays a afficher * @param string $filter Add a SQL filter on list * @return void * @deprecated Use print xxx->select_juridicalstatus instead @@ -711,7 +711,7 @@ function selectTypeContact($object, $selected, $htmlname = 'type', $source='inte * @param string $fields Fields * @param int $fieldsize Field size * @param int $disableautocomplete 1 To disable autocomplete features - * @return string + * @return void */ function select_ziptown($selected='', $htmlname='zipcode', $fields='', $fieldsize=0, $disableautocomplete=0) { diff --git a/htdocs/core/class/html.formcron.class.php b/htdocs/core/class/html.formcron.class.php index 35ff7388293ef..bce8d9f041e7e 100644 --- a/htdocs/core/class/html.formcron.class.php +++ b/htdocs/core/class/html.formcron.class.php @@ -46,8 +46,8 @@ function __construct($db) * Display On Off selector * * @param string $htmlname Html control name - * @param integer $selected selected value - * @param integer $readonly Select is read only or not + * @param string $selected selected value + * @param string $readonly Select is read only or not * @return string HTML select field */ function select_typejob($htmlname,$selected=0,$readonly=0) diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 28b0c1c454082..6e764941d314e 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -62,9 +62,9 @@ function __construct($db) * @param int $size Length of input file area * @param Object $object Object to use (when attachment is done on an element) * @param string $options Add an option column - * @param integer $useajax Use fileupload ajax (0=never, 1=if enabled, 2=always whatever is option). 2 should never be used. + * @param boolean $useajax Use fileupload ajax (0=never, 1=if enabled, 2=always whatever is option). 2 should never be used. * @param string $savingdocmask Mask to use to define output filename. For example 'XXXXX-__YYYYMMDD__-__file__' - * @param integer $linkfiles 1=Also add form to link files, 0=Do not show form to link files + * @param string $linkfiles 1=Also add form to link files, 0=Do not show form to link files * @param string $htmlname Name and id of HTML form * @return int <0 if KO, >0 if OK */ @@ -215,11 +215,11 @@ function form_attach_new_file($url, $title='', $addcancel=0, $sectionid=0, $perm * @param int $genallowed Generation is allowed (1/0 or array of formats) * @param int $delallowed Remove is allowed (1/0) * @param string $modelselected Model to preselect by default - * @param integer $allowgenifempty Show warning if no model activated - * @param integer $forcenomultilang Do not show language option (even if MAIN_MULTILANGS defined) + * @param string $allowgenifempty Show warning if no model activated + * @param string $forcenomultilang Do not show language option (even if MAIN_MULTILANGS defined) * @param int $iconPDF Show only PDF icon with link (1/0) * @param int $maxfilenamelength Max length for filename shown - * @param integer $noform Do not output html form tags + * @param string $noform Do not output html form tags * @param string $param More param on http links * @param string $title Title to show on top of form * @param string $buttonlabel Label on submit button @@ -244,11 +244,11 @@ function show_documents($modulepart,$modulesubdir,$filedir,$urlsource,$genallowe * @param int $genallowed Generation is allowed (1/0 or array list of templates) * @param int $delallowed Remove is allowed (1/0) * @param string $modelselected Model to preselect by default - * @param integer $allowgenifempty Allow generation even if list of template ($genallowed) is empty (show however a warning) - * @param integer $forcenomultilang Do not show language option (even if MAIN_MULTILANGS defined) + * @param string $allowgenifempty Allow generation even if list of template ($genallowed) is empty (show however a warning) + * @param string $forcenomultilang Do not show language option (even if MAIN_MULTILANGS defined) * @param int $iconPDF Obsolete, see getDocumentsLink * @param int $maxfilenamelength Max length for filename shown - * @param integer $noform Do not output html form tags + * @param string $noform Do not output html form tags * @param string $param More param on http links * @param string $title Title to show on top of form * @param string $buttonlabel Label on submit button diff --git a/htdocs/core/class/html.formmailing.class.php b/htdocs/core/class/html.formmailing.class.php index 93fdac553a3a0..98a76c8468615 100644 --- a/htdocs/core/class/html.formmailing.class.php +++ b/htdocs/core/class/html.formmailing.class.php @@ -48,7 +48,7 @@ function __construct($db) * * @param string $selectedid the selected id * @param string $htmlname name of controm - * @param integer $show_empty show empty option + * @param number $show_empty show empty option * @return string HTML select */ public function selectDestinariesStatus($selectedid='',$htmlname='dest_status', $show_empty=0) { diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php index b267e14b1dddd..5ea5b33c1f463 100644 --- a/htdocs/core/class/html.formorder.class.php +++ b/htdocs/core/class/html.formorder.class.php @@ -102,7 +102,7 @@ function selectSourcesCommande($selected='',$htmlname='source_id',$addempty=0) * @param string $selected Id of preselected input method * @param string $htmlname Name of HTML select list * @param int $addempty 0=list with no empty value, 1=list with empty value - * @return integer Tableau des sources de commandes + * @return array Tableau des sources de commandes */ function selectInputMethod($selected='',$htmlname='source_id',$addempty=0) { diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index 9cbe4418bbe0c..ab924d482a742 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -157,7 +157,7 @@ function select_import_model($selected='',$htmlname='importmodelid',$type='',$us * * @param string $selected Preselected ecotaxes * @param string $htmlname Name of combo list - * @return integer + * @return void */ function select_ecotaxes($selected='',$htmlname='ecotaxe_id') { @@ -268,7 +268,7 @@ function select_revenue_stamp($selected='',$htmlname='revenuestamp',$country_cod /** * Return a HTML select list to select a percent * - * @param integer $selected pourcentage pre-selectionne + * @param string $selected pourcentage pre-selectionne * @param string $htmlname nom de la liste deroulante * @param int $disabled Disabled or not * @param int $increment increment value @@ -303,7 +303,7 @@ function select_percent($selected=0,$htmlname='percent',$disabled=0,$increment=5 * Return select list for categories (to use in form search selectors) * * @param int $type Type of categories (0=product, 1=suppliers, 2=customers, 3=members) - * @param integer $selected Preselected value + * @param string $selected Preselected value * @param string $htmlname Name of combo list * @param int $nocateg Show also an entry "Not categorized" * @return string Html combo list code @@ -469,7 +469,6 @@ function selectProjectTasks($selectedtask='', $projectid=0, $htmlname='task_pare * @param int $selectedtask Id selected task * @param int $selectedproject Id selected project * @param int $disablechildoftaskid 1=Disable task that are child of the provided task id - * @param integer $inc * @return void */ private function _pLineSelect(&$inc, $parent, $lines, $level=0, $selectedtask=0, $selectedproject=0, $disablechildoftaskid=0) @@ -580,7 +579,7 @@ function select_color($set_color='', $prefix='f_color', $form_name='objForm', $s * @param int $showcolorbox 1=Show color code and color box, 0=Show only color code * @param array $arrayofcolors Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813') * @param string $morecss Add css style into input field - * @return string + * @return void */ function selectColor($set_color='', $prefix='f_color', $form_name='objForm', $showcolorbox=1, $arrayofcolors='', $morecss='') { @@ -710,7 +709,7 @@ function CreateColorIcon($color,$module,$name,$x='12',$y='12') * @param string $selected Preselected value * @param string $htmlname Nom de la zone select * @param int $useempty Affiche valeur vide dans liste - * @return string + * @return void */ function select_dayofweek($selected='',$htmlname='weekid',$useempty=0) { @@ -751,7 +750,7 @@ function select_dayofweek($selected='',$htmlname='weekid',$useempty=0) * @param string $selected Preselected value * @param string $htmlname Nom de la zone select * @param int $useempty Affiche valeur vide dans liste - * @return string + * @return void */ function select_month($selected='',$htmlname='monthid',$useempty=0) { @@ -811,7 +810,7 @@ function select_year($selected='',$htmlname='yearid',$useempty=0, $min_year=10, * @param int $offset Offset * @param int $invert Invert * @param string $option Option - * @return string + * @return void */ function selectyear($selected='',$htmlname='yearid',$useempty=0, $min_year=10, $max_year=5, $offset=0, $invert=0, $option='') { diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php index 03020d12f99ea..30eeca5a486a1 100644 --- a/htdocs/core/class/ldap.class.php +++ b/htdocs/core/class/ldap.class.php @@ -345,7 +345,7 @@ function getVersion() /** * Change ldap protocol version to use. * - * @return boolean version + * @return string version */ function setVersion() { // LDAP_OPT_PROTOCOL_VERSION est une constante qui vaut 17 @@ -356,7 +356,7 @@ function setVersion() { /** * changement du referrals. * - * @return boolean referrals + * @return string referrals */ function setReferrals() { // LDAP_OPT_REFERRALS est une constante qui vaut ? @@ -1308,7 +1308,7 @@ function parseSAT($samtype) * Convertit le temps ActiveDirectory en Unix timestamp * * @param string $value AD time to convert - * @return integer Unix timestamp + * @return string Unix timestamp */ function convert_time($value) { diff --git a/htdocs/core/class/menu.class.php b/htdocs/core/class/menu.class.php index dff357d8f91c0..411158dea8466 100644 --- a/htdocs/core/class/menu.class.php +++ b/htdocs/core/class/menu.class.php @@ -53,7 +53,7 @@ function clear() * * @param string $url Url to follow on click * @param string $titre Label of menu to add - * @param integer $level Level of menu to add + * @param string $level Level of menu to add * @param int $enabled Menu active or not (0=Not active, 1=Active, 2=Active but grey) * @param string $target Target lien * @param string $mainmenu Main menu ('home', 'companies', 'products', ...) @@ -71,7 +71,7 @@ function add($url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftme * @param int $idafter Array key after which inserting new entry * @param string $url Url to follow on click * @param string $titre Label of menu to add - * @param integer $level Level of menu to add + * @param string $level Level of menu to add * @param int $enabled Menu active or not * @param string $target Target lien * @param string $mainmenu Main menu ('home', 'companies', 'products', ...) diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php index 256eec469c75e..aa43c545c8d52 100644 --- a/htdocs/core/class/menubase.class.php +++ b/htdocs/core/class/menubase.class.php @@ -71,7 +71,7 @@ function __construct($db,$menu_handler='') /** * Create menu entry into database * - * @param integer $user User that create + * @param User $user User that create * @return int <0 if KO, Id of record if OK */ function create($user=0) @@ -181,7 +181,7 @@ function create($user=0) /** * Update menu entry into database. * - * @param integer $user User that modify + * @param User $user User that modify * @param int $notrigger 0=no, 1=yes (no update trigger) * @return int <0 if KO, >0 if OK */ @@ -247,7 +247,7 @@ function update($user=0, $notrigger=0) * Load object in memory from database * * @param int $id Id object - * @param integer $user User that load + * @param User $user User that load * @return int <0 if KO, >0 if OK */ function fetch($id, $user=0) diff --git a/htdocs/core/class/openid.class.php b/htdocs/core/class/openid.class.php index 29ad98cc204ab..5165dcb4994a3 100644 --- a/htdocs/core/class/openid.class.php +++ b/htdocs/core/class/openid.class.php @@ -150,7 +150,7 @@ function SetIdentity($a) /** * GetIdentity * - * @return string + * @return void */ function GetIdentity() { // Get Identity @@ -187,7 +187,7 @@ function ErrorStore($code, $desc = null) /** * IsError * - * @return boolean + * @return void */ function IsError() { @@ -225,7 +225,7 @@ function splitResponse($response) * OpenID_Standarize * * @param string $openid_identity Server - * @return string + * @return void */ function OpenID_Standarize($openid_identity = null) { @@ -283,9 +283,6 @@ function FSOCK_Request($url, $method="GET", $params = "") } } - /** - * @param string $url - */ function CURL_Request($url, $method="GET", $params = "") { // Remember, SSL MUST BE SUPPORTED if (is_array($params)) $params = $this->array2url($params); @@ -359,7 +356,7 @@ function GetOpenIDServer($url='') /** * GetRedirectURL * - * @return string + * @return void */ function GetRedirectURL() { @@ -403,7 +400,7 @@ function Redirect() /** * ValidateWithServer * - * @return boolean + * @return void */ function ValidateWithServer() { diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php index c68cf4002f561..80ca1b155b777 100644 --- a/htdocs/core/class/rssparser.class.php +++ b/htdocs/core/class/rssparser.class.php @@ -151,7 +151,7 @@ public function getDescription() /** * getLastFetchDate * - * @return integer + * @return string */ public function getLastFetchDate() { diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php index cfc502c423908..61a098330c211 100644 --- a/htdocs/core/class/smtps.class.php +++ b/htdocs/core/class/smtps.class.php @@ -362,7 +362,7 @@ function _server_connect() /** * Attempt mail server authentication for a secure connection * - * @return boolean|null $_retVal Boolean indicating success or failure of authentication + * @return mixed $_retVal Boolean indicating success or failure of authentication */ function _server_authenticate() { @@ -399,7 +399,7 @@ function _server_authenticate() * * @param boolean $_bolTestMsg whether to run this method in 'Test' mode. * @param boolean $_bolDebug whether to log all communication between this Class and the Mail Server. - * @return boolean|null void + * @return mixed void * $_strMsg If this is run in 'Test' mode, the actual message structure will be returned */ function sendMsg($_bolTestMsg = false, $_bolDebug = false) @@ -499,7 +499,7 @@ function sendMsg($_bolTestMsg = false, $_bolDebug = false) * defined. * * @param mixed $_strConfigPath path to config file or VOID - * @return boolean + * @return void */ function setConfig ( $_strConfigPath = null ) { @@ -573,7 +573,7 @@ function getTransportType() * Path to the sendmail execuable * * @param string $_path Path to the sendmail execuable - * @return boolean + * @return void * */ function setMailPath($_path) @@ -949,8 +949,8 @@ function get_RCPT_list() /** * Returns an array of addresses for a specific type; TO, CC or BCC * - * @param string $_which Which collection of adresses to return - * @return string|false Array of emaill address + * @param mixed $_which Which collection of adresses to return + * @return array Array of emaill address */ function get_email_list($_which = null) { @@ -1000,7 +1000,7 @@ function get_email_list($_which = null) /** * TO Address[es] inwhich to send mail to * - * @param string $_addrTo TO Address[es] inwhich to send mail to + * @param mixed $_addrTo TO Address[es] inwhich to send mail to * @return void */ function setTO($_addrTo) @@ -1370,7 +1370,7 @@ function setImageInline($strContent, $strImageName = 'unknown', $strMimeType = ' * - [2] Private * - [3] Company Confidential * - * @param integer $_value Message Sensitivity + * @param string $_value Message Sensitivity * @return void */ function setSensitivity($_value = 0) @@ -1405,7 +1405,7 @@ function getSensitivity() * - [4] 'Low' * - [5] 'Lowest' * - * @param integer $_value Message Priority + * @param string $_value Message Priority * @return void */ function setPriority ( $_value = 3 ) @@ -1425,7 +1425,7 @@ function setPriority ( $_value = 3 ) * - [4] 'Low' * - [5] 'Lowest' * - * @return string + * @return void */ function getPriority() { @@ -1448,7 +1448,7 @@ function setMD5flag($_flag = false) /** * Gets flag which determines whether to calculate message MD5 checksum. * - * @return boolean Message Priority + * @return string Message Priority */ function getMD5flag() { @@ -1472,7 +1472,7 @@ function setXheader($strXdata) /** * Retrieves the Message X-Header Content * - * @return string[] $_msgContent Message X-Header Content + * @return string $_msgContent Message X-Header Content */ function getXheader() { @@ -1546,7 +1546,7 @@ function server_parse($socket, $response) * @param string $_strSend String to send * @param string $_returnCode Return code * @param string $CRLF CRLF - * @return boolean|null True or false + * @return boolean True or false */ function socket_send_str( $_strSend, $_returnCode = null, $CRLF = "\r\n" ) { diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index 2b00c74568a40..f86681f5c7677 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -154,7 +154,7 @@ function getDefaultLang($mode=0) * If $domain is "file@module" instead of "file" then we look for module lang file * in htdocs/custom/modules/mymodule/langs/code_CODE/file.lang * then in htdocs/module/langs/code_CODE/file.lang instead of htdocs/langs/code_CODE/file.lang - * @param integer $alt 0 (try xx_ZZ then 1), 1 (try xx_XX then 2), 2 (try en_US or fr_FR or es_ES) + * @param string $alt 0 (try xx_ZZ then 1), 1 (try xx_XX then 2), 2 (try en_US or fr_FR or es_ES) * @param int $stopafterdirection Stop when the DIRECTION tag is found (optimize speed) * @param int $forcelangdir To force a different lang directory * @return int <0 if KO, 0 if already loaded or loading not required, >0 if OK @@ -543,7 +543,7 @@ function convToOutputCharset($str,$pagecodefrom='UTF-8') * Return list of all available languages * * @param string $langdir Directory to scan - * @param integer $maxlength Max length for each value in combo box (will be truncated) + * @param string $maxlength Max length for each value in combo box (will be truncated) * @param int $usecode Show code instead of country name for language variant * @return array List of languages */ @@ -578,7 +578,7 @@ function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0,$usecod * Return if a filename $filename exists for current language (or alternate language) * * @param string $filename Language filename to search - * @param integer $searchalt Search also alernate language file + * @param string $searchalt Search also alernate language file * @return boolean true if exists and readable */ function file_exists($filename,$searchalt=0) @@ -714,7 +714,7 @@ function getCurrencyAmount($currency_code, $amount) * Return a currency code into its symbol * * @param string $currency_code Currency code - * @param integer $forceloadall 1=Force to load all currencies into cache. We know we need to use all of them. By default read and cache only required currency. + * @param string $forceloadall 1=Force to load all currencies into cache. We know we need to use all of them. By default read and cache only required currency. * @return string Currency symbol encoded into UTF8 */ function getCurrencySymbol($currency_code, $forceloadall=0) diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php index bc9f9081a4946..512aa011d986c 100644 --- a/htdocs/core/class/vcard.class.php +++ b/htdocs/core/class/vcard.class.php @@ -306,7 +306,7 @@ function setURL($url, $type="") /** * permet d'obtenir une vcard * - * @return string + * @return void */ function getVCard() { diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php index 0001bec05143f..7e0333bc5aa0c 100644 --- a/htdocs/core/datepicker.php +++ b/htdocs/core/datepicker.php @@ -119,7 +119,7 @@ * Convert date to timestamp * * @param string $mysqldate Date YYYMMDD - * @return integer Timestamp + * @return timestamp Timestamp */ function xyzToUnixTimestamp($mysqldate) { diff --git a/htdocs/core/db/Database.interface.php b/htdocs/core/db/Database.interface.php index cd607a72b58f7..8b5f2c86810ce 100644 --- a/htdocs/core/db/Database.interface.php +++ b/htdocs/core/db/Database.interface.php @@ -137,8 +137,8 @@ function lastquery(); /** * Define sort criteria of request * - * @param integer $sortfield List of sort fields - * @param integer $sortorder Sort order + * @param string $sortfield List of sort fields + * @param string $sortorder Sort order * @return string String to provide syntax of a sort sql string */ function order($sortfield = 0, $sortorder = 0); @@ -216,7 +216,7 @@ function query($query, $usesavepoint = 0, $type = 'auto'); * @param string $login login * @param string $passwd password * @param string $name name of database (not used for mysql, used for pgsql) - * @param integer $port Port of database server + * @param string $port Port of database server * @return resource Database access handler * @see close */ @@ -421,7 +421,7 @@ function DDLInfoTable($table); /** * Free last resultset used. * - * @param integer $resultset Curseur de la requete voulue + * @param resource $resultset Curseur de la requete voulue * @return void */ function free($resultset = 0); diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php index 179eb81fefc69..aa0792c5970ad 100644 --- a/htdocs/core/db/DoliDB.class.php +++ b/htdocs/core/db/DoliDB.class.php @@ -223,8 +223,8 @@ function lastquery() /** * Define sort criteria of request * - * @param integer $sortfield List of sort fields - * @param integer $sortorder Sort order + * @param string $sortfield List of sort fields + * @param string $sortorder Sort order * @return string String to provide syntax of a sort sql string */ function order($sortfield=0,$sortorder=0) @@ -266,7 +266,7 @@ function lasterror() * * @param string $string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS) * @param int $gm 1=Input informations are GMT values, otherwise local to server TZ - * @return integer Date TMS + * @return date Date TMS */ function jdate($string, $gm=false) { diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php index c03baa2b04c20..d0b454168df44 100644 --- a/htdocs/core/db/mssql.class.php +++ b/htdocs/core/db/mssql.class.php @@ -155,7 +155,7 @@ function select_db($database) * @param string $login login * @param string $passwd password * @param string $name name of database (not used for mysql, used for pgsql) - * @param integer $port Port of database server + * @param string $port Port of database server * @return resource Database access handler * @see close */ @@ -399,7 +399,7 @@ function fetch_object($resultset) /** * Return datas as an array * - * @param resource $resultset Resultset of request + * @param Resultset $resultset Resultset of request * @return array Array */ function fetch_array($resultset) @@ -413,7 +413,7 @@ function fetch_array($resultset) /** * Return datas as an array * - * @param resource $resultset Resultset of request + * @param Resultset $resultset Resultset of request * @return array Array */ function fetch_row($resultset) @@ -441,7 +441,7 @@ function num_rows($resultset) * Renvoie le nombre de lignes dans le resultat d'une requete INSERT, DELETE ou UPDATE * * @param resultset $resultset Curseur de la requete voulue - * @return string Nombre de lignes + * @return int Nombre de lignes * @see num_rows */ function affected_rows($resultset) @@ -459,7 +459,7 @@ function affected_rows($resultset) /** * Free last resultset used. * - * @param integer $resultset Curseur de la requete voulue + * @param resultset $resultset Curseur de la requete voulue * @return void */ function free($resultset=0) @@ -588,7 +588,7 @@ function last_insert_id($tab,$fieldid='rowid') * * @param string $fieldorvalue Field name or value to encrypt * @param int $withQuotes Return string with quotes - * @return string XXX(field) or XXX('value') or field or 'value' + * @return return XXX(field) or XXX('value') or field or 'value' */ function encrypt($fieldorvalue, $withQuotes=0) { @@ -903,7 +903,7 @@ function getDefaultCharacterSetDatabase() /** * Return list of available charset that can be used to store data in database * - * @return string List of Charset + * @return array List of Charset */ function getListOfCharacterSet() { @@ -932,7 +932,7 @@ function getDefaultCollationDatabase() /** * Return list of available collation that can be used for database * - * @return string Liste of Collation + * @return array Liste of Collation */ function getListOfCollation() { diff --git a/htdocs/core/db/mysql.class.php b/htdocs/core/db/mysql.class.php index 2b5ecd6c32aca..bfa2d39b0939c 100644 --- a/htdocs/core/db/mysql.class.php +++ b/htdocs/core/db/mysql.class.php @@ -182,7 +182,7 @@ function select_db($database) * @param string $login login * @param string $passwd password * @param string $name name of database (not used for mysql, used for pgsql) - * @param integer $port Port of database server + * @param string $port Port of database server * @return resource Database access handler * @see close */ @@ -314,7 +314,7 @@ function fetch_array($resultset) /** * Return datas as an array * - * @param resource $resultset Resultset of request + * @param Resultset $resultset Resultset of request * @return array Array */ function fetch_row($resultset) @@ -358,7 +358,7 @@ function affected_rows($resultset) /** * Free last resultset used. * - * @param integer $resultset Curseur de la requete voulue + * @param resultset $resultset Curseur de la requete voulue * @return void */ function free($resultset=0) diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php index 89ed3cbc1d778..da16c1a7971d1 100644 --- a/htdocs/core/db/mysqli.class.php +++ b/htdocs/core/db/mysqli.class.php @@ -185,7 +185,7 @@ function select_db($database) * @param string $login login * @param string $passwd password * @param string $name name of database (not used for mysql, used for pgsql) - * @param integer $port Port of database server + * @param string $port Port of database server * @return resource Database access handler * @see close */ @@ -316,7 +316,7 @@ function fetch_array($resultset) /** * Return datas as an array * - * @param resource $resultset Resultset of request + * @param Resultset $resultset Resultset of request * @return array Array */ function fetch_row($resultset) @@ -369,7 +369,7 @@ function affected_rows($resultset) /** * Libere le dernier resultset utilise sur cette connexion * - * @param integer $resultset Curseur de la requete voulue + * @param resultset $resultset Curseur de la requete voulue * @return void */ function free($resultset=0) @@ -716,7 +716,7 @@ function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys="",$fullt * * @param string $table Name of table * @param string $field Optionnel : Name of field if we want description of field - * @return resource Resultset x (x->Field, x->Type, ...) + * @return resultset Resultset x (x->Field, x->Type, ...) */ function DDLDescTable($table,$field="") { diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php index d2f17427d4261..f6759e087c8de 100644 --- a/htdocs/core/db/pgsql.class.php +++ b/htdocs/core/db/pgsql.class.php @@ -145,7 +145,7 @@ function __construct($type, $host, $user, $pass, $name='', $port=0) * * @param string $line SQL request line to convert * @param string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...) - * @param integer $unescapeslashquot Unescape slash quote with quote quote + * @param string $unescapeslashquot Unescape slash quote with quote quote * @return string SQL request line converted */ static function convertSQLFromMysql($line,$type='auto',$unescapeslashquot=0) @@ -361,7 +361,7 @@ function select_db($database) * @param string $login Login * @param string $passwd Password * @param string $name Name of database (not used for mysql, used for pgsql) - * @param integer $port Port of database server + * @param string $port Port of database server * @return resource Database access handler * @see close */ @@ -539,7 +539,7 @@ function fetch_object($resultset) /** * Return datas as an array * - * @param resource $resultset Resultset of request + * @param Resultset $resultset Resultset of request * @return array Array */ function fetch_array($resultset) @@ -552,7 +552,7 @@ function fetch_array($resultset) /** * Return datas as an array * - * @param resource $resultset Resultset of request + * @param Resultset $resultset Resultset of request * @return array Array */ function fetch_row($resultset) @@ -596,7 +596,7 @@ function affected_rows($resultset) /** * Libere le dernier resultset utilise sur cette connexion * - * @param integer $resultset Result set of request + * @param Resultset $resultset Result set of request * @return void */ function free($resultset=0) @@ -664,7 +664,7 @@ function ifsql($test,$resok,$resko) /** * Renvoie le code erreur generique de l'operation precedente. * - * @return string (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...) + * @return error_num (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...) */ function errno() { @@ -730,7 +730,7 @@ function errno() /** * Renvoie le texte de l'erreur pgsql de l'operation precedente * - * @return string + * @return error_text */ function error() { @@ -742,7 +742,7 @@ function error() * * @param string $tab Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql * @param string $fieldid Field name - * @return null|string Id of row + * @return int Id of row */ function last_insert_id($tab,$fieldid='rowid') { @@ -764,7 +764,7 @@ function last_insert_id($tab,$fieldid='rowid') * * @param string $fieldorvalue Field name or value to encrypt * @param int $withQuotes Return string with quotes - * @return string XXX(field) or XXX('value') or field or 'value' + * @return return XXX(field) or XXX('value') or field or 'value' */ function encrypt($fieldorvalue, $withQuotes=0) { @@ -785,7 +785,7 @@ function encrypt($fieldorvalue, $withQuotes=0) * Decrypt sensitive data in database * * @param int $value Value to decrypt - * @return integer Decrypted value if used + * @return string Decrypted value if used */ function decrypt($value) { @@ -1002,7 +1002,7 @@ function DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_m * * @param string $table Name of table * @param string $field Optionnel : Name of field if we want description of field - * @return resource Resultset x (x->attname) + * @return resultset Resultset x (x->attname) */ function DDLDescTable($table,$field="") { diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php index 8bc030ecae787..34ee2a41b6d56 100644 --- a/htdocs/core/db/sqlite.class.php +++ b/htdocs/core/db/sqlite.class.php @@ -294,7 +294,7 @@ function select_db($database) * @param string $login login * @param string $passwd password * @param string $name name of database (not used for mysql, used for pgsql) - * @param integer $port Port of database server + * @param string $port Port of database server * @return resource Database access handler * @see close */ @@ -457,7 +457,7 @@ function fetch_array($resultset) /** * Return datas as an array * - * @param resource $resultset Resultset of request + * @param Resultset $resultset Resultset of request * @return array Array */ function fetch_row($resultset) @@ -509,7 +509,7 @@ function affected_rows($resultset) /** * Free last resultset used. * - * @param integer $resultset Curseur de la requete voulue + * @param resultset $resultset Curseur de la requete voulue * @return void */ function free($resultset=0) @@ -627,7 +627,7 @@ function last_insert_id($tab,$fieldid='rowid') * * @param string $fieldorvalue Field name or value to encrypt * @param int $withQuotes Return string with quotes - * @return string XXX(field) or XXX('value') or field or 'value' + * @return return XXX(field) or XXX('value') or field or 'value' */ function encrypt($fieldorvalue, $withQuotes=0) { diff --git a/htdocs/core/filemanagerdol/connectors/php/basexml.php b/htdocs/core/filemanagerdol/connectors/php/basexml.php index cacdb8d2e7826..4f8fd7345b603 100644 --- a/htdocs/core/filemanagerdol/connectors/php/basexml.php +++ b/htdocs/core/filemanagerdol/connectors/php/basexml.php @@ -47,9 +47,6 @@ function SetXmlHeaders() header('Content-Type: text/xml; charset=utf-8'); } -/** - * @param string $currentFolder - */ function CreateXmlHeader( $command, $resourceType, $currentFolder ) { SetXmlHeaders(); @@ -74,7 +71,7 @@ function CreateXmlFooter() /** * SendError * - * @param integer $number Number + * @param unknown_type $number Number * @param unknown_type $text Text * @return void */ diff --git a/htdocs/core/filemanagerdol/connectors/php/commands.php b/htdocs/core/filemanagerdol/connectors/php/commands.php index f0b7fc0798ba6..6369ac9d3ae51 100644 --- a/htdocs/core/filemanagerdol/connectors/php/commands.php +++ b/htdocs/core/filemanagerdol/connectors/php/commands.php @@ -22,9 +22,6 @@ * This is the File Manager Connector for PHP. */ -/** - * @param string $currentFolder - */ function GetFolders( $resourceType, $currentFolder ) { // Map the virtual path to the local server path. @@ -56,9 +53,6 @@ function GetFolders( $resourceType, $currentFolder ) echo "" ; } -/** - * @param string $currentFolder - */ function GetFoldersAndFiles( $resourceType, $currentFolder ) { // Map the virtual path to the local server path. @@ -117,9 +111,6 @@ function GetFoldersAndFiles( $resourceType, $currentFolder ) echo '' ; } -/** - * @param string $currentFolder - */ function CreateFolder( $resourceType, $currentFolder ) { if (!isset($_GET)) { @@ -173,9 +164,6 @@ function CreateFolder( $resourceType, $currentFolder ) // DOL_CHANGE //function FileUpload( $resourceType, $currentFolder, $sCommand ) -/** - * @param string $currentFolder - */ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '') { if (!isset($_FILES)) { diff --git a/htdocs/core/filemanagerdol/connectors/php/io.php b/htdocs/core/filemanagerdol/connectors/php/io.php index 138849e6aa609..660f36ceb7b3b 100644 --- a/htdocs/core/filemanagerdol/connectors/php/io.php +++ b/htdocs/core/filemanagerdol/connectors/php/io.php @@ -21,9 +21,6 @@ * * This is the File Manager Connector for PHP. */ -/** - * @param string $sBasePath - */ function CombinePaths( $sBasePath, $sFolder ) { return RemoveFromEnd($sBasePath, '/') . '/' . RemoveFromStart($sFolder, '/'); @@ -48,8 +45,8 @@ function GetResourceTypePath($resourceType, $sCommand) /** * GetResourceTypeDirectory * - * @param string $resourceType Resource type - * @param string $sCommand Command + * @param unknown_type $resourceType Resource type + * @param unknown_type $sCommand Command * @return string */ function GetResourceTypeDirectory($resourceType, $sCommand) @@ -97,7 +94,7 @@ function RemoveExtension($fileName) * @param string $resourceType Resource type * @param string $folderPath Folder * @param string $sCommand Command - * @return string + * @return void */ function ServerMapFolder($resourceType, $folderPath, $sCommand) { @@ -113,9 +110,6 @@ function ServerMapFolder($resourceType, $folderPath, $sCommand) return CombinePaths($sResourceTypePath, $folderPath); } -/** - * @param string $folderPath - */ function GetParentFolder( $folderPath ) { $sPattern = "-[/\\\\][^/\\\\]+[/\\\\]?$-" ; @@ -230,9 +224,6 @@ function Server_MapPath( $path ) return GetRootPath() . $path ; } -/** - * @param string $sExtension - */ function IsAllowedExt($sExtension, $resourceType) { global $Config ; @@ -360,10 +351,6 @@ function SendUploadResults( $errorNumber, $fileUrl = '', $fileName = '', $custom // DOL_CHANGE // This is the function that sends the results of the uploading process to CKE. -/** - * @param string $callback - * @param string $sFileUrl - */ function SendCKEditorResults ($callback, $sFileUrl, $customMsg = '') { echo '