Skip to content

Commit 7a4489f

Browse files
committed
Implemented: FS#1101 - Use relative paths for symlinks to enable modules.
1 parent 54396ba commit 7a4489f

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

install/lib/installer_base.lib.php

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,9 +1242,15 @@ public function install_ispconfig() {
12421242
$module_name = substr($file,0,-8);
12431243
$tmp = new $module_name;
12441244
if($tmp->onInstall()) {
1245-
if(!@is_link($install_dir.'/server/mods-enabled/'.$file)) @symlink($install_dir.'/server/mods-available/'.$file, $install_dir.'/server/mods-enabled/'.$file);
1245+
if(!@is_link($install_dir.'/server/mods-enabled/'.$file)) {
1246+
// @symlink($install_dir.'/server/mods-available/'.$file, $install_dir.'/server/mods-enabled/'.$file);
1247+
@symlink($install_dir.'/server/mods-available/'.$file, '../mods-enabled/'.$file);
1248+
}
12461249
if (strpos($file, '_core_module') !== false) {
1247-
if(!@is_link($install_dir.'/server/mods-core/'.$file)) @symlink($install_dir.'/server/mods-available/'.$file, $install_dir.'/server/mods-core/'.$file);
1250+
if(!@is_link($install_dir.'/server/mods-core/'.$file)) {
1251+
//@symlink($install_dir.'/server/mods-available/'.$file, $install_dir.'/server/mods-core/'.$file);
1252+
@symlink($install_dir.'/server/mods-available/'.$file, '../mods-core/'.$file);
1253+
}
12481254
}
12491255
}
12501256
unset($tmp);
@@ -1263,9 +1269,15 @@ public function install_ispconfig() {
12631269
$plugin_name = substr($file,0,-8);
12641270
$tmp = new $plugin_name;
12651271
if(method_exists($tmp,'onInstall') && $tmp->onInstall()) {
1266-
if(!@is_link($install_dir.'/server/plugins-enabled/'.$file)) @symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-enabled/'.$file);
1272+
if(!@is_link($install_dir.'/server/plugins-enabled/'.$file)) {
1273+
// @symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-enabled/'.$file);
1274+
@symlink($install_dir.'/server/plugins-available/'.$file, '../plugins-enabled/'.$file);
1275+
}
12671276
if (strpos($file, '_core_plugin') !== false) {
1268-
if(!@is_link($install_dir.'/server/plugins-core/'.$file)) @symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-core/'.$file);
1277+
if(!@is_link($install_dir.'/server/plugins-core/'.$file)) {
1278+
// @symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-core/'.$file);
1279+
@symlink($install_dir.'/server/plugins-available/'.$file, '../plugins-core/'.$file);
1280+
}
12691281
}
12701282
}
12711283
unset($tmp);

0 commit comments

Comments
 (0)