From f3ea8efa84329887e60e1aed274dc06faaba4efd Mon Sep 17 00:00:00 2001
From: warmels <sdos@astron.nl>
Date: Thu, 12 Jul 2007 09:24:15 +0000
Subject: [PATCH] BugID: 1079

bezig met main: compatibel maken met het admin gedeelte + componenten structuur aangemaakt + comp overzicht gemaakt
---
 .../tool/CRAFT/admin_gebruikers/bewerken.php  |  57 ++++--
 .../tool/CRAFT/admin_gebruikers/toevoegen.php |   6 +-
 .../tool/CRAFT/admin_meldingen/toevoegen.php  |   2 +-
 .../CRAFT/admin_meldingen/verwijderen.php     |   4 +-
 .../componenten_per_type.php                  |  30 +++
 .../algemene_functionaliteit/contact.php      |  47 +++++
 .../algemene_functionaliteit/gebruiker.php    |  27 +++
 .../algemene_functionaliteit/locatie.php      |  32 ++++
 .../melding_historie.php}                     |   4 +-
 .../melding_info.php                          |   0
 support/tool/CRAFT/documentatie/changes.doc   | Bin 27136 -> 29184 bytes
 support/tool/CRAFT/includes/admin_menu.php    |   2 +-
 support/tool/CRAFT/includes/login_funcs.php   |  13 +-
 .../tool/CRAFT/includes/stylesheet_1024.css   |   4 +
 .../tool/CRAFT/includes/stylesheet_1280.css   |   3 +
 support/tool/CRAFT/includes/tree_items.php    |  10 +-
 support/tool/CRAFT/main.php                   |  19 +-
 support/tool/CRAFT/main/componenten.php       |  10 -
 .../CRAFT/main_componenten/Comp_Overzicht.php |  32 ++++
 .../CRAFT/main_componenten/Type_Overzicht.php |  31 +++
 .../tool/CRAFT/main_componenten/bewerken.php  |  36 ++++
 .../tool/CRAFT/main_componenten/overzicht.php | 178 ++++++++++++++++++
 .../tool/CRAFT/main_componenten/toevoegen.php |  43 +++++
 .../CRAFT/main_componenten/verwijderen.php    |  36 ++++
 24 files changed, 588 insertions(+), 38 deletions(-)
 create mode 100644 support/tool/CRAFT/algemene_functionaliteit/componenten_per_type.php
 create mode 100644 support/tool/CRAFT/algemene_functionaliteit/contact.php
 create mode 100644 support/tool/CRAFT/algemene_functionaliteit/gebruiker.php
 create mode 100644 support/tool/CRAFT/algemene_functionaliteit/locatie.php
 rename support/tool/CRAFT/{admin_meldingen/historie.php => algemene_functionaliteit/melding_historie.php} (87%)
 rename support/tool/CRAFT/{admin_meldingen => algemene_functionaliteit}/melding_info.php (100%)
 delete mode 100644 support/tool/CRAFT/main/componenten.php
 create mode 100644 support/tool/CRAFT/main_componenten/Comp_Overzicht.php
 create mode 100644 support/tool/CRAFT/main_componenten/Type_Overzicht.php
 create mode 100644 support/tool/CRAFT/main_componenten/bewerken.php
 create mode 100644 support/tool/CRAFT/main_componenten/overzicht.php
 create mode 100644 support/tool/CRAFT/main_componenten/toevoegen.php
 create mode 100644 support/tool/CRAFT/main_componenten/verwijderen.php

diff --git a/support/tool/CRAFT/admin_gebruikers/bewerken.php b/support/tool/CRAFT/admin_gebruikers/bewerken.php
index bdd7e554102..551ed16adc0 100644
--- a/support/tool/CRAFT/admin_gebruikers/bewerken.php
+++ b/support/tool/CRAFT/admin_gebruikers/bewerken.php
@@ -5,6 +5,7 @@
 	  
 	  require_once($_SESSION['pagina'] . 'includes/login_funcs.php');
 		include_once($_SESSION['pagina'] . 'includes/controle_functies.php');  
+		include_once($_SESSION['pagina'] . 'includes/datum_tijd_functies.php');
 		
 	  //controleren of er iemand ingelogd is...
 	  if ($LOGGED_IN = user_isloggedin()) {
@@ -35,26 +36,46 @@
 								if ($_POST['Gebr_Naam'] == '')
 									return false;
 							} else return false;
-	 	    			
-	 	    			//Wachtwoord
-							if (isset($_POST['Wachtwoord'])) {
-								if ($_POST['Wachtwoord'] == '')
-									return false;
-							} else return false;
-	
+	 	    				
 	 	    			//Gebr_Email
 							if (isset($_POST['Gebr_Email'])) {
 								if ($_POST['Gebr_Email'] != '' && !mail_check($_POST['Gebr_Email']))
 									return false;
 							} else return false;
 	
