diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php index 9f8fda42d61..a35fee85d0a 100644 --- a/htdocs/core/js/lib_head.js.php +++ b/htdocs/core/js/lib_head.js.php @@ -524,8 +524,9 @@ function hideMessage(fieldId,message) { * @param int entity Entity * @param int strict Strict * @param int forcereload Force reload + * @param int userid User id */ -function setConstant(url, code, input, entity, strict, forcereload) { +function setConstant(url, code, input, entity, strict, forcereload, userid) { $.get( url, { action: "set", name: code, @@ -593,8 +594,9 @@ function setConstant(url, code, input, entity, strict, forcereload) { * @param int entity Entity * @param int strict Strict * @param int forcereload Force reload + * @param int userid User id */ -function delConstant(url, code, input, entity, strict, forcereload) { +function delConstant(url, code, input, entity, strict, forcereload, userid) { $.get( url, { action: "del", name: code, @@ -661,8 +663,9 @@ function delConstant(url, code, input, entity, strict, forcereload) { * @param int yesButton yesButton * @param int noButton noButton * @param int strict Strict + * @param int userid User id */ -function confirmConstantAction(action, url, code, input, box, entity, yesButton, noButton, strict) { +function confirmConstantAction(action, url, code, input, box, entity, yesButton, noButton, strict, userid) { var boxConfirm = box; $("#confirm_" + code) .attr("title", boxConfirm.title) @@ -678,9 +681,9 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton, text : yesButton, click : function() { if (action == "set") { - setConstant(url, code, input, entity, strict); + setConstant(url, code, input, entity, strict, 0, userid); } else if (action == "del") { - delConstant(url, code, input, entity, strict); + delConstant(url, code, input, entity, strict, 0, userid); } // Close dialog $(this).dialog("close"); diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php index 58567748f7f..c29b82f4329 100644 --- a/htdocs/core/lib/ajax.lib.php +++ b/htdocs/core/lib/ajax.lib.php @@ -485,7 +485,7 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete = */ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonoff = 0, $strict = 0, $forcereload = 0, $marginleftonlyshort = 2) { - global $conf, $langs; + global $conf, $langs, $user; $entity = ((isset($entity) && is_numeric($entity) && $entity >= 0) ? $entity : $conf->entity); @@ -504,6 +504,7 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof var code = \''.$code.'\'; var entity = \''.$entity.'\'; var strict = \''.$strict.'\'; + var userid = \''.$user->id.'\'; var yesButton = "'.dol_escape_js($langs->transnoentities("Yes")).'"; var noButton = "'.dol_escape_js($langs->transnoentities("No")).'"; @@ -512,9 +513,9 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof if (input.alert && input.alert.set) { if (input.alert.set.yesButton) yesButton = input.alert.set.yesButton; if (input.alert.set.noButton) noButton = input.alert.set.noButton; - confirmConstantAction("set", url, code, input, input.alert.set, entity, yesButton, noButton, strict); + confirmConstantAction("set", url, code, input, input.alert.set, entity, yesButton, noButton, strict, userid); } else { - setConstant(url, code, input, entity, 0, '.$forcereload.'); + setConstant(url, code, input, entity, 0, '.$forcereload.', userid); } }); @@ -523,9 +524,9 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof if (input.alert && input.alert.del) { if (input.alert.del.yesButton) yesButton = input.alert.del.yesButton; if (input.alert.del.noButton) noButton = input.alert.del.noButton; - confirmConstantAction("del", url, code, input, input.alert.del, entity, yesButton, noButton, strict); + confirmConstantAction("del", url, code, input, input.alert.del, entity, yesButton, noButton, strict, userid); } else { - delConstant(url, code, input, entity, 0, '.$forcereload.'); + delConstant(url, code, input, entity, 0, '.$forcereload.', userid); } }); }); diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index a6fc287d0cf..2b510373299 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -942,6 +942,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false) print ''; print ''.$langs->trans("MAIN_OPTIMIZEFORTEXTBROWSER").''; print ''; + //print ajax_constantonoff("MAIN_OPTIMIZEFORTEXTBROWSER", array(), null, 0, 0, 1, 0); if ($edit) { print $form->selectyesno('MAIN_OPTIMIZEFORTEXTBROWSER', $fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER, 1);