diff --git a/bureau/admin/dom_edit.inc.php b/bureau/admin/dom_edit.inc.php index 92e1013b..60cb0e73 100644 --- a/bureau/admin/dom_edit.inc.php +++ b/bureau/admin/dom_edit.inc.php @@ -87,7 +87,7 @@ $dom->unlock(); </script><?php break; case "URL": ?> - <input type="text" class="int" name="t_<?php echo $dt['name']?>" id="t_<?php echo $dt['name']?>" value="<?php ehe($targval); ?>" size="50" /> + <input type="text" class="int" name="t_<?php echo $dt['name']?>" id="t_<?php echo $dt['name']?>" value="<?php ehe( (empty($targval)?'http://':$targval) ); ?>" size="50" /> <small><?php __("(enter an URL here)"); ?></small><?php break;; case 'IP':?> diff --git a/install/mysql.sql b/install/mysql.sql index 76ed101b..c8bb0b47 100644 --- a/install/mysql.sql +++ b/install/mysql.sql @@ -692,9 +692,9 @@ CREATE TABLE IF NOT EXISTS `default_subdomains` ( INSERT INTO `default_subdomains` (`sub`, `domain_type`, `domain_type_parameter`, `concerned`) VALUES ('www', 'VHOST', '%%DOMAINDIR%%', 'MAIN'), ('mail', 'WEBMAIL', '', 'MAIN'), -('', 'URL', 'www.%%DOMAIN%%', 'MAIN'), -('www', 'URL', 'www.%%TARGETDOM%%', 'SLAVE'), -('mail', 'URL', 'mail.%%TARGETDOM%%', 'SLAVE'), -('', 'URL', '%%TARGETDOM%%', 'SLAVE'); +('', 'URL', 'http://www.%%DOMAIN%%', 'MAIN'), +('www', 'URL', 'http://www.%%TARGETDOM%%', 'SLAVE'), +('mail', 'URL', 'http://mail.%%TARGETDOM%%', 'SLAVE'), +('', 'URL', 'http://%%TARGETDOM%%', 'SLAVE'); diff --git a/install/upgrades/1.1.sql b/install/upgrades/1.1.sql index b284ae0c..c58890d0 100644 --- a/install/upgrades/1.1.sql +++ b/install/upgrades/1.1.sql @@ -212,12 +212,12 @@ CREATE TABLE IF NOT EXISTS `default_subdomains` ( ) COMMENT='Contains the defaults subdomains created on domains creation'; INSERT INTO `default_subdomains` (`sub`, `domain_type`, `domain_type_parameter`, `concerned`) VALUES -('www', 'VHOST', '%%DOMAINDIR%%', 'MAIN'), -('mail', 'WEBMAIL', '', 'MAIN'), -('', 'URL', 'www.%%DOMAIN%%', 'MAIN'), -('www', 'URL', 'www.%%TARGETDOM%%', 'SLAVE'), -('mail', 'URL', 'mail.%%TARGETDOM%%', 'SLAVE'), -('', 'URL', '%%TARGETDOM%%', 'SLAVE'); +('www', 'VHOST', '%%DOMAINDIR%%', 'MAIN'), +('mail', 'WEBMAIL', '', 'MAIN'), +('', 'URL', 'http://www.%%DOMAIN%%', 'MAIN'), +('www', 'URL', 'http://www.%%TARGETDOM%%', 'SLAVE'), +('mail', 'URL', 'http://mail.%%TARGETDOM%%', 'SLAVE'), +('', 'URL', 'http://%%TARGETDOM%%', 'SLAVE'); -- -------------------------------------------------