From de192f9601d5191d86900bba2c0d2b829613400d Mon Sep 17 00:00:00 2001 From: renaiku Date: Wed, 9 Aug 2017 00:39:41 +0200 Subject: [PATCH 01/40] Initial commit --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..69c5506c --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# fxserver-esx_joblisting \ No newline at end of file From b52e9a48d23e49c305ccac3095d087a1473b945f Mon Sep 17 00:00:00 2001 From: renaiku Date: Wed, 9 Aug 2017 00:42:51 +0200 Subject: [PATCH 02/40] Add files --- README.md | 3 +- __resource.lua | 9 +++ client/esx_joblisting_cl.lua | 115 +++++++++++++++++++++++++++++++++++ config.lua | 9 +++ server/esx_joblisting_sv.lua | 26 ++++++++ 5 files changed, 161 insertions(+), 1 deletion(-) create mode 100644 __resource.lua create mode 100644 client/esx_joblisting_cl.lua create mode 100644 config.lua create mode 100644 server/esx_joblisting_sv.lua diff --git a/README.md b/README.md index 69c5506c..64d5b689 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ -# fxserver-esx_joblisting \ No newline at end of file +# fxserver-esx_joblisting +FR - Pôle Emploi \ No newline at end of file diff --git a/__resource.lua b/__resource.lua new file mode 100644 index 00000000..7993f10f --- /dev/null +++ b/__resource.lua @@ -0,0 +1,9 @@ +server_scripts { + '@mysql-async/lib/MySQL.lua', + 'server/esx_joblisting_sv.lua' +} + +client_scripts { + 'config.lua', + 'client/esx_joblisting_cl.lua' +} \ No newline at end of file diff --git a/client/esx_joblisting_cl.lua b/client/esx_joblisting_cl.lua new file mode 100644 index 00000000..e782aa7e --- /dev/null +++ b/client/esx_joblisting_cl.lua @@ -0,0 +1,115 @@ +local Keys = { + ["ESC"] = 322, ["BACKSPACE"] = 177, ["E"] = 38, ["ENTER"] = 18, ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173 +} + +local menuIsShowed = false +local hasAlreadyEnteredMarker = false +local lastZone = nil +local isInJoblistingMarker = false + +ESX = nil + +Citizen.CreateThread(function() + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end +end) + +function ShowJobListingMenu(data) + ESX.TriggerServerCallback('esx_joblisting:getJobsList', function(data) + local elements = {} + for i = 1, #data, 1 do + table.insert( + elements, + {label = data[i].label, value = data[i].value} + ) + end + + ESX.UI.Menu.CloseAll() + + ESX.UI.Menu.Open( + 'default', GetCurrentResourceName(), 'joblisting', + { + title = 'POLE EMPLOI', + elements = elements + }, + function(data, menu) + TriggerServerEvent('esx_joblisting:setJob', data.current.value) + ESX.ShowNotification('Vous avez un nouveau job !') + menu.close() + end, + function(data, menu) + menu.close() + end + ) + + end) +end + +AddEventHandler('esx_joblisting:hasExitedMarker', function(zone) + ESX.UI.Menu.CloseAll() +end) + +-- Display markers +Citizen.CreateThread(function() + while true do + Wait(0) + local coords = GetEntityCoords(GetPlayerPed(-1)) + for i=1, #Config.Zones, 1 do + if(GetDistanceBetweenCoords(coords, Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z, true) < Config.DrawDistance) then + DrawMarker(Config.MarkerType, Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.ZoneSize.x, Config.ZoneSize.y, Config.ZoneSize.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false) + end + end + end +end) + +-- Activate menu when player is inside marker +Citizen.CreateThread(function() + while true do + Wait(0) + local coords = GetEntityCoords(GetPlayerPed(-1)) + isInJoblistingMarker = false + local currentZone = nil + for i=1, #Config.Zones, 1 do + if(GetDistanceBetweenCoords(coords, Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z, true) < Config.ZoneSize.x / 2) then + isInJoblistingMarker = true + SetTextComponentFormat('STRING') + AddTextComponentString('Appuyez sur ~INPUT_PICKUP~ pour \naccéder au ~b~Pôle Emploi~s~.') + DisplayHelpTextFromStringLabel(0, 0, 1, -1) + end + end + if isInJoblistingMarker and not hasAlreadyEnteredMarker then + hasAlreadyEnteredMarker = true + end + if not isInJoblistingMarker and hasAlreadyEnteredMarker then + hasAlreadyEnteredMarker = false + TriggerEvent('esx_joblisting:hasExitedMarker') + end + end +end) + +-- Create blips +Citizen.CreateThread(function() + for i=1, #Config.Zones, 1 do + local blip = AddBlipForCoord(Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z) + SetBlipSprite (blip, 407) + SetBlipDisplay(blip, 4) + SetBlipScale (blip, 1.2) + SetBlipColour (blip, 27) + SetBlipAsShortRange(blip, true) + BeginTextCommandSetBlipName("STRING") + AddTextComponentString("Pôle-Emploi") + EndTextCommandSetBlipName(blip) + end +end) + +-- Menu Controls +Citizen.CreateThread(function() + while true do + Wait(0) + if IsControlJustReleased(0, Keys['E']) and isInJoblistingMarker and not menuIsShowed then + ShowJobListingMenu() + end + end +end) \ No newline at end of file diff --git a/config.lua b/config.lua new file mode 100644 index 00000000..876c8df9 --- /dev/null +++ b/config.lua @@ -0,0 +1,9 @@ +Config = {} +Config.DrawDistance = 100.0 +Config.ZoneSize = {x = 3.0, y = 3.0, z = 2.0} +Config.MarkerColor = {r = 100, g = 100, b = 204} +Config.MarkerType = 1 + +Config.Zones = { + {x = -265.036, y = -963.630, z = 30.223} +} diff --git a/server/esx_joblisting_sv.lua b/server/esx_joblisting_sv.lua new file mode 100644 index 00000000..79533e40 --- /dev/null +++ b/server/esx_joblisting_sv.lua @@ -0,0 +1,26 @@ +ESX = nil +TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + +ESX.RegisterServerCallback('esx_joblisting:getJobsList', function(source, cb) + MySQL.Async.fetchAll( + 'SELECT * FROM jobs', + {}, + function(result) + local data = {} + for i=1, #result, 1 do + table.insert(data, { + value = result[i].name, + label = result[i].label + }) + end + cb(data) + end + ) +end) + +RegisterServerEvent('esx_joblisting:setJob') +AddEventHandler('esx_joblisting:setJob', function(job) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) + xPlayer.setJob(job, 0) +end) \ No newline at end of file From 64f61da31e3822450146f3359d62e8d4859a38a8 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Tue, 15 Aug 2017 23:17:28 -0400 Subject: [PATCH 03/40] Multi-language support --- __resource.lua | 8 +++++++- client/esx_joblisting_cl.lua | 20 ++++++++++---------- config.lua | 1 + locales/en.lua | 7 +++++++ locales/fr.lua | 7 +++++++ 5 files changed, 32 insertions(+), 11 deletions(-) create mode 100644 locales/en.lua create mode 100644 locales/fr.lua diff --git a/__resource.lua b/__resource.lua index 7993f10f..30e27ff6 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,9 +1,15 @@ server_scripts { + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', '@mysql-async/lib/MySQL.lua', 'server/esx_joblisting_sv.lua' } client_scripts { + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', 'config.lua', 'client/esx_joblisting_cl.lua' -} \ No newline at end of file +} diff --git a/client/esx_joblisting_cl.lua b/client/esx_joblisting_cl.lua index e782aa7e..2ae6c0a0 100644 --- a/client/esx_joblisting_cl.lua +++ b/client/esx_joblisting_cl.lua @@ -21,7 +21,7 @@ function ShowJobListingMenu(data) local elements = {} for i = 1, #data, 1 do table.insert( - elements, + elements, {label = data[i].label, value = data[i].value} ) end @@ -36,7 +36,7 @@ function ShowJobListingMenu(data) }, function(data, menu) TriggerServerEvent('esx_joblisting:setJob', data.current.value) - ESX.ShowNotification('Vous avez un nouveau job !') + ESX.ShowNotification(_U('new_job')) menu.close() end, function(data, menu) @@ -53,9 +53,9 @@ end) -- Display markers Citizen.CreateThread(function() - while true do - Wait(0) - local coords = GetEntityCoords(GetPlayerPed(-1)) + while true do + Wait(0) + local coords = GetEntityCoords(GetPlayerPed(-1)) for i=1, #Config.Zones, 1 do if(GetDistanceBetweenCoords(coords, Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z, true) < Config.DrawDistance) then DrawMarker(Config.MarkerType, Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.ZoneSize.x, Config.ZoneSize.y, Config.ZoneSize.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false) @@ -66,7 +66,7 @@ end) -- Activate menu when player is inside marker Citizen.CreateThread(function() - while true do + while true do Wait(0) local coords = GetEntityCoords(GetPlayerPed(-1)) isInJoblistingMarker = false @@ -75,7 +75,7 @@ Citizen.CreateThread(function() if(GetDistanceBetweenCoords(coords, Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z, true) < Config.ZoneSize.x / 2) then isInJoblistingMarker = true SetTextComponentFormat('STRING') - AddTextComponentString('Appuyez sur ~INPUT_PICKUP~ pour \naccéder au ~b~Pôle Emploi~s~.') + AddTextComponentString(_U('access_job_center')) DisplayHelpTextFromStringLabel(0, 0, 1, -1) end end @@ -92,14 +92,14 @@ end) -- Create blips Citizen.CreateThread(function() for i=1, #Config.Zones, 1 do - local blip = AddBlipForCoord(Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z) + local blip = AddBlipForCoord(Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z) SetBlipSprite (blip, 407) SetBlipDisplay(blip, 4) SetBlipScale (blip, 1.2) SetBlipColour (blip, 27) SetBlipAsShortRange(blip, true) BeginTextCommandSetBlipName("STRING") - AddTextComponentString("Pôle-Emploi") + AddTextComponentString(_U('job_center')) EndTextCommandSetBlipName(blip) end end) @@ -112,4 +112,4 @@ Citizen.CreateThread(function() ShowJobListingMenu() end end -end) \ No newline at end of file +end) diff --git a/config.lua b/config.lua index 876c8df9..8648b3db 100644 --- a/config.lua +++ b/config.lua @@ -3,6 +3,7 @@ Config.DrawDistance = 100.0 Config.ZoneSize = {x = 3.0, y = 3.0, z = 2.0} Config.MarkerColor = {r = 100, g = 100, b = 204} Config.MarkerType = 1 +Config.Locale = 'fr' Config.Zones = { {x = -265.036, y = -963.630, z = 30.223} diff --git a/locales/en.lua b/locales/en.lua new file mode 100644 index 00000000..a07a80a2 --- /dev/null +++ b/locales/en.lua @@ -0,0 +1,7 @@ +Locales['en'] = { + + ['new_job'] = 'you have a new job!', + ['access_job_center'] = 'press ~INPUT_PICKUP~ to access the ~b~job center~s~.', + ['job_center'] = 'job Center', + +} diff --git a/locales/fr.lua b/locales/fr.lua new file mode 100644 index 00000000..60217531 --- /dev/null +++ b/locales/fr.lua @@ -0,0 +1,7 @@ +Locales['fr'] = { + + ['new_job'] = 'vous avez nouveau job !', + ['access_job_center'] = 'appuyez sur ~INPUT_PICKUP~ pour \naccéder au ~b~Pôle Emploi~s~.', + ['job_center'] = 'pôle-Emploi', + +} From 9f380ad8d35a307c79a0886d5ff3c8d1989ddbd4 Mon Sep 17 00:00:00 2001 From: TakumiBR <31086346+TakumiBR@users.noreply.github.com> Date: Thu, 17 Aug 2017 08:43:24 -0700 Subject: [PATCH 04/40] Multi-language support Brazilian Portuguese translation. --- __resource.lua | 2 ++ locales/br.lua | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 locales/br.lua diff --git a/__resource.lua b/__resource.lua index 30e27ff6..dfec33a0 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,5 +1,6 @@ server_scripts { '@es_extended/locale.lua', + 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', '@mysql-async/lib/MySQL.lua', @@ -8,6 +9,7 @@ server_scripts { client_scripts { '@es_extended/locale.lua', + 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', 'config.lua', diff --git a/locales/br.lua b/locales/br.lua new file mode 100644 index 00000000..993f1630 --- /dev/null +++ b/locales/br.lua @@ -0,0 +1,7 @@ +Locales['br'] = { + + ['new_job'] = 'Você agora tem um novo emprego!', + ['access_job_center'] = 'Pressione ~INPUT_PICKUP~ para acessar a ~b~Lista de Empregos~s~.', + ['job_center'] = 'Agência de Empregos', + +} From a0f435e389132bb72067db678f1023acfc4f7d4d Mon Sep 17 00:00:00 2001 From: nearbyplayer <3721216+nearbyplayer@users.noreply.github.com> Date: Thu, 17 Aug 2017 14:03:04 -0400 Subject: [PATCH 05/40] Update __resource.lua --- __resource.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/__resource.lua b/__resource.lua index dfec33a0..d6f3bb27 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,9 +1,10 @@ server_scripts { + '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', - '@mysql-async/lib/MySQL.lua', + 'config.lua', 'server/esx_joblisting_sv.lua' } From fa85f47fd69fa2c5bf61dd2d25503e9db57cc7b8 Mon Sep 17 00:00:00 2001 From: nearbyplayer <3721216+nearbyplayer@users.noreply.github.com> Date: Thu, 17 Aug 2017 14:11:50 -0400 Subject: [PATCH 06/40] Update __resource.lua Add missing resource_manifest_version --- __resource.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__resource.lua b/__resource.lua index d6f3bb27..58be36f8 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,3 +1,5 @@ +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + server_scripts { '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', From f588707547f4af2c80dab793bd552e472a19d74f Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Thu, 17 Aug 2017 14:17:32 -0400 Subject: [PATCH 07/40] Update multi-language support --- __resource.lua | 4 ++-- client/esx_joblisting_cl.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/__resource.lua b/__resource.lua index 58be36f8..d63e1497 100644 --- a/__resource.lua +++ b/__resource.lua @@ -3,18 +3,18 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' server_scripts { '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', + 'config.lua', 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', - 'config.lua', 'server/esx_joblisting_sv.lua' } client_scripts { '@es_extended/locale.lua', + 'config.lua', 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', - 'config.lua', 'client/esx_joblisting_cl.lua' } diff --git a/client/esx_joblisting_cl.lua b/client/esx_joblisting_cl.lua index 2ae6c0a0..d4560005 100644 --- a/client/esx_joblisting_cl.lua +++ b/client/esx_joblisting_cl.lua @@ -31,7 +31,7 @@ function ShowJobListingMenu(data) ESX.UI.Menu.Open( 'default', GetCurrentResourceName(), 'joblisting', { - title = 'POLE EMPLOI', + title = _U('job_center'), elements = elements }, function(data, menu) From eb3b8f86a311c684fc17e66fe5229cbd60c15d61 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Thu, 17 Aug 2017 14:19:08 -0400 Subject: [PATCH 08/40] Update __resource.lua Removes resource_manifest_version --- __resource.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/__resource.lua b/__resource.lua index d63e1497..4c7f041d 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,5 +1,3 @@ -resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' - server_scripts { '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', From 26110d3dd1e9ea9a42fc59b588a09e0807c252eb Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Wed, 23 Aug 2017 22:58:59 -0400 Subject: [PATCH 09/40] Add Job Whitelist Credits "Jager Bom" --- server/esx_joblisting_sv.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/esx_joblisting_sv.lua b/server/esx_joblisting_sv.lua index 79533e40..af73d047 100644 --- a/server/esx_joblisting_sv.lua +++ b/server/esx_joblisting_sv.lua @@ -3,7 +3,7 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) ESX.RegisterServerCallback('esx_joblisting:getJobsList', function(source, cb) MySQL.Async.fetchAll( - 'SELECT * FROM jobs', + 'SELECT * FROM jobs WHERE whitelisted = false', {}, function(result) local data = {} From b172cd630a23b164fbd002773c6cb38f02b2ccf9 Mon Sep 17 00:00:00 2001 From: Don <30905704+ddh3@users.noreply.github.com> Date: Thu, 24 Aug 2017 21:13:31 -0700 Subject: [PATCH 10/40] added sql command to readme --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 64d5b689..8f8403dc 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,6 @@ # fxserver-esx_joblisting -FR - Pôle Emploi \ No newline at end of file +FR - Pôle Emploi + +Update SQL database for job whitelist: + +ALTER TABLE jobs add whitelist BOOLEAN NOT NULL DEFAULT FALSE; From 2164ffdec3e26174b048e084ad922636085bac26 Mon Sep 17 00:00:00 2001 From: Don <30905704+ddh3@users.noreply.github.com> Date: Thu, 24 Aug 2017 21:35:30 -0700 Subject: [PATCH 11/40] added sql command to readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8f8403dc..c2e84113 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,4 @@ FR - Pôle Emploi Update SQL database for job whitelist: -ALTER TABLE jobs add whitelist BOOLEAN NOT NULL DEFAULT FALSE; +ALTER TABLE jobs add whitelisted BOOLEAN NOT NULL DEFAULT FALSE; From 9ed46165f5e18ec06031bec68c10e335f8d7e624 Mon Sep 17 00:00:00 2001 From: ultratm Date: Sat, 26 Aug 2017 11:31:41 +0200 Subject: [PATCH 12/40] Add German Language --- __resource.lua | 2 ++ locales/de.lua | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 locales/de.lua diff --git a/__resource.lua b/__resource.lua index 4c7f041d..afa1e3f5 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,6 +2,7 @@ server_scripts { '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', 'config.lua', + 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', @@ -11,6 +12,7 @@ server_scripts { client_scripts { '@es_extended/locale.lua', 'config.lua', + 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', diff --git a/locales/de.lua b/locales/de.lua new file mode 100644 index 00000000..19032e2f --- /dev/null +++ b/locales/de.lua @@ -0,0 +1,7 @@ +Locales['de'] = { + + ['new_job'] = 'Du hast einen neuen Job!', + ['access_job_center'] = 'Drücke ~INPUT_PICKUP~ um das ~b~Arbeitsamt~s~ zu öffnen.', + ['job_center'] = 'Arbeitsamt', + +} From ee242c0b92d140c5e18f1e569a844298e69f649f Mon Sep 17 00:00:00 2001 From: Aleweadan Date: Wed, 30 Aug 2017 00:27:57 +0200 Subject: [PATCH 13/40] Update fr.lua --- locales/fr.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/fr.lua b/locales/fr.lua index 60217531..e89be8a6 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,6 +1,6 @@ Locales['fr'] = { - ['new_job'] = 'vous avez nouveau job !', + ['new_job'] = 'vous avez un nouveau job !', ['access_job_center'] = 'appuyez sur ~INPUT_PICKUP~ pour \naccéder au ~b~Pôle Emploi~s~.', ['job_center'] = 'pôle-Emploi', From d522b36f2d5815c9511fa3bde65649c0186308d1 Mon Sep 17 00:00:00 2001 From: renaiku Date: Mon, 4 Sep 2017 17:59:09 +0200 Subject: [PATCH 14/40] complete descriptions --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index c2e84113..77128d47 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,5 @@ FR - Pôle Emploi Update SQL database for job whitelist: ALTER TABLE jobs add whitelisted BOOLEAN NOT NULL DEFAULT FALSE; + +You can show (0) or hide (1) a job in the joblisting by changing the value in the DB of the field whitelisted From fcda14fe191c4e3bea8cd420ecadfa9e9eff38da Mon Sep 17 00:00:00 2001 From: Coro Veneno Date: Tue, 12 Sep 2017 22:38:54 +0200 Subject: [PATCH 15/40] Create es.lua Added Spanish Language Multi-Language --- locales/es.lua | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 locales/es.lua diff --git a/locales/es.lua b/locales/es.lua new file mode 100644 index 00000000..5b0d06bc --- /dev/null +++ b/locales/es.lua @@ -0,0 +1,7 @@ +Locales['es'] = { + + ['new_job'] = '¡Tienes un trabajo nuevo!', + ['access_job_center'] = 'Pulsa ~INPUT_PICKUP~ para entrar a la ~b~Oficina de Empleo~s~.', + ['job_center'] = 'Oficina de Empleo', + +} From 5e4dc6c082691a48406da81e79a77deeee979f59 Mon Sep 17 00:00:00 2001 From: Coro Veneno Date: Tue, 12 Sep 2017 23:04:50 +0200 Subject: [PATCH 16/40] Update Spanish Language Added Spanish Language --- __resource.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__resource.lua b/__resource.lua index afa1e3f5..7d311cf4 100644 --- a/__resource.lua +++ b/__resource.lua @@ -6,6 +6,7 @@ server_scripts { 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', + 'locales/es.lua', 'server/esx_joblisting_sv.lua' } @@ -16,5 +17,6 @@ client_scripts { 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', + 'locales/es.lua', 'client/esx_joblisting_cl.lua' } From c947b06867ff21dfca338784b4ba52ac9b49cfb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Thu, 14 Sep 2017 23:17:22 +0200 Subject: [PATCH 17/40] Update LICENSE.txt --- LICENSE.txt | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..d8ab8d4a --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + fxserver-esx_joblisting + Copyright (C) 2015 Jérémie N'gadi + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + fxserver-esx_joblisting Copyright (C) 2015 Jérémie N'gadi + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file From 26fe2f399299c26e6080a570f6c82e6401d7d709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 15 Sep 2017 15:29:25 +0200 Subject: [PATCH 18/40] chore(resource): Add version --- __resource.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__resource.lua b/__resource.lua index 7d311cf4..6590296a 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,3 +1,5 @@ +version '1.0.0' + server_scripts { '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', From d2daf7909f3f346461e63c0825ac4b098b6b1365 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 9 Apr 2018 12:13:54 +0200 Subject: [PATCH 19/40] Added manifest info, proper readme --- README.md | 12 +++++------- __resource.lua | 8 +++++++- client/esx_joblisting_cl.lua | 18 +++++++++--------- locales/sv.lua | 5 +++++ 4 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 locales/sv.lua diff --git a/README.md b/README.md index 77128d47..916dcf00 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ -# fxserver-esx_joblisting -FR - Pôle Emploi +# esx_joblisting +Simple job listing script, you can specify what jobs you want to be whitelisted. -Update SQL database for job whitelist: - -ALTER TABLE jobs add whitelisted BOOLEAN NOT NULL DEFAULT FALSE; - -You can show (0) or hide (1) a job in the joblisting by changing the value in the DB of the field whitelisted +### Update +If you have an outdated version of ES Extended, you might need to run the following on your SQL server: +`ALTER TABLE jobs add whitelisted BOOLEAN NOT NULL DEFAULT FALSE;` diff --git a/__resource.lua b/__resource.lua index 6590296a..ad917bb0 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,4 +1,8 @@ -version '1.0.0' +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + +description 'ESX Job Listing' + +version '1.1.0' server_scripts { '@mysql-async/lib/MySQL.lua', @@ -9,6 +13,7 @@ server_scripts { 'locales/en.lua', 'locales/fr.lua', 'locales/es.lua', + 'locales/sv.lua', 'server/esx_joblisting_sv.lua' } @@ -20,5 +25,6 @@ client_scripts { 'locales/en.lua', 'locales/fr.lua', 'locales/es.lua', + 'locales/sv.lua', 'client/esx_joblisting_cl.lua' } diff --git a/client/esx_joblisting_cl.lua b/client/esx_joblisting_cl.lua index d4560005..c294fcd1 100644 --- a/client/esx_joblisting_cl.lua +++ b/client/esx_joblisting_cl.lua @@ -2,10 +2,10 @@ local Keys = { ["ESC"] = 322, ["BACKSPACE"] = 177, ["E"] = 38, ["ENTER"] = 18, ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173 } -local menuIsShowed = false -local hasAlreadyEnteredMarker = false -local lastZone = nil -local isInJoblistingMarker = false +local menuIsShowed = false +local hasAlreadyEnteredMarker = false +local lastZone = nil +local isInJoblistingMarker = false ESX = nil @@ -54,7 +54,7 @@ end) -- Display markers Citizen.CreateThread(function() while true do - Wait(0) + Citizen.Wait(10) local coords = GetEntityCoords(GetPlayerPed(-1)) for i=1, #Config.Zones, 1 do if(GetDistanceBetweenCoords(coords, Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z, true) < Config.DrawDistance) then @@ -67,7 +67,7 @@ end) -- Activate menu when player is inside marker Citizen.CreateThread(function() while true do - Wait(0) + Citizen.Wait(10) local coords = GetEntityCoords(GetPlayerPed(-1)) isInJoblistingMarker = false local currentZone = nil @@ -75,8 +75,8 @@ Citizen.CreateThread(function() if(GetDistanceBetweenCoords(coords, Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z, true) < Config.ZoneSize.x / 2) then isInJoblistingMarker = true SetTextComponentFormat('STRING') - AddTextComponentString(_U('access_job_center')) - DisplayHelpTextFromStringLabel(0, 0, 1, -1) + AddTextComponentString(_U('access_job_center')) + DisplayHelpTextFromStringLabel(0, 0, 1, -1) end end if isInJoblistingMarker and not hasAlreadyEnteredMarker then @@ -107,7 +107,7 @@ end) -- Menu Controls Citizen.CreateThread(function() while true do - Wait(0) + Citizen.Wait(10) if IsControlJustReleased(0, Keys['E']) and isInJoblistingMarker and not menuIsShowed then ShowJobListingMenu() end diff --git a/locales/sv.lua b/locales/sv.lua new file mode 100644 index 00000000..170a1b3c --- /dev/null +++ b/locales/sv.lua @@ -0,0 +1,5 @@ +Locales['sv'] = { + ['new_job'] = 'du har ett nytt jobb! ~y~Tips:~s~ kolla kartan för nya blips.', + ['access_job_center'] = 'tryck ~INPUT_PICKUP~ för att se ~b~arbetsförmedlingen~s~', + ['job_center'] = 'arbetsförmedlingen', +} From e34490d58ae2ce25deef4b3479d0fbc2cee0f1ea Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 30 Apr 2018 16:36:43 +0200 Subject: [PATCH 20/40] Improvements to README, minor stuff --- README.md | 36 ++++++++++++++++++++++ __resource.lua | 4 +-- client/{esx_joblisting_cl.lua => main.lua} | 26 ++++++++-------- config.lua | 2 +- server/{esx_joblisting_sv.lua => main.lua} | 0 5 files changed, 51 insertions(+), 17 deletions(-) rename client/{esx_joblisting_cl.lua => main.lua} (89%) rename server/{esx_joblisting_sv.lua => main.lua} (100%) diff --git a/README.md b/README.md index 916dcf00..ec1b6e26 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,40 @@ Simple job listing script, you can specify what jobs you want to be whitelisted. ### Update If you have an outdated version of ES Extended, you might need to run the following on your SQL server: + `ALTER TABLE jobs add whitelisted BOOLEAN NOT NULL DEFAULT FALSE;` + +## Download & Installation + +### Using [fvm](https://github.com/qlaffont/fvm-installer) +``` +fvm install --save --folder=esx esx-org/esx_joblisting +``` + +### Using Git +``` +cd resources +git clone https://github.com/ESX-Org/esx_joblisting [esx]/esx_joblisting +``` + +### Manually +- Download https://github.com/ESX-Org/esx_joblisting/archive/master.zip +- Put it in the `[esx]` directory + +- Add this in your `server.cfg`: + +``` +start esx_joblisting +``` + +# Legal +### License +esx_joblisting - job listing script + +Copyright (C) 2015-2018 Jérémie N'gadi + +This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. + +This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details. + +You should have received a copy Of the GNU General Public License along with this program. If Not, see http://www.gnu.org/licenses/. diff --git a/__resource.lua b/__resource.lua index ad917bb0..08b13f3b 100644 --- a/__resource.lua +++ b/__resource.lua @@ -14,7 +14,7 @@ server_scripts { 'locales/fr.lua', 'locales/es.lua', 'locales/sv.lua', - 'server/esx_joblisting_sv.lua' + 'server/main.lua' } client_scripts { @@ -26,5 +26,5 @@ client_scripts { 'locales/fr.lua', 'locales/es.lua', 'locales/sv.lua', - 'client/esx_joblisting_cl.lua' + 'client/main.lua' } diff --git a/client/esx_joblisting_cl.lua b/client/main.lua similarity index 89% rename from client/esx_joblisting_cl.lua rename to client/main.lua index c294fcd1..2506b8c2 100644 --- a/client/esx_joblisting_cl.lua +++ b/client/main.lua @@ -29,20 +29,18 @@ function ShowJobListingMenu(data) ESX.UI.Menu.CloseAll() ESX.UI.Menu.Open( - 'default', GetCurrentResourceName(), 'joblisting', - { - title = _U('job_center'), - elements = elements - }, - function(data, menu) - TriggerServerEvent('esx_joblisting:setJob', data.current.value) - ESX.ShowNotification(_U('new_job')) - menu.close() - end, - function(data, menu) - menu.close() - end - ) + 'default', GetCurrentResourceName(), 'joblisting', + { + title = _U('job_center'), + align = 'top-left', + elements = elements + }, function(data, menu) + TriggerServerEvent('esx_joblisting:setJob', data.current.value) + ESX.ShowNotification(_U('new_job')) + menu.close() + end, function(data, menu) + menu.close() + end) end) end diff --git a/config.lua b/config.lua index 8648b3db..83c8435e 100644 --- a/config.lua +++ b/config.lua @@ -3,7 +3,7 @@ Config.DrawDistance = 100.0 Config.ZoneSize = {x = 3.0, y = 3.0, z = 2.0} Config.MarkerColor = {r = 100, g = 100, b = 204} Config.MarkerType = 1 -Config.Locale = 'fr' +Config.Locale = 'en' Config.Zones = { {x = -265.036, y = -963.630, z = 30.223} diff --git a/server/esx_joblisting_sv.lua b/server/main.lua similarity index 100% rename from server/esx_joblisting_sv.lua rename to server/main.lua From 699b7eb420fd3d4cad713e9f78969a18deac70aa Mon Sep 17 00:00:00 2001 From: AdrineX Date: Tue, 12 Jun 2018 23:34:00 +0300 Subject: [PATCH 21/40] add Finnish lang... --- __resource.lua | 2 ++ locales/fi.lua | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 locales/fi.lua diff --git a/__resource.lua b/__resource.lua index 08b13f3b..a29f912f 100644 --- a/__resource.lua +++ b/__resource.lua @@ -11,6 +11,7 @@ server_scripts { 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', + 'locales/fi.lua', 'locales/fr.lua', 'locales/es.lua', 'locales/sv.lua', @@ -23,6 +24,7 @@ client_scripts { 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', + 'locales/fi.lua', 'locales/fr.lua', 'locales/es.lua', 'locales/sv.lua', diff --git a/locales/fi.lua b/locales/fi.lua new file mode 100644 index 00000000..df17487d --- /dev/null +++ b/locales/fi.lua @@ -0,0 +1,7 @@ +Locales['fi'] = { + + ['new_job'] = 'Sinulla on nyt uusi työ !', + ['access_job_center'] = 'paina ~INPUT_PICKUP~ vaihtaaksesi työtä ~b~työkeskuksessa~s~.', + ['job_center'] = 'työkeskus', + +} From eac73092e08b2af91f0ab9b115b3da60c3dd57d0 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 23 Jun 2018 11:51:09 +0200 Subject: [PATCH 22/40] Added missing SQL information --- README.md | 9 +++------ esx_joblisting.sql | 3 +++ 2 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 esx_joblisting.sql diff --git a/README.md b/README.md index ec1b6e26..c1fd14aa 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,5 @@ # esx_joblisting -Simple job listing script, you can specify what jobs you want to be whitelisted. - -### Update -If you have an outdated version of ES Extended, you might need to run the following on your SQL server: - -`ALTER TABLE jobs add whitelisted BOOLEAN NOT NULL DEFAULT FALSE;` +Simple job listing script, you can specify what jobs you want to be whitelisted in db. ## Download & Installation @@ -23,6 +18,8 @@ git clone https://github.com/ESX-Org/esx_joblisting [esx]/esx_joblisting - Download https://github.com/ESX-Org/esx_joblisting/archive/master.zip - Put it in the `[esx]` directory +## Installation +- Import `esx_joblisting.sql` in your database - Add this in your `server.cfg`: ``` diff --git a/esx_joblisting.sql b/esx_joblisting.sql new file mode 100644 index 00000000..f5f134f6 --- /dev/null +++ b/esx_joblisting.sql @@ -0,0 +1,3 @@ +USE `essentialmode`; + +ALTER TABLE jobs add whitelisted BOOLEAN NOT NULL DEFAULT FALSE; \ No newline at end of file From e086f7de4576041e1d2c709a9371199f5a6a580a Mon Sep 17 00:00:00 2001 From: deviljin112 <39461646+deviljin112@users.noreply.github.com> Date: Mon, 23 Jul 2018 22:30:17 +0100 Subject: [PATCH 23/40] Polish Translation --- __resource.lua | 2 ++ locales/pl.lua | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 locales/pl.lua diff --git a/__resource.lua b/__resource.lua index a29f912f..8d8c4b39 100644 --- a/__resource.lua +++ b/__resource.lua @@ -15,6 +15,7 @@ server_scripts { 'locales/fr.lua', 'locales/es.lua', 'locales/sv.lua', + 'locales/pl.lua', 'server/main.lua' } @@ -28,5 +29,6 @@ client_scripts { 'locales/fr.lua', 'locales/es.lua', 'locales/sv.lua', + 'locales/pl.lua', 'client/main.lua' } diff --git a/locales/pl.lua b/locales/pl.lua new file mode 100644 index 00000000..b32cf870 --- /dev/null +++ b/locales/pl.lua @@ -0,0 +1,7 @@ +Locales['pl'] = { + + ['new_job'] = 'masz nową pracę!', + ['access_job_center'] = 'wciśnij ~INPUT_PICKUP~ aby otworzyć ~b~urząd pracy~s~.', + ['job_center'] = 'urząd Pracy', + +} From c927a228f59b8fcb1c0515d5ae7d441b761bf829 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Fri, 10 Aug 2018 00:53:52 -0400 Subject: [PATCH 24/40] Repo Update --- .editorconfig | 9 +++++++++ LICENSE.txt => LICENSE | 0 2 files changed, 9 insertions(+) create mode 100644 .editorconfig rename LICENSE.txt => LICENSE (100%) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..9b425256 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +indent_size = 4 +indent_style = tab +end_of_line = crlf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE From 5fda6fa6724d22391eaffc3f901c19103e2ace2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rychl=C3=BD?= Date: Sat, 18 Aug 2018 08:34:02 +0200 Subject: [PATCH 25/40] Add of Czech translate --- __resource.lua | 2 ++ locales/cs.lua | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 locales/cs.lua diff --git a/__resource.lua b/__resource.lua index a29f912f..6fe9df3f 100644 --- a/__resource.lua +++ b/__resource.lua @@ -15,6 +15,7 @@ server_scripts { 'locales/fr.lua', 'locales/es.lua', 'locales/sv.lua', + 'locales/cs.lua', 'server/main.lua' } @@ -28,5 +29,6 @@ client_scripts { 'locales/fr.lua', 'locales/es.lua', 'locales/sv.lua', + 'locales/cs.lua', 'client/main.lua' } diff --git a/locales/cs.lua b/locales/cs.lua new file mode 100644 index 00000000..332a4510 --- /dev/null +++ b/locales/cs.lua @@ -0,0 +1,7 @@ +Locales['cs'] = { + + ['new_job'] = 'máte novou práci!', + ['access_job_center'] = 'zmáčkněte ~INPUT_PICKUP~ pro přísutp na ~b~Úřad práce~s~.', + ['job_center'] = 'úřad práce', + +} From d131442fc3e4c68149d653c9c1d3b7e0702bc31b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rychl=C3=BD?= Date: Sat, 18 Aug 2018 09:03:26 +0200 Subject: [PATCH 26/40] Czech translate typo fix --- locales/cs.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/cs.lua b/locales/cs.lua index 332a4510..aaa5aef3 100644 --- a/locales/cs.lua +++ b/locales/cs.lua @@ -1,7 +1,7 @@ Locales['cs'] = { ['new_job'] = 'máte novou práci!', - ['access_job_center'] = 'zmáčkněte ~INPUT_PICKUP~ pro přísutp na ~b~Úřad práce~s~.', + ['access_job_center'] = 'zmáčkněte ~INPUT_PICKUP~ pro přístup na ~b~Úřad práce~s~.', ['job_center'] = 'úřad práce', } From a54b53de7d8d43239dc0f9d9b45926d8145aa721 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 19 Aug 2018 12:48:53 +0200 Subject: [PATCH 27/40] Fixed exploiting the setJob event, closes #12 --- __resource.lua | 2 ++ client/main.lua | 16 +++++++--------- server/main.lua | 41 ++++++++++++++++++++++++++--------------- 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/__resource.lua b/__resource.lua index a29f912f..a0947dbf 100644 --- a/__resource.lua +++ b/__resource.lua @@ -30,3 +30,5 @@ client_scripts { 'locales/sv.lua', 'client/main.lua' } + +dependency 'es_extended' diff --git a/client/main.lua b/client/main.lua index 2506b8c2..97b3c22f 100644 --- a/client/main.lua +++ b/client/main.lua @@ -19,11 +19,9 @@ end) function ShowJobListingMenu(data) ESX.TriggerServerCallback('esx_joblisting:getJobsList', function(data) local elements = {} + for i = 1, #data, 1 do - table.insert( - elements, - {label = data[i].label, value = data[i].value} - ) + table.insert(elements, {label = data[i].label, value = data[i].value}) end ESX.UI.Menu.CloseAll() @@ -52,7 +50,7 @@ end) -- Display markers Citizen.CreateThread(function() while true do - Citizen.Wait(10) + Citizen.Wait(1) local coords = GetEntityCoords(GetPlayerPed(-1)) for i=1, #Config.Zones, 1 do if(GetDistanceBetweenCoords(coords, Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z, true) < Config.DrawDistance) then @@ -65,10 +63,10 @@ end) -- Activate menu when player is inside marker Citizen.CreateThread(function() while true do - Citizen.Wait(10) - local coords = GetEntityCoords(GetPlayerPed(-1)) - isInJoblistingMarker = false - local currentZone = nil + Citizen.Wait(1) + local coords = GetEntityCoords(GetPlayerPed(-1)) + isInJoblistingMarker = false + local currentZone = nil for i=1, #Config.Zones, 1 do if(GetDistanceBetweenCoords(coords, Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z, true) < Config.ZoneSize.x / 2) then isInJoblistingMarker = true diff --git a/server/main.lua b/server/main.lua index af73d047..b83dbc64 100644 --- a/server/main.lua +++ b/server/main.lua @@ -2,25 +2,36 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) ESX.RegisterServerCallback('esx_joblisting:getJobsList', function(source, cb) - MySQL.Async.fetchAll( - 'SELECT * FROM jobs WHERE whitelisted = false', - {}, - function(result) - local data = {} - for i=1, #result, 1 do - table.insert(data, { - value = result[i].name, - label = result[i].label - }) - end - cb(data) + MySQL.Async.fetchAll('SELECT * FROM jobs WHERE whitelisted = @whitelisted', { + ['@whitelisted'] = false + }, function(result) + local data = {} + + for i=1, #result, 1 do + table.insert(data, { + value = result[i].name, + label = result[i].label + }) end - ) + + cb(data) + end) end) RegisterServerEvent('esx_joblisting:setJob') AddEventHandler('esx_joblisting:setJob', function(job) local _source = source local xPlayer = ESX.GetPlayerFromId(_source) - xPlayer.setJob(job, 0) -end) \ No newline at end of file + + MySQL.Async.fetchAll('SELECT whitelisted FROM jobs WHERE name = @name', { + ['@name'] = job, + }, function(result) + if not result[1].whitelisted then + xPlayer.setJob(job, 0) + else + print(('esx_joblisting: %s attempted to set a whitelisted job! (lua injector)'):format(xPlayer.identifier)) + end + + end) + +end) From fc1920a474d94613adc7f994f3ab2df87ac18a2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rychl=C3=BD?= Date: Fri, 9 Nov 2018 16:57:11 +0100 Subject: [PATCH 28/40] Czech diacritic temp remove Solves https://github.com/rp-esx-fivem/esx_joblisting/issues/2 --- locales/cs.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/cs.lua b/locales/cs.lua index aaa5aef3..d089e3fb 100644 --- a/locales/cs.lua +++ b/locales/cs.lua @@ -1,7 +1,7 @@ Locales['cs'] = { - ['new_job'] = 'máte novou práci!', - ['access_job_center'] = 'zmáčkněte ~INPUT_PICKUP~ pro přístup na ~b~Úřad práce~s~.', - ['job_center'] = 'úřad práce', + ['new_job'] = 'mate novou praci!', + ['access_job_center'] = 'stiskni ~INPUT_PICKUP~ pro pristup na ~b~Urad prace~s~.', + ['job_center'] = 'Urad prace', } From c915b1b5e3332eebfb174fe95fc2c766dcbd7bdd Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 4 Dec 2018 19:43:58 +0100 Subject: [PATCH 29/40] Minor cleanup --- client/main.lua | 37 ++++++++++++++++++++----------------- server/main.lua | 4 ++-- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/client/main.lua b/client/main.lua index 97b3c22f..f7d8ca12 100644 --- a/client/main.lua +++ b/client/main.lua @@ -16,24 +16,23 @@ Citizen.CreateThread(function() end end) -function ShowJobListingMenu(data) +function ShowJobListingMenu() ESX.TriggerServerCallback('esx_joblisting:getJobsList', function(data) local elements = {} for i = 1, #data, 1 do - table.insert(elements, {label = data[i].label, value = data[i].value}) + table.insert(elements, { + label = data[i].label, + job = data[i].job + }) end - ESX.UI.Menu.CloseAll() - - ESX.UI.Menu.Open( - 'default', GetCurrentResourceName(), 'joblisting', - { + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'joblisting', { title = _U('job_center'), align = 'top-left', elements = elements }, function(data, menu) - TriggerServerEvent('esx_joblisting:setJob', data.current.value) + TriggerServerEvent('esx_joblisting:setJob', data.current.job) ESX.ShowNotification(_U('new_job')) menu.close() end, function(data, menu) @@ -51,9 +50,9 @@ end) Citizen.CreateThread(function() while true do Citizen.Wait(1) - local coords = GetEntityCoords(GetPlayerPed(-1)) + local coords = GetEntityCoords(PlayerPedId()) for i=1, #Config.Zones, 1 do - if(GetDistanceBetweenCoords(coords, Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z, true) < Config.DrawDistance) then + if GetDistanceBetweenCoords(coords, Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z, true) < Config.DrawDistance then DrawMarker(Config.MarkerType, Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.ZoneSize.x, Config.ZoneSize.y, Config.ZoneSize.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false) end end @@ -64,20 +63,20 @@ end) Citizen.CreateThread(function() while true do Citizen.Wait(1) - local coords = GetEntityCoords(GetPlayerPed(-1)) - isInJoblistingMarker = false - local currentZone = nil + + local coords, isInJoblistingMarker, currentZone = GetEntityCoords(PlayerPedId()), false, nil + for i=1, #Config.Zones, 1 do - if(GetDistanceBetweenCoords(coords, Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z, true) < Config.ZoneSize.x / 2) then + if GetDistanceBetweenCoords(coords, Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z, true) < (Config.ZoneSize.x / 2) then isInJoblistingMarker = true - SetTextComponentFormat('STRING') - AddTextComponentString(_U('access_job_center')) - DisplayHelpTextFromStringLabel(0, 0, 1, -1) + ESX.ShowHelpNotification(_U('access_job_center')) end end + if isInJoblistingMarker and not hasAlreadyEnteredMarker then hasAlreadyEnteredMarker = true end + if not isInJoblistingMarker and hasAlreadyEnteredMarker then hasAlreadyEnteredMarker = false TriggerEvent('esx_joblisting:hasExitedMarker') @@ -89,11 +88,13 @@ end) Citizen.CreateThread(function() for i=1, #Config.Zones, 1 do local blip = AddBlipForCoord(Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z) + SetBlipSprite (blip, 407) SetBlipDisplay(blip, 4) SetBlipScale (blip, 1.2) SetBlipColour (blip, 27) SetBlipAsShortRange(blip, true) + BeginTextCommandSetBlipName("STRING") AddTextComponentString(_U('job_center')) EndTextCommandSetBlipName(blip) @@ -104,7 +105,9 @@ end) Citizen.CreateThread(function() while true do Citizen.Wait(10) + if IsControlJustReleased(0, Keys['E']) and isInJoblistingMarker and not menuIsShowed then + ESX.UI.Menu.CloseAll() ShowJobListingMenu() end end diff --git a/server/main.lua b/server/main.lua index b83dbc64..3802ae40 100644 --- a/server/main.lua +++ b/server/main.lua @@ -9,8 +9,8 @@ ESX.RegisterServerCallback('esx_joblisting:getJobsList', function(source, cb) for i=1, #result, 1 do table.insert(data, { - value = result[i].name, - label = result[i].label + job = result[i].name, + label = result[i].label }) end From a3f312e50525f4a7fe2c8a80a60fe0fbce36d2ab Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Fri, 7 Dec 2018 20:29:33 +0100 Subject: [PATCH 30/40] Fixed menu not opening --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index f7d8ca12..f1952928 100644 --- a/client/main.lua +++ b/client/main.lua @@ -64,7 +64,7 @@ Citizen.CreateThread(function() while true do Citizen.Wait(1) - local coords, isInJoblistingMarker, currentZone = GetEntityCoords(PlayerPedId()), false, nil + local coords, currentZone = GetEntityCoords(PlayerPedId()), nil for i=1, #Config.Zones, 1 do if GetDistanceBetweenCoords(coords, Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z, true) < (Config.ZoneSize.x / 2) then From 20eb4f5a7e8a5eef4b94ae8bb7b094cda1aa7c07 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 23 Dec 2018 17:27:07 +0100 Subject: [PATCH 31/40] vector3, fixes #18 --- client/main.lua | 37 +++++++++++++++++++------------------ config.lua | 8 +++++--- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/client/main.lua b/client/main.lua index f1952928..d0552212 100644 --- a/client/main.lua +++ b/client/main.lua @@ -2,10 +2,9 @@ local Keys = { ["ESC"] = 322, ["BACKSPACE"] = 177, ["E"] = 38, ["ENTER"] = 18, ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173 } -local menuIsShowed = false -local hasAlreadyEnteredMarker = false -local lastZone = nil -local isInJoblistingMarker = false +local menuIsShowed = false +local hasAlreadyEnteredMarker = false +local isInMarker = false ESX = nil @@ -17,13 +16,13 @@ Citizen.CreateThread(function() end) function ShowJobListingMenu() - ESX.TriggerServerCallback('esx_joblisting:getJobsList', function(data) + ESX.TriggerServerCallback('esx_joblisting:getJobsList', function(jobs) local elements = {} - for i = 1, #data, 1 do + for i=1, #jobs, 1 do table.insert(elements, { - label = data[i].label, - job = data[i].job + label = jobs[i].label, + job = jobs[i].job }) end @@ -51,9 +50,10 @@ Citizen.CreateThread(function() while true do Citizen.Wait(1) local coords = GetEntityCoords(PlayerPedId()) + for i=1, #Config.Zones, 1 do - if GetDistanceBetweenCoords(coords, Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z, true) < Config.DrawDistance then - DrawMarker(Config.MarkerType, Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.ZoneSize.x, Config.ZoneSize.y, Config.ZoneSize.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false) + if GetDistanceBetweenCoords(coords, Config.Zones[i], true) < Config.DrawDistance then + DrawMarker(Config.MarkerType, Config.Zones[i], 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.ZoneSize.x, Config.ZoneSize.y, Config.ZoneSize.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false) end end end @@ -64,20 +64,21 @@ Citizen.CreateThread(function() while true do Citizen.Wait(1) - local coords, currentZone = GetEntityCoords(PlayerPedId()), nil + local coords = GetEntityCoords(PlayerPedId()) + isInMarker = false for i=1, #Config.Zones, 1 do - if GetDistanceBetweenCoords(coords, Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z, true) < (Config.ZoneSize.x / 2) then - isInJoblistingMarker = true + if GetDistanceBetweenCoords(coords, Config.Zones[i], true) < (Config.ZoneSize.x / 2) then + isInMarker = true ESX.ShowHelpNotification(_U('access_job_center')) end end - if isInJoblistingMarker and not hasAlreadyEnteredMarker then + if isInMarker and not hasAlreadyEnteredMarker then hasAlreadyEnteredMarker = true end - if not isInJoblistingMarker and hasAlreadyEnteredMarker then + if not isInMarker and hasAlreadyEnteredMarker then hasAlreadyEnteredMarker = false TriggerEvent('esx_joblisting:hasExitedMarker') end @@ -87,7 +88,7 @@ end) -- Create blips Citizen.CreateThread(function() for i=1, #Config.Zones, 1 do - local blip = AddBlipForCoord(Config.Zones[i].x, Config.Zones[i].y, Config.Zones[i].z) + local blip = AddBlipForCoord(Config.Zones[i]) SetBlipSprite (blip, 407) SetBlipDisplay(blip, 4) @@ -96,7 +97,7 @@ Citizen.CreateThread(function() SetBlipAsShortRange(blip, true) BeginTextCommandSetBlipName("STRING") - AddTextComponentString(_U('job_center')) + AddTextComponentSubstringPlayerName(_U('job_center')) EndTextCommandSetBlipName(blip) end end) @@ -106,7 +107,7 @@ Citizen.CreateThread(function() while true do Citizen.Wait(10) - if IsControlJustReleased(0, Keys['E']) and isInJoblistingMarker and not menuIsShowed then + if IsControlJustReleased(0, Keys['E']) and isInMarker and not menuIsShowed then ESX.UI.Menu.CloseAll() ShowJobListingMenu() end diff --git a/config.lua b/config.lua index 83c8435e..0f657dd6 100644 --- a/config.lua +++ b/config.lua @@ -1,10 +1,12 @@ Config = {} + Config.DrawDistance = 100.0 -Config.ZoneSize = {x = 3.0, y = 3.0, z = 2.0} +Config.ZoneSize = {x = 3.0, y = 3.0, z = 0.5} Config.MarkerColor = {r = 100, g = 100, b = 204} Config.MarkerType = 1 -Config.Locale = 'en' + +Config.Locale = 'fr' Config.Zones = { - {x = -265.036, y = -963.630, z = 30.223} + vector3(-265.0, -963.6, 30.2) } From e7bbc43c045e9cac5ea9b41a0fd082bc3a6b8cd0 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 23 Dec 2018 17:30:48 +0100 Subject: [PATCH 32/40] Enforced 2 space indent on locale files --- locales/br.lua | 8 +++----- locales/cs.lua | 8 +++----- locales/de.lua | 8 +++----- locales/en.lua | 8 +++----- locales/es.lua | 8 +++----- locales/fi.lua | 8 +++----- locales/fr.lua | 8 +++----- locales/pl.lua | 8 +++----- locales/sv.lua | 6 +++--- 9 files changed, 27 insertions(+), 43 deletions(-) diff --git a/locales/br.lua b/locales/br.lua index 993f1630..f5a559bf 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,7 +1,5 @@ Locales['br'] = { - - ['new_job'] = 'Você agora tem um novo emprego!', - ['access_job_center'] = 'Pressione ~INPUT_PICKUP~ para acessar a ~b~Lista de Empregos~s~.', - ['job_center'] = 'Agência de Empregos', - + ['new_job'] = 'Você agora tem um novo emprego!', + ['access_job_center'] = 'Pressione ~INPUT_PICKUP~ para acessar a ~b~Lista de Empregos~s~.', + ['job_center'] = 'Agência de Empregos', } diff --git a/locales/cs.lua b/locales/cs.lua index d089e3fb..1d486544 100644 --- a/locales/cs.lua +++ b/locales/cs.lua @@ -1,7 +1,5 @@ Locales['cs'] = { - - ['new_job'] = 'mate novou praci!', - ['access_job_center'] = 'stiskni ~INPUT_PICKUP~ pro pristup na ~b~Urad prace~s~.', - ['job_center'] = 'Urad prace', - + ['new_job'] = 'mate novou praci!', + ['access_job_center'] = 'stiskni ~INPUT_PICKUP~ pro pristup na ~b~Urad prace~s~.', + ['job_center'] = 'Urad prace', } diff --git a/locales/de.lua b/locales/de.lua index 19032e2f..a2a73d42 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,7 +1,5 @@ Locales['de'] = { - - ['new_job'] = 'Du hast einen neuen Job!', - ['access_job_center'] = 'Drücke ~INPUT_PICKUP~ um das ~b~Arbeitsamt~s~ zu öffnen.', - ['job_center'] = 'Arbeitsamt', - + ['new_job'] = 'Du hast einen neuen Job!', + ['access_job_center'] = 'Drücke ~INPUT_PICKUP~ um das ~b~Arbeitsamt~s~ zu öffnen.', + ['job_center'] = 'Arbeitsamt', } diff --git a/locales/en.lua b/locales/en.lua index a07a80a2..8951c026 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,7 +1,5 @@ Locales['en'] = { - - ['new_job'] = 'you have a new job!', - ['access_job_center'] = 'press ~INPUT_PICKUP~ to access the ~b~job center~s~.', - ['job_center'] = 'job Center', - + ['new_job'] = 'you have a new job!', + ['access_job_center'] = 'press ~INPUT_PICKUP~ to access the ~b~job center~s~.', + ['job_center'] = 'job Center', } diff --git a/locales/es.lua b/locales/es.lua index 5b0d06bc..5f7c5e36 100644 --- a/locales/es.lua +++ b/locales/es.lua @@ -1,7 +1,5 @@ Locales['es'] = { - - ['new_job'] = '¡Tienes un trabajo nuevo!', - ['access_job_center'] = 'Pulsa ~INPUT_PICKUP~ para entrar a la ~b~Oficina de Empleo~s~.', - ['job_center'] = 'Oficina de Empleo', - + ['new_job'] = '¡Tienes un trabajo nuevo!', + ['access_job_center'] = 'Pulsa ~INPUT_PICKUP~ para entrar a la ~b~Oficina de Empleo~s~.', + ['job_center'] = 'Oficina de Empleo', } diff --git a/locales/fi.lua b/locales/fi.lua index df17487d..78bf4e09 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -1,7 +1,5 @@ Locales['fi'] = { - - ['new_job'] = 'Sinulla on nyt uusi työ !', - ['access_job_center'] = 'paina ~INPUT_PICKUP~ vaihtaaksesi työtä ~b~työkeskuksessa~s~.', - ['job_center'] = 'työkeskus', - + ['new_job'] = 'Sinulla on nyt uusi työ !', + ['access_job_center'] = 'paina ~INPUT_PICKUP~ vaihtaaksesi työtä ~b~työkeskuksessa~s~.', + ['job_center'] = 'työkeskus', } diff --git a/locales/fr.lua b/locales/fr.lua index e89be8a6..3d0d6a3c 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,7 +1,5 @@ Locales['fr'] = { - - ['new_job'] = 'vous avez un nouveau job !', - ['access_job_center'] = 'appuyez sur ~INPUT_PICKUP~ pour \naccéder au ~b~Pôle Emploi~s~.', - ['job_center'] = 'pôle-Emploi', - + ['new_job'] = 'vous avez un nouveau job !', + ['access_job_center'] = 'appuyez sur ~INPUT_PICKUP~ pour \naccéder au ~b~Pôle Emploi~s~.', + ['job_center'] = 'pôle-Emploi', } diff --git a/locales/pl.lua b/locales/pl.lua index b32cf870..01d4c383 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -1,7 +1,5 @@ Locales['pl'] = { - - ['new_job'] = 'masz nową pracę!', - ['access_job_center'] = 'wciśnij ~INPUT_PICKUP~ aby otworzyć ~b~urząd pracy~s~.', - ['job_center'] = 'urząd Pracy', - + ['new_job'] = 'masz nową pracę!', + ['access_job_center'] = 'wciśnij ~INPUT_PICKUP~ aby otworzyć ~b~urząd pracy~s~.', + ['job_center'] = 'urząd Pracy', } diff --git a/locales/sv.lua b/locales/sv.lua index 170a1b3c..5d668420 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,5 +1,5 @@ Locales['sv'] = { - ['new_job'] = 'du har ett nytt jobb! ~y~Tips:~s~ kolla kartan för nya blips.', - ['access_job_center'] = 'tryck ~INPUT_PICKUP~ för att se ~b~arbetsförmedlingen~s~', - ['job_center'] = 'arbetsförmedlingen', + ['new_job'] = 'du har ett nytt jobb! ~y~Tips:~s~ kolla kartan för nya blips.', + ['access_job_center'] = 'tryck ~INPUT_PICKUP~ för att öppna ~b~arbetsförmedlingen~s~', + ['job_center'] = 'arbetsförmedlingen', } From a6d6b6deebc2d83005d5ed3b26d57b6d52d48816 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Fri, 28 Dec 2018 17:46:49 +0100 Subject: [PATCH 33/40] Only get distance once --- client/main.lua | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/client/main.lua b/client/main.lua index d0552212..42f5ec2f 100644 --- a/client/main.lua +++ b/client/main.lua @@ -45,21 +45,7 @@ AddEventHandler('esx_joblisting:hasExitedMarker', function(zone) ESX.UI.Menu.CloseAll() end) --- Display markers -Citizen.CreateThread(function() - while true do - Citizen.Wait(1) - local coords = GetEntityCoords(PlayerPedId()) - - for i=1, #Config.Zones, 1 do - if GetDistanceBetweenCoords(coords, Config.Zones[i], true) < Config.DrawDistance then - DrawMarker(Config.MarkerType, Config.Zones[i], 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.ZoneSize.x, Config.ZoneSize.y, Config.ZoneSize.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false) - end - end - end -end) - --- Activate menu when player is inside marker +-- Activate menu when player is inside marker, and draw markers Citizen.CreateThread(function() while true do Citizen.Wait(1) @@ -68,7 +54,13 @@ Citizen.CreateThread(function() isInMarker = false for i=1, #Config.Zones, 1 do - if GetDistanceBetweenCoords(coords, Config.Zones[i], true) < (Config.ZoneSize.x / 2) then + local distance = GetDistanceBetweenCoords(coords, Config.Zones[i], true) + + if distance < Config.DrawDistance then + DrawMarker(Config.MarkerType, Config.Zones[i], 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.ZoneSize.x, Config.ZoneSize.y, Config.ZoneSize.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false) + end + + if distance < (Config.ZoneSize.x / 2) then isInMarker = true ESX.ShowHelpNotification(_U('access_job_center')) end From 0d2f0ac8497df738070b0121591a25abb9754a15 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 30 Dec 2018 21:34:19 +0100 Subject: [PATCH 34/40] Check IsControlJustReleased() every frame --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index 42f5ec2f..a9101d0f 100644 --- a/client/main.lua +++ b/client/main.lua @@ -97,7 +97,7 @@ end) -- Menu Controls Citizen.CreateThread(function() while true do - Citizen.Wait(10) + Citizen.Wait(0) if IsControlJustReleased(0, Keys['E']) and isInMarker and not menuIsShowed then ESX.UI.Menu.CloseAll() From 92c5b103438138f6fb0066ae41ffcd54c868f9a1 Mon Sep 17 00:00:00 2001 From: Tinky <48660658+Tinky124@users.noreply.github.com> Date: Tue, 19 Nov 2019 20:46:01 +0100 Subject: [PATCH 35/40] Removed local keys --- client/main.lua | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/client/main.lua b/client/main.lua index a9101d0f..af8971f3 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,11 +1,4 @@ -local Keys = { - ["ESC"] = 322, ["BACKSPACE"] = 177, ["E"] = 38, ["ENTER"] = 18, ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173 -} - -local menuIsShowed = false -local hasAlreadyEnteredMarker = false -local isInMarker = false - +local menuIsShowed, hasAlreadyEnteredMarker, isInMarker = false, false, false ESX = nil Citizen.CreateThread(function() @@ -99,7 +92,7 @@ Citizen.CreateThread(function() while true do Citizen.Wait(0) - if IsControlJustReleased(0, Keys['E']) and isInMarker and not menuIsShowed then + if IsControlJustReleased(0, 38) and isInMarker and not menuIsShowed then ESX.UI.Menu.CloseAll() ShowJobListingMenu() end From 00b5a75d4f5e413516e4ae0084cc956a1e08ce78 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 4 Jan 2020 12:56:46 +0100 Subject: [PATCH 36/40] Minor server sided code improvement, fixed #14 --- README.md | 3 ++- server/main.lua | 36 +++++++++++++++++------------------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index c1fd14aa..ae32faa2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # esx_joblisting + Simple job listing script, you can specify what jobs you want to be whitelisted in db. ## Download & Installation @@ -30,7 +31,7 @@ start esx_joblisting ### License esx_joblisting - job listing script -Copyright (C) 2015-2018 Jérémie N'gadi +Copyright (C) 2015-2020 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/server/main.lua b/server/main.lua index 3802ae40..b7a2d509 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,37 +1,35 @@ ESX = nil +local availableJobs = {} + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) -ESX.RegisterServerCallback('esx_joblisting:getJobsList', function(source, cb) +MySQL.ready(function() MySQL.Async.fetchAll('SELECT * FROM jobs WHERE whitelisted = @whitelisted', { ['@whitelisted'] = false }, function(result) - local data = {} - for i=1, #result, 1 do - table.insert(data, { - job = result[i].name, + table.insert(availableJobs, { + job = result[i].name, label = result[i].label }) end - - cb(data) end) end) +ESX.RegisterServerCallback('esx_joblisting:getJobsList', function(source, cb) + cb(availableJobs) +end) + RegisterServerEvent('esx_joblisting:setJob') AddEventHandler('esx_joblisting:setJob', function(job) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(source) - MySQL.Async.fetchAll('SELECT whitelisted FROM jobs WHERE name = @name', { - ['@name'] = job, - }, function(result) - if not result[1].whitelisted then - xPlayer.setJob(job, 0) - else - print(('esx_joblisting: %s attempted to set a whitelisted job! (lua injector)'):format(xPlayer.identifier)) + if xPlayer then + for k,v in ipairs(availableJobs) do + if v.job == job then + xPlayer.setJob(job, 0) + break + end end - - end) - + end end) From 100d097b333d740eab02520d6b2a82bfc72d142e Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 17:41:44 +0100 Subject: [PATCH 37/40] Replace __resource.lua with fxmanifest.lua --- __resource.lua => fxmanifest.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename __resource.lua => fxmanifest.lua (90%) diff --git a/__resource.lua b/fxmanifest.lua similarity index 90% rename from __resource.lua rename to fxmanifest.lua index 631e975c..c1068048 100644 --- a/__resource.lua +++ b/fxmanifest.lua @@ -1,4 +1,6 @@ -resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' +fx_version 'adamant' + +game 'gta5' description 'ESX Job Listing' From ef84cb54d2519a638963e374d5c0a4eed22d11ae Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 17 Feb 2020 21:52:50 +0100 Subject: [PATCH 38/40] Dont select * --- server/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/main.lua b/server/main.lua index b7a2d509..5ab094c3 100644 --- a/server/main.lua +++ b/server/main.lua @@ -4,7 +4,7 @@ local availableJobs = {} TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) MySQL.ready(function() - MySQL.Async.fetchAll('SELECT * FROM jobs WHERE whitelisted = @whitelisted', { + MySQL.Async.fetchAll('SELECT name, label FROM jobs WHERE whitelisted = @whitelisted', { ['@whitelisted'] = false }, function(result) for i=1, #result, 1 do From afcd852cd1cfefc1d99fd1551048e970461c0844 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 14 Apr 2020 16:49:34 +0200 Subject: [PATCH 39/40] Update esx_joblisting.sql --- esx_joblisting.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esx_joblisting.sql b/esx_joblisting.sql index f5f134f6..3d1e9a09 100644 --- a/esx_joblisting.sql +++ b/esx_joblisting.sql @@ -1,3 +1,3 @@ -USE `essentialmode`; +USE `es_extended`; ALTER TABLE jobs add whitelisted BOOLEAN NOT NULL DEFAULT FALSE; \ No newline at end of file From d4ef2b67da465d4ba021509084832fab22af8a60 Mon Sep 17 00:00:00 2001 From: tabarra Date: Tue, 1 Dec 2020 12:12:38 -0300 Subject: [PATCH 40/40] Update config.lua --- config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.lua b/config.lua index 0f657dd6..ff0ee891 100644 --- a/config.lua +++ b/config.lua @@ -5,7 +5,7 @@ Config.ZoneSize = {x = 3.0, y = 3.0, z = 0.5} Config.MarkerColor = {r = 100, g = 100, b = 204} Config.MarkerType = 1 -Config.Locale = 'fr' +Config.Locale = 'en' Config.Zones = { vector3(-265.0, -963.6, 30.2)