From 668ab7f235fdf520890722269288536bfd3761b8 Mon Sep 17 00:00:00 2001
From: Nick Liu <deltik@gmx.com>
Date: Sat, 28 Nov 2020 16:10:05 +0100
Subject: [PATCH] Fixed all unchecked usages of possibly undefined constant
 BOOTSTRAP

---
 e107_core/shortcodes/batch/bbcode_shortcodes.php             | 2 +-
 e107_handlers/comment_class.php                              | 2 +-
 e107_handlers/form_handler.php                               | 2 +-
 e107_plugins/forum/shortcodes/batch/view_shortcodes.php      | 4 ++--
 e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php | 5 +++--
 e107_plugins/news/news.php                                   | 2 +-
 search.php                                                   | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/e107_core/shortcodes/batch/bbcode_shortcodes.php b/e107_core/shortcodes/batch/bbcode_shortcodes.php
index f1cfd05f9d..7412784b56 100644
--- a/e107_core/shortcodes/batch/bbcode_shortcodes.php
+++ b/e107_core/shortcodes/batch/bbcode_shortcodes.php
@@ -43,7 +43,7 @@ function bb_format($id)
 		); 
 		
 		
-		if(BOOTSTRAP)
+		if(defined('BOOTSTRAP') && BOOTSTRAP)
 		{
 				$text = '<div class="btn-group">';
 				$text .= '<a class="btn btn-default btn-secondary dropdown-toggle" data-toggle="dropdown" href="#" title="">';
diff --git a/e107_handlers/comment_class.php b/e107_handlers/comment_class.php
index 73997c1d67..c6ef678442 100644
--- a/e107_handlers/comment_class.php
+++ b/e107_handlers/comment_class.php
@@ -1153,7 +1153,7 @@ function compose_comment($table, $action, $id, $width, $subject, $rate = FALSE,
 		}
 		else
 		{
-			if(BOOTSTRAP)
+			if(defined('BOOTSTRAP') && BOOTSTRAP)
 			{
 				$comment = e107::getMessage()->addInfo(COMLAN_328)->render(); 
 			}
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 335e15a19f..269f22eb9c 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -2103,7 +2103,7 @@ public function pagination($url='', $total=0, $from=0, $perPage=10, $options=arr
 			return '';
 		}
 		
-		if(BOOTSTRAP === 4)
+		if(defined('BOOTSTRAP') && BOOTSTRAP === 4)
 		{
 			return '<a class="pager-button btn btn-primary" href="'.$url.'">'.$total.'</a>';
 		}
diff --git a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
index cb81819e61..0f42ff82b7 100644
--- a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
@@ -848,7 +848,7 @@ function sc_postoptions()
     	<button class="btn btn-default btn-secondary btn-sm btn-small dropdown-toggle" data-toggle="dropdown">
     	' . LAN_FORUM_8013 . '
     	';
-    	if(BOOTSTRAP !== 4)
+    	if(defined('BOOTSTRAP') && BOOTSTRAP !== 4)
     	{
     		$text .= '<span class="caret"></span>';
     	}
@@ -1144,7 +1144,7 @@ function sc_buttonsx()
    ' . $replyUrl . '
     <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
     ';
-	if(BOOTSTRAP !== 4)
+	if(defined('BOOTSTRAP') && BOOTSTRAP !== 4)
 	{
     	$text .= '<span class="caret"></span>';
     }
diff --git a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
index df953cb113..b2ee09f1ff 100644
--- a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
@@ -71,8 +71,9 @@ function sc_newthreadbutton()
 
 		function sc_newthreadbuttonx()
 		{
+			$bootstrap = defined('BOOTSTRAP') ? BOOTSTRAP : false;
 
-			if(!BOOTSTRAP)
+			if(!$bootstrap)
 			{
 				return $this->sc_newthreadbutton();
 			}
@@ -103,7 +104,7 @@ function sc_newthreadbuttonx()
 			'.($this->var['ntUrl'] ?"":"<span>&nbsp;</span>").'
 			<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
 			';
-			if(BOOTSTRAP !== 4)
+			if($bootstrap !== 4)
 			{
 		    	$text .= '<span class="caret"></span>';
 		    }
diff --git a/e107_plugins/news/news.php b/e107_plugins/news/news.php
index 59f524514f..af32666e38 100644
--- a/e107_plugins/news/news.php
+++ b/e107_plugins/news/news.php
@@ -1308,7 +1308,7 @@ private function renderComments($news)
 			// Only show message if global comments are enabled, but current news item comments are disabled
 			if(e107::getPref('comments_disabled') == 0 && $news['news_allow_comments'] == 1)
 			{
-				if(BOOTSTRAP)
+				if(defined('BOOTSTRAP') && BOOTSTRAP)
 				{
 					return e107::getMessage()->addInfo(LAN_NEWS_13)->render(); 
 				}
diff --git a/search.php b/search.php
index f9cacd4754..48c4377cde 100644
--- a/search.php
+++ b/search.php
@@ -166,7 +166,7 @@ function sc_search_main($parm = '')
 		<button class='btn btn-primary dropdown-toggle' tabindex='-1' data-toggle='dropdown' type='button'>
 		";
 
-		if(BOOTSTRAP !== 4)
+		if(defined('BOOTSTRAP') && BOOTSTRAP !== 4)
 		{
 			$text .= "<span class='caret'></span></button>";
 		}