(no commit message)

diff --git a/inc/extranet/Controlleur/class.extranet.ajax.php b/inc/extranet/Controlleur/class.extranet.ajax.php
index c71962043d60c4661e38ca3ffe0d4237523526cd..50a53ae133ab5cd18c81a3bb8f3ccaece44f593a 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.ajax.php
+++ b/inc/extranet/Controlleur/class.extranet.ajax.php
@@ -1,8 +1,8 @@
 <?php\r
+\r
 class extranetAjax {\r
 \r
-       public static function formClient($args, &$x)\r
-       {\r
+       public static function formClient($args, &$x) {\r
                global $core;\r
                if ($args[1] == 'new') {\r
                        $extra = '';\r
@@ -14,22 +14,19 @@ class extranetAjax {
                commonAjax::form('saveClient', __("Edition d'un client"), extranetUrl::formClient($args[1]), false, 2, '', $extra);\r
        }\r
 \r
-       public static function formContact($args, &$x)\r
-       {\r
+       public static function formContact($args, &$x) {\r
                if (!isset($args[2])) {\r
                        $args[2] = null;\r
                }\r
                commonAjax::form('saveContact', __("Edition d'un contact"), extranetUrl::formContact($args[1], $args[2]));\r
        }\r
 \r
-       public static function formNotes($args, &$x)\r
-       {\r
+       public static function formNotes($args, &$x) {\r
                global $core;\r
                commonAjax::form('saveNotes', __('Edition des notes'), extranetUrl::formNotes($args[1]));\r
        }\r
 \r
-       public static function saveClient($args, &$x)\r
-       {\r
+       public static function saveClient($args, &$x) {\r
                global $core;\r
                $dao = new commonDAOEntreprise($core->con);\r
                $entreprise = $dao->sauve($_POST);\r
@@ -46,8 +43,7 @@ class extranetAjax {
                        $daoClient = new commonDAOClient($core->con);\r
                        try {\r
                                $daoClient->sauve($data);\r
-                       }\r
-                       catch(exception $e) {\r
+                       } catch (exception $e) {\r
                                fb($e);\r
                                $dao->supprime($entreprise->entreprise_id);\r
                        }\r
@@ -57,16 +53,14 @@ class extranetAjax {
                $x->addClosePopup();\r
        }\r
 \r
-       public static function saveNotes($args, &$x)\r
-       {\r
+       public static function saveNotes($args, &$x) {\r
                global $core;\r
                $dao = new commonDAOClient($core->con);\r
                $dao->sauveNotes($_POST['utilisateur_id'], $_POST['notes']);\r
                $x->addClosePopup();\r
        }\r
 \r
-       public static function saveContact($args, &$x)\r
-       {\r
+       public static function saveContact($args, &$x) {\r
                global $core;\r
                $dao = new commonDAOClient($core->con);\r
                $client = $dao->sauve($_POST);\r
@@ -76,7 +70,7 @@ class extranetAjax {
                $x->addContent('listeContacts', extranetUrl::listeContacts($client->entreprise));\r
                $contacts = array();\r
                $client_contacts = $dao->getContactsOfEntreprise($client->entreprise);\r
-               foreach($client_contacts as $c) {\r
+               foreach ($client_contacts as $c) {\r
                        $contacts[] = '<a href="#" class="popup" rel="formContact/' . $c->utilisateur_id . '">' . $c->prenom . ' ' . $c->nom . '</a>';\r
                }\r
                $x->addContent('contacts_' . $client->entreprise, implode(', ', $contacts));\r
@@ -84,8 +78,7 @@ class extranetAjax {
                $x->addPopupDimensions();\r
        }\r
 \r
-       public static function supprimeClient($args, &$x)\r
-       {\r
+       public static function supprimeClient($args, &$x) {\r
                global $core;\r
                $dao = new commonDAOEntreprise($core->con);\r
                $dao->supprime($args[1]);\r
@@ -93,36 +86,31 @@ class extranetAjax {
                $x->addContent('listeClients', extranetUrl::listeClients());\r
        }\r
 \r
-       public static function searchClients($args, &$x)\r
-       {\r
+       public static function searchClients($args, &$x) {\r
                $x->addContent('listeClients', extranetUrl::listeClients());\r
        }\r
 \r
-       public static function sortClient($args, &$x)\r
-       {\r
+       public static function sortClient($args, &$x) {\r
                commonAjax::sort('clients', $args[1]);\r
                $x->addContent('listeClients', extranetUrl::listeClients());\r
        }\r
-       public static function sortEquipier($args, &$x)\r
-       {\r
+\r
+       public static function sortEquipier($args, &$x) {\r
                commonAjax::sort('equipiers', $args[1]);\r
                $x->addContent('listeEquipiers', extranetUrl::listeRh());\r
        }\r
 \r
-       public static function pageClient($args, &$x)\r
-       {\r
+       public static function pageClient($args, &$x) {\r
                commonAjax::page('clients', $args[1]);\r
                $x->addContent('listeClients', extranetUrl::listeClients());\r
        }\r
 \r
-       public static function parPageClient($args, &$x)\r
-       {\r
+       public static function parPageClient($args, &$x) {\r
                commonAjax::parPage('clients', $_POST['par_page']);\r
                $x->addContent('listeClients', extranetUrl::listeClients());\r
        }\r
 \r
-       public static function filtreClients($args, &$x)\r
-       {\r
+       public static function filtreClients($args, &$x) {\r
                if (isset($args[1]) && $args[1] == 'efface') {\r
                        commonAjax::filtre('clients');\r
                        $x->addReload();\r
@@ -133,30 +121,39 @@ class extranetAjax {
                }\r
        }\r
 \r
-       public static function clientDetailCa($args, &$x)\r
-       {\r
+       public static function clientDetailCa($args, &$x) {\r
                global $core;\r
                $dao = new commonDAOEntreprise($core->con);\r
                $client = $dao->selectById($args[1]);\r
                return commonAjax::form('', __("Détail du chiffre d'affaire de") . ' ' . $client->nom, extranetUrl::clientDetailCa($args[1]), false);\r
        }\r
 \r
-       public static function clientDetailImpaye($args, &$x)\r
-       {\r
+       public static function clientDetailImpaye($args, &$x) {\r
                global $core;\r
                $dao = new commonDAOEntreprise($core->con);\r
                $client = $dao->selectById($args[1]);\r
                return commonAjax::form('', __("Détail des impayés de") . ' ' . $client->nom, extranetUrl::clientDetailImpaye($args[1]), false, 4);\r
        }\r
 \r
-       public static function formProjet($args, &$x)\r
-       {\r
+       public static function formProjet($args, &$x) {\r
                commonAjax::form('saveProjet', __("Edition d'un projet"), extranetUrl::formProjet($args[1]));\r
        }\r
 \r
-       public static function saveProjet($args, &$x)\r
-       {\r
+       public static function saveProjet($args, &$x) {\r
                global $core;\r
+\r
+               $error = false;\r
+               if ($_POST['client'] == '') {\r
+                       $x->addError('client');\r
+                       $error = true;\r
+               } else {\r
+                       $x->addOk('client');\r
+               }\r
+\r
+               if ($error) {\r
+                       return;\r
+               }\r
+\r
                $dao = new extranetDAOProjet($core->con);\r
                $id = $dao->sauve($_POST);\r
 \r
@@ -164,8 +161,7 @@ class extranetAjax {
                $x->addRedirection(SITE_PATH . 'projet/' . $id);\r
        }\r
 \r
-       public static function changeProjetStatus($args, &$x)\r
-       {\r
+       public static function changeProjetStatus($args, &$x) {\r
                global $core;\r
                $dao = new extranetDAOProjet($core->con);\r
                $dao->changeStatus($args[1]);\r
@@ -173,8 +169,7 @@ class extranetAjax {
                $x->addContent('listeProjet', extranetUrl::listeProjet($args[1]));\r
        }\r
 \r
-       public static function changeProjetsStatus($args, &$x)\r
-       {\r
+       public static function changeProjetsStatus($args, &$x) {\r
                global $core;\r
                $dao = new extranetDAOProjet($core->con);\r
                $dao->changeStatus($args[1]);\r
@@ -182,8 +177,7 @@ class extranetAjax {
                $x->addContent('listeProjets', extranetUrl::listeProjets($args[1]));\r
        }\r
 \r
-       public static function supprimeProjet($args, &$x)\r
-       {\r
+       public static function supprimeProjet($args, &$x) {\r
                global $core;\r
                $dao = new extranetDAOProjet($core->con);\r
                $dao->supprime($args[1]);\r
@@ -191,30 +185,26 @@ class extranetAjax {
                $x->addRedirection(SITE_PATH . 'projets');\r
        }\r
 \r
-       public static function searchProjets($args, &$x)\r
-       {\r
+       public static function searchProjets($args, &$x) {\r
                $x->addContent('listeProjets', extranetUrl::listeProjets());\r
        }\r
 \r
-       public static function pageProjet($args, &$x)\r
-       {\r
+       public static function pageProjet($args, &$x) {\r
                commonAjax::page('projets', $args[1]);\r
                $x->addContent('listeProjets', extranetUrl::listeProjets());\r
        }\r
-       public static function parPageProjet($args, &$x)\r
-       {\r
+\r
+       public static function parPageProjet($args, &$x) {\r
                commonAjax::parPage('projets', $_POST['par_page']);\r
                $x->addContent('listeProjets', extranetUrl::listeProjets());\r
        }\r
 \r
-       public static function sortProjet($args, &$x)\r
-       {\r
+       public static function sortProjet($args, &$x) {\r
                commonAjax::sort('projets', $args[1]);\r
                $x->addContent('listeProjets', extranetUrl::listeProjets());\r
        }\r
 \r
-       public static function filtreProjet($args, &$x)\r
-       {\r
+       public static function filtreProjet($args, &$x) {\r
                if (isset($args[1]) && $args[1] == 'efface') {\r
                        commonAjax::filtre('projets');\r
                        $x->addReload();\r
@@ -225,20 +215,17 @@ class extranetAjax {
                }\r
        }\r
 \r
-       public static function formTacheNormale($args, &$x)\r
-       {\r
-               $projet = isset($args[2])?$args[2]:null;\r
+       public static function formTacheNormale($args, &$x) {\r
+               $projet = isset($args[2]) ? $args[2] : null;\r
                commonAjax::form('saveTache', __("Edition d'un tâche"), extranetUrl::formTacheNormale($args[1], $projet));\r
        }\r
 \r
-       public static function formTacheSousTraitee($args, &$x)\r
-       {\r
-               $projet = isset($args[2])?$args[2]:null;\r
+       public static function formTacheSousTraitee($args, &$x) {\r
+               $projet = isset($args[2]) ? $args[2] : null;\r
                commonAjax::form('saveTache', __("Edition d'un tâche sous-traitée"), extranetUrl::formTacheSousTraitee($args[1], $projet));\r
        }\r
 \r
-       public static function saveTache($args, &$x)\r
-       {\r
+       public static function saveTache($args, &$x) {\r
                global $core;\r
                $dao = new extranetDAOTache($core->con);\r
                $dao->sauve($_POST);\r
@@ -247,8 +234,7 @@ class extranetAjax {
                $x->addClosePopup();\r
        }\r
 \r
-       public static function supprimeTache($args, &$x)\r
-       {\r
+       public static function supprimeTache($args, &$x) {\r
                global $core;\r
                $dao = new extranetDAOTache($core->con);\r
                $tache = $dao->selectById($args[1]);\r
@@ -257,8 +243,7 @@ class extranetAjax {
                $x->addContent('listeProjet', extranetUrl::listeProjet($tache->projet));\r
        }\r
 \r
-       public static function saveTimereport($args, &$x)\r
-       {\r
+       public static function saveTimereport($args, &$x) {\r
                global $core;\r
                $date = $args[1];\r
                $heures = $args[3];\r
@@ -269,15 +254,15 @@ class extranetAjax {
                // Mise a jour des valeurs pour le projet et la tâche\r
                $daoProjet = new extranetDAOProjet($core->con);\r
                $projet = $daoProjet->getProjetByTache($tache_id);\r
-               foreach($projet as $p) {\r
-                       $p->progression = !$p->progression?'-':$p->progression . '%';\r
-                       $p->jours_consommes = !$p->jours_consommes?'-':$p->jours_consommes;\r
-                       foreach($p->taches as $t) {\r
+               foreach ($projet as $p) {\r
+                       $p->progression = !$p->progression ? '-' : $p->progression . '%';\r
+                       $p->jours_consommes = !$p->jours_consommes ? '-' : $p->jours_consommes;\r
+                       foreach ($p->taches as $t) {\r
                                if ($t->tache_id != $tache_id) {\r
                                        continue;\r
                                }\r
-                               $t->progression = !$t->progression?'-':$t->progression . '%';\r
-                               $t->jours_consommes = !$t->jours_consommes?'-':$t->jours_consommes;\r
+                               $t->progression = !$t->progression ? '-' : $t->progression . '%';\r
+                               $t->jours_consommes = !$t->jours_consommes ? '-' : $t->jours_consommes;\r
                                break;\r
                        }\r
                        $x->addContent('progress_projet_' . $p->projet_id, $p->progression);\r
@@ -287,31 +272,26 @@ class extranetAjax {
                }\r
        }\r
 \r
-       public static function sortTimereport($args, &$x)\r
-       {\r
+       public static function sortTimereport($args, &$x) {\r
                commonAjax::sort('timereport', $args[1]);\r
                $x->addContent('listeTimereport', extranetUrl::listeTimereport());\r
        }\r
 \r
-       public static function pageTimereport($args, &$x)\r
-       {\r
+       public static function pageTimereport($args, &$x) {\r
                commonAjax::page('timereport', $args[1]);\r
                $x->addContent('listeTimereport', extranetUrl::listeTimereport());\r
        }\r
 \r
-       public static function searchTimereport($args, &$x)\r
-       {\r
+       public static function searchTimereport($args, &$x) {\r
                $x->addContent('listeTimereport', extranetUrl::listeTimereport());\r
        }\r
 \r
-       public static function parPageTimereport($args, &$x)\r
-       {\r
+       public static function parPageTimereport($args, &$x) {\r
                commonAjax::parPage('timereport', $_POST['par_page']);\r
                $x->addContent('listeTimereport', extranetUrl::listeTimereport());\r
        }\r
 \r
-       public static function filtreTimereport($args, &$x)\r
-       {\r
+       public static function filtreTimereport($args, &$x) {\r
                if (isset($args[1]) && $args[1] == 'efface') {\r
                        commonAjax::filtre('timereport');\r
                        $x->addReload();\r
@@ -322,8 +302,7 @@ class extranetAjax {
                }\r
        }\r
 \r
-       public static function changeDevisStatus($args, &$x)\r
-       {\r
+       public static function changeDevisStatus($args, &$x) {\r
                global $core;\r
                $dao = new extranetDAODevis($core->con);\r
                $dao->changeStatus($args[1], $args[2]);\r
@@ -337,8 +316,7 @@ class extranetAjax {
                }\r
        }\r
 \r
-       public static function supprimeDevis($args, &$x)\r
-       {\r
+       public static function supprimeDevis($args, &$x) {\r
                global $core;\r
                $dao = new extranetDAODevis($core->con);\r
                $dao->supprime($args[1]);\r
@@ -348,31 +326,26 @@ class extranetAjax {
                $x->addContent('listeDevis', extranetUrl::listeDevis());\r
        }\r
 \r
-       public static function searchDevis($args, &$x)\r
-       {\r
+       public static function searchDevis($args, &$x) {\r
                $x->addContent('listeDevis', extranetUrl::listeDevis());\r
        }\r
 \r
-       public static function pageDevis($args, &$x)\r
-       {\r
+       public static function pageDevis($args, &$x) {\r
                commonAjax::page('devis', $args[1]);\r
                $x->addContent('listeDevis', extranetUrl::listeDevis());\r
        }\r
 \r
-       public static function parPageDevis($args, &$x)\r
-       {\r
+       public static function parPageDevis($args, &$x) {\r
                commonAjax::parPage('devis', $_POST['par_page']);\r
                $x->addContent('listeDevis', extranetUrl::listeDevis());\r
        }\r
 \r
-       public static function sortDevis($args, &$x)\r
-       {\r
+       public static function sortDevis($args, &$x) {\r
                commonAjax::sort('devis', $args[1]);\r
                $x->addContent('listeDevis', extranetUrl::listeDevis());\r
        }\r
 \r
-       public static function filtreDevis($args, &$x)\r
-       {\r
+       public static function filtreDevis($args, &$x) {\r
                if (isset($args[1]) && $args[1] == 'efface') {\r
                        commonAjax::filtre('devis');\r
                        $x->addReload();\r
@@ -383,14 +356,12 @@ class extranetAjax {
                }\r
        }\r
 \r
-       public static function sortDevisClient($args, &$x)\r
-       {\r
+       public static function sortDevisClient($args, &$x) {\r
                commonAjax::sort('devis', $args[1]);\r
                $x->addContent('listeDevis', extranetUrl::listeDevisClient());\r
        }\r
 \r
-       public static function expedieDevis($args, &$x)\r
-       {\r
+       public static function expedieDevis($args, &$x) {\r
                global $core;\r
                $dao = new extranetDAODevis($core->con);\r
                $devis = $dao->selectByID($args[2]);\r
@@ -416,16 +387,14 @@ class extranetAjax {
                $x->addRedirection(SITE_PATH . 'devis');\r
        }\r
 \r
-       public static function duplicateDevis($args, &$x)\r
-       {\r
+       public static function duplicateDevis($args, &$x) {\r
                global $core;\r
                $dao = new extranetDAODevis($core->con);\r
                $devis = $dao->duplique($args[1], $core->user->utilisateur_id);\r
                $x->addRedirection(SITE_PATH . 'editedevis/' . $devis->devis_id);\r
        }\r
 \r
-       public static function changeFactureStatus($args, &$x)\r
-       {\r
+       public static function changeFactureStatus($args, &$x) {\r
                global $core;\r
                $dao = new extranetDAOFacture($core->con);\r
                $dao->changeStatus($args[1], $args[2]);\r
@@ -433,13 +402,11 @@ class extranetAjax {
                $x->addContent('listeFactures', extranetUrl::listeFactures());\r
        }\r
 \r
-       public static function changeFacturePaiement($args, &$x)\r
-       {\r
+       public static function changeFacturePaiement($args, &$x) {\r
                return commonAjax::form('saveFacturePaiement', __('Informations relatives au paiement de la facture'), extranetUrl::formFacturePaiement($args[1]));\r
        }\r
 \r
-       public static function saveFacturePaiement($args, &$x)\r
-       {\r
+       public static function saveFacturePaiement($args, &$x) {\r
                global $core;\r
                $dao = new extranetDAOFacture($core->con);\r
                $dao->savePaiement($_POST);\r
@@ -447,8 +414,7 @@ class extranetAjax {
                $x->addContent('listeFactures', extranetUrl::listeFactures());\r
        }\r
 \r
-       public static function supprimeFacture($args, &$x)\r
-       {\r
+       public static function supprimeFacture($args, &$x) {\r
                global $core;\r
                $dao = new extranetDAOFacture($core->con);\r
                $dao->supprime($args[1]);\r
@@ -457,8 +423,7 @@ class extranetAjax {
                $x->addContent('listeFactures', extranetUrl::listeFactures());\r
        }\r
 \r
-       public static function valideFacture($args, &$x)\r
-       {\r
+       public static function valideFacture($args, &$x) {\r
                global $core;\r
                $dao = new extranetDAOFacture($core->con);\r
                $dao->valide($args[1]);\r
@@ -466,31 +431,26 @@ class extranetAjax {
                $x->addRedirection(SITE_PATH . 'factures');\r
        }\r
 \r
-       public static function searchFactures($args, &$x)\r
-       {\r
+       public static function searchFactures($args, &$x) {\r
                $x->addContent('listeFactures', extranetUrl::listeFactures());\r
        }\r
 \r
-       public static function pageFacture($args, &$x)\r
-       {\r
+       public static function pageFacture($args, &$x) {\r
                commonAjax::page('factures', $args[1]);\r
                $x->addContent('listeFactures', extranetUrl::listeFactures());\r
        }\r
 \r
-       public static function parPageFacture($args, &$x)\r
-       {\r
+       public static function parPageFacture($args, &$x) {\r
                commonAjax::parPage('factures', $_POST['par_page']);\r
                $x->addContent('listeFactures', extranetUrl::listeFactures());\r
        }\r
 \r
-       public static function sortFacture($args, &$x)\r
-       {\r
+       public static function sortFacture($args, &$x) {\r
                commonAjax::sort('factures', $args[1]);\r
                $x->addContent('listeFactures', extranetUrl::listeFactures());\r
        }\r
 \r
-       public static function filtreFactures($args, &$x)\r
-       {\r
+       public static function filtreFactures($args, &$x) {\r
                if (isset($args[1]) && $args[1] == 'efface') {\r
                        commonAjax::filtre('factures');\r
                        $x->addReload();\r
@@ -501,8 +461,7 @@ class extranetAjax {
                }\r
        }\r
 \r
-       public static function sauveFactures($args, &$x)\r
-       {\r
+       public static function sauveFactures($args, &$x) {\r
                global $core;\r
                $dao = new extranetDAOFacture($core->con);\r
                $dao->sauve($_POST);\r
@@ -510,8 +469,7 @@ class extranetAjax {
                $x->addRedirection(SITE_PATH . 'factures');\r
        }\r
 \r
-       public static function duplicateFacture($args, &$x)\r
-       {\r
+       public static function duplicateFacture($args, &$x) {\r
                global $core;\r
 \r
                $dao = new extranetDAOFacture($core->con);\r
@@ -520,18 +478,16 @@ class extranetAjax {
                $x->addRedirection(SITE_PATH . 'editefacture/' . $facture->facture_id);\r
        }\r
 \r
-       public static function formPrintFactures($args, &$x)\r
-       {\r
+       public static function formPrintFactures($args, &$x) {\r
                commonAjax::form('printFactures', __('Imprimer des factures'), extranetUrl::formPrintFactures(), __("Lancer l'impression"));\r
        }\r
 \r
-       public static function printFactures($args, &$x)\r
-       {\r
+       public static function printFactures($args, &$x) {\r
                global $core;\r
                $factures = cubeArray::parseRange($_POST['factures']);\r
 \r
                $liste = array();\r
-               foreach($factures as $f) {\r
+               foreach ($factures as $f) {\r
                        if (file_exists(ROOT . '/factures/' . $f . '.pdf')) {\r
                                $liste[] = ROOT . '/factures/' . $f . '.pdf';\r
                        }\r
@@ -550,10 +506,7 @@ class extranetAjax {
                $core->sauvePreferencesUtilisateur();\r
        }\r
 \r
-\r
-\r
-       public static function getAdresseForDevis($args, &$x)\r
-       {\r
+       public static function getAdresseForDevis($args, &$x) {\r
                $adresse = commonUrl::adresse($args[1], null, 'devis');\r
                if (!$adresse) {\r
                        $x->addError('client_nom', '');\r
@@ -562,8 +515,7 @@ class extranetAjax {
                }\r
        }\r
 \r
-       public static function getAdresseForFacture($args, &$x)\r
-       {\r
+       public static function getAdresseForFacture($args, &$x) {\r
                $adresse = commonUrl::adresse(null, $args[1], 'facture');\r
                if (!$adresse) {\r
                        $x->addError('projet_nom', '');\r
@@ -572,15 +524,13 @@ class extranetAjax {
                }\r
        }\r
 \r
-       public static function saveTrad($args, &$x)\r
-       {\r
+       public static function saveTrad($args, &$x) {\r
                $data = cubeLang::dataToFile($_POST);\r
                file_put_contents(L10N . '/en/main.lang.php', $data);\r
                $x->addAlert(__('Traductions sauvegardées'));\r
        }\r
 \r
-       public static function previewDevis($args, &$x)\r
-       {\r
+       public static function previewDevis($args, &$x) {\r
                global $core;\r
 \r
                $daoUtilisateur = new commonDAOUtilisateur($core->con);\r
@@ -597,8 +547,7 @@ class extranetAjax {
                $x->addRedirection(SITE_PATH . 'previewDevis/' . $devis->devis_id);\r
        }\r
 \r
-       public static function previewFacture($args, &$x)\r
-       {\r
+       public static function previewFacture($args, &$x) {\r
                global $core;\r
                commonDroits::min(1);\r
 \r
@@ -616,8 +565,7 @@ class extranetAjax {
                $x->addRedirection(SITE_PATH . 'previewFacture/' . $facture->facture_id);\r
        }\r
 \r
-       public static function chargesDetails($args, &$x)\r
-       {\r
+       public static function chargesDetails($args, &$x) {\r
                commonAjax::form('', sprintf(__("Détails des charges de l'année %s"), date('Y')), extranetPageChiffres::chargesDetails($args), '', 3, 'liste');\r
        }\r
 \r

diff --git a/inc/extranet/Controlleur/class.extranet.droits.php b/inc/extranet/Controlleur/class.extranet.droits.php
index 9cbe230284a507440da648b7b679b90cce2825db..9f623d1e1b168240d22c3a2b8fefcc944e450655 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.droits.php
+++ b/inc/extranet/Controlleur/class.extranet.droits.php
@@ -37,6 +37,7 @@ class extranetDroits {
 \r
        public static function projet($projet, $error)\r
        {\r
+               fb($projet);\r
                return self::verifDroits($projet->chef_id, 0, 'w', $error);\r
        }\r
 \r

diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index fe5435db19582cac5aa4a668a14650a3171192c0..1ccf63278721492a5cb2f7bec420aa533e82fa8a 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.url.php
+++ b/inc/extranet/Controlleur/class.extranet.url.php
@@ -431,6 +431,7 @@ class extranetUrl {
 \r
                $dao = new extranetDAOProjet($core->con);\r
                $projet = $dao->selectById($projet_id);\r
+               fb($projet_id);\r
 \r
                $hasFacture = $dao->hasFacture($projet_id);\r
 \r
@@ -533,9 +534,13 @@ class extranetUrl {
 \r
                $listeClients = array();\r
                foreach ($clients as $client) {\r
-                       $listeClients[$client->rs . ' (' . $client->prenom . ' ' . $client->nom . ')'] = $client->utilisateur_id;\r
+                       if (empty($client->utilisateur_id)) {\r
+                               continue;\r
+                       }\r
+                       $listeClients[trim($client->rs) . ' (' . $client->prenom . ' ' . $client->nom . ')'] = $client->utilisateur_id;\r
                }\r
                ksort($listeClients);\r
+               $listeClients = array_merge(array('--' => ''), $listeClients);\r
 \r
                $daoEquipier = new commonDAOEquipier($core->con);\r
                $equipiers = $daoEquipier->getListe();\r

diff --git a/inc/extranet/DAO/class.extranet.dao.projet.php b/inc/extranet/DAO/class.extranet.dao.projet.php
index 499c9808511640ce974977e1743e8fd9d6ae292f..0d61ff428935f38ea1c76b8c40a9851fca4484eb 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.projet.php
+++ b/inc/extranet/DAO/class.extranet.dao.projet.php
@@ -123,6 +123,7 @@ class extranetDAOProjet extends commonDAO {
        public function selectById($projet_id)\r
        {\r
                $r = $this->con->select('SELECT * FROM projets_vue WHERE projet_id=\'' . $this->con->escape($projet_id) . '\'');\r
+               \r
                $liste = $this->factory($r);\r
                if (count($liste)) {\r
                        return $liste[0];\r

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 7ab082246da6cdafe9c37fae3c12f01d843cf7a5..c0064b9deeca36105390097e8cee87b93de60039 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -583,7 +583,7 @@ class wsAjax extends cubeAjax {
                //$mail->to = 'tech@fluidbook.com';\r
                $mail->to = $r->email;\r
                $mail->bcc='tech@fluidbook.com';\r
-               fb($mail->send());\r
+               $mail->send();\r
        }\r
 \r
        public static function reponseDemande($args, &$x) {\r

diff --git a/inc/ws/Controlleur/class.ws.users.tree.php b/inc/ws/Controlleur/class.ws.users.tree.php
index d8e372eb214d8dc3c6fafde72eedfe1b5596bf7f..c7530f582372e5d48e194618c91514afe63bb4da 100644 (file)
--- a/inc/ws/Controlleur/class.ws.users.tree.php
+++ b/inc/ws/Controlleur/class.ws.users.tree.php
@@ -1,6 +1,7 @@
 <?php\r
 \r
 class wsUsersTree {\r
+\r
        protected $users;\r
        protected $admins;\r
        protected $grades;\r
@@ -8,16 +9,13 @@ class wsUsersTree {
        protected $rights;\r
        protected $entreprises;\r
        protected $entreprises_tree;\r
-\r
        protected $con;\r
 \r
-       public function __construct(&$con)\r
-       {\r
+       public function __construct(&$con) {\r
                $this->con = $con;\r
        }\r
 \r
-       public function refreshWSUsersTree()\r
-       {\r
+       public function refreshWSUsersTree() {\r
                $this->con->execute('TRUNCATE TABLE ws_users_tree');\r
                $this->con->execute('TRUNCATE TABLE ws_entreprises_tree');\r
 \r
@@ -28,7 +26,7 @@ class wsUsersTree {
 \r
                $this->rights = array();\r
 \r
-               $r = $this->con->select('SELECT * FROM utilisateurs u,entreprises e WHERE u.entreprise=e.entreprise_id AND e.ws_grade>0 ORDER BY e.ws_grade ASC');\r
+               $r = $this->con->select('SELECT * FROM utilisateurs u LEFT JOIN entreprises e ON u.entreprise=e.entreprise_id WHERE e.ws_grade>0 ORDER BY e.ws_grade ASC');\r
                while ($r->fetch()) {\r
                        $this->entreprises[$r->utilisateur_id] = $r->entreprise_id;\r
                        $this->users[$r->utilisateur_id] = $r->ws_admin;\r
@@ -49,13 +47,19 @@ class wsUsersTree {
 \r
                $evu = array();\r
 \r
-               foreach($this->users as $utilisateur_id => $admin) {\r
+               foreach ($this->users as $utilisateur_id => $admin) {\r
                        $facturable_id = $administrateur_id = 0;\r
                        $this->getFacturableOf($utilisateur_id, $facturable_id, $administrateur_id, 1);\r
+\r
+                       if (!isset($this->entreprises[$facturable_id]) || is_null($this->entreprises[$facturable_id])) {\r
+                               //$this->entreprises[$facturable_id]=$this->entreprises[$utilisateur_id];\r
+                       }\r
+\r
+\r
                        $c->utilisateur_id = $utilisateur_id;\r
                        $ce->entreprise_id = $c->entreprise_id = $this->entreprises[$utilisateur_id];\r
                        $c->facturable_id = $facturable_id;\r
-                       $ce->facturable_entreprise_id = $c->facturable_entreprise_id = $this->entreprises[$facturable_id] ;\r
+                       $ce->facturable_entreprise_id = $c->facturable_entreprise_id = $this->entreprises[$facturable_id];\r
                        $ce->administrateur_id = $c->administrateur_id = $administrateur_id;\r
                        $c->insert();\r
                        if (isset($evu[$c->entreprise_id])) {\r
@@ -65,11 +69,11 @@ class wsUsersTree {
                        $evu[$c->entreprise_id] = true;\r
                }\r
                // Fabrication de la liste des droits à partir de l'arbre\r
-               $j=0;\r
-               for($i = 1;$i <=5;$i++) {\r
-                       foreach($this->admins as $admin_id => $list) {\r
+               $j = 0;\r
+               for ($i = 1; $i <= 5; $i++) {\r
+                       foreach ($this->admins as $admin_id => $list) {\r
                                $newlist = $list;\r
-                               foreach($list as $uid) {\r
+                               foreach ($list as $uid) {\r
                                        if ($uid != $admin_id && isset($this->admins[$uid])) {\r
                                                $newlist = array_merge($this->admins[$uid], $newlist);\r
                                        }\r
@@ -78,38 +82,37 @@ class wsUsersTree {
                        }\r
                }\r
                // Ajout des droits personnels\r
-               foreach($this->users as $uid => $admin) {\r
+               foreach ($this->users as $uid => $admin) {\r
                        $this->admins[$uid][] = $uid;\r
                }\r
                // Echange des droits entre collègues\r
-               foreach($this->admins as $admin_id => $list) {\r
+               foreach ($this->admins as $admin_id => $list) {\r
                        $e = $this->entreprises[$admin_id];\r
                        $collegues = array_keys($this->entreprises, $e);\r
                        $newlist = $this->admins[$admin_id];\r
-                       foreach($collegues as $c) {\r
+                       foreach ($collegues as $c) {\r
                                $newlist = array_merge($newlist, $this->admins[$c]);\r
                        }\r
                        $newlist = array_unique($newlist);\r
                        $this->admins[$admin_id] = $newlist;\r
-                       foreach($collegues as $c) {\r
+                       foreach ($collegues as $c) {\r
                                $this->admins[$c] = $newlist;\r
                        }\r
                }\r
 \r
-               foreach($this->admins as $admin => $list) {\r
+               foreach ($this->admins as $admin => $list) {\r
                        $this->admins[$admin] = array_unique($list);\r
                        sort($this->admins[$admin]);\r
                }\r
 \r
                $c = $this->con->openCursor('utilisateurs');\r
-               foreach($this->admins as $admin => $list) {\r
+               foreach ($this->admins as $admin => $list) {\r
                        $c->ws_rights = implode(',', $list);\r
                        $c->update('WHERE utilisateur_id=\'' . $this->con->escape($admin) . '\'');\r
                }\r
        }\r
 \r
-       protected function getFacturableOf($utilisateur_id, &$facturable_id, &$administrateur_id, $level)\r
-       {\r
+       protected function getFacturableOf($utilisateur_id, &$facturable_id, &$administrateur_id, $level) {\r
                if (in_array($utilisateur_id, $this->facturables)) {\r
                        $facturable_id = $utilisateur_id;\r
                        $administrateur_id = $this->users[$utilisateur_id];\r
@@ -124,16 +127,17 @@ class wsUsersTree {
                return $this->getFacturableOf($this->users[$utilisateur_id], $facturable_id, $administrateur_id, $level + 1);\r
        }\r
 \r
-       protected function getFacturables()\r
-       {\r
+       protected function getFacturables() {\r
                $res = array();\r
-               foreach($this->users as $utilisateur_id => $admin) {\r
+               foreach ($this->users as $utilisateur_id => $admin) {\r
                        if ($this->grades[$admin] == 5) {\r
                                $res[] = $utilisateur_id;\r
                        }\r
                }\r
+               sort($res);\r
                return $res;\r
        }\r
+\r
 }\r
 \r
 ?>
\ No newline at end of file