Patrick Anders
2014-12-09 f7ec00b2f8ba3efc5bdeacef9c813f8a826ae3be
server/plugins-available/nginx_plugin.inc.php
@@ -925,6 +925,12 @@
         }
      }
      // Spdy
      $tpl->setVar('spdy_enabled', '');
      if($data['new']['enable_spdy'] == 'y') {
         $tpl->setVar('spdy_enabled', ' spdy');
      }
      // PHP-FPM
      // Support for multiple PHP versions
      /*
@@ -1089,7 +1095,16 @@
      // Custom nginx directives
      $final_nginx_directives = array();
      $nginx_directives = $data['new']['nginx_directives'];
      if(intval($data['new']['directive_snippets_id']) > 0){
         $snippet = $app->db->queryOneRecord("SELECT * FROM directive_snippets WHERE directive_snippets_id = ? AND type = 'nginx' AND active = 'y' AND customer_viewable = 'y'", intval($data['new']['directive_snippets_id']));
         if(isset($snippet['snippet'])){
            $nginx_directives = $snippet['snippet'];
         } else {
            $nginx_directives = $data['new']['nginx_directives'];
         }
      } else {
         $nginx_directives = $data['new']['nginx_directives'];
      }
      // Make sure we only have Unix linebreaks
      $nginx_directives = str_replace("\r\n", "\n", $nginx_directives);
      $nginx_directives = str_replace("\r", "\n", $nginx_directives);