+							//Laatst_Ingelogd
+		  				if (isset($_POST['Inlog_Datum'])) {
+		  					//wanneer de Inlog_Datum ingevuld is, dan... 
+		  					if($_POST['Inlog_Datum'] !='') {
+		
+		   						//controleren op de juiste samenstelling van de Inlog_Datum
+			   					if (Valideer_Datum($_POST['Inlog_Datum']) == false)
+			   						return false;
+		  						//controleren of de tijd correct ingevoerd is
+		    					if(isset($_POST['Inlog_Tijd'])) {
+		    						if (Valideer_Tijd($_POST['Inlog_Tijd']) == false)
+		    					 		return false;
+		  						} else return false;
+		   					} else return false;
+		     			} else return false;
+	
 	 	    			return true;
 	 	    		}
 				
 					if(Valideer_Invoer()) {
-						$query = "UPDATE gebruiker SET inlognaam = '". $_POST['Gebr_Naam'] ."', Wachtwoord = '". md5($_POST['Wachtwoord']) ."', Start_Alg='". $_POST['Alg_Start'] ."'";
+						$query = "UPDATE gebruiker SET inlognaam = '". $_POST['Gebr_Naam'] ."', ";
+						if ($_POST['Wachtwoord'] != '')
+							$query = $query . "Wachtwoord = '". md5($_POST['Wachtwoord']) ."', ";
+						
+						$query = $query . "Start_Alg='". $_POST['Alg_Start'] ."'";
 						$query = $query . ", Start_Comp='". $_POST['Comp_Start'] ."', Start_Melding = '". $_POST['Melding_Start'] ."', Start_Stats='". $_POST['Stats_Start'] ."'";
 						$query = $query . ", Groep_ID = '". $_POST['Gebr_Groep'] ."', Gebruiker_Taal='". $_POST['Gebr_Taal'] ."', Emailadres = '". $_POST['Gebr_Email'] ."'";
+
+	  				//de waarde voor de inlogdatum aan de query toevoegen
+	  				if (isset($_POST['Inlog_Datum']) && $_POST['Inlog_Datum'] != '') {
+	    				$datum = split("-",$_POST['Inlog_Datum']);
+	    				$query = $query . ", Laatst_Ingelogd = '". $datum[2]."-".$datum[1]."-".$datum[0] ." ". $_POST['Inlog_Tijd'] .":00'";
+	  				}
 						$query = $query . " WHERE Werknem_ID = '" . $_GET['c'] . "'";
 						
 						if (mysql_query($query)) echo("De gewijzigde gebruiker \"". $_POST['Gebr_Naam'] ."\" is in het systeem bijgewerkt<br>");
@@ -95,9 +116,7 @@
 	    				</tr>
 	    				<tr>
 	    					<td>Wachtwoord:</td>
-	    					<td><input name="Wachtwoord" type="password">
-		    				  <?php if(isset($_POST['Wachtwoord']) && $_POST['Wachtwoord'] == '') echo('<b>* Er is geen wachtwoord ingevoerd!</b>'); ?>
-		    				</td>
+	    					<td><input name="Wachtwoord" type="password"></td>
 	    				</tr>
 	    				<tr>
 	    					<td>E-mailadres:</td>
@@ -188,6 +207,22 @@
 	   							<option value="4" <?php if($selectie == 4) echo('SELECTED'); ?>>Statistieken verwijderen</option>
 	   						</select></td>
 	    				</tr>
+	    				<tr>
+	    					<td>Laatste inlog:</td>
+	    					<td>
+									<?php 
+										//splitten op de spatie (formaat is als volgt: 2007-08-26 12:01:56)
+			    					$gedeeldveld=split(" ",$row['Laatst_Ingelogd']);
+										//datum veld opdelen zodat de jaar, maand en dagvelden makkelijk te benaderen zijn
+										$datum = split("-",$gedeeldveld[0]);
+										//tijd veld opdelen zodat de uren, minuten en secondevelden makkelijk te benaderen zijn
+										$tijd = split(":",$gedeeldveld[1]);
+									 ?>
+									<input name="Inlog_Datum" type="text" size="8" maxlength="10" value="<?php if(isset($_POST['Inlog_Datum'])) echo(htmlentities($_POST['Inlog_Datum'], ENT_QUOTES)); else echo($datum[2] ."-". $datum[1] ."-". $datum[0]); ?>">
+									<input name="Inlog_Tijd" type="text" size="2" maxlength="5" value="<?php if(isset($_POST['Inlog_Tijd'])) echo(htmlentities($_POST['Inlog_Tijd'], ENT_QUOTES)); else echo($tijd[0] .":". $tijd[1]); ?>">	    						
+	    					  <?php if(isset($_POST['Inlog_Datum']) && (!Valideer_Datum($_POST['Inlog_Datum']) || !Valideer_Tijd($_POST['Inlog_Tijd']))) echo('<b>* De ingevoerde datum/tijd is onjuist samengesteld!</b>'); ?></td>
+	    					</td>
+	    				</tr>
 	    				<tr>
 			    			<td><input name="opslaan" type="hidden" value="1"></td>
 	    					<td><a href="javascript:document.theForm.submit();">Opslaan</a></td>
diff --git a/support/tool/CRAFT/admin_gebruikers/toevoegen.php b/support/tool/CRAFT/admin_gebruikers/toevoegen.php
index d26a17330a8..11b6e75563e 100644
--- a/support/tool/CRAFT/admin_gebruikers/toevoegen.php
+++ b/support/tool/CRAFT/admin_gebruikers/toevoegen.php
@@ -52,9 +52,9 @@
 	 	    		
 	 	    		
 	 	    		if (Valideer_Invoer()) {
-							$query = "INSERT INTO gebruiker (inlognaam, Wachtwoord, Start_Alg, Start_Comp, Start_Melding, Start_Stats, Groep_ID, Gebruiker_Taal, Emailadres) ";
-							$query = $query . "VALUES ('". $_POST['Gebr_Naam'] ."', '". md5($_POST['Wachtwoord']) ."', '". $_POST['Alg_Start'] ."' ,'". $_POST['Comp_Start'] ."', ";
-							$query = $query . "'". $_POST['Melding_Start'] ."', '". $_POST['Stats_Start'] ."', '" . $_POST['Gebr_Groep'] ."', '". $_POST['Gebr_Taal'] ."', '". $_POST['Gebr_Email'] ."')";
+							$query = "INSERT INTO gebruiker (inlognaam, Wachtwoord, Start_Alg, Start_Comp, Start_Melding, Start_Stats, Groep_ID, Gebruiker_Taal, Emailadres, Laatst_Ingelogd) ";
+							$query = $query . "VALUES ('". $_POST['Gebr_Naam'] ."', '". md5($_POST['Wachtwoord']) ."', '". $_POST['Alg_Start'] ."' ,'". $_POST['Comp_Start'] ."', '". $_POST['Melding_Start'];
+							$query = $query . "', '". $_POST['Stats_Start'] ."', '" . $_POST['Gebr_Groep'] ."', '". $_POST['Gebr_Taal'] ."', '". $_POST['Gebr_Email'] ."', NOW())";
 							
 							if (mysql_query($query)) echo("De nieuwe gebruiker \"". $_POST['Gebr_Naam'] ."\" is aan het systeem toegevoegd<br>");
 							else echo("De nieuwe gebruiker \"". $_POST['Gebr_Naam'] ."\" kon niet aan het systeem toegevoegd worden!.");
diff --git a/support/tool/CRAFT/admin_meldingen/toevoegen.php b/support/tool/CRAFT/admin_meldingen/toevoegen.php
index 24386d78e73..5f24751112c 100644
--- a/support/tool/CRAFT/admin_meldingen/toevoegen.php
+++ b/support/tool/CRAFT/admin_meldingen/toevoegen.php
@@ -197,7 +197,7 @@
 				    			</tr>
 				    			<tr>
 				    				<td>Historie:</td>
-				    				<td><iframe id="frame_historie" name="frame_historie" align="middle" marginwidth="0" marginheight="0" src="<?php echo($_SESSION['pagina']); ?>admin_meldingen/historie.php <?php if(isset($_GET['c'])) echo("?c=".$_GET['c']); ?>" width="425" height="105" ALLOWTRANSPARENCY frameborder="0" scrolling="auto"></iframe></td>
+				    				<td><iframe id="frame_historie" name="frame_historie" align="middle" marginwidth="0" marginheight="0" src="<?php echo($_SESSION['pagina']); ?>algemene_functionaliteit/melding_historie.php <?php if(isset($_GET['c'])) echo("?c=".$_GET['c']); ?>" width="425" height="105" ALLOWTRANSPARENCY frameborder="0" scrolling="auto"></iframe></td>
 				    			</tr>
 				    			<tr>
 				    				<td>
diff --git a/support/tool/CRAFT/admin_meldingen/verwijderen.php b/support/tool/CRAFT/admin_meldingen/verwijderen.php
index 509c647156e..f07b70f6402 100644
--- a/support/tool/CRAFT/admin_meldingen/verwijderen.php
+++ b/support/tool/CRAFT/admin_meldingen/verwijderen.php
@@ -66,7 +66,7 @@
 	
 							//tabel aanmaken om de gegevens in te tonen
 							echo("<table border=\"1\">\n");
-							echo("<tr><td><input type=\"checkbox\" name=\"cVerwijderen\" CHECKED></td><td>" . substr($data['Prob_Beschrijving'], 0, 40) . "...</td><td>". $datum[2] ."-". $datum[1] ."-". $datum[0]. "</td><td><a href=\"".$_SESSION['pagina']."admin_meldingen/melding_info.php?c=".$data['Meld_Lijst_ID']."\" target=\"_blank\">Bekijken</a></td></tr>\n");
+							echo("<tr><td><input type=\"checkbox\" name=\"cVerwijderen\" CHECKED></td><td>" . substr($data['Prob_Beschrijving'], 0, 40) . "...</td><td>". $datum[2] ."-". $datum[1] ."-". $datum[0]. "</td><td><a href=\"".$_SESSION['pagina']."algemene_functionaliteit/melding_info.php?c=".$data['Meld_Lijst_ID']."\" target=\"_blank\">Bekijken</a></td></tr>\n");
 							$melding = $data['Meld_Lijst_ID'];
 							$laatste = $data['Voorgaande_Melding'];
 							//terugwerken richting het begin van de meldingenketen
@@ -81,7 +81,7 @@
 								$datum = split("-",$gedeeldveld[0]);
 	
 								//tonen gegevens
-								echo("<tr><td>&nbsp</td><td>" .substr($data['Prob_Beschrijving'],0, 40) . "...</td><td>". $datum[2] ."-". $datum[1] ."-". $datum[0]. "</td><td><a href=\"".$_SESSION['pagina']."admin_meldingen/melding_info.php?c=".$data['Meld_Lijst_ID']."\" target=\"_blank\">Bekijken</a></td></tr>\n");
+								echo("<tr><td>&nbsp</td><td>" .substr($data['Prob_Beschrijving'],0, 40) . "...</td><td>". $datum[2] ."-". $datum[1] ."-". $datum[0]. "</td><td><a href=\"".$_SESSION['pagina']."algemene_functionaliteit/melding_info.php?c=".$data['Meld_Lijst_ID']."\" target=\"_blank\">Bekijken</a></td></tr>\n");
 							}
 							//afsluiten tabel
 							echo("</table>");
diff --git a/support/tool/CRAFT/algemene_functionaliteit/componenten_per_type.php b/support/tool/CRAFT/algemene_functionaliteit/componenten_per_type.php
new file mode 100644
index 00000000000..23f330c5868
--- /dev/null
+++ b/support/tool/CRAFT/algemene_functionaliteit/componenten_per_type.php
@@ -0,0 +1,30 @@
+<?php
+
+	session_start();
+
+	include_once("../includes/vars.php");
+
+	echo("<HTML>");
+	echo("<HEAD></HEAD>");
+	echo("<BODY bgcolor=\"#B3CCE6\">");
+	
+	if(isset($_GET['c']))  {
+		
+		$query = "SELECT Comp_Lijst_ID, Comp_Naam, Comp_Locatie FROM comp_lijst WHERE Comp_Type_ID = '". $_GET['c'] ."'";
+		$resultaat = mysql_query($query);
+
+		echo("<table border =\"1\">");
+			
+		while ($data = mysql_fetch_array($resultaat)) { 
+
+			$query = "SELECT Loc_Naam FROM comp_locatie WHERE Locatie_ID ='". $data['Comp_Locatie'] ."'";
+			$res = mysql_query($query);
+			$row = mysql_fetch_array($res);
+
+			echo("<tr><td>" .substr($data['Comp_Naam'], 0, 40) . "...</td><td>".$row['Loc_Naam']."</td><td><a href=\"../". $_SESSION['huidige_pagina']."&o=1&c=". $data['Comp_Lijst_ID'] ."\" target=\"_top\">Meer</a></td></tr>");
+		}
+		echo("</table>");
+	}
+	echo("</BODY>");
+	echo("</HTML>");
+?>
\ No newline at end of file
diff --git a/support/tool/CRAFT/algemene_functionaliteit/contact.php b/support/tool/CRAFT/algemene_functionaliteit/contact.php
new file mode 100644
index 00000000000..55f76f1aaa5
--- /dev/null
+++ b/support/tool/CRAFT/algemene_functionaliteit/contact.php
@@ -0,0 +1,47 @@
+<html>
+	<head></head>
+	<body>
+		<?php
+			include_once("../includes/vars.php");			
+			
+			if (isset($_GET['c'])) {
+				$query = "SELECT * FROM contact WHERE Contact_ID= '". $_GET['c'] ."'";
+				$resultaat = mysql_query($query);
+				$data = mysql_fetch_array($resultaat);
+				
+				echo("<h3>Gegevens van \"".$data['Contact_Naam']."\" </h3>");
+				echo("<table>");
+				echo("<tr><td>Contact ID:</td><td>" . $data['Contact_ID'] . "</td></tr>");
+				echo("<tr><td>Naam:</td><td>". $data['Contact_Naam'] . "</td></tr>");
+				echo("<tr><td>Functie:</td><td>" . $data['Contact_Functie'] . "</td></tr>");
+				echo("<tr><td>E-mail:</td><td>" . $data['Contact_Email'] . "</td></tr>");
+				echo("<tr><td>Telefoon (vast):</td><td>" . $data['Contact_Telefoon_Vast'] . "</td></tr>");
+				echo("<tr><td>Telefoon (mobiel):</td><td>" . $data['Contact_Telefoon_Mobiel'] . "</td></tr>");
+				echo("<tr><td>Telefoon (fax):</td><td>" . $data['Contact_Fax'] . "</td></tr>");
+				echo("<tr><td>Contact adres 1:</td><td>". $data['Contact_Adres1'] . "</td></tr>");
+				echo("<tr><td>Contact adres 2:</td><td>". $data['Contact_Adres2'] . "</td></tr>");
+				echo("<tr><td>Postcode:</td><td>" . $data['Contact_Postcode'] . "</td></tr>");
+				echo("<tr><td>Plaats:</td><td>" . $data['Contact_Woonplaats'] . "</td></tr>");
+				echo("</table>");
+				
+				
+				$contacten_array = array();
+	 	  	array_push($contacten_array, $data['Contact_Naam']);
+				while ($data['Contact_Parent']!= 1) {
+					$query = "SELECT Contact_Parent, Contact_Naam FROM contact WHERE Contact_ID = '".$data['Contact_Parent']."'";			
+					$resultaat = mysql_query($query);
+					$data = mysql_fetch_array($resultaat);
+		 	  	array_push($contacten_array, $data['Contact_Naam']);
+				}
+				
+				echo("<h3>Contact structuur:</h3>");
+				for ($i = (count($contacten_array)-1); $i >=0;  $i--) {
+					if ($i < (count($contacten_array)-1)) echo("&nbsp&nbsp<<&nbsp&nbsp");
+					echo($contacten_array[$i]);
+				}				
+			}
+		
+		
+		?>
+	</body>
+</html>
\ No newline at end of file
diff --git a/support/tool/CRAFT/algemene_functionaliteit/gebruiker.php b/support/tool/CRAFT/algemene_functionaliteit/gebruiker.php
new file mode 100644
index 00000000000..8daa2d1cde0
--- /dev/null
+++ b/support/tool/CRAFT/algemene_functionaliteit/gebruiker.php
@@ -0,0 +1,27 @@
+<html>
+	<head></head>
+	<body>
+		<?php
+			include_once("../includes/vars.php");			
+			
+			if (isset($_GET['c'])) {
+				$query = "SELECT * FROM gebruiker WHERE Werknem_ID= '". $_GET['c'] ."'";
+				$resultaat = mysql_query($query);
+				$data = mysql_fetch_array($resultaat);
+				
+				echo("<h3>Gegevens van \"".$data['inlognaam']."\" </h3>");
+				echo("<table>");
+				echo("<tr><td>Werknemer ID:</td><td>" . $data['Werknem_ID'] . "</td></tr>");
+				echo("<tr><td>Naam:</td><td>". $data['inlognaam'] . "</td></tr>");
+				echo("<tr><td>E-mail:</td><td>". $data['Emailadres'] . "</td></tr>");
+				echo("<tr><td>Groep:</td><td>");
+				
+				$query = "SELECT Groeps_Naam FROM gebruikers_groepen WHERE Groep_ID= '". $data['Groep_ID'] ."'";
+				$resultaat = mysql_query($query);
+				$data = mysql_fetch_array($resultaat);
+				echo($data['Groeps_Naam'] . "</td></tr>");
+				echo("</table>");
+			}
+		?>
+	</body>
+</html>
\ No newline at end of file
diff --git a/support/tool/CRAFT/algemene_functionaliteit/locatie.php b/support/tool/CRAFT/algemene_functionaliteit/locatie.php
new file mode 100644
index 00000000000..911e0cae2f9
--- /dev/null
+++ b/support/tool/CRAFT/algemene_functionaliteit/locatie.php
@@ -0,0 +1,32 @@
+<html>
+	<head></head>
+	<body>
+		<?php
+			include_once("../includes/vars.php");			
+			
+			if (isset($_GET['c'])) {
+				$query = "SELECT * FROM comp_locatie WHERE Locatie_ID= '". $_GET['c'] ."'";
+				$resultaat = mysql_query($query);
+				$data = mysql_fetch_array($resultaat);
+				
+				echo("<h3>Locatie gegevens van \"".$data['Loc_Naam']."\" </h3>");
+				echo("<table>");
+				echo("<tr><td>Locatie ID:</td><td>" . $data['Locatie_ID'] . "</td></tr>");
+				echo("<tr><td>Locatie naam:</td><td>". $data['Loc_Naam'] . "</td></tr>");
+				echo("<tr><td>Locatie adres 1:</td><td>". $data['Loc_Adres1'] . "</td></tr>");
+				echo("<tr><td>Locatie adres 2:</td><td>". $data['Loc_Adres2'] . "</td></tr>");
+				echo("<tr><td>Postcode:</td><td>" . $data['Loc_Postcode'] . "</td></tr>");
+				echo("<tr><td>Plaats:</td><td>" . $data['Loc_Woonplaats'] . "</td></tr>");
+				
+				echo("<tr><td>Longitude graden:</td><td>". $data['Long_Graden'] . "</td></tr>");
+				echo("<tr><td>Longitude minuten:</td><td>". $data['Long_Min'] . "</td></tr>");
+				echo("<tr><td>Longitude seconden:</td><td>". $data['Long_Sec'] . "</td></tr>");
+				echo("<tr><td>Latitude graden:</td><td>". $data['Lat_Graden'] . "</td></tr>");
+				echo("<tr><td>Latitude minuten:</td><td>". $data['Lat_Min'] . "</td></tr>");
+				echo("<tr><td>Latitude seconden:</td><td>". $data['Lat_Sec'] . "</td></tr>");
+
+				echo("</table>");
+			}
+		?>
+	</body>
+</html>
\ No newline at end of file
diff --git a/support/tool/CRAFT/admin_meldingen/historie.php b/support/tool/CRAFT/algemene_functionaliteit/melding_historie.php
similarity index 87%
rename from support/tool/CRAFT/admin_meldingen/historie.php
rename to support/tool/CRAFT/algemene_functionaliteit/melding_historie.php
index 1e99fc6239c..6c108406afc 100644
--- a/support/tool/CRAFT/admin_meldingen/historie.php
+++ b/support/tool/CRAFT/algemene_functionaliteit/melding_historie.php
@@ -26,7 +26,7 @@
 
 
 		echo("<table border =\"1\">");
-		echo("<tr><td>". $datum[2] ."-". $datum[1] ."-". $datum[0]. "</td><td>" . substr($data[6], 0, 40) . "...</td><td><a href=\"../admin_meldingen/melding_info.php?c=".$data['Meld_Lijst_ID']."\" target=\"_blank\">Meer</a></td></tr>");
+		echo("<tr><td>". $datum[2] ."-". $datum[1] ."-". $datum[0]. "</td><td>" . substr($data[6], 0, 40) . "...</td><td><a href=\"../algemene_functionaliteit/melding_info.php?c=".$data['Meld_Lijst_ID']."\" target=\"_blank\">Meer</a></td></tr>");
 
 			
 		while ($data['Voorgaande_Melding'] != 1) { 
@@ -39,7 +39,7 @@
 			//datum veld opdelen zodat de jaar, maand en dagvelden makkelijk te benaderen zijn
 			$datum = split("-",$gedeeldveld[0]);
 		
-			echo("<tr><td>". $datum[2] ."-". $datum[1] ."-". $datum[0]. "</td><td>" .substr($data[6], 0, 40) . "...</td><td><a href=\"../admin_meldingen/melding_info.php?c=".$data['Meld_Lijst_ID']."\" target=\"_blank\">Meer</a></td></tr>");
+			echo("<tr><td>". $datum[2] ."-". $datum[1] ."-". $datum[0]. "</td><td>" .substr($data[6], 0, 40) . "...</td><td><a href=\"../algemene_functionaliteit/melding_info.php?c=".$data['Meld_Lijst_ID']."\" target=\"_blank\">Meer</a></td></tr>");
 		}
 		echo("</table>");
 	}
