Removed short link protocol detection

Removed short link protocol detection due to mantis ticket 0021118
fluxapps · Sep 12, 2017 · ee3ba13 · ee3ba13
1 parent 6283b44
commit ee3ba13
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/classes/Conf/class.xlvoConf.php b/classes/Conf/class.xlvoConf.php
@@ -44,18 +44,15 @@ class xlvoConf extends CachingActiveRecord {
 	 * @return string
 	 */
 	public static function getShortLinkURL() {
-		if (self::getConfig(self::F_ALLOW_SHORTLINK)) {
+
+		$url = null;
+		$shortLinkEnabled = intval(self::getConfig(self::F_ALLOW_SHORTLINK));
+
+		if ($shortLinkEnabled === 1) {
 			$url = self::getConfig(self::F_ALLOW_SHORTLINK_LINK);
 			$url = rtrim($url, "/") . "/";
-			$url = str_replace("http://", '', $url);
-			$url = str_replace("https://", '', $url);
-
-			if (\ilHTTPS::getInstance()->isDetected()) {
-				$url = 'https://' . $url;
-			} else {
-				$url = 'http://' . $url;
-			}
-		} else {
+		}
+		else {
 			$url = ILIAS_HTTP_PATH
 			       . '/Customizing/global/plugins/Services/Repository/RepositoryObject/LiveVoting/pin.php?pin=';
 		}