diff --git a/support/tool/CRAFT/admin_component_types/bewerken.php b/support/tool/CRAFT/admin_component_types/bewerken.php
index 90a6f60878032978f839d2e136c41cd4eda87970..6db111816ee2e890987a4b704dd0c1cc271492f9 100644
--- a/support/tool/CRAFT/admin_component_types/bewerken.php
+++ b/support/tool/CRAFT/admin_component_types/bewerken.php
@@ -201,7 +201,7 @@
else $verantwoordelijke = $row['Type_Verantwoordelijke'];
?>
- <tr><td>Type verantwoordelijke:</td><td><iframe id="frame_contact" name="frame_contact" align="middle" marginwidth="0" marginheight="0" src="<?php echo($_SESSION['pagina']); ?>algemene_functionaliteit/type_verantwoordelijke.php?c=<?php echo($type_selectie . "&s=" . $verantwoordelijke);?>" width="300" height="26" ALLOWTRANSPARENCY frameborder="0" scrolling="auto"></iframe></td></tr>
+ <tr><td>Verantwoordelijke:</td><td><iframe id="frame_contact" name="frame_contact" align="middle" marginwidth="0" marginheight="0" src="<?php echo($_SESSION['pagina']); ?>algemene_functionaliteit/type_verantwoordelijke.php?c=<?php echo($type_selectie . "&s=" . $verantwoordelijke);?>" width="300" height="26" ALLOWTRANSPARENCY frameborder="0" scrolling="auto"></iframe></td></tr>
<tr>
<td id="opslaan" align="right"><a href="javascript:submitTypeOpslaan();">Opslaan</a></td>
<td><input name="hidden_verantwoordelijke" id="hidden_verantwoordelijke" type="hidden" value="-1"><input id="opslaan" name="opslaan" type="hidden" value="1"></td>
diff --git a/support/tool/CRAFT/admin_component_types/toevoegen.php b/support/tool/CRAFT/admin_component_types/toevoegen.php
index dac1b9c1e77c9490f52a18253e05e903850ce41c..231dbb049669fddd13d7ec68871757c8824cfd3b 100644
--- a/support/tool/CRAFT/admin_component_types/toevoegen.php
+++ b/support/tool/CRAFT/admin_component_types/toevoegen.php
@@ -135,7 +135,7 @@
$selectie = $_GET['c'];
else $selectie = $Geselecteerd_Type;
?>
- <tr><td>Type verantwoordelijke:</td><td><iframe id="frame_contact" name="frame_contact" align="middle" marginwidth="0" marginheight="0" src="<?php echo($_SESSION['pagina']); ?>algemene_functionaliteit/type_verantwoordelijke.php?c=<?php echo($selectie . "&s=" . $verantwoordelijke);?>" width="300" height="26" ALLOWTRANSPARENCY frameborder="0" scrolling="auto"></iframe></td></tr>
+ <tr><td>Verantwoordelijke:</td><td><iframe id="frame_contact" name="frame_contact" align="middle" marginwidth="0" marginheight="0" src="<?php echo($_SESSION['pagina']); ?>algemene_functionaliteit/type_verantwoordelijke.php?c=<?php echo($selectie . "&s=" . $verantwoordelijke);?>" width="300" height="26" ALLOWTRANSPARENCY frameborder="0" scrolling="auto"></iframe></td></tr>
<tr><td><input name="hidden_verantwoordelijke" id="hidden_verantwoordelijke" type="hidden" value="-1"></td><td><input name="opslaan" type="hidden" value="1"><a href="javascript:submitTypeOpslaan();">Opslaan</a></td></tr>
</table>
</form>
diff --git a/support/tool/CRAFT/admin_contacten/toevoegen.php b/support/tool/CRAFT/admin_contacten/toevoegen.php
index b545cc5c329a3e5c7e25027e73d46a65c959fed1..287d1bd946db9ceda0c16411cbe2db6adf5c6a24 100644
--- a/support/tool/CRAFT/admin_contacten/toevoegen.php
+++ b/support/tool/CRAFT/admin_contacten/toevoegen.php
@@ -269,4 +269,4 @@
//niemand ingelogt, dus bezoeker naar de inlogpagina sturen
else header("Location: index.php");
}
-?>
\ No newline at end of file
+?>
\ No newline at end of file
diff --git a/support/tool/CRAFT/admin_extra_velden/bewerken.php b/support/tool/CRAFT/admin_extra_velden/bewerken.php
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..bfd6a853b63677c398a6be94cf18398c02aab289 100644
--- a/support/tool/CRAFT/admin_extra_velden/bewerken.php
+++ b/support/tool/CRAFT/admin_extra_velden/bewerken.php
@@ -0,0 +1,37 @@
+<?php
+ if(isset($_SESSION['admin_deel'])){
+ $_SESSION['admin_deel'] = 5;
+ $_SESSION['huidige_pagina'] = $_SESSION['pagina'] . 'admin.php?p='.$_SESSION['admin_deel'].'&s=2';
+
+ require_once($_SESSION['pagina'] . 'includes/login_funcs.php');
+ include_once($_SESSION['pagina'] . 'includes/controle_functies.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>Extra velden 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/admin_extra_velden/extra_velden_functies.php b/support/tool/CRAFT/admin_extra_velden/extra_velden_functies.php
new file mode 100644
index 0000000000000000000000000000000000000000..abdb499ba0fb298d1845799036751dfe0db2a8ff
--- /dev/null
+++ b/support/tool/CRAFT/admin_extra_velden/extra_velden_functies.php
@@ -0,0 +1,18 @@
+<?php
+
+ session_start();
+?>
+
+function switchDocument()
+{
+ var z=document.getElementById('koppel').value;
+ document.getElementById('frame_component').src = "<?php echo($_SESSION['pagina']); ?>admin_extra_velden/type_keuze.php?c=" + z;
+}
+
+function submitFunctie()
+{
+ var z = document.frames['frame_component'].document.getElementById('sType').value;
+ document.getElementById('hidden_component').value = z;
+
+ document.theForm.submit();
+}
\ No newline at end of file
diff --git a/support/tool/CRAFT/admin_extra_velden/toevoegen.php b/support/tool/CRAFT/admin_extra_velden/toevoegen.php
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7881d71f5171be251d42d37017cea8c6376717d6 100644
--- a/support/tool/CRAFT/admin_extra_velden/toevoegen.php
+++ b/support/tool/CRAFT/admin_extra_velden/toevoegen.php
@@ -0,0 +1,175 @@
+<?php
+ if(isset($_SESSION['admin_deel'])){
+ $_SESSION['admin_deel'] = 5;
+ $_SESSION['huidige_pagina'] = $_SESSION['pagina'] . 'admin.php?p='.$_SESSION['admin_deel'].'&s=1';
+
+ require_once($_SESSION['pagina'] . 'includes/login_funcs.php');
+ include_once($_SESSION['pagina'] . 'includes/controle_functies.php');
+
+ //controleren of er iemand ingelogd is...
+ if ($LOGGED_IN = user_isloggedin()) {
+
+ ?>
+
+ <div id="linkerdeel">
+ <?php
+ echo("<script language=\"JavaScript\" src=\"". $_SESSION['pagina'] ."admin_extra_velden/extra_velden_functies.php\"></script>");
+
+ 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>Extra velden toevoegen</h2>
+
+ <?php
+
+ function Valideer_Invoer() {
+ //contact naam
+ if (isset($_POST['veldnaam'])) {
+ if ($_POST['veldnaam'] == '')
+ return false;
+ } else return false;
+
+ return true;
+ }
+
+ if(Valideer_Invoer()) {
+ //extra_velden / datatabel / type_comp_koppel_extra / type_melding_koppel_extra
+ //integer
+ if ($_POST['datatype'] == 1) $query = "INSERT INTO datatabel (Type_Integer) VALUES('".$_POST['standaard']."')";
+ //double
+ else if ($_POST['datatype'] == 2) $query = "INSERT INTO datatabel (Type_Double) VALUES('".$_POST['standaard']."')";
+ //text
+ else if ($_POST['datatype'] == 3) $query = "INSERT INTO datatabel (Type_Text) VALUES('".$_POST['standaard']."')";
+ //datumtijd
+ else if ($_POST['datatype'] == 4) $query = "INSERT INTO datatabel (Type_DateTime) VALUES('".$_POST['standaard']."')";
+ //bestandsverwijzing
+ else if ($_POST['datatype'] == 5) $query = "INSERT INTO datatabel (Type_TinyText) VALUES('".$_POST['standaard']."')";
+
+ $errorlevel = 0;
+ if (mysql_query($query)) {
+ $errorlevel = 1;
+
+ $Veld_ID = mysql_insert_id();
+ $query = "INSERT INTO extra_velden (Data_Kolom_ID, Aangemaakt_Door, Veld_Naam, DataType, Type_Beschrijving, Is_Verplicht)";
+ $query = $query . "VALUES ('".$Veld_ID."', '".$_SESSION['gebr_id'] ."', '".$_POST['veldnaam']."', '".$_POST['datatype']."', '1', ";
+ //de verplicht checkbox vertalen naar sql taal ;)
+ if (isset($_POST['verplicht']) && ($_POST['verplicht'] == 'on' || $_POST['verplicht'] == '1'))
+ $query = $query . "1') ";
+ else $query = $query . "0') ";
+
+ if (mysql_query($query)) {
+ $errorlevel = 2;
+
+ $Veld_ID = mysql_insert_id();
+ if ($_POST['koppel'] == 1)
+ $query = "INSERT INTO Type_Comp_Koppel_Extra (Kolom_ID, Comp_Type_ID) VALUES('".$Veld_ID. "', '". $_POST['hidden_component'] ."')";
+ else if ($_POST['koppel'] == 2)
+ $query = "INSERT INTO Type_Melding_Koppel_Extra (Kolom_ID, Meld_Type_ID) VALUES('".$Veld_ID. "', '". $_POST['hidden_component'] ."')";
+
+ if (mysql_query($query))
+ $errorlevel = 3;
+ }
+ }
+
+ //if $errorlevel ==
+
+ }
+ else {
+ ?>
+
+ <form name="theForm" method="post" action="<?php echo($_SESSION['huidige_pagina']); ?>">
+ <table>
+ <tr>
+ <td>Veldnaam:</td><td><input name="veldnaam" type="text">
+ <?php if(isset($_POST['veldnaam']) && $_POST['veldnaam'] == '') echo('<b>* Er is geen veldnaam ingevoerd!</b>'); ?>
+ </td>
+ </tr>
+ <tr>
+ <td>Standaard waarde:</td><td><input name="standaard" type="text"></td>
+ </tr>
+ <tr>
+ <td>Koppelen aan:</td>
+ <td>
+ <select name="koppel" id="koppel" onchange="switchDocument();">
+ <?php
+ if (isset($_POST['koppel'])) $selected = $_POST['koppel'];
+ else $selected = 'SELECTED';
+
+ echo ('<option value="1"');
+ if ($selected == 1 || $selected == 'SELECTED') { echo(' SELECTED'); $selected = 1;}
+ echo ('>Component type</option>');
+ echo ('<option value="2"');
+ if ($selected == 2) { echo(' SELECTED'); }
+ echo ('>Melding type</option>');
+ ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>Component:</td>
+ <?php
+ if (isset($_POST['hidden_component'])) $component = $_POST['hidden_component'];
+ else $component = -1;
+ ?>
+ <td><iframe id="frame_component" name="frame_component" align="middle" marginwidth="0" marginheight="0" src="<?php echo($_SESSION['pagina']); ?>admin_extra_velden/type_keuze.php?c=<?php echo($selected . "&p=" . $component); ?>" width="450" height="26" ALLOWTRANSPARENCY frameborder="0" scrolling="auto"></iframe></td>
+ </tr>
+ <tr>
+ <td>Datatype:</td>
+ <td>
+ <select name="datatype">
+ <?php
+ if (isset($_POST['datatype'])) $selected = $_POST['datatype'];
+ else $selected = 'SELECTED';
+
+ echo ('<option value="1"');
+ if ($selected == 1 || $selected == 'SELECTED') { echo(' SELECTED');}
+ echo('>Geheel getal (integer)</option>');
+ echo ('<option value="2"');
+ if ($selected == 2) { echo(' SELECTED'); }
+ echo('>Getal met decimalen (double)</option>');
+ echo ('<option value="3"');
+ if ($selected == 3) { echo(' SELECTED'); }
+ echo('>Text veld</option>');
+ echo ('<option value="4"');
+ if ($selected == 4) { echo(' SELECTED'); }
+ echo('>Datum/tijd veld (datetime)</option>');
+ echo ('<option value="5"');
+ if ($selected == 5) { echo(' SELECTED'); }
+ echo('>Bestandsverwijzing</option>');
+ ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>Verplicht:</td>
+ <td><input name="verplicht" type="checkbox"
+ <?php
+ if(isset($_POST['verplicht']) && ($_POST['verplicht'] == 1 || $_POST['verplicht'] == 'on')) echo(' CHECKED');
+ ?>></td>
+ </tr>
+ <tr>
+ <td><input type="hidden" name="hidden_component" id="hidden_component"></td>
+ <td><a href="javascript:submitFunctie();">Toevoegen</a></td>
+ </tr>
+ </table>
+ </form>
+ <?php
+ }
+ ?>
+ </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/admin_extra_velden/type_keuze.php b/support/tool/CRAFT/admin_extra_velden/type_keuze.php
new file mode 100644
index 0000000000000000000000000000000000000000..6f21b168a8190d548c200a0cc9af92c4c3293470
--- /dev/null
+++ b/support/tool/CRAFT/admin_extra_velden/type_keuze.php
@@ -0,0 +1,26 @@
+<html>
+ <head>
+ </head>
+ <body bgcolor="#B3CCE6">
+ <?php
+ include_once("../includes/vars.php");
+
+ //mogelijkheden "c": 1 = Component type, 2 = melding type
+ if (isset($_GET['c']) && $_GET['c'] != 0) {
+ if($_GET['c'] == 1)
+ $query = "SELECT Comp_Type, Type_Naam FROM comp_type WHERE Comp_Type >1";
+ else if ($_GET['c'] == 2)
+ $query = "SELECT Meld_Type_ID, Melding_Type_Naam FROM melding_type";
+ $resultaat = mysql_query($query);
+ echo("<form name=\"fTest\">\r\n");
+ echo("<select id=\"sType\" name=\"sType\">\r\n");
+ while ($data = mysql_fetch_array($resultaat)) {
+ echo("<option value=\"". $data[0] ."\"");
+ if (isset($_GET['p']) && $_GET['p'] == $data[0]) echo('SELECTED');
+ echo(">". $data[1] ."</option>\r\n");
+ }
+ echo("</select></form>");
+ }
+ ?>
+ </body>
+</html>
\ No newline at end of file
diff --git a/support/tool/CRAFT/admin_extra_velden/verwijderen.php b/support/tool/CRAFT/admin_extra_velden/verwijderen.php
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8814353f8f6bf153a49249a26f90c14ccd744011 100644
--- a/support/tool/CRAFT/admin_extra_velden/verwijderen.php
+++ b/support/tool/CRAFT/admin_extra_velden/verwijderen.php
@@ -0,0 +1,37 @@
+<?php
+ if(isset($_SESSION['admin_deel'])){
+ $_SESSION['admin_deel'] = 5;
+ $_SESSION['huidige_pagina'] = $_SESSION['pagina'] . 'admin.php?p='.$_SESSION['admin_deel'].'&s=3';
+
+ require_once($_SESSION['pagina'] . 'includes/login_funcs.php');
+ include_once($_SESSION['pagina'] . 'includes/controle_functies.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>Extra velden verwijderen</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/documentatie/changes.doc b/support/tool/CRAFT/documentatie/changes.doc
index d789fd21f22bedd2faf216507c7c1b95fb247f92..e60f197cc2a6cf732cfdfcdfb716515ae834779a 100644
Binary files a/support/tool/CRAFT/documentatie/changes.doc and b/support/tool/CRAFT/documentatie/changes.doc differ
diff --git a/support/tool/CRAFT/includes/tree_items.php b/support/tool/CRAFT/includes/tree_items.php
index 1824bc8f6bd2d945c2ded526ac0c62493989250a..b515c030e40cc42bbfc4926646e8136edbc9fc1b 100644
--- a/support/tool/CRAFT/includes/tree_items.php
+++ b/support/tool/CRAFT/includes/tree_items.php
@@ -5,7 +5,22 @@
include("type_object.php");
$Types_Objecten = array();
- //functie om alle externe contacten uit de database te lezen en deze hierarchisch op te slaan
+ //functie om alle extra velden uit de database te lezen en deze op te slaan
+ function Extra_Velden_Lijst() {
+ $Collectie = array();
+ $query = 'SELECT Kolom_ID, Veld_Naam FROM comp_locatie';
+ $resultaat = mysql_query($query);
+ while ($huidige_level = mysql_fetch_array($resultaat)) {
+ $Comp_Type = new Type_Object();
+ $Comp_Type->Set_ID($huidige_level['Kolom_ID'],$huidige_level['Veld_Naam']);
+ $num_rows = mysql_num_rows(mysql_query($query));
+ array_push($Collectie, $Comp_Type);
+ $Comp_Type = NULL;
+ }
+ return $Collectie;
+ }
+
+ //functie om alle externe contacten uit de database te lezen en deze op te slaan
function Locaties_Lijst() {
$Collectie = array();
$query = 'SELECT Locatie_ID, Loc_Naam FROM comp_locatie';
@@ -206,7 +221,7 @@
//meldingen
else if ($_SESSION['admin_deel'] == 4) $Types_Objecten = Bepaal_Comp_Lijst();
//extra velden
- else if ($_SESSION['admin_deel'] == 5) {}
+ else if ($_SESSION['admin_deel'] == 5) $Types_Objecten = Extra_Velden_Lijst();
//gebruikersgroepen
else if ($_SESSION['admin_deel'] == 6) $Types_Objecten = Gebruikersgroepen_Lijst(1);
//gebruikers