Commit 3e41e8e8 authored by latham's avatar latham
Browse files

Start Private Label work

parent 777a1d2a
...@@ -25,7 +25,9 @@ careful as this can override settings for the database. ...@@ -25,7 +25,9 @@ careful as this can override settings for the database.
// $conf['theme'] = 'mycustom_theme'; // Must be installed. // $conf['theme'] = 'mycustom_theme'; // Must be installed.
// $conf['logo'] = 'themes/default/images/ispc_logo.png'; // $conf['logo'] = 'themes/default/images/ispc_logo.png';
// $conf['language'] = 'en'; // $conf['templates'] = '/opt/tecnoera/templates';
// $conf['language'] = 'es';
// $conf['interface_logout_url'] = 'http://www.mycompany.com'; // $conf['interface_logout_url'] = 'http://www.mycompany.com';
......
...@@ -128,6 +128,8 @@ $conf['theme'] = 'default'; ...@@ -128,6 +128,8 @@ $conf['theme'] = 'default';
$conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ... $conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
$conf['logo'] = 'themes/default/images/ispc_logo.png'; $conf['logo'] = 'themes/default/images/ispc_logo.png';
//** Templates
$conf['templates'] = '/usr/local/ispconfig/server/conf';
//** Default Language //** Default Language
$conf['language'] = 'en'; $conf['language'] = 'en';
......
...@@ -420,40 +420,54 @@ class apache2_plugin { ...@@ -420,40 +420,54 @@ class apache2_plugin {
} }
// Install the Standard or Custom Error, Index and other related files
// /usr/local/ispconfig/server/conf is for the standard files
// /usr/local/ispconfig/server/conf-custom is for the custom files
// setting a local var here
// normally $conf['templates'] = "/usr/local/ispconfig/server/conf";
if($this->action == 'insert' && $data['new']['type'] == 'vhost') { if($this->action == 'insert' && $data['new']['type'] == 'vhost') {
// Copy the error pages // Copy the error pages
if($data['new']['errordocs']) { if($data['new']['errordocs']) {
$error_page_path = escapeshellcmd($data['new']['document_root']).'/web/error/'; $error_page_path = escapeshellcmd($data['new']['document_root']).'/web/error/';
if (file_exists('/usr/local/ispconfig/server/conf-custom/error/'.substr(escapeshellcmd($conf['language']),0,2))) { if (file_exists($conf['templates'] . '-custom/error/'.substr(escapeshellcmd($conf['language']),0,2))) {
exec('cp /usr/local/ispconfig/server/conf-custom/error/'.substr(escapeshellcmd($conf['language']),0,2).'/* '.$error_page_path); exec('cp ' . $conf['templates'] . '-custom/error/'.substr(escapeshellcmd($conf['language']),0,2).'/* '.$error_page_path);
} }
else { else {
if (file_exists('/usr/local/ispconfig/server/conf-custom/error/400.html')) { if (file_exists($conf['templates'] . '-custom/error/400.html')) {
exec('cp /usr/local/ispconfig/server/conf-custom/error/*.html '.$error_page_path); exec('cp '. $conf['templates'] .'-custom/error/*.html '.$error_page_path);
} }
else { else {
exec('cp /usr/local/ispconfig/server/conf/error/'.substr(escapeshellcmd($conf['language']),0,2).'/* '.$error_page_path); exec('cp ' . $conf['templates'] . '/error/'.substr(escapeshellcmd($conf['language']),0,2).'/* '.$error_page_path);
} }
} }
exec('chmod -R a+r '.$error_page_path); exec('chmod -R a+r '.$error_page_path);
} }
// copy the standard index page if (file_exists($conf['templates'] . '-custom/index/standard_index.html_'.substr(escapeshellcmd($conf['language']),0,2))) {
if (file_exists('/usr/local/ispconfig/server/conf-custom/index/standard_index.html_'.substr(escapeshellcmd($conf['language']),0,2))) { exec('cp ' . $conf['templates'] . '-custom/index/standard_index.html_'.substr(escapeshellcmd($conf['language']),0,2).' '.escapeshellcmd($data['new']['document_root']).'/web/index.html');
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($conf['templates'] . '-custom/index/favicon.ico')) {
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/'); exec('cp ' . $conf['templates'] . '-custom/index/favicon.ico '.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/'); }
} if(is_file($conf['templates'] . '-custom/index/robots.txt')) {
exec('cp ' . $conf['templates'] . '-custom/index/robots.txt '.escapeshellcmd($data['new']['document_root']).'/web/');
}
if(is_file($conf['templates'] . '-custom/index/.htaccess')) {
exec('cp ' . $conf['templates'] . '-custom/index/.htaccess '.escapeshellcmd($data['new']['document_root']).'/web/');
}
}
else { else {
if (file_exists('/usr/local/ispconfig/server/conf-custom/index/standard_index.html')) { if (file_exists($conf['templates'] . '-custom/index/standard_index.html')) {
exec('cp /usr/local/ispconfig/server/conf-custom/index/standard_index.html '.escapeshellcmd($data['new']['document_root']).'/web/index.html'); exec('cp ' . $conf['templates'] . '-custom/index/standard_index.html '.escapeshellcmd($data['new']['document_root']).'/web/index.html');
} }
else { else {
exec('cp /usr/local/ispconfig/server/conf/index/standard_index.html_'.substr(escapeshellcmd($conf['language']),0,2).' '.escapeshellcmd($data['new']['document_root']).'/web/index.html'); exec('cp ' . $conf['templates'] . '/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/index/favicon.ico')) exec('cp /usr/local/ispconfig/server/conf/index/favicon.ico '.escapeshellcmd($data['new']['document_root']).'/web/'); if(is_file($conf['templates'] . '/index/favicon.ico')) exec('cp ' . $conf['templates'] . '/index/favicon.ico '.escapeshellcmd($data['new']['document_root']).'/web/');
if(is_file('/usr/local/ispconfig/server/conf/index/robots.txt')) exec('cp /usr/local/ispconfig/server/conf/index/robots.txt '.escapeshellcmd($data['new']['document_root']).'/web/'); if(is_file($conf['templates'] . '/index/robots.txt')) exec('cp ' . $conf['templates'] . '/index/robots.txt '.escapeshellcmd($data['new']['document_root']).'/web/');
if(is_file('/usr/local/ispconfig/server/conf/index/.htaccess')) exec('cp /usr/local/ispconfig/server/conf/index/.htaccess '.escapeshellcmd($data['new']['document_root']).'/web/'); if(is_file($conf['templates'] . '/index/.htaccess')) exec('cp ' . $conf['templates'] . '/index/.htaccess '.escapeshellcmd($data['new']['document_root']).'/web/');
} }
} }
exec('chmod -R a+r '.escapeshellcmd($data['new']['document_root']).'/web/'); exec('chmod -R a+r '.escapeshellcmd($data['new']['document_root']).'/web/');
...@@ -462,15 +476,15 @@ class apache2_plugin { ...@@ -462,15 +476,15 @@ class apache2_plugin {
} elseif ($this->action == 'update' && $data['new']['type'] == 'vhost' && $data['old']['errordocs'] == 0 && $data['new']['errordocs'] == 1) { } elseif ($this->action == 'update' && $data['new']['type'] == 'vhost' && $data['old']['errordocs'] == 0 && $data['new']['errordocs'] == 1) {
$error_page_path = escapeshellcmd($data['new']['document_root']).'/web/error/'; $error_page_path = escapeshellcmd($data['new']['document_root']).'/web/error/';
if (file_exists('/usr/local/ispconfig/server/conf-custom/error/'.substr(escapeshellcmd($conf['language']),0,2))) { if (file_exists($conf['templates'] . '-custom/error/'.substr(escapeshellcmd($conf['language']),0,2))) {
exec('cp /usr/local/ispconfig/server/conf-custom/error/'.substr(escapeshellcmd($conf['language']),0,2).'/* '.$error_page_path); exec('cp ' . $conf['templates'] . '-custom/error/'.substr(escapeshellcmd($conf['language']),0,2).'/* '.$error_page_path);
} }
else { else {
if (file_exists('/usr/local/ispconfig/server/conf-custom/error/400.html')) { if (file_exists($conf['templates'] . '-custom/error/400.html')) {
exec('cp /usr/local/ispconfig/server/conf-custom/error/*.html '.$error_page_path); exec('cp ' . $conf['templates'] . '-custom/error/*.html '.$error_page_path);
} }
else { else {
exec('cp /usr/local/ispconfig/server/conf/error/'.substr(escapeshellcmd($conf['language']),0,2).'/* '.$error_page_path); exec('cp ' . $conf['templates'] . '/error/'.substr(escapeshellcmd($conf['language']),0,2).'/* '.$error_page_path);
} }
} }
exec('chmod -R a+r '.$error_page_path); exec('chmod -R a+r '.$error_page_path);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment