diff --git a/lib/formfields/customer/domains/formfield.domains_add.php b/lib/formfields/customer/domains/formfield.domains_add.php index 457c9c7b..996fbba9 100644 --- a/lib/formfields/customer/domains/formfield.domains_add.php +++ b/lib/formfields/customer/domains/formfield.domains_add.php @@ -43,7 +43,7 @@ return array( ), 'path' => array( 'label' => $lng['panel']['path'], - 'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? $pathSelect['note'].'
'.$pathSelect['value'] : ''), + 'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescriptionSubdomain'] : null).(isset($pathSelect['note']) ? $pathSelect['note'].'
'.$pathSelect['value'] : ''), 'type' => $pathSelect['type'], 'select_var' => $pathSelect['value'], 'value' => $pathSelect['value'] diff --git a/lib/formfields/customer/domains/formfield.domains_edit.php b/lib/formfields/customer/domains/formfield.domains_edit.php index 7cce00f2..6ca1aec5 100644 --- a/lib/formfields/customer/domains/formfield.domains_edit.php +++ b/lib/formfields/customer/domains/formfield.domains_edit.php @@ -42,7 +42,7 @@ return array( ), 'path' => array( 'label' => $lng['panel']['path'], - 'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '
'.$pathSelect['value'] : ''), + 'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescriptionSubdomain'] : null).(isset($pathSelect['note']) ? '
'.$pathSelect['value'] : ''), 'type' => $pathSelect['type'], 'select_var' => $pathSelect['value'], 'value' => $pathSelect['value'] diff --git a/lng/english.lng.php b/lng/english.lng.php index 9b99b5ee..03f711b9 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -492,7 +492,8 @@ $lng['admin']['nameserversettings'] = 'Nameserver settings'; $lng['admin']['updatecounters'] = 'Recalculate resource usage'; $lng['question']['admin_counters_reallyupdate'] = 'Do you really want to recalculate resource usage?'; $lng['panel']['pathDescription'] = 'If the directory doesn\'t exist, it will be created automatically.'; -$lng['panel']['pathDescriptionEx'] = '

If you want a redirect to another domain than this entry has to start with http:// or https://'; +$lng['panel']['pathDescriptionEx'] = '

If you want a redirect to another domain than this entry has to start with http:// or https://.'; +$lng['panel']['pathDescriptionSubdomain'] = $lng['panel']['pathDescription'].$lng['panel']['pathDescriptionEx']."

If the URL ends with / it is considered a folder, if not, it is treated as file."; // ADDED IN 1.2.16-svn6 diff --git a/lng/german.lng.php b/lng/german.lng.php index 42df39ca..4d0f4195 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -491,7 +491,8 @@ $lng['admin']['nameserversettings'] = 'Nameservereinstellungen'; $lng['admin']['updatecounters'] = 'Ressourcenverbrauch'; $lng['question']['admin_counters_reallyupdate'] = 'Wollen Sie den Ressourcenverbrauch neu berechnen?'; $lng['panel']['pathDescription'] = 'Wenn das Verzeichnis nicht existiert, wird es automatisch erstellt.'; -$lng['panel']['pathDescriptionEx'] = '

Sollte eine Weiterleitung auf eine andere Domain gewünscht sein, muss der Eintrag mit http:// oder https:// beginnen'; +$lng['panel']['pathDescriptionEx'] = '

Sollte eine Weiterleitung auf eine andere Domain gewünscht sein, muss der Eintrag mit http:// oder https:// beginnen.'; +$lng['panel']['pathDescriptionSubdomain'] = $lng['panel']['pathDescription'].$lng['panel']['pathDescriptionEx']."

Endet die URL mit einem / geht Froxlor von einem Ordner aus, wenn nicht, wird es wie eine Datei behandelt."; // ADDED IN 1.2.16-svn6 diff --git a/scripts/jobs/cron_tasks.inc.http.10.apache.php b/scripts/jobs/cron_tasks.inc.http.10.apache.php index 4b654f6e..40bfe440 100644 --- a/scripts/jobs/cron_tasks.inc.http.10.apache.php +++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php @@ -673,9 +673,6 @@ class apache if (preg_match('/^https?\:\/\//', $domain['documentroot'])) { $corrected_docroot = $this->idnaConvert->encode($domain['documentroot']); - if (substr($corrected_docroot, -1) == '/') { - $corrected_docroot = substr($corrected_docroot, 0, -1); - } /* Get domain's redirect code */ $code = getDomainRedirectCode($domain['id']);