diff --git a/support/tool/CRAFT/admin_meldingen/melding_info.php b/support/tool/CRAFT/algemene_functionaliteit/melding_info.php
similarity index 100%
rename from support/tool/CRAFT/admin_meldingen/melding_info.php
rename to support/tool/CRAFT/algemene_functionaliteit/melding_info.php
diff --git a/support/tool/CRAFT/documentatie/changes.doc b/support/tool/CRAFT/documentatie/changes.doc
index 371121653a5137ccc871f04692c2955a736865b6..afb0d95fab5b670dca3612aacea72701bcda1f09 100644
GIT binary patch
delta 4344
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
Bpxpof

delta 3379
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

diff --git a/support/tool/CRAFT/includes/admin_menu.php b/support/tool/CRAFT/includes/admin_menu.php
index 36aa114d594..d6399f500d9 100644
--- a/support/tool/CRAFT/includes/admin_menu.php
+++ b/support/tool/CRAFT/includes/admin_menu.php
@@ -34,7 +34,7 @@
 	  	<?php if (isset($_SESSION['admin_deel']) && $_SESSION['admin_deel'] == 0) { 
 	  		echo("<li><A name=\"Admin\" href=\"admin.php?p=0\">Admin-gedeelte</A></li>");
 	  	 } else 
