diff --git a/gulliver/system/class.dbMaintenance.php b/gulliver/system/class.dbMaintenance.php index aa2c9058d..ffa73dba5 100644 --- a/gulliver/system/class.dbMaintenance.php +++ b/gulliver/system/class.dbMaintenance.php @@ -267,7 +267,7 @@ class DataBaseMaintenance // Commented that is not assigned to a variable. // mysql_escape_string("';"); if (! @mysql_query( $sql )) { - $ws = (!empty(config("system.workspace")))? config("system.workspace") : "Wokspace Undefined"; + $ws = (!empty(config("system.workspace")))? config("system.workspace") : "Undefined Workspace"; Bootstrap::registerMonolog('MysqlCron', 400, mysql_error(), array('sql'=>$sql), $ws, 'processmaker.log'); $varRes = mysql_error() . "\n"; G::outRes( $varRes ); @@ -288,7 +288,7 @@ class DataBaseMaintenance $tableName = str_replace( '.dump', '', basename( $backupFile ) ); $sql = "LOAD DATA INFILE '$backupFile' INTO TABLE $tableName FIELDS TERMINATED BY '\t|\t' OPTIONALLY ENCLOSED BY '\"' LINES TERMINATED BY '\t\t\r\r\n'"; if (! @mysql_query( $sql )) { - $ws = (!empty(config("system.workspace")))? config("system.workspace") : "Wokspace Undefined"; + $ws = (!empty(config("system.workspace")))? config("system.workspace") : "Undefined Workspace"; Bootstrap::registerMonolog('MysqlCron', 400, mysql_error(), array('sql'=>$sql), $ws, 'processmaker.log'); $varRes = mysql_error() . "\n"; G::outRes( $varRes ); diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index 827cce26e..c9776460b 100644 --- a/gulliver/system/class.g.php +++ b/gulliver/system/class.g.php @@ -5447,7 +5447,7 @@ class G */ public static function auditLog($actionToLog, $valueToLog = "") { - $workspace = !empty(config("system.workspace")) ? config("system.workspace") : 'Wokspace Undefined'; + $workspace = !empty(config("system.workspace")) ? config("system.workspace") : 'Undefined Workspace'; $conf = new Configurations(); $sflag = $conf->getConfiguration('AUDIT_LOG', 'log'); $sflagAudit = $sflag == 'true' ? true : false; diff --git a/gulliver/system/class.pmException.php b/gulliver/system/class.pmException.php index 964ed9651..392eadbe7 100644 --- a/gulliver/system/class.pmException.php +++ b/gulliver/system/class.pmException.php @@ -21,7 +21,7 @@ class PMException extends Exception } public static function registerErrorLog($error, $token){ - $ws = (!empty(config("system.workspace")))? config("system.workspace") : "Wokspace Undefined"; + $ws = (!empty(config("system.workspace")))? config("system.workspace") : "Undefined Workspace"; Bootstrap::registerMonolog('ExceptionCron', 400, $error->getMessage(), array('token'=>$token), $ws, 'processmaker.log'); } } diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php index c2368ca60..0c0f13c76 100644 --- a/gulliver/system/class.xmlform.php +++ b/gulliver/system/class.xmlform.php @@ -255,7 +255,7 @@ class XmlFormField $rs = $con->executeQuery( $query, ResultSet::FETCHMODE_NUM ); } catch (Exception $e) { //dismiss error because dbarray shouldnt be defined in some contexts. - $workspace = !empty(config("system.workspace"))? config("system.workspace") : "Wokspace Undefined"; + $workspace = !empty(config("system.workspace"))? config("system.workspace") : "Undefined Workspace"; G::log($workspace . " | ip: | " . G::getIpAddress() . " | type error: | " . $e->getMessage() . " | query: " . $query, PATH_DATA, "queriesWithErrors.log"); return $result; @@ -267,7 +267,7 @@ class XmlFormField $rs = $stmt->executeQuery( $query, ResultSet::FETCHMODE_NUM ); } catch (Exception $e) { //dismiss error because dbarray shouldnt be defined in some contexts. - $workspace = !empty(config("system.workspace"))? config("system.workspace") : "Wokspace Undefined"; + $workspace = !empty(config("system.workspace"))? config("system.workspace") : "Undefined Workspace"; G::log($workspace . " | ip: | " . G::getIpAddress() . " | type error: | " . $e->getMessage() . " | query: " . $query, PATH_DATA, "queriesWithErrors.log"); return $result; diff --git a/workflow/engine/classes/IndicatorsCalculator.php b/workflow/engine/classes/IndicatorsCalculator.php index ad3bdb05b..7a366df4b 100644 --- a/workflow/engine/classes/IndicatorsCalculator.php +++ b/workflow/engine/classes/IndicatorsCalculator.php @@ -650,7 +650,7 @@ class IndicatorsCalculator } private function pdoConnection() { - $currentWS = !empty(config("system.workspace")) ? config("system.workspace") : 'Wokspace Undefined'; + $currentWS = !empty(config("system.workspace")) ? config("system.workspace") : 'Undefined Workspace'; $workSpace = new WorkspaceTools($currentWS); $arrayHost = explode(':', $workSpace->dbHost); $host = "host=".$arrayHost[0]; diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php b/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php index a4d762bf9..c4412f906 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php @@ -63,7 +63,7 @@ class EmailServer $currentUser = $RBAC->aUserInfo['USER_INFO']; $info = array( 'ip' => G::getIpAddress(), - 'workspace' => (!empty(config("system.workspace"))) ? config("system.workspace") : "Workspace undefined", + 'workspace' => (!empty(config("system.workspace"))) ? config("system.workspace") : "Undefined Workspace", 'usrUid' => $currentUser['USR_UID'] ); $this->setContextLog($info); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/TimerEvent.php b/workflow/engine/src/ProcessMaker/BusinessModel/TimerEvent.php index fd2a4539e..3496b1268 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/TimerEvent.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/TimerEvent.php @@ -1151,7 +1151,7 @@ class TimerEvent private function log($action, $value = "", $status = "action") { try { - $workspace = (!empty(config("system.workspace")))? config("system.workspace") : "Wokspace Undefined"; + $workspace = (!empty(config("system.workspace")))? config("system.workspace") : "Undefined Workspace"; $ipClient = \G::getIpAddress(); $actionTimer = "timereventcron: "; diff --git a/workflow/engine/src/ProcessMaker/Project/Bpmn.php b/workflow/engine/src/ProcessMaker/Project/Bpmn.php index 6900d487b..977af64cf 100644 --- a/workflow/engine/src/ProcessMaker/Project/Bpmn.php +++ b/workflow/engine/src/ProcessMaker/Project/Bpmn.php @@ -138,7 +138,7 @@ class Bpmn extends Handler //Define the variables for the logging $info = array( 'ip' => G::getIpAddress(), - 'workspace' => (!empty(config("system.workspace")))? config("system.workspace") : "Workspace undefined" + 'workspace' => (!empty(config("system.workspace")))? config("system.workspace") : "Undefined Workspace" ); $this->setContextLog($info); }