*
* Copyright 2011-2012, Franck Villaume - TrivialDev
* Copyright (C) 2012 Alain Peyrat - Alcatel-Lucent
- * Copyright 2013, French Ministry of Education
+ * Copyright 2013, French Ministry of National Education
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
require_once $gfcommon.'include/Error.class.php';
require_once $gfcommon.'include/User.class.php';
+require_once $gfcommon.'include/minijson.php';
require_once $gfcommon.'docman/DocumentGroup.class.php';
class DocumentManager extends Error {
}
switch ($format) {
case 'json': {
- $returnString = '{';
+ $state_values = array();
while ($stateArr = db_fetch_array($stateQuery)) {
- $returnString .= util_html_secure($stateArr['name']).': \''.$stateArr['stateid'].'\',';
+ $state_values[$stateArr['name']] = $stateArr['stateid'];
}
- $returnString .= '}';
- return $returnString;
- break;
+ return minijson_encode($state_values, false);
}
default: {
return $stateQuery;
case "json": {
$returnString = '{';
for ($i=0; $i<$rows; $i++) {
- $returnString .= '\''.util_html_secure($text_array[$i]).'\':'.$id_array[$i].',';
+ $returnString .= '\''.util_html_secure(addslashes($text_array[$i])).'\':'.$id_array[$i].',';
}
$returnString .= '}';
break;