Ticket #2019: setupFix_Mbstring.patch

setup/

@@ -62 +62 @@
                                 lang('*** You have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get eGW fully working !!!')."\n".
                                 lang('*** Do NOT update your database via setup, as the update might be interrupted by the max_execution_time, which leaves your DB in an unrecoverable state (your data is lost) !!!')
                 ),
-/* not longer needed, as it gets set now on runtime (works even with safe_mode)
-                'error_reporting' => array(
-                        'func' => 'php_ini_check',
-                        'value' => E_NOTICE,
-                        'verbose_value' => 'E_NOTICE',
-                        'check' => 'not set',
-                        'safe_mode' => 'error_reporting = E_ALL & ~E_NOTICE'
-                ),
-*/
                 'magic_quotes_runtime' => array(
                         'func' => 'php_ini_check',
                         'value' => 0,
@@ -104 +95 @@
                         'error' => lang('include_path need to contain "." - the current directory'),
                         'save_mode' => 'max_execution_time = 30'
                 ),
-#               'mysql' => array(
-#                       'func' => 'extension_check',
-#                       'warning' => "<div id='setup_info'>" . lang('The %1 extension is needed, if you plan to use a %2 database.','mysql','MySQL').'</div>'
-#               ),
                 'ldap' => array(
                         'func' => 'extension_check',
                         'warning' => "<div id='setup_info'>" . lang('The %1 extension is needed, if you plan to use a %2 database.','ldap','LDAP').'</div>'
@@ -127 +114 @@
                 ),
                 'mbstring.func_overload' => array(
                         'func' => 'php_ini_check',
-                        'value' => 7,
-                        'warning' => '<div id="setup_info">' . lang('The mbstring.func_overload = 7 is needed to fully support unicode (utf-8) or other multibyte-charsets.') . "</div>",
-                        'change' => extension_loaded('mbstring')  || function_exists('dl') && @dl(PHP_SHLIB_PREFIX.'mbstring.'.PHP_SHLIB_SUFFIX) ? 'mbstring.func_overload = 7' : '',
+                        'value' => 0,
+                        'warning' => '<div id="setup_info">' . lang('The mbstring.func_overload = 0 is needed to fully support unicode (utf-8) or other multibyte-charsets.') . "</div>",
+                        'change' => extension_loaded('mbstring')  || function_exists('dl') && @dl(PHP_SHLIB_PREFIX.'mbstring.'.PHP_SHLIB_SUFFIX) ? 'mbstring.func_overload = 0' : '',
                 ),
                 'imap' => array(
                         'func' => 'extension_check',
@@ -153 +140 @@
                         'func' => 'permission_check',
                         'is_writable' => True
                 ),
-#               'fudforum' => array(
-#                       'func' => 'permission_check',
-#                       'is_writable' => True,
-#                       'only_if_exists' => True
-#               ),
-#               'gd' => array(
-#                       'func' => 'gd_check'
-#               )
         );
 
         // some constants for pre php4.3
@@ -473 +452 @@
                 } else {
                         $GLOBALS['phpgw_setup']->html->show_header(lang('Checking the Expresso Livre (eGroupWare) Installation'),False,'config',$ConfigDomain ? $ConfigDomain . '(' . @$phpgw_domain[$ConfigDomain]['db_type'] . ')' : '');
                         echo '<h1>'.lang('Checking the Expresso Livre (eGroupWare) Installation')."</h1>\n";
-                        # echo "<pre style=\"text-align: left;\">\n";;
                 }
         }
         else
@@ -491 +469 @@
 
         if ($run_by_webserver)
         {
-                # echo "</pre>\n";;
 
                 if ($GLOBALS['phpgw_info']['setup']['stage']['header'] != 10)
                 {
@@ -518 +495 @@
                         echo '<br><a href="'.str_replace('check_install.php','',$_SERVER['HTTP_REFERER']).'">'.lang('Return to Setup')."</a></h3>\n";
                 }
                 $setup_tpl->pparse('out','T_footer');
-                //echo "</body>\n</html>\n";
         }
 ?>