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

fixed syscp-bug #1213;

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-01-20 10:34:06 +00:00
parent 0eb38f5f29
commit 20f91fc718
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@@ -1,7 +1,7 @@
FIXED 0001282 Homedirs von Dovecot identisch FIXED 0001282 Homedirs von Dovecot identisch
0001274 Option to mark a Domain as Subdomain possible or not 0001274 Option to mark a Domain as Subdomain possible or not
FIXED 0001283 SysCP creating broken lighttpd config files FIXED 0001283 SysCP creating broken lighttpd config files
0001213 APS class_apsinstaller.php on line 510 - error installing different apps FIXED 0001213 APS class_apsinstaller.php on line 510 - error installing different apps
0001272 Default Config for libnss incomplete (debian/lenny) 0001272 Default Config for libnss incomplete (debian/lenny)
FIXED 0001281 Wrong open_basedir directive FIXED 0001281 Wrong open_basedir directive
0001280 deb packet 1.4.2.1-2 fu*ked 0001280 deb packet 1.4.2.1-2 fu*ked

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

@@ -247,9 +247,9 @@ class ApsInstaller extends ApsParser
//skip APS internal data //skip APS internal data
if($Row2['Name'] == 'main_location' if($Row2['Name'] == 'main_location'
|| $Row2['Name'] == 'main_domain' || $Row2['Name'] == 'main_domain'
|| $Row2['Name'] == 'main_database_password' || $Row2['Name'] == 'main_database_password'
|| $Row2['Name'] == 'license')continue; || $Row2['Name'] == 'license')continue;
putenv('SETTINGS_' . $Row2['Name'] . '=' . $Row2['Value']); putenv('SETTINGS_' . $Row2['Name'] . '=' . $Row2['Value']);
} }
} }
@@ -275,7 +275,7 @@ class ApsInstaller extends ApsParser
//extract all files and chown them to the customer guid //extract all files and chown them to the customer guid
if(self::ExtractZip($this->RootDir . 'packages/' . $Row['Path'] . '/' . $Row['Path'], $Xml->mapping['path'], $this->RealPath . $this->DomainPath . '/') == false if(self::ExtractZip($this->RootDir . 'packages/' . $Row['Path'] . '/' . $Row['Path'], $Xml->mapping['path'], $this->RealPath . $this->DomainPath . '/') == false
|| self::ExtractZip($this->RootDir . 'packages/' . $Row['Path'] . '/' . $Row['Path'], 'scripts', $this->RealPath . $this->DomainPath . '/install_scripts/') == false) || self::ExtractZip($this->RootDir . 'packages/' . $Row['Path'] . '/' . $Row['Path'], 'scripts', $this->RealPath . $this->DomainPath . '/install_scripts/') == false)
{ {
$this->db->query('UPDATE `' . TABLE_APS_INSTANCES . '` SET `Status` = ' . INSTANCE_ERROR . ' WHERE `ID` = ' . $this->db->escape($Row['InstanceID'])); $this->db->query('UPDATE `' . TABLE_APS_INSTANCES . '` SET `Status` = ' . INSTANCE_ERROR . ' WHERE `ID` = ' . $this->db->escape($Row['InstanceID']));
@@ -507,6 +507,12 @@ class ApsInstaller extends ApsParser
if(zip_entry_open($ZipHandle, $ZipEntry)) if(zip_entry_open($ZipHandle, $ZipEntry))
{ {
// handle new directory
$dir = dirname($Destination.$NewPath);
if (!file_exists($dir)) {
mkdir ($dir, 0777, true);
}
$File = fopen($Destination . $NewPath, "wb"); $File = fopen($Destination . $NewPath, "wb");
if($File) if($File)