Fix link in 'XML phonebook for your device' button

Implement new getSystemBaseURL() method to get the current URL of the system
Massi-X · Dec 21, 2024 · a834e51 · a834e51
1 parent cc447f3
commit a834e51
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/Phonemiddleware.class.php b/Phonemiddleware.class.php
@@ -31,8 +31,8 @@ class Phonemiddleware extends \DB_Helper implements \BMO
 	private $WWW_MODULE_DIR_NEW;
 	private $ASSETS_SYMLINK;
 
-	private const numberToCnamPath = '/carddavmiddleware/numbertocnam.php';
-	private const carddavToXmlPath = '/carddavmiddleware/carddavtoxml.php';
+	const numberToCnamPath = '/carddavmiddleware/numbertocnam.php';
+	const carddavToXmlPath = '/carddavmiddleware/carddavtoxml.php';
 
 	private static $inPage = false;
 	private static $forceSSL = null;
@@ -288,6 +288,22 @@ public static function getForceSSL()
 		return self::$forceSSL;
 	}
 
+	/**
+	 * Get the system base URL
+	 * 
+	 * @return	string					base URL
+	 */
+	public static function getSystemBaseURL()
+	{
+		$ssl = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on';
+		$port = ':' . $_SERVER['SERVER_PORT'];
+
+		if ($ssl && $_SERVER['SERVER_PORT'] == 443) $port = '';
+		if (!$ssl && $_SERVER['SERVER_PORT'] == 80) $port = '';
+
+		return ($ssl ? 'https' : 'http') . '://' . $_SERVER['SERVER_NAME'] . $port;
+	}
+
 	/**
 	 * Return the resolved email address
 	 * 
@@ -301,7 +317,6 @@ public static function getToAddress()
 		return self::$emailTo;
 	}
 
-
 	/**
 	 * Set which ajax requests should be allowed
 	 * 

diff --git a/page.carddavmiddleware.php b/page.carddavmiddleware.php
@@ -403,7 +403,7 @@
 				<button data-action="close-tip" class="btn fl-right"><?= _('Got it'); ?></button>
 			</div>
 			<div class="help-section">
-				<a target="_blank" href="<?= \FreePBX::PhoneMiddleware()->getXmlPhonebookURL(); ?>" title="<?= _('Open in new page…'); ?>" class="btn-popup"><?= _('XML phonebook for your device'); ?> <i class="fa fa-external-link"></i></a>
+				<a target="_blank" href="<?= \FreePBX::PhoneMiddleware()->getSystemBaseURL() . \FreePBX::PhoneMiddleware()::carddavToXmlPath; ?>" title="<?= _('Open in new page…'); ?>" class="btn-popup"><?= _('XML phonebook for your device'); ?> <i class="fa fa-external-link"></i></a>
 				<a href="javascript:;" class="btn-popup" onclick="$('#errorPopup').dialog('open'); return false;"><?= _('Error codes and fixes'); ?></a>
 			</div>
 		</div>