From 527e2ecb2ea5fb7a784834bd12644b5dd4235d45 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 2 May 2010 18:02:43 +0000 Subject: [PATCH] Qual: Uniformise code. user class use id in first param of fetch --- dev/initdata/generate-facture.php | 41 +++++++++--------- dev/initdata/generate-propale.php | 59 +++++++++++++------------- htdocs/comm/action/fiche.php | 16 +++---- htdocs/comm/action/listactions.php | 6 +-- htdocs/compta/bank/ligne.php | 4 +- htdocs/compta/deplacement/fiche.php | 4 +- htdocs/compta/deplacement/note.php | 4 +- htdocs/compta/prelevement/demandes.php | 4 +- htdocs/ecm/docfile.php | 4 +- htdocs/ecm/docmine.php | 4 +- htdocs/user/clicktodial.php | 3 +- htdocs/user/fiche.php | 6 ++- htdocs/user/group/fiche.php | 6 ++- scripts/withdrawals/prelevement.php | 8 ++-- 14 files changed, 88 insertions(+), 81 deletions(-) diff --git a/dev/initdata/generate-facture.php b/dev/initdata/generate-facture.php index 9a506914df1..cc04fc06273 100644 --- a/dev/initdata/generate-facture.php +++ b/dev/initdata/generate-facture.php @@ -27,8 +27,8 @@ // Test si mode batch $sapi_type = php_sapi_name(); if (substr($sapi_type, 0, 3) == 'cgi') { - echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; - exit; + echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; + exit; } // Recupere root dolibarr @@ -49,8 +49,9 @@ $sql = "SELECT min(rowid) FROM ".MAIN_DB_PREFIX."user"; $resql = $db->query($sql); if ($resql) { - $row = $db->fetch_row($resql); - $user = new User($db, $row[0]); + $row = $db->fetch_row($resql); + $user = new User($db); + $user->fetch($row[0]); } $socids = array(); @@ -58,15 +59,15 @@ $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe WHERE client=1"; $resql = $db->query($sql); if ($resql) { - $num_socs = $db->num_rows($resql); - $i = 0; - while ($i < $num_socs) - { - $i++; + $num_socs = $db->num_rows($resql); + $i = 0; + while ($i < $num_socs) + { + $i++; - $row = $db->fetch_row($resql); - $socids[$i] = $row[0]; - } + $row = $db->fetch_row($resql); + $socids[$i] = $row[0]; + } } $prodids = array(); @@ -74,15 +75,15 @@ $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product WHERE envente=1"; $resql = $db->query($sql); if ($resql) { - $num_prods = $db->num_rows($resql); - $i = 0; - while ($i < $num_prods) - { - $i++; + $num_prods = $db->num_rows($resql); + $i = 0; + while ($i < $num_prods) + { + $i++; - $row = $db->fetch_row($resql); - $prodids[$i] = $row[0]; - } + $row = $db->fetch_row($resql); + $prodids[$i] = $row[0]; + } } $i=0; diff --git a/dev/initdata/generate-propale.php b/dev/initdata/generate-propale.php index ebf6cbc06a5..a0f5ac64cec 100644 --- a/dev/initdata/generate-propale.php +++ b/dev/initdata/generate-propale.php @@ -28,8 +28,8 @@ // Test si mode batch $sapi_type = php_sapi_name(); if (substr($sapi_type, 0, 3) == 'cgi') { - echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; - exit; + echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; + exit; } // Recupere root dolibarr @@ -51,8 +51,9 @@ $sql = "SELECT min(rowid) FROM ".MAIN_DB_PREFIX."user"; $resql = $db->query($sql); if ($resql) { - $row = $db->fetch_row($resql); - $user = new User($db, $row[0]); + $row = $db->fetch_row($resql); + $user = new User($db); + $user->fetch($row[0]); } $socids = array(); @@ -60,15 +61,15 @@ $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe WHERE client=1"; $resql = $db->query($sql); if ($resql) { - $num_socs = $db->num_rows($resql); - $i = 0; - while ($i < $num_socs) - { - $i++; + $num_socs = $db->num_rows($resql); + $i = 0; + while ($i < $num_socs) + { + $i++; - $row = $db->fetch_row($resql); - $socids[$i] = $row[0]; - } + $row = $db->fetch_row($resql); + $socids[$i] = $row[0]; + } } $contids = array(); @@ -76,15 +77,15 @@ $sql = "SELECT rowid, fk_soc FROM ".MAIN_DB_PREFIX."socpeople"; $resql = $db->query($sql); if ($resql) { - $num_conts = $db->num_rows($resql); - $i = 0; - while ($i < $num_conts) - { - $i++; + $num_conts = $db->num_rows($resql); + $i = 0; + while ($i < $num_conts) + { + $i++; - $row = $db->fetch_row($resql); - $contids[$row[1]][0] = $row[0]; // A ameliorer - } + $row = $db->fetch_row($resql); + $contids[$row[1]][0] = $row[0]; // A ameliorer + } } $prodids = array(); @@ -92,15 +93,15 @@ $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product WHERE envente=1"; $resql = $db->query($sql); if ($resql) { - $num_prods = $db->num_rows($resql); - $i = 0; - while ($i < $num_prods) - { - $i++; + $num_prods = $db->num_rows($resql); + $i = 0; + while ($i < $num_prods) + { + $i++; - $row = $db->fetch_row($resql); - $prodids[$i] = $row[0]; - } + $row = $db->fetch_row($resql); + $prodids[$i] = $row[0]; + } } $user->rights->propale->valider=1; @@ -117,7 +118,7 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0) { $i++; $socid = rand(1, $num_socs); - print "Proposal ".$i." for socid ".$socid; + print "Proposal ".$i." for socid ".$socid; $soc = new Societe($db); diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index b014179318e..90c2c91a6eb 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -168,16 +168,16 @@ if ($_POST["action"] == 'add_action') } $actioncomm->duree=(($_POST["dureehour"] * 60) + $_POST["dureemin"]) * 60; - $usertodo=new User($db,$_POST["affectedto"]); + $usertodo=new User($db); if ($_POST["affectedto"] > 0) { - $usertodo->fetch(); + $usertodo->fetch($_POST["affectedto"]); } $actioncomm->usertodo = $usertodo; - $userdone=new User($db,$_POST["doneby"]); + $userdone=new User($db); if ($_POST["doneby"] > 0) { - $userdone->fetch(); + $userdone->fetch($_POST["doneby"]); } $actioncomm->userdone = $userdone; @@ -357,16 +357,16 @@ if ($_POST["action"] == 'update') } // Users - $usertodo=new User($db,$_POST["affectedto"]); + $usertodo=new User($db); if ($_POST["affectedto"]) { - $usertodo->fetch(); + $usertodo->fetch($_POST["affectedto"]); } $actioncomm->usertodo = $usertodo; - $userdone=new User($db,$_POST["doneby"]); + $userdone=new User($db); if ($_POST["doneby"]) { - $userdone->fetch(); + $userdone->fetch($_POST["doneby"]); } $actioncomm->userdone = $userdone; diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 274279d6d8f..22fcad7990c 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -275,7 +275,7 @@ if ($resql) print ''; if ($obj->useridauthor) { - $userstatic=new User($db,$obj->useridauthor); + $userstatic=new User($db); $userstatic->id=$obj->useridauthor; $userstatic->login=$obj->loginauthor; print $userstatic->getLoginUrl(1); @@ -287,7 +287,7 @@ if ($resql) print ''; if ($obj->useridtodo) { - $userstatic=new User($db,$obj->useridtodo); + $userstatic=new User($db); $userstatic->id=$obj->useridtodo; $userstatic->login=$obj->logintodo; print $userstatic->getLoginUrl(1); @@ -299,7 +299,7 @@ if ($resql) print ''; if ($obj->useriddone) { - $userstatic=new User($db,$obj->useriddone); + $userstatic=new User($db); $userstatic->id=$obj->useriddone; $userstatic->login=$obj->logindone; print $userstatic->getLoginUrl(1); diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index 6aafa3e3b5b..7fa2ef6f42a 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -243,8 +243,8 @@ if ($result) print ''.$langs->trans("Author").""; if ($objp->fk_user_author) { - $author=new User($db,$objp->fk_user_author); - $author->fetch(); + $author=new User($db); + $author->fetch($objp->fk_user_author); print ''; print img_object($langs->trans("ShowUser"),'user').' '.$author->fullname.''; } diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index 9efb37a1697..6e56a317070 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -333,8 +333,8 @@ else // Who print ''.$langs->trans("Person").''; - $userfee=new User($db,$deplacement->fk_user); - $userfee->fetch(); + $userfee=new User($db); + $userfee->fetch($deplacement->fk_user); print $userfee->getNomUrl(1); print ''; diff --git a/htdocs/compta/deplacement/note.php b/htdocs/compta/deplacement/note.php index 6eabf6c6be8..c197b0181c3 100644 --- a/htdocs/compta/deplacement/note.php +++ b/htdocs/compta/deplacement/note.php @@ -137,8 +137,8 @@ if ($id > 0 || ! empty($ref)) // Who print ""; print ''.$langs->trans("Person").''; - $userfee=new User($db,$trip->fk_user); - $userfee->fetch(); + $userfee=new User($db); + $userfee->fetch($trip->fk_user); print $userfee->getNomUrl(1); print ''; diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php index cf83955dba6..8e170ebf524 100644 --- a/htdocs/compta/prelevement/demandes.php +++ b/htdocs/compta/prelevement/demandes.php @@ -140,8 +140,8 @@ if ( $db->query($sql) ) if (!array_key_exists($obj->fk_user_demande,$users)) { - $users[$obj->fk_user_demande] = new User($db, $obj->fk_user_demande); - $users[$obj->fk_user_demande]->fetch(); + $users[$obj->fk_user_demande] = new User($db); + $users[$obj->fk_user_demande]->fetch($obj->fk_user_demande); } // User diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/docfile.php index bf3616abd2d..83374eaa2cc 100644 --- a/htdocs/ecm/docfile.php +++ b/htdocs/ecm/docfile.php @@ -164,8 +164,8 @@ if ($_GET["action"] == 'edit') else print dol_nl2br($ecmdir->description); print ''; print ''.$langs->trans("ECMCreationUser").''; -$userecm=new User($db,$ecmdir->fk_user_c); -$userecm->fetch(); +$userecm=new User($db); +$userecm->fetch($ecmdir->fk_user_c); print $userecm->getNomUrl(1); print ''; print ''.$langs->trans("ECMCreationDate").''; diff --git a/htdocs/ecm/docmine.php b/htdocs/ecm/docmine.php index be9db8c4599..b487dc94e97 100644 --- a/htdocs/ecm/docmine.php +++ b/htdocs/ecm/docmine.php @@ -277,8 +277,8 @@ if ($_GET["action"] == 'edit') else print dol_nl2br($ecmdir->description); print ''; print ''.$langs->trans("ECMCreationUser").''; -$userecm=new User($db,$ecmdir->fk_user_c); -$userecm->fetch(); +$userecm=new User($db); +$userecm->fetch($ecmdir->fk_user_c); print $userecm->getNomUrl(1); print ''; print ''.$langs->trans("ECMCreationDate").''; diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php index 8c0c815b5cc..49c701bcc06 100644 --- a/htdocs/user/clicktodial.php +++ b/htdocs/user/clicktodial.php @@ -45,7 +45,8 @@ $result = restrictedArea($user, 'user', $_GET["id"], '', $feature2); if ($_POST["action"] == 'update' && ! $_POST['cancel']) { - $edituser = new User($db, $_GET["id"]); + $edituser = new User($db); + $edituser->fetch($_GET["id"]); $edituser->clicktodial_login = $_POST["login"]; $edituser->clicktodial_password = $_POST["password"]; diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 1f7d0290e8d..c99c4d93fed 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -202,7 +202,8 @@ if ($_POST["action"] == 'addgroup' && $caneditfield) { if ($_POST["group"]) { - $edituser = new User($db, $_GET["id"]); + $edituser = new User($db); + $edituser->fetch($_GET["id"]); $edituser->SetInGroup($_POST["group"]); Header("Location: fiche.php?id=".$_GET["id"]); @@ -214,7 +215,8 @@ if ($_GET["action"] == 'removegroup' && $caneditfield) { if ($_GET["group"]) { - $edituser = new User($db, $_GET["id"]); + $edituser = new User($db); + $edituser->fetch($_GET["id"]); $edituser->RemoveFromGroup($_GET["group"]); Header("Location: fiche.php?id=".$_GET["id"]); diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php index d3a4aad96f2..77e7ea7af5a 100644 --- a/htdocs/user/group/fiche.php +++ b/htdocs/user/group/fiche.php @@ -115,7 +115,8 @@ if ($_POST["action"] == 'adduser') $editgroup->fetch($_GET["id"]); $editgroup->oldcopy=dol_clone($editgroup); - $edituser = new User($db, $_POST["user"]); + $edituser = new User($db); + $edituser->fetch($_POST["user"]); $result=$edituser->SetInGroup($_GET["id"]); // We reload members (list has changed) @@ -146,7 +147,8 @@ if ($_GET["action"] == 'removeuser') $editgroup->fetch($_GET["id"]); $editgroup->oldcopy=dol_clone($editgroup); - $edituser = new User($db, $_GET["user"]); + $edituser = new User($db); + $edituser->fetch($_GET["user"]); $edituser->RemoveFromGroup($_GET["id"]); // We reload members (list has changed) diff --git a/scripts/withdrawals/prelevement.php b/scripts/withdrawals/prelevement.php index ee5cc81b943..c43e124ad66 100644 --- a/scripts/withdrawals/prelevement.php +++ b/scripts/withdrawals/prelevement.php @@ -50,12 +50,12 @@ $datetimeprev = time(); $month = strftime("%m", $datetimeprev); $year = strftime("%Y", $datetimeprev); -$user = new user($db, PRELEVEMENT_USER); +$user = new user($db); +$user->fetch(PRELEVEMENT_USER); + /* - * - * Lectures des factures - * + * View */ $factures = array();