From aa47e549ff2c6b7fa3b17e520d290b7dfee61d3f Mon Sep 17 00:00:00 2001 From: Lab 8916100448256 Date: Thu, 12 Nov 2020 18:55:32 +0100 Subject: [PATCH] Fix #6 --- boffice/agenda.php | 12 ++++----- boffice/generbargraf.php | 10 ++++---- boffice/index.php | 54 ++++++++++++++++++++++++---------------- index.php | 12 ++++----- 4 files changed, 50 insertions(+), 38 deletions(-) diff --git a/boffice/agenda.php b/boffice/agenda.php index b3d0b09..bd34964 100644 --- a/boffice/agenda.php +++ b/boffice/agenda.php @@ -11,11 +11,11 @@ $listjourheure = array(); $letabdesjours = array(1=>"Lun.",2=>"Mardi",3=>"Mercredi",4=>"Jeudi",5=>"Vendredi",6=>"Samedi",7=>"Dimanche"); -if($_GET['type']!='') $lasuite = " AND type='".$_GET['type']."' "; -elseif($_GET['theme']!='') $lasuite = " AND theme='".$_GET['theme']."' "; -elseif($_GET['lieu']!='') $lasuite = " AND lieu='".$_GET['lieu']."' "; -elseif($_GET['interv']!='') $lasuite = " AND intervenant='".$_GET['interv']."' "; -elseif($_GET['refer']!='') $lasuite = " AND referent='".$_GET['refer']."' "; +if(isset($_GET['type']) && $_GET['type']!='') $lasuite = " AND type='".$_GET['type']."' "; +elseif(isset($_GET['theme']) && $_GET['theme']!='') $lasuite = " AND theme='".$_GET['theme']."' "; +elseif(isset($_GET['lieu']) && $_GET['lieu']!='') $lasuite = " AND lieu='".$_GET['lieu']."' "; +elseif(isset($_GET['interv']) && $_GET['interv']!='') $lasuite = " AND intervenant='".$_GET['interv']."' "; +elseif(isset($_GET['refer']) && $_GET['refer']!='') $lasuite = " AND referent='".$_GET['refer']."' "; else $lasuite = ""; @@ -203,4 +203,4 @@ if(isset($_GET['refer']) && ($_GET['refer']!='')) echo "Référent :

