Fixed double db_escape in add/update.

[fa-stable.git] / dimensions / dimension_entry.php

diff --git a/dimensions/dimension_entry.php b/dimensions/dimension_entry.php
index 7b9bcb3791ceb475581dc3a87287c7ed71b480c8..626d8466914e5ca6a1b393c9b4c85542dfd952d1 100644 (file)
--- a/dimensions/dimension_entry.php
+++ b/dimensions/dimension_entry.php
@@ -17,6 +17,7 @@ include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/manufacturing.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 
+include_once($path_to_root . "/admin/db/tags_db.inc");
 include_once($path_to_root . "/dimensions/includes/dimensions_db.inc");
 include_once($path_to_root . "/dimensions/includes/dimensions_ui.inc");
 
@@ -161,6 +162,7 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
                {
 
                        $id = add_dimension($_POST['ref'], $_POST['name'], $_POST['type_'], $_POST['date_'], $_POST['due_date'], $_POST['memo_']);
+                       add_tag_associations($id, $_POST['dimension_tags']);
 
                        meta_forward($_SERVER['PHP_SELF'], "AddedID=$id");
                } 
@@ -168,6 +170,7 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
                {
 
                        update_dimension($selected_id, $_POST['name'], $_POST['type_'], $_POST['date_'], $_POST['due_date'], $_POST['memo_']);
+                       update_tag_associations(TAG_DIMENSION, $selected_id, $_POST['dimension_tags']);
 
                        meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$selected_id");
                }
@@ -194,6 +197,7 @@ if (isset($_POST['delete']))
 
                // delete
                delete_dimension($selected_id);
+               delete_tag_associations(TAG_DIMENSION,$selected_id, true);
                meta_forward($_SERVER['PHP_SELF'], "DeletedID=$selected_id");
        }
 }
@@ -245,6 +249,12 @@ if ($selected_id != -1)
        $_POST['date_'] = sql2date($myrow["date_"]);
        $_POST['due_date'] = sql2date($myrow["due_date"]);
        $_POST['memo_'] = get_comments_string(ST_DIMENSION, $selected_id);
+       
+       $tags_result = get_tags_associated_with_record(TAG_DIMENSION, $selected_id);
+       $tagids = array();
+       while ($tag = db_fetch($tags_result)) 
+               $tagids[] = $tag['id'];
+       $_POST['dimension_tags'] = $tagids;     
 
        hidden('ref', $_POST['ref']);
 
@@ -254,6 +264,7 @@ if ($selected_id != -1)
 } 
 else 
 {
+       $_POST['dimension_tags'] = array();
        ref_row(_("Dimension Reference:"), 'ref', '', $Refs->get_next(ST_DIMENSION));
 }
 
@@ -267,6 +278,8 @@ date_row(_("Start Date") . ":", 'date_');
 
 date_row(_("Date Required By") . ":", 'due_date', '', null, $SysPrefs->default_dimension_required_by());
 
+tag_list_row(_("Tags:"), 'dimension_tags', 5, TAG_DIMENSION, true);
+
 textarea_row(_("Memo:"), 'memo_', null, 40, 5);
 
 end_table(1);
@@ -277,7 +290,7 @@ if (isset($_POST['closed']) && $_POST['closed'] == 1)
 if ($selected_id != -1) 
 {
        echo "<br>";
-       submit_center_first('UPDATE_ITEM', _("Update"), _('Save changes to dimension'), 'default');
+       submit_center_first('UPDATE_ITEM', _("Update"), _('Save changes to dimension'), false);
        if ($_POST['closed'] == 1)
                submit('reopen', _("Re-open This Dimension"), true, _('Mark this dimension as re-opened'), true);
        else    
@@ -286,7 +299,7 @@ if ($selected_id != -1)
 }
 else
 {
-       submit_center('ADD_ITEM', _("Add"), true, '', 'default');
+       submit_center('ADD_ITEM', _("Add"), true, '', false);
 }
 end_form();