diff --git a/lib/Tracking_UPS.lib.php b/lib/Tracking_UPS.lib.php index 7e4277e..33cf86e 100644 --- a/lib/Tracking_UPS.lib.php +++ b/lib/Tracking_UPS.lib.php @@ -89,15 +89,10 @@ class Tracking_UPS { $info->setCarrier("ups"); $info->setService(new Service($trackinfo["Service"]["Code"], $trackinfo["Service"]["Description"])); - $info->setCarrierLogo(($_SERVER['SERVER_PORT'] == 443 ? "https://" : "http://") - . $_SERVER['HTTP_HOST'] . env("urlbase", "/") - . "resources/logistics.tracking/logos/ups.gif"); + $info->setCarrierLogo("data:image/svg+xml;base64,PHN2ZyBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDEyLjYzNSAxNS4zNjggMjI3LjMwNSAyNzkuNDQzIiBoZWlnaHQ9IjI3OS40NDMiIHZpZXdCb3g9IjEyLjYzNSAxNS4zNjggMjI3LjMwNSAyNzkuNDQzIiB3aWR0aD0iMjI3LjMwNSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+PGNsaXBQYXRoIGlkPSJhIj48cGF0aCBkPSJtMjM5LjkzOCA0MC4yNzFjLTIzLjg1NC0xMy4xNzYtNTAuOTE2LTE5LjM5My03Mi42NDktMjIuMzE5LTIzLjczMS0zLjE4OC00MS4xMDEtMi40Ni00MS4wMTUtMi41ODQuMDUyLjA2Ni00LjU4Mi0uMDk4LTEyLjM1LjE2Ny03LjkyNC4yNzYtMTkuMTE0Ljk5Ni0zMS45MzggMi44NzYtMTAuMTEzIDEuNDg2LTIxLjIzNiAzLjY4OS0zMi41NzYgNi45NTEtMTIuMzUyIDMuNTU5LTI0Ljk1MiA4LjM4MS0zNi43NzUgMTQuOTA5djI3LjQ5NiAxMC40NzggMjAuMDgyIDc2LjYzNmMuMDA3IDI3LjI3MSA5LjM5NyA1MS4yMzUgMjkuOTQ5IDY4LjMxNyA0LjY1OCAzLjkzOCAxMS44MDcgOC40MzcgMjAuMDE2IDEzLjAwNCA2Ljk2MiAzLjg2NSAxNC42OSA3Ljc4MyAyMi4yODQgMTEuNDY2IDguOTU3IDQuMzMzIDE3LjczNSA4LjMxNSAyNC44ODQgMTEuNDc2IDkuODExIDQuMzM0IDE2LjU2IDcuMTA2IDE2LjUwNSA3LjA1My0uMDgyLjA3MiAxNC45MzItNi4xMDQgMzIuNjgzLTE0LjM4OSAxOC44OTctOC44MjggNDAuODgyLTIwLjAyNyA1MS4wMjEtMjguNjA3IDIwLjU2Mi0xNy4wODEgMjkuOTYzLTQxLjA0OSAyOS45NjMtNjguMzI2IDAtMjUuNTM1IDAtNTEuMDgzIDAtNzYuNjI3IDAtNy41MjkgMC0xMy4zODcgMC0yMC45MTUgMC0yLjY1OSAwLTYuOTg1IDAtOS42NDUtLjAwMi05LjE2OC0uMDAyLTE4LjMzNS0uMDAyLTI3LjQ5OSIvPjwvY2xpcFBhdGg+PGNsaXBQYXRoIGlkPSJiIj48cGF0aCBkPSJtMjMxLjAyMyA0Mi4wMjhjLTMzLjI1LTMuNDk3LTY5Ljg5Mi00LjQxNC0xMDYuMzYyIDIuODU1LTEwLjU4NSAyLjEyOC0yMS4xNTcgNC45MzgtMzEuNTg5IDguNTkxLTExLjE0NyAzLjkwOC0yMi4xMjYgOC43NjgtMzIuNzg0IDE0Ljc2OC0xMy42MjcgNy42NzUtMjYuNzEzIDE3LjIxNC0zOC45MjUgMjguOTc4LS4wMDIgMi41MTctLjAwOSA1LjAzMy0uMDE2IDcuNTQ3LS4wMTggMTIuMDc0LS4wMjkgMjQuMTU5LS4wMzQgMzYuMjQ1LS4wMDkgMTEuMzQyIDAgMjIuNjkuMDA5IDM0LjAzOS4wMTggMjUuMzAyIDkuMTEgNDYuNTg5IDI2Ljg5NyA2MS4zNjYgMTAuOTM4IDUuNjYxIDIxLjg3OCAxMS4zMjYgMzIuODIyIDE2Ljk5MSA4LjM1NSA0LjMzMyAxNi43MTYgOC42NTUgMjUuMDc0IDEyLjk4NyA2LjcyMSAzLjQ3NyAxMy40NDEgNi45NTMgMjAuMTYyIDEwLjQ0IDEzLjM5Ni01LjU4NCA2Mi4yMTEtMjcuMDI0IDc4LjA2Ny00MC40MjEgMTcuNzkxLTE0Ljc3NyAyNi44NzItMzYuMDY0IDI2Ljg5Mi02MS4zNjYuMDI3LTI0LjM4Ny4wMTUtNDguNzg4LS4wMjYtNzMuMTUtLjAzNi0xNi41NTEtLjA4MS0zMy4wODYtLjE0Ni00OS41NjktLjAxNy0zLjQzMi0uMDI2LTYuODY4LS4wNDEtMTAuMzAxIi8+PC9jbGlwUGF0aD48Y2xpcFBhdGggaWQ9ImMiPjxwYXRoIGQ9Im0yMDMuODYzIDE3MS40NTVjLS4xMzctNi4zNzktMy42MzctOS44MjYtMTIuNDQ2LTE1LjA1Ni0xNi41OS05Ljg0LTE5LjY1MS0xNy45OS0xOS42OTgtMjguODYyLS4xLTE2LjQ5MiAxMy44MTUtMjYuMDE5IDI2LjkyOC0yNi4yNjYgMTAuOTctLjIxIDE4LjMwMyA0LjA1NiAyMS43NTggNi44MDcuMDE5IDUuODM5LjAzMSAxMS42ODkuMDM1IDE3LjUzNS00LjA4OC00LjM0Ni0xMC43MjktOC4zMjgtMTcuNy04LjQ1Mi01LjY1NS0uMTA2LTExLjU2NCAyLjM4OC0xMS43NDUgOS42MjUtLjE2MyA3LjM5MSA1Ljc3MSAxMC4zNDEgMTMuMTY1IDE0Ljc5NCAxNi41OTkgMTAuMDE0IDE5LjYxIDE4Ljg1OCAxOS4yOTEgMzAuNjI0LS40MjcgMTIuODk1LTguOTk5IDI3LjA4LTI4Ljc3OCAyNy4yOTctNy45MjUuMDgxLTE1Ljc5NS0yLjM2Ny0yMi4xMTktNi4xMDcuMDI2LTYuMjQ4LjA0Ny0xMi41MDYuMDU1LTE4Ljc4NSA1LjE3OSA0LjY1MiAxMi44ODEgOC4yMDMgMTkuMjcyIDguMjAzIDcuMzM0LS4wMDIgMTIuMTQtNC4zMDkgMTEuOTgyLTExLjM1N20tODIuMzU1LTUyLjcwM2MxLjY1My0uODAyIDQuNDg2LTEuNDYxIDcuMjQyLTEuNDYxIDExLjg3NyAwIDE2LjgxMSA5LjQ3OSAxNi44MjkgMzIuNDM1LS4wMTEgMjIuMzgxLTUuNjUyIDMzLjE3LTE3LjQzNSAzMy4xNy0yLjc1MiAwLTUuMTY2LS42ODgtNi42MzktMS4yMzgtLjAwMi0yMC45MjUgMC00MS45ODQuMDAzLTYyLjkwNnptLjA0IDEyMS45OTNjLS4wMDktMTMuOTc5LS4wMjQtMjguMTQzLS4wMjYtNDIuNDA5IDIuMDI3LjU5NyA1LjAyIDEuMTQgOS4yMDcgMS4xMzQgMjIuNjQ1LS4wMjEgMzUuNjk0LTIwLjQxIDM1LjY5NC01MC4yODctLjAxNC0yOS43OTUtMTMuNDMyLTQ4LjI3Mi0zNy44MjMtNDguMjg4LTExLjExOCAwLTIwLjExNiAyLjQ3Mi0yNy40OTMgNy4yODMtLjEwMiA0NC4yMDMtLjA0MSA4OS4yNDYuMTc2IDEzMi41MDggNi43NS4wMzggMTMuNTA5LjA1NCAyMC4yNjUuMDU5em0tNjAuMDAzLTU4LjQzYzQuMDg2LjAyNiA3LjM0Ni0uODk1IDkuNTI4LTIuNDAyLS4wNzItMjUuNTYyLS4wNS01MS4yODIuMDc1LTc2Ljc0NyA2LjcxMS0uMDU3IDEzLjQ1OC0uMTAzIDIwLjIyMi0uMTMxLS4wOTkgMjkuMzYzLS4xMDYgNTkuMTE2LS4wMTggODguNTQyLTcuNzYyIDUuMjctMTguMTQ2IDguMDY4LTMwLjQzIDcuOTU1LTE5LjgzNi0uMjAyLTI5LjU2Ny0xMS4xODItMjkuNjA1LTMyLjUyMiAwLTIxLjE0NS4wMDItNDIuMzE5LjAwMi02My40MTkgNi41MzUtLjA5MyAxMy4xNDMtLjE2NSAxOS43OTEtLjIzOS0uMTAyIDIxLjQ2OS0uMTM4IDQzLjA4Ni0uMTAyIDY0LjY0OC4wMTcgNS43MjggMS4zNzIgMTQuMjUzIDEwLjUzNyAxNC4zMTV6Ii8+PC9jbGlwUGF0aD48cGF0aCBjbGlwLXBhdGg9InVybCgjYSkiIGQ9Im05IDEzaDIzNS41djI3M2gtMjM1LjV6IiBmaWxsPSIjZmViMzAyIi8+PHBhdGggY2xpcC1wYXRoPSJ1cmwoI2IpIiBkPSJtMjAgMzYuNWgyMTV2MjQyLjVoLTIxNXoiIGZpbGw9IiMzNTFjMTUiLz48ZyBmaWxsPSIjZmViMzAyIj48cGF0aCBjbGlwLXBhdGg9InVybCgjYykiIGQ9Im0yMDMuODYzIDE3MS40NTVjLS4xMzctNi4zNzktMy42MzctOS44MjYtMTIuNDQ2LTE1LjA1Ni0xNi41OS05Ljg0LTE5LjY1MS0xNy45OS0xOS42OTgtMjguODYyLS4xLTE2LjQ5MiAxMy44MTUtMjYuMDE5IDI2LjkyOC0yNi4yNjYgMTAuOTctLjIxIDE4LjMwMyA0LjA1NiAyMS43NTggNi44MDcuMDE5IDUuODM5LjAzMSAxMS42ODkuMDM1IDE3LjUzNS00LjA4OC00LjM0Ni0xMC43MjktOC4zMjgtMTcuNy04LjQ1Mi01LjY1NS0uMTA2LTExLjU2NCAyLjM4OC0xMS43NDUgOS42MjUtLjE2MyA3LjM5MSA1Ljc3MSAxMC4zNDEgMTMuMTY1IDE0Ljc5NCAxNi41OTkgMTAuMDE0IDE5LjYxIDE4Ljg1OCAxOS4yOTEgMzAuNjI0LS40MjcgMTIuODk1LTguOTk5IDI3LjA4LTI4Ljc3OCAyNy4yOTctNy45MjUuMDgxLTE1Ljc5NS0yLjM2Ny0yMi4xMTktNi4xMDcuMDI2LTYuMjQ4LjA0Ny0xMi41MDYuMDU1LTE4Ljc4NSA1LjE3OSA0LjY1MiAxMi44ODEgOC4yMDMgMTkuMjcyIDguMjAzIDcuMzM0LS4wMDIgMTIuMTQtNC4zMDkgMTEuOTgyLTExLjM1N20tODIuMzU1LTUyLjcwM2MxLjY1My0uODAyIDQuNDg2LTEuNDYxIDcuMjQyLTEuNDYxIDExLjg3NyAwIDE2LjgxMSA5LjQ3OSAxNi44MjkgMzIuNDM1LS4wMTEgMjIuMzgxLTUuNjUyIDMzLjE3LTE3LjQzNSAzMy4xNy0yLjc1MiAwLTUuMTY2LS42ODgtNi42MzktMS4yMzgtLjAwMi0yMC45MjUgMC00MS45ODQuMDAzLTYyLjkwNnptLjA0IDEyMS45OTNjLS4wMDktMTMuOTc5LS4wMjQtMjguMTQzLS4wMjYtNDIuNDA5IDIuMDI3LjU5NyA1LjAyIDEuMTQgOS4yMDcgMS4xMzQgMjIuNjQ1LS4wMjEgMzUuNjk0LTIwLjQxIDM1LjY5NC01MC4yODctLjAxNC0yOS43OTUtMTMuNDMyLTQ4LjI3Mi0zNy44MjMtNDguMjg4LTExLjExOCAwLTIwLjExNiAyLjQ3Mi0yNy40OTMgNy4yODMtLjEwMiA0NC4yMDMtLjA0MSA4OS4yNDYuMTc2IDEzMi41MDggNi43NS4wMzggMTMuNTA5LjA1NCAyMC4yNjUuMDU5em0tNjAuMDAzLTU4LjQzYzQuMDg2LjAyNiA3LjM0Ni0uODk1IDkuNTI4LTIuNDAyLS4wNzItMjUuNTYyLS4wNS01MS4yODIuMDc1LTc2Ljc0NyA2LjcxMS0uMDU3IDEzLjQ1OC0uMTAzIDIwLjIyMi0uMTMxLS4wOTkgMjkuMzYzLS4xMDYgNTkuMTE2LS4wMTggODguNTQyLTcuNzYyIDUuMjctMTguMTQ2IDguMDY4LTMwLjQzIDcuOTU1LTE5LjgzNi0uMjAyLTI5LjU2Ny0xMS4xODItMjkuNjA1LTMyLjUyMiAwLTIxLjE0NS4wMDItNDIuMzE5LjAwMi02My40MTkgNi41MzUtLjA5MyAxMy4xNDMtLjE2NSAxOS43OTEtLjIzOS0uMTAyIDIxLjQ2OS0uMTM4IDQzLjA4Ni0uMTAyIDY0LjY0OC4wMTcgNS43MjggMS4zNzIgMTQuMjUzIDEwLjUzNyAxNC4zMTV6Ii8+PHBhdGggZD0ibTIwNi44MjYgMjgyLjg1OGMwIDYuNjk3LTUuMjU4IDExLjk1My0xMi4wOTggMTEuOTUzLTYuNzcgMC0xMi4xNy01LjI1Ni0xMi4xNy0xMS45NTMgMC02LjU1MyA1LjQtMTEuODEgMTIuMTctMTEuODEgNi44NC4wMDEgMTIuMDk4IDUuMjU4IDEyLjA5OCAxMS44MXptLTIxLjI0MiAwYzAgNS4yNTcgMy44ODkgOS40MzQgOS4yMTcgOS40MzQgNS4xODYgMCA5LjAwMS00LjE3NyA5LjAwMS05LjM2MSAwLTUuMjU2LTMuODE1LTkuNTA1LTkuMDczLTkuNTA1LTUuMjU2LS4wMDEtOS4xNDUgNC4yNDgtOS4xNDUgOS40MzJ6bTcuMjcxIDYuMTkzaC0yLjczNXYtMTEuODFjMS4wOC0uMjE3IDIuNTkzLS4zNiA0LjUzNi0uMzYgMi4yMzIgMCAzLjI0LjM2IDQuMTA0Ljg2NC42NDguNTA1IDEuMTUyIDEuNDM5IDEuMTUyIDIuNTkzIDAgMS4yOTYtMS4wMDggMi4zMDQtMi40NDggMi43MzZ2LjE0NGMxLjE1Mi40MzQgMS44IDEuMjk3IDIuMTYgMi44ODEuMzYgMS44MDEuNTc2IDIuNTIxLjg2NCAyLjk1MmgtMi45NTJjLS4zNi0uNDMzLS41NzYtMS41MTMtLjkzNy0yLjg4MS0uMjE3LTEuMjk2LS45MzctMS44NzItMi40NDktMS44NzJoLTEuMjk1em0uMDc1LTYuNjk3aDEuMjk1YzEuNTEyIDAgMi43MzYtLjUwNCAyLjczNi0xLjcyOSAwLTEuMDgtLjc5Mi0xLjc5OS0yLjUyMS0xLjc5OS0uNzE5IDAtMS4yMjQuMDcxLTEuNTEyLjE0M3YzLjM4NmguMDAyeiIvPjwvZz48L3N2Zz4="); $info->setCarrierAttributionText("UPS, the UPS brand mark, and the Color Brown are " - . "trademarks of United Parcel Service of America, Inc. All Rights Reserved. " - . "© 2021 United Parcel Service of America, Inc. All Rights Reserved. Confidential " - . "and Proprietary The use, disclosure, reproduction, modification, transfer, or " - . "transmittal of this work for any purpose in any form or by any means without the " - . "written permission of United Parcel Service is strictly prohibited."); + . "trademarks of United Parcel Service of America, Inc. All Rights Reserved."); + if (count($trackinfo["Package"]["Activity"]) > 0) { $current = $trackinfo["Package"]["Activity"][0]; diff --git a/resources/logistics.tracking/logos/ups.gif b/resources/logistics.tracking/logos/ups.gif deleted file mode 100644 index 2638384..0000000 Binary files a/resources/logistics.tracking/logos/ups.gif and /dev/null differ