From 3335e99e9d8a8b21807bf08cb596b89eae796bcd Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Thu, 3 Jul 2014 09:45:15 -0400 Subject: [PATCH] Correccion de errores stdclass --- workflow/engine/classes/model/TaskUser.php | 1 + workflow/engine/classes/model/Users.php | 1 + workflow/engine/config/databases.php | 39 +++++++++---------- workflow/engine/controllers/dashboard.php | 1 + .../methods/inputdocs/inputdocs_Delete.php | 2 +- 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/workflow/engine/classes/model/TaskUser.php b/workflow/engine/classes/model/TaskUser.php index 1df286bb3..5545b6703 100755 --- a/workflow/engine/classes/model/TaskUser.php +++ b/workflow/engine/classes/model/TaskUser.php @@ -188,6 +188,7 @@ class TaskUser extends BaseTaskUser while ($dataset->next()) { $usersTask[] = $dataset->getRow(); } + $result = new stdClass(); $result->data = $usersTask; $result->totalCount = sizeof( $usersTask ); diff --git a/workflow/engine/classes/model/Users.php b/workflow/engine/classes/model/Users.php index e8b82eff7..30e42c4a4 100755 --- a/workflow/engine/classes/model/Users.php +++ b/workflow/engine/classes/model/Users.php @@ -363,6 +363,7 @@ class Users extends BaseUsers $rows[] = $rs->getRow(); } + $result = new stdClass(); $result->data = $rows; $result->totalCount = $totalCount; diff --git a/workflow/engine/config/databases.php b/workflow/engine/config/databases.php index 225a93822..8528bcb1a 100755 --- a/workflow/engine/config/databases.php +++ b/workflow/engine/config/databases.php @@ -23,16 +23,14 @@ * */ - if (defined('PATH_DB') && defined('SYS_SYS')) { +if (defined('PATH_DB') && defined('SYS_SYS')) { if (!file_exists(PATH_DB . SYS_SYS . '/db.php')) - throw new Exception("Could not find db.php in current workspace " . SYS_SYS); + throw new Exception("Could not find db.php in current workspace " . SYS_SYS); require_once(PATH_DB . SYS_SYS . '/db.php'); - //to do: enable for other databases $dbType = DB_ADAPTER; - $dsn = DB_ADAPTER . '://' . DB_USER . ':' . DB_PASS . '@' . DB_HOST . '/' . DB_NAME; //to do: enable a mechanism to select RBAC Database @@ -42,18 +40,19 @@ $dsnReport = DB_ADAPTER . '://' . DB_REPORT_USER . ':' . DB_REPORT_PASS . '@' . DB_REPORT_HOST . '/' . DB_REPORT_NAME; switch (DB_ADAPTER) { - case 'mysql': - $dsn .= '?encoding=utf8'; - $dsnRbac .= '?encoding=utf8'; - $dsnReport .= '?encoding=utf8'; - break; - case 'mssql': - //$dsn .= '?sendStringAsUnicode=false'; - //$dsnRbac .= '?sendStringAsUnicode=false'; - //$dsnReport .= '?sendStringAsUnicode=false'; - break; - default: - break; + case 'mysql': + $dsn .= '?encoding=utf8'; + $dsnRbac .= '?encoding=utf8'; + $dsnReport .= '?encoding=utf8'; + break; + case 'mssql': + case 'sqlsrv': + //$dsn .= '?sendStringAsUnicode=false'; + //$dsnRbac .= '?sendStringAsUnicode=false'; + //$dsnReport .= '?sendStringAsUnicode=false'; + break; + default: + break; } $pro ['datasources']['workflow']['connection'] = $dsn; @@ -65,9 +64,9 @@ $pro ['datasources']['rp']['connection'] = $dsnReport; $pro ['datasources']['rp']['adapter'] = DB_ADAPTER; - } +} - $pro ['datasources']['dbarray']['connection'] = 'dbarray://user:pass@localhost/pm_os'; - $pro ['datasources']['dbarray']['adapter'] = 'dbarray'; +$pro ['datasources']['dbarray']['connection'] = 'dbarray://user:pass@localhost/pm_os'; +$pro ['datasources']['dbarray']['adapter'] = 'dbarray'; - return $pro; +return $pro; diff --git a/workflow/engine/controllers/dashboard.php b/workflow/engine/controllers/dashboard.php index e7d062236..776c881e3 100644 --- a/workflow/engine/controllers/dashboard.php +++ b/workflow/engine/controllers/dashboard.php @@ -145,6 +145,7 @@ class Dashboard extends Controller $oConfiguration->aConfig = $dataDashboard; $oConfiguration->saveConfig('Dashboard', '', '', $_SESSION['USER_LOGGED']); + $result = new stdClass(); $result->success = '1'; return $result; } catch (Exception $error) { diff --git a/workflow/engine/methods/inputdocs/inputdocs_Delete.php b/workflow/engine/methods/inputdocs/inputdocs_Delete.php index 902f689da..2955c2bc4 100755 --- a/workflow/engine/methods/inputdocs/inputdocs_Delete.php +++ b/workflow/engine/methods/inputdocs/inputdocs_Delete.php @@ -48,7 +48,7 @@ try { } else { $sfunction = $_POST['functions']; } - + $result = new stdclass(); switch ($sfunction) { case 'getRelationInfDoc': try {