Commit d4d1ead7 authored by Marius Cramer's avatar Marius Cramer

Merge remote-tracking branch 'origin/stable-3.0.5'

Conflicts:
	interface/lib/classes/tpl.inc.php
	interface/web/mail/lib/lang/de_spamfilter_blacklist.lng
	interface/web/mail/lib/lang/de_spamfilter_users.lng
	interface/web/mail/lib/lang/de_spamfilter_whitelist.lng
	server/lib/classes/tpl.inc.php
parents f0bed3a1 42b689d1
ALTER TABLE `client`
ADD `web_servers` blob NOT NULL DEFAULT '' AFTER `default_webserver`,
ADD `mail_servers` blob NOT NULL DEFAULT '' AFTER `default_mailserver`,
ADD `db_servers` blob NOT NULL DEFAULT '' AFTER `default_dbserver`,
ADD `dns_servers` blob NOT NULL DEFAULT '' AFTER `default_dnsserver`;
UPDATE `client` SET `web_servers` = `default_webserver`, `mail_servers` = `default_mailserver`, `db_servers` = `default_dbserver`, `dns_servers` = `default_dnsserver` WHERE 1;
......@@ -638,7 +638,72 @@ class ispcmail {
return true;
}
private function _extract_names($data) {
$senders = array();
$data = stripslashes(preg_replace("'(\t|\r|\n)'", '', $data));
if(trim($data) == '') return $senders;
$armail = array();
$counter = 0; $inthechar = 0;
$chartosplit = ',;'; $protectchar = '"'; $temp = '';
$closed = 1;
for($i = 0; $i < strlen($data); $i++) {
$thischar = $data[$i];
if($thischar == '<' && $closed) $closed = 0;
if($thischar == '>' && !$closed) $closed = 1;
if($thischar == $protectchar) $inthechar = ($inthechar) ? 0 : 1;
if((strpos($chartosplit, $thischar) !== false) && !$inthechar && $closed) {
$armail[] = $temp;
$temp = '';
} else {
$temp .= $thischar;
}
}
if(trim($temp) != '') {
$armail[] = trim($temp);
unset($temp);
}
foreach($armail as $thisPart) {
$thisPart = trim(preg_replace('/^"(.*)"$/i', '$1', trim($thisPart)));
if($thisPart != '') {
$email = '';
$name = '';
if(preg_match('/(.*)<(.*)>/i', $thisPart, $matches)) {
$email = trim($matches[2]);
$name = trim($matches[1]);
} else {
if(preg_match('/([-a-z0-9_$+.]+@[-a-z0-9_.]+[-a-z0-9_]+)((.*))/i', $thisPart, $matches)) {
$email = $matches[1];
$name = $matches[2];
} else {
$email = $thisPart;
}
}
$email = preg_replace('/<(.*)\\>/', '$1', $email);
$name = preg_replace('/"(.*)"/', '$1', trim($name));
$name = preg_replace('/\((.*)\)/', '$1', $name);
if($name == '') $name = $email;
if($email == '') $email = $name;
$senders[] = array(
'name' => $name,
'mail' => $email
);
unset($name);
unset($email);
}
}
unset($armail);
unset($thisPart);
return $senders;
}
/**
* Send the mail to one or more recipients
......@@ -683,6 +748,7 @@ class ispcmail {
$result = $this->_smtp_login();
if(!$result) return false;
}
$bcc_cc_sent = false;
foreach($recipients as $recipname => $recip) {
if($this->_sent_mails >= $this->smtp_max_mails) {
// close connection to smtp and reconnect
......@@ -705,6 +771,19 @@ class ispcmail {
fputs($this->_smtp_conn, 'RCPT TO: <' . $recip . '>' . $this->_crlf);
$response = fgets($this->_smtp_conn, 515);
if($bcc_cc_sent == false) {
$add_recips = array();
if($this->getHeader('Cc') != '') $add_recips = array_merge($add_recips, $this->_extract_names($this->getHeader('Cc')));
if($this->getHeader('Bcc') != '') $add_recips = array_merge($add_recips, $this->_extract_names($this->getHeader('Bcc')));
foreach($add_recips as $add_recip) {
if(!$add_recip['mail']) continue;
fputs($this->_smtp_conn, 'RCPT TO: <' . $this->_encodeHeader($add_recip['mail'], $this->mail_charset) . '>' . $this->_crlf);
$response = fgets($this->_smtp_conn, 515);
}
unset($add_recips);
$bcc_cc_sent = true;
}
//The Email
fputs($this->_smtp_conn, 'DATA' . $this->_crlf);
$response = fgets($this->_smtp_conn, 515);
......@@ -715,7 +794,6 @@ class ispcmail {
$mail_content = 'Subject: ' . $enc_subject . $this->_crlf;
$mail_content .= 'To: ' . $this->getHeader('To') . $this->_crlf;
if($this->getHeader('Bcc') != '') $mail_content .= 'Bcc: ' . $this->_encodeHeader($this->getHeader('Bcc'), $this->mail_charset) . $this->_crlf;
if($this->getHeader('Cc') != '') $mail_content .= 'Cc: ' . $this->_encodeHeader($this->getHeader('Cc'), $this->mail_charset) . $this->_crlf;
$mail_content .= implode($this->_crlf, $headers) . $this->_crlf . ($this->_is_signed == false ? $this->_crlf : '') . $this->body;
......
......@@ -234,12 +234,12 @@ if (!defined('vlibTemplateClassLoaded')) {
if (is_array($k)) {
foreach($k as $key => $value){
$key = ($this->OPTIONS['CASELESS']) ? strtolower(trim($key)) : trim($key);
if (preg_match('/^[A-Za-z]+[A-Za-z0-9_]*$/', $key) && $value !== null ) {
if (preg_match('/^[A-Za-z_]+[A-Za-z0-9_]*$/', $key) && $value !== null ) {
$this->_vars[$key] = $value;
}
}
} else {
if (preg_match('/^[A-Za-z]+[A-Za-z0-9_]*$/', $k) && $v !== null) {
if (preg_match('/^[A-Za-z_]+[A-Za-z0-9_]*$/', $k) && $v !== null) {
if ($this->OPTIONS['CASELESS']) $k = strtolower($k);
$this->_vars[trim($k)] = $v;
} else {
......@@ -287,7 +287,7 @@ if (!defined('vlibTemplateClassLoaded')) {
for ($i = 0; $i < $num_args; $i++) {
$var = func_get_arg($i);
if ($this->OPTIONS['CASELESS']) $var = strtolower($var);
if (!preg_match('/^[A-Za-z]+[A-Za-z0-9_]*$/', $var)) continue;
if (!preg_match('/^[A-Za-z_]+[A-Za-z0-9_]*$/', $var)) continue;
unset($this->_vars[$var]);
}
return true;
......@@ -344,7 +344,7 @@ if (!defined('vlibTemplateClassLoaded')) {
*/
public function setLoop($k, $v)
{
if (is_array($v) && preg_match('/^[A-Za-z]+[A-Za-z0-9_]*$/', $k)) {
if (is_array($v) && preg_match('/^[A-Za-z_]+[A-Za-z0-9_]*$/', $k)) {
$k = ($this->OPTIONS['CASELESS']) ? strtolower(trim($k)) : trim($k);
$this->_arrvars[$k] = array();
if ($this->OPTIONS['SET_LOOP_VAR'] && !empty($v)) $this->setvar($k, 1);
......@@ -1006,7 +1006,8 @@ if (!defined('vlibTemplateClassLoaded')) {
* @access private
* @return string used for eval'ing
*/
function _parseIf ($varname, $value=null, $op=null, $namespace=null, $format=null) {
private function _parseIf($varname, $value = null, $op = null, $namespace = null, $format = null)
{
if (isset($namespace)) $namespace = substr($namespace, 0, -1);
$comp_str = ''; // used for extended if statements
......@@ -1046,14 +1047,14 @@ if (!defined('vlibTemplateClassLoaded')) {
if ($this->OPTIONS['GLOBAL_VARS'] && empty($namespace)) {
$retstr = '(('.$retstr.'[\''.$varname.'\'] !== null) ? '.$retstr.'[\''.$varname.'\'] : $this->_vars[\''.$varname.'\'])';
if(isset($format) && isset($value) && $format == 'version') {
return 'version_compare(' . $retstr . ', \'' . $value . '\', ' . (!empty($op) ? $op : '==') . ')';
return 'version_compare(' . $retstr . ', \'' . $value . '\', \'' . (!empty($op) ? $op : '==') . '\')';
} else {
return $retstr.$comp_str;
}
}
else {
if(isset($format) && isset($value) && $format == 'version') {
return 'version_compare(' . $retstr."['".$varname."']" . ', \'' . $value . '\', ' . (!empty($op) ? $op : '==') . ')';
return 'version_compare(' . $retstr."['".$varname."']" . ', \'' . $value . '\', \'' . (!empty($op) ? $op : '==') . '\')';
} else {
return $retstr."['".$varname."']".$comp_str;
}
......@@ -1183,8 +1184,7 @@ if (!defined('vlibTemplateClassLoaded')) {
if ($tag == 'loop' || $tag == 'endloop') array_pop($this->_namespace);
if ($tag == 'comment' || $tag == 'endcomment') {
return '<?php */ ?>';
}
else {
} else {
return '<?php } ?>';
}
}
......@@ -1207,6 +1207,7 @@ if (!defined('vlibTemplateClassLoaded')) {
$$key = $match[2];
}
}
$var = ($this->OPTIONS['CASELESS']) ? strtolower($name) : $name;
if ($this->_debug && !empty($var)) {
......@@ -1228,47 +1229,37 @@ if (!defined('vlibTemplateClassLoaded')) {
if (empty($escape) && (!empty($this->OPTIONS['DEFAULT_ESCAPE']) && strtolower($this->OPTIONS['DEFAULT_ESCAPE']) != 'none')) {
$escape = strtolower($this->OPTIONS['DEFAULT_ESCAPE']);
}
return '<?php '.$this->_parseVar ($wholetag, $tag, $var, @$escape, @$format, @$namespace).' ?>'."\n";
break;
return '<?php '.$this->_parseVar ($wholetag, $tag, $var, @$escape, @$format, @$namespace)." ?>\n";
case 'if':
return '<?php if ('. $this->_parseIf($var, @$value, @$op, @$namespace, @$format) .') { ?>';
break;
case 'unless':
return '<?php if (!'. $this->_parseIf($var, @$value, @$op, @$namespace, @$format) .') { ?>';
break;
case 'elseif':
return '<?php } elseif ('. $this->_parseIf($var, @$value, @$op, @$namespace, @$format) .') { ?>';
break;
case 'loop':
return '<?php '. $this->_parseLoop($var) .'?>';
break;
case 'comment':
if (empty($var)) { // full open/close style comment
return '<?php /* ?>';
}
else { // just ignore tag if it was a one line comment
} else { // just ignore tag if it was a one line comment
return;
}
break;
case 'phpinclude':
if ($this->OPTIONS['ENABLE_PHPINCLUDE']) {
return '<?php include(\''.$file.'\'); ?>';
}
break;
case 'include':
return '<?php $this->_getData($this->_fileSearch(\''.$file.'\'), 1); ?>';
break;
case 'dyninclude':
return '<?php $this->_getData($this->_fileSearch($this->_dyninclude[\''.$name.'\']), 1); ?>';
break;
default:
if ($this->OPTIONS['STRICT']) vlibTemplateError::raiseError('VT_ERROR_INVALID_TAG', KILL, htmlspecialchars($wholetag, ENT_QUOTES));
......
......@@ -101,7 +101,7 @@ $form["tabs"]['blacklist'] = array (
'datatype' => 'INTEGER',
'formtype' => 'SELECT',
'default' => 5,
'value' => array(1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10)
'value' => array(1 => '1 - lowest', 2 => 2, 3 => 3, 4 => 4, 5 => '5 - medium', 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => '10 - highest')
),
'active' => array (
'datatype' => 'VARCHAR',
......
......@@ -73,7 +73,7 @@ $form["tabs"]['users'] = array (
'datatype' => 'INTEGER',
'formtype' => 'SELECT',
'default' => 5,
'value' => array(1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10)
'value' => array(1 => '1 - lowest', 2 => 2, 3 => 3, 4 => 4, 5 => '5 - medium', 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => '10 - highest')
),
'policy_id' => array (
'datatype' => 'INTEGER',
......
......@@ -108,7 +108,7 @@ $form["tabs"]['whitelist'] = array (
'datatype' => 'INTEGER',
'formtype' => 'SELECT',
'default' => 5,
'value' => array(1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10)
'value' => array(1 => '1 - lowest', 2 => 2, 3 => 3, 4 => 4, 5 => '5 - medium', 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => '10 - highest')
),
'active' => array (
'datatype' => 'VARCHAR',
......
......@@ -6,4 +6,7 @@ $wb['email_txt'] = 'E-Mail Adresse';
$wb['priority_txt'] = 'Priorität';
$wb['active_txt'] = 'Aktiv';
$wb['limit_spamfilter_wblist_txt'] = 'Die maximale Anzahl an White- oder Blacklist Einträgen für ihr Konto wurde erreicht.';
$wb['10 - highest'] = '10 - h&ouml;chste';
$wb['5 - medium'] = '5 - normal';
$wb['1 - lowest'] = '1 - niedrigste';
?>
......@@ -7,4 +7,7 @@ $wb['fullname_txt'] = 'Name';
$wb['local_txt'] = 'Lokal';
$wb['email_error_notempty'] = 'Die E-Mail-Adresse darf nicht leer sein.';
$wb['fullname_error_notempty'] = 'Der Name darf nicht leer sein.';
$wb['10 - highest'] = '10 - h&ouml;chste';
$wb['5 - medium'] = '5 - normal';
$wb['1 - lowest'] = '1 - niedrigste';
?>
......@@ -6,4 +6,7 @@ $wb['email_txt'] = 'E-Mail';
$wb['priority_txt'] = 'Priorität';
$wb['active_txt'] = 'Aktiv';
$wb['limit_spamfilter_wblist_txt'] = 'Die maximale Anzahl an White- oder Blacklist Einträgen für Ihr Konto wurde erreicht.';
$wb['10 - highest'] = '10 - h&ouml;chste';
$wb['5 - medium'] = '5 - normal';
$wb['1 - lowest'] = '1 - niedrigste';
?>
......@@ -6,4 +6,7 @@ $wb["email_txt"] = 'Email';
$wb["priority_txt"] = 'Priority';
$wb["active_txt"] = 'Active';
$wb["limit_spamfilter_wblist_txt"] = 'The max. number of White- or Blacklist records for your account is reached.';
$wb['10 - highest'] = '10 - highest';
$wb['5 - medium'] = '5 - medium';
$wb['1 - lowest'] = '1 - lowest';
?>
\ No newline at end of file
......@@ -7,4 +7,7 @@ $wb["fullname_txt"] = 'Name';
$wb["local_txt"] = 'Local';
$wb['email_error_notempty'] = 'The email address must not be empty.';
$wb['fullname_error_notempty'] = 'The name must not be empty.';
$wb['10 - highest'] = '10 - highest';
$wb['5 - medium'] = '5 - medium';
$wb['1 - lowest'] = '1 - lowest';
?>
\ No newline at end of file
......@@ -6,4 +6,7 @@ $wb["email_txt"] = 'Email';
$wb["priority_txt"] = 'Priority';
$wb["active_txt"] = 'Active';
$wb["limit_spamfilter_wblist_txt"] = 'The max. number of White- or Blacklist records for your account is reached.';
$wb['10 - highest'] = '10 - highest';
$wb['5 - medium'] = '5 - medium';
$wb['1 - lowest'] = '1 - lowest';
?>
\ No newline at end of file
......@@ -65,7 +65,7 @@ class list_action extends listform_actions {
return $rec;
}
function getQueryString() {
function getQueryString($no_limit = false) {
global $app;
$sql_where = '';
......
......@@ -91,7 +91,7 @@ class list_action extends listform_actions {
$app->tpl->pparse();
}
function getQueryString() {
function getQueryString($no_limit = false) {
global $app;
$sql_where = '';
......
......@@ -21,12 +21,12 @@
<Directory {tmpl_var name='apps_vhost_dir'}>
Options FollowSymLinks
AllowOverride None
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
{tmpl_else}
<tmpl_else>
Order allow,deny
Allow from all
{/tmpl_if}
</tmpl_if>
</Directory>
</IfModule>
......@@ -38,12 +38,12 @@
AllowOverride AuthConfig Indexes Limit Options FileInfo
AddHandler fcgid-script .php
FCGIWrapper {tmpl_var name='apps_vhost_basedir'}/php-fcgi-scripts/apps/.php-fcgi-starter .php
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
{tmpl_else}
<tmpl_else>
Order allow,deny
Allow from all
{/tmpl_if}
</tmpl_if>
</Directory>
</IfModule>
......
......@@ -8,100 +8,100 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
<Directory /var/www/clients>
AllowOverride None
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all deny
{tmpl_else}
<tmpl_else>
Order Deny,Allow
Deny from all
{/tmpl_if}
</tmpl_if>
</Directory>
# Do not allow access to the root file system of the server for security reasons
<Directory />
AllowOverride None
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all deny
{tmpl_else}
<tmpl_else>
Order Deny,Allow
Deny from all
{/tmpl_if}
</tmpl_if>
</Directory>
<Directory /var/www/conf>
AllowOverride None
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all deny
{tmpl_else}
<tmpl_else>
Order Deny,Allow
Deny from all
{/tmpl_if}
</tmpl_if>
</Directory>
# Except of the following directories that contain website scripts
<Directory /usr/share/phpmyadmin>
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
{tmpl_else}
<tmpl_else>
Order allow,deny
Allow from all
{/tmpl_if}
</tmpl_if>
</Directory>
<Directory /usr/share/phpMyAdmin>
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
{tmpl_else}
<tmpl_else>
Order allow,deny
Allow from all
{/tmpl_if}
</tmpl_if>
</Directory>
<Directory /usr/share/squirrelmail>
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
{tmpl_else}
<tmpl_else>
Order allow,deny
Allow from all
{/tmpl_if}
</tmpl_if>
</Directory>
# Allow access to mailman on OpenSuSE
<Directory /usr/lib/mailman/cgi-bin>
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
{tmpl_else}
<tmpl_else>
Order allow,deny
Allow from all
{/tmpl_if}
</tmpl_if>
</Directory>
<Directory /usr/lib/mailman/icons>
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
{tmpl_else}
<tmpl_else>
Order allow,deny
Allow from all
{/tmpl_if}
</tmpl_if>
</Directory>
<Directory /var/lib/mailman/archives/>
Options +FollowSymLinks
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
{tmpl_else}
<tmpl_else>
Order allow,deny
Allow from all
{/tmpl_if}
</tmpl_if>
</Directory>
# allow path to awstats and alias for awstats icons
<Directory /usr/share/awstats>
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
{tmpl_else}
<tmpl_else>
Order allow,deny
Allow from all
{/tmpl_if}
</tmpl_if>
</Directory>
Alias /awstats-icon "/usr/share/awstats/icon"
......
<Directory {tmpl_var name='web_basedir'}/{tmpl_var name='domain'}>
AllowOverride None
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all deny
{tmpl_else}
<tmpl_else>
Order Deny,Allow
Deny from all
{/tmpl_if}
</tmpl_if>
</Directory>
<tmpl_loop name="vhosts">
......@@ -59,12 +59,12 @@
<Directory {tmpl_var name='web_document_root_www'}>
Options FollowSymLinks
AllowOverride <tmpl_var name='allow_override'>
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
{tmpl_else}
<tmpl_else>
Order allow,deny
Allow from all
{/tmpl_if}
</tmpl_if>
<tmpl_if name='ssi' op='==' value='y'>
# ssi enabled
......@@ -74,25 +74,25 @@
</tmpl_if>
<tmpl_if name='php' op='==' value='no'>
<Files ~ '.php[s3-6]{0,1}$'>
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all denied
{tmpl_else}
<tmpl_else>
Order allow,deny
Deny from all
Allow from none
{/tmpl_if}
</tmpl_if>
</Files>
</tmpl_if>
</Directory>
<Directory {tmpl_var name='web_document_root'}>
Options FollowSymLinks
AllowOverride <tmpl_var name='allow_override'>
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
{tmpl_else}
<tmpl_else>
Order allow,deny
Allow from all
{/tmpl_if}
</tmpl_if>
<tmpl_if name='ssi' op='==' value='y'>
# ssi enabled
......@@ -102,13 +102,13 @@
</tmpl_if>
<tmpl_if name='php' op='==' value='no'>
<Files ~ '.php[s3-6]{0,1}$'>
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all denied
{tmpl_else}
<tmpl_else>
Order allow,deny
Deny from all
Allow from none
{/tmpl_if}
</tmpl_if>
</Files>
</tmpl_if>
</Directory>
......@@ -161,12 +161,12 @@
<tmpl_if name='cgi' op='==' value='y'>
# cgi enabled
<Directory {tmpl_var name='document_root'}/cgi-bin>
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
{tmpl_else}
<tmpl_else>
Order allow,deny
Allow from all
{/tmpl_if}
</tmpl_if>
</Directory>
ScriptAlias /cgi-bin/ <tmpl_var name='document_root'>/cgi-bin/
AddHandler cgi-script .cgi
......@@ -213,12 +213,12 @@
Action php5-cgi /php5-cgi
AddHandler php5-cgi .php .php3 .php4 .php5
<Directory {tmpl_var name='cgi_starter_path'}>
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
{tmpl_else}
<tmpl_else>
Order allow,deny
Allow from all
{/tmpl_if}
</tmpl_if>
</Directory>
</tmpl_if>
<tmpl_if name='php' op='==' value='fast-cgi'>
......@@ -252,35 +252,35 @@
FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php
Options +ExecCGI