Fixed issue #32
This commit is contained in:
parent
de1fce5aac
commit
204baf5f33
@ -42,7 +42,9 @@ $CONF_LIB_PATH =""; /* chemin des librairies */
|
||||
### Inclusion du contrôle d'installation
|
||||
#####################################################################################################
|
||||
|
||||
include($CONF_LIB_PATH."config/installcontrol.php");
|
||||
if( file_exists($CONF_LIB_PATH."config/installcontrol.php") )
|
||||
include($CONF_LIB_PATH."config/installcontrol.php");
|
||||
|
||||
if ( !defined('QWARE_INSTALLED') )
|
||||
{
|
||||
header("location:install/index.php");
|
||||
|
@ -43,7 +43,7 @@
|
||||
#####################################################################################################
|
||||
### Inclusion du control d'installation
|
||||
#####################################################################################################
|
||||
include($CONF_LIB_PATH."config/installcontrol.php");
|
||||
// include($CONF_LIB_PATH."config/installcontrol.php.install");
|
||||
|
||||
/*On récupère la langue détectée*/
|
||||
$language = check_lang("install.ini");
|
||||
@ -101,20 +101,9 @@
|
||||
</form>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
<!--
|
||||
function recupelement(message)
|
||||
{
|
||||
if (document.getElementById)
|
||||
{
|
||||
document.getElementById("myform").helpdesc.value=message;
|
||||
}
|
||||
// cas ie 5.5
|
||||
else if (document.all)
|
||||
{
|
||||
document.all["myform"].helpdesc.value=message;
|
||||
}
|
||||
}
|
||||
//-->
|
||||
//<![CDATA[
|
||||
function recupelement(message){if(document.getElementById){document.getElementById("myform").helpdesc.value=message;}else if(document.all){document.all["myform"].helpdesc.value=message;}}
|
||||
// ]]>
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
@ -211,6 +211,7 @@ function updateStringInFile($arrayValue, $filein, $fileout)
|
||||
*/
|
||||
function makeMcryptKey($lenght)
|
||||
{
|
||||
$i=0;$mcryptKey=null;
|
||||
while($i<$lenght)
|
||||
{
|
||||
$mcryptKey.=chr((rand()%26)+97);
|
||||
@ -416,10 +417,12 @@ function datasource($POST="")
|
||||
}
|
||||
else
|
||||
{
|
||||
var_dump($dbselect);
|
||||
exit(0);
|
||||
include_once($CONF_LIB_PATH."lib/system/system_data_source/database/sql_parse.php");
|
||||
|
||||
$mysqlversion = explode(" ", getModuleSetting('pdo_mysql','Client API version'));
|
||||
$mysqlversion = explode(".",$mysqlversion[1]);
|
||||
$mysqlversion = $mysqlversion[0];
|
||||
|
||||
$sql_query = @fread(@fopen("./db_scripts/mysql/".$mysqlversion."_create_structure.sql", 'r'), @filesize("./db_scripts/mysql/".$mysqlversion."_create_structure.sql"));
|
||||
if($dbnameprefx != "") { $dbnameprefx = $dbnameprefx."_"; } else { $dbnameprefx = "sys_"; }
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user