Merge branch 'master' into 'master'

Marius Cramer

2015-03-06 39a2d33c4680fe0a0fcd10e864d075f520d9905e

 server/lib/classes/getconf.inc.php

@@ -59,6 +59,15 @@
      }
      return ($section == '') ? $this->config['global'] : $this->config['global'][$section];
   }
	
   public function get_security_config($section = '') {
      global $app;

      $app->uses('ini_parser');
      $security_config = $app->ini_parser->parse_ini_string(file_get_contents('/usr/local/ispconfig/security/security_settings.ini'));

      return ($section == '') ? $security_config : $security_config[$section];
   }

}