chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #306 - The extension mbstring ibecame optional. This is why a correction has been made in the installation script, also blocking checks have been removed.

Browse Source
skala
Ivan Tcholakov 16 years ago
parent 980ec02ff9
commit bb7feb13b7
3 changed files with 2 additions and 80 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 38
      main/inc/global.inc.php
  2. 40
      main/install/index.php
  3. 4
      main/install/install_functions.inc.php

38
main/inc/global.inc.php
Unescape View File

@ -60,44 +60,6 @@ EOM;
die($error_message_php_version);
}
if (!function_exists('mb_strlen'))
{
$error_message_mbstring = <<<EOM
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<title>PHP extension "mbstring" has not been installed!</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<style type="text/css" media="screen, projection">
/*<![CDATA[*/
@import "main/css/public_admin/default.css";
/*]]>*/
</style>
</head>
<body>
<div id="header">
<div id="header1"><a href="http://www.dokeos.com" target="_blank">Dokeos Homepage</a></div>
<div class="clear"></div>
<div id="header2">&nbsp;</div>
<div id="header3">&nbsp;</div>
</div>
<div style="text-align: center;"><br /><br />
The Dokeos system needs PHP extension <strong>mbstring</strong> to be installed.<br />
See <a href="http://php.net/manual/en/mbstring.installation.php" target="_blank">http://php.net/manual/en/book.mbstring.php</a> for more information<br /><br />
</div>
<div id="footer">
<div class="copyright">Platform <a href="http://www.dokeos.com" target="_blank"> Dokeos </a> &copy; 2009 </div>
&nbsp;
</div>
</body>
</html>
EOM;
header('Content-Type: text/html; charset=UTF-8');
die($error_message_mbstring);
}
// Determine the directory path where this current file lies
// This path will be useful to include the other intialisation files

40
main/install/index.php
Unescape View File

@ -62,46 +62,6 @@ EOM;
die($error_message_php_version);
}
if (!function_exists('mb_strlen')) {
$error_message_mbstring = <<<EOM
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<title>PHP extension "mbstring" has not been installed!</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<style type="text/css" media="screen, projection">
/*<![CDATA[*/
@import "../css/public_admin/default.css";
/*]]>*/
</style>
</head>
<body>
<div id="wrapper">
<div id="header">
<div id="header1"><a href="http://www.dokeos.com" target="_blank">Dokeos Homepage</a></div>
<div class="clear"></div>
<div id="header2">&nbsp;</div>
<div id="header3">&nbsp;</div>
</div>
<div style="text-align: center;"><br /><br />
The Dokeos system needs PHP extension <strong>mbstring</strong> to be installed.<br />
See <a href="http://php.net/manual/en/mbstring.installation.php" target="_blank">http://php.net/manual/en/book.mbstring.php</a> for more information<br /><br />
</div>
<div id="push"></div>
</div>
<div id="footer">
<div class="copyright">Platform <a href="http://www.dokeos.com" target="_blank"> Dokeos </a> &copy; 2009 </div>
&nbsp;
</div>
</body>
</html>
EOM;
header('Content-Type: text/html; charset=UTF-8');
die($error_message_mbstring);
}
/*
==============================================================================
INIT SECTION

4
main/install/install_functions.inc.php
Unescape View File

@ -426,8 +426,8 @@ function display_requirements($installType, $badUpdatePath, $updatePath='', $upd
<td class="requirements-value">'.check_extension('xml', get_lang('Yes'), get_lang('No')).'</td>
</tr>
<tr>
<td class="requirements-item"><a href="http://php.net/manual/en/book.mbstring.php" target="_blank">Multibyte string</a> '.get_lang('support').'</td>
<td class="requirements-value">'.check_extension('mbstring', get_lang('Yes'), get_lang('ExtensionMBStringNotAvailable')).'</td>
<td class="requirements-item"><a href="http://php.net/manual/en/book.mbstring.php" target="_blank">Multibyte string</a> '.get_lang('support').' ('.get_lang('Optional').')</td>
<td class="requirements-value">'.check_extension('mbstring', get_lang('Yes'), get_lang('ExtensionMBStringNotAvailable'), true).'</td>
</tr>
<tr>
<td class="requirements-item"><a href="http://php.net/manual/en/book.iconv.php" target="_blank">Iconv</a> '.get_lang('support').' ('.get_lang('Optional').')</td>

Write Preview
Loading…
Cancel
Save