From 11fe834f06da1618d575fb47a6bdabc58e6dcd38 Mon Sep 17 00:00:00 2001
From: Julio <gugli100@gmail.com>
Date: Fri, 5 Jul 2019 15:19:30 +0200
Subject: [PATCH] Minor - update from master

---
 main/admin/add_users_to_usergroup.php | 2 +-
 main/admin/grade_models.php           | 6 +++++-
 main/admin/legal_add.php              | 2 +-
 main/admin/skill_create.php           | 2 +-
 main/admin/skill_edit.php             | 2 +-
 main/admin/user_add.php               | 2 +-
 main/admin/user_edit.php              | 3 +--
 main/announcements/announcements.php  | 1 -
 main/social/group_view.php            | 2 +-
 main/ticket/categories_add_user.php   | 4 ++--
 10 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/main/admin/add_users_to_usergroup.php b/main/admin/add_users_to_usergroup.php
index fd2f8136f1..12fd963e66 100755
--- a/main/admin/add_users_to_usergroup.php
+++ b/main/admin/add_users_to_usergroup.php
@@ -30,7 +30,7 @@ $tool_name = get_lang('SubscribeUsersToClass');
 $htmlHeadXtra[] = '
 <script>
 
-$(document).ready( function() {
+$(function () {
     $("#relation").change(function() {
         window.location = "add_users_to_usergroup.php?id='.$id.'" +"&relation=" + $(this).val();
     });
diff --git a/main/admin/grade_models.php b/main/admin/grade_models.php
index 95cc61393f..d2745e8b62 100755
--- a/main/admin/grade_models.php
+++ b/main/admin/grade_models.php
@@ -204,5 +204,9 @@ switch ($action) {
         $obj->display();
         break;
 }
-echo '<script> $(document).ready(function(){ $("input").removeClass("form-control"); }); </script>';
+echo '<script> 
+$(function () { 
+    $("input").removeClass("form-control"); 
+}); 
+</script>';
 Display::display_footer();
diff --git a/main/admin/legal_add.php b/main/admin/legal_add.php
index cb58019888..29ed44a018 100755
--- a/main/admin/legal_add.php
+++ b/main/admin/legal_add.php
@@ -187,7 +187,7 @@ $interbreadcrumb[] = ['url' => 'index.php', 'name' => get_lang('PlatformAdmin')]
 
 // the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function
 $htmlHeadXtra[] = '<script>
-$(document).ready(function(){
+$(function () {
     '.$jqueryReady.'
 });
 </script>';
diff --git a/main/admin/skill_create.php b/main/admin/skill_create.php
index 50ad49cd69..55b26aa0aa 100644
--- a/main/admin/skill_create.php
+++ b/main/admin/skill_create.php
@@ -47,7 +47,7 @@ $jquery_ready_content = $returnParams['jquery_ready_content'];
 // the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function
 if (!empty($jquery_ready_content)) {
     $htmlHeadXtra[] = '<script>
-    $(document).ready(function(){
+    $(function () {
         '.$jquery_ready_content.'
     });
     </script>';
diff --git a/main/admin/skill_edit.php b/main/admin/skill_edit.php
index 9841713c6a..4973c8b858 100644
--- a/main/admin/skill_edit.php
+++ b/main/admin/skill_edit.php
@@ -63,7 +63,7 @@ $jquery_ready_content = $returnParams['jquery_ready_content'];
 // in the $(document).ready javascript function
 if (!empty($jquery_ready_content)) {
     $htmlHeadXtra[] = '<script>
-    $(document).ready(function(){
+    $(function () {
         '.$jquery_ready_content.'
     });
     </script>';
diff --git a/main/admin/user_add.php b/main/admin/user_add.php
index ff85856d27..dc6834dad6 100755
--- a/main/admin/user_add.php
+++ b/main/admin/user_add.php
@@ -324,7 +324,7 @@ $jquery_ready_content = $returnParams['jquery_ready_content'];
 
 // the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function
 $htmlHeadXtra[] = '<script>
-$(document).ready(function(){
+$(function () {
     '.$jquery_ready_content.'
 });
 </script>';
diff --git a/main/admin/user_edit.php b/main/admin/user_edit.php
index 495e95181e..88627130a5 100755
--- a/main/admin/user_edit.php
+++ b/main/admin/user_edit.php
@@ -329,9 +329,8 @@ if ($allowEmailTemplate) {
 }
 
 // the $jqueryReadyContent variable collects all functions that will be load in the
-// $(document).ready javascript function
 $htmlHeadXtra[] = '<script>
-$(document).ready(function(){
+$(function () {
     '.$jqueryReadyContent.'
 });
 </script>';
diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index 660ba27e29..e65c5c33fa 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -250,7 +250,6 @@ switch ($action) {
                 'index' => 'actions',
                 'width' => '150',
                 'align' => 'left',
-                //'formatter' => 'action_formatter',
                 'sortable' => 'false',
             ],
         ];
diff --git a/main/social/group_view.php b/main/social/group_view.php
index d6fe402cca..e3f0540ac4 100644
--- a/main/social/group_view.php
+++ b/main/social/group_view.php
@@ -322,7 +322,7 @@ $tpl = new Template(null);
 
 // Block Social Avatar
 SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'groups', $group_id);
-//Block Social Menu
+
 $social_menu_block = SocialManager::show_social_menu('groups', $group_id);
 $tpl->setHelp('Groups');
 $tpl->assign('create_link', $create_thread_link);
diff --git a/main/ticket/categories_add_user.php b/main/ticket/categories_add_user.php
index 58ea0bbccc..837f0de156 100644
--- a/main/ticket/categories_add_user.php
+++ b/main/ticket/categories_add_user.php
@@ -9,7 +9,7 @@ require_once __DIR__.'/../inc/global.inc.php';
 api_protect_admin_script(true);
 
 $categoryId = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
-$projectId = isset($_GET['project_id']) ? (int) $_GET['project_id'] : '';
+$projectId = isset($_GET['project_id']) ? (int) $_GET['project_id'] : 0;
 
 $categoryInfo = TicketManager::getCategory($categoryId);
 
@@ -49,7 +49,7 @@ if ($form->validate()) {
     TicketManager::deleteAllUserInCategory($categoryId);
     TicketManager::addUsersToCategory($categoryId, $values['users']);
     Display::addFlash(Display::return_message(get_lang('Updated')));
-    header("Location: ".api_get_self()."?id=".$categoryId.'&project_id='.$projectId);
+    header('Location: '.api_get_self().'?id='.$categoryId.'&project_id='.$projectId);
     exit;
 }