rooty/Qware_core
0
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed issue #32

Browse Source
This commit is contained in:
Rooty 2020-12-15 00:15:31 +01:00
parent de1fce5aac
commit 204baf5f33
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.php
View File

@ -42,7 +42,9 @@ $CONF_LIB_PATH =""; /* chemin des librairies */
### Inclusion du contrôle d'installation ### Inclusion du contrôle d'installation
##################################################################################################### #####################################################################################################
if( file_exists($CONF_LIB_PATH."config/installcontrol.php") )
include($CONF_LIB_PATH."config/installcontrol.php"); include($CONF_LIB_PATH."config/installcontrol.php");
if ( !defined('QWARE_INSTALLED') ) if ( !defined('QWARE_INSTALLED') )
{ {
header("location:install/index.php"); header("location:install/index.php");

19
install/index.php
View File

@ -43,7 +43,7 @@
##################################################################################################### #####################################################################################################
### Inclusion du control d'installation ### 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*/ /*On récupère la langue détectée*/
$language = check_lang("install.ini"); $language = check_lang("install.ini");
@ -101,20 +101,9 @@
</form> </form>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
<!-- //<![CDATA[
function recupelement(message) function recupelement(message){if(document.getElementById){document.getElementById("myform").helpdesc.value=message;}else if(document.all){document.all["myform"].helpdesc.value=message;}}
{ // ]]>
if (document.getElementById)
{
document.getElementById("myform").helpdesc.value=message;
}
// cas ie 5.5
else if (document.all)
{
document.all["myform"].helpdesc.value=message;
}
}
//-->
</script> </script>
</body> </body>
</html> </html>

7
install/lib_install.php
View File

@ -211,6 +211,7 @@ function updateStringInFile($arrayValue, $filein, $fileout)
*/ */
function makeMcryptKey($lenght) function makeMcryptKey($lenght)
{ {
$i=0;$mcryptKey=null;
while($i<$lenght) while($i<$lenght)
{ {
$mcryptKey.=chr((rand()%26)+97); $mcryptKey.=chr((rand()%26)+97);
@ -416,10 +417,12 @@ function datasource($POST="")
} }
else else
{ {
var_dump($dbselect);
exit(0);
include_once($CONF_LIB_PATH."lib/system/system_data_source/database/sql_parse.php"); 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")); $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_"; } if($dbnameprefx != "") { $dbnameprefx = $dbnameprefx."_"; } else { $dbnameprefx = "sys_"; }