diff --git a/[SQL]/legacy.sql b/[SQL]/legacy.sql index 15e49771..39e24040 100644 --- a/[SQL]/legacy.sql +++ b/[SQL]/legacy.sql @@ -907,25 +907,7 @@ ALTER TABLE `users` -- ALTER TABLE `user_licenses` MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; - --- --- ESX Phone --- -CREATE TABLE `user_contacts` ( - `id` INT(11) NOT NULL AUTO_INCREMENT, - `identifier` VARCHAR(60) NOT NULL, - `name` VARCHAR(100) NOT NULL, - `number` INT(11) NOT NULL, - - PRIMARY KEY (`id`), - INDEX `index_user_contacts_identifier_name_number` (`identifier`, `name`, `number`) -) ENGINE=InnoDB; - - -ALTER TABLE `users` - ADD COLUMN `phone_number` INT(11) NULL, - ADD UNIQUE INDEX `index_users_phone_number` (`phone_number`); - + -- -- Fine Types -- diff --git a/[esx_addons]/esx_ambulancejob/client/main.lua b/[esx_addons]/esx_ambulancejob/client/main.lua index a9a46264..95e90c9f 100644 --- a/[esx_addons]/esx_ambulancejob/client/main.lua +++ b/[esx_addons]/esx_ambulancejob/client/main.lua @@ -344,14 +344,6 @@ function RespawnPed(ped, coords, heading) TriggerEvent('playerSpawned') -- compatibility with old scripts, will be removed soon end -RegisterNetEvent('esx_phone:loaded') -AddEventHandler('esx_phone:loaded', function(phoneNumber, contacts) - local specialContact = {name = 'Ambulance', number = 'ambulance', - base64Icon = 'data:image/png;base64,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'} - - TriggerEvent('esx_phone:addSpecialContact', specialContact.name, specialContact.number, specialContact.base64Icon) -end) - AddEventHandler('esx:onPlayerDeath', function(data) OnPlayerDeath() end) diff --git a/[esx_addons]/esx_ambulancejob/locales/br.lua b/[esx_addons]/esx_ambulancejob/locales/br.lua index 36c698ad..efa6a58c 100644 --- a/[esx_addons]/esx_ambulancejob/locales/br.lua +++ b/[esx_addons]/esx_ambulancejob/locales/br.lua @@ -61,8 +61,6 @@ Locales['br'] = { ['ems_menu_small'] = 'curar pequenas feridas', ['ems_menu_big'] = 'tratando lesões graves', ['ems_menu_search'] = 'paciente não encontrado', - -- Phone - ['alert_ambulance'] = 'alerta socorrista', -- Death ['respawn_available_in'] = 'você irar reviver em %s minutos %s segundos', ['respawn_bleedout_in'] = 'você vai sangrar %s minutos %s segundos\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/cs.lua b/[esx_addons]/esx_ambulancejob/locales/cs.lua index 0f295494..fcebdcfd 100644 --- a/[esx_addons]/esx_ambulancejob/locales/cs.lua +++ b/[esx_addons]/esx_ambulancejob/locales/cs.lua @@ -61,8 +61,6 @@ Locales['cs'] = { ['ems_menu_small'] = 'ošetřit malé zranění', ['ems_menu_big'] = 'ošetřit vážné zranění', ['ems_menu_search'] = 'pacient nebyl nalezen', - -- Phone - ['alert_ambulance'] = 'zdravotnický poplach', -- Death ['respawn_available_in'] = 'oživení dostupné za %s minut a %s sekund\n', ['respawn_bleedout_in'] = 'vykrvácíte za %s minut a %s sekund\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/de.lua b/[esx_addons]/esx_ambulancejob/locales/de.lua index cc708e82..c05028ba 100644 --- a/[esx_addons]/esx_ambulancejob/locales/de.lua +++ b/[esx_addons]/esx_ambulancejob/locales/de.lua @@ -60,8 +60,6 @@ Locales['de'] = { ['ems_menu_putincar'] = 'In Fahrzeug stecken', ['ems_menu_small'] = 'Kleine Wunden behandeln', ['ems_menu_big'] = 'Ernsthafte Verletzungen behandeln', - -- Phone - ['alert_ambulance'] = 'Rettungsdienst alarmieren', -- Death ['respawn_available_in'] = 'Respawn in %s Minuten %s Sekundenrfügbar', ['respawn_bleedout_in'] = 'Du wirst in %s Minuten %s Sekundensbluten\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/en.lua b/[esx_addons]/esx_ambulancejob/locales/en.lua index c54b7f21..4f7831d9 100644 --- a/[esx_addons]/esx_ambulancejob/locales/en.lua +++ b/[esx_addons]/esx_ambulancejob/locales/en.lua @@ -61,8 +61,6 @@ Locales['en'] = { ['ems_menu_small'] = 'Heal small wounds', ['ems_menu_big'] = 'Treat serious injuries', ['ems_menu_search'] = 'Patient not found', - -- Phone - ['alert_ambulance'] = 'Alert Ambulance', -- Death ['respawn_available_in'] = 'Respawn available in %s minutes %s seconds', ['respawn_bleedout_in'] = 'You will bleed out in %s minutes %s seconds\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/es.lua b/[esx_addons]/esx_ambulancejob/locales/es.lua index 17f7a240..5e3d3235 100644 --- a/[esx_addons]/esx_ambulancejob/locales/es.lua +++ b/[esx_addons]/esx_ambulancejob/locales/es.lua @@ -63,8 +63,6 @@ Locales['es'] = { ['ems_menu_small'] = 'Curar pequeñas heridas', ['ems_menu_big'] = 'Tratar lesiones graves', ['ems_menu_search'] = 'Paciente no encontrado', - -- Phone - ['alert_ambulance'] = 'Alerta de ambulancia', -- Death ['respawn_available_in'] = 'Reaparición disponible en %s minutes %s seconds', ['respawn_bleedout_in'] = 'te desangrarás en %s minutes %s seconds\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/et.lua b/[esx_addons]/esx_ambulancejob/locales/et.lua index ea0b825c..a596173f 100644 --- a/[esx_addons]/esx_ambulancejob/locales/et.lua +++ b/[esx_addons]/esx_ambulancejob/locales/et.lua @@ -61,8 +61,6 @@ Locales['et'] = { ['ems_menu_small'] = 'Ravi väikseid haavi', ['ems_menu_big'] = 'Ravi tõsiseid haavu', ['ems_menu_search'] = 'Patsienti ei leitud', - -- Phone - ['alert_ambulance'] = 'Kiirabi teadaanded', -- Death ['respawn_available_in'] = 'Sul on võimalik haiglas ärgata %s minuti ka %s sekundi pärast', ['respawn_bleedout_in'] = 'Sa jooksed verest tühjak %s minuti ja %s sekundi pärast\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/fi.lua b/[esx_addons]/esx_ambulancejob/locales/fi.lua index 783b1aff..b7b20d3a 100644 --- a/[esx_addons]/esx_ambulancejob/locales/fi.lua +++ b/[esx_addons]/esx_ambulancejob/locales/fi.lua @@ -61,8 +61,6 @@ Locales['fi'] = { ['ems_menu_small'] = 'hoida pieniä haavoja', ['ems_menu_big'] = 'hoida isoja haavoja', ['ems_menu_search'] = 'potilasta ei löydy', - -- Phone - ['alert_ambulance'] = 'hälyytys Ensihoidolle', -- Death ['respawn_available_in'] = 'respawn available in %s minutes %s seconds', ['respawn_bleedout_in'] = 'you will bleed out in %s minutes %s seconds\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/fr.lua b/[esx_addons]/esx_ambulancejob/locales/fr.lua index 9f7102e8..08a741ab 100644 --- a/[esx_addons]/esx_ambulancejob/locales/fr.lua +++ b/[esx_addons]/esx_ambulancejob/locales/fr.lua @@ -61,8 +61,6 @@ Locales['fr'] = { ['ems_menu_small'] = 'soigner petites blessures', ['ems_menu_big'] = 'soigner blessures graves', ['ems_menu_search'] = 'patient introuvable', - -- Phone - ['alert_ambulance'] = 'alerte Ambulance', -- Death ['respawn_available_in'] = 'réanimation possible dans %s minutes %s secondes', ['respawn_bleedout_in'] = 'vous allez souffrir d\'une hémorragie dans %s minutes %s secondes\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/hu.lua b/[esx_addons]/esx_ambulancejob/locales/hu.lua index b0996bf6..558097cf 100644 --- a/[esx_addons]/esx_ambulancejob/locales/hu.lua +++ b/[esx_addons]/esx_ambulancejob/locales/hu.lua @@ -61,8 +61,6 @@ Locales['hu'] = { ['ems_menu_small'] = 'Kis sebek meggyógyítása', ['ems_menu_big'] = 'Súlyos sérülések kezelése', ['ems_menu_search'] = 'Civil megkeresése', - -- Phone - ['alert_ambulance'] = 'EMS értesités', -- Death ['respawn_available_in'] = 'Újraéledés: %s', ['respawn_bleedout_in'] = 'Elfogsz vérezni %s perc %s másodperc múlva...\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/nl.lua b/[esx_addons]/esx_ambulancejob/locales/nl.lua index 93383888..01c40aff 100644 --- a/[esx_addons]/esx_ambulancejob/locales/nl.lua +++ b/[esx_addons]/esx_ambulancejob/locales/nl.lua @@ -60,8 +60,6 @@ Locales['nl'] = { ['ems_menu_putincar'] = 'Zet in voertuig', ['ems_menu_small'] = 'Behandel kleine verwondingen', ['ems_menu_big'] = 'Behandel grote verwondingen', - -- Phone - ['alert_ambulance'] = 'alert Ambulance', -- Death ['respawn_available_in'] = 'Respawn beschikbaar in %s minuten en %s seconden', ['respawn_bleedout_in'] = 'Je zal doodbloeden in %s minuten %s seconden\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/pl.lua b/[esx_addons]/esx_ambulancejob/locales/pl.lua index b1cb2035..a9b9df68 100644 --- a/[esx_addons]/esx_ambulancejob/locales/pl.lua +++ b/[esx_addons]/esx_ambulancejob/locales/pl.lua @@ -61,8 +61,6 @@ Locales['pl'] = { ['ems_menu_small'] = 'ulecz małe rany', ['ems_menu_big'] = 'ulecz poważne obrażenia', ['ems_menu_search'] = 'nie znaleziono pacjenta', - -- Phone - ['alert_ambulance'] = 'wezwij ambulans', -- Death ['respawn_available_in'] = 'respawn available in %s minutes %s seconds', ['respawn_bleedout_in'] = 'you will bleed out in %s minutes %s seconds\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/si.lua b/[esx_addons]/esx_ambulancejob/locales/si.lua index 06b4a507..95687b48 100644 --- a/[esx_addons]/esx_ambulancejob/locales/si.lua +++ b/[esx_addons]/esx_ambulancejob/locales/si.lua @@ -61,8 +61,6 @@ Locales['si'] = { ['ems_menu_small'] = 'Heal small wounds', ['ems_menu_big'] = 'Treat serious injuries', ['ems_menu_search'] = 'Patient not found', - -- Telefon - ['alert_ambulance'] = 'Alert Ambulance', -- Smrt ['respawn_available_in'] = 'Ponovna obnova je na voljo čez %s minut %s sekund', ['respawn_bleedout_in'] = 'Izkrvavel boš v %s minutah %s sekundah\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/sv.lua b/[esx_addons]/esx_ambulancejob/locales/sv.lua index 44be806e..cb1f4958 100644 --- a/[esx_addons]/esx_ambulancejob/locales/sv.lua +++ b/[esx_addons]/esx_ambulancejob/locales/sv.lua @@ -61,8 +61,6 @@ Locales['sv'] = { ['ems_menu_small'] = 'behandla mindre skador', ['ems_menu_big'] = 'behandla svåra skador', ['ems_menu_search'] = 'patienten hittades inte', - -- Phone - ['alert_ambulance'] = 'ambulanssamtal', -- Death ['respawn_available_in'] = 'respawn tillgänglig om %s:%s', ['respawn_bleedout_in'] = 'du kommer att förblöda om %s:%s\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/tr.lua b/[esx_addons]/esx_ambulancejob/locales/tr.lua index 052b2974..9137daee 100644 --- a/[esx_addons]/esx_ambulancejob/locales/tr.lua +++ b/[esx_addons]/esx_ambulancejob/locales/tr.lua @@ -60,8 +60,6 @@ Locales['tr'] = { ['ems_menu_putincar'] = 'araca koy', ['ems_menu_small'] = 'küçük yaraları tedavi et', ['ems_menu_big'] = 'ciddi yaraları tedavi et', - -- Phone - ['alert_ambulance'] = 'hastane Acil Durum', -- Death ['respawn_available_in'] = 'yeniden canlanmana %s dakika %s saniye kaldı', ['respawn_bleedout_in'] = 'kanama %s dakika %s saniye boyunca devam edecek\n', diff --git a/[esx_addons]/esx_ambulancejob/server/main.lua b/[esx_addons]/esx_ambulancejob/server/main.lua index c5265ab2..8fb273f9 100644 --- a/[esx_addons]/esx_ambulancejob/server/main.lua +++ b/[esx_addons]/esx_ambulancejob/server/main.lua @@ -1,9 +1,5 @@ local playersHealing, deadPlayers = {}, {} -if GetResourceState("esx_phone") ~= 'missing' then -TriggerEvent('esx_phone:registerNumber', 'ambulance', TranslateCap('alert_ambulance'), true, true) -end - CreateThread(function() exports["esx_society"]:registerSociety('ambulance', 'Ambulance', 'society_ambulance', 'society_ambulance', 'society_ambulance', {type = 'public'}) end) diff --git a/[esx_addons]/esx_bankerjob/client/main.lua b/[esx_addons]/esx_bankerjob/client/main.lua index a4d8a732..eab4b623 100644 --- a/[esx_addons]/esx_bankerjob/client/main.lua +++ b/[esx_addons]/esx_bankerjob/client/main.lua @@ -254,14 +254,3 @@ CreateThread(function() end end end) - -RegisterNetEvent('esx_phone:loaded') -AddEventHandler('esx_phone:loaded', function (phoneNumber, contacts) - local specialContact = { - name = TranslateCap('phone_label'), - number = 'banker', - base64Icon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAMAAAD04JH5AAAABGdBTUEAALGPC/xhBQAAAwBQTFRFAAAAJUO2JUS4JkW7Jka+L0y5M0+7O1e9J0fBKEjEKEnHKUrJKUvMKk3PK07SK0/VLFHaLVLeLVPgLlTjOl7kO1/lQFu/RmDBTmbEU2vHXHLIR2jmSGnnVHPoVXToaX7NYX7pYn/qbIHPd4rReYzTbojre5PtfZTuhZbWh5jYiJ7vkqHblqnwl6rxoK3fpLXzsb/1u8Xovsr2ydHty9X419zy5Oj25ur88vT78vT88/X9////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATuU7PwAAAQB0Uk5T////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////AFP3ByUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAAYdEVYdFNvZnR3YXJlAHBhaW50Lm5ldCA0LjEuNv1OCegAAAUoSURBVHhe5ZvrdtQ2FEZjoCmFltsQ2gYCA4VA06GUhktK3v+5ppK8bUu2jnTk26zV7l+JbH1nR7Y0QglH+zHstpsBb7hWSLHAjnpxttylp0zgKXWSXHCzjgKBxxRQcE4XBVqBc6LV0C+LTqDgh+/Y0TmNRoDAcjRPIi8w6qdvyI9CTiAy4csgRyQjQMoUHhMlkBSYNPodpMVJCdB/OqlBkAXO6D0LZEYQBeg5F+L6LAnQbz7OCO4jCNBrVojuERUoXvh1kB4SE1ioftwgIjDr6x9CBZ+hwGI/v4UaHgOBRetHDAYC3LgYlGnpC3DbcvSX5Z4Ady1Jb+McCnDPslALAoEFJ6AP1WoCAW5YHMo5fAEuL4//GngCM+1/NFDR4glwcRUoaegEuFTEp+vr6298XUS3P2kFRuy/X5rylvd8XwJVPQEu6Dn5Rn3Dc9r0PKVsK1D8BtrR7yh/DtRtBWjWckHhjr+5oobCCNCo5BlFQ95yVUldeJTAVyoOOOEGFXws1gIlb8AHqsX4yj0qXGUEaFLQTD2JgilZTwQnoN6G+VNP4iX35ukEaMgSTj0J9ZQsFRhOPYlP9MjRCKhewfjUk9BNyUaAb5OIU0/iGR1T2EMsncBfpJagmZK1QPb8NTf1JD7QX6YW4BuJE+LGkJuSGgHd1JP4hxQJK5A+f1esPGkeEBTHCvClADHjOb5HUpQVBE6rH4iKsYJAVVU3yIpwlhV4Tg58NnnwhCbLFW0WmuCjayMswv4o/Q5agvfQ5TmuaHHQZvhIi+MJjdUjsgbsj/LbccJqCDQElWgzvKPFcUpjVUmTYX/EFwn8legX8izeEPxGk+UzbYZLmix3SeuhEbC4PKJ8CppvERWyokB8MuxWFIhOhu2qAtVD4jrO1hWohuvyygLVHQJb1haobpLYsLpA/1U8gEC4Lh9CIFiXDyJQ/USs4TAC1W1yDybQrssrr4Q+dfD54QTqybDuh1GP+yZ4zY/jIWZd3h+9oUQamzi/gNmkZHfFYBMXEKiq/73Aq0ML2H+aqc7pbeJSAqohsIn/RYFfDy1QH9FcUCSFTVxMQDMENnF+ge8OLWBqOwHFYblNXE5AMQQ2cXaB77UC3hGJ/y/+L7QZvtBkuaTN4J/cRLCla4G0QXBU2Z1Q/EGL4x2NVXVKi6M+IZJwpRUC70lz0NcQVGoPg6pjWhwvaIziKiOQOKl6O+ms9PKYahFcZQTkISBoPOIgvK4rIyDORGImQL0BdeFGQBwCUiZAvT6/U7gRkN4CUsbjz1Af6rYC0hBMPq4X3kKqegKSATlj+ZOCfSjqC0i/vBvzC6uGq259CKGmoROQp+I9es2H2Qk1eAKywSP6zQYFLb5A4jeoN+g5D9Rz+ALyEGw2d+g7B6yBNYFAyuABvadjN2IdoUByf0r/yVALQoH0H/TdImEaVGroCaQewmbzIxlToE5LXyBt8JCU8TSfQS0DgbTB1BfhFUU6hgIZg9tEjcJbARsiAhmD+4SN4GcK+MQEMgajF+bh+BuiAhmDkQvz4P1zxAVyf1hzl8wSSO4jCOQObsoXZnIHSALZx0CuknD995EFcgYlC3Pw+ReSEMg9Bv1GibwoKYGZ5mNk9fFIC+TOjzTzkSSJjEDu76yyGyVSZLICmeeQno/xtSdAIZBZlqgVQVFeKZB+EMJ8pGcOpYCBchEiGyV3/qRCL5A4ROhtlORlL0KJgIWSfShtSM/6IaUCltjW2W2Uoh/4GcYI1Oy2rcj2XPe/rIfs9/8CuOBqaLBm2ZcAAAAASUVORK5CYII=' - } - - TriggerEvent('esx_phone:addSpecialContact', specialContact.name, specialContact.number, specialContact.base64Icon) -end) diff --git a/[esx_addons]/esx_bankerjob/locales/br.lua b/[esx_addons]/esx_bankerjob/locales/br.lua index ea237504..6bc9341c 100644 --- a/[esx_addons]/esx_bankerjob/locales/br.lua +++ b/[esx_addons]/esx_bankerjob/locales/br.lua @@ -13,6 +13,4 @@ Locales['br'] = { ['press_input_context_to_open_menu'] = 'pressione [E] para abrir o menu', ['withdraw'] = 'sacar', ['boss_actions'] = 'boss Actions', - ['phone_receive'] = 'bank Customer', - ['phone_label'] = 'bank', } diff --git a/[esx_addons]/esx_bankerjob/locales/de.lua b/[esx_addons]/esx_bankerjob/locales/de.lua index 791d973e..dfd68f42 100644 --- a/[esx_addons]/esx_bankerjob/locales/de.lua +++ b/[esx_addons]/esx_bankerjob/locales/de.lua @@ -13,6 +13,4 @@ Locales['de'] = { ['press_input_context_to_open_menu'] = 'Drücke [E] um das Bank Menü zu öffnen', ['withdraw'] = 'Abheben', ['boss_actions'] = 'boss Actions', - ['phone_receive'] = 'Bankkunde', - ['phone_label'] = 'bank', } diff --git a/[esx_addons]/esx_bankerjob/locales/en.lua b/[esx_addons]/esx_bankerjob/locales/en.lua index 43243733..66fae148 100644 --- a/[esx_addons]/esx_bankerjob/locales/en.lua +++ b/[esx_addons]/esx_bankerjob/locales/en.lua @@ -13,6 +13,4 @@ Locales['en'] = { ['press_input_context_to_open_menu'] = 'press [E] to open the Bank Menu.', ['withdraw'] = 'withdraw', ['boss_actions'] = 'boss Actions', - ['phone_receive'] = 'bank Customer', - ['phone_label'] = 'bank', } diff --git a/[esx_addons]/esx_bankerjob/locales/es.lua b/[esx_addons]/esx_bankerjob/locales/es.lua index 8b04a1b0..f108ffe0 100644 --- a/[esx_addons]/esx_bankerjob/locales/es.lua +++ b/[esx_addons]/esx_bankerjob/locales/es.lua @@ -13,6 +13,4 @@ Locales['es'] = { ['press_input_context_to_open_menu'] = 'presione [E] para abrir el Menú del banc .', ['withdraw'] = 'retirar', ['boss_actions'] = 'Acciones del jefe', - ['phone_receive'] = 'Cliente bancario', - ['phone_label'] = 'banco', } \ No newline at end of file diff --git a/[esx_addons]/esx_bankerjob/locales/et.lua b/[esx_addons]/esx_bankerjob/locales/et.lua index 182b4602..474ede2a 100644 --- a/[esx_addons]/esx_bankerjob/locales/et.lua +++ b/[esx_addons]/esx_bankerjob/locales/et.lua @@ -13,6 +13,4 @@ Locales['et'] = { ['press_input_context_to_open_menu'] = 'Vajuta [E], et avada panga menüü.', ['withdraw'] = 'Võta välja', ['boss_actions'] = 'Bossi tegevused', - ['phone_receive'] = 'Panga klient', - ['phone_label'] = 'Pank', } diff --git a/[esx_addons]/esx_bankerjob/locales/fi.lua b/[esx_addons]/esx_bankerjob/locales/fi.lua index 12b95adc..27941be9 100644 --- a/[esx_addons]/esx_bankerjob/locales/fi.lua +++ b/[esx_addons]/esx_bankerjob/locales/fi.lua @@ -13,6 +13,4 @@ Locales['fi'] = { ['press_input_context_to_open_menu'] = 'Paina [E] avataksesi valikon', ['withdraw'] = 'nosta', ['boss_actions'] = 'pomo valinnat', - ['phone_receive'] = 'pankin asiakas', - ['phone_label'] = 'bank', } diff --git a/[esx_addons]/esx_bankerjob/locales/fr.lua b/[esx_addons]/esx_bankerjob/locales/fr.lua index c836a0c2..ceb3efed 100644 --- a/[esx_addons]/esx_bankerjob/locales/fr.lua +++ b/[esx_addons]/esx_bankerjob/locales/fr.lua @@ -13,6 +13,4 @@ Locales['fr'] = { ['press_input_context_to_open_menu'] = 'appuyez sur [E] pour ouvrir le menu', ['withdraw'] = 'retrait', ['boss_actions'] = 'action Patron', - ['phone_receive'] = 'client Banque', - ['phone_label'] = 'banque', } diff --git a/[esx_addons]/esx_bankerjob/locales/hu.lua b/[esx_addons]/esx_bankerjob/locales/hu.lua index 74fd85b0..79570d88 100644 --- a/[esx_addons]/esx_bankerjob/locales/hu.lua +++ b/[esx_addons]/esx_bankerjob/locales/hu.lua @@ -13,6 +13,4 @@ Locales['hu'] = { ['press_input_context_to_open_menu'] = 'Nyomj [E] hogy megnyisd a bankot.', ['withdraw'] = 'Kivétel', ['boss_actions'] = 'Főnöki menü', - ['phone_receive'] = 'banki ügyfél', - ['phone_label'] = 'bank', } diff --git a/[esx_addons]/esx_bankerjob/locales/it.lua b/[esx_addons]/esx_bankerjob/locales/it.lua index 2d3b50a2..47ac737d 100644 --- a/[esx_addons]/esx_bankerjob/locales/it.lua +++ b/[esx_addons]/esx_bankerjob/locales/it.lua @@ -13,6 +13,4 @@ Locales['it'] = { ['press_input_context_to_open_menu'] = 'premi [E] per aprire il menu della banca.', ['withdraw'] = 'ritira', ['boss_actions'] = 'azioni boss', - ['phone_receive'] = 'cliente bancario', - ['phone_label'] = 'banca', } diff --git a/[esx_addons]/esx_bankerjob/locales/nl.lua b/[esx_addons]/esx_bankerjob/locales/nl.lua index 824df3ab..c797c8f3 100644 --- a/[esx_addons]/esx_bankerjob/locales/nl.lua +++ b/[esx_addons]/esx_bankerjob/locales/nl.lua @@ -13,6 +13,4 @@ Locales['nl'] = { ['press_input_context_to_open_menu'] = 'druk op [E] om het Bank Menute openen.', ['withdraw'] = 'opnemen', ['boss_actions'] = 'baas acties', - ['phone_receive'] = 'bank klant', - ['phone_label'] = 'bank', } diff --git a/[esx_addons]/esx_bankerjob/locales/si.lua b/[esx_addons]/esx_bankerjob/locales/si.lua index 1cf1de71..a3d5071c 100644 --- a/[esx_addons]/esx_bankerjob/locales/si.lua +++ b/[esx_addons]/esx_bankerjob/locales/si.lua @@ -13,6 +13,4 @@ Locales['si'] = { ['press_input_context_to_open_menu'] = 'pritisnite [E] za odprtje menija banke Bank.', ['withdraw'] = 'umakni', ['boss_actions'] = 'boss Actions', - ['phone_receive'] = 'bančna stranka', - ['phone_label'] = 'bank', } \ No newline at end of file diff --git a/[esx_addons]/esx_bankerjob/locales/sv.lua b/[esx_addons]/esx_bankerjob/locales/sv.lua index da67d2d3..aa76049c 100644 --- a/[esx_addons]/esx_bankerjob/locales/sv.lua +++ b/[esx_addons]/esx_bankerjob/locales/sv.lua @@ -13,6 +13,4 @@ Locales['sv'] = { ['press_input_context_to_open_menu'] = 'Tryck [E] för att öppna Bankmenyn.', ['withdraw'] = 'Ta ut', ['boss_actions'] = 'Chef handlingar', - ['phone_receive'] = 'Bank meddelande mottaget', - ['phone_label'] = 'Bank', } diff --git a/[esx_addons]/esx_bankerjob/locales/tr.lua b/[esx_addons]/esx_bankerjob/locales/tr.lua index 73067996..e7f76b64 100644 --- a/[esx_addons]/esx_bankerjob/locales/tr.lua +++ b/[esx_addons]/esx_bankerjob/locales/tr.lua @@ -13,7 +13,5 @@ Locales['tr'] = { ['press_input_context_to_open_menu'] = 'Banka Menüsünü açmak için [E] tuşuna basın.', ['withdraw'] = 'para çek', ['boss_actions'] = 'patron Hareketleri', - ['phone_receive'] = 'banka Müşterisi', - ['phone_label'] = 'banka', } \ No newline at end of file diff --git a/[esx_addons]/esx_bankerjob/server/main.lua b/[esx_addons]/esx_bankerjob/server/main.lua index 33dd831c..93fa459b 100644 --- a/[esx_addons]/esx_bankerjob/server/main.lua +++ b/[esx_addons]/esx_bankerjob/server/main.lua @@ -1,6 +1,5 @@ -TriggerEvent('esx_phone:registerNumber', 'banker', _('phone_receive'), false, false) CreateThread(function() - exports["esx_society"]:registerSociety('banker', TranslateCap('phone_label'), 'society_banker', 'society_banker', 'society_banker', {type = 'public'}) + exports["esx_society"]:registerSociety('banker', TranslateCap('bank'), 'society_banker', 'society_banker', 'society_banker', {type = 'public'}) end) RegisterServerEvent('esx_bankerjob:customerDeposit') diff --git a/[esx_addons]/esx_mechanicjob/client/main.lua b/[esx_addons]/esx_mechanicjob/client/main.lua index 85fccc2c..a97a9270 100644 --- a/[esx_addons]/esx_mechanicjob/client/main.lua +++ b/[esx_addons]/esx_mechanicjob/client/main.lua @@ -717,17 +717,6 @@ AddEventHandler('esx_mechanicjob:hasExitedEntityZone', function(entity) end end) -RegisterNetEvent('esx_phone:loaded') -AddEventHandler('esx_phone:loaded', function(phoneNumber, contacts) - local specialContact = { - name = TranslateCap('mechanic'), - number = 'mechanic', - base64Icon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAA4BJREFUWIXtll9oU3cUx7/nJA02aSSlFouWMnXVB0ejU3wcRteHjv1puoc9rA978cUi2IqgRYWIZkMwrahUGfgkFMEZUdg6C+u21z1o3fbgqigVi7NzUtNcmsac40Npltz7S3rvUHzxQODec87vfD+/e0/O/QFv7Q0beV3QeXqmgV74/7H7fZJvuLwv8q/Xeux1gUrNBpN/nmtavdaqDqBK8VT2RDyV2VHmF1lvLERSBtCVynzYmcp+A9WqT9kcVKX4gHUehF0CEVY+1jYTTIwvt7YSIQnCTvsSUYz6gX5uDt7MP7KOKuQAgxmqQ+neUA+I1B1AiXi5X6ZAvKrabirmVYFwAMRT2RMg7F9SyKspvk73hfrtbkMPyIhA5FVqi0iBiEZMMQdAui/8E4GPv0oAJkpc6Q3+6goAAGpWBxNQmTLFmgL3jSJNgQdGv4pMts2EKm7ICJB/aG0xNdz74VEk13UYCx1/twPR8JjDT8wttyLZtkoAxSb8ZDCz0gdfKxWkFURf2v9qTYH7SK7rQIDn0P3nA0ehixvfwZwE0X9vBE/mW8piohhl1WH18UQBhYnre8N/L8b8xQvlx4ACbB4NnzaeRYDnKm0EALCMLXy84hwuTCXL/ExoB1E7qcK/8NCLIq5HcTT0i6u8TYbXUM1cAyyveVq8Xls7XhYrvY/4n3gC8C+dsmAzL1YUiyfWxvHzsy/w/dNd+KjhW2yvv/RfXr7x9QDcmo1he2RBiCCI1Q8jVj9szPNixVfgz+UiIGyDSrcoRu2J16d3I6e1VYvNSQjXpnucAcEPUOkGYZs/l4uUhowt/3kqu1UIv9n90fAY9jT3YBlbRvFTD4fw++wHjhiTRL/bG75t0jI2ITcHb5om4Xgmhv57xpGOg3d/NIqryOR7z+r+MC6qBJB/ZB2t9Om1D5lFm843G/3E3HI7Yh1xDRAfzLQr5EClBf/HBHK462TG2J0OABXeyWDPZ8VqxmBWYscpyghwtTd4EKpDTjCZdCNmzFM9k+4LHXIFACJN94Z6FiFEpKDQw9HndWsEuhnADVMhAUaYJBp9XrcGQKJ4qFE9k+6r2+MG3k5N8VQ22TVglbX2ZwOzX2VvNKr91zmY6S7N6zqZicVT2WNLyVSehESaBhxnOALfMeYX+K/S2yv7wmMAlvwyuR7FxQUyf0fgc/jztfkJr7XeGgC8BJJgWNV8ImT+AAAAAElFTkSuQmCC' - } - - TriggerEvent('esx_phone:addSpecialContact', specialContact.name, specialContact.number, specialContact.base64Icon) -end) - -- Pop NPC mission vehicle when inside area CreateThread(function() while true do diff --git a/[esx_addons]/esx_mechanicjob/server/main.lua b/[esx_addons]/esx_mechanicjob/server/main.lua index 0727d680..9d8e2103 100644 --- a/[esx_addons]/esx_mechanicjob/server/main.lua +++ b/[esx_addons]/esx_mechanicjob/server/main.lua @@ -4,8 +4,6 @@ if Config.MaxInService ~= -1 then TriggerEvent('esx_service:activateService', 'mechanic', Config.MaxInService) end -TriggerEvent('esx_phone:registerNumber', 'mechanic', TranslateCap('mechanic_customer'), true, true) - CreateThread(function() exports["esx_society"]:registerSociety('mechanic', 'mechanic', 'society_mechanic', 'society_mechanic', 'society_mechanic', {type = 'private'}) end) diff --git a/[esx_addons]/esx_phone/.editorconfig b/[esx_addons]/esx_phone/.editorconfig deleted file mode 100644 index 9b425256..00000000 --- a/[esx_addons]/esx_phone/.editorconfig +++ /dev/null @@ -1,9 +0,0 @@ -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/[esx_addons]/esx_phone/LICENSE b/[esx_addons]/esx_phone/LICENSE deleted file mode 100644 index 8c137bd7..00000000 --- a/[esx_addons]/esx_phone/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - 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. - - esx_phone - Copyright (C) 2015-2023 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: - - esx_phone Copyright (C) 2015-2023 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 diff --git a/[esx_addons]/esx_phone/README.md b/[esx_addons]/esx_phone/README.md deleted file mode 100644 index 9701790c..00000000 --- a/[esx_addons]/esx_phone/README.md +++ /dev/null @@ -1,69 +0,0 @@ -# esx_phone - -### Note -- All scripts that implement the usage of esx phone must be started **after** this script, or else they won't register and no messages will be received. - -## Download & Installation - -### Using [fvm](https://github.com/qlaffont/fvm-installer) -``` -fvm install --save --folder=esx esx-org/esx_phone -``` - -### Using Git -``` -cd resources -git clone https://github.com/ESX-Org/esx_phone [esx]/esx_phone -``` - -### Manually -- Download https://github.com/ESX-Org/esx_phone/archive/master.zip -- Put it in the `[esx]` directory - -- Import `esx_phone.sql` in your database -- Add this in your `server.cfg`: - -``` -start esx_phone -``` - -### Add custom contacts - -Client side - -```lua -RegisterNetEvent('esx_phone:loaded') -AddEventHandler('esx_phone:loaded', function(phoneNumber, contacts) - local specialContact = { - name = 'societyName', - number = 'societyNumber', - base64Icon = 'insert base 64 icon' - } - - TriggerEvent('esx_phone:addSpecialContact', specialContact.name, specialContact.number, specialContact.base64Icon) -end) -``` - -Server side - -```lua -TriggerServerEvent('esx_phone:registerNumber', number, type, sharePos, hasDispatch, hideNumber, hidePosIfAnon) - -example - -TriggerEvent('esx_phone:registerNumber', 'ambulance', TranslateCap('alert_ambulance'), true, true) - -last two booleans are optional -``` - -# Legal -### License -esx_phone - phone script for fivem - -Copyright (C) 2015-2023 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/[esx_addons]/esx_phone/client/main.lua b/[esx_addons]/esx_phone/client/main.lua deleted file mode 100644 index a0b0ce4f..00000000 --- a/[esx_addons]/esx_phone/client/main.lua +++ /dev/null @@ -1,282 +0,0 @@ -local GUI, PhoneData, CurrentActionData, PhoneNumberSources, CurrentDispatchRequestId = {}, {phoneNumber = 0, contacts = {}}, {}, {}, -1 -local CurrentAction, CurrentActionMsg -GUI.PhoneIsShowed = false -GUI.MessagesIsShowed = false -GUI.AddContactIsShowed = false - -function OpenPhone() - local playerPed = PlayerPedId() - TriggerServerEvent('esx_phone:reload', PhoneData.phoneNumber) - - SendNUIMessage({ - showPhone = true, - phoneData = PhoneData - }) - - GUI.PhoneIsShowed = true - - ESX.SetTimeout(250, function() - SetNuiFocus(true, true) - end) - - if not IsPedInAnyVehicle(playerPed, false) then - TaskStartScenarioInPlace(playerPed, 'WORLD_HUMAN_STAND_MOBILE', 0, true) - end -end - -function ClosePhone() - local playerPed = PlayerPedId() - - SendNUIMessage({ - showPhone = false - }) - - SetNuiFocus(false) - GUI.PhoneIsShowed = false - ClearPedTasks(playerPed) -end - -RegisterNetEvent('esx_phone:loaded') -AddEventHandler('esx_phone:loaded', function(phoneNumber, contacts) - PhoneData.phoneNumber = phoneNumber - PhoneData.contacts = {} - - for i=1, #contacts, 1 do - contacts[i].online = (PhoneNumberSources[contacts[i].number] == nil and false or NetworkIsPlayerActive(GetPlayerFromServerId(PhoneNumberSources[contacts[i].number]))) - table.insert(PhoneData.contacts, contacts[i]) - end - - SendNUIMessage({ - reloadPhone = true, - phoneData = PhoneData - }) - ESX.UI.Menu.RegisterType('phone', OpenPhone, ClosePhone) -end) - -RegisterNetEvent('esx_phone:addContact') -AddEventHandler('esx_phone:addContact', function(name, phoneNumber, playerOnline) - table.insert(PhoneData.contacts, { - name = name, - number = phoneNumber, - online = playerOnline - }) - - SendNUIMessage({ - contactAdded = true, - phoneData = PhoneData - }) -end) - -RegisterNetEvent('esx_phone:removeContact') -AddEventHandler('esx_phone:removeContact', function(name, phoneNumber) - for key, value in pairs(PhoneData.contacts) do - if value.name == name and value.number == phoneNumber then - table.remove(PhoneData.contacts, key) - break - end - end - - SendNUIMessage({ - contactRemoved = true, - phoneData = PhoneData - }) -end) - -RegisterNetEvent('esx_phone:addSpecialContact') -AddEventHandler('esx_phone:addSpecialContact', function(name, phoneNumber, base64Icon) - SendNUIMessage({ - addSpecialContact = true, - name = name, - number = phoneNumber, - base64Icon = base64Icon - }) -end) - -RegisterNetEvent('esx_phone:removeSpecialContact') -AddEventHandler('esx_phone:removeSpecialContact', function(phoneNumber) - SendNUIMessage({ - removeSpecialContact = true, - number = phoneNumber - }) -end) - -RegisterNUICallback('add_contact', function(data, cb) - local phoneNumber = tonumber(data.phoneNumber) - local contactName = tostring(data.contactName) - - if phoneNumber then - TriggerServerEvent('esx_phone:addPlayerContact', phoneNumber, contactName) - else - ESX.ShowNotification(TranslateCap('invalid_number')) - end -end) - -RegisterNUICallback('remove_contact', function(data, cb) - local phoneNumber = tonumber(data.phoneNumber) - local contactName = tostring(data.contactName) - - if phoneNumber then - TriggerServerEvent('esx_phone:removePlayerContact', phoneNumber, contactName) - end -end) - -RegisterNetEvent('esx_phone:onMessage') -AddEventHandler('esx_phone:onMessage', function(phoneNumber, message, position, anon, job, dispatchRequestId, dispatchNumber) - if dispatchNumber and phoneNumber == PhoneData.phoneNumber then - TriggerEvent('esx_phone:cancelMessage', dispatchNumber) - - if WasEventCanceled() then - return - end - end - - if job == 'player' then - ESX.ShowNotification(TranslateCap('new_message', message)) - else - ESX.ShowNotification(('%s: %s'):format(job, message)) - end - - PlaySound(-1, 'Menu_Accept', 'Phone_SoundSet_Default', false, 0, true) - - SendNUIMessage({ - newMessage = true, - phoneNumber = phoneNumber, - message = message, - position = position, - anonyme = anon, - job = job - }) - - if dispatchRequestId then - CurrentAction = 'dispatch' - CurrentActionMsg = TranslateCap('press_take_call', job) - CurrentDispatchRequestId = dispatchRequestId - - CurrentActionData = { - phoneNumber = phoneNumber, - message = message, - position = position, - actions = actions, - anonyme = anon, - job = job - } - - ESX.SetTimeout(15000, function() - CurrentAction = nil - end) - end -end) - -RegisterNetEvent('esx_phone:stopDispatch') -AddEventHandler('esx_phone:stopDispatch', function(dispatchRequestId, playerName) - if CurrentDispatchRequestId == dispatchRequestId and CurrentAction == 'dispatch' then - CurrentAction = nil - ESX.ShowNotification(TranslateCap('taken_call', playerName)) - end -end) - -RegisterNetEvent('esx_phone:setPhoneNumberSource') -AddEventHandler('esx_phone:setPhoneNumberSource', function(phoneNumber, source) - if source == -1 then - PhoneNumberSources[phoneNumber] = nil - else - PhoneNumberSources[phoneNumber] = source - end -end) - -RegisterNUICallback('setGPS', function(data) - SetNewWaypoint(data.x, data.y) - ESX.ShowNotification(TranslateCap('gps_position')) -end) - -RegisterNUICallback('send', function(data) - local phoneNumber = data.number - local playerPed = PlayerPedId() - local coords = GetEntityCoords(playerPed) - - if tonumber(phoneNumber) then - phoneNumber = tonumber(phoneNumber) - end - - TriggerServerEvent('esx_phone:send', phoneNumber, data.message, data.anonyme, { - x = coords.x, - y = coords.y, - z = coords.z - }) - - SendNUIMessage({ - showMessageEditor = false - }) - - ESX.ShowNotification(TranslateCap('message_sent')) -end) - -RegisterNUICallback('escape', function() - ESX.UI.Menu.Close('phone', GetCurrentResourceName(), 'main') -end) - -CreateThread(function() - while true do - Wait(0) - - if GUI.PhoneIsShowed then -- codes here: https://pastebin.com/guYd0ht4 - DisableControlAction(0, 1, true) -- LookLeftRight - DisableControlAction(0, 2, true) -- LookUpDown - DisableControlAction(0, 25, true) -- Input Aim - DisableControlAction(0, 106, true) -- Vehicle Mouse Control Override - - DisableControlAction(0, 24, true) -- Input Attack - DisableControlAction(0, 140, true) -- Melee Attack Alternate - DisableControlAction(0, 141, true) -- Melee Attack Alternate - DisableControlAction(0, 142, true) -- Melee Attack Alternate - DisableControlAction(0, 257, true) -- Input Attack 2 - DisableControlAction(0, 263, true) -- Input Melee Attack - DisableControlAction(0, 264, true) -- Input Melee Attack 2 - - DisableControlAction(0, 12, true) -- Weapon Wheel Up Down - DisableControlAction(0, 14, true) -- Weapon Wheel Next - DisableControlAction(0, 15, true) -- Weapon Wheel Prev - DisableControlAction(0, 16, true) -- Select Next Weapon - DisableControlAction(0, 17, true) -- Select Prev Weapon - else - -- open phone - -- todo: is player busy (handcuffed, etc) - if IsControlJustReleased(0, 288) and IsUsingKeyboard(0) then - if not ESX.UI.Menu.IsOpen('phone', GetCurrentResourceName(), 'main') then - ESX.UI.Menu.CloseAll() - ESX.UI.Menu.Open('phone', GetCurrentResourceName(), 'main') - end - end - end - end -end) - -AddEventHandler('onResourceStop', function(resource) - if resource == GetCurrentResourceName() then - if GUI.PhoneIsShowed then - ESX.UI.Menu.CloseAll() - end - end -end) - --- Key controls -CreateThread(function() - while true do - Wait(0) - - if CurrentAction then - ESX.ShowHelpNotification(CurrentActionMsg) - - if IsControlJustReleased(0, 38) and IsUsingKeyboard(0) then - if CurrentAction == 'dispatch' then - TriggerServerEvent('esx_phone:stopDispatch', CurrentDispatchRequestId) - SetNewWaypoint(CurrentActionData.position.x, CurrentActionData.position.y) - end - - CurrentAction = nil - end - else - Wait(500) - end - end -end) \ No newline at end of file diff --git a/[esx_addons]/esx_phone/config.lua b/[esx_addons]/esx_phone/config.lua deleted file mode 100644 index f6c6c4d9..00000000 --- a/[esx_addons]/esx_phone/config.lua +++ /dev/null @@ -1,2 +0,0 @@ -Config = {} -Config.Locale = GetConvar('esx:locale', 'en') diff --git a/[esx_addons]/esx_phone/esx_phone.sql b/[esx_addons]/esx_phone/esx_phone.sql deleted file mode 100644 index 1b56aea9..00000000 --- a/[esx_addons]/esx_phone/esx_phone.sql +++ /dev/null @@ -1,16 +0,0 @@ - - -CREATE TABLE `user_contacts` ( - `id` INT(11) NOT NULL AUTO_INCREMENT, - `identifier` VARCHAR(60) NOT NULL, - `name` VARCHAR(100) NOT NULL, - `number` INT(11) NOT NULL, - - PRIMARY KEY (`id`), - INDEX `index_user_contacts_identifier_name_number` (`identifier`, `name`, `number`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - - -ALTER TABLE `users` - ADD COLUMN `phone_number` INT(11) NULL, - ADD UNIQUE INDEX `index_users_phone_number` (`phone_number`); \ No newline at end of file diff --git a/[esx_addons]/esx_phone/fxmanifest.lua b/[esx_addons]/esx_phone/fxmanifest.lua deleted file mode 100644 index 252e0ce9..00000000 --- a/[esx_addons]/esx_phone/fxmanifest.lua +++ /dev/null @@ -1,50 +0,0 @@ -fx_version 'adamant' - -game 'gta5' - -description 'ESX Phone' -lua54 'yes' -version '1.9.0' - -shared_script '@es_extended/imports.lua' - -server_scripts { - '@oxmysql/lib/MySQL.lua', - 'config.lua', - '@es_extended/locale.lua', - 'locales/*.lua', - 'server/main.lua' -} - -client_scripts { - '@es_extended/locale.lua', - 'config.lua', - 'locales/*.lua', - 'client/main.lua' -} - -ui_page 'html/ui.html' - -files { - 'html/ui.html', - - 'html/css/app.css', - - 'html/scripts/mustache.min.js', - 'html/scripts/app.js', - - 'html/img/phone.png', - - 'html/img/icons/signal.png', - 'html/img/icons/rep.png', - 'html/img/icons/msg.png', - 'html/img/icons/add.png', - 'html/img/icons/back.png', - 'html/img/icons/new-msg.png', - 'html/img/icons/reply.png', - 'html/img/icons/write.png', - 'html/img/icons/edit.png', - 'html/img/icons/location.png' -} - -dependency 'es_extended' diff --git a/[esx_addons]/esx_phone/html/css/app.css b/[esx_addons]/esx_phone/html/css/app.css deleted file mode 100644 index 9540a640..00000000 --- a/[esx_addons]/esx_phone/html/css/app.css +++ /dev/null @@ -1,392 +0,0 @@ -html, body { - width: 100%; - height: 100%; - overflow: hidden; -} - -#cursor { - position: absolute; - z-index: 999999; - display: none; -} - -#console { - position: absolute; - left: 0; - bottom: 0; - width: 320px; - height: 250px; - background-color: rgba(0, 0, 0, 0.8); - color: white; - padding: 5px; - overflow-y: auto; - overflow-x: hidden; -} - -#phone { - background-image: url("../img/phone.png"); - background-repeat: no-repeat; - font-family: 'Catamaran', sans-serif; - font-weight: 400; - font-size: 12px; - width: 298px; - height: 480px; - color: #212121; - position: absolute; - right: 50px; - bottom: 0; - overflow: hidden; - cursor: default; - display: none; -} - -#phone>.container { - position: absolute; - top: 59px; - left: 46px; - width: 207px; - height: 365px; - background-repeat: no-repeat; - overflow: hidden; -} - -#phone .head { - position: relative; - text-transform: uppercase; - text-align: center; - height: 20px; - line-height: 20px; - background-color: black; - z-index: 5; -} - -#phone-icon { - display: block; - position: absolute; - height: 12px; - line-height: 20px; - top: 4px; - right: 5px; -} - -#phone-number { - display: block; - position: absolute; - height: 20px; - line-height: 20px; - top: 0; - left: 5px; - color: white; -} - -#phone .menu { - max-height: 320px; - overflow-y: scroll; - z-index: 1; -} - -#phone .menu .home { - list-style: none outside none; - margin: 0; - padding: 13px; - color: white; -} - -#phone .menu .phone-icon { - position: relative; - display: block; - float: left; - text-align: center; - width: 60px; - padding-top: 50px; - padding-bottom: 5px; - background-size: 32px 32px; - background-color: transparent; - background-repeat: no-repeat; - background-position: center 10px; - cursor: pointer; -} - -#phone .menu .phone-icon::after { - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - background-color: rgba(255, 255, 255, 0.01); -} - -#phone-icon-rep { - background-image: url("../img/icons/rep.png"); -} - -#phone-icon-msg { - background-image: url("../img/icons/msg.png"); -} - -#phone .menu::-webkit-scrollbar { - display: none; -} - -#phone .menu .phone-icon.selected, #phone .menu .phone-icon:hover { - background-color: rgba(255, 255, 255, 0.1); -} - -.screen { - position: absolute; - top: 0; - left: 207px; - width: 207px; - height: 365px; - background-color: #dde1e8; - z-index: 1; - transition: left 0.25s ease; - overflow: hidden; -} - -.screen.active { - left: 0; -} - -.screen>.container { - position: absolute; - top: 50px; - left: 0; - width: 224px; - height: 315px; - overflow-y: scroll; -} - -.head-screen { - position: absolute; - height: 30px; - line-height: 30px; - text-transform: uppercase; - background-color: white; - text-align: center; - color: #212121; - background-color: white; - font-weight: 600; - border-bottom: 1px solid rgba(0, 0, 0, 0.3); - font-size: 13px; - top: 20px; - left: 0; - right: 0; - z-index: 5; -} - -.btn-head { - display: block; - color: #212121; - width: 30px; - height: 30px; - font-size: 20px; - cursor: pointer; -} - -.btn-head:hover { - background-color: #f1f1f1; -} - -.btn-head-back { - float: left; - background: transparent url("../img/icons/back.png") no-repeat 50%; -} - -.btn-head-new { - float: right; - background: transparent url("../img/icons/add.png") no-repeat 50%; -} - -.message, .contact { - position: relative; - padding: 3px 35px 3px 25px; - background-color: white; - border-bottom: 1px solid rgba(0, 0, 0, 0.3); - color: #212121; - min-height: 30px; -} - -.message.no-item, .contact.no-item { - padding: 3px 5px; -} - -.contact { - opacity: 0.5; -} - -.contact.online, .contact.no-item { - opacity: 1; -} - -.contact::after { - position: absolute; - display: block; - content: ''; - width: 8px; - height: 8px; - background-color: #dcdcdc; - left: 10px; - top: 8px; - border-radius: 50%; -} - -.contact.online::after { - background-color: #6ecc49; -} - -.contact.no-item::after { - display: none; -} - -.no-item { - text-align: center; -} - -.message .sender-info, .message .body, .contact .sender-info { - margin-right: 30px; -} - -.message .phone-number { - line-height: 10px; - color: #999; -} - -.message .body { - margin-top: 5px; - line-height: 16px; -} - -.sender { - font-weight: 600; -} - -.actions { - position: absolute; - top: 0; - right: 0; - bottom: 0; - width: 24px; -} - -.actions .new-msg { - display: block; - width: 24px; - height: 24px; - background: transparent url("../img/icons/write.png") no-repeat 50%; - cursor: pointer; -} - -.actions .reply-btn { - background: transparent url("../img/icons/reply.png") no-repeat 50%; -} - -.actions .gps { - display: none; - width: 24px; - height: 24px; - background: transparent url("../img/icons/location.png") no-repeat 50%; - cursor: pointer; -} - -.actions .ok-btn { - display: none; - width: 24px; - height: 24px; - background: transparent url("../img/icons/ok.png") no-repeat 50%; - cursor: pointer; -} - -.actions .new-msg.anonyme, .contact .actions .new-msg { - display: none; -} - -.contact.online .actions .new-msg, .actions .gps.active, .actions .ok-btn.showOK { - display: block; -} - -.actions .new-msg:hover, .actions .gps:hover, .actions .ok-btn:hover, .actions .del-contact:hover { - background-color: #f1f1f1; -} - -#writer textarea { - width: 207px; - min-width: 207px; - max-width: 207px; - height: 255px; - min-height: 255px; - max-height: 255px; - background-color: #f1f1f1; - border: none; - box-shadow: 0 2px 3px 1px rgba(0, 0, 0, 0.1) inset; - padding: 5px; - outline: none; -} - -#writer label { - display: block; - width: 100%; - height: 30px; - line-height: 34px; - background-color: #f1f1f1; - border: none; - box-shadow: 0 2px 3px 1px rgba(0, 0, 0, 0.1) inset; - font-size: 14px; - font-weight: 600; - color: #6b6b6b; -} - -#writer label input { - top: 2px; - position: relative; - left: 5px; - margin-right: 10px; -} - -#writer button, #contact button { - display: block; - float: left; - width: 103px; - height: 30px; - line-height: 30px; - background-color: #dcdcdc; - border-color: rgba(0, 0, 0, 0.5); - border: none; - color: white; - font-weight: 600; - cursor: pointer; - outline: none; -} - -#writer button.marged, #contact button.marged { - margin-left: 1px; -} - -#writer #writer_cancel, #contact #contact_cancel { - background-color: #d9534f; -} - -#writer #writer_send:hover, #contact #contact_send:hover { - background-color: #74c374; -} - -#writer #writer_cancel:hover, #contact #contact_cancel:hover { - background-color: #dc6b68; -} - -#writer #writer_send, #contact #contact_send { - background-color: #5cb85c; -} - -#contact input { - display: block; - width: 100%; - height: 30px; - line-height: 30px; - padding: 2px 5px; - background-color: #f1f1f1; - border: none; - border-bottom: 1px solid rgba(0, 0, 0, 0.3); - outline: none; - box-shadow: 0 2px 3px 1px rgba(0, 0, 0, 0.1) inset; -} \ No newline at end of file diff --git a/[esx_addons]/esx_phone/html/img/icons/add.png b/[esx_addons]/esx_phone/html/img/icons/add.png deleted file mode 100644 index ad5a1310..00000000 Binary files a/[esx_addons]/esx_phone/html/img/icons/add.png and /dev/null differ diff --git a/[esx_addons]/esx_phone/html/img/icons/back.png b/[esx_addons]/esx_phone/html/img/icons/back.png deleted file mode 100644 index f7fa8c38..00000000 Binary files a/[esx_addons]/esx_phone/html/img/icons/back.png and /dev/null differ diff --git a/[esx_addons]/esx_phone/html/img/icons/edit.png b/[esx_addons]/esx_phone/html/img/icons/edit.png deleted file mode 100644 index 9f0c9db5..00000000 Binary files a/[esx_addons]/esx_phone/html/img/icons/edit.png and /dev/null differ diff --git a/[esx_addons]/esx_phone/html/img/icons/location.png b/[esx_addons]/esx_phone/html/img/icons/location.png deleted file mode 100644 index 54e65f47..00000000 Binary files a/[esx_addons]/esx_phone/html/img/icons/location.png and /dev/null differ diff --git a/[esx_addons]/esx_phone/html/img/icons/msg.png b/[esx_addons]/esx_phone/html/img/icons/msg.png deleted file mode 100644 index aec485a3..00000000 Binary files a/[esx_addons]/esx_phone/html/img/icons/msg.png and /dev/null differ diff --git a/[esx_addons]/esx_phone/html/img/icons/new-msg.png b/[esx_addons]/esx_phone/html/img/icons/new-msg.png deleted file mode 100644 index a5970481..00000000 Binary files a/[esx_addons]/esx_phone/html/img/icons/new-msg.png and /dev/null differ diff --git a/[esx_addons]/esx_phone/html/img/icons/ok.png b/[esx_addons]/esx_phone/html/img/icons/ok.png deleted file mode 100644 index c08a8a7a..00000000 Binary files a/[esx_addons]/esx_phone/html/img/icons/ok.png and /dev/null differ diff --git a/[esx_addons]/esx_phone/html/img/icons/rep.png b/[esx_addons]/esx_phone/html/img/icons/rep.png deleted file mode 100644 index efb0082e..00000000 Binary files a/[esx_addons]/esx_phone/html/img/icons/rep.png and /dev/null differ diff --git a/[esx_addons]/esx_phone/html/img/icons/reply.png b/[esx_addons]/esx_phone/html/img/icons/reply.png deleted file mode 100644 index 0b359ecc..00000000 Binary files a/[esx_addons]/esx_phone/html/img/icons/reply.png and /dev/null differ diff --git a/[esx_addons]/esx_phone/html/img/icons/signal.png b/[esx_addons]/esx_phone/html/img/icons/signal.png deleted file mode 100644 index 143301f5..00000000 Binary files a/[esx_addons]/esx_phone/html/img/icons/signal.png and /dev/null differ diff --git a/[esx_addons]/esx_phone/html/img/icons/write.png b/[esx_addons]/esx_phone/html/img/icons/write.png deleted file mode 100644 index 28f32beb..00000000 Binary files a/[esx_addons]/esx_phone/html/img/icons/write.png and /dev/null differ diff --git a/[esx_addons]/esx_phone/html/img/phone.png b/[esx_addons]/esx_phone/html/img/phone.png deleted file mode 100644 index 2c2c8adb..00000000 Binary files a/[esx_addons]/esx_phone/html/img/phone.png and /dev/null differ diff --git a/[esx_addons]/esx_phone/html/scripts/app.js b/[esx_addons]/esx_phone/html/scripts/app.js deleted file mode 100644 index 151df962..00000000 --- a/[esx_addons]/esx_phone/html/scripts/app.js +++ /dev/null @@ -1,512 +0,0 @@ -(function(){ - - let ContactTpl = - '
' + - '
' + - '
' + - '{{sender}}
#{{phoneNumber}}' + - '
' + - '
' + - '
' + - 'X' + - '' + - '
' + - '
' - ; - - let MessageTpl = - '
' + - '
' + - '
' + - '{{sender}}
#{{phoneNumber}}' + - '
' + - '
' + - '
{{message}}
' + - '
' + - '
' - ; - - let SpecialContactTpl = '
  • {{name}}
    • '; - - let contacts = []; - let specialContacts = []; - let menu = []; - let currentItem = 0; - let currentVal = null; - let isMessageEditorOpen = false; - let isMessagesOpen = false; - let isPhoneShowed = false; - - let showMain = function() { - $('.screen').removeClass('active'); - $('.screen *').attr('disabled', 'disabled'); - } - - let showRepertoire = function() { - $('#repertoire').addClass('active'); - } - - let hideRepertoire = function() { - $('#repertoire').removeClass('active'); - } - - let showMessages = function(){ - $('#messages').addClass('active'); - isMessagesOpen = true; - } - - let hideMessages = function(){ - $('#messages').removeClass('active'); - isMessagesOpen = false; - } - - let showAddContact = function() { - $('#contact').addClass('active'); - $('.screen *').attr('disabled', 'disabled'); - $('.screen.active *').removeAttr('disabled'); - } - - let hideAddContact = function() { - $('#contact').removeClass('active'); - $('#contact_name').val(''); - $('#contact_number').val(''); - } - - let showNewMessage = function(cnum, cname) { - $('#writer').addClass('active'); - $('#writer_number').val(cnum); - $('#writer .header-title').html(cname); - $('.screen *').attr('disabled', 'disabled'); - $('.screen.active *').removeAttr('disabled'); - } - - let hideNewMessage = function() { - $('#writer').removeClass('active'); - $('#writer_number').val(''); - $('#writer_message').val(''); - $('#writer .header-title').html(''); - } - - let showGPS = function(xPos, yPos) { - $.post('http://esx_phone/setGPS', JSON.stringify({ - x: parseFloat(xPos), - y: parseFloat(yPos) - } - )); - } - - let renderContacts = function(){ - - let contactHTML = ''; - - if(contacts.length > 0) { - - for(let i=0; i 0) { - - for(let i=0; i { - return a.name.localeCompare(b.name); - }); - - renderSpecialContacts(); - - } - - } - - let removeSpecialContact = function(number){ - - for(let i=0; iRepertoire' + - '
  • Messages
    • ' - ); - - for(let i=0; i' + - '
    ' + - '
    ' + - '{{sender}}
    #{{phoneNumber}}' + - '
    ' + - '
    ' + - '
    ' + - 'X' + - '' + - '
    ' + - '' - ; - - let MessageTpl = - '
    ' + - '
    ' + - '
    ' + - '{{sender}}
    #{{phoneNumber}}' + - '
    ' + - '
    ' + - '
    {{message}}
    ' + - '
    ' + - '
    ' - ; - - let SpecialContactTpl = '
  • {{name}}
    • '; - - let contacts = []; - let specialContacts = []; - let menu = []; - let currentItem = 0; - let currentVal = null; - let isMessageEditorOpen = false; - let isMessagesOpen = false; - let isPhoneShowed = false; - - let showMain = function() { - $('.screen').removeClass('active'); - $('.screen *').attr('disabled', 'disabled'); - } - - let showRepertoire = function() { - $('#repertoire').addClass('active'); - } - - let hideRepertoire = function() { - $('#repertoire').removeClass('active'); - } - - let showMessages = function(){ - $('#messages').addClass('active'); - isMessagesOpen = true; - } - - let hideMessages = function(){ - $('#messages').removeClass('active'); - isMessagesOpen = false; - } - - let showAddContact = function() { - $('#contact').addClass('active'); - $('.screen *').attr('disabled', 'disabled'); - $('.screen.active *').removeAttr('disabled'); - } - - let hideAddContact = function() { - $('#contact').removeClass('active'); - $('#contact_name').val(''); - $('#contact_number').val(''); - } - - let showNewMessage = function(cnum, cname) { - $('#writer').addClass('active'); - $('#writer_number').val(cnum); - $('#writer .header-title').html(cname); - $('.screen *').attr('disabled', 'disabled'); - $('.screen.active *').removeAttr('disabled'); - } - - let hideNewMessage = function() { - $('#writer').removeClass('active'); - $('#writer_number').val(''); - $('#writer_message').val(''); - $('#writer .header-title').html(''); - } - - let showGPS = function(xPos, yPos) { - $.post('http://esx_phone/setGPS', JSON.stringify({ - x: parseFloat(xPos), - y: parseFloat(yPos) - } - )); - } - - let renderContacts = function(){ - - let contactHTML = ''; - - if(contacts.length > 0) { - - for(let i=0; i 0) { - - for(let i=0; i { - return a.name.localeCompare(b.name); - }); - - renderSpecialContacts(); - - } - - } - - let removeSpecialContact = function(number){ - - for(let i=0; iKontakte' + - '
  • Nachrichten
    • ' - ); - - for(let i=0; i' + - '
    ' + - '
    ' + - '{{sender}}
    #{{phoneNumber}}' + - '
    ' + - '
    ' + - '
    ' + - 'X' + - '' + - '
    ' + - '' - ; - - let MessageTpl = - '
    ' + - '
    ' + - '
    ' + - '{{sender}}
    #{{phoneNumber}}' + - '
    ' + - '
    ' + - '
    {{message}}
    ' + - '
    ' + - '
    ' - ; - - let SpecialContactTpl = '
  • {{name}}
    • '; - - let contacts = []; - let specialContacts = []; - let menu = []; - let currentItem = 0; - let currentVal = null; - let isMessageEditorOpen = false; - let isMessagesOpen = false; - let isPhoneShowed = false; - - let showMain = function() { - $('.screen').removeClass('active'); - $('.screen *').attr('disabled', 'disabled'); - } - - let showRepertoire = function() { - $('#repertoire').addClass('active'); - } - - let hideRepertoire = function() { - $('#repertoire').removeClass('active'); - } - - let showMessages = function(){ - $('#messages').addClass('active'); - isMessagesOpen = true; - } - - let hideMessages = function(){ - $('#messages').removeClass('active'); - isMessagesOpen = false; - } - - let showAddContact = function() { - $('#contact').addClass('active'); - $('.screen *').attr('disabled', 'disabled'); - $('.screen.active *').removeAttr('disabled'); - } - - let hideAddContact = function() { - $('#contact').removeClass('active'); - $('#contact_name').val(''); - $('#contact_number').val(''); - } - - let showNewMessage = function(cnum, cname) { - $('#writer').addClass('active'); - $('#writer_number').val(cnum); - $('#writer .header-title').html(cname); - $('.screen *').attr('disabled', 'disabled'); - $('.screen.active *').removeAttr('disabled'); - } - - let hideNewMessage = function() { - $('#writer').removeClass('active'); - $('#writer_number').val(''); - $('#writer_message').val(''); - $('#writer .header-title').html(''); - } - - let showGPS = function(xPos, yPos) { - $.post('http://esx_phone/setGPS', JSON.stringify({ - x: parseFloat(xPos), - y: parseFloat(yPos) - } - )); - } - - let renderContacts = function(){ - - let contactHTML = ''; - - if(contacts.length > 0) { - - for(let i=0; i 0) { - - for(let i=0; i { - return a.name.localeCompare(b.name); - }); - - renderSpecialContacts(); - - } - - } - - let removeSpecialContact = function(number){ - - for(let i=0; iContacts' + - '
  • Messages
    • ' - ); - - for(let i=0; i' + - '
    ' + - '
    ' + - '{{sender}}
    #{{phoneNumber}}' + - '
    ' + - '
    ' + - '
    ' + - 'X' + - '' + - '
    ' + - '' - ; - - let MessageTpl = - '
    ' + - '
    ' + - '
    ' + - '{{sender}}
    #{{phoneNumber}}' + - '
    ' + - '
    ' + - '
    {{message}}
    ' + - '
    ' + - '
    ' - ; - - let SpecialContactTpl = '
  • {{name}}
    • '; - - let contacts = []; - let specialContacts = []; - let menu = []; - let currentItem = 0; - let currentVal = null; - let isMessageEditorOpen = false; - let isMessagesOpen = false; - let isPhoneShowed = false; - - let showMain = function() { - $('.screen').removeClass('active'); - $('.screen *').attr('disabled', 'disabled'); - } - - let showRepertoire = function() { - $('#repertoire').addClass('active'); - } - - let hideRepertoire = function() { - $('#repertoire').removeClass('active'); - } - - let showMessages = function(){ - $('#messages').addClass('active'); - isMessagesOpen = true; - } - - let hideMessages = function(){ - $('#messages').removeClass('active'); - isMessagesOpen = false; - } - - let showAddContact = function() { - $('#contact').addClass('active'); - $('.screen *').attr('disabled', 'disabled'); - $('.screen.active *').removeAttr('disabled'); - } - - let hideAddContact = function() { - $('#contact').removeClass('active'); - $('#contact_name').val(''); - $('#contact_number').val(''); - } - - let showNewMessage = function(cnum, cname) { - $('#writer').addClass('active'); - $('#writer_number').val(cnum); - $('#writer .header-title').html(cname); - $('.screen *').attr('disabled', 'disabled'); - $('.screen.active *').removeAttr('disabled'); - } - - let hideNewMessage = function() { - $('#writer').removeClass('active'); - $('#writer_number').val(''); - $('#writer_message').val(''); - $('#writer .header-title').html(''); - } - - let showGPS = function(xPos, yPos) { - $.post('http://esx_phone/setGPS', JSON.stringify({ - x: parseFloat(xPos), - y: parseFloat(yPos) - } - )); - } - - let renderContacts = function(){ - - let contactHTML = ''; - - if(contacts.length > 0) { - - for(let i=0; i 0) { - - for(let i=0; i { - return a.name.localeCompare(b.name); - }); - - renderSpecialContacts(); - - } - - } - - let removeSpecialContact = function(number){ - - for(let i=0; iContactos' + - '
  • Mensajes
    • ' - ); - - for(let i=0; i' + - '
    ' + - '
    ' + - '{{sender}}
    #{{phoneNumber}}' + - '
    ' + - '
    ' + - '
    ' + - 'X' + - '' + - '
    ' + - '' - ; - - let MessageTpl = - '
    ' + - '
    ' + - '
    ' + - '{{sender}}
    #{{phoneNumber}}' + - '
    ' + - '
    ' + - '
    {{message}}
    ' + - '
    ' + - '
    ' - ; - - let SpecialContactTpl = '
  • {{name}}
    • '; - - let contacts = []; - let specialContacts = []; - let menu = []; - let currentItem = 0; - let currentVal = null; - let isMessageEditorOpen = false; - let isMessagesOpen = false; - let isPhoneShowed = false; - - let showMain = function() { - $('.screen').removeClass('active'); - $('.screen *').attr('disabled', 'disabled'); - } - - let showRepertoire = function() { - $('#repertoire').addClass('active'); - } - - let hideRepertoire = function() { - $('#repertoire').removeClass('active'); - } - - let showMessages = function(){ - $('#messages').addClass('active'); - isMessagesOpen = true; - } - - let hideMessages = function(){ - $('#messages').removeClass('active'); - isMessagesOpen = false; - } - - let showAddContact = function() { - $('#contact').addClass('active'); - $('.screen *').attr('disabled', 'disabled'); - $('.screen.active *').removeAttr('disabled'); - } - - let hideAddContact = function() { - $('#contact').removeClass('active'); - $('#contact_name').val(''); - $('#contact_number').val(''); - } - - let showNewMessage = function(cnum, cname) { - $('#writer').addClass('active'); - $('#writer_number').val(cnum); - $('#writer .header-title').html(cname); - $('.screen *').attr('disabled', 'disabled'); - $('.screen.active *').removeAttr('disabled'); - } - - let hideNewMessage = function() { - $('#writer').removeClass('active'); - $('#writer_number').val(''); - $('#writer_message').val(''); - $('#writer .header-title').html(''); - } - - let showGPS = function(xPos, yPos) { - $.post('http://esx_phone/setGPS', JSON.stringify({ - x: parseFloat(xPos), - y: parseFloat(yPos) - } - )); - } - - let renderContacts = function(){ - - let contactHTML = ''; - - if(contacts.length > 0) { - - for(let i=0; i 0) { - - for(let i=0; i { - return a.name.localeCompare(b.name); - }); - - renderSpecialContacts(); - - } - - } - - let removeSpecialContact = function(number){ - - for(let i=0; iKontakty' + - '
  • Wiadomości
    • ' - ); - - for(let i=0; i":">",'"':""","'":"'","/":"/","`":"`","=":"="};function escapeHtml(string){return String(string).replace(/[&<>"'`=\/]/g,function fromEntityMap(s){return entityMap[s]})}var whiteRe=/\s*/;var spaceRe=/\s+/;var equalsRe=/\s*=/;var curlyRe=/\s*\}/;var tagRe=/#|\^|\/|>|\{|&|=|!/;function parseTemplate(template,tags){if(!template)return[];var sections=[];var tokens=[];var spaces=[];var hasTag=false;var nonSpace=false;function stripSpace(){if(hasTag&&!nonSpace){while(spaces.length)delete tokens[spaces.pop()]}else{spaces=[]}hasTag=false;nonSpace=false}var openingTagRe,closingTagRe,closingCurlyRe;function compileTags(tagsToCompile){if(typeof tagsToCompile==="string")tagsToCompile=tagsToCompile.split(spaceRe,2);if(!isArray(tagsToCompile)||tagsToCompile.length!==2)throw new Error("Invalid tags: "+tagsToCompile);openingTagRe=new RegExp(escapeRegExp(tagsToCompile[0])+"\\s*");closingTagRe=new RegExp("\\s*"+escapeRegExp(tagsToCompile[1]));closingCurlyRe=new RegExp("\\s*"+escapeRegExp("}"+tagsToCompile[1]))}compileTags(tags||mustache.tags);var scanner=new Scanner(template);var start,type,value,chr,token,openSection;while(!scanner.eos()){start=scanner.pos;value=scanner.scanUntil(openingTagRe);if(value){for(var i=0,valueLength=value.length;i0?sections[sections.length-1][4]:nestedTokens;break;default:collector.push(token)}}return nestedTokens}function Scanner(string){this.string=string;this.tail=string;this.pos=0}Scanner.prototype.eos=function eos(){return this.tail===""};Scanner.prototype.scan=function scan(re){var match=this.tail.match(re);if(!match||match.index!==0)return"";var string=match[0];this.tail=this.tail.substring(string.length);this.pos+=string.length;return string};Scanner.prototype.scanUntil=function scanUntil(re){var index=this.tail.search(re),match;switch(index){case-1:match=this.tail;this.tail="";break;case 0:match="";break;default:match=this.tail.substring(0,index);this.tail=this.tail.substring(index)}this.pos+=match.length;return match};function Context(view,parentContext){this.view=view;this.cache={".":this.view};this.parent=parentContext}Context.prototype.push=function push(view){return new Context(view,this)};Context.prototype.lookup=function lookup(name){var cache=this.cache;var value;if(cache.hasOwnProperty(name)){value=cache[name]}else{var context=this,names,index,lookupHit=false;while(context){if(name.indexOf(".")>0){value=context.view;names=name.split(".");index=0;while(value!=null&&index")value=this.renderPartial(token,context,partials,originalTemplate);else if(symbol==="&")value=this.unescapedValue(token,context);else if(symbol==="name")value=this.escapedValue(token,context);else if(symbol==="text")value=this.rawValue(token);if(value!==undefined)buffer+=value}return buffer};Writer.prototype.renderSection=function renderSection(token,context,partials,originalTemplate){var self=this;var buffer="";var value=context.lookup(token[1]);function subRender(template){return self.render(template,context,partials)}if(!value)return;if(isArray(value)){for(var j=0,valueLength=value.length;j - - - - - - - - - -
    - -
    - -
    - - unknown -
    - -
    -
      -
    • Contacts
      • -
    • Messages
      • -
    -
    - -
    -
    - Contacts - -
    -
    -
    -
    -

    No contacts

    -
    -
    -
    -
    - -
    -
    Messages - -
    -
    -
    -
    -

    No messages

    -
    -
    -
    -
    - -
    -
    -
    -
    - - - - - -
    -
    -
    - -
    -
    Add a - contact
    -
    -
    - - - - -
    -
    -
    - -
    -
    - - - - - - - - diff --git a/[esx_addons]/esx_phone/html/ui_br.html b/[esx_addons]/esx_phone/html/ui_br.html deleted file mode 100644 index b0e2c9e3..00000000 --- a/[esx_addons]/esx_phone/html/ui_br.html +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - -
    - -
    - -
    - - unknown -
    - -
    -
      -
    • Agenda
      • -
    • Mensagens
      • -
    -
    - -
    -
    - Agenda - -
    -
    -
    -
    -

    Nenhum contato

    -
    -
    -
    -
    - -
    -
    Mensagens - -
    -
    -
    -
    -

    Nenhuma mensagem

    -
    -
    -
    -
    - -
    -
    -
    -
    - - - - - -
    -
    -
    - -
    -
    Adicionar contato
    -
    -
    - - - - -
    -
    -
    - -
    -
    - - - - - - - - \ No newline at end of file diff --git a/[esx_addons]/esx_phone/html/ui_de.html b/[esx_addons]/esx_phone/html/ui_de.html deleted file mode 100644 index e8171754..00000000 --- a/[esx_addons]/esx_phone/html/ui_de.html +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - -
    - -
    - -
    - - unknown -
    - -
    -
      -
    • Kontakte
      • -
    • Nachrichten
      • -
    -
    - -
    -
    - Kontakte - -
    -
    -
    -
    -

    Keine Kontakte

    -
    -
    -
    -
    - -
    -
    Nachrichten - -
    -
    -
    -
    -

    Keine Nachrichten

    -
    -
    -
    -
    - -
    -
    -
    -
    - - - - - -
    -
    -
    - -
    -
    Kontakt - hinzufügen
    -
    -
    - - - - -
    -
    -
    - -
    -
    - - - - - - - - \ No newline at end of file diff --git a/[esx_addons]/esx_phone/html/ui_en.html b/[esx_addons]/esx_phone/html/ui_en.html deleted file mode 100644 index 18375822..00000000 --- a/[esx_addons]/esx_phone/html/ui_en.html +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - -
    - -
    - -
    - - unknown -
    - -
    -
      -
    • Contacts
      • -
    • Messages
      • -
    -
    - -
    -
    - Contacts - -
    -
    -
    -
    -

    No contacts

    -
    -
    -
    -
    - -
    -
    Messages - -
    -
    -
    -
    -

    No messages

    -
    -
    -
    -
    - -
    -
    -
    -
    - - - - - -
    -
    -
    - -
    -
    Add a - contact
    -
    -
    - - - - -
    -
    -
    - -
    -
    - - - - - - - - \ No newline at end of file diff --git a/[esx_addons]/esx_phone/html/ui_es.html b/[esx_addons]/esx_phone/html/ui_es.html deleted file mode 100644 index 9b730801..00000000 --- a/[esx_addons]/esx_phone/html/ui_es.html +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - -
    - -
    - -
    - - unknown -
    - -
    -
      -
    • Contactos
      • -
    • Mensajes
      • -
    -
    - -
    - -
    Contactos
    -
    -
    -
    -

    No hay contactos

    -
    -
    -
    -
    - -
    -
    Mensajes - -
    -
    -
    -
    -

    No hay mensajes

    -
    -
    -
    -
    - -
    -
    -
    -
    - - - - - -
    -
    -
    - -
    -
    Añadir contacto
    -
    -
    - - - - -
    -
    -
    - -
    -
    - - - - - - - - diff --git a/[esx_addons]/esx_phone/html/ui_hu.html b/[esx_addons]/esx_phone/html/ui_hu.html deleted file mode 100644 index 99dc892a..00000000 --- a/[esx_addons]/esx_phone/html/ui_hu.html +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - -
    -
    -
    - - ismeretlen -
    - -
    -
      -
    • Kapcsolatok
      • -
    • Üzenetek
      • -
    -
    - -
    -
    - Kapcsolatok - -
    -
    -
    -
    -

    Nincsenek kapcsolatok

    -
    -
    -
    -
    - -
    -
    - Üzenetek - -
    -
    -
    -
    -

    Nincs üzenet

    -
    -
    -
    -
    - -
    -
    - -
    -
    -
    - - - - - -
    -
    -
    - -
    -
    Kapcsolat hozzáadása
    -
    -
    - - - - -
    -
    -
    -
    -
    - - - - - - diff --git a/[esx_addons]/esx_phone/html/ui_pl.html b/[esx_addons]/esx_phone/html/ui_pl.html deleted file mode 100644 index 92448574..00000000 --- a/[esx_addons]/esx_phone/html/ui_pl.html +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - -
    - -
    - -
    - - #123456 -
    - -
    -
      -
    • Kontakty
      • -
    • Wiadomości
      • -
    -
    - -
    -
    - Kontakty - -
    -
    -
    -
    -

    Brak kontaktów

    -
    -
    -
    -
    - -
    -
    Wiadomości - -
    -
    -
    -
    -

    Brak wiadomości

    -
    -
    -
    -
    - -
    -
    -
    -
    - - - - - -
    -
    -
    - -
    -
    Dodaj - kontakt
    -
    -
    - - - - -
    -
    -
    - -
    -
    - - - - - - - - - \ No newline at end of file diff --git a/[esx_addons]/esx_phone/locales/br.lua b/[esx_addons]/esx_phone/locales/br.lua deleted file mode 100644 index 247c3f66..00000000 --- a/[esx_addons]/esx_phone/locales/br.lua +++ /dev/null @@ -1,13 +0,0 @@ -Locales['br'] = { - ['new_message'] = 'Nova mensagem : %s', - ['press_take_call'] = '%s - Pressione [E] para aceitar a chamada', - ['taken_call'] = '%s recebeu uma chamada', - ['gps_position'] = 'destino inserido no GPS', - ['message_sent'] = 'mensagem enviada', - ['cannot_add_self'] = 'você não pode se adicionar', - ['number_in_contacts'] = 'este número já está na sua lista de contatos', - ['contact_added'] = 'contato adicionado', - ['contact_removed'] = 'the contact has been removed!', - ['number_not_assigned'] = 'este número não foi atribuído...', - ['invalid_number'] = 'that\'s not an valid number!', -} diff --git a/[esx_addons]/esx_phone/locales/de.lua b/[esx_addons]/esx_phone/locales/de.lua deleted file mode 100644 index c5afe06d..00000000 --- a/[esx_addons]/esx_phone/locales/de.lua +++ /dev/null @@ -1,13 +0,0 @@ -Locales['de'] = { - ['new_message'] = 'Neue Nachricht', - ['press_take_call'] = '%s - Drücke [E] um den Anruf anzunehmen', - ['taken_call'] = '%s hat den Anruf angenommen', - ['gps_position'] = 'Ziel im GPS eingegeben', - ['message_sent'] = 'Nachricht wurde versendet', - ['cannot_add_self'] = 'Du kannst dich nicht selbst hinzufügen', - ['number_in_contacts'] = 'Diese Nummer ist bereits in deinen Kontakten', - ['contact_added'] = 'Kontakt hinzugefügt', - ['contact_removed'] = 'Dieser Kontakt wurde entfernt!', - ['number_not_assigned'] = 'Diese Nummer ist nicht vergeben...', - ['invalid_number'] = 'Dies ist keine gültige Telefonnummer!', -} diff --git a/[esx_addons]/esx_phone/locales/en.lua b/[esx_addons]/esx_phone/locales/en.lua deleted file mode 100644 index 29d878a3..00000000 --- a/[esx_addons]/esx_phone/locales/en.lua +++ /dev/null @@ -1,13 +0,0 @@ -Locales['en'] = { - ['new_message'] = 'You have received a message: %s', - ['press_take_call'] = '%s - Press [E] to take the call', - ['taken_call'] = '%s has taken the call', - ['gps_position'] = 'the destination has been added to your GPS', - ['message_sent'] = 'the message has been sent', - ['cannot_add_self'] = 'you can not add yourself!', - ['number_in_contacts'] = 'this number is already in your contact list', - ['contact_added'] = 'the contact has been added!', - ['contact_removed'] = 'the contact has been removed!', - ['number_not_assigned'] = 'the number has not been assigned!', - ['invalid_number'] = 'that\'s not an valid number!', -} diff --git a/[esx_addons]/esx_phone/locales/es.lua b/[esx_addons]/esx_phone/locales/es.lua deleted file mode 100644 index c8083d22..00000000 --- a/[esx_addons]/esx_phone/locales/es.lua +++ /dev/null @@ -1,14 +0,0 @@ -Locales['es'] = { - ['new_message'] = 'Nuevo mensaje : %s', - ['press_take_call'] = '%s - Pulsar [E] para coger la llamada', - ['taken_call'] = '%s ha contestado la llamada', - ['gps_position'] = 'destino añadido al GPS', - ['message_sent'] = 'mensaje enviado', - ['cannot_add_self'] = 'no puedes agregarte a ti mismo!', - ['number_in_contacts'] = 'este número ya está en tu lista de contactos', - ['contact_added'] = 'contacto añadido!', - ['contact_removed'] = 'el contacto ha sido eliminado!', - ['number_not_assigned'] = 'el número no ha sido añadido!', - ['invalid_number'] = 'el número no es válido!', -} - diff --git a/[esx_addons]/esx_phone/locales/fr.lua b/[esx_addons]/esx_phone/locales/fr.lua deleted file mode 100644 index a50a4e4c..00000000 --- a/[esx_addons]/esx_phone/locales/fr.lua +++ /dev/null @@ -1,13 +0,0 @@ -Locales['fr'] = { - ['new_message'] = 'Nouveau message : %s', - ['press_take_call'] = '%s - Appuyez sur [E] pour prendre l\'appel', - ['taken_call'] = '%s a pris l\'appel', - ['gps_position'] = 'position entrée dans le GPS', - ['message_sent'] = 'message envoyé', - ['cannot_add_self'] = 'vous ne pouvez pas vous ajouter vous-même', - ['number_in_contacts'] = 'ce numéro est déja dans votre liste de contacts', - ['contact_added'] = 'contact ajouté', - ['contact_removed'] = 'contact supprimé', - ['number_not_assigned'] = 'ce numéro n\'est pas attribué...', - ['invalid_number'] = 'that\'s not an valid number!', -} diff --git a/[esx_addons]/esx_phone/locales/hu.lua b/[esx_addons]/esx_phone/locales/hu.lua deleted file mode 100644 index dcf65f1a..00000000 --- a/[esx_addons]/esx_phone/locales/hu.lua +++ /dev/null @@ -1,13 +0,0 @@ -Locales['hu'] = { - ['new_message'] = 'Kaptál egy üzenetet: %s', - ['press_take_call'] = '%s - Nyomd meg a [E] gombot a hívás fogadásához', - ['taken_call'] = '%s fogadta a hívást', - ['gps_position'] = 'az úti cél hozzáadva a GPS-hez.', - ['message_sent'] = 'az üzenet elküldve', - ['cannot_add_self'] = 'nem adhatod hozzá magad!', - ['number_in_contacts'] = 'ez a szám már szerepel a névjegyzékében', - ['contact_added'] = 'a névjegy hozzáadva!', - ['contact_removed'] = 'a névjegy eltávolítva!', - ['number_not_assigned'] = 'a szám nincs hozzárendelve!', - ['invalid_number'] = 'ez nem érvényes szám!', -} diff --git a/[esx_addons]/esx_phone/locales/it.lua b/[esx_addons]/esx_phone/locales/it.lua deleted file mode 100644 index a99c4a96..00000000 --- a/[esx_addons]/esx_phone/locales/it.lua +++ /dev/null @@ -1,13 +0,0 @@ -Locales['it'] = { - ['new_message'] = 'Hai ricevuto un messaggio: %s', - ['press_take_call'] = '%s - Premi [E] per rispondere', - ['taken_call'] = '%s chiamata in corso...', - ['gps_position'] = 'La destinazione è stata aggiunta al tuo GPS', - ['message_sent'] = 'Messaggio inviato', - ['cannot_add_self'] = 'Non puoi aggiungere te stesso!', - ['number_in_contacts'] = 'Questo numero è già presente nella lista contatti', - ['contact_added'] = 'Contatto aggiunto!', - ['contact_removed'] = 'Contatto rimosso!', - ['number_not_assigned'] = 'Il numero non è stato assegnato!', - ['invalid_number'] = 'Numero inserito non valido', -} diff --git a/[esx_addons]/esx_phone/locales/nl.lua b/[esx_addons]/esx_phone/locales/nl.lua deleted file mode 100644 index 75944215..00000000 --- a/[esx_addons]/esx_phone/locales/nl.lua +++ /dev/null @@ -1,13 +0,0 @@ -Locales['nl'] = { - ['new_message'] = 'Je hebt een bericht ontvangen: %s', - ['press_take_call'] = '%s - Klik op [E] om op te nemen', - ['taken_call'] = '%s heeft opgenomen', - ['gps_position'] = 'de bestemming is op je navigatie gezet', - ['message_sent'] = 'het bericht is verstuurd', - ['cannot_add_self'] = 'je kan jezelf niet toevoegen!', - ['number_in_contacts'] = 'dit nummer staat al in je contacten', - ['contact_added'] = 'je hebt een contact toegevoegd!', - ['contact_removed'] = 'je hebt een contact verwijderd!', - ['number_not_assigned'] = 'het nummer is nog niet toegewezen!', - ['invalid_number'] = 'dat is een ongeldig nummer!', -} diff --git a/[esx_addons]/esx_phone/locales/pl.lua b/[esx_addons]/esx_phone/locales/pl.lua deleted file mode 100644 index 5df9746c..00000000 --- a/[esx_addons]/esx_phone/locales/pl.lua +++ /dev/null @@ -1,13 +0,0 @@ -Locales['pl'] = { - ['new_message'] = 'Masz nową wiadomość: %s', - ['press_take_call'] = '%s - wciśnij [E] aby odebrać telefon', - ['taken_call'] = '%s odebrał telefon', - ['gps_position'] = 'cel podróży został dodany do GPS\'a', - ['message_sent'] = 'wiadomość wysłana', - ['cannot_add_self'] = 'nie możesz dodać samego siebie!', - ['number_in_contacts'] = 'ten numer jest już na twojej liście kontaktów', - ['contact_added'] = 'kontakt dodany!', - ['contact_removed'] = 'kontakt usunięty!', - ['number_not_assigned'] = 'numer nie jest przypisany!', - ['invalid_number'] = 'to nie jest prawidłowy numer telefonu!', -} diff --git a/[esx_addons]/esx_phone/locales/si.lua b/[esx_addons]/esx_phone/locales/si.lua deleted file mode 100644 index d43bb5e1..00000000 --- a/[esx_addons]/esx_phone/locales/si.lua +++ /dev/null @@ -1,13 +0,0 @@ -Locales['si'] = { - ['new_message'] = 'Prejeli ste sporočilo: %s', - ['press_take_call'] = '%s - Pritisnite [E] za sprejem klica', - ['taken_call'] = '%s je sprejel klic', - ['gps_position'] = 'cilj je bil dodan v vaš GPS', - ['message_sent'] = 'sporočilo je bilo poslano', - ['cannot_add_self'] = 'ne morete se dodati!', - ['number_in_contacts'] = 'ta številka je že na vašem seznamu stikov', - ['contact_added'] = 'stik je bil dodan!', - ['contact_removed'] = 'stik je bil odstranjen!', - ['number_not_assigned'] = 'številka ni bila dodeljena!', - ['invalid_number'] = 'to ni veljavna številka!', -} diff --git a/[esx_addons]/esx_phone/locales/sv.lua b/[esx_addons]/esx_phone/locales/sv.lua deleted file mode 100644 index fc23d6db..00000000 --- a/[esx_addons]/esx_phone/locales/sv.lua +++ /dev/null @@ -1,13 +0,0 @@ -Locales['sv'] = { - ['new_message'] = 'Nytt meddelande: %s', - ['press_take_call'] = '%s - tryck [E] för att svara', - ['taken_call'] = '%s har tagit emot ditt meddelande', - ['gps_position'] = 'destinationen är markerad på din GPS!', - ['message_sent'] = 'meddelandet har skickats!', - ['cannot_add_self'] = 'du kan inte lägga till dig själv!', - ['number_in_contacts'] = 'det här nummret finns redan bland dina kontakter!', - ['contact_added'] = 'kontakten har lags till!', - ['contact_removed'] = 'kontakten har tagits bort!', - ['number_not_assigned'] = 'det här nummret finns inte!', - ['invalid_number'] = 'det är inte ett giltigt nummer!', -} diff --git a/[esx_addons]/esx_phone/server/main.lua b/[esx_addons]/esx_phone/server/main.lua deleted file mode 100644 index fc865a32..00000000 --- a/[esx_addons]/esx_phone/server/main.lua +++ /dev/null @@ -1,293 +0,0 @@ - -local DisptachRequestId, PhoneNumbers = 0, {} - -AddEventHandler('onResourceStart', function(resource) - if resource == GetCurrentResourceName() then - local xPlayers = ESX.GetExtendedPlayers() - - for k, v in pairs(xPlayers) do - LoadPlayer(v) - end - end -end) - -function LoadPlayer(player) - local xPlayer = player - - for num,v in pairs(PhoneNumbers) do - if tonumber(num) == num then -- if phonenumber is a player phone number - for src,_ in pairs(v.sources) do - TriggerClientEvent('esx_phone:setPhoneNumberSource', xPlayer.source, num, tonumber(src)) - end - end - end - - MySQL.query('SELECT phone_number FROM users WHERE identifier = @identifier', { - ['@identifier'] = xPlayer.identifier - }, function(result) - local phoneNumber = result[1].phone_number - - if phoneNumber == nil then - phoneNumber = GenerateUniquePhoneNumber() - - MySQL.update('UPDATE users SET phone_number = @phone_number WHERE identifier = @identifier', { - ['@identifier'] = xPlayer.identifier, - ['@phone_number'] = phoneNumber - }) - end - TriggerClientEvent('esx_phone:setPhoneNumberSource', -1, phoneNumber, xPlayer.source) - - PhoneNumbers[phoneNumber] = { - type = 'player', - hashDispatch = false, - sharePos = false, - hideNumber = false, - hidePosIfAnon = false, - sources = {[xPlayer.source] = true} - } - - xPlayer.set('phoneNumber', phoneNumber) - local contacts = {} - - if PhoneNumbers[xPlayer.job.name] then - TriggerEvent('esx_phone:addSource', xPlayer.job.name, xPlayer.source) - end - - MySQL.query('SELECT * FROM user_contacts WHERE identifier = @identifier ORDER BY name ASC', { - ['@identifier'] = xPlayer.identifier - }, function(result2) - for i=1, #result2, 1 do - table.insert(contacts, { - name = result2[i].name, - number = result2[i].number, - }) - end - - xPlayer.set('contacts', contacts) - TriggerClientEvent('esx_phone:loaded', xPlayer.source, phoneNumber, contacts) - end) - end) -end - -function GenerateUniquePhoneNumber() - local foundNumber, phoneNumber = false, nil - - while not foundNumber do - Wait(100) - - math.randomseed(GetGameTimer()) - phoneNumber = math.random(10000, 99999) - - local result = MySQL.query.await('SELECT COUNT(*) as count FROM users WHERE phone_number = @phoneNumber', { - ['@phoneNumber'] = phoneNumber - }) - - if tonumber(result[1].count) == 0 then - foundNumber = true - end - end - - return phoneNumber -end - -function GetDistpatchRequestId() - local requestId = DisptachRequestId - - if DisptachRequestId < 65535 then - DisptachRequestId = DisptachRequestId + 1 - else - DisptachRequestId = 0 - end - - return requestId -end - -AddEventHandler('esx_phone:getDistpatchRequestId', function(cb) - cb(GetDistpatchRequestId()) -end) - -AddEventHandler('esx:playerLoaded', function(playerId, xPlayer) - LoadPlayer(xPlayer) -end) - -AddEventHandler('esx:playerDropped', function(source) - local xPlayer = ESX.GetPlayerFromId(source) - local phoneNumber = xPlayer.get('phoneNumber') - - TriggerClientEvent('esx_phone:setPhoneNumberSource', -1, phoneNumber, -1) - PhoneNumbers[phoneNumber] = nil - - if PhoneNumbers[xPlayer.job.name] then - TriggerEvent('esx_phone:removeSource', xPlayer.job.name, source) - end -end) - -AddEventHandler('esx:setJob', function(source, job, lastJob) - if PhoneNumbers[lastJob.name] then - TriggerEvent('esx_phone:removeSource', lastJob.name, source) - end - - if PhoneNumbers[job.name] then - TriggerEvent('esx_phone:addSource', job.name, source) - end -end) - -RegisterServerEvent('esx_phone:reload') -AddEventHandler('esx_phone:reload', function(phoneNumber) - local playerId = source - local xPlayer = ESX.GetPlayerFromId(playerId) - local contacts = xPlayer.get('contacts') - - TriggerClientEvent('esx_phone:loaded', playerId, phoneNumber, contacts) -end) - -RegisterServerEvent('esx_phone:send') -AddEventHandler('esx_phone:send', function(phoneNumber, message, anon, position) - local xPlayer = ESX.GetPlayerFromId(source) - print(('esx_phone: MESSAGE => %s@%s: %s'):format(xPlayer.name, phoneNumber, message)) - - if PhoneNumbers[phoneNumber] then - for k,v in pairs(PhoneNumbers[phoneNumber].sources) do - local numType = PhoneNumbers[phoneNumber].type - local numHasDispatch = PhoneNumbers[phoneNumber].hasDispatch - local numHide = PhoneNumbers[phoneNumber].hideNumber - local numHidePosIfAnon = PhoneNumbers[phoneNumber].hidePosIfAnon - local numPosition = (PhoneNumbers[phoneNumber].sharePos and position or false) - local numSource = tonumber(k) - - if numHidePosIfAnon and anon then - numPosition = false - end - - if numHasDispatch then - TriggerClientEvent('esx_phone:onMessage', numSource, xPlayer.get('phoneNumber'), message, numPosition, (numHide and true or anon), numType, GetDistpatchRequestId(), phoneNumber) - else - TriggerClientEvent('esx_phone:onMessage', numSource, xPlayer.get('phoneNumber'), message, numPosition, (numHide and true or anon), numType, false) - end - end - end -end) - -AddEventHandler('esx_phone:registerNumber', function(number, type, sharePos, hasDispatch, hideNumber, hidePosIfAnon) - local hideNumber = hideNumber or false - local hidePosIfAnon = hidePosIfAnon or false - - PhoneNumbers[number] = { - type = type, - sharePos = sharePos, - hasDispatch = (hasDispatch or false), - hideNumber = hideNumber, - hidePosIfAnon = hidePosIfAnon, - sources = {} - } -end) - -AddEventHandler('esx_phone:removeNumber', function(number) - PhoneNumbers[number] = nil -end) - -AddEventHandler('esx_phone:addSource', function(number, source) - PhoneNumbers[number].sources[tostring(source)] = true -end) - -AddEventHandler('esx_phone:removeSource', function(number, source) - PhoneNumbers[number].sources[tostring(source)] = nil -end) - -RegisterServerEvent('esx_phone:addPlayerContact') -AddEventHandler('esx_phone:addPlayerContact', function(phoneNumber, contactName) - local playerId = source - local xPlayer = ESX.GetPlayerFromId(playerId) - phoneNumber = tonumber(phoneNumber) - local playerOnline = false - - if phoneNumber == nil then - print(('esx_phone: %s parsed invalid player contact number!'):format(xPlayer.identifier)) - return - end - - MySQL.query('SELECT phone_number, identifier FROM users WHERE phone_number = @number', { - ['@number'] = phoneNumber - }, function(result) - if result[1] then - if phoneNumber == xPlayer.get('phoneNumber') then - TriggerClientEvent('esx:showNotification', playerId, TranslateCap('cannot_add_self')) - else - local contacts = xPlayer.get('contacts') - - -- already added player? - for i=1, #contacts, 1 do - if contacts[i].number == phoneNumber then - TriggerClientEvent('esx:showNotification', playerId, TranslateCap('number_in_contacts')) - return - end - end - - table.insert(contacts, { - name = contactName, - number = phoneNumber - }) - - xPlayer.set('contacts', contacts) - - -- is the player currently online? - local xTarget = ESX.GetPlayerFromIdentifier(result[1].identifier) - playerOnline = xTarget ~= nil - - MySQL.update('INSERT INTO user_contacts (identifier, name, number) VALUES (@identifier, @name, @number)', { - ['@identifier'] = xPlayer.identifier, - ['@name'] = contactName, - ['@number'] = phoneNumber - }, function(rowsChanged) - TriggerClientEvent('esx:showNotification', playerId, TranslateCap('contact_added')) - TriggerClientEvent('esx_phone:addContact', playerId, contactName, phoneNumber, playerOnline) - end) - end - else - TriggerClientEvent('esx:showNotification', playerId, TranslateCap('number_not_assigned')) - end - end) -end) - -RegisterServerEvent('esx_phone:removePlayerContact') -AddEventHandler('esx_phone:removePlayerContact', function(phoneNumber, contactName) - local playerId = source - local xPlayer = ESX.GetPlayerFromId(playerId) - local foundNumber = false - - MySQL.query('SELECT phone_number FROM users WHERE phone_number = @number', { - ['@number'] = phoneNumber - }, function(result) - if result[1] then - foundNumber = true - end - - if foundNumber then - local contacts = xPlayer.get('contacts') - - for key, value in pairs(contacts) do - if value.name == contactName and value.number == phoneNumber then - table.remove(contacts, key) - end - end - - xPlayer.set('contacts', contacts) - - MySQL.update('DELETE FROM user_contacts WHERE identifier = @identifier AND name = @name AND number = @number', { - ['@identifier'] = xPlayer.identifier, - ['@name'] = contactName, - ['@number'] = phoneNumber - }, function(rowsChanged) - TriggerClientEvent('esx:showNotification', playerId, TranslateCap('contact_removed')) - TriggerClientEvent('esx_phone:removeContact', playerId, contactName, phoneNumber) - end) - else - TriggerClientEvent('esx:showNotification', playerId, TranslateCap('number_not_assigned')) - end - end) -end) - -RegisterServerEvent('esx_phone:stopDispatch') -AddEventHandler('esx_phone:stopDispatch', function(dispatchRequestId) - TriggerClientEvent('esx_phone:stopDispatch', -1, dispatchRequestId, GetPlayerName(source)) -end) \ No newline at end of file diff --git a/[esx_addons]/esx_policejob/client/main.lua b/[esx_addons]/esx_policejob/client/main.lua index 0115ba9c..faa2ea4b 100644 --- a/[esx_addons]/esx_policejob/client/main.lua +++ b/[esx_addons]/esx_policejob/client/main.lua @@ -918,27 +918,6 @@ AddEventHandler('esx:setJob', function(job) end end) -RegisterNetEvent('esx_phone:loaded') -AddEventHandler('esx_phone:loaded', function(phoneNumber, contacts) - local specialContact = { - name = TranslateCap('phone_police'), - number = 'police', - base64Icon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NDFGQTJDRkI0QUJCMTFFN0JBNkQ5OENBMUI4QUEzM0YiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NDFGQTJDRkM0QUJCMTFFN0JBNkQ5OENBMUI4QUEzM0YiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo0MUZBMkNGOTRBQkIxMUU3QkE2RDk4Q0ExQjhBQTMzRiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo0MUZBMkNGQTRBQkIxMUU3QkE2RDk4Q0ExQjhBQTMzRiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PoW66EYAAAjGSURBVHjapJcLcFTV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' - } - - TriggerEvent('esx_phone:addSpecialContact', specialContact.name, specialContact.number, specialContact.base64Icon) -end) - --- don't show dispatches if the player isn't in service -AddEventHandler('esx_phone:cancelMessage', function(dispatchNumber) - if ESX.PlayerData.job and ESX.PlayerData.job.name == 'police' and ESX.PlayerData.job.name == dispatchNumber then - -- if esx_service is enabled - if Config.EnableESXService and not playerInService then - CancelEvent() - end - end -end) - AddEventHandler('esx_policejob:hasEnteredMarker', function(station, part, partNum) if part == 'Cloakroom' then CurrentAction = 'menu_cloakroom' @@ -1521,7 +1500,6 @@ end) AddEventHandler('onResourceStop', function(resource) if resource == GetCurrentResourceName() then TriggerEvent('esx_policejob:unrestrain') - TriggerEvent('esx_phone:removeSpecialContact', 'police') if Config.EnableESXService then TriggerServerEvent('esx_service:disableService', 'police') diff --git a/[esx_addons]/esx_policejob/locales/br.lua b/[esx_addons]/esx_policejob/locales/br.lua index 2f430e44..c2e6e84d 100644 --- a/[esx_addons]/esx_policejob/locales/br.lua +++ b/[esx_addons]/esx_policejob/locales/br.lua @@ -145,7 +145,4 @@ Locales['br'] = { ['remove_prop'] = 'Pressione [E] para remover o objeto', ['map_blip'] = 'Departamento de Polícia', ['unrestrained_timer'] = 'you feel your handcuffs slowly losing grip and fading away.', - -- Notifications - ['alert_police'] = 'Alerta da Polícia', - ['phone_police'] = 'police', } diff --git a/[esx_addons]/esx_policejob/locales/cs.lua b/[esx_addons]/esx_policejob/locales/cs.lua index 863e361d..4d73e757 100644 --- a/[esx_addons]/esx_policejob/locales/cs.lua +++ b/[esx_addons]/esx_policejob/locales/cs.lua @@ -145,7 +145,4 @@ Locales['cs'] = { ['remove_prop'] = 'stiskni [E] pro odstranění předmětu', ['map_blip'] = 'policejní stanice', ['unrestrained_timer'] = 'cítíš, že tvé pouta pomalu ztrácejí přilnavost a padají.', - -- Notifications - ['alert_police'] = 'policejní poplach', - ['phone_police'] = 'policie', } diff --git a/[esx_addons]/esx_policejob/locales/de.lua b/[esx_addons]/esx_policejob/locales/de.lua index 2aebdc53..44c12991 100644 --- a/[esx_addons]/esx_policejob/locales/de.lua +++ b/[esx_addons]/esx_policejob/locales/de.lua @@ -145,7 +145,4 @@ Locales['de'] = { ['remove_prop'] = 'Drücke [E], um das Objekt zu entfernen', ['map_blip'] = 'Polizeistation', ['unrestrained_timer'] = 'Du spürst, wie die Handschellen langsam ihren Halt verlieren und sich auflösen.', - -- Notifications - ['alert_police'] = 'Polizei alarmieren', - ['phone_police'] = 'Polizei', } diff --git a/[esx_addons]/esx_policejob/locales/en.lua b/[esx_addons]/esx_policejob/locales/en.lua index 1e248348..6b6a12bc 100644 --- a/[esx_addons]/esx_policejob/locales/en.lua +++ b/[esx_addons]/esx_policejob/locales/en.lua @@ -145,7 +145,4 @@ Locales['en'] = { ['remove_prop'] = 'press [E] to delete the object', ['map_blip'] = 'police Station', ['unrestrained_timer'] = 'you feel your handcuffs slowly losing grip and fading away.', - -- Notifications - ['alert_police'] = 'police alert', - ['phone_police'] = 'police', } diff --git a/[esx_addons]/esx_policejob/locales/es.lua b/[esx_addons]/esx_policejob/locales/es.lua index e390020e..389f43f4 100644 --- a/[esx_addons]/esx_policejob/locales/es.lua +++ b/[esx_addons]/esx_policejob/locales/es.lua @@ -145,7 +145,4 @@ Locales['es'] = { ['remove_prop'] = 'presionar [E] para eliminar el objeto', ['map_blip'] = 'comisaría de policía', ['unrestrained_timer'] = 'you feel your handcuffs slowly losing grip and fading away.', - -- Notifications - ['alert_police'] = 'alerta policia', - ['phone_police'] = 'policia', } diff --git a/[esx_addons]/esx_policejob/locales/et.lua b/[esx_addons]/esx_policejob/locales/et.lua index e62c9738..4b1834b6 100644 --- a/[esx_addons]/esx_policejob/locales/et.lua +++ b/[esx_addons]/esx_policejob/locales/et.lua @@ -150,7 +150,4 @@ Locales['et'] = { ['remove_prop'] = 'Vajuta ~INPUT_CONTEXT~ et kustutada asi sinu ees.', ['map_blip'] = 'Politseijaoskond', ['unrestrained_timer'] = 'Sa tunned, kuidas käerauad libisevad kätelt.', - -- Notifications - ['alert_police'] = 'Politsei teavitus', - ['phone_police'] = 'Politsei', } diff --git a/[esx_addons]/esx_policejob/locales/fi.lua b/[esx_addons]/esx_policejob/locales/fi.lua index 8041f6c6..db2d037e 100644 --- a/[esx_addons]/esx_policejob/locales/fi.lua +++ b/[esx_addons]/esx_policejob/locales/fi.lua @@ -145,7 +145,4 @@ Locales['fi'] = { ['remove_prop'] = 'paina [E] poistaaksesi objektin', ['map_blip'] = 'poliisilaitos', ['unrestrained_timer'] = 'tunnet kuinka hitaasti käsiraudat alkavat löystyä ja irtoavat', - -- Notifications - ['alert_police'] = 'hälyytys Poliisi', - ['phone_police'] = 'poliisi', } \ No newline at end of file diff --git a/[esx_addons]/esx_policejob/locales/fr.lua b/[esx_addons]/esx_policejob/locales/fr.lua index 23839ca6..c3136406 100644 --- a/[esx_addons]/esx_policejob/locales/fr.lua +++ b/[esx_addons]/esx_policejob/locales/fr.lua @@ -145,7 +145,4 @@ Locales['fr'] = { ['remove_prop'] = 'appuyez sur [E] pour enlever l\'objet', ['map_blip'] = 'Commissariat', ['unrestrained_timer'] = 'vous sentez que vos menottes deviennent fragiles.', - -- Notifications - ['alert_police'] = 'alerte police', - ['phone_police'] = 'police', } diff --git a/[esx_addons]/esx_policejob/locales/hu.lua b/[esx_addons]/esx_policejob/locales/hu.lua index 08b4be92..6938493c 100644 --- a/[esx_addons]/esx_policejob/locales/hu.lua +++ b/[esx_addons]/esx_policejob/locales/hu.lua @@ -146,7 +146,4 @@ Locales['hu'] = { ['remove_prop'] = 'Nyomj [E] gombot az objektum törléséhez', ['map_blip'] = 'LSPD', ['unrestrained_timer'] = '...', - -- Notifications - ['alert_police'] = 'riasztás', - ['phone_police'] = 'rendörség', } diff --git a/[esx_addons]/esx_policejob/locales/ko.lua b/[esx_addons]/esx_policejob/locales/ko.lua index fc539dc3..f83119f3 100644 --- a/[esx_addons]/esx_policejob/locales/ko.lua +++ b/[esx_addons]/esx_policejob/locales/ko.lua @@ -145,7 +145,4 @@ Locales['ko'] = { ['remove_prop'] = '[E]를 눌러 오브젝트를 삭제하십시오.', ['map_blip'] = '경찰서', ['unrestrained_timer'] = '당신의 수갑이 천천히 풀리는 것을 느낍니다.', - -- Notifications - ['alert_police'] = '경찰 경보', - ['phone_police'] = '경찰', } diff --git a/[esx_addons]/esx_policejob/locales/nl.lua b/[esx_addons]/esx_policejob/locales/nl.lua index c8511feb..49fb3d2e 100644 --- a/[esx_addons]/esx_policejob/locales/nl.lua +++ b/[esx_addons]/esx_policejob/locales/nl.lua @@ -146,7 +146,4 @@ Locales['nl'] = { ['remove_prop'] = 'Druk op [E] om dit object te verwijderen.', ['map_blip'] = 'Politiebureau', ['unrestrained_timer'] = 'Je voelt je handboeien langzaam wegglijden.', - -- Notifications - ['alert_police'] = 'politie alert', - ['phone_police'] = 'politie', } diff --git a/[esx_addons]/esx_policejob/locales/pl.lua b/[esx_addons]/esx_policejob/locales/pl.lua index 69cf3f8c..725e67dd 100644 --- a/[esx_addons]/esx_policejob/locales/pl.lua +++ b/[esx_addons]/esx_policejob/locales/pl.lua @@ -145,7 +145,4 @@ Locales['pl'] = { ['remove_prop'] = 'naciśnij [E] aby usunąć ten obiekt', ['map_blip'] = 'komisariat Policji', ['unrestrained_timer'] = 'czujesz, że twoje kajdanki powoli tracą przyczepność i znikają.', - -- Notifications - ['alert_police'] = 'ostrzeż policję', - ['phone_police'] = 'police', } diff --git a/[esx_addons]/esx_policejob/locales/si.lua b/[esx_addons]/esx_policejob/locales/si.lua index 3625428e..c84e45db 100644 --- a/[esx_addons]/esx_policejob/locales/si.lua +++ b/[esx_addons]/esx_policejob/locales/si.lua @@ -146,7 +146,4 @@ Locales['si'] = { ['remove_prop'] = 'pritisnite [E], da izbrišete predmet', ['map_blip'] = 'policijska postaja', ['unrestrained_timer'] = 'čutiš, kako se ti izgubljaš oprijem in kako se ti razblinjajo okovi.', --- obvestila -['alert_police'] = 'policijski alarm', -['phone_police'] = 'policija', } diff --git a/[esx_addons]/esx_policejob/locales/sv.lua b/[esx_addons]/esx_policejob/locales/sv.lua index 29178bde..e6e6673f 100644 --- a/[esx_addons]/esx_policejob/locales/sv.lua +++ b/[esx_addons]/esx_policejob/locales/sv.lua @@ -145,7 +145,4 @@ Locales['sv'] = { ['remove_prop'] = 'tryck [E] för att ta bort objektet', ['map_blip'] = 'polisstation', ['unrestrained_timer'] = 'dina handklovar har försvunnit', - -- Notifications - ['alert_police'] = 'meddela polisen', - ['phone_police'] = 'polisen', } diff --git a/[esx_addons]/esx_policejob/locales/tr.lua b/[esx_addons]/esx_policejob/locales/tr.lua index 98c2a40d..d121c3e6 100644 --- a/[esx_addons]/esx_policejob/locales/tr.lua +++ b/[esx_addons]/esx_policejob/locales/tr.lua @@ -145,7 +145,4 @@ Locales['tr'] = { ['remove_prop'] = 'objeyi silmek için [E] tuşuna basın', ['map_blip'] = 'polis Karakolu', ['unrestrained_timer'] = 'ellerinin yavaşça çözüldüğünü hissediyorsun.', - -- Notifications - ['alert_police'] = 'polis Acil Durum', - ['phone_police'] = 'polis', } diff --git a/[esx_addons]/esx_policejob/server/main.lua b/[esx_addons]/esx_policejob/server/main.lua index 5aa7712f..8cc2c7a0 100644 --- a/[esx_addons]/esx_policejob/server/main.lua +++ b/[esx_addons]/esx_policejob/server/main.lua @@ -4,7 +4,6 @@ if Config.EnableESXService then end end -TriggerEvent('esx_phone:registerNumber', 'police', TranslateCap('alert_police'), true, true) CreateThread(function() exports["esx_society"]:registerSociety('police', 'Police', 'society_police', 'society_police', 'society_police', {type = 'public'}) end) @@ -458,9 +457,3 @@ AddEventHandler('onResourceStart', function(resource) end end end) - -AddEventHandler('onResourceStop', function(resource) - if resource == GetCurrentResourceName() then - TriggerEvent('esx_phone:removeNumber', 'police') - end -end) diff --git a/[esx_addons]/esx_taxijob/client/main.lua b/[esx_addons]/esx_taxijob/client/main.lua index afb3b56e..fb0c5c2a 100644 --- a/[esx_addons]/esx_taxijob/client/main.lua +++ b/[esx_addons]/esx_taxijob/client/main.lua @@ -431,17 +431,6 @@ AddEventHandler('esx_taxijob:hasExitedMarker', function(zone) CurrentAction = nil end) -RegisterNetEvent('esx_phone:loaded') -AddEventHandler('esx_phone:loaded', function(phoneNumber, contacts) - local specialContact = { - name = TranslateCap('phone_taxi'), - number = 'taxi', - base64Icon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAGGElEQVR4XsWWW2gd1xWGv7Vn5pyRj47ut8iOYlmyWxw1KSZN4riOW6eFuCYldaBtIL1Ag4NNmt5ICORCaNKXlF6oCy0hpSoJKW4bp7Sk6YNb01RuLq4d0pQ0kWQrshVJ1uX46HJ0zpy5rCKfQYgjCUs4kA+GtTd786+ftW8jqsqHibB6TLZn2zeq09ZTWAIWCxACoTI1E+6v+eSpXwHRqkVZPcmqlBzCApLQ8dk3IWVKMQlYcHG81OODNmD6D7d9VQrTSbwsH73lFKePtvOxXSfn48U+Xpb58fl5gPmgl6DiR19PZN4+G7iODY4liIAACqiCHyp+AFvb7ML3uot1QP5yDUim292RtIqfU6Lr8wFVDVV8AsPKRDAxzYkKm2kj5sSFuUT3+v2FXkDXakD6f+7c1NGS7Ml0Pkah6jq8mhvwUy7Cyijg5Aoks6/hTp+k7vRjDJ73dmw8WHxlJRM2y5Nsb3GPDuzsZURbGMsUmRkoUPByCMrKCG7SobJiO01X7OKq6utoe3XX34BaoLDaCljj3faTcu3j3z3T+iADwzNYEmKIWcGAIAtqqkKAxZa2Sja/tY+59/7y48aveQ8A4Woq4Fa3bj7Q1/EgwWRAZ52NMTYCWAZEwIhBUEQgUiVQ8IpKvqj4kVJCyGRCRrb+hvap+gPAo0DuUhWQfx2q29u+t/vPmarbCLwII7qQTEQRLbUtBJ2PAkZARBADqkLBV/I+BGrhpoSN577FWz3P3XbTvRMvAlpuwC4crv5jwtK9RAFSu46+G8cRwESxQ+K2gESAgCiIASHuA8YCBdSUohdCKGCF0H6iGc3MgrEphvKi+6Wp24HABioSjuxFARGobyJ5OMXEiGHW6iLR0EmifhPJDddj3CoqtuwEZSkCc73/RAvTeEOvU5w8gz/Zj2TfoLFFibZvQrI5EOFiPqgAZmzApTINKKgPiW20ffkXtPXfA9Ysmf5/kHn/T0z8e5rpCS5JVQNUN1ayfn2a+qvT2JWboOOXMPg0ms6C2IAAWTc2ACPeupdbm5yb8XNQczOM90DOB0uoa01Ttz5FZ6IL3Ctg9DUIg7Lto2DZ0HIDFEbAz4AaiBRyxZJe9U7kQg84KYbH/JeJESANXPXwXdWffvzu1p+x5VE4/ST4EyAOoEAI6WsAhdx/AYulhJDqAgRm/hPPEVAfnAboeAB6v88jTw/f98SzU8eAwbgC5IGRg3vsW3E7YewYzJwF4wAhikJURGqvBO8ouAFIxBI0gqgPEp9B86+ASSAIEEHhbEnX7eTgnrFbn3iW5+K82EAA+M2V+d2EeRj9K/izIBYgJZGwCO4Gzm/uRQOwDEsI41PSfPZ+xJsBKwFo6dOwpJvezMU84Md5sSmRCM51uacGbUKvHWEjAKIelXaGJqePyopjzFTdx6Ef/gDbjo3FKEoQKN+8/yEqRt8jf67IaNDBnF9FZFwERRGspMM20+XC64nym9AMhSE1G7fjbb0bCQsISi6vFCdPMPzuUwR9AcmOKQ7cew+WZcq3IGEYMZeb4p13sjjmU4TX7Cfdtp0oDAFBbZfk/37N0MALAKbcAKaY4yPeuwy3t2J8MAKDIxDVd1Lz8Ts599vb8Wameen532GspRWIQmXPHV8k0BquvPP3TOSgsRmiCFRAHWh9420Gi7nl34JaBen7O7UWRMD740AQ7yEf8nW78TIeN+7+PCIsOYaqMJHxqKtpJ++D+DA5ARsawEmASqzv1Cz7FjRpbt951tUAOcAHdNEUC7C5NAJo7Dws03CAFMxlkdSRZmCMxaq8ejKuVwSqIJfzA61LmyIgBoxZfgmYmQazKLGumHitRso0ZVkD0aE/FI7UrYv2WUYXjo0ihNhEatA1GBEUIxEWAcKCHhHCVMG8AETlda0ENn3hrm+/6Zh47RBCtXn+mZ/sAXzWjnPHV77zkiXBgl6gFkee+em1wBlgdnEF8sCF5moLI7KwlSIMwABwgbVT21htMNjleheAfPkShEBh/PzQccexdxBT9IPjQAYYZ+3o2OjQ8cQiPb+kVwBCliENXA3sAm6Zj3E/zaq4fD07HmwEmuKYXsUFcDl6Hz7/B1RGfEbPim/bAAAAAElFTkSuQmCC' - } - - TriggerEvent('esx_phone:addSpecialContact', specialContact.name, specialContact.number, specialContact.base64Icon) -end) - -- Create Blips CreateThread(function() local blip = AddBlipForCoord(Config.Zones.TaxiActions.Pos.x, Config.Zones.TaxiActions.Pos.y, diff --git a/[esx_addons]/esx_taxijob/locales/br.lua b/[esx_addons]/esx_taxijob/locales/br.lua index 473505d2..7a2a5fd4 100644 --- a/[esx_addons]/esx_taxijob/locales/br.lua +++ b/[esx_addons]/esx_taxijob/locales/br.lua @@ -46,7 +46,6 @@ Locales['br'] = { ['have_deposited'] = 'você depositou x%s %s', ['player_cannot_hold'] = 'você não tem espaço suficiente em seu inventário!', ['blip_taxi'] = 'taxi', - ['phone_taxi'] = 'taxi', ['taxi'] = 'taxi', ['taxi_stock'] = 'taxi Stock' } diff --git a/[esx_addons]/esx_taxijob/locales/de.lua b/[esx_addons]/esx_taxijob/locales/de.lua index 80cb2b37..4510c1c6 100644 --- a/[esx_addons]/esx_taxijob/locales/de.lua +++ b/[esx_addons]/esx_taxijob/locales/de.lua @@ -46,7 +46,6 @@ Locales['de'] = { ['have_deposited'] = 'Du hast eingelagert x%s %s', ['player_cannot_hold'] = 'Du hast nicht genug Platz im Inventar', ['blip_taxi'] = 'taxi', - ['phone_taxi'] = 'taxi', ['taxi'] = 'taxi', ['taxi_stock'] = 'taxi lagerbestand' } diff --git a/[esx_addons]/esx_taxijob/locales/en.lua b/[esx_addons]/esx_taxijob/locales/en.lua index 9721f5e3..6982f30b 100644 --- a/[esx_addons]/esx_taxijob/locales/en.lua +++ b/[esx_addons]/esx_taxijob/locales/en.lua @@ -47,7 +47,6 @@ Locales['en'] = { ['have_deposited'] = 'you have deposited x%s %s', ['player_cannot_hold'] = 'you do ~r~not have enough free space in your inventory!', ['blip_taxi'] = 'downtown Cab Co.', - ['phone_taxi'] = 'downtown Cab Co.', ['taxi'] = 'taxi', ['taxi_stock'] = 'taxi Stock' } diff --git a/[esx_addons]/esx_taxijob/locales/es.lua b/[esx_addons]/esx_taxijob/locales/es.lua index 11059049..ff24663c 100644 --- a/[esx_addons]/esx_taxijob/locales/es.lua +++ b/[esx_addons]/esx_taxijob/locales/es.lua @@ -48,7 +48,6 @@ Locales['es'] = { ['have_deposited'] = 'Has depositado x%s %s', ['player_cannot_hold'] = '!Tu ~r~no tienes suficiente espacio libre en tu inventario!', ['blip_taxi'] = 'Downtown Cab Co.', - ['phone_taxi'] = 'Downtown Cab Co.', ['taxi'] = 'Taxi', ['taxi_stock'] = 'Taxi Stock' } diff --git a/[esx_addons]/esx_taxijob/locales/fi.lua b/[esx_addons]/esx_taxijob/locales/fi.lua index 005670cf..01c21ba6 100644 --- a/[esx_addons]/esx_taxijob/locales/fi.lua +++ b/[esx_addons]/esx_taxijob/locales/fi.lua @@ -46,7 +46,6 @@ Locales['fi'] = { ['have_deposited'] = 'sinä talletit x%s %s', ['player_cannot_hold'] = 'sinulla ~r~ei ole enempää vapaata tilaa repussasi!', ['blip_taxi'] = 'taxi', - ['phone_taxi'] = 'taxi', ['taxi'] = 'taxi', ['taxi_stock'] = 'taxi Stock' } diff --git a/[esx_addons]/esx_taxijob/locales/fr.lua b/[esx_addons]/esx_taxijob/locales/fr.lua index 3619f1c4..f331195e 100644 --- a/[esx_addons]/esx_taxijob/locales/fr.lua +++ b/[esx_addons]/esx_taxijob/locales/fr.lua @@ -46,7 +46,6 @@ Locales['fr'] = { ['have_deposited'] = 'vous avez déposé x%s %s', ['player_cannot_hold'] = 'vous n\'avez pas assez de place dans votre inventaire!', ['blip_taxi'] = 'taxi', - ['phone_taxi'] = 'taxi', ['taxi'] = 'taxi', ['taxi_stock'] = 'taxi Stock' } diff --git a/[esx_addons]/esx_taxijob/locales/hu.lua b/[esx_addons]/esx_taxijob/locales/hu.lua index 628ecd50..1efd6a19 100644 --- a/[esx_addons]/esx_taxijob/locales/hu.lua +++ b/[esx_addons]/esx_taxijob/locales/hu.lua @@ -45,7 +45,6 @@ Locales['hu'] = { ['have_deposited'] = 'betettél x%s %s', ['player_cannot_hold'] = '~r~nincs elég üres helyed a leltárban!', ['blip_taxi'] = 'Taxitársaság', - ['phone_taxi'] = 'Taxi Hívás.', ['taxi'] = 'taxi', ['taxi_stock'] = 'taxi készlet' } diff --git a/[esx_addons]/esx_taxijob/locales/it.lua b/[esx_addons]/esx_taxijob/locales/it.lua index 5d97f45c..c9a3e7f0 100644 --- a/[esx_addons]/esx_taxijob/locales/it.lua +++ b/[esx_addons]/esx_taxijob/locales/it.lua @@ -50,7 +50,6 @@ Locales['it'] = { ['have_deposited'] = 'hai depositato x%s %s', ['player_cannot_hold'] = '~r~non hai abbastanza spazio libero nel tuo inventario!', ['blip_taxi'] = 'Downtown Cab Co.', - ['phone_taxi' ] = ' downtown Cab Co.', ['taxi' ] = 'taxi', ['taxi_stock'] = 'deposito dei taxi', ['menu_return'] = 'Ritorno' diff --git a/[esx_addons]/esx_taxijob/locales/pl.lua b/[esx_addons]/esx_taxijob/locales/pl.lua index 58c48622..78e3e1ad 100644 --- a/[esx_addons]/esx_taxijob/locales/pl.lua +++ b/[esx_addons]/esx_taxijob/locales/pl.lua @@ -46,7 +46,6 @@ Locales['pl'] = { ['have_deposited'] = 'deponujesz x%s %s', ['player_cannot_hold'] = '~r~Nie masz wystarczająco wolnego miejsca w swoim ekwipunku!', ['blip_taxi'] = 'taxi', - ['phone_taxi'] = 'taxi', ['taxi'] = 'taxi', ['taxi_stock'] = 'taxi Stock' } diff --git a/[esx_addons]/esx_taxijob/locales/si.lua b/[esx_addons]/esx_taxijob/locales/si.lua index ba25f67f..2e8fd057 100644 --- a/[esx_addons]/esx_taxijob/locales/si.lua +++ b/[esx_addons]/esx_taxijob/locales/si.lua @@ -45,7 +45,6 @@ Locales['si'] = { ['have_deposited'] = 'ste deponirali x%s %s', ['player_cannot_hold'] = 'v svojem inventarju nimaš dovolj prostora!', ['blip_taxi'] = 'podjetje downtown Cab Co.', - ['phone_taxi'] = 'downtown Cab Co.', ['taxi'] = 'taxi', ['taxi_stock'] = 'taxi Stock' } diff --git a/[esx_addons]/esx_taxijob/locales/sv.lua b/[esx_addons]/esx_taxijob/locales/sv.lua index 2ae2bd11..012fa56c 100644 --- a/[esx_addons]/esx_taxijob/locales/sv.lua +++ b/[esx_addons]/esx_taxijob/locales/sv.lua @@ -46,7 +46,6 @@ Locales['sv'] = { ['have_deposited'] = 'du har lagrat x%s %s', ['player_cannot_hold'] = 'du har ~r~inte tillräckligt med utrymme för att hålla det!', ['blip_taxi'] = 'taxifirman', - ['phone_taxi'] = 'taxi', ['taxi'] = 'taxi', ['taxi_stock'] = 'taxi Stock' } diff --git a/[esx_addons]/esx_taxijob/server/main.lua b/[esx_addons]/esx_taxijob/server/main.lua index e84561ad..fcfea05d 100644 --- a/[esx_addons]/esx_taxijob/server/main.lua +++ b/[esx_addons]/esx_taxijob/server/main.lua @@ -4,13 +4,6 @@ if Config.MaxInService ~= -1 then TriggerEvent('esx_service:activateService', 'taxi', Config.MaxInService) end -TriggerEvent('esx_phone:registerNumber', 'taxi', TranslateCap('taxi_client'), true, true) -CreateThread(function() - exports["esx_society"]:registerSociety('taxi', 'Taxi', 'society_taxi', 'society_taxi', 'society_taxi', { - type = 'public' - }) -end) - RegisterNetEvent('esx_taxijob:success') AddEventHandler('esx_taxijob:success', function() local xPlayer = ESX.GetPlayerFromId(source) diff --git a/[esx_addons]/esx_vehicleshop/server/main.lua b/[esx_addons]/esx_vehicleshop/server/main.lua index e93703fe..d4628296 100644 --- a/[esx_addons]/esx_vehicleshop/server/main.lua +++ b/[esx_addons]/esx_vehicleshop/server/main.lua @@ -1,7 +1,6 @@ local categories, vehicles = {}, {} local vehiclesByModel = {} -TriggerEvent('esx_phone:registerNumber', 'cardealer', TranslateCap('dealer_customers'), false, false) CreateThread(function() exports["esx_society"]:registerSociety('cardealer', TranslateCap('car_dealer'), 'society_cardealer', 'society_cardealer', 'society_cardealer', {type = 'private'}) end)