Merge pull request #197 from hector-cortez/BUG-9369

BUG 9369 In debug mode the content of an array variable is not display S...
This commit is contained in:
julceslauhub
2012-07-09 09:55:31 -07:00

View File

@@ -1,4 +1,5 @@
<?php <?php
$request = isset($_POST['request']) ? $_POST['request'] : ''; $request = isset($_POST['request']) ? $_POST['request'] : '';
switch ($request) { switch ($request) {
case 'getRows': case 'getRows':
@@ -9,14 +10,14 @@ switch($request){
$oApp = new Cases(); $oApp = new Cases();
$aFields = $oApp->loadCase($_SESSION['APPLICATION']); $aFields = $oApp->loadCase($_SESSION['APPLICATION']);
$aVariables = Array(); $aVars = Array();
for ($i = 0; $i < count($_SESSION['TRIGGER_DEBUG']['DATA']); $i++) { for ($i = 0; $i < count($_SESSION['TRIGGER_DEBUG']['DATA']); $i++) {
$aVariables[$_SESSION['TRIGGER_DEBUG']['DATA'][$i]['key']] = $_SESSION['TRIGGER_DEBUG']['DATA'][$i]['value']; $aVars[$_SESSION['TRIGGER_DEBUG']['DATA'][$i]['key']] = $_SESSION['TRIGGER_DEBUG']['DATA'][$i]['value'];
} }
$aVariables = array_merge($aFields['APP_DATA'], $aVariables); $aVars = array_merge($aFields['APP_DATA'], $aVars);
$field = $aVariables[$fieldname]; $field = $aVars[$fieldname];
$response->headers = Array(); $response->headers = Array();
$response->columns = Array(); $response->columns = Array();
$response->rows = Array(); $response->rows = Array();
@@ -40,58 +41,58 @@ switch($request){
} }
$response->rows[$j++] = $tmp; $response->rows[$j++] = $tmp;
} }
} else if( is_object($field) ) { } else {
if (is_object($field)) {
$response->headers = Array(Array('name' => 'name'), Array('name' => 'value')); $response->headers = Array(Array('name' => 'name'), Array('name' => 'value'));
$response->columns = Array(Array('header'=>'Property', 'width'=>100, 'dataIndex'=>'name'), Array('header'=>'Value', 'width'=>100, 'dataIndex'=>'value')); $response->columns = Array(Array('header' => 'Property', 'width' => 100, 'dataIndex' => 'name'),
Array('header' => 'Value', 'width' => 100, 'dataIndex' => 'value'));
foreach ($field as $key => $value) { foreach ($field as $key => $value) {
$response->rows[] = Array($key, $value); $response->rows[] = Array($key, $value);
} }
} }
}
echo G::json_encode($response); echo G::json_encode($response);
break; break;
default: default:
G::LoadClass('case'); G::LoadClass('case');
$oApp = new Cases(); $oApp = new Cases();
$aFields = $oApp->loadCase($_SESSION['APPLICATION']); $aFields = $oApp->loadCase($_SESSION['APPLICATION']);
$aVariables = Array(); $aVars = Array();
for ($i = 0; $i < count($_SESSION['TRIGGER_DEBUG']['DATA']); $i++) { for ($i = 0; $i < count($_SESSION['TRIGGER_DEBUG']['DATA']); $i++) {
$aVariables[$_SESSION['TRIGGER_DEBUG']['DATA'][$i]['key']] = $_SESSION['TRIGGER_DEBUG']['DATA'][$i]['value']; $aVars[$_SESSION['TRIGGER_DEBUG']['DATA'][$i]['key']] = $_SESSION['TRIGGER_DEBUG']['DATA'][$i]['value'];
} }
$aVariables = array_merge($aFields['APP_DATA'], $aVariables); $aVars = array_merge($aFields['APP_DATA'], $aVars);
if (isset($_POST['filter']) && $_POST['filter'] == 'dyn') { if (isset($_POST['filter']) && $_POST['filter'] == 'dyn') {
$sysVars = array_keys(G::getSystemConstants()); $sysVars = array_keys(G::getSystemConstants());
$varNames = array_keys($aVariables); $varNames = array_keys($aVars);
foreach ($varNames as $var) { foreach ($varNames as $var) {
if (in_array($var, $sysVars)) { if (in_array($var, $sysVars)) {
unset($aVariables[$var]); unset($aVars[$var]);
} }
} }
} }
if (isset($_POST['filter']) && $_POST['filter'] == 'sys') { if (isset($_POST['filter']) && $_POST['filter'] == 'sys') {
$aVariables = G::getSystemConstants(); $aVars = G::getSystemConstants();
} }
ksort($aVariables); ksort($aVars);
$return_object->totalCount = 1; $return_object->totalCount = 1;
foreach ($aVariables as $i=>$var) { foreach ($aVars as $i => $var) {
if( is_object($var) ){ if (is_array($var) || is_object($var)) {
$aVariables[$i] = '<object>'; $aVars[$i] = print_r($var, true);
}
if( is_array($var) ){
$aVariables[$i] = '<array>';
} }
} }
$return_object->data[0]=$aVariables; $return_object->data[0] = $aVars;
echo G::json_encode($return_object); echo G::json_encode($return_object);
break; break;
} }