tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-02-14 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/agentes/module_manager_editor_common.php,
	include/functions_profile.php, operation/events/events_list.php:
	changed in jQuery the deprecated function evalJSON for parseJSON.
	
	Fixes: #3604536




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7649 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-02-14 10:37:37 +00:00
parent eb61caadac
commit f22306fea3
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2013-02-14 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor_common.php,
include/functions_profile.php, operation/events/events_list.php:
changed in jQuery the deprecated function evalJSON for parseJSON.
Fixes: #3604536
2013-02-14 Miguel de Dios <miguel.dedios@artica.es>
* godmode/massive/massive_operations.php,

4
pandora_console/godmode/agentes/module_manager_editor_common.php
View File

@ -446,7 +446,7 @@ $(document).ready (function () {
$(this).attr('selected','selected');
});
});
$("#submit-crtbutton").click(function () {
$('#id_tag_selected option').map(function(){
$(this).attr('selected','selected');
@ -455,7 +455,7 @@ $(document).ready (function () {
$("#id_module_type").change(function () {
var type_selected = $(this).val();
var type_names = jQuery.evalJSON(Base64.decode($('#hidden-type_names').val()));
var type_names = jQuery.parseJSON(Base64.decode($('#hidden-type_names').val()));
var type_name_selected = type_names[type_selected];

17
pandora_console/include/functions_profile.php
View File

@ -69,27 +69,28 @@ function profile_get_profiles ($filter = false) {
*/
function profile_create_user_profile ($id_user, $id_profile = 1, $id_group = 0, $assignUser = false, $tags = '') {
global $config;
if (empty ($id_profile) || $id_group < 0)
return false;
// Checks if the user exists
$result_user = users_get_user_by_id($id_user);
if (!$result_user){
if (!$result_user) {
return false;
}
}
if (isset ($config["id_user"])) {
//Usually this is set unless we call it while logging in (user known by auth scheme but not by pandora)
$assign = $config["id_user"];
} else {
}
else {
$assign = $id_user;
}
if ($assignUser !== false)
$assign = $assignUser;
$insert = array (
"id_usuario" => $id_user,
"id_perfil" => $id_profile,
@ -97,7 +98,7 @@ function profile_create_user_profile ($id_user, $id_profile = 1, $id_group = 0,
"tags" => $tags,
"assigned_by" => $assign
);
return db_process_sql_insert ("tusuario_perfil", $insert);
}

4
pandora_console/operation/events/events_list.php
View File

@ -945,7 +945,7 @@ function reorder_tags_inputs() {
tags_base64 = $("#hidden-tag_with").val();
tags = jQuery.evalJSON(Base64.decode(tags_base64));
tags = jQuery.parseJSON(Base64.decode(tags_base64));
jQuery.each(tags, function(key, element) {
if ($("#select_with option[value='" + element + "']").length == 1) {
text = $("#select_with option[value='" + element + "']").text();
@ -977,7 +977,7 @@ function reorder_tags_inputs() {
tags_base64 = $("#hidden-tag_without").val();
tags = jQuery.evalJSON(Base64.decode(tags_base64));
tags = jQuery.parseJSON(Base64.decode(tags_base64));
jQuery.each(tags, function(key, element) {
if ($("#select_without option[value='" + element + "']").length == 1) {
text = $("#select_without option[value='" + element + "']").text();