galads/icehrm
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix for php7

Browse Source
This commit is contained in:
Thilina Hasantha
2016-06-10 03:23:41 +05:30
parent 37299ac1a8
commit 1757421d9f
2 changed files with 45 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/install/index.php
View File

@@ -131,7 +131,7 @@ if(!$isDataFolderExists){
return; return;
} }
if(request["BASE_URL"].indexOf("http://") == 0 || request["BASE_URL"].indexOf("https://")){ if(request["BASE_URL"].indexOf("http://") == 0 || request["BASE_URL"].indexOf("https://") == 0){
}else{ }else{
alert("Invalid Base URL"); alert("Invalid Base URL");
return; return;

23
src/app/install/submit.php
View File

@@ -25,9 +25,9 @@ if($action == "TEST_DB"){
$res = $db->Connect($_REQUEST["APP_HOST"], $_REQUEST["APP_USERNAME"], $_REQUEST["APP_PASSWORD"], $_REQUEST["APP_DB"]); $res = $db->Connect($_REQUEST["APP_HOST"], $_REQUEST["APP_USERNAME"], $_REQUEST["APP_PASSWORD"], $_REQUEST["APP_DB"]);
if (!$res){ if (!$res){
error_log('Could not connect: ' . mysql_error()); error_log('Could not connect: ' . $db->ErrorMsg());
$ret["status"] = "ERROR"; $ret["status"] = "ERROR";
$ret["msg"] = "Incorrect credentials or incorrect DB host"; $ret["msg"] = "Incorrect credentials or incorrect DB host :".$db->ErrorMsg();
echo json_encode($ret); echo json_encode($ret);
exit(); exit();
} }
@@ -36,7 +36,6 @@ if($action == "TEST_DB"){
error_log(print_r("Number of tables:".$result->RecordCount(),true)); error_log(print_r("Number of tables:".$result->RecordCount(),true));
$num_rows = $result->RecordCount(); $num_rows = $result->RecordCount();
if($num_rows != 0){ if($num_rows != 0){
error_log('Database is not empty: ' . mysql_error());
$ret["status"] = "ERROR"; $ret["status"] = "ERROR";
$ret["msg"] = "Database is not empty"; $ret["msg"] = "Database is not empty";
echo json_encode($ret); echo json_encode($ret);
@@ -70,16 +69,15 @@ if($action == "TEST_DB"){
$config = str_replace("_APP_HOST_", $_REQUEST['APP_HOST'], $config); $config = str_replace("_APP_HOST_", $_REQUEST['APP_HOST'], $config);
$config = str_replace("_CLIENT_", 'app', $config); $config = str_replace("_CLIENT_", 'app', $config);
$con = mysql_connect($_REQUEST["APP_HOST"],$_REQUEST["APP_USERNAME"],$_REQUEST["APP_PASSWORD"]);
$db = NewADOConnection('mysqli'); $db = NewADOConnection('mysqli');
$res = $db->Connect($_REQUEST["APP_HOST"], $_REQUEST["APP_USERNAME"], $_REQUEST["APP_PASSWORD"], $_REQUEST["APP_DB"]); $res = $db->Connect($_REQUEST["APP_HOST"], $_REQUEST["APP_USERNAME"], $_REQUEST["APP_PASSWORD"], $_REQUEST["APP_DB"]);
if (!$res){ if (!$res){
error_log('Could not connect: ' . mysql_error()); error_log('Could not connect: ' . $db->ErrorMsg());
$ret["status"] = "ERROR"; $ret["status"] = "ERROR";
$ret["msg"] = "Incorrect credentials or incorrect DB host"; $ret["msg"] = "Incorrect credentials or incorrect DB host. ".'Could not connect: ' . $db->ErrorMsg();
echo json_encode($ret); echo json_encode($ret);
exit(); exit();
} }
@@ -88,7 +86,6 @@ if($action == "TEST_DB"){
error_log(print_r("Number of tables:".$result->RecordCount(),true)); error_log(print_r("Number of tables:".$result->RecordCount(),true));
$num_rows = $result->RecordCount(); $num_rows = $result->RecordCount();
if($num_rows != 0){ if($num_rows != 0){
error_log('Database is not empty: ' . mysql_error());
$ret["status"] = "ERROR"; $ret["status"] = "ERROR";
$ret["msg"] = "Database is not empty"; $ret["msg"] = "Database is not empty";
echo json_encode($ret); echo json_encode($ret);
@@ -101,9 +98,9 @@ if($action == "TEST_DB"){
$sql_list = preg_split('/;/',$insql); $sql_list = preg_split('/;/',$insql);
foreach($sql_list as $sql){ foreach($sql_list as $sql){
if (preg_match('/^\s+$/', $sql) || $sql == '') { # skip empty lines if (preg_match('/^\s+$/', $sql) || $sql == '') { # skip empty lines
continue; continue;
} }
$db->Execute($sql); $db->Execute($sql);
} }
//Run create table script //Run create table script
@@ -111,9 +108,9 @@ if($action == "TEST_DB"){
$sql_list = preg_split('/;/',$insql); $sql_list = preg_split('/;/',$insql);
foreach($sql_list as $sql){ foreach($sql_list as $sql){
if (preg_match('/^\s+$/', $sql) || $sql == '') { # skip empty lines if (preg_match('/^\s+$/', $sql) || $sql == '') { # skip empty lines
continue; continue;
} }
$db->Execute($sql); $db->Execute($sql);
} }