mcramer
2012-08-16 ab7597c7ec2d62aadf82c4c647d3dc63dae8de90
Implemented  FS#2379 - Add perl option to web sites (apache2 mod_perl2)
Fixed (partly) FS#2310 - Template switch not working in mailuser module, for dashlets and the login page

7 files modified
1 files added
35 ■■■■■ changed files
install/sql/incremental/upd_0036.sql 5 ●●●●● patch | view | raw | blame | history
install/sql/ispconfig3.sql 1 ●●●● patch | view | raw | blame | history
interface/web/index.php 2 ●●●●● patch | view | raw | blame | history
interface/web/sites/form/web_domain.tform.php 6 ●●●●● patch | view | raw | blame | history
interface/web/sites/lib/lang/de_web_domain.lng 1 ●●●● patch | view | raw | blame | history
interface/web/sites/lib/lang/en_web_domain.lng 1 ●●●● patch | view | raw | blame | history
interface/web/sites/templates/web_domain_edit.htm 6 ●●●●● patch | view | raw | blame | history
server/conf/vhost.conf.master 13 ●●●●● patch | view | raw | blame | history
install/sql/incremental/upd_0036.sql
New file
@@ -0,0 +1,5 @@
-- --------------------------------------------------------
ALTER TABLE  `web_domain` ADD  `perl` enum('n','y') NOT NULL default 'n' AFTER  `python`;
install/sql/ispconfig3.sql
@@ -1643,6 +1643,7 @@
  `php` varchar(32) NOT NULL default 'y',
  `ruby` enum('n','y') NOT NULL default 'n',
  `python` enum('n','y') NOT NULL default 'n',
  `perl` enum('n','y') NOT NULL default 'n',
  `redirect_type` varchar(255) default NULL,
  `redirect_path` varchar(255) default NULL,
  `seo_redirect` varchar(255) default NULL,
interface/web/index.php
@@ -31,6 +31,8 @@
require_once('../lib/config.inc.php');
require_once('../lib/app.inc.php');
if(!isset($_SESSION['s']['module']['name'])) $_SESSION['s']['module']['name'] = 'login';
$app->uses('tpl');
$app->tpl->newTemplate('main.tpl.htm');
interface/web/sites/form/web_domain.tform.php
@@ -230,6 +230,12 @@
                                     ),*/
            'value'        => ''
        ),
        'perl' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'CHECKBOX',
            'default'    => 'n',
            'value'        => array(0 => 'n',1 => 'y')
        ),
        'ruby' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'CHECKBOX',
interface/web/sites/lib/lang/de_web_domain.lng
@@ -80,6 +80,7 @@
$wb['ipv6_address_txt'] = 'IPv6-Adresse';
$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
$wb['python_txt'] = 'Python';
$wb['perl_txt'] = 'Perl';
$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
interface/web/sites/lib/lang/en_web_domain.lng
@@ -81,6 +81,7 @@
$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
$wb["error_no_sni_txt"] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
$wb["python_txt"] = 'Python';
$wb["perl_txt"] = 'Perl';
$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
interface/web/sites/templates/web_domain_edit.htm
@@ -80,6 +80,12 @@
                </div>
            </div>
            <div class="ctrlHolder apache">
                <p class="label">{tmpl_var name='perl_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='perl'}
                </div>
            </div>
            <div class="ctrlHolder apache">
                <p class="label">{tmpl_var name='ruby_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='ruby'}
server/conf/vhost.conf.master
@@ -109,6 +109,19 @@
        </IfModule>
</tmpl_if>
<tmpl_if name='perl' op='==' value='y'>
        <IfModule mod_perl.c>
            PerlModule ModPerl::Registry
            PerlModule Apache2::Reload
            <Directory {tmpl_var name='web_document_root_www'}>
                SetHandler perl-script
                PerlResponseHandler ModPerl::Registry
                PerlOptions +ParseHeaders
                Options +ExecCGI
            </Directory>
        </IfModule>
</tmpl_if>
<tmpl_if name='python' op='==' value='y'>
        <IfModule mod_python.c>
            <Directory {tmpl_var name='web_document_root_www'}>