- \ No newline at end of file + diff --git a/boffice/generbargraf.php b/boffice/generbargraf.php index 5da5b2a..4a694cb 100644 --- a/boffice/generbargraf.php +++ b/boffice/generbargraf.php @@ -8,9 +8,9 @@ include("./access.php"); $tabtime = array(); $listjourheure = array(); -if($_GET['type']!='') $lasuite = " AND type='".$_GET['type']."' "; -elseif($_GET['theme']!='') $lasuite = " AND theme='".$_GET['theme']."' "; -elseif($_GET['lieu']!='') $lasuite = " AND lieu='".$_GET['lieu']."' "; +if(isset($_GET['type']) && $_GET['type']!='') $lasuite = " AND type='".$_GET['type']."' "; +elseif(isset($_GET['theme']) && $_GET['theme']!='') $lasuite = " AND theme='".$_GET['theme']."' "; +elseif(isset($_GET['lieu']) && $_GET['lieu']!='') $lasuite = " AND lieu='".$_GET['lieu']."' "; else $lasuite = ""; @@ -126,7 +126,7 @@ td {padding:0px;margin:0px;} - \ No newline at end of file +?> diff --git a/boffice/index.php b/boffice/index.php index e3b56d2..290fb84 100644 --- a/boffice/index.php +++ b/boffice/index.php @@ -11,14 +11,14 @@ $resultat = mysqli_query($connect,$qda); list($cle,$jour,$heure,$heurefin,$lieu,$theme,$intervenant,$titre,$description,$valid,$onoff,$type,$referent,$secretaire,$rapporteur,$online) = mysqli_fetch_array($resultat); } -if($_GET['type']!='') $lasuite = " AND type='".$_GET['type']."' "; -elseif($_GET['theme']!='') $lasuite = " AND theme='".$_GET['theme']."' "; -elseif($_GET['lieu']!='') $lasuite = " AND lieu='".$_GET['lieu']."' "; -elseif($_GET['intervenant']!='') $lasuite = " AND intervenant='".$_GET['intervenant']."' "; -elseif($_GET['secretaire']!='') $lasuite = " AND secretaire='".$_GET['secretaire']."' "; -elseif($_GET['rapporteur']!='') $lasuite = " AND rapporteur='".$_GET['rapporteur']."' "; -elseif($_GET['referent']!='') $lasuite = " AND referent='".$_GET['referent']."' "; -elseif($_GET['quoi']!='') $lasuite = "AND theme='".$_GET['quoi']."'"; +if(isset($_GET['type']) && $_GET['type']!='') $lasuite = " AND type='".$_GET['type']."' "; +elseif(isset($_GET['theme']) && $_GET['theme']!='') $lasuite = " AND theme='".$_GET['theme']."' "; +elseif(isset($_GET['lieu']) && $_GET['lieu']!='') $lasuite = " AND lieu='".$_GET['lieu']."' "; +elseif(isset($_GET['intervenant']) && $_GET['intervenant']!='') $lasuite = " AND intervenant='".$_GET['intervenant']."' "; +elseif(isset($_GET['secretaire']) && $_GET['secretaire']!='') $lasuite = " AND secretaire='".$_GET['secretaire']."' "; +elseif(isset($_GET['rapporteur']) && $_GET['rapporteur']!='') $lasuite = " AND rapporteur='".$_GET['rapporteur']."' "; +elseif(isset($_GET['referent']) && $_GET['referent']!='') $lasuite = " AND referent='".$_GET['referent']."' "; +elseif(isset($_GET['quoi']) && $_GET['quoi']!='') $lasuite = "AND theme='".$_GET['quoi']."'"; else $lasuite = ""; $malistec = ""; @@ -37,7 +37,9 @@ foreach($tablojourmax as $lejour=>$lemax){ $malistec .= " ".$row['heure']." à ".$row['heurefin']." ".$lejour." ".$tablointervenant[$row['intervenant']]['prenom']." ".$tablointervenant[$row['intervenant']]['nom']." - ".$tablotheme[$row['theme']]." + "; + if($row['theme'] != 0) $malistec .= "".$tablotheme[$row['theme']].""; + $malistec .= " "; if($row['lieu'] != 0) $malistec .= "".$tablolieux[$row['lieu']].""; $malistec .= " @@ -47,10 +49,18 @@ foreach($tablojourmax as $lejour=>$lemax){ Modifier - ".$tabloreferent[$row['referent']]['nom']." - ".$tablosecretaire[$row['secretaire']]." - ".$tablorapporteur[$row['rapporteur']]." - ".$tablotypeinsc[$row['type']]." + "; + if($row['referent'] != 0) $malistec .= "".$tabloreferent[$row['referent']]['nom'].""; + $malistec .= " + "; + if($row['secretaire'] != 0) $malistec .= "".$tablosecretaire[$row['secretaire']].""; + $malistec .= " + "; + if($row['rapporteur'] != 0) $malistec .= "".$tablorapporteur[$row['rapporteur']].""; + $malistec .= " + "; + if($row['type'] != 0) $malistec .= "".$tablotypeinsc[$row['type']].""; + $malistec .= " "; } } @@ -350,11 +360,13 @@ foreach($tabloheure as $val) { echo "" Annexe

"; +} ?> @@ -365,7 +377,7 @@ Lieu
@@ -374,7 +386,7 @@ Thème
@@ -383,7 +395,7 @@ Intervenant
@@ -392,7 +404,7 @@ Référent @@ -402,7 +414,7 @@ Secrétaire
@@ -411,7 +423,7 @@ Rapporteur
@@ -430,7 +442,7 @@ Type d'intervention

@@ -471,4 +483,4 @@ else echo ""; redim(); - \ No newline at end of file + diff --git a/index.php b/index.php index ce1b558..a116895 100644 --- a/index.php +++ b/index.php @@ -11,11 +11,11 @@ $listjourheure = array(); $letabdesjours = array(1=>"Lun.",2=>"Mardi",3=>"Mercredi",4=>"Jeudi",5=>"Vendredi",6=>"Samedi",7=>"Dimanche"); -if($_GET['type']!='') $lasuite = " AND type='".$_GET['type']."' "; -elseif($_GET['theme']!='') $lasuite = " AND theme='".$_GET['theme']."' "; -elseif($_GET['lieu']!='') $lasuite = " AND lieu='".$_GET['lieu']."' "; -elseif($_GET['interv']!='') $lasuite = " AND intervenant='".$_GET['interv']."' "; -elseif($_GET['refer']!='') $lasuite = " AND referent='".$_GET['refer']."' "; +if(isset($_GET['type']) && $_GET['type']!='') $lasuite = " AND type='".$_GET['type']."' "; +elseif(isset($_GET['theme']) && $_GET['theme']!='') $lasuite = " AND theme='".$_GET['theme']."' "; +elseif(isset($_GET['lieu']) && $_GET['lieu']!='') $lasuite = " AND lieu='".$_GET['lieu']."' "; +elseif(isset($_GET['interv']) && $_GET['interv']!='') $lasuite = " AND intervenant='".$_GET['interv']."' "; +elseif(isset($_GET['refer']) && $_GET['refer']!='') $lasuite = " AND referent='".$_GET['refer']."' "; else $lasuite = ""; @@ -218,4 +218,4 @@ if(isset($_GET['refer']) && ($_GET['refer']!='')) echo "Référent :

- \ No newline at end of file +