From fb6bea07b7518892cc31f775f151cd9811b0ef09 Mon Sep 17 00:00:00 2001 From: Gudule Lapointe Date: Thu, 13 Mar 2025 16:41:51 +0100 Subject: [PATCH] * fix duplicate TPLINK* constant declarations --- includes/functions.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/includes/functions.php b/includes/functions.php index bebe357..9dac4ec 100644 --- a/includes/functions.php +++ b/includes/functions.php @@ -517,16 +517,18 @@ function set_helpers_locale( $locale = null, $domain = 'messages' ) { textdomain( $domain ); } -define( 'NULL_KEY', '00000000-0000-0000-0000-000000000000' ); -define( 'TPLINK_LOCAL', 1 ); // seconlife://Region/x/y/z -define( 'TPLINK_HG', 2 ); // seconlife://yourgrid.org:8002 Region/x/y/z -define( 'TPLINK_V3HG', 4 ); // the overcomplicated stuff! -define( 'TPLINK_HOP', 8 ); // hop://yourgrid.org:8002:Region/x/y/z -define( 'TPLINK_TXT', 16 ); // yourgrid.org:8002:Region/x/y/z -define( 'TPLINK_APPTP', 32 ); // secondlife:///app/teleport/yourgrid.org:8002:Region/x/y/z -define( 'TPLINK_MAP', 64 ); // secondlife:///app/map/yourgrid.org:8002:Region/x/y/z -define( 'TPLINK', pow( 2, 8 ) - 1 ); // all formats -define( 'TPLINK_DEFAULT', TPLINK_HOP ); // default +if( ! defined( 'NULL_KEY') ) define( 'NULL_KEY', '00000000-0000-0000-0000-000000000000' ); +if( ! defined( 'TPLINK_LOCAL') ) { + define( 'TPLINK_LOCAL', 1 ); // seconlife://Region/x/y/z + define( 'TPLINK_HG', 2 ); // seconlife://yourgrid.org:8002 Region/x/y/z + define( 'TPLINK_V3HG', 4 ); // the overcomplicated stuff! + define( 'TPLINK_HOP', 8 ); // hop://yourgrid.org:8002:Region/x/y/z + define( 'TPLINK_TXT', 16 ); // yourgrid.org:8002:Region/x/y/z + define( 'TPLINK_APPTP', 32 ); // secondlife:///app/teleport/yourgrid.org:8002:Region/x/y/z + define( 'TPLINK_MAP', 64 ); // secondlife:///app/map/yourgrid.org:8002:Region/x/y/z + define( 'TPLINK', pow( 2, 8 ) - 1 ); // all formats + define( 'TPLINK_DEFAULT', TPLINK_HOP ); // default +} define( 'HELPERS_LOCALE_DIR', dirname( __DIR__ ) . '/languages' );