Syncing from our internal branch. This adds safe default favicon.ico which ...

latham

2011-05-19 1c711c8e544d7d0f62d73c0d8367fa709b59cfce

Syncing from our internal branch. This adds safe
default favicon.ico which is blank, a simple 
.htaccess, and a simple robots.txt.  This will 
also reduce 404s on the whole server

 server/conf/index/.htaccess

New file
@@ -0,0 +1 @@
## Default .htaccess file

 server/conf/index/favicon.ico

 server/conf/index/robots.txt

New file
@@ -0,0 +1,2 @@
User-agent: *
Disallow:

 server/plugins-available/apache2_plugin.inc.php

@@ -441,6 +441,9 @@
            // copy the standard index page
            if (file_exists('/usr/local/ispconfig/server/conf-custom/index/standard_index.html_'.substr(escapeshellcmd($conf['language']),0,2))) {
                exec('cp /usr/local/ispconfig/server/conf-custom/index/standard_index.html_'.substr(escapeshellcmd($conf['language']),0,2).' '.escapeshellcmd($data['new']['document_root']).'/web/index.html');
                if(is_file('/usr/local/ispconfig/server/conf-custom/index/favicon.ico')) exec('cp /usr/local/ispconfig/server/conf-custom/index/favicon.ico '.escapeshellcmd($data['new']['document_root']).'/web/');
                if(is_file('/usr/local/ispconfig/server/conf-custom/index/robots.txt')) exec('cp /usr/local/ispconfig/server/conf-custom/index/robots.txt '.escapeshellcmd($data['new']['document_root']).'/web/');
                if(is_file('/usr/local/ispconfig/server/conf-custom/index/.htaccess')) exec('cp /usr/local/ispconfig/server/conf-custom/index/.htaccess '.escapeshellcmd($data['new']['document_root']).'/web/');
            }
            else {
                if (file_exists('/usr/local/ispconfig/server/conf-custom/index/standard_index.html')) {
@@ -1418,4 +1421,4 @@

} // end class

?>
?>