-	  		echo("<li><A name=\"Admin\" href=\"main.php\">Hoofdapplicatie</A></li>");
+	  		echo("<li><A name=\"Admin\" href=\"main.php?p=".$_SESSION['tab']."\">Hoofdapplicatie</A></li>");
 	  	?>
 	  	<li><A name="LogUit" href="index.php">Uitloggen</A></li>
 		</ul>
diff --git a/support/tool/CRAFT/includes/login_funcs.php b/support/tool/CRAFT/includes/login_funcs.php
index fbb6830d290..c47aaa2218f 100644
--- a/support/tool/CRAFT/includes/login_funcs.php
+++ b/support/tool/CRAFT/includes/login_funcs.php
@@ -62,14 +62,21 @@
 					$_SESSION['gebr_id']    = $row['Werknem_ID'];					
 					$_SESSION['gebr_naam']  = $row['inlognaam'];
 					$_SESSION['gebr_email'] = $row['Emailadres'];
+					$_SESSION['groep_id']		= $row['Groep_ID'];
+					$_SESSION['taal']			  = $row['Gebruiker_Taal'];
+					$_SESSION['start_tabblad'] = $row['Start_Alg'];
+					$_SESSION['laatste_inlog'] = $row['Laatst_Ingelogd'];
+					$query = "SELECT * FROM gebruikers_groepen WHERE Groep_ID = '".$row['Groep_ID']."'";
+					$result = mysql_query($query);
+					$row = mysql_fetch_array($result);
 					$_SESSION['pag_start']  = $row['Intro_Zichtbaar'];
 					$_SESSION['pag_comp']   = $row['Comp_Zichtbaar'];
 					$_SESSION['pag_meld']   = $row['Melding_Zichtbaar'];
 					$_SESSION['pag_stats']  = $row['Stats_Zichtbaar'];
 					$_SESSION['pag_instel'] = $row['Instel_Zichtbaar'];
