- don't set password via remoting if field is empty

Marius Cramer

2015-08-06 37b29231e47a0c4458dc1c15d98588f16f07e1e2

 server/lib/classes/getconf.inc.php

@@ -38,7 +38,7 @@
      if(!is_array($this->config[$server_id])) {
         $app->uses('ini_parser');
         $server_id = intval($server_id);
         $server = $app->db->queryOneRecord('SELECT config FROM server WHERE server_id = '.$server_id);
         $server = $app->db->queryOneRecord('SELECT config FROM server WHERE server_id = ?', $server_id);
         $this->config[$server_id] = $app->ini_parser->parse_ini_string(stripslashes($server['config']));
      }

@@ -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];
   }

}