(no commit message)

diff --git a/inc/commons/class.common.filtre.php b/inc/commons/class.common.filtre.php
index f5d555b43c518523ff8a6a092c24a25bd6bc914a..d5c04e3a8f5f90db84b3613356e96a1ff8509e92 100644 (file)
--- a/inc/commons/class.common.filtre.php
+++ b/inc/commons/class.common.filtre.php
@@ -99,7 +99,7 @@ class commonFiltre {
 \r
        public static function test($varname, $settings)\r
        {\r
-               $f = new extranetFiltre(__(''), $varname, array());\r
+               $f = new commonFiltre(__(''), $varname, array());\r
                return isset($settings[$varname]) && count($f->values) > count($settings[$varname]) && count($settings[$varname]);\r
        }\r
 }\r

diff --git a/inc/commons/class.common.page.php b/inc/commons/class.common.page.php
index 2b3f2643485fa10464e846533edb99649464c55e..a54ef7d9a19f14c501cf03cf14f70ba393d9602b 100644 (file)
--- a/inc/commons/class.common.page.php
+++ b/inc/commons/class.common.page.php
@@ -102,7 +102,7 @@ class commonPage {
                        $hasRealFilters = false;\r
                        foreach($filtres as $filtre) {\r
                                $res .= $filtre->display();\r
-                               if ($filtre instanceof extranetFiltre) {\r
+                               if ($filtre instanceof commonFiltre) {\r
                                        $hasRealFilters = true;\r
                                }\r
                        }\r

diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index e1d1d2a5700bc48784e51ea8b0fa765852e66b2f..b3ac2d7c86ee752c4e92de8b9aa22ea0cf05f24c 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.url.php
+++ b/inc/extranet/Controlleur/class.extranet.url.php
@@ -154,8 +154,8 @@ class extranetUrl {
                $shortcuts = array();\r
                $shortcuts[] = '<a href="#" class="popup" rel="formClient/new">' . $core->typo->Ajouter('Créer un nouveau client') . '</a>';\r
                $filtres = array();\r
-               $filtres[] = new extranetFiltre(__('Ayant un projet'), 'status_client_projet', $settings['filtres']);\r
-               $filtres[] = new extranetFiltre(__('Ayant des impayés'), 'impaye', $settings['filtres']);\r
+               $filtres[] = new commonFiltre(__('Ayant un projet'), 'status_client_projet', $settings['filtres']);\r
+               $filtres[] = new commonFiltre(__('Ayant des impayés'), 'impaye', $settings['filtres']);\r
                $res = commonPage::barre($filtres, 'filtreClients', 'clients', $shortcuts);\r
                $res .= commonPage::tMain();\r
                $res .= commonPage::bh();\r
@@ -422,9 +422,9 @@ class extranetUrl {
                $shortcuts[] = '<a href="#" class="popup" rel="formProjet/new">' . $core->typo->Ajouter('Créer un projet') . '</a>';\r
 \r
                $filtres = array();\r
-               $filtres[] = new extranetFiltre(__('Crée par'), 'equipier', $settings['filtres']);\r
-               $filtres[] = new extranetFiltre(__('Status'), 'status_projet', $settings['filtres']);\r
-               $filtres[] = new extranetFiltre(__('Année'), 'annee', $settings['filtres']);\r
+               $filtres[] = new commonFiltre(__('Crée par'), 'equipier', $settings['filtres']);\r
+               $filtres[] = new commonFiltre(__('Status'), 'status_projet', $settings['filtres']);\r
+               $filtres[] = new commonFiltre(__('Année'), 'annee', $settings['filtres']);\r
 \r
                $res = commonPage::barre($filtres, 'filtreProjet', 'projets', $shortcuts);\r
                $res .= commonPage::tMain();\r
@@ -763,7 +763,7 @@ class extranetUrl {
                extranetDroits::min(1);\r
                $settings = $core->user->getSettings('timereport');\r
                $filtres = array();\r
-               $filtres[] = new extranetFiltre(__('Participants'), 'equipier_participe', $settings['filtres']);\r
+               $filtres[] = new commonFiltre(__('Participants'), 'equipier_participe', $settings['filtres']);\r
                $res = commonPage::barre($filtres, 'filtreTimereport', 'timereport', null);\r
                $res .= commonPage::tMain();\r
                $res .= commonPage::bh();\r
@@ -901,9 +901,9 @@ class extranetUrl {
                $shortcuts[] = '<a href="' . SITE_PATH . 'editedevis/new">' . $core->typo->Ajouter('Créer un devis') . '</a>';\r
 \r
                $filtres = array();\r
-               $filtres[] = new extranetFiltre(__('Créées par'), 'equipier', $settings['filtres']);\r
-               $filtres[] = new extranetFiltre(__('Status'), 'status_devis', $settings['filtres']);\r
-               $filtres[] = new extranetFiltre(__('Année'), 'annee_facture', $settings['filtres']);\r
+               $filtres[] = new commonFiltre(__('Créées par'), 'equipier', $settings['filtres']);\r
+               $filtres[] = new commonFiltre(__('Status'), 'status_devis', $settings['filtres']);\r
+               $filtres[] = new commonFiltre(__('Année'), 'annee_facture', $settings['filtres']);\r
 \r
                $res = commonPage::barre($filtres, 'filtreDevis', 'devis' , $shortcuts);\r
                $res .= commonPage::tMain();\r
@@ -1271,9 +1271,9 @@ class extranetUrl {
                }\r
                $shortcuts[] = '<a href="#" rel="formPrintFactures" title="Imprimer les factures" class="popup">' . cubeMedia::image(IMG . '/print.png') . '</a>';\r
                $filtres = array();\r
-               $filtres[] = new extranetFiltre(__('Créées par'), 'equipier', $settings['filtres']);\r
-               $filtres[] = new extranetFiltre(__('Status'), 'status_facture', $settings['filtres']);\r
-               $filtres[] = new extranetFiltre(__('Année'), 'annee_facture', $settings['filtres']);\r
+               $filtres[] = new commonFiltre(__('Créées par'), 'equipier', $settings['filtres']);\r
+               $filtres[] = new commonFiltre(__('Status'), 'status_facture', $settings['filtres']);\r
+               $filtres[] = new commonFiltre(__('Année'), 'annee_facture', $settings['filtres']);\r
                $res = commonPage::barre($filtres , 'filtreFactures', 'factures', $shortcuts);\r
                $res .= commonPage::tMain();\r
                $res .= commonPage::bh();\r

diff --git a/inc/extranet/DAO/class.extranet.dao.client.php b/inc/extranet/DAO/class.extranet.dao.client.php
index 99f7bf1e27692ecae840f0e0adb412b3e4864ca9..c407cea53699c69631165362e40eb1491af1a4de 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.client.php
+++ b/inc/extranet/DAO/class.extranet.dao.client.php
@@ -79,10 +79,10 @@ class extranetDAOClient extends extranetDAOUtilisateur {
        {\r
                if (!is_null($this->filtres)) {\r
                        $w = array('1=1');\r
-                       if (extranetFiltre::test('status_client_projet', $this->filtres)) {\r
+                       if (commonFiltre::test('status_client_projet', $this->filtres)) {\r
                                $w[] = 'utilisateur_id IN(SELECT client FROM projets WHERE status IN(' . implode(',', array_keys($this->filtres['status_client_projet'])) . '))';\r
                        }\r
-                       if (extranetFiltre::test('impaye', $this->filtres)) {\r
+                       if (commonFiltre::test('impaye', $this->filtres)) {\r
                                if (isset($this->filtres['impaye'][1])) {\r
                                        $w[] = '(impaye>0 OR impaye IS NOT NULL)';\r
                                } else {\r

diff --git a/inc/extranet/DAO/class.extranet.dao.devis.php b/inc/extranet/DAO/class.extranet.dao.devis.php
index 9f7e8f07189c32f52c110f6b77a175d8c49ab0b6..9b48364d2b95c692f1a3d5f8ac408070cddfe459 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.devis.php
+++ b/inc/extranet/DAO/class.extranet.dao.devis.php
@@ -303,13 +303,13 @@ class extranetDAODevis extends extranetDAO {
        {\r
                if (!is_null($this->filtres)) {\r
                        $w = array('1=1');\r
-                       if (extranetFiltre::test('annee_facture', $this->filtres)) {\r
+                       if (commonFiltre::test('annee_facture', $this->filtres)) {\r
                                $w[] = 'YEAR(FROM_UNIXTIME(date_creation)) IN (' . implode(',', array_keys($this->filtres['annee_facture'])) . ')';\r
                        }\r
-                       if (extranetFiltre::test('status_devis', $this->filtres)) {\r
+                       if (commonFiltre::test('status_devis', $this->filtres)) {\r
                                $w[] = 'status IN(' . implode(',', array_keys($this->filtres['status_devis'])) . ')';\r
                        }\r
-                       if (extranetFiltre::test('equipier', $this->filtres)) {\r
+                       if (commonFiltre::test('equipier', $this->filtres)) {\r
                                $w[] = 'createur_id IN(' . implode(',', array_keys($this->filtres['equipier'])) . ')';\r
                        }\r
                        return implode(' AND ', $w);\r

diff --git a/inc/extranet/DAO/class.extranet.dao.facture.php b/inc/extranet/DAO/class.extranet.dao.facture.php
index 7cb54dd6a782575b59620f14427466469b21a425..2e62a34d65e3df07d1d4642fe560421cf0efd4ba 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.facture.php
+++ b/inc/extranet/DAO/class.extranet.dao.facture.php
@@ -360,13 +360,13 @@ class extranetDAOFacture extends extranetDAO {
        {\r
                if (!is_null($this->filtres)) {\r
                        $w = array('1=1');\r
-                       if (extranetFiltre::test('annee_facture', $this->filtres)) {\r
+                       if (commonFiltre::test('annee_facture', $this->filtres)) {\r
                                $w[] = 'YEAR(FROM_UNIXTIME(date_creation)) IN (' . implode(',', array_keys($this->filtres['annee_facture'])) . ')';\r
                        }\r
-                       if (extranetFiltre::test('status_facture', $this->filtres)) {\r
+                       if (commonFiltre::test('status_facture', $this->filtres)) {\r
                                $w[] = 'status IN(' . implode(',', array_keys($this->filtres['status_facture'])) . ')';\r
                        }\r
-                       if (extranetFiltre::test('equipier', $this->filtres)) {\r
+                       if (commonFiltre::test('equipier', $this->filtres)) {\r
                                $w[] = 'createur_id IN(' . implode(',', array_keys($this->filtres['equipier'])) . ')';\r
                        }\r
                        return implode(' AND ', $w);\r

diff --git a/inc/extranet/DAO/class.extranet.dao.projet.php b/inc/extranet/DAO/class.extranet.dao.projet.php
index e87a1a5163f9549470b65b00dd6e8f3cabb717e4..44c2236ede644c7a4de6f2d62f99645161faa9de 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.projet.php
+++ b/inc/extranet/DAO/class.extranet.dao.projet.php
@@ -252,10 +252,10 @@ class extranetDAOProjet extends extranetDAO {
        {\r
                if (!is_null($this->filtres)) {\r
                        $w = array('1=1');\r
-                       if (extranetFiltre::test('annee', $this->filtres)) {\r
+                       if (commonFiltre::test('annee', $this->filtres)) {\r
                                $w[] = 'annee_fin IN (' . implode(',', array_keys($this->filtres['annee'])) . ')';\r
                        }\r
-                       if (extranetFiltre::test('status_projet', $this->filtres)) {\r
+                       if (commonFiltre::test('status_projet', $this->filtres)) {\r
                                $p = array();\r
                                foreach($this->filtres['status_projet'] as $k => $v) {\r
                                        list($rub, $val) = explode('_', $k);\r
@@ -273,10 +273,10 @@ class extranetDAOProjet extends extranetDAO {
                                        }\r
                                }\r
                        }\r
-                       if (extranetFiltre::test('equipier', $this->filtres)) {\r
+                       if (commonFiltre::test('equipier', $this->filtres)) {\r
                                $w[] = 'chef_id IN(' . implode(',', array_keys($this->filtres['equipier'])) . ')';\r
                        }\r
-                       if (extranetFiltre::test('equipier_participe', $this->filtres)) {\r
+                       if (commonFiltre::test('equipier_participe', $this->filtres)) {\r
                                $w[] = 'p.projet_id IN(SELECT projet FROM taches WHERE tache_id IN(SELECT tache_id FROM timereport WHERE utilisateur_id IN (' . implode(',', array_keys($this->filtres['equipier_participe'])) . '))) ';\r
                        }\r
                        return implode("\n" . ' AND ' . "\n", $w);\r

diff --git a/inc/ws/Controlleur/class.ws.stats.php b/inc/ws/Controlleur/class.ws.stats.php
index 8a42b618ac11325b63ac5517320514ef1d5290ad..9a43a10dcf6bdf0ab16f5eafb4f550abce34ec34 100644 (file)
--- a/inc/ws/Controlleur/class.ws.stats.php
+++ b/inc/ws/Controlleur/class.ws.stats.php
@@ -39,14 +39,14 @@ class wsStats {
                                        }\r
                                        $moiss[cubeDate::getMonth((string)$m['month'])] = SITE_PATH . 'stats/' . $bid . '/' . (string)$y['year'] . '/' . (string)$m['month'];\r
                                }\r
-                               $listeMois = new extranetShortcuts(__('Mois'), $moiss, $selectedMonth);\r
+                               $listeMois = new commonShortcuts(__('Mois'), $moiss, $selectedMonth);\r
                        }\r
                        if ((string)$y['year'] == $annee) {\r
                                $selectedYear = $annee;\r
                        }\r
                        $annees[(string)$y['year']] = SITE_PATH . 'stats/' . $bid . '/' . (string)$y['year'];\r
                }\r
-               $listeAnnees = new extranetShortcuts(__('Année'), $annees, $selectedYear);\r
+               $listeAnnees = new commonShortcuts(__('Année'), $annees, $selectedYear);\r
                $listeShortcuts[] = $listeAnnees;\r
                if (!is_null($listeMois)) {\r
                        $listeShortcuts[] = $listeMois;\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index db3e4e67d8453a98f75ef0291dcdfadc481b3679..81e31cc9f4c79574e1fbb1ae6f41a82b4271803d 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -10,8 +10,8 @@ class wsUrl {
                $shortcuts[] = '<a href="#" class="popup" rel="newBookForm">' . $core->typo->Ajouter(__('Créer une nouvelle publication')) . '</a>';\r
 \r
                $filtres = array();\r
-               $filtres[] = new extranetFiltre(__('Status'), 'status_book', $settings['filtres']);\r
-               $filtres[] = new extranetFiltre(__('Année'), 'annee_book', $settings['filtres']);\r
+               $filtres[] = new commonFiltre(__('Status'), 'status_book', $settings['filtres']);\r
+               $filtres[] = new commonFiltre(__('Année'), 'annee_book', $settings['filtres']);\r
                $res = commonPage::barre($filtres , 'filtreBooks', 'books', $shortcuts);\r
                $res .= commonPage::tMain(null, true);\r
                $res .= commonPage::bh();\r
@@ -380,8 +380,8 @@ html{height:100%}' . "\n";
                $shortcuts = array();\r
                $shortcuts[] = '<a href="#" class="popup" rel="formClient/new">' . $core->typo->Ajouter('Créer un nouveau client') . '</a>';\r
                $filtres = array();\r
-               $filtres[] = new extranetFiltre(__('Ayant un projet'), 'status_client_projet', $settings['filtres']);\r
-               $filtres[] = new extranetFiltre(__('Ayant des impayés'), 'impaye', $settings['filtres']);\r
+               $filtres[] = new commonFiltre(__('Ayant un projet'), 'status_client_projet', $settings['filtres']);\r
+               $filtres[] = new commonFiltre(__('Ayant des impayés'), 'impaye', $settings['filtres']);\r
                $res = commonPage::barre($filtres, 'filtreClients', 'clients', $shortcuts);\r
                $res .= commonPage::tMain();\r
                $res .= commonPage::bh();\r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 4f90354e48637f2fd426207889e0b86ac83c8cd1..1a26893eff0a7e2bf25366d98d556ac79df597fd 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -276,10 +276,10 @@ class wsDAOBook extends extranetDAO {
        {\r
                if (!is_null($this->filtres)) {\r
                        $w = array('1=1');\r
-                       if (extranetFiltre::test('annee_book', $this->filtres)) {\r
+                       if (commonFiltre::test('annee_book', $this->filtres)) {\r
                                $w[] = 'YEAR(FROM_UNIXTIME(date)) IN (' . implode(',', array_keys($this->filtres['annee_book'])) . ')';\r
                        }\r
-                       if (extranetFiltre::test('status_book', $this->filtres)) {\r
+                       if (commonFiltre::test('status_book', $this->filtres)) {\r
                                $w[] = 'status IN(' . implode(',', array_keys($this->filtres['status_book'])) . ')';\r
                        }\r
                        return implode(' AND ', $w);\r