extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 09:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed checks and config to use mbstring.func_overlaod=0 and disabled checks from anyway not supported databases

Browse Source
This commit is contained in:
Ralf Becker 2014-02-22 17:12:24 +00:00
parent aeffdb3c4b
commit 107a48ce2c
3 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/rpm-build/apache.conf
View File

@ -32,7 +32,7 @@ RedirectMatch ^(/principals/users/.*)$ /egroupware/groupdav.php$1
# E_ALL & ~E_NOTICE & ~E_STRICT = 8191 - 8 - 2048 = 6135
php_value error_reporting 6135
php_value max_execution_time 90
php_admin_value mbstring.func_overload 7
php_admin_value mbstring.func_overload 0
php_value memory_limit 128M
php_value include_path .:/usr/share/pear
php_admin_value open_basedir /usr/share/egroupware:/var/lib/egroupware:/tmp:/usr/share/pear:/usr/bin/zip:/usr/share/jpgraph:/usr/bin/tnef:/usr/bin/aspell:/usr/share/fonts
@ -66,9 +66,3 @@ RedirectMatch ^(/principals/users/.*)$ /egroupware/groupdav.php$1
<Directory /usr/share/egroupware/gallery/>
php_admin_value open_basedir /usr/share/egroupware:/var/lib/egroupware:/tmp:/usr/share/pear:/usr/bin:/bin
</Directory>
<Location /egroupware/rpc.php>
php_admin_value mbstring.func_overload 0
Order allow,deny
Allow from all
</Location>

6
mail/setup/setup.inc.php
View File

@ -78,6 +78,12 @@ $setup_info['mail']['check_install'] = array(
'value' => 0,
'verbose_value' => 'Off',
),
'mbstring.func_overload' => array(
'func' => 'php_ini_check',
'value' => 0,
'warning' => '<div class="setup_info">' . lang('mbstring.func_overload=0 is required for correct mail processing!') . "</div>",
'change' => check_load_extension('mbstring') ? 'mbstring.func_overload = 0' : '',
),
'tnef' => array(
'func' => 'tnef_check',
),

29
setup/check_install.php
View File

@ -80,7 +80,7 @@ $checks = array(
),
'memory_limit' => array(
'func' => 'php_ini_check',
'value' => '24M',
'value' => '128M',
'check' => '>=',
'error' => lang('memory_limit is set to less than %1: some applications of eGroupWare need more than the recommend 8M, expect occasional failures','24M'),
'change' => 'memory_limit = 24M'
@ -150,6 +150,7 @@ $checks = array(
'func' => 'extension_check',
'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.','pdo_pgsql','pgSQL')
),
/* disable checks for other database extensions, as we are not really supporting them anymore
'mssql' => array(
'func' => 'extension_check',
'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.','mssql','MsSQL'),
@ -175,17 +176,11 @@ $checks = array(
'pdo_oci' => array(
'func' => 'extension_check',
'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.','pdo_oci','Oracle'),
),
),*/
'mbstring' => array(
'func' => 'extension_check',
'warning' => lang('The mbstring extension is needed to fully support unicode (utf-8) or other multibyte-charsets.')
),
'mbstring.func_overload' => array(
'func' => 'php_ini_check',
'value' => 7,
'warning' => '<div class="setup_info">' . lang('The mbstring.func_overload = 7 is needed to fully support unicode (utf-8) or other multibyte-charsets.') . "</div>",
'change' => check_load_extension('mbstring') ? 'mbstring.func_overload = 7' : '',
),
'ldap' => array(
'func' => 'extension_check',
'warning' => lang("The ldap extension is needed, if you use ldap as account or contact storage, authenticate against ldap or active directory. It's not needed for a standard SQL installation."),
@ -429,15 +424,6 @@ function pear_check($package,$args)
echo ' '.lang('PEAR (%1) is a PHP repository and is usually in a package called %2.',
'<a href="http://pear.php.net" target="_blank">pear.php.net</a>','php-pear');
}
elseif ($min_version && !$version_available)
{
echo ' '.lang('We could not determine the version of %1, please make sure it is at least %2',$package,$min_version);
}
elseif ($min_version && version_compare($min_version,$version_available) > 0)
{
echo ' '.lang('Your installed version of %1 is %2, required is at least %3, please run: ',
$package,$version_available,$min_version).' pear update '.$package;
}
elseif ($package)
{
echo ' '.lang('You can install it by running:').
@ -446,6 +432,15 @@ function pear_check($package,$args)
}
echo "</div>";
}
elseif ($min_version && !$version_available)
{
echo '<div class="setup_info">'.lang('We could not determine the version of %1, please make sure it is at least %2',$package,$min_version).'</div>';
}
elseif ($min_version && version_compare($min_version,$version_available) > 0)
{
echo '<div class="setup_info">'.lang('Your installed version of %1 is %2, required is at least %3, please run: ',
$package,$version_available,$min_version).' pear update '.$package.'</div>';
}
echo "\n";
return $available;