maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #134 from RipClaw2971/#1281

Browse Source 
fixes #1281
This commit is contained in:
Michael Kaufmann
2013-10-21 09:11:31 -07:00
parent 510c429956 d0315b7ed3
commit b81d163e1d
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/classes/aps/class.ApsInstaller.php
View File

@@ -269,18 +269,21 @@ class ApsInstaller extends ApsParser
$this->db->query('DELETE FROM `' . TABLE_APS_INSTANCES . '` WHERE `ID` = ' . $this->db->escape($Row['InstanceID'])); $this->db->query('DELETE FROM `' . TABLE_APS_INSTANCES . '` WHERE `ID` = ' . $this->db->escape($Row['InstanceID']));
$this->db->query('DELETE FROM `' . TABLE_APS_SETTINGS . '` WHERE `InstanceID` = ' . $this->db->escape($Row['InstanceID'])); $this->db->query('DELETE FROM `' . TABLE_APS_SETTINGS . '` WHERE `InstanceID` = ' . $this->db->escape($Row['InstanceID']));
//remove data, #273 if($this->RealPath != '' && checkDisallowedPaths($this->RealPath))
if($this->DomainPath != '' && $this->DomainPath != '/') { {
self::UnlinkRecursive($this->RealPath . $this->DomainPath . '/'); //remove data, #273
} else { if($this->DomainPath != '' && $this->DomainPath != '/') {
// save awstats/webalizer folder if it's the docroot self::UnlinkRecursive($this->RealPath . $this->DomainPath . '/');
self::UnlinkRecursive($this->RealPath . $this->DomainPath . '/', true); } else {
// place standard-index file // save awstats/webalizer folder if it's the docroot
$loginname = getLoginNameByUid($Row['CustomerID']); self::UnlinkRecursive($this->RealPath . $this->DomainPath . '/', true);
if($loginname !== false) // place standard-index file
{ $loginname = getLoginNameByUid($Row['CustomerID']);
storeDefaultIndex($loginname, $this->RealPath . $this->DomainPath . '/'); if($loginname !== false)
} {
storeDefaultIndex($loginname, $this->RealPath . $this->DomainPath . '/');
}
}
} }
} }
} }
@@ -335,7 +338,13 @@ class ApsInstaller extends ApsParser
$mapping_path = $Xml->mapping['path']; $mapping_path = $Xml->mapping['path'];
$mapping_url = $Xml->mapping['url']; $mapping_url = $Xml->mapping['url'];
} }
if ($this->RealPath == '' || !checkDisallowedPaths($this->RealPath))
{
$this->db->query('UPDATE `' . TABLE_APS_INSTANCES . '` SET `Status` = ' . INSTANCE_ERROR . ' WHERE `ID` = ' . $this->db->escape($Row['InstanceID']));
return false;
}
if($Task == TASK_INSTALL) if($Task == TASK_INSTALL)
{ {
//FIXME truncate customer directory //FIXME truncate customer directory