diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php index 47ba89c3b7f7c9a551a25397be7f34ba08bb2987..9a80aa0a6c57d83eecbff1a3e22bb8db72cecfff 100644 --- a/interface/web/admin/form/server_config.tform.php +++ b/interface/web/admin/form/server_config.tform.php @@ -354,6 +354,12 @@ $form["tabs"]['web'] = array( 'width' => '40', 'maxlength' => '255' ), + 'website_symlinks_rel' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'n', + 'value' => array(0 => 'n',1 => 'y') + ), 'vhost_conf_dir' => array( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng index 4237b1a7072f80324700d56e9ba214e5c3b7e188..7af080a060ce13f436c8aef175ae29c81fc398ad 100644 --- a/interface/web/admin/lib/lang/ar_server_config.lng +++ b/interface/web/admin/lib/lang/ar_server_config.lng @@ -5,6 +5,7 @@ $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications'; $wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications'; $wb['website_path_txt'] = 'Website path'; $wb['website_symlinks_txt'] = 'Website symlinks'; +$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; $wb['website_basedir_txt'] = 'Website basedir'; $wb['vhost_conf_dir_txt'] = 'Vhost config dir'; $wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir'; diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng index d91e15f6d53152ba5c55d936283840a727fb6a9f..b2fb3060971e6a4e36eb0168b8f54a4b4b933bee 100644 --- a/interface/web/admin/lib/lang/bg_server_config.lng +++ b/interface/web/admin/lib/lang/bg_server_config.lng @@ -4,6 +4,7 @@ $wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections'; $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications'; $wb['website_path_txt'] = 'Website path'; $wb['website_symlinks_txt'] = 'Website symlinks'; +$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; $wb['vhost_conf_dir_txt'] = 'Vhost config dir'; $wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir'; $wb['getmail_config_dir_txt'] = 'Getmail config dir'; diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng index 43ab69a8f46f8852eed8d520055dd075e8b25133..dcbd1e206f79b72c23fe2d995cad97400e9f7272 100644 --- a/interface/web/admin/lib/lang/br_server_config.lng +++ b/interface/web/admin/lib/lang/br_server_config.lng @@ -4,6 +4,7 @@ $wb['jailkit_chroot_app_sections_txt'] = 'Aplicações Jailkit chroot (Sessões) $wb['jailkit_chroot_app_programs_txt'] = 'Aplicações Jailkit em ambiente chroot'; $wb['website_path_txt'] = 'Caminho do Website'; $wb['website_symlinks_txt'] = 'Website symlinks: link simbólico'; +$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; $wb['website_basedir_txt'] = 'Website basedir: Diretório base '; $wb['vhost_conf_dir_txt'] = 'Vhost config dir'; $wb['vhost_conf_enabled_dir_txt'] = 'Vhost diretório de configuração ativo'; diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng index 7a3b4f8bcf20dd6d8098cc64aaf06bd91322b4f3..4f75f233fc2325d0da6e93bcebdf5c129da509a2 100644 --- a/interface/web/admin/lib/lang/cz_server_config.lng +++ b/interface/web/admin/lib/lang/cz_server_config.lng @@ -5,6 +5,7 @@ $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrootované aplikace'; $wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrootované aplikace'; $wb['website_path_txt'] = 'Website cesta'; $wb['website_symlinks_txt'] = 'Website symlinky'; +$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; $wb['website_basedir_txt'] = 'Website config adresář'; $wb['vhost_conf_dir_txt'] = 'Vhost config adresář'; $wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled adresář'; diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng index 4f7b9a54ff2f803b52f7ff75b22663242152e9bc..1ec85d3aa9f77ad2e22f28c8250b861f198f7a5d 100644 --- a/interface/web/admin/lib/lang/de_server_config.lng +++ b/interface/web/admin/lib/lang/de_server_config.lng @@ -5,6 +5,7 @@ $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted Anwendungen'; $wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted Anwendungen'; $wb['website_path_txt'] = 'Website Pfad'; $wb['website_symlinks_txt'] = 'Website Symlinks'; +$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; $wb['vhost_conf_dir_txt'] = 'Vhost config dir'; $wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir'; $wb['getmail_config_dir_txt'] = 'Getmail config dir'; diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng index f5c01d0d1be13c7a007a172361fc54f8b20f34d0..9925cdfb9da604d5043fd66611b3f060945e727b 100644 --- a/interface/web/admin/lib/lang/el_server_config.lng +++ b/interface/web/admin/lib/lang/el_server_config.lng @@ -5,6 +5,7 @@ $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications'; $wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications'; $wb['website_path_txt'] = 'Διαδρομή Website'; $wb['website_symlinks_txt'] = 'Website symlinks'; +$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; $wb['website_basedir_txt'] = 'Βασικός φάκελος Website'; $wb['vhost_conf_dir_txt'] = 'Φάκελος ρυθμίσεων Vhost'; $wb['vhost_conf_enabled_dir_txt'] = 'Φάκελος ρυθμίσεων (ενεργών) Vhost'; diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng index 6b9bbfe2c02eec4b08bc7a82802c9e41b1bbd452..abf946bb77e08d4d148dc628bc9a7e42ffa1229b 100644 --- a/interface/web/admin/lib/lang/en_server_config.lng +++ b/interface/web/admin/lib/lang/en_server_config.lng @@ -13,6 +13,7 @@ $wb["jailkit_chroot_app_programs_txt"] = 'Jailkit chrooted applications'; $wb["jailkit_chroot_cron_programs_txt"] = 'Jailkit cron chrooted applications'; $wb["website_path_txt"] = 'Website path'; $wb["website_symlinks_txt"] = 'Website symlinks'; +$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; $wb["website_basedir_txt"] = 'Website basedir'; $wb["vhost_conf_dir_txt"] = 'Vhost config dir'; $wb["vhost_conf_enabled_dir_txt"] = 'Vhost config enabled dir'; diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng index f2a0b19acb9132003e40a694bf9498e85fd19c72..096411ebafd97b31c0f312c6fe13292406104bda 100644 --- a/interface/web/admin/lib/lang/es_server_config.lng +++ b/interface/web/admin/lib/lang/es_server_config.lng @@ -4,6 +4,7 @@ $wb['jailkit_chroot_app_sections_txt'] = 'Secciones de aplicación Jailkit chroo $wb['jailkit_chroot_app_programs_txt'] = 'Aplicaciones Jailkit chrooted'; $wb['website_path_txt'] = 'Ruta del sitio web'; $wb['website_symlinks_txt'] = 'Enlaces simbólicos del sitio web'; +$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; $wb['vhost_conf_dir_txt'] = 'Directorio de configuración de vhost'; $wb['vhost_conf_enabled_dir_txt'] = 'Directorio de configuración de vhost activados'; $wb['getmail_config_dir_txt'] = 'Directorio de configuración de Getmail'; diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng index 94417c1dda7bd644b3ca4af67be32d41e0a625f9..42227769bf277a4dfb838f68a3cc8d09d9f656b3 100755 --- a/interface/web/admin/lib/lang/fi_server_config.lng +++ b/interface/web/admin/lib/lang/fi_server_config.lng @@ -4,6 +4,7 @@ $wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot-ohjelmaosiot'; $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted-ohjelmat'; $wb['website_path_txt'] = 'Verkkotunnuksen kotihakemisto'; $wb['website_symlinks_txt'] = 'Verkkotunnuksen symmetriset linkit'; +$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; $wb['vhost_conf_dir_txt'] = 'Virtuaalipalvelimen asetuskansio'; $wb['vhost_conf_enabled_dir_txt'] = 'Virtuaalipalvelimen käyttöönottokansio'; $wb['getmail_config_dir_txt'] = 'Getmail-asetuskansio'; diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng index 3efec6a7cd36ff9d4254d7f78c35e0d92782238e..7dbf4ae16db7e2ba5b477bb5818324171694dcb9 100644 --- a/interface/web/admin/lib/lang/fr_server_config.lng +++ b/interface/web/admin/lib/lang/fr_server_config.lng @@ -4,6 +4,7 @@ $wb['jailkit_chroot_app_sections_txt'] = 'Sections des applications chrootées J $wb['jailkit_chroot_app_programs_txt'] = 'Applications chrootées Jailkit'; $wb['website_path_txt'] = 'Chemin du site web'; $wb['website_symlinks_txt'] = 'Liens symboliques du site web'; +$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; $wb['vhost_conf_dir_txt'] = 'Répertoire de configuration des VHosts'; $wb['vhost_conf_enabled_dir_txt'] = 'Répertoire de configuration des VHosts actifs'; $wb['getmail_config_dir_txt'] = 'Répertoire de configuration de Getmail'; diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng index f62d28e5b3543eb880c8ce0d702bd5a2c586f88c..279bda631ecf34410ed52910761a80ebbe478481 100644 --- a/interface/web/admin/lib/lang/hu_server_config.lng +++ b/interface/web/admin/lib/lang/hu_server_config.lng @@ -4,6 +4,7 @@ $wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections'; $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications'; $wb['website_path_txt'] = 'Website path'; $wb['website_symlinks_txt'] = 'Website symlinks'; +$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; $wb['vhost_conf_dir_txt'] = 'Vhost config dir'; $wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir'; $wb['getmail_config_dir_txt'] = 'Getmail config dir'; diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng index 022aff866dea45892995befeb738c28c279d6b1e..5999bfd3914ce8296f155d26b242747bc6f683a9 100644 --- a/interface/web/admin/lib/lang/id_server_config.lng +++ b/interface/web/admin/lib/lang/id_server_config.lng @@ -5,6 +5,7 @@ $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit aplikasi yang ter-chroot'; $wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit aplikasi cron yang ter-chroot'; $wb['website_path_txt'] = 'Path situs web'; $wb['website_symlinks_txt'] = 'Symlink Situs web'; +$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; $wb['website_basedir_txt'] = 'Basedir Situs web'; $wb['vhost_conf_dir_txt'] = 'Direktori konfigurasi vhost'; $wb['vhost_conf_enabled_dir_txt'] = 'Direktori konfigurasi vhost yang aktif'; diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng index c907926e3095c34fd1f73eee32eac133d27b202b..1505b3a5eb1976a39a8a5d860ef66434024f6a7a 100644 --- a/interface/web/admin/lib/lang/it_server_config.lng +++ b/interface/web/admin/lib/lang/it_server_config.lng @@ -4,6 +4,7 @@ $wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections'; $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications'; $wb['website_path_txt'] = 'Website path'; $wb['website_symlinks_txt'] = 'Website symlinks'; +$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; $wb['vhost_conf_dir_txt'] = 'Vhost config dir'; $wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir'; $wb['getmail_config_dir_txt'] = 'Getmail config dir'; diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng index 2cade8d650e01592e98661eb50e484a2b99072f1..fadca57e6fb523cf32241f625f6b623a254a9e42 100644 --- a/interface/web/admin/lib/lang/ja_server_config.lng +++ b/interface/web/admin/lib/lang/ja_server_config.lng @@ -5,6 +5,7 @@ $wb['jailkit_chroot_app_programs_txt'] = '利用可能アプリケーション'; $wb['jailkit_chroot_cron_programs_txt'] = 'cron での利用可能アプリケーション'; $wb['website_path_txt'] = 'ウェブサイトのパス'; $wb['website_symlinks_txt'] = 'ウェブサイトのシンボリックリンク'; +$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; $wb['website_basedir_txt'] = 'ウェブサイトのベースディレクトリ'; $wb['vhost_conf_dir_txt'] = 'バーチャルホスト設定ディレクトリ'; $wb['vhost_conf_enabled_dir_txt'] = 'バーチャルホスト設定ディレクトリ(有効)'; diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng index 8a13b9d5f8afa793f21ea1d7626feeff0a284a74..2c17e75e545152eec627b5e77edee44548bc9c56 100644 --- a/interface/web/admin/lib/lang/nl_server_config.lng +++ b/interface/web/admin/lib/lang/nl_server_config.lng @@ -5,6 +5,7 @@ $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applicaties'; $wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applicaties'; $wb['website_path_txt'] = 'Website pad'; $wb['website_symlinks_txt'] = 'Website symlinks'; +$wb['website_symlinks_rel_txt'] = 'Maak relative symlinks'; $wb['website_basedir_txt'] = 'Website basedir'; $wb['vhost_conf_dir_txt'] = 'Vhost config dir'; $wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir'; diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng index 94f383d52409378f808ed6b537ba7fa9ac4f8789..6a73b1ccaee26ac07ced45e1bb72fb8db3bc9b06 100644 --- a/interface/web/admin/lib/lang/pl_server_config.lng +++ b/interface/web/admin/lib/lang/pl_server_config.lng @@ -5,6 +5,7 @@ $wb['jailkit_chroot_app_programs_txt'] = 'Ścieżki aplikacji roota Jailkit'; $wb['jailkit_chroot_cron_programs_txt'] = 'Aplikacje cron roota Jailkit'; $wb['website_path_txt'] = 'Adres strony WWW'; $wb['website_symlinks_txt'] = 'Symulowany link strony WWW'; +$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; $wb['website_basedir_txt'] = 'Ścieżka bazowa strony WWW'; $wb['vhost_conf_dir_txt'] = 'Ścieżka do konfiguracyji wirtualnego serwera'; $wb['vhost_conf_enabled_dir_txt'] = 'Ścieżka do aktywnej konfiguracyji Vhost'; diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng index 77b261358ad12ff56541d3a3f49b71ffdbcdf544..e5893865ccb35eb12a036702f056891cd9a6a047 100644 --- a/interface/web/admin/lib/lang/pt_server_config.lng +++ b/interface/web/admin/lib/lang/pt_server_config.lng @@ -4,6 +4,7 @@ $wb['jailkit_chroot_app_sections_txt'] = 'Aplicações Jailkit chroot (Sessões) $wb['jailkit_chroot_app_programs_txt'] = 'Aplicações Jailkit em ambiente chroot'; $wb['website_path_txt'] = 'Pasta do Website'; $wb['website_symlinks_txt'] = 'Website symlinks: link simbólico'; +$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; $wb['website_basedir_txt'] = 'Website basedir: pasta base '; $wb['vhost_conf_dir_txt'] = 'Vhost config dir'; $wb['vhost_conf_enabled_dir_txt'] = 'Vhost pasta de configuração activo'; diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng index 4301f7acb79c64c3b09949fead519a329b7c9c88..8e130a2c4009756e98001789bd952baf0afa1bbc 100644 --- a/interface/web/admin/lib/lang/ro_server_config.lng +++ b/interface/web/admin/lib/lang/ro_server_config.lng @@ -4,6 +4,7 @@ $wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections'; $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications'; $wb['website_path_txt'] = 'Website path'; $wb['website_symlinks_txt'] = 'Website symlinks'; +$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; $wb['website_basedir_txt'] = 'Website basedir'; $wb['vhost_conf_dir_txt'] = 'Vhost config dir'; $wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir'; diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng index 071e1653baaa75c759875c7bd65bf67aca6e2915..9771e3425313046d7758fad5a8c188bd2d3d0ce3 100644 --- a/interface/web/admin/lib/lang/ru_server_config.lng +++ b/interface/web/admin/lib/lang/ru_server_config.lng @@ -4,6 +4,7 @@ $wb['jailkit_chroot_app_sections_txt'] = 'Раздел программы Jailki $wb['jailkit_chroot_app_programs_txt'] = 'Программы Jailkit chrooted'; $wb['website_path_txt'] = 'Путь web-сайта'; $wb['website_symlinks_txt'] = 'Симлинки Web-сайта'; +$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; $wb['vhost_conf_dir_txt'] = 'Папка конфига Vhost'; $wb['vhost_conf_enabled_dir_txt'] = 'Папка конфига включенного Vhost'; $wb['getmail_config_dir_txt'] = 'Папка конфига Getmail'; diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng index f97bf12e6a46b13e128a9dbfa72b60c189738fb4..bdcbb589a63765f16ee96281372789795463ba06 100644 --- a/interface/web/admin/lib/lang/se_server_config.lng +++ b/interface/web/admin/lib/lang/se_server_config.lng @@ -4,6 +4,7 @@ $wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections'; $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications'; $wb['website_path_txt'] = 'Website path'; $wb['website_symlinks_txt'] = 'Website symlinks'; +$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; $wb['vhost_conf_dir_txt'] = 'Vhost config dir'; $wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir'; $wb['getmail_config_dir_txt'] = 'Getmail config dir'; diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng index 97ba1447d8f2c2f7b324088c8ddf9737d40d1126..2d6c81ffda0aba60bcf29949459f82743026cb30 100644 --- a/interface/web/admin/lib/lang/sk_server_config.lng +++ b/interface/web/admin/lib/lang/sk_server_config.lng @@ -5,6 +5,7 @@ $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted aplikácia'; $wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted aplikácia'; $wb['website_path_txt'] = 'Website cesta'; $wb['website_symlinks_txt'] = 'Website symlinky'; +$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; $wb['website_basedir_txt'] = 'Website základny adresár'; $wb['vhost_conf_dir_txt'] = 'Vhost konfig adresár'; $wb['vhost_conf_enabled_dir_txt'] = 'Vhost konfig odblokovaný adresár'; diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng index fc6b4b8a3248df98ed1a4a99ff363e3c9001ec6e..c12f650e625f1d428f361ca776698015f79730b2 100644 --- a/interface/web/admin/lib/lang/tr_server_config.lng +++ b/interface/web/admin/lib/lang/tr_server_config.lng @@ -5,6 +5,7 @@ $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications'; $wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications'; $wb['website_path_txt'] = 'Website yolu'; $wb['website_symlinks_txt'] = 'Website symlinks'; +$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; $wb['website_basedir_txt'] = 'Website klasörü'; $wb['vhost_conf_dir_txt'] = 'Vhost config dir'; $wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir'; diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm index 8cdc188688e381e80612c8d206b05c966e9a925a..56ea0b79561524c1ad7532db420e7e63354b5891 100644 --- a/interface/web/admin/templates/server_config_web_edit.htm +++ b/interface/web/admin/templates/server_config_web_edit.htm @@ -17,6 +17,12 @@ +
+ +
+ {tmpl_var name='website_symlinks_rel'} +
+
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index 6552feaeb06e35ed7d539632932c2f31751c7af2..a499ae43860f028c148e26b223f4da1ed3fd8046 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -357,7 +357,13 @@ class apache2_plugin { // Create the symlink for the logfiles if(!is_dir('/var/log/ispconfig/httpd/'.$data['new']['domain'])) exec('mkdir -p /var/log/ispconfig/httpd/'.$data['new']['domain']); if(!is_link($data['new']['document_root'].'/log')) { - exec('ln -s /var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/log'); +// exec("ln -s /var/log/ispconfig/httpd/".$data["new"]["domain"]." ".$data["new"]["document_root"]."/log"); + if ($web_config["website_symlinks_rel"] == 'y') { + $this->create_relative_link("/var/log/ispconfig/httpd/".$data["new"]["domain"], $data["new"]["document_root"]."/log"); + } else { + exec("ln -s /var/log/ispconfig/httpd/".$data["new"]["domain"]." ".$data["new"]["document_root"]."/log"); + } + $app->log('Creating symlink: ln -s /var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/log',LOGLEVEL_DEBUG); } /* @@ -413,7 +419,13 @@ class apache2_plugin { } // create the symlinks, if not exist if(!is_link($tmp_symlink)) { - exec('ln -s '.escapeshellcmd($data['new']['document_root']).'/ '.escapeshellcmd($tmp_symlink)); +// exec("ln -s ".escapeshellcmd($data["new"]["document_root"])."/ ".escapeshellcmd($tmp_symlink)); + if ($web_config["website_symlinks_rel"] == 'y') { + $this->create_relative_link(escapeshellcmd($data["new"]["document_root"]), escapeshellcmd($tmp_symlink)); + } else { + exec("ln -s ".escapeshellcmd($data["new"]["document_root"])."/ ".escapeshellcmd($tmp_symlink)); + } + $app->log('Creating symlink: ln -s '.$data['new']['document_root'].'/ '.$tmp_symlink,LOGLEVEL_DEBUG); } } @@ -1458,6 +1470,31 @@ class apache2_plugin { } } + public function create_relative_link($f, $t) { + // $from already exists + $from = realpath($f); + + // realpath requires the traced file to exist - so, lets touch it first, then remove + @unlink($t); touch($t); + $to = realpath($t); + @unlink($t); + + // Remove from the left side matching path elements from $from and $to + // and get path elements counts + $a1 = explode('/', $from); $a2 = explode('/', $to); + for ($c = 0; $a1[$c] == $a2[$c]; $c++) { + unset($a1[$c]); unset($a2[$c]); + } + $cfrom = implode('/', $a1); + + // Check if a path is fully a subpath of another - no way to create symlink in the case + if (count($a1) == 0 || count($a2) == 0) return false; + + // Add ($cnt_to-1) number of "../" elements to left side of $cfrom + for ($c = 0; $c < (count($a2)-1); $c++) { $cfrom = '../'.$cfrom; } + + return symlink($cfrom, $to); + } } // end class