Merged d00ps and my branch, renamed SysCP -> Froxlor in installer

This commit is contained in:
Florian Aders (EleRas)
2010-01-22 14:02:42 +00:00
parent eeec43ebd7
commit a46b99ea03
32 changed files with 228 additions and 87 deletions

View File

@@ -30,10 +30,10 @@ class apache
private $logger = false;
private $debugHandler = false;
private $idnaConvert = false;
private $settings = array();
// protected
protected $settings = array();
protected $known_vhostfilenames = array();
protected $known_diroptionsfilenames = array();
protected $known_htpasswdsfilenames = array();
@@ -49,10 +49,11 @@ class apache
$this->idnaConvert = $idnaConvert;
$this->settings = $settings;
}
/*
* We compose the namevirtualhost entries
*/
protected function getDB()
{
return $this->db;
}
public function reload()
{