fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in luisfernandosl/processmaker/PM-2258 (pull request #2260)

Browse Source 
PM-2258 "Change the text when checking..." SOLVED
This commit is contained in:
Julio Cesar Laura Avendaño
2015-05-25 11:41:10 -04:00
parent 57856ae593 7be4a1fcc6
commit 8a2dab1d66
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
workflow/engine/src/ProcessMaker/BusinessModel/DataBaseConnection.php
View File

@@ -246,31 +246,31 @@ class DataBaseConnection
// STEP 3 : Trying to connect to host // STEP 3 : Trying to connect to host
$respTest['2'] = array(); $respTest['2'] = array();
$respTest['2']['test'] = 'Trying to connect to host ' . $dataCon['DBS_SERVER'] . (($dataCon['DBS_PORT'] != '') ? ':'.$dataCon['DBS_PORT'] : ''); $respTest['2']['test'] = 'Connecting to host ' . $dataCon['DBS_SERVER'] . (($dataCon['DBS_PORT'] != '') ? ':'.$dataCon['DBS_PORT'] : '');
$Server->loginDbServer($dataCon['DBS_USERNAME'], $dataCon['DBS_PASSWORD']); $Server->loginDbServer($dataCon['DBS_USERNAME'], $dataCon['DBS_PASSWORD']);
$Server->setDataBase($dataCon['DBS_DATABASE_NAME'], $dataCon['DBS_PORT']); $Server->setDataBase($dataCon['DBS_DATABASE_NAME'], $dataCon['DBS_PORT']);
if ($Server->errno == 0) { if ($Server->errno == 0) {
$response = $Server->tryConnectServer($dataCon['DBS_TYPE']); $response = $Server->tryConnectServer($dataCon['DBS_TYPE']);
if ($response->status != 'SUCCESS') { if ($response->status != 'SUCCESS') {
if ($returnArray) { if ($returnArray) {
$respTest['2']['error'] = "Error Testing Connection: Trying to connect to host FAILED : " . $Server->error; $respTest['2']['error'] = "Error Testing Connection: Connecting to host FAILED : " . $Server->error;
} else { } else {
$resp['message'] = "Error Testing Connection: Trying to connect to host FAILED : " . $Server->error; $resp['message'] = "Error Testing Connection: Connecting to host FAILED : " . $Server->error;
return $resp; return $resp;
} }
} }
} else { } else {
if ($returnArray) { if ($returnArray) {
$respTest['2']['error'] = "Error Testing Connection: Trying to connect to host FAILED : " . $Server->error; $respTest['2']['error'] = "Error Testing Connection: Connecting to host FAILED : " . $Server->error;
} else { } else {
$resp['message'] = "Error Testing Connection: Trying to connect to host FAILED : " . $Server->error; $resp['message'] = "Error Testing Connection: Connecting to host FAILED : " . $Server->error;
return $resp; return $resp;
} }
} }
// STEP 4 : Trying to open database // STEP 4 : Trying to open database
$respTest['3'] = array(); $respTest['3'] = array();
$respTest['3']['test'] = 'Trying to open database [' . $dataCon['DBS_DATABASE_NAME'] . ']'; $respTest['3']['test'] = 'Opening database [' . $dataCon['DBS_DATABASE_NAME'] . ']';
$Server->loginDbServer($dataCon['DBS_USERNAME'], $dataCon['DBS_PASSWORD']); $Server->loginDbServer($dataCon['DBS_USERNAME'], $dataCon['DBS_PASSWORD']);
$Server->setDataBase($dataCon['DBS_DATABASE_NAME'], $dataCon['DBS_PORT']); $Server->setDataBase($dataCon['DBS_DATABASE_NAME'], $dataCon['DBS_PORT']);
if ($Server->errno == 0) { if ($Server->errno == 0) {
@@ -279,25 +279,25 @@ class DataBaseConnection
$response = $Server->tryOpenDataBase($dataCon['DBS_TYPE']); $response = $Server->tryOpenDataBase($dataCon['DBS_TYPE']);
if ($response->status != 'SUCCESS') { if ($response->status != 'SUCCESS') {
if ($returnArray) { if ($returnArray) {
$respTest['3']['error'] = "Error Testing Connection: Trying to open database FAILED : " . $Server->error; $respTest['3']['error'] = "Error Testing Connection: Opening database FAILED : " . $Server->error;
} else { } else {
$resp['message'] = "Error Testing Connection: Trying to open database FAILED : " . $Server->error; $resp['message'] = "Error Testing Connection: Opening database FAILED : " . $Server->error;
return $resp; return $resp;
} }
} }
} else { } else {
if ($returnArray) { if ($returnArray) {
$respTest['3']['error'] = "Error Testing Connection: Trying to open database FAILED : " . $Server->error; $respTest['3']['error'] = "Error Testing Connection: Opening database FAILED : " . $Server->error;
} else { } else {
$resp['message'] = "Error Testing Connection: Trying to open database FAILED : " . $Server->error; $resp['message'] = "Error Testing Connection: Opening database FAILED : " . $Server->error;
return $resp; return $resp;
} }
} }
} else { } else {
if ($returnArray) { if ($returnArray) {
$respTest['3']['error'] = "Error Testing Connection: Trying to open database FAILED : " . $Server->error; $respTest['3']['error'] = "Error Testing Connection: Opening database FAILED : " . $Server->error;
} else { } else {
$resp['message'] = "Error Testing Connection: Trying to open database FAILED : " . $Server->error; $resp['message'] = "Error Testing Connection: Opening database FAILED : " . $Server->error;
return $resp; return $resp;
} }
} }
@@ -374,4 +374,3 @@ class DataBaseConnection
return $dbs_uid; return $dbs_uid;
} }
} }