Merge remote-tracking branch 'ispc/master' into new-layout-3.1

Marius Cramer

2014-12-19 62e25488daa4f857f717d2687e820091ffaa8a13

 server/plugins-available/apache2_plugin.inc.php

@@ -1030,6 +1030,12 @@
      $vhost_data['custom_php_ini_dir'] = escapeshellcmd($custom_php_ini_dir);

      // Custom Apache directives
      if(intval($data['new']['directive_snippets_id']) > 0){
         $snippet = $app->db->queryOneRecord("SELECT * FROM directive_snippets WHERE directive_snippets_id = ? AND type = 'apache' AND active = 'y' AND customer_viewable = 'y'", intval($data['new']['directive_snippets_id']));
         if(isset($snippet['snippet'])){
            $vhost_data['apache_directives'] = $snippet['snippet'];
         }
      }
      // Make sure we only have Unix linebreaks
      $vhost_data['apache_directives'] = str_replace("\r\n", "\n", $vhost_data['apache_directives']);
      $vhost_data['apache_directives'] = str_replace("\r", "\n", $vhost_data['apache_directives']);