-					$_SESSION['groep_id']		= $row['Groep_ID'];
-					$_SESSION['taal']			  = $row['Gebruiker_Taal'];
-					$_SESSION['start_tabblad'] = $row['Start_Alg'];
+					
+					$query = "UPDATE gebruiker SET Laatst_Ingelogd = NOW() WHERE Werknem_ID='". $_SESSION['gebr_id'] ."'";
+					mysql_query($query);
 				}
 				
 				return 1;
diff --git a/support/tool/CRAFT/includes/stylesheet_1024.css b/support/tool/CRAFT/includes/stylesheet_1024.css
index 2e91ac0dacd..f7afe774361 100644
--- a/support/tool/CRAFT/includes/stylesheet_1024.css
+++ b/support/tool/CRAFT/includes/stylesheet_1024.css
@@ -60,5 +60,9 @@ a.actieveoptie:active			{text-decoration: underline; }
 #linkerdeel  { border:1px solid #000000; background-color=#6699CC; width: 206px; height: 100%; float: left; overflow:auto;}
 #rechterdeel { border:1px solid #000000; background-color=#B3CCE6; width: 100%; height: 100%; }
 
+#boom_knoppen_container {border:1px solid #000000; margin:0 auto; text-align:center; width: 100%; height: 5%;} 
+#boom_schakel_knop  { border:1px solid #000000; background-color=#B3CCE6; text-align: center; width: 85%; height: 100%; margin-left: auto; margin-right: auto; }
+
+
 .foutmelding { font-family: verdana, helvetica, arial, sans-serif; color: #FF0000; }
 b { color: #FF0000; }
diff --git a/support/tool/CRAFT/includes/stylesheet_1280.css b/support/tool/CRAFT/includes/stylesheet_1280.css
index 48f57f4fea6..c485d7317a2 100644
--- a/support/tool/CRAFT/includes/stylesheet_1280.css
+++ b/support/tool/CRAFT/includes/stylesheet_1280.css
@@ -59,5 +59,8 @@ a.actieveoptie:active			{text-decoration: underline; }
 #linkerdeel  { border:1px solid #000000; background-color=#6699CC; width: 206px; height: 100%; float: left; overflow:auto;}
 #rechterdeel { border:1px solid #000000; background-color=#B3CCE6; width: 100%; height: 100%; }
 
+#boom_knoppen_container {border:1px solid #000000; margin:0 auto; text-align:center; width: 100%; height: 5%;} 
+#boom_schakel_knop  { border:1px solid #000000; background-color=#B3CCE6; text-align: center; width: 85%; height: 100%; margin-left: auto; margin-right: auto; }
+
 .foutmelding { font-family: verdana, helvetica, arial, sans-serif; color: #FF0000; }
 b { color: #FF0000; }
diff --git a/support/tool/CRAFT/includes/tree_items.php b/support/tool/CRAFT/includes/tree_items.php
index ef7b98f9ae0..29beb5e7a6c 100644
--- a/support/tool/CRAFT/includes/tree_items.php
+++ b/support/tool/CRAFT/includes/tree_items.php
@@ -140,8 +140,7 @@
   $query = 'SELECT Comp_Type, Type_Naam FROM comp_type WHERE Type_Parent = 1';
   $rest = mysql_query($query);
   
-  if ($_SESSION['admin_deel'] == 1)
-  	$Types_Objecten = Comp_Type_Lijst(1);
+  if ($_SESSION['admin_deel'] == 1)      $Types_Objecten = Comp_Type_Lijst(1);
   else if ($_SESSION['admin_deel'] == 2) $Types_Objecten = Comp_Lijst(1);
   else if ($_SESSION['admin_deel'] == 3) $Types_Objecten = Melding_Type_Lijst();
 	else if ($_SESSION['admin_deel'] == 4) $Types_Objecten = Comp_Lijst(1);
@@ -149,7 +148,12 @@
 	else if ($_SESSION['admin_deel'] == 6) $Types_Objecten = Gebruikers_Lijst();
 	else if ($_SESSION['admin_deel'] == 7) $Types_Objecten = Contacten_Lijst(1);
 	else if ($_SESSION['admin_deel'] == 8) $Types_Objecten = Locaties_Lijst();
-
+  else if ($_SESSION['admin_deel'] == 0) {
+  	if ($_SESSION['main_deel'] == 2) {
+  		if ($_SESSION['type_overzicht'] == 1) 		 $Types_Objecten = Comp_Lijst(1);
+  		else if ($_SESSION['type_overzicht'] == 2) $Types_Objecten = Comp_Type_Lijst(1);
+  	}
+  }
 	echo ("var TREE_ITEMS = [");
 	
 	echo(Recursieve_Uitlees_Methode($Types_Objecten));
diff --git a/support/tool/CRAFT/main.php b/support/tool/CRAFT/main.php
index b4de34e8d21..b3fed694797 100644
--- a/support/tool/CRAFT/main.php
+++ b/support/tool/CRAFT/main.php
@@ -2,7 +2,9 @@
 	session_start();
   
 	$_SESSION['admin_deel'] = 0;  
-  
+ 	$_SESSION['main_deel'] = $_SESSION['start_tabblad'];
+ 	$_SESSION['tab'] = $_GET['p'];
+
   require_once('includes/login_funcs.php');
 
   //controleren of er iemand ingelogd is...
@@ -19,7 +21,20 @@
     		//TODO controleren of die pagina wel geladen mag worden!!!!!!!
     		$pagina = $_GET['p'];
     		if ($pagina == 1) include ($_SESSION['pagina'] .'main/start.php');
-    		else if ($pagina == 2) include ($_SESSION['pagina'] .'main/componenten.php');
+    		else if ($pagina == 2) {
+					//toevoegen van componenten 
+					if (isset($_GET['s']) && $_GET['s'] == 2)
+						include($_SESSION['pagina'] . 'main_componenten/toevoegen.php');
+					//bewerken van componenten 
+					else if (isset($_GET['s']) && $_GET['s'] == 3)
+						include($_SESSION['pagina'] . 'main_componenten/bewerken.php');
+					//verwijderen van componenten
+					else if (isset($_GET['s']) && $_GET['s'] == 4)
+						include($_SESSION['pagina'] . 'main_componenten/verwijderen.php');    			
+    			//toevoegen van componenten (standaard actie)
+    			else 
+						include($_SESSION['pagina'] . 'main_componenten/overzicht.php');
+    		}
     		else if ($pagina == 3) include ($_SESSION['pagina'] .'main/meldingen.php');
     		else if ($pagina == 4) include ($_SESSION['pagina'] .'main/statistieken.php');
     		else if ($pagina == 5) include ($_SESSION['pagina'] .'main/instellingen.php');
diff --git a/support/tool/CRAFT/main/componenten.php b/support/tool/CRAFT/main/componenten.php
deleted file mode 100644
index f6fe520174d..00000000000
--- a/support/tool/CRAFT/main/componenten.php
+++ /dev/null
@@ -1,10 +0,0 @@
-  
-  	
-  	<div id="linkerdeel">
-	
-		</div>
-    <div id="rechterdeel">
-    	
-    	Componenten
-    	
-    </div>
diff --git a/support/tool/CRAFT/main_componenten/Comp_Overzicht.php b/support/tool/CRAFT/main_componenten/Comp_Overzicht.php
new file mode 100644
index 00000000000..bbab841d3b8
--- /dev/null
+++ b/support/tool/CRAFT/main_componenten/Comp_Overzicht.php
@@ -0,0 +1,32 @@
+<?php
+
+	session_start();
+	if (isset($_SESSION['laatste_inlog'])) {
+		include_once("../includes/vars.php");
+?>
+		<html>
+			<head></head>
+			<body bgcolor="#B3CCE6">
+	
+			<?php
+				$query = "SELECT * FROM comp_lijst WHERE Laatste_Melding in";
+				$query = $query . "(SELECT Meld_Lijst_ID FROM melding_lijst WHERE Meld_Datum > ";
+				$query = $query . "'".$_SESSION['laatste_inlog']."' AND Voorgaande_Melding = 1)";
+			  $resultaat = mysql_query($query);
+				echo("<table border=\"1\">");
+				while ($data = mysql_fetch_array($resultaat)) {
+					$query2 = "SELECT Loc_Naam FROM comp_locatie WHERE Locatie_ID ='". $data['Comp_Locatie']."'";
+				  $res = mysql_query($query2);
+					$row = mysql_fetch_array($res);
+					
+					echo("<tr><td>".$data['Comp_Lijst_ID']."</td><td>".substr($data['Comp_Naam'], 0, 40)."...</td><td>". $row['Loc_Naam'] ."</td>");
+					echo("<td><a href=\"../". $_SESSION['huidige_pagina']."&o=1&c=". $data['Comp_Lijst_ID'] ."\" target=\"_top\">Info</a></td></tr>");
+				}
+				echo("</table>");
+			?>
+				
+			</body>
+		</html>
+<?php
+	}
+?>
\ No newline at end of file
diff --git a/support/tool/CRAFT/main_componenten/Type_Overzicht.php b/support/tool/CRAFT/main_componenten/Type_Overzicht.php
new file mode 100644
index 00000000000..646bfcb9e9e
--- /dev/null
+++ b/support/tool/CRAFT/main_componenten/Type_Overzicht.php
@@ -0,0 +1,31 @@
+<?php
+
+	session_start();
+	if (isset($_SESSION['laatste_inlog'])) {
+		include_once("../includes/vars.php");
+?>
+
+		<html>
+			<head></head>
+			<body bgcolor="#B3CCE6">
+	
+			<?php
+			
+				$query = "SELECT * FROM comp_type WHERE Aanmaak_Datum > '".$_SESSION['laatste_inlog']."'";
+			  $resultaat = mysql_query($query);
+
+				echo("<table border=\"1\">");
+				while ($data = mysql_fetch_array($resultaat)) {
+					echo("<tr><td>". $data['Comp_Type'] ."</td><td>".substr($data['Type_Naam'], 0, 40)."...</td>");
+					echo("<td><a href=\"../". $_SESSION['huidige_pagina']."&o=2&c=". $data['Comp_Type']."\" target=\"_top\">Info</a></td></tr>");
+				}
+				echo("</table>");
+
+			?>
+
+			</body>
+		</html>
+
+<?php
+	}
+?>
\ No newline at end of file
diff --git a/support/tool/CRAFT/main_componenten/bewerken.php b/support/tool/CRAFT/main_componenten/bewerken.php
new file mode 100644
index 00000000000..7fdd4ccc198
--- /dev/null
+++ b/support/tool/CRAFT/main_componenten/bewerken.php
@@ -0,0 +1,36 @@
+<?php	
+	if(isset($_SESSION['main_deel'])){
+		$_SESSION['main_deel'] = 2;
+	  $_SESSION['huidige_pagina'] = $_SESSION['pagina'] . 'main.php?p='.$_SESSION['main_deel'].'&s=3';
+	  
+	  require_once($_SESSION['pagina'] . 'includes/login_funcs.php');
+		
+	  //controleren of er iemand ingelogd is...
+	  if ($LOGGED_IN = user_isloggedin()) {
+	  	
+	  	?>
+	  	<div id="linkerdeel">
+	  		<?php 
+	  			echo("<script language=\"JavaScript\" src=\"". $_SESSION['pagina'] ."includes/tree.js\"></script>");
+					echo("<script language=\"JavaScript\" src=\"". $_SESSION['pagina'] ."includes/tree_items.php\"></script>");
+					echo("<script language=\"JavaScript\" src=\"". $_SESSION['pagina'] ."includes/tree_tpl.js\"></script>");
+	  		?>
+				<script language="JavaScript">
+				<!--//
+		 			new tree (TREE_ITEMS, TREE_TPL);
+	   		//-->
+				</script> 
+			
+			</div>
+	    <div id="rechterdeel">
+	    	
+	    	<h2>Componenten bewerken</h2>
+	    
+	    </div>
+	
+	<?php  
+	      }
+		//niemand ingelogt, dus bezoeker naar de inlogpagina sturen
+		else header("Location: index.php");  
+	}
+?> 
\ No newline at end of file
diff --git a/support/tool/CRAFT/main_componenten/overzicht.php b/support/tool/CRAFT/main_componenten/overzicht.php
new file mode 100644
index 00000000000..9a76be5c097
--- /dev/null
+++ b/support/tool/CRAFT/main_componenten/overzicht.php
@@ -0,0 +1,178 @@
+<?php	
+	if(isset($_SESSION['main_deel'])){
+		$_SESSION['main_deel'] = 2;
+	  $_SESSION['huidige_pagina'] = $_SESSION['pagina'] . 'main.php?p='.$_SESSION['main_deel'].'&s=1';
+		
+		if (isset($_GET['o'])) {
+			$_SESSION['type_overzicht'] = $_GET['o'];
+		} else if (!isset($_SESSION['type_overzicht'])) $_SESSION['type_overzicht'] = 1;
+
+	  require_once($_SESSION['pagina'] . 'includes/login_funcs.php');
+
+	  //controleren of er iemand ingelogd is...
+	  if ($LOGGED_IN = user_isloggedin()) {
+	  	
+	  	?>
+	  	<div id="linkerdeel">
+	  		<div id="boom_knoppen_container">
+		  		<div id="boom_schakel_knop">
+		  			<?php 
+		  				if ($_SESSION['type_overzicht'] == '2')
+				  			echo("<a href=\"".$_SESSION['huidige_pagina']. "&o=1\">Geef comp. overzicht weer</a>");
+							else
+				  			echo("<a href=\"".$_SESSION['huidige_pagina']. "&o=2\">Geef type overzicht weer</a>");
+		  			?>
+					</div>	  		
+	  		</div>
+	  		<?php 
+	  			echo("<script language=\"JavaScript\" src=\"". $_SESSION['pagina'] ."includes/tree.js\"></script>");
+					echo("<script language=\"JavaScript\" src=\"". $_SESSION['pagina'] ."includes/tree_items.php\"></script>");
+					echo("<script language=\"JavaScript\" src=\"". $_SESSION['pagina'] ."includes/tree_tpl.js\"></script>");
+	  		?>
+				<script language="JavaScript">
+				<!--//
+		 			new tree (TREE_ITEMS, TREE_TPL);
+	   		//-->
+				</script> 
+			
+			</div>
+	    <div id="rechterdeel">
+	    	
+	    	<h2>Componenten overzicht</h2>
+	    
+				<?php
+
+					//er is een component gekozen, dus gegevens weergeven
+					if (isset($_GET['c'])) {
+						//is er een instantie van een type gekozen
+						if ($_SESSION['type_overzicht'] == 1) {
+							$query = "SELECT * FROM comp_lijst WHERE Comp_Lijst_ID='". $_GET['c'] ."'";
+						  $resultaat = mysql_query($query);
+							$data = mysql_fetch_array($resultaat);
+							echo("<h3>".$data['Comp_Naam']."</h3>");
+							echo("<table border=\"0\">");
+							
+							echo("<tr><td>Type component:</td><td>");
+							$query = "SELECT Type_Naam FROM Comp_Type WHERE Comp_Type ='".$data['Comp_Type_ID']."'";
+						  $res = mysql_query($query);
+							$row = mysql_fetch_array($res);
+							echo($row['Type_Naam'] ."</td><td><a href=\"".$_SESSION['huidige_pagina']."&o=2&c=". $data['Comp_Type_ID']."\">Meer info</a></td></tr>");
+							
+							echo("<tr><td>Locatie component:</td><td>");
+							$query = "SELECT Loc_Naam FROM comp_locatie WHERE Locatie_ID ='".$data['Comp_Locatie']."'";
+						  $res = mysql_query($query);
+							$row = mysql_fetch_array($res);
+							echo($row['Loc_Naam'] ."</td><td><a href=\"".$_SESSION['pagina'] ."algemene_functionaliteit/locatie.php?c=".$data['Comp_Locatie']."\" target=\"_blank\">Meer info</a></td></tr>");
+							
+							echo("<tr><td>Verantwoordelijke:</td><td>");
+							$query = "SELECT inlognaam FROM gebruiker WHERE Werknem_ID ='".$data['Comp_Verantwoordelijke']."'";
+						  $res = mysql_query($query);
+							$row = mysql_fetch_array($res);
+							echo($row['inlognaam'] ."</td><td><a href=\"".$_SESSION['pagina'] ."algemene_functionaliteit/gebruiker.php?c=".$data['Comp_Verantwoordelijke']."\" target=\"_blank\">Meer info</a></td></tr>");
+
+							echo("<tr><td>Fabricant:</td><td>");
+							$query = "SELECT Contact_Naam FROM contact WHERE Contact_ID ='".$data['Contact_Fabricant']."'";
+						  $res = mysql_query($query);
+							$row = mysql_fetch_array($res);
+							echo($row['Contact_Naam'] ."</td><td><a href=\"".$_SESSION['pagina'] ."algemene_functionaliteit/contact.php?c=".$data['Contact_Fabricant']."\" target=\"_blank\">Meer info</a></td></tr>");
+
+							//splitten op de spatie (formaat is als volgt: 2007-08-26 12:01:56)
+							$gedeeldveld=split(" ",$data['Fabricatie_Datum']);
+							//datum veld opdelen zodat de jaar, maand en dagvelden makkelijk te benaderen zijn
+							$datum = split("-",$gedeeldveld[0]);
+							
+							echo("<tr><td>Fabricatiedatum:</td><td>". $datum[2] ."-". $datum[1] ."-". $datum[0]. " (".$gedeeldveld[1].")</td><td>&nbsp</td></tr>");
+							echo("<tr><td>Leverancier:</td><td>");
+							$query = "SELECT Contact_Naam FROM contact WHERE Contact_ID ='".$data['Contact_Leverancier']."'";
+						  $res = mysql_query($query);
+							$row = mysql_fetch_array($res);
+							echo($row['Contact_Naam']  ."</td><td><a href=\"".$_SESSION['pagina'] ."algemene_functionaliteit/contact.php?c=".$data['Contact_Leverancier']."\" target=\"_blank\">Meer info</a></td></tr>");
+
+							//splitten op de spatie (formaat is als volgt: 2007-08-26 12:01:56)
+							$gedeeldveld=split(" ",$data['Lever_Datum']);
+							//datum veld opdelen zodat de jaar, maand en dagvelden makkelijk te benaderen zijn
+							$datum = split("-",$gedeeldveld[0]);
+
+							echo("<tr><td>Leverdatum:</td><td>". $datum[2] ."-". $datum[1] ."-". $datum[0]. " (".$gedeeldveld[1].")</td><td>&nbsp</td></tr>");
+							echo("</table>");
+		   				echo("<br>Meldingen historie van dit component:<br>");
+		   				echo("<iframe id=\"frame_overzicht\" name=\"frame_overzicht\" align=\"middle\" marginwidth=\"0\" marginheight=\"0\" src=\"". $_SESSION['pagina'] ."algemene_functionaliteit/melding_historie.php?c=".$_GET['c']."\" width=\"450\" height=\"175\" ALLOWTRANSPARENCY frameborder=\"0\" scrolling=\"auto\"></iframe>");
+							
+						}
+						//of is er een type gekozen
+						else if ($_SESSION['type_overzicht'] == 2) {
+							$query = "SELECT * FROM comp_type WHERE Comp_Type='". $_GET['c'] ."'";
+						  $resultaat = mysql_query($query);
+							$data = mysql_fetch_array($resultaat);
+
+							echo("<h3>".$data['Type_Naam']."</h3>");
+
+							echo("<table border=\"0\">");
+							echo("<tr><td>Aangemaakt door:</td><td>");
+							$query = "SELECT inlognaam FROM gebruiker WHERE Werknem_ID ='".$data['Aangemaakt_Door']."'";
+						  $res = mysql_query($query);
+							$row = mysql_fetch_array($res);
+							echo($row['inlognaam'] ."</td><td><a href=\"".$_SESSION['pagina'] ."algemene_functionaliteit/gebruiker.php?c=".$data['Aangemaakt_Door']."\" target=\"_blank\">Meer info</a></td></tr>");
+
+							//splitten op de spatie (formaat is als volgt: 2007-08-26 12:01:56)
+							$gedeeldveld=split(" ",$data['Aanmaak_Datum']);
+							//datum veld opdelen zodat de jaar, maand en dagvelden makkelijk te benaderen zijn
+							$datum = split("-",$gedeeldveld[0]);
+
+							echo("<tr><td>Aangemaakt op:</td><td>".$datum[2] ."-". $datum[1] ."-". $datum[0]. " (".$gedeeldveld[1].")</td><td>&nbsp</td></tr>");
+							echo("<tr><td>Structuur entry:</td><td>");
+							if ($data['Structuur_Entry'] == 1) echo("Ja");
+							else echo("Nee");
+							echo("</td><td>&nbsp</td></tr>");
+
+							echo("<tr><td>Fabricant:</td><td>");
+							$query = "SELECT Contact_Naam FROM contact WHERE Contact_ID ='".$data['Gefabriceerd_Door']."'";
+						  $res = mysql_query($query);
+							$row = mysql_fetch_array($res);
+							echo($row['Contact_Naam'] ."</td><td><a href=\"".$_SESSION['pagina'] ."algemene_functionaliteit/contact.php?c=".$data['Gefabriceerd_Door']."\" target=\"_blank\">Meer info</a></td></tr>");
+
+							echo("<tr><td>Leverancier:</td><td>");
+							$query = "SELECT Contact_Naam FROM contact WHERE Contact_ID ='".$data['Geleverd_Door']."'";
+						  $res = mysql_query($query);
+							$row = mysql_fetch_array($res);
+							echo($row['Contact_Naam']  ."</td><td><a href=\"".$_SESSION['pagina'] ."algemene_functionaliteit/contact.php?c=".$data['Geleverd_Door']."\" target=\"_blank\">Meer info</a></td></tr>");
+
+							echo("<tr><td>Minimum aantal:</td><td>".$data['Min_Aantal']."</td><td>&nbsp</td></tr>");
+							echo("<tr><td>Momenteel aangemaakt:</td><td>");
+							$query = "SELECT Count(Comp_Lijst_ID) FROM comp_lijst WHERE Comp_Type_ID = '". $data['Comp_Type'] ."'";
+						  $res = mysql_query($query);
+							$row = mysql_fetch_array($res);
+							echo($row[0] ."</td></tr>");
+							echo("<tr><td>Maximum aantal:</td><td>".$data['Max_Aantal']."</td><td>&nbsp</td></tr>");
+							echo("<tr><td>Reserve minimum:</td><td>".$data['Reserve_Minimum']."</td><td>&nbsp</td></tr>");
+							echo("<tr><td>Type verantwoordelijke:</td><td>");
+							$query = "SELECT inlognaam FROM gebruiker WHERE Werknem_ID ='".$data['Type_Verantwoordelijke']."'";
+						  $res = mysql_query($query);
+							$row = mysql_fetch_array($res);
+							echo($row['inlognaam'] ."</td><td><a href=\"".$_SESSION['pagina'] ."algemene_functionaliteit/gebruiker.php?c=".$data['Type_Verantwoordelijke']."\" target=\"_blank\">Meer info</a></td></tr>");
+							echo("</table>");
+							
+							//alle componenten van dit type
+		   				echo("<br>Aangemaakte componenten van dit type:<br>");
+		   				echo("<iframe id=\"frame_overzicht\" name=\"frame_overzicht\" align=\"middle\" marginwidth=\"0\" marginheight=\"0\" src=\"". $_SESSION['pagina'] ."algemene_functionaliteit/componenten_per_type.php?c=".$_GET['c']."\" width=\"450\" height=\"130\" ALLOWTRANSPARENCY frameborder=\"0\" scrolling=\"auto\"></iframe>");
+						}
+					}
+					else {					
+	
+						$_SESSION['laatste_inlog'] = '2007-01-12 09:00:00'; //<----- CHEATZ!!!!!!
+
+						echo("Sinds uw laatste inlog zijn onderstaande componenten aan het systeem toegevoegd:<br>");
+	   				echo("<iframe id=\"frame_comp\" name=\"frame_comp\" align=\"middle\" marginwidth=\"0\" marginheight=\"0\" src=\"". $_SESSION['pagina'] ."main_componenten/Comp_Overzicht.php\" width=\"450\" height=\"126\" ALLOWTRANSPARENCY frameborder=\"0\" scrolling=\"auto\"></iframe>");
+	
+						echo("<br><br>Sinds uw laatste inlog zijn onderstaande componenttypes aan het systeem toegevoegd:<br>");
+	   				echo("<iframe id=\"frame_type\" name=\"frame_type\" align=\"middle\" marginwidth=\"0\" marginheight=\"0\" src=\"". $_SESSION['pagina'] ."main_componenten/Type_Overzicht.php\" width=\"450\" height=\"126\" ALLOWTRANSPARENCY frameborder=\"0\" scrolling=\"auto\"></iframe>");
+					}
+				?>	    
+	    </div>
+
+	<?php  
+	      }
+		//niemand ingelogt, dus bezoeker naar de inlogpagina sturen
+		else header("Location: index.php");  
+	}
+?> 
\ No newline at end of file
diff --git a/support/tool/CRAFT/main_componenten/toevoegen.php b/support/tool/CRAFT/main_componenten/toevoegen.php
new file mode 100644
index 00000000000..45b29f7d3a8
--- /dev/null
+++ b/support/tool/CRAFT/main_componenten/toevoegen.php
@@ -0,0 +1,43 @@
+<?php	
+	if(isset($_SESSION['main_deel'])){
+		$_SESSION['main_deel'] = 2;
+	  $_SESSION['huidige_pagina'] = $_SESSION['pagina'] . 'main.php?p='.$_SESSION['main_deel'].'&s=2';
+	  
+	  require_once($_SESSION['pagina'] . 'includes/login_funcs.php');
+		
+	  //controleren of er iemand ingelogd is...
+	  if ($LOGGED_IN = user_isloggedin()) {
+	  	
+	  	?>
+	  	<div id="linkerdeel">
+	  		<?php  			
+	  			echo("<script language=\"JavaScript\" src=\"". $_SESSION['pagina'] ."includes/tree.js\"></script>");
+					echo("<script language=\"JavaScript\" src=\"". $_SESSION['pagina'] ."includes/tree_items.php\"></script>");
+					echo("<script language=\"JavaScript\" src=\"". $_SESSION['pagina'] ."includes/tree_tpl.js\"></script>");
+	  		?>
+				<script language="JavaScript">
+				<!--//
+		 			new tree (TREE_ITEMS, TREE_TPL);
+	   		//-->
+				</script> 
+			
+			</div>
+	    <div id="rechterdeel">
+
+	    	<h2>Componenten toevoegen</h2>
+	    		<form>
+	    			<table>
+	    				<tr>
+	    					<td>Component type:</td>
+	    					<td></td>
+	    				</tr>
+	    			</table>
+	    		</form>
+	    </div>
+	
+	<?php  
+	      }
+		//niemand ingelogt, dus bezoeker naar de inlogpagina sturen
+		else header("Location: index.php");  
+	}
+?> 
diff --git a/support/tool/CRAFT/main_componenten/verwijderen.php b/support/tool/CRAFT/main_componenten/verwijderen.php
new file mode 100644
index 00000000000..5dfd3952975
--- /dev/null
+++ b/support/tool/CRAFT/main_componenten/verwijderen.php
@@ -0,0 +1,36 @@
+<?php	
+	if(isset($_SESSION['main_deel'])){
+		$_SESSION['main_deel'] = 2;
+	  $_SESSION['huidige_pagina'] = $_SESSION['pagina'] . 'main.php?p='.$_SESSION['main_deel'].'&s=4';
+	  
+	  require_once($_SESSION['pagina'] . 'includes/login_funcs.php');
+		
+	  //controleren of er iemand ingelogd is...
+	  if ($LOGGED_IN = user_isloggedin()) {
+	  	
+	  	?>
+	  	<div id="linkerdeel">
+	  		<?php 
+	  			echo("<script language=\"JavaScript\" src=\"". $_SESSION['pagina'] ."includes/tree.js\"></script>");
+					echo("<script language=\"JavaScript\" src=\"". $_SESSION['pagina'] ."includes/tree_items.php\"></script>");
+					echo("<script language=\"JavaScript\" src=\"". $_SESSION['pagina'] ."includes/tree_tpl.js\"></script>");
+	  		?>
+				<script language="JavaScript">
+				<!--//
+		 			new tree (TREE_ITEMS, TREE_TPL);
+	   		//-->
+				</script> 
+			
+			</div>
+	    <div id="rechterdeel">
+	    	
+	    	<h2>Componenten verwijderen</h2>
+	    
+	    </div>
+	
+	<?php  
+	      }
+		//niemand ingelogt, dus bezoeker naar de inlogpagina sturen
+		else header("Location: index.php");  
+	}
+?> 
-- 
GitLab