Ticket #2091: use_prefix.patch

gui/domain_default_page/index.html

@@ -98 +98 @@
                <div id="center">
                        <div id="content">
                                <p>This is the default page for <b>{DOMAIN_NAME}</b>. This page was generated automatically via ispCP Omega. Please upload your own index.html file.</p>
-                               <p>If you are the Administrator of this domain, please login <a href="http://{BASE_SERVER_VHOST}" class="link">here</a>.</p>
+                               <p>If you are the Administrator of this domain, please login <a href="{BASE_SERVER_VHOST_PREFIX}{BASE_SERVER_VHOST}" class="link">here</a>.</p>
                                <p class="login">Powered by <a class="link" href="http://www.isp-control.net" title="ispCP Omega Homepage">ispCP Omega</a></p>
                        </div>
                </div>

engine/ispcp-dmn-mngr

@@ -1652 +1652 @@
 
                my ($index_tpl, $err_cfg_dir) = (undef, undef);
                my $vhost = $main::cfg{'BASE_SERVER_VHOST'};
+                my $prefix = $main::cfg{'BASE_SERVER_VHOST_PREFIX'};
                $err_cfg_dir = "$main::cfg{'GUI_ROOT_DIR'}/domain_default_page";
                ($rs, $index_tpl) = get_tpl($err_cfg_dir, 'index.html');
                return $rs if ($rs != 0);
@@ -1659 +1660 @@
                my $decoded_dmn_name = idn_to_unicode($dmn_name, 'utf-8');
                my %tag_hash = (
                        '{DOMAIN_NAME}' => $decoded_dmn_name,
-                       '{BASE_SERVER_VHOST}' => $vhost
+                       '{BASE_SERVER_VHOST}' => $vhost,
+                       '{BASE_SERVER_VHOST_PREFIX}' => $prefix
                );
                ($rs, $cfg) = prep_tpl(\%tag_hash, $index_tpl);
                return $rs if ($rs != 0);