Merge pull request #2483 from greezybacon/issue/2470

forms: Forbid adding deleted forms to topics, form management

Reviewed-By: Peter Rotich <peter@osticket.com>

include/staff/helptopic.inc.php

@@ -387,7 +387,10 @@ foreach ($forms as $F) {
    <strong><?php echo __('Add Custom Form'); ?></strong>:
    <select name="form_id" id="newform">
     <option value=""><?php echo '— '.__('Add a custom form') . ' —'; ?></option>
-    <?php foreach (DynamicForm::objects()->filter(array('type'=>'G')) as $F) { ?>
+    <?php foreach (DynamicForm::objects()
+        ->filter(array('type'=>'G'))
+        ->exclude(array('flags__hasbit' => DynamicForm::FLAG_DELETED))
+    as $F) { ?>
         <option value="<?php echo $F->get('id'); ?>"
            <?php if (in_array($F->id, $current_forms))
                echo 'disabled="disabled"'; ?>

include/staff/templates/form-manage.tmpl.php

@@ -29,9 +29,10 @@ foreach ($forms as $e) { ?>
     $(this).parent().find('button').trigger('click');">
 <option selected="selected" disabled="disabled"><?php
     echo __('Add a form'); ?></option>
-<?php foreach (DynamicForm::objects()->filter(array(
-    'type'=>'G')) as $f
-) {
+<?php foreach (DynamicForm::objects()
+    ->filter(array('type'=>'G'))
+    ->exclude(array('flags__hasbit' => DynamicForm::FLAG_DELETED))
+    as $f) {
     if (in_array($f->get('id'), $current_list))
         continue;
     ?><option value="<?php echo $f->get('id'); ?>"><?php