Commit 112ad827 authored by Brian's avatar Brian

- moved SQL update commands to right location

- added nginx support to directive sn. sellection and removed required_php_snippet from sql condition
parent 313df06b
Pipeline #6303 passed with stage
in 7 minutes and 56 seconds
-- Default Directive Snippets --
ALTER TABLE `client` ADD `default_directive_snippet` INT(3) NOT NULL DEFAULT 0 AFTER `limit_xmpp_httparchive`;
ALTER TABLE `client_template` ADD `default_directive_snippet` INT(3) NOT NULL DEFAULT 0 AFTER `web_servers`;
\ No newline at end of file
......@@ -43,8 +43,4 @@ DROP TABLE IF EXISTS `domain_handle`;
DROP TABLE IF EXISTS `domain_provider`;
DROP TABLE IF EXISTS `domain_tld`;
SET FOREIGN_KEY_CHECKS = 1;
-- Default Directive Snippets --
ALTER TABLE `client` ADD `default_directive_snippet` INT(3) NULL DEFAULT NULL AFTER `limit_xmpp_httparchive`;
ALTER TABLE `client_template` ADD `default_directive_snippet` INT(3) NULL DEFAULT NULL AFTER `web_servers`;
\ No newline at end of file
SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
......@@ -679,7 +679,7 @@ $form["tabs"]['limits'] = array (
'default' => '',
'value' => '',
'datasource' => array ( 'type' => 'SQL',
'querystring' => "SELECT directive_snippets_id,name FROM directive_snippets WHERE active='y' AND type='apache' AND required_php_snippets != '' AND {AUTHSQL} ORDER BY directive_snippets_id",
'querystring' => "SELECT directive_snippets_id,name FROM directive_snippets WHERE active='y' AND (type='apache' or type='nginx') AND {AUTHSQL} ORDER BY directive_snippets_id",
'keyfield'=> 'directive_snippets_id',
'valuefield'=> 'name